mirror of
https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc.git
synced 2025-11-02 13:13:34 +00:00
Compare commits
1 Commits
master
...
neels/log_
| Author | SHA1 | Date | |
|---|---|---|---|
|
f3e9013ee4 |
@@ -19,7 +19,7 @@ SUBDIRS = \
|
||||
BUILT_SOURCES = $(top_srcdir)/.version
|
||||
EXTRA_DIST = \
|
||||
.version \
|
||||
README.md \
|
||||
contrib/osmo-smlc.spec.in \
|
||||
debian \
|
||||
git-version-gen \
|
||||
osmoappdesc.py \
|
||||
|
||||
@@ -60,7 +60,7 @@ Contributing
|
||||
Our coding standards are described at
|
||||
<https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards>
|
||||
|
||||
We use a Gerrit based patch submission/review process for managing
|
||||
We us a gerrit based patch submission/review process for managing
|
||||
contributions. Please see
|
||||
<https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit> for
|
||||
more details
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install
|
||||
# according to https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release
|
||||
# In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
|
||||
# LIBVERSION=c:r:a
|
||||
# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a.
|
||||
# If any interfaces have been added, removed, or changed since the last update: c + 1:0:a.
|
||||
# If any interfaces have been added since the last public release: c:r:a + 1.
|
||||
# If any interfaces have been removed or changed since the last public release: c:r:0.
|
||||
#library what description / commit summary line
|
||||
12
configure.ac
12
configure.ac
@@ -36,11 +36,12 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
|
||||
fi
|
||||
PKG_PROG_PKG_CONFIG([0.20])
|
||||
|
||||
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.10.0)
|
||||
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.10.0)
|
||||
PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.10.0)
|
||||
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.10.0)
|
||||
PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 2.0.0)
|
||||
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.8.0)
|
||||
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.8.0)
|
||||
PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.8.0)
|
||||
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.8.0)
|
||||
PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.7.0)
|
||||
PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.7.0)
|
||||
|
||||
dnl checks for header files
|
||||
AC_HEADER_STDC
|
||||
@@ -207,4 +208,5 @@ AC_OUTPUT(
|
||||
doc/manuals/Makefile
|
||||
contrib/Makefile
|
||||
contrib/systemd/Makefile
|
||||
contrib/osmo-smlc.spec
|
||||
Makefile)
|
||||
|
||||
@@ -31,8 +31,9 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
export LD_LIBRARY_PATH="$inst/lib"
|
||||
export PATH="$inst/bin:$PATH"
|
||||
|
||||
osmo-build-dep.sh libosmo-netif "" --disable-doxygen
|
||||
osmo-build-dep.sh libosmo-sigtran "" --disable-doxygen
|
||||
osmo-build-dep.sh libosmo-abis
|
||||
osmo-build-dep.sh libosmo-netif
|
||||
osmo-build-dep.sh libosmo-sccp
|
||||
|
||||
# Additional configure options and depends
|
||||
CONFIG=""
|
||||
|
||||
89
contrib/osmo-smlc.spec.in
Normal file
89
contrib/osmo-smlc.spec.in
Normal file
@@ -0,0 +1,89 @@
|
||||
#
|
||||
# spec file for package osmo-smlc
|
||||
#
|
||||
# Copyright (c) 2017, Martin Hauke <mardnh@gmx.de>
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
## Disable LTO for now since it breaks compilation of the tests
|
||||
## https://osmocom.org/issues/4113
|
||||
%define _lto_cflags %{nil}
|
||||
|
||||
Name: osmo-smlc
|
||||
Version: @VERSION@
|
||||
Release: 0
|
||||
Summary: OsmoSMLC: Osmocom's Location Service Center
|
||||
License: AGPL-3.0-or-later
|
||||
Group: Hardware/Mobile
|
||||
URL: https://osmocom.org/projects/osmo-smlc
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake >= 1.9
|
||||
BuildRequires: libtool >= 2
|
||||
BuildRequires: pkgconfig >= 0.20
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: systemd-rpm-macros
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libosmo-netif) >= 1.3.0
|
||||
BuildRequires: pkgconfig(libosmo-sccp) >= 1.7.0
|
||||
BuildRequires: pkgconfig(libosmo-sigtran) >= 1.7.0
|
||||
BuildRequires: pkgconfig(libosmocore) >= 1.8.0
|
||||
BuildRequires: pkgconfig(libosmoctrl) >= 1.8.0
|
||||
BuildRequires: pkgconfig(libosmogsm) >= 1.8.0
|
||||
BuildRequires: pkgconfig(libosmovty) >= 1.8.0
|
||||
BuildRequires: pkgconfig(talloc)
|
||||
%{?systemd_requires}
|
||||
|
||||
%description
|
||||
OsmoBSC: Osmocom's Base Station Controller for 2G circuit-switched mobile networks.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
echo "%{version}" >.tarball-version
|
||||
autoreconf -fi
|
||||
%configure \
|
||||
--docdir=%{_docdir}/%{name} \
|
||||
--with-systemdsystemunitdir=%{_unitdir}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%make_install
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%preun
|
||||
%service_del_preun %{name}.service
|
||||
|
||||
%postun
|
||||
%service_del_postun %{name}.service
|
||||
|
||||
%pre
|
||||
%service_add_pre %{name}.service
|
||||
|
||||
%post
|
||||
%service_add_post %{name}.service
|
||||
%endif
|
||||
|
||||
%check
|
||||
make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc AUTHORS README.md
|
||||
%{_bindir}/osmo-smlc
|
||||
%dir %{_docdir}/%{name}/examples
|
||||
%dir %{_docdir}/%{name}/examples/osmo-smlc
|
||||
%{_docdir}/%{name}/examples/osmo-smlc/osmo-smlc.cfg
|
||||
%dir %{_sysconfdir}/osmocom
|
||||
%config(noreplace) %{_sysconfdir}/osmocom/osmo-smlc.cfg
|
||||
%{_unitdir}/%{name}.service
|
||||
|
||||
%changelog
|
||||
@@ -8,8 +8,6 @@ Type=simple
|
||||
Restart=always
|
||||
StateDirectory=osmocom
|
||||
WorkingDirectory=%S/osmocom
|
||||
User=osmocom
|
||||
Group=osmocom
|
||||
ExecStart=/usr/bin/osmo-smlc -c /etc/osmocom/osmo-smlc.cfg
|
||||
RestartSec=2
|
||||
|
||||
|
||||
67
debian/changelog
vendored
67
debian/changelog
vendored
@@ -1,70 +1,3 @@
|
||||
osmo-smlc (0.3.2) unstable; urgency=medium
|
||||
|
||||
[ Oliver Smith ]
|
||||
* contrib/jenkins: libosmo-abis after libosmo-netif
|
||||
|
||||
[ Pau Espin Pedrol ]
|
||||
* jenkins.sh: Skip building unneeded libosmo-abis
|
||||
* jenkins.sh: No need to build libosmo-sigtran with doxygen
|
||||
* Add missing required vty go_parent_cb for libosmo-sigtran
|
||||
|
||||
-- Oliver Smith <osmith@sysmocom.de> Wed, 05 Mar 2025 11:35:11 +0100
|
||||
|
||||
osmo-smlc (0.3.1) unstable; urgency=medium
|
||||
|
||||
[ Harald Welte ]
|
||||
* remove libosmo-sccp dependency; depend on libosmo-sigtran only
|
||||
|
||||
[ Oliver Smith ]
|
||||
* contrib/jenkins: libosmo-sccp -> libosmo-sigtran
|
||||
|
||||
-- Oliver Smith <osmith@sysmocom.de> Mon, 16 Sep 2024 12:26:33 +0200
|
||||
|
||||
osmo-smlc (0.3.0) unstable; urgency=medium
|
||||
|
||||
[ Andreas Eversberg ]
|
||||
* Use uniform log format for default config files
|
||||
|
||||
[ Vadim Yanitskiy ]
|
||||
* build: include README.md into the release tarball
|
||||
* README.md: cosmetic: fix a typo
|
||||
|
||||
[ Max ]
|
||||
* .deb/.rpm: add osmocom user during package install
|
||||
|
||||
[ Oliver Smith ]
|
||||
* .deb/.rpm: various fixes related to non-root
|
||||
* contrib: remove rpm spec file
|
||||
* debian/postinst: add checks, be verbose
|
||||
|
||||
-- Oliver Smith <osmith@sysmocom.de> Thu, 25 Jul 2024 09:49:50 +0200
|
||||
|
||||
osmo-smlc (0.2.4) unstable; urgency=medium
|
||||
|
||||
[ arehbein ]
|
||||
* Transition to use of 'telnet_init_default'
|
||||
|
||||
[ Vadim Yanitskiy ]
|
||||
* configure.ac: set -std=gnu11
|
||||
* Makefile.am: remove $(COVERAGE_LDFLAGS) from osmo_smlc_LDADD
|
||||
* Makefile.am: remove unneeded AM_LDFLAGS with LIBS
|
||||
* tests: $(BUILT_SOURCES) is not defined, depend on osmo-smlc
|
||||
* tests: execute osmotest{vty,config}.py against osmo-smlc
|
||||
* copyright: fix typo: sysmocom s/s.m.f.c./s.f.m.c./ GmbH
|
||||
* configure.ac: migrate from python2 to python3
|
||||
|
||||
[ Oliver Smith ]
|
||||
* debian: set compat level to 10
|
||||
* systemd: depend on networking-online.target
|
||||
|
||||
[ Neels Janosch Hofmeyr ]
|
||||
* ctrl-test: drop bogus 'rm -f $(CTRL_TEST_DB)'
|
||||
|
||||
[ Pau Espin Pedrol ]
|
||||
* Write explicit role & sctp-role fields in ASP configurations
|
||||
|
||||
-- Pau Espin Pedrol <pespin@sysmocom.de> Tue, 12 Sep 2023 17:14:41 +0200
|
||||
|
||||
osmo-smlc (0.2.3) unstable; urgency=medium
|
||||
|
||||
[ Vadim Yanitskiy ]
|
||||
|
||||
7
debian/control
vendored
7
debian/control
vendored
@@ -11,9 +11,10 @@ Build-Depends: debhelper (>= 10),
|
||||
pkg-config,
|
||||
libsctp-dev,
|
||||
libtalloc-dev,
|
||||
libosmocore-dev (>= 1.10.0),
|
||||
libosmo-sigtran-dev (>= 2.0.0),
|
||||
osmo-gsm-manuals-dev (>= 1.6.0)
|
||||
libosmocore-dev (>= 1.8.0),
|
||||
libosmo-sccp-dev (>= 1.7.0),
|
||||
libosmo-sigtran-dev (>= 1.7.0),
|
||||
osmo-gsm-manuals-dev (>= 1.4.0)
|
||||
Standards-Version: 3.9.8
|
||||
Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc
|
||||
Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc
|
||||
|
||||
38
debian/postinst
vendored
38
debian/postinst
vendored
@@ -1,38 +0,0 @@
|
||||
#!/bin/sh -e
|
||||
case "$1" in
|
||||
configure)
|
||||
# Create the osmocom group and user (if it doesn't exist yet)
|
||||
if ! getent group osmocom >/dev/null; then
|
||||
groupadd --system osmocom
|
||||
fi
|
||||
if ! getent passwd osmocom >/dev/null; then
|
||||
useradd \
|
||||
--system \
|
||||
--gid osmocom \
|
||||
--home-dir /var/lib/osmocom \
|
||||
--shell /sbin/nologin \
|
||||
--comment "Open Source Mobile Communications" \
|
||||
osmocom
|
||||
fi
|
||||
|
||||
# Fix permissions of previous (root-owned) install (OS#4107)
|
||||
if dpkg --compare-versions "$2" le "0.3.0"; then
|
||||
if [ -e /etc/osmocom/osmo-smlc.cfg ]; then
|
||||
chown -v osmocom:osmocom /etc/osmocom/osmo-smlc.cfg
|
||||
chmod -v 0660 /etc/osmocom/osmo-smlc.cfg
|
||||
fi
|
||||
|
||||
if [ -d /etc/osmocom ]; then
|
||||
chown -v root:osmocom /etc/osmocom
|
||||
chmod -v 2775 /etc/osmocom
|
||||
fi
|
||||
|
||||
mkdir -p /var/lib/osmocom
|
||||
chown -R -v osmocom:osmocom /var/lib/osmocom
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb(1) will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
#DEBHELPER#
|
||||
@@ -1,11 +1,3 @@
|
||||
log stderr
|
||||
logging color 1
|
||||
logging print category-hex 0
|
||||
logging print category 1
|
||||
logging timestamp 0
|
||||
logging print file basename last
|
||||
logging print level 1
|
||||
|
||||
cells
|
||||
lac-ci 23 42 lat 12.34567 lon 34.56789
|
||||
cgi 262 42 17 5 lat 12.34765 lon 34.56987
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#include <osmocom/core/linuxlist.h>
|
||||
#include <osmocom/gsm/gsm0808_utils.h>
|
||||
#include <osmocom/sigtran/sccp_sap.h>
|
||||
|
||||
struct osmo_gad;
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include <osmocom/core/linuxlist.h>
|
||||
#include <osmocom/gsm/gsm0808.h>
|
||||
#include <osmocom/sigtran/sccp_sap.h>
|
||||
@@ -51,8 +49,8 @@ enum lb_peer_event {
|
||||
LB_PEER_EV_MSG_DOWN_CO,
|
||||
LB_PEER_EV_RX_RESET,
|
||||
LB_PEER_EV_RX_RESET_ACK,
|
||||
LB_PEER_EV_AVAILABLE,
|
||||
LB_PEER_EV_UNAVAILABLE,
|
||||
LB_PEER_EV_CONNECTION_SUCCESS,
|
||||
LB_PEER_EV_CONNECTION_TIMEOUT,
|
||||
};
|
||||
|
||||
struct lb_peer_ev_ctx {
|
||||
@@ -62,8 +60,8 @@ struct lb_peer_ev_ctx {
|
||||
};
|
||||
|
||||
struct lb_peer *lb_peer_find_or_create(struct sccp_lb_inst *sli, const struct osmo_sccp_addr *peer_addr);
|
||||
struct lb_peer *lb_peer_find(const struct sccp_lb_inst *sli, const struct osmo_sccp_addr *peer_addr);
|
||||
struct lb_peer *lb_peer_find_by_pc(const struct sccp_lb_inst *sli, uint32_t pc);
|
||||
struct lb_peer *lb_peer_find(struct sccp_lb_inst *sli, const struct osmo_sccp_addr *peer_addr);
|
||||
|
||||
int lb_peer_up_l2(struct sccp_lb_inst *sli, const struct osmo_sccp_addr *calling_addr, bool co, uint32_t conn_id,
|
||||
struct msgb *l2);
|
||||
void lb_peer_disconnect(struct sccp_lb_inst *sli, uint32_t conn_id);
|
||||
|
||||
@@ -37,7 +37,6 @@ enum smlc_ctrl_node {
|
||||
_LAST_CTRL_NODE_SMLC
|
||||
};
|
||||
|
||||
/* rate_ctr */
|
||||
enum {
|
||||
SMLC_CTR_BSSMAP_LE_RX_UDT_RESET,
|
||||
SMLC_CTR_BSSMAP_LE_RX_UDT_RESET_ACK,
|
||||
@@ -59,9 +58,3 @@ enum {
|
||||
SMLC_CTR_BSSMAP_LE_TX_DT1_PERFORM_LOCATION_RESPONSE,
|
||||
SMLC_CTR_BSSMAP_LE_TX_DT1_BSSLAP_TA_REQUEST,
|
||||
};
|
||||
|
||||
/* osmo_stat */
|
||||
enum {
|
||||
SMLC_STAT_LB_PEERS_TOTAL,
|
||||
SMLC_STAT_LB_PEERS_ACTIVE,
|
||||
};
|
||||
|
||||
@@ -5,5 +5,3 @@
|
||||
enum smlc_vty_node {
|
||||
CELLS_NODE = _LAST_OSMOVTY_NODE + 1,
|
||||
};
|
||||
|
||||
void smlc_vty_init(struct vty_app_info *vty_app_info);
|
||||
|
||||
@@ -32,7 +32,6 @@ osmo_smlc_SOURCES = \
|
||||
smlc_loc_req.c \
|
||||
smlc_main.c \
|
||||
smlc_subscr.c \
|
||||
smlc_vty.c \
|
||||
$(NULL)
|
||||
|
||||
osmo_smlc_LDADD = \
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* (C) 2019-2025 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
|
||||
* (C) 2019 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
|
||||
* All Rights Reserved
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0+
|
||||
@@ -23,7 +23,6 @@
|
||||
#include <osmocom/core/linuxlist.h>
|
||||
#include <osmocom/core/logging.h>
|
||||
#include <osmocom/core/fsm.h>
|
||||
#include <osmocom/core/stat_item.h>
|
||||
#include <osmocom/gsm/bssmap_le.h>
|
||||
#include <osmocom/sigtran/sccp_helpers.h>
|
||||
|
||||
@@ -58,7 +57,6 @@ static struct lb_peer *lb_peer_alloc(struct sccp_lb_inst *sli, const struct osmo
|
||||
fi->priv = lbp;
|
||||
|
||||
llist_add(&lbp->entry, &sli->lb_peers);
|
||||
osmo_stat_item_inc(osmo_stat_item_group_get_item(g_smlc->statg, SMLC_STAT_LB_PEERS_TOTAL), 1);
|
||||
|
||||
return lbp;
|
||||
}
|
||||
@@ -71,7 +69,7 @@ struct lb_peer *lb_peer_find_or_create(struct sccp_lb_inst *sli, const struct os
|
||||
return lb_peer_alloc(sli, peer_addr);
|
||||
}
|
||||
|
||||
struct lb_peer *lb_peer_find(const struct sccp_lb_inst *sli, const struct osmo_sccp_addr *peer_addr)
|
||||
struct lb_peer *lb_peer_find(struct sccp_lb_inst *sli, const struct osmo_sccp_addr *peer_addr)
|
||||
{
|
||||
struct lb_peer *lbp;
|
||||
llist_for_each_entry(lbp, &sli->lb_peers, entry) {
|
||||
@@ -82,15 +80,6 @@ struct lb_peer *lb_peer_find(const struct sccp_lb_inst *sli, const struct osmo_s
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Find an lb_peer by its remote SCCP address */
|
||||
struct lb_peer *lb_peer_find_by_pc(const struct sccp_lb_inst *sli, uint32_t pc)
|
||||
{
|
||||
struct osmo_sccp_addr rem_addr;
|
||||
|
||||
osmo_sccp_make_addr_pc_ssn(&rem_addr, pc, OSMO_SCCP_SSN_BSC_BSSAP_LE);
|
||||
return lb_peer_find(sli, &rem_addr);
|
||||
}
|
||||
|
||||
static const struct osmo_tdef_state_timeout lb_peer_fsm_timeouts[32] = {
|
||||
[LB_PEER_ST_WAIT_RX_RESET_ACK] = { .T = -13 },
|
||||
[LB_PEER_ST_DISCARDING] = { .T = -14 },
|
||||
@@ -99,7 +88,7 @@ static const struct osmo_tdef_state_timeout lb_peer_fsm_timeouts[32] = {
|
||||
#define lb_peer_state_chg(LB_PEER, NEXT_STATE) \
|
||||
osmo_tdef_fsm_inst_state_chg((LB_PEER)->fi, NEXT_STATE, lb_peer_fsm_timeouts, g_smlc_tdefs, 5)
|
||||
|
||||
static void lb_peer_discard_all_conns(struct lb_peer *lbp)
|
||||
void lb_peer_discard_all_conns(struct lb_peer *lbp)
|
||||
{
|
||||
struct lb_conn *lb_conn, *next;
|
||||
|
||||
@@ -148,7 +137,7 @@ static void lb_peer_rx_reset_ack(struct lb_peer *lbp, struct msgb* msg)
|
||||
lb_peer_state_chg(lbp, LB_PEER_ST_READY);
|
||||
}
|
||||
|
||||
static void lb_peer_reset(struct lb_peer *lbp)
|
||||
void lb_peer_reset(struct lb_peer *lbp)
|
||||
{
|
||||
struct bssap_le_pdu reset = {
|
||||
.discr = BSSAP_LE_MSG_DISCR_BSSMAP_LE,
|
||||
@@ -178,18 +167,7 @@ static void lb_peer_reset(struct lb_peer *lbp)
|
||||
}
|
||||
}
|
||||
|
||||
static void lb_peer_disconnect(struct sccp_lb_inst *sli, uint32_t conn_id)
|
||||
{
|
||||
struct lb_conn *lb_conn;
|
||||
llist_for_each_entry(lb_conn, &sli->lb_conns, entry) {
|
||||
if (lb_conn->sccp_conn_id == conn_id) {
|
||||
lb_conn_discard(lb_conn);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void lb_peer_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)
|
||||
void lb_peer_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)
|
||||
{
|
||||
struct lb_peer *lbp = fi->priv;
|
||||
struct lb_peer_ev_ctx *ctx = data;
|
||||
@@ -218,7 +196,7 @@ static void lb_peer_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, vo
|
||||
}
|
||||
}
|
||||
|
||||
static void lb_peer_st_wait_rx_reset(struct osmo_fsm_inst *fi, uint32_t event, void *data)
|
||||
void lb_peer_st_wait_rx_reset(struct osmo_fsm_inst *fi, uint32_t event, void *data)
|
||||
{
|
||||
struct lb_peer *lbp = fi->priv;
|
||||
struct lb_peer_ev_ctx *ctx;
|
||||
@@ -246,22 +224,13 @@ static void lb_peer_st_wait_rx_reset(struct osmo_fsm_inst *fi, uint32_t event, v
|
||||
lb_peer_rx_reset(lbp, msg);
|
||||
return;
|
||||
|
||||
case LB_PEER_EV_AVAILABLE:
|
||||
/* Send a RESET to the peer. */
|
||||
lb_peer_reset(lbp);
|
||||
return;
|
||||
|
||||
case LB_PEER_EV_UNAVAILABLE:
|
||||
/* Do nothing, wait for peer to come up again. */
|
||||
return;
|
||||
|
||||
default:
|
||||
LOG_LB_PEER(lbp, LOGL_ERROR, "Unhandled event: %s\n", osmo_fsm_event_name(&lb_peer_fsm, event));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
static void lb_peer_st_wait_rx_reset_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data)
|
||||
void lb_peer_st_wait_rx_reset_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data)
|
||||
{
|
||||
struct lb_peer *lbp = fi->priv;
|
||||
struct lb_peer_ev_ctx *ctx;
|
||||
@@ -290,28 +259,13 @@ static void lb_peer_st_wait_rx_reset_ack(struct osmo_fsm_inst *fi, uint32_t even
|
||||
lb_peer_rx_reset(lbp, msg);
|
||||
return;
|
||||
|
||||
case LB_PEER_EV_AVAILABLE:
|
||||
/* Send a RESET to the peer. */
|
||||
lb_peer_reset(lbp);
|
||||
return;
|
||||
|
||||
case LB_PEER_EV_UNAVAILABLE:
|
||||
lb_peer_state_chg(lbp, LB_PEER_ST_WAIT_RX_RESET);
|
||||
return;
|
||||
|
||||
default:
|
||||
LOG_LB_PEER(lbp, LOGL_ERROR, "Unhandled event: %s\n", osmo_fsm_event_name(&lb_peer_fsm, event));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
static void lb_peer_st_ready_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
|
||||
{
|
||||
if (prev_state != LB_PEER_ST_READY)
|
||||
osmo_stat_item_inc(osmo_stat_item_group_get_item(g_smlc->statg, SMLC_STAT_LB_PEERS_ACTIVE), 1);
|
||||
}
|
||||
|
||||
static void lb_peer_st_ready(struct osmo_fsm_inst *fi, uint32_t event, void *data)
|
||||
void lb_peer_st_ready(struct osmo_fsm_inst *fi, uint32_t event, void *data)
|
||||
{
|
||||
struct lb_peer *lbp = fi->priv;
|
||||
struct lb_peer_ev_ctx *ctx;
|
||||
@@ -369,28 +323,12 @@ static void lb_peer_st_ready(struct osmo_fsm_inst *fi, uint32_t event, void *dat
|
||||
lb_peer_rx_reset(lbp, msg);
|
||||
return;
|
||||
|
||||
case LB_PEER_EV_AVAILABLE:
|
||||
/* Send a RESET to the peer. */
|
||||
lb_peer_reset(lbp);
|
||||
return;
|
||||
|
||||
case LB_PEER_EV_UNAVAILABLE:
|
||||
lb_peer_discard_all_conns(lbp);
|
||||
lb_peer_state_chg(lbp, LB_PEER_ST_WAIT_RX_RESET);
|
||||
return;
|
||||
|
||||
default:
|
||||
LOG_LB_PEER(lbp, LOGL_ERROR, "Unhandled event: %s\n", osmo_fsm_event_name(&lb_peer_fsm, event));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
static void lb_peer_st_ready_onleave(struct osmo_fsm_inst *fi, uint32_t next_state)
|
||||
{
|
||||
if (next_state != LB_PEER_ST_READY)
|
||||
osmo_stat_item_dec(osmo_stat_item_group_get_item(g_smlc->statg, SMLC_STAT_LB_PEERS_ACTIVE), 1);
|
||||
}
|
||||
|
||||
static int lb_peer_fsm_timer_cb(struct osmo_fsm_inst *fi)
|
||||
{
|
||||
struct lb_peer *lbp = fi->priv;
|
||||
@@ -398,17 +336,10 @@ static int lb_peer_fsm_timer_cb(struct osmo_fsm_inst *fi)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* struct lb_peer destructor: */
|
||||
static void lb_peer_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause)
|
||||
void lb_peer_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause)
|
||||
{
|
||||
struct lb_peer *lbp = fi->priv;
|
||||
|
||||
lb_peer_discard_all_conns(lbp);
|
||||
|
||||
if (lbp->fi->state == LB_PEER_ST_READY)
|
||||
osmo_stat_item_dec(osmo_stat_item_group_get_item(g_smlc->statg, SMLC_STAT_LB_PEERS_ACTIVE), 1);
|
||||
osmo_stat_item_dec(osmo_stat_item_group_get_item(g_smlc->statg, SMLC_STAT_LB_PEERS_TOTAL), 1);
|
||||
|
||||
llist_del(&lbp->entry);
|
||||
}
|
||||
|
||||
@@ -421,8 +352,8 @@ static const struct value_string lb_peer_fsm_event_names[] = {
|
||||
OSMO_VALUE_STRING(LB_PEER_EV_MSG_DOWN_CO),
|
||||
OSMO_VALUE_STRING(LB_PEER_EV_RX_RESET),
|
||||
OSMO_VALUE_STRING(LB_PEER_EV_RX_RESET_ACK),
|
||||
OSMO_VALUE_STRING(LB_PEER_EV_AVAILABLE),
|
||||
OSMO_VALUE_STRING(LB_PEER_EV_UNAVAILABLE),
|
||||
OSMO_VALUE_STRING(LB_PEER_EV_CONNECTION_SUCCESS),
|
||||
OSMO_VALUE_STRING(LB_PEER_EV_CONNECTION_TIMEOUT),
|
||||
{}
|
||||
};
|
||||
|
||||
@@ -436,8 +367,7 @@ static const struct osmo_fsm_state lb_peer_fsm_states[] = {
|
||||
| S(LB_PEER_EV_RX_RESET)
|
||||
| S(LB_PEER_EV_MSG_UP_CO_INITIAL)
|
||||
| S(LB_PEER_EV_MSG_UP_CO)
|
||||
| S(LB_PEER_EV_AVAILABLE)
|
||||
| S(LB_PEER_EV_UNAVAILABLE)
|
||||
| S(LB_PEER_EV_CONNECTION_TIMEOUT)
|
||||
,
|
||||
.out_state_mask = 0
|
||||
| S(LB_PEER_ST_WAIT_RX_RESET)
|
||||
@@ -454,8 +384,7 @@ static const struct osmo_fsm_state lb_peer_fsm_states[] = {
|
||||
| S(LB_PEER_EV_RX_RESET_ACK)
|
||||
| S(LB_PEER_EV_MSG_UP_CO_INITIAL)
|
||||
| S(LB_PEER_EV_MSG_UP_CO)
|
||||
| S(LB_PEER_EV_AVAILABLE)
|
||||
| S(LB_PEER_EV_UNAVAILABLE)
|
||||
| S(LB_PEER_EV_CONNECTION_TIMEOUT)
|
||||
,
|
||||
.out_state_mask = 0
|
||||
| S(LB_PEER_ST_WAIT_RX_RESET)
|
||||
@@ -467,8 +396,6 @@ static const struct osmo_fsm_state lb_peer_fsm_states[] = {
|
||||
[LB_PEER_ST_READY] = {
|
||||
.name = "READY",
|
||||
.action = lb_peer_st_ready,
|
||||
.onenter = lb_peer_st_ready_onenter,
|
||||
.onleave = lb_peer_st_ready_onleave,
|
||||
.in_event_mask = 0
|
||||
| S(LB_PEER_EV_RX_RESET)
|
||||
| S(LB_PEER_EV_MSG_UP_CO_INITIAL)
|
||||
@@ -476,8 +403,6 @@ static const struct osmo_fsm_state lb_peer_fsm_states[] = {
|
||||
| S(LB_PEER_EV_MSG_DOWN_CO_INITIAL)
|
||||
| S(LB_PEER_EV_MSG_DOWN_CO)
|
||||
| S(LB_PEER_EV_MSG_DOWN_CL)
|
||||
| S(LB_PEER_EV_AVAILABLE)
|
||||
| S(LB_PEER_EV_UNAVAILABLE)
|
||||
,
|
||||
.out_state_mask = 0
|
||||
| S(LB_PEER_ST_WAIT_RX_RESET)
|
||||
@@ -557,3 +482,14 @@ int lb_peer_up_l2(struct sccp_lb_inst *sli, const struct osmo_sccp_addr *calling
|
||||
|
||||
return osmo_fsm_inst_dispatch(lb_peer->fi, event, &ctx);
|
||||
}
|
||||
|
||||
void lb_peer_disconnect(struct sccp_lb_inst *sli, uint32_t conn_id)
|
||||
{
|
||||
struct lb_conn *lb_conn;
|
||||
llist_for_each_entry(lb_conn, &sli->lb_conns, entry) {
|
||||
if (lb_conn->sccp_conn_id == conn_id) {
|
||||
lb_conn_discard(lb_conn);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* (C) 2020-2025 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
|
||||
* (C) 2020 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
|
||||
* All Rights Reserved
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0+
|
||||
@@ -85,126 +85,6 @@ struct sccp_lb_inst *sccp_lb_init(void *talloc_ctx, struct osmo_sccp_instance *s
|
||||
return sli;
|
||||
}
|
||||
|
||||
static void handle_notice_ind(struct sccp_lb_inst *sli, const struct osmo_scu_notice_param *ni)
|
||||
{
|
||||
struct lb_peer *lbp;
|
||||
|
||||
lbp = lb_peer_find(sli, &ni->calling_addr);
|
||||
if (!lbp) {
|
||||
LOG_SCCP_LB(sli, LOGL_DEBUG, "(calling_addr=%s) N-NOTICE.ind cause=%u='%s' importance=%u didn't match any lb_peer, ignoring\n",
|
||||
osmo_sccp_addr_dump(&ni->calling_addr),
|
||||
ni->cause, osmo_sccp_return_cause_name(ni->cause),
|
||||
ni->importance);
|
||||
return;
|
||||
}
|
||||
|
||||
LOG_LB_PEER(lbp, LOGL_NOTICE, "N-NOTICE.ind cause=%u='%s' importance=%u\n",
|
||||
ni->cause, osmo_sccp_return_cause_name(ni->cause),
|
||||
ni->importance);
|
||||
|
||||
switch (ni->cause) {
|
||||
case SCCP_RETURN_CAUSE_SUBSYSTEM_CONGESTION:
|
||||
case SCCP_RETURN_CAUSE_NETWORK_CONGESTION:
|
||||
/* Transient failures (hopefully), keep going. */
|
||||
return;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
/* Messages are not arriving to lb_peer. Signal it is unavailable to update local state. */
|
||||
osmo_fsm_inst_dispatch(lbp->fi, LB_PEER_EV_UNAVAILABLE, NULL);
|
||||
}
|
||||
|
||||
static void handle_pcstate_ind(struct sccp_lb_inst *sli, const struct osmo_scu_pcstate_param *pcst)
|
||||
{
|
||||
struct osmo_ss7_instance *cs7 = osmo_sccp_get_ss7(sli->sccp);
|
||||
struct lb_peer *lbp;
|
||||
bool connected;
|
||||
bool disconnected;
|
||||
|
||||
LOG_SCCP_LB(sli, LOGL_DEBUG, "N-PCSTATE ind: affected_pc=%u=%s sp_status=%s remote_sccp_status=%s\n",
|
||||
pcst->affected_pc, osmo_ss7_pointcode_print(cs7, pcst->affected_pc),
|
||||
osmo_sccp_sp_status_name(pcst->sp_status),
|
||||
osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status));
|
||||
|
||||
/* If we don't care about that point-code, ignore PCSTATE. */
|
||||
lbp = lb_peer_find_by_pc(sli, pcst->affected_pc);
|
||||
if (!lbp) {
|
||||
LOG_SCCP_LB(sli, LOGL_DEBUG, "No lb_peer found under pc=%u=%s\n",
|
||||
pcst->affected_pc, osmo_ss7_pointcode_print(cs7, pcst->affected_pc));
|
||||
return;
|
||||
}
|
||||
|
||||
/* See if this marks the point code to have become available, or to have been lost.
|
||||
*
|
||||
* I want to detect two events:
|
||||
* - connection event (both indicators say PC is reachable).
|
||||
* - disconnection event (at least one indicator says the PC is not reachable).
|
||||
*
|
||||
* There are two separate incoming indicators with various possible values -- the incoming events can be:
|
||||
*
|
||||
* - neither connection nor disconnection indicated -- just indicating congestion
|
||||
* connected == false, disconnected == false --> do nothing.
|
||||
* - both incoming values indicate that we are connected
|
||||
* --> trigger connected
|
||||
* - both indicate we are disconnected
|
||||
* --> trigger disconnected
|
||||
* - one value indicates 'connected', the other indicates 'disconnected'
|
||||
* --> trigger disconnected
|
||||
*
|
||||
* Congestion could imply that we're connected, but it does not indicate that a PC's reachability changed, so no need to
|
||||
* trigger on that.
|
||||
*/
|
||||
connected = false;
|
||||
disconnected = false;
|
||||
|
||||
switch (pcst->sp_status) {
|
||||
case OSMO_SCCP_SP_S_ACCESSIBLE:
|
||||
connected = true;
|
||||
break;
|
||||
case OSMO_SCCP_SP_S_INACCESSIBLE:
|
||||
disconnected = true;
|
||||
break;
|
||||
default:
|
||||
case OSMO_SCCP_SP_S_CONGESTED:
|
||||
/* Neither connecting nor disconnecting */
|
||||
break;
|
||||
}
|
||||
|
||||
switch (pcst->remote_sccp_status) {
|
||||
case OSMO_SCCP_REM_SCCP_S_AVAILABLE:
|
||||
if (!disconnected)
|
||||
connected = true;
|
||||
break;
|
||||
case OSMO_SCCP_REM_SCCP_S_UNAVAILABLE_UNKNOWN:
|
||||
case OSMO_SCCP_REM_SCCP_S_UNEQUIPPED:
|
||||
case OSMO_SCCP_REM_SCCP_S_INACCESSIBLE:
|
||||
disconnected = true;
|
||||
connected = false;
|
||||
break;
|
||||
default:
|
||||
case OSMO_SCCP_REM_SCCP_S_CONGESTED:
|
||||
/* Neither connecting nor disconnecting */
|
||||
break;
|
||||
}
|
||||
|
||||
if (disconnected) {
|
||||
LOG_SCCP_LB(sli, LOGL_NOTICE,
|
||||
"now unreachable: N-PCSTATE ind: pc=%u=%s sp_status=%s remote_sccp_status=%s\n",
|
||||
pcst->affected_pc, osmo_ss7_pointcode_print(cs7, pcst->affected_pc),
|
||||
osmo_sccp_sp_status_name(pcst->sp_status),
|
||||
osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status));
|
||||
osmo_fsm_inst_dispatch(lbp->fi, LB_PEER_EV_UNAVAILABLE, NULL);
|
||||
} else if (connected) {
|
||||
LOG_SCCP_LB(sli, LOGL_NOTICE,
|
||||
"now available: N-PCSTATE ind: pc=%u=%s sp_status=%s remote_sccp_status=%s\n",
|
||||
pcst->affected_pc, osmo_ss7_pointcode_print(cs7, pcst->affected_pc),
|
||||
osmo_sccp_sp_status_name(pcst->sp_status),
|
||||
osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status));
|
||||
osmo_fsm_inst_dispatch(lbp->fi, LB_PEER_EV_AVAILABLE, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
static int sccp_lb_sap_up(struct osmo_prim_hdr *oph, void *_scu)
|
||||
{
|
||||
struct osmo_sccp_user *scu = _scu;
|
||||
@@ -283,24 +163,6 @@ static int sccp_lb_sap_up(struct osmo_prim_hdr *oph, void *_scu)
|
||||
rc = lb_peer_up_l2(sli, peer_addr, false, 0, oph->msg);
|
||||
break;
|
||||
|
||||
case OSMO_PRIM(OSMO_SCU_PRIM_N_NOTICE, PRIM_OP_INDICATION):
|
||||
handle_notice_ind(sli, &prim->u.notice);
|
||||
rc = 0;
|
||||
break;
|
||||
|
||||
case OSMO_PRIM(OSMO_SCU_PRIM_N_PCSTATE, PRIM_OP_INDICATION):
|
||||
handle_pcstate_ind(sli, &prim->u.pcstate);
|
||||
rc = 0;
|
||||
break;
|
||||
|
||||
case OSMO_PRIM(OSMO_SCU_PRIM_N_STATE, PRIM_OP_INDICATION):
|
||||
LOG_SCCP_LB(sli, LOGL_INFO,
|
||||
"SCCP-User-SAP: Ignoring %s.%s\n",
|
||||
osmo_scu_prim_type_name(oph->primitive),
|
||||
get_value_string(osmo_prim_op_names, oph->operation));
|
||||
rc = 0;
|
||||
break;
|
||||
|
||||
default:
|
||||
LOG_SCCP_LB_CL(sli, NULL, LOGL_ERROR, "%s(%s) unsupported\n", __func__, osmo_scu_prim_name(oph));
|
||||
rc = -1;
|
||||
|
||||
@@ -54,19 +54,6 @@ static const struct rate_ctr_group_desc smlc_ctrg_desc = {
|
||||
smlc_ctr_description,
|
||||
};
|
||||
|
||||
static const struct osmo_stat_item_desc smlc_stat_item_description[] = {
|
||||
[SMLC_STAT_LB_PEERS_TOTAL] = { "lb_peers.total", "Total Lb peers seen since startup", OSMO_STAT_ITEM_NO_UNIT, 4, 0},
|
||||
[SMLC_STAT_LB_PEERS_ACTIVE] = { "lb_peers.active", "Currently active Lb peers", OSMO_STAT_ITEM_NO_UNIT, 4, 0},
|
||||
};
|
||||
|
||||
static const struct osmo_stat_item_group_desc smlc_statg_desc = {
|
||||
"smlc",
|
||||
"serving mobile location center",
|
||||
OSMO_STATS_CLASS_GLOBAL,
|
||||
ARRAY_SIZE(smlc_stat_item_description),
|
||||
smlc_stat_item_description,
|
||||
};
|
||||
|
||||
struct smlc_state *smlc_state_alloc(void *ctx)
|
||||
{
|
||||
struct smlc_state *smlc = talloc_zero(ctx, struct smlc_state);
|
||||
@@ -74,14 +61,5 @@ struct smlc_state *smlc_state_alloc(void *ctx)
|
||||
INIT_LLIST_HEAD(&smlc->subscribers);
|
||||
INIT_LLIST_HEAD(&smlc->cell_locations);
|
||||
smlc->ctrs = rate_ctr_group_alloc(smlc, &smlc_ctrg_desc, 0);
|
||||
|
||||
smlc->statg = osmo_stat_item_group_alloc(smlc, &smlc_statg_desc, 0);
|
||||
if (!smlc->statg)
|
||||
goto ret_free;
|
||||
return smlc;
|
||||
|
||||
ret_free:
|
||||
rate_ctr_group_free(smlc->ctrs);
|
||||
talloc_free(smlc);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <osmocom/ctrl/control_cmd.h>
|
||||
#include <osmocom/ctrl/control_if.h>
|
||||
#include <osmocom/ctrl/ports.h>
|
||||
#include <osmocom/ctrl/control_vty.h>
|
||||
|
||||
#include <osmocom/core/application.h>
|
||||
#include <osmocom/core/linuxlist.h>
|
||||
@@ -28,15 +29,17 @@
|
||||
#include <osmocom/core/rate_ctr.h>
|
||||
#include <osmocom/vty/telnet_interface.h>
|
||||
#include <osmocom/vty/ports.h>
|
||||
#include <osmocom/vty/logging.h>
|
||||
#include <osmocom/vty/command.h>
|
||||
#include <osmocom/vty/misc.h>
|
||||
|
||||
#include <osmocom/sigtran/xua_msg.h>
|
||||
#include <osmocom/sigtran/sccp_sap.h>
|
||||
#include <osmocom/sigtran/osmo_ss7.h>
|
||||
|
||||
#include <osmocom/smlc/debug.h>
|
||||
#include <osmocom/smlc/smlc_data.h>
|
||||
#include <osmocom/smlc/sccp_lb_inst.h>
|
||||
#include <osmocom/smlc/smlc_vty.h>
|
||||
#include <osmocom/smlc/cell_locations.h>
|
||||
|
||||
#define _GNU_SOURCE
|
||||
#include <getopt.h>
|
||||
@@ -167,7 +170,6 @@ static struct vty_app_info vty_info = {
|
||||
"This is free software: you are free to change and redistribute it.\r\n"
|
||||
"There is NO WARRANTY, to the extent permitted by law.\r\n",
|
||||
.version = PACKAGE_VERSION,
|
||||
.go_parent_cb = osmo_ss7_vty_go_parent,
|
||||
};
|
||||
|
||||
static void signal_handler(int signal)
|
||||
@@ -237,11 +239,17 @@ int main(int argc, char **argv)
|
||||
|
||||
g_smlc = smlc_state_alloc(tall_smlc_ctx);
|
||||
|
||||
/* This needs to precede handle_options() */
|
||||
vty_init(&vty_info);
|
||||
logging_vty_add_cmds();
|
||||
osmo_talloc_vty_add_cmds();
|
||||
ctrl_vty_init(tall_smlc_ctx);
|
||||
cell_locations_vty_init();
|
||||
|
||||
/* Initialize SS7 */
|
||||
OSMO_ASSERT(osmo_ss7_init() == 0);
|
||||
|
||||
/* This needs to precede handle_options() */
|
||||
smlc_vty_init(&vty_info);
|
||||
osmo_ss7_vty_init_asp(tall_smlc_ctx);
|
||||
osmo_sccp_vty_init();
|
||||
|
||||
/* parse options */
|
||||
handle_options(argc, argv);
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
/*
|
||||
* (C) 2025 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
|
||||
* All Rights Reserved
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0+
|
||||
*
|
||||
* Author: Pau Espin Pedrol
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation; either version 3 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 Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <osmocom/ctrl/control_vty.h>
|
||||
#include <osmocom/vty/logging.h>
|
||||
#include <osmocom/vty/misc.h>
|
||||
#include <osmocom/vty/stats.h>
|
||||
#include <osmocom/vty/vty.h>
|
||||
|
||||
#include <osmocom/sigtran/osmo_ss7.h>
|
||||
#include <osmocom/sigtran/sccp_sap.h>
|
||||
|
||||
#include <osmocom/smlc/cell_locations.h>
|
||||
|
||||
void smlc_vty_init(struct vty_app_info *vty_app_info)
|
||||
{
|
||||
vty_init(vty_app_info);
|
||||
|
||||
logging_vty_add_cmds();
|
||||
osmo_talloc_vty_add_cmds();
|
||||
ctrl_vty_init(vty_app_info->tall_ctx);
|
||||
osmo_fsm_vty_add_cmds();
|
||||
osmo_stats_vty_add_cmds();
|
||||
|
||||
osmo_ss7_vty_init_asp(vty_app_info->tall_ctx);
|
||||
osmo_sccp_vty_init();
|
||||
|
||||
cell_locations_vty_init();
|
||||
}
|
||||
@@ -141,7 +141,7 @@ int main()
|
||||
|
||||
osmo_init_logging2(ctx, &log_info);
|
||||
log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
|
||||
log_set_print_timestamp(osmo_stderr_target, 0);
|
||||
log_set_print_timestamp2(osmo_stderr_target, LOG_TIMESTAMP_NONE);
|
||||
log_set_use_color(osmo_stderr_target, 0);
|
||||
log_set_print_category(osmo_stderr_target, 1);
|
||||
log_set_print_category_hex(osmo_stderr_target, 0);
|
||||
|
||||
Reference in New Issue
Block a user