December 2022 - gerrit-log - lists.osmocom.org

Change in osmo-upf[master]: GTP,UE addrs in osmo_sockaddr: assert( port == 0 )

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30497 ) Change subject: GTP,UE addrs in osmo_sockaddr: assert( port == 0 ) ...................................................................... GTP,UE addrs in osmo_sockaddr: assert( port == 0 ) Assert that all port numbers in osmo_sockaddr parts of up_gtp_action are zero: uncover code paths that leak port numbers into the gtp_action API. GTP and UE addresses have no port information. Port numbers in GTP,UE addresses stored in struct osmo_sockaddr should be zero, so that - to-string conversion via osmo_sockaddr_to_str_c() returns only an IP address: for nftables rules and logging. - osmo_sockaddr_cmp() matches on identical IP addresses "only", without the port numbers causing mismatches: for finding tunnels and devs. Change-Id: If49f1e82e8cb92b7225e85a7c3b059e0f7f92fa3 --- M src/osmo-upf/upf_gtp.c M src/osmo-upf/upf_nft.c 2 files changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/osmo-upf/upf_gtp.c b/src/osmo-upf/upf_gtp.c index f04dad1..adac836 100644 --- a/src/osmo-upf/upf_gtp.c +++ b/src/osmo-upf/upf_gtp.c @@ -323,10 +323,18 @@ return 0; } +#define tunend_desc_validate(TUN_DESC) \ + 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); \ + } while (0) + static struct upf_gtp_tunend *upf_gtp_tunend_alloc(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *desc) { struct upf_gtp_tunend *tun = talloc(dev, struct upf_gtp_tunend); OSMO_ASSERT(tun); + tunend_desc_validate(desc); *tun = (struct upf_gtp_tunend){ .dev = dev, .desc = *desc, @@ -386,6 +394,7 @@ static struct upf_gtp_tunend *upf_gtp_dev_tunend_find(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc) { struct upf_gtp_tunend *tun; + tunend_desc_validate(tun_desc); llist_for_each_entry(tun, &dev->tunnels, entry) { if (upf_gtp_tunend_desc_cmp(tun_desc, &tun->desc)) continue; @@ -397,6 +406,7 @@ int upf_gtp_dev_tunend_add(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc) { struct upf_gtp_tunend *tun; + tunend_desc_validate(tun_desc); tun = upf_gtp_dev_tunend_find(dev, tun_desc); if (!tun) tun = upf_gtp_tunend_alloc(dev, tun_desc); @@ -409,6 +419,7 @@ { struct upf_gtp_tunend *tun; int rc; + tunend_desc_validate(tun_desc); tun = upf_gtp_dev_tunend_find(dev, tun_desc); if (!tun) return 0; diff --git a/src/osmo-upf/upf_nft.c b/src/osmo-upf/upf_nft.c index c34cbfb..8f59d01 100644 --- a/src/osmo-upf/upf_nft.c +++ b/src/osmo-upf/upf_nft.c @@ -191,6 +191,11 @@ static void upf_nft_args_from_tunmap_desc(struct upf_nft_args *args, const struct upf_nft_tunmap_desc *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); + *args = (struct upf_nft_args){ .table_name = g_upf->nft.table_name, .chain_id = tunmap->id, -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: If49f1e82e8cb92b7225e85a7c3b059e0f7f92fa3 Gerrit-Change-Number: 30497 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmo-upf[master]: nft: end each rule in semicolon

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30495 ) Change subject: nft: end each rule in semicolon ...................................................................... nft: end each rule in semicolon also cosmetic: put the line ending in a separate PRINTF so that adding or removing items to the rule in future patches does not affect the line ending. Change-Id: I6ff6f59fb24a18596aa60848fb00ac70deb1985f --- M src/osmo-upf/upf_nft.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/osmo-upf/upf_nft.c b/src/osmo-upf/upf_nft.c index 0b270ff..4dfea6c 100644 --- a/src/osmo-upf/upf_nft.c +++ b/src/osmo-upf/upf_nft.c @@ -149,7 +149,8 @@ /* Change the TEID in the header to the one to_peer expects */ OSMO_STRBUF_PRINTF(sb, " @ih,32,32 set 0x%08x", to_peer->teid_remote); - OSMO_STRBUF_PRINTF(sb, " counter\n"); + OSMO_STRBUF_PRINTF(sb, " counter"); + OSMO_STRBUF_PRINTF(sb, ";\n"); return sb.chars_needed; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I6ff6f59fb24a18596aa60848fb00ac70deb1985f Gerrit-Change-Number: 30495 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmo-upf[master]: vty: add: show nft-rule tunmap example

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30499 ) Change subject: vty: add: show nft-rule tunmap example ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I9b57aa492c051e480c9bd819ae58f8f59a13af40 Gerrit-Change-Number: 30499 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sun, 11 Dec 2022 22:46:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: fix l1ctl_tx_dt_conf(): accept const *cnf

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30533 ) Change subject: trxcon: fix l1ctl_tx_dt_conf(): accept const *cnf ...................................................................... trxcon: fix l1ctl_tx_dt_conf(): accept const *cnf The *cnf param of l1ctl_tx_dt_conf() was already declared as const in the header file, however it was not in the actual function definition. Take a chance to fix formatting in the header. Change-Id: I842ac717a6959830c536cbf91efdbb6a4ee931ce --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/src/l1ctl.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/33/30533/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index 949960c..7e2fa6a 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -17,6 +17,6 @@ int l1ctl_tx_dt_ind(struct trxcon_inst *trxcon, const struct trxcon_param_rx_data_ind *ind); int l1ctl_tx_dt_conf(struct trxcon_inst *trxcon, - const struct trxcon_param_tx_data_cnf *cnf); + const struct trxcon_param_tx_data_cnf *cnf); int l1ctl_tx_rach_conf(struct trxcon_inst *trxcon, const struct trxcon_param_tx_access_burst_cnf *cnf); diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index f28bdc8..e424524 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -311,7 +311,7 @@ * Handles both L1CTL_DATA_CONF and L1CTL_TRAFFIC_CONF. */ int l1ctl_tx_dt_conf(struct trxcon_inst *trxcon, - struct trxcon_param_tx_data_cnf *cnf) + const struct trxcon_param_tx_data_cnf *cnf) { struct msgb *msg; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I842ac717a6959830c536cbf91efdbb6a4ee931ce Gerrit-Change-Number: 30533 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in osmo-trx[master]: ms-trx support

by fixeria

Attention is currently required from: Hoernchen, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30416 ) Change subject: ms-trx support ...................................................................... Patch Set 15: (2 comments) Patchset: PS15: > The designated initializers problem fixed here: […] Updated the patch: https://cgit.osmocom.org/osmo-trx/commit/?h=fixeria/mstrx&id=ffc6ca06d28719… File Makefile.am: https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/519081a7_b7242eb9 PS15, Line 32: SUBDIRS > There should be no tab here, otherwise automake simply ignores the subdir (at least on my machine). […] https://cgit.osmocom.org/osmo-trx/commit/?h=fixeria/mstrx&id=944c6ace068677… -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36c65a8c725c4da76dc70006cd96b0a2b6878e84 Gerrit-Change-Number: 30416 Gerrit-PatchSet: 15 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 11 Dec 2022 13:25:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-trx[master]: ms-trx support

by fixeria

Attention is currently required from: Hoernchen, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30416 ) Change subject: ms-trx support ...................................................................... Patch Set 15: (1 comment) File Makefile.am: https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/df47f643_daea38e9 PS15, Line 32: SUBDIRS There should be no tab here, otherwise automake simply ignores the subdir (at least on my machine). o_O -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36c65a8c725c4da76dc70006cd96b0a2b6878e84 Gerrit-Change-Number: 30416 Gerrit-PatchSet: 15 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 11 Dec 2022 12:56:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmo-abis[master]: Fix support for HDLC/RAW type channels at mISDN.c

by jolly

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30446 ) Change subject: Fix support for HDLC/RAW type channels at mISDN.c ...................................................................... Patch Set 1: (1 comment) File src/input/misdn.c: https://gerrit.osmocom.org/c/libosmo-abis/+/30446/comment/4d0bbf8e_4df74767 PS1, Line 690: /* TS 16 is the D-channel, so we use D-channel proto */ : bfd->fd = socket(PF_ISDN, SOCK_DGRAM, : (ts == 16) ? ISDN_P_NT_E1 : ISDN_P_B_HDLC); > the problem here is that it makes assumptions. […] mISDN handles TS 16 different, so that ISDN_P_NT_E1 must be given instead of ISDN_P_B_HDLC. The result is the same, both use HDLC mode. Opening TS 16 as 'b' channel does not work with mISDN. Only NT mode is supported in all other places of misdn.c. Support of TE mode would require changes to the API or additional e1in_driver. E1INP_TS_TYPE_SIGN works with kernel space or user space LAPD on top of HDLC. We cannot use that when we want pure HDLC. (E.g frame relay function of V5 interface) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie9a2a3f6ae1ad7da1711b6ff2f0aeda39839a427 Gerrit-Change-Number: 30446 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 11 Dec 2022 12:55:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-trx[master]: ms-trx support

by fixeria

Attention is currently required from: Hoernchen, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30416 ) Change subject: ms-trx support ...................................................................... Patch Set 15: (1 comment) Patchset: PS15: > Looks like you forgot to update contrib/jenkins. […] The designated initializers problem fixed here: https://cgit.osmocom.org/osmo-trx/commit/?h=fixeria/mstrx&id=52e0d3a40a1018… -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36c65a8c725c4da76dc70006cd96b0a2b6878e84 Gerrit-Change-Number: 30416 Gerrit-PatchSet: 15 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 11 Dec 2022 12:06:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-trx[master]: ms-trx support

by fixeria

Attention is currently required from: Hoernchen, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30416 ) Change subject: ms-trx support ...................................................................... Patch Set 15: Code-Review-1 (1 comment) Patchset: PS15: Looks like you forgot to update contrib/jenkins.sh, so your code is not being compiled during the build verification. I tried to build it on my machine and got this error: CXX ms/osmo_trx_ms_uhd-logging.o ms/logging.cpp:73:1: sorry, unimplemented: non-trivial designated initializers not supported 73 | }; | ^ I am also seeing warnings like this: In file included from ms/ms_upper.cpp:23: ms/ms.h:201:65: warning: ‘optnone’ attribute directive ignored [-Wattributes] 201 | void grab_bursts(dev_buf_t *rcd) __attribute__((optnone)); | ^ In file included from ms/ms_upper.cpp:51: ms/ms_upper.h:39:101: warning: ‘optnone’ attribute directive ignored [-Wattributes] 39 | bool pullRadioVector(GSM::Time &wTime, int &RSSI, int &timingOffset) __attribute__((optnone)); | -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36c65a8c725c4da76dc70006cd96b0a2b6878e84 Gerrit-Change-Number: 30416 Gerrit-PatchSet: 15 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 11 Dec 2022 11:42:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-trx[master]: ms-trx support

by fixeria

Attention is currently required from: Hoernchen, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30416 ) Change subject: ms-trx support ...................................................................... Patch Set 15: (1 comment) File Transceiver52M/Makefile.am: https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/99a4debf_44c1292b PS15, Line 26: -I$(top_srcdir)/osmocom-bb/src/host/trxcon/include/ This needs to be removed, you're adding it conditionally below. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36c65a8c725c4da76dc70006cd96b0a2b6878e84 Gerrit-Change-Number: 30416 Gerrit-PatchSet: 15 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 11 Dec 2022 11:34:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022