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

[S] Change in osmo-pcu[master]: pcu_l1_if_phy: add new API call l1if_disconnect_pdch

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/31438 to look at the new patch set (#2). Change subject: pcu_l1_if_phy: add new API call l1if_disconnect_pdch ...................................................................... pcu_l1_if_phy: add new API call l1if_disconnect_pdch Change-Id: I4cc72f032f0abdd5833cdd3b1fe68c69394d89a4 --- M src/pcu_l1_if.cpp M src/pcu_l1_if_phy.h 2 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/38/31438/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4cc72f032f0abdd5833cdd3b1fe68c69394d89a4 Gerrit-Change-Number: 31438 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

[L] Change in osmo-pcu[master]: pcu_l1_if_phy: flexible phy access

by dexter

Attention is currently required from: laforge, pespin, fixeria. Hello Jenkins Builder, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/31341 to look at the new patch set (#10). Change subject: pcu_l1_if_phy: flexible phy access ...................................................................... pcu_l1_if_phy: flexible phy access At the moment we have three different platform specific PHY interfaces, which can be selected using a compile time option. Since those three all are intended to be used on embedded platforms this works fine. However, in the future we plan to add E1 phy support (PHY/CCU is attached via an E1 line), which shall not be a compiletime distinction. It might be also thinkable that we might even add multiple E1 phys in the future, so multiple phy implementations must be able to co-exist. This patch adds a generic interface that allows for the creation of PHY modules that are able to register themselves so that they can be selected dynamically. The "legacy" PHY implementations are not intended to co-exist next to other PHYs, so it is possible to register them as "singleton" modules (only one at a time, via compiletime option). For the moment only "singleton" modules are supported. The selection mechanism (pcu_sock, pcu_l1_if.cpp) will be introduced with the first resident PHY implementation (Ericsson E1 CCU support) Change-Id: I8692d1bd5d137a17cf596ee2914722f419c9978d Related: OS#5198 --- M src/Makefile.am M src/gprs_pcu.h M src/gprs_rlcmac_sched.cpp M src/osmo-bts-litecell15/lc15_l1_if.c M src/osmo-bts-oc2g/oc2g_l1_if.c M src/osmo-bts-sysmo/sysmo_l1_if.c M src/osmobts_sock.c M src/pcu_l1_if.cpp A src/pcu_l1_if_phy.c M src/pcu_l1_if_phy.h M src/pcu_main.cpp 11 files changed, 283 insertions(+), 71 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/41/31341/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8692d1bd5d137a17cf596ee2914722f419c9978d Gerrit-Change-Number: 31341 Gerrit-PatchSet: 10 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

[XL] Change in osmo-upf[master]: add unique_ids_test.c

by Jenkins Builder

Attention is currently required from: neels. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/31482 ) Change subject: add unique_ids_test.c ...................................................................... Patch Set 2: (1 comment) File tests/unique_ids/unique_ids_test.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3989): https://gerrit.osmocom.org/c/osmo-upf/+/31482/comment/ab503a20_6d859a36 PS2, Line 450: #if 1 Consider removing the #if 1 and its #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I36acff15f22d23ade4d281c2af3eb117dfc10359 Gerrit-Change-Number: 31482 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 24 Feb 2023 16:07:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[XL] Change in osmo-upf[master]: add unique_ids_test.c

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-upf/+/31482 to look at the new patch set (#2). Change subject: add unique_ids_test.c ...................................................................... add unique_ids_test.c Verify that skipping used IDs works for: - PFCP UP-SEID - GTP local TEID - chain_id for nft rulesets -- so far expected to fail, fix follows in I139b46de0bd15185a7a06109d55f7c759755ec81. Related: OS#5900 Change-Id: I36acff15f22d23ade4d281c2af3eb117dfc10359 --- M configure.ac M include/osmocom/upf/up_endpoint.h M include/osmocom/upf/up_session.h M include/osmocom/upf/upf.h M src/osmo-upf/up_endpoint.c M src/osmo-upf/up_peer.c M src/osmo-upf/up_session.c M src/osmo-upf/upf.c M src/osmo-upf/upf_nft.c M tests/Makefile.am M tests/testsuite.at A tests/unique_ids/Makefile.am A tests/unique_ids/unique_ids_test.c A tests/unique_ids/unique_ids_test.err A tests/unique_ids/unique_ids_test.ok 15 files changed, 1,057 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/82/31482/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I36acff15f22d23ade4d281c2af3eb117dfc10359 Gerrit-Change-Number: 31482 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

[M] Change in osmo-upf[master]: cosmetic: rename g_upf->gtp to tunend, ->nft to tunmap

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/31479 ) Change subject: cosmetic: rename g_upf->gtp to tunend, ->nft to tunmap ...................................................................... cosmetic: rename g_upf->gtp to tunend, ->nft to tunmap Upcoming patch I8eae5b53c563400ddfded264678d9cfb28b6f737 will introduce a g_upf->gtp sub struct for more generally GTP related things (local TEID assignment). Change-Id: I74df838af50f38604e2ff06cac0af11ccfdab386 --- M include/osmocom/upf/upf.h M src/osmo-upf/up_gtp_action.c M src/osmo-upf/upf.c M src/osmo-upf/upf_gtp.c M src/osmo-upf/upf_gtpu_echo.c M src/osmo-upf/upf_nft.c M src/osmo-upf/upf_vty.c 7 files changed, 76 insertions(+), 63 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/upf/upf.h b/include/osmocom/upf/upf.h index 2e80abe..71364d4 100644 --- a/include/osmocom/upf/upf.h +++ b/include/osmocom/upf/upf.h @@ -68,7 +68,7 @@ struct tunend_vty_cfg { /* list of struct tunend_vty_cfg_dev, GTP devices as in the config file. The actual GTP devices in use are in - * g_upf->gtp.devs. */ + * g_upf->tunend.devs. */ struct llist_head devs; }; @@ -101,7 +101,7 @@ int32_t genl_id; uint8_t recovery_count; - } gtp; + } tunend; /* Tunnel forwarding via linux netfilter */ struct { @@ -113,7 +113,7 @@ int priority_pre; int priority_post; uint32_t next_chain_id_state; - } nft; + } tunmap; struct llist_head netinst; }; diff --git a/src/osmo-upf/up_gtp_action.c b/src/osmo-upf/up_gtp_action.c index e7616ac..28dd078 100644 --- a/src/osmo-upf/up_gtp_action.c +++ b/src/osmo-upf/up_gtp_action.c @@ -84,7 +84,7 @@ switch (a->kind) { case UP_GTP_U_TUNEND: - if (g_upf->gtp.mockup) { + if (g_upf->tunend.mockup) { LOG_UP_GTP_ACTION(a, LOGL_NOTICE, "tunend/mockup active, skipping GTP action %s\n", enable ? "enable" : "disable"); return 0; @@ -116,7 +116,7 @@ return 0; case UP_GTP_U_TUNMAP: - if (g_upf->nft.mockup) { + if (g_upf->tunmap.mockup) { LOG_UP_GTP_ACTION(a, LOGL_NOTICE, "tunmap/mockup active, skipping nftables ruleset %s\n", enable ? "enable" : "disable"); return 0; diff --git a/src/osmo-upf/upf.c b/src/osmo-upf/upf.c index e26d9c7..b28e55d 100644 --- a/src/osmo-upf/upf.c +++ b/src/osmo-upf/upf.c @@ -50,18 +50,18 @@ .local_port = OSMO_PFCP_PORT, }, }, - .nft = { + .tunmap = { .priority_pre = -300, .priority_post = 400, }, - .gtp = { + .tunend = { /* TODO: recovery count state file; use lower byte of current time, poor person's random. */ .recovery_count = time(NULL), }, }; - INIT_LLIST_HEAD(&g_upf->gtp.vty_cfg.devs); - INIT_LLIST_HEAD(&g_upf->gtp.devs); + INIT_LLIST_HEAD(&g_upf->tunend.vty_cfg.devs); + INIT_LLIST_HEAD(&g_upf->tunend.devs); INIT_LLIST_HEAD(&g_upf->netinst); } @@ -89,7 +89,7 @@ int upf_gtp_devs_open() { - struct tunend_vty_cfg *c = &g_upf->gtp.vty_cfg; + struct tunend_vty_cfg *c = &g_upf->tunend.vty_cfg; struct tunend_vty_cfg_dev *d; llist_for_each_entry(d, &c->devs, entry) { diff --git a/src/osmo-upf/upf_gtp.c b/src/osmo-upf/upf_gtp.c index cbca882..e2c6d07 100644 --- a/src/osmo-upf/upf_gtp.c +++ b/src/osmo-upf/upf_gtp.c @@ -66,7 +66,7 @@ struct upf_gtp_dev *upf_gtp_dev_find_by_name(const char *name) { struct upf_gtp_dev *dev; - llist_for_each_entry(dev, &g_upf->gtp.devs, entry) { + llist_for_each_entry(dev, &g_upf->tunend.devs, entry) { if (!strcmp(name, dev->name)) return dev; } @@ -79,7 +79,7 @@ struct upf_gtp_dev *dev_any = NULL; struct osmo_sockaddr needle = *local_addr; - llist_for_each_entry(dev, &g_upf->gtp.devs, entry) { + llist_for_each_entry(dev, &g_upf->tunend.devs, entry) { /* To leave the port number out of the cmp, set the needle's port to match */ osmo_sockaddr_set_port(&needle.u.sa, osmo_sockaddr_port(&dev->gtpv1.local_addr.u.sa)); @@ -95,7 +95,7 @@ struct upf_gtp_dev *upf_gtp_dev_first() { - return llist_first_entry_or_null(&g_upf->gtp.devs, struct upf_gtp_dev, entry); + return llist_first_entry_or_null(&g_upf->tunend.devs, struct upf_gtp_dev, entry); } /* Tell the kernel to remove the GTP device. Called implicitly by talloc_free() (see upf_gtp_dev_destruct()). */ @@ -116,7 +116,7 @@ static int upf_gtp_dev_destruct(struct upf_gtp_dev *dev); -/* Allocate state for one GTP device, add to g_upf->gtp.devs and return the created device. If state for the device of +/* Allocate state for one GTP device, add to g_upf->tunend.devs and return the created device. If state for the device of * that name already exists, do nothing and return NULL. */ static struct upf_gtp_dev *upf_gtp_dev_alloc(const char *name, const char *local_addr) { @@ -144,7 +144,7 @@ /* Need to add to list before setting up the destructor. A talloc_free() does automagically remove from the * list. */ - llist_add(&dev->entry, &g_upf->gtp.devs); + llist_add(&dev->entry, &g_upf->tunend.devs); talloc_set_destructor(dev, upf_gtp_dev_destruct); @@ -163,7 +163,7 @@ } /* Let's try something to see if talking to the device works. */ errno = 0; - rc = gtp_list_tunnel(g_upf->gtp.genl_id, g_upf->gtp.nl); + rc = gtp_list_tunnel(g_upf->tunend.genl_id, g_upf->tunend.nl); if (errno) rc = -errno; else if (rc) @@ -192,7 +192,7 @@ int rc; struct upf_gtp_dev *dev; - if (g_upf->gtp.mockup) { + if (g_upf->tunend.mockup) { LOGP(DGTP, LOGL_NOTICE, "tunend/mockup active: not opening GTP device '%s'\n", name); return 0; } @@ -265,17 +265,17 @@ void upf_gtp_devs_close() { struct upf_gtp_dev *dev; - while ((dev = llist_first_entry_or_null(&g_upf->gtp.devs, struct upf_gtp_dev, entry))) + while ((dev = llist_first_entry_or_null(&g_upf->tunend.devs, struct upf_gtp_dev, entry))) talloc_free(dev); } void upf_gtp_genl_close() { - if (!g_upf->gtp.nl) + if (!g_upf->tunend.nl) return; - genl_socket_close(g_upf->gtp.nl); - g_upf->gtp.nl = NULL; - g_upf->gtp.genl_id = -1; + genl_socket_close(g_upf->tunend.nl); + g_upf->tunend.nl = NULL; + g_upf->tunend.genl_id = -1; LOGP(DGTP, LOGL_NOTICE, "Closed mnl_socket\n"); } @@ -284,21 +284,21 @@ int upf_gtp_genl_ensure_open() { /* Already open? */ - if (g_upf->gtp.nl && g_upf->gtp.genl_id >= 0) + if (g_upf->tunend.nl && g_upf->tunend.genl_id >= 0) return 0; /* sanity / paranoia: if re-opening, make sure the previous socket is closed */ - if (g_upf->gtp.nl) + if (g_upf->tunend.nl) upf_gtp_genl_close(); - g_upf->gtp.nl = genl_socket_open(); - if (!g_upf->gtp.nl) { + g_upf->tunend.nl = genl_socket_open(); + if (!g_upf->tunend.nl) { LOGP(DGTP, LOGL_ERROR, "Cannot open mnl_socket: %s\n", strerror(errno)); return -EIO; } - g_upf->gtp.genl_id = genl_lookup_family(g_upf->gtp.nl, "gtp"); - if (g_upf->gtp.genl_id < 0) { + g_upf->tunend.genl_id = genl_lookup_family(g_upf->tunend.nl, "gtp"); + if (g_upf->tunend.genl_id < 0) { LOGP(DGTP, LOGL_ERROR, "genl family 'gtp' not found\n"); return -ENOTSUP; } @@ -398,7 +398,7 @@ return -ENOTSUP; errno = 0; - rc = gtp_add_tunnel(g_upf->gtp.genl_id, g_upf->gtp.nl, t); + rc = gtp_add_tunnel(g_upf->tunend.genl_id, g_upf->tunend.nl, t); if (errno) { rc = -errno; } else if (rc) { @@ -466,7 +466,7 @@ if (!t) return -EINVAL; - rc = gtp_del_tunnel(g_upf->gtp.genl_id, g_upf->gtp.nl, t); + rc = gtp_del_tunnel(g_upf->tunend.genl_id, g_upf->tunend.nl, t); if (rc) LOG_GTP_TUN(tun, LOGL_ERROR, "Failed to delete tunnel\n"); else diff --git a/src/osmo-upf/upf_gtpu_echo.c b/src/osmo-upf/upf_gtpu_echo.c index bc59695..b251a94 100644 --- a/src/osmo-upf/upf_gtpu_echo.c +++ b/src/osmo-upf/upf_gtpu_echo.c @@ -84,7 +84,7 @@ /* ECHO RESPONSE shall contain a recovery counter */ msgb_put_u8(msg, GTP1U_IEI_RECOVERY); - msgb_put_u8(msg, g_upf->gtp.recovery_count); + msgb_put_u8(msg, g_upf->tunend.recovery_count); osmo_store16be(msg->tail - tx_h->data1, &tx_h->length); diff --git a/src/osmo-upf/upf_nft.c b/src/osmo-upf/upf_nft.c index 4b5cb43..ed3b921 100644 --- a/src/osmo-upf/upf_nft.c +++ b/src/osmo-upf/upf_nft.c @@ -63,18 +63,18 @@ { int rc; - if (g_upf->nft.mockup) { + if (g_upf->tunmap.mockup) { LOGP(DNFT, LOGL_NOTICE, "tunmap/mockup active: not running nft ruleset: '%s'\n", ruleset); return 0; } - if (!g_upf->nft.nft_ctx) { + if (!g_upf->tunmap.nft_ctx) { rc = upf_nft_init(); if (rc) return rc; } - rc = nft_run_cmd_from_buffer(g_upf->nft.nft_ctx, ruleset); + rc = nft_run_cmd_from_buffer(g_upf->tunmap.nft_ctx, ruleset); if (rc < 0) { LOGP(DNFT, LOGL_ERROR, "error running nft ruleset: rc=%d ruleset=%s\n", rc, osmo_quote_str_c(OTC_SELECT, ruleset, -1)); @@ -90,18 +90,18 @@ int rc; /* Always set up the default settings, also in mockup mode, so that the VTY reflects sane values */ - if (!g_upf->nft.table_name) - g_upf->nft.table_name = talloc_strdup(g_upf, "osmo-upf"); + if (!g_upf->tunmap.table_name) + g_upf->tunmap.table_name = talloc_strdup(g_upf, "osmo-upf"); /* When in mockup mode, do not set up nft_ctx and netfilter table */ - if (g_upf->nft.mockup) { + if (g_upf->tunmap.mockup) { LOGP(DNFT, LOGL_NOTICE, "tunmap/mockup active: not allocating libnftables nft_ctx. FOR TESTING PURPOSES ONLY.\n"); return 0; } - g_upf->nft.nft_ctx = nft_ctx_new(NFT_CTX_DEFAULT); - if (!g_upf->nft.nft_ctx) { + g_upf->tunmap.nft_ctx = nft_ctx_new(NFT_CTX_DEFAULT); + if (!g_upf->tunmap.nft_ctx) { LOGP(DNFT, LOGL_ERROR, "cannot allocate libnftables nft_ctx\n"); return -EIO; } @@ -109,14 +109,14 @@ rc = upf_nft_run(upf_nft_tunmap_get_table_init_str(OTC_SELECT)); if (rc) { LOGP(DNFT, LOGL_ERROR, "Failed to create nft table %s\n", - osmo_quote_str_c(OTC_SELECT, g_upf->nft.table_name, -1)); + osmo_quote_str_c(OTC_SELECT, g_upf->tunmap.table_name, -1)); return rc; } - LOGP(DNFT, LOGL_NOTICE, "Created nft table %s\n", osmo_quote_str_c(OTC_SELECT, g_upf->nft.table_name, -1)); + LOGP(DNFT, LOGL_NOTICE, "Created nft table %s\n", osmo_quote_str_c(OTC_SELECT, g_upf->tunmap.table_name, -1)); rc = upf_nft_run(upf_nft_tunmap_get_vmap_init_str(OTC_SELECT)); if (rc) { - LOGP(DNFT, LOGL_ERROR, "Failed to initialize nft verdict map in table %s\n", g_upf->nft.table_name); + LOGP(DNFT, LOGL_ERROR, "Failed to initialize nft verdict map in table %s\n", g_upf->tunmap.table_name); return rc; } return 0; @@ -124,10 +124,10 @@ int upf_nft_free() { - if (!g_upf->nft.nft_ctx) + if (!g_upf->tunmap.nft_ctx) return 0; - nft_ctx_free(g_upf->nft.nft_ctx); - g_upf->nft.nft_ctx = NULL; + nft_ctx_free(g_upf->tunmap.nft_ctx); + g_upf->tunmap.nft_ctx = NULL; return 0; } @@ -314,7 +314,7 @@ OSMO_ASSERT(osmo_sockaddr_port(&tunmap->core.tun.local.addr.u.sa) == 0); *args = (struct upf_nft_args){ - .table_name = g_upf->nft.table_name, + .table_name = g_upf->tunmap.table_name, .peer_a = { .addr_remote = &tunmap->access.tun.remote.addr, .teid_remote = tunmap->access.tun.remote.teid, @@ -334,21 +334,21 @@ char *upf_nft_tunmap_get_table_init_str(void *ctx) { - return upf_nft_ruleset_table_create(ctx, g_upf->nft.table_name); + return upf_nft_ruleset_table_create(ctx, g_upf->tunmap.table_name); } char *upf_nft_tunmap_get_vmap_init_str(void *ctx) { - return upf_nft_ruleset_vmap_init(ctx, g_upf->nft.table_name, g_upf->nft.priority_pre, - g_upf->nft.priority_post); + return upf_nft_ruleset_vmap_init(ctx, g_upf->tunmap.table_name, g_upf->tunmap.priority_pre, + g_upf->tunmap.priority_post); } static uint32_t chain_id_next(void) { - g_upf->nft.next_chain_id_state++; - if (!g_upf->nft.next_chain_id_state) - g_upf->nft.next_chain_id_state++; - return g_upf->nft.next_chain_id_state; + g_upf->tunmap.next_chain_id_state++; + if (!g_upf->tunmap.next_chain_id_state) + g_upf->tunmap.next_chain_id_state++; + return g_upf->tunmap.next_chain_id_state; } char *upf_nft_tunmap_get_ruleset_str(void *ctx, struct upf_tunmap *tunmap) diff --git a/src/osmo-upf/upf_vty.c b/src/osmo-upf/upf_vty.c index 51bf002..4a76439 100644 --- a/src/osmo-upf/upf_vty.c +++ b/src/osmo-upf/upf_vty.c @@ -53,7 +53,7 @@ }; #define pfcp_vty (g_upf->pfcp.vty_cfg) -#define tunend_vty (g_upf->gtp.vty_cfg) +#define tunend_vty (g_upf->tunend.vty_cfg) DEFUN(cfg_pfcp, cfg_pfcp_cmd, "pfcp", @@ -102,7 +102,7 @@ struct tunend_vty_cfg_dev *d; vty_out(vty, "tunend%s", VTY_NEWLINE); - if (g_upf->gtp.mockup) + if (g_upf->tunend.mockup) vty_out(vty, " mockup%s", VTY_NEWLINE); llist_for_each_entry(d, &tunend_vty.devs, entry) { @@ -124,7 +124,7 @@ "mockup", "don't actually send commands to the GTP kernel module, just return success\n") { - g_upf->gtp.mockup = true; + g_upf->tunend.mockup = true; return CMD_SUCCESS; } @@ -133,7 +133,7 @@ NO_STR "operate GTP kernel module normally\n") { - g_upf->gtp.mockup = false; + g_upf->tunend.mockup = false; return CMD_SUCCESS; } @@ -224,11 +224,11 @@ { vty_out(vty, "tunmap%s", VTY_NEWLINE); - if (g_upf->nft.mockup) + if (g_upf->tunmap.mockup) vty_out(vty, " mockup%s", VTY_NEWLINE); - if (g_upf->nft.table_name && strcmp(g_upf->nft.table_name, "osmo-upf")) - vty_out(vty, " table-name %s%s", g_upf->nft.table_name, VTY_NEWLINE); + if (g_upf->tunmap.table_name && strcmp(g_upf->tunmap.table_name, "osmo-upf")) + vty_out(vty, " table-name %s%s", g_upf->tunmap.table_name, VTY_NEWLINE); return CMD_SUCCESS; } @@ -237,7 +237,7 @@ "mockup", "don't actually send rulesets to nftables, just return success\n") { - g_upf->nft.mockup = true; + g_upf->tunmap.mockup = true; return CMD_SUCCESS; } @@ -246,7 +246,7 @@ NO_STR "operate nftables rulesets normally\n") { - g_upf->nft.mockup = false; + g_upf->tunmap.mockup = false; return CMD_SUCCESS; } @@ -258,7 +258,7 @@ " The default table name is \"osmo-upf\".\n" "nft inet table name\n") { - osmo_talloc_replace_string(g_upf, &g_upf->nft.table_name, argv[0]); + osmo_talloc_replace_string(g_upf, &g_upf->tunmap.table_name, argv[0]); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I74df838af50f38604e2ff06cac0af11ccfdab386 Gerrit-Change-Number: 31479 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[M] Change in osmo-upf[master]: move next_teid from up_endpoint to g_upf

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/31480 ) Change subject: move next_teid from up_endpoint to g_upf ...................................................................... move next_teid from up_endpoint to g_upf up_endpoint is about the PFCP endpoint, handing out local TEID is about local GTP endpoints. Move the TEID allocation to g_upf / upf.c. An upcoming patch will use a hash table in g_upf to speed up lookup whether a local TEID is already in use; cosmetically prepare for that. Change-Id: I8eae5b53c563400ddfded264678d9cfb28b6f737 --- M include/osmocom/upf/up_endpoint.h M include/osmocom/upf/upf.h M src/osmo-upf/up_endpoint.c M src/osmo-upf/up_session.c M src/osmo-upf/upf.c 5 files changed, 55 insertions(+), 35 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/upf/up_endpoint.h b/include/osmocom/upf/up_endpoint.h index 60b3927..12ab548 100644 --- a/include/osmocom/upf/up_endpoint.h +++ b/include/osmocom/upf/up_endpoint.h @@ -39,11 +39,9 @@ struct llist_head peers; uint64_t next_seid_state; - uint32_t next_teid_state; }; struct up_endpoint *up_endpoint_init(void *ctx, const struct osmo_sockaddr *local_addr); void up_endpoint_free(struct up_endpoint **ep); uint64_t up_endpoint_next_seid(struct up_endpoint *ep); -uint32_t up_endpoint_next_teid(struct up_endpoint *ep); diff --git a/include/osmocom/upf/upf.h b/include/osmocom/upf/upf.h index 71364d4..041edea 100644 --- a/include/osmocom/upf/upf.h +++ b/include/osmocom/upf/upf.h @@ -115,6 +115,10 @@ uint32_t next_chain_id_state; } tunmap; + struct { + uint32_t next_local_teid_state; + } gtp; + struct llist_head netinst; }; @@ -134,3 +138,5 @@ int upf_gtp_devs_open(); void upf_gtp_devs_close(); + +uint32_t upf_next_local_teid(void); diff --git a/src/osmo-upf/up_endpoint.c b/src/osmo-upf/up_endpoint.c index 70900c4..4500a43 100644 --- a/src/osmo-upf/up_endpoint.c +++ b/src/osmo-upf/up_endpoint.c @@ -271,17 +271,6 @@ return NULL; } -static struct up_session *up_endpoint_find_session_by_local_teid(struct up_endpoint *ep, uint32_t teid) -{ - struct up_peer *peer; - llist_for_each_entry(peer, &ep->peers, entry) { - struct up_session *session = up_session_find_by_local_teid(peer, teid); - if (session) - return session; - } - return NULL; -} - uint64_t up_endpoint_next_seid(struct up_endpoint *ep) { uint64_t sanity; @@ -294,26 +283,6 @@ return 0; } -static uint32_t up_endpoint_inc_teid(struct up_endpoint *ep) -{ - ep->next_teid_state++; - if (!ep->next_teid_state) - ep->next_teid_state++; - return ep->next_teid_state; -} - -uint32_t up_endpoint_next_teid(struct up_endpoint *ep) -{ - uint32_t sanity; - for (sanity = 2342; sanity; sanity--) { - uint32_t next_teid = up_endpoint_inc_teid(ep); - if (up_endpoint_find_session_by_local_teid(ep, next_teid)) - continue; - return next_teid; - } - return 0; -} - void up_endpoint_free(struct up_endpoint **_ep) { struct up_peer *peer; diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index 38f4d2b..bbf994e 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -185,7 +185,6 @@ bool choose_id_present, uint8_t choose_id, const char *netinst_name) { - struct up_endpoint *up_ep = session->up_peer->up_endpoint; struct chosen_f_teid *chosen = NULL; if (choose_id_present) @@ -206,7 +205,7 @@ return rc; /* Choose a new TEID */ - dst->fixed.teid = up_endpoint_next_teid(up_ep); + dst->fixed.teid = upf_next_local_teid(); if (dst->fixed.teid == 0) { LOGPFSML(session->fi, LOGL_ERROR, "Failed to allocate an unused TEID\n"); return OSMO_PFCP_CAUSE_PFCP_ENTITY_IN_CONGESTION; diff --git a/src/osmo-upf/upf.c b/src/osmo-upf/upf.c index b28e55d..047a6ff 100644 --- a/src/osmo-upf/upf.c +++ b/src/osmo-upf/upf.c @@ -29,6 +29,8 @@ #include <osmocom/upf/upf.h> #include <osmocom/upf/up_endpoint.h> +#include <osmocom/upf/up_peer.h> +#include <osmocom/upf/up_session.h> #include <osmocom/upf/upf_gtp.h> struct g_upf *g_upf = NULL; @@ -98,3 +100,34 @@ } return 0; } + +static bool upf_is_local_teid_in_use(uint32_t teid) +{ + struct up_peer *peer; + llist_for_each_entry(peer, &g_upf->pfcp.ep->peers, entry) { + struct up_session *session = up_session_find_by_local_teid(peer, teid); + if (session) + return true; + } + return false; +} + +static uint32_t upf_next_local_teid_inc(void) +{ + g_upf->gtp.next_local_teid_state++; + if (!g_upf->gtp.next_local_teid_state) + g_upf->gtp.next_local_teid_state++; + return g_upf->gtp.next_local_teid_state; +} + +uint32_t upf_next_local_teid(void) +{ + uint32_t sanity; + for (sanity = 2342; sanity; sanity--) { + uint32_t next_teid = upf_next_local_teid_inc(); + if (upf_is_local_teid_in_use(next_teid)) + continue; + return next_teid; + } + return 0; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I8eae5b53c563400ddfded264678d9cfb28b6f737 Gerrit-Change-Number: 31480 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[S] Change in osmo-upf[master]: cosmetic: rename next_seid to next_up_seid

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/31481 ) Change subject: cosmetic: rename next_seid to next_up_seid ...................................................................... cosmetic: rename next_seid to next_up_seid There are UP-SEID and CP-SEID. Only UP-SEID are chosen by the UPF. Clarify naming. Change-Id: Ib725857079400accb4781f8a91eca6495b6b92a9 --- M include/osmocom/upf/up_endpoint.h M src/osmo-upf/up_endpoint.c M src/osmo-upf/up_session.c 3 files changed, 17 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/upf/up_endpoint.h b/include/osmocom/upf/up_endpoint.h index 12ab548..58fe01c 100644 --- a/include/osmocom/upf/up_endpoint.h +++ b/include/osmocom/upf/up_endpoint.h @@ -38,10 +38,10 @@ /* list of struct up_peer. */ struct llist_head peers; - uint64_t next_seid_state; + uint64_t next_up_seid_state; }; struct up_endpoint *up_endpoint_init(void *ctx, const struct osmo_sockaddr *local_addr); void up_endpoint_free(struct up_endpoint **ep); -uint64_t up_endpoint_next_seid(struct up_endpoint *ep); +uint64_t up_endpoint_next_up_seid(struct up_endpoint *ep); diff --git a/src/osmo-upf/up_endpoint.c b/src/osmo-upf/up_endpoint.c index 4500a43..7a2628a 100644 --- a/src/osmo-upf/up_endpoint.c +++ b/src/osmo-upf/up_endpoint.c @@ -271,11 +271,11 @@ return NULL; } -uint64_t up_endpoint_next_seid(struct up_endpoint *ep) +uint64_t up_endpoint_next_up_seid(struct up_endpoint *ep) { uint64_t sanity; for (sanity = 2342; sanity; sanity--) { - uint64_t next_seid = osmo_pfcp_next_seid(&ep->next_seid_state); + uint64_t next_seid = osmo_pfcp_next_seid(&ep->next_up_seid_state); if (up_endpoint_find_session(ep, next_seid)) continue; return next_seid; diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index bbf994e..5874f3c 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -986,7 +986,7 @@ static struct up_session *up_session_add(struct up_peer *peer, const struct osmo_pfcp_ie_f_seid *cp_f_seid) { struct up_session *session; - uint64_t up_seid = up_endpoint_next_seid(peer->up_endpoint); + uint64_t up_seid = up_endpoint_next_up_seid(peer->up_endpoint); if (!up_seid) return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ib725857079400accb4781f8a91eca6495b6b92a9 Gerrit-Change-Number: 31481 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[M] Change in osmo-upf[master]: cosmetic: simplify naming: struct upf_tunmap, struct upf_tunend

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/31477 ) Change subject: cosmetic: simplify naming: struct upf_tunmap, struct upf_tunend ...................................................................... cosmetic: simplify naming: struct upf_tunmap, struct upf_tunend The "desc" has no meaning, every struct is a description of its data. The "nft" and "gtp" hint at the specific "nftables" and "GTP kernel module" implementations. I'd rather keep it more abstract and shorter. That serves removing dup of shared bits in an upcoming patch. Change-Id: I15e4552a20067265abb8d2dd716861cd50270028 --- M include/osmocom/upf/up_gtp_action.h M include/osmocom/upf/upf_gtp.h M include/osmocom/upf/upf_nft.h M src/osmo-pfcp-tool/pfcp_tool.h M src/osmo-upf/upf_gtp.c M src/osmo-upf/upf_nft.c M src/osmo-upf/upf_vty.c 7 files changed, 67 insertions(+), 52 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/upf/up_gtp_action.h b/include/osmocom/upf/up_gtp_action.h index 416910a..c47c35c 100644 --- a/include/osmocom/upf/up_gtp_action.h +++ b/include/osmocom/upf/up_gtp_action.h @@ -54,10 +54,10 @@ enum up_gtp_action_kind kind; union { /* En-/De-capsulate GTP: add/remove a GTP header and forward the GTP payload from/to plain IP. */ - struct upf_gtp_tunend_desc tunend; + struct upf_tunend tunend; /* Tunnel-map GTP: translate from one TEID to another and forward */ - struct upf_nft_tunmap_desc tunmap; + struct upf_tunmap tunmap; }; /* volatile loop variable to match up wanted and actually present GTP actions */ diff --git a/include/osmocom/upf/upf_gtp.h b/include/osmocom/upf/upf_gtp.h index ec27455..695aead 100644 --- a/include/osmocom/upf/upf_gtp.h +++ b/include/osmocom/upf/upf_gtp.h @@ -57,7 +57,7 @@ /* Description of a GTP encapsulation / decapsulation. * The active state to operate the GTP kernel module accordingly is kept in struct upf_gtp_tunend. */ -struct upf_gtp_tunend_desc { +struct upf_tunend { struct { struct osmo_sockaddr gtp_local_addr; uint32_t local_teid; @@ -69,7 +69,7 @@ } core; }; -int upf_gtp_tunend_desc_cmp(const struct upf_gtp_tunend_desc *a, const struct upf_gtp_tunend_desc *b); +int upf_gtp_tunend_cmp(const struct upf_tunend *a, const struct upf_tunend *b); int upf_gtp_genl_ensure_open(); void upf_gtp_genl_close(); @@ -80,8 +80,8 @@ struct upf_gtp_dev *upf_gtp_dev_find_by_local_addr(const struct osmo_sockaddr *local_addr); struct upf_gtp_dev *upf_gtp_dev_first(); -int upf_gtp_dev_tunend_add(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *t); -int upf_gtp_dev_tunend_del(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *t); +int upf_gtp_dev_tunend_add(struct upf_gtp_dev *dev, const struct upf_tunend *t); +int upf_gtp_dev_tunend_del(struct upf_gtp_dev *dev, const struct upf_tunend *t); int upf_gtp_dev_to_str_buf(char *buf, size_t buflen, const struct upf_gtp_dev *dev); char *upf_gtp_dev_to_str_c(void *ctx, const struct upf_gtp_dev *dev); diff --git a/include/osmocom/upf/upf_nft.h b/include/osmocom/upf/upf_nft.h index cf0f0b9..8f0cccd 100644 --- a/include/osmocom/upf/upf_nft.h +++ b/include/osmocom/upf/upf_nft.h @@ -27,7 +27,7 @@ #include <osmocom/core/socket.h> -struct upf_nft_tunmap_desc { +struct upf_tunmap { struct { struct osmo_sockaddr gtp_local_addr; uint32_t local_teid; @@ -44,15 +44,15 @@ } core; }; -int upf_nft_tunmap_to_str_buf(char *buf, size_t buflen, const struct upf_nft_tunmap_desc *tunmap); -char *upf_nft_tunmap_to_str_c(void *ctx, const struct upf_nft_tunmap_desc *tunmap); +int upf_nft_tunmap_to_str_buf(char *buf, size_t buflen, const struct upf_tunmap *tunmap); +char *upf_nft_tunmap_to_str_c(void *ctx, const struct upf_tunmap *tunmap); int upf_nft_init(); int upf_nft_free(); char *upf_nft_tunmap_get_table_init_str(void *ctx); char *upf_nft_tunmap_get_vmap_init_str(void *ctx); -char *upf_nft_tunmap_get_ruleset_str(void *ctx, struct upf_nft_tunmap_desc *tunmap); -char *upf_nft_tunmap_get_ruleset_del_str(void *ctx, struct upf_nft_tunmap_desc *tunmap); -int upf_nft_tunmap_create(struct upf_nft_tunmap_desc *tunmap); -int upf_nft_tunmap_delete(struct upf_nft_tunmap_desc *tunmap); +char *upf_nft_tunmap_get_ruleset_str(void *ctx, struct upf_tunmap *tunmap); +char *upf_nft_tunmap_get_ruleset_del_str(void *ctx, struct upf_tunmap *tunmap); +int upf_nft_tunmap_create(struct upf_tunmap *tunmap); +int upf_nft_tunmap_delete(struct upf_tunmap *tunmap); diff --git a/src/osmo-pfcp-tool/pfcp_tool.h b/src/osmo-pfcp-tool/pfcp_tool.h index dbfbb23..3b81baf 100644 --- a/src/osmo-pfcp-tool/pfcp_tool.h +++ b/src/osmo-pfcp-tool/pfcp_tool.h @@ -61,14 +61,14 @@ struct pfcp_tool_gtp_tun_ep remote; }; -struct pfcp_tool_tunend_desc { +struct pfcp_tool_tunend { struct pfcp_tool_gtp_tun access; struct { struct osmo_sockaddr_str ue_local_addr; } core; }; -struct pfcp_tool_tunmap_desc { +struct pfcp_tool_tunmap { struct pfcp_tool_gtp_tun access; struct pfcp_tool_gtp_tun core; }; @@ -83,10 +83,10 @@ enum up_gtp_action_kind kind; union { /* En-/De-capsulate GTP: add/remove a GTP header and forward the GTP payload from/to plain IP. */ - struct pfcp_tool_tunend_desc tunend; + struct pfcp_tool_tunend tunend; /* Tunnel-map GTP: translate from one TEID to another and forward */ - struct pfcp_tool_tunmap_desc tunmap; + struct pfcp_tool_tunmap tunmap; }; }; diff --git a/src/osmo-upf/upf_gtp.c b/src/osmo-upf/upf_gtp.c index fea4453..54dcf11 100644 --- a/src/osmo-upf/upf_gtp.c +++ b/src/osmo-upf/upf_gtp.c @@ -311,7 +311,7 @@ struct llist_head entry; struct upf_gtp_dev *dev; - struct upf_gtp_tunend_desc desc; + struct upf_tunend desc; bool active; }; @@ -343,18 +343,18 @@ return 0; } -#define tunend_desc_validate(TUN_DESC) \ +#define tunend_validate(TUNEND) \ do { \ - OSMO_ASSERT(osmo_sockaddr_port(&(TUN_DESC)->access.gtp_local_addr.u.sa) == 0); \ - OSMO_ASSERT(osmo_sockaddr_port(&(TUN_DESC)->access.gtp_remote_addr.u.sa) == 0); \ - OSMO_ASSERT(osmo_sockaddr_port(&(TUN_DESC)->core.ue_local_addr.u.sa) == 0); \ + OSMO_ASSERT(osmo_sockaddr_port(&(TUNEND)->access.gtp_local_addr.u.sa) == 0); \ + OSMO_ASSERT(osmo_sockaddr_port(&(TUNEND)->access.gtp_remote_addr.u.sa) == 0); \ + OSMO_ASSERT(osmo_sockaddr_port(&(TUNEND)->core.ue_local_addr.u.sa) == 0); \ } while (0) -static struct upf_gtp_tunend *upf_gtp_tunend_alloc(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *desc) +static struct upf_gtp_tunend *upf_gtp_tunend_alloc(struct upf_gtp_dev *dev, const struct upf_tunend *desc) { struct upf_gtp_tunend *tun = talloc(dev, struct upf_gtp_tunend); OSMO_ASSERT(tun); - tunend_desc_validate(desc); + tunend_validate(desc); *tun = (struct upf_gtp_tunend){ .dev = dev, .desc = *desc, @@ -411,36 +411,36 @@ return rc; } -static struct upf_gtp_tunend *upf_gtp_dev_tunend_find(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc) +static struct upf_gtp_tunend *upf_gtp_dev_tunend_find(struct upf_gtp_dev *dev, const struct upf_tunend *tunend) { struct upf_gtp_tunend *tun; - tunend_desc_validate(tun_desc); + tunend_validate(tunend); llist_for_each_entry(tun, &dev->tunnels, entry) { - if (upf_gtp_tunend_desc_cmp(tun_desc, &tun->desc)) + if (upf_gtp_tunend_cmp(tunend, &tun->desc)) continue; return tun; } return NULL; } -int upf_gtp_dev_tunend_add(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc) +int upf_gtp_dev_tunend_add(struct upf_gtp_dev *dev, const struct upf_tunend *tunend) { struct upf_gtp_tunend *tun; - tunend_desc_validate(tun_desc); - tun = upf_gtp_dev_tunend_find(dev, tun_desc); + tunend_validate(tunend); + tun = upf_gtp_dev_tunend_find(dev, tunend); if (!tun) - tun = upf_gtp_tunend_alloc(dev, tun_desc); + tun = upf_gtp_tunend_alloc(dev, tunend); if (tun->active) return 0; return upf_gtp_tunend_activate(tun); } -int upf_gtp_dev_tunend_del(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc) +int upf_gtp_dev_tunend_del(struct upf_gtp_dev *dev, const struct upf_tunend *tunend) { struct upf_gtp_tunend *tun; int rc; - tunend_desc_validate(tun_desc); - tun = upf_gtp_dev_tunend_find(dev, tun_desc); + tunend_validate(tunend); + tun = upf_gtp_dev_tunend_find(dev, tunend); if (!tun) return 0; if (tun->active) { @@ -491,7 +491,7 @@ return 0; } -int upf_gtp_tunend_desc_cmp(const struct upf_gtp_tunend_desc *a, const struct upf_gtp_tunend_desc *b) +int upf_gtp_tunend_cmp(const struct upf_tunend *a, const struct upf_tunend *b) { int r; diff --git a/src/osmo-upf/upf_nft.c b/src/osmo-upf/upf_nft.c index 9faeb1e..37a4730 100644 --- a/src/osmo-upf/upf_nft.c +++ b/src/osmo-upf/upf_nft.c @@ -284,7 +284,7 @@ OSMO_NAME_C_IMPL(ctx, 512, "ERROR", upf_nft_ruleset_tunmap_delete_buf, args) } -int upf_nft_tunmap_to_str_buf(char *buf, size_t buflen, const struct upf_nft_tunmap_desc *tunmap) +int upf_nft_tunmap_to_str_buf(char *buf, size_t buflen, const struct upf_tunmap *tunmap) { struct osmo_strbuf sb = { .buf = buf, .len = buflen }; @@ -301,12 +301,12 @@ return sb.chars_needed; } -char *upf_nft_tunmap_to_str_c(void *ctx, const struct upf_nft_tunmap_desc *tunmap) +char *upf_nft_tunmap_to_str_c(void *ctx, const struct upf_tunmap *tunmap) { OSMO_NAME_C_IMPL(ctx, 128, "ERROR", upf_nft_tunmap_to_str_buf, tunmap) } -static void upf_nft_args_from_tunmap_desc(struct upf_nft_args *args, const struct upf_nft_tunmap_desc *tunmap) +static void upf_nft_args_from_tunmap(struct upf_nft_args *args, const struct upf_tunmap *tunmap) { OSMO_ASSERT(osmo_sockaddr_port(&tunmap->access.gtp_remote_addr.u.sa) == 0); OSMO_ASSERT(osmo_sockaddr_port(&tunmap->access.gtp_local_addr.u.sa) == 0); @@ -351,7 +351,7 @@ return g_upf->nft.next_chain_id_state; } -char *upf_nft_tunmap_get_ruleset_str(void *ctx, struct upf_nft_tunmap_desc *tunmap) +char *upf_nft_tunmap_get_ruleset_str(void *ctx, struct upf_tunmap *tunmap) { struct upf_nft_args args; @@ -360,23 +360,23 @@ if (!tunmap->core.chain_id) tunmap->core.chain_id = chain_id_next(); - upf_nft_args_from_tunmap_desc(&args, tunmap); + upf_nft_args_from_tunmap(&args, tunmap); return upf_nft_ruleset_tunmap_create_c(ctx, &args); } -char *upf_nft_tunmap_get_ruleset_del_str(void *ctx, struct upf_nft_tunmap_desc *tunmap) +char *upf_nft_tunmap_get_ruleset_del_str(void *ctx, struct upf_tunmap *tunmap) { struct upf_nft_args args; - upf_nft_args_from_tunmap_desc(&args, tunmap); + upf_nft_args_from_tunmap(&args, tunmap); return upf_nft_ruleset_tunmap_delete_c(ctx, &args); } -int upf_nft_tunmap_create(struct upf_nft_tunmap_desc *tunmap) +int upf_nft_tunmap_create(struct upf_tunmap *tunmap) { return upf_nft_run(upf_nft_tunmap_get_ruleset_str(OTC_SELECT, tunmap)); } -int upf_nft_tunmap_delete(struct upf_nft_tunmap_desc *tunmap) +int upf_nft_tunmap_delete(struct upf_tunmap *tunmap) { return upf_nft_run(upf_nft_tunmap_get_ruleset_del_str(OTC_SELECT, tunmap)); } diff --git a/src/osmo-upf/upf_vty.c b/src/osmo-upf/upf_vty.c index 70e0d69..3fe297a 100644 --- a/src/osmo-upf/upf_vty.c +++ b/src/osmo-upf/upf_vty.c @@ -296,7 +296,7 @@ "Print a complete nftables ruleset for a tunmap filled with example IP addresses and TEIDs\n") { struct osmo_sockaddr_str str = {}; - struct upf_nft_tunmap_desc d = { + struct upf_tunmap tunmap = { .access = { .local_teid = 0x201, .remote_teid = 0x102, @@ -310,25 +310,25 @@ }; osmo_sockaddr_str_from_str2(&str, "1.1.1.1"); - osmo_sockaddr_str_to_sockaddr(&str, &d.access.gtp_remote_addr.u.sas); + osmo_sockaddr_str_to_sockaddr(&str, &tunmap.access.gtp_remote_addr.u.sas); osmo_sockaddr_str_from_str2(&str, "2.2.2.1"); - osmo_sockaddr_str_to_sockaddr(&str, &d.access.gtp_local_addr.u.sas); + osmo_sockaddr_str_to_sockaddr(&str, &tunmap.access.gtp_local_addr.u.sas); osmo_sockaddr_str_from_str2(&str, "2.2.2.3"); - osmo_sockaddr_str_to_sockaddr(&str, &d.core.gtp_local_addr.u.sas); + osmo_sockaddr_str_to_sockaddr(&str, &tunmap.core.gtp_local_addr.u.sas); osmo_sockaddr_str_from_str2(&str, "3.3.3.3"); - osmo_sockaddr_str_to_sockaddr(&str, &d.core.gtp_remote_addr.u.sas); + osmo_sockaddr_str_to_sockaddr(&str, &tunmap.core.gtp_remote_addr.u.sas); vty_out(vty, "%% init verdict map:%s", VTY_NEWLINE); vty_out(vty, "%s%s", upf_nft_tunmap_get_table_init_str(OTC_SELECT), VTY_NEWLINE); vty_out(vty, "%s%s", upf_nft_tunmap_get_vmap_init_str(OTC_SELECT), VTY_NEWLINE); vty_out(vty, "%% add tunmap:%s", VTY_NEWLINE); - vty_out(vty, "%% %s%s", upf_nft_tunmap_to_str_c(OTC_SELECT, &d), VTY_NEWLINE); - vty_out(vty, "%s%s", upf_nft_tunmap_get_ruleset_str(OTC_SELECT, &d), VTY_NEWLINE); + vty_out(vty, "%% %s%s", upf_nft_tunmap_to_str_c(OTC_SELECT, &tunmap), VTY_NEWLINE); + vty_out(vty, "%s%s", upf_nft_tunmap_get_ruleset_str(OTC_SELECT, &tunmap), VTY_NEWLINE); vty_out(vty, "%% delete tunmap:%s", VTY_NEWLINE); - vty_out(vty, "%s%s", upf_nft_tunmap_get_ruleset_del_str(OTC_SELECT, &d), VTY_NEWLINE); + vty_out(vty, "%s%s", upf_nft_tunmap_get_ruleset_del_str(OTC_SELECT, &tunmap), VTY_NEWLINE); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I15e4552a20067265abb8d2dd716861cd50270028 Gerrit-Change-Number: 31477 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[S] Change in osmo-upf[master]: minor api doc

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/31476 ) Change subject: minor api doc ...................................................................... minor api doc Change-Id: I2291e34545844d3a6b82c0e9a3278bb422cc890c --- M include/osmocom/upf/up_endpoint.h M include/osmocom/upf/up_peer.h M include/osmocom/upf/up_session.h 3 files changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/upf/up_endpoint.h b/include/osmocom/upf/up_endpoint.h index 3bb14ec..60b3927 100644 --- a/include/osmocom/upf/up_endpoint.h +++ b/include/osmocom/upf/up_endpoint.h @@ -35,6 +35,7 @@ struct up_endpoint { struct osmo_pfcp_endpoint *pfcp_ep; + /* list of struct up_peer. */ struct llist_head peers; uint64_t next_seid_state; diff --git a/include/osmocom/upf/up_peer.h b/include/osmocom/upf/up_peer.h index 0c168cf..59c2b91 100644 --- a/include/osmocom/upf/up_peer.h +++ b/include/osmocom/upf/up_peer.h @@ -44,6 +44,7 @@ struct llist_head entry; struct osmo_fsm_inst *fi; + /* backpointer */ struct up_endpoint *up_endpoint; /* peer's remote address */ diff --git a/include/osmocom/upf/up_session.h b/include/osmocom/upf/up_session.h index c459cd7..215a414 100644 --- a/include/osmocom/upf/up_session.h +++ b/include/osmocom/upf/up_session.h @@ -46,6 +46,7 @@ struct hlist_node node_by_cp_seid; struct osmo_fsm_inst *fi; + /* backpointer */ struct up_peer *up_peer; struct osmo_pfcp_ie_f_seid cp_f_seid; -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I2291e34545844d3a6b82c0e9a3278bb422cc890c Gerrit-Change-Number: 31476 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[M] Change in osmo-upf[master]: cosmetic: reduce dup in tunnel struct definitions

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/31478 ) Change subject: cosmetic: reduce dup in tunnel struct definitions ...................................................................... cosmetic: reduce dup in tunnel struct definitions Use a common struct upf_tun_ep and struct upf_tun for both tunend and tunmap definitions, with a nicer local / remote sub-structuring. Change-Id: I07866e2acbeb74914e1fd6f66839a5a8ae247b1e --- M include/osmocom/upf/Makefile.am M include/osmocom/upf/upf_gtp.h M include/osmocom/upf/upf_nft.h A include/osmocom/upf/upf_tun.h M src/osmo-upf/up_gtp_action.c M src/osmo-upf/up_session.c M src/osmo-upf/upf_gtp.c M src/osmo-upf/upf_nft.c M src/osmo-upf/upf_vty.c 9 files changed, 151 insertions(+), 94 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/upf/Makefile.am b/include/osmocom/upf/Makefile.am index f418cb1..e8eda55 100644 --- a/include/osmocom/upf/Makefile.am +++ b/include/osmocom/upf/Makefile.am @@ -7,5 +7,6 @@ upf_gtp.h \ upf_gtpu_echo.h \ upf_nft.h \ + upf_tun.h \ up_gtp_action.h \ $(NULL) diff --git a/include/osmocom/upf/upf_gtp.h b/include/osmocom/upf/upf_gtp.h index 695aead..b4cd3df 100644 --- a/include/osmocom/upf/upf_gtp.h +++ b/include/osmocom/upf/upf_gtp.h @@ -27,6 +27,8 @@ #include <osmocom/core/select.h> #include <osmocom/core/logging.h> +#include <osmocom/upf/upf_tun.h> + #define LOG_GTP_DEV(DEV, LEVEL, FMT, ARGS...) \ LOGP(DGTP, LEVEL, "%s: " FMT, upf_gtp_dev_to_str_c(OTC_SELECT, (DEV)), ##ARGS) @@ -58,12 +60,7 @@ /* Description of a GTP encapsulation / decapsulation. * The active state to operate the GTP kernel module accordingly is kept in struct upf_gtp_tunend. */ struct upf_tunend { - struct { - struct osmo_sockaddr gtp_local_addr; - uint32_t local_teid; - struct osmo_sockaddr gtp_remote_addr; - uint32_t remote_teid; - } access; + struct upf_tun access; struct { struct osmo_sockaddr ue_local_addr; } core; diff --git a/include/osmocom/upf/upf_nft.h b/include/osmocom/upf/upf_nft.h index 8f0cccd..be2ec0d 100644 --- a/include/osmocom/upf/upf_nft.h +++ b/include/osmocom/upf/upf_nft.h @@ -25,23 +25,16 @@ #include <stdint.h> -#include <osmocom/core/socket.h> +#include <osmocom/upf/upf_tun.h> + +struct upf_nft_tun { + struct upf_tun tun; + uint32_t chain_id; +}; struct upf_tunmap { - struct { - struct osmo_sockaddr gtp_local_addr; - uint32_t local_teid; - struct osmo_sockaddr gtp_remote_addr; - uint32_t remote_teid; - uint32_t chain_id; - } access; - struct { - struct osmo_sockaddr gtp_local_addr; - uint32_t local_teid; - struct osmo_sockaddr gtp_remote_addr; - uint32_t remote_teid; - uint32_t chain_id; - } core; + struct upf_nft_tun access; + struct upf_nft_tun core; }; int upf_nft_tunmap_to_str_buf(char *buf, size_t buflen, const struct upf_tunmap *tunmap); diff --git a/include/osmocom/upf/upf_tun.h b/include/osmocom/upf/upf_tun.h new file mode 100644 index 0000000..e14b036 --- /dev/null +++ b/include/osmocom/upf/upf_tun.h @@ -0,0 +1,38 @@ +/* + * (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved. + * + * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de> + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#pragma once + +#include <stdint.h> + +#include <osmocom/core/socket.h> + +struct upf_tun_ep { + struct osmo_sockaddr addr; + uint32_t teid; +}; + +struct upf_tun { + struct upf_tun_ep local; + struct upf_tun_ep remote; +}; diff --git a/src/osmo-upf/up_gtp_action.c b/src/osmo-upf/up_gtp_action.c index b331260..e7616ac 100644 --- a/src/osmo-upf/up_gtp_action.c +++ b/src/osmo-upf/up_gtp_action.c @@ -48,11 +48,11 @@ switch (a->kind) { case UP_GTP_U_TUNEND: - if ((cmp = CMP_MEMB(tunend.access.local_teid))) + if ((cmp = CMP_MEMB(tunend.access.local.teid))) return cmp; - if ((cmp = CMP_MEMB(tunend.access.remote_teid))) + if ((cmp = CMP_MEMB(tunend.access.remote.teid))) return cmp; - cmp = osmo_sockaddr_cmp(&a->tunend.access.gtp_remote_addr, &b->tunend.access.gtp_remote_addr); + cmp = osmo_sockaddr_cmp(&a->tunend.access.remote.addr, &b->tunend.access.remote.addr); if (cmp) return cmp; cmp = osmo_sockaddr_cmp(&a->tunend.core.ue_local_addr, &b->tunend.core.ue_local_addr); @@ -61,13 +61,13 @@ break; case UP_GTP_U_TUNMAP: - if ((cmp = CMP_MEMB(tunmap.access.local_teid))) + if ((cmp = CMP_MEMB(tunmap.access.tun.local.teid))) return cmp; - if ((cmp = CMP_MEMB(tunmap.access.remote_teid))) + if ((cmp = CMP_MEMB(tunmap.access.tun.remote.teid))) return cmp; - if ((cmp = CMP_MEMB(tunmap.core.local_teid))) + if ((cmp = CMP_MEMB(tunmap.core.tun.local.teid))) return cmp; - if ((cmp = CMP_MEMB(tunmap.core.remote_teid))) + if ((cmp = CMP_MEMB(tunmap.core.tun.remote.teid))) return cmp; break; default: @@ -91,7 +91,7 @@ } /* Pick GTP device matching the local F-TEID set up for the GTP tunnel (it is on the Access side) */ - gtp_addr = &a->tunend.access.gtp_local_addr; + gtp_addr = &a->tunend.access.local.addr; gtp_dev = upf_gtp_dev_find_by_local_addr(gtp_addr); if (!gtp_dev) { LOG_UP_GTP_ACTION(a, LOGL_ERROR, "No GTP device open for local address %s, cannot %s" @@ -158,26 +158,26 @@ switch (a->kind) { case UP_GTP_U_TUNEND: OSMO_STRBUF_PRINTF(sb, "GTP:tunend GTP-access-r:"); - OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunend.access.gtp_remote_addr); - OSMO_STRBUF_PRINTF(sb, " TEID-access-r:0x%"PRIx32, a->tunend.access.remote_teid); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunend.access.remote.addr); + OSMO_STRBUF_PRINTF(sb, " TEID-access-r:0x%"PRIx32, a->tunend.access.remote.teid); OSMO_STRBUF_PRINTF(sb, " GTP-access-l:"); - OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunend.access.gtp_local_addr); - OSMO_STRBUF_PRINTF(sb, " TEID-access-l:0x%"PRIx32" IP-core-l:", a->tunend.access.local_teid); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunend.access.local.addr); + OSMO_STRBUF_PRINTF(sb, " TEID-access-l:0x%"PRIx32" IP-core-l:", a->tunend.access.local.teid); OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunend.core.ue_local_addr); break; case UP_GTP_U_TUNMAP: OSMO_STRBUF_PRINTF(sb, "GTP:tunmap GTP-access-r:"); - OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunmap.access.gtp_remote_addr); - OSMO_STRBUF_PRINTF(sb, " TEID-access-r:0x%"PRIx32, a->tunmap.access.remote_teid); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunmap.access.tun.remote.addr); + OSMO_STRBUF_PRINTF(sb, " TEID-access-r:0x%"PRIx32, a->tunmap.access.tun.remote.teid); OSMO_STRBUF_PRINTF(sb, " GTP-access-l:"); - OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunmap.access.gtp_local_addr); - OSMO_STRBUF_PRINTF(sb, " TEID-access-l:0x%"PRIx32, a->tunmap.access.local_teid); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunmap.access.tun.local.addr); + OSMO_STRBUF_PRINTF(sb, " TEID-access-l:0x%"PRIx32, a->tunmap.access.tun.local.teid); OSMO_STRBUF_PRINTF(sb, " GTP-core-r:"); - OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunmap.core.gtp_remote_addr); - OSMO_STRBUF_PRINTF(sb, " TEID-core-r:0x%"PRIx32, a->tunmap.core.remote_teid); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunmap.core.tun.remote.addr); + OSMO_STRBUF_PRINTF(sb, " TEID-core-r:0x%"PRIx32, a->tunmap.core.tun.remote.teid); OSMO_STRBUF_PRINTF(sb, " GTP-core-l:"); - OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunmap.core.gtp_local_addr); - OSMO_STRBUF_PRINTF(sb, " TEID-core-l:0x%"PRIx32, a->tunmap.core.local_teid); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunmap.core.tun.local.addr); + OSMO_STRBUF_PRINTF(sb, " TEID-core-l:0x%"PRIx32, a->tunmap.core.tun.local.teid); break; case UP_GTP_DROP: OSMO_STRBUF_PRINTF(sb, "GTP:drop"); diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index 59d45c0..38f4d2b 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -1227,10 +1227,14 @@ .kind = UP_GTP_U_TUNEND, .tunend = { .access = { - .gtp_local_addr = pdr->local_f_teid->fixed.ip_addr.v4, - .local_teid = pdr->local_f_teid->fixed.teid, - .gtp_remote_addr = rfar_forw->outer_header_creation.ip_addr.v4, - .remote_teid = rfar_forw->outer_header_creation.teid, + .local = { + .addr = pdr->local_f_teid->fixed.ip_addr.v4, + .teid = pdr->local_f_teid->fixed.teid, + }, + .remote = { + .addr = rfar_forw->outer_header_creation.ip_addr.v4, + .teid = rfar_forw->outer_header_creation.teid, + }, }, .core = { .ue_local_addr = rpdr->desc.pdi.ue_ip_address.ip_addr.v4, @@ -1336,17 +1340,25 @@ .pdr_core = rpdr->desc.pdr_id, .kind = UP_GTP_U_TUNMAP, .tunmap = { - .access = { - .gtp_local_addr = pdr->local_f_teid->fixed.ip_addr.v4, - .local_teid = pdr->local_f_teid->fixed.teid, - .gtp_remote_addr = rfar_forw->outer_header_creation.ip_addr.v4, - .remote_teid = rfar_forw->outer_header_creation.teid, + .access.tun = { + .local = { + .addr = pdr->local_f_teid->fixed.ip_addr.v4, + .teid = pdr->local_f_teid->fixed.teid, + }, + .remote = { + .addr = rfar_forw->outer_header_creation.ip_addr.v4, + .teid = rfar_forw->outer_header_creation.teid, + }, }, - .core = { - .gtp_local_addr = rpdr->local_f_teid->fixed.ip_addr.v4, - .local_teid = rpdr->local_f_teid->fixed.teid, - .gtp_remote_addr = far_forw->outer_header_creation.ip_addr.v4, - .remote_teid = far_forw->outer_header_creation.teid, + .core.tun = { + .local = { + .addr = rpdr->local_f_teid->fixed.ip_addr.v4, + .teid = rpdr->local_f_teid->fixed.teid, + }, + .remote = { + .addr = far_forw->outer_header_creation.ip_addr.v4, + .teid = far_forw->outer_header_creation.teid, + }, }, }, }; diff --git a/src/osmo-upf/upf_gtp.c b/src/osmo-upf/upf_gtp.c index 54dcf11..cbca882 100644 --- a/src/osmo-upf/upf_gtp.c +++ b/src/osmo-upf/upf_gtp.c @@ -320,9 +320,9 @@ struct osmo_strbuf sb = { .buf = buf, .len = buflen }; /* "tunend{dev=apn0 access(GTP-r=1.2.3.4 TEID:l=0x1234,r=0x5678) core(UE-l=10.9.8.7)}" */ OSMO_STRBUF_PRINTF(sb, "tunend{dev=%s access(GTP-r=", tun->dev->name); - OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &tun->desc.access.gtp_remote_addr); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &tun->desc.access.remote.addr); OSMO_STRBUF_PRINTF(sb, " TEID:l=0x%x,r=0x%x) core(UE-l=", - tun->desc.access.local_teid, tun->desc.access.remote_teid); + tun->desc.access.local.teid, tun->desc.access.remote.teid); OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &tun->desc.core.ue_local_addr); OSMO_STRBUF_PRINTF(sb, ")}"); return sb.chars_needed; @@ -345,8 +345,8 @@ #define tunend_validate(TUNEND) \ do { \ - OSMO_ASSERT(osmo_sockaddr_port(&(TUNEND)->access.gtp_local_addr.u.sa) == 0); \ - OSMO_ASSERT(osmo_sockaddr_port(&(TUNEND)->access.gtp_remote_addr.u.sa) == 0); \ + OSMO_ASSERT(osmo_sockaddr_port(&(TUNEND)->access.local.addr.u.sa) == 0); \ + OSMO_ASSERT(osmo_sockaddr_port(&(TUNEND)->access.remote.addr.u.sa) == 0); \ OSMO_ASSERT(osmo_sockaddr_port(&(TUNEND)->core.ue_local_addr.u.sa) == 0); \ } while (0) @@ -369,7 +369,7 @@ struct gtp_tunnel *t; if (tun->desc.core.ue_local_addr.u.sas.ss_family != AF_INET - || tun->desc.access.gtp_remote_addr.u.sas.ss_family != AF_INET) { + || tun->desc.access.remote.addr.u.sas.ss_family != AF_INET) { LOG_GTP_TUN(tun, LOGL_ERROR, "Only capabale of IPv4\n"); return NULL; } @@ -378,9 +378,9 @@ OSMO_ASSERT(t); gtp_tunnel_set_ifidx(t, tun->dev->ifidx); gtp_tunnel_set_version(t, GTP_V1); - gtp_tunnel_set_i_tei(t, tun->desc.access.local_teid); - gtp_tunnel_set_o_tei(t, tun->desc.access.remote_teid); - gtp_tunnel_set_sgsn_ip4(t, &tun->desc.access.gtp_remote_addr.u.sin.sin_addr); + gtp_tunnel_set_i_tei(t, tun->desc.access.local.teid); + gtp_tunnel_set_o_tei(t, tun->desc.access.remote.teid); + gtp_tunnel_set_sgsn_ip4(t, &tun->desc.access.remote.addr.u.sin.sin_addr); gtp_tunnel_set_ms_ip4(t, &tun->desc.core.ue_local_addr.u.sin.sin_addr); return t; } @@ -503,9 +503,9 @@ return 1; #define CMP_MEMB(MEMB) OSMO_CMP(a->MEMB, b->MEMB) - if ((r = CMP_MEMB(access.local_teid))) + if ((r = CMP_MEMB(access.local.teid))) return r; - if ((r = CMP_MEMB(access.remote_teid))) + if ((r = CMP_MEMB(access.remote.teid))) return r; - return osmo_sockaddr_cmp(&a->access.gtp_remote_addr, &b->access.gtp_remote_addr); + return osmo_sockaddr_cmp(&a->access.remote.addr, &b->access.remote.addr); } diff --git a/src/osmo-upf/upf_nft.c b/src/osmo-upf/upf_nft.c index 37a4730..4b5cb43 100644 --- a/src/osmo-upf/upf_nft.c +++ b/src/osmo-upf/upf_nft.c @@ -290,14 +290,14 @@ /* ACCESS 1.1.1.2:0x102 <---> 2.2.2.1:0x201 UPF 2.2.2.3:0x203 <---> 3.3.3.2:0x302 CORE */ OSMO_STRBUF_PRINTF(sb, "ACCESS "); - OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &tunmap->access.gtp_remote_addr); - OSMO_STRBUF_PRINTF(sb, ":0x%x <---> ", tunmap->access.remote_teid); - OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &tunmap->access.gtp_local_addr); - OSMO_STRBUF_PRINTF(sb, ":0x%x UPF ", tunmap->access.local_teid); - OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &tunmap->core.gtp_local_addr); - OSMO_STRBUF_PRINTF(sb, ":0x%x <---> ", tunmap->core.local_teid); - OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &tunmap->core.gtp_remote_addr); - OSMO_STRBUF_PRINTF(sb, ":0x%x CORE", tunmap->core.remote_teid); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &tunmap->access.tun.remote.addr); + OSMO_STRBUF_PRINTF(sb, ":0x%x <---> ", tunmap->access.tun.remote.teid); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &tunmap->access.tun.local.addr); + OSMO_STRBUF_PRINTF(sb, ":0x%x UPF ", tunmap->access.tun.local.teid); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &tunmap->core.tun.local.addr); + OSMO_STRBUF_PRINTF(sb, ":0x%x <---> ", tunmap->core.tun.local.teid); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &tunmap->core.tun.remote.addr); + OSMO_STRBUF_PRINTF(sb, ":0x%x CORE", tunmap->core.tun.remote.teid); return sb.chars_needed; } @@ -308,25 +308,25 @@ static void upf_nft_args_from_tunmap(struct upf_nft_args *args, const struct upf_tunmap *tunmap) { - OSMO_ASSERT(osmo_sockaddr_port(&tunmap->access.gtp_remote_addr.u.sa) == 0); - OSMO_ASSERT(osmo_sockaddr_port(&tunmap->access.gtp_local_addr.u.sa) == 0); - OSMO_ASSERT(osmo_sockaddr_port(&tunmap->core.gtp_remote_addr.u.sa) == 0); - OSMO_ASSERT(osmo_sockaddr_port(&tunmap->core.gtp_local_addr.u.sa) == 0); + OSMO_ASSERT(osmo_sockaddr_port(&tunmap->access.tun.remote.addr.u.sa) == 0); + OSMO_ASSERT(osmo_sockaddr_port(&tunmap->access.tun.local.addr.u.sa) == 0); + OSMO_ASSERT(osmo_sockaddr_port(&tunmap->core.tun.remote.addr.u.sa) == 0); + OSMO_ASSERT(osmo_sockaddr_port(&tunmap->core.tun.local.addr.u.sa) == 0); *args = (struct upf_nft_args){ .table_name = g_upf->nft.table_name, .peer_a = { - .addr_remote = &tunmap->access.gtp_remote_addr, - .teid_remote = tunmap->access.remote_teid, - .addr_local = &tunmap->access.gtp_local_addr, - .teid_local = tunmap->access.local_teid, + .addr_remote = &tunmap->access.tun.remote.addr, + .teid_remote = tunmap->access.tun.remote.teid, + .addr_local = &tunmap->access.tun.local.addr, + .teid_local = tunmap->access.tun.local.teid, .chain_id = tunmap->access.chain_id, }, .peer_b = { - .addr_remote = &tunmap->core.gtp_remote_addr, - .teid_remote = tunmap->core.remote_teid, - .addr_local = &tunmap->core.gtp_local_addr, - .teid_local = tunmap->core.local_teid, + .addr_remote = &tunmap->core.tun.remote.addr, + .teid_remote = tunmap->core.tun.remote.teid, + .addr_local = &tunmap->core.tun.local.addr, + .teid_local = tunmap->core.tun.local.teid, .chain_id = tunmap->core.chain_id, }, }; diff --git a/src/osmo-upf/upf_vty.c b/src/osmo-upf/upf_vty.c index 3fe297a..51bf002 100644 --- a/src/osmo-upf/upf_vty.c +++ b/src/osmo-upf/upf_vty.c @@ -298,28 +298,32 @@ struct osmo_sockaddr_str str = {}; struct upf_tunmap tunmap = { .access = { - .local_teid = 0x201, - .remote_teid = 0x102, + .tun = { + .local.teid = 0x201, + .remote.teid = 0x102, + }, .chain_id = 123, }, .core = { - .local_teid = 0x203, - .remote_teid = 0x302, + .tun = { + .local.teid = 0x203, + .remote.teid = 0x302, + }, .chain_id = 321, }, }; osmo_sockaddr_str_from_str2(&str, "1.1.1.1"); - osmo_sockaddr_str_to_sockaddr(&str, &tunmap.access.gtp_remote_addr.u.sas); + osmo_sockaddr_str_to_sockaddr(&str, &tunmap.access.tun.remote.addr.u.sas); osmo_sockaddr_str_from_str2(&str, "2.2.2.1"); - osmo_sockaddr_str_to_sockaddr(&str, &tunmap.access.gtp_local_addr.u.sas); + osmo_sockaddr_str_to_sockaddr(&str, &tunmap.access.tun.local.addr.u.sas); osmo_sockaddr_str_from_str2(&str, "2.2.2.3"); - osmo_sockaddr_str_to_sockaddr(&str, &tunmap.core.gtp_local_addr.u.sas); + osmo_sockaddr_str_to_sockaddr(&str, &tunmap.core.tun.local.addr.u.sas); osmo_sockaddr_str_from_str2(&str, "3.3.3.3"); - osmo_sockaddr_str_to_sockaddr(&str, &tunmap.core.gtp_remote_addr.u.sas); + osmo_sockaddr_str_to_sockaddr(&str, &tunmap.core.tun.remote.addr.u.sas); vty_out(vty, "%% init verdict map:%s", VTY_NEWLINE); vty_out(vty, "%s%s", upf_nft_tunmap_get_table_init_str(OTC_SELECT), VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I07866e2acbeb74914e1fd6f66839a5a8ae247b1e Gerrit-Change-Number: 31478 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023