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

Change in libosmocore[master]: gsm: bts_features: Add missing entries to osmo_bts_features_names

by fixeria

Attention is currently required from: osmith, pespin, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29000 ) Change subject: gsm: bts_features: Add missing entries to osmo_bts_features_names ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic8162e7ab6b657de694e3825e694e9b18c540271 Gerrit-Change-Number: 29000 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 16:01:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-hnbgw[master]: build: add --enable-pfcp, make PFCP dep optional

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29001 ) Change subject: build: add --enable-pfcp, make PFCP dep optional ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: this patch should fix build server fallout until the packaging of libosmo-pfcp works properly, by disabling PFCP by default. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6d50c60bccda767910217243bdfb4a6fad1e39c1 Gerrit-Change-Number: 29001 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 09 Aug 2022 15:59:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-hnbgw[master]: build: add --enable-pfcp, make PFCP dep optional

by neels

neels has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29001 ) Change subject: build: add --enable-pfcp, make PFCP dep optional ...................................................................... build: add --enable-pfcp, make PFCP dep optional Related: SYS#5895 Change-Id: I6d50c60bccda767910217243bdfb4a6fad1e39c1 --- M configure.ac M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_rua.c M src/osmo-hnbgw/hnbgw_vty.c M src/osmo-hnbgw/tdefs.c 8 files changed, 62 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/01/29001/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6d50c60bccda767910217243bdfb4a6fad1e39c1 Gerrit-Change-Number: 29001 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 10 months

1
0
0 0

Change in osmo-hnbgw[master]: optimize: decode PS msgs only when PFCP is enabled

by neels

neels has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29003 ) Change subject: optimize: decode PS msgs only when PFCP is enabled ...................................................................... optimize: decode PS msgs only when PFCP is enabled For the benefit of skipping decoding of all PS RANAP and RUA messages, introduce code dup: decode CS and PS separately. Related: SYS#5895 Change-Id: Ifb57bad6a0d5ff263e4c6c3facc51620e110e7d2 --- M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_rua.c 2 files changed, 48 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/03/29003/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ifb57bad6a0d5ff263e4c6c3facc51620e110e7d2 Gerrit-Change-Number: 29003 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 10 months

1
0
0 0

Change in osmo-hnbgw[master]: debian: add libosmo-pfcp deps

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29002 ) Change subject: debian: add libosmo-pfcp deps ...................................................................... debian: add libosmo-pfcp deps Add missing bits from adding PFCP support in Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a Related: SYS#5895 Change-Id: I54dfe600d45541fecbb4c05bf75f147934c230f0 --- M debian/control 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/02/29002/1 diff --git a/debian/control b/debian/control index 3fe8035..5b06c20 100644 --- a/debian/control +++ b/debian/control @@ -21,6 +21,8 @@ libosmo-hnbap-dev (>= 1.3.0), libosmo-ranap-dev (>= 1.3.0), libosmo-rua-dev (>= 1.3.0), + libosmo-gtlv-dev (>= 0.1.0), + libosmo-pfcp-dev (>= 0.1.0), osmo-gsm-manuals-dev (>= 1.3.0) Standards-Version: 3.9.8 Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-hnbgw -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I54dfe600d45541fecbb4c05bf75f147934c230f0 Gerrit-Change-Number: 29002 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-hnbgw[master]: optimize: decode PS msgs only when PFCP is enabled

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29003 ) Change subject: optimize: decode PS msgs only when PFCP is enabled ...................................................................... optimize: decode PS msgs only when PFCP is enabled For the benefit of skipping decoding of all PS RANAP and RUA messages, introduce code dup: decode CS and PS separately. Related: SYS#5895 Change-Id: Ifb57bad6a0d5ff263e4c6c3facc51620e110e7d2 --- M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_rua.c 2 files changed, 48 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/03/29003/1 diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 893ee2a..7cbfcec 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -373,11 +373,12 @@ } /* Intercept RAB Assignment Request, to map RTP and GTP between access and core */ - message = talloc_zero(map, ranap_message); - rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg)); - if (rc == 0) { - if (!map->is_ps) { - /* Circuit-Switched. Set up mapping of RTP ports via MGW */ + if (!map->is_ps) { + /* Circuit-Switched. Set up mapping of RTP ports via MGW */ + message = talloc_zero(map, ranap_message); + rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg)); + + if (rc == 0) { switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: /* mgw_fsm_alloc_and_handle_rab_ass_req() takes ownership of (ranap) message */ @@ -388,10 +389,18 @@ mgw_fsm_release(map); break; } + ranap_ran_rx_co_free(message); + } + + talloc_free(message); #if ENABLE_PFCP - } else { - struct hnb_gw *hnb_gw = cnlink->gw; - /* Packet-Switched. Set up mapping of GTP ports via UPF */ + } else { + struct hnb_gw *hnb_gw = cnlink->gw; + /* Packet-Switched. Set up mapping of GTP ports via UPF */ + message = talloc_zero(map, ranap_message); + rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg)); + + if (rc == 0) { switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: @@ -408,16 +417,17 @@ break; case RANAP_ProcedureCode_id_Iu_Release: - /* An IU Release will terminate the PFCP sessions for all RABs (ps_rab FSM instances). - * Terminate all RABs and forward the IU Release directly by rua_tx_dt() below. */ + /* Any IU Release will terminate the MGW FSM, the message itsself is not passed to the + * FSM code. It is just forwarded normally by the rua_tx_dt() call below. */ hnbgw_gtpmap_release(map); break; } -#endif + ranap_ran_rx_co_free(message); } - ranap_ran_rx_co_free(message); + + talloc_free(message); +#endif } - talloc_free(message); return rua_tx_dt(map->hnb_ctx, map->is_ps, map->rua_ctx_id, msgb_l2(oph->msg), msgb_l2len(oph->msg)); diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index 9234ac4..7d5492f 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -276,25 +276,37 @@ /* If there is data, see if it is a RAB Assignment message where we need to change the user plane information, * for RTP mapping via MGW (soon also GTP mapping via UPF). */ if (data && len && map && !release_context_map) { - message = talloc_zero(map, ranap_message); - rc = ranap_cn_rx_co_decode(map, message, msgb_l2(prim->oph.msg), msgb_l2len(prim->oph.msg)); + if (!map->is_ps) { + message = talloc_zero(map, ranap_message); + rc = ranap_cn_rx_co_decode(map, message, msgb_l2(prim->oph.msg), msgb_l2len(prim->oph.msg)); - if (rc == 0) { - switch (message->procedureCode) { - case RANAP_ProcedureCode_id_RAB_Assignment: - if (!map->is_ps) { + if (rc == 0) { + switch (message->procedureCode) { + case RANAP_ProcedureCode_id_RAB_Assignment: /* mgw_fsm_handle_rab_ass_resp() takes ownership of prim->oph and (ranap) message */ return mgw_fsm_handle_rab_ass_resp(map, &prim->oph, message); } -#if ENABLE_PFCP - /* ps_rab_ass_fsm takes ownership of prim->oph and RANAP message */ - return hnbgw_gtpmap_rx_rab_ass_resp(map, &prim->oph, message); -#endif + ranap_cn_rx_co_free(message); } - ranap_cn_rx_co_free(message); - } - talloc_free(message); + talloc_free(message); +#if ENABLE_PFCP + } else { + message = talloc_zero(map, ranap_message); + rc = ranap_cn_rx_co_decode(map, message, msgb_l2(prim->oph.msg), msgb_l2len(prim->oph.msg)); + + if (rc == 0) { + switch (message->procedureCode) { + case RANAP_ProcedureCode_id_RAB_Assignment: + /* ps_rab_ass_fsm takes ownership of prim->oph and RANAP message */ + return hnbgw_gtpmap_rx_rab_ass_resp(map, &prim->oph, message); + } + ranap_cn_rx_co_free(message); + } + + talloc_free(message); +#endif + } } rc = osmo_sccp_user_sap_down(cn->sccp_user, &prim->oph); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ifb57bad6a0d5ff263e4c6c3facc51620e110e7d2 Gerrit-Change-Number: 29003 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-hnbgw[master]: build: add --enable-pfcp, make PFCP dep optional

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29001 ) Change subject: build: add --enable-pfcp, make PFCP dep optional ...................................................................... build: add --enable-pfcp, make PFCP dep optional Related: SYS#5895 Change-Id: I6d50c60bccda767910217243bdfb4a6fad1e39c1 --- M configure.ac M debian/rules M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_rua.c M src/osmo-hnbgw/hnbgw_vty.c M src/osmo-hnbgw/tdefs.c 9 files changed, 63 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/01/29001/1 diff --git a/configure.ac b/configure.ac index 0f2a7c4..6bfb080 100644 --- a/configure.ac +++ b/configure.ac @@ -61,8 +61,17 @@ PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOHNBAP, libosmo-hnbap >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.10.0) -PKG_CHECK_MODULES(LIBOSMOGTLV, libosmo-gtlv >= 0.1.0) -PKG_CHECK_MODULES(LIBOSMOPFCP, libosmo-pfcp >= 0.1.0) + +# Enable PFCP support for GTP tunnel mapping via UPF +AC_ARG_ENABLE([pfcp], [AS_HELP_STRING([--enable-pfcp], [Build with PFCP support, for GTP tunnel mapping via UPF])], + [osmo_ac_pfcp="$enableval"],[osmo_ac_pfcp="no"]) +if test "x$osmo_ac_pfcp" = "xyes" ; then + PKG_CHECK_MODULES(LIBOSMOGTLV, libosmo-gtlv >= 0.1.0) + PKG_CHECK_MODULES(LIBOSMOPFCP, libosmo-pfcp >= 0.1.0) + AC_DEFINE(ENABLE_PFCP, 1, [Define to build with PFCP support]) +fi +AM_CONDITIONAL(ENABLE_PFCP, test "x$osmo_ac_pfcp" = "xyes") +AC_SUBST(osmo_ac_pfcp) dnl checks for header files AC_HEADER_STDC diff --git a/debian/rules b/debian/rules index bce8ed6..f341a84 100755 --- a/debian/rules +++ b/debian/rules @@ -46,6 +46,7 @@ # debmake generated override targets CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals +CONFIGURE_FLAGS += --enable-pfcp override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) # diff --git a/src/osmo-hnbgw/Makefile.am b/src/osmo-hnbgw/Makefile.am index 4d2403d..1d907ba 100644 --- a/src/osmo-hnbgw/Makefile.am +++ b/src/osmo-hnbgw/Makefile.am @@ -20,8 +20,6 @@ $(LIBOSMORANAP_CFLAGS) \ $(LIBOSMOHNBAP_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ - $(LIBOSMOGTLV_CFLAGS) \ - $(LIBOSMOPFCP_CFLAGS) \ $(NULL) AM_LDFLAGS = \ @@ -37,14 +35,11 @@ hnbgw_hnbap.c \ hnbgw_rua.c \ hnbgw_ranap.c \ - hnbgw_pfcp.c \ hnbgw_vty.c \ context_map.c \ hnbgw_cn.c \ ranap_rab_ass.c \ mgw_fsm.c \ - ps_rab_ass_fsm.c \ - ps_rab_fsm.c \ tdefs.c \ $(NULL) @@ -63,6 +58,20 @@ $(LIBOSMOMGCPCLIENT_LIBS) \ $(LIBSCTP_LIBS) \ $(LIBOSMOMGCPCLIENT_LIBS) \ + $(NULL) + +if ENABLE_PFCP +AM_CFLAGS += \ + $(LIBOSMOGTLV_CFLAGS) \ + $(LIBOSMOPFCP_CFLAGS) \ + $(NULL) +osmo_hnbgw_LDADD += \ $(LIBOSMOGTLV_LIBS) \ $(LIBOSMOPFCP_LIBS) \ $(NULL) +osmo_hnbgw_SOURCES += \ + hnbgw_pfcp.c \ + ps_rab_ass_fsm.c \ + ps_rab_fsm.c \ + $(NULL) +endif diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c index 6bd4f6c..c069651 100644 --- a/src/osmo-hnbgw/context_map.c +++ b/src/osmo-hnbgw/context_map.c @@ -19,6 +19,8 @@ * */ +#include "config.h" + /* an expired mapping is destroyed after 1..2 * EXPIRY_TIMER_SECS */ #define EXPIRY_TIMER_SECS 23 @@ -166,7 +168,9 @@ OSMO_ASSERT(map->mgw_fi == NULL); } +#if ENABLE_PFCP hnbgw_gtpmap_release(map); +#endif } static struct osmo_timer_list context_map_tmr; diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 8b72a8f..526622b 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -61,7 +61,9 @@ #include <osmocom/sigtran/protocol/m3ua.h> #include <osmocom/sigtran/sccp_sap.h> +#if ENABLE_PFCP #include <osmocom/pfcp/pfcp_proto.h> +#endif #include <osmocom/hnbgw/hnbgw.h> #include <osmocom/hnbgw/hnbgw_hnbap.h> @@ -104,7 +106,9 @@ gw->config.mgcp_client = talloc_zero(tall_hnb_ctx, struct mgcp_client_conf); mgcp_client_conf_init(gw->config.mgcp_client); +#if ENABLE_PFCP gw->config.pfcp.remote_port = OSMO_PFCP_PORT; +#endif return gw; } @@ -718,8 +722,10 @@ return -EINVAL; } +#if ENABLE_PFCP /* If UPF is configured, set up PFCP socket and send Association Setup Request to UPF */ hnbgw_pfcp_init(g_hnb_gw); +#endif if (hnbgw_cmdline_config.daemonize) { rc = osmo_daemonize(); diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 0f1ed07..893ee2a 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -18,6 +18,8 @@ * */ +#include "config.h" + #include <arpa/inet.h> #include <errno.h> @@ -29,7 +31,9 @@ #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> @@ -356,7 +360,6 @@ struct hnbgw_context_map *map; ranap_message *message; int rc; - struct hnb_gw *hnb_gw = cnlink->gw; /* Usually connection-oriented data is always passed transparently towards the specific HNB, via a RUA * connection identified by conn_id. An exception is made for RANAP RAB AssignmentRequest and @@ -385,7 +388,9 @@ mgw_fsm_release(map); break; } +#if ENABLE_PFCP } else { + struct hnb_gw *hnb_gw = cnlink->gw; /* Packet-Switched. Set up mapping of GTP ports via UPF */ switch (message->procedureCode) { @@ -408,6 +413,7 @@ hnbgw_gtpmap_release(map); break; } +#endif } ranap_ran_rx_co_free(message); } diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index f3ce5d9..9234ac4 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -18,6 +18,7 @@ * */ +#include "config.h" #include <osmocom/core/msgb.h> #include <osmocom/core/utils.h> @@ -285,8 +286,10 @@ /* mgw_fsm_handle_rab_ass_resp() takes ownership of prim->oph and (ranap) message */ return mgw_fsm_handle_rab_ass_resp(map, &prim->oph, message); } +#if ENABLE_PFCP /* ps_rab_ass_fsm takes ownership of prim->oph and RANAP message */ return hnbgw_gtpmap_rx_rab_ass_resp(map, &prim->oph, message); +#endif } ranap_cn_rx_co_free(message); } diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index 03f6617..3f76c6f 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -18,6 +18,8 @@ * */ +#include "config.h" + #include <string.h> #include <osmocom/core/socket.h> @@ -362,6 +364,8 @@ return CMD_SUCCESS; } +#if ENABLE_PFCP + static struct cmd_node pfcp_node = { PFCP_NODE, "%s(config-hnbgw-pfcp)# ", @@ -403,6 +407,8 @@ return CMD_SUCCESS; } +#endif /* ENABLE_PFCP */ + static int config_write_hnbgw(struct vty *vty) { vty_out(vty, "hnbgw%s", VTY_NEWLINE); @@ -466,6 +472,7 @@ return CMD_SUCCESS; } +#if ENABLE_PFCP static int config_write_hnbgw_pfcp(struct vty *vty) { vty_out(vty, " pfcp%s", VTY_NEWLINE); @@ -476,6 +483,7 @@ return CMD_SUCCESS; } +#endif void hnbgw_vty_init(struct hnb_gw *gw, void *tall_ctx) { @@ -515,11 +523,13 @@ install_element(HNBGW_NODE, &cfg_hnbgw_mgcp_cmd); install_node(&mgcp_node, config_write_hnbgw_mgcp); +#if ENABLE_PFCP install_node(&pfcp_node, config_write_hnbgw_pfcp); install_element(HNBGW_NODE, &cfg_hnbgw_pfcp_cmd); install_element(PFCP_NODE, &cfg_pfcp_local_addr_cmd); install_element(PFCP_NODE, &cfg_pfcp_local_port_cmd); install_element(PFCP_NODE, &cfg_pfcp_remote_addr_cmd); +#endif mgcp_client_vty_init(tall_hnb_ctx, MGCP_NODE, g_hnb_gw->config.mgcp_client); osmo_tdef_vty_groups_init(HNBGW_NODE, hnbgw_tdef_group); diff --git a/src/osmo-hnbgw/tdefs.c b/src/osmo-hnbgw/tdefs.c index 5113dd3..d798345 100644 --- a/src/osmo-hnbgw/tdefs.c +++ b/src/osmo-hnbgw/tdefs.c @@ -14,8 +14,13 @@ * GNU General Public License for more details. */ +#include "config.h" + #include <osmocom/hnbgw/tdefs.h> + +#if ENABLE_PFCP #include <osmocom/pfcp/pfcp_endpoint.h> +#endif struct osmo_tdef mgw_fsm_T_defs[] = { {.T = -1001, .default_val = 5, .desc = "Timeout for HNB side call-leg (to-HNB) creation" }, @@ -34,6 +39,8 @@ struct osmo_tdef_group hnbgw_tdef_group[] = { {.name = "mgw", .tdefs = mgw_fsm_T_defs, .desc = "MGW (Media Gateway) interface" }, {.name = "ps", .tdefs = ps_T_defs, .desc = "timers for Packet Switched domain" }, +#if ENABLE_PFCP {.name = "pfcp", .tdefs = osmo_pfcp_tdefs, .desc = "PFCP timers" }, +#endif { } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6d50c60bccda767910217243bdfb4a6fad1e39c1 Gerrit-Change-Number: 29001 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in libosmocore[master]: gsm: bts_features: Add missing entries to osmo_bts_features_names

by pespin

Attention is currently required from: osmith, fixeria, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29000 ) Change subject: gsm: bts_features: Add missing entries to osmo_bts_features_names ...................................................................... Patch Set 1: (1 comment) File src/gsm/bts_features.c: https://gerrit.osmocom.org/c/libosmocore/+/29000/comment/b807d35a_e7ecd84b PS1, Line 83: {} I used BTS_FEAT_ACCH_TEMP_OVP as a guide when adding BTS_FEAT_OSMUX recently, that's why I forgot to add it here, because the former was missing ;) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic8162e7ab6b657de694e3825e694e9b18c540271 Gerrit-Change-Number: 29000 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 15:54:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmocore[master]: gsm: bts_features: Add missing entries to osmo_bts_features_names

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/29000 ) Change subject: gsm: bts_features: Add missing entries to osmo_bts_features_names ...................................................................... gsm: bts_features: Add missing entries to osmo_bts_features_names Those features were present in osmo_bts_features_descs but not in osmo_bts_features_names. Change-Id: Ic8162e7ab6b657de694e3825e694e9b18c540271 --- M src/gsm/bts_features.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/29000/1 diff --git a/src/gsm/bts_features.c b/src/gsm/bts_features.c index 785ad8a..6811038 100644 --- a/src/gsm/bts_features.c +++ b/src/gsm/bts_features.c @@ -78,5 +78,7 @@ { BTS_FEAT_ABIS_OSMO_PCU, "ABIS_OSMO_PCU" }, { BTS_FEAT_BCCH_POWER_RED, "BCCH_PWR_RED" }, { BTS_FEAT_DYN_TS_SDCCH8, "DYN_TS_SDCCH8" }, + { BTS_FEAT_ACCH_TEMP_OVP, "ACCH_TEMP_OVP" }, + { BTS_FEAT_OSMUX, "OSMUX" }, {} }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic8162e7ab6b657de694e3825e694e9b18c540271 Gerrit-Change-Number: 29000 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: populate SACCH cache in f_TC_ms_pwr_ctrl_{constant,pf_ewma}

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28876 ) Change subject: BTS_Tests: populate SACCH cache in f_TC_ms_pwr_ctrl_{constant,pf_ewma} ...................................................................... BTS_Tests: populate SACCH cache in f_TC_ms_pwr_ctrl_{constant,pf_ewma} There is a time window between activation of a dedicated channel and receipt of a L1CTL_DATA_REQ with the first RR Measurement Report, in which the L1 may need to start transmission on Uplink SACCH. In this case the L1 is using a dummy SACCH block with hard-coded L1 SACCH header values and hard-coded Measurement Results. Until recently we relied on implementation specific behavior of trxcon patching the L1 SACCH header in hard-coded dummy SACCH block. This behavior was changed, so TC_ms_pwr_ctrl_{constant,pf_ewma} started to fail. Let's properly populate the SACCH cache to fix these TCs. Change-Id: I89eb90815e86db466ea626f4c25f2634c1d942d5 Depends: osmocom-bb.git I0f467fc07cf844cc73465f235b36ba7d00788c9f Related: OS#5635 --- M bts/BTS_Tests.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 395059a..cbbb297 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -7876,6 +7876,12 @@ /* Ensure that 'rx-current' equals 'rx-target' */ f_trxc_fake_rssi(mp_uplink_power_target); + /* Populate SACCH cache with a Measurement Report */ + L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), + ts_SacchL1Header(g_pars.l1_pars.ms_power_level, + g_pars.l1_pars.ms_actual_ta), + f_pad_oct('010349'O & '0615004001C0'O, 21, '00'O))); + /* Establish a dedicated channel */ f_est_dchan(more_ies := valueof(ies)); @@ -7937,6 +7943,12 @@ /* Ensure that 'rx-current' equals 'rx-target' */ f_trxc_fake_rssi(mp_uplink_power_target); + /* Populate SACCH cache with a Measurement Report */ + L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), + ts_SacchL1Header(g_pars.l1_pars.ms_power_level, + g_pars.l1_pars.ms_actual_ta), + f_pad_oct('010349'O & '0615004001C0'O, 21, '00'O))); + /* Establish a dedicated channel */ f_est_dchan(more_ies := valueof(ies)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28876 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: I89eb90815e86db466ea626f4c25f2634c1d942d5 Gerrit-Change-Number: 28876 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(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-MessageType: merged

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022