aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am3
-rw-r--r--contrib/screenrc-sysmobts2
-rw-r--r--doc/examples/osmobts-mgr.cfg30
-rw-r--r--src/osmo-bts-sysmo/Makefile.am5
-rw-r--r--src/osmo-bts-sysmo/main.c104
-rw-r--r--src/osmo-bts-sysmo/misc/sysmobts_mgr.c135
-rw-r--r--src/osmo-bts-sysmo/misc/sysmobts_mgr.h25
-rw-r--r--src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c279
-rw-r--r--src/osmo-bts-sysmo/misc/sysmobts_misc.c138
-rw-r--r--src/osmo-bts-sysmo/misc/sysmobts_misc.h32
-rw-r--r--src/osmo-bts-sysmo/utils.c166
-rw-r--r--src/osmo-bts-sysmo/utils.h23
12 files changed, 6 insertions, 936 deletions
diff --git a/Makefile.am b/Makefile.am
index 08375592..733e80f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,5 +11,4 @@ EXTRA_DIST = \
contrib/sysmobts-calib/sysmobts-calib.c \
contrib/sysmobts-calib/sysmobts-layer1.c \
contrib/sysmobts-calib/sysmobts-layer1.h \
- doc/examples/osmo-bts.cfg \
- doc/examples/osmobts-mgr.cfg
+ doc/examples/osmo-bts.cfg
diff --git a/contrib/screenrc-sysmobts b/contrib/screenrc-sysmobts
index 8d34332b..1bd510ce 100644
--- a/contrib/screenrc-sysmobts
+++ b/contrib/screenrc-sysmobts
@@ -1,5 +1,5 @@
chdir /tmp
screen -t BTS 0 /etc/osmocom/respawn.sh /usr/bin/sysmobts -c /etc/osmocom/osmo-bts.cfg -r 1 -M
screen -t PCU 1 /etc/osmocom/respawn-only.sh /usr/bin/osmo-pcu -c /etc/osmocom/osmo-pcu.cfg -e
-screen -t MGR 2 /etc/osmocom/respawn-only.sh /usr/bin/sysmobts-mgr -c /etc/osmocom/osmobts-mgr.cfg -n
+screen -t MGR 2 /etc/osmocom/respawn-only.sh /usr/bin/sysmobts-mgr -n
detach
diff --git a/doc/examples/osmobts-mgr.cfg b/doc/examples/osmobts-mgr.cfg
deleted file mode 100644
index 35922021..00000000
--- a/doc/examples/osmobts-mgr.cfg
+++ /dev/null
@@ -1,30 +0,0 @@
-!
-! SysmoMgr (0.3.0.141-33e5) configuration saved from vty
-!!
-!
-log stderr
- logging filter all 1
- logging color 1
- logging timestamp 0
- logging level all everything
- logging level temp info
- logging level fw info
- logging level find info
- logging level lglobal notice
- logging level llapd notice
- logging level linp notice
- logging level lmux notice
- logging level lmi notice
- logging level lmib notice
- logging level lsms notice
-!
-line vty
- no login
-!
-config-mgr
- temperature-warning board -30 50
- temperature-severe board -50 80
- temperature-warning pa -30 50
- temperature-severe pa -50 80
- power-action on on off
- power-reduce-transmitter 4
diff --git a/src/osmo-bts-sysmo/Makefile.am b/src/osmo-bts-sysmo/Makefile.am
index de707614..1c08af3a 100644
--- a/src/osmo-bts-sysmo/Makefile.am
+++ b/src/osmo-bts-sysmo/Makefile.am
@@ -22,9 +22,8 @@ l1fwd_proxy_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
sysmobts_mgr_SOURCES = \
misc/sysmobts_mgr.c misc/sysmobts_misc.c \
- misc/sysmobts_par.c misc/sysmobts_nl.c utils.c \
- misc/sysmobts_mgr_vty.c
-sysmobts_mgr_LDADD = $(COMMON_LDADD)
+ misc/sysmobts_par.c misc/sysmobts_nl.c
+sysmobts_mgr_LDADD = $(LIBOSMOCORE_LIBS)
sysmobts_util_SOURCES = misc/sysmobts_util.c misc/sysmobts_par.c
sysmobts_util_LDADD = $(LIBOSMOCORE_LIBS)
diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c
index 81f6474c..bd11472b 100644
--- a/src/osmo-bts-sysmo/main.c
+++ b/src/osmo-bts-sysmo/main.c
@@ -35,10 +35,8 @@
#include <osmocom/core/talloc.h>
#include <osmocom/core/application.h>
-#include <osmocom/core/socket.h>
#include <osmocom/vty/telnet_interface.h>
#include <osmocom/vty/logging.h>
-#include <osmocom/gsm/protocol/ipaccess.h>
#include <osmo-bts/gsm_data.h>
#include <osmo-bts/logging.h>
@@ -47,9 +45,6 @@
#include <osmo-bts/vty.h>
#include <osmo-bts/bts_model.h>
#include <osmo-bts/pcu_if.h>
-#include <osmo-bts/oml.h>
-
-#include "misc/sysmobts_mgr.h"
#define SYSMOBTS_RF_LOCK_PATH "/var/lock/bts_rf_lock"
@@ -263,7 +258,6 @@ static void signal_handler(int signal)
case SIGINT:
//osmo_signal_dispatch(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL);
bts_shutdown(bts, "SIGINT");
- unlink(SOCKET_PATH);
break;
case SIGABRT:
case SIGUSR1:
@@ -294,97 +288,6 @@ static int write_pid_file(char *procname)
return 0;
}
-static int read_sock(struct osmo_fd *fd, unsigned int what)
-{
- struct msgb *msg;
- struct gsm_abis_mo *mo;
- int rc;
-
- msg = oml_msgb_alloc();
- if (msg == NULL) {
- LOGP(DL1C, LOGL_ERROR,
- "Failed to allocate oml msgb.\n");
- return -1;
- }
-
- rc = recv(fd->fd, msg->tail, msg->data_len, 0);
- if (rc <= 0) {
- close(fd->fd);
- osmo_fd_unregister(fd);
- fd->fd = -1;
- goto err;
- }
-
- msgb_put(msg, rc);
-
- rc = check_ipa_header(msg);
- if (rc < 0) {
- LOGP(DL1C, LOGL_ERROR, "Malformed receive message: Ipa hdr\n");
- goto err;
- }
-
- msgb_pull(msg, sizeof(struct ipaccess_head));
-
- rc = check_oml_msg(msg);
- if (rc < 0) {
- LOGP(DL1C, LOGL_ERROR, "Malformed receive message\n");
- goto err;
- }
-
- mo = &bts->mo;
- msg->trx = mo->bts->c0;
-
- return abis_oml_sendmsg(msg);
-
-err:
- msgb_free(msg);
- return -1;
-}
-
-static int accept_unix_sock(struct osmo_fd *fd, unsigned int what)
-{
- int sfd = fd->fd, cl;
- struct osmo_fd *read_fd = (struct osmo_fd *)fd->data;
-
- if (read_fd->fd > -1) {
- close(read_fd->fd);
- osmo_fd_unregister(read_fd);
- read_fd->fd = -1;
- }
-
- cl = accept(sfd, NULL, NULL);
- if (cl < 0) {
- LOGP(DL1C, LOGL_ERROR, "Failed to accept. errno: %s.\n",
- strerror(errno));
- return -1;
- }
-
- read_fd->fd = cl;
- if (osmo_fd_register(read_fd) != 0) {
- LOGP(DL1C, LOGL_ERROR, "Register the read file desc.\n");
- close(cl);
- read_fd->fd = -1;
- return -1;
- }
-
- return 0;
-}
-
-static int oml_sock_unix_init(struct osmo_fd *accept, struct osmo_fd *read)
-{
- int rc;
-
- accept->cb = accept_unix_sock;
- read->cb = read_sock;
- read->when = BSC_FD_READ;
- read->fd = -1;
- accept->data = read;
-
- rc = osmo_sock_unix_init_ofd(accept, SOCK_SEQPACKET, 0, SOCKET_PATH,
- OSMO_SOCK_F_BIND | OSMO_SOCK_F_NONBLOCK);
- return rc;
-}
-
int main(int argc, char **argv)
{
struct stat st;
@@ -392,7 +295,6 @@ int main(int argc, char **argv)
struct gsm_bts_role_bts *btsb;
struct e1inp_line *line;
void *tall_msgb_ctx;
- struct osmo_fd accept_fd, read_fd;
int rc;
tall_bts_ctx = talloc_named_const(NULL, 1, "OsmoBTS context");
@@ -471,12 +373,6 @@ int main(int argc, char **argv)
exit(1);
}
- rc = oml_sock_unix_init(&accept_fd, &read_fd);
- if (rc < 0) {
- perror("Error creating socket domain creation");
- exit(1);
- }
-
if (daemonize) {
rc = osmo_daemonize();
if (rc < 0) {
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
index e45d41f2..6c64d0f2 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
@@ -36,7 +36,6 @@
#include <osmocom/core/timer.h>
#include <osmocom/core/msgb.h>
#include <osmocom/core/serial.h>
-#include <osmocom/core/socket.h>
#include <osmocom/vty/telnet_interface.h>
#include <osmocom/vty/logging.h>
@@ -49,25 +48,6 @@
static int no_eeprom_write = 0;
static int daemonize = 0;
void *tall_mgr_ctx;
-static struct sbts2050_config_info confinfo;
-
-static struct sysmobts_mgr_instance sysmobts_mgr_inst = {
- .config_file = "osmobts-mgr.cfg",
-};
-
-const char *sysmomgr_copyright =
- "(C) 2012 by Harald Welte <laforge@gnumonks.org>\r\n"
- "(C) 2014 by Holger Hans Peter Freyther\r\n"
- "License AGPLv3+: GNU AGPL version 2 or later <http://gnu.org/licenses/agpl-3.0.html>\r\n"
- "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";
-
-static struct vty_app_info vty_info = {
- .name = "SysmoMgr",
- .version = PACKAGE_VERSION,
- .go_parent_cb = mgr_vty_go_parent,
- .is_config_node = mgr_vty_is_config_node,
-};
/* every 6 hours means 365*4 = 1460 EEprom writes per year (max) */
#define TEMP_TIMER_SECS (6 * 3600)
@@ -75,66 +55,8 @@ static struct vty_app_info vty_info = {
/* every 1 hours means 365*24 = 8760 EEprom writes per year (max) */
#define HOURS_TIMER_SECS (1 * 3600)
-/* every 5 minutes try to reconnect if we have a problem in the communication*/
-#define CONNECT_TIMER_SECS 300
-
#ifdef BUILD_SBTS2050
-static int fd_unix = -1;
-static int trx_nr = -1;
-static int state_connection;
-
static struct osmo_timer_list temp_uc_timer;
-static struct osmo_timer_list connect_timer;
-static void socket_connect_cb(void *data)
-{
- fd_unix = osmo_sock_unix_init(SOCK_SEQPACKET, 0, SOCKET_PATH,
- OSMO_SOCK_F_CONNECT);
- if (fd_unix < 0) {
- osmo_timer_schedule(&connect_timer, CONNECT_TIMER_SECS, 0);
- return;
- }
-
- osmo_timer_del(&connect_timer);
- state_connection = SYSMO_MGR_CONNECTED;
-}
-
-static int check_temperature(struct uc *ucontrol0, int lowlimit, int highlimit,
- int current_temp,
- enum sbts2050_temp_sensor sensor,
- enum sbts2050_alert_lvl alert)
-{
- int rc;
-
- if (lowlimit >= current_temp || highlimit <= current_temp) {
- switch (alert) {
- case SBTS2050_WARN_ALERT:
- rc = send_omlfailure(fd_unix, alert, sensor, &confinfo,
- trx_nr);
- break;
- case SBTS2050_SEVERE_ALERT:
- rc = send_omlfailure(fd_unix, alert, sensor,
- &confinfo, trx_nr);
- sbts2050_uc_power(ucontrol0, confinfo.master_power_act,
- confinfo.slave_power_act,
- confinfo.pa_power_act);
- break;
- default:
- LOGP(DFIND, LOGL_ERROR, "Unknown alert type %d\n",
- alert);
- return -1;
- }
- } else {
- return 0;
- }
-
- state_connection = rc;
-
- if (state_connection == SYSMO_MGR_DISCONNECTED)
- socket_connect_cb(NULL);
-
- return 1;
-}
-
static void check_uctemp_timer_cb(void *data)
{
int temp_pa = 0, temp_board = 0;
@@ -142,33 +64,6 @@ static void check_uctemp_timer_cb(void *data)
sbts2050_uc_check_temp(ucontrol0, &temp_pa, &temp_board);
- confinfo.temp_pa_cur = temp_pa;
- confinfo.temp_board_cur = temp_board;
-
- check_temperature(ucontrol0,
- confinfo.temp_min_pa_warn_limit,
- confinfo.temp_max_pa_warn_limit,
- temp_pa, SBTS2050_TEMP_PA,
- SBTS2050_WARN_ALERT);
-
- check_temperature(ucontrol0,
- confinfo.temp_min_pa_severe_limit,
- confinfo.temp_max_pa_severe_limit,
- temp_pa, SBTS2050_TEMP_PA,
- SBTS2050_SEVERE_ALERT);
-
- check_temperature(ucontrol0,
- confinfo.temp_min_board_warn_limit,
- confinfo.temp_max_board_warn_limit,
- temp_board, SBTS2050_TEMP_BOARD,
- SBTS2050_WARN_ALERT);
-
- check_temperature(ucontrol0,
- confinfo.temp_min_board_severe_limit,
- confinfo.temp_max_board_severe_limit,
- temp_board, SBTS2050_TEMP_BOARD,
- SBTS2050_SEVERE_ALERT);
-
osmo_timer_schedule(&temp_uc_timer, TEMP_TIMER_SECS, 0);
}
#endif
@@ -198,7 +93,6 @@ static void initialize_sbts2050(void)
if (val != 0)
return;
}
- trx_nr = val;
ucontrol0.fd = osmo_serial_init(ucontrol0.path, 115200);
if (ucontrol0.fd < 0) {
@@ -207,10 +101,6 @@ static void initialize_sbts2050(void)
return;
}
- /* start handle for reconnect the socket in case of error */
- connect_timer.cb = socket_connect_cb;
- socket_connect_cb(NULL);
-
temp_uc_timer.cb = check_uctemp_timer_cb;
temp_uc_timer.data = &ucontrol0;
check_uctemp_timer_cb(&ucontrol0);
@@ -240,14 +130,13 @@ static void print_help(void)
printf(" -s Disable color\n");
printf(" -d CAT enable debugging\n");
printf(" -D daemonize\n");
- printf(" -c Specify the filename of the config file\n");
}
static int parse_options(int argc, char **argv)
{
int opt;
- while ((opt = getopt(argc, argv, "nhsd:c:")) != -1) {
+ while ((opt = getopt(argc, argv, "nhsd:")) != -1) {
switch (opt) {
case 'n':
no_eeprom_write = 1;
@@ -264,9 +153,6 @@ static int parse_options(int argc, char **argv)
case 'D':
daemonize = 1;
break;
- case 'c':
- sysmobts_mgr_inst.config_file = optarg;
- break;
default:
return -1;
}
@@ -469,25 +355,6 @@ int main(int argc, char **argv)
if (rc < 0)
exit(2);
- vty_info.copyright = sysmomgr_copyright;
- vty_init(&vty_info);
- logging_vty_add_cmds(&mgr_log_info);
-
- sysmobts_mgr_vty_init();
-
- rc = sysmobts_mgr_parse_config(sysmobts_mgr_inst.config_file,
- &confinfo);
- if (rc < 0) {
- LOGP(DFIND, LOGL_FATAL, "Cannot parse config file\n");
- exit(1);
- }
-
- rc = telnet_init(tall_msgb_ctx, NULL, 4252);
- if (rc < 0) {
- fprintf(stderr, "Error initializing telnet\n");
- exit(1);
- }
-
/* start temperature check timer */
temp_timer.cb = check_temp_timer_cb;
check_temp_timer_cb(NULL);
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h
index 5e0d4a7b..ddb6774a 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h
+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h
@@ -1,35 +1,10 @@
#ifndef _SYSMOBTS_MGR_H
#define _SYSMOBTS_MGR_H
-#include <osmocom/vty/vty.h>
-#include <osmocom/vty/command.h>
-
enum {
DTEMP,
DFW,
DFIND,
};
-enum {
- SYSMO_MGR_DISCONNECTED = 0,
- SYSMO_MGR_CONNECTED,
-};
-
-#define SOCKET_PATH "/var/run/bts_oml"
-
-struct sbts2050_config_info;
-
-enum mgr_vty_node {
- MGR_NODE = _LAST_OSMOVTY_NODE + 1,
-};
-
-enum node_type mgr_vty_go_parent(struct vty *vty);
-int mgr_vty_is_config_node(struct vty *vty, int node);
-int sysmobts_mgr_vty_init(void);
-int sysmobts_mgr_parse_config(const char *config_file,
- struct sbts2050_config_info *cfg);
-
-struct sysmobts_mgr_instance {
- const char *config_file;
-};
#endif
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c
deleted file mode 100644
index 9a77a95a..00000000
--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* (C) 2014 by sysmocom - s.f.m.c. GmbH
- *
- * All Rights Reserved
- *
- * Author: Alvaro Neira Ayuso <anayuso@sysmocom.de>
- *
- * 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 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 <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdint.h>
-#include <ctype.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <osmocom/vty/vty.h>
-#include <osmocom/vty/command.h>
-#include <osmocom/vty/misc.h>
-
-#include <osmo-bts/logging.h>
-
-#include "sysmobts_misc.h"
-#include "sysmobts_mgr.h"
-
-static struct sbts2050_config_info *mgr_cfg;
-
-enum node_type mgr_vty_go_parent(struct vty *vty)
-{
- switch (vty->node) {
- case MGR_NODE:
- vty->node = CONFIG_NODE;
- break;
- default:
- vty->node = CONFIG_NODE;
- }
- return vty->node;
-}
-
-int mgr_vty_is_config_node(struct vty *vty, int node)
-{
- switch (node) {
- case MGR_NODE:
- return 1;
- default:
- return 0;
- }
-}
-
-#define MGR_STR "Configure sysmobts-mgr\n"
-#define MGR_TEMP_WARN_STR "Configure the temperature warning limits\n"
-#define MGR_TEMP_SEVERE_STR "Configure the temperature severe limits\n"
-
-static struct cmd_node mgr_node = {
- MGR_NODE,
- "%s(config-mgr)# ",
- 1,
-};
-
-DEFUN(cfg_mgr, cfg_mgr_cmd,
- "config-mgr",
- MGR_STR)
-{
- vty->node = MGR_NODE;
- return CMD_SUCCESS;
-}
-
-DEFUN(show_mgr, show_mgr_cmd, "show mgr",
- SHOW_STR "Display information about the mgr")
-{
- vty_out(vty, " temperature-warning board Min:%d Max:%d%s",
- mgr_cfg->temp_min_board_warn_limit,
- mgr_cfg->temp_max_board_warn_limit,
- VTY_NEWLINE);
-
- vty_out(vty, " temperature-severe board Min:%d Max:%d%s",
- mgr_cfg->temp_min_board_severe_limit,
- mgr_cfg->temp_max_board_severe_limit,
- VTY_NEWLINE);
-
- vty_out(vty, " temperature-warning pa Min:%d Max:%d%s",
- mgr_cfg->temp_min_pa_warn_limit,
- mgr_cfg->temp_max_pa_warn_limit,
- VTY_NEWLINE);
-
- vty_out(vty, " temperature-severe pa Min:%d Max:%d%s",
- mgr_cfg->temp_min_pa_severe_limit,
- mgr_cfg->temp_max_pa_severe_limit,
- VTY_NEWLINE);
-
- vty_out(vty, " power-action Master:%s Slave:%s PA:%s%s",
- mgr_cfg->master_power_act ? "on" : "off",
- mgr_cfg->slave_power_act ? "on" : "off",
- mgr_cfg->pa_power_act ? "on" : "off",
- VTY_NEWLINE);
-
- vty_out(vty, " power-reduce-transmitter %d%s",
- mgr_cfg->reduce_max_power,
- VTY_NEWLINE);
- return CMD_SUCCESS;
-}
-
-static int config_write_mgr(struct vty *vty)
-{
- vty_out(vty, "config-mgr%s", VTY_NEWLINE);
-
- vty_out(vty, " temperature-warning board %d %d%s",
- mgr_cfg->temp_min_board_warn_limit,
- mgr_cfg->temp_max_board_warn_limit,
- VTY_NEWLINE);
-
- vty_out(vty, " temperature-severe board %d %d%s",
- mgr_cfg->temp_min_board_severe_limit,
- mgr_cfg->temp_max_board_severe_limit,
- VTY_NEWLINE);
-
- vty_out(vty, " temperature-warning pa %d %d%s",
- mgr_cfg->temp_min_pa_warn_limit,
- mgr_cfg->temp_max_pa_warn_limit,
- VTY_NEWLINE);
-
- vty_out(vty, " temperature-severe pa %d %d%s",
- mgr_cfg->temp_min_pa_severe_limit,
- mgr_cfg->temp_max_pa_severe_limit,
- VTY_NEWLINE);
-
- vty_out(vty, " power-action %s %s %s%s",
- mgr_cfg->master_power_act ? "on" : "off",
- mgr_cfg->slave_power_act ? "on" : "off",
- mgr_cfg->pa_power_act ? "on" : "off",
- VTY_NEWLINE);
-
- vty_out(vty, " power-reduce-transmitter %d%s",
- mgr_cfg->reduce_max_power,
- VTY_NEWLINE);
-
- return CMD_SUCCESS;
-}
-
-DEFUN(cfg_mgr_board_temp_warn, cfg_mgr_board_temp_warn_cmd,
- "temperature-warning board <-255-255> <-255-255>",
- MGR_TEMP_WARN_STR
- "Set warning temperature limits on the Board\n"
- "Warning temperature low limit on the Board\n"
- "Warning temperature high limit on the Board\n")
-{
- mgr_cfg->temp_min_board_warn_limit = atoi(argv[0]);
- mgr_cfg->temp_max_board_warn_limit = atoi(argv[1]);
-
- return CMD_SUCCESS;
-}
-
-DEFUN(cfg_mgr_board_temp_sever, cfg_mgr_board_temp_sever_cmd,
- "temperature-severe board <-255-255> <-255-255>",
- MGR_TEMP_SEVERE_STR
- "Set severe temperature limits on the Board\n"
- "Severe temperature low limit on the Board\n"
- "Severe Temperature high limit on the Board\n")
-{
- mgr_cfg->temp_min_board_severe_limit = atoi(argv[0]);
- mgr_cfg->temp_max_board_severe_limit = atoi(argv[1]);
-
- return CMD_SUCCESS;
-}
-
-DEFUN(cfg_mgr_pa_temp_warn, cfg_mgr_pa_temp_warn_cmd,
- "temperature-warning pa <-255-255> <-255-255>",
- MGR_TEMP_WARN_STR
- "Set warning temperature limits on the PA\n"
- "Warning temperature low limit on the PA\n"
- "Warning temperature high limit on the PA\n")
-{
- mgr_cfg->temp_min_pa_warn_limit = atoi(argv[0]);
- mgr_cfg->temp_max_pa_warn_limit = atoi(argv[1]);
-
- return CMD_SUCCESS;
-}
-
-DEFUN(cfg_mgr_pa_temp_sever, cfg_mgr_pa_temp_sever_cmd,
- "temperature-severe pa <-255-255> <-255-255>",
- MGR_TEMP_SEVERE_STR
- "Set severe temperature limits on the Board\n"
- "Severe temperature low limit on the PA\n"
- "Severe temperature high limit on the PA\n")
-{
- mgr_cfg->temp_min_pa_severe_limit = atoi(argv[0]);
- mgr_cfg->temp_max_pa_severe_limit = atoi(argv[1]);
-
- return CMD_SUCCESS;
-}
-
-DEFUN(cfg_mgr_pwr_action, cfg_mgr_pwr_action_cmd,
- "power-action (on|off) (on|off) (on|off)",
- "Configure which devices we want to turn on/off in several situation\n"
- "Turn on the Master\n"
- "Turn off the Master\n"
- "Turn on the Slave\n"
- "Turn off the Slave\n"
- "Turn on the PA\n"
- "Turn off the PA\n")
-{
- if (strcmp(argv[0], "on") == 0)
- mgr_cfg->master_power_act = 1;
- else if (strcmp(argv[0], "off") == 0)
- mgr_cfg->master_power_act = 0;
-
- if (strcmp(argv[1], "on") == 0)
- mgr_cfg->slave_power_act = 1;
- else if (strcmp(argv[1], "off") == 0)
- mgr_cfg->slave_power_act = 0;
-
- if (strcmp(argv[2], "on") == 0)
- mgr_cfg->pa_power_act = 1;
- else if (strcmp(argv[2], "off") == 0)
- mgr_cfg->pa_power_act = 0;
-
- return CMD_SUCCESS;
-}
-
-DEFUN(cfg_mgr_pa_baud_action, cfg_mgr_pa_baud_action_cmd,
- "power-reduce-transmitter <0-255>",
- "Configure the power that we want to reduce in warning situation\n"
- "Power baud transmition that we want to reduce in the PA\n")
-{
- mgr_cfg->reduce_max_power = atoi(argv[0]);
-
- return CMD_SUCCESS;
-}
-
-int sysmobts_mgr_vty_init(void)
-
-{
- install_element_ve(&show_mgr_cmd);
-
- install_node(&mgr_node, config_write_mgr);
- install_element(CONFIG_NODE, &cfg_mgr_cmd);
- vty_install_default(MGR_NODE);
-
- install_element(MGR_NODE, &cfg_mgr_board_temp_warn_cmd);
- install_element(MGR_NODE, &cfg_mgr_board_temp_sever_cmd);
- install_element(MGR_NODE, &cfg_mgr_pa_temp_warn_cmd);
- install_element(MGR_NODE, &cfg_mgr_pa_temp_sever_cmd);
- install_element(MGR_NODE, &cfg_mgr_pwr_action_cmd);
- install_element(MGR_NODE, &cfg_mgr_pa_baud_action_cmd);
-
- return 0;
-}
-
-int sysmobts_mgr_parse_config(const char *config_file,
- struct sbts2050_config_info *cfg)
-{
- int rc;
-
- mgr_cfg = cfg;
-
- rc = vty_read_config_file(config_file, NULL);
- if (rc < 0) {
- fprintf(stderr, "Failed to parse the config file: '%s'\n",
- config_file);
- return rc;
- }
-
- return 0;
-}
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_misc.c b/src/osmo-bts-sysmo/misc/sysmobts_misc.c
index 06f0c4c1..9ea26c29 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_misc.c
+++ b/src/osmo-bts-sysmo/misc/sysmobts_misc.c
@@ -29,19 +29,14 @@
#include <sys/signal.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <arpa/inet.h>
#include <osmocom/core/talloc.h>
#include <osmocom/core/utils.h>
#include <osmocom/core/msgb.h>
-#include <osmocom/core/socket.h>
#include <osmocom/core/application.h>
#include <osmocom/vty/telnet_interface.h>
#include <osmocom/vty/logging.h>
-#include <osmocom/gsm/abis_nm.h>
-#include <osmocom/gsm/protocol/ipaccess.h>
-#include "utils.h"
#include "btsconfig.h"
#include "sysmobts_misc.h"
#include "sysmobts_par.h"
@@ -54,140 +49,9 @@
#define SERIAL_ALLOC_SIZE 300
#define SIZE_HEADER_RSP 5
#define SIZE_HEADER_CMD 4
-#define OM_ALLOC_SIZE 1024
-#define OM_HEADROOM_SIZE 128
-#ifdef BUILD_SBTS2050
-static void add_sw_descr(struct msgb *msg)
-{
- char file_version[255];
- char file_id[255];
-
- strncpy(file_id, "sysmomgr", strlen("sysmomgr"));
- file_id[sizeof(file_id) - 1] = '\0';
- strncpy(file_version, PACKAGE_VERSION, strlen(PACKAGE_VERSION));
- file_version[sizeof(file_version) - 1] = '\0';
- msgb_v_put(msg, NM_ATT_SW_DESCR);
- msgb_tl16v_put(msg, NM_ATT_FILE_ID, strlen(file_id),
- (uint8_t *)file_id);
- msgb_tl16v_put(msg, NM_ATT_FILE_VERSION, strlen(file_version),
- (uint8_t *)file_version);
-}
-
-static void add_probable_cause(struct msgb *msg)
-{
- msgb_tv_put(msg, NM_ATT_PROB_CAUSE, NM_PCAUSE_T_MANUF);
- msgb_v_put(msg, 0);
- msgb_v_put(msg, 0);
-}
-
-static void add_oml_hdr_msg(struct msgb *msg, uint8_t msg_type,
- uint8_t obj_class, uint8_t bts_nr,
- uint8_t trx_nr, uint8_t ts_nr, int is_manuf)
-{
- struct abis_om_fom_hdr *foh;
- struct abis_om_hdr *omh;
-
- msg->l3h = msgb_push(msg, sizeof(*foh));
- foh = (struct abis_om_fom_hdr *) msg->l3h;
-
- foh->msg_type = msg_type;
- foh->obj_class = obj_class;
- foh->obj_inst.bts_nr = bts_nr;
- foh->obj_inst.trx_nr = trx_nr;
- foh->obj_inst.ts_nr = ts_nr;
-
- if (is_manuf)
- add_manufacturer_id_label(msg, MANUF_ID_OSMO);
-
- msg->l2h = msgb_push(msg, sizeof(*omh));
- omh = (struct abis_om_hdr *) msg->l2h;
-
- if (is_manuf)
- omh->mdisc = ABIS_OM_MDISC_MANUF;
- else
- omh->mdisc = ABIS_OM_MDISC_FOM;
- omh->placement = ABIS_OM_PLACEMENT_ONLY;
- omh->sequence = 0;
- omh->length = msgb_l3len(msg);
-}
-
-int send_omlfailure(int fd_unix, enum sbts2050_alert_lvl alert,
- enum sbts2050_temp_sensor sensor,
- struct sbts2050_config_info *add_info, int trx_nr)
-{
- int rc;
- struct msgb *msg;
- const char *buf, *nsensor;
-
- msg = msgb_alloc_headroom(OM_ALLOC_SIZE, OM_HEADROOM_SIZE, "OML");
- if (msg == NULL) {
- LOGP(DTEMP, LOGL_ERROR, "Failed to allocate oml msgb\n");
- return -1;
- }
-
- add_oml_hdr_msg(msg, NM_MT_FAILURE_EVENT_REP, 0, 0, trx_nr, 255, 0);
-
- msgb_tv_put(msg, NM_ATT_EVENT_TYPE, NM_EVT_ENV_FAIL);
-
- switch (alert) {
- case SBTS2050_WARN_ALERT:
- msgb_tv_put(msg, NM_ATT_SEVERITY, NM_SEVER_WARNING);
- break;
- case SBTS2050_SEVERE_ALERT:
- msgb_tv_put(msg, NM_ATT_SEVERITY, NM_SEVER_CRITICAL);
- break;
- default:
- LOGP(DTEMP, LOGL_ERROR, "Unknown attr severity type %d\n",
- alert);
- goto err;
- }
-
- add_probable_cause(msg);
-
- add_sw_descr(msg);
-
- switch (sensor) {
- case SBTS2050_TEMP_BOARD:
- buf = "Unusual temperature on the Board";
- nsensor = "Board";
- break;
- case SBTS2050_TEMP_PA:
- buf = "Unusual temperature on the PA";
- nsensor = "PA";
- break;
- default:
- LOGP(DTEMP, LOGL_ERROR, "Unknown sensor type %d\n", sensor);
- goto err;
- }
- strncpy(add_info->name_sensor, nsensor, sizeof(add_info->name_sensor));
- add_info->name_sensor[sizeof(add_info->name_sensor) - 1] = '\0';
-
- msgb_tl16v_put(msg, NM_ATT_ADD_TEXT, strlen(buf), (const uint8_t *)buf);
-
- msgb_tl16v_put(msg, NM_ATT_ADD_INFO,
- sizeof(struct sbts2050_config_info),
- (const uint8_t *)add_info);
-
- prepend_oml_ipa_header(msg);
-
- rc = send(fd_unix, msg->data, msg->len, 0);
- if (rc < 0 || rc != msg->len) {
- LOGP(DTEMP, LOGL_ERROR,
- "send error %s during send the Failure Event Report msg\n",
- strerror(errno));
- close(fd_unix);
- msgb_free(msg);
- return SYSMO_MGR_DISCONNECTED;
- }
-
- msgb_free(msg);
- return SYSMO_MGR_CONNECTED;
-err:
- msgb_free(msg);
- return -1;
-}
+#ifdef BUILD_SBTS2050
/**********************************************************************
* Functions read/write from serial interface
*********************************************************************/
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_misc.h b/src/osmo-bts-sysmo/misc/sysmobts_misc.h
index c22a54b2..01878f24 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_misc.h
+++ b/src/osmo-bts-sysmo/misc/sysmobts_misc.h
@@ -32,34 +32,6 @@ struct ucinfo {
int pa;
};
-enum sbts2050_alert_lvl {
- SBTS2050_WARN_ALERT,
- SBTS2050_SEVERE_ALERT
-};
-
-enum sbts2050_temp_sensor {
- SBTS2050_TEMP_BOARD,
- SBTS2050_TEMP_PA
-};
-
-struct sbts2050_config_info {
- char name_sensor[8];
- int temp_max_pa_warn_limit;
- int temp_min_pa_warn_limit;
- int temp_max_pa_severe_limit;
- int temp_min_pa_severe_limit;
- int temp_max_board_warn_limit;
- int temp_min_board_warn_limit;
- int temp_max_board_severe_limit;
- int temp_min_board_severe_limit;
- int reduce_max_power;
- int slave_power_act;
- int master_power_act;
- int pa_power_act;
- int temp_pa_cur;
- int temp_board_cur;
-};
-
int sysmobts_temp_get(enum sysmobts_temp_sensor sensor,
enum sysmobts_temp_type type);
@@ -71,10 +43,6 @@ void sbts2050_uc_power(struct uc *ucontrol, int pmaster, int pslave, int ppa);
int sbts2050_uc_status(struct uc *ucontrol, enum sbts2050_status_rqt status);
-int send_omlfailure(int fd_unix, enum sbts2050_alert_lvl alert,
- enum sbts2050_temp_sensor sensor,
- struct sbts2050_config_info *add_info, int trx_nr);
-
int sysmobts_update_hours(int no_epprom_write);
enum sysmobts_firmware_type {
diff --git a/src/osmo-bts-sysmo/utils.c b/src/osmo-bts-sysmo/utils.c
index 01e6f973..af1e5d29 100644
--- a/src/osmo-bts-sysmo/utils.c
+++ b/src/osmo-bts-sysmo/utils.c
@@ -27,9 +27,6 @@
#include <osmo-bts/gsm_data.h>
#include <osmo-bts/logging.h>
-#include <osmocom/core/msgb.h>
-#include <osmocom/gsm/protocol/ipaccess.h>
-
#include "femtobts.h"
#include "l1_if.h"
@@ -150,166 +147,3 @@ int sysmobts_get_power_trx(struct gsm_bts_trx *trx)
return power_transmitter;
}
-
-void prepend_oml_ipa_header(struct msgb *msg)
-{
- struct ipaccess_head *hh;
-
- hh = (struct ipaccess_head *) msgb_push(msg, sizeof(*hh));
- hh->proto = IPAC_PROTO_OML;
- hh->len = htons(msg->len - sizeof(struct ipaccess_head));
-}
-
-/**
- * \brief Check that the data in \param msg is a proper OML message
- *
- * This function verifies that the data in \param in msg is a proper
- * OML message and can be handled by later functions. In the successful
- * case the msg->l2h will now point to the OML header and the msg->l3h
- * will point to the FOM header. The value of l2h/l3h is undefined in
- * case the verification of the \param msg is failing.
- *
- * \param msg The message to analyze. msg->len starting from msg->data
- * will be analyzed.
- * \return This function returns the msg with the l2h/l3h pointers in the right
- * direction on success and on failure, in the case that the msg doesn't contain
- * the OML header or the OML header values aren't the expect, the function
- * doesn't set the l2h and l3h. In the case that the msg don't contains the FOM
- * header or the FOM header values aren't the expect, the function set the l2h
- * but doesn't set the l3h.
- */
-
-int check_oml_msg(struct msgb *msg)
-{
- struct abis_om_hdr *omh;
- int abis_oml_hdr_len;
- char label_id[255];
-
- abis_oml_hdr_len = sizeof(struct abis_om_hdr);
-
- if (msg->len < abis_oml_hdr_len) {
- LOGP(DL1C, LOGL_ERROR, "Om header insufficient space %d %d\n",
- msg->len, abis_oml_hdr_len);
- return -1;
- }
-
- msg->l2h = msg->data;
-
- omh = (struct abis_om_hdr *) msg->l2h;
-
- if (omh->mdisc != ABIS_OM_MDISC_FOM &&
- omh->mdisc != ABIS_OM_MDISC_MANUF) {
- LOGP(DL1C, LOGL_ERROR, "Incorrect om mdisc value %x\n",
- omh->mdisc);
- return -1;
- }
-
- if (omh->placement != ABIS_OM_PLACEMENT_ONLY) {
- LOGP(DL1C, LOGL_ERROR, "Incorrect om placement value %x %x\n",
- omh->placement, ABIS_OM_PLACEMENT_ONLY);
- return -1;
- }
-
- if (omh->sequence != 0) {
- LOGP(DL1C, LOGL_ERROR, "Incorrect om sequence value %d\n",
- omh->sequence);
- return -1;
- }
-
- if (omh->length != sizeof(struct abis_om_fom_hdr)) {
- LOGP(DL1C, LOGL_ERROR, "Incorrect om length value %d %d\n",
- omh->length, sizeof(struct abis_om_fom_hdr));
- return -1;
- }
-
- if (omh->mdisc == ABIS_OM_MDISC_MANUF) {
- abis_oml_hdr_len += sizeof(ipaccess_magic);
-
- if (msg->len < abis_oml_hdr_len) {
- LOGP(DL1C, LOGL_ERROR,
- "ID manuf label insufficient space %d %d\n",
- msg->len, abis_oml_hdr_len);
- return -1;
- }
- }
-
- abis_oml_hdr_len += sizeof(struct abis_om_fom_hdr);
-
- if (msg->len < abis_oml_hdr_len) {
- LOGP(DL1C, LOGL_ERROR, "Fom header insufficient space %d %d\n",
- msg->len, abis_oml_hdr_len);
- return -1;
- }
-
- msg->l3h = msg->data + sizeof(struct abis_om_hdr);
-
- if (omh->mdisc == ABIS_OM_MDISC_MANUF) {
- strncpy(label_id, (const char *) msg->l3h + 1,
- sizeof(ipaccess_magic));
-
- if (strncmp(ipaccess_magic, label_id,
- sizeof(ipaccess_magic)) == 0) {
- msg->l3h = msg->l3h + sizeof(ipaccess_magic) + 1;
- return OML_MSG_TYPE_IPA;
- } else if (strncmp(osmocom_magic, label_id,
- sizeof(osmocom_magic)) == 0) {
- msg->l3h = msg->l3h + sizeof(osmocom_magic) + 1;
- return OML_MSG_TYPE_OSMO;
- } else {
- msg->l3h = NULL;
- LOGP(DL1C, LOGL_ERROR,
- "Manuf Label Unknown %s\n", label_id);
- return -1;
- }
- }
-
- return OML_MSG_TYPE_ETSI;
-}
-
-int check_ipa_header(struct msgb *msg)
-{
- struct ipaccess_head *hh;
-
- if (msg->len < sizeof(struct ipaccess_head)) {
- LOGP(DL1C, LOGL_ERROR, "Ipa header insufficient space %d %d\n",
- msg->len, sizeof(struct ipaccess_head));
- return -1;
- }
-
- hh = (struct ipaccess_head *)msg->data;
-
- if (hh->proto != IPAC_PROTO_OML) {
- LOGP(DL1C, LOGL_ERROR, "Incorrect ipa header protocol %x %x\n",
- hh->proto, IPAC_PROTO_OML);
- return -1;
- }
-
- if (ntohs(hh->len) != msg->len - sizeof(struct ipaccess_head)) {
- LOGP(DL1C, LOGL_ERROR, "Incorrect ipa header msg size %d %d\n",
- ntohs(hh->len), msg->len - sizeof(struct ipaccess_head));
- return -1;
- }
-
- return 0;
-}
-
-int add_manufacturer_id_label(struct msgb *msg, enum manuf_type_id type_id)
-{
- uint8_t *manuf;
-
- switch (type_id) {
- case MANUF_ID_IPA:
- manuf = msgb_push(msg, 1 + sizeof(ipaccess_magic));
- manuf[0] = sizeof(ipaccess_magic);
- memcpy(manuf+1, ipaccess_magic, sizeof(ipaccess_magic));
- break;
- case MANUF_ID_OSMO:
- manuf = msgb_push(msg, 1 + sizeof(osmocom_magic));
- manuf[0] = sizeof(osmocom_magic);
- memcpy(manuf+1, osmocom_magic, sizeof(osmocom_magic));
- break;
- default:
- return -1;
- }
- return 0;
-}
diff --git a/src/osmo-bts-sysmo/utils.h b/src/osmo-bts-sysmo/utils.h
index c38757e3..aef774ca 100644
--- a/src/osmo-bts-sysmo/utils.h
+++ b/src/osmo-bts-sysmo/utils.h
@@ -13,27 +13,4 @@ int sysmobts_select_femto_band(struct gsm_bts_trx *trx, uint16_t arfcn);
int sysmobts_get_nominal_power(struct gsm_bts_trx *trx);
int sysmobts_get_power_trx(struct gsm_bts_trx *trx);
-
-struct msgb;
-
-enum manuf_type_id {
- MANUF_ID_IPA,
- MANUF_ID_OSMO,
-};
-
-enum oml_message_type {
- OML_MSG_TYPE_ETSI,
- OML_MSG_TYPE_IPA,
- OML_MSG_TYPE_OSMO,
-};
-
-static const char osmocom_magic[] = "org.osmocom";
-static const char ipaccess_magic[] = "com.ipaccess";
-
-int add_manufacturer_id_label(struct msgb *msg, enum manuf_type_id type_id);
-
-void prepend_oml_ipa_header(struct msgb *msg);
-
-int check_oml_msg(struct msgb *msg);
-int check_ipa_header(struct msgb *msg);
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 06:00:05 +0000