Attention is currently required from: neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30345 )
Change subject: paging: Introduce VTY configurable X3113 (Maximum Paging Request Transmit Delay Threshold)
......................................................................
Patch Set 1:
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bsc/+/30345/comment/63285b51_2b45bfb6
PS1, Line 11: timeouts, etc.
> i'm having a hard time understanding this, clarify a bit? […]
T3113 defines the amount of time that a response for a paging request is expected to take at maximum. Hence after T3113 timeouts the request can be freed/retransmitted because we now for sure that there's no answer for it.
File src/osmo-bsc/net_init.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/30345/comment/de69a62b_678d0cc7
PS1, Line 78: PAGING_THRESHOLD_X3113_DEFAULT_SEC
> AFAICT this is the only place where this #define is used. […]
I prefer keeping it in a define in paging.h, where I can describe better the meaning of it, where all related paging information is located.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30345
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ia556ef4e474e6a2d0d1618bab680a3330a3c062b
Gerrit-Change-Number: 30345
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 28 Nov 2022 15:17:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: comment
neels has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30353 )
Change subject: osmo_tdef_get(): clarify API doc on val_if_not_present
......................................................................
Removed Verified-1 by Jenkins Builder (1000002)
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30353
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2301aad86d6d165a3b51c6849bcd8fe02972e0a3
Gerrit-Change-Number: 30353
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: deleteVote
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30353 )
Change subject: osmo_tdef_get(): clarify API doc on val_if_not_present
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
this patch cannot possibly cause the sockets test to fail, will just merge this manually when votes are in
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30353
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2301aad86d6d165a3b51c6849bcd8fe02972e0a3
Gerrit-Change-Number: 30353
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 28 Nov 2022 15:01:42 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30348 )
Change subject: jobs/update-osmo-ci: update list of nodes
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30348
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I79bbb84cd19df7838a30a954ffa47a2a62517f77
Gerrit-Change-Number: 30348
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 28 Nov 2022 14:56:58 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30351 )
Change subject: jobs/master-builds: don't only use debian 9 lxcs
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30351
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I62bf0b968103724ec676900de6cee65fdb00b9e4
Gerrit-Change-Number: 30351
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 28 Nov 2022 14:53:03 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30349 )
Change subject: jobs/gerrit: don't only use debian 9 lxcs
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30349
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I2d14bffb09439e031dec3ab3633a36710434a229
Gerrit-Change-Number: 30349
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 28 Nov 2022 14:52:41 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30353 )
Change subject: osmo_tdef_get(): clarify API doc on val_if_not_present
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30353
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2301aad86d6d165a3b51c6849bcd8fe02972e0a3
Gerrit-Change-Number: 30353
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 28 Nov 2022 14:48:18 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30347 )
Change subject: paging: Replace reqs waiting for retransmission with new incoming inital req if queue is full
......................................................................
Patch Set 1:
(1 comment)
File src/osmo-bsc/paging.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/30347/comment/c0328c87_42f44f00
PS1, Line 477: /* Need to drop a retrans from the queue if possible, in order to make space for the new initial req. */
This function is getting hard to read, maybe move finding and dropping a retrans into a separate static function?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30347
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Idfd93254ae456b1ee08416e05479488299dd063d
Gerrit-Change-Number: 30347
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 28 Nov 2022 14:24:10 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/30353 )
Change subject: osmo_tdef_get(): clarify API doc on val_if_not_present
......................................................................
osmo_tdef_get(): clarify API doc on val_if_not_present
Change-Id: I2301aad86d6d165a3b51c6849bcd8fe02972e0a3
---
M src/tdef.c
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/53/30353/1
diff --git a/src/tdef.c b/src/tdef.c
index 7741a44..abbe581 100644
--- a/src/tdef.c
+++ b/src/tdef.c
@@ -200,8 +200,10 @@
* \param[in] tdefs Array of timer definitions, last entry must be fully zero initialized.
* \param[in] T Timer number to get the value for.
* \param[in] as_unit Return timeout value in this unit.
- * \param[in] val_if_not_present Fallback value to return if no timeout is defined.
+ * \param[in] val_if_not_present Fallback value to return if no timeout is defined; if this is a negative number, a
+ * missing T timer definition aborts the program via OSMO_ASSERT().
* \return Timeout value in the unit given by as_unit, rounded up if necessary, or val_if_not_present.
+ * If val_if_not_present is negative and no T timer is defined, trigger OSMO_ASSERT() and do not return.
*/
unsigned long osmo_tdef_get(const struct osmo_tdef *tdefs, int T, enum osmo_tdef_unit as_unit, long val_if_not_present)
{
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30353
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2301aad86d6d165a3b51c6849bcd8fe02972e0a3
Gerrit-Change-Number: 30353
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30345 )
Change subject: paging: Introduce VTY configurable X3113 (Maximum Paging Request Transmit Delay Threshold)
......................................................................
Patch Set 1:
(1 comment)
File src/osmo-bsc/paging.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/30345/comment/b65c2faa_b541bd35
PS1, Line 415: struct osmo_tdef *td_x3113 = osmo_tdef_get_entry(bts->network->T_defs, -3113);
> the API intended way to do […]
actually it is documented
abort the program if default < 0
but could be more prominent
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30345
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ia556ef4e474e6a2d0d1618bab680a3330a3c062b
Gerrit-Change-Number: 30345
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 28 Nov 2022 14:16:03 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30345 )
Change subject: paging: Introduce VTY configurable X3113 (Maximum Paging Request Transmit Delay Threshold)
......................................................................
Patch Set 1:
(4 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bsc/+/30345/comment/76adbf6e_76ec75ed
PS1, Line 11: timeouts, etc.
i'm having a hard time understanding this, clarify a bit?
is this an accurate explanation: "we discard paging requests when the paging queue is too long to deliver the request in time. T3113 defines this time." ?
How does it relate to `timer T3113` and `timer-dynamic T3113`
File src/osmo-bsc/net_init.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/30345/comment/25a5cb96_76e1e413
PS1, Line 78: PAGING_THRESHOLD_X3113_DEFAULT_SEC
AFAICT this is the only place where this #define is used. just put the number here, like for all the other X and T timers?
https://gerrit.osmocom.org/c/osmo-bsc/+/30345/comment/32640850_d42b5cde
PS1, Line 80: "Drop new paging requests estimated to be scheduled too far in the future due to current queue length"},
as a user this leaves me curious and uninformed about how T3113 and X3113 relate. There is no limit on the length of VTY doc, it gets formatted nicely on telnet and adds valuable info to the vty reference pdf, so do explain elaborately
File src/osmo-bsc/paging.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/30345/comment/fbc5d029_61068750
PS1, Line 415: struct osmo_tdef *td_x3113 = osmo_tdef_get_entry(bts->network->T_defs, -3113);
the API intended way to do
td = osmo_tdef_get_entry(...);
OSMO_ASSERT(td);
use(td->val);
is
use(osmo_tdef_get(T_defs, -3113, OSMO_TDEF_S, -1));
The -1 gives you an implicit OSMO_ASSERT(), and the OSMO_TDEF_S still gives you the expected value in seconds even if we were to change the default to "1, OSMO_TDEF_M" = 1 minute in the T_defs.
Hmm, I'm just noticing that the assert part is not documented properly in the API doc of osmo_tdef_get(), I'll fix
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30345
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ia556ef4e474e6a2d0d1618bab680a3330a3c062b
Gerrit-Change-Number: 30345
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 28 Nov 2022 14:13:55 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30350 )
Change subject: jobs/master-builds: pass ssh agent sock to docker
......................................................................
jobs/master-builds: pass ssh agent sock to docker
Pass the ssh agent to docker for master builds, so we can publish
manuals and other files generated during the builds. This used to work
with the .ssh directory where each lxc had its own key. But we are
changing that to have the keys in jenkins and use the ssh agent, so it
works without additional configuration when adding new nodes/lxcs (such
as the two deb11 lxcs we just added).
Change-Id: I6dc1fd5d7e81ec135f805562608f06cf03a1baeb
---
M jobs/master-builds.yml
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/50/30350/1
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 3ef3f03..cc5f925 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -36,15 +36,16 @@
-e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \
-e PARALLEL_MAKE="$PARALLEL_MAKE" \
-e PUBLISH="1" \
+ -e SSH_AUTH_SOCK=/ssh-agent \
-e WITH_MANUALS="1" \
-w /build -i -u build \
+ -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \
-v "$PWD:/build" \
-v "$ARTIFACT_STORE:/artifact_store" \
-v "$HOME/.ssh:/home/build/.ssh:ro" \
docker_img: '$USER/debian-buster-jenkins'
timeout_cmd: '/usr/bin/timeout 30m'
cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh'
- wrappers: []
trigger:
email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org
git_base_url: https://gerrit.osmocom.org
@@ -531,6 +532,9 @@
- email:
recipients: '{obj:email}'
send-to-individuals: true
- wrappers: '{obj:wrappers}'
+ wrappers:
+ - ssh-agent-credentials:
+ users:
+ - 97634b9d-a867-4f6d-825d-1da99813e93d
# vim: expandtab tabstop=2 shiftwidth=2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30350
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6dc1fd5d7e81ec135f805562608f06cf03a1baeb
Gerrit-Change-Number: 30350
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30344 )
Change subject: vty: Fix lost 'no timer-dynamic T3113' config when writing current config
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30344
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: If121a97bbb4a0234a0c162ef37c3692d6408404d
Gerrit-Change-Number: 30344
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 28 Nov 2022 13:52:04 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30322 )
Change subject: UPF_Tests.cfg: fix wrong mp_verify_gtp name
......................................................................
UPF_Tests.cfg: fix wrong mp_verify_gtp name
The proper name is mp_verify_gtp_actions.
jenkins is not affected because it uses another .cfg from
docker-playground.git.
Change-Id: Ia13407db795021a2c3e2923c08b63ad6cdd6b0f9
---
M upf/UPF_Tests.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved
msuraev: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/upf/UPF_Tests.cfg b/upf/UPF_Tests.cfg
index fc410b6..06ef1d0 100644
--- a/upf/UPF_Tests.cfg
+++ b/upf/UPF_Tests.cfg
@@ -11,7 +11,7 @@
[TESTPORT_PARAMETERS]
[MODULE_PARAMETERS]
-UPF_Tests.mp_verify_gtp := false;
+UPF_Tests.mp_verify_gtp_actions := false;
[MAIN_CONTROLLER]
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30322
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ia13407db795021a2c3e2923c08b63ad6cdd6b0f9
Gerrit-Change-Number: 30322
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30323 )
Change subject: upf: in PFCP Sess Est, use local F-TEID = CHOOSE
......................................................................
upf: in PFCP Sess Est, use local F-TEID = CHOOSE
So far the test asked osmo-upf to use an actual IP address and TEID, but
normally it is sent with CHOOSE = 1 so that osmo-upf picks a new local
TEID and returns it with the proper local IP address in the response.
This is making the test more realistic, and also prepares for testing
Network Instance handling, where osmo-upf will need to return the proper
IP addresses for specific Network Instance names.
Change-Id: Iaba372cbb2e0cf0c5bee80b09d346f9bcb78bfbe
---
M upf/UPF_Tests.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved
msuraev: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn
index fb4ef08..3dd469b 100644
--- a/upf/UPF_Tests.ttcn
+++ b/upf/UPF_Tests.ttcn
@@ -633,7 +633,7 @@
private function f_ruleset_tunend(GTP_Action gtp) return PFCP_Ruleset
{
var PFCP_Ruleset rules := { {}, {} };
- f_ruleset_add_GTP_decaps(rules, ts_PFCP_F_TEID_ipv4(gtp.teid_access_l, gtp.gtp_access_ip));
+ f_ruleset_add_GTP_decaps(rules, ts_PFCP_F_TEID_choose_v4());
f_ruleset_add_GTP_encaps(rules, gtp.core_ip, gtp.teid_access_r, gtp.gtp_access_ip);
return rules;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30323
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Iaba372cbb2e0cf0c5bee80b09d346f9bcb78bfbe
Gerrit-Change-Number: 30323
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/30321 )
Change subject: osmo_pfcp_ip_addrs_set(): do not set port number
......................................................................
osmo_pfcp_ip_addrs_set(): do not set port number
struct osmo_pfcp_ip_addrs uses an osmo_sockaddr for storing IP
addresses. Even though osmo_sockaddr contains a port number, no port
number gets encoded in PFCP messages. Hence always set the port to 0.
I noticed that when osmo_pfcp_ip_addrs_set() is invoked with an
osmo_sockaddr that incidentally has a port number set, subsequent
logging of e.g. a PFCP F-TEID shows a port number, which is confusing.
Change-Id: Ib29a123c06d459c99d7c1c0b9a7694fb78cd9fd8
---
M src/libosmo-pfcp/pfcp_msg.c
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
msuraev: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
neels: Looks good to me, approved
diff --git a/src/libosmo-pfcp/pfcp_msg.c b/src/libosmo-pfcp/pfcp_msg.c
index ff8860a..18b9113 100644
--- a/src/libosmo-pfcp/pfcp_msg.c
+++ b/src/libosmo-pfcp/pfcp_msg.c
@@ -494,16 +494,20 @@
return *next_seid_state;
}
+/* Set either dst->v4 or dst->v6 to addr, depending on addr->family. Set the IP address to addr and port to 0, not
+ * copying the port information from addr. Return zero on success, negative on error (i.e. no known family in addr). */
int osmo_pfcp_ip_addrs_set(struct osmo_pfcp_ip_addrs *dst, const struct osmo_sockaddr *addr)
{
switch (addr->u.sas.ss_family) {
case AF_INET:
dst->v4_present = true;
dst->v4 = *addr;
+ osmo_sockaddr_set_port(&dst->v4.u.sa, 0);
return 0;
case AF_INET6:
dst->v6_present = true;
dst->v6 = *addr;
+ osmo_sockaddr_set_port(&dst->v6.u.sa, 0);
return 0;
default:
return -ENOTSUP;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/30321
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-pfcp
Gerrit-Branch: master
Gerrit-Change-Id: Ib29a123c06d459c99d7c1c0b9a7694fb78cd9fd8
Gerrit-Change-Number: 30321
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: pespin.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/30321 )
Change subject: osmo_pfcp_ip_addrs_set(): do not set port number
......................................................................
Patch Set 1: Code-Review+2
(2 comments)
Patchset:
PS1:
combine votes
File src/libosmo-pfcp/pfcp_msg.c:
https://gerrit.osmocom.org/c/libosmo-pfcp/+/30321/comment/37898af2_b875e635
PS1, Line 504: dst->v4 = *addr;
> Did you think about simply copying the address part? addr.u.in. […]
i find it conceptually simpler to set the port number to zero instead...
--
To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/30321
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-pfcp
Gerrit-Branch: master
Gerrit-Change-Id: Ib29a123c06d459c99d7c1c0b9a7694fb78cd9fd8
Gerrit-Change-Number: 30321
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 28 Nov 2022 13:47:12 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith, fixeria.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30307 )
Change subject: fsms: use configurable timers instead of T23042
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bsc/+/30307/comment/47c9582d_7b56631f
PS1, Line 9: It looks like T23042 was a placeholder for timers to be filled in later,
> T23042 may also look like a spec. reference - 3GPP TS 23. […]
let me assure you that i invented this number explicitly as a placeholder, please don't even consider looking in any spec for this number. it is made up, and i chose 23 and 42 and added a zero to hope to surpass the typical four digit range of existing timers, this happened in a time where (negative) X timers were not invented yet
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30307
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Id0d4d0788f609f3272fc81c80a754383dde25c16
Gerrit-Change-Number: 30307
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 28 Nov 2022 13:41:52 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30347 )
Change subject: paging: Replace reqs waiting for retransmission with new incoming inital req if queue is full
......................................................................
paging: Replace reqs waiting for retransmission with new incoming inital req if queue is full
If queue size (in transmit delay of requests) is too long (above
threshold) when a new initial incoming request arrives, instead of
directly discarding it, see if we can drop a pending retransmission and
insert the new one instead, in order to avoid losing initial requests.
This is done under the assumption that is it more important to transmit
intial requests than to retransmit already transmitted ones. The
rationale is that there's lower chances than an MS which didn't answer
lately will answer now (aka being reachable at the cell), so it's better
to allocate resources for new requests (new MS) which may be available
in the cell.
Related: OS#5552
Change-Id: Idfd93254ae456b1ee08416e05479488299dd063d
---
M src/osmo-bsc/paging.c
1 file changed, 42 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/47/30347/1
diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c
index 32ae627..50cc1ed 100644
--- a/src/osmo-bsc/paging.c
+++ b/src/osmo-bsc/paging.c
@@ -416,17 +416,10 @@
unsigned int reqs_before = 0, reqs_before_same_pgroup = 0;
uint8_t pgroup = gsm0502_calc_paging_group(&bts->si_common.chan_desc,
str_to_imsi(params->bsub->imsi));
+ bool queue_full = false;
rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_PAGING_ATTEMPTED));
- /* Don't try to queue more requests than we can realistically handle within X3113 seconds,
- * see PAGING_THRESHOLD_X3113_DEFAULT_SEC. */
- OSMO_ASSERT(td_x3113);
- if (paging_pending_requests_nr(bts) > paging_estimate_available_slots(bts, td_x3113->val)) {
- rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_PAGING_OVERLOAD));
- return -ENOSPC;
- }
-
/* Find if we already have one for the given subscriber on this BTS: */
if (bsc_subscr_find_req_by_bts(params->bsub, bts)) {
LOG_PAGING_BTS(params, bts, DPAG, LOGL_INFO, "Paging request already pending for this subscriber\n");
@@ -434,6 +427,22 @@
return -EEXIST;
}
+ /* Don't try to queue more requests than we can realistically handle within X3113 seconds,
+ * see PAGING_THRESHOLD_X3113_DEFAULT_SEC. */
+ OSMO_ASSERT(td_x3113);
+ if (paging_pending_requests_nr(bts) > paging_estimate_available_slots(bts, td_x3113->val)) {
+ struct gsm_paging_request *last_req;
+ rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_PAGING_OVERLOAD));
+ OSMO_ASSERT(!llist_empty(&bts_entry->pending_requests));
+ last_req = llist_last_entry(&bts_entry->pending_requests, struct gsm_paging_request, entry);
+ if (last_req->attempts == 0) {
+ /* Queue is full of initial requests, discard new one */
+ return -ENOSPC;
+ }
+ /* There's at least 1 retrans. Flag to remove first retrans in queue once found below. */
+ queue_full = true;
+ }
+
/* Find the last not-yet-ever-once-transmitted request; the new request
* will be added immediately after it, giving higher prio to initial
* transmissions (no retrans). This avoids new subscribers being paged to
@@ -465,6 +474,31 @@
reqs_before_same_pgroup++;
}
+ /* Need to drop a retrans from the queue if possible, in order to make space for the new initial req. */
+ if (queue_full) {
+ if (!last_initial_req) {
+ /* Queue is full of retransmissions only, drop first one to free some space: */
+ struct gsm_paging_request *first_retrans_req;
+ first_retrans_req = llist_first_entry_or_null(&bts_entry->pending_requests, struct gsm_paging_request, entry);
+ OSMO_ASSERT(first_retrans_req);
+ reqs_before--;
+ if (first_retrans_req->pgroup == pgroup)
+ reqs_before_same_pgroup--;
+ paging_remove_request(first_retrans_req);
+ } else {
+ struct gsm_paging_request *last_req;
+ last_req = llist_last_entry(&bts_entry->pending_requests, struct gsm_paging_request, entry);
+ OSMO_ASSERT(last_req);
+ if (&last_initial_req->entry == llist_last(&bts_entry->pending_requests)) {
+ /* Queue is full of initial requests only, discard the current new req: */
+ return -ENOSPC;
+ }
+ /* We checked beforehand (set queue_full = true) that queue contains a retrans.
+ * Hence queue contains [1..N intials, 1..N retrans]: Drop first retransmission to free some space: */
+ paging_remove_request(llist_entry(last_initial_req->entry.next, struct gsm_paging_request, entry));
+ }
+ }
+
LOG_PAGING_BTS(params, bts, DPAG, LOGL_DEBUG, "Start paging\n");
req = talloc_zero(tall_paging_ctx, struct gsm_paging_request);
OSMO_ASSERT(req);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30347
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Idfd93254ae456b1ee08416e05479488299dd063d
Gerrit-Change-Number: 30347
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/30346
to look at the new patch set (#2).
Change subject: ansible/jenkins: add gerrit ssh key to known_hosts
......................................................................
ansible/jenkins: add gerrit ssh key to known_hosts
Add the key to known hosts to prevent host key verification failed
errors when attempting to use the gerrit API from jenkins (to post
review comments) or when attempting to clone over ssh from gerrit (as
we do for some reason apparently).
Change-Id: I50981f201c5ca1425e30677b2578491f5111fc0c
---
M ansible/roles/osmocom-jenkins-slave/tasks/main.yml
1 file changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/46/30346/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30346
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I50981f201c5ca1425e30677b2578491f5111fc0c
Gerrit-Change-Number: 30346
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset