diff options
-rw-r--r-- | src/osmo-bts-litecell15/Makefile.am | 4 | ||||
-rw-r--r-- | src/osmo-bts-litecell15/main.c | 10 | ||||
-rw-r--r-- | src/osmo-bts-litecell15/oml_router.c | 132 | ||||
-rw-r--r-- | src/osmo-bts-litecell15/oml_router.h | 13 | ||||
-rw-r--r-- | src/osmo-bts-oc2g/Makefile.am | 4 | ||||
-rw-r--r-- | src/osmo-bts-oc2g/main.c | 10 | ||||
-rw-r--r-- | src/osmo-bts-oc2g/oml_router.c | 132 | ||||
-rw-r--r-- | src/osmo-bts-oc2g/oml_router.h | 13 | ||||
-rw-r--r-- | src/osmo-bts-sysmo/Makefile.am | 4 | ||||
-rw-r--r-- | src/osmo-bts-sysmo/main.c | 10 | ||||
-rw-r--r-- | src/osmo-bts-sysmo/oml_router.c | 129 | ||||
-rw-r--r-- | src/osmo-bts-sysmo/oml_router.h | 13 |
12 files changed, 6 insertions, 468 deletions
diff --git a/src/osmo-bts-litecell15/Makefile.am b/src/osmo-bts-litecell15/Makefile.am index 0cc124ab..bb68efaf 100644 --- a/src/osmo-bts-litecell15/Makefile.am +++ b/src/osmo-bts-litecell15/Makefile.am @@ -9,12 +9,12 @@ AM_CFLAGS += -DENABLE_LC15BTS EXTRA_DIST = misc/lc15bts_mgr.h misc/lc15bts_misc.h misc/lc15bts_par.h misc/lc15bts_led.h \ misc/lc15bts_temp.h misc/lc15bts_power.h misc/lc15bts_clock.h \ misc/lc15bts_bid.h misc/lc15bts_nl.h misc/lc15bts_bts.h misc/lc15bts_swd.h \ - hw_misc.h l1_if.h l1_transp.h lc15bts.h oml_router.h utils.h + hw_misc.h l1_if.h l1_transp.h lc15bts.h utils.h bin_PROGRAMS = osmo-bts-lc15 lc15bts-mgr lc15bts-util COMMON_SOURCES = main.c lc15bts.c l1_if.c oml.c lc15bts_vty.c tch.c hw_misc.c calib_file.c \ - utils.c misc/lc15bts_par.c misc/lc15bts_bid.c oml_router.c + utils.c misc/lc15bts_par.c misc/lc15bts_bid.c osmo_bts_lc15_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c osmo_bts_lc15_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD) diff --git a/src/osmo-bts-litecell15/main.c b/src/osmo-bts-litecell15/main.c index b48d3ecc..a4f04e78 100644 --- a/src/osmo-bts-litecell15/main.c +++ b/src/osmo-bts-litecell15/main.c @@ -76,7 +76,6 @@ static int write_status_file(char *status_file, char *status_str) #include "utils.h" #include "l1_if.h" #include "hw_misc.h" -#include "oml_router.h" #include "misc/lc15bts_bid.h" unsigned int dsp_trace = 0x00000000; @@ -84,8 +83,6 @@ unsigned int dsp_trace = 0x00000000; int bts_model_init(struct gsm_bts *bts) { struct stat st; - static struct osmo_fd accept_fd, read_fd; - int rc; struct bts_lc15_priv *bts_lc15 = talloc(bts, struct bts_lc15_priv); @@ -98,13 +95,6 @@ int bts_model_init(struct gsm_bts *bts) /* RTP drift threshold default */ bts_lc15->rtp_drift_thres_ms = LC15_BTS_RTP_DRIFT_THRES_DEFAULT; - rc = oml_router_init(bts, OML_ROUTER_PATH, &accept_fd, &read_fd); - if (rc < 0) { - fprintf(stderr, "Error creating the OML router: %s rc=%d\n", - OML_ROUTER_PATH, rc); - exit(1); - } - if (stat(LC15BTS_RF_LOCK_PATH, &st) == 0) { LOGP(DL1C, LOGL_NOTICE, "Not starting BTS due to RF_LOCK file present\n"); exit(23); diff --git a/src/osmo-bts-litecell15/oml_router.c b/src/osmo-bts-litecell15/oml_router.c deleted file mode 100644 index e20ce5b5..00000000 --- a/src/osmo-bts-litecell15/oml_router.c +++ /dev/null @@ -1,132 +0,0 @@ -/* Beginnings of an OML router */ - -/* Copyright (C) 2015 by Yves Godin <support@nuranwireless.com> - * - * Based on sysmoBTS: - * (C) 2014 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * 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 "oml_router.h" - -#include <osmo-bts/bts.h> -#include <osmo-bts/logging.h> -#include <osmo-bts/oml.h> -#include <osmo-bts/msg_utils.h> - -#include <osmocom/core/socket.h> -#include <osmocom/core/select.h> - -#include <errno.h> -#include <string.h> -#include <unistd.h> - -static int oml_router_read_cb(struct osmo_fd *fd, unsigned int what) -{ - struct msgb *msg; - int rc; - - msg = oml_msgb_alloc(); - if (!msg) { - 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; - } - - msg->l1h = msgb_put(msg, rc); - rc = msg_verify_ipa_structure(msg); - if (rc < 0) { - LOGP(DL1C, LOGL_ERROR, - "OML Router: Invalid IPA message rc(%d)\n", rc); - goto err; - } - - rc = msg_verify_oml_structure(msg); - if (rc < 0) { - LOGP(DL1C, LOGL_ERROR, - "OML Router: Invalid OML message rc(%d)\n", rc); - goto err; - } - - /* todo dispatch message */ - -err: - msgb_free(msg); - return -1; -} - -static int oml_router_accept_cb(struct osmo_fd *accept_fd, unsigned int what) -{ - int fd; - struct osmo_fd *read_fd = (struct osmo_fd *) accept_fd->data; - - /* Accept only one connection at a time. De-register it */ - if (read_fd->fd > -1) { - LOGP(DL1C, LOGL_NOTICE, - "New OML router connection. Closing old one.\n"); - close(read_fd->fd); - osmo_fd_unregister(read_fd); - read_fd->fd = -1; - } - - fd = accept(accept_fd->fd, NULL, NULL); - if (fd < 0) { - LOGP(DL1C, LOGL_ERROR, "Failed to accept. errno: %s.\n", - strerror(errno)); - return -1; - } - - read_fd->fd = fd; - if (osmo_fd_register(read_fd) != 0) { - LOGP(DL1C, LOGL_ERROR, "Registering the read fd failed.\n"); - close(fd); - read_fd->fd = -1; - return -1; - } - - return 0; -} - -int oml_router_init(struct gsm_bts *bts, const char *path, - struct osmo_fd *accept_fd, struct osmo_fd *read_fd) -{ - int rc; - - memset(accept_fd, 0, sizeof(*accept_fd)); - memset(read_fd, 0, sizeof(*read_fd)); - - accept_fd->cb = oml_router_accept_cb; - accept_fd->data = read_fd; - - read_fd->cb = oml_router_read_cb; - read_fd->data = bts; - read_fd->when = OSMO_FD_READ; - read_fd->fd = -1; - - rc = osmo_sock_unix_init_ofd(accept_fd, SOCK_SEQPACKET, 0, - path, - OSMO_SOCK_F_BIND | OSMO_SOCK_F_NONBLOCK); - return rc; -} diff --git a/src/osmo-bts-litecell15/oml_router.h b/src/osmo-bts-litecell15/oml_router.h deleted file mode 100644 index 8c08baaa..00000000 --- a/src/osmo-bts-litecell15/oml_router.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -struct gsm_bts; -struct osmo_fd; - -/** - * The default path lc15bts will listen for incoming - * registrations for OML routing and sending. - */ -#define OML_ROUTER_PATH "/var/run/lc15bts_oml_router" - - -int oml_router_init(struct gsm_bts *bts, const char *path, struct osmo_fd *accept, struct osmo_fd *read); diff --git a/src/osmo-bts-oc2g/Makefile.am b/src/osmo-bts-oc2g/Makefile.am index 54a8afab..7b18e88f 100644 --- a/src/osmo-bts-oc2g/Makefile.am +++ b/src/osmo-bts-oc2g/Makefile.am @@ -9,12 +9,12 @@ AM_CFLAGS += -DENABLE_OC2GBTS EXTRA_DIST = misc/oc2gbts_mgr.h misc/oc2gbts_misc.h misc/oc2gbts_par.h misc/oc2gbts_led.h \ misc/oc2gbts_temp.h misc/oc2gbts_power.h misc/oc2gbts_clock.h \ misc/oc2gbts_bid.h misc/oc2gbts_bts.h misc/oc2gbts_nl.h misc/oc2gbts_swd.h \ - hw_misc.h l1_if.h l1_transp.h oc2gbts.h oml_router.h utils.h + hw_misc.h l1_if.h l1_transp.h oc2gbts.h utils.h bin_PROGRAMS = osmo-bts-oc2g oc2gbts-mgr oc2gbts-util COMMON_SOURCES = main.c oc2gbts.c l1_if.c oml.c oc2gbts_vty.c tch.c hw_misc.c calib_file.c \ - utils.c misc/oc2gbts_par.c misc/oc2gbts_bid.c oml_router.c + utils.c misc/oc2gbts_par.c misc/oc2gbts_bid.c osmo_bts_oc2g_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c osmo_bts_oc2g_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD) diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c index a0f4d4a8..efbe180e 100644 --- a/src/osmo-bts-oc2g/main.c +++ b/src/osmo-bts-oc2g/main.c @@ -76,7 +76,6 @@ static int write_status_file(char *status_file, char *status_str) #include "utils.h" #include "l1_if.h" #include "hw_misc.h" -#include "oml_router.h" #include "misc/oc2gbts_bid.h" unsigned int dsp_trace = 0x00000000; @@ -84,8 +83,6 @@ unsigned int dsp_trace = 0x00000000; int bts_model_init(struct gsm_bts *bts) { struct stat st; - static struct osmo_fd accept_fd, read_fd; - int rc; struct bts_oc2g_priv *bts_oc2g = talloc(bts, struct bts_oc2g_priv); bts->model_priv = bts_oc2g; @@ -99,13 +96,6 @@ int bts_model_init(struct gsm_bts *bts) /* RTP drift threshold default */ /* bts_oc2g->rtp_drift_thres_ms = OC2G_BTS_RTP_DRIFT_THRES_DEFAULT; */ - rc = oml_router_init(bts, OML_ROUTER_PATH, &accept_fd, &read_fd); - if (rc < 0) { - fprintf(stderr, "Error creating the OML router: %s rc=%d\n", - OML_ROUTER_PATH, rc); - exit(1); - } - if (stat(OC2GBTS_RF_LOCK_PATH, &st) == 0) { LOGP(DL1C, LOGL_NOTICE, "Not starting BTS due to RF_LOCK file present\n"); exit(23); diff --git a/src/osmo-bts-oc2g/oml_router.c b/src/osmo-bts-oc2g/oml_router.c deleted file mode 100644 index e20ce5b5..00000000 --- a/src/osmo-bts-oc2g/oml_router.c +++ /dev/null @@ -1,132 +0,0 @@ -/* Beginnings of an OML router */ - -/* Copyright (C) 2015 by Yves Godin <support@nuranwireless.com> - * - * Based on sysmoBTS: - * (C) 2014 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * 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 "oml_router.h" - -#include <osmo-bts/bts.h> -#include <osmo-bts/logging.h> -#include <osmo-bts/oml.h> -#include <osmo-bts/msg_utils.h> - -#include <osmocom/core/socket.h> -#include <osmocom/core/select.h> - -#include <errno.h> -#include <string.h> -#include <unistd.h> - -static int oml_router_read_cb(struct osmo_fd *fd, unsigned int what) -{ - struct msgb *msg; - int rc; - - msg = oml_msgb_alloc(); - if (!msg) { - 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; - } - - msg->l1h = msgb_put(msg, rc); - rc = msg_verify_ipa_structure(msg); - if (rc < 0) { - LOGP(DL1C, LOGL_ERROR, - "OML Router: Invalid IPA message rc(%d)\n", rc); - goto err; - } - - rc = msg_verify_oml_structure(msg); - if (rc < 0) { - LOGP(DL1C, LOGL_ERROR, - "OML Router: Invalid OML message rc(%d)\n", rc); - goto err; - } - - /* todo dispatch message */ - -err: - msgb_free(msg); - return -1; -} - -static int oml_router_accept_cb(struct osmo_fd *accept_fd, unsigned int what) -{ - int fd; - struct osmo_fd *read_fd = (struct osmo_fd *) accept_fd->data; - - /* Accept only one connection at a time. De-register it */ - if (read_fd->fd > -1) { - LOGP(DL1C, LOGL_NOTICE, - "New OML router connection. Closing old one.\n"); - close(read_fd->fd); - osmo_fd_unregister(read_fd); - read_fd->fd = -1; - } - - fd = accept(accept_fd->fd, NULL, NULL); - if (fd < 0) { - LOGP(DL1C, LOGL_ERROR, "Failed to accept. errno: %s.\n", - strerror(errno)); - return -1; - } - - read_fd->fd = fd; - if (osmo_fd_register(read_fd) != 0) { - LOGP(DL1C, LOGL_ERROR, "Registering the read fd failed.\n"); - close(fd); - read_fd->fd = -1; - return -1; - } - - return 0; -} - -int oml_router_init(struct gsm_bts *bts, const char *path, - struct osmo_fd *accept_fd, struct osmo_fd *read_fd) -{ - int rc; - - memset(accept_fd, 0, sizeof(*accept_fd)); - memset(read_fd, 0, sizeof(*read_fd)); - - accept_fd->cb = oml_router_accept_cb; - accept_fd->data = read_fd; - - read_fd->cb = oml_router_read_cb; - read_fd->data = bts; - read_fd->when = OSMO_FD_READ; - read_fd->fd = -1; - - rc = osmo_sock_unix_init_ofd(accept_fd, SOCK_SEQPACKET, 0, - path, - OSMO_SOCK_F_BIND | OSMO_SOCK_F_NONBLOCK); - return rc; -} diff --git a/src/osmo-bts-oc2g/oml_router.h b/src/osmo-bts-oc2g/oml_router.h deleted file mode 100644 index 4b22e9c5..00000000 --- a/src/osmo-bts-oc2g/oml_router.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -struct gsm_bts; -struct osmo_fd; - -/** - * The default path oc2gbts will listen for incoming - * registrations for OML routing and sending. - */ -#define OML_ROUTER_PATH "/var/run/oc2gbts_oml_router" - - -int oml_router_init(struct gsm_bts *bts, const char *path, struct osmo_fd *accept, struct osmo_fd *read); diff --git a/src/osmo-bts-sysmo/Makefile.am b/src/osmo-bts-sysmo/Makefile.am index 5f588f8d..1faf1221 100644 --- a/src/osmo-bts-sysmo/Makefile.am +++ b/src/osmo-bts-sysmo/Makefile.am @@ -5,12 +5,12 @@ COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIB EXTRA_DIST = misc/sysmobts_mgr.h misc/sysmobts_misc.h misc/sysmobts_par.h \ misc/sysmobts_eeprom.h misc/sysmobts_nl.h femtobts.h hw_misc.h \ misc/sysmobts-layer1.h \ - l1_fwd.h l1_if.h l1_transp.h eeprom.h utils.h oml_router.h + l1_fwd.h l1_if.h l1_transp.h eeprom.h utils.h bin_PROGRAMS = osmo-bts-sysmo osmo-bts-sysmo-remote l1fwd-proxy sysmobts-mgr sysmobts-util COMMON_SOURCES = main.c femtobts.c l1_if.c oml.c sysmobts_vty.c tch.c hw_misc.c calib_file.c \ - eeprom.c calib_fixup.c utils.c misc/sysmobts_par.c oml_router.c sysmobts_ctrl.c + eeprom.c calib_fixup.c utils.c misc/sysmobts_par.c sysmobts_ctrl.c osmo_bts_sysmo_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c osmo_bts_sysmo_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD) diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index 51a14c7d..735768c9 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -53,24 +53,14 @@ #include "eeprom.h" #include "l1_if.h" #include "hw_misc.h" -#include "oml_router.h" int bts_model_init(struct gsm_bts *bts) { struct stat st; - static struct osmo_fd accept_fd, read_fd; - int rc; bts->variant = BTS_OSMO_SYSMO; bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); - rc = oml_router_init(bts, OML_ROUTER_PATH, &accept_fd, &read_fd); - if (rc < 0) { - fprintf(stderr, "Error creating the OML router: %s rc=%d\n", - OML_ROUTER_PATH, rc); - exit(1); - } - if (stat(SYSMOBTS_RF_LOCK_PATH, &st) == 0) { LOGP(DL1C, LOGL_NOTICE, "Not starting BTS due to RF_LOCK file present\n"); exit(23); diff --git a/src/osmo-bts-sysmo/oml_router.c b/src/osmo-bts-sysmo/oml_router.c deleted file mode 100644 index faaf1b57..00000000 --- a/src/osmo-bts-sysmo/oml_router.c +++ /dev/null @@ -1,129 +0,0 @@ -/* Beginnings of an OML router */ - -/* (C) 2014 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * 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 "oml_router.h" - -#include <osmo-bts/bts.h> -#include <osmo-bts/logging.h> -#include <osmo-bts/oml.h> -#include <osmo-bts/msg_utils.h> - -#include <osmocom/core/socket.h> -#include <osmocom/core/select.h> - -#include <errno.h> -#include <string.h> -#include <unistd.h> - -static int oml_router_read_cb(struct osmo_fd *fd, unsigned int what) -{ - struct msgb *msg; - int rc; - - msg = oml_msgb_alloc(); - if (!msg) { - 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; - } - - msg->l1h = msgb_put(msg, rc); - rc = msg_verify_ipa_structure(msg); - if (rc < 0) { - LOGP(DL1C, LOGL_ERROR, - "OML Router: Invalid IPA message rc(%d)\n", rc); - goto err; - } - - rc = msg_verify_oml_structure(msg); - if (rc < 0) { - LOGP(DL1C, LOGL_ERROR, - "OML Router: Invalid OML message rc(%d)\n", rc); - goto err; - } - - /* todo dispatch message */ - -err: - msgb_free(msg); - return -1; -} - -static int oml_router_accept_cb(struct osmo_fd *accept_fd, unsigned int what) -{ - int fd; - struct osmo_fd *read_fd = (struct osmo_fd *) accept_fd->data; - - /* Accept only one connection at a time. De-register it */ - if (read_fd->fd > -1) { - LOGP(DL1C, LOGL_NOTICE, - "New OML router connection. Closing old one.\n"); - close(read_fd->fd); - osmo_fd_unregister(read_fd); - read_fd->fd = -1; - } - - fd = accept(accept_fd->fd, NULL, NULL); - if (fd < 0) { - LOGP(DL1C, LOGL_ERROR, "Failed to accept. errno: %s.\n", - strerror(errno)); - return -1; - } - - read_fd->fd = fd; - if (osmo_fd_register(read_fd) != 0) { - LOGP(DL1C, LOGL_ERROR, "Registering the read fd failed.\n"); - close(fd); - read_fd->fd = -1; - return -1; - } - - return 0; -} - -int oml_router_init(struct gsm_bts *bts, const char *path, - struct osmo_fd *accept_fd, struct osmo_fd *read_fd) -{ - int rc; - - memset(accept_fd, 0, sizeof(*accept_fd)); - memset(read_fd, 0, sizeof(*read_fd)); - - accept_fd->cb = oml_router_accept_cb; - accept_fd->data = read_fd; - - read_fd->cb = oml_router_read_cb; - read_fd->data = bts; - read_fd->when = OSMO_FD_READ; - read_fd->fd = -1; - - rc = osmo_sock_unix_init_ofd(accept_fd, SOCK_SEQPACKET, 0, - path, - OSMO_SOCK_F_BIND | OSMO_SOCK_F_NONBLOCK); - return rc; -} diff --git a/src/osmo-bts-sysmo/oml_router.h b/src/osmo-bts-sysmo/oml_router.h deleted file mode 100644 index 55f0681d..00000000 --- a/src/osmo-bts-sysmo/oml_router.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -struct gsm_bts; -struct osmo_fd; - -/** - * The default path sysmobts will listen for incoming - * registrations for OML routing and sending. - */ -#define OML_ROUTER_PATH "/var/run/sysmobts_oml_router" - - -int oml_router_init(struct gsm_bts *bts, const char *path, struct osmo_fd *accept, struct osmo_fd *read); |