- OpenBSC - lists.osmocom.org

[PATCH 3/3] Add VTY section for Control interface bind address
by Neels Hofmeyr 24 Feb '16

24 Feb '16

This may seem like overkill for a mere const char * config item, but it makes the Control interface VTY commands reusable in any main() scope (inspired by libosmo-abis' VTY config). Add API functions ctrl_vty_init() and ctrl_vty_get_bind_addr(), in new files src/ctrl/control_vty.c and include/osmocom/ctrl/control_vty.h, compiled and/or installed dependent on ENABLE_VTY. Using these functions allows configuring a static const char* with the VTY commands ctrl bind A.B.C.D which callers shall subsequently use to bind the Control interface to a specific local interface address, by passing the return value of ctrl_vty_get_bind_addr() to control_interface_setup(). Add CTRL_NODE to enum node_type, "eating" RESERVED4_NODE to heed that comment on avoiding ABI changes. --- include/Makefile.am | 3 +- include/osmocom/ctrl/control_vty.h | 9 ++++ include/osmocom/vty/command.h | 3 +- src/ctrl/Makefile.am | 4 ++ src/ctrl/control_vty.c | 90 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 include/osmocom/ctrl/control_vty.h create mode 100644 src/ctrl/control_vty.c diff --git a/include/Makefile.am b/include/Makefile.am index a965fb9..ac22ee6 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -117,7 +117,8 @@ nobase_include_HEADERS += \ osmocom/vty/telnet_interface.h \ osmocom/vty/vector.h \ osmocom/vty/vty.h \ - osmocom/vty/ports.h + osmocom/vty/ports.h \ + osmocom/ctrl/control_vty.h endif noinst_HEADERS = \ diff --git a/include/osmocom/ctrl/control_vty.h b/include/osmocom/ctrl/control_vty.h new file mode 100644 index 0000000..d0ef69f --- /dev/null +++ b/include/osmocom/ctrl/control_vty.h @@ -0,0 +1,9 @@ +#pragma once + +/* Add the 'ctrl' section to VTY, containing the 'bind' command. */ +int ctrl_vty_init(void *ctx); + +/* Obtain the IP address configured by the 'ctrl'/'bind A.B.C.D' VTY command. + * This should be fed to ctrl_interface_setup() once the configuration has been + * read. */ +const char *ctrl_vty_get_bind_addr(void); diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index 2078e1b..937d2f8 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -84,6 +84,8 @@ enum node_type { L_NS_NODE, /*!< \brief NS node in libosmo-gb. */ L_BSSGP_NODE, /*!< \brief BSSGP node in libosmo-gb. */ + CTRL_NODE, /*!< \brief Control interface node. */ + /* * When adding new nodes to the libosmocore project, these nodes can be * used to avoid ABI changes for unrelated projects. @@ -91,7 +93,6 @@ enum node_type { RESERVED1_NODE, /*!< \brief Reserved for later extensions */ RESERVED2_NODE, /*!< \brief Reserved for later extensions */ RESERVED3_NODE, /*!< \brief Reserved for later extensions */ - RESERVED4_NODE, /*!< \brief Reserved for later extensions */ _LAST_OSMOVTY_NODE }; diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index e6ccafb..b4a3da4 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -13,3 +13,7 @@ libosmoctrl_la_LIBADD = \ $(top_builddir)/src/libosmocore.la \ $(top_builddir)/src/gsm/libosmogsm.la \ $(top_builddir)/src/vty/libosmovty.la + +if ENABLE_VTY +libosmoctrl_la_SOURCES += control_vty.c +endif diff --git a/src/ctrl/control_vty.c b/src/ctrl/control_vty.c new file mode 100644 index 0000000..7df53b8 --- /dev/null +++ b/src/ctrl/control_vty.c @@ -0,0 +1,90 @@ +/* VTY configuration for Control interface + * + * (C) 2016 by sysmocom s.m.f.c GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include <stdlib.h> +#include <talloc.h> +#include <osmocom/ctrl/control_vty.h> +#include <osmocom/vty/command.h> + +static void *ctrl_vty_ctx = NULL; +static const char *ctrl_vty_bind_addr = NULL; + +DEFUN(cfg_ctrl_bind_addr, + cfg_ctrl_bind_addr_cmd, + "bind A.B.C.D", + "Set bind address to listen for Control connections\n" + "Local IP address (default 127.0.0.1)\n") +{ + if (ctrl_vty_bind_addr) { + talloc_free((void*)ctrl_vty_bind_addr); + ctrl_vty_bind_addr = NULL; + } + ctrl_vty_bind_addr = talloc_strdup(ctrl_vty_ctx, argv[0]); + return CMD_SUCCESS; +} + +const char *ctrl_vty_get_bind_addr(void) +{ + if (!ctrl_vty_bind_addr) + return "127.0.0.1"; + return ctrl_vty_bind_addr; +} + +struct cmd_node ctrl_node = { + CTRL_NODE, + "%s(config-ctrl)# ", + 1, +}; + +DEFUN(cfg_ctrl, + cfg_ctrl_cmd, + "ctrl", "Configure the Control Interface") +{ + vty->index = NULL; + vty->node = CTRL_NODE; + + return CMD_SUCCESS; +} + +static int config_write_ctrl(struct vty *vty) +{ + /* So far there's only one element. Omit the entire section if the bind + * element is omitted. */ + if (!ctrl_vty_bind_addr) + return CMD_SUCCESS; + + vty_out(vty, "ctrl%s", VTY_NEWLINE); + vty_out(vty, " bind %s%s", ctrl_vty_bind_addr, VTY_NEWLINE); + + return CMD_SUCCESS; +} + +int ctrl_vty_init(void *ctx) +{ + ctrl_vty_ctx = ctx; + install_element(CONFIG_NODE, &cfg_ctrl_cmd); + install_node(&ctrl_node, config_write_ctrl); + + install_element(CTRL_NODE, &cfg_ctrl_bind_addr_cmd); + return 0; +} + -- 2.1.4

2 4

[PATCH 0/3] eliminate some compiler warnings
by Neels Hofmeyr 24 Feb '16

24 Feb '16

These patches eradicate some of the easier-to-fix compiler warnings I keep seeing in almost every dev cycle. I'd be glad to have them on master. One of them is an actual error, ignoring return values. Neels Hofmeyr (3): bsc_nat: fail if VTY telnet port cannot be bound, clarify comment ipaccess_rcvmsg: fix returncode, add partial write warning gsm340_rx_tpdu: comment-out two unused vars openbsc/src/ipaccess/ipaccess-proxy.c | 8 +++++++- openbsc/src/libmsc/gsm_04_11.c | 7 +++++-- openbsc/src/osmo-bsc_nat/bsc_nat.c | 7 +++++-- 3 files changed, 17 insertions(+), 5 deletions(-) -- 2.1.4

1 4

[PATCH 0/6] v2: Allow osmo-nitb bind config (and others)
by Neels Hofmeyr 24 Feb '16

24 Feb '16

This time SMPP is included. Here is the abridged complete overview: Following the previous patch sets for libosmo-abis and libosmocore, this patch set allows configuring ALL of osmo-nitb's local IP addresses and makes it possible to run several osmo-nitb processes alongside each other. (1) Abis/IP (from the libosmo-abis patch) In the config file, have: e1_input ipa bind 10.9.8.7 (2) telnet VTY (prepared by libosmocore patch set) In the config file, have: line vty bind 10.9.8.7 (3) ctrl interface (prepared by libosmocore patch set) In the config file, have: ctrl bind 10.9.8.7 (4) MNCC socket In addition to the old -m option with a fixed socket path, you may now supply a cmdline argument with explicit path: -M /path/to/socket/file (5) SMPP SMSC In the config file, have: smpp local-tcp 10.9.8.7 2775 Neels Hofmeyr (6): enable telnet VTY bind address config for various programs osmo-nitb: add -M to pass specific MNCC socket path osmo-nitb: cosmetic: rename to rf_ctrl_path, following mncc_sock_path osmo-nitb: be strict about cmdline args enable ctrl bind config for various programs smpp: refactor initialization, add bind address openbsc/include/openbsc/bsc_nat.h | 3 +- openbsc/include/openbsc/ctrl.h | 3 +- openbsc/include/openbsc/gprs_sgsn.h | 3 +- openbsc/include/openbsc/mncc.h | 2 +- openbsc/include/openbsc/smpp.h | 4 +- openbsc/src/gprs/gb_proxy_main.c | 12 +++-- openbsc/src/gprs/gtphub_main.c | 11 ++-- openbsc/src/gprs/sgsn_ctrl.c | 5 +- openbsc/src/gprs/sgsn_main.c | 42 ++++++++++----- openbsc/src/libbsc/bsc_ctrl_lookup.c | 6 ++- openbsc/src/libbsc/bsc_init.c | 6 ++- openbsc/src/libmsc/mncc_sock.c | 9 ++-- openbsc/src/libmsc/smpp_openbsc.c | 43 +++++++++------ openbsc/src/libmsc/smpp_smsc.c | 93 ++++++++++++++++++++++++--------- openbsc/src/libmsc/smpp_smsc.h | 7 ++- openbsc/src/libmsc/smpp_vty.c | 75 +++++++++++++++++++++----- openbsc/src/osmo-bsc/osmo_bsc_main.c | 10 +++- openbsc/src/osmo-bsc_mgcp/mgcp_main.c | 6 ++- openbsc/src/osmo-bsc_nat/bsc_nat.c | 22 ++++++-- openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c | 5 +- openbsc/src/osmo-nitb/bsc_hack.c | 43 ++++++++++----- 21 files changed, 298 insertions(+), 112 deletions(-) -- 2.1.4

1 6

[PATCH] v3 of: configure Abis/IP bind address
by Neels Hofmeyr 24 Feb '16

24 Feb '16

Like in the vty/ctrl patch set, just talloc_free(NULL) and save two lines of code. Neels Hofmeyr (1): ipa driver: make bind address vty configurable include/internal.h | 3 +++ include/osmocom/abis/e1_input.h | 1 + src/e1_input_vty.c | 20 ++++++++++++++++++++ src/input/ipaccess.c | 26 ++++++++++++++++++++++++-- 4 files changed, 48 insertions(+), 2 deletions(-) -- 2.1.4

1 1

[PATCH 0/3] v2 of: prepare configuration of vty-telnet and ctrl binds
by Neels Hofmeyr 24 Feb '16

24 Feb '16

incorporated all comments. * improved comment * just talloc_free(NULL) * don't break ctrl_interface_setup() API * L_CTRL_NODE Neels Hofmeyr (3): vty: add bind command for telnet vty line add ctrl_interface_setup_dynip() for bind address vty: add ctrl section for Control interface bind address include/Makefile.am | 3 +- include/osmocom/ctrl/control_if.h | 4 ++ include/osmocom/ctrl/control_vty.h | 9 ++++ include/osmocom/vty/command.h | 2 +- include/osmocom/vty/vty.h | 3 ++ src/ctrl/Makefile.am | 4 ++ src/ctrl/control_if.c | 10 ++++- src/ctrl/control_vty.c | 90 ++++++++++++++++++++++++++++++++++++++ src/vty/vty.c | 28 ++++++++++++ 9 files changed, 150 insertions(+), 3 deletions(-) create mode 100644 include/osmocom/ctrl/control_vty.h create mode 100644 src/ctrl/control_vty.c -- 2.1.4

1 3

[PATCH 0/6] Allow osmo-nitb bind config (and others)
by Neels Hofmeyr 24 Feb '16

24 Feb '16

Following the previous patch sets for libosmo-abis and libosmocore, this patch set allows configuring almost all of the osmo-nitb IP addresses. The goal is to allow several osmo-nitb processes to run alongside each other. (1) Abis/IP (from the libosmo-abis patch) in the config file, have: e1_input ipa bind 10.9.8.7 (2) telnet VTY (prepared by libosmocore patch set) in the config file, have: line vty bind 127.0.0.99 (3) ctrl interface (prepared by libosmocore patch set) in the config file, have: ctrl bind 127.0.0.99 (4) MNCC socket In addition to the old -m option with a fixed socket path, you may now supply a cmdline argument with explicit path: -M /path/to/socket/file (5) still TODO: SMPP SMSC libsmpp34 is still listening on 0.0.0.0:2775, requires a change in libsmpp34. Will follow in a subsequent patch. Neels Hofmeyr (6): enable telnet VTY bind address config for various programs osmo-nitb: add -M to pass specific MNCC socket path osmo-nitb: cosmetic: rename to rf_ctrl_path, following mncc_sock_path osmo-nitb: be strict about cmdline args enable ctrl bind config for various programs bsc_nat: fail if VTY telnet port cannot be bound openbsc/include/openbsc/bsc_nat.h | 3 ++- openbsc/include/openbsc/ctrl.h | 3 ++- openbsc/include/openbsc/gprs_sgsn.h | 3 ++- openbsc/include/openbsc/mncc.h | 2 +- openbsc/src/gprs/gb_proxy_main.c | 12 ++++++---- openbsc/src/gprs/gtphub_main.c | 11 ++++++--- openbsc/src/gprs/sgsn_ctrl.c | 5 ++-- openbsc/src/gprs/sgsn_main.c | 42 ++++++++++++++++++++++----------- openbsc/src/libbsc/bsc_ctrl_lookup.c | 6 +++-- openbsc/src/libbsc/bsc_init.c | 6 ++++- openbsc/src/libmsc/mncc_sock.c | 9 +++---- openbsc/src/osmo-bsc/osmo_bsc_main.c | 10 +++++++- openbsc/src/osmo-bsc_mgcp/mgcp_main.c | 6 ++++- openbsc/src/osmo-bsc_nat/bsc_nat.c | 21 ++++++++++++++--- openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c | 5 ++-- openbsc/src/osmo-nitb/bsc_hack.c | 39 ++++++++++++++++++++---------- 16 files changed, 130 insertions(+), 53 deletions(-) -- 2.1.4

1 1

[PATCH] Explicitly initialize m_v_n and m_v_b
by msuraev＠sysmocom.de 24 Feb '16

24 Feb '16

From: Max <msuraev(a)sysmocom.de> Call reset() to initialize m_v_b in gprs_rlc_dl_window() and m_v_n in gprs_rlc_ul_window() constructors. Fixes: Coverity: CID 1351738, 1351737 --- src/rlc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rlc.h b/src/rlc.h index 54f28df..c3c03e0 100644 --- a/src/rlc.h +++ b/src/rlc.h @@ -448,6 +448,7 @@ inline gprs_rlc_dl_window::gprs_rlc_dl_window() : m_v_s(0) , m_v_a(0) { + m_v_b.reset(); } inline const uint16_t gprs_rlc_dl_window::v_s() const @@ -494,6 +495,7 @@ inline gprs_rlc_ul_window::gprs_rlc_ul_window() : m_v_r(0) , m_v_q(0) { + m_v_n.reset(); } inline bool gprs_rlc_ul_window::is_in_window(uint16_t bsn) const -- 2.7.1

1 0

more comfortable Option parsing? (CCAN)
by Harald Welte 24 Feb '16

24 Feb '16

FYI, Rusty's CCAN contains some interesting option parsing code released under GPLv2+, i.e. compatible to libosmocore: Usage is explained in https://github.com/rustyrussell/ccan/blob/master/ccan/opt/_info It seems rather small and simple, and permits the subsequent addition of options, i.e. some shared code can register options, and other parts of the code can register even more options to it (like our libraries, or bts-specific code in osmo-bts, ...) I have more pressing things on my todo list than convert this now, but as there was some discussion regarding gengetopt here recently, I thought I might point out an alternative. We might also look into the LGPL 2.1+ CCAN htable https://github.com/rustyrussell/ccan/blob/master/ccan/htable/_info as a possible replacement for those areas where our linear llist iterations should turn out to be problematic. Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

1 0

[PATCH] Expand RLCMAC diagnostics output
by msuraev＠sysmocom.de 24 Feb '16

24 Feb '16

From: Max <msuraev(a)sysmocom.de> When smth bad happens (e. g. we hit timeout in RLCMAC) on TBF - obtain corresponding MS object and print extended information about it and its TBFs to aid troubleshooting. Diagnostic function should not change state hence make it const with no return value. --- src/tbf.cpp | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------ src/tbf.h | 2 +- 2 files changed, 76 insertions(+), 8 deletions(-) diff --git a/src/tbf.cpp b/src/tbf.cpp index 69b9e3a..18205fd 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -490,7 +490,7 @@ void gprs_rlcmac_tbf::poll_timeout() if (!(state_flags & (1 << GPRS_RLCMAC_FLAG_TO_UL_ACK))) { LOGP(DRLCMAC, LOGL_NOTICE, "- Timeout for polling " "PACKET CONTROL ACK for PACKET UPLINK ACK\n"); - rlcmac_diag(); + rlcmac_diag("POLL TIMEOUT for PACKET CONTROL ACK for PACKET UPLINK ACK"); state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_UL_ACK); } ul_ack_state = GPRS_RLCMAC_UL_ACK_NONE; @@ -514,7 +514,7 @@ void gprs_rlcmac_tbf::poll_timeout() LOGP(DRLCMAC, LOGL_NOTICE, "- Timeout for polling " "PACKET CONTROL ACK for PACKET UPLINK " "ASSIGNMENT.\n"); - rlcmac_diag(); + rlcmac_diag("POLL TIMEOUT for PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT"); state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_UL_ASS); } ul_ass_state = GPRS_RLCMAC_UL_ASS_NONE; @@ -534,7 +534,7 @@ void gprs_rlcmac_tbf::poll_timeout() LOGP(DRLCMAC, LOGL_NOTICE, "- Timeout for polling " "PACKET CONTROL ACK for PACKET DOWNLINK " "ASSIGNMENT.\n"); - rlcmac_diag(); + rlcmac_diag("POLL TIMEOUT for PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT"); state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_DL_ASS); } dl_ass_state = GPRS_RLCMAC_DL_ASS_NONE; @@ -555,7 +555,7 @@ void gprs_rlcmac_tbf::poll_timeout() if (!(dl_tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK))) { LOGP(DRLCMAC, LOGL_NOTICE, "- Timeout for polling " "PACKET DOWNLINK ACK.\n"); - dl_tbf->rlcmac_diag(); + dl_tbf->rlcmac_diag("POLL TIMEOUT for PACKET DOWNLINK ACK"); dl_tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK); } dl_tbf->n3105++; @@ -872,7 +872,7 @@ void gprs_rlcmac_tbf::handle_timeout() case 3195: LOGP(DRLCMAC, LOGL_NOTICE, "%s T%d timeout during " "transsmission\n", tbf_name(this), T); - rlcmac_diag(); + rlcmac_diag("TRANSMISSION TIMEOUT"); /* fall through */ case 3193: LOGP(DRLCMAC, LOGL_DEBUG, @@ -887,8 +887,26 @@ void gprs_rlcmac_tbf::handle_timeout() } } -int gprs_rlcmac_tbf::rlcmac_diag() +static inline void print_tbf_diag(const struct gprs_rlcmac_tbf * t, bool uplink) { + const char * d = uplink ? "UL" : "DL"; + + LOGP(DRLCMAC, LOGL_NOTICE, "- MS %s %s\n", d, t->name()); + LOGP(DRLCMAC, LOGL_NOTICE, "- MS %s TBF 1st TS = %d, 1st common TS = %d, ctrl TS = %d\n", + d, t->first_ts, t->first_common_ts, t->control_ts); + LOGP(DRLCMAC, LOGL_NOTICE, "- MS %s TBF TSC = %d, DL: "OSMO_BIT_SPEC", UL: "OSMO_BIT_SPEC"\n", + d, t->tsc(), OSMO_BIT_PRINT(t->dl_slots()), OSMO_BIT_PRINT(t->ul_slots())); + + if (GPRS_RLCMAC_POLL_SCHED == t->poll_state) + LOGP(DRLCMAC, LOGL_NOTICE, "- MS %s TBF poll. scheduled: FN = %d, TS = %d\n", d, t->poll_fn, t->poll_ts); + else + LOGP(DRLCMAC, LOGL_NOTICE, "- MS %s TBF no polling\n", d); +} + +void gprs_rlcmac_tbf::rlcmac_diag(const char * context) const +{ + GprsMs * m = ms(); + LOGP(DRLCMAC, LOGL_NOTICE, "- RLCMAC diag. report for %s:\n", context); if ((state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH))) LOGP(DRLCMAC, LOGL_NOTICE, "- Assignment was on CCCH\n"); if ((state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH))) @@ -902,7 +920,57 @@ int gprs_rlcmac_tbf::rlcmac_diag() else if (direction == GPRS_RLCMAC_DL_TBF) LOGP(DRLCMAC, LOGL_NOTICE, "- No downlink ACK received yet\n"); - return 0; + if (is_tfi_assigned()) + LOGP(DRLCMAC, LOGL_NOTICE, "- TBF's TFI = %d\n", tfi()); + else + LOGP(DRLCMAC, LOGL_NOTICE, "- No TFI is assigned to this TBF yet\n"); + + if (is_tlli_valid()) + LOGP(DRLCMAC, LOGL_NOTICE, "- TBF's TLLI = 0x%x\n", tlli()); + else + LOGP(DRLCMAC, LOGL_NOTICE, "- No TLLI is assigned to this TBF yet\n"); + + LOGP(DRLCMAC, LOGL_NOTICE, "- MS IMSI = %s, GPRS class = %d, EGPRS class = %d, TA = %d, TLLI = 0x%x\n", + m->imsi(), m->ms_class(), m->egprs_ms_class(), m->ta(), m->tlli()); + LOGP(DRLCMAC, LOGL_NOTICE, "- MS 1st common TS = %d, current PACCH = %d\n", + m->first_common_ts(), m->current_pacch_slots()); + LOGP(DRLCMAC, LOGL_NOTICE, "- MS DL: "OSMO_BIT_SPEC" (RSRVD: "OSMO_BIT_SPEC"), UL: "OSMO_BIT_SPEC" (RSRVD: "OSMO_BIT_SPEC")\n", + OSMO_BIT_PRINT(m->dl_slots()), OSMO_BIT_PRINT(m->reserved_dl_slots()), OSMO_BIT_PRINT(m->ul_slots()), OSMO_BIT_PRINT(m->reserved_ul_slots())); + + if (m->is_idle()) + LOGP(DRLCMAC, LOGL_NOTICE, "- MS id idle\n"); + if (m->need_dl_tbf()) + LOGP(DRLCMAC, LOGL_NOTICE, "- MS needs DL TBF\n"); + + if (m->dl_tbf()) { + struct gprs_rlcmac_dl_tbf * dl = m->dl_tbf(); + print_tbf_diag(dl, false); + + if (m->dl_tbf()->need_control_ts()) + LOGP(DRLCMAC, LOGL_NOTICE, "- MS DL TBF needs ctrl TS\n"); + + if (m->dl_tbf()->have_data()) + LOGP(DRLCMAC, LOGL_NOTICE, "- MS DL TBF have data\n"); + } else + LOGP(DRLCMAC, LOGL_NOTICE, "- MS have no DL TBF\n"); + + if (m->ul_tbf()) { + struct gprs_rlcmac_ul_tbf * ul = m->ul_tbf(); + print_tbf_diag(ul, true); + + LOGP(DRLCMAC, LOGL_NOTICE, "- MS UL TBF USF: %d %d %d %d %d %d %d %d\n", + m->ul_tbf()->m_usf[0], + m->ul_tbf()->m_usf[1], + m->ul_tbf()->m_usf[2], + m->ul_tbf()->m_usf[3], + m->ul_tbf()->m_usf[4], + m->ul_tbf()->m_usf[5], + m->ul_tbf()->m_usf[6], + m->ul_tbf()->m_usf[7]); + } else + LOGP(DRLCMAC, LOGL_NOTICE, "- MS have no UL TBF\n"); + + LOGP(DRLCMAC, LOGL_NOTICE, "- RLCMAC diag. report complete\n\n"); } struct msgb *gprs_rlcmac_tbf::create_dl_ass(uint32_t fn, uint8_t ts) diff --git a/src/tbf.h b/src/tbf.h index ad8ad4c..b556e0c 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -112,7 +112,7 @@ struct gprs_rlcmac_tbf { uint8_t tsc() const; - int rlcmac_diag(); + void rlcmac_diag(const char * context) const; int update(); void handle_timeout(); -- 2.7.1

1 0

[PATCH] Add byte printing macros
by msuraev＠sysmocom.de 24 Feb '16

24 Feb '16

From: Max <msuraev(a)sysmocom.de> It's sometimes handy for debugging to be able to immediately see which bits are set in a given byte. Generalize macro used for that in bitvec tests and make it available for the rest of the library. --- include/osmocom/core/bits.h | 21 +++++++++++++++++++++ tests/bitvec/bitvec_test.c | 13 +------------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/include/osmocom/core/bits.h b/include/osmocom/core/bits.h index 1587b05..46f0c8b 100644 --- a/include/osmocom/core/bits.h +++ b/include/osmocom/core/bits.h @@ -50,6 +50,27 @@ int osmo_pbit2ubit_ext(ubit_t *out, unsigned int out_ofs, const pbit_t *in, unsigned int in_ofs, unsigned int num_bits, int lsb_mode); +#define OSMO_BIN_SPEC "%d%d%d%d%d%d%d%d" +#define OSMO_BIN_PRINT(byte) \ + (byte & 0x80 ? 1 : 0), \ + (byte & 0x40 ? 1 : 0), \ + (byte & 0x20 ? 1 : 0), \ + (byte & 0x10 ? 1 : 0), \ + (byte & 0x08 ? 1 : 0), \ + (byte & 0x04 ? 1 : 0), \ + (byte & 0x02 ? 1 : 0), \ + (byte & 0x01 ? 1 : 0) + +#define OSMO_BIT_SPEC "%c%c%c%c%c%c%c%c" +#define OSMO_BIT_PRINT(byte) \ + (byte & 0x80 ? '1' : '.'), \ + (byte & 0x40 ? '1' : '.'), \ + (byte & 0x20 ? '1' : '.'), \ + (byte & 0x10 ? '1' : '.'), \ + (byte & 0x08 ? '1' : '.'), \ + (byte & 0x04 ? '1' : '.'), \ + (byte & 0x02 ? '1' : '.'), \ + (byte & 0x01 ? '1' : '.') /* BIT REVERSAL */ diff --git a/tests/bitvec/bitvec_test.c b/tests/bitvec/bitvec_test.c index 800a040..76d6773 100644 --- a/tests/bitvec/bitvec_test.c +++ b/tests/bitvec/bitvec_test.c @@ -11,17 +11,6 @@ #include <osmocom/core/bitvec.h> #include <osmocom/core/bits.h> -#define BIN_PATTERN "%d%d%d%d%d%d%d%d" -#define BIN(byte) \ - (byte & 0x80 ? 1 : 0), \ - (byte & 0x40 ? 1 : 0), \ - (byte & 0x20 ? 1 : 0), \ - (byte & 0x10 ? 1 : 0), \ - (byte & 0x08 ? 1 : 0), \ - (byte & 0x04 ? 1 : 0), \ - (byte & 0x02 ? 1 : 0), \ - (byte & 0x01 ? 1 : 0) - static char lol[1024]; // we pollute this with printed vectors static inline void test_rl(const struct bitvec *bv) { @@ -45,7 +34,7 @@ static inline void test_get(struct bitvec *bv, unsigned n) int16_t x = bitvec_get_int16_msb(bv, n); uint8_t tmp[2]; osmo_store16be(x, &tmp); - printf(" -> %d (%u bit) ["BIN_PATTERN" "BIN_PATTERN"]:\n", x, n, BIN(tmp[0]), BIN(tmp[1])); + printf(" -> %d (%u bit) ["OSMO_BIN_SPEC" "OSMO_BIN_SPEC"]:\n", x, n, OSMO_BIN_PRINT(tmp[0]), OSMO_BIN_PRINT(tmp[1])); bitvec_to_string_r(bv, lol); printf("%s [%d]\n", lol, bv->cur_bit); } -- 2.7.1

1 0