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

Change in libosmo-pfcp[master]: set LIBVERSION=0:0:0

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29004 ) Change subject: set LIBVERSION=0:0:0 ...................................................................... set LIBVERSION=0:0:0 I wrote '1:0:0', but we should start with '0:0:0', according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info… Since the packaging for this repository is not functional yet, i.e. it was never packaged by anyone anywhere, i assume it is safe to go back from '1:0:0' to '0:0:0'. Related: SYS#5895 Change-Id: I5b80de2f486fdae62f0da1b74cb70dc9de7bb9cc --- M src/libosmo-gtlv/Makefile.am M src/libosmo-pfcp/Makefile.am 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/04/29004/1 diff --git a/src/libosmo-gtlv/Makefile.am b/src/libosmo-gtlv/Makefile.am index 1c40386..af0f839 100644 --- a/src/libosmo-gtlv/Makefile.am +++ b/src/libosmo-gtlv/Makefile.am @@ -29,6 +29,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=1:0:0 +LIBVERSION=0:0:0 libosmo_gtlv_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' diff --git a/src/libosmo-pfcp/Makefile.am b/src/libosmo-pfcp/Makefile.am index a1e9904..d202c6a 100644 --- a/src/libosmo-pfcp/Makefile.am +++ b/src/libosmo-pfcp/Makefile.am @@ -36,7 +36,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=1:0:0 +LIBVERSION=0:0:0 libosmo_pfcp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I5b80de2f486fdae62f0da1b74cb70dc9de7bb9cc Gerrit-Change-Number: 29004 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: debian packaging of libosmo-gtlv and libosmo-pfcp

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29005 ) Change subject: debian packaging of libosmo-gtlv and libosmo-pfcp ...................................................................... debian packaging of libosmo-gtlv and libosmo-pfcp Fix debian packaging, so far a copy-paste from osmo-upf.git crept in here by accident. Related: SYS#5895 Change-Id: Id7169fc67b4f8f77dfbeff9f199e6557ced67a53 --- M debian/changelog M debian/compat M debian/control M debian/copyright A debian/libosmo-gtlv0.install R debian/libosmo-pfcp0.install M debian/rules M tests/libosmo-pfcp/Makefile.am 8 files changed, 96 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/05/29005/1 diff --git a/debian/changelog b/debian/changelog index e69de29..e16e70f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -0,0 +1,5 @@ +libosmo-pfcp (0.1.0) testing; urgency=low + + Create new Debian package. + + -- Neels Hofmeyr <nhofmeyr(a)sysmocom.de> Tue, 9 Aug 2022 18:29:05 +0200 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 04b8224..fe370e0 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ -Source: osmo-upf -Section: net -Priority: extra -Maintainer: Osmocom team <openbsc(a)lists.osmocom.org> -Build-Depends: debhelper (>=9), +Source: libosmo-pfcp +Section: libs +Priority: optional +Maintainer: Osmocom team <osmocom-net-gprs(a)lists.osmocom.org> +Build-Depends: debhelper (>=10), dh-autoreconf, autotools-dev, autoconf, @@ -11,32 +11,89 @@ libtool, pkg-config, python3-minimal, - libtalloc-dev, - libosmocore-dev (>= 1.6.0), - osmo-gsm-manuals-dev (>= 1.2.0) + libosmocore-dev (>= 1.7.0), + libtalloc-dev (>= 2.1.0) Standards-Version: 3.9.8 -Vcs-Git: git://git.osmocom.org/osmo-upf.git -Vcs-Browser: https://git.osmocom.org/osmo-upf/ -Homepage: https://projects.osmocom.org/projects/osmo-upf +Vcs-Git: git://git.osmocom.org/libosmo-pfcp.git +Vcs-Browser: https://git.osmocom.org/libosmo-pfcp/ +Homepage: https://projects.osmocom.org/projects/libosmo-pfcp -Package: osmo-upf +Package: libosmo-pfcp +Section: libs Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: OsmoUPF: Osmocom User Plane Function +Depends: ${misc:Depends}, + libosmo-gtlv0 (= ${binary:Version}), + libosmo-pfcp0 (= ${binary:Version}) +Description: Osmocom PFCP protocol implementation (metapackage) + Install Osmocom PFCP and generic TLV protocol libraries. -Package: osmo-upf-dbg -Section: debug +Package: libosmo-gtlv0 +Section: libs Architecture: any Multi-Arch: same -Depends: osmo-upf (= ${binary:Version}), ${misc:Depends} -Description: OsmoUPF: Osmocom User Plane Function +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libosmocore-dev (>= 1.7.0), + libtalloc-dev (>= 2.1.0) +Pre-Depends: ${misc:Pre-Depends} +Description: Generic TLV and TLIV protocol support + Decoding, encoding and logging of protocols using a Tag-Length-Value and/or + Tag-Length-Instance-Value structure. -Package: osmo-upf-doc -Architecture: all -Section: doc -Priority: optional -Depends: ${misc:Depends} -Description: ${misc:Package} PDF documentation - Various manuals: user manual, VTY reference manual and/or - protocol/interface manuals. +Package: libosmo-gtlv-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Depends: ${misc:Depends}, + libosmo-gtlv0 (= ${binary:Version}) +Description: Development headers for libosmo-gtlv + libosmo-gtlv implements decoding, encoding and logging of protocols using a + Tag-Length-Value and/or Tag-Length-Instance-Value structure. This package in + particular contains the files for compiling a program using this library. + +Package: libosmo-gtlv-dbg +Architecture: any +Multi-Arch: same +Section: debug +Priority: extra +Depends: ${misc:Depends}, + libosmo-gtlv0 (= ${binary:Version}) +Description: Debug symbols for libosmo-gtlv + libosmo-gtlv implements decoding, encoding and logging of protocols using a + Tag-Length-Value and/or Tag-Length-Instance-Value structure. This package in + particular contains the debug symbols for this library. + +Package: libosmo-pfcp0 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Description: PFCP protocol support + Decoding, encoding and endpoint implementation of the Packet Forwarding Control Protocol + (3GPP TS 29.244). + +Package: libosmo-pfcp-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Depends: ${misc:Depends}, + libosmo-pfcp0 (= ${binary:Version}) +Description: Development headers for libosmo-pfcp + libosmo-pfcp implements decoding, encoding and endpoint implementation of the + Packet Forwarding Control Protocol (3GPP TS 29.244). This package in particular + contains the files for compiling a program using this library. + +Package: libosmo-pfcp-dbg +Architecture: any +Multi-Arch: same +Section: debug +Priority: extra +Depends: ${misc:Depends}, + libosmo-pfcp0 (= ${binary:Version}) +Description: Debug symbols for libosmo-pfcp + libosmo-pfcp implements decoding, encoding and endpoint implementation of the + Packet Forwarding Control Protocol (3GPP TS 29.244). This package in particular + contains the debug symbols for this library. diff --git a/debian/copyright b/debian/copyright index 84c249f..aa284b9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: osmo-upf -Source: git://git.osmocom.org/osmo-upf +Upstream-Name: libosmo-pfcp +Source: git://git.osmocom.org/libosmo-pfcp Files: * -Copyright: 2021-2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +Copyright: 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> License: AGPL-3.0+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/debian/libosmo-gtlv0.install b/debian/libosmo-gtlv0.install new file mode 100644 index 0000000..dba9905 --- /dev/null +++ b/debian/libosmo-gtlv0.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-gtlv*.so.* diff --git a/debian/libosmo-pfcp.install b/debian/libosmo-pfcp0.install similarity index 100% rename from debian/libosmo-pfcp.install rename to debian/libosmo-pfcp0.install diff --git a/debian/rules b/debian/rules index b206acd..e32eb67 100755 --- a/debian/rules +++ b/debian/rules @@ -55,7 +55,8 @@ # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practic… override_dh_strip: - dh_strip -plibosmo-pfcp --dbg-package=libosmo-pfcp-dbg + dh_strip -plibosmo-gtlv0 --dbg-package=libosmo-gtlv-dbg + dh_strip -plibosmo-pfcp0 --dbg-package=libosmo-pfcp-dbg # Print test results in case of a failure override_dh_auto_test: diff --git a/tests/libosmo-pfcp/Makefile.am b/tests/libosmo-pfcp/Makefile.am index a2bcdf6..6f3eca1 100644 --- a/tests/libosmo-pfcp/Makefile.am +++ b/tests/libosmo-pfcp/Makefile.am @@ -23,8 +23,8 @@ pfcp_test_LDADD = \ $(LIBOSMOCORE_LIBS) \ - $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(top_builddir)/src/libosmo-pfcp/libosmo-pfcp.la \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(NULL) .PHONY: update_exp -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Id7169fc67b4f8f77dfbeff9f199e6557ced67a53 Gerrit-Change-Number: 29005 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 submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved 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/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: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-tetra[master]: when traffic dump directory is specified, now prints error message an...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28926 ) Change subject: when traffic dump directory is specified, now prints error message and exits instead of crashing when traffic file cannot be written ...................................................................... when traffic dump directory is specified, now prints error message and exits instead of crashing when traffic file cannot be written Change-Id: I273e07aefd9faea13662f6699a6f3b074c8efe88 --- M src/lower_mac/tetra_lower_mac.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/lower_mac/tetra_lower_mac.c b/src/lower_mac/tetra_lower_mac.c index ca1b72e..f6a893a 100644 --- a/src/lower_mac/tetra_lower_mac.c +++ b/src/lower_mac/tetra_lower_mac.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <errno.h> #include <linux/limits.h> #include <osmocom/core/utils.h> @@ -196,6 +197,10 @@ snprintf(fname, sizeof(fname), "%s/traffic_%d_%d.out", tms->dumpdir, tms->cur_burst.is_traffic, tms->tsn); f = fopen(fname, "ab"); + if (!f) { + fprintf(stderr, "Could not open dump file %s for writing: %s\n", fname, strerror(errno)); + exit(1); + } /* Generate a block */ memset(block, 0x00, sizeof(int16_t) * 690); -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I273e07aefd9faea13662f6699a6f3b074c8efe88 Gerrit-Change-Number: 28926 Gerrit-PatchSet: 4 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-tetra[master]: when traffic dump directory is specified, now prints error message an...

by laforge

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28926 ) Change subject: when traffic dump directory is specified, now prints error message and exits instead of crashing when traffic file cannot be written ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I273e07aefd9faea13662f6699a6f3b074c8efe88 Gerrit-Change-Number: 28926 Gerrit-PatchSet: 4 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Tue, 09 Aug 2022 16:36:12 +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 laforge

Attention is currently required from: neels, pespin. laforge 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: Code-Review+2 (1 comment) Patchset: PS2: > Do we really want to disable PFCP support at build time? Is that really going to be used and it is w […] our existing apporoach is to try to minimize dependencies, see osmo-msc with default-off for smpp or Iu support. The advantage of this approach is that it makes it easier for people to build a simple/typical setup from source, without cursing over all the dependencies. For our package feeds it's not an issue as we can simply pass --enable-foo in the debian/rules. -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 16:34:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-pcu[master]: {src,tests}/Makefile.am: $(COMMON_LA) is not definied

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28973 ) Change subject: {src,tests}/Makefile.am: $(COMMON_LA) is not definied ...................................................................... {src,tests}/Makefile.am: $(COMMON_LA) is not definied Change-Id: I4958b5d62645be6ed2a200a50a23c567c9a9f3c0 --- M src/Makefile.am M tests/Makefile.am 2 files changed, 17 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/Makefile.am b/src/Makefile.am index fedc96f..dea4a17 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -161,7 +161,7 @@ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOGSM_LIBS) \ - $(COMMON_LA) + $(NULL) endif if ENABLE_LC15BTS_PHY @@ -210,6 +210,6 @@ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOGSM_LIBS) \ - $(COMMON_LA) + $(NULL) #MOSTLYCLEANFILES += testSource testDestination diff --git a/tests/Makefile.am b/tests/Makefile.am index fdc0a6c..7c50969 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,7 +24,7 @@ rlcmac_RLCMACTest_LDADD = \ $(top_builddir)/src/libgprs.la \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) alloc_AllocTest_SOURCES = alloc/AllocTest.cpp alloc_AllocTest_LDADD = \ @@ -33,7 +33,7 @@ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) alloc_MslotTest_SOURCES = alloc/MslotTest.cpp alloc_MslotTest_LDADD = \ @@ -42,7 +42,7 @@ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) tbf_TbfTest_SOURCES = tbf/TbfTest.cpp tbf_TbfTest_LDADD = \ @@ -51,7 +51,7 @@ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) tbf_TbfTest_LDFLAGS = -Wl,--wrap=pcu_sock_send bitcomp_BitcompTest_SOURCES = bitcomp/BitcompTest.cpp ../src/egprs_rlc_compression.cpp @@ -59,7 +59,7 @@ $(top_builddir)/src/libgprs.la \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) edge_EdgeTest_SOURCES = edge/EdgeTest.cpp edge_EdgeTest_LDADD = \ @@ -68,7 +68,7 @@ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) emu_pcu_emu_SOURCES = emu/pcu_emu.cpp emu/test_replay_gprs_attach.cpp \ emu/openbsc_clone.c emu/openbsc_clone.h emu/gprs_tests.h \ @@ -79,7 +79,7 @@ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) types_TypesTest_SOURCES = types/TypesTest.cpp types_TypesTest_LDADD = \ @@ -88,7 +88,7 @@ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) ms_MsTest_SOURCES = ms/MsTest.cpp ms_MsTest_LDADD = \ @@ -97,7 +97,7 @@ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) ms_MsTest_LDFLAGS = \ -Wl,-u,bssgp_prim_cb @@ -109,7 +109,7 @@ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) llc_LlcTest_LDFLAGS = \ -Wl,-u,bssgp_prim_cb @@ -117,14 +117,14 @@ llist_LListTest_SOURCES = llist/LListTest.cpp llist_LListTest_LDADD = \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) codel_codel_test_SOURCES = codel/codel_test.c codel_codel_test_LDADD = \ $(top_builddir)/src/libgprs.la \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) fn_FnTest_SOURCES = fn/FnTest.cpp fn_FnTest_LDADD = \ @@ -133,7 +133,7 @@ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) app_info_AppInfoTest_SOURCES = app_info/AppInfoTest.cpp app_info_AppInfoTest_LDADD = \ @@ -142,7 +142,7 @@ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) ulc_PdchUlcTest_SOURCES = ulc/PdchUlcTest.cpp ulc_PdchUlcTest_LDADD = \ @@ -151,7 +151,7 @@ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4958b5d62645be6ed2a200a50a23c567c9a9f3c0 Gerrit-Change-Number: 28973 Gerrit-PatchSet: 2 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

Change in osmo-pcu[master]: {src,tests}/Makefile.am: $(COMMON_LA) is not definied

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28973 ) Change subject: {src,tests}/Makefile.am: $(COMMON_LA) is not definied ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4958b5d62645be6ed2a200a50a23c567c9a9f3c0 Gerrit-Change-Number: 28973 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 16:04:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes 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 submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved 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-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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

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

by pespin

Attention is currently required from: neels, laforge. pespin 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: Do we really want to disable PFCP support at build time? Is that really going to be used and it is worth it to maintain that? I'm fine with simply disabling it at runtime. -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 09 Aug 2022 16:01:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022