[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Log command used to record packets
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Log command used to record packets .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 Gerrit-Change-Number: 36866 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 07:05:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Log command used to record packets
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Log command used to record packets .. Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 Gerrit-Change-Number: 36866 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 07:06:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Log command used to record packets
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Log command used to record packets .. Patch Set 1: (1 comment) File ttcn3-tcpdump-start.sh: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866/comment/9fbbccb0_2a801040 PS1, Line 88: echo $CMD_STR should be ``` echo "$CMD_STR" ``` Otherwise `>$CMD_OUTFILE 2>$FIFO &` will be applied here AFAIK, redirect stdout and stderr, and run in background. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 Gerrit-Change-Number: 36866 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 07:08:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pc...
Attention is currently required from: Hoernchen, laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pcap parent dir .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If8ea5bb62f4866042761d3e08fe83179bf10c75a Gerrit-Change-Number: 36867 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: Hoernchen Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 07:14:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: asterisk: Compute nonce from rand and autn params
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36868?usp=email ) Change subject: asterisk: Compute nonce from rand and autn params .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36868?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2809eec496a1c2c2b5f6e3d5d3bb1c33a788bd58 Gerrit-Change-Number: 36868 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 07:15:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: asterisk: Asterisk_Tests.default: Improve mtc logging
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36869?usp=email ) Change subject: asterisk: Asterisk_Tests.default: Improve mtc logging .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36869?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id7ad0230b50d301e60f636a3b983a315112e4042 Gerrit-Change-Number: 36869 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 07:16:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: asterisk: Delay test start until FullyBooted event is received in AMI
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email ) Change subject: asterisk: Delay test start until FullyBooted event is received in AMI .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I65f56bcee332f4ae9ffc71ad7119c378ca1649dc Gerrit-Change-Number: 36870 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 07:17:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: expect TC_data_rtp_tchf144 to fail
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36873?usp=email ) Change subject: bts: expected-results.xml: expect TC_data_rtp_tchf144 to fail .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36873?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I02aa92f2ddb99b86f5c692319c57dd926c295da1 Gerrit-Change-Number: 36873 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 08:34:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: expect all LAPDm testcases to pass
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36874?usp=email ) Change subject: bts: expected-results.xml: expect all LAPDm testcases to pass .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36874?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2e9dcf6d06cd5aa51294769ac492a968c4f86e7d Gerrit-Change-Number: 36874 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 08:35:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: asterisk: Compute nonce from rand and autn params
Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36868?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: asterisk: Compute nonce from rand and autn params .. asterisk: Compute nonce from rand and autn params Change-Id: I2809eec496a1c2c2b5f6e3d5d3bb1c33a788bd58 --- M asterisk/IMS_ConnectionHandler.ttcn M asterisk/gen_links.sh M asterisk/regen_makefile.sh 3 files changed, 25 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/36868/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36868?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2809eec496a1c2c2b5f6e3d5d3bb1c33a788bd58 Gerrit-Change-Number: 36868 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Log command used to record packets
Attention is currently required from: pespin. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ttcn3-tcpdump-start.sh: Log command used to record packets .. ttcn3-tcpdump-start.sh: Log command used to record packets Change-Id: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 --- M ttcn3-tcpdump-start.sh 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/36866/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 Gerrit-Change-Number: 36866 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: asterisk: Asterisk_Tests.default: Improve mtc logging
Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36869?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: asterisk: Asterisk_Tests.default: Improve mtc logging .. asterisk: Asterisk_Tests.default: Improve mtc logging Change-Id: Id7ad0230b50d301e60f636a3b983a315112e4042 --- M asterisk/Asterisk_Tests.default 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/36869/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36869?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id7ad0230b50d301e60f636a3b983a315112e4042 Gerrit-Change-Number: 36869 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Delay test start until FullyBooted event is received in AMI
Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by osmith, Verified-1 by Jenkins Builder Change subject: asterisk: Delay test start until FullyBooted event is received in AMI .. asterisk: Delay test start until FullyBooted event is received in AMI Change-Id: I65f56bcee332f4ae9ffc71ad7119c378ca1649dc --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.ttcn 2 files changed, 50 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/36870/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I65f56bcee332f4ae9ffc71ad7119c378ca1649dc Gerrit-Change-Number: 36870 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: expect TC_data_rtp_tchf144 to fail
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36873?usp=email ) Change subject: bts: expected-results.xml: expect TC_data_rtp_tchf144 to fail .. bts: expected-results.xml: expect TC_data_rtp_tchf144 to fail Change-Id: I02aa92f2ddb99b86f5c692319c57dd926c295da1 Related: OS#6167 --- M bts/expected-results.xml 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/expected-results.xml b/bts/expected-results.xml index a856fca..9157f37 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -182,7 +182,12 @@ - + +Rx unexpected RSL port message: MASKED + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_data_rtp_tchf144 testcase + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36873?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I02aa92f2ddb99b86f5c692319c57dd926c295da1 Gerrit-Change-Number: 36873 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: add missing testcases
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36875?usp=email ) Change subject: bts: expected-results.xml: add missing testcases .. bts: expected-results.xml: add missing testcases Change-Id: I10f6b3f2b201338b2839a6f16edd450e4968b0eb --- M bts/expected-results.xml 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 0d6dab2..c06f328 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -102,6 +102,7 @@ + @@ -261,4 +262,9 @@ + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36875?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I10f6b3f2b201338b2839a6f16edd450e4968b0eb Gerrit-Change-Number: 36875 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: add missing testcases
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36875?usp=email ) Change subject: bts: expected-results.xml: add missing testcases .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36875?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I10f6b3f2b201338b2839a6f16edd450e4968b0eb Gerrit-Change-Number: 36875 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 08:35:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: expect all LAPDm testcases to pass
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36874?usp=email ) Change subject: bts: expected-results.xml: expect all LAPDm testcases to pass .. bts: expected-results.xml: expect all LAPDm testcases to pass Change-Id: I2e9dcf6d06cd5aa51294769ac492a968c4f86e7d Related: OS#5971 -- TC_sabm_ua_dcch_sapi0_nopayload Related: OS#5970 -- TC_sabm_retransmit_bts Related: OS#5969 -- TC_ns_seq_error Related: OS#5968 -- TC_nr_seq_error --- M bts/expected-results.xml 1 file changed, 17 insertions(+), 24 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 9157f37..0d6dab2 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -225,39 +225,19 @@ - -Initial SABM/UA must contain L3 payload but BTS accepts without - BTS_Tests_LAPDm.ttcn:MASKED BTS_Tests_LAPDm control part - BTS_Tests_LAPDm.ttcn:MASKED TC_sabm_ua_dcch_sapi0_nopayload testcase - - + - -Incorrect number of SABM re-transmissions of observed: 7 - BTS_Tests_LAPDm.ttcn:MASKED BTS_Tests_LAPDm control part - BTS_Tests_LAPDm.ttcn:MASKED TC_sabm_retransmit_bts testcase - - + - -Missing second REJ - BTS_Tests_LAPDm.ttcn:MASKED BTS_Tests_LAPDm control part - BTS_Tests_LAPDm.ttcn:MASKED TC_ns_seq_error testcase - - - -Missing DISC from BTS - BTS_Tests_LAPDm.ttcn:MASKED BTS_Tests_LAPDm control part - BTS_Tests_LAPDm.ttcn:MASKED TC_nr_seq_error testcase - - + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36874?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2e9dcf6d06cd5aa51294769ac492a968c4f86e7d Gerrit-Change-Number: 36874 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Log command used to record packets
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Log command used to record packets .. Patch Set 2: Code-Review+1 (1 comment) File ttcn3-tcpdump-start.sh: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866/comment/f1c3f31f_13dbb6c8 PS1, Line 88: echo $CMD_STR > should be […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 Gerrit-Change-Number: 36866 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 08:35:50 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: SMS-over-GSUP: set log context in gsm411_gsup_rx()
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email ) Change subject: SMS-over-GSUP: set log context in gsm411_gsup_rx() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3414953d2aa7b075fcee1cf6e5e76c527ae7b507 Gerrit-Change-Number: 36861 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 08:37:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Delay test start until FullyBooted event is received in AMI
Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email ) Change subject: asterisk: Delay test start until FullyBooted event is received in AMI .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I65f56bcee332f4ae9ffc71ad7119c378ca1649dc Gerrit-Change-Number: 36870 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 08:59:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-bts-test: also execute tests from BTS_Tests_ASCI
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36872?usp=email ) Change subject: ttcn3-bts-test: also execute tests from BTS_Tests_ASCI .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36872?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bcdccb6e2c48542d6447d7757fe1d56c1bf8406 Gerrit-Change-Number: 36872 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:00:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36876?usp=email ) Change subject: ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36876?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I03f1ac2ed9ca59b90fead73fee3cf333b6146344 Gerrit-Change-Number: 36876 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:00:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: gsm411_send_rp_data(): add FIXME for MSC_CTR_SMS_DELIVERED
Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email ) Change subject: gsm411_send_rp_data(): add FIXME for MSC_CTR_SMS_DELIVERED .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5380035294d2fca481620638b59eae779670e9f8 Gerrit-Change-Number: 36862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 09:00:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-bts-test: also execute tests from BTS_Tests_ASCI
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36872?usp=email ) Change subject: ttcn3-bts-test: also execute tests from BTS_Tests_ASCI .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36872?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bcdccb6e2c48542d6447d7757fe1d56c1bf8406 Gerrit-Change-Number: 36872 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:01:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36876?usp=email ) Change subject: ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36876?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I03f1ac2ed9ca59b90fead73fee3cf333b6146344 Gerrit-Change-Number: 36876 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:01:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36876?usp=email ) Change subject: ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI .. ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI We do have 13 ASCI (VBS/VGCS) testcases in osmo-ttcn3-hacks.git, but we never executed them on Jenkins so far. Fix this. Change-Id: I03f1ac2ed9ca59b90fead73fee3cf333b6146344 --- M ttcn3-bsc-test/BSC_Tests.cfg 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg index 80e06ee..2eefc85 100644 --- a/ttcn3-bsc-test/BSC_Tests.cfg +++ b/ttcn3-bsc-test/BSC_Tests.cfg @@ -73,3 +73,4 @@ BSC_Tests.control BSC_Tests_LCLS.control BSC_Tests_CBSP.control +BSC_Tests_ASCI.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36876?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I03f1ac2ed9ca59b90fead73fee3cf333b6146344 Gerrit-Change-Number: 36876 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in docker-playground[master]: ttcn3-bts-test: also execute tests from BTS_Tests_ASCI
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36872?usp=email ) Change subject: ttcn3-bts-test: also execute tests from BTS_Tests_ASCI .. ttcn3-bts-test: also execute tests from BTS_Tests_ASCI We do have 5 ASCI (VBS/VGCS) testcases in osmo-ttcn3-hacks.git, but we never executed them on Jenkins so far. Fix this. Change-Id: I1bcdccb6e2c48542d6447d7757fe1d56c1bf8406 Related: osmo-ttcn3-hacks.git I3727c471663b731117a264f60d2f1ba5fd16928e --- M ttcn3-bts-test/generic/BTS_Tests.cfg 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/ttcn3-bts-test/generic/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg index cd1e739..a87c99f 100644 --- a/ttcn3-bts-test/generic/BTS_Tests.cfg +++ b/ttcn3-bts-test/generic/BTS_Tests.cfg @@ -27,3 +27,4 @@ BTS_Tests_SMSCB.control BTS_Tests_LAPDm.control BTS_Tests_VAMOS.control +BTS_Tests_ASCI.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36872?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bcdccb6e2c48542d6447d7757fe1d56c1bf8406 Gerrit-Change-Number: 36872 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: trxcon/l1sched: fix sending dummy TCH/A[FH]S blocks
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/36879?usp=email ) Change subject: trxcon/l1sched: fix sending dummy TCH/A[FH]S blocks .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/36879?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I26205e8672cb2849ea79bd6206c1eff1172bd9d9 Gerrit-Change-Number: 36879 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:01:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: bsc: BSC_Tests.cfg: remove commented out testcases
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36877?usp=email ) Change subject: bsc: BSC_Tests.cfg: remove commented out testcases .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36877?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibccc0d2072dc496f7f7017772eca8bed274ff1a5 Gerrit-Change-Number: 36877 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:01:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: bsc: execute ASCI tests, add them to expected-results.xml
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36878?usp=email ) Change subject: bsc: execute ASCI tests, add them to expected-results.xml .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36878?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I78a3078df06d7aa77dda983a42ca342ef939c1b6 Gerrit-Change-Number: 36878 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:02:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: bsc: execute ASCI tests, add them to expected-results.xml
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36878?usp=email ) Change subject: bsc: execute ASCI tests, add them to expected-results.xml .. bsc: execute ASCI tests, add them to expected-results.xml Change-Id: I78a3078df06d7aa77dda983a42ca342ef939c1b6 --- M bsc/BSC_Tests.cfg M bsc/expected-results.xml 2 files changed, 23 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.cfg b/bsc/BSC_Tests.cfg index 34b6033..d8ed74a 100644 --- a/bsc/BSC_Tests.cfg +++ b/bsc/BSC_Tests.cfg @@ -18,4 +18,5 @@ BSC_Tests.control BSC_Tests_LCLS.control BSC_Tests_CBSP.control +BSC_Tests_ASCI.control #BSC_Tests_OML.control diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 2d69eee..f042a8c 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -317,4 +317,17 @@ + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36878?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I78a3078df06d7aa77dda983a42ca342ef939c1b6 Gerrit-Change-Number: 36878 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: bsc: BSC_Tests.cfg: remove commented out testcases
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36877?usp=email ) Change subject: bsc: BSC_Tests.cfg: remove commented out testcases .. bsc: BSC_Tests.cfg: remove commented out testcases Change-Id: Ibccc0d2072dc496f7f7017772eca8bed274ff1a5 --- M bsc/BSC_Tests.cfg 1 file changed, 9 insertions(+), 59 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.cfg b/bsc/BSC_Tests.cfg index 5ac91b6..34b6033 100644 --- a/bsc/BSC_Tests.cfg +++ b/bsc/BSC_Tests.cfg @@ -19,62 +19,3 @@ BSC_Tests_LCLS.control BSC_Tests_CBSP.control #BSC_Tests_OML.control -#BSC_Tests.TC_chan_act_noreply -#BSC_Tests.TC_chan_act_ack_noest -#BSC_Tests.TC_chan_act_ack_est_ind_noreply -#BSC_Tests.TC_chan_act_ack_est_ind_refused -#BSC_Tests.TC_chan_act_nack -#BSC_Tests.TC_chan_exhaustion -#BSC_Tests.TC_ctrl -#BSC_Tests.TC_chan_rel_rll_rel_ind -#BSC_Tests.TC_chan_rel_conn_fail -#BSC_Tests.TC_chan_rel_hard_clear -#BSC_Tests.TC_chan_rel_hard_rlsd -#BSC_Tests.TC_chan_rel_a_reset - -#BSC_Tests.TC_rll_est_ind_inact_lchan -#BSC_Tests.TC_rll_est_ind_inval_sapi1 -#BSC_Tests.TC_rll_est_ind_inval_sapi3 -#BSC_Tests.TC_rll_est_ind_inval_sacch - -#BSC_Tests.TC_outbound_connect -#BSC_Tests.TC_assignment_cic_only -#BSC_Tests.TC_assignment_csd -#BSC_Tests.TC_assignment_ctm -#BSC_Tests.TC_assignment_sign -#BSC_Tests.TC_assignment_fr_a5_0 -#BSC_Tests.TC_assignment_fr_a5_1_codec_missing -#BSC_Tests.TC_assignment_fr_a5_1 -#BSC_Tests.TC_assignment_fr_a5_3 -#BSC_Tests.TC_assignment_fr_a5_4 - -#BSC_Tests.TC_paging_imsi_nochan -#BSC_Tests.TC_paging_tmsi_nochan -#BSC_Tests.TC_paging_tmsi_any -#BSC_Tests.TC_paging_tmsi_sdcch -#BSC_Tests.TC_paging_tmsi_tch_f -#BSC_Tests.TC_paging_tmsi_tch_hf -#BSC_Tests.TC_paging_imsi_nochan_cgi -#BSC_Tests.TC_paging_imsi_nochan_lac_ci -#BSC_Tests.TC_paging_imsi_nochan_ci -#BSC_Tests.TC_paging_imsi_nochan_lai -#BSC_Tests.TC_paging_imsi_nochan_lac -#BSC_Tests.TC_paging_imsi_nochan_all -#BSC_Tests.TC_paging_imsi_nochan_plmn_lac_rnc -#BSC_Tests.TC_paging_imsi_nochan_rnc -#BSC_Tests.TC_paging_imsi_nochan_lac_rnc -#BSC_Tests.TC_paging_imsi_nochan_lacs -#BSC_Tests.TC_paging_imsi_nochan_lacs_empty -#BSC_Tests.TC_paging_imsi_a_reset -#BSC_Tests.TC_paging_imsi_load -#BSC_Tests.TC_paging_counter -#BSC_Tests.TC_paging_imsi_nochan_cgi_unknown_cid -#BSC_Tests.TC_rsl_drop_counter -#BSC_Tests.TC_classmark -#BSC_Tests.TC_unsol_ass_fail -#BSC_Tests.TC_unsol_ass_compl -#BSC_Tests.TC_unsol_ho_fail -#BSC_Tests.TC_err_82_short_msg -#BSC_Tests.TC_err_84_unknown_msg -#BSC_Tests.TC_ho_int -#BSC_Tests.TC_chopped_ipa_ping -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36877?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibccc0d2072dc496f7f7017772eca8bed274ff1a5 Gerrit-Change-Number: 36877 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Log command used to record packets
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Log command used to record packets .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 Gerrit-Change-Number: 36866 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 09:02:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pc...
Attention is currently required from: Hoernchen, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pcap parent dir .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If8ea5bb62f4866042761d3e08fe83179bf10c75a Gerrit-Change-Number: 36867 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: Hoernchen Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 09:03:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Delay test start until FullyBooted event is received in AMI
Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email ) Change subject: asterisk: Delay test start until FullyBooted event is received in AMI .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I65f56bcee332f4ae9ffc71ad7119c378ca1649dc Gerrit-Change-Number: 36870 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 09:03:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pc...
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pcap parent dir .. ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pcap parent dir dumpcap seems to be opening the pcap file it writes to *after* dropping privileges, which means even if running it as root, it will fail to create the pcap file inside a directory where that same user (even if root) doesn't have write+execute permissions. This is exactly what happens when one tries to run the ttcn3-tcmpdump-start.sh script inside docker with "--cap-add=NET_ADMIN --cap-add=SYS_RESOURCE" and root user, where it then tells dumpcap to write to a volume mounted inside docker which was created by the user outside user, hence with UID=1000 instead of UID=0 inside docker. Since tcpdump works fine in this setup, simply skip using dumpcap if it would fail to create the pcap file. Related: OS#6455 Change-Id: If8ea5bb62f4866042761d3e08fe83179bf10c75a --- M ttcn3-tcpdump-start.sh 1 file changed, 30 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 8b75d0e..4068b26 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -62,7 +62,12 @@ fi if [ -u $DUMPCAP -o "$CAP_ERR" = "0" ]; then - CMD="$DUMPCAP -q" + # dumpcap, *after dropping permissions*, needs to be able to write to the directory to create the pcap file: + if [ "$(stat -L -c "%u" "$TTCN3_PCAP_PATH")" = "$(id -u)" ] && [ "$(stat -L -c "%A" "$TTCN3_PCAP_PATH" | head -c 4)" = "drwx" ]; then + CMD="$DUMPCAP -q" + else + echo "NOTE: unable to use dumpcap due to missing permissions in $TTCN3_PCAP_PATH" + fi else echo "NOTE: unable to use dumpcap due to missing capabilities or suid bit" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If8ea5bb62f4866042761d3e08fe83179bf10c75a Gerrit-Change-Number: 36867 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: asterisk: Compute nonce from rand and autn params
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36868?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: asterisk: Compute nonce from rand and autn params
..
asterisk: Compute nonce from rand and autn params
Change-Id: I2809eec496a1c2c2b5f6e3d5d3bb1c33a788bd58
---
M asterisk/IMS_ConnectionHandler.ttcn
M asterisk/gen_links.sh
M asterisk/regen_makefile.sh
3 files changed, 25 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/asterisk/IMS_ConnectionHandler.ttcn
b/asterisk/IMS_ConnectionHandler.ttcn
index dcf3646..d1e3185 100644
--- a/asterisk/IMS_ConnectionHandler.ttcn
+++ b/asterisk/IMS_ConnectionHandler.ttcn
@@ -10,6 +10,7 @@
*/
module IMS_ConnectionHandler {
+import from TCCEncoding_Functions all;
import from TCCOpenSecurity_Functions all;
import from General_Types all;
import from Osmocom_Types all;
@@ -65,7 +66,8 @@
charstring user,
charstring display_name,
charstring password,
- charstring nonce,
+ octetstring rand,
+ octetstring autn,
charstring ipsec_auth_key,
integer ipsec_local_spi_c,
integer ipsec_local_spi_s,
@@ -147,7 +149,8 @@
display_name := f_sip_str_quote(display_name),
password := password,
/* The Nonce field is the Base64 encoded version of the RAND value and
concatenated with the AUTN: */
- nonce := "FJh2MfZfjjeIoHmLbrzQjvbhmnzLAoAAoGsZyVRFFuU=",
+ rand := '14987631f65f8e3788a0798b6ebcd08e'O,
+ autn := 'f6e19a7ccb028000a06b19c9544516e5'O,
ipsec_auth_key := "0x5238297dfcca759bd05d48ff49bc63fa",
ipsec_local_spi_c := 4142,
ipsec_local_spi_s := 4143,
@@ -214,6 +217,13 @@
}
}
+private function f_nonce_from_rand_autn(octetstring rand, octetstring autn)
return charstring {
+ var octetstring concat := rand & autn;
+ var charstring nonce := enc_MIME_Base64(concat);
+ log("rand=", rand, " & autn=",autn, " => nonce=", nonce);
+ return nonce;
+}
+
/* HTTP Digest Authentication Using AKA (AKAv1-MD5): RFC 3310 */
function f_tr_Authorization_AKAv1MD5(WwwAuthenticate www_authenticate,
charstring username,
@@ -404,7 +414,7 @@
ts_Param("realm", f_sip_str_quote(g_pars.realm)),
ts_Param("qop", f_sip_str_quote("auth")),
ts_Param("algorithm", "AKAv1-MD5"),
- ts_Param("nonce", f_sip_str_quote(g_pars.nonce))
+ ts_Param("nonce",
f_sip_str_quote(f_nonce_from_rand_autn(g_pars.rand, g_pars.autn)))
/* "opaque not needed in IMS "*/
};
wwwAuthenticate := ts_WwwAuthenticate( {
ts_Challenge_digestCln(digestCln) } )
diff --git a/asterisk/gen_links.sh b/asterisk/gen_links.sh
index 3c4495f..e42ffe3 100755
--- a/asterisk/gen_links.sh
+++ b/asterisk/gen_links.sh
@@ -7,7 +7,8 @@
DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src
FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn
TCCConversion.cc TCCInterface.cc TCCInterface_ip.h "
FILES+="TCCOpenSecurity_Functions.ttcn TCCOpenSecurity.cc
TCCOpenSecurity_Functions.hh "
-FILES+="TCCDateTime.cc TCCDateTime_Functions.ttcn"
+FILES+="TCCDateTime.cc TCCDateTime_Functions.ttcn "
+FILES+="TCCEncoding_Functions.ttcn TCCEncoding.cc " # Base64
gen_links $DIR $FILES
DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src
diff --git a/asterisk/regen_makefile.sh b/asterisk/regen_makefile.sh
index 8f7eae9..f0c9bcb 100755
--- a/asterisk/regen_makefile.sh
+++ b/asterisk/regen_makefile.sh
@@ -14,6 +14,7 @@
SDP_EncDec.cc
SIPmsg_PT.cc
TCCConversion.cc
+ TCCEncoding.cc
TCCInterface.cc
TCCOpenSecurity.cc
TCCDateTime.cc
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36868?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I2809eec496a1c2c2b5f6e3d5d3bb1c33a788bd58
Gerrit-Change-Number: 36868
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Log command used to record packets
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Log command used to record packets .. ttcn3-tcpdump-start.sh: Log command used to record packets Change-Id: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 --- M ttcn3-tcpdump-start.sh 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 8564cd5..8b75d0e 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -85,6 +85,7 @@ # Log stderr to CMD_OUTFILE and a dedicated error log file tee $CMD_OUTFILE < $FIFO > $CMD_OUTFILE_ERR & CMD_STR="$CMD -s 1520 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE 2>$FIFO &" +echo "$CMD_STR" eval $CMD_STR # $CMD -s 1520 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE & PID=$! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 Gerrit-Change-Number: 36866 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Delay test start until FullyBooted event is received in AMI
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email )
Change subject: asterisk: Delay test start until FullyBooted event is received
in AMI
..
asterisk: Delay test start until FullyBooted event is received in AMI
Change-Id: I65f56bcee332f4ae9ffc71ad7119c378ca1649dc
---
M asterisk/AMI_Functions.ttcn
M asterisk/Asterisk_Tests.ttcn
2 files changed, 50 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn
index c05403e..9fbe973 100644
--- a/asterisk/AMI_Functions.ttcn
+++ b/asterisk/AMI_Functions.ttcn
@@ -27,6 +27,7 @@
const charstring AMI_FIELD_ACTION := "Action";
const charstring AMI_FIELD_ACTION_ID := "ActionID";
+const charstring AMI_FIELD_EVENT := "Event";
const charstring AMI_FIELD_USERNAME := "Username";
const charstring AMI_FIELD_SECRET := "Secret";
const charstring AMI_FIELD_RESPONSE := "Response";
@@ -76,6 +77,8 @@
template (value) AMI_Field
ts_AMI_Field_ActionId(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_ACTION_ID, val);
template (value) AMI_Field
+ts_AMI_Field_Event(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_EVENT, val);
+template (value) AMI_Field
ts_AMI_Field_Username(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_USERNAME, val);
template (value) AMI_Field
ts_AMI_Field_Secret(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_SECRET, val);
@@ -88,6 +91,8 @@
template (present) AMI_Field
tr_AMI_Field_ActionId(template (present) charstring val := ?) :=
tr_AMI_Field(pattern @nocase AMI_FIELD_ACTION_ID, val);
template (present) AMI_Field
+tr_AMI_Field_Event(template (present) charstring val := ?) :=
tr_AMI_Field(pattern @nocase AMI_FIELD_EVENT, val);
+template (present) AMI_Field
tr_AMI_Field_Username(template (present) charstring val := ?) :=
tr_AMI_Field(pattern @nocase AMI_FIELD_USERNAME, val);
template (present) AMI_Field
tr_AMI_Field_Secret(template (present) charstring val := ?) :=
tr_AMI_Field(pattern @nocase AMI_FIELD_SECRET, val);
@@ -173,6 +178,22 @@
tr_AMI_Field_ActionId(action_id)
);
+/*
+ * EVENTS
+ */
+template (present) AMI_Msg
+tr_AMI_Event(template (present) charstring ev_name := ?) := superset(
+ tr_AMI_Field_Event(ev_name)
+);
+
+/* Event: FullyBooted
+ * Privilege: system,all
+ * Status: Fully Booted
+ * Uptime: 4
+ * LastReload: 4 *
+ */
+template (present) AMI_Msg
+tr_AMI_Event_FullyBooted := tr_AMI_Event("FullyBooted");
/***
* Adapter:
@@ -420,6 +441,15 @@
}
+altstep as_ami_rx_ignore(AMI_Msg_PT pt)
+{
+ var AMI_Msg msg;
+ [] pt.receive(AMI_Msg:?) -> value msg {
+ log("Ignoring AMI message := ", msg);
+ repeat;
+ }
+}
+
private altstep as_ami_rx_fail(AMI_Msg_PT pt, template AMI_Msg exp_msg := *)
{
var AMI_Msg msg;
diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn
index 8a124c1..a71bcad 100644
--- a/asterisk/Asterisk_Tests.ttcn
+++ b/asterisk/Asterisk_Tests.ttcn
@@ -100,8 +100,18 @@
};
vc_AMI.start(f_AMI_Adapter_main(ami_pars));
-
f_ami_action_login(AMI_CLIENT, mp_ami_user, mp_ami_secret);
+
+ timer tReady;
+ tReady.start(10.0);
+ alt {
+ [] AMI_CLIENT.receive(tr_AMI_Event_FullyBooted);
+ [] as_ami_rx_ignore(AMI_CLIENT);
+ [] tReady.timeout {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("AMI FullyBooted timeout: "));
+ }
+ }
}
/* Local SIP UAs */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I65f56bcee332f4ae9ffc71ad7119c378ca1649dc
Gerrit-Change-Number: 36870
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: asterisk: Asterisk_Tests.default: Improve mtc logging
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36869?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: asterisk: Asterisk_Tests.default: Improve mtc logging .. asterisk: Asterisk_Tests.default: Improve mtc logging Change-Id: Id7ad0230b50d301e60f636a3b983a315112e4042 --- M asterisk/Asterisk_Tests.default 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/asterisk/Asterisk_Tests.default b/asterisk/Asterisk_Tests.default index ed4ec44..24c53e3 100644 --- a/asterisk/Asterisk_Tests.default +++ b/asterisk/Asterisk_Tests.default @@ -1,7 +1,6 @@ [LOGGING] FileMask := LOG_ALL | TTCN_MATCHING; - -mtc.FileMask := ERROR | WARNING | PARALLEL | VERDICTOP; +mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; [TESTPORT_PARAMETERS] #*.*.DEBUG := "yes" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36869?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id7ad0230b50d301e60f636a3b983a315112e4042 Gerrit-Change-Number: 36869 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in simtrace2[master]: RFC: card emu config: add feature sim polarity
Attention is currently required from: Hoernchen, lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/36859?usp=email ) Change subject: RFC: card emu config: add feature sim polarity .. Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: looks good to me. Might be worth having #defines for the two bits like ``` #define CEMU_CONFIG_SIMPOL_VALID 0x02 #define CEMU_CONFIG_SIMPOL_PRES_H 0x01 ``` or the like -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36859?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I36a8acb74ad7616205af68b1626b45ab79d7cb02 Gerrit-Change-Number: 36859 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Attention: Hoernchen Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 21 May 2024 09:08:11 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: cosmetic: fix sourcecode formatting
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36880?usp=email )
Change subject: SGP32Definitions_Templates: cosmetic: fix sourcecode formatting
..
SGP32Definitions_Templates: cosmetic: fix sourcecode formatting
Related: SYS#6824
Change-Id: I0940109b2c2d0021406cbcbfdabb048b76b2e7da
---
M library/euicc/SGP32Definitions_Templates.ttcn
1 file changed, 20 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/80/36880/1
diff --git a/library/euicc/SGP32Definitions_Templates.ttcn
b/library/euicc/SGP32Definitions_Templates.ttcn
index e87cb49..e1ca093 100644
--- a/library/euicc/SGP32Definitions_Templates.ttcn
+++ b/library/euicc/SGP32Definitions_Templates.ttcn
@@ -522,7 +522,7 @@
seqNumber := ?,
euiccResult := {
{
- enableResult := ?
+ enableResult := ?
}
}
},
@@ -539,7 +539,7 @@
seqNumber := 123,
euiccResult := {
{
- enableResult := 0
+ enableResult := 0
}
}
},
@@ -556,7 +556,7 @@
seqNumber := ?,
euiccResult := {
{
- disableResult := ?
+ disableResult := ?
}
}
},
@@ -573,7 +573,7 @@
seqNumber := 123,
euiccResult := {
{
- disableResult := 0
+ disableResult := 0
}
}
},
@@ -590,7 +590,7 @@
seqNumber := ?,
euiccResult := {
{
- deleteResult := ?
+ deleteResult := ?
}
}
},
@@ -607,7 +607,7 @@
seqNumber := 123,
euiccResult := {
{
- deleteResult := 0
+ deleteResult := 0
}
}
},
@@ -624,10 +624,10 @@
seqNumber := ?,
euiccResult := {
{
- disableResult := ?
+ disableResult := ?
},
{
- deleteResult := ?
+ deleteResult := ?
}
}
},
@@ -644,10 +644,10 @@
seqNumber := 123,
euiccResult := {
{
- disableResult := 0
+ disableResult := 0
},
{
- deleteResult := 0
+ deleteResult := 0
}
}
},
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36880?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I0940109b2c2d0021406cbcbfdabb048b76b2e7da
Gerrit-Change-Number: 36880
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: add templates for missing PSMOs
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36881?usp=email )
Change subject: SGP32Definitions_Templates: add templates for missing PSMOs
..
SGP32Definitions_Templates: add templates for missing PSMOs
We do not have templates for all PSMOs (EuiccPackage) and their
results (EuiccPackageResult) yet. This packages makes the set
complete.
Related: SYS#6824
Change-Id: I354ca5f45a6157e1e40596547388147daf60b95f
---
M library/euicc/SGP32Definitions_Templates.ttcn
1 file changed, 211 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/81/36881/1
diff --git a/library/euicc/SGP32Definitions_Templates.ttcn
b/library/euicc/SGP32Definitions_Templates.ttcn
index e1ca093..d18fee4 100644
--- a/library/euicc/SGP32Definitions_Templates.ttcn
+++ b/library/euicc/SGP32Definitions_Templates.ttcn
@@ -344,6 +344,70 @@
}
}
}
+template (present) EuiccPackage
+tr_euiccPackage_listProfileInfo := {
+ psmoList := {
+ {
+ listProfileInfo := {
+ searchCriteria := *,
+ tagList := *
+ }
+ }
+ }
+}
+template (value) EuiccPackage
+ts_euiccPackage_listProfileInfo := {
+ psmoList := {
+ {
+ listProfileInfo := {
+ searchCriteria := {
+ iccid := '123456789ABCDEFF'O
+ },
+ tagList := '92'O /* profileName */
+ }
+ }
+ }
+}
+template (present) EuiccPackage
+tr_euiccPackage_getRAT := {
+ psmoList := {
+ {
+ getRAT := { }
+ }
+ }
+}
+template (value) EuiccPackage
+ts_euiccPackage_getRAT := {
+ psmoList := {
+ {
+ getRAT := { }
+ }
+ }
+}
+template (present) EuiccPackage
+tr_euiccPackage_configureAutoEnable := {
+ psmoList := {
+ {
+ configureAutoEnable := {
+ autoEnableFlag := *,
+ smdpOid := *,
+ smdpAddress := *
+ }
+ }
+ }
+}
+template (value) EuiccPackage
+ts_euiccPackage_configureAutoEnable := {
+ psmoList := {
+ {
+ configureAutoEnable := {
+ autoEnableFlag := NULL,
+ smdpOid := objid {1 2 3},
+ smdpAddress := "smdp.example.com"
+ }
+ }
+ }
+}
/* GSMA SGP.32, section 6.3.2.6 */
template (present) EsipaMessageFromEimToIpa
@@ -654,6 +718,139 @@
euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O
}
}
+template (present) EuiccPackageResult
+tr_euiccPackageResultSigned_listProfileInfo := {
+ euiccPackageResultSigned := {
+ euiccPackageResultDataSigned := {
+ eimId := ?,
+ counterValue := ?,
+ transactionId := *,
+ seqNumber := ?,
+ euiccResult := {
+ {
+ listProfileInfoResult := ?
+ }
+ }
+ },
+ euiccSignEPR := ?
+ }
+}
+template (value) EuiccPackageResult
+ts_euiccPackageResultSigned_listProfileInfo := {
+ euiccPackageResultSigned := {
+ euiccPackageResultDataSigned := {
+ eimId := "myEIM",
+ counterValue := 1,
+ transactionId := omit,
+ seqNumber := 123,
+ euiccResult := {
+ {
+ listProfileInfoResult := {
+ profileInfoListOk := {
+ {
+ iccid := omit,
+ isdpAid := omit,
+ profileState :=
omit,
+ profileNickname
:= omit,
+
serviceProviderName := omit,
+ profileName :=
"testme",
+ iconType :=
omit,
+ icon := omit,
+
[S] Change in osmocom-bb[master]: trxcon/l1sched: fix sending dummy TCH/A[FH]S blocks
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/36879?usp=email ) Change subject: trxcon/l1sched: fix sending dummy TCH/A[FH]S blocks .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/36879?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I26205e8672cb2849ea79bd6206c1eff1172bd9d9 Gerrit-Change-Number: 36879 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:26:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: cosmetic: fix sourcecode formatting
Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36880?usp=email ) Change subject: SGP32Definitions_Templates: cosmetic: fix sourcecode formatting .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36880?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0940109b2c2d0021406cbcbfdabb048b76b2e7da Gerrit-Change-Number: 36880 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 21 May 2024 09:26:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: cosmetic: fix sourcecode formatting
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36880?usp=email ) Change subject: SGP32Definitions_Templates: cosmetic: fix sourcecode formatting .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36880?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0940109b2c2d0021406cbcbfdabb048b76b2e7da Gerrit-Change-Number: 36880 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 May 2024 09:27:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: add templates for missing PSMOs
Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36881?usp=email ) Change subject: SGP32Definitions_Templates: add templates for missing PSMOs .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36881?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I354ca5f45a6157e1e40596547388147daf60b95f Gerrit-Change-Number: 36881 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 21 May 2024 09:27:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: cosmetic: fix sourcecode formatting
dexter has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36880?usp=email )
Change subject: SGP32Definitions_Templates: cosmetic: fix sourcecode formatting
..
SGP32Definitions_Templates: cosmetic: fix sourcecode formatting
Related: SYS#6824
Change-Id: I0940109b2c2d0021406cbcbfdabb048b76b2e7da
---
M library/euicc/SGP32Definitions_Templates.ttcn
1 file changed, 20 insertions(+), 10 deletions(-)
Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/library/euicc/SGP32Definitions_Templates.ttcn
b/library/euicc/SGP32Definitions_Templates.ttcn
index e87cb49..e1ca093 100644
--- a/library/euicc/SGP32Definitions_Templates.ttcn
+++ b/library/euicc/SGP32Definitions_Templates.ttcn
@@ -522,7 +522,7 @@
seqNumber := ?,
euiccResult := {
{
- enableResult := ?
+ enableResult := ?
}
}
},
@@ -539,7 +539,7 @@
seqNumber := 123,
euiccResult := {
{
- enableResult := 0
+ enableResult := 0
}
}
},
@@ -556,7 +556,7 @@
seqNumber := ?,
euiccResult := {
{
- disableResult := ?
+ disableResult := ?
}
}
},
@@ -573,7 +573,7 @@
seqNumber := 123,
euiccResult := {
{
- disableResult := 0
+ disableResult := 0
}
}
},
@@ -590,7 +590,7 @@
seqNumber := ?,
euiccResult := {
{
- deleteResult := ?
+ deleteResult := ?
}
}
},
@@ -607,7 +607,7 @@
seqNumber := 123,
euiccResult := {
{
- deleteResult := 0
+ deleteResult := 0
}
}
},
@@ -624,10 +624,10 @@
seqNumber := ?,
euiccResult := {
{
- disableResult := ?
+ disableResult := ?
},
{
- deleteResult := ?
+ deleteResult := ?
}
}
},
@@ -644,10 +644,10 @@
seqNumber := 123,
euiccResult := {
{
- disableResult := 0
+ disableResult := 0
},
{
- deleteResult := 0
+ deleteResult := 0
}
}
},
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36880?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I0940109b2c2d0021406cbcbfdabb048b76b2e7da
Gerrit-Change-Number: 36880
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ci[master]: jobs/ttcn3: update ttcn3-ggsn-test-kernel
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36882?usp=email ) Change subject: jobs/ttcn3: update ttcn3-ggsn-test-kernel .. jobs/ttcn3: update ttcn3-ggsn-test-kernel Remove ttcn3-ggsn-test-kernel-pablo-gtp, as the IPv6 GTP patches have been merged. Add ttcn3-ggsn-test-kernel-net-next and ttcn3-ggsn-test-kernel-torvalds instead, which run the master/nightly version of osmo-ggsn against HEAD of the kernel trees in netdev/net-next and torvalds/linux. Change-Id: I3d2f26ca87f79365f4a407376b5c3c0145f729a6 --- M jobs/ttcn3-testsuites.yml 1 file changed, 41 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/82/36882/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 6780f74..d7646f5 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -32,16 +32,24 @@ timer: H 04 * * * description: | Test osmo-ggsn master with the Debian kernel. - - ttcn3-ggsn-test-kernel-pablo-gtp: + - ttcn3-ggsn-test-kernel-net-next: timer: H 04 * * * # Cache the linux source tree in the workspace of one node wipe_workspace: false + node: ttcn3-ggsn-test-kernel-git description: | -Test osmo-ggsn master with the Linux kernel built from main of -https://git.kernel.org/pub/scm/linux/kernel/git/pablo/gtp.git/";>pablo/gtp.git. - -This is a temporary job, to be removed once the IPv6 related GTP -patches are upstreamed (OS#1952). +Test osmo-ggsn master with the Linux kernel built from master of +https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/";> + net-next.git. + - ttcn3-ggsn-test-kernel-torvalds: + timer: H 04 * * * + # Cache the linux source tree in the workspace of one node + wipe_workspace: false + node: ttcn3-ggsn-test-kernel-git + description: | +Test osmo-ggsn master with the Linux kernel built from master of +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/";> + torvalds/linux.git. - ttcn3-ggsn-test-kernel-latest: timer: H 04 * * * description: | @@ -266,15 +274,24 @@ # Run against debian's kernel export KERNEL_TEST=1 ;; - ttcn3-ggsn-test-kernel-pablo-gtp) + ttcn3-ggsn-test-kernel-net-next) DIR="ttcn3-ggsn-test" export IMAGE_SUFFIX="master" export KERNEL_TEST=1 export KERNEL_BUILD=1 - export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/pablo/gtp.git"; - export KERNEL_REMOTE_NAME="pablo-gtp" + export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git"; + export KERNEL_REMOTE_NAME="net-next" export KERNEL_BRANCH="main" ;; + ttcn3-ggsn-test-kernel-torvalds) + DIR="ttcn3-ggsn-test" + export IMAGE_SUFFIX="master" + export KERNEL_TEST=1 + export KERNEL_BUILD=1 + export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"; + export KERNEL_REMOTE_NAME="torvalds" + export KERNEL_BRANCH="master" + ;; ttcn3-ggsn-test-kernel-latest) DIR="ttcn3-ggsn-test" export IMAGE_SUFFIX="latest" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36882?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3d2f26ca87f79365f4a407376b5c3c0145f729a6 Gerrit-Change-Number: 36882 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[M] Change in osmo-ci[master]: jobs/ttcn3: update ttcn3-ggsn-test-kernel
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36882?usp=email ) Change subject: jobs/ttcn3: update ttcn3-ggsn-test-kernel .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36882?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3d2f26ca87f79365f4a407376b5c3c0145f729a6 Gerrit-Change-Number: 36882 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 21 May 2024 09:41:38 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: SMS-over-GSUP: set log context in gsm411_gsup_rx()
Attention is currently required from: fixeria. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email ) Change subject: SMS-over-GSUP: set log context in gsm411_gsup_rx() .. Patch Set 1: (1 comment) Patchset: PS1: Why are you removing the log context lines? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3414953d2aa7b075fcee1cf6e5e76c527ae7b507 Gerrit-Change-Number: 36861 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:50:14 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/36883?usp=email )
Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
..
ipa: Use pseudo-random number for SLS in IPA->M3UA direction
In Change-Id Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 we introduced
code that would make the LSB of the file descriptor be used as SLS
when passing packets from IPA in M3UA direction.
This did however not achieve sufficient entropy in real-world use cases.
In this change, we change over to allocating a pseudo-random SLS to each
IPA connection at the time it is established; We then assign that SLS
to each packet received on that IPA connection.
Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733
Related: SYS#6543
Closes: SYS#6802
---
M src/osmo_ss7_asp.c
M stp/stp_main.c
2 files changed, 32 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/83/36883/1
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index e1c197c..b017510 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -906,7 +906,9 @@
}
msg->dst = asp;
rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL);
- return ipa_rx_msg(asp, msg, ofd->fd & 0xf);
+ /* we simply use the lower 4 bits of the asp_id, which is initialized
to a pseudo-random value upon
+* connect */
+ return ipa_rx_msg(asp, msg, asp->asp_id & 0xf);
}
/* netif code tells us we can read something from the socket */
@@ -996,6 +998,12 @@
if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA) {
rc = ss7_asp_apply_peer_primary_address(asp);
rc = ss7_asp_apply_primary_address(asp);
+ } else {
+ if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) {
+ /* we use the lower 4 bits of the asp_id feld as SLS;
let's initialize it here from a
+* pseudo-random value */
+ asp->asp_id = rand() & 0xf;
+ }
}
if (asp->lm && asp->lm->prim_cb) {
diff --git a/stp/stp_main.c b/stp/stp_main.c
index 01d1865..d630032 100644
--- a/stp/stp_main.c
+++ b/stp/stp_main.c
@@ -213,6 +213,8 @@
{
int rc;
+ srand(time(NULL));
+
tall_stp_ctx = talloc_named_const(NULL, 1, "osmo-stp");
msgb_talloc_ctx_init(tall_stp_ctx, 0);
osmo_init_logging2(tall_stp_ctx, &log_info);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36883?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: for-1.8
Gerrit-Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733
Gerrit-Change-Number: 36883
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email )
Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
..
ipa: Use pseudo-random number for SLS in IPA->M3UA direction
[back-port of Ia4e66d660b6057338f66a47fffc8a0d32759f733]
In Change-Id Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 we introduced
code that would make the LSB of the file descriptor be used as SLS
when passing packets from IPA in M3UA direction.
This did however not achieve sufficient entropy in real-world use cases.
In this change, we change over to allocating a pseudo-random SLS to each
IPA connection at the time it is established; We then assign that SLS
to each packet received on that IPA connection.
Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7
Related: SYS#6543
Closes: SYS#6802
---
M src/osmo_ss7_asp.c
M stp/stp_main.c
2 files changed, 34 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/84/36884/1
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index e1c197c..b017510 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -906,7 +906,9 @@
}
msg->dst = asp;
rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL);
- return ipa_rx_msg(asp, msg, ofd->fd & 0xf);
+ /* we simply use the lower 4 bits of the asp_id, which is initialized
to a pseudo-random value upon
+* connect */
+ return ipa_rx_msg(asp, msg, asp->asp_id & 0xf);
}
/* netif code tells us we can read something from the socket */
@@ -996,6 +998,12 @@
if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA) {
rc = ss7_asp_apply_peer_primary_address(asp);
rc = ss7_asp_apply_primary_address(asp);
+ } else {
+ if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) {
+ /* we use the lower 4 bits of the asp_id feld as SLS;
let's initialize it here from a
+* pseudo-random value */
+ asp->asp_id = rand() & 0xf;
+ }
}
if (asp->lm && asp->lm->prim_cb) {
diff --git a/stp/stp_main.c b/stp/stp_main.c
index 01d1865..d630032 100644
--- a/stp/stp_main.c
+++ b/stp/stp_main.c
@@ -213,6 +213,8 @@
{
int rc;
+ srand(time(NULL));
+
tall_stp_ctx = talloc_named_const(NULL, 1, "osmo-stp");
msgb_talloc_ctx_init(tall_stp_ctx, 0);
osmo_init_logging2(tall_stp_ctx, &log_info);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: for-1.8
Gerrit-Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7
Gerrit-Change-Number: 36884
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
laforge has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36883?usp=email ) Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction .. Abandoned replaced by https://gerrit.osmocom.org/c/libosmo-sccp/+/36884 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36883?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733 Gerrit-Change-Number: 36883 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon
[S] Change in libosmo-sccp[for-1.8]: Bump version: 1.8.1-dirty → 1.8.2
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email ) Change subject: Bump version: 1.8.1-dirty → 1.8.2 .. Bump version: 1.8.1-dirty → 1.8.2 Let's tag a 1.8.2 just containing the change of more random SLS allocation in IPA / SCCPlite links. Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c --- M debian/changelog M src/Makefile.am 2 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/85/36885/1 diff --git a/debian/changelog b/debian/changelog index cd1c181..b3bf213 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmo-sccp (1.8.2) unstable; urgency=medium + + * ipa: Use pseudo-random number for SLS in IPA->M3UA direction + + -- Harald Welte Tue, 21 May 2024 14:28:44 +0200 + libosmo-sccp (1.8.1) unstable; urgency=medium * Fix counting received IPA packets in server mode diff --git a/src/Makefile.am b/src/Makefile.am index c87848d..5fba62a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=9:1:0 +LIBVERSION=9:2:0 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c Gerrit-Change-Number: 36885 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email ) Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7 Gerrit-Change-Number: 36884 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Tue, 21 May 2024 12:37:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[for-1.8]: Bump version: 1.8.1-dirty → 1.8.2
Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email ) Change subject: Bump version: 1.8.1-dirty → 1.8.2 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c Gerrit-Change-Number: 36885 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Tue, 21 May 2024 12:38:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Action PJSIPAccessNetworkInfo
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email )
Change subject: asterisk: Use Action PJSIPAccessNetworkInfo
..
asterisk: Use Action PJSIPAccessNetworkInfo
Validate P-Access-Network-Info should only be present in 2nd REGISTER
sent over ipsec.
Change-Id: I2759d12caeaca81a9224997a29541c325d65fe30
---
M asterisk/AMI_Functions.ttcn
M asterisk/Asterisk_Tests.ttcn
M asterisk/IMS_ConnectionHandler.ttcn
M library/SIP_Templates.ttcn
4 files changed, 107 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/86/36886/1
diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn
index 9fbe973..4969905 100644
--- a/asterisk/AMI_Functions.ttcn
+++ b/asterisk/AMI_Functions.ttcn
@@ -28,6 +28,7 @@
const charstring AMI_FIELD_ACTION := "Action";
const charstring AMI_FIELD_ACTION_ID := "ActionID";
const charstring AMI_FIELD_EVENT := "Event";
+const charstring AMI_FIELD_INFO := "Info";
const charstring AMI_FIELD_USERNAME := "Username";
const charstring AMI_FIELD_SECRET := "Secret";
const charstring AMI_FIELD_RESPONSE := "Response";
@@ -79,6 +80,8 @@
template (value) AMI_Field
ts_AMI_Field_Event(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_EVENT, val);
template (value) AMI_Field
+ts_AMI_Field_Info(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_INFO, val);
+template (value) AMI_Field
ts_AMI_Field_Username(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_USERNAME, val);
template (value) AMI_Field
ts_AMI_Field_Secret(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_SECRET, val);
@@ -93,6 +96,8 @@
template (present) AMI_Field
tr_AMI_Field_Event(template (present) charstring val := ?) :=
tr_AMI_Field(pattern @nocase AMI_FIELD_EVENT, val);
template (present) AMI_Field
+tr_AMI_Field_Info(template (present) charstring val := ?) :=
tr_AMI_Field(pattern @nocase AMI_FIELD_INFO, val);
+template (present) AMI_Field
tr_AMI_Field_Username(template (present) charstring val := ?) :=
tr_AMI_Field(pattern @nocase AMI_FIELD_USERNAME, val);
template (present) AMI_Field
tr_AMI_Field_Secret(template (present) charstring val := ?) :=
tr_AMI_Field(pattern @nocase AMI_FIELD_SECRET, val);
@@ -139,6 +144,23 @@
tr_AMI_Field_Secret(secret)
);
+/* Action: PJSIPAccessNetworkInfo
+ * Registration: volte_ims
+ * Info: 3GPP-E-UTRAN-FDD; utran-cell-id-3gpp=238010001101
+ */
+template (value) AMI_Msg
+ts_AMI_Action_PJSIPAccessNetworkInfo(template (value) charstring registration
:= "volte_ims",
+template (value) charstring info := "",
+template (value) charstring action_id :=
"0001") := {
+ ts_AMI_Field_Action("PJSIPAccessNetworkInfo"),
+ ts_AMI_Field_ActionId(action_id),
+ ts_AMI_Field_Registration(registration),
+ ts_AMI_Field_Info(info)
+};
+function f_ami_gen_PJSIPAccessNetworkInfo_Info_EUTRAN(charstring uli_str)
return charstring {
+ return "3GPP-E-UTRAN-FDD; utran-cell-id-3gpp=" & uli_str;
+}
+
/* Action: PJSIPRegister
* ActionID:
* Registration: volte_ims
@@ -508,6 +530,13 @@
f_ami_transceive_match_response_success(pt,
ts_AMI_Action_Login(username, secret, reg_action_id));
}
+function f_ami_action_PJSIPAccessNetworkInfo(AMI_Msg_PT pt,
+template (value) charstring
registration,
+template (value) charstring info) {
+ var charstring reg_action_id := f_gen_action_id();
+ f_ami_transceive_match_response_success(pt,
ts_AMI_Action_PJSIPAccessNetworkInfo(registration, info, reg_action_id));
+}
+
function f_ami_action_PJSIPRegister(AMI_Msg_PT pt, charstring register) {
var charstring reg_action_id := f_gen_action_id();
f_ami_transceive_match_response_success(pt,
ts_AMI_Action_PJSIPRegister(register, reg_action_id));
diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn
index a71bcad..df5904b 100644
--- a/asterisk/Asterisk_Tests.ttcn
+++ b/asterisk/Asterisk_Tests.ttcn
@@ -376,6 +376,12 @@
f_sleep(1.0);
/* Clear events: */
AMI_CLIENT.clear;
+
+ /* Announce network information, this should usually happen when UE
+* becomes attached to network and before IMS APN is set up: */
+ f_ami_action_PJSIPAccessNetworkInfo(AMI_CLIENT,
mp_volte_ims_outbound_registration,
+
f_ami_gen_PJSIPAccessNetworkInfo_Info_EUTRAN(pars.uli_str));
+
/* Trigger registration: */
f_ami_action_PJSIPRegister(AMI_CLIENT,
mp_volte_ims_outbound_registration);
/* TODO: Rx "Event: AuthRequest" */
diff --git a/asterisk/IMS_ConnectionHandler.ttcn
b/asterisk/IMS_ConnectionHandler.ttcn
index d1e3185..ae291b5 100644
--- a/asterisk/IMS_ConnectionHandler.ttcn
+++
[S] Change in osmo-hnbgw[master]: fixup: compilation error: unused var in map_rua_init_action()
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email )
Change subject: fixup: compilation error: unused var in map_rua_init_action()
..
fixup: compilation error: unused var in map_rua_init_action()
Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807
---
M src/osmo-hnbgw/context_map_rua.c
1 file changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/87/36887/1
diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c
index d5b2cb7..3c6ea1e 100644
--- a/src/osmo-hnbgw/context_map_rua.c
+++ b/src/osmo-hnbgw/context_map_rua.c
@@ -214,7 +214,6 @@
static void map_rua_init_action(struct osmo_fsm_inst *fi, uint32_t event, void
*data)
{
- struct hnbgw_context_map *map = fi->priv;
struct msgb *ranap_msg = data;
switch (event) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807
Gerrit-Change-Number: 36887
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters
Attention is currently required from: laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters .. Patch Set 5: (1 comment) File src/osmo-hnbgw/context_map_rua.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788/comment/ece32614_96601772 PS5, Line 217: struct hnbgw_context_map *map = fi->priv; This is now an unused variable -- why did jenkins not complain about this? see also https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Tue, 21 May 2024 15:54:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-hnbgw[master]: fixup: compilation error: unused var in map_rua_init_action()
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email ) Change subject: fixup: compilation error: unused var in map_rua_init_action() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807 Gerrit-Change-Number: 36887 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 21 May 2024 15:57:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-hnbgw[master]: fixup: compilation error: unused var in map_rua_init_action()
Attention is currently required from: neels, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin Change subject: fixup: compilation error: unused var in map_rua_init_action() .. fixup: compilation error: unused var in map_rua_init_action() The variable was left unused by recent patch I3e1ad7a2aa71674a22a27c31512600f2de139032 aka a5974d7906a333bfd3399f83cc8072b4604f49cd Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807 --- M src/osmo-hnbgw/context_map_rua.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/87/36887/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807 Gerrit-Change-Number: 36887 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmo-hnbgw[master]: change back dispatch ordering in map_rua_init_action()
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36888?usp=email )
Change subject: change back dispatch ordering in map_rua_init_action()
..
change back dispatch ordering in map_rua_init_action()
Before patch I3e1ad7a2aa71674a22a27c31512600f2de139032,
the order was:
case MAP_RUA_EV_RX_CONNECT:
state-chg --> map_rua_fsm_state_chg(MAP_RUA_ST_CONNECTED);
dispatch --> map_sccp_dispatch(map, MAP_SCCP_EV_TX_DATA_REQUEST, ranap_msg);
return;
>From that patch on, the order is:
case MAP_RUA_EV_RX_CONNECT:
dispatch --> handle_rx_rua(fi, ranap_msg);
state-chg --> map_rua_fsm_state_chg(MAP_RUA_ST_CONNECTED);
return;
The ordering of event dispatching and state changing is a delicate matter,
because event dispatching might result in an fsm deallocation, especially on
corner case errors. Attempting to modify the state after that may crash.
TODO: insert actual proven reason for this patch here.
TODO: explain why the same ordering one 'case' below is not a problem.
Change-Id: Ie277c46d153bc12dc28a914c241392cdf5ec0aa4
---
M src/osmo-hnbgw/context_map_rua.c
1 file changed, 33 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/88/36888/1
diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c
index 3c6ea1e..67d50d0 100644
--- a/src/osmo-hnbgw/context_map_rua.c
+++ b/src/osmo-hnbgw/context_map_rua.c
@@ -219,9 +219,9 @@
switch (event) {
case MAP_RUA_EV_RX_CONNECT:
+ map_rua_fsm_state_chg(MAP_RUA_ST_CONNECTED);
/* not needed for RAB assignment scanning, but for KPI scanning
*/
handle_rx_rua(fi, ranap_msg);
- map_rua_fsm_state_chg(MAP_RUA_ST_CONNECTED);
return;
case MAP_RUA_EV_RX_DISCONNECT:
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36888?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Ie277c46d153bc12dc28a914c241392cdf5ec0aa4
Gerrit-Change-Number: 36888
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters
Attention is currently required from: laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters .. Patch Set 5: (1 comment) Patchset: PS5: related: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36888 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Tue, 21 May 2024 16:08:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-hnbgw[master]: fixup: compilation error: unused var in map_rua_init_action()
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email ) Change subject: fixup: compilation error: unused var in map_rua_init_action() .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807 Gerrit-Change-Number: 36887 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 21 May 2024 16:16:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-hnbgw[master]: fixup: compilation error: unused var in map_rua_init_action()
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email ) Change subject: fixup: compilation error: unused var in map_rua_init_action() .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807 Gerrit-Change-Number: 36887 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 May 2024 16:23:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-hnbgw[master]: fixup: compilation error: unused var in map_rua_init_action()
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email )
Change subject: fixup: compilation error: unused var in map_rua_init_action()
..
fixup: compilation error: unused var in map_rua_init_action()
The variable was left unused by recent patch
I3e1ad7a2aa71674a22a27c31512600f2de139032 aka
a5974d7906a333bfd3399f83cc8072b4604f49cd
Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807
---
M src/osmo-hnbgw/context_map_rua.c
1 file changed, 13 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
neels: Looks good to me, approved
diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c
index d5b2cb7..3c6ea1e 100644
--- a/src/osmo-hnbgw/context_map_rua.c
+++ b/src/osmo-hnbgw/context_map_rua.c
@@ -214,7 +214,6 @@
static void map_rua_init_action(struct osmo_fsm_inst *fi, uint32_t event, void
*data)
{
- struct hnbgw_context_map *map = fi->priv;
struct msgb *ranap_msg = data;
switch (event) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807
Gerrit-Change-Number: 36887
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: per-HNB GTP-U traffic counters via nft .. per-HNB GTP-U traffic counters via nft Add optional feature: retrieve GTP-U traffic counters per hNodeB (not per individual subscriber!) using nftables, to provide new rate_ctr stats. This is a "workaround" to get performance indicators per hNodeB, without needing a UPF that supports URR. When an hNodeB registers, set up nftables rules to count GTP-U packets (UDP port 2152) to and from that hNodeB's address -- we are assuming that it is the same address that Iuh is connecting from. >From the per-hNodeB packet and byte counters from nftables, also derive a "UE bytes" counter, which is counting only the GTP-U payload. Assume IP header of 20 bytes; UDP and GTP-U headers are 8 bytes each: ue_bytes = total_bytes - packets * (20 + 8 + 8) Query these periodically, as configurable by new timer X34. Default is one second of wait time between querying counters (excluding the time it takes to retrieve and update the counters). Add compile-time switch --enable-nftables, to build with/without external dependency libnftables. Default is without, as before. Add jenkins axis NFTABLES to switch --enable-nftables. Add cfg file option 'hnbgw' / 'nft-kpi' to enable use of nftables. This requires osmo-hnbgw to be run with cap_net_admin. The VTY config commands are always visible -- simplifies VTY testing. Refuse to start osmo-hnbgw when the user is requesting nft-kpi in the config but when built without --enable-nftables. Do nft commands in 2 separate threads. Run the same request queue implementation twice, with two thread workers to handle them: - one thread receives all requests to init the nft table, add and remove hNodeB counters, and start and stop counting for a specific hNodeB. - Another thread handles all retrieval and parsing of counters from nft. The main() thread hence never blocks for nftables commands, and services the responses from nft when they are ready, via an osmo_it_q registered in the main() select loop. Persistently keep an nftables named counter for each seen hNodeB cell id in the nftables ruleset, for the lifetime of a hnb_persistent instance that holds the target rate_ctrs. Add the rules to feed into these persistent counters to the ruleset when the particular cell attaches and detaches via HNBAP HNB (De-)Register. On hnb_persistent_free(), remove all items relating to this cell id from nftables, including the persistent named counters. Loosely related: upcoming patches will implement - a hashtable for faster cell id lookup (important for updating counters) Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 - proper MNC-3-digit support in cell ids (better have a 100% correct primary key). Id9a91c80cd2745424a916aef4736993bb7cd8ba0 - idle timeout for disconnected hnbp, so we are sure stale state does not build up for eternity. Ic819d7cbc03fb39e98c204b70d016c5170dc6307 Related: SYS#6773 Related: OS#6425 Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca --- M configure.ac M contrib/jenkins.sh M debian/control M debian/rules M include/osmocom/hnbgw/Makefile.am M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/nft_kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/nft_kpi.c M src/osmo-hnbgw/osmo_hnbgw_main.c M src/osmo-hnbgw/tdefs.c M tests/osmo-hnbgw.vty 15 files changed, 1,299 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/39/36539/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels, pespin.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email )
Change subject: per-HNB GTP-U traffic counters via nft
..
Patch Set 4:
(6 comments)
File src/osmo-hnbgw/hnbgw.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16220):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/27cb50fa_a1c2d0c6
PS4, Line 585: if (getpeername(fd, &osa.u.sa, &socklen)){
space required before the open brace '{'
File src/osmo-hnbgw/nft_kpi.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16220):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/cfffabca_cb61ff3e
PS4, Line 193: static const char *nft_thread_req_type_name[] = {
static const char * array should probably be static const char * const
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16220):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/f95be9ba_bdf88f8b
PS4, Line 620: while (1) {
braces {} are not necessary for single statement blocks
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16220):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/d0cc942e_62412f17
PS4, Line 652:if (period_us < 1)
suspect code indent for conditional statements (7, 15)
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16220):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/cfff3b06_24b62f7b
PS4, Line 653:period_us = 1;
code indent should use tabs where possible
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16220):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/4075a7e7_9e0e6e81
PS4, Line 653:period_us = 1;
please, no spaces at the start of a line
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca
Gerrit-Change-Number: 36539
Gerrit-PatchSet: 4
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Attention: neels
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 21 May 2024 16:25:40 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: nft_kpi: retrieve counters in a separate thread
neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36540?usp=email ) Change subject: nft_kpi: retrieve counters in a separate thread .. Abandoned surpassed by https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36540?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I9dc54e6bc94c553f45adfa71ae8ad70be4afbc8f Gerrit-Change-Number: 36540 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: abandon
[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email )
Change subject: add hnb_persistent hashtable: optimize lookup by cell id
..
add hnb_persistent hashtable: optimize lookup by cell id
Mainly the new nft counters do a lot of hnb_persistent lookups.
Add a hashtable to optimize looking up hnb_persistent instances. So far
we iterate the linear list of hnb_persistent for each and every counter
returned from nft_kpi.c, and also for every HNBAP HNB* operation.
Related: SYS#6773
Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2
---
M include/osmocom/hnbgw/hnbgw.h
M src/osmo-hnbgw/hnbgw.c
2 files changed, 56 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/89/36889/1
diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h
index 46506ca..edfd496 100644
--- a/include/osmocom/hnbgw/hnbgw.h
+++ b/include/osmocom/hnbgw/hnbgw.h
@@ -175,6 +175,7 @@
};
const char *umts_cell_id_name(const struct umts_cell_id *ucid);
int umts_cell_id_from_str(struct umts_cell_id *ucid, const char *instr);
+uint32_t umts_cell_id_hash(const struct umts_cell_id *ucid);
/*! are both given umts_cell_id euqal? */
static inline bool umts_cell_id_equal(const struct umts_cell_id *a, const
struct umts_cell_id *b)
@@ -367,6 +368,8 @@
struct hnb_persistent {
/*! Entry in HNBGW-global list of hnb_persistent */
struct llist_head list;
+ /*! Entry in hash table g_hnbgw->hnb_persistent_by_id. */
+ struct hlist_node node_by_id;
/*! back-pointer to hnb_context. Can be NULL if no context at this
point */
struct hnb_context *ctx;
@@ -451,8 +454,12 @@
struct osmo_stream_srv_link *iuh;
/* list of struct hnb_context */
struct llist_head hnb_list;
+
/* list of struct hnb_persistent */
struct llist_head hnb_persistent_list;
+ /* optimized lookup for hnb_persistent, by cell id string */
+ DECLARE_HASHTABLE(hnb_persistent_by_id, 5);
+
struct osmo_timer_list store_uptime_timer;
/* list of struct ue_context */
struct llist_head ue_list;
diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c
index f14ee13..5bd4c80 100644
--- a/src/osmo-hnbgw/hnbgw.c
+++ b/src/osmo-hnbgw/hnbgw.c
@@ -242,6 +242,32 @@
ucid->sac, ucid->cid);
}
+/* source: http://www.cse.yorku.ca/~oz/hash.html */
+static inline void mkhash_init(uint32_t *hash)
+{
+ *hash = 5381;
+}
+static inline void mkhash_add(uint32_t *hash, int32_t val)
+{
+ uint32_t h = *hash;
+ h = ((h << 5) + h) ^ val; /* (h * 33) ^ val */
+ *hash = h;
+}
+
+/* Useful to index a hash table by struct umts_cell_id. */
+uint32_t umts_cell_id_hash(const struct umts_cell_id *ucid)
+{
+ uint32_t hash;
+ mkhash_init(&hash);
+ mkhash_add(&hash, ucid->mcc);
+ mkhash_add(&hash, ucid->mnc);
+ mkhash_add(&hash, ucid->lac);
+ mkhash_add(&hash, ucid->rac);
+ mkhash_add(&hash, ucid->sac);
+ mkhash_add(&hash, ucid->cid);
+ return hash;
+}
+
/* parse a string representation of an umts_cell_id into its decoded
representation */
int umts_cell_id_from_str(struct umts_cell_id *ucid, const char *instr)
{
@@ -542,6 +568,7 @@
osmo_stat_item_group_set_name(hnbp->statg, hnbp->id_str);
llist_add(&hnbp->list, &g_hnbgw->hnb_persistent_list);
+ hash_add(g_hnbgw->hnb_persistent_by_id, &hnbp->node_by_id,
umts_cell_id_hash(&hnbp->id));
if (g_hnbgw->nft_kpi.active)
nft_kpi_hnb_persistent_init(hnbp);
@@ -558,8 +585,8 @@
struct hnb_persistent *hnb_persistent_find_by_id(const struct umts_cell_id *id)
{
struct hnb_persistent *hnbp;
-
- llist_for_each_entry(hnbp, &g_hnbgw->hnb_persistent_list, list) {
+ uint32_t id_hash = umts_cell_id_hash(id);
+ hash_for_each_possible(g_hnbgw->hnb_persistent_by_id, hnbp, node_by_id,
id_hash) {
if (umts_cell_id_equal(&hnbp->id, id))
return hnbp;
}
@@ -635,6 +662,7 @@
nft_kpi_hnb_stop(hnbp);
nft_kpi_hnb_persistent_remove(hnbp);
llist_del(&hnbp->list);
+ hash_del(&hnbp->node_by_id);
talloc_free(hnbp);
}
@@ -994,7 +1022,10 @@
g_hnbgw->next_ue_ctx_id = 23;
INIT_LLIST_HEAD(&g_hnbgw->hnb_list);
+
INIT_LLIST_HEAD(&g_hnbgw->hnb_persistent_list);
+ hash_init(g_hnbgw->hnb_persistent_by_id);
+
INIT_LLIST_HEAD(&g_hnbgw->ue_list);
INIT_LLIST_HEAD(&g_hnbgw->sccp.users);
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2
Gerrit-Change-Number: 36889
Gerrit-PatchSet: 1
Gerrit-O
[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email )
Change subject: add hnb_persistent hashtable: optimize lookup by cell id
..
Patch Set 1:
(1 comment)
File src/osmo-hnbgw/hnbgw.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16221):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889/comment/4d78fe92_f4995f57
PS1, Line 589: hash_for_each_possible(g_hnbgw->hnb_persistent_by_id, hnbp,
node_by_id, id_hash) {
space required before the open parenthesis '('
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2
Gerrit-Change-Number: 36889
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Tue, 21 May 2024 16:28:39 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Action PJSIPAccessNetworkInfo
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: asterisk: Use Action PJSIPAccessNetworkInfo .. asterisk: Use Action PJSIPAccessNetworkInfo Validate P-Access-Network-Info should only be present in 2nd REGISTER sent over ipsec. Change-Id: I2759d12caeaca81a9224997a29541c325d65fe30 --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.ttcn M asterisk/IMS_ConnectionHandler.ttcn M library/SIP_Templates.ttcn 4 files changed, 111 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/36886/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2759d12caeaca81a9224997a29541c325d65fe30 Gerrit-Change-Number: 36886 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: per-HNB GTP-U traffic counters via nft .. per-HNB GTP-U traffic counters via nft Add optional feature: retrieve GTP-U traffic counters per hNodeB (not per individual subscriber!) using nftables, to provide new rate_ctr stats. This is a "workaround" to get performance indicators per hNodeB, without needing a UPF that supports URR. When an hNodeB registers, set up nftables rules to count GTP-U packets (UDP port 2152) to and from that hNodeB's address -- we are assuming that it is the same address that Iuh is connecting from. >From the per-hNodeB packet and byte counters from nftables, also derive a "UE bytes" counter, which is counting only the GTP-U payload. Assume IP header of 20 bytes; UDP and GTP-U headers are 8 bytes each: ue_bytes = total_bytes - packets * (20 + 8 + 8) Query these periodically, as configurable by new timer X34. Default is one second of wait time between querying counters (excluding the time it takes to retrieve and update the counters). Add compile-time switch --enable-nftables, to build with/without external dependency libnftables. Default is without, as before. Add jenkins axis NFTABLES to switch --enable-nftables. Add cfg file option 'hnbgw' / 'nft-kpi' to enable use of nftables. This requires osmo-hnbgw to be run with cap_net_admin. The VTY config commands are always visible -- simplifies VTY testing. Refuse to start osmo-hnbgw when the user is requesting nft-kpi in the config but when built without --enable-nftables. Do nft commands in 2 separate threads. Run the same request queue implementation twice, with two thread workers to handle them: - one thread receives all requests to init the nft table, add and remove hNodeB counters, and start and stop counting for a specific hNodeB. - Another thread handles all retrieval and parsing of counters from nft. The main() thread hence never blocks for nftables commands, and services the responses from nft when they are ready, via an osmo_it_q registered in the main() select loop. Persistently keep an nftables named counter for each seen hNodeB cell id in the nftables ruleset, for the lifetime of a hnb_persistent instance that holds the target rate_ctrs. Add the rules to feed into these persistent counters to the ruleset when the particular cell attaches and detaches via HNBAP HNB (De-)Register. On hnb_persistent_free(), remove all items relating to this cell id from nftables, including the persistent named counters. Loosely related: upcoming patches will implement - a hashtable for faster cell id lookup (important for updating counters) Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 - proper MNC-3-digit support in cell ids (better have a 100% correct primary key). Id9a91c80cd2745424a916aef4736993bb7cd8ba0 - idle timeout for disconnected hnbp, so we are sure stale state does not build up for eternity. Ic819d7cbc03fb39e98c204b70d016c5170dc6307 Related: SYS#6773 Related: OS#6425 Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca --- M configure.ac M contrib/jenkins.sh M debian/control M debian/rules M include/osmocom/hnbgw/Makefile.am M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/nft_kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/nft_kpi.c M src/osmo-hnbgw/osmo_hnbgw_main.c M src/osmo-hnbgw/tdefs.c M tests/osmo-hnbgw.vty 15 files changed, 1,299 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/39/36539/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels, pespin.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email )
Change subject: per-HNB GTP-U traffic counters via nft
..
Patch Set 5:
(5 comments)
File src/osmo-hnbgw/nft_kpi.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16223):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/df4ad6ff_ceda3078
PS5, Line 193: static const char *nft_thread_req_type_name[] = {
static const char * array should probably be static const char * const
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16223):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/d6770d68_79f2c7f2
PS5, Line 620: while (1) {
braces {} are not necessary for single statement blocks
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16223):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/7508f387_d8d5a2c9
PS5, Line 652:if (period_us < 1)
suspect code indent for conditional statements (7, 15)
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16223):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/3bdc932d_afd931ff
PS5, Line 653:period_us = 1;
code indent should use tabs where possible
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16223):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/7901fdad_9cee6d30
PS5, Line 653:period_us = 1;
please, no spaces at the start of a line
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca
Gerrit-Change-Number: 36539
Gerrit-PatchSet: 5
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Attention: neels
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 21 May 2024 16:33:21 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: per-HNB GTP-U traffic counters via nft .. per-HNB GTP-U traffic counters via nft Add optional feature: retrieve GTP-U traffic counters per hNodeB (not per individual subscriber!) using nftables, to provide new rate_ctr stats. This is a "workaround" to get performance indicators per hNodeB, without needing a UPF that supports URR. When an hNodeB registers, set up nftables rules to count GTP-U packets (UDP port 2152) to and from that hNodeB's address -- we are assuming that it is the same address that Iuh is connecting from. >From the per-hNodeB packet and byte counters from nftables, also derive a "UE bytes" counter, which is counting only the GTP-U payload. Assume IP header of 20 bytes; UDP and GTP-U headers are 8 bytes each: ue_bytes = total_bytes - packets * (20 + 8 + 8) Query these periodically, as configurable by new timer X34. Default is one second of wait time between querying counters (excluding the time it takes to retrieve and update the counters). Add compile-time switch --enable-nftables, to build with/without external dependency libnftables. Default is without, as before. Add jenkins axis NFTABLES to switch --enable-nftables. Add cfg file option 'hnbgw' / 'nft-kpi' to enable use of nftables. This requires osmo-hnbgw to be run with cap_net_admin. The VTY config commands are always visible -- simplifies VTY testing. Refuse to start osmo-hnbgw when the user is requesting nft-kpi in the config but when built without --enable-nftables. Do nft commands in 2 separate threads. Run the same request queue implementation twice, with two thread workers to handle them: - one thread receives all requests to init the nft table, add and remove hNodeB counters, and start and stop counting for a specific hNodeB. - Another thread handles all retrieval and parsing of counters from nft. The main() thread hence never blocks for nftables commands, and services the responses from nft when they are ready, via an osmo_it_q registered in the main() select loop. Persistently keep an nftables named counter for each seen hNodeB cell id in the nftables ruleset, for the lifetime of a hnb_persistent instance that holds the target rate_ctrs. Add the rules to feed into these persistent counters to the ruleset when the particular cell attaches and detaches via HNBAP HNB (De-)Register. On hnb_persistent_free(), remove all items relating to this cell id from nftables, including the persistent named counters. Loosely related: upcoming patches will implement - a hashtable for faster cell id lookup (important for updating counters) Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 - proper MNC-3-digit support in cell ids (better have a 100% correct primary key). Id9a91c80cd2745424a916aef4736993bb7cd8ba0 - idle timeout for disconnected hnbp, so we are sure stale state does not build up for eternity. Ic819d7cbc03fb39e98c204b70d016c5170dc6307 Related: SYS#6773 Related: OS#6425 Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca --- M configure.ac M contrib/jenkins.sh M debian/control M debian/rules M include/osmocom/hnbgw/Makefile.am M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/nft_kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/nft_kpi.c M src/osmo-hnbgw/osmo_hnbgw_main.c M src/osmo-hnbgw/tdefs.c M tests/osmo-hnbgw.vty 15 files changed, 1,298 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/39/36539/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels, pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email ) Change subject: per-HNB GTP-U traffic counters via nft .. Patch Set 6: (1 comment) File src/osmo-hnbgw/nft_kpi.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16230): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/19efdfdf_69942797 PS6, Line 651:if (period_us < 1) suspect code indent for conditional statements (7, 15) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 16:39:15 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email )
Change subject: per-HNB GTP-U traffic counters via nft
..
Patch Set 6:
(27 comments)
File include/osmocom/hnbgw/hnbgw.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/e5fba8c1_f58df936
PS6, Line 384: /* When rules to count traffic to and from this hNodeB are
present, this reflects the state in nftables
I'm not understanding this comment. You first mention "rules", and after
"nftables rules". Not sure what are the differences.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/ace1cd1a_3147487a
PS6, Line 394: struct osmo_sockaddr_str addr_remote;
open question: to be seen whether it makes more sense to use a osmo_sockaddr
instead here. It depends on whether we really use strings all the time or
whether libnft or alike uses sockaddr.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/b7c35db9_bd89154c
PS6, Line 402: struct {
maybe you want to declare the struct type once and use it twice here.
Maybe add it in osmocom/hnbgw/nft_kpi.h?
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/a7c66462_c1e777cf
PS6, Line 446: bool enable;
some short comment here on what these do would be welcome.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/b926458d_eb85ddce
PS6, Line 483: struct {
same here, some comment welcome.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/a17a9596_e9973ccc
PS6, Line 514: void hnb_persistent_connected(struct hnb_persistent *hnbp);
difficult to understand what are these exactly only by looking at the name.
Some functions that get called when hnb is connected or disconnected? at which
stack level?
File include/osmocom/hnbgw/nft_kpi.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/e8146148_bb9b5fc9
PS6, Line 7: struct nft_kpi_handle {
Some comments docummenting these structs and fields may be welcome.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/6a3c44ba_8fae36bd
PS6, Line 19: void nft_kpi_hnb_persistent_init(struct hnb_persistent *hnbp);
These APIs seems to be counterparts, but sounds weird having init vs remove.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/e7e0fa6d_bc83b684
PS6, Line 21: int nft_kpi_hnb_start(struct hnb_persistent *hnbp, const struct
osmo_sockaddr_str *gtpu_remote);
This addr is probably coming from RANAP in binary form, so feels weird having
it converted to a osmo_sockaddr_str instead of keeping it as a osmo_sockaddr.
File src/osmo-hnbgw/hnbgw.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/f93ff87e_23b1f35f
PS6, Line 346: hnb_persistent_disconnected(ctx->persistent);
so API is not really protocol related. More like "attach/detach" maybe?
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/dcf2a91b_764b7d1e
PS6, Line 590: if (osmo_sockaddr_str_from_osa(&remote_str, &osa)) {
there we go, a sockaddr transformed into a sockaddr_str, not sure if there's a
real reason to do so, maybe inside nft we use strings?
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/c0ac0e59_62a0cb56
PS6, Line 607: {
Sounds like a self-made FSM right? :P
May make sense to move to osmo_fsm.
File src/osmo-hnbgw/hnbgw_hnbap.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/856b23fc_d075cf8f
PS6, Line 571: hnb_persistent_connected(ctx->persistent);
Since this happens at registration time, maybe rename it to
"hnb_persistent_registered"? I still find the "connected" here a bit confusing.
File src/osmo-hnbgw/hnbgw_vty.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/9f5d00ea_76ab979f
PS6, Line 884: DEFUN(cfg_hnbgw_nft_kpi, cfg_hnbgw_nft_kpi_cmd,
I think we have VTY CMD flags to state that changes apply after a process
restart, you could use them here.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/272e2fa5_45bacedd
PS6, Line 899: g_hnbgw->config.nft_kpi.table_name = talloc_strdup(g_hnbgw,
set_table_name);
These 3 lines is basically a osmo_talloc_replace_string right?
File src/osmo-hnbgw/nft_kpi.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/9840336e_39060b40
PS6, Line 18: #include
Some overall architecture comment description here would be great, to quickly
figure out the interesting APIs.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/a4b157a4_d5851d35
PS6, Line 35: {
I guess these will be filled up by follow-up patches adding hashtables?
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/36732648_bd0d1060
PS6, Line 86: static __thread struct nft_thread *g_nft_thread = NULL;
having a thread-specific variable prefix with "g_" sounds weird, since it's not
really globally available :)
Maybe "self_nft_thread".
EDIT: Ok after having a whole look at the file, I see this is actually a
pointer only. But I don't really see a point in having
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email ) Change subject: per-HNB GTP-U traffic counters via nft .. Patch Set 6: (1 comment) Patchset: PS6: Hi @nhofm...@sysmocom.de, I wrote some comments while digesting the patch, feel free to apply whatever you think makes sense. In general looks promising. What I would really like, is that you split each of the worker threads into its own file, otherwise it's a bit mindblowing trying to digest that (for me now, and for any reader that comes after me when the code is merged and has to debug it). So I say: Please first split those into different files if possible and then I'll give a more through review through each of them on that code. It should be mostly moving functions from one file to another (and if a lot other work is needed, then to me it also means something is entangled where it shouldn't, so it's good it becomes untangled). -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Tue, 21 May 2024 17:48:53 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: neels, pespin.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email )
Change subject: per-HNB GTP-U traffic counters via nft
..
Patch Set 6:
(6 comments)
File include/osmocom/hnbgw/hnbgw.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/f24a208b_f76c6399
PS6, Line 394: struct osmo_sockaddr_str addr_remote;
> open question: to be seen whether it makes more sense to use a osmo_sockaddr
> instead here. […]
libnftables interfacing is string based, as the patch should show in other
places
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/97e043bd_58c8421e
PS6, Line 446: bool enable;
> some short comment here on what these do would be welcome.
I actually think they are self-explanatory.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/0cc2af5c_e83598e1
PS6, Line 483: struct {
> same here, some comment welcome.
I actually think they are self-explanatory.
File include/osmocom/hnbgw/nft_kpi.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/34cfe65b_bb6094e9
PS6, Line 7: struct nft_kpi_handle {
> Some comments docummenting these structs and fields may be welcome.
I actually think they are simple, clarly named and self-explanatory.
File src/osmo-hnbgw/nft_kpi.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/30e6cd61_14520ed5
PS6, Line 35: {
> I guess these will be filled up by follow-up patches adding hashtables?
those are the stubs for when you are compiling osmo-hnbgw without libnftables
support
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/9becf34f_bf329996
PS6, Line 86: static __thread struct nft_thread *g_nft_thread = NULL;
> Simply have one var per thread, even better when you split stuff into
> different files.
isn't that what __thread is for?
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca
Gerrit-Change-Number: 36539
Gerrit-PatchSet: 6
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Attention: neels
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 21 May 2024 20:16:34 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email ) Change subject: per-HNB GTP-U traffic counters via nft .. Patch Set 6: (1 comment) File src/osmo-hnbgw/nft_kpi.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/94748393_6ce3a7e9 PS6, Line 86: static __thread struct nft_thread *g_nft_thread = NULL; > > Simply have one var per thread, even better when you split stuff into > > different files. […] Not exactly imho. __thread is useful when you have N (tons of, unknown) threads spawned which do generic work and use generic code. This is not really the case here. You have a well known number of threads (2), each having its own specific purpose and hence context. So it's totally fine having 2 global variables instead of having to use TLS every time each of the threads need to access its context. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Tue, 21 May 2024 20:32:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, pespin.
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email )
Change subject: per-HNB GTP-U traffic counters via nft
..
Patch Set 6:
(26 comments)
Patchset:
PS6:
> Hi @nhofmeyr@sysmocom. […]
Actually it is the same thread running twice.
There is one "instruction set" and the caller decides how to split the thread
responsibilities.
It would not be a problem to run only one thread, or three, which is the point
of this implementation.
For review of the blocking/nonblocking nature, you may find interesting to know
that all requests are handled by the maintenance thread, except that the second
thread handles ONLY and ALL the GET_COUNTERS requests. This is also described
in a comment in-code IIRC.
For review of functionality it should not make any difference how often the
thread runs.
File include/osmocom/hnbgw/hnbgw.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/c52e8836_5a81c567
PS6, Line 384: /* When rules to count traffic to and from this hNodeB are
present, this reflects the state in nftables
> I'm not understanding this comment. You first mention "rules", and after
> "nftables rules". […]
"rules" and "nftables rules" is the same thing.
is this a better comment? :
State that the main thread needs in order to know what to request from the
worker threads.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/0d7e16e5_ff928953
PS6, Line 402: struct {
> maybe you want to declare the struct type once and use it twice here. […]
(in an earlier patch set i actually had the two combined in one struct.)
The two nft_kpi_handle and nft_kpi_val are also used in function signatures and
static vars, but this combined one (ul, dl) exists only here. I can make an
extra struct for that, but that makes more lines of code, not less.
should i still do that? i wouldn't do it, but my opinion is not strong
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/63da49ff_ea065842
PS6, Line 446: bool enable;
> I actually think they are self-explanatory.
nft_kpi.enable means nft_kpi is enabled,
the nft_kpi.table_name is used as name for the nft table... =)
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/d018d3ed_0a5347a2
PS6, Line 483: struct {
> I actually think they are self-explanatory.
I'm not a friend of comments like
/* timer to get nftables counters */
nft_kpi.get_counters_timer;
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/c94caac6_48d70682
PS6, Line 514: void hnb_persistent_connected(struct hnb_persistent *hnbp);
> difficult to understand what are these exactly only by looking at the name.
> […]
(not sure i understand what you mean by stack level)
i'll add comments to describe. they are a late addition, it seems i forgot.
File include/osmocom/hnbgw/nft_kpi.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/88db9e0a_5132b9cb
PS6, Line 7: struct nft_kpi_handle {
> I actually think they are simple, clarly named and self-explanatory.
i can explain in a comment that nftables has "handles" required to remove
unnamed rules...?
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/b46445d9_0114dca7
PS6, Line 19: void nft_kpi_hnb_persistent_init(struct hnb_persistent *hnbp);
> These APIs seems to be counterparts, but sounds weird having init vs remove.
ah yes, i had names based on "init the ruleset" at some point, this is a
leftover. i'll make it "add" instead.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/2c1be44b_7aa4dd63
PS6, Line 21: int nft_kpi_hnb_start(struct hnb_persistent *hnbp, const struct
osmo_sockaddr_str *gtpu_remote);
> This addr is probably coming from RANAP in binary form, so feels weird having
> it converted to a osmo […]
nftables uses strings (also all logging), so it makes sense to use strings here.
(This is the same as in MGCP, also a string based protocol, where it is also
often more useful to store the strings than the sockaddr)
File src/osmo-hnbgw/hnbgw.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/992ef815_ac9bbe62
PS6, Line 346: hnb_persistent_disconnected(ctx->persistent);
> so API is not really protocol related. […]
(or "active" and "inactive", s.a.)
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/ae15427e_d9a3ee85
PS6, Line 590: if (osmo_sockaddr_str_from_osa(&remote_str, &osa)) {
> there we go, a sockaddr transformed into a sockaddr_str, not sure if there's
> a real reason to do so, […]
yes
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/a32a6f58_262c4afe
PS6, Line 607: {
> Sounds like a self-made FSM right? :P […]
exactly what i mean above. But this patch is not about fixing the HNBAP / HNB
activity tracking. It only shows up because I add the two functions that should
already have existed before this patch.
So my idea here is to add these "stubs" fo
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email ) Change subject: per-HNB GTP-U traffic counters via nft .. Patch Set 6: (1 comment) File tests/osmo-hnbgw.vty: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/c3dc4761_f19d61d3 PS6, Line 96: bw haha no-one found this typo! -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 22 May 2024 00:16:50 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: per-HNB GTP-U traffic counters via nft .. per-HNB GTP-U traffic counters via nft Add optional feature: retrieve GTP-U traffic counters per hNodeB (not per individual subscriber!) using nftables, to provide new rate_ctr stats. This is a "workaround" to get performance indicators per hNodeB, without needing a UPF that supports URR. When an hNodeB registers, set up nftables rules to count GTP-U packets (UDP port 2152) to and from that hNodeB's address -- we are assuming that it is the same address that Iuh is connecting from. >From the per-hNodeB packet and byte counters from nftables, also derive a "UE bytes" counter, which is counting only the GTP-U payload. Assume IP header of 20 bytes; UDP and GTP-U headers are 8 bytes each: ue_bytes = total_bytes - packets * (20 + 8 + 8) Query these periodically, as configurable by new timer X34. Default is one second of wait time between querying counters (excluding the time it takes to retrieve and update the counters). Add compile-time switch --enable-nftables, to build with/without external dependency libnftables. Default is without, as before. Add jenkins axis NFTABLES to switch --enable-nftables. Add cfg file option 'hnbgw' / 'nft-kpi' to enable use of nftables. This requires osmo-hnbgw to be run with cap_net_admin. The VTY config commands are always visible -- simplifies VTY testing. Refuse to start osmo-hnbgw when the user is requesting nft-kpi in the config but when built without --enable-nftables. Do nft commands in 2 separate threads. Run the same request queue implementation twice, with two thread workers to handle them: - one thread receives all requests to init the nft table, add and remove hNodeB counters, and start and stop counting for a specific hNodeB. - Another thread handles all retrieval and parsing of counters from nft. The main() thread hence never blocks for nftables commands, and services the responses from nft when they are ready, via an osmo_it_q registered in the main() select loop. Persistently keep an nftables named counter for each seen hNodeB cell id in the nftables ruleset, for the lifetime of a hnb_persistent instance that holds the target rate_ctrs. Add the rules to feed into these persistent counters to the ruleset when the particular cell attaches and detaches via HNBAP HNB (De-)Register. On hnb_persistent_free(), remove all items relating to this cell id from nftables, including the persistent named counters. Loosely related: upcoming patches will implement - a hashtable for faster cell id lookup (important for updating counters) Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 - proper MNC-3-digit support in cell ids (better have a 100% correct primary key). Id9a91c80cd2745424a916aef4736993bb7cd8ba0 - idle timeout for disconnected hnbp, so we are sure stale state does not build up for eternity. Ic819d7cbc03fb39e98c204b70d016c5170dc6307 Related: SYS#6773 Related: OS#6425 Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca --- M configure.ac M contrib/jenkins.sh M debian/control M debian/rules M include/osmocom/hnbgw/Makefile.am M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/nft_kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/nft_kpi.c M src/osmo-hnbgw/osmo_hnbgw_main.c M src/osmo-hnbgw/tdefs.c M tests/osmo-hnbgw.vty 15 files changed, 1,306 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/39/36539/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: include/osmocom/gsm: add rtp_extensions.h
falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/36895?usp=email ) Change subject: include/osmocom/gsm: add rtp_extensions.h .. include/osmocom/gsm: add rtp_extensions.h Previous patches add definitions of GSM0808_IE_THEMWI_RTP_EXTENSIONS and RSL_IE_OSMO_RTP_EXTENSIONS to BSSMAP and RSL; this new header file provides definitions for individual bits in the single value octet of the new IE. Related: OS#6448 Change-Id: I0eccfe5ddcf44f8f20440acb01e2d4870ec0cd91 --- M include/osmocom/gsm/Makefile.am A include/osmocom/gsm/rtp_extensions.h 2 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/36895/1 diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am index 5678a51..e42ffec 100644 --- a/include/osmocom/gsm/Makefile.am +++ b/include/osmocom/gsm/Makefile.am @@ -50,6 +50,7 @@ oap_client.h \ rlp.h \ rsl.h \ + rtp_extensions.h \ rxlev_stat.h \ sysinfo.h \ tlv.h \ diff --git a/include/osmocom/gsm/rtp_extensions.h b/include/osmocom/gsm/rtp_extensions.h new file mode 100644 index 000..edea431 --- /dev/null +++ b/include/osmocom/gsm/rtp_extensions.h @@ -0,0 +1,23 @@ +/* + * Themyscira Wireless Technical Specification TW-TS-003 defines a BSSMAP + * extension whereby a CN implementation and a BSS implementation can + * negotiate the use of non-3GPP-standard extensions to RTP user plane, + * extensions that modify RTP formats counter to the stipulations of + * 3GPP TS 48.103. There is also a private Osmocom-defined IE in Abis RSL + * that communicates the same RTP extensions from OsmoBSC to OsmoBTS. + * + * This header file defines the meaning of the bits in the first (and currently + * only) value octet of the TLV IE added to BSSMAP and RSL interfaces, + * namely, GSM0808_IE_THEMWI_RTP_EXTENSIONS and RSL_IE_OSMO_RTP_EXTENSIONS. + * It is based on this authoritative definition: + * + * https://www.freecalypso.org/specs/tw-ts-003-v010002.txt + * + * Section 5.3 in the above specification defines the assignment of + * individual bits in the single value octet. + */ + +#pragma once + +#defineOSMO_RTP_EXT_TWTS0010x01 +#defineOSMO_RTP_EXT_TWTS0020x02 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36895?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0eccfe5ddcf44f8f20440acb01e2d4870ec0cd91 Gerrit-Change-Number: 36895 Gerrit-PatchSet: 1 Gerrit-Owner: falconia Gerrit-MessageType: newchange
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email to look at the new patch set (#8). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: per-HNB GTP-U traffic counters via nft .. per-HNB GTP-U traffic counters via nft Add optional feature: retrieve GTP-U traffic counters per hNodeB (not per individual subscriber!) using nftables, to provide new rate_ctr stats. This is a "workaround" to get performance indicators per hNodeB, without needing a UPF that supports URR. When an hNodeB registers, set up nftables rules to count GTP-U packets (UDP port 2152) to and from that hNodeB's address -- we are assuming that it is the same address that Iuh is connecting from. >From the per-hNodeB packet and byte counters from nftables, also derive a "UE bytes" counter, which is counting only the GTP-U payload. Assume IP header of 20 bytes; UDP and GTP-U headers are 8 bytes each: ue_bytes = total_bytes - packets * (20 + 8 + 8) Query these periodically, as configurable by new timer X34. Default is one second of wait time between querying counters (excluding the time it takes to retrieve and update the counters). Add compile-time switch --enable-nftables, to build with/without external dependency libnftables. Default is without, as before. Add jenkins axis NFTABLES to switch --enable-nftables. Add cfg file option 'hnbgw' / 'nft-kpi' to enable use of nftables. This requires osmo-hnbgw to be run with cap_net_admin. The VTY config commands are always visible -- simplifies VTY testing. Refuse to start osmo-hnbgw when the user is requesting nft-kpi in the config but when built without --enable-nftables. Do nft commands in 2 separate threads. Run the same request queue implementation twice, with two thread workers to handle them: - one thread receives all requests to init the nft table, add and remove hNodeB counters, and start and stop counting for a specific hNodeB. - Another thread handles all retrieval and parsing of counters from nft. The main() thread hence never blocks for nftables commands, and services the responses from nft when they are ready, via an osmo_it_q registered in the main() select loop. Persistently keep an nftables named counter for each seen hNodeB cell id in the nftables ruleset, for the lifetime of a hnb_persistent instance that holds the target rate_ctrs. Add the rules to feed into these persistent counters to the ruleset when the particular cell attaches and detaches via HNBAP HNB (De-)Register. On hnb_persistent_free(), remove all items relating to this cell id from nftables, including the persistent named counters. Loosely related: upcoming patches will implement - a hashtable for faster cell id lookup (important for updating counters) Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 - proper MNC-3-digit support in cell ids (better have a 100% correct primary key). Id9a91c80cd2745424a916aef4736993bb7cd8ba0 - idle timeout for disconnected hnbp, so we are sure stale state does not build up for eternity. Ic819d7cbc03fb39e98c204b70d016c5170dc6307 Related: SYS#6773 Related: OS#6425 Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca --- M configure.ac M contrib/jenkins.sh M debian/control M debian/rules M include/osmocom/hnbgw/Makefile.am M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/nft_kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/nft_kpi.c M src/osmo-hnbgw/osmo_hnbgw_main.c M src/osmo-hnbgw/tdefs.c M tests/osmo-hnbgw.vty 15 files changed, 1,361 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/39/36539/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 8 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, pespin.
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email )
Change subject: per-HNB GTP-U traffic counters via nft
..
Patch Set 8:
(10 comments)
File include/osmocom/hnbgw/hnbgw.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/05db6881_c2e313de
PS6, Line 384: /* When rules to count traffic to and from this hNodeB are
present, this reflects the state in nftables
> "rules" and "nftables rules" is the same thing. […]
Done
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/e4f7363b_9d5f1f5c
PS6, Line 446: bool enable;
> nft_kpi.enable means nft_kpi is enabled, […]
Done
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/7c5eace2_0b14116a
PS6, Line 483: struct {
> I'm not a friend of comments like […]
Done
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/b6ed9449_5b8dd6c6
PS6, Line 514: void hnb_persistent_connected(struct hnb_persistent *hnbp);
> (not sure i understand what you mean by stack level) […]
Done
File include/osmocom/hnbgw/nft_kpi.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/e166bad6_f8e42919
PS6, Line 7: struct nft_kpi_handle {
> i can explain in a comment that nftables has "handles" required to remove
> unnamed rules... […]
Done
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/2d7fa26e_8c21e836
PS6, Line 19: void nft_kpi_hnb_persistent_init(struct hnb_persistent *hnbp);
> ah yes, i had names based on "init the ruleset" at some point, this is a
> leftover. […]
Done
File src/osmo-hnbgw/hnbgw.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/78f44e93_2a1bdebb
PS6, Line 590: if (osmo_sockaddr_str_from_osa(&remote_str, &osa)) {
> yes
Done
File src/osmo-hnbgw/hnbgw_vty.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/35175add_26566ad4
PS6, Line 899: g_hnbgw->config.nft_kpi.table_name = talloc_strdup(g_hnbgw,
set_table_name);
> yup, it incrementally became this so i didn't notice, thx
Done
File src/osmo-hnbgw/nft_kpi.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/597df748_1c4a4942
PS6, Line 18: #include
> hm i thought i had that somewhere...
Done
File tests/osmo-hnbgw.vty:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/8718a2e4_077d62c7
PS6, Line 96: bw
> haha no-one found this typo!
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca
Gerrit-Change-Number: 36539
Gerrit-PatchSet: 8
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Wed, 22 May 2024 01:08:37 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels
Comment-In-Reply-To: laforge
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email ) Change subject: per-HNB GTP-U traffic counters via nft .. Patch Set 8: (1 comment) File src/osmo-hnbgw/nft_kpi.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/a50479b1_7fa9b125 PS6, Line 419: rate_ctr_add2(cg, cgidx, new_val - *last_val); > update_ctr does what it does: updating counters. The important part is where > is it called from: […] you're right, these two functions were in the wrong place of the file, moving them further down -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 8 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 22 May 2024 01:22:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: per-HNB GTP-U traffic counters via nft .. per-HNB GTP-U traffic counters via nft Add optional feature: retrieve GTP-U traffic counters per hNodeB (not per individual subscriber!) using nftables, to provide new rate_ctr stats. This is a "workaround" to get performance indicators per hNodeB, without needing a UPF that supports URR. When an hNodeB registers, set up nftables rules to count GTP-U packets (UDP port 2152) to and from that hNodeB's address -- we are assuming that it is the same address that Iuh is connecting from. >From the per-hNodeB packet and byte counters from nftables, also derive a "UE bytes" counter, which is counting only the GTP-U payload. Assume IP header of 20 bytes; UDP and GTP-U headers are 8 bytes each: ue_bytes = total_bytes - packets * (20 + 8 + 8) Query these periodically, as configurable by new timer X34. Default is one second of wait time between querying counters (excluding the time it takes to retrieve and update the counters). Add compile-time switch --enable-nftables, to build with/without external dependency libnftables. Default is without, as before. Add jenkins axis NFTABLES to switch --enable-nftables. Add cfg file option 'hnbgw' / 'nft-kpi' to enable use of nftables. This requires osmo-hnbgw to be run with cap_net_admin. The VTY config commands are always visible -- simplifies VTY testing. Refuse to start osmo-hnbgw when the user is requesting nft-kpi in the config but when built without --enable-nftables. Do nft commands in 2 separate threads. Run the same request queue implementation twice, with two thread workers to handle them: - one thread receives all requests to init the nft table, add and remove hNodeB counters, and start and stop counting for a specific hNodeB. - Another thread handles all retrieval and parsing of counters from nft. The main() thread hence never blocks for nftables commands, and services the responses from nft when they are ready, via an osmo_it_q registered in the main() select loop. Persistently keep an nftables named counter for each seen hNodeB cell id in the nftables ruleset, for the lifetime of a hnb_persistent instance that holds the target rate_ctrs. Add the rules to feed into these persistent counters to the ruleset when the particular cell attaches and detaches via HNBAP HNB (De-)Register. On hnb_persistent_free(), remove all items relating to this cell id from nftables, including the persistent named counters. Loosely related: upcoming patches will implement - a hashtable for faster cell id lookup (important for updating counters) Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 - proper MNC-3-digit support in cell ids (better have a 100% correct primary key). Id9a91c80cd2745424a916aef4736993bb7cd8ba0 - idle timeout for disconnected hnbp, so we are sure stale state does not build up for eternity. Ic819d7cbc03fb39e98c204b70d016c5170dc6307 Related: SYS#6773 Related: OS#6425 Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca --- M configure.ac M contrib/jenkins.sh M debian/control M debian/rules M include/osmocom/hnbgw/Makefile.am M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/nft_kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/nft_kpi.c M src/osmo-hnbgw/osmo_hnbgw_main.c M src/osmo-hnbgw/tdefs.c M tests/osmo-hnbgw.vty 15 files changed, 1,380 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/39/36539/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 9 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email ) Change subject: per-HNB GTP-U traffic counters via nft .. Patch Set 9: (2 comments) Patchset: PS9: sprinkled some more comments everywhere clarifying which thread runs what File src/osmo-hnbgw/nft_kpi.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/70169773_66a0d04c PS6, Line 419: rate_ctr_add2(cg, cgidx, new_val - *last_val); > you're right, these two functions were in the wrong place of the file, moving > them further down Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 9 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 22 May 2024 01:23:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email ) Change subject: per-HNB GTP-U traffic counters via nft .. Patch Set 9: (1 comment) Patchset: PS9: the remaining unresolved comments are open to responses; if i made my point / my opinion clear enough, maybe reviewers can mark them resolved... -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 9 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 22 May 2024 01:26:39 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: common: add support for TW-TS-001
falconia has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/36896?usp=email )
Change subject: common: add support for TW-TS-001
..
common: add support for TW-TS-001
Themyscira Wireless Technical Specification TW-TS-001 defines
an enhanced RTP transport format for FR and EFR codecs within
an IP-based GSM RAN, restoring the full functionality and semantics
of GSM 08.60 TRAU-UL format that were lost in the industry transition
to RTP with payload formats standardized by TIPHON and IETF.
Given that this new enhanced RTP transport format runs counter
to commonly accepted standards, it is strictly optional. OsmoBTS
always accepts both basic and extended RTP formats, but it sends
the extended RTP format of TW-TS-001 only when commanded to do so
by the BSC via an RSL extension IE; OsmoBSC will in turn direct
the BTS to use this extension only when the CN asks for it via
the BSSMAP extension defined in TW-TS-003.
Spec references:
https://www.freecalypso.org/specs/tw-ts-001-v010100.txt
https://www.freecalypso.org/specs/tw-ts-003-v010002.txt
Related: OS#6448
Change-Id: Id997e8666bc19e60936aaa83b43a968d30320bd7
---
M include/osmo-bts/lchan.h
M src/common/bts.c
M src/common/l1sap.c
M src/common/rsl.c
M src/common/rtp_input_preen.c
5 files changed, 147 insertions(+), 17 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/36896/1
diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h
index 585483b..60c2710 100644
--- a/include/osmo-bts/lchan.h
+++ b/include/osmo-bts/lchan.h
@@ -168,6 +168,7 @@
uint16_t conn_id;
uint8_t rtp_payload;
uint8_t rtp_payload2;
+ uint8_t rtp_extensions;
uint8_t speech_mode;
struct {
bool use;
diff --git a/src/common/bts.c b/src/common/bts.c
index 56765ec..633e0d1 100644
--- a/src/common/bts.c
+++ b/src/common/bts.c
@@ -393,6 +393,7 @@
osmo_bts_set_feature(bts->features, BTS_FEAT_ETWS_PN);
osmo_bts_set_feature(bts->features, BTS_FEAT_IPV6_NSVC);
osmo_bts_set_feature(bts->features, BTS_FEAT_PAGING_COORDINATION);
+ osmo_bts_set_feature(bts->features, BTS_FEAT_TWTS001);
/* Maximum TA supported by the PHY (can be overridden by PHY specific
code) */
bts->support.max_ta = MAX_TA_DEF;
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 5f275cd..5a900f8 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1990,13 +1991,42 @@
send_ul_rtp_packet_speech(lchan, fn, msg->data, msg->len);
}
+/* a helper function for emitting FR/EFR UL in TW-TS-001 format */
+static void send_rtp_twts001(struct gsm_lchan *lchan, uint32_t fn,
+struct msgb *msg, bool good_frame)
+{
+ uint8_t teh;
+ bool send_frame;
+
+ if (msg->len == GSM_FR_BYTES || msg->len == GSM_EFR_BYTES) {
+ if (good_frame)
+ teh = 0xE0;
+ else
+ teh = 0xE2;
+ send_frame = true;
+ } else {
+ teh = 0xE6;
+ send_frame = false;
+ }
+ /* always set DTXd and TAF bits */
+ if (lchan->ts->trx->bts->dtxd)
+ teh |= 0x08;
+ if (fn % 104 == 52)
+ teh |= 0x01;
+ if (send_frame) {
+ msgb_push_u8(msg, teh);
+ send_ul_rtp_packet_speech(lchan, fn, msg->data, msg->len);
+ } else {
+ send_ul_rtp_packet_speech(lchan, fn, &teh, 1);
+ }
+}
+
/* A helper function for l1sap_tch_ind(): handling BFI
*
- * Please note that we pass the msgb to this function, even though it is
- * currently not used. This msgb passing is a provision for adding
- * support for TRAU-UL-like RTP payload formats like TW-TS-001 that allow
- * indicating BFI along with deemed-bad frame data bits, just like
- * GSM 08.60 and 08.61 TRAU-UL frames.
+ * Please note that the msgb passed to this function is used only when
+ * the CN asked the BSS to emit extended RTP formats (currently TW-TS-001,
+ * later TW-TS-002 as well) that can indicate BFI along with deemed-bad
+ * frame data bits, just like GSM 08.60 and 08.61 TRAU-UL frames.
*/
static void tch_ul_bfi_handler(struct gsm_lchan *lchan,
const struct gsm_time *g_time, struct msgb *msg)
@@ -2005,6 +2035,20 @@
uint8_t ecu_out[GSM_FR_BYTES];
int rc;
+ /* Are we on TCH/FS or TCH/EFS, configured to emit TW-TS-001 extended
+* RTP format? If so, emit BFI per that spec. The placement of
+* this check before the ECU is intentional: the modes of TW-TS-001
+* UL output (closely replicating the classic GSM architecture in which
+* a BTS never applies an ECU to its UL output) and
[M] Change in osmo-bts[master]: common: add support for TW-TS-001
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36896?usp=email ) Change subject: common: add support for TW-TS-001 .. Patch Set 1: (12 comments) File src/common/l1sap.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16235): https://gerrit.osmocom.org/c/osmo-bts/+/36896/comment/bcb9c1b8_64c97313 PS1, Line 1998: uint8_t teh; 'teh' may be misspelled - perhaps 'the'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16235): https://gerrit.osmocom.org/c/osmo-bts/+/36896/comment/d1802a21_bc319f6a PS1, Line 2003: teh = 0xE0; 'teh' may be misspelled - perhaps 'the'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16235): https://gerrit.osmocom.org/c/osmo-bts/+/36896/comment/09c46f74_0b55d5d4 PS1, Line 2005: teh = 0xE2; 'teh' may be misspelled - perhaps 'the'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16235): https://gerrit.osmocom.org/c/osmo-bts/+/36896/comment/848fe8cc_61f31b81 PS1, Line 2008: teh = 0xE6; 'teh' may be misspelled - perhaps 'the'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16235): https://gerrit.osmocom.org/c/osmo-bts/+/36896/comment/3e1d16df_ae355de3 PS1, Line 2013: teh |= 0x08; 'teh' may be misspelled - perhaps 'the'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16235): https://gerrit.osmocom.org/c/osmo-bts/+/36896/comment/1719c13b_81877257 PS1, Line 2015: teh |= 0x01; 'teh' may be misspelled - perhaps 'the'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16235): https://gerrit.osmocom.org/c/osmo-bts/+/36896/comment/05608687_536519ec PS1, Line 2017: msgb_push_u8(msg, teh); 'teh' may be misspelled - perhaps 'the'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16235): https://gerrit.osmocom.org/c/osmo-bts/+/36896/comment/2d2d3d9d_8b3d11e9 PS1, Line 2020: send_ul_rtp_packet_speech(lchan, fn, &teh, 1); 'teh' may be misspelled - perhaps 'the'? File src/common/rtp_input_preen.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16235): https://gerrit.osmocom.org/c/osmo-bts/+/36896/comment/c8288bb0_de6f62a8 PS1, Line 74: /* TEH octet must be correct, and not a BFI */ 'TEH' may be misspelled - perhaps 'THE'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16235): https://gerrit.osmocom.org/c/osmo-bts/+/36896/comment/54c04f2c_71cd8e94 PS1, Line 80: /* Strip TEH octet, leaving only standard FR payload. */ 'TEH' may be misspelled - perhaps 'THE'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16235): https://gerrit.osmocom.org/c/osmo-bts/+/36896/comment/0dc63208_dade06ad PS1, Line 98: /* TEH octet must be correct, and not a BFI */ 'TEH' may be misspelled - perhaps 'THE'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16235): https://gerrit.osmocom.org/c/osmo-bts/+/36896/comment/23da6236_9207b679 PS1, Line 104: /* Strip TEH octet, leaving only standard EFR payload. */ 'TEH' may be misspelled - perhaps 'THE'? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36896?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id997e8666bc19e60936aaa83b43a968d30320bd7 Gerrit-Change-Number: 36896 Gerrit-PatchSet: 1 Gerrit-Owner: falconia Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 22 May 2024 02:38:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: trxcon/l1sched: fix sending dummy TCH/A[FH]S blocks
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/36879?usp=email )
Change subject: trxcon/l1sched: fix sending dummy TCH/A[FH]S blocks
..
trxcon/l1sched: fix sending dummy TCH/A[FH]S blocks
... in the absence of valid Uplink TCH/A[FH]S or FACCH frames.
Change-Id: I26205e8672cb2849ea79bd6206c1eff1172bd9d9
Related: libosmocore.git I82ce2adf995a4b42d1f378c5819f88d773b9104a
Related: OS#6049
---
M src/host/trxcon/src/sched_lchan_tchf.c
M src/host/trxcon/src/sched_lchan_tchh.c
2 files changed, 17 insertions(+), 14 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/host/trxcon/src/sched_lchan_tchf.c
b/src/host/trxcon/src/sched_lchan_tchf.c
index 37e0cea..d11b314 100644
--- a/src/host/trxcon/src/sched_lchan_tchf.c
+++ b/src/host/trxcon/src/sched_lchan_tchf.c
@@ -305,13 +305,7 @@
const uint8_t *data = msg ? msgb_l2(msg) : NULL;
size_t data_len = msg ? msgb_l2len(msg) : 0;
- if (msg == NULL) {
- /* TODO: It's not clear what to do for TCH/AFS.
-* TODO: Send dummy FACCH maybe? */
- goto send_burst; /* send something */
- }
-
- if (data_len != GSM_MACBLOCK_LEN) { /* TCH/AFS: speech */
+ if (msg != NULL && msg != msg_facch) { /* TCH/AFS: speech */
if (!l1sched_lchan_amr_prim_is_valid(lchan, msg,
amr_fn_is_cmr))
goto free_bad_msg;
/* pull the AMR header - sizeof(struct amr_hdr) */
@@ -319,6 +313,7 @@
data += 2;
}
+ /* if msg == NULL, transmit a dummy speech block with inverted
CRC6 */
rc = gsm0503_tch_afs_encode(BUFPOS(bursts_p, 0),
data, data_len,
amr_fn_is_cmr,
diff --git a/src/host/trxcon/src/sched_lchan_tchh.c
b/src/host/trxcon/src/sched_lchan_tchh.c
index 99e2680..0d3de00 100644
--- a/src/host/trxcon/src/sched_lchan_tchh.c
+++ b/src/host/trxcon/src/sched_lchan_tchh.c
@@ -512,13 +512,7 @@
const uint8_t *data = msg ? msgb_l2(msg) : NULL;
size_t data_len = msg ? msgb_l2len(msg) : 0;
- if (msg == NULL) {
- /* TODO: It's not clear what to do for TCH/AHS.
-* TODO: Send dummy FACCH maybe? */
- goto send_burst; /* send garbage */
- }
-
- if (data_len != GSM_MACBLOCK_LEN) { /* TCH/AHS: speech */
+ if (msg != NULL && msg != msg_facch) { /* TCH/AHS: speech */
if (!l1sched_lchan_amr_prim_is_valid(lchan, msg,
amr_fn_is_cmr))
goto free_bad_msg;
/* pull the AMR header - sizeof(struct amr_hdr) */
@@ -526,6 +520,7 @@
data += 2;
}
+ /* if msg == NULL, transmit a dummy speech block with inverted
CRC6 */
rc = gsm0503_tch_ahs_encode(BUFPOS(bursts_p, 0),
data, data_len,
amr_fn_is_cmr,
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/36879?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I26205e8672cb2849ea79bd6206c1eff1172bd9d9
Gerrit-Change-Number: 36879
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-msc[master]: SMS-over-GSUP: set log context in gsm411_gsup_rx()
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email )
Change subject: SMS-over-GSUP: set log context in gsm411_gsup_rx()
..
SMS-over-GSUP: set log context in gsm411_gsup_rx()
Change-Id: I3414953d2aa7b075fcee1cf6e5e76c527ae7b507
---
M src/libmsc/gsm_04_11_gsup.c
1 file changed, 12 insertions(+), 6 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c
index 1afdfab..328d047 100644
--- a/src/libmsc/gsm_04_11_gsup.c
+++ b/src/libmsc/gsm_04_11_gsup.c
@@ -133,9 +133,6 @@
const char *msg_name;
bool msg_is_err;
- /* Associate logging messages with this subscriber */
- log_set_context(LOG_CTX_VLR_SUBSCR, vsub);
-
/* Determine the message type and name */
msg_is_err = OSMO_GSUP_IS_MSGT_ERROR(gsup_msg->message_type);
switch (gsup_msg->message_type) {
@@ -241,9 +238,6 @@
bool sm_rp_mmts_ind;
int rc;
- /* Associate logging messages with this subscriber */
- log_set_context(LOG_CTX_VLR_SUBSCR, vsub);
-
LOGP(DLSMS, LOGL_DEBUG, "RX MT-forwardSM-Req\n");
/**
@@ -310,6 +304,9 @@
return -GMM_CAUSE_IMSI_UNKNOWN;
}
+ /* Associate logging messages with this subscriber */
+ log_set_context(LOG_CTX_VLR_SUBSCR, vsub);
+
switch (gsup_msg->message_type) {
/* GSM 04.11 code implementing MO SMS */
case OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR:
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I3414953d2aa7b075fcee1cf6e5e76c527ae7b507
Gerrit-Change-Number: 36861
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-CC: lynxis lazus
Gerrit-MessageType: merged
[S] Change in osmo-msc[master]: SMS-over-GSUP: set log context in gsm411_gsup_rx()
Attention is currently required from: lynxis lazus. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email ) Change subject: SMS-over-GSUP: set log context in gsm411_gsup_rx() .. Patch Set 1: (1 comment) Patchset: PS1: > Why are you removing the log context lines? Because I am moving setting the log context to the common code path. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3414953d2aa7b075fcee1cf6e5e76c527ae7b507 Gerrit-Change-Number: 36861 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 22 May 2024 03:43:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters
Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters .. Patch Set 5: (1 comment) File src/osmo-hnbgw/context_map_rua.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788/comment/68a96698_8b64eb1d PS5, Line 217: struct hnbgw_context_map *map = fi->priv; > This is now an unused variable -- why did jenkins not complain about this? […] looks like jenkins tested patchset 4, not the rebase in patchset 5 that was submitted -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 May 2024 06:35:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters
Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters .. Patch Set 5: (1 comment) File src/osmo-hnbgw/context_map_rua.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788/comment/55b76f78_9cc2b0c1 PS5, Line 217: struct hnbgw_context_map *map = fi->priv; > looks like jenkins tested patchset 4, not the rebase in patchset 5 that was > submitted -> https://osmocom.org/issues/6460 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 May 2024 06:39:11 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: neels Gerrit-MessageType: comment
[S] Change in osmo-hnbgw[master]: contrib/jenkins: set --enable-werror
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36897?usp=email ) Change subject: contrib/jenkins: set --enable-werror .. contrib/jenkins: set --enable-werror Fixes: OS#6460 Change-Id: I6d85b077f57a86b0bad29cb868f1f4f848506f46 --- M contrib/jenkins.sh 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/97/36897/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index dfbbbfe..1c4fa2b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -59,7 +59,7 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests $CONFIG +./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36897?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6d85b077f57a86b0bad29cb868f1f4f848506f46 Gerrit-Change-Number: 36897 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
