February 2023 - gerrit-log - lists.osmocom.org

Change in osmo-upf[master]: tunmap: prep new nft ruleset: log only mapping id

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/31164 ) Change subject: tunmap: prep new nft ruleset: log only mapping id ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: re-add vote after commit log tweak -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ic46ae5bd824a211668d4ac9a77b3597eaca17146 Gerrit-Change-Number: 31164 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Feb 2023 16:43:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in libusrp[master]: configure: abort if SDCC is not found

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/31270 ) Change subject: configure: abort if SDCC is not found ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: rpm error is unrelated: https://osmocom.org/issues/5898 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/31270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Id8defcc72a35e469a1eeb59919d66cc7cf2f6ac8 Gerrit-Change-Number: 31270 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Feb 2023 16:42:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-upf[master]: drop unused function up_peer_tx

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/31274 ) Change subject: drop unused function up_peer_tx ...................................................................... drop unused function up_peer_tx Change-Id: Ib2808ad402555fd58b92a1ea4bef4a67305a4ae2 --- M src/osmo-upf/up_peer.c 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/74/31274/1 diff --git a/src/osmo-upf/up_peer.c b/src/osmo-upf/up_peer.c index 8499632..c0e43e4 100644 --- a/src/osmo-upf/up_peer.c +++ b/src/osmo-upf/up_peer.c @@ -169,11 +169,6 @@ return up_peer_add(up_endpoint, remote_addr); } -int up_peer_tx(struct up_peer *peer, struct osmo_pfcp_msg *m) -{ - return osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, m); -} - static int up_peer_fsm_timer_cb(struct osmo_fsm_inst *fi) { //struct up_peer *peer = fi->priv; -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ib2808ad402555fd58b92a1ea4bef4a67305a4ae2 Gerrit-Change-Number: 31274 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmo-upf[master]: tunmap: ensure nft table is removed on program exit

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-upf/+/31166 to look at the new patch set (#5). Change subject: tunmap: ensure nft table is removed on program exit ...................................................................... tunmap: ensure nft table is removed on program exit Make the nft table owned by the osmo-upf process, so that any kind of graceful or ungraceful exit will drop all tunmap rules implicitly. Related: SYS#6327 SYS#6264 Change-Id: Ia26bb295849905ccfeaec801d7b187bf85f21366 --- M src/osmo-upf/upf_nft.c M tests/nft-rule.vty 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/66/31166/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ia26bb295849905ccfeaec801d7b187bf85f21366 Gerrit-Change-Number: 31166 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in osmo-upf[master]: tunmap: prep new nft ruleset: log only mapping id

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-upf/+/31164 to look at the new patch set (#2). Change subject: tunmap: prep new nft ruleset: log only mapping id ...................................................................... tunmap: prep new nft ruleset: log only mapping id Instead of logging a full nft chain/rule name like 'tunmap123', log only the id '123'. Rationale: with the new nft rulesets, there will be four distinct identifiers: tunmap-pre-123a tunmap-pre-123b tunmap-post-123a tunmap-post-123b so let's simplify. Related: SYS#6327 SYS#6264 Change-Id: Ic46ae5bd824a211668d4ac9a77b3597eaca17146 --- M src/osmo-upf/up_gtp_action.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/64/31164/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ic46ae5bd824a211668d4ac9a77b3597eaca17146 Gerrit-Change-Number: 31164 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in osmo-upf[master]: fix various crashes on osmo_pfcp_endpoint_tx() err handling

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/31271 ) Change subject: fix various crashes on osmo_pfcp_endpoint_tx() err handling ...................................................................... fix various crashes on osmo_pfcp_endpoint_tx() err handling osmo_pfcp_endpoint_tx() deallocates the PFCP msg on error. Make sure osmo-upf doesn't use the PFCP msg after passing it to osmo_pfcp_endpoint_tx(). Change-Id: Ibb666d62b8469dbf0b13cdf25e6912c02fbc4fa9 --- M src/osmo-pfcp-tool/pfcp_tool.c M src/osmo-upf/up_peer.c 2 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/71/31271/1 diff --git a/src/osmo-pfcp-tool/pfcp_tool.c b/src/osmo-pfcp-tool/pfcp_tool.c index aebb92c..ff93cd0 100644 --- a/src/osmo-pfcp-tool/pfcp_tool.c +++ b/src/osmo-pfcp-tool/pfcp_tool.c @@ -162,11 +162,11 @@ int peer_tx(struct pfcp_tool_peer *peer, struct osmo_pfcp_msg *m) { int rc; - rc = osmo_pfcp_endpoint_tx(g_pfcp_tool->ep, m); if (m->is_response) peer->last_resp = *m; else peer->last_req = *m; + rc = osmo_pfcp_endpoint_tx(g_pfcp_tool->ep, m); return rc; } diff --git a/src/osmo-upf/up_peer.c b/src/osmo-upf/up_peer.c index 6039b6a..ec50674 100644 --- a/src/osmo-upf/up_peer.c +++ b/src/osmo-upf/up_peer.c @@ -217,7 +217,8 @@ }; if (osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, resp)) { - OSMO_LOG_PFCP_MSG(resp, LOGL_ERROR, "Error sending response, cannot associate with peer\n"); + OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Error sending response to this message," + " cannot associate with peer\n"); return -EIO; } return 0; @@ -234,7 +235,7 @@ }; if (osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, resp)) { - OSMO_LOG_PFCP_MSG(resp, LOGL_ERROR, "Error sending response\n"); + OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Error sending response to this message\n"); return -EIO; } return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ibb666d62b8469dbf0b13cdf25e6912c02fbc4fa9 Gerrit-Change-Number: 31271 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmo-upf[master]: osmo-pfcp-tool: avoid stale pointers on msg copy

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/31272 ) Change subject: osmo-pfcp-tool: avoid stale pointers on msg copy ...................................................................... osmo-pfcp-tool: avoid stale pointers on msg copy Upon copying a PFCP msg struct for the 'retrans' command, make sure the copy has no pointers that may go stale. Change-Id: I4278d1c6b6da48a10d72955d9b070790d631c664 --- M src/osmo-pfcp-tool/pfcp_tool.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/72/31272/1 diff --git a/src/osmo-pfcp-tool/pfcp_tool.c b/src/osmo-pfcp-tool/pfcp_tool.c index ff93cd0..ae77f64 100644 --- a/src/osmo-pfcp-tool/pfcp_tool.c +++ b/src/osmo-pfcp-tool/pfcp_tool.c @@ -159,13 +159,22 @@ } } +static void copy_msg(struct osmo_pfcp_msg *dst, const struct osmo_pfcp_msg *m) +{ + *dst = *m; + dst->encoded = NULL; + dst->ctx.peer_use_token = NULL; + dst->ctx.session_use_token = NULL; + dst->ctx.resp_cb = NULL; +} + int peer_tx(struct pfcp_tool_peer *peer, struct osmo_pfcp_msg *m) { int rc; if (m->is_response) - peer->last_resp = *m; + copy_msg(&peer->last_resp, m); else - peer->last_req = *m; + copy_msg(&peer->last_req, m); rc = osmo_pfcp_endpoint_tx(g_pfcp_tool->ep, m); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I4278d1c6b6da48a10d72955d9b070790d631c664 Gerrit-Change-Number: 31272 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmo-upf[master]: osmo_pfcp_tool: make usable again

by neels

Attention is currently required from: neels. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-upf/+/31193 to look at the new patch set (#3). Change subject: osmo_pfcp_tool: make usable again ...................................................................... osmo_pfcp_tool: make usable again Some things in osmo-upf and libosmo-pfcp have changed without accounting for that in osmo-pfcp-tool. (This tool is not that important, forgive me for submitting various changes in one patch.) Properly represent all of {access,core} x {local,remote} GTP F-TEIDs in the internal osmo-pfcp-tool state. Adjust and clarify osmo-pfcp-tool script commands. Adjust the osmo-pfcp-tool scripts in contrib so that they work again. Change-Id: I22cfaa4aedd465c81de85e673b9960eaf99c426b --- M contrib/osmo-pfcp-tool-scripts/osmo-upf-11.cfg M contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg M contrib/osmo-pfcp-tool-scripts/session_est_without_assoc.vty M contrib/osmo-pfcp-tool-scripts/session_mod.vty M contrib/osmo-pfcp-tool-scripts/tunend_plus_tunmap.vty M contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty M contrib/osmo-pfcp-tool-scripts/tunmap_session_est.vty M src/osmo-pfcp-tool/pfcp_tool.c M src/osmo-pfcp-tool/pfcp_tool.h M src/osmo-pfcp-tool/pfcp_tool_vty.c 10 files changed, 176 insertions(+), 111 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/93/31193/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I22cfaa4aedd465c81de85e673b9960eaf99c426b Gerrit-Change-Number: 31193 Gerrit-PatchSet: 3 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-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in osmo-upf[master]: fix some PFCP peer,session error handling paths

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/31273 ) Change subject: fix some PFCP peer,session error handling paths ...................................................................... fix some PFCP peer,session error handling paths Fix various failures to return and/or discard a session on PFCP message errors. Change-Id: I12650037c7c74d98e1f33e0379cf91edcbd02d1a --- M src/osmo-upf/up_peer.c M src/osmo-upf/up_session.c 2 files changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/73/31273/1 diff --git a/src/osmo-upf/up_peer.c b/src/osmo-upf/up_peer.c index ec50674..8499632 100644 --- a/src/osmo-upf/up_peer.c +++ b/src/osmo-upf/up_peer.c @@ -327,6 +327,8 @@ .cause = cause, }; osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, resp); + if (session) + up_session_discard(session); } static void up_peer_not_associated_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index 0c2f103..59d45c0 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -631,14 +631,20 @@ resp->up_f_seid_present = true; rc = osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, tx); - if (rc) + if (rc) { + /* sending ACK failed, discard session. It might seem like a good idea to keep the session around, + * because the creation succeeded, only the ACK failed. But in the greater scheme of things, if we + * cannot ACK to the PFCP peer, all is lost. Rather not keep stale sessions around. */ up_session_fsm_state_chg(UP_SESSION_ST_WAIT_USE_COUNT); + return; + } up_session_fsm_state_chg(UP_SESSION_ST_ESTABLISHED); return; nack_response: resp->created_pdr_count = 0; osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, tx); + /* No matter if sending the NACK succeeded or not, discard the session. */ up_session_fsm_state_chg(UP_SESSION_ST_WAIT_USE_COUNT); } @@ -719,8 +725,13 @@ goto nack_response; /* Success, send ACK */ - if (osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, tx)) + if (osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, tx)) { + /* sending ACK failed, discard session. It might seem like a good idea to keep the session around, + * because the modification succeeded, only the ACK failed. But in the greater scheme of things, if we + * cannot ACK to the PFCP peer, all is lost. Rather not keep stale sessions around. */ up_session_fsm_state_chg(UP_SESSION_ST_WAIT_USE_COUNT); + return; + } LOGPFSML(fi, LOGL_NOTICE, "Session modified: %s\n", up_session_gtp_status(session)); return; @@ -728,6 +739,7 @@ nack_response: resp->created_pdr_count = 0; osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, tx); + /* No matter if sending the NACK succeeded or not, discard the session. */ up_session_fsm_state_chg(UP_SESSION_ST_WAIT_USE_COUNT); } @@ -742,6 +754,7 @@ .cause = OSMO_PFCP_CAUSE_REQUEST_ACCEPTED }; osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, tx); + /* No matter if sending the deletion ACK succeeded or not, discard the session. */ up_session_fsm_state_chg(UP_SESSION_ST_WAIT_USE_COUNT); } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I12650037c7c74d98e1f33e0379cf91edcbd02d1a Gerrit-Change-Number: 31273 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in libusrp[master]: configure: abort if SDCC is not found

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/31270 ) Change subject: configure: abort if SDCC is not found ...................................................................... configure: abort if SDCC is not found Change RESULT to ERROR so the configure script stops when SDCC is not found. Otherwise it tries to use "no": no -I../../firmware/include -c delay.c -o delay.rel /bin/bash: line 1: no: command not found Change-Id: Id8defcc72a35e469a1eeb59919d66cc7cf2f6ac8 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/70/31270/1 diff --git a/configure.ac b/configure.ac index bcc95e6..6635e71 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,7 @@ AC_CHECK_PROG([XMLTO],[xmlto],[yes],[]) AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes]) -USRP_SDCC([3.2.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware compiler SDCC 3.x.])]) +USRP_SDCC([3.2.0],[],[passed=no;AC_MSG_ERROR([Unable to find firmware compiler SDCC 3.x.])]) AC_CONFIG_FILES([ Makefile -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/31270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Id8defcc72a35e469a1eeb59919d66cc7cf2f6ac8 Gerrit-Change-Number: 31270 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023