Change in osmo-ttcn3-hacks[master]: Introduce NS test cases
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22091 ) Change subject: Introduce NS test cases .. Patch Set 9: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22091/9/ns/NS_Tests.ttcn File ns/NS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22091/9/ns/NS_Tests.ttcn@4 PS9, Line 4: de > -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic619a374b88879d3116f8f28afb14401c3e3192b Gerrit-Change-Number: 22091 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Jan 2021 07:50:45 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: pySim-read.py: Add support for reading USIM+ISIM data from third-part...
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/22351 to look at the new patch set (#2). Change subject: pySim-read.py: Add support for reading USIM+ISIM data from third-party UICC .. pySim-read.py: Add support for reading USIM+ISIM data from third-party UICC Change-Id: Id8b95630e90cb5833482da2690e423e7adefb95b --- M pySim-read.py 1 file changed, 25 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/51/22351/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/22351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id8b95630e90cb5833482da2690e423e7adefb95b Gerrit-Change-Number: 22351 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in pysim[master]: pySim-read.py: Add support for reading USIM+ISIM data from third-part...
herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/22351 ) Change subject: pySim-read.py: Add support for reading USIM+ISIM data from third-party UICC .. pySim-read.py: Add support for reading USIM+ISIM data from third-party UICC Change-Id: Id8b95630e90cb5833482da2690e423e7adefb95b --- M pySim-read.py 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/51/22351/1 diff --git a/pySim-read.py b/pySim-read.py index b94e709..2ec80c4 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -33,7 +33,7 @@ from pySim.ts_31_103 import EF_IST_map, EF_ISIM_ADF_map from pySim.commands import SimCardCommands -from pySim.cards import card_detect, Card +from pySim.cards import card_detect, Card, UsimCard, IsimCard from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, dec_msisdn from pySim.utils import format_xplmn_w_act, dec_spn, dec_st, init_reader, dec_addr_tlv from pySim.utils import h2s, format_ePDGSelection @@ -250,6 +250,9 @@ # Check whether we have th AID of USIM, if so select it by its AID # EF.UST - File Id in ADF USIM : 6f38 if '9000' == card.select_adf_by_aid(): + # Select USIM profile + card = UsimCard(scc) + # EF.EHPLMN if card.file_exists(EF_USIM_ADF_map['EHPLMN']): (res, sw) = card.read_ehplmn() @@ -296,6 +299,9 @@ # Select ISIM application by its AID if '9000' == card.select_adf_by_aid(adf="isim"): + # Select USIM profile + card = IsimCard(scc) + #EF.P-CSCF - P-CSCF Address try: if card.file_exists(EF_ISIM_ADF_map['PCSCF']): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/22351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id8b95630e90cb5833482da2690e423e7adefb95b Gerrit-Change-Number: 22351 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 118s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 119s] [COMPILING libboard/qmod/source/card_pres.c] [ 119s] [COMPILING libboard/qmod/source/wwan_led.c] [ 119s] [COMPILING libboard/qmod/source/i2c.c] [ 119s] [COMPILING libboard/qmod/source/board_qmod.c] [ 119s] [COMPILING apps/dfu/main.c] [ 119s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 119s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 119s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 120s] Memory region Used Size Region Size %age Used [ 120s] rom: 16588 B16 KB101.25% [ 120s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 120s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 120s] collect2: error: ld returned 1 exit status [ 120s] % [ 120s] make[2]: *** [Makefile:234: flash] Error 1 [ 120s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 120s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 120s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 120s] dh_auto_build: error: make -j1 returned exit code 2 [ 120s] make: *** [debian/rules:16: build] Error 25 [ 120s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 120s] ### VM INTERACTION START ### [ 123s] [ 114.519909] sysrq: Power Off [ 123s] [ 114.526053] reboot: Power down [ 123s] ### VM INTERACTION END ### [ 123s] [ 123s] goat09 failed "build simtrace2_0.7.0.69.aadd.dsc" at Thu Jan 21 03:03:37 UTC 2021. [ 123s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 169s] [COMPILING apps/dfu/main.c] [ 170s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 170s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 170s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 170s] Memory region Used Size Region Size %age Used [ 170s] rom: 16580 B16 KB101.20% [ 170s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 170s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 170s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 170s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 170s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 170s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 170s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 170s] collect2: error: ld returned 1 exit status [ 170s] % [ 170s] make[2]: *** [Makefile:234: flash] Error 1 [ 170s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 170s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 170s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 170s] dh_auto_build: error: make -j1 returned exit code 2 [ 170s] make: *** [debian/rules:16: build] Error 25 [ 170s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 170s] ### VM INTERACTION START ### [ 173s] [ 160.527918] sysrq: Power Off [ 173s] [ 160.532820] reboot: Power down [ 173s] ### VM INTERACTION END ### [ 173s] [ 173s] lamb61 failed "build simtrace2_0.7.0.69.aadd.dsc" at Thu Jan 21 02:55:01 UTC 2021. [ 173s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 352s] Makefile:2098: recipe for target 'gb/gprs_ns2_test.o' failed [ 352s] make[6]: *** [gb/gprs_ns2_test.o] Error 1 [ 352s] make[6]: Leaving directory '/usr/src/packages/BUILD/tests' [ 352s] Makefile:2303: recipe for target 'check-am' failed [ 352s] make[5]: *** [check-am] Error 2 [ 352s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 352s] Makefile:2306: recipe for target 'check' failed [ 352s] make[4]: *** [check] Error 2 [ 352s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 352s] Makefile:693: recipe for target 'check-recursive' failed [ 352s] make[3]: *** [check-recursive] Error 1 [ 352s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 352s] Makefile:984: recipe for target 'check' failed [ 352s] make[2]: *** [check] Error 2 [ 352s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 352s] dh_auto_test: make -j1 check returned exit code 2 [ 352s] debian/rules:26: recipe for target 'override_dh_auto_test' failed [ 352s] make[1]: *** [override_dh_auto_test] Error 1 [ 352s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 352s] debian/rules:15: recipe for target 'build' failed [ 352s] make: *** [build] Error 2 [ 352s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 352s] ### VM INTERACTION START ### [ 353s] Powering off. [ 353s] [ 343.555656] reboot: Power down [ 353s] ### VM INTERACTION END ### [ 353s] [ 353s] lamb59 failed "build libosmocore_1.4.0.394.9c1e.dsc" at Thu Jan 21 01:39:31 UTC 2021. [ 353s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 256s] Makefile:2098: recipe for target 'gb/gprs_ns2_test.o' failed [ 256s] make[6]: *** [gb/gprs_ns2_test.o] Error 1 [ 256s] make[6]: Leaving directory '/usr/src/packages/BUILD/tests' [ 256s] Makefile:2303: recipe for target 'check-am' failed [ 256s] make[5]: *** [check-am] Error 2 [ 256s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 256s] Makefile:2306: recipe for target 'check' failed [ 256s] make[4]: *** [check] Error 2 [ 256s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 256s] Makefile:693: recipe for target 'check-recursive' failed [ 256s] make[3]: *** [check-recursive] Error 1 [ 256s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 256s] Makefile:984: recipe for target 'check' failed [ 256s] make[2]: *** [check] Error 2 [ 256s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 256s] dh_auto_test: make -j1 check returned exit code 2 [ 256s] debian/rules:26: recipe for target 'override_dh_auto_test' failed [ 256s] make[1]: *** [override_dh_auto_test] Error 1 [ 256s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 256s] debian/rules:15: recipe for target 'build' failed [ 256s] make: *** [build] Error 2 [ 256s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 256s] ### VM INTERACTION START ### [ 257s] Powering off. [ 257s] [ 250.986861] reboot: Power down [ 257s] ### VM INTERACTION END ### [ 257s] [ 257s] build84 failed "build libosmocore_1.4.0.394.9c1e.dsc" at Thu Jan 21 01:34:42 UTC 2021. [ 257s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-trx[master]: Transceiver: fix integer division in addRadioVector()
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22350 ) Change subject: Transceiver: fix integer division in addRadioVector() .. Patch Set 1: Code-Review+1 There is this great interactive c++ shell that can be used to learn stuff like casts called "cling": https://root.cern/cling/ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I85b1063f57f630d90c6da32827bec4a05afc6514 Gerrit-Change-Number: 22350 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 21 Jan 2021 00:01:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_vc_fsm: fix nullpointer dereference when sending uintdata
lynxis lazus has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22349 )
Change subject: gprs_ns2_vc_fsm: fix nullpointer dereference when sending
uintdata
..
Patch Set 1:
(1 comment)
https://gerrit.osmocom.org/c/libosmocore/+/22349/1/src/gb/gprs_ns2_vc_fsm.c
File src/gb/gprs_ns2_vc_fsm.c:
https://gerrit.osmocom.org/c/libosmocore/+/22349/1/src/gb/gprs_ns2_vc_fsm.c@765
PS1, Line 765: if (!tp) {
do OSMO_ASSERT(tp). A NULL tp should never happen except for UNITDATA. Only
UNITDATA is special.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22349
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I7d7c95604ba4af4ed4b6019f1d432970225f8d7a
Gerrit-Change-Number: 22349
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: lynxis lazus
Gerrit-Comment-Date: Wed, 20 Jan 2021 23:57:12 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in osmo-trx[master]: Transceiver: fix integer division in addRadioVector()
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/22350 ) Change subject: Transceiver: fix integer division in addRadioVector() .. Transceiver: fix integer division in addRadioVector() By default, C/C++ compiler does assume integer division. The lack of explicit cast to 'double' causes the transceiver to ignore non-decimal attenuation values (x % 10 > 0): txFullScale * 10 ^ ( -3 / 10) == txFullScale * 10 ^ 0 == txFullScale * 1.0 txFullScale * 10 ^ ( -8 / 10) == txFullScale * 10 ^ 0 == txFullScale * 1.0 txFullScale * 10 ^ (-10 / 10) == txFullScale * 10 ^ -1 == txFullScale * 0.1 txFullScale * 10 ^ (-18 / 10) == txFullScale * 10 ^ -1 == txFullScale * 0.1 Change-Id: I85b1063f57f630d90c6da32827bec4a05afc6514 Related: SYS#4918 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/50/22350/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 9c93e98..3188c70 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -396,7 +396,7 @@ else burst = modulateBurst(bits, 8 + (wTime.TN() % 4 == 0), cfg->tx_sps); - scaleVector(*burst, txFullScale * pow(10, -RSSI / 10)); + scaleVector(*burst, txFullScale * pow(10, (double) -RSSI / 10)); radio_burst = new radioVector(wTime, burst); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I85b1063f57f630d90c6da32827bec4a05afc6514 Gerrit-Change-Number: 22350 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in libosmocore[master]: logging_vty: Fix saving of "logging print file .. last"
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22341 ) Change subject: logging_vty: Fix saving of "logging print file .. last" .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7b6245256aecc425722242aaabc154ac58ba27a0 Gerrit-Change-Number: 22341 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 23:01:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: Add vty command to show summary of all or filtered subscribers
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/22311 to look at the new patch set (#11). Change subject: Add vty command to show summary of all or filtered subscribers .. Add vty command to show summary of all or filtered subscribers Adds the following commands: show subscribers all - Display summary of all entries in HLR show subscribers (imsi|msisdn|cs|ps) ... As above but filter on search field/string show subscribers last seen - Display only subscribers with data in Last LU update field, and sorts by Last LU. Change-Id: I7f0573381a6d0d13841ac6d42d50f0e8389decf4 --- M include/osmocom/hlr/db.h M src/db.c M src/db_hlr.c M src/hlr_vty_subscr.c M tests/test_nodes.vty 5 files changed, 228 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/22311/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7f0573381a6d0d13841ac6d42d50f0e8389decf4 Gerrit-Change-Number: 22311 Gerrit-PatchSet: 11 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: neels Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: vty: add expert commands for MS/BS power control
Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22348 to look at the new patch set (#2). Change subject: vty: add expert commands for MS/BS power control .. vty: add expert commands for MS/BS power control These new commands are useful for debugging MS/BS power control loops, e.g. one can change power control mode, overwrite the current BS power reduction or MS power level at run-time. Change-Id: I1ebb033b02c2bc3b1fa7de874e0035a07297f266 Related: SYS#4918 --- M src/common/vty.c 1 file changed, 76 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/22348/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1ebb033b02c2bc3b1fa7de874e0035a07297f266 Gerrit-Change-Number: 22348 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: vty: make commands related to the loopback mode hidden
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22347 to look at the new patch set (#2). Change subject: vty: make commands related to the loopback mode hidden .. vty: make commands related to the loopback mode hidden The loopback mode was added for testing, and may be dangerous if enabled in production. Let's make it appear only in expert mode. Change-Id: I3f68acd7f2b0231f78516f59fb5e8ef56fb69dbf --- M src/common/vty.c 1 file changed, 10 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/22347/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3f68acd7f2b0231f78516f59fb5e8ef56fb69dbf Gerrit-Change-Number: 22347 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: Add vty command to show summary of all or filtered subscribers
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/22311 to look at the new patch set (#10). Change subject: Add vty command to show summary of all or filtered subscribers .. Add vty command to show summary of all or filtered subscribers Adds the following commands: show subscribers all - Display summary of all entries in HLR show subscribers (imsi|msisdn|cs|ps) ... As above but filter on search field/string show subscribers last seen - Display only subscribers with data in Last LU update field, and sorts by Last LU. Change-Id: I7f0573381a6d0d13841ac6d42d50f0e8389decf4 --- M include/osmocom/hlr/db.h M src/db.c M src/db_hlr.c M src/hlr_vty_subscr.c M tests/test_nodes.vty 5 files changed, 230 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/22311/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7f0573381a6d0d13841ac6d42d50f0e8389decf4 Gerrit-Change-Number: 22311 Gerrit-PatchSet: 10 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: neels Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: vty: make commands related to the loopback mode hidden
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22347 ) Change subject: vty: make commands related to the loopback mode hidden .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/22347/1/src/common/vty.c File src/common/vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/22347/1/src/common/vty.c@2014 PS1, Line 2014: CMD_ATTR_IMMEDIATE > I think the IMMEDIATE is bogus, as this is not a configuration command. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3f68acd7f2b0231f78516f59fb5e8ef56fb69dbf Gerrit-Change-Number: 22347 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 20 Jan 2021 22:52:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-hlr[master]: Add vty command to show summary of all or filtered subscribers
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/22311 ) Change subject: Add vty command to show summary of all or filtered subscribers .. Patch Set 9: (7 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/db_hlr.c@629 PS7, Line 629: > there is no vty argument in below function Done https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/db_hlr.c@633 PS7, Line 633: > meh, sorry. forgot to update these.. Done https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@232 PS7, Line 232: vty_out(vty, "- -"); : if (show_ls) : vty_out(vty, " "); : vty_out_newline(vty); : vty_out(vty, "ID MSISDNIMSI IMEI NAM"); : if (show_ls) : vty_out(vty, "LAST SEEN"); : vty_out_newline(vty); > yes, please go for that function, if required with reversed lines. […] Done https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@251 PS7, Line 251: SUBSCR_SHOW_HELP > works for me. Ack https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@305 PS7, Line 305: SHOW_STR SUBSCRS_SHOW_HELP "Show summary of subscribers with filter\n" : "Filter by IMSI\n" "Filter by MSISDN\n" "String to match in msisdn or imsi\n") > My understanding of the existing logic (the code before I edited it) was that > anything appearing mor […] Ack https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@320 PS7, Line 320: > This doesn't make sense: […] Done https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@323 PS7, Line 323: last seen > I personally don't think there are other tokens after last and hence would > like to see last-seen. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7f0573381a6d0d13841ac6d42d50f0e8389decf4 Gerrit-Change-Number: 22311 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: neels Gerrit-Comment-Date: Wed, 20 Jan 2021 22:52:51 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: keith Gerrit-MessageType: comment
Change in osmo-hlr[master]: Add vty command to show summary of all or filtered subscribers
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/22311 to look at the new patch set (#9). Change subject: Add vty command to show summary of all or filtered subscribers .. Add vty command to show summary of all or filtered subscribers Adds the following commands: show subscribers all - Display summary of all entries in HLR show subscribers (imsi|msisdn|cs|ps) ... As above but filter on search field/string show subscribers last seen - Display only subscribers with data in Last LU update field, and sorts by Last LU. Change-Id: I7f0573381a6d0d13841ac6d42d50f0e8389decf4 --- M include/osmocom/hlr/db.h M src/db.c M src/db_hlr.c M src/hlr_vty_subscr.c M tests/test_nodes.vty 5 files changed, 230 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/22311/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7f0573381a6d0d13841ac6d42d50f0e8389decf4 Gerrit-Change-Number: 22311 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: neels Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gprs_ns2_vc_fsm: fix nullpointer dereference when sending uintdata
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/22349 )
Change subject: gprs_ns2_vc_fsm: fix nullpointer dereference when sending
uintdata
..
gprs_ns2_vc_fsm: fix nullpointer dereference when sending uintdata
the function gprs_ns2_vc_rx() is called from gprs_ns2.c with tp=NULL.
This leads into a null pointer dereference because gprs_ns2_vc_rx() is
accessing tp several times. tp is also handed up into the FSM, with the
exception of unitdata. Apparently for unitdata tp does not exist, so we
can move up the part where unitdata is handed up into the FSM and after
that we can check if tp is NULL to make sure the code which is accessing
it is not executed.
Change-Id: I7d7c95604ba4af4ed4b6019f1d432970225f8d7a
---
M src/gb/gprs_ns2_vc_fsm.c
1 file changed, 12 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/49/22349/1
diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index d4f4320..7ea7192 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -756,6 +756,18 @@
* if not answer STATUS with "NS-VC unknown" */
/* TODO: handle BLOCK/UNBLOCK/ALIVE with different VCI */
+ if (nsh->pdu_type == NS_PDUT_UNITDATA) {
+ /* UNITDATA have to free msg because it might send the msg
layer upwards */
+ osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_UNITDATA, msg);
+ return 0;
+ }
+
+ if (!tp) {
+ LOGPFSML(fi, LOGL_ERROR, "NSEI=%u Rx %s without TLV IEs\n",
nsvc->nse->nsei,
+get_value_string(gprs_ns_pdu_strings, nsh->pdu_type));
+ goto out;
+ }
+
if (gprs_ns2_validate(nsvc, nsh->pdu_type, msg, tp, )) {
if (nsh->pdu_type != NS_PDUT_STATUS) {
rc = ns2_tx_status(nsvc, cause, 0, msg);
@@ -814,10 +826,6 @@
case NS_PDUT_ALIVE_ACK:
osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_ALIVE_ACK, tp);
break;
- case NS_PDUT_UNITDATA:
- /* UNITDATA have to free msg because it might send the msg
layer upwards */
- osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_UNITDATA, msg);
- return 0;
default:
LOGPFSML(fi, LOGL_ERROR, "NSEI=%u Rx unknown NS PDU type %s\n",
nsvc->nse->nsei,
get_value_string(gprs_ns_pdu_strings, nsh->pdu_type));
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22349
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I7d7c95604ba4af4ed4b6019f1d432970225f8d7a
Gerrit-Change-Number: 22349
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
Change in osmo-hlr[master]: Add vty command to show summary of all or filtered subscribers
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/22311 to look at the new patch set (#8). Change subject: Add vty command to show summary of all or filtered subscribers .. Add vty command to show summary of all or filtered subscribers Adds the following commands: show subscribers all - Display summary of all entries in HLR show subscribers (imsi|msisdn|cs|ps) ... As above but filter on search field/string show subscribers last seen - Display only subscribers with data in Last LU update field, and sorts by Last LU. Change-Id: I7f0573381a6d0d13841ac6d42d50f0e8389decf4 --- M include/osmocom/hlr/db.h M src/db.c M src/db_hlr.c M src/hlr_vty_subscr.c M tests/test_nodes.vty 5 files changed, 230 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/22311/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7f0573381a6d0d13841ac6d42d50f0e8389decf4 Gerrit-Change-Number: 22311 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: neels Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: vty: add expert commands for MS/BS power control
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22348 ) Change subject: vty: add expert commands for MS/BS power control .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1ebb033b02c2bc3b1fa7de874e0035a07297f266 Gerrit-Change-Number: 22348 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 20 Jan 2021 22:07:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: vty: make commands related to the loopback mode hidden
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22347 ) Change subject: vty: make commands related to the loopback mode hidden .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/22347/1/src/common/vty.c File src/common/vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/22347/1/src/common/vty.c@2014 PS1, Line 2014: CMD_ATTR_IMMEDIATE I think the IMMEDIATE is bogus, as this is not a configuration command. Anything that's outside of CONFIG_NODE by definition is always immediate, right? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3f68acd7f2b0231f78516f59fb5e8ef56fb69dbf Gerrit-Change-Number: 22347 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 20 Jan 2021 22:07:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: vty: extend trx / lchan number range in BTS_T_T_L_CMD
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22346 ) Change subject: vty: extend trx / lchan number range in BTS_T_T_L_CMD .. vty: extend trx / lchan number range in BTS_T_T_L_CMD Change-Id: I8d8a4c46909daa0f2682d9662db8dffb4fbd8422 --- M src/common/vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/vty.c b/src/common/vty.c index 09c0a98..846ba4a 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1793,7 +1793,7 @@ } #define BTS_T_T_L_CMD \ - "bts <0-0> trx <0-0> ts <0-7> lchan <0-1>" + "bts <0-0> trx <0-255> ts <0-7> lchan <0-7>" #define BTS_T_T_L_STR \ "BTS related commands\n"\ "BTS number\n" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d8a4c46909daa0f2682d9662db8dffb4fbd8422 Gerrit-Change-Number: 22346 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: vty: add macro for 'bts <0-0> trx <0-0> ts <0-7> lchan <0-1>'
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/22345 )
Change subject: vty: add macro for 'bts <0-0> trx <0-0> ts <0-7> lchan <0-1>'
..
vty: add macro for 'bts <0-0> trx <0-0> ts <0-7> lchan <0-1>'
Change-Id: If8e1ee87366a0d301e21161f2d9ddde8383cb744
---
M src/common/vty.c
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/common/vty.c b/src/common/vty.c
index a0ebfae..09c0a98 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1792,6 +1792,8 @@
return >lchan[lchan_nr];
}
+#define BTS_T_T_L_CMD \
+ "bts <0-0> trx <0-0> ts <0-7> lchan <0-1>"
#define BTS_T_T_L_STR \
"BTS related commands\n"\
"BTS number\n" \
@@ -1955,7 +1957,7 @@
DEFUN(bts_t_t_l_jitter_buf,
bts_t_t_l_jitter_buf_cmd,
- "bts <0-0> trx <0-0> ts <0-7> lchan <0-1> rtp jitter-buffer <0-1>",
+ BTS_T_T_L_CMD " rtp jitter-buffer <0-1>",
BTS_T_T_L_STR "RTP settings\n"
"Jitter buffer\n" "Size of jitter buffer in (ms)\n")
{
@@ -1988,7 +1990,7 @@
DEFUN(bts_t_t_l_loopback,
bts_t_t_l_loopback_cmd,
- "bts <0-0> trx <0-0> ts <0-7> lchan <0-1> loopback",
+ BTS_T_T_L_CMD " loopback",
BTS_T_T_L_STR "Set loopback\n")
{
struct gsm_network *net = gsmnet_from_vty(vty);
@@ -2006,7 +2008,7 @@
DEFUN(no_bts_t_t_l_loopback,
no_bts_t_t_l_loopback_cmd,
- "no bts <0-0> trx <0-0> ts <0-7> lchan <0-1> loopback",
+ "no " BTS_T_T_L_CMD " loopback",
NO_STR BTS_T_T_L_STR "Set loopback\n")
{
struct gsm_network *net = gsmnet_from_vty(vty);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22345
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: If8e1ee87366a0d301e21161f2d9ddde8383cb744
Gerrit-Change-Number: 22345
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-bts[master]: vty: fix error messages in lchan specific commands
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/22344 )
Change subject: vty: fix error messages in lchan specific commands
..
vty: fix error messages in lchan specific commands
Change-Id: Ic0fba0605fc8a3ffa044f65fdad03b95e7cd8331
---
M src/common/vty.c
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/common/vty.c b/src/common/vty.c
index 689ae58..a0ebfae 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1965,7 +1965,7 @@
lchan = resolve_lchan(net, argv, 0);
if (!lchan) {
- vty_out(vty, "%% can't find BTS%s", VTY_NEWLINE);
+ vty_out(vty, "%% Could not resolve logical channel%s",
VTY_NEWLINE);
return CMD_WARNING;
}
if (!lchan->abis_ip.rtp_socket) {
@@ -1996,7 +1996,7 @@
lchan = resolve_lchan(net, argv, 0);
if (!lchan) {
- vty_out(vty, "%% can't find BTS%s", VTY_NEWLINE);
+ vty_out(vty, "%% Could not resolve logical channel%s",
VTY_NEWLINE);
return CMD_WARNING;
}
lchan->loopback = 1;
@@ -2014,7 +2014,7 @@
lchan = resolve_lchan(net, argv, 0);
if (!lchan) {
- vty_out(vty, "%% can't find BTS%s", VTY_NEWLINE);
+ vty_out(vty, "%% Could not resolve logical channel%s",
VTY_NEWLINE);
return CMD_WARNING;
}
lchan->loopback = 0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22344
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ic0fba0605fc8a3ffa044f65fdad03b95e7cd8331
Gerrit-Change-Number: 22344
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-bts[master]: vty: extend trx / lchan number range in BTS_T_T_L_CMD
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22346 ) Change subject: vty: extend trx / lchan number range in BTS_T_T_L_CMD .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d8a4c46909daa0f2682d9662db8dffb4fbd8422 Gerrit-Change-Number: 22346 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Jan 2021 22:06:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: vty: add macro for 'bts <0-0> trx <0-0> ts <0-7> lchan <0-1>'
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22345 ) Change subject: vty: add macro for 'bts <0-0> trx <0-0> ts <0-7> lchan <0-1>' .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If8e1ee87366a0d301e21161f2d9ddde8383cb744 Gerrit-Change-Number: 22345 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Jan 2021 22:05:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: vty: fix error messages in lchan specific commands
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22344 ) Change subject: vty: fix error messages in lchan specific commands .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic0fba0605fc8a3ffa044f65fdad03b95e7cd8331 Gerrit-Change-Number: 22344 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Jan 2021 22:05:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: power_control: fix: properly print 'delta' applied to attenuation
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22118 ) Change subject: power_control: fix: properly print 'delta' applied to attenuation .. power_control: fix: properly print 'delta' applied to attenuation Change-Id: I178df05c1a4cb982279b21d07bd69f75b44928da Related: SYS#4918 --- M src/common/power_control.c M tests/power/bs_power_loop_test.err 2 files changed, 32 insertions(+), 32 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/power_control.c b/src/common/power_control.c index 97baeb7..2948861 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -321,7 +321,7 @@ "%u -> %u dB (maximum %u dB, delta %d dB, " "RxLev current %u (%d dBm), thresholds %u .. %u)\n", state->current, new, state->max, - delta, rxlev, rxlev2dbm(rxlev), + -delta, rxlev, rxlev2dbm(rxlev), params->rxlev_meas.lower_thresh, params->rxlev_meas.upper_thresh); state->current = new; @@ -331,7 +331,7 @@ "at %u dB (maximum %u dB, delta %d dB, " "RxLev current %u (%d dBm), thresholds %u .. %u)\n", state->current, state->max, - delta, rxlev, rxlev2dbm(rxlev), + -delta, rxlev, rxlev2dbm(rxlev), params->rxlev_meas.lower_thresh, params->rxlev_meas.upper_thresh); return 0; diff --git a/tests/power/bs_power_loop_test.err b/tests/power/bs_power_loop_test.err index db02199..2b1e0a9 100644 --- a/tests/power/bs_power_loop_test.err +++ b/tests/power/bs_power_loop_test.err @@ -7,43 +7,43 @@ (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0), DTx is disabled => using FULL (bts=0,trx=0,ts=0,ss=0) Keeping Downlink attenuation at 0 dB (maximum 20 dB, delta 0 dB, RxLev current 30 (-80 dBm), thresholds 30 .. 30) (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL -(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 0 -> 2 dB (maximum 20 dB, delta -2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 0 -> 2 dB (maximum 20 dB, delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL -(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 2 -> 4 dB (maximum 20 dB, delta -2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 2 -> 4 dB (maximum 20 dB, delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL -(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 4 -> 6 dB (maximum 20 dB, delta -2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 4 -> 6 dB (maximum 20 dB, delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL -(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 6 -> 8 dB (maximum 20 dB, delta -2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 6 -> 8 dB (maximum 20 dB, delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL -(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 8 -> 10 dB (maximum 20 dB, delta -2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 8 -> 10 dB (maximum 20 dB, delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL -(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 10 -> 12 dB (maximum 20 dB, delta -2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 10 -> 12 dB (maximum 20 dB, delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60),
Change in osmo-bts[master]: power_control: print current RxLev and lower/upper thresholds
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/22117 )
Change subject: power_control: print current RxLev and lower/upper thresholds
..
power_control: print current RxLev and lower/upper thresholds
This makes the logging messages easier to read and understand.
Change-Id: I5f8c987054b2b01acdb9f525d06ca15bbc577070
Related: SYS#4918
---
M src/common/power_control.c
M tests/power/bs_power_loop_test.err
2 files changed, 65 insertions(+), 60 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/common/power_control.c b/src/common/power_control.c
index 6620add..97baeb7 100644
--- a/src/common/power_control.c
+++ b/src/common/power_control.c
@@ -316,19 +316,24 @@
if (new < 0)
new = 0;
- /* FIXME: this is only needed for logging, print thresholds instead */
- int target_dbm = rxlev2dbm(CALC_TARGET(params->rxlev_meas));
-
if (state->current != new) {
LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Changing Downlink
attenuation: "
- "%u -> %u dB (maximum %u dB, target %d dBm, delta %d
dB)\n",
- state->current, new, state->max, target_dbm, delta);
+ "%u -> %u dB (maximum %u dB, delta %d dB, "
+ "RxLev current %u (%d dBm), thresholds %u .. %u)\n",
+ state->current, new, state->max,
+ delta, rxlev, rxlev2dbm(rxlev),
+ params->rxlev_meas.lower_thresh,
+ params->rxlev_meas.upper_thresh);
state->current = new;
return 1;
} else {
LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping Downlink
attenuation "
- "at %u dB (maximum %u dB, target %d dBm, delta %d
dB)\n",
- state->current, state->max, target_dbm, delta);
+ "at %u dB (maximum %u dB, delta %d dB, "
+ "RxLev current %u (%d dBm), thresholds %u .. %u)\n",
+ state->current, state->max,
+ delta, rxlev, rxlev2dbm(rxlev),
+ params->rxlev_meas.lower_thresh,
+ params->rxlev_meas.upper_thresh);
return 0;
}
}
diff --git a/tests/power/bs_power_loop_test.err
b/tests/power/bs_power_loop_test.err
index e7ba310..db02199 100644
--- a/tests/power/bs_power_loop_test.err
+++ b/tests/power/bs_power_loop_test.err
@@ -1,69 +1,69 @@
(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(30),
RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0), DTx is disabled => using FULL
-(bts=0,trx=0,ts=0,ss=0) Keeping Downlink attenuation at 0 dB (maximum 20 dB,
target -80 dBm, delta 0 dB)
+(bts=0,trx=0,ts=0,ss=0) Keeping Downlink attenuation at 0 dB (maximum 20 dB,
delta 0 dB, RxLev current 30 (-80 dBm), thresholds 30 .. 30)
(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(30),
RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0), DTx is disabled => using FULL
-(bts=0,trx=0,ts=0,ss=0) Keeping Downlink attenuation at 0 dB (maximum 20 dB,
target -80 dBm, delta 0 dB)
+(bts=0,trx=0,ts=0,ss=0) Keeping Downlink attenuation at 0 dB (maximum 20 dB,
delta 0 dB, RxLev current 30 (-80 dBm), thresholds 30 .. 30)
(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(30),
RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0), DTx is disabled => using FULL
-(bts=0,trx=0,ts=0,ss=0) Keeping Downlink attenuation at 0 dB (maximum 20 dB,
target -80 dBm, delta 0 dB)
+(bts=0,trx=0,ts=0,ss=0) Keeping Downlink attenuation at 0 dB (maximum 20 dB,
delta 0 dB, RxLev current 30 (-80 dBm), thresholds 30 .. 30)
(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(30),
RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0), DTx is disabled => using FULL
-(bts=0,trx=0,ts=0,ss=0) Keeping Downlink attenuation at 0 dB (maximum 20 dB,
target -80 dBm, delta 0 dB)
+(bts=0,trx=0,ts=0,ss=0) Keeping Downlink attenuation at 0 dB (maximum 20 dB,
delta 0 dB, RxLev current 30 (-80 dBm), thresholds 30 .. 30)
(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60),
RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL
-(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 0 -> 2 dB (maximum 20
dB, target -80 dBm, delta -2 dB)
+(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 0 -> 2 dB (maximum 20
dB, delta -2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30)
(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60),
RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL
-(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 2 -> 4 dB (maximum 20
dB, target -80 dBm, delta -2 dB)
+(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 2 -> 4 dB
Change in osmo-bts[master]: power_control: print current RxLev and lower/upper thresholds
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22117 ) Change subject: power_control: print current RxLev and lower/upper thresholds .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5f8c987054b2b01acdb9f525d06ca15bbc577070 Gerrit-Change-Number: 22117 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 22:04:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: Introduce NS test cases
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22091 ) Change subject: Introduce NS test cases .. Patch Set 9: yay, more low-level tests! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic619a374b88879d3116f8f28afb14401c3e3192b Gerrit-Change-Number: 22091 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Jan 2021 22:04:23 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: Introduce NS test cases
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22091 ) Change subject: Introduce NS test cases .. Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic619a374b88879d3116f8f28afb14401c3e3192b Gerrit-Change-Number: 22091 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Jan 2021 22:04:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE .. Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_frgre.c File src/gb/gprs_ns2_frgre.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_frgre.c@572 PS2, Line 572: 1500 I think this changes from current behavior. I think the old code would simply IP-fragment, which is actually intended in that situation. What matters here is not the MTU of the Ethernet device, but what kind of UDP packet payload size we can transmit. https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_internal.h File src/gb/gprs_ns2_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_internal.h@240 PS2, Line 240: is there a reason to use a signed value? like negative having a special meaning? If yes, please docuemnt in comment, if not I'd suggest unsigned int. https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_udp.c File src/gb/gprs_ns2_udp.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_udp.c@121 PS2, Line 121: int also here I'm not sure if we really should worry about the MTU of the ethernet. In the end, we have potentially larger BSSGP frames and there is no way to influence the size of the upper layer frames. Think of a PDP context with MTU 1500 (or close to that), plus the LLC, SNDCP, BSSGP overhead -> boom. Yes, we may end up generating IP fragments. But then, the bandwidth of GPRS is ultra low, so what do we care about some more packets in the core network over wired interfaces that likely have more than a thousand time more bandwidth than our radio interface. If we enforce staying within the MTU of the ethernet device, we would start dropping packets with no way to inform this up the protocol stack so that the LLC/SNDCP XID exchange could negotiate smaller packet sizes. - i.e. we'd effectively break the network completely. I think the only situation wherer the MTU matters is in the case of FR, where we have a fixed, well-known MTU and no support from the transport (FR) to do segmentation / fragmentation by itself. Luckily it's 1600, and hence we do have some room for BSSGP/LLC/SNDCP overhead -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Jan 2021 22:02:36 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: Add vty command to show summary of all or filtered subscribers
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/22311 ) Change subject: Add vty command to show summary of all or filtered subscribers .. Patch Set 7: (4 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@232 PS7, Line 232: vty_out(vty, "- -"); : if (show_ls) : vty_out(vty, " "); : vty_out_newline(vty); : vty_out(vty, "ID MSISDNIMSI IMEI NAM"); : if (show_ls) : vty_out(vty, "LAST SEEN"); : vty_out_newline(vty); > Well, it is and it isn't... the first one has the text above the lines.. the > footer is reversed. […] yes, please go for that function, if required with reversed lines. Or two separate functions that you call in different order. I just don't want to see those strings copy+pasted at two locations. https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@251 PS7, Line 251: SUBSCR_SHOW_HELP > Yeah, I think this can be optimised more, but I was not sure as it does get > hard to read. works for me. https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@320 PS7, Line 320: > Ah, I messed up somewhere.. […] This doesn't make sense: show -> SHOW_STR subscribers -> SUBSCR_SHOW_HELP cs -> Show summary of all Subscribers ps -> Show Subscribers with NAM CS In/active on -> Show Subscribers with NAM PS In/active\n" off -> no help even if you remove the "Show summary of all Subscribers" string (it is not "all", after all) then still you are missing the ON/OFF help. https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@323 PS7, Line 323: last seen > Yes. […] I personally don't think there are other tokens after last and hence would like to see last-seen. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7f0573381a6d0d13841ac6d42d50f0e8389decf4 Gerrit-Change-Number: 22311 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: neels Gerrit-Comment-Date: Wed, 20 Jan 2021 21:55:39 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: keith Gerrit-MessageType: comment
Change in osmo-bts[master]: vty: add expert commands for MS/BS power control
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/22348 )
Change subject: vty: add expert commands for MS/BS power control
..
vty: add expert commands for MS/BS power control
These new commands are useful for debugging MS/BS power control
loops, e.g. one can change power control mode, overwrite the
current BS power reduction or MS power level at run-time.
Change-Id: I1ebb033b02c2bc3b1fa7de874e0035a07297f266
Related: SYS#4918
---
M src/common/vty.c
1 file changed, 76 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/22348/1
diff --git a/src/common/vty.c b/src/common/vty.c
index fd8b3c8..636f205 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -2026,6 +2026,80 @@
return CMD_SUCCESS;
}
+#define LCHAN_PWR_CTRL_CMD \
+ BTS_T_T_L_CMD " (bs-power-ctrl|ms-power-ctrl)"
+#define LCHAN_PWR_CTRL_STR \
+ BTS_T_T_L_STR "BS power control\n" "MS power control\n"
+
+DEFUN_ATTR(bts_t_t_l_power_ctrl_mode,
+ bts_t_t_l_power_ctrl_mode_cmd,
+ LCHAN_PWR_CTRL_CMD " mode (static|dynamic)",
+ LCHAN_PWR_CTRL_STR "Change power control mode\n"
+ "Disable the power control loop\n"
+ "Enable the power control loop\n",
+ CMD_ATTR_HIDDEN | CMD_ATTR_IMMEDIATE)
+{
+ struct gsm_network *net = gsmnet_from_vty(vty);
+ const struct gsm_power_ctrl_params *params;
+ struct lchan_power_ctrl_state *state;
+ const char **args = argv + 4;
+ struct gsm_lchan *lchan;
+
+ lchan = resolve_lchan(net, argv, 0);
+ if (!lchan) {
+ vty_out(vty, "%% Could not resolve logical channel%s",
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ if (strcmp(args[0], "bs-power-ctrl") == 0) {
+ params = >bs_dpc_params;
+ state = >bs_power_ctrl;
+ } else { /* ms-power-ctrl */
+ params = >ms_dpc_params;
+ state = >ms_power_ctrl;
+ }
+
+ if (strcmp(args[1], "dynamic") == 0)
+ state->dpc_params = params;
+ else
+ state->dpc_params = NULL;
+
+ return CMD_SUCCESS;
+}
+
+DEFUN_ATTR(bts_t_t_l_power_ctrl_current_max,
+ bts_t_t_l_power_ctrl_current_max_cmd,
+ LCHAN_PWR_CTRL_CMD " value (current|max) <0-255>",
+ LCHAN_PWR_CTRL_STR "Change current power value\n"
+ "Current value (for both dynamic and static modes)\n"
+ "Maximum value (for dynamic mode only)\n"
+ "BS power reduction (in dB) or MS power level\n",
+ CMD_ATTR_HIDDEN | CMD_ATTR_IMMEDIATE)
+{
+ struct gsm_network *net = gsmnet_from_vty(vty);
+ struct lchan_power_ctrl_state *state;
+ const char **args = argv + 4;
+ struct gsm_lchan *lchan;
+
+ lchan = resolve_lchan(net, argv, 0);
+ if (!lchan) {
+ vty_out(vty, "%% Could not resolve logical channel%s",
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ if (strcmp(args[0], "bs-power-ctrl") == 0)
+ state = >bs_power_ctrl;
+ else /* ms-power-ctrl */
+ state = >ms_power_ctrl;
+
+ if (strcmp(args[1], "current") == 0)
+ state->current = atoi(args[2]);
+ else
+ state->max = atoi(args[2]);
+
+ return CMD_SUCCESS;
+}
+
DEFUN(logging_fltr_l1_sapi, logging_fltr_l1_sapi_cmd, "HIDDEN", "HIDDEN")
{
int sapi = get_string_value(l1sap_common_sapi_names, argv[0]);
@@ -2155,6 +2229,8 @@
install_element(ENABLE_NODE, _t_t_l_jitter_buf_cmd);
install_element(ENABLE_NODE, _t_t_l_loopback_cmd);
install_element(ENABLE_NODE, _bts_t_t_l_loopback_cmd);
+ install_element(ENABLE_NODE, _t_t_l_power_ctrl_mode_cmd);
+ install_element(ENABLE_NODE, _t_t_l_power_ctrl_current_max_cmd);
install_element(ENABLE_NODE, _send_failure_event_report_cmd);
install_element(ENABLE_NODE, _link_timeout_cmd);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22348
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I1ebb033b02c2bc3b1fa7de874e0035a07297f266
Gerrit-Change-Number: 22348
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: vty: make commands related to the loopback mode hidden
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/22347 )
Change subject: vty: make commands related to the loopback mode hidden
..
vty: make commands related to the loopback mode hidden
The loopback mode was added for testing, and may be dangerous if
enabled in production. Let's make it appear only in hidden mode,
and take this chance to indicate that it applies immediately.
Change-Id: I3f68acd7f2b0231f78516f59fb5e8ef56fb69dbf
---
M src/common/vty.c
1 file changed, 10 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/22347/1
diff --git a/src/common/vty.c b/src/common/vty.c
index 846ba4a..fd8b3c8 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1988,10 +1988,11 @@
return CMD_SUCCESS;
}
-DEFUN(bts_t_t_l_loopback,
- bts_t_t_l_loopback_cmd,
- BTS_T_T_L_CMD " loopback",
- BTS_T_T_L_STR "Set loopback\n")
+DEFUN_ATTR(bts_t_t_l_loopback,
+ bts_t_t_l_loopback_cmd,
+ BTS_T_T_L_CMD " loopback",
+ BTS_T_T_L_STR "Set loopback\n",
+ CMD_ATTR_HIDDEN | CMD_ATTR_IMMEDIATE)
{
struct gsm_network *net = gsmnet_from_vty(vty);
struct gsm_lchan *lchan;
@@ -2006,10 +2007,11 @@
return CMD_SUCCESS;
}
-DEFUN(no_bts_t_t_l_loopback,
- no_bts_t_t_l_loopback_cmd,
- "no " BTS_T_T_L_CMD " loopback",
- NO_STR BTS_T_T_L_STR "Set loopback\n")
+DEFUN_ATTR(no_bts_t_t_l_loopback,
+ no_bts_t_t_l_loopback_cmd,
+ "no " BTS_T_T_L_CMD " loopback",
+ NO_STR BTS_T_T_L_STR "Set loopback\n",
+ CMD_ATTR_HIDDEN | CMD_ATTR_IMMEDIATE)
{
struct gsm_network *net = gsmnet_from_vty(vty);
struct gsm_lchan *lchan;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22347
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I3f68acd7f2b0231f78516f59fb5e8ef56fb69dbf
Gerrit-Change-Number: 22347
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: vty: extend trx / lchan number range in BTS_T_T_L_CMD
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22346 ) Change subject: vty: extend trx / lchan number range in BTS_T_T_L_CMD .. vty: extend trx / lchan number range in BTS_T_T_L_CMD Change-Id: I8d8a4c46909daa0f2682d9662db8dffb4fbd8422 --- M src/common/vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/46/22346/1 diff --git a/src/common/vty.c b/src/common/vty.c index 09c0a98..846ba4a 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1793,7 +1793,7 @@ } #define BTS_T_T_L_CMD \ - "bts <0-0> trx <0-0> ts <0-7> lchan <0-1>" + "bts <0-0> trx <0-255> ts <0-7> lchan <0-7>" #define BTS_T_T_L_STR \ "BTS related commands\n"\ "BTS number\n" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d8a4c46909daa0f2682d9662db8dffb4fbd8422 Gerrit-Change-Number: 22346 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-bts[master]: vty: add macro for 'bts <0-0> trx <0-0> ts <0-7> lchan <0-1>'
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/22345 )
Change subject: vty: add macro for 'bts <0-0> trx <0-0> ts <0-7> lchan <0-1>'
..
vty: add macro for 'bts <0-0> trx <0-0> ts <0-7> lchan <0-1>'
Change-Id: If8e1ee87366a0d301e21161f2d9ddde8383cb744
---
M src/common/vty.c
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/45/22345/1
diff --git a/src/common/vty.c b/src/common/vty.c
index a0ebfae..09c0a98 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1792,6 +1792,8 @@
return >lchan[lchan_nr];
}
+#define BTS_T_T_L_CMD \
+ "bts <0-0> trx <0-0> ts <0-7> lchan <0-1>"
#define BTS_T_T_L_STR \
"BTS related commands\n"\
"BTS number\n" \
@@ -1955,7 +1957,7 @@
DEFUN(bts_t_t_l_jitter_buf,
bts_t_t_l_jitter_buf_cmd,
- "bts <0-0> trx <0-0> ts <0-7> lchan <0-1> rtp jitter-buffer <0-1>",
+ BTS_T_T_L_CMD " rtp jitter-buffer <0-1>",
BTS_T_T_L_STR "RTP settings\n"
"Jitter buffer\n" "Size of jitter buffer in (ms)\n")
{
@@ -1988,7 +1990,7 @@
DEFUN(bts_t_t_l_loopback,
bts_t_t_l_loopback_cmd,
- "bts <0-0> trx <0-0> ts <0-7> lchan <0-1> loopback",
+ BTS_T_T_L_CMD " loopback",
BTS_T_T_L_STR "Set loopback\n")
{
struct gsm_network *net = gsmnet_from_vty(vty);
@@ -2006,7 +2008,7 @@
DEFUN(no_bts_t_t_l_loopback,
no_bts_t_t_l_loopback_cmd,
- "no bts <0-0> trx <0-0> ts <0-7> lchan <0-1> loopback",
+ "no " BTS_T_T_L_CMD " loopback",
NO_STR BTS_T_T_L_STR "Set loopback\n")
{
struct gsm_network *net = gsmnet_from_vty(vty);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22345
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: If8e1ee87366a0d301e21161f2d9ddde8383cb744
Gerrit-Change-Number: 22345
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: vty: fix error messages in lchan specific commands
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/22344 )
Change subject: vty: fix error messages in lchan specific commands
..
vty: fix error messages in lchan specific commands
Change-Id: Ic0fba0605fc8a3ffa044f65fdad03b95e7cd8331
---
M src/common/vty.c
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/44/22344/1
diff --git a/src/common/vty.c b/src/common/vty.c
index 689ae58..a0ebfae 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1965,7 +1965,7 @@
lchan = resolve_lchan(net, argv, 0);
if (!lchan) {
- vty_out(vty, "%% can't find BTS%s", VTY_NEWLINE);
+ vty_out(vty, "%% Could not resolve logical channel%s",
VTY_NEWLINE);
return CMD_WARNING;
}
if (!lchan->abis_ip.rtp_socket) {
@@ -1996,7 +1996,7 @@
lchan = resolve_lchan(net, argv, 0);
if (!lchan) {
- vty_out(vty, "%% can't find BTS%s", VTY_NEWLINE);
+ vty_out(vty, "%% Could not resolve logical channel%s",
VTY_NEWLINE);
return CMD_WARNING;
}
lchan->loopback = 1;
@@ -2014,7 +2014,7 @@
lchan = resolve_lchan(net, argv, 0);
if (!lchan) {
- vty_out(vty, "%% can't find BTS%s", VTY_NEWLINE);
+ vty_out(vty, "%% Could not resolve logical channel%s",
VTY_NEWLINE);
return CMD_WARNING;
}
lchan->loopback = 0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22344
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ic0fba0605fc8a3ffa044f65fdad03b95e7cd8331
Gerrit-Change-Number: 22344
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-hlr[master]: Add vty command to show summary of all or filtered subscribers
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/22311 ) Change subject: Add vty command to show summary of all or filtered subscribers .. Patch Set 7: (6 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/db_hlr.c@633 PS7, Line 633: > it's now called get_cb? 'data' is missing. meh, sorry. forgot to update these.. https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@232 PS7, Line 232: vty_out(vty, "- -"); : if (show_ls) : vty_out(vty, " "); : vty_out_newline(vty); : vty_out(vty, "ID MSISDNIMSI IMEI NAM"); : if (show_ls) : vty_out(vty, "LAST SEEN"); : vty_out_newline(vty); > thisi s a repetition of the above. […] Well, it is and it isn't... the first one has the text above the lines.. the footer is reversed. But far too much attention to visual detail maybe? I guess the function could accept a header/footer arg and reverse the output based on this.. https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@251 PS7, Line 251: SUBSCR_SHOW_HELP > you could add the SHOW_STR inside the definition of SUBSCR_SHOW_HELP, so you > don't have to repeat it […] Yeah, I think this can be optimised more, but I was not sure as it does get hard to read. https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@305 PS7, Line 305: SHOW_STR SUBSCRS_SHOW_HELP "Show summary of subscribers with filter\n" : "Filter by IMSI\n" "Filter by MSISDN\n" "String to match in msisdn or imsi\n") > it's odd that the command syntax is hidden in a #define whle the help strings > are not. […] My understanding of the existing logic (the code before I edited it) was that anything appearing more than once was #define'd and anything appearing ONLY ONCE was just strings in the DEFUN. It seemed to make sense as eliminates duplication. I tried to follow the same logic. https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@320 PS7, Line 320: > Somehow the number of help strings doesn't match the number of tokens. […] Ah, I messed up somewhere.. Which part does not make sense? The way I wrote In/Active? https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@323 PS7, Line 323: last seen > if you do not expect other tokens after "last" (like "last created" or > whatever), then please change […] Yes. I guess it would be nice to get some feedback on anything people might like to see here, so it could be integrated in this patch set. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7f0573381a6d0d13841ac6d42d50f0e8389decf4 Gerrit-Change-Number: 22311 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: neels Gerrit-Comment-Date: Wed, 20 Jan 2021 20:48:42 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_vc_fsm: check NSVCI match the NSE
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22340 )
Change subject: gprs_ns2_vc_fsm: check NSVCI match the NSE
..
gprs_ns2_vc_fsm: check NSVCI match the NSE
The NSVCI must match the PDUs. The only exception is a RESET with
dialect ipaccess. However those will be handled later.
Change-Id: I8518bdb03e9e33b04b77a2a346d04c5d29544a6c
---
M src/gb/gprs_ns2_vc_fsm.c
1 file changed, 14 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index 3ec6909..d4f4320 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -750,11 +750,10 @@
struct osmo_fsm_inst *fi = nsvc->fi;
int rc = 0;
uint8_t cause;
- uint16_t nsei;
+ uint16_t nsei, nsvci;
/* TODO: 7.2: on UNBLOCK/BLOCK: check if NS-VCI is correct,
* if not answer STATUS with "NS-VC unknown" */
- /* TODO: handle RESET with different VCI */
/* TODO: handle BLOCK/UNBLOCK/ALIVE with different VCI */
if (gprs_ns2_validate(nsvc, nsh->pdu_type, msg, tp, )) {
@@ -777,6 +776,19 @@
}
}
+ if (nsvc->nsvci_is_valid && TLVP_PRESENT(tp, NS_IE_VCI)) {
+ nsvci = tlvp_val16be(tp, NS_IE_VCI);
+ if (nsvci != nsvc->nsvci) {
+ /* 48.016 § 7.3.1 send RESET_ACK to wrong NSVCI +
ignore */
+ if (nsh->pdu_type == NS_PDUT_RESET)
+ ns2_tx_reset_ack(nsvc);
+
+ LOGNSVC(nsvc, LOGL_ERROR, "Rx %s with wrong NSVCI=%05u.
Ignoring PDU.\n",
+ get_value_string(gprs_ns_pdu_strings,
nsh->pdu_type), nsvci);
+ goto out;
+ }
+ }
+
switch (nsh->pdu_type) {
case NS_PDUT_RESET:
osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_RESET, tp);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22340
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I8518bdb03e9e33b04b77a2a346d04c5d29544a6c
Gerrit-Change-Number: 22340
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-MessageType: merged
Change in libosmocore[master]: gprs_ns2_vc_fsm: check NSEI match the NSE
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22325 )
Change subject: gprs_ns2_vc_fsm: check NSEI match the NSE
..
gprs_ns2_vc_fsm: check NSEI match the NSE
The NSE must match the PDUs. The only exception is a RESET with
dialect ipaccess. However those will be handled later.
Change-Id: Ic8fc49d850490feb0ff69171a6b0881ae8696c0b
---
M src/gb/gprs_ns2_vc_fsm.c
1 file changed, 14 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index fc2a86a..3ec6909 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -750,6 +750,7 @@
struct osmo_fsm_inst *fi = nsvc->fi;
int rc = 0;
uint8_t cause;
+ uint16_t nsei;
/* TODO: 7.2: on UNBLOCK/BLOCK: check if NS-VCI is correct,
* if not answer STATUS with "NS-VC unknown" */
@@ -763,6 +764,19 @@
}
}
+ if (TLVP_PRESENT(tp, NS_IE_NSEI)) {
+ nsei = tlvp_val16be(tp, NS_IE_NSEI);
+ if (nsei != nsvc->nse->nsei) {
+ /* 48.016 § 7.3.1 send, RESET_ACK to wrong NSVCI +
ignore */
+ if (nsh->pdu_type == NS_PDUT_RESET)
+ ns2_tx_reset_ack(nsvc);
+
+ LOGNSVC(nsvc, LOGL_ERROR, "Rx %s with wrong NSEI=%05u.
Ignoring PDU.\n",
+ get_value_string(gprs_ns_pdu_strings,
nsh->pdu_type), nsei);
+ goto out;
+ }
+ }
+
switch (nsh->pdu_type) {
case NS_PDUT_RESET:
osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_RESET, tp);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22325
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ic8fc49d850490feb0ff69171a6b0881ae8696c0b
Gerrit-Change-Number: 22325
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmocore[master]: gprs_ns2_vc_fsm: check NSVCI match the NSE
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22340 ) Change subject: gprs_ns2_vc_fsm: check NSVCI match the NSE .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8518bdb03e9e33b04b77a2a346d04c5d29544a6c Gerrit-Change-Number: 22340 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 20 Jan 2021 19:25:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_vc_fsm: check NSEI match the NSE
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22325 ) Change subject: gprs_ns2_vc_fsm: check NSEI match the NSE .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic8fc49d850490feb0ff69171a6b0881ae8696c0b Gerrit-Change-Number: 22325 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 19:25:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: Readme.md: update debian deps, add python3-yaml
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/22342 ) Change subject: Readme.md: update debian deps, add python3-yaml .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/22342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic0d53ec3f312afee9d28f2f63d35e5c56dfd4686 Gerrit-Change-Number: 22342 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Jan 2021 19:24:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: Readme.md: update debian deps, add python3-yaml
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/22342 ) Change subject: Readme.md: update debian deps, add python3-yaml .. Readme.md: update debian deps, add python3-yaml Change-Id: Ic0d53ec3f312afee9d28f2f63d35e5c56dfd4686 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/README.md b/README.md index 105ca3f..3234665 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Example for Debian: - apt-get install python3-pyscard python3-serial python3-pip + apt-get install python3-pyscard python3-serial python3-pip python3-yaml pip3 install pytlv -- To view, visit https://gerrit.osmocom.org/c/pysim/+/22342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic0d53ec3f312afee9d28f2f63d35e5c56dfd4686 Gerrit-Change-Number: 22342 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: Introduce NS test cases
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22091 ) Change subject: Introduce NS test cases .. Patch Set 9: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic619a374b88879d3116f8f28afb14401c3e3192b Gerrit-Change-Number: 22091 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Jan 2021 18:11:33 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE
Hello laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22343 to look at the new patch set (#2). Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE .. gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE The BSSGP need to know the MTU of the BSSGP layer. The MTU can be 0 if the NSE doesn't contain any NSVC. Every status indication will contain the mtu value. The MTU in the status indication contain the maximum transfer unit of a BSSGP message. From NS side the maximum SDU. Related: OS#4889 Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c 6 files changed, 65 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22343/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gprs_ns2_vc_fsm: check NSVCI match the NSE
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22340 to look at the new patch set (#2). Change subject: gprs_ns2_vc_fsm: check NSVCI match the NSE .. gprs_ns2_vc_fsm: check NSVCI match the NSE The NSVCI must match the PDUs. The only exception is a RESET with dialect ipaccess. However those will be handled later. Change-Id: I8518bdb03e9e33b04b77a2a346d04c5d29544a6c --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/22340/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8518bdb03e9e33b04b77a2a346d04c5d29544a6c Gerrit-Change-Number: 22340 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gprs_ns2: rework logging of Rx and Tx NS PDU
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22294 to look at the new patch set (#11). Change subject: gprs_ns2: rework logging of Rx and Tx NS PDU .. gprs_ns2: rework logging of Rx and Tx NS PDU Unify log messages so all log messages look similiar. Log also Rx PDUs. Ensure dropped Tx packets (BLOCK/RESET on SNS) contain *Tx*. Change-Id: I34b8fde2955ecc010d1dcd9512e1bba9211e2c0d --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_message.c M src/gb/gprs_ns2_vc_fsm.c 4 files changed, 26 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/22294/11 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I34b8fde2955ecc010d1dcd9512e1bba9211e2c0d Gerrit-Change-Number: 22294 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/22343 )
Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE
..
gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE
The BSSGP need to know the MTU of the BSSGP layer.
The MTU can be 0 if the NSE doesn't contain any NSVC.
Every status indication will contain the mtu value.
The MTU in the status indication contain the maximum transfer
unit of a BSSGP message. From NS side the maximum SDU.
Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6
---
M include/osmocom/gprs/gprs_ns2.h
M src/gb/gprs_ns2.c
M src/gb/gprs_ns2_fr.c
M src/gb/gprs_ns2_frgre.c
M src/gb/gprs_ns2_internal.h
M src/gb/gprs_ns2_udp.c
6 files changed, 65 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22343/1
diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h
index 1b20298..cf2f86c 100644
--- a/include/osmocom/gprs/gprs_ns2.h
+++ b/include/osmocom/gprs/gprs_ns2.h
@@ -135,6 +135,8 @@
/* Only true on the first time it's available.
* Allow the BSSGP layer to reset persistent NSE */
bool first;
+ /* MTU of a BSSGP PDU. It's the lowest MTU of all
(alive & dead) NSVCs */
+ int mtu;
} status;
} u;
};
diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c
index 0c1d564..87cb0ad 100644
--- a/src/gb/gprs_ns2.c
+++ b/src/gb/gprs_ns2.c
@@ -474,6 +474,7 @@
nsp.u.status.transfer = ns2_count_transfer_cap(nse, bvci);
nsp.u.status.first = nse->first;
nsp.u.status.persistent = nse->persistent;
+ nsp.u.status.mtu = nse->mtu - 4; /* 1b NS PDU type, 1b NS SDU control,
2b BVCI */
if (nsvc)
nsp.u.status.nsvc = gprs_ns2_ll_str_buf(nsvc_str,
sizeof(nsvc_str), nsvc);
@@ -519,6 +520,7 @@
llist_add(>list, >nsvc);
llist_add(>blist, >nsvc);
+ ns2_nse_update_mtu(nse);
return nsvc;
@@ -717,6 +719,7 @@
nse->nsei = nsei;
nse->nsi = nsi;
nse->first = true;
+ nse->mtu = 0;
llist_add(>list, >nse);
INIT_LLIST_HEAD(>nsvc);
@@ -1316,6 +1319,26 @@
array[i] = bind;
}
+void ns2_nse_update_mtu(struct gprs_ns2_nse *nse)
+{
+ struct gprs_ns2_vc *nsvc;
+ int mtu = 0;
+
+ if (llist_empty(>nsvc)) {
+ nse->mtu = 0;
+ return;
+ }
+
+ llist_for_each_entry(nsvc, >nsvc, list) {
+ if (mtu == 0)
+ mtu = nsvc->bind->mtu;
+ else if (mtu > nsvc->bind->mtu)
+ mtu = nsvc->bind->mtu;
+ }
+
+ nse->mtu = mtu;
+}
+
/*! calculate the transfer capabilities for a nse
* \param nse the nse to count the transfer capability
* \param bvci a bvci - unused
diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c
index 274ed96..00efd8a 100644
--- a/src/gb/gprs_ns2_fr.c
+++ b/src/gb/gprs_ns2_fr.c
@@ -592,6 +592,9 @@
bind->free_vc = free_vc;
bind->dump_vty = dump_vty;
bind->nsi = nsi;
+ /* 48.016 § 6.1.4.2 default maximum information field size of 1600
octets
+* FR has 2 byte header */
+ bind->mtu = 1600 - 2;
priv = bind->priv = talloc_zero(bind, struct priv_bind);
if (!priv) {
rc = -ENOSPC;
diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c
index 2812e12..1529b48 100644
--- a/src/gb/gprs_ns2_frgre.c
+++ b/src/gb/gprs_ns2_frgre.c
@@ -568,6 +568,8 @@
bind->send_vc = frgre_vc_sendmsg;
bind->free_vc = free_vc;
bind->nsi = nsi;
+ /* TODO: update mtu similiar to UDP - GRE header */
+ bind->mtu = 1500;
priv = bind->priv = talloc_zero(bind, struct priv_bind);
if (!priv) {
diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h
index af8c5f0..42499db 100644
--- a/src/gb/gprs_ns2_internal.h
+++ b/src/gb/gprs_ns2_internal.h
@@ -167,6 +167,9 @@
/*! sum of all the signalling weight of _active_ NS-VCs */
uint32_t sum_sig_weight;
+
+ /*! MTU of a NS PDU. This is the lowest MTU of all NSVCs */
+ int mtu;
};
/*! Structure representing a single NS-VC */
@@ -232,6 +235,9 @@
/*! transfer capability in mbit */
int transfer_capability;
+ /*! MTU of a NS PDU on this bind. */
+ int mtu;
+
/*! which link-layer are we based on? */
enum gprs_ns2_ll ll;
@@ -276,6 +282,7 @@
uint16_t bvci,
enum gprs_ns2_affecting_cause cause);
void ns2_nse_notify_alive(struct gprs_ns2_vc *nsvc, bool alive);
+void ns2_nse_update_mtu(struct gprs_ns2_nse *nse);
/* message */
int gprs_ns2_validate(struct gprs_ns2_vc *nsvc,
diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c
Change in libosmocore[master]: gprs_ns2_vc_fsm: check NSEI match the NSE
Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22325 to look at the new patch set (#3). Change subject: gprs_ns2_vc_fsm: check NSEI match the NSE .. gprs_ns2_vc_fsm: check NSEI match the NSE The NSE must match the PDUs. The only exception is a RESET with dialect ipaccess. However those will be handled later. Change-Id: Ic8fc49d850490feb0ff69171a6b0881ae8696c0b --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/22325/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic8fc49d850490feb0ff69171a6b0881ae8696c0b Gerrit-Change-Number: 22325 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in pysim[master]: Readme.md: update debian deps, add python3-yaml
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/22342 ) Change subject: Readme.md: update debian deps, add python3-yaml .. Readme.md: update debian deps, add python3-yaml Change-Id: Ic0d53ec3f312afee9d28f2f63d35e5c56dfd4686 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/42/22342/1 diff --git a/README.md b/README.md index 105ca3f..3234665 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Example for Debian: - apt-get install python3-pyscard python3-serial python3-pip + apt-get install python3-pyscard python3-serial python3-pip python3-yaml pip3 install pytlv -- To view, visit https://gerrit.osmocom.org/c/pysim/+/22342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic0d53ec3f312afee9d28f2f63d35e5c56dfd4686 Gerrit-Change-Number: 22342 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: NS_Emulation: Respect data_weight==0 or signalling_weight==0
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22305 ) Change subject: NS_Emulation: Respect data_weight==0 or signalling_weight==0 .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9798e639b4bc8658482945970775b012b5840779 Gerrit-Change-Number: 22305 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 20 Jan 2021 17:52:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: Use separate NS-VC for data / signalling on SGSN side
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22306 ) Change subject: gbproxy: Use separate NS-VC for data / signalling on SGSN side .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If0e404bdf2c30a5e18748695608611be83f61109 Gerrit-Change-Number: 22306 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 20 Jan 2021 17:50:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_message: remove wrong comment
lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22317 ) Change subject: gprs_ns2_message: remove wrong comment .. gprs_ns2_message: remove wrong comment It's a leftover from converting NS1 -> NS2 code Change-Id: I934c7905f8396e74bb1f14d68097c03463816720 --- M src/gb/gprs_ns2_message.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index 6c7f08f..41605f4 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -258,7 +258,6 @@ LOGP(DLNS, LOGL_INFO, "NSEI=%u Tx NS BLOCK ACK (NSVCI=%u)\n", nsvc->nse->nsei, nsvc->nsvci); - /* be conservative and mark it as blocked even now! */ msg->l2h = msgb_put(msg, sizeof(*nsh)); nsh = (struct gprs_ns_hdr *) msg->l2h; nsh->pdu_type = NS_PDUT_BLOCK_ACK; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I934c7905f8396e74bb1f14d68097c03463816720 Gerrit-Change-Number: 22317 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmocore[master]: ns2: Unify logging context via log macros
lynxis lazus has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22337 )
Change subject: ns2: Unify logging context via log macros
..
ns2: Unify logging context via log macros
Let's avoid open-coding the printing of log context and rather rely on
log macros to prefix each log line with the relevant context. This
helps log readability, log post processing whether by grep or more
sophisticated tools.
Change-Id: I946c0e77686d91efc5afb62031e1ac1033a9a586
---
M src/gb/gprs_ns2.c
M src/gb/gprs_ns2_fr.c
M src/gb/gprs_ns2_frgre.c
M src/gb/gprs_ns2_internal.h
M src/gb/gprs_ns2_message.c
M src/gb/gprs_ns2_sns.c
M src/gb/gprs_ns2_udp.c
M src/gb/gprs_ns2_vc_fsm.c
8 files changed, 112 insertions(+), 119 deletions(-)
Approvals:
lynxis lazus: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c
index dc8ad8e..ec60dbd 100644
--- a/src/gb/gprs_ns2.c
+++ b/src/gb/gprs_ns2.c
@@ -695,7 +695,7 @@
nse = gprs_ns2_nse_by_nsei(nsi, nsei);
if (nse) {
- LOGP(DLNS, LOGL_ERROR, "NSEI:%u Can not create a NSE with
already taken NSEI\n", nsei);
+ LOGNSE(nse, LOGL_ERROR, "Can not create a NSE with already
taken NSEI\n");
return nse;
}
@@ -885,8 +885,9 @@
} else {
/* nsei already known */
if (nse->ll != bind->ll) {
- LOGP(DLNS, LOGL_ERROR, "Received NS-RESET NS-VCI(%05u)
with wrong linklayer(%s) for already known NSE(%05u/%s)\n",
-nsei, gprs_ns2_lltype_str(bind->ll), nse->nsei,
gprs_ns2_lltype_str(nse->ll));
+ LOGNSE(nse, LOGL_ERROR, "Received NS-RESET NS-VCI(%05u)
with wrong linklayer(%s)"
+ " for already known NSE(%s)\n", nsvci,
gprs_ns2_lltype_str(bind->ll),
+ gprs_ns2_lltype_str(nse->ll));
return GPRS_NS2_CS_SKIPPED;
}
}
@@ -894,8 +895,7 @@
nsvc = gprs_ns2_nsvc_by_nsvci(bind->nsi, nsvci);
if (nsvc) {
if (nsvc->persistent) {
- LOGP(DLNS, LOGL_ERROR, "Received NS-RESET for a
persistent NSE(%05u) NS-VCI(%05u) over wrong connection.\n",
-nsei, nsvci);
+ LOGNSVC(nsvc, LOGL_ERROR, "Received NS-RESET for a
persistent NSE over wrong connection.\n");
return GPRS_NS2_CS_SKIPPED;
}
/* destroy old dynamic nsvc */
@@ -904,8 +904,8 @@
/* do nse persistent check late to be more precise on the error message
*/
if (nse->persistent) {
- LOGP(DLNS, LOGL_ERROR, "Received NS-RESET for a persistent
NSE(%05u) but the unknown NS-VCI(%05u)\n",
-nsei, nsvci);
+ LOGNSE(nse, LOGL_ERROR, "Received NS-RESET for a persistent NSE
but the unknown "
+ "NS-VCI(%05u)\n", nsvci);
return GPRS_NS2_CS_SKIPPED;
}
diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c
index a7455d7..274ed96 100644
--- a/src/gb/gprs_ns2_fr.c
+++ b/src/gb/gprs_ns2_fr.c
@@ -214,8 +214,7 @@
rc = recvfrom(bfd->fd, msg->data, NS_ALLOC_SIZE, 0, (struct sockaddr
*), _len);
if (rc < 0) {
- LOGP(DLNS, LOGL_ERROR, "recv error %s during NS-FR-GRE recv\n",
-strerror(errno));
+ LOGBIND(bind, LOGL_ERROR, "recv error %s during NS-FR-GRE
recv\n", strerror(errno));
goto out_err;
} else if (rc == 0) {
goto out_err;
@@ -273,8 +272,7 @@
struct priv_bind *priv = bind->priv;
if (osmo_wqueue_enqueue(>wqueue, msg)) {
- LOGP(DLNS, LOGL_ERROR, "frame relay %s: failed to enqueue
message\n",
-priv->netif);
+ LOGBIND(bind, LOGL_ERROR, "frame relay %s: failed to enqueue
message\n", priv->netif);
msgb_free(msg);
return -EINVAL;
}
@@ -303,7 +301,7 @@
return ifr.ifr_ifindex;
}
-static int open_socket(int ifindex)
+static int open_socket(int ifindex, const struct gprs_ns2_vc_bind *nsbind)
{
struct sockaddr_ll addr;
int fd, rc;
@@ -315,7 +313,7 @@
fd = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_HDLC));
if (fd < 0) {
- LOGP(DLNS, LOGL_ERROR, "Can not create AF_PACKET socket. Are
you root or have CAP_RAW_SOCKET?\n");
+ LOGBIND(nsbind, LOGL_ERROR, "Can not create AF_PACKET socket.
Are you root or have CAP_NET_RAW?\n");
return fd;
}
@@ -324,7 +322,7 @@
rc = bind(fd, (struct sockaddr *), sizeof(addr));
if (rc < 0) {
- LOGP(DLNS, LOGL_ERROR, "Can not bind AF_PACKET socket to
ifindex %d\n", ifindex);
+
Change in libosmocore[master]: ns2: Unify logging context via log macros
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22337 ) Change subject: ns2: Unify logging context via log macros .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I946c0e77686d91efc5afb62031e1ac1033a9a586 Gerrit-Change-Number: 22337 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 16:42:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: Add vty command to show summary of all or filtered subscribers
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/22311 ) Change subject: Add vty command to show summary of all or filtered subscribers .. Patch Set 7: (7 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/db_hlr.c@629 PS7, Line 629: there is no vty argument in below function https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/db_hlr.c@633 PS7, Line 633: it's now called get_cb? 'data' is missing. https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@232 PS7, Line 232: vty_out(vty, "- -"); : if (show_ls) : vty_out(vty, " "); : vty_out_newline(vty); : vty_out(vty, "ID MSISDNIMSI IMEI NAM"); : if (show_ls) : vty_out(vty, "LAST SEEN"); : vty_out_newline(vty); thisi s a repetition of the above. I suggest you factor that "print header" into a separate function and call it from a few lines above and from here. This way we don't have to edit two places if the table format ever changes. https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@251 PS7, Line 251: SUBSCR_SHOW_HELP you could add the SHOW_STR inside the definition of SUBSCR_SHOW_HELP, so you don't have to repeat it at every DEFUN below. However, you may intentionally not have wanted that, as the number of tokens/strings is harder to see? https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@305 PS7, Line 305: SHOW_STR SUBSCRS_SHOW_HELP "Show summary of subscribers with filter\n" : "Filter by IMSI\n" "Filter by MSISDN\n" "String to match in msisdn or imsi\n") it's odd that the command syntax is hidden in a #define whle the help strings are not. So it's hard to match both when looking at the code. Either use #defines for both and put them at the same location in the file, or list them explicitly here. https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@320 PS7, Line 320: Somehow the number of help strings doesn't match the number of tokens. You need 6 strings, I see 5 and some don't make sense. https://gerrit.osmocom.org/c/osmo-hlr/+/22311/7/src/hlr_vty_subscr.c@323 PS7, Line 323: last seen if you do not expect other tokens after "last" (like "last created" or whatever), then please change to a single tokenm "last-seen". -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7f0573381a6d0d13841ac6d42d50f0e8389decf4 Gerrit-Change-Number: 22311 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: neels Gerrit-Comment-Date: Wed, 20 Jan 2021 16:20:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_bssgp_rim: fix bug in dub_tlvp_header()
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22339 )
Change subject: gprs_bssgp_rim: fix bug in dub_tlvp_header()
..
gprs_bssgp_rim: fix bug in dub_tlvp_header()
When the length field is written the function writes the lower and the
higher half of the length at the same position, so the higher half is
overwritten with the lower half, this is wrong.
Change-Id: I3cce0b2796793554a421fd3ce8e749c52d22eaea
Related: CID#216670
Related: SYS#5103
---
M src/gb/gprs_bssgp_rim.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/gb/gprs_bssgp_rim.c b/src/gb/gprs_bssgp_rim.c
index 2096977..23fb3a0 100644
--- a/src/gb/gprs_bssgp_rim.c
+++ b/src/gb/gprs_bssgp_rim.c
@@ -438,7 +438,7 @@
} else {
memmove(buf_ptr + 1, buf_ptr, len);
buf_ptr[1] = len >> 8;
- buf_ptr[1] = len & 0xff;
+ buf_ptr[2] = len & 0xff;
buf_ptr += TVLV_HDR_MAXLEN;
}
buf_ptr += len;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22339
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I3cce0b2796793554a421fd3ce8e749c52d22eaea
Gerrit-Change-Number: 22339
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmocore[master]: gprs_bssgp_rim: fix bug in dub_tlvp_header()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22339 ) Change subject: gprs_bssgp_rim: fix bug in dub_tlvp_header() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3cce0b2796793554a421fd3ce8e749c52d22eaea Gerrit-Change-Number: 22339 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 16:10:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_bssgp_rim: Return with EOPNOTSUPP on unsupported containers
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22319 ) Change subject: gprs_bssgp_rim: Return with EOPNOTSUPP on unsupported containers .. gprs_bssgp_rim: Return with EOPNOTSUPP on unsupported containers The current version of libosmocore only supports NACC related RIM application containers. If the parser detects a different application container it returns with EINVAL. Unfortunately this means that the caller can not distinguish if there is a lack of support or a real parsing error. Change-Id: Ib5ada3554c04259764352888cf95bc4460cb2a54 Related: SYS#5103 --- M src/gb/gprs_bssgp_rim.c 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_bssgp_rim.c b/src/gb/gprs_bssgp_rim.c index 7094f5f..2096977 100644 --- a/src/gb/gprs_bssgp_rim.c +++ b/src/gb/gprs_bssgp_rim.c @@ -405,7 +405,7 @@ case BSSGP_RAN_INF_APP_ID_SON: case BSSGP_RAN_INF_APP_ID_UTRA_SI: /* TODO: add parsers for Si3, MBMS, SON, UTRA-SI app containers */ - return -EINVAL; + return -EOPNOTSUPP; default: return -EINVAL; } @@ -475,7 +475,7 @@ case BSSGP_RAN_INF_APP_ID_SON: case BSSGP_RAN_INF_APP_ID_UTRA_SI: /* TODO: add encoders for Si3, MBMS, SON, UTRA-SI app containers */ - return -EINVAL; + return -EOPNOTSUPP; default: return -EINVAL; } @@ -528,7 +528,7 @@ case BSSGP_RAN_INF_APP_ID_SON: case BSSGP_RAN_INF_APP_ID_UTRA_SI: /* TODO: add parsers for Si3, MBMS, SON, UTRA-SI app containers */ - return -EINVAL; + return -EOPNOTSUPP; default: return -EINVAL; } @@ -547,7 +547,7 @@ case BSSGP_RAN_INF_APP_ID_SON: case BSSGP_RAN_INF_APP_ID_UTRA_SI: /* TODO: add parsers for Si3, MBMS, SON, UTRA-SI app containers */ - return -EINVAL; + return -EOPNOTSUPP; default: return -EINVAL; } @@ -594,7 +594,7 @@ case BSSGP_RAN_INF_APP_ID_SON: case BSSGP_RAN_INF_APP_ID_UTRA_SI: /* TODO: add encoders for Si3, MBMS, SON, UTRA-SI app containers */ - return -EINVAL; + return -EOPNOTSUPP; default: return -EINVAL; } @@ -613,7 +613,7 @@ case BSSGP_RAN_INF_APP_ID_SON: case BSSGP_RAN_INF_APP_ID_UTRA_SI: /* TODO: add encoders for Si3, MBMS, SON, UTRA-SI app containers */ - return -EINVAL; + return -EOPNOTSUPP; default: return -EINVAL; } @@ -810,7 +810,7 @@ case BSSGP_RAN_INF_APP_ID_SON: case BSSGP_RAN_INF_APP_ID_UTRA_SI: /* TODO: add parsers for Si3, MBMS, SON, UTRA-SI app containers */ - return -EINVAL; + return -EOPNOTSUPP; default: return -EINVAL; } @@ -849,7 +849,7 @@ case BSSGP_RAN_INF_APP_ID_SON: case BSSGP_RAN_INF_APP_ID_UTRA_SI: /* TODO: add encoders for Si3, MBMS, SON, UTRA-SI app containers */ - return -EINVAL; + return -EOPNOTSUPP; default: return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib5ada3554c04259764352888cf95bc4460cb2a54 Gerrit-Change-Number: 22319 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmocore[master]: gprs_bssgp_rim: Return with EOPNOTSUPP on unsupported containers
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22319 ) Change subject: gprs_bssgp_rim: Return with EOPNOTSUPP on unsupported containers .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib5ada3554c04259764352888cf95bc4460cb2a54 Gerrit-Change-Number: 22319 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 16:08:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: logging_vty: Fix saving of "logging print file .. last"
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/22341 )
Change subject: logging_vty: Fix saving of "logging print file .. last"
..
logging_vty: Fix saving of "logging print file .. last"
Back in 2018 in I393907b3c9e0cc1145e102328adad0a83ee13a9f Neels
introduced "last" as an optional flag to log the file/line number at the
end of the line, rather than at the end of the header. It seems nobody
has been usingi this feature, or at least never tried to save a related
config file, as there was no code whatsoever that would ever save this
optional "last" flag.
Change-Id: I7b6245256aecc425722242aaabc154ac58ba27a0
---
M src/vty/logging_vty.c
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/41/22341/1
diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c
index 0282350..6a7a8f4 100644
--- a/src/vty/logging_vty.c
+++ b/src/vty/logging_vty.c
@@ -1010,8 +1010,9 @@
tgt->print_timestamp ? 1 : 0, VTY_NEWLINE);
if (tgt->print_level)
vty_out(vty, " logging print level 1%s", VTY_NEWLINE);
- vty_out(vty, " logging print file %s%s",
+ vty_out(vty, " logging print file %s%s%s",
get_value_string(logging_print_file_args, tgt->print_filename2),
+ tgt->print_filename_pos == LOG_FILENAME_POS_LINE_END ? " last"
: "",
VTY_NEWLINE);
if (tgt->loglevel) {
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22341
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I7b6245256aecc425722242aaabc154ac58ba27a0
Gerrit-Change-Number: 22341
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in libosmocore[master]: gprs_ns2_message: remove wrong comment
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22317 ) Change subject: gprs_ns2_message: remove wrong comment .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I934c7905f8396e74bb1f14d68097c03463816720 Gerrit-Change-Number: 22317 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:37:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: make HTTP, OBS vars local
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/22329 )
Change subject: repo-install-test: make HTTP, OBS vars local
..
repo-install-test: make HTTP, OBS vars local
Move the two debian-specific variables to the debian-related functions
where they are used. Both are only used once, and having them global is
misleading since the test isn't just for debian anymore, but also for
centos8.
Make the variables lowercase to indicate that they aren't used globally.
Related: OS#4733
Change-Id: I1dfddbd9311d741c03ceedb12aee9aeae6abdab8
---
M scripts/repo-install-test/run-inside-docker.sh
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
osmith: Verified
diff --git a/scripts/repo-install-test/run-inside-docker.sh
b/scripts/repo-install-test/run-inside-docker.sh
index f472645..3c3245d 100755
--- a/scripts/repo-install-test/run-inside-docker.sh
+++ b/scripts/repo-install-test/run-inside-docker.sh
@@ -45,9 +45,6 @@
echo "$1" | tr : _
}
-HTTP="http://download.opensuse.org/repositories/$(proj_with_slashes
"$PROJ")/Debian_9.0/"
-OBS="obs://build.opensuse.org/$PROJ/Debian_9.0"
-
check_env() {
if [ -n "$FEED" ]; then
echo "Checking feed: $FEED"
@@ -70,8 +67,10 @@
}
configure_osmocom_repo_debian() {
+ local
http="http://download.opensuse.org/repositories/$(proj_with_slashes
"$PROJ")/Debian_9.0/"
+
echo "Configuring Osmocom repository"
- echo "deb $HTTP ./" \
+ echo "deb $http ./" \
> /etc/apt/sources.list.d/osmocom-latest.list
apt-get update
}
@@ -125,12 +124,14 @@
}
install_repo_packages_debian() {
+ local obs="obs://build.opensuse.org/$PROJ/Debian_9.0"
+
echo "Installing all repository packages"
# Get a list of all packages from the repository. Reference:
# https://www.debian.org/doc/manuals/aptitude/ch02s04s05.en.html
aptitude search -F%p \
- "?origin($OBS) ?architecture(native)" | sort \
+ "?origin($obs) ?architecture(native)" | sort \
> osmocom_packages_all.txt
filter_packages_txt
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22329
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I1dfddbd9311d741c03ceedb12aee9aeae6abdab8
Gerrit-Change-Number: 22329
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ci[master]: repo-install-test: put $PROJ in sources.list name
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22330 ) Change subject: repo-install-test: put $PROJ in sources.list name .. repo-install-test: put $PROJ in sources.list name Don't call the file osmocom-latest regardless of the feed name. This becomes important in a future conflict test where we will have two repositories from two feeds configured. Related: OS#4733 Change-Id: I8926443a9ff70f285d9467d39658e64456972b07 --- M scripts/repo-install-test/run-inside-docker.sh 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Verified diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index 3c3245d..ee148c8 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -70,8 +70,7 @@ local http="http://download.opensuse.org/repositories/$(proj_with_slashes "$PROJ")/Debian_9.0/" echo "Configuring Osmocom repository" - echo "deb $http ./" \ - > /etc/apt/sources.list.d/osmocom-latest.list + echo "deb $http ./" > "/etc/apt/sources.list.d/$PROJ.list" apt-get update } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8926443a9ff70f285d9467d39658e64456972b07 Gerrit-Change-Number: 22330 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ci[master]: repo-install-test: tweak FEED syntax
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/22327 )
Change subject: repo-install-test: tweak FEED syntax
..
repo-install-test: tweak FEED syntax
Use the shorter form, before adding another variable with default value.
Related: OS#4733
Change-Id: Icb36da91a6dc52529c2087b0961c1b698076eea1
---
M scripts/repo-install-test.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
osmith: Verified
diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh
index 0c08e15..a30c36d 100755
--- a/scripts/repo-install-test.sh
+++ b/scripts/repo-install-test.sh
@@ -15,7 +15,7 @@
DISTRO="$1"
docker_images_require "$DISTRO-repo-install-test"
-[ -z "$FEED" ] && FEED="nightly"
+FEED="${FEED:-nightly}"
CONTAINER="$DISTRO-repo-install-test-$FEED"
# Try to run "systemctl status" 10 times, kill the container on failure
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22327
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Icb36da91a6dc52529c2087b0961c1b698076eea1
Gerrit-Change-Number: 22327
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
Change in osmo-ci[master]: repo-install-test: add PROJ variable
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/22328 )
Change subject: repo-install-test: add PROJ variable
..
repo-install-test: add PROJ variable
Make debugging easier by having a PROJ variable that can be overridden
by an environment variable of the same name. Pass it to docker and use
it to generate all related URLs etc.
Add functions in run-inside-docker.sh to convert the PROJ variable into
the two other formates needed (with slashes, with underscore), so a
future patch can use these functions with a different PROJ variable too.
Related: OS#4733
Change-Id: I0ac05a79ad65b5664b5ba37227b65e3b1422a4bf
---
M scripts/repo-install-test.sh
M scripts/repo-install-test/run-inside-docker.sh
2 files changed, 29 insertions(+), 7 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
osmith: Verified
diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh
index a30c36d..a785b74 100755
--- a/scripts/repo-install-test.sh
+++ b/scripts/repo-install-test.sh
@@ -2,6 +2,7 @@
# Environment variables:
# * INTERACTIVE: set to 1 to keep an interactive shell open after the script
ran (for debugging)
# * FEED: binary package feed (e.g. "latest", "nightly")
+# * PROJ: OBS project namespace (e.g. "network:osmocom:latest")
# * KEEP_CACHE: set to 1 to keep downloaded binary packages (for development)
. "$(dirname "$0")/common.sh"
@@ -16,6 +17,7 @@
docker_images_require "$DISTRO-repo-install-test"
FEED="${FEED:-nightly}"
+PROJ="${PROJ:-network:osmocom:$FEED}"
CONTAINER="$DISTRO-repo-install-test-$FEED"
# Try to run "systemctl status" 10 times, kill the container on failure
@@ -54,6 +56,7 @@
-v
"$OSMO_CI_DIR/scripts/repo-install-test:/repo-install-test:ro" \
--name "$CONTAINER" \
-e FEED="$FEED" \
+ -e PROJ="$PROJ" \
-e DISTRO="$DISTRO" \
-e container=docker \
--tmpfs /run \
diff --git a/scripts/repo-install-test/run-inside-docker.sh
b/scripts/repo-install-test/run-inside-docker.sh
index 93e8b7f..f472645 100755
--- a/scripts/repo-install-test/run-inside-docker.sh
+++ b/scripts/repo-install-test/run-inside-docker.sh
@@ -1,6 +1,7 @@
#!/bin/sh -ex
# Environment variables:
# * FEED: binary package feed (e.g. "latest", "nightly")
+# * PROJ: OBS project namespace (e.g. "network:osmocom:latest")
# * KEEP_CACHE: set to 1 to keep downloaded binary packages (for development)
# * DISTRO: linux distribution name (e.g. "debian", "centos")
@@ -34,8 +35,18 @@
osmo-bts-virtual
"
-HTTP="http://download.opensuse.org/repositories/network:/osmocom:/$FEED/Debian_9.0/;
-OBS="obs://build.opensuse.org/network:osmocom:$FEED/Debian_9.0"
+# $1: OBS project (e.g. "network:osmocom:nightly" ->
"network:/osmocom:/nightly")
+proj_with_slashes() {
+ echo "$1" | sed "s.:.:/.g"
+}
+
+# $1: OBS project (e.g. "network:osmocom:nightly" -> "network_osmocom_nightly")
+proj_with_underscore() {
+ echo "$1" | tr : _
+}
+
+HTTP="http://download.opensuse.org/repositories/$(proj_with_slashes
"$PROJ")/Debian_9.0/"
+OBS="obs://build.opensuse.org/$PROJ/Debian_9.0"
check_env() {
if [ -n "$FEED" ]; then
@@ -44,6 +55,12 @@
echo "ERROR: missing environment variable \$FEED!"
exit 1
fi
+ if [ -n "$PROJ" ]; then
+ echo "Checking project: $PROJ"
+ else
+ echo "ERROR: missing environment variable \$PROJ!"
+ exit 1
+ fi
if [ -n "$DISTRO" ]; then
echo "Linux distribution: $DISTRO"
else
@@ -60,16 +77,18 @@
}
configure_osmocom_repo_centos8() {
+ local
baseurl="https://download.opensuse.org/repositories/$(proj_with_slashes
"$PROJ")/CentOS_8"
+
echo "Configuring Osmocom repository"
# Generate this file, based on the feed:
#
https://download.opensuse.org/repositories/network:osmocom:latest/CentOS_8/network:osmocom:latest.repo
- cat << EOF > /etc/yum.repos.d/network:osmocom:$FEED.repo
-[network_osmocom_$FEED]
+ cat << EOF > "/etc/yum.repos.d/$PROJ.repo"
+[$(proj_with_underscore "$PROJ")]
name=$FEED packages of the Osmocom project (CentOS_8)
type=rpm-md
-baseurl=https://download.opensuse.org/repositories/network:/osmocom:/$FEED/CentOS_8/
+baseurl=$baseurl/
gpgcheck=1
-gpgkey=https://download.opensuse.org/repositories/network:/osmocom:/$FEED/CentOS_8/repodata/repomd.xml.key
+gpgkey=$baseurl/repodata/repomd.xml.key
enabled=1
EOF
}
@@ -124,7 +143,7 @@
# Get a list of all packages from the repository
LANG=C.UTF-8 repoquery \
--quiet \
- --repoid="network_osmocom_$FEED" \
+ --repoid="$(proj_with_underscore "$PROJ")" \
--archlist="x86_64,noarch" \
--qf="%{name}" \
>
Change in osmo-ci[master]: repo-install-test: add test_conflict
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/22335 )
Change subject: repo-install-test: add test_conflict
..
repo-install-test: add test_conflict
Install one Osmocom package from one package feed and attempt to install
a second package from a different feed. Verify that the package manager
exits with error and mentions the conflict in its output.
Related: OS#4733
Change-Id: Icf2a3a1d1de2ff42b1dc9aadf2075e5e1ff40291
---
M scripts/repo-install-test.sh
M scripts/repo-install-test/run-inside-docker.sh
2 files changed, 107 insertions(+), 0 deletions(-)
Approvals:
osmith: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh
index 71e55d7..7585509 100755
--- a/scripts/repo-install-test.sh
+++ b/scripts/repo-install-test.sh
@@ -3,6 +3,7 @@
# * INTERACTIVE: set to 1 to keep an interactive shell open after the script
ran (for debugging)
# * FEED: binary package feed (e.g. "latest", "nightly")
# * PROJ: OBS project namespace (e.g. "network:osmocom:latest")
+# * PROJ_CONFLICT: Conflicting OBS project namespace (e.g.
"network:osmocom:nightly")
# * KEEP_CACHE: set to 1 to keep downloaded binary packages (for development)
# * TESTS: which tests to run (all by default, see below for possible values)
. "$(dirname "$0")/common.sh"
@@ -23,12 +24,31 @@
if [ -z "$TESTS" ]; then
TESTS="
+ test_conflict
install_repo_packages
test_binaries
services_check
"
fi
+if [ -z "$PROJ_CONFLICT" ]; then
+ case "$FEED" in
+ latest)
+ PROJ_CONFLICT="network:osmocom:nightly"
+ ;;
+ nightly)
+ PROJ_CONFLICT="network:osmocom:latest"
+ if [ "$DISTRO" = "centos8" ]; then
+ # Doesn't have packages built for "latest" yet
+ PROJ_CONFLICT="network:osmocom:next"
+ fi
+ ;;
+ next)
+ PROJ_CONFLICT="network:osmocom:nightly"
+ ;;
+ esac
+fi
+
# Try to run "systemctl status" 10 times, kill the container on failure
check_if_systemd_is_running() {
for i in $(seq 1 10); do
@@ -66,6 +86,7 @@
--name "$CONTAINER" \
-e FEED="$FEED" \
-e PROJ="$PROJ" \
+ -e PROJ_CONFLICT="$PROJ_CONFLICT" \
-e DISTRO="$DISTRO" \
-e TESTS="$TESTS" \
-e container=docker \
diff --git a/scripts/repo-install-test/run-inside-docker.sh
b/scripts/repo-install-test/run-inside-docker.sh
index 79dd3cf..f7d1449 100755
--- a/scripts/repo-install-test/run-inside-docker.sh
+++ b/scripts/repo-install-test/run-inside-docker.sh
@@ -2,6 +2,7 @@
# Environment variables:
# * FEED: binary package feed (e.g. "latest", "nightly")
# * PROJ: OBS project namespace (e.g. "network:osmocom:latest")
+# * PROJ_CONFLICT: Conflicting OBS project namespace (e.g.
"network:osmocom:nightly")
# * KEEP_CACHE: set to 1 to keep downloaded binary packages (for development)
# * DISTRO: linux distribution name (e.g. "debian", "centos")
# * TESTS: which tests to run (see repo-install-test.sh)
@@ -59,6 +60,12 @@
echo "ERROR: missing environment variable \$PROJ!"
exit 1
fi
+ if [ -n "$PROJ_CONFLICT" ]; then
+ echo "Checking conflicting project: $PROJ_CONFLICT"
+ else
+ echo "ERROR: missing environment variable \$PROJ_CONFLICT!"
+ exit 1
+ fi
if [ -n "$DISTRO" ]; then
echo "Linux distribution: $DISTRO"
else
@@ -92,6 +99,12 @@
}
# $1: OBS project (e.g. "network:osmocom:nightly")
+configure_osmocom_repo_debian_remove() {
+ local proj="$1"
+ rm "/etc/apt/sources.list.d/$proj.list"
+}
+
+# $1: OBS project (e.g. "network:osmocom:nightly")
configure_osmocom_repo_centos8() {
local proj="$1"
local
baseurl="https://download.opensuse.org/repositories/$(proj_with_slashes
"$proj")/CentOS_8"
@@ -110,6 +123,12 @@
EOF
}
+# $1: OBS project (e.g. "network:osmocom:nightly")
+configure_osmocom_repo_centos8_remove() {
+ local proj="$1"
+ rm "/etc/yum.repos.d/$proj.repo"
+}
+
configure_keep_cache_debian() {
if [ -z "$KEEP_CACHE" ]; then
return
@@ -130,6 +149,70 @@
echo "keepcache=1" >> /etc/dnf/dnf.conf
}
+# $1: file
+# $2-n: patterns to look for in file with grep
+find_patterns_or_exit() {
+ local file="$1"
+ local pattern
+ shift
+
+ for pattern in "$@"; do
+ if grep -q "$pattern" "$file"; then
+ continue
+ fi
+
+ echo
Change in osmo-ci[master]: repo-install-test: download/add deb release key
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/22332 )
Change subject: repo-install-test: download/add deb release key
..
repo-install-test: download/add deb release key
Download and add the release key for the debian repository from OBS.
This is useful for manually testing the existing tests with a different
PROJ for debugging, and it will be used by a future conflict test to
install a second repository (e.g. nightly and latest at the same time).
Note that this is not needed for rpm, because the dnf package manager
automatically downloads the key if it is missing.
Related: OS#4733
Change-Id: I91e7a208d8f5cb50f8baa2fde0eb979aae91da8f
---
M scripts/repo-install-test/run-inside-docker.sh
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, approved; Verified
diff --git a/scripts/repo-install-test/run-inside-docker.sh
b/scripts/repo-install-test/run-inside-docker.sh
index 3dd3101..652fcd1 100755
--- a/scripts/repo-install-test/run-inside-docker.sh
+++ b/scripts/repo-install-test/run-inside-docker.sh
@@ -67,10 +67,19 @@
}
configure_osmocom_repo_debian() {
- local
http="http://download.opensuse.org/repositories/$(proj_with_slashes
"$PROJ")/Debian_9.0/"
+ local obs_repo="download.opensuse.org/repositories/$(proj_with_slashes
"$PROJ")/Debian_9.0/"
+ local release_key="/var/cache/apt/${PROJ}_Release.key"
echo "Configuring Osmocom repository"
- echo "deb $http ./" > "/etc/apt/sources.list.d/$PROJ.list"
+ echo "deb http://$obs_repo ./" > "/etc/apt/sources.list.d/$PROJ.list"
+
+ # Add repository key
+ if ! [ -e "$release_key" ]; then
+ apt install -y wget
+ wget -O "$release_key" "https://$obs_repo/Release.key;
+ fi
+ apt-key add "$release_key"
+
apt-get update
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22332
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I91e7a208d8f5cb50f8baa2fde0eb979aae91da8f
Gerrit-Change-Number: 22332
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ci[master]: repo-install-test: cfg_osmocom_repo: add PROJ arg
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/22333 )
Change subject: repo-install-test: cfg_osmocom_repo: add PROJ arg
..
repo-install-test: cfg_osmocom_repo: add PROJ arg
Prepare for future conflicts test, which will configure repositories
with a different PROJ.
Related: OS#4733
Change-Id: Ib9946b5a02f8692efc8515907ba84048026474f9
---
M scripts/repo-install-test/run-inside-docker.sh
1 file changed, 12 insertions(+), 8 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
osmith: Verified
diff --git a/scripts/repo-install-test/run-inside-docker.sh
b/scripts/repo-install-test/run-inside-docker.sh
index 652fcd1..b10c97d 100755
--- a/scripts/repo-install-test/run-inside-docker.sh
+++ b/scripts/repo-install-test/run-inside-docker.sh
@@ -66,12 +66,14 @@
fi
}
+# $1: OBS project (e.g. "network:osmocom:nightly")
configure_osmocom_repo_debian() {
- local obs_repo="download.opensuse.org/repositories/$(proj_with_slashes
"$PROJ")/Debian_9.0/"
- local release_key="/var/cache/apt/${PROJ}_Release.key"
+ local proj="$1"
+ local obs_repo="download.opensuse.org/repositories/$(proj_with_slashes
"$proj")/Debian_9.0/"
+ local release_key="/var/cache/apt/${proj}_Release.key"
echo "Configuring Osmocom repository"
- echo "deb http://$obs_repo ./" > "/etc/apt/sources.list.d/$PROJ.list"
+ echo "deb http://$obs_repo ./" > "/etc/apt/sources.list.d/$proj.list"
# Add repository key
if ! [ -e "$release_key" ]; then
@@ -83,15 +85,17 @@
apt-get update
}
+# $1: OBS project (e.g. "network:osmocom:nightly")
configure_osmocom_repo_centos8() {
- local
baseurl="https://download.opensuse.org/repositories/$(proj_with_slashes
"$PROJ")/CentOS_8"
+ local proj="$1"
+ local
baseurl="https://download.opensuse.org/repositories/$(proj_with_slashes
"$proj")/CentOS_8"
echo "Configuring Osmocom repository"
# Generate this file, based on the feed:
#
https://download.opensuse.org/repositories/network:osmocom:latest/CentOS_8/network:osmocom:latest.repo
- cat << EOF > "/etc/yum.repos.d/$PROJ.repo"
-[$(proj_with_underscore "$PROJ")]
-name=$PROJ
+ cat << EOF > "/etc/yum.repos.d/$proj.repo"
+[$(proj_with_underscore "$proj")]
+name=$proj
type=rpm-md
baseurl=$baseurl/
gpgcheck=1
@@ -239,7 +243,7 @@
check_env
configure_keep_cache_${DISTRO}
-configure_osmocom_repo_${DISTRO}
+configure_osmocom_repo_${DISTRO} "$PROJ"
install_repo_packages_${DISTRO}
test_binaries
services_check
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22333
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ib9946b5a02f8692efc8515907ba84048026474f9
Gerrit-Change-Number: 22333
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ci[master]: repo-install-test: add TESTS variable
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/22334 )
Change subject: repo-install-test: add TESTS variable
..
repo-install-test: add TESTS variable
Allow to enable only certain tests during development.
Related: OS#4733
Change-Id: I8d817f47d790e4cdc25c5182a0e91b66a00fbf52
---
M scripts/repo-install-test.sh
M scripts/repo-install-test/run-inside-docker.sh
2 files changed, 42 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
osmith: Verified
diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh
index a785b74..71e55d7 100755
--- a/scripts/repo-install-test.sh
+++ b/scripts/repo-install-test.sh
@@ -4,6 +4,7 @@
# * FEED: binary package feed (e.g. "latest", "nightly")
# * PROJ: OBS project namespace (e.g. "network:osmocom:latest")
# * KEEP_CACHE: set to 1 to keep downloaded binary packages (for development)
+# * TESTS: which tests to run (all by default, see below for possible values)
. "$(dirname "$0")/common.sh"
# Show usage
@@ -20,6 +21,14 @@
PROJ="${PROJ:-network:osmocom:$FEED}"
CONTAINER="$DISTRO-repo-install-test-$FEED"
+if [ -z "$TESTS" ]; then
+ TESTS="
+ install_repo_packages
+ test_binaries
+ services_check
+ "
+fi
+
# Try to run "systemctl status" 10 times, kill the container on failure
check_if_systemd_is_running() {
for i in $(seq 1 10); do
@@ -58,6 +67,7 @@
-e FEED="$FEED" \
-e PROJ="$PROJ" \
-e DISTRO="$DISTRO" \
+ -e TESTS="$TESTS" \
-e container=docker \
--tmpfs /run \
--tmpfs /run/lock \
diff --git a/scripts/repo-install-test/run-inside-docker.sh
b/scripts/repo-install-test/run-inside-docker.sh
index b10c97d..79dd3cf 100755
--- a/scripts/repo-install-test/run-inside-docker.sh
+++ b/scripts/repo-install-test/run-inside-docker.sh
@@ -4,6 +4,7 @@
# * PROJ: OBS project namespace (e.g. "network:osmocom:latest")
# * KEEP_CACHE: set to 1 to keep downloaded binary packages (for development)
# * DISTRO: linux distribution name (e.g. "debian", "centos")
+# * TESTS: which tests to run (see repo-install-test.sh)
# Systemd services that must start up successfully after installing all
packages (OS#3369)
# Disabled services:
@@ -64,6 +65,11 @@
echo "ERROR: missing environment variable \$DISTRO!"
exit 1
fi
+ if [ -n "$TESTS" ]; then
+ echo "Enabled tests: $TESTS"
+ else
+ echo "ERROR: missing environment variable \$TESTS!"
+ fi
}
# $1: OBS project (e.g. "network:osmocom:nightly")
@@ -244,6 +250,29 @@
check_env
configure_keep_cache_${DISTRO}
configure_osmocom_repo_${DISTRO} "$PROJ"
-install_repo_packages_${DISTRO}
-test_binaries
-services_check
+
+for test in $TESTS; do
+ set +x
+ echo
+ echo "### Running test: $test ###"
+ echo
+ set -x
+
+ case "$test" in
+ install_repo_packages)
+ install_repo_packages_${DISTRO}
+ ;;
+ test_binaries)
+ # install_repo_packages must run first!
+ test_binaries
+ ;;
+ services_check)
+ # install_repo_packages must run first!
+ services_check
+ ;;
+ *)
+ echo "ERROR: unknown test: $test"
+ exit 1
+ ;;
+ esac
+done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22334
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I8d817f47d790e4cdc25c5182a0e91b66a00fbf52
Gerrit-Change-Number: 22334
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ci[master]: repo-install-test: don't use $FEED in centos8 repo
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22331 ) Change subject: repo-install-test: don't use $FEED in centos8 repo .. repo-install-test: don't use $FEED in centos8 repo Use $PROJ instead of $FEED in the repository name, so we can add $PROJ as parameter to the repo configuration functions later without worrying about having a matching $FEED. Related: OS#4733 Change-Id: Ic316add6b2d9b6f50335cad762628bb16da61d82 --- M scripts/repo-install-test/run-inside-docker.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Verified diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index ee148c8..3dd3101 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -82,7 +82,7 @@ # https://download.opensuse.org/repositories/network:osmocom:latest/CentOS_8/network:osmocom:latest.repo cat << EOF > "/etc/yum.repos.d/$PROJ.repo" [$(proj_with_underscore "$PROJ")] -name=$FEED packages of the Osmocom project (CentOS_8) +name=$PROJ type=rpm-md baseurl=$baseurl/ gpgcheck=1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic316add6b2d9b6f50335cad762628bb16da61d82 Gerrit-Change-Number: 22331 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ci[master]: repo-install-test: don't use $FEED in centos8 repo
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22331 ) Change subject: repo-install-test: don't use $FEED in centos8 repo .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic316add6b2d9b6f50335cad762628bb16da61d82 Gerrit-Change-Number: 22331 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:32:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: add TESTS variable
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22334 ) Change subject: repo-install-test: add TESTS variable .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8d817f47d790e4cdc25c5182a0e91b66a00fbf52 Gerrit-Change-Number: 22334 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:33:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: cfg_osmocom_repo: add PROJ arg
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22333 ) Change subject: repo-install-test: cfg_osmocom_repo: add PROJ arg .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib9946b5a02f8692efc8515907ba84048026474f9 Gerrit-Change-Number: 22333 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:32:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: make HTTP, OBS vars local
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22329 ) Change subject: repo-install-test: make HTTP, OBS vars local .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1dfddbd9311d741c03ceedb12aee9aeae6abdab8 Gerrit-Change-Number: 22329 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:32:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: put $PROJ in sources.list name
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22330 ) Change subject: repo-install-test: put $PROJ in sources.list name .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8926443a9ff70f285d9467d39658e64456972b07 Gerrit-Change-Number: 22330 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:32:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: add PROJ variable
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22328 ) Change subject: repo-install-test: add PROJ variable .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0ac05a79ad65b5664b5ba37227b65e3b1422a4bf Gerrit-Change-Number: 22328 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:32:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: tweak FEED syntax
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22327 ) Change subject: repo-install-test: tweak FEED syntax .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icb36da91a6dc52529c2087b0961c1b698076eea1 Gerrit-Change-Number: 22327 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 20 Jan 2021 15:32:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: download/add deb release key
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22332 ) Change subject: repo-install-test: download/add deb release key .. Patch Set 1: Verified+1 Code-Review+2 (1 comment) 1+1=2 https://gerrit.osmocom.org/c/osmo-ci/+/22332/1/scripts/repo-install-test/run-inside-docker.sh File scripts/repo-install-test/run-inside-docker.sh: https://gerrit.osmocom.org/c/osmo-ci/+/22332/1/scripts/repo-install-test/run-inside-docker.sh@a70 PS1, Line 70: Debian_9 > unrelated to this patch: IT might make sense to switch to Debian_10 > Debian_9. […] Right. I'll prepare a patch and test it, shouldn't be much effort. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I91e7a208d8f5cb50f8baa2fde0eb979aae91da8f Gerrit-Change-Number: 22332 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:32:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in libosmocore[master]: WIP: gprs_ns2: rework logging of Rx and Tx NS PDU
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22294 ) Change subject: WIP: gprs_ns2: rework logging of Rx and Tx NS PDU .. Patch Set 10: need to use LOGNSVC from laforge -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I34b8fde2955ecc010d1dcd9512e1bba9211e2c0d Gerrit-Change-Number: 22294 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:32:31 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_vc_fsm: check NSVCI match the NSE
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22340 ) Change subject: gprs_ns2_vc_fsm: check NSVCI match the NSE .. Patch Set 1: Code-Review-1 need to use LOGNSVC from laforge -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8518bdb03e9e33b04b77a2a346d04c5d29544a6c Gerrit-Change-Number: 22340 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 20 Jan 2021 15:32:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_vc_fsm: check NSEI match the NSE
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22325 ) Change subject: gprs_ns2_vc_fsm: check NSEI match the NSE .. Patch Set 2: Code-Review-1 need to use LOGNSVC from laforge -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic8fc49d850490feb0ff69171a6b0881ae8696c0b Gerrit-Change-Number: 22325 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:32:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_vc_fsm: check NSVCI match the NSE
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/22340 )
Change subject: gprs_ns2_vc_fsm: check NSVCI match the NSE
..
gprs_ns2_vc_fsm: check NSVCI match the NSE
The NSVCI must match the PDUs. The only exception is a RESET with
dialect ipaccess. However those will be handled later.
Change-Id: I8518bdb03e9e33b04b77a2a346d04c5d29544a6c
---
M src/gb/gprs_ns2_vc_fsm.c
1 file changed, 15 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/22340/1
diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index ca33ade..3d22fd6 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -750,11 +750,10 @@
struct osmo_fsm_inst *fi = nsvc->fi;
int rc = 0;
uint8_t cause;
- uint16_t nsei;
+ uint16_t nsei, nsvci;
/* TODO: 7.2: on UNBLOCK/BLOCK: check if NS-VCI is correct,
* if not answer STATUS with "NS-VC unknown" */
- /* TODO: handle RESET with different VCI */
/* TODO: handle BLOCK/UNBLOCK/ALIVE with different VCI */
if (gprs_ns2_validate(nsvc, nsh->pdu_type, msg, tp, )) {
@@ -777,6 +776,20 @@
}
}
+ if (nsvc->nsvci_is_valid && TLVP_PRESENT(tp, NS_IE_VCI)) {
+ nsvci = tlvp_val16be(tp, NS_IE_VCI);
+ if (nsvci != nsvc->nsvci) {
+ /* 48.016 § 7.3.1 send RESET_ACK to wrong NSVCI +
ignore */
+ if (nsh->pdu_type == NS_PDUT_RESET)
+ ns2_tx_reset_ack(nsvc);
+
+ LOGP(DLNS, LOGL_ERROR, "NSEI=%05u (NSVCI=%05u) Rx %s
with wrong NSVCI=%05u. Ignoring PDU.\n",
+nsvc->nse->nsei, nsvc->nsvci,
+get_value_string(gprs_ns_pdu_strings,
nsh->pdu_type), nsvci);
+ goto out;
+ }
+ }
+
switch (nsh->pdu_type) {
case NS_PDUT_RESET:
osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_RESET, tp);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22340
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I8518bdb03e9e33b04b77a2a346d04c5d29544a6c
Gerrit-Change-Number: 22340
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus
Gerrit-MessageType: newchange
Change in libosmocore[master]: WIP: gprs_ns2: rework logging of Rx and Tx NS PDU
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22294 to look at the new patch set (#10). Change subject: WIP: gprs_ns2: rework logging of Rx and Tx NS PDU .. WIP: gprs_ns2: rework logging of Rx and Tx NS PDU Unify log messages so all log messages look similiar. Log also Rx PDUs. Ensure dropped Tx packets (BLOCK/RESET on SNS) contain *Tx*. TODO: use LOGNSVC Change-Id: I34b8fde2955ecc010d1dcd9512e1bba9211e2c0d --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_message.c 3 files changed, 33 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/22294/10 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I34b8fde2955ecc010d1dcd9512e1bba9211e2c0d Gerrit-Change-Number: 22294 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gprs_ns2_vc_fsm: check NSEI match the NSE
Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22325 to look at the new patch set (#2). Change subject: gprs_ns2_vc_fsm: check NSEI match the NSE .. gprs_ns2_vc_fsm: check NSEI match the NSE The NSE must match the PDUs. The only exception is a RESET with dialect ipaccess. However those will be handled later. Change-Id: Ic8fc49d850490feb0ff69171a6b0881ae8696c0b --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/22325/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic8fc49d850490feb0ff69171a6b0881ae8696c0b Gerrit-Change-Number: 22325 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gprs_ns2_message: remove wrong comment
Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22317 to look at the new patch set (#7). Change subject: gprs_ns2_message: remove wrong comment .. gprs_ns2_message: remove wrong comment It's a leftover from converting NS1 -> NS2 code Change-Id: I934c7905f8396e74bb1f14d68097c03463816720 --- M src/gb/gprs_ns2_message.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/22317/7 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I934c7905f8396e74bb1f14d68097c03463816720 Gerrit-Change-Number: 22317 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gprs_ns2: rework logging of Rx and Tx NS PDU
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22294 ) Change subject: gprs_ns2: rework logging of Rx and Tx NS PDU .. Patch Set 9: > Patch Set 9: > > unfortunately conflicts with my (later) > https://gerrit.osmocom.org/c/libosmocore/+/22337 > > As your log macro is more specific than the general ones I introduce, I wuuld > suppose it's best to rebase your change on top of mine? ok. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I34b8fde2955ecc010d1dcd9512e1bba9211e2c0d Gerrit-Change-Number: 22294 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:24:16 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: add TESTS variable
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22334 ) Change subject: repo-install-test: add TESTS variable .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8d817f47d790e4cdc25c5182a0e91b66a00fbf52 Gerrit-Change-Number: 22334 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:14:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: cfg_osmocom_repo: add PROJ arg
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22333 ) Change subject: repo-install-test: cfg_osmocom_repo: add PROJ arg .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib9946b5a02f8692efc8515907ba84048026474f9 Gerrit-Change-Number: 22333 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:14:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: download/add deb release key
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22332 ) Change subject: repo-install-test: download/add deb release key .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I91e7a208d8f5cb50f8baa2fde0eb979aae91da8f Gerrit-Change-Number: 22332 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:13:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Ignore dummy rlcmac packets in f_ms_rx_pkt_ass_pacch
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313 )
Change subject: pcu: Ignore dummy rlcmac packets in f_ms_rx_pkt_ass_pacch
..
Patch Set 1:
(1 comment)
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313/1/pcu/GPRS_Components.ttcn
File pcu/GPRS_Components.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313/1/pcu/GPRS_Components.ttcn@512
PS1, Line 512: as_ms_rx_pkt_ass_pacch
I am sorry, but this altstep is pretty much useless for anything else than
f_ms_rx_pkt_ass_pacch().
Imagine you have an 'alt' statement with several altsteps:
alt {
[] as_ms_rx_pkt_ass_pacch(...);
[] as_ms_rx_pkt_foo(...);
[] as_ms_rx_pkt_bar(...);
}
Due to 'repeat' statement in as_ms_rx_pkt_ass_pacch(), other altsteps will
never be executed.
This is a case where decmatch() would probably do the trick.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I0a10d3a7383d8534e9263864b4130a96392e6198
Gerrit-Change-Number: 22313
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-CC: fixeria
Gerrit-Comment-Date: Wed, 20 Jan 2021 15:12:52 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: don't use $FEED in centos8 repo
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22331 ) Change subject: repo-install-test: don't use $FEED in centos8 repo .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic316add6b2d9b6f50335cad762628bb16da61d82 Gerrit-Change-Number: 22331 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:12:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: don't use $FEED in centos8 repo
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22331 ) Change subject: repo-install-test: don't use $FEED in centos8 repo .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic316add6b2d9b6f50335cad762628bb16da61d82 Gerrit-Change-Number: 22331 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:12:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: put $PROJ in sources.list name
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22330 ) Change subject: repo-install-test: put $PROJ in sources.list name .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8926443a9ff70f285d9467d39658e64456972b07 Gerrit-Change-Number: 22330 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:12:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: make HTTP, OBS vars local
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22329 ) Change subject: repo-install-test: make HTTP, OBS vars local .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1dfddbd9311d741c03ceedb12aee9aeae6abdab8 Gerrit-Change-Number: 22329 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:11:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: make HTTP, OBS vars local
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22329 ) Change subject: repo-install-test: make HTTP, OBS vars local .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1dfddbd9311d741c03ceedb12aee9aeae6abdab8 Gerrit-Change-Number: 22329 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Jan 2021 15:11:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
