Attention is currently required from: arehbein.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30466 )
Change subject: fix access/core mixup of PDR IDs / tunmap FAR
......................................................................
Patch Set 2:
(2 comments)
Patchset:
PS1:
> I noticed that half the error fixed here is caused by a patch from this series. […]
(actually it ended up https://gerrit.osmocom.org/c/osmo-upf/+/30460 being squashed into this patch)
PS1:
> I find the commit message + ASCII graphic confusing. […]
re renaming, that would have to be a separate patch.
i see a potential for confusion with 'pdr_at_core' and 'far_at_core'. In PFCP, a PDR is linked to a FAR, and it is 'pdr_at_core' linked to 'far_at_access' and vice versa.
I prefer to have a similarity between the names of the PDR+FAR linked together, to match the semantics in PFCP. So I chose pdr+far and rpdr+rfar with r meaning reverse. true, if it were more verbose there could be less documentation. i'd see pdr_access_to_core + far_acces_to_core and pdr_core_to_access + far_core_to_access but they are so much longer. pdr_a2c + far_a2c and pdr_c2a + far_c2a ? if you insist i could change that -- but in a separate patch.
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30466
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I66babdfe4c1746bd3bf259342ce80dae2661de8c
Gerrit-Change-Number: 30466
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 09 Dec 2022 05:18:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: arehbein.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30461 )
Change subject: tunmap: choose local GTP addr by Network Instance IEs
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
this patchset 2 fixes a memleak that patchset 1 has
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30461
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I15ee046a1c37b83b8a83527a67a6215a30106d81
Gerrit-Change-Number: 30461
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 09 Dec 2022 05:05:03 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30466 )
Change subject: fix access/core mixup of PDR IDs / tunmap FAR
......................................................................
Patch Set 2: Code-Review+2
(1 comment)
Patchset:
PS2:
this is two patches that both had CR+2, squashed together. So re-adding the CR+2 vote.
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30466
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I66babdfe4c1746bd3bf259342ce80dae2661de8c
Gerrit-Change-Number: 30466
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 09 Dec 2022 05:02:53 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: arehbein, pespin.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30459 )
Change subject: VTY 'show gtp': more accurately identify local/remote IP
......................................................................
Patch Set 2:
(1 comment)
File src/osmo-upf/up_session.c:
https://gerrit.osmocom.org/c/osmo-upf/+/30459/comment/35cab5a3_c7faac30
PS1, Line 1147: /* A GTP tunnel on Access side, TODO TODO TODO plain IP on Core side.
> i was sure i wouldn't forget it ... […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30459
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: Ic539ebe84a0853f665e5b8b8489dd587e6907287
Gerrit-Change-Number: 30459
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 09 Dec 2022 05:02:00 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/30524 )
Change subject: gtpu_echo: do not osmo_fd_register twice
......................................................................
gtpu_echo: do not osmo_fd_register twice
Change-Id: Ib498cc8d5252c05e12196f84bd1ea18d67e3052c
---
M src/osmo-upf/upf_gtpu_echo.c
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/24/30524/1
diff --git a/src/osmo-upf/upf_gtpu_echo.c b/src/osmo-upf/upf_gtpu_echo.c
index f6dfe5c..60a8da8 100644
--- a/src/osmo-upf/upf_gtpu_echo.c
+++ b/src/osmo-upf/upf_gtpu_echo.c
@@ -155,7 +155,12 @@
return -EINVAL;
}
+ /* the caller should already have osmo_fd_register()ed when setting up the socket. */
+ OSMO_ASSERT(osmo_fd_is_registered(&dev->gtpv1.ofd));
+ /* make sure there is no cb yet that this would be replacing. */
+ OSMO_ASSERT(dev->gtpv1.ofd.cb == NULL);
+
dev->gtpv1.ofd.cb = upf_gtpu_echo_read_cb;
dev->gtpv1.ofd.data = dev;
- return osmo_fd_register(&dev->gtpv1.ofd);
+ return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30524
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: Ib498cc8d5252c05e12196f84bd1ea18d67e3052c
Gerrit-Change-Number: 30524
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newchange
Hello Jenkins Builder, arehbein, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-upf/+/30466
to look at the new patch set (#2).
Change subject: fix access/core mixup of PDR IDs / tunmap FAR
......................................................................
fix access/core mixup of PDR IDs / tunmap FAR
The GTP action detection always has 'pdr' detecting on the Access side
and its reverse 'rpdr' on the Core side.
Access osmo-upf Core
|------> pdr|far ----->|
|<------ rfar|rpdr <-----|
Related: SYS#6192
Change-Id: I66babdfe4c1746bd3bf259342ce80dae2661de8c
---
M src/osmo-upf/up_session.c
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/66/30466/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30466
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I66babdfe4c1746bd3bf259342ce80dae2661de8c
Gerrit-Change-Number: 30466
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: arehbein, pespin.
Hello Jenkins Builder, arehbein, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-upf/+/30459
to look at the new patch set (#2).
Change subject: VTY 'show gtp': more accurately identify local/remote IP
......................................................................
VTY 'show gtp': more accurately identify local/remote IP
Indicate whether a shown IP address is local or remote, by adding '-l'
or '-r' to the field names shown.
So far, osmo-upf is only tracking remote GTP addrs, but we are about to
implement choosing local GTP addrs by Network Instance IEs. Those should
also be shown and will need to be set apart from the remote addresses.
Related: I440466f1cc9689391869ac2579a4497ef6008adb (osmo-ttcn3-hacks)
Change-Id: Ic539ebe84a0853f665e5b8b8489dd587e6907287
---
M include/osmocom/upf/up_gtp_action.h
M include/osmocom/upf/up_session.h
M include/osmocom/upf/upf_gtp.h
M src/osmo-upf/up_gtp_action.c
M src/osmo-upf/up_session.c
M src/osmo-upf/upf_gtp.c
6 files changed, 67 insertions(+), 41 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/59/30459/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30459
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: Ic539ebe84a0853f665e5b8b8489dd587e6907287
Gerrit-Change-Number: 30459
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-upf/+/30497
to look at the new patch set (#2).
Change subject: GTP,UE addrs in osmo_sockaddr: assert( port == 0 )
......................................................................
GTP,UE addrs in osmo_sockaddr: assert( port == 0 )
Assert that all port numbers in osmo_sockaddr parts of up_gtp_action are
zero: uncover code paths that leak port numbers into the gtp_action API.
GTP and UE addresses have no port information. Port numbers in GTP,UE
addresses stored in struct osmo_sockaddr should be zero, so that
- to-string conversion via osmo_sockaddr_to_str_c() returns only an IP
address: for nftables rules and logging.
- osmo_sockaddr_cmp() matches on identical IP addresses "only", without
the port numbers causing mismatches: for finding tunnels and devs.
Change-Id: If49f1e82e8cb92b7225e85a7c3b059e0f7f92fa3
---
M src/osmo-upf/upf_gtp.c
M src/osmo-upf/upf_nft.c
2 files changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/97/30497/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30497
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: If49f1e82e8cb92b7225e85a7c3b059e0f7f92fa3
Gerrit-Change-Number: 30497
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
Attention is currently required from: arehbein, neels.
Hello Jenkins Builder, arehbein, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-upf/+/30461
to look at the new patch set (#2).
Change subject: tunmap: choose local GTP addr by Network Instance IEs
......................................................................
tunmap: choose local GTP addr by Network Instance IEs
Add 'netinst' config section to osmo-upf.cfg, to define Network Instance
name to local IP address mappings.
For the tunmap use case (forwarding GTP tunnels), heed the Network
Instance IEs in PFCP session creation and return IP addresses in F-TEIDs
accordingly.
Related: SYS#6192
Related: I37bebc7d6ef75c3e6ae05e81b83a1b5895839a64 (osmo-ttcn3-hacks)
Change-Id: I15ee046a1c37b83b8a83527a67a6215a30106d81
---
M include/osmocom/upf/Makefile.am
A include/osmocom/upf/netinst.h
M include/osmocom/upf/upf.h
M src/osmo-upf/Makefile.am
A src/osmo-upf/netinst.c
M src/osmo-upf/up_session.c
M src/osmo-upf/upf.c
M src/osmo-upf/upf_vty.c
A tests/netinst.vty
9 files changed, 411 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/61/30461/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30461
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I15ee046a1c37b83b8a83527a67a6215a30106d81
Gerrit-Change-Number: 30461
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newpatchset