- gerrit-log - lists.osmocom.org

[XS] Change in osmo-ttcn3-hacks[master]: SGSN_Tests_NS: TC_NS_connect_alive: set missing verdict
by lynxis lazus 16 Aug '24

16 Aug '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37813?usp=email ) Change subject: SGSN_Tests_NS: TC_NS_connect_alive: set missing verdict ...................................................................... SGSN_Tests_NS: TC_NS_connect_alive: set missing verdict Change-Id: I03574bc17a10d9098dcd25d73007ec5525c42c18 --- M sgsn/SGSN_Tests_NS.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/sgsn/SGSN_Tests_NS.ttcn b/sgsn/SGSN_Tests_NS.ttcn index ed21d5f..e1bc4a7 100644 --- a/sgsn/SGSN_Tests_NS.ttcn +++ b/sgsn/SGSN_Tests_NS.ttcn @@ -47,6 +47,7 @@ f_sleep(1.0); f_clean_ns_codec(); + setverdict(pass); Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37813?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I03574bc17a10d9098dcd25d73007ec5525c42c18 Gerrit-Change-Number: 37813 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: SGSN_Tests: add paging a whole routing area with multiple cells
by lynxis lazus 16 Aug '24

16 Aug '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37796?usp=email ) Change subject: SGSN_Tests: add paging a whole routing area with multiple cells ...................................................................... SGSN_Tests: add paging a whole routing area with multiple cells 1. Attach + PDP Request 2. Wait for UE to be in Standby 3. Transmit to GTP Userdata 4. See the Paging on 2 BVCIs within the Routing Area Change-Id: I88dc95669d57278a96e05ec84f934ebf70b319e5 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 50 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index fe4b086..1d38d65 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -2603,6 +2603,55 @@ f_cleanup(); } +/* + * Wait for T3314 expiration and check that PS PAGING is created on DL PDU + * Use a Routing Area with 2 cells and expect paging on both cells. + * + * MS <-> SGSN: Attach Procedure + * MS <-> SGSN: PDP Context Request/Response + * MS SGSN: Timeout of T3314, MS location known only on Routing Area precision + * GGSN -> SGSN: User Data + * MS <-- SGSN: Paging PS all BVCI within the Routing Area + */ +private function f_TC_paging_ps_ra_multiple_cells(charstring id) runs on BSSGP_ConnHdlr { + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + + f_bssgp_client_unregister(g_pars.imsi, BSSGP_PROC[0]); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, BSSGP_PROC[1]); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, BSSGP_PROC[2]); + + /* first perform regular attach */ + f_gmm_attach(false, false, ran_index := 1); + /* then activate PDP context */ + f_pdp_ctx_act(apars, ran_index := 1); + + /* do a RAU to second BVCI */ + /* then transceive a downlink PDU */ + f_gtpu_xceive_mt(apars, f_rnd_octstring(100), ran_index := 1); + + /* now wait for T3314 expiration (test_CT below has reduced it to 3s) */ + f_sleep(5.0); + + /* now data should be flowing again, but with PS PAGING */ + f_gtpu_xceive_mt(apars, f_rnd_octstring(100), ran_index := 1); + BSSGP_SIG[1].receive(tr_BSSGP_PS_PAGING(?)); + BSSGP_SIG[2].receive(tr_BSSGP_PS_PAGING(?)); + + /* FIXME: simulate paging response */ + /* FIXME: verify PDU actually arrives only after paging response was successful */ +} + +testcase TC_paging_ps_ra_multiple_cells() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_vty_config(SGSNVTY, "sgsn", "timer 3314 3"); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_paging_ps_ra_multiple_cells), testcasename(), g_gb, 52); + vc_conn.done; + f_vty_config(SGSNVTY, "sgsn", "timer 3314 default"); + f_cleanup(); +} + /* Run a RIM single report procedure over the sgsn. Since the SGSN will only do a transparent routing of the * RIM messages this basically tests if the message is correctly transfered from one GB interface to the * other and vice versa. */ @@ -3168,6 +3217,7 @@ execute( TC_suspend_resume() ); execute( TC_suspend_rau() ); execute( TC_paging_ps() ); + execute( TC_paging_ps_ra_multiple_cells() ); execute( TC_bssgp_rim_single_report() ); execute( TC_rim_eutran_to_geran() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I88dc95669d57278a96e05ec84f934ebf70b319e5 Gerrit-Change-Number: 37796 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: SGSN_Tests: remove unused variable d
by lynxis lazus 16 Aug '24

16 Aug '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37811?usp=email ) Change subject: SGSN_Tests: remove unused variable d ...................................................................... SGSN_Tests: remove unused variable d Change-Id: I611e4444dfc9443584397e5523e7612ee5b00af4 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 1d38d65..cbf50dd 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -2572,7 +2572,6 @@ /* wait for T3314 expiration and check that PS PAGING is created on DL PDU */ private function f_TC_paging_ps(charstring id) runs on BSSGP_ConnHdlr { var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); - var default d; /* first perform regular attach */ f_TC_attach(id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37811?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I611e4444dfc9443584397e5523e7612ee5b00af4 Gerrit-Change-Number: 37811 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>

1 0

[S] Change in osmo-upf[master]: upf gtp-u echo: improve loging
by neels 16 Aug '24

16 Aug '24

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/37828?usp=email ) Change subject: upf gtp-u echo: improve loging ...................................................................... upf gtp-u echo: improve loging Tweak GTPv1-U Echo logging to more consistently show logging like: DGTP INFO apn11 [23] 127.0.0.11:2152: <- 127.0.0.12:2152: rx GTPv1-U Echo Request: seq_nr=123 recovery_count=131 DGTP INFO apn11 [23] 127.0.0.11:2152: -> 127.0.0.12:2152: tx GTPv1-U Echo Response: seq_nr=123 recovery_count=570 Change-Id: I3c7fe7c3eb1467ae34085da6bbf26a935a6c927b --- M src/osmo-upf/upf_gtpu_echo.c 1 file changed, 27 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/28/37828/1 diff --git a/src/osmo-upf/upf_gtpu_echo.c b/src/osmo-upf/upf_gtpu_echo.c index cbf804b..d8958e8 100644 --- a/src/osmo-upf/upf_gtpu_echo.c +++ b/src/osmo-upf/upf_gtpu_echo.c @@ -50,12 +50,17 @@ static int tx_echo_resp(struct upf_gtp_dev *dev, const struct osmo_sockaddr *remote, uint16_t seq_nr); -static int rx_echo_req(struct upf_gtp_dev *dev, const struct osmo_sockaddr *remote, const struct gtp1u_hdr *rx_h) +static int rx_echo_req(struct upf_gtp_dev *dev, const struct osmo_sockaddr *remote, const struct gtp1u_hdr *rx_h, + size_t msg_len) { - if (!rx_h->s) { - LOG_GTP_DEV(dev, LOGL_ERROR, "rx GTPv1-U ECHO REQ without sequence nr\n"); - return -1; - } + uint16_t seq_nr = 0; + uint8_t recovery_count = 0; + if (msg_len >= (sizeof(*rx_h) + 2) && rx_h->data2[0] == GTP1U_IEI_RECOVERY) + recovery_count = rx_h->data2[1]; + + seq_nr = rx_h->s; + LOG_GTP_DEV(dev, LOGL_INFO, "<- %s: rx GTPv1-U Echo Request: seq_nr=%u recovery_count=%u\n", + osmo_sockaddr_to_str(remote), seq_nr, recovery_count); return tx_echo_resp(dev, remote, rx_h->ext.seq_nr); } @@ -66,7 +71,7 @@ struct gtp1u_hdr *tx_h; int rc; - msg = msgb_alloc_headroom(1024, 128, "GTP-echo-resp"); + msg = msgb_alloc_headroom(1024, 128, "GTPv1-U-echo-resp"); tx_h = (void *)msgb_put(msg, sizeof(*tx_h)); *tx_h = (struct gtp1u_hdr){ @@ -90,9 +95,13 @@ rc = sendto(dev->gtpv1.ofd.fd, msgb_data(msg), msgb_length(msg), 0, &remote->u.sa, sizeof(*remote)); if (rc < 0) { - int err = errno; - LOG_GTP_DEV(dev, LOGL_ERROR, "GTP1-U sendto(len=%d, to=%s): %s\n", msgb_length(msg), - osmo_sockaddr_to_str(remote), strerror(err)); + rc = -errno; + LOG_GTP_DEV(dev, LOGL_ERROR, "-> %s: tx GTPv1-U Echo Response: sendto(len=%d): %s\n", + osmo_sockaddr_to_str(remote), msgb_length(msg), strerror(-rc)); + } else { + LOG_GTP_DEV(dev, LOGL_INFO, "-> %s: tx GTPv1-U Echo Response: seq_nr=%u recovery_count=%u\n", + osmo_sockaddr_to_str(remote), seq_nr, g_upf->tunend.recovery_count); + rc = 0; } msgb_free(msg); return rc; @@ -121,27 +130,29 @@ /* A GTPv1-U header of size 8 is valid, but this code expects to handle only ECHO REQUEST messages. These are * required to have a sequence number, hence this check here consciously uses the full sizeof(*h) == 12. */ if (sz < sizeof(*h)) { - LOG_GTP_DEV(dev, LOGL_ERROR, "rx GTP packet smaller than the GTPv1-U header + sequence nr: %zd < %zu\n", - sz, sizeof(*h)); + LOG_GTP_DEV(dev, LOGL_ERROR, + "<- %s: rx GTPv1-U packet smaller than the GTPv1-U header + sequence nr: %zd < %zu\n", + osmo_sockaddr_to_str(&remote), sz, sizeof(*h)); return -1; } h = (const struct gtp1u_hdr *)buf; if (h->version != 1) { - LOG_GTP_DEV(dev, LOGL_ERROR, "rx GTP v%u: only GTP version 1 supported\n", h->version); + LOG_GTP_DEV(dev, LOGL_ERROR, "<- %s: rx GTPv1-U v%u: only GTP version 1 supported\n", + osmo_sockaddr_to_str(&remote), h->version); return -1; } h_length = osmo_load16be(&h->length); if (offsetof(struct gtp1u_hdr, data1) + h_length > sz) { - LOG_GTP_DEV(dev, LOGL_ERROR, "rx GTP: header + h.length = %zu > received bytes = %zd\n", - offsetof(struct gtp1u_hdr, data1) + h_length, sz); + LOG_GTP_DEV(dev, LOGL_ERROR, "<- %s: rx GTPv1-U: header + h.length = %zu > received bytes = %zd\n", + osmo_sockaddr_to_str(&remote), offsetof(struct gtp1u_hdr, data1) + h_length, sz); return -1; } switch (h->msg_type) { case GTP1U_MSGTYPE_ECHO_REQ: - return rx_echo_req(dev, &remote, h); + return rx_echo_req(dev, &remote, h, sz); default: LOG_GTP_DEV(dev, LOGL_ERROR, "rx: GTPv1-U message type %u not supported\n", h->msg_type); return -1; @@ -151,7 +162,7 @@ int upf_gtpu_echo_setup(struct upf_gtp_dev *dev) { if (dev->gtpv1.ofd.fd == -1) { - LOGP(DGTP, LOGL_ERROR, "Cannot setup GTP-U ECHO: GTP-v1 socket not initialized\n"); + LOGP(DGTP, LOGL_ERROR, "Cannot setup GTPv1-U ECHO: socket not initialized\n"); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37828?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I3c7fe7c3eb1467ae34085da6bbf26a935a6c927b Gerrit-Change-Number: 37828 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

1 0

[S] Change in osmo-upf[master]: upf gtp-u echo: rx Echo Response messages
by neels 16 Aug '24

16 Aug '24

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/37829?usp=email ) Change subject: upf gtp-u echo: rx Echo Response messages ...................................................................... upf gtp-u echo: rx Echo Response messages Support receiving of Echo Responses, so far showed an error log for unsupported message type. Just log the message. Prep for upcoming patch to allow sending Echo Requests from VTY. Change-Id: Idad417746a1ea797e8fbfe04ca9c84923a6118fa --- M src/osmo-upf/upf_gtpu_echo.c 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/29/37829/1 diff --git a/src/osmo-upf/upf_gtpu_echo.c b/src/osmo-upf/upf_gtpu_echo.c index d8958e8..b234065 100644 --- a/src/osmo-upf/upf_gtpu_echo.c +++ b/src/osmo-upf/upf_gtpu_echo.c @@ -65,6 +65,21 @@ return tx_echo_resp(dev, remote, rx_h->ext.seq_nr); } +static void rx_echo_resp(struct upf_gtp_dev *dev, const struct osmo_sockaddr *remote, const struct gtp1u_hdr *rx_h, + size_t msg_len) +{ + if (msg_len < (sizeof(*rx_h) + 2)) { + LOG_GTP_DEV(dev, LOGL_ERROR, + "<- %s: rx GTPv1-U Echo Response, but message is too short (%zu < %zu)\n", + osmo_sockaddr_to_str_c(OTC_SELECT, remote), msg_len, (sizeof(*rx_h) + 2)); + return; + } + + uint8_t recovery_count = rx_h->data2[1]; + LOG_GTP_DEV(dev, LOGL_INFO, "<- %s: rx GTPv1-U Echo Response: seq_nr=%u recovery_count=%u\n", + osmo_sockaddr_to_str(remote), rx_h->ext.seq_nr, recovery_count); +} + static int tx_echo_resp(struct upf_gtp_dev *dev, const struct osmo_sockaddr *remote, uint16_t seq_nr) { struct msgb *msg; @@ -153,6 +168,9 @@ switch (h->msg_type) { case GTP1U_MSGTYPE_ECHO_REQ: return rx_echo_req(dev, &remote, h, sz); + case GTP1U_MSGTYPE_ECHO_RSP: + rx_echo_resp(dev, &remote, h, sz); + return 0; default: LOG_GTP_DEV(dev, LOGL_ERROR, "rx: GTPv1-U message type %u not supported\n", h->msg_type); return -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37829?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Idad417746a1ea797e8fbfe04ca9c84923a6118fa Gerrit-Change-Number: 37829 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

1 0

[XS] Change in osmo-upf[master]: contrib/pfcp-tool-scripts: adjust tunend_session_est.vty and upf cfg ...
by neels 16 Aug '24

16 Aug '24

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/37827?usp=email ) Change subject: contrib/pfcp-tool-scripts: adjust tunend_session_est.vty and upf cfg to match up ...................................................................... contrib/pfcp-tool-scripts: adjust tunend_session_est.vty and upf cfg to match up Change-Id: I3d6a26b45f084c281887bee541cf01b690c9d1de --- M contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg M contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/27/37827/1 diff --git a/contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg b/contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg index b639e96..4577a94 100644 --- a/contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg +++ b/contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg @@ -23,3 +23,7 @@ local-addr 127.0.0.12 tunmap table-name osmo-upf-12 + +# gtp-dev only for GTP-U Echo service +tunend + dev create gtp-echo-12 127.0.0.12 diff --git a/contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty b/contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty index 89a4629..2cefc09 100644 --- a/contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty +++ b/contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty @@ -1,5 +1,5 @@ timer pfcp x23 0 -pfcp-peer 127.0.0.1 +pfcp-peer 127.0.0.11 tx assoc-setup-req sleep 1 session tunend -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37827?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I3d6a26b45f084c281887bee541cf01b690c9d1de Gerrit-Change-Number: 37827 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

1 0

[L] Change in osmo-upf[master]: add VTY 'gtp-echo' command
by neels 16 Aug '24

16 Aug '24

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/37830?usp=email ) Change subject: add VTY 'gtp-echo' command ...................................................................... add VTY 'gtp-echo' command Allow sending GTPv1-U Echo Requests to GTP peers via new VTY command gtp-echo tx to 1.2.3.4 [from (dev|ip) (apn0|5.6.7.8)] (pseudocode) Related: OS#6541 Change-Id: I970dccd7a27b098eea9e660822e24e2c4b059fc6 --- M include/osmocom/upf/upf.h M include/osmocom/upf/upf_gtpu_echo.h M src/osmo-upf/upf_gtpu_echo.c M src/osmo-upf/upf_vty.c A tests/gtp-echo.vty 5 files changed, 295 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/30/37830/1 diff --git a/include/osmocom/upf/upf.h b/include/osmocom/upf/upf.h index db73c1f..abd881e 100644 --- a/include/osmocom/upf/upf.h +++ b/include/osmocom/upf/upf.h @@ -117,6 +117,7 @@ struct { uint32_t next_local_teid_state; + uint16_t next_echo_seq_nr; } gtp; struct llist_head netinst; diff --git a/include/osmocom/upf/upf_gtpu_echo.h b/include/osmocom/upf/upf_gtpu_echo.h index 2575424..2bb7c31 100644 --- a/include/osmocom/upf/upf_gtpu_echo.h +++ b/include/osmocom/upf/upf_gtpu_echo.h @@ -2,3 +2,4 @@ #pragma once int upf_gtpu_echo_setup(struct upf_gtp_dev *dev); +int upf_gtpu_echo_req_tx(struct upf_gtp_dev *dev, const struct osmo_sockaddr *remote, uint16_t seq_nr); diff --git a/src/osmo-upf/upf_gtpu_echo.c b/src/osmo-upf/upf_gtpu_echo.c index b234065..8d8db0c 100644 --- a/src/osmo-upf/upf_gtpu_echo.c +++ b/src/osmo-upf/upf_gtpu_echo.c @@ -122,6 +122,45 @@ return rc; } +int upf_gtpu_echo_req_tx(struct upf_gtp_dev *dev, const struct osmo_sockaddr *remote, uint16_t seq_nr) +{ + struct gtp1u_hdr *tx_h; + int rc; + +#define GTP_ECHO_REQ_SIZE ((size_t)(sizeof(struct gtp1u_hdr) + 2)) + uint8_t msgbuf[GTP_ECHO_REQ_SIZE]; + + tx_h = (void *)msgbuf; + *tx_h = (struct gtp1u_hdr){ + /* 3GPP TS 29.281 5.1 defines that the ECHO REQ & RESP shall contain a sequence nr */ + .s = 1, + .pt = 1, + .version = 1, + .msg_type = GTP1U_MSGTYPE_ECHO_REQ, + .ext = { + .seq_nr = seq_nr, + }, + }; + + /* ECHO REQUEST shall contain a recovery counter */ + tx_h->data2[0] = GTP1U_IEI_RECOVERY; + tx_h->data2[1] = g_upf->tunend.recovery_count; + + osmo_store16be(GTP_ECHO_REQ_SIZE - offsetof(struct gtp1u_hdr, data1), &tx_h->length); + + rc = sendto(dev->gtpv1.ofd.fd, msgbuf, GTP_ECHO_REQ_SIZE, 0, &remote->u.sa, sizeof(*remote)); + if (rc < 0) { + rc = -errno; + LOG_GTP_DEV(dev, LOGL_ERROR, "GTP1-U sendto(len=%zu, to=%s): %s\n", GTP_ECHO_REQ_SIZE, + osmo_sockaddr_to_str(remote), strerror(-rc)); + } else { + rc = 0; + } + LOG_GTP_DEV(dev, LOGL_INFO, "<- %s: tx GTP1-U Echo Request: seq_nr=%u recovery_count=%u\n", + osmo_sockaddr_to_str(remote), seq_nr, g_upf->tunend.recovery_count); + return rc; +} + int upf_gtpu_echo_read_cb(struct osmo_fd *ofd, unsigned int what) { struct upf_gtp_dev *dev = ofd->data; diff --git a/src/osmo-upf/upf_vty.c b/src/osmo-upf/upf_vty.c index 44d14db..76d18ea 100644 --- a/src/osmo-upf/upf_vty.c +++ b/src/osmo-upf/upf_vty.c @@ -38,6 +38,7 @@ #include <osmocom/upf/up_session.h> #include <osmocom/upf/up_gtp_action.h> #include <osmocom/upf/netinst.h> +#include <osmocom/upf/upf_gtpu_echo.h> enum upf_vty_node { PFCP_NODE = _LAST_OSMOVTY_NODE + 1, @@ -486,6 +487,80 @@ return CMD_SUCCESS; } +DEFUN(gtp_echo_tx, gtp_echo_tx_cmd, + "gtp-echo tx to IP_ADDR [from] [(ip|dev)] [LOCAL_ADDR_OR_DEV_NAME]", + "GTP1-U Echo probing\n" + "Send a GTP1-U Echo Request to a remote peer\n" + "Send to remote peer's GTP address\n" "IP address like 1.2.3.4 or 1:2:3::4\n" + "Choose local GTP device to send from; when omitted, choose first GTP device.\n" + "Choose local GTP device by IP address\n" + "Choose local GTP device by configured name\n" + "A local IP address bound by a GTP device | a GTP device name as in cfg\n") +{ + struct osmo_sockaddr_str addr; + struct osmo_sockaddr osa_remote; + struct osmo_sockaddr osa_local; + struct upf_gtp_dev *gtp_dev = NULL; + const char *remote_str = argv[0]; + const char *local_type = NULL; + const char *local_str = NULL; + if (argc > 1 && argc <= 3) { + vty_out(vty, "%% Error: missing argument after '%s'%s", argv[argc - 1], VTY_NEWLINE); + return CMD_WARNING; + } + if (argc > 2) + local_type = argv[2]; + if (argc > 3) + local_str = argv[3]; + + /* GTP can be received on port 2152 only, i.e. the remote port must be 2152. (The sending port is allowed to + * differ). */ + if (osmo_sockaddr_str_from_str(&addr, remote_str, 2152) + || osmo_sockaddr_str_to_osa(&addr, &osa_remote)) { + vty_out(vty, "%% Error: invalid IP address: %s%s", osmo_quote_str(remote_str, -1), VTY_NEWLINE); + return CMD_WARNING; + } + + if (local_type) { + if (!strcmp(local_type, "ip")) { + if (osmo_sockaddr_str_from_str(&addr, local_str, 2152) + || osmo_sockaddr_str_to_osa(&addr, &osa_local)) { + vty_out(vty, "%% Error: invalid IP address: %s%s", osmo_quote_str(local_str, -1), VTY_NEWLINE); + return CMD_WARNING; + } + gtp_dev = upf_gtp_dev_find_by_local_addr(&osa_local); + if (!gtp_dev) { + vty_out(vty, "%% Error: this does not seem to be a locally bound GTP address: %s%s", + osmo_sockaddr_to_str_c(OTC_SELECT, &osa_local), VTY_NEWLINE); + return CMD_WARNING; + } + } else { + gtp_dev = upf_gtp_dev_find_by_name(local_str); + if (!gtp_dev) { + vty_out(vty, "%% Error: there is no GTP device by the name of '%s'%s", + local_str, VTY_NEWLINE); + return CMD_WARNING; + } + } + } else { + gtp_dev = llist_first_entry_or_null(&g_upf->tunend.devs, struct upf_gtp_dev, entry); + if (!gtp_dev) { + vty_out(vty, "%% Error: there is no GTP device to send Echo from%s", + VTY_NEWLINE); + return CMD_WARNING; + } + } + OSMO_ASSERT(gtp_dev); + + if (upf_gtpu_echo_req_tx(gtp_dev, &osa_remote, g_upf->gtp.next_echo_seq_nr++)) { + vty_out(vty, "%%Error: Failed to transmit Echo Request (see DGTP logging)%s", VTY_NEWLINE); + return CMD_WARNING; + } + vty_out(vty, "%s -> %s tx Echo Request; for responses, see DGTP logging level INFO%s", + gtp_dev->name, osmo_sockaddr_to_str_c(OTC_SELECT, &osa_remote), VTY_NEWLINE); + return CMD_SUCCESS; +} + void upf_vty_init() { OSMO_ASSERT(g_upf != NULL); @@ -495,6 +570,7 @@ install_element_ve(&show_session_cmd); install_element_ve(&show_netinst_cmd); install_element_ve(&show_nft_rule_append_cmd); + install_element_ve(&gtp_echo_tx_cmd); install_node(&cfg_pfcp_node, config_write_pfcp); install_element(CONFIG_NODE, &cfg_pfcp_cmd); diff --git a/tests/gtp-echo.vty b/tests/gtp-echo.vty new file mode 100644 index 0000000..620d36c --- /dev/null +++ b/tests/gtp-echo.vty @@ -0,0 +1,178 @@ +OsmoUPF> list + show pid + show uptime + show version + show online-help + list [with-flags] + exit + help + show vty-attributes + show vty-attributes (application|library|global) + enable [expert-mode] + terminal length <0-512> + terminal no length + who + show history + logging enable + logging disable + logging filter all (0|1) + logging color (0|1) + logging timestamp (0|1) + logging print extended-timestamp (0|1) + logging print thread-id (0|1) + logging print category (0|1) + logging print category-hex (0|1) + logging print level (0|1) + logging print file (0|1|basename) [last] + logging set-log-mask MASK + logging level (ref|peer|session|gtp|nft|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro|lns|lbssgp|lnsdata|lnssignal|liuup|lpfcp|lcsn1|lio) (debug|info|notice|error|fatal) + logging level set-all (debug|info|notice|error|fatal) + logging level force-all (debug|info|notice|error|fatal) + no logging level force-all + logp (ref|peer|session|gtp|nft|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro|lns|lbssgp|lnsdata|lnssignal|liuup|lpfcp|lcsn1|lio) (debug|info|notice|error|fatal) .LOGMESSAGE + show logging vty + show alarms + show talloc-context (application|global|all) (full|brief|DEPTH) + show talloc-context (application|global|all) (full|brief|DEPTH) tree ADDRESS + show talloc-context (application|global|all) (full|brief|DEPTH) filter REGEXP + show cpu-sched threads + show pdr + show gtp + show session + show netinst [NAME] + gtp-echo tx to IP_ADDR [from] [(ip|dev)] [LOCAL_ADDR_OR_DEV_NAME] + show timer [(pfcp)] [TNNNN] +OsmoUPF> enable +OsmoUPF# list + help + list [with-flags] + show vty-attributes + show vty-attributes (application|library|global) + write terminal + write file [PATH] + write memory + write + show running-config + exit + disable + configure [terminal] + copy running-config startup-config + shutdown + show startup-config + show version + show online-help + terminal length <0-512> + terminal no length + who + show history + terminal monitor + terminal no monitor + logging enable + logging disable + logging filter all (0|1) + logging color (0|1) + logging timestamp (0|1) + logging print extended-timestamp (0|1) + logging print thread-id (0|1) + logging print category (0|1) + logging print category-hex (0|1) + logging print level (0|1) + logging print file (0|1|basename) [last] + logging set-log-mask MASK + logging level (ref|peer|session|gtp|nft|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro|lns|lbssgp|lnsdata|lnssignal|liuup|lpfcp|lcsn1|lio) (debug|info|notice|error|fatal) + logging level set-all (debug|info|notice|error|fatal) + logging level force-all (debug|info|notice|error|fatal) + no logging level force-all + logp (ref|peer|session|gtp|nft|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro|lns|lbssgp|lnsdata|lnssignal|liuup|lpfcp|lcsn1|lio) (debug|info|notice|error|fatal) .LOGMESSAGE + show logging vty + show alarms + show talloc-context (application|global|all) (full|brief|DEPTH) + show talloc-context (application|global|all) (full|brief|DEPTH) tree ADDRESS + show talloc-context (application|global|all) (full|brief|DEPTH) filter REGEXP + show cpu-sched threads + show pdr + show gtp + show session + show netinst [NAME] + gtp-echo tx to IP_ADDR [from] [(ip|dev)] [LOCAL_ADDR_OR_DEV_NAME] + show timer [(pfcp)] [TNNNN] +OsmoUPF# configure terminal +OsmoUPF(config)# list + help + list [with-flags] + show vty-attributes + show vty-attributes (application|library|global) + write terminal + write file [PATH] + write memory + write + show running-config + exit + end + hostname WORD + no hostname [HOSTNAME] + password (8|) WORD + password LINE + enable password (8|) WORD + enable password LINE + no enable password + banner motd default + banner motd file [FILE] + no banner motd + service terminal-length <0-512> + no service terminal-length [<0-512>] + line vty + service advanced-vty + no service advanced-vty + show history + ctrl + log stderr [blocking-io] + no log stderr + log file FILENAME [blocking-io] + no log file FILENAME + log alarms <2-32700> + no log alarms + log syslog (authpriv|cron|daemon|ftp|lpr|mail|news|user|uucp) + log syslog local <0-7> + no log syslog + log systemd-journal [raw] + no log systemd-journal + log gsmtap [HOSTNAME] + no log gsmtap [HOSTNAME] + cpu-sched + pfcp + tunend + tunmap + netinst + timer [(pfcp)] [TNNNN] [(<0-2147483647>|default)] +OsmoUPF(config)# end + +OsmoUPF# gtp-echo? + gtp-echo GTP1-U Echo probing +OsmoUPF# gtp-echo ? + tx Send a GTP1-U Echo Request to a remote peer +OsmoUPF# gtp-echo tx ? + to Send to remote peer's GTP address +OsmoUPF# gtp-echo tx to ? + IP_ADDR IP address like 1.2.3.4 or 1:2:3::4 +OsmoUPF# gtp-echo tx to 1.2.3.4 ? + [from] Choose local GTP device to send from; when omitted, choose first GTP device. +OsmoUPF# gtp-echo tx to 1.2.3.4 from ? + [ip] Choose local GTP device by IP address + [dev] Choose local GTP device by configured name +OsmoUPF# gtp-echo tx to 1.2.3.4 from ip ? + [LOCAL_ADDR_OR_DEV_NAME] A local IP address bound by a GTP device | a GTP device name as in cfg +OsmoUPF# gtp-echo tx to 1.2.3.4 from dev ? + [LOCAL_ADDR_OR_DEV_NAME] A local IP address bound by a GTP device | a GTP device name as in cfg +OsmoUPF# gtp-echo tx to 1.2.3.4 +% Error: there is no GTP device to send Echo from +OsmoUPF# gtp-echo tx to 1.2.3.4 from +% Error: missing argument after 'from' +OsmoUPF# gtp-echo tx to 1.2.3.4 from ip +% Error: missing argument after 'ip' +OsmoUPF# gtp-echo tx to 1.2.3.4 from dev +% Error: missing argument after 'dev' +OsmoUPF# gtp-echo tx to 1.2.3.4 from ip 1.2.3.4 +% Error: this does not seem to be a locally bound GTP address: 1.2.3.4:2152 +OsmoUPF# gtp-echo tx to 1.2.3.4 from dev apn0 +% Error: there is no GTP device by the name of 'apn0' -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37830?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I970dccd7a27b098eea9e660822e24e2c4b059fc6 Gerrit-Change-Number: 37830 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

1 0

[XS] Change in osmo-upf[master]: fix msgb memleak on GTP echo response
by neels 16 Aug '24

16 Aug '24

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/37824?usp=email ) Change subject: fix msgb memleak on GTP echo response ...................................................................... fix msgb memleak on GTP echo response Change-Id: I2bd2e9c57bf392074eed9628a69eb710d4e459a6 --- M src/osmo-upf/upf_gtpu_echo.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/24/37824/1 diff --git a/src/osmo-upf/upf_gtpu_echo.c b/src/osmo-upf/upf_gtpu_echo.c index b251a94..0d93299 100644 --- a/src/osmo-upf/upf_gtpu_echo.c +++ b/src/osmo-upf/upf_gtpu_echo.c @@ -94,6 +94,7 @@ LOG_GTP_DEV(dev, LOGL_ERROR, "GTP1-U sendto(len=%d, to=%s): %s\n", msgb_length(msg), osmo_sockaddr_to_str(remote), strerror(err)); } + msgb_free(msg); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37824?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I2bd2e9c57bf392074eed9628a69eb710d4e459a6 Gerrit-Change-Number: 37824 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

1 0

[XS] Change in osmo-upf[master]: fix EXTRA_DIST for vty test scripts
by neels 16 Aug '24

16 Aug '24

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/37825?usp=email ) Change subject: fix EXTRA_DIST for vty test scripts ...................................................................... fix EXTRA_DIST for vty test scripts Like e.g. in osmo-msc.git, osmo-bsc.git, use wildcard $(srcdir)/*.vty to make sure we never forget to distribute committed VTY test scripts. Change-Id: If4dca81ce287ce1b1af32057634af912a8b89665 --- M tests/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/25/37825/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 5e1d517..ef55b97 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -21,7 +21,7 @@ } >'$(srcdir)/package.m4' EXTRA_DIST = \ - upf.vty \ + $(srcdir)/*.vty \ testsuite.at \ $(srcdir)/package.m4 \ $(TESTSUITE) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37825?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: If4dca81ce287ce1b1af32057634af912a8b89665 Gerrit-Change-Number: 37825 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

1 0

[XS] Change in osmo-upf[master]: drop unreachable statement
by neels 16 Aug '24

16 Aug '24

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/37826?usp=email ) Change subject: drop unreachable statement ...................................................................... drop unreachable statement Change-Id: I0710fd0e38a5ce26ac532ab7150e285f171accfb --- M src/osmo-upf/upf_gtpu_echo.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/26/37826/1 diff --git a/src/osmo-upf/upf_gtpu_echo.c b/src/osmo-upf/upf_gtpu_echo.c index 0d93299..cbf804b 100644 --- a/src/osmo-upf/upf_gtpu_echo.c +++ b/src/osmo-upf/upf_gtpu_echo.c @@ -146,8 +146,6 @@ LOG_GTP_DEV(dev, LOGL_ERROR, "rx: GTPv1-U message type %u not supported\n", h->msg_type); return -1; } - - return 0; } int upf_gtpu_echo_setup(struct upf_gtp_dev *dev) -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37826?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I0710fd0e38a5ce26ac532ab7150e285f171accfb Gerrit-Change-Number: 37826 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log