2 Apr
2014
2 Apr
'14
11:56 a.m.
From: Álvaro Neira Ayuso <anayuso(a)sysmocom.de>
With this patch, the manager monitors the sensors and send
OML Failure message from the Manager to the BTS and the BTS
to BSC, for having a report system of the sensors.
Signed-off-by: Alvaro Neira Ayuso <anayuso(a)sysmocom.de>
---
v3: Changed the unix domain socket path for having an appropriate location
src/osmo-bts-sysmo/main.c | 65 ++++++++++++++
src/osmo-bts-sysmo/misc/sysmobts_mgr.c | 77 +++++++++++++++++
src/osmo-bts-sysmo/misc/sysmobts_misc.c | 140 ++++++++++++++++++++++++++++++-
src/osmo-bts-sysmo/misc/sysmobts_misc.h | 33 ++++++++
4 files changed, 314 insertions(+), 1 deletion(-)
diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c
index 74ee47f..2992e5b 100644
--- a/src/osmo-bts-sysmo/main.c
+++ b/src/osmo-bts-sysmo/main.c
@@ -35,6 +35,7 @@
#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>
@@ -45,8 +46,10 @@
#include <osmo-bts/vty.h>
#include <osmo-bts/bts_model.h>
#include <osmo-bts/pcu_if.h>
+#include <osmo-bts/oml.h>
#define SYSMOBTS_RF_LOCK_PATH "/var/lock/bts_rf_lock"
+#define SOCKET_PATH "/var/run/bts_oml"
#include "utils.h"
#include "eeprom.h"
@@ -258,6 +261,7 @@ 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:
@@ -288,6 +292,55 @@ 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)
+ return -1;
+
+ rc = recv(fd->fd, msg->tail, msg->data_len, 0);
+ if (rc <= 0) {
+ close(fd->fd);
+ osmo_fd_unregister(fd);
+ return -1;
+ }
+
+ msgb_put(msg, rc);
+
+ /*Remove the IPA header for removing the conflict with the new IPA
+ * header*/
+ msgb_pull(msg, sizeof(struct ipaccess_head *)-1);
+
+ mo = &bts->mo;
+ msg->trx = mo->bts->c0;
+ msg->l2h = msg->data;
+ msg->l3h = msg->data + sizeof(struct abis_om_fom_hdr);
+
+ return abis_oml_sendmsg(msg);
+}
+
+static int accept_unix_sock(struct osmo_fd *fd, unsigned int what)
+{
+ int sfd = fd->fd, cl;
+ struct osmo_fd *ofd = (struct osmo_fd *)fd->data;
+
+ cl = accept(sfd, NULL, NULL);
+ if (cl < 0)
+ return -1;
+
+ ofd->fd = cl;
+ if (osmo_fd_register(ofd) != 0) {
+ close(cl);
+ return -1;
+ }
+
+ return 0;
+}
+
int main(int argc, char **argv)
{
struct stat st;
@@ -295,6 +348,7 @@ int main(int argc, char **argv)
struct gsm_bts_role_bts *btsb;
struct e1inp_line *line;
void *tall_msgb_ctx;
+ struct osmo_fd fd, rfd;
int rc;
tall_bts_ctx = talloc_named_const(NULL, 1, "OsmoBTS context");
@@ -370,6 +424,17 @@ int main(int argc, char **argv)
fprintf(stderr, "unable to connect to BSC\n");
exit(1);
}
+ fd.cb = accept_unix_sock;
+ rfd.cb = read_sock;
+ rfd.when = BSC_FD_READ;
+ fd.data = &rfd;
+
+ rc = osmo_sock_unix_init_ofd(&fd, SOCK_SEQPACKET, 0, SOCKET_PATH,
+ OSMO_SOCK_F_BIND | OSMO_SOCK_F_NONBLOCK);
+ if (rc < 0) {
+ perror("Error creating socket domain creation");
+ exit(3);
+ }
if (daemonize) {
rc = osmo_daemonize();
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
index 6c64d0f..525e526 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
@@ -36,6 +36,7 @@
#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>
@@ -47,7 +48,11 @@
static int no_eeprom_write = 0;
static int daemonize = 0;
+static int trx_nr = -1;
+static int fd_unix = -1;
+static int state_connection = 0;
void *tall_mgr_ctx;
+static struct sbts2050_config_info confinfo;
/* every 6 hours means 365*4 = 1460 EEprom writes per year (max) */
#define TEMP_TIMER_SECS (6 * 3600)
@@ -55,7 +60,29 @@ void *tall_mgr_ctx;
/* 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)
+
+/* unix domain socket file descriptor */
+#define SOCKET_PATH "/var/run/bts_oml"
+
#ifdef BUILD_SBTS2050
+static struct osmo_timer_list connect_timer;
+static void socket_connect_cb(void *data)
+{
+ if (state_connection == 0) {
+ fd_unix = osmo_sock_unix_init(SOCK_SEQPACKET, 0, SOCKET_PATH,
+ OSMO_SOCK_F_CONNECT);
+ if (fd_unix < 0) {
+ LOGP(DTEMP, LOGL_ERROR, "Error creating unix socket\n");
+ return;
+ }
+
+ state_connection = 1;
+ }
+ osmo_timer_schedule(&connect_timer, CONNECT_TIMER_SECS, 0);
+}
+
static struct osmo_timer_list temp_uc_timer;
static void check_uctemp_timer_cb(void *data)
{
@@ -64,6 +91,50 @@ 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;
+
+ if (confinfo.temp_min_pa_warn_limit > temp_pa ||
+ confinfo.temp_max_pa_warn_limit < temp_pa) {
+ state_connection = sendto_osmobts(fd_unix, ucontrol0,
+ SBTS2050_WARN_ALERT,
+ SBTS2050_TEMP_PA,
+ &confinfo, trx_nr);
+ } else if (confinfo.temp_min_pa_sever_limit > temp_pa ||
+ confinfo.temp_max_pa_sever_limit < temp_pa) {
+ state_connection = sendto_osmobts(fd_unix, ucontrol0,
+ SBTS2050_SEVER_ALERT,
+ SBTS2050_TEMP_PA,
+ &confinfo, trx_nr);
+ sbts2050_uc_power(ucontrol0,
+ sbts2050_uc_status(ucontrol0,
+ SBTS2050_STATUS_MASTER),
+ sbts2050_uc_status(ucontrol0,
+ SBTS2050_STATUS_SLAVE),
+ confinfo.pa_power_act);
+ }
+
+ if (confinfo.temp_min_board_warn_limit > temp_board ||
+ confinfo.temp_max_board_warn_limit < temp_board) {
+ state_connection = sendto_osmobts(fd_unix, ucontrol0,
+ SBTS2050_WARN_ALERT,
+ SBTS2050_TEMP_BOARD,
+ &confinfo, trx_nr);
+ } else if (confinfo.temp_min_board_sever_limit > temp_board ||
+ confinfo.temp_max_board_sever_limit < temp_board) {
+ state_connection = sendto_osmobts(fd_unix, ucontrol0,
+ SBTS2050_SEVER_ALERT,
+ SBTS2050_TEMP_BOARD,
+ &confinfo, trx_nr);
+ sbts2050_uc_power(ucontrol0, confinfo.master_power_act,
+ confinfo.slave_power_act,
+ sbts2050_uc_status(ucontrol0,
+ SBTS2050_STATUS_PA));
+ }
+
+ if (state_connection == 0)
+ close(fd_unix);
+
osmo_timer_schedule(&temp_uc_timer, TEMP_TIMER_SECS, 0);
}
#endif
@@ -93,6 +164,7 @@ static void initialize_sbts2050(void)
if (val != 0)
return;
}
+ trx_nr = val;
ucontrol0.fd = osmo_serial_init(ucontrol0.path, 115200);
if (ucontrol0.fd < 0) {
@@ -169,6 +241,7 @@ static void signal_handler(int signal)
case SIGINT:
sysmobts_check_temp(no_eeprom_write);
sysmobts_update_hours(no_eeprom_write);
+ close(fd_unix);
exit(0);
break;
case SIGABRT:
@@ -363,6 +436,10 @@ int main(int argc, char **argv)
hours_timer.cb = hours_timer_cb;
hours_timer_cb(NULL);
+ /*start handle for reconnect the socket in case of error*/
+ connect_timer.cb = socket_connect_cb;
+ socket_connect_cb(NULL);
+
/* start uc temperature check timer */
initialize_sbts2050();
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_misc.c
b/src/osmo-bts-sysmo/misc/sysmobts_misc.c
index 9ea26c2..0e89da6 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_misc.c
+++ b/src/osmo-bts-sysmo/misc/sysmobts_misc.c
@@ -29,13 +29,17 @@
#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 "btsconfig.h"
#include "sysmobts_misc.h"
@@ -49,10 +53,144 @@
#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
+#define IPA_OML_PROTO 0xFF
#ifdef BUILD_SBTS2050
/**********************************************************************
+ * Function send information to OsmoBts
+ *********************************************************************/
+static void add_sw_descr(struct msgb *msg)
+{
+ char file_version[255];
+ char file_id[255];
+
+ strcpy(file_id, "sysmomgr");
+ strncpy(file_version, PACKAGE_VERSION, strlen(PACKAGE_VERSION));
+ 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_ipa_header(struct msgb *msg)
+{
+ struct ipaccess_head *hh;
+
+ hh = (struct ipaccess_head *) msgb_push(msg, sizeof(*hh));
+ hh->proto = IPA_OML_PROTO;
+ hh->len = htons(msg->len);
+}
+
+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)
+{
+ 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;
+
+ msg->l2h = msgb_push(msg, sizeof(*omh));
+ omh = (struct abis_om_hdr *) msg->l2h;
+
+ omh->mdisc = ABIS_OM_MDISC_FOM;
+ omh->placement = ABIS_OM_PLACEMENT_ONLY;
+ omh->sequence = 0;
+ omh->length = msgb_l3len(msg);
+}
+
+int sendto_osmobts(int fd_unix, struct uc *ucontrol,
+ 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, "Error creating oml msg\n");
+ goto err;
+ }
+
+ add_oml_hdr_msg(msg, NM_MT_FAILURE_EVENT_REP, 0, 0, trx_nr, 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_SEVER_ALERT:
+ msgb_tv_put(msg, NM_ATT_SEVERITY, NM_SEVER_CRITICAL);
+ break;
+ default:
+ 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:
+ return -1;
+ }
+ memset(add_info->name_sensor, 0, sizeof(add_info->name_sensor));
+ strncpy(add_info->name_sensor, nsensor, strlen(nsensor));
+
+ msgb_tl16v_put(msg, NM_ATT_ADD_TEXT, strlen(buf), (const uint8_t *)buf);
+
+ /*If we need to send this structure to other machine, we need to pass
+ the integer inside the structure to internet format (big endian)*/
+ msgb_tl16v_put(msg, NM_ATT_ADD_INFO,
+ sizeof(struct sbts2050_config_info),
+ (const uint8_t *)add_info);
+
+ add_ipa_header(msg);
+
+ rc = send(fd_unix, msg->data, msg->len, 0);
+ if (rc < 0) {
+ LOGP(DTEMP, LOGL_ERROR, "Error writting in unix socket\n");
+ close(fd_unix);
+ msgb_free(msg);
+ return 0;
+ }
+
+ msgb_free(msg);
+ return 1;
+err:
+ msgb_free(msg);
+ return -1;
+}
+
+/**********************************************************************
* Functions read/write from serial interface
*********************************************************************/
static int hand_serial_read(int fd, struct msgb *msg, int numbytes)
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_misc.h
b/src/osmo-bts-sysmo/misc/sysmobts_misc.h
index 01878f2..b19606e 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_misc.h
+++ b/src/osmo-bts-sysmo/misc/sysmobts_misc.h
@@ -32,6 +32,34 @@ struct ucinfo {
int pa;
};
+enum sbts2050_alert_lvl {
+ SBTS2050_WARN_ALERT,
+ SBTS2050_SEVER_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_sever_limit;
+ int temp_min_pa_sever_limit;
+ int temp_max_board_warn_limit;
+ int temp_min_board_warn_limit;
+ int temp_max_board_sever_limit;
+ int temp_min_board_sever_limit;
+ int pa_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);
@@ -43,6 +71,11 @@ 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 sendto_osmobts(int fd_unix, struct uc *ucontrol,
+ 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 {
--
1.7.10.4