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

Change in libosmocore[master]: Makefile.am: Remove unexsiting all_includes variable

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31017 ) Change subject: Makefile.am: Remove unexsiting all_includes variable ...................................................................... Makefile.am: Remove unexsiting all_includes variable Change-Id: I9bc7de6f85558e55265c6cc965bc7fe97a6736ee --- M Makefile.am M src/ctrl/Makefile.am M src/pseudotalloc/Makefile.am M src/sim/Makefile.am M src/usb/Makefile.am 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/31017/1 diff --git a/Makefile.am b/Makefile.am index 4347807..48d6e9b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include SUBDIRS = \ include \ src \ diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index f149acb..20de7d6 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=7:0:7 -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_CTRL diff --git a/src/pseudotalloc/Makefile.am b/src/pseudotalloc/Makefile.am index b631eca..1b86183 100644 --- a/src/pseudotalloc/Makefile.am +++ b/src/pseudotalloc/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I. $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall if ENABLE_PSEUDOTALLOC diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 4ef4490..51424c7 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=3:1:1 -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) diff --git a/src/usb/Makefile.am b/src/usb/Makefile.am index c8e557b..b097aa7 100644 --- a/src/usb/Makefile.am +++ b/src/usb/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=0:1:0 -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(LIBUSB_CFLAGS) $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bc7de6f85558e55265c6cc965bc7fe97a6736ee Gerrit-Change-Number: 31017 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Fix all references to config.h

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31018 ) Change subject: Fix all references to config.h ...................................................................... Fix all references to config.h config.h is created in $(top_buildir)/config.h. Let's make sure all CPPFLAGS add correct -Ipath includes, and that all code includes the correct file. Change-Id: Ie9ea38bb009bc715b01cde4d66d181f7bec2e7bd --- M src/codec/Makefile.am M src/coding/Makefile.am M src/core/Makefile.am M src/core/gsmtap_util.c M src/core/it_q.c M src/core/logging.c M src/core/logging_gsmtap.c M src/core/logging_syslog.c M src/core/panic.c M src/core/plugin.c M src/core/select.c M src/core/socket.c M src/core/utils.c M src/ctrl/Makefile.am M src/gb/Makefile.am M src/gsm/gsm0411_utils.c M src/gsm/gsm_utils.c M src/gsm/kdf.c M src/gsm/mncc.c M src/pseudotalloc/Makefile.am M src/sim/Makefile.am M src/usb/Makefile.am M src/vty/Makefile.am M src/vty/cpu_sched_vty.c M src/vty/fsm_vty.c M src/vty/logging_vty.c M src/vty/stats_vty.c M tests/Makefile.am M tests/socket/socket_sctp_test.c M tests/socket/socket_test.c M tests/timer/timer_test.c M utils/osmo-stat-dummy/osmo-stat-dummy.c 32 files changed, 34 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/18/31018/1 diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index c16ce9a..f05ac1f 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=3:1:3 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_PSEUDOTALLOC diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am index d856918..42b16e8 100644 --- a/src/coding/Makefile.am +++ b/src/coding/Makefile.am @@ -5,7 +5,9 @@ AM_CPPFLAGS = \ -I"$(top_srcdir)/include" \ - -I"$(top_builddir)/include" + -I"$(top_builddir)/include" \ + -I"$(top_builddir)" \ + $(NULL) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_PSEUDOTALLOC diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 2cfb281..9b812ce 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=19:0:0 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) if ENABLE_PSEUDOTALLOC diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c index 2571b85..cb7538b 100644 --- a/src/core/gsmtap_util.c +++ b/src/core/gsmtap_util.c @@ -19,7 +19,7 @@ * */ -#include "../config.h" +#include "config.h" #include <osmocom/core/gsmtap_util.h> #include <osmocom/core/logging.h> diff --git a/src/core/it_q.c b/src/core/it_q.c index fda6c1f..a3ff420 100644 --- a/src/core/it_q.c +++ b/src/core/it_q.c @@ -32,7 +32,7 @@ * and call a queue-specific callback function. */ -#include "../config.h" +#include "config.h" #ifdef HAVE_SYS_EVENTFD_H diff --git a/src/core/logging.c b/src/core/logging.c index ce42e4c..938c65f 100644 --- a/src/core/logging.c +++ b/src/core/logging.c @@ -25,7 +25,7 @@ * * \file logging.c */ -#include "../config.h" +#include "config.h" #include <stdarg.h> #include <stdlib.h> diff --git a/src/core/logging_gsmtap.c b/src/core/logging_gsmtap.c index cc95388..dfd059b 100644 --- a/src/core/logging_gsmtap.c +++ b/src/core/logging_gsmtap.c @@ -27,7 +27,7 @@ * @{ * \file logging_gsmtap.c */ -#include "../config.h" +#include "config.h" #include <stdarg.h> #include <stdlib.h> diff --git a/src/core/logging_syslog.c b/src/core/logging_syslog.c index 2090856..1153bdf 100644 --- a/src/core/logging_syslog.c +++ b/src/core/logging_syslog.c @@ -22,7 +22,7 @@ * @{ * \file logging_syslog.c */ -#include "../config.h" +#include "config.h" #ifdef HAVE_SYSLOG_H diff --git a/src/core/panic.c b/src/core/panic.c index 6c92522..bbf6d08 100644 --- a/src/core/panic.c +++ b/src/core/panic.c @@ -27,7 +27,7 @@ #include <osmocom/core/panic.h> #include <osmocom/core/backtrace.h> -#include "../config.h" +#include "config.h" static osmo_panic_handler_t osmo_panic_handler = (void*)0; diff --git a/src/core/plugin.c b/src/core/plugin.c index 5f44a40..687ad40 100644 --- a/src/core/plugin.c +++ b/src/core/plugin.c @@ -23,7 +23,7 @@ * @{ * \file plugin.c */ -#include "../config.h" +#include "config.h" #if HAVE_DLFCN_H diff --git a/src/core/select.c b/src/core/select.c index 026d457..72f794f 100644 --- a/src/core/select.c +++ b/src/core/select.c @@ -36,7 +36,7 @@ #include <osmocom/core/stat_item.h> #include <osmocom/core/stats_tcp.h> -#include "../config.h" +#include "config.h" #if defined(HAVE_SYS_SELECT_H) && defined(HAVE_POLL_H) #include <sys/select.h> diff --git a/src/core/socket.c b/src/core/socket.c index ee49c27..43736e0 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -17,7 +17,7 @@ * */ -#include "../config.h" +#include "config.h" /*! \addtogroup socket * @{ diff --git a/src/core/utils.c b/src/core/utils.c index 2012b74..231b65c 100644 --- a/src/core/utils.c +++ b/src/core/utils.c @@ -459,7 +459,7 @@ __attribute__((weak, alias("osmo_hexdump_nospc"))); #endif -#include "../config.h" +#include "config.h" #ifdef HAVE_CTYPE_H #include <ctype.h> /*! Convert an entire string to lower case diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index 20de7d6..3134079 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=7:0:7 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_CTRL diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index 32a03c8..1a26939 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=14:0:0 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall -fno-strict-aliasing \ $(TALLOC_CFLAGS) \ $(LIBMNL_CFLAGS) \ diff --git a/src/gsm/gsm0411_utils.c b/src/gsm/gsm0411_utils.c index ccefe54..c26cd82 100644 --- a/src/gsm/gsm0411_utils.c +++ b/src/gsm/gsm0411_utils.c @@ -27,7 +27,7 @@ * */ -#include "../../config.h" +#include "config.h" #include <time.h> #include <string.h> diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index bbc7dd6..48341ae 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -92,7 +92,7 @@ #include <time.h> #include <unistd.h> -#include "../../config.h" +#include "config.h" #if (!EMBEDDED) /* FIXME: this can be removed once we bump glibc requirements to 2.25: */ diff --git a/src/gsm/kdf.c b/src/gsm/kdf.c index 6982f6f..4113aad 100644 --- a/src/gsm/kdf.c +++ b/src/gsm/kdf.c @@ -22,7 +22,7 @@ #include <stdint.h> #include <string.h> -#include "../../config.h" +#include "config.h" #if (USE_GNUTLS) #include <gnutls/gnutls.h> #include <gnutls/crypto.h> diff --git a/src/gsm/mncc.c b/src/gsm/mncc.c index 938cf9a..8a7dc4d 100644 --- a/src/gsm/mncc.c +++ b/src/gsm/mncc.c @@ -20,7 +20,7 @@ * */ -#include "../config.h" +#include "config.h" #ifdef HAVE_SYS_SOCKET_H diff --git a/src/pseudotalloc/Makefile.am b/src/pseudotalloc/Makefile.am index 1b86183..030b281 100644 --- a/src/pseudotalloc/Makefile.am +++ b/src/pseudotalloc/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall if ENABLE_PSEUDOTALLOC diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 51424c7..dee59bb 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=3:1:1 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -fPIC -Wall $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) diff --git a/src/usb/Makefile.am b/src/usb/Makefile.am index b097aa7..c7d7a2a 100644 --- a/src/usb/Makefile.am +++ b/src/usb/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=0:1:0 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -fPIC -Wall $(LIBUSB_CFLAGS) $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index c2d133a..3da0919 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=11:0:2 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) if ENABLE_VTY diff --git a/src/vty/cpu_sched_vty.c b/src/vty/cpu_sched_vty.c index 301e7a6..7198f74 100644 --- a/src/vty/cpu_sched_vty.c +++ b/src/vty/cpu_sched_vty.c @@ -25,7 +25,7 @@ #define _GNU_SOURCE -#include "../../config.h" +#include "config.h" #include <string.h> #include <stdlib.h> diff --git a/src/vty/fsm_vty.c b/src/vty/fsm_vty.c index 777d38c..da6038f 100644 --- a/src/vty/fsm_vty.c +++ b/src/vty/fsm_vty.c @@ -19,7 +19,7 @@ #include <stdlib.h> #include <string.h> -#include "../../config.h" +#include "config.h" #include <osmocom/vty/command.h> #include <osmocom/vty/buffer.h> diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 59c8a9c..2a07422 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include <string.h> -#include "../../config.h" +#include "config.h" #include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index 299ec24..f940018 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> -#include "../../config.h" +#include "config.h" #include <osmocom/vty/command.h> #include <osmocom/vty/buffer.h> diff --git a/tests/Makefile.am b/tests/Makefile.am index f0eaaca..78666e9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) AM_LDFLAGS = -no-install LDADD = $(top_builddir)/src/core/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS) diff --git a/tests/socket/socket_sctp_test.c b/tests/socket/socket_sctp_test.c index b318fe5..e099be9 100644 --- a/tests/socket/socket_sctp_test.c +++ b/tests/socket/socket_sctp_test.c @@ -31,7 +31,7 @@ #include <osmocom/core/logging.h> #include <osmocom/core/bits.h> -#include "../config.h" +#include "config.h" void *ctx = NULL; diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c index b3b9584..ddb6926 100644 --- a/tests/socket/socket_test.c +++ b/tests/socket/socket_test.c @@ -32,7 +32,7 @@ #include <osmocom/core/logging.h> #include <osmocom/core/bits.h> -#include "../config.h" +#include "config.h" void *ctx = NULL; diff --git a/tests/timer/timer_test.c b/tests/timer/timer_test.c index b06c774..9c51ad9 100644 --- a/tests/timer/timer_test.c +++ b/tests/timer/timer_test.c @@ -29,7 +29,7 @@ #include <osmocom/core/select.h> #include <osmocom/core/linuxlist.h> -#include "../config.h" +#include "config.h" static void main_timer_fired(void *data); static void secondary_timer_fired(void *data); diff --git a/utils/osmo-stat-dummy/osmo-stat-dummy.c b/utils/osmo-stat-dummy/osmo-stat-dummy.c index d8036e4..37da7b3 100644 --- a/utils/osmo-stat-dummy/osmo-stat-dummy.c +++ b/utils/osmo-stat-dummy/osmo-stat-dummy.c @@ -36,7 +36,7 @@ #include <osmocom/vty/stats.h> #include <osmocom/vty/misc.h> -#include "../../config.h" +#include "config.h" void *tall_statdummy_ctx = NULL; static bool quit = false; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie9ea38bb009bc715b01cde4d66d181f7bec2e7bd Gerrit-Change-Number: 31018 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-hnbgw[master]: fix possible leak of ue_context on UE REGISTER error

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31016 ) Change subject: fix possible leak of ue_context on UE REGISTER error ...................................................................... Patch Set 1: (1 comment) File src/osmo-hnbgw/hnbgw_hnbap.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/31016/comment/81c3eca7_efa326d7 PS1, Line 335: ue = ue_allocated = ue_context_alloc(hnb, NULL, tmsi); what's the point in having 2 different variables here? I see no benefit and added complexity. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icf4b82f9a904d56332c567f7ccfb24231ee66270 Gerrit-Change-Number: 31016 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 18 Jan 2023 18:00:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-hnbgw[master]: fix possible leak of ue_context on UE REGISTER error

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31016 ) Change subject: fix possible leak of ue_context on UE REGISTER error ...................................................................... fix possible leak of ue_context on UE REGISTER error Deallocate a recently allocated UE context if the UE REGISTER procedure fails internally, in two places. The UE REGISTER error is rather unlikely to happen in practice: it only occurs when encoding the HNBAP response fails, which only gets checked input and thus is unlikely to fail. The same code paths also possibly leak asn1c allocations -- leave those for another patch. Related: SYS#6297 Change-Id: Icf4b82f9a904d56332c567f7ccfb24231ee66270 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 18 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/16/31016/1 diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 23d1f48..4aefe2b 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -284,6 +284,7 @@ uint32_t ctx_id; uint32_t tmsi = 0; struct ue_context *ue; + struct ue_context *ue_allocated = NULL; int rc; memset(&accept, 0, sizeof(accept)); @@ -331,14 +332,19 @@ ue = ue_context_by_tmsi(hnb->gw, tmsi); if (!ue) - ue = ue_context_alloc(hnb, NULL, tmsi); + ue = ue_allocated = ue_context_alloc(hnb, NULL, tmsi); asn1_u24_to_bitstring(&accept.context_ID, &ctx_id, ue->context_id); memset(&accept_out, 0, sizeof(accept_out)); rc = hnbap_encode_ueregisteraccepties(&accept_out, &accept); - if (rc < 0) + if (rc < 0) { + /* If we allocated the UE context but the UE REGISTER fails, get rid of it again: there will likely + * never be a UE DE-REGISTER for this UE from the HNB, and the ue_context would linger forever. */ + if (ue_allocated) + ue_context_free(ue_allocated); return rc; + } msg = hnbap_generate_successful_outcome(HNBAP_ProcedureCode_id_UERegister, HNBAP_Criticality_reject, @@ -475,6 +481,7 @@ { HNBAP_UERegisterRequestIEs_t ies; struct ue_context *ue; + struct ue_context *ue_allocated = NULL; char imsi[16]; int rc; @@ -516,11 +523,18 @@ ue = ue_context_by_imsi(ctx->gw, imsi); if (!ue) - ue = ue_context_alloc(ctx, imsi, 0); + ue = ue_allocated = ue_context_alloc(ctx, imsi, 0); hnbap_free_ueregisterrequesties(&ies); /* Send UERegisterAccept */ - return hnbgw_tx_ue_register_acc(ue); + rc = hnbgw_tx_ue_register_acc(ue); + if (rc < 0) { + /* If we allocated the UE context but the UE REGISTER fails, get rid of it again: there will likely + * never be a UE DE-REGISTER for this UE from the HNB, and the ue_context would linger forever. */ + if (ue_allocated) + ue_context_free(ue_allocated); + } + return rc; } static int hnbgw_rx_ue_deregister(struct hnb_context *ctx, ANY_t *in) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icf4b82f9a904d56332c567f7ccfb24231ee66270 Gerrit-Change-Number: 31016 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Add osmo_io with initial poll backend

by osmith

Attention is currently required from: Hoernchen, neels, pespin, fixeria, daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30934 ) Change subject: Add osmo_io with initial poll backend ...................................................................... Patch Set 3: (3 comments) File src/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/a198e86e_38f0e34e PS3, Line 75: OSMO_ASSERT(0); I suggest printing an error message and exit(1) here, since this may be the result of an unexpected value in the env var https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/47b73328_8f30fc2f PS3, Line 171: allways always File src/osmo_io_poll.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/a2c4b60e_98b2fb3c PS3, Line 40: what might be just me, but I find "flags" much more descriptive than "what" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50d73cf550d6ce8154bf827bf47408131cf5b0a0 Gerrit-Change-Number: 30934 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 18 Jan 2023 17:39:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Split include/Makefile.am content into subdirs

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31015 ) Change subject: Split include/Makefile.am content into subdirs ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I785891c2f89114bf8303c799094b637d3d25ac71 Gerrit-Change-Number: 31015 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 18 Jan 2023 17:36:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-hnbgw[master]: fix msgb leak for RANAP RAB Ass. Req.

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31009 ) Change subject: fix msgb leak for RANAP RAB Ass. Req. ...................................................................... fix msgb leak for RANAP RAB Ass. Req. Fix leaked msgb introduced by the MGW support recently added, and from there copied to the UPF support added after that. Fixes leaked "RANAP Tx" msgb, one per RAB Assignment that involves an MGW or UPF proxying of user data. Related: SYS#6297 Change-Id: Ie30e880301346ffca72f98f8c467e56d622fb03f --- M src/osmo-hnbgw/mgw_fsm.c M src/osmo-hnbgw/ps_rab_ass_fsm.c 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, approved diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index f09300e..764e9a7 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -256,6 +256,7 @@ LOGPFSML(fi, LOGL_DEBUG, "forwarding modified RAB-AssignmentRequest to HNB\n"); rua_tx_dt(map->hnb_ctx, map->is_ps, map->rua_ctx_id, msg->data, msg->len); + msgb_free(msg); } static void mgw_fsm_assign(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c index b298e45..e676c2c 100644 --- a/src/osmo-hnbgw/ps_rab_ass_fsm.c +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -352,6 +352,7 @@ return; } rua_tx_dt(rab_ass->map->hnb_ctx, rab_ass->map->is_ps, rab_ass->map->rua_ctx_id, msg->data, msg->len); + msgb_free(msg); /* The request message has been forwarded. The response will be handled by a new FSM instance. * We are done. */ osmo_fsm_inst_term(rab_ass->fi, OSMO_FSM_TERM_REGULAR, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ie30e880301346ffca72f98f8c467e56d622fb03f Gerrit-Change-Number: 31009 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-hnbgw[master]: fix segfault on MGCP timeout

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31008 ) Change subject: fix segfault on MGCP timeout ...................................................................... fix segfault on MGCP timeout bisect shows that the segfault was introduced by using the MGCP client pool: e62af4d46a74af4a98dc9399082f4277fb6379e5 is the first bad commit Author: Pau Espin Pedrol <pespin(a)sysmocom.de> Introduce support for libosmo-mgcp-client MGW pooling Change-Id I371dc773b58788ee21037dc25d77f556c89c6b61 The segfault: 20230117224550365 DLMGCP DEBUG MGCP_CONN(to-HNB)[0x612000003ca0]{ST_CRCX_RESP}: Timeout of T1 (fsm.c:317) [...] 20230117224550366 DLMGCP DEBUG mgw-endp(mgw-fsm-14429752-0)[0x612000003b20]{WAIT_MGW_RESPONSE}: Deallocated (fsm.c:568) 20230117224550366 DMGW DEBUG mgw(mgw-fsm-14429752-0)[0x612000003820]{MGW_ST_CRCX_HNB}: Received Event MGW_EV_MGCP_TERM (mgcp_client_endpoint_fsm.c:869) ================================================================= ==255699==ERROR: AddressSanitizer: heap-use-after-free on address 0x62b000000260 at pc 0x7f282a6ee143 bp 0x7fff0d9bcae0 sp 0x7fff0d9bcad8 READ of size 8 at 0x62b000000260 thread T0 #0 0x7f282a6ee142 in osmo_mgcpc_ep_client ../../../../src/osmo-mgw/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c:223 #1 0x55e2a84f1889 in mgw_fsm_allstate_action ../../../../src/osmo-hnbgw/src/osmo-hnbgw/mgw_fsm.c:504 #2 0x7f2829d50c56 in _osmo_fsm_inst_dispatch ../../../src/libosmocore/src/fsm.c:863 #3 0x7f2829d55a08 in _osmo_fsm_inst_term ../../../src/libosmocore/src/fsm.c:962 #4 0x7f282a72679a in osmo_mgcpc_ep_fsm_check_state_chg_after_response ../../../../src/osmo-mgw/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c:869 #5 0x7f282a6f1869 in on_failure ../../../../src/osmo-mgw/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c:414 #6 0x7f282a727ac6 in osmo_mgcpc_ep_fsm_handle_ci_events ../../../../src/osmo-mgw/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c:935 [...] When a CRCX times out, MGCP_CONN fsm terminates (libosmo-mgcp-client). In turn the parent mgw-endp fsm terminates (libosmo-mgcp-client). This generates an MGW_EV_MGCP_TERM event to the mgw_fsm (osmo-ttcn3-hacks). This attempts to retrieve a pointer from mgw_fsm state: mgw_fsm_priv->mgcpc_ep->mgcp_client where the middle one, mgcpc_ep, is the 'mgw-endp' that already deallocated above. To fix, add to /osmo-hnbgw/mgw_fsm.c a separate pointer to the mgcp_client, to call mgcp_client_pool_put() on it. Do not use mgcpc_ep to get the mgcp_client, because mgcpc_ep deallocates independently. Related: OS#5862 Change-Id: I460d7249f4fc7edcfd94f6084fc8f933b491520c --- M src/osmo-hnbgw/mgw_fsm.c 1 file changed, 9 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index 656066b..f09300e 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -115,6 +115,7 @@ struct osmo_prim_hdr *ranap_rab_ass_resp_oph; /* MGW context */ + struct mgcp_client *mgcpc; struct osmo_mgcpc_ep *mgcpc_ep; struct osmo_mgcpc_ep_ci *mgcpc_ep_ci_hnb; struct osmo_mgcpc_ep_ci *mgcpc_ep_ci_msc; @@ -141,7 +142,6 @@ RANAP_RAB_AssignmentRequestIEs_t *ies; const char *epname; struct mgcp_conn_peer mgw_info; - struct mgcp_client *mgcp_client; int rc; LOGPFSML(fi, LOGL_DEBUG, "RAB-AssignmentRequest received, creating HNB side call-leg on MGW...\n"); @@ -173,16 +173,16 @@ mgw_info.codecs[0] = CODEC_IUFP; mgw_info.codecs_len = 1; - mgcp_client = mgcp_client_pool_get(map->hnb_ctx->gw->mgw_pool); - if (!mgcp_client) { + mgw_fsm_priv->mgcpc = mgcp_client_pool_get(map->hnb_ctx->gw->mgw_pool); + if (!mgw_fsm_priv->mgcpc) { LOGPFSML(fi, LOGL_ERROR, "cannot ensure MGW endpoint -- no MGW configured, check configuration!\n"); osmo_fsm_inst_state_chg(fi, MGW_ST_FAILURE, 0, 0); return; } - epname = mgcp_client_rtpbridge_wildcard(mgcp_client); + epname = mgcp_client_rtpbridge_wildcard(mgw_fsm_priv->mgcpc); mgw_fsm_priv->mgcpc_ep = - osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, mgcp_client, mgw_fsm_T_defs, fi->id, "%s", epname); + osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, mgw_fsm_priv->mgcpc, mgw_fsm_T_defs, fi->id, "%s", epname); mgw_fsm_priv->mgcpc_ep_ci_hnb = osmo_mgcpc_ep_ci_add(mgw_fsm_priv->mgcpc_ep, "to-HNB"); osmo_mgcpc_ep_ci_request(mgw_fsm_priv->mgcpc_ep_ci_hnb, MGCP_VERB_CRCX, &mgw_info, fi, MGW_EV_MGCP_OK, @@ -496,13 +496,14 @@ static void mgw_fsm_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; - struct mgcp_client *mgcp_client; switch (event) { case MGW_EV_MGCP_TERM: /* Put MGCP client back into MGW pool */ - mgcp_client = osmo_mgcpc_ep_client(mgw_fsm_priv->mgcpc_ep); - mgcp_client_pool_put(mgcp_client); + if (mgw_fsm_priv->mgcpc) { + mgcp_client_pool_put(mgw_fsm_priv->mgcpc); + mgw_fsm_priv->mgcpc = NULL; + } mgw_fsm_priv->mgcpc_ep = NULL; LOGPFSML(fi, LOGL_ERROR, "Media gateway failed\n"); osmo_fsm_inst_state_chg(fi, MGW_ST_FAILURE, 0, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I460d7249f4fc7edcfd94f6084fc8f933b491520c Gerrit-Change-Number: 31008 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: src/core/Makefile.am: reformat SOURCES list

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31014 ) Change subject: src/core/Makefile.am: reformat SOURCES list ...................................................................... src/core/Makefile.am: reformat SOURCES list Have one per line and order items in an alphabetical order. Change-Id: Ib14396e9a1a744cdad2f35f7241eb2ab3212c0cb --- M src/core/Makefile.am 1 file changed, 62 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 2c73af6..2cfb281 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -12,29 +12,68 @@ lib_LTLIBRARIES = libosmocore.la -libosmocore_la_LIBADD = $(BACKTRACE_LIB) $(TALLOC_LIBS) $(LIBRARY_RT) $(PTHREAD_LIBS) $(LIBSCTP_LIBS) -libosmocore_la_SOURCES = context.c timer.c timer_gettimeofday.c timer_clockgettime.c \ - select.c signal.c msgb.c bits.c \ - bitvec.c bitcomp.c counter.c fsm.c \ - write_queue.c utils.c socket.c \ - logging.c logging_syslog.c logging_gsmtap.c rate_ctr.c \ - gsmtap_util.c crc16.c panic.c backtrace.c \ - conv.c application.c rbtree.c strrb.c \ - loggingrb.c crc8gen.c crc16gen.c crc32gen.c crc64gen.c \ - macaddr.c stat_item.c stats.c stats_statsd.c prim.c \ - stats_tcp.c \ - conv_acc.c conv_acc_generic.c sercomm.c prbs.c \ - isdnhdlc.c \ - tdef.c \ - thread.c \ - time_cc.c \ - sockaddr_str.c \ - use_count.c \ - exec.c \ - it_q.c \ - probes.d \ - base64.c \ - $(NULL) +libosmocore_la_LIBADD = \ + $(BACKTRACE_LIB) \ + $(TALLOC_LIBS) \ + $(LIBRARY_RT) \ + $(PTHREAD_LIBS) \ + $(LIBSCTP_LIBS) \ + $(NULL) + +libosmocore_la_SOURCES = \ + application.c \ + backtrace.c \ + base64.c \ + bits.c \ + bitvec.c \ + bitcomp.c \ + context.c \ + conv.c \ + conv_acc.c \ + conv_acc_generic.c \ + counter.c \ + crc16.c \ + crc8gen.c \ + crc16gen.c \ + crc32gen.c \ + crc64gen.c \ + exec.c \ + fsm.c \ + gsmtap_util.c \ + isdnhdlc.c \ + it_q.c \ + logging.c \ + logging_syslog.c \ + logging_gsmtap.c \ + loggingrb.c \ + macaddr.c \ + msgb.c \ + panic.c \ + prbs.c \ + prim.c \ + rate_ctr.c \ + rbtree.c \ + select.c \ + sercomm.c \ + signal.c \ + sockaddr_str.c \ + socket.c \ + stat_item.c \ + stats.c \ + stats_statsd.c \ + stats_tcp.c \ + strrb.c \ + tdef.c \ + thread.c \ + time_cc.c \ + timer.c \ + timer_gettimeofday.c \ + timer_clockgettime.c \ + use_count.c \ + utils.c \ + write_queue.c \ + probes.d \ + $(NULL) if HAVE_SSSE3 libosmocore_la_SOURCES += conv_acc_sse.c -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib14396e9a1a744cdad2f35f7241eb2ab3212c0cb Gerrit-Change-Number: 31014 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Move src/*.{c,h} to src/core/

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31013 ) Change subject: Move src/*.{c,h} to src/core/ ...................................................................... Move src/*.{c,h} to src/core/ This way we have all libosmocore.so in an own subdir instead of having lots of files in the parent dir, which also contains subdirs to other libraries. This also matches the schema under include/osmocom/. Change-Id: I6c76fafebdd5e961aed88bbecd2c16bc69d580e2 --- M Doxyfile.core.in M Makefile.am M configure.ac M debian/copyright M src/Makefile.am M src/codec/Makefile.am M src/coding/Makefile.am A src/core/Makefile.am R src/core/application.c R src/core/backtrace.c R src/core/base64.c R src/core/bitcomp.c R src/core/bits.c R src/core/bitvec.c R src/core/context.c R src/core/conv.c R src/core/conv_acc.c R src/core/conv_acc_generic.c R src/core/conv_acc_neon.c R src/core/conv_acc_neon_impl.h R src/core/conv_acc_sse.c R src/core/conv_acc_sse_avx.c R src/core/conv_acc_sse_impl.h R src/core/counter.c R src/core/crc16.c R src/core/crcXXgen.c.tpl R src/core/exec.c R src/core/fsm.c R src/core/gsmtap_util.c R src/core/isdnhdlc.c R src/core/it_q.c R src/core/logging.c R src/core/logging_gsmtap.c R src/core/logging_syslog.c R src/core/logging_systemd.c R src/core/loggingrb.c R src/core/macaddr.c R src/core/mnl.c R src/core/msgb.c R src/core/msgfile.c R src/core/panic.c R src/core/plugin.c R src/core/prbs.c R src/core/prim.c R src/core/probes.d R src/core/rate_ctr.c R src/core/rbtree.c R src/core/select.c R src/core/sercomm.c R src/core/serial.c R src/core/signal.c R src/core/sockaddr_str.c R src/core/socket.c R src/core/stat_item.c R src/core/stat_item_internal.h R src/core/stats.c R src/core/stats_statsd.c R src/core/stats_tcp.c R src/core/strrb.c R src/core/tdef.c R src/core/thread.c R src/core/time_cc.c R src/core/timer.c R src/core/timer_clockgettime.c R src/core/timer_gettimeofday.c R src/core/use_count.c R src/core/utils.c R src/core/write_queue.c M src/ctrl/Makefile.am M src/gb/Makefile.am M src/gsm/Makefile.am M src/sim/Makefile.am M src/usb/Makefile.am M src/vty/Makefile.am M tests/Makefile.am M utils/Makefile.am M utils/osmo-stat-dummy/Makefile.am 77 files changed, 148 insertions(+), 142 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Doxyfile.core.in b/Doxyfile.core.in index c2bfcd5..29507e0 100644 --- a/Doxyfile.core.in +++ b/Doxyfile.core.in @@ -610,7 +610,7 @@ # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = @srcdir@/include/osmocom/core @srcdir@/src +INPUT = @srcdir@/include/osmocom/core @srcdir@/src/core # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/Makefile.am b/Makefile.am index b3663ba..4347807 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,15 +4,6 @@ SUBDIRS = \ include \ src \ - src/vty \ - src/codec \ - src/gsm \ - src/coding \ - src/gb \ - src/ctrl \ - src/sim \ - src/pseudotalloc \ - src/usb \ utils \ tapset \ tests \ @@ -90,8 +81,8 @@ $(top_builddir)/doc/libosmocore.tag.prep: $(top_builddir)/Doxyfile.core \ $(top_srcdir)/include/osmocom/core/*.h \ - $(top_srcdir)/src/*.[hc] \ - $(top_srcdir)/src/crcXXgen.c.tpl \ + $(top_srcdir)/src/core/*.[hc] \ + $(top_srcdir)/src/core/crcXXgen.c.tpl \ $(top_srcdir)/src/pseudotalloc/*.[hc] rm -rf $(top_builddir)/doc/core; mkdir -p $(top_builddir)/doc/core rm -rf $(top_builddir)/doc/libosmocore.map diff --git a/configure.ac b/configure.ac index 3d9492e..5f70fca 100644 --- a/configure.ac +++ b/configure.ac @@ -586,6 +586,7 @@ libosmousb.pc include/Makefile src/Makefile + src/core/Makefile src/vty/Makefile src/codec/Makefile src/coding/Makefile diff --git a/debian/copyright b/debian/copyright index 79c5876..31a2946 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,23 +13,23 @@ Files: include/osmocom/core/loggingrb.h include/osmocom/core/strrb.h - src/strrb.c - src/loggingrb.c + src/core/strrb.c + src/core/loggingrb.c Copyright: 2012-2013 Katerina Barone-Adesi <kat.obsc(a)gmail.com> License: GPL-2+ Files: include/osmocom/core/linuxrbtree.h - src/rbtree.c + src/core/rbtree.c Copyright: 1999 Andrea Arcangeli <andrea(a)suse.de> 2002 David Woodhouse <dwmw2(a)infradead.org> License: GPL-2+ Files: include/osmocom/core/crc16.h - src/crc16.c + src/core/crc16.c Copyright: 2005 Ben Gardner <bgardner(a)wabtec.com> License: GPL-2 -Files: src/utils.c +Files: src/core/utils.c Copyright: 2011 Harald Welte <laforge(a)gnumonks.org> 2011 Sylvain Munaut <tnt(a)246tNt.com> 2014 Nils O. Selåsdal <noselasd(a)fiane.dyndns.org> @@ -100,8 +100,8 @@ License: GPL-2+ Files: include/osmocom/core/stats.h - src/stat_item.c - src/stats.c + src/core/stat_item.c + src/core/stats.c src/vty/stats_vty.c tests/stats/stats_test.c Copyright: 2009-2010 by Harald Welte <laforge(a)gnumonks.org> diff --git a/src/Makefile.am b/src/Makefile.am index 2c73af6..5d8343c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,108 +1,12 @@ -# This is _NOT_ the library release version, it's an API version. -# Please read chapter "Library interface versions" of the libtool documentation -# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=19:0:0 - -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) - -if ENABLE_PSEUDOTALLOC -AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc -endif - -lib_LTLIBRARIES = libosmocore.la - -libosmocore_la_LIBADD = $(BACKTRACE_LIB) $(TALLOC_LIBS) $(LIBRARY_RT) $(PTHREAD_LIBS) $(LIBSCTP_LIBS) -libosmocore_la_SOURCES = context.c timer.c timer_gettimeofday.c timer_clockgettime.c \ - select.c signal.c msgb.c bits.c \ - bitvec.c bitcomp.c counter.c fsm.c \ - write_queue.c utils.c socket.c \ - logging.c logging_syslog.c logging_gsmtap.c rate_ctr.c \ - gsmtap_util.c crc16.c panic.c backtrace.c \ - conv.c application.c rbtree.c strrb.c \ - loggingrb.c crc8gen.c crc16gen.c crc32gen.c crc64gen.c \ - macaddr.c stat_item.c stats.c stats_statsd.c prim.c \ - stats_tcp.c \ - conv_acc.c conv_acc_generic.c sercomm.c prbs.c \ - isdnhdlc.c \ - tdef.c \ - thread.c \ - time_cc.c \ - sockaddr_str.c \ - use_count.c \ - exec.c \ - it_q.c \ - probes.d \ - base64.c \ - $(NULL) - -if HAVE_SSSE3 -libosmocore_la_SOURCES += conv_acc_sse.c -if HAVE_SSE4_1 -conv_acc_sse.lo : AM_CFLAGS += -mssse3 -msse4.1 -else -conv_acc_sse.lo : AM_CFLAGS += -mssse3 -endif - -if HAVE_AVX2 -libosmocore_la_SOURCES += conv_acc_sse_avx.c -if HAVE_SSE4_1 -conv_acc_sse_avx.lo : AM_CFLAGS += -mssse3 -mavx2 -msse4.1 -else -conv_acc_sse_avx.lo : AM_CFLAGS += -mssse3 -mavx2 -endif -endif -endif - -if HAVE_NEON -libosmocore_la_SOURCES += conv_acc_neon.c -# conv_acc_neon.lo : AM_CFLAGS += -mfpu=neon no, could as well be vfp with neon -endif - -BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c - -EXTRA_DIST = \ - conv_acc_sse_impl.h \ - conv_acc_neon_impl.h \ - crcXXgen.c.tpl \ - stat_item_internal.h \ - $(NULL) - -libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined - -if ENABLE_PLUGIN -libosmocore_la_SOURCES += plugin.c -libosmocore_la_LIBADD += $(LIBRARY_DLOPEN) -endif - -if ENABLE_MSGFILE -libosmocore_la_SOURCES += msgfile.c -endif - -if ENABLE_SERIAL -libosmocore_la_SOURCES += serial.c -endif - -if ENABLE_SYSTEMD_LOGGING -libosmocore_la_SOURCES += logging_systemd.c -libosmocore_la_LIBADD += $(SYSTEMD_LIBS) -endif - -if ENABLE_LIBMNL -libosmocore_la_SOURCES += mnl.c -libosmocore_la_LIBADD += $(LIBMNL_LIBS) -endif - -if ENABLE_SYSTEMTAP -probes.h: probes.d - $(DTRACE) -C -h -s $< -o $@ - -probes.lo: probes.d - $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC env CFLAGS="$(CFLAGS)" $(DTRACE) -C -G -s $< -o $@ - -BUILT_SOURCES += probes.h probes.lo -libosmocore_la_LIBADD += probes.lo -endif - -crc%gen.c: crcXXgen.c.tpl - $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ +SUBDIRS = \ + core \ + vty \ + codec \ + gsm \ + coding \ + gb \ + ctrl \ + pseudotalloc \ + sim \ + usb \ + $(NULL) \ No newline at end of file diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index de8de1b..c16ce9a 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -15,4 +15,4 @@ libosmocodec_la_SOURCES = gsm610.c gsm620.c gsm660.c gsm690.c ecu.c ecu_fr.c libosmocodec_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -libosmocodec_la_LIBADD = $(top_builddir)/src/libosmocore.la +libosmocodec_la_LIBADD = $(top_builddir)/src/core/libosmocore.la diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am index 5ce3cbf..d856918 100644 --- a/src/coding/Makefile.am +++ b/src/coding/Makefile.am @@ -27,9 +27,11 @@ $(LIBVERSION) \ -no-undefined \ $(TALLOC_LIBS) + libosmocoding_la_LIBADD = \ - ../libosmocore.la \ - ../gsm/libosmogsm.la \ - ../codec/libosmocodec.la + $(top_builddir)/src/core/libosmocore.la \ + $(top_builddir)/src/gsm/libosmogsm.la \ + $(top_builddir)/src/codec/libosmocodec.la \ + $(NULL) EXTRA_DIST = libosmocoding.map diff --git a/src/core/Makefile.am b/src/core/Makefile.am new file mode 100644 index 0000000..2c73af6 --- /dev/null +++ b/src/core/Makefile.am @@ -0,0 +1,108 @@ +# This is _NOT_ the library release version, it's an API version. +# Please read chapter "Library interface versions" of the libtool documentation +# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html +LIBVERSION=19:0:0 + +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) + +if ENABLE_PSEUDOTALLOC +AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc +endif + +lib_LTLIBRARIES = libosmocore.la + +libosmocore_la_LIBADD = $(BACKTRACE_LIB) $(TALLOC_LIBS) $(LIBRARY_RT) $(PTHREAD_LIBS) $(LIBSCTP_LIBS) +libosmocore_la_SOURCES = context.c timer.c timer_gettimeofday.c timer_clockgettime.c \ + select.c signal.c msgb.c bits.c \ + bitvec.c bitcomp.c counter.c fsm.c \ + write_queue.c utils.c socket.c \ + logging.c logging_syslog.c logging_gsmtap.c rate_ctr.c \ + gsmtap_util.c crc16.c panic.c backtrace.c \ + conv.c application.c rbtree.c strrb.c \ + loggingrb.c crc8gen.c crc16gen.c crc32gen.c crc64gen.c \ + macaddr.c stat_item.c stats.c stats_statsd.c prim.c \ + stats_tcp.c \ + conv_acc.c conv_acc_generic.c sercomm.c prbs.c \ + isdnhdlc.c \ + tdef.c \ + thread.c \ + time_cc.c \ + sockaddr_str.c \ + use_count.c \ + exec.c \ + it_q.c \ + probes.d \ + base64.c \ + $(NULL) + +if HAVE_SSSE3 +libosmocore_la_SOURCES += conv_acc_sse.c +if HAVE_SSE4_1 +conv_acc_sse.lo : AM_CFLAGS += -mssse3 -msse4.1 +else +conv_acc_sse.lo : AM_CFLAGS += -mssse3 +endif + +if HAVE_AVX2 +libosmocore_la_SOURCES += conv_acc_sse_avx.c +if HAVE_SSE4_1 +conv_acc_sse_avx.lo : AM_CFLAGS += -mssse3 -mavx2 -msse4.1 +else +conv_acc_sse_avx.lo : AM_CFLAGS += -mssse3 -mavx2 +endif +endif +endif + +if HAVE_NEON +libosmocore_la_SOURCES += conv_acc_neon.c +# conv_acc_neon.lo : AM_CFLAGS += -mfpu=neon no, could as well be vfp with neon +endif + +BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c + +EXTRA_DIST = \ + conv_acc_sse_impl.h \ + conv_acc_neon_impl.h \ + crcXXgen.c.tpl \ + stat_item_internal.h \ + $(NULL) + +libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined + +if ENABLE_PLUGIN +libosmocore_la_SOURCES += plugin.c +libosmocore_la_LIBADD += $(LIBRARY_DLOPEN) +endif + +if ENABLE_MSGFILE +libosmocore_la_SOURCES += msgfile.c +endif + +if ENABLE_SERIAL +libosmocore_la_SOURCES += serial.c +endif + +if ENABLE_SYSTEMD_LOGGING +libosmocore_la_SOURCES += logging_systemd.c +libosmocore_la_LIBADD += $(SYSTEMD_LIBS) +endif + +if ENABLE_LIBMNL +libosmocore_la_SOURCES += mnl.c +libosmocore_la_LIBADD += $(LIBMNL_LIBS) +endif + +if ENABLE_SYSTEMTAP +probes.h: probes.d + $(DTRACE) -C -h -s $< -o $@ + +probes.lo: probes.d + $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC env CFLAGS="$(CFLAGS)" $(DTRACE) -C -G -s $< -o $@ + +BUILT_SOURCES += probes.h probes.lo +libosmocore_la_LIBADD += probes.lo +endif + +crc%gen.c: crcXXgen.c.tpl + $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ diff --git a/src/application.c b/src/core/application.c similarity index 100% rename from src/application.c rename to src/core/application.c diff --git a/src/backtrace.c b/src/core/backtrace.c similarity index 100% rename from src/backtrace.c rename to src/core/backtrace.c diff --git a/src/base64.c b/src/core/base64.c similarity index 100% rename from src/base64.c rename to src/core/base64.c diff --git a/src/bitcomp.c b/src/core/bitcomp.c similarity index 100% rename from src/bitcomp.c rename to src/core/bitcomp.c diff --git a/src/bits.c b/src/core/bits.c similarity index 100% rename from src/bits.c rename to src/core/bits.c diff --git a/src/bitvec.c b/src/core/bitvec.c similarity index 100% rename from src/bitvec.c rename to src/core/bitvec.c diff --git a/src/context.c b/src/core/context.c similarity index 100% rename from src/context.c rename to src/core/context.c diff --git a/src/conv.c b/src/core/conv.c similarity index 100% rename from src/conv.c rename to src/core/conv.c diff --git a/src/conv_acc.c b/src/core/conv_acc.c similarity index 100% rename from src/conv_acc.c rename to src/core/conv_acc.c diff --git a/src/conv_acc_generic.c b/src/core/conv_acc_generic.c similarity index 100% rename from src/conv_acc_generic.c rename to src/core/conv_acc_generic.c diff --git a/src/conv_acc_neon.c b/src/core/conv_acc_neon.c similarity index 100% rename from src/conv_acc_neon.c rename to src/core/conv_acc_neon.c diff --git a/src/conv_acc_neon_impl.h b/src/core/conv_acc_neon_impl.h similarity index 100% rename from src/conv_acc_neon_impl.h rename to src/core/conv_acc_neon_impl.h diff --git a/src/conv_acc_sse.c b/src/core/conv_acc_sse.c similarity index 100% rename from src/conv_acc_sse.c rename to src/core/conv_acc_sse.c diff --git a/src/conv_acc_sse_avx.c b/src/core/conv_acc_sse_avx.c similarity index 100% rename from src/conv_acc_sse_avx.c rename to src/core/conv_acc_sse_avx.c diff --git a/src/conv_acc_sse_impl.h b/src/core/conv_acc_sse_impl.h similarity index 100% rename from src/conv_acc_sse_impl.h rename to src/core/conv_acc_sse_impl.h diff --git a/src/counter.c b/src/core/counter.c similarity index 100% rename from src/counter.c rename to src/core/counter.c diff --git a/src/crc16.c b/src/core/crc16.c similarity index 100% rename from src/crc16.c rename to src/core/crc16.c diff --git a/src/crcXXgen.c.tpl b/src/core/crcXXgen.c.tpl similarity index 100% rename from src/crcXXgen.c.tpl rename to src/core/crcXXgen.c.tpl diff --git a/src/exec.c b/src/core/exec.c similarity index 100% rename from src/exec.c rename to src/core/exec.c diff --git a/src/fsm.c b/src/core/fsm.c similarity index 100% rename from src/fsm.c rename to src/core/fsm.c diff --git a/src/gsmtap_util.c b/src/core/gsmtap_util.c similarity index 100% rename from src/gsmtap_util.c rename to src/core/gsmtap_util.c diff --git a/src/isdnhdlc.c b/src/core/isdnhdlc.c similarity index 100% rename from src/isdnhdlc.c rename to src/core/isdnhdlc.c diff --git a/src/it_q.c b/src/core/it_q.c similarity index 100% rename from src/it_q.c rename to src/core/it_q.c diff --git a/src/logging.c b/src/core/logging.c similarity index 100% rename from src/logging.c rename to src/core/logging.c diff --git a/src/logging_gsmtap.c b/src/core/logging_gsmtap.c similarity index 100% rename from src/logging_gsmtap.c rename to src/core/logging_gsmtap.c diff --git a/src/logging_syslog.c b/src/core/logging_syslog.c similarity index 100% rename from src/logging_syslog.c rename to src/core/logging_syslog.c diff --git a/src/logging_systemd.c b/src/core/logging_systemd.c similarity index 100% rename from src/logging_systemd.c rename to src/core/logging_systemd.c diff --git a/src/loggingrb.c b/src/core/loggingrb.c similarity index 100% rename from src/loggingrb.c rename to src/core/loggingrb.c diff --git a/src/macaddr.c b/src/core/macaddr.c similarity index 100% rename from src/macaddr.c rename to src/core/macaddr.c diff --git a/src/mnl.c b/src/core/mnl.c similarity index 100% rename from src/mnl.c rename to src/core/mnl.c diff --git a/src/msgb.c b/src/core/msgb.c similarity index 100% rename from src/msgb.c rename to src/core/msgb.c diff --git a/src/msgfile.c b/src/core/msgfile.c similarity index 100% rename from src/msgfile.c rename to src/core/msgfile.c diff --git a/src/panic.c b/src/core/panic.c similarity index 100% rename from src/panic.c rename to src/core/panic.c diff --git a/src/plugin.c b/src/core/plugin.c similarity index 100% rename from src/plugin.c rename to src/core/plugin.c diff --git a/src/prbs.c b/src/core/prbs.c similarity index 100% rename from src/prbs.c rename to src/core/prbs.c diff --git a/src/prim.c b/src/core/prim.c similarity index 100% rename from src/prim.c rename to src/core/prim.c diff --git a/src/probes.d b/src/core/probes.d similarity index 100% rename from src/probes.d rename to src/core/probes.d diff --git a/src/rate_ctr.c b/src/core/rate_ctr.c similarity index 100% rename from src/rate_ctr.c rename to src/core/rate_ctr.c diff --git a/src/rbtree.c b/src/core/rbtree.c similarity index 100% rename from src/rbtree.c rename to src/core/rbtree.c diff --git a/src/select.c b/src/core/select.c similarity index 100% rename from src/select.c rename to src/core/select.c diff --git a/src/sercomm.c b/src/core/sercomm.c similarity index 100% rename from src/sercomm.c rename to src/core/sercomm.c diff --git a/src/serial.c b/src/core/serial.c similarity index 100% rename from src/serial.c rename to src/core/serial.c diff --git a/src/signal.c b/src/core/signal.c similarity index 100% rename from src/signal.c rename to src/core/signal.c diff --git a/src/sockaddr_str.c b/src/core/sockaddr_str.c similarity index 100% rename from src/sockaddr_str.c rename to src/core/sockaddr_str.c diff --git a/src/socket.c b/src/core/socket.c similarity index 100% rename from src/socket.c rename to src/core/socket.c diff --git a/src/stat_item.c b/src/core/stat_item.c similarity index 100% rename from src/stat_item.c rename to src/core/stat_item.c diff --git a/src/stat_item_internal.h b/src/core/stat_item_internal.h similarity index 100% rename from src/stat_item_internal.h rename to src/core/stat_item_internal.h diff --git a/src/stats.c b/src/core/stats.c similarity index 100% rename from src/stats.c rename to src/core/stats.c diff --git a/src/stats_statsd.c b/src/core/stats_statsd.c similarity index 100% rename from src/stats_statsd.c rename to src/core/stats_statsd.c diff --git a/src/stats_tcp.c b/src/core/stats_tcp.c similarity index 100% rename from src/stats_tcp.c rename to src/core/stats_tcp.c diff --git a/src/strrb.c b/src/core/strrb.c similarity index 100% rename from src/strrb.c rename to src/core/strrb.c diff --git a/src/tdef.c b/src/core/tdef.c similarity index 100% rename from src/tdef.c rename to src/core/tdef.c diff --git a/src/thread.c b/src/core/thread.c similarity index 100% rename from src/thread.c rename to src/core/thread.c diff --git a/src/time_cc.c b/src/core/time_cc.c similarity index 100% rename from src/time_cc.c rename to src/core/time_cc.c diff --git a/src/timer.c b/src/core/timer.c similarity index 100% rename from src/timer.c rename to src/core/timer.c diff --git a/src/timer_clockgettime.c b/src/core/timer_clockgettime.c similarity index 100% rename from src/timer_clockgettime.c rename to src/core/timer_clockgettime.c diff --git a/src/timer_gettimeofday.c b/src/core/timer_gettimeofday.c similarity index 100% rename from src/timer_gettimeofday.c rename to src/core/timer_gettimeofday.c diff --git a/src/use_count.c b/src/core/use_count.c similarity index 100% rename from src/use_count.c rename to src/core/use_count.c diff --git a/src/utils.c b/src/core/utils.c similarity index 100% rename from src/utils.c rename to src/core/utils.c diff --git a/src/write_queue.c b/src/core/write_queue.c similarity index 100% rename from src/write_queue.c rename to src/core/write_queue.c diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index e53594d..f149acb 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -13,7 +13,7 @@ libosmoctrl_la_LDFLAGS = $(LTLDFLAGS_OSMOCTRL) -version-info $(LIBVERSION) -no-undefined libosmoctrl_la_LIBADD = $(TALLOC_LIBS) \ - $(top_builddir)/src/libosmocore.la \ + $(top_builddir)/src/core/libosmocore.la \ $(top_builddir)/src/gsm/libosmogsm.la \ $(top_builddir)/src/vty/libosmovty.la diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index f3bbcfb..32a03c8 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -21,7 +21,7 @@ -no-undefined \ $(NULL) libosmogb_la_LIBADD = $(TALLOC_LIBS) \ - $(top_builddir)/src/libosmocore.la \ + $(top_builddir)/src/core/libosmocore.la \ $(top_builddir)/src/vty/libosmovty.la \ $(top_builddir)/src/gsm/libosmogsm.la diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 0d66476..eb0f7e4 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -36,7 +36,7 @@ gad.c bsslap.c bssmap_le.c kdf.c iuup.c libgsmint_la_LDFLAGS = -no-undefined -libgsmint_la_LIBADD = $(top_builddir)/src/libosmocore.la +libgsmint_la_LIBADD = $(top_builddir)/src/core/libosmocore.la libosmogsm_la_SOURCES = libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-undefined diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 3d30506..4ef4490 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -20,7 +20,7 @@ -no-undefined \ $(NULL) libosmosim_la_LIBADD = \ - $(top_builddir)/src/libosmocore.la \ + $(top_builddir)/src/core/libosmocore.la \ $(top_builddir)/src/gsm/libosmogsm.la \ $(TALLOC_LIBS) if ENABLE_PCSC diff --git a/src/usb/Makefile.am b/src/usb/Makefile.am index a1426f9..c8e557b 100644 --- a/src/usb/Makefile.am +++ b/src/usb/Makefile.am @@ -17,7 +17,7 @@ -no-undefined \ $(NULL) libosmousb_la_LIBADD = \ - $(top_builddir)/src/libosmocore.la \ + $(top_builddir)/src/core/libosmocore.la \ $(TALLOC_LIBS) \ $(LIBUSB_LIBS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 3142d75..c2d133a 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -14,5 +14,5 @@ fsm_vty.c talloc_ctx_vty.c \ cpu_sched_vty.c tdef_vty.c libosmovty_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -libosmovty_la_LIBADD = $(top_builddir)/src/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS) +libosmovty_la_LIBADD = $(top_builddir)/src/core/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS) endif diff --git a/tests/Makefile.am b/tests/Makefile.am index 8c7e40a..f0eaaca 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) AM_LDFLAGS = -no-install -LDADD = $(top_builddir)/src/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS) +LDADD = $(top_builddir)/src/core/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS) if ENABLE_SERCOM_STUB noinst_LIBRARIES = libsercomstub.a @@ -93,7 +93,7 @@ stats_stats_test_SOURCES = stats/stats_test.c stats_stats_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la -stats_stats_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src +stats_stats_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/core stats_stats_vty_test_SOURCES = stats/stats_vty_test.c stats_stats_vty_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la @@ -209,7 +209,7 @@ gb_gprs_ns2_test_LDADD = $(LDADD) $(LIBRARY_DLSYM) \ $(top_builddir)/src/vty/libosmovty.la \ $(top_builddir)/src/gsm/libosmogsm.la \ - $(top_builddir)/src/libosmocore.la \ + $(top_builddir)/src/core/libosmocore.la \ $(top_builddir)/src/gb/libosmogb-test.la if ENABLE_LIBMNL gb_gprs_ns2_test_LDADD += $(LIBMNL_LIBS) diff --git a/utils/Makefile.am b/utils/Makefile.am index 80d1566..6e11dcd 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -3,7 +3,7 @@ noinst_PROGRAMS = AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) -LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la $(PTHREAD_LIBS) +LDADD = $(top_builddir)/src/core/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la $(PTHREAD_LIBS) if ENABLE_UTILITIES EXTRA_DIST = conv_gen.py conv_codes_gsm.py diff --git a/utils/osmo-stat-dummy/Makefile.am b/utils/osmo-stat-dummy/Makefile.am index d28b982..f1faa3d 100644 --- a/utils/osmo-stat-dummy/Makefile.am +++ b/utils/osmo-stat-dummy/Makefile.am @@ -4,7 +4,7 @@ osmo_stat_dummy_LDADD = $(LDADD) $(TALLOC_LIBS) \ $(top_builddir)/src/vty/libosmovty.la \ $(top_builddir)/src/ctrl/libosmoctrl.la \ - $(top_builddir)/src/libosmocore.la + $(top_builddir)/src/core/libosmocore.la osmo_stat_dummy_CFLAGS = -Wall $(TALLOC_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOCTRL_CFLAGS) osmo_stat_dummy_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include endif -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6c76fafebdd5e961aed88bbecd2c16bc69d580e2 Gerrit-Change-Number: 31013 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023