daniel has uploaded this change for review. ( https://gerrit.osmocom.org/9402
Change subject: gb_proxy: Add ctrl interface and ns-state, gbproxy-state
commands
......................................................................
gb_proxy: Add ctrl interface and ns-state, gbproxy-state commands
This patch adds a control interface to osmo-gbproxy as well as the first
two commands to query the state of each NSVC and gbproxy peer.
The "ns-state" command replies with
nsei, nsvci, local state, role, remote state of all NSVCs.
The "gbproxy-state" command replies with
nsei, bvci, mcc, mnc, lac, rac, and state of each peer.
If there are no entries an error is returned.
$ ./osmo_ctrl.py -d 127.0.0.1 -p 4263 -g ns-state
Got message: b'GET_REPLY 23 gb-status 101,101,DEAD,BLOCKED,SGSN,DEAD,UNBLOCKED;'
$ ./osmo_ctrl.py -d 127.0.0.1 -p 4263 -g gbproxy-state
Got message: b'ERROR 23 No peers found'
Change-Id: I82c74fd0bfcb9ba4ec3619d9fdaa0cae201b3177
Ticket: OS#3281, SYS#4235
Sponsored-by: On-Waves ehf
---
M include/osmocom/sgsn/gb_proxy.h
M src/gprs/Makefile.am
A src/gprs/gb_proxy_ctrl.c
M src/gprs/gb_proxy_main.c
4 files changed, 131 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/02/9402/1
diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h
index 2540a7e..70de3d7 100644
--- a/include/osmocom/sgsn/gb_proxy.h
+++ b/include/osmocom/sgsn/gb_proxy.h
@@ -184,6 +184,9 @@
int gbproxy_vty_init(void);
int gbproxy_parse_config(const char *config_file, struct gbproxy_config *cfg);
+/* gb_proxy_ctrl.c */
+int gb_ctrl_cmds_install(void);
+
/* gb_proxy.c */
int gbproxy_init_config(struct gbproxy_config *cfg);
diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am
index 4c7f730..1cf6785 100644
--- a/src/gprs/Makefile.am
+++ b/src/gprs/Makefile.am
@@ -44,6 +44,7 @@
gb_proxy.c \
gb_proxy_main.c \
gb_proxy_vty.c \
+ gb_proxy_ctrl.c \
gb_proxy_patch.c \
gb_proxy_tlli.c \
gb_proxy_peer.c \
diff --git a/src/gprs/gb_proxy_ctrl.c b/src/gprs/gb_proxy_ctrl.c
new file mode 100644
index 0000000..9096edc
--- /dev/null
+++ b/src/gprs/gb_proxy_ctrl.c
@@ -0,0 +1,109 @@
+/* Control Interface Implementation for the Gb-proxy */
+/*
+ * (C) 2018 by Daniel Willmann
+ * (C) 2018 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 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/core/talloc.h>
+
+
+#include <osmocom/gprs/gprs_bssgp.h>
+
+#include <osmocom/ctrl/control_if.h>
+#include <osmocom/ctrl/control_cmd.h>
+#include <osmocom/sgsn/gb_proxy.h>
+#include <osmocom/sgsn/debug.h>
+
+extern vector ctrl_node_vec;
+
+static int get_ns_status(struct ctrl_cmd *cmd, void *data)
+{
+ struct gbproxy_config *cfg = data;
+ struct gprs_ns_inst *nsi = cfg->nsi;
+ struct gprs_nsvc *nsvc;
+
+ cmd->reply = talloc_strdup(cmd, "");
+
+ llist_for_each_entry(nsvc, &nsi->gprs_nsvcs, list) {
+ if (nsvc == nsi->unknown_nsvc)
+ continue;
+
+ cmd->reply = talloc_asprintf_append(cmd->reply,
+ "%u,%u,%s,%s,%s,%s,%s;",
+ nsvc->nsei, nsvc->nsvci,
+ NS_DESC_A(nsvc->state),
+ NS_DESC_B(nsvc->state),
+ nsvc->remote_end_is_sgsn ? "SGSN" : "BSS",
+ NS_DESC_A(nsvc->remote_state),
+ NS_DESC_B(nsvc->remote_state));
+
+ }
+
+ if (strnlen(cmd->reply, 2) == 0) {
+ talloc_free(cmd->reply);
+ cmd->reply = "No NSVCs found";
+ goto err;
+ }
+
+ return CTRL_CMD_REPLY;
+
+err:
+ return CTRL_CMD_ERROR;
+}
+
+CTRL_CMD_DEFINE_RO(ns_status, "ns-state");
+
+static int get_gbproxy_status(struct ctrl_cmd *cmd, void *data)
+{
+ struct gbproxy_config *cfg = data;
+ struct gbproxy_peer *peer;
+
+ cmd->reply = talloc_strdup(cmd, "");
+
+ llist_for_each_entry(peer, &cfg->bts_peers, list) {
+ struct gprs_ra_id raid;
+ gsm48_parse_ra(&raid, peer->ra);
+
+ cmd->reply = talloc_asprintf_append(cmd->reply,
"%u,%u,%u,%u,%u,%u,%s;",
+ peer->nsei, peer->bvci,
+ raid.mcc, raid.mnc,
+ raid.lac, raid.rac,
+ peer->blocked ? "BLOCKED" : "UNBLOCKED");
+ }
+
+ if (strnlen(cmd->reply, 2) == 0) {
+ talloc_free(cmd->reply);
+ cmd->reply = "No peers found";
+ goto err;
+ }
+
+ return CTRL_CMD_REPLY;
+
+err:
+ return CTRL_CMD_ERROR;
+}
+
+CTRL_CMD_DEFINE_RO(gbproxy_status, "gbproxy-state");
+
+int gb_ctrl_cmds_install(void)
+{
+ int rc = 0;
+ rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_ns_status);
+ rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_gbproxy_status);
+ return rc;
+}
diff --git a/src/gprs/gb_proxy_main.c b/src/gprs/gb_proxy_main.c
index 474aa52..97e6342 100644
--- a/src/gprs/gb_proxy_main.c
+++ b/src/gprs/gb_proxy_main.c
@@ -46,6 +46,10 @@
#include <osmocom/sgsn/vty.h>
#include <osmocom/sgsn/gb_proxy.h>
+#include <osmocom/ctrl/control_vty.h>
+#include <osmocom/ctrl/control_if.h>
+#include <osmocom/ctrl/ports.h>
+
#include <osmocom/vty/command.h>
#include <osmocom/vty/telnet_interface.h>
#include <osmocom/vty/logging.h>
@@ -263,6 +267,7 @@
int main(int argc, char **argv)
{
int rc;
+ struct ctrl_handle *ctrl;
tall_bsc_ctx = talloc_named_const(NULL, 0, "nsip_proxy");
msgb_talloc_ctx_init(tall_bsc_ctx, 0);
@@ -334,6 +339,19 @@
if (rc < 0)
exit(1);
+ /* Start control interface after getting config for
+ * ctrl_vty_get_bind_addr() */
+ ctrl = ctrl_interface_setup_dynip(gbcfg, ctrl_vty_get_bind_addr(),
OSMO_CTRL_PORT_GBPROXY, NULL);
+ if (!ctrl) {
+ LOGP(DGPRS, LOGL_FATAL, "Failed to create CTRL interface.\n");
+ exit(1);
+ }
+
+ if (gb_ctrl_cmds_install() != 0) {
+ LOGP(DGPRS, LOGL_FATAL, "Failed to install CTRL commands.\n");
+ exit(1);
+ }
+
if (!gprs_nsvc_by_nsei(gbcfg->nsi, gbcfg->nsip_sgsn_nsei)) {
LOGP(DGPRS, LOGL_FATAL, "You cannot proxy to NSEI %u "
"without creating that NSEI before\n",
--
To view, visit https://gerrit.osmocom.org/9402
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82c74fd0bfcb9ba4ec3619d9fdaa0cae201b3177
Gerrit-Change-Number: 9402
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <[email protected]>
