diff options
author | Daniel Willmann <dwillmann@sysmocom.de> | 2018-06-01 07:21:20 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-06-15 07:33:46 +0000 |
commit | c977afad6f270289f363ca2038104af8aaf2588d (patch) | |
tree | cdba2adcc17a20e303f3d798d683a731384d1208 /src/gprs | |
parent | aaa3e2b9aee28e6a5e5ffcb84ff24876dc4fc72a (diff) |
gb_proxy: Add ctrl interface and nsvc-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 "nsvc-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.
Entries are separated by a newline '\n' character. If there are no
entries an empty list is returned. This behaviour is similar to that of
the subscriber-list-active-v1 command in osmo-sgsn.
$ ./osmo_ctrl.py -d 127.0.0.1 -p 4263 -g nsvc-state
Got message: b'GET_REPLY 23 nsvc-state 101,101,DEAD,BLOCKED,SGSN,DEAD,UNBLOCKED\n'
$ ./osmo_ctrl.py -d 127.0.0.1 -p 4263 -g gbproxy-state
Got message: b'GET_REPLY 4871085901306801158 gbproxy-state '
Change-Id: I82c74fd0bfcb9ba4ec3619d9fdaa0cae201b3177
Ticket: OS#3281, SYS#4235
Sponsored-by: On-Waves ehf
Diffstat (limited to 'src/gprs')
-rw-r--r-- | src/gprs/Makefile.am | 1 | ||||
-rw-r--r-- | src/gprs/gb_proxy_ctrl.c | 85 | ||||
-rw-r--r-- | src/gprs/gb_proxy_main.c | 18 |
3 files changed, 104 insertions, 0 deletions
diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index 4c7f730a4..1cf67850c 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -44,6 +44,7 @@ osmo_gbproxy_SOURCES = \ 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 000000000..032d8d45b --- /dev/null +++ b/src/gprs/gb_proxy_ctrl.c @@ -0,0 +1,85 @@ +/* Control Interface Implementation for the Gb-proxy */ +/* + * (C) 2018 by sysmocom s.f.m.c. GmbH <info@sysmocom.de> + * All Rights Reserved + * + * Author: Daniel Willmann + * + * 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/gprs/gprs_ns.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_nsvc_state(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 = gprs_nsvc_state_append(cmd->reply, nsvc); + } + + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_RO(nsvc_state, "nsvc-state"); + +static int get_gbproxy_state(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\n", + peer->nsei, peer->bvci, + raid.mcc, raid.mnc, + raid.lac, raid.rac, + peer->blocked ? "BLOCKED" : "UNBLOCKED"); + } + + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_RO(gbproxy_state, "gbproxy-state"); + +int gb_ctrl_cmds_install(void) +{ + int rc = 0; + rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_nsvc_state); + rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_gbproxy_state); + return rc; +} diff --git a/src/gprs/gb_proxy_main.c b/src/gprs/gb_proxy_main.c index 474aa528f..97e634206 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 @@ static bool file_exists(const char *path) 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 @@ int main(int argc, char **argv) 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", |