This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Max gerrit-no-reply at lists.osmocom.orgHello Neels Hofmeyr, Harald Welte, Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/1827
to look at the new patch set (#16).
Add CTRL interface
Add command to query Packet Services (GPRS etc.) for particular IMSI.
Change-Id: Id787ef4aa88473c3bbde6ee25117b1fd99dc8fcb
Related: OS#1645
---
M configure.ac
M src/Makefile.am
A src/ctrl.c
A src/ctrl.h
M src/hlr.c
M src/hlr.h
6 files changed, 136 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/1827/16
diff --git a/configure.ac b/configure.ac
index bfda9c5..a04185f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,7 @@
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.9.5)
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.9.0)
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.9.0)
+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl)
PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.3.2)
PKG_CHECK_MODULES(SQLITE3, sqlite3)
diff --git a/src/Makefile.am b/src/Makefile.am
index 1791343..b410ff3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@
$(LIBOSMOCORE_CFLAGS) \
$(LIBOSMOGSM_CFLAGS) \
$(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOCTRL_CFLAGS) \
$(LIBOSMOABIS_CFLAGS) \
$(SQLITE3_CFLAGS) \
$(NULL)
@@ -20,6 +21,7 @@
gsup_server.h \
logging.h \
rand.h \
+ ctrl.h \
hlr_vty.h \
$(NULL)
@@ -33,6 +35,7 @@
osmo_hlr_SOURCES = \
auc.c \
+ ctrl.c \
db.c \
luop.c \
db_auc.c \
@@ -49,6 +52,7 @@
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOCTRL_LIBS) \
$(LIBOSMOABIS_LIBS) \
$(SQLITE3_LIBS) \
$(NULL)
diff --git a/src/ctrl.c b/src/ctrl.c
new file mode 100644
index 0000000..a167171
--- /dev/null
+++ b/src/ctrl.c
@@ -0,0 +1,81 @@
+/* OsmoHLR Control Interface implementation */
+
+/* (C) 2017 sysmocom s.f.m.c. GmbH <info at sysmocom.de>
+ * All Rights Reserved
+ *
+ * Author: Max Suraev <msuraev at 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 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 <stdbool.h>
+
+#include <osmocom/ctrl/control_cmd.h>
+#include <osmocom/ctrl/control_if.h>
+#include <osmocom/ctrl/ports.h>
+
+#include "gsup_server.h"
+#include "logging.h"
+#include "db.h"
+#include "hlr.h"
+#include "luop.h"
+#include "ctrl.h"
+
+CTRL_CMD_DEFINE_WO_NOVRF(status_ps, "status-ps");
+static int set_status_ps(struct ctrl_cmd *cmd, void *data)
+{
+ struct hlr *ctx = data;
+ struct lu_operation *luop = lu_op_alloc(ctx->gs);
+ if (!luop) {
+ cmd->reply = "Internal HLR error";
+ return CTRL_CMD_ERROR;
+ }
+
+ if (!lu_op_fill_subscr(luop, ctx->dbc, cmd->value)) {
+ cmd->reply = "Subscriber Unknown in HLR";
+ return CTRL_CMD_ERROR;
+ }
+
+ cmd->reply = luop->subscr.nam_ps ? "1" : "0";
+
+ return CTRL_CMD_REPLY;
+}
+
+int hlr_ctrl_cmds_install()
+{
+ int rc = 0;
+
+ rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_status_ps);
+
+ return rc;
+}
+
+struct ctrl_handle *hlr_controlif_setup(struct hlr *ctx,
+ struct osmo_gsup_server *gs)
+{
+ int rc;
+ struct ctrl_handle *hdl = ctrl_interface_setup_dynip(ctx,
+ ctx->ctrl_bind_addr,
+ OSMO_CTRL_PORT_HLR,
+ NULL);
+ if (!hdl)
+ return NULL;
+
+ rc = hlr_ctrl_cmds_install();
+ if (rc) /* FIXME: close control interface? */
+ return NULL;
+
+ return hdl;
+}
diff --git a/src/ctrl.h b/src/ctrl.h
new file mode 100644
index 0000000..663de30
--- /dev/null
+++ b/src/ctrl.h
@@ -0,0 +1,31 @@
+/* OsmoHLR Control Interface implementation */
+
+/* (C) 2017 sysmocom s.f.m.c. GmbH <info at sysmocom.de>
+ * All Rights Reserved
+ *
+ * Author: Max Suraev <msuraev at 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 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/>.
+ *
+ */
+
+#pragma once
+
+#include <osmocom/ctrl/control_if.h>
+
+#include "gsup_server.h"
+
+int hlr_ctrl_cmds_install();
+struct ctrl_handle *hlr_controlif_setup(struct hlr *ctx,
+ struct osmo_gsup_server *gs);
diff --git a/src/hlr.c b/src/hlr.c
index bb6f05a..c69526e 100644
--- a/src/hlr.c
+++ b/src/hlr.c
@@ -35,6 +35,7 @@
#include "db.h"
#include "hlr.h"
+#include "ctrl.h"
#include "logging.h"
#include "gsup_server.h"
#include "gsup_router.h"
@@ -299,6 +300,8 @@
printf(" -s --disable-color Do not print ANSI colors in the log\n");
printf(" -T --timestamp Prefix every log line with a timestamp.\n");
printf(" -e --log-level number Set a global loglevel.\n");
+ printf(" -R --ctrl address Set address to which Control "
+ "Interface should be bound, defaults to 127.0.0.1.\n");
printf(" -V --version Print the version of OsmoHLR.\n");
}
@@ -324,12 +327,13 @@
{"daemonize", 0, 0, 'D'},
{"disable-color", 0, 0, 's'},
{"log-level", 1, 0, 'e'},
+ {"ctrl", 1, 0, 'R'},
{"timestamp", 0, 0, 'T'},
{"version", 0, 0, 'V' },
{0, 0, 0, 0}
};
- c = getopt_long(argc, argv, "hc:l:d:Dse:TV",
+ c = getopt_long(argc, argv, "hc:l:d:Dse:R:TV",
long_options, &option_index);
if (c == -1)
break;
@@ -344,6 +348,9 @@
break;
case 'l':
cmdline_opts.db_file = optarg;
+ break;
+ case 'R':
+ g_hlr->ctrl_bind_addr = optarg;
break;
case 'd':
log_parse_category_mask(osmo_stderr_target, optarg);
@@ -407,6 +414,7 @@
msgb_talloc_ctx_init(hlr_ctx, 0);
g_hlr = talloc_zero(hlr_ctx, struct hlr);
+ g_hlr->ctrl_bind_addr = "127.0.0.1";
rc = osmo_init_logging(&hlr_log_info);
if (rc < 0) {
@@ -452,6 +460,12 @@
exit(1);
}
+ if (g_hlr->ctrl_bind_addr)
+ g_hlr->ctrl = hlr_controlif_setup(g_hlr, g_hlr->gs);
+ else
+ LOGP(DLGSUP, LOGL_NOTICE, "Control Interface is NOT created: "
+ "bind address missing\n");
+
osmo_init_ignore_signals();
signal(SIGINT, &signal_hdlr);
signal(SIGUSR1, &signal_hdlr);
diff --git a/src/hlr.h b/src/hlr.h
index 77751dd..1e8eff8 100644
--- a/src/hlr.h
+++ b/src/hlr.h
@@ -30,4 +30,8 @@
/* DB context */
struct db_context *dbc;
+
+ /* Control Interface */
+ struct ctrl_handle *ctrl;
+ const char *ctrl_bind_addr;
};
--
To view, visit https://gerrit.osmocom.org/1827
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Id787ef4aa88473c3bbde6ee25117b1fd99dc8fcb
Gerrit-PatchSet: 16
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>