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

[S] Change in libosmo-pfcp[master]: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv
by fixeria 09 Mar '23

09 Mar '23

Attention is currently required from: neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 ) Change subject: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv ...................................................................... Patch Set 3: (1 comment) File src/libosmo-pfcp/Makefile.am: https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741/comment/a1d54c06_39d8ed10 PS1, Line 68: gen__pfcp_ies_auto_LDFLAGS > I presume LDFLAGS and LDADD are the same thing, one replaces the earlier LDFLAGS and the other doesn't replace but just append? No, these are different things. The `LDFLAGS` is for stuff like: `-Wl,--wrap=foo`, `-version-info`, `-no-undefined`, `-no-install`, etc. The `LDADD` is for libraries. As I said above, the key difference is that the `LDFLAGS` appears first in the linker's command line, while the `LDADD` appears last. > Since AM_LDFLAGS include LIBOSMOCORE_LIBS, then the local lib is appended by LDADD after libosmocore, which then fails. By using LDFLAGS, not LDADD, the order is being fixed, because no other libs are listed before libosmo-gtlv.a. `AM_LDFLAGS` shall never contain `*_LIBS`, since it ends up first in the linker's command line. The actual fix is to not have `*_LIBS` in `AM_LDFLAGS`. -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I2e92238b214d8e79bab1095d6093139bad05bc66 Gerrit-Change-Number: 31741 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 08:35:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-pfcp[master]: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv
by fixeria 09 Mar '23

09 Mar '23

Attention is currently required from: neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 ) Change subject: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv ...................................................................... Patch Set 3: Code-Review-1 (3 comments) Commit Message: https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741/comment/c726a8d9_a959a778 PS3, Line 15: used use File src/libosmo-pfcp/Makefile.am: https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741/comment/598a6047_c54ca009 PS1, Line 68: gen__pfcp_ies_auto_LDFLAGS > erm ok, of course there is some linking phase for the library and it has LDFLAGS. […] I still don't like changing `_LDADD` to `_LDFLAGS`. The author of this patch https://lore.kernel.org/all/20181118160802.11087-4-jengelh@inai.de/ explains that having -l arguments (i.e. `*_LIBS`) in `LDFLAGS` is wrong. I guess the problem was that initially you had `AM_LDFLAGS` with `*_LIBS` in there -- this is wrong because the `LDFLAGS` do appear earlier in the linker's command line than `LDADD`. Now that you have removed the `AM_LDFLAGS`, I think it should work as expected without the need to change `_LDADD` to `_LDFLAGS`. File src/libosmo-pfcp/Makefile.am: https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741/comment/f860ed82_cedfa358 PS3, Line 71: COVERAGE_LDFLAGS This does not belong here and should be done in https://gerrit.osmocom.org/c/libosmo-pfcp/+/31761. -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I2e92238b214d8e79bab1095d6093139bad05bc66 Gerrit-Change-Number: 31741 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 08:12:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-pfcp[master]: build: drop COVERAGE
by fixeria 09 Mar '23

09 Mar '23

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31761 ) Change subject: build: drop COVERAGE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Ib256ce7d979aec5c368b19ac2c145f75a9dab0fc Gerrit-Change-Number: 31761 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 07:12:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: error log: osmo_sock_init2_multiaddr() v4/v6 mix
by neels 09 Mar '23

09 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31771 ) Change subject: error log: osmo_sock_init2_multiaddr() v4/v6 mix ...................................................................... error log: osmo_sock_init2_multiaddr() v4/v6 mix Provide some more information for the error case when local and remote addresses mix v4 and v6. Change-Id: I0fd12b08e0788ce3af6dc519ff8c82ad196a115f --- M src/core/socket.c M tests/socket/socket_sctp_test.err 2 files changed, 21 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/31771/1 diff --git a/src/core/socket.c b/src/core/socket.c index 9e0f84e..1b14794 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -776,7 +776,11 @@ if (((flags & OSMO_SOCK_F_BIND) && (flags & OSMO_SOCK_F_CONNECT)) && !addrinfo_has_in6addr_any((const struct addrinfo **)res_loc, local_hosts_cnt) && (loc_has_v4addr != rem_has_v4addr || loc_has_v6addr != rem_has_v6addr)) { - LOGP(DLGLOBAL, LOGL_ERROR, "Invalid v4 vs v6 in local vs remote addresses\n"); + LOGP(DLGLOBAL, LOGL_ERROR, "Invalid v4 vs v6 in local vs remote addresses: " + "local:%s%s remote:%s%s\n", + loc_has_v4addr ? " v4" : "", loc_has_v6addr ? " v6" : "", + rem_has_v4addr ? " v4" : "", rem_has_v6addr ? " v6" : "" + ); rc = -EINVAL; goto ret_freeaddrinfo; } diff --git a/tests/socket/socket_sctp_test.err b/tests/socket/socket_sctp_test.err index 996d092..7583a2a 100644 --- a/tests/socket/socket_sctp_test.err +++ b/tests/socket/socket_sctp_test.err @@ -1,8 +1,8 @@ invalid: you have to specify either BIND or CONNECT flags -Invalid v4 vs v6 in local vs remote addresses -Invalid v4 vs v6 in local vs remote addresses +Invalid v4 vs v6 in local vs remote addresses: local: v4 remote: v6 +Invalid v4 vs v6 in local vs remote addresses: local: v6 remote: v4 invalid: you have to specify either BIND or CONNECT flags -Invalid v4 vs v6 in local vs remote addresses -Invalid v4 vs v6 in local vs remote addresses +Invalid v4 vs v6 in local vs remote addresses: local: v4 remote: v6 +Invalid v4 vs v6 in local vs remote addresses: local: v6 remote: v4 getaddrinfo(::1, 0) failed: Address family for hostname not supported getaddrinfo(127.0.0.1, 0) failed: Address family for hostname not supported -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0fd12b08e0788ce3af6dc519ff8c82ad196a115f Gerrit-Change-Number: 31771 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-hnbgw[master]: fix regression: unbreak PFCP: PS RAB via UPF proxying
by neels 09 Mar '23

09 Mar '23

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31769 ) Change subject: fix regression: unbreak PFCP: PS RAB via UPF proxying ...................................................................... fix regression: unbreak PFCP: PS RAB via UPF proxying Fix PS RAB Assignment operation: - add #include "config.h" - fix uncompilable code in ENABLE_PFCP sections. A series of oversights made me completely break PFCP / UPF operation for PS RAB Assignments in this commit: 'context map: introduce RUA and SCCP FSMs to fix leaks' ed424d5be471376d482d203c2e78deb1f836c119 I6ff7e36532ff57c6f2d3e7e419dd22ef27dafd19 - In my HNBGW_Tests.ttcn, I used osmo-hnbgw-with-pfcp.cfg, but failed to set mp_enable_pfcp_tests := true in HNBGW_Tests.cfg. - Hence I was under the impression that I was testing PFCP via UPF when really I wasn't. So I did not notice that: - in the new files context_map_rua.c and context_map_sccp.c, the ENABLE_PFCP macro was always unset because I forgot to #include "config.h". - Hence I did not notice that the moved PFCP RAB code was never once compiled or run. My bad, that was really dumb. Related: SYS#6297 Change-Id: I5df5073f0092ecdfd73d5d08207ca4042154eab1 --- M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/context_map_sccp.c M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_rua.c 4 files changed, 52 insertions(+), 19 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c index 25304d9..674fc50 100644 --- a/src/osmo-hnbgw/context_map_rua.c +++ b/src/osmo-hnbgw/context_map_rua.c @@ -19,16 +19,23 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "config.h" #include <osmocom/core/utils.h> #include <osmocom/core/fsm.h> #include <osmocom/ranap/ranap_common_cn.h> +#if ENABLE_PFCP +#include <osmocom/pfcp/pfcp_cp_peer.h> +#endif + +#include <osmocom/hnbgw/hnbgw.h> #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbgw/tdefs.h> #include <osmocom/hnbgw/hnbgw_rua.h> #include <osmocom/hnbgw/mgw_fsm.h> +#include <osmocom/hnbgw/ps_rab_ass_fsm.h> enum map_rua_fsm_state { MAP_RUA_ST_INIT, @@ -142,7 +149,7 @@ } } #if ENABLE_PFCP - } else if (hnb_gw_is_gtp_mapping_enabled(map->hnb_gw)) { + } else if (hnb_gw_is_gtp_mapping_enabled(map->gw)) { /* map->is_ps == true and PFCP is enabled in osmo-hnbgw.cfg */ ranap_message *message = talloc_zero(OTC_SELECT, ranap_message); rc = ranap_cn_rx_co_decode2(message, msgb_l2(ranap_msg), msgb_l2len(ranap_msg)); diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 3042636..9245ed5 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -20,6 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "config.h" + #include <osmocom/core/utils.h> #include <osmocom/core/fsm.h> @@ -27,10 +29,15 @@ #include <osmocom/ranap/ranap_common_ran.h> +#if ENABLE_PFCP +#include <osmocom/pfcp/pfcp_cp_peer.h> +#endif + #include <osmocom/hnbgw/hnbgw_cn.h> #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbgw/tdefs.h> #include <osmocom/hnbgw/mgw_fsm.h> +#include <osmocom/hnbgw/ps_rab_ass_fsm.h> enum map_sccp_fsm_state { MAP_SCCP_ST_INIT, @@ -198,7 +205,6 @@ #if ENABLE_PFCP } else { ranap_message *message; - struct hnb_gw *hnb_gw = cnlink->gw; /* Packet-Switched. Set up mapping of GTP ports via UPF */ message = talloc_zero(OTC_SELECT, ranap_message); rc = ranap_ran_rx_co_decode(message, message, msgb_l2(ranap_msg), msgb_l2len(ranap_msg)); @@ -211,10 +217,10 @@ case RANAP_ProcedureCode_id_RAB_Assignment: /* If a UPF is configured, handle the RAB Assignment via ps_rab_ass_fsm, and replace the * GTP F-TEIDs in the RAB Assignment message before passing it on to RUA. */ - if (hnb_gw_is_gtp_mapping_enabled(hnb_gw)) { + if (hnb_gw_is_gtp_mapping_enabled(map->gw)) { LOGP(DMAIN, LOGL_DEBUG, "RAB Assignment: setting up GTP tunnel mapping via UPF %s\n", - osmo_sockaddr_to_str_c(OTC_SELECT, &hnb_gw->pfcp.cp_peer->remote_addr)); + osmo_sockaddr_to_str_c(OTC_SELECT, &map->gw->pfcp.cp_peer->remote_addr)); return hnbgw_gtpmap_rx_rab_ass_req(map, ranap_msg, message); } /* If no UPF is configured, directly forward the message as-is (no GTP mapping). */ diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 856bf79..e2dccf9 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -31,21 +31,11 @@ #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/sigtran/sccp_helpers.h> -#if ENABLE_PFCP -#include <osmocom/pfcp/pfcp_cp_peer.h> -#endif - #include <osmocom/hnbgw/hnbgw.h> #include <osmocom/hnbgw/hnbgw_rua.h> #include <osmocom/ranap/ranap_ies_defs.h> #include <osmocom/ranap/ranap_msg_factory.h> #include <osmocom/hnbgw/context_map.h> -#include <osmocom/hnbgw/mgw_fsm.h> -#include <osmocom/hnbgw/ps_rab_ass_fsm.h> -#include <osmocom/ranap/RANAP_ProcedureCode.h> -#include <osmocom/ranap/ranap_common.h> -#include <osmocom/ranap/ranap_common_ran.h> -#include <osmocom/ranap/RANAP_RANAP-PDU.h> /*********************************************************************** * Outbound RANAP RESET to CN diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index db7fdbb..83410b9 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -39,11 +39,6 @@ #include <osmocom/rua/rua_ies_defs.h> #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbap/HNBAP_CN-DomainIndicator.h> -#include <osmocom/hnbgw/mgw_fsm.h> -#include <osmocom/hnbgw/ps_rab_ass_fsm.h> -#include <osmocom/ranap/RANAP_ProcedureCode.h> -#include <osmocom/ranap/ranap_common.h> -#include <osmocom/ranap/ranap_common_cn.h> static const char *cn_domain_indicator_to_str(RUA_CN_DomainIndicator_t cN_DomainIndicator) { -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I5df5073f0092ecdfd73d5d08207ca4042154eab1 Gerrit-Change-Number: 31769 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-hnbgw[master]: fix regression: unbreak PFCP: PS RAB via UPF proxying
by neels 09 Mar '23

09 Mar '23

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31769 ) Change subject: fix regression: unbreak PFCP: PS RAB via UPF proxying ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: this fixes a regression, so I'm going to fast track this. Review is still welcome! -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I5df5073f0092ecdfd73d5d08207ca4042154eab1 Gerrit-Change-Number: 31769 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 02:28:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-hnbgw[master]: fix regression: unbreak PFCP: PS RAB via UPF proxying
by neels 09 Mar '23

09 Mar '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31769 to look at the new patch set (#2). Change subject: fix regression: unbreak PFCP: PS RAB via UPF proxying ...................................................................... fix regression: unbreak PFCP: PS RAB via UPF proxying Fix PS RAB Assignment operation: - add #include "config.h" - fix uncompilable code in ENABLE_PFCP sections. A series of oversights made me completely break PFCP / UPF operation for PS RAB Assignments in this commit: 'context map: introduce RUA and SCCP FSMs to fix leaks' ed424d5be471376d482d203c2e78deb1f836c119 I6ff7e36532ff57c6f2d3e7e419dd22ef27dafd19 - In my HNBGW_Tests.ttcn, I used osmo-hnbgw-with-pfcp.cfg, but failed to set mp_enable_pfcp_tests := true in HNBGW_Tests.cfg. - Hence I was under the impression that I was testing PFCP via UPF when really I wasn't. So I did not notice that: - in the new files context_map_rua.c and context_map_sccp.c, the ENABLE_PFCP macro was always unset because I forgot to #include "config.h". - Hence I did not notice that the moved PFCP RAB code was never once compiled or run. My bad, that was really dumb. Related: SYS#6297 Change-Id: I5df5073f0092ecdfd73d5d08207ca4042154eab1 --- M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/context_map_sccp.c M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_rua.c 4 files changed, 52 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/69/31769/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I5df5073f0092ecdfd73d5d08207ca4042154eab1 Gerrit-Change-Number: 31769 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-hnbgw[master]: debug log: log received RANAP message types on DCN, DHNB
by neels 09 Mar '23

09 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31770 ) Change subject: debug log: log received RANAP message types on DCN, DHNB ...................................................................... debug log: log received RANAP message types on DCN, DHNB Change-Id: Ib295e49f2c53164c5787002797145b3e6de5546b --- M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/context_map_sccp.c 2 files changed, 26 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/70/31770/1 diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c index 674fc50..980fad2 100644 --- a/src/osmo-hnbgw/context_map_rua.c +++ b/src/osmo-hnbgw/context_map_rua.c @@ -128,8 +128,9 @@ } /* Dispatch RANAP message to SCCP, if any. */ -static int handle_rx_rua(struct hnbgw_context_map *map, struct msgb *ranap_msg) +static int handle_rx_rua(struct osmo_fsm_inst *fi, struct msgb *ranap_msg) { + struct hnbgw_context_map *map = fi->priv; int rc; if (!msg_has_l2_data(ranap_msg)) return 0; @@ -142,6 +143,9 @@ if (rc == 0) { talloc_set_destructor(message, destruct_ranap_cn_rx_co_ies); + LOGPFSML(fi, LOGL_DEBUG, "rx from RUA: RANAP %s\n", + get_value_string(ranap_procedure_code_vals, message->procedureCode)); + switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: /* mgw_fsm_handle_rab_ass_resp() takes ownership of prim->oph and (ranap) message */ @@ -156,6 +160,9 @@ if (rc == 0) { talloc_set_destructor(message, destruct_ranap_cn_rx_co_ies); + LOGPFSML(fi, LOGL_DEBUG, "rx from RUA: RANAP %s\n", + get_value_string(ranap_procedure_code_vals, message->procedureCode)); + switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: /* ps_rab_ass_fsm takes ownership of prim->oph and RANAP message */ @@ -205,7 +212,7 @@ case MAP_RUA_EV_CN_DISC: case MAP_RUA_EV_HNB_LINK_LOST: /* Unlikely that SCCP is active, but let the SCCP FSM decide about that. */ - handle_rx_rua(map, ranap_msg); + handle_rx_rua(fi, ranap_msg); /* There is a reason to shut down this RUA connection. Super unlikely, we haven't even processed the * MAP_RUA_EV_RX_CONNECT that created this FSM. Semantically, RUA is not connected, so we can * directly go to MAP_RUA_ST_DISCONNECTED. */ @@ -246,7 +253,7 @@ case MAP_RUA_EV_RX_DIRECT_TRANSFER: /* received DirectTransfer from RUA, forward to SCCP */ - handle_rx_rua(map, ranap_msg); + handle_rx_rua(fi, ranap_msg); return; case MAP_RUA_EV_TX_DIRECT_TRANSFER: @@ -263,7 +270,7 @@ return; } map_rua_fsm_state_chg(MAP_RUA_ST_DISCONNECTED); - handle_rx_rua(map, ranap_msg); + handle_rx_rua(fi, ranap_msg); return; case MAP_RUA_EV_HNB_LINK_LOST: diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 9245ed5..deb6e0f 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -191,6 +191,9 @@ if (rc == 0) { talloc_set_destructor(message, destruct_ranap_ran_rx_co_ies); + LOGPFSML(fi, LOGL_DEBUG, "rx from SCCP: RANAP %s\n", + get_value_string(ranap_procedure_code_vals, message->procedureCode)); + switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: /* mgw_fsm_alloc_and_handle_rab_ass_req() takes ownership of (ranap) message */ @@ -212,6 +215,9 @@ if (rc == 0) { talloc_set_destructor(message, destruct_ranap_ran_rx_co_ies); + LOGPFSML(fi, LOGL_DEBUG, "rx from SCCP: RANAP %s\n", + get_value_string(ranap_procedure_code_vals, message->procedureCode)); + switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib295e49f2c53164c5787002797145b3e6de5546b Gerrit-Change-Number: 31770 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-hnbgw[master]: fix regression: unbreak PFCP: PS RAB via UPF proxying
by neels 09 Mar '23

09 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31769 ) Change subject: fix regression: unbreak PFCP: PS RAB via UPF proxying ...................................................................... fix regression: unbreak PFCP: PS RAB via UPF proxying Fix PS RAB Assignment operation: - add #include "config.h" - fix uncompilable code in ENABLE_PFCP sections. A series of oversights made me completely break PFCP / UPF operation for PS RAB Assignments in this commit: 'context map: introduce RUA and SCCP FSMs to fix leaks' ed424d5be471376d482d203c2e78deb1f836c119 I6ff7e36532ff57c6f2d3e7e419dd22ef27dafd19 - In my HNBGW_Tests.ttcn, I used osmo-hnbgw-with-pfcp.cfg, but failed to set mp_enable_pfcp_tests := true in HNBGW_Tests.cfg. - Hence I was under the impression that I was testing PFCP via UPF when really I wasn't. So I did not notice that: - in the new files context_map_rua.c and context_map_sccp.c, the ENABLE_PFCP macro was always unset because I forgot to #include "config.h". - Hence I did not notice that the moved PFCP RAB code was never once compiled or run. My bad, that was really dumb. Related: SYS#6297 Change-Id: I5df5073f0092ecdfd73d5d08207ca4042154eab1 --- M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/context_map_sccp.c M src/osmo-hnbgw/hnbgw_cn.c 3 files changed, 52 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/69/31769/1 diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c index 25304d9..674fc50 100644 --- a/src/osmo-hnbgw/context_map_rua.c +++ b/src/osmo-hnbgw/context_map_rua.c @@ -19,16 +19,23 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "config.h" #include <osmocom/core/utils.h> #include <osmocom/core/fsm.h> #include <osmocom/ranap/ranap_common_cn.h> +#if ENABLE_PFCP +#include <osmocom/pfcp/pfcp_cp_peer.h> +#endif + +#include <osmocom/hnbgw/hnbgw.h> #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbgw/tdefs.h> #include <osmocom/hnbgw/hnbgw_rua.h> #include <osmocom/hnbgw/mgw_fsm.h> +#include <osmocom/hnbgw/ps_rab_ass_fsm.h> enum map_rua_fsm_state { MAP_RUA_ST_INIT, @@ -142,7 +149,7 @@ } } #if ENABLE_PFCP - } else if (hnb_gw_is_gtp_mapping_enabled(map->hnb_gw)) { + } else if (hnb_gw_is_gtp_mapping_enabled(map->gw)) { /* map->is_ps == true and PFCP is enabled in osmo-hnbgw.cfg */ ranap_message *message = talloc_zero(OTC_SELECT, ranap_message); rc = ranap_cn_rx_co_decode2(message, msgb_l2(ranap_msg), msgb_l2len(ranap_msg)); diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 3042636..9245ed5 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -20,6 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "config.h" + #include <osmocom/core/utils.h> #include <osmocom/core/fsm.h> @@ -27,10 +29,15 @@ #include <osmocom/ranap/ranap_common_ran.h> +#if ENABLE_PFCP +#include <osmocom/pfcp/pfcp_cp_peer.h> +#endif + #include <osmocom/hnbgw/hnbgw_cn.h> #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbgw/tdefs.h> #include <osmocom/hnbgw/mgw_fsm.h> +#include <osmocom/hnbgw/ps_rab_ass_fsm.h> enum map_sccp_fsm_state { MAP_SCCP_ST_INIT, @@ -198,7 +205,6 @@ #if ENABLE_PFCP } else { ranap_message *message; - struct hnb_gw *hnb_gw = cnlink->gw; /* Packet-Switched. Set up mapping of GTP ports via UPF */ message = talloc_zero(OTC_SELECT, ranap_message); rc = ranap_ran_rx_co_decode(message, message, msgb_l2(ranap_msg), msgb_l2len(ranap_msg)); @@ -211,10 +217,10 @@ case RANAP_ProcedureCode_id_RAB_Assignment: /* If a UPF is configured, handle the RAB Assignment via ps_rab_ass_fsm, and replace the * GTP F-TEIDs in the RAB Assignment message before passing it on to RUA. */ - if (hnb_gw_is_gtp_mapping_enabled(hnb_gw)) { + if (hnb_gw_is_gtp_mapping_enabled(map->gw)) { LOGP(DMAIN, LOGL_DEBUG, "RAB Assignment: setting up GTP tunnel mapping via UPF %s\n", - osmo_sockaddr_to_str_c(OTC_SELECT, &hnb_gw->pfcp.cp_peer->remote_addr)); + osmo_sockaddr_to_str_c(OTC_SELECT, &map->gw->pfcp.cp_peer->remote_addr)); return hnbgw_gtpmap_rx_rab_ass_req(map, ranap_msg, message); } /* If no UPF is configured, directly forward the message as-is (no GTP mapping). */ diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 856bf79..2875c49 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -31,10 +31,6 @@ #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/sigtran/sccp_helpers.h> -#if ENABLE_PFCP -#include <osmocom/pfcp/pfcp_cp_peer.h> -#endif - #include <osmocom/hnbgw/hnbgw.h> #include <osmocom/hnbgw/hnbgw_rua.h> #include <osmocom/ranap/ranap_ies_defs.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I5df5073f0092ecdfd73d5d08207ca4042154eab1 Gerrit-Change-Number: 31769 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: osmo-hnbgw-with-pfcp.cfg: improve logging
by neels 09 Mar '23

09 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31768 ) Change subject: osmo-hnbgw-with-pfcp.cfg: improve logging ...................................................................... osmo-hnbgw-with-pfcp.cfg: improve logging Change-Id: Iaf4e8993f9d3b41f74145291940ca59947f9d171 --- M hnbgw/osmo-hnbgw-with-pfcp.cfg 1 file changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/31768/1 diff --git a/hnbgw/osmo-hnbgw-with-pfcp.cfg b/hnbgw/osmo-hnbgw-with-pfcp.cfg index e4dfed2..178369a 100644 --- a/hnbgw/osmo-hnbgw-with-pfcp.cfg +++ b/hnbgw/osmo-hnbgw-with-pfcp.cfg @@ -5,12 +5,21 @@ log stderr logging filter all 1 logging color 1 - logging print category-hex 1 + logging print category-hex 0 logging print category 1 logging print thread-id 0 logging print extended-timestamp 1 - logging print file 1 + logging print level 1 + logging print file basename last logging level set-all debug + logging level ranap info + logging level rua info + logging level lss7 error + logging level lm3ua error + logging level linp error + logging level lpfcp info + logging level lsua notice + logging level lsccp notice ! line vty no login -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaf4e8993f9d3b41f74145291940ca59947f9d171 Gerrit-Change-Number: 31768 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0