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

Change in osmocom-bb[master]: trxcon: group header files into 'include/osmocom/bb/trxcon'

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28502 ) Change subject: trxcon: group header files into 'include/osmocom/bb/trxcon' ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Hey @osmith, in this patch 'src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h' is a symlynk, and the linter complains about a missing newline. Could you please tweak the linter to ignore symlinks? Thanks! -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifa6137c239c215a3d323213ee74d34b419622be4 Gerrit-Change-Number: 28502 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 02 Jul 2022 12:41:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: group header files into 'include/osmocom/bb/trxcon'

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28502 ) Change subject: trxcon: group header files into 'include/osmocom/bb/trxcon' ...................................................................... trxcon: group header files into 'include/osmocom/bb/trxcon' This is the first step towards the goal of moving the scheduler into a separate library. Change-Id: Ifa6137c239c215a3d323213ee74d34b419622be4 Related: OS#5599, OS#3761 --- M src/host/trxcon/Makefile.am M src/host/trxcon/configure.ac A src/host/trxcon/include/Makefile.am A src/host/trxcon/include/osmocom/Makefile.am A src/host/trxcon/include/osmocom/bb/Makefile.am A src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am R src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h R src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h A src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h R src/host/trxcon/include/osmocom/bb/trxcon/logging.h R src/host/trxcon/include/osmocom/bb/trxcon/sched_trx.h R src/host/trxcon/include/osmocom/bb/trxcon/scheduler.h R src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h R src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/l1ctl.c M src/host/trxcon/l1ctl_link.c D src/host/trxcon/l1ctl_proto.h M src/host/trxcon/logging.c M src/host/trxcon/sched_clck.c M src/host/trxcon/sched_lchan_common.c M src/host/trxcon/sched_lchan_desc.c M src/host/trxcon/sched_lchan_pdtch.c M src/host/trxcon/sched_lchan_rach.c M src/host/trxcon/sched_lchan_sch.c M src/host/trxcon/sched_lchan_tchf.c M src/host/trxcon/sched_lchan_tchh.c M src/host/trxcon/sched_lchan_xcch.c M src/host/trxcon/sched_mframe.c M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/trx_if.c M src/host/trxcon/trxcon.c 32 files changed, 116 insertions(+), 89 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/02/28502/1 diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am index 893d9ab..aa0ae56 100644 --- a/src/host/trxcon/Makefile.am +++ b/src/host/trxcon/Makefile.am @@ -1,5 +1,9 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 +SUBDIRS = \ + include \ + $(NULL) + AM_CPPFLAGS = \ $(all_includes) \ -I$(top_srcdir)/include \ diff --git a/src/host/trxcon/configure.ac b/src/host/trxcon/configure.ac index 1f24260..0e5ce6f 100644 --- a/src/host/trxcon/configure.ac +++ b/src/host/trxcon/configure.ac @@ -31,5 +31,9 @@ dnl Checks for typedefs, structures and compiler characteristics -AC_OUTPUT( - Makefile) +AC_CONFIG_FILES([include/Makefile + include/osmocom/Makefile + include/osmocom/bb/Makefile + include/osmocom/bb/trxcon/Makefile + Makefile]) +AC_OUTPUT diff --git a/src/host/trxcon/include/Makefile.am b/src/host/trxcon/include/Makefile.am new file mode 100644 index 0000000..9d963a0 --- /dev/null +++ b/src/host/trxcon/include/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + osmocom \ + $(NULL) diff --git a/src/host/trxcon/include/osmocom/Makefile.am b/src/host/trxcon/include/osmocom/Makefile.am new file mode 100644 index 0000000..83c6385 --- /dev/null +++ b/src/host/trxcon/include/osmocom/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + bb \ + $(NULL) diff --git a/src/host/trxcon/include/osmocom/bb/Makefile.am b/src/host/trxcon/include/osmocom/bb/Makefile.am new file mode 100644 index 0000000..008a966 --- /dev/null +++ b/src/host/trxcon/include/osmocom/bb/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + trxcon \ + $(NULL) diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am new file mode 100644 index 0000000..e506520 --- /dev/null +++ b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am @@ -0,0 +1,10 @@ +noinst_HEADERS = \ + l1ctl_proto.h \ + l1ctl_link.h \ + l1ctl.h \ + scheduler.h \ + sched_trx.h \ + trx_if.h \ + logging.h \ + trxcon.h \ + $(NULL) diff --git a/src/host/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h similarity index 90% rename from src/host/trxcon/l1ctl.h rename to src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index 48bbe09..f93908d 100644 --- a/src/host/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -3,8 +3,8 @@ #include <stdint.h> #include <osmocom/core/msgb.h> -#include "l1ctl_link.h" -#include "l1ctl_proto.h" +#include <osmocom/bb/trxcon/l1ctl_link.h> +#include <osmocom/bb/trxcon/l1ctl_proto.h> /* Event handlers */ int l1ctl_rx_cb(struct l1ctl_link *l1l, struct msgb *msg); diff --git a/src/host/trxcon/l1ctl_link.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h similarity index 100% rename from src/host/trxcon/l1ctl_link.h rename to src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h new file mode 120000 index 0000000..7ab0f41 --- /dev/null +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h @@ -0,0 +1 @@ +../../../../../../../include/l1ctl_proto.h \ No newline at end of file diff --git a/src/host/trxcon/logging.h b/src/host/trxcon/include/osmocom/bb/trxcon/logging.h similarity index 100% rename from src/host/trxcon/logging.h rename to src/host/trxcon/include/osmocom/bb/trxcon/logging.h diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/include/osmocom/bb/trxcon/sched_trx.h similarity index 98% rename from src/host/trxcon/sched_trx.h rename to src/host/trxcon/include/osmocom/bb/trxcon/sched_trx.h index 74b41e3..ab8ef34 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/sched_trx.h @@ -9,8 +9,8 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/core/linuxlist.h> -#include "logging.h" -#include "scheduler.h" +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/scheduler.h> #define GSM_BURST_LEN 148 #define GSM_BURST_PL_LEN 116 diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/include/osmocom/bb/trxcon/scheduler.h similarity index 100% rename from src/host/trxcon/scheduler.h rename to src/host/trxcon/include/osmocom/bb/trxcon/scheduler.h diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h similarity index 95% rename from src/host/trxcon/trx_if.h rename to src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h index fa66d4a..89c7dd0 100644 --- a/src/host/trxcon/trx_if.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h @@ -5,8 +5,8 @@ #include <osmocom/core/timer.h> #include <osmocom/core/fsm.h> -#include "scheduler.h" -#include "sched_trx.h" +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> #define TRXC_BUF_SIZE 1024 #define TRXD_BUF_SIZE 512 diff --git a/src/host/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h similarity index 100% rename from src/host/trxcon/trxcon.h rename to src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 94a4d18..ca78e9b 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -35,12 +35,12 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_08_58.h> -#include "logging.h" -#include "l1ctl_link.h" -#include "l1ctl_proto.h" +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/l1ctl_link.h> +#include <osmocom/bb/trxcon/l1ctl_proto.h> -#include "trx_if.h" -#include "sched_trx.h" +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/sched_trx.h> static const char *arfcn2band_name(uint16_t arfcn) { diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c index 552fc8b..b10d9da 100644 --- a/src/host/trxcon/l1ctl_link.c +++ b/src/host/trxcon/l1ctl_link.c @@ -36,10 +36,10 @@ #include <osmocom/core/socket.h> #include <osmocom/core/write_queue.h> -#include "trxcon.h" -#include "logging.h" -#include "l1ctl_link.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/trxcon.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/l1ctl_link.h> +#include <osmocom/bb/trxcon/l1ctl.h> static struct value_string l1ctl_evt_names[] = { { 0, NULL } /* no events? */ diff --git a/src/host/trxcon/l1ctl_proto.h b/src/host/trxcon/l1ctl_proto.h deleted file mode 120000 index 75862ba..0000000 --- a/src/host/trxcon/l1ctl_proto.h +++ /dev/null @@ -1 +0,0 @@ -../../../include/l1ctl_proto.h \ No newline at end of file diff --git a/src/host/trxcon/logging.c b/src/host/trxcon/logging.c index 8352e6a..04f3568 100644 --- a/src/host/trxcon/logging.c +++ b/src/host/trxcon/logging.c @@ -21,7 +21,7 @@ #include <osmocom/core/logging.h> #include <osmocom/core/utils.h> -#include "logging.h" +#include <osmocom/bb/trxcon/logging.h> static struct log_info_cat trx_log_info_cat[] = { [DAPP] = { diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c index 9476ccd..1e962aa 100644 --- a/src/host/trxcon/sched_clck.c +++ b/src/host/trxcon/sched_clck.c @@ -38,9 +38,9 @@ #include <osmocom/core/timer_compat.h> #include <osmocom/gsm/a5.h> -#include "scheduler.h" -#include "logging.h" -#include "trx_if.h" +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> #define MAX_FN_SKEW 50 #define TRX_LOSS_FRAMES 400 diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index ac6d262..f5ee866 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -36,13 +36,13 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/protocol/gsm_08_58.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trxcon.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trxcon.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> /* GSM 05.02 Chapter 5.2.3 Normal Burst (NB) */ const uint8_t sched_nb_training_bits[8][26] = { diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c index b6a72b3..ed7b141 100644 --- a/src/host/trxcon/sched_lchan_desc.c +++ b/src/host/trxcon/sched_lchan_desc.c @@ -26,7 +26,7 @@ #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/core/gsmtap.h> -#include "sched_trx.h" +#include <osmocom/bb/trxcon/sched_trx.h> /* Forward declaration of handlers */ int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts, diff --git a/src/host/trxcon/sched_lchan_pdtch.c b/src/host/trxcon/sched_lchan_pdtch.c index ad6a736..3dabc6b 100644 --- a/src/host/trxcon/sched_lchan_pdtch.c +++ b/src/host/trxcon/sched_lchan_pdtch.c @@ -30,12 +30,12 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/coding/gsm0503_coding.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> int rx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, diff --git a/src/host/trxcon/sched_lchan_rach.c b/src/host/trxcon/sched_lchan_rach.c index 76c0abb..33c0022 100644 --- a/src/host/trxcon/sched_lchan_rach.c +++ b/src/host/trxcon/sched_lchan_rach.c @@ -30,12 +30,12 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/coding/gsm0503_coding.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> /* 3GPP TS 05.02, section 5.2.7 "Access burst (AB)" */ #define RACH_EXT_TAIL_BITS_LEN 8 diff --git a/src/host/trxcon/sched_lchan_sch.c b/src/host/trxcon/sched_lchan_sch.c index 4d7804e..ed914a0 100644 --- a/src/host/trxcon/sched_lchan_sch.c +++ b/src/host/trxcon/sched_lchan_sch.c @@ -31,12 +31,12 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/coding/gsm0503_coding.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> static void decode_sb(struct gsm_time *time, uint8_t *bsic, uint8_t *sb_info) { diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c index caf3586..6669bb0 100644 --- a/src/host/trxcon/sched_lchan_tchf.c +++ b/src/host/trxcon/sched_lchan_tchf.c @@ -32,12 +32,12 @@ #include <osmocom/coding/gsm0503_coding.h> #include <osmocom/codec/codec.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> int rx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, diff --git a/src/host/trxcon/sched_lchan_tchh.c b/src/host/trxcon/sched_lchan_tchh.c index ae67de4..3be3a59 100644 --- a/src/host/trxcon/sched_lchan_tchh.c +++ b/src/host/trxcon/sched_lchan_tchh.c @@ -35,12 +35,12 @@ #include <osmocom/coding/gsm0503_coding.h> #include <osmocom/codec/codec.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> static const uint8_t tch_h0_traffic_block_map[3][4] = { /* B0(0,2,4,6), B1(4,6,8,10), B2(8,10,0,2) */ diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/sched_lchan_xcch.c index 9fdbcc7..e3accf3 100644 --- a/src/host/trxcon/sched_lchan_xcch.c +++ b/src/host/trxcon/sched_lchan_xcch.c @@ -30,12 +30,12 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/coding/gsm0503_coding.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, diff --git a/src/host/trxcon/sched_mframe.c b/src/host/trxcon/sched_mframe.c index 9b759af..f5fb6c9 100644 --- a/src/host/trxcon/sched_mframe.c +++ b/src/host/trxcon/sched_mframe.c @@ -25,7 +25,7 @@ #include <osmocom/gsm/gsm_utils.h> -#include "sched_trx.h" +#include <osmocom/bb/trxcon/sched_trx.h> /* Non-combined CCCH */ static const struct trx_frame frame_bcch[51] = { diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index e5554ea..847ebd3 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -29,10 +29,10 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> -#include "scheduler.h" -#include "sched_trx.h" -#include "trx_if.h" -#include "logging.h" +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/logging.h> /** * Initializes a new primitive by allocating memory diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 828787e..618ce8b 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -31,11 +31,11 @@ #include <osmocom/core/logging.h> #include <osmocom/core/linuxlist.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "trx_if.h" -#include "logging.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/logging.h> static void sched_trx_a5_burst_enc(struct trx_lchan_state *lchan, struct sched_burst_req *br); diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 8dbbd12..7528609 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -39,11 +39,11 @@ #include <osmocom/gsm/gsm_utils.h> -#include "l1ctl.h" -#include "trxcon.h" -#include "trx_if.h" -#include "logging.h" -#include "scheduler.h" +#include <osmocom/bb/trxcon/l1ctl.h> +#include <osmocom/bb/trxcon/trxcon.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/scheduler.h> static struct value_string trx_evt_names[] = { { 0, NULL } /* no events? */ diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index d6ba0c4..998fdde 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -39,14 +39,14 @@ #include <osmocom/gsm/gsm_utils.h> -#include "trxcon.h" -#include "trx_if.h" -#include "logging.h" -#include "l1ctl.h" -#include "l1ctl_link.h" -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" +#include <osmocom/bb/trxcon/trxcon.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/l1ctl.h> +#include <osmocom/bb/trxcon/l1ctl_link.h> +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> #define COPYRIGHT \ "Copyright (C) 2016-2020 by Vadim Yanitskiy <axilirator(a)gmail.com>\n" \ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifa6137c239c215a3d323213ee74d34b419622be4 Gerrit-Change-Number: 28502 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: Makefile.am: move versioning magic to the bottom

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28500 ) Change subject: trxcon: Makefile.am: move versioning magic to the bottom ...................................................................... trxcon: Makefile.am: move versioning magic to the bottom This is a more usual place for manually added targets. Change-Id: I69892f8689fd7062ca26b6f1337c972b11b1906e Related: OS#5599, OS#3761 --- M src/host/trxcon/Makefile.am 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/00/28500/1 diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am index b51db02..0c71e97 100644 --- a/src/host/trxcon/Makefile.am +++ b/src/host/trxcon/Makefile.am @@ -1,12 +1,5 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -# versioning magic -BUILT_SOURCES = $(top_srcdir)/.version -$(top_srcdir)/.version: - echo $(VERSION) > $@-t && mv $@-t $@ -dist-hook: - echo $(VERSION) > $(distdir)/.tarball-version - AM_CPPFLAGS = \ $(all_includes) \ -I$(top_srcdir)/include \ @@ -50,3 +43,10 @@ $(LIBOSMOCODING_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(NULL) + +# versioning magic +BUILT_SOURCES = $(top_srcdir)/.version +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I69892f8689fd7062ca26b6f1337c972b11b1906e Gerrit-Change-Number: 28500 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: Makefile.am: fix make {dist,distcheck} targets

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28501 ) Change subject: trxcon: Makefile.am: fix make {dist,distcheck} targets ...................................................................... trxcon: Makefile.am: fix make {dist,distcheck} targets File '.version' must be also listed in EXTRA_DIST, otherwise I get: echo 0.0.0 > ../../.version-t && mv ../../.version-t ../../.version /bin/sh: line 1: ../../.version-t: Permission denied Change-Id: I65f7c505f5a231bab114c45f5fdd7421601dfbc0 Related: OS#5599, OS#3761 --- M src/host/trxcon/Makefile.am 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/01/28501/1 diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am index 0c71e97..893d9ab 100644 --- a/src/host/trxcon/Makefile.am +++ b/src/host/trxcon/Makefile.am @@ -44,8 +44,14 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) +BUILT_SOURCES = \ + $(top_srcdir)/.version \ + $(NULL) +EXTRA_DIST = \ + .version \ + $(NULL) + # versioning magic -BUILT_SOURCES = $(top_srcdir)/.version $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ dist-hook: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I65f7c505f5a231bab114c45f5fdd7421601dfbc0 Gerrit-Change-Number: 28501 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: cbsp_server: Exit process gracefully if binding socket fails

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28499 ) Change subject: cbsp_server: Exit process gracefully if binding socket fails ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6fac793aa6975cacfeffc3389167bd00864a8a08 Gerrit-Change-Number: 28499 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Jul 2022 19:14:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: main: remove newline char in perror() call

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28498 ) Change subject: main: remove newline char in perror() call ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I14874c2c86495c83030fa40c7060706e9dfe1968 Gerrit-Change-Number: 28498 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Jul 2022 19:13:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Fix typos in error messages

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28497 ) Change subject: Fix typos in error messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I42b201127535ae9fc61adbdc37e1d23897fd81d8 Gerrit-Change-Number: 28497 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Jul 2022 19:13:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmocom-release-tarballs: move to dp

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28477 ) Change subject: jobs/osmocom-release-tarballs: move to dp ...................................................................... jobs/osmocom-release-tarballs: move to dp Move the long shell command into a jenkins.sh in docker-playground, and move the osmocom-release-tarballs.sh script there as well. This makes it easier to test the script, and only patching one repository is needed from now on when changing to a newer debian version. Depends: docker-playground I4cf66097f508c029f688ec8af1cab2238d42f84f Change-Id: I15f6c08b807f1462f91e95b624cdc1aad0592dd6 --- M jobs/osmocom-release-tarballs.yml D scripts/osmocom-release-tarballs.sh 2 files changed, 4 insertions(+), 315 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/osmocom-release-tarballs.yml b/jobs/osmocom-release-tarballs.yml index 930fb42..0bc1fff 100644 --- a/jobs/osmocom-release-tarballs.yml +++ b/jobs/osmocom-release-tarballs.yml @@ -14,44 +14,19 @@ Publishes to: <a href="https://ftp.osmocom.org/releases/">https://ftp.osmocom.org/releases</a> parameters: - string: - name: BRANCH_OSMO_CI - description: | - osmo-ci.git branch where the osmocom-release-tarballs.sh gets pulled from - default: 'master' - - string: name: BRANCH_DOCKER_PLAYGROUND description: | docker-playground.git branch where the Dockerfile gets pulled from default: 'master' builders: - shell: | - export OSMO_BRANCH_DOCKER_PLAYGROUND="$BRANCH_DOCKER_PLAYGROUND" - . scripts/common.sh - docker_images_require \ - "debian-stretch-obs-latest" \ - "debian-stretch-build-dist" - - docker run \ - --rm=true \ - -v "$PWD:/osmo-ci" \ - -w /osmo-ci \ - -e KEEP_TEMP="$KEEP_TEMP" \ - "$USER/debian-stretch-build-dist" /osmo-ci/scripts/osmocom-release-tarballs.sh - - cat > "$WORKSPACE/known_hosts" <<EOF - [ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9 - [ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54= - [ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX - EOF - - SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48" - cd _release_tarballs - rsync -avz --delete -e "$SSH_COMMAND" . releases@ftp.osmocom.org:web-files/ + cd release-tarball-build-dist + ./jenkins.sh scm: - git: branches: - - '$BRANCH_OSMO_CI' - url: git://git.osmocom.org/osmo-ci + - '$BRANCH_DOCKER_PLAYGROUND' + url: git://git.osmocom.org/docker-playground git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' # Don't wipe workspace to keep generated release tarballs diff --git a/scripts/osmocom-release-tarballs.sh b/scripts/osmocom-release-tarballs.sh deleted file mode 100755 index 3ac4545..0000000 --- a/scripts/osmocom-release-tarballs.sh +++ /dev/null @@ -1,286 +0,0 @@ -#!/bin/sh -e -# Iterate over all relevant Osmocom repositories and generate release tarballs for each of the repository tags. The tags -# are queried from the git server without cloning the repositories first, so we can clone them only if we need to build -# a missing tarball. All repositories are deleted afterwards to save space. -# -# Environment variables: -# * KEEP_TEMP: do not delete cloned repositories (use for development) -# * PARALLEL_MAKE: -jN argument for make (default: -j5). - -. "$(dirname "$0")/common.sh" -cd "$(dirname "$0")" -PARALLEL_MAKE="${PARALLEL_MAKE:--j5}" -OUTPUT="$(cd ..; pwd)/_release_tarballs" -TEMP="$(cd ..; pwd)/_temp" - -# Print all tags for which no release tarball should be built. -# $1: Osmocom repository -tags_to_ignore() { - case "$1" in - libosmocore) - # configure.ac:144: error: required file 'src/gb/Makefile.in' not found - echo "0.5.0" - echo "0.5.1" - ;; - libsmpp34) - # duplicate of 1.12.0 - echo "1.12" - ;; - osmo-bsc) - # openbsc - echo "1.0.1" - # Requires libosmo-legacy-mgcp - echo "1.1.0" - echo "1.1.1" - echo "1.1.2" - echo "1.2.0" - echo "1.2.1" - echo "1.2.2" - ;; - osmo-bts) - # gsm_data_shared.h:464:26: error: field 'power_params' has incomplete type - echo "0.2.0" - echo "0.3.0" - ;; - osmo-hlr) - # Not using autotools - echo "0.0.1" - ;; - osmo-mgw) - # openbsc - echo "1.0.1" - ;; - osmo-msc) - # openbsc - echo "1.0.1" - ;; - osmo-pcap) - # No rule to make target 'osmo-pcap-server.cfg', needed by 'distdir' - echo "0.0.3" - ;; - osmo-pcu) - # Duplicates of 0.1.0, 0.2.0 - echo "0.1" - echo "0.2" - ;; - osmo-sgsn) - # openbsc - echo "0.9.0 0.9.1 0.9.2 0.9.3 0.9.4 0.9.5 0.9.6 0.9.8 0.9.9 0.9.10 0.9.11 0.9.12 0.9.13 0.9.14" - echo "0.9.15 0.9.16 0.10.0 0.10.1 0.11.0 0.12.0 0.13.0 0.14.0 0.15.0 1.0.1" - ;; - osmo-sip-connector) - # make: *** No rule to make target 'osmoappdesc.py' - echo "0.0.1" - ;; - osmo-trx) - # cp: cannot stat './/home/user/code/osmo-dev/src/osmo-ci/_temp/repos/osmo-trx/configure' - echo "0.2.0" - echo "0.3.0" - echo "1.3.0" - ;; - esac -} - -# Clone dependency repositories. -# $1: Osmocom repository -prepare_depends() { - case "$1" in - osmo-bts) - # Includes openbsc/gsm_data_shared.h - prepare_repo "openbsc" - ;; - esac -} - -# Apply workarounds for bugs that break too many releases. This function runs between ./configure and make dist-bzip2. -# $1: Osmocom repository -fix_repo() { - case "$1" in - osmo-mgw) - # No rule to make target 'osmocom/mgcp_client/mgcp_common.h' (OS#4084) - make -C "$TEMP/repos/$1/include/osmocom/mgcp_client" mgcp_common.h || true - ;; - esac -} - -# Check if one specific tag should be ignored. -# $1: Osmocom repository -# $2: tag (e.g. "1.0.0") -ignore_tag() { - local repo="$1" - local tag="$2" - local tags="$(tags_to_ignore "$repo")" - for tag_i in $tags; do - if [ "$tag" = "$tag_i" ]; then - return 0 - fi - done - return 1 -} - -# Delete existing temp dir (unless KEEP_TEMP is set). If all repos were checked out, this restores ~500 MB of space. -remove_temp_dir() { - if [ -n "$KEEP_TEMP" ]; then - echo "NOTE: not removing temp dir, because KEEP_TEMP is set: $TEMP" - elif [ -d "$TEMP" ]; then - rm -rf "$TEMP" - fi -} - -# Clone an Osmocom repository to $TEMP/repos/$repo, clean it, checkout a tag. -# $1: Osmocom repository (may end in subdir, e.g. simtrace2/host) -# $2: tag (optional, default: master) -prepare_repo() { - local repo="$1" - local tag="${2:-master}" - - if ! [ -d "$TEMP/repos/$repo" ]; then - git -C "$TEMP/repos" clone "$OSMO_GIT_URL/$repo" - fi - - cd "$TEMP/repos/$repo" - git clean -qdxf - git reset --hard HEAD # in case the tracked files were modified (e.g. libsmpp34 1.10) - git checkout -q "$tag" -} - - -# Get the desired tarball name, replace / with - in $1. -# $1: Osmocom repository (may end in subdir, e.g. simtrace2/host) -# $2: tag -tarball_name() { - echo "$(echo "$repo" | tr / -)-$tag.tar.bz2" -} - -# Checkout a given tag and build a release tarball. -# $1: Osmocom repository (may end in subdir, e.g. simtrace2/host) -# $2: tag -create_tarball() { - local repo="$1" - local tag="$2" - local tarball="$(tarball_name "$repo" "$tag")" - - # Be verbose during the tarball build and preparation. Everything else is not verbose, so we can generate an - # easy to read overview of tarballs that are already built or are ignored. - set -x - - prepare_repo "$repo" "$tag" - prepare_depends "$repo" - - cd "$TEMP/repos/$repo" - autoreconf -fi - ./configure - fix_repo "$repo" - make dist-bzip2 - - # Back to non-verbose mode - set +x - - if ! [ -e "$tarball" ]; then - echo "NOTE: tarball has a different name (wrong version in configure.ac?), renaming." - mv -v *.tar.bz2 "$tarball" - fi -} - -# Create a release tarball with "git archive" for non-autotools projects. -# $1: Osmocom repository -# $2: tag -create_tarball_git() { - local repo="$1" - local tag="$2" - local tarball="$(tarball_name "$repo" "$tag")" - - set -x - - cd "$TEMP/repos/$repo" - git archive \ - -o "$tarball" \ - "$tag" - - set +x -} - -# Move a generated release tarball to the output dir. -# $1: Osmocom repository (may end in subdir, e.g. simtrace2/host) -# $2: tag -move_tarball() { - local repo="$1" - local tag="$2" - local tarball="$(tarball_name "$repo" "$tag")" - local repo_dir="$(echo "$repo" | cut -d / -f 1)" - - cd "$TEMP/repos/$repo" - mkdir -p "$OUTPUT/$repo_dir" - mv "$tarball" "$OUTPUT/$repo_dir/$tarball" -} - -# Check if a git tag has a specific file -# $1: Osmocom repository -# $2: tag -# $3: file -tag_has_file() { - local repo="$1" - local tag="$2" - local file="$3" - - git -C "$TEMP/repos/$repo" show "$tag:$file" >/dev/null 2>&1 -} - -# Create and move tarballs for Osmocom repositories. -# $1: Osmocom repository -# $2: tag -create_move_tarball() { - local repo="$1" - local tag="$2" - - case "$repo" in - simtrace2) - if tag_has_file "$repo" "$tag" host/configure.ac; then - create_tarball "$repo/host" "$tag" - move_tarball "$repo/host" "$tag" - else - prepare_repo "$repo" - fi - - create_tarball_git "$repo" "$tag" - move_tarball "$repo" "$tag" - ;; - *) - create_tarball "$repo" "$tag" - move_tarball "$repo" "$tag" - ;; - esac -} - -remove_temp_dir -mkdir -p "$TEMP/repos" -echo "Temp dir: $TEMP" - -for repo in $OSMO_RELEASE_REPOS; do - echo "$repo" - tags="$(osmo_git_last_commits_tags "$repo" "all" | cut -d / -f 3)" - - # Skip untagged repos - if [ -z "$tags" ]; then - echo " (repository has no release tags)" - continue - fi - - # Build missing tarballs for each tag - for tag in $tags; do - tarball="$repo-$tag.tar.bz2" - if ignore_tag "$repo" "$tag"; then - echo " $tarball (ignored)" - continue - elif [ -e "$OUTPUT/$repo/$tarball" ]; then - echo " $tarball (exists)" - continue - fi - - echo " $tarball (creating)" - create_move_tarball "$repo" "$tag" - done -done - -remove_temp_dir -echo "done!" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I15f6c08b807f1462f91e95b624cdc1aad0592dd6 Gerrit-Change-Number: 28477 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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, 11 months

1
0
0 0

Change in osmo-cbc[master]: cbsp_server: Exit process gracefully if binding socket fails

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28499 ) Change subject: cbsp_server: Exit process gracefully if binding socket fails ...................................................................... cbsp_server: Exit process gracefully if binding socket fails Change-Id: I6fac793aa6975cacfeffc3389167bd00864a8a08 --- M src/cbsp_server.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/99/28499/1 diff --git a/src/cbsp_server.c b/src/cbsp_server.c index b265b53..c6312dc 100644 --- a/src/cbsp_server.c +++ b/src/cbsp_server.c @@ -227,7 +227,11 @@ osmo_stream_srv_link_set_addr(cbc->link, bind_ip); osmo_stream_srv_link_set_accept_cb(cbc->link, cbsp_cbc_accept_cb); rc = osmo_stream_srv_link_open(cbc->link); - OSMO_ASSERT(rc == 0); + if (rc < 0) { + osmo_stream_srv_link_destroy(cbc->link); + talloc_free(cbc); + return NULL; + } LOGP(DCBSP, LOGL_NOTICE, "Listening for CBSP at %s\n", osmo_stream_srv_link_get_sockname(cbc->link)); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6fac793aa6975cacfeffc3389167bd00864a8a08 Gerrit-Change-Number: 28499 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: main: remove newline char in perror() call

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28498 ) Change subject: main: remove newline char in perror() call ...................................................................... main: remove newline char in perror() call perror() appends ":" immediatelly afterwards in order to append the error string, so having a newline breaks the format. Change-Id: I14874c2c86495c83030fa40c7060706e9dfe1968 --- M src/cbc_main.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/98/28498/1 diff --git a/src/cbc_main.c b/src/cbc_main.c index 868a28e..2ce5287 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -241,18 +241,18 @@ rc = telnet_init_dynif(tall_cbc_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_CBC); if (rc < 0) { - perror("Error binding VTY port\n"); + perror("Error binding VTY port"); exit(1); } if (cbsp_cbc_create(tall_cbc_ctx) == NULL) { - perror("Error binding CBSP port\n"); + perror("Error binding CBSP port"); exit(1); } rc = rest_api_init(tall_rest_ctx, g_cbc->config.ecbe.local_host, g_cbc->config.ecbe.local_port); if (rc < 0) { - perror("Error binding ECBE port\n"); + perror("Error binding ECBE port"); exit(1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I14874c2c86495c83030fa40c7060706e9dfe1968 Gerrit-Change-Number: 28498 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022