<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16257">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">D-GSM 2/n: implement mDNS method of mslookup server<br><br>Implement the mslookup server's mDNS responder, to actually service remote<br>mslookup requests:<br>- VTY mslookup/server config with service names,<br>- the mslookup_mdns_server listening for mslookup requests,<br><br>For a detailed overview of the D-GSM and mslookup related files, please see the<br>elaborate comment at the top of mslookup.c (already added in an earlier patch).<br><br>Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2<br>---<br>M include/osmocom/hlr/Makefile.am<br>M include/osmocom/hlr/hlr.h<br>M include/osmocom/hlr/hlr_vty.h<br>M include/osmocom/hlr/mslookup_server.h<br>A include/osmocom/hlr/mslookup_server_mdns.h<br>M src/Makefile.am<br>A src/dgsm_vty.c<br>M src/hlr.c<br>A src/mslookup_server_mdns.c<br>9 files changed, 509 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/57/16257/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/hlr/Makefile.am b/include/osmocom/hlr/Makefile.am</span><br><span>index 5c96ec8..b24f084 100644</span><br><span>--- a/include/osmocom/hlr/Makefile.am</span><br><span>+++ b/include/osmocom/hlr/Makefile.am</span><br><span>@@ -11,6 +11,7 @@</span><br><span> logging.h \</span><br><span> lu_fsm.h \</span><br><span> mslookup_server.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ mslookup_server_mdns.h \</span><br><span> rand.h \</span><br><span> timestamp.h \</span><br><span> $(NULL)</span><br><span>diff --git a/include/osmocom/hlr/hlr.h b/include/osmocom/hlr/hlr.h</span><br><span>index 5a10856..8bc7def 100644</span><br><span>--- a/include/osmocom/hlr/hlr.h</span><br><span>+++ b/include/osmocom/hlr/hlr.h</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/gsm/ipa.h></span><br><span> #include <osmocom/core/tdef.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/sockaddr_str.h></span><br><span> </span><br><span> #define HLR_DEFAULT_DB_FILE_PATH "hlr.db"</span><br><span> </span><br><span>@@ -70,9 +71,19 @@</span><br><span> unsigned int subscr_create_on_demand_rand_msisdn_len;</span><br><span> </span><br><span> struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool allow_startup;</span><br><span> struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Whether the mslookup server should be active in general (all lookup methods) */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool enable;</span><br><span> uint32_t local_attach_max_age;</span><br><span> struct llist_head local_site_services;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Whether the mDNS method of the mslookup server should be active. */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool enable;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The mDNS bind address as set by the VTY, not necessarily in use. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str bind_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mslookup_server_mdns *running;</span><br><span style="color: hsl(120, 100%, 40%);">+ } mdns;</span><br><span> } server;</span><br><span> } mslookup;</span><br><span> };</span><br><span>diff --git a/include/osmocom/hlr/hlr_vty.h b/include/osmocom/hlr/hlr_vty.h</span><br><span>index acd6510..c026d91 100644</span><br><span>--- a/include/osmocom/hlr/hlr_vty.h</span><br><span>+++ b/include/osmocom/hlr/hlr_vty.h</span><br><span>@@ -31,8 +31,13 @@</span><br><span> HLR_NODE = _LAST_OSMOVTY_NODE + 1,</span><br><span> GSUP_NODE,</span><br><span> EUSE_NODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSLOOKUP_NODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSLOOKUP_SERVER_NODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSLOOKUP_SERVER_MSC_NODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSLOOKUP_CLIENT_NODE,</span><br><span> };</span><br><span> </span><br><span> int hlr_vty_is_config_node(struct vty *vty, int node);</span><br><span> int hlr_vty_go_parent(struct vty *vty);</span><br><span> void hlr_vty_init(void);</span><br><span style="color: hsl(120, 100%, 40%);">+void dgsm_vty_init(void);</span><br><span>diff --git a/include/osmocom/hlr/mslookup_server.h b/include/osmocom/hlr/mslookup_server.h</span><br><span>index c8f5c54..1f36345 100644</span><br><span>--- a/include/osmocom/hlr/mslookup_server.h</span><br><span>+++ b/include/osmocom/hlr/mslookup_server.h</span><br><span>@@ -1,5 +1,8 @@</span><br><span> #pragma once</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/global_title.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mslookup/mslookup.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_mslookup_query;</span><br><span> struct osmo_mslookup_result;</span><br><span> </span><br><span>@@ -41,7 +44,6 @@</span><br><span> extern const struct osmo_gt mslookup_server_msc_wildcard;</span><br><span> struct mslookup_server_msc_cfg *mslookup_server_msc_get(const struct osmo_gt *msc_name, bool create);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> struct mslookup_service_host *mslookup_server_get_local_gsup_addr();</span><br><span> void mslookup_server_rx(const struct osmo_mslookup_query *query,</span><br><span> struct osmo_mslookup_result *result);</span><br><span>diff --git a/include/osmocom/hlr/mslookup_server_mdns.h b/include/osmocom/hlr/mslookup_server_mdns.h</span><br><span>new file mode 100644</span><br><span>index 0000000..85117b8</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/hlr/mslookup_server_mdns.h</span><br><span>@@ -0,0 +1,15 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdbool.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/sockaddr_str.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mslookup/mdns_sock.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_mslookup_server_mdns {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mslookup_server *mslookup;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str bind_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mdns_sock *sock;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_mslookup_server_mdns *osmo_mslookup_server_mdns_start(void *ctx, const struct osmo_sockaddr_str *bind_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+void osmo_mslookup_server_mdns_stop(struct osmo_mslookup_server_mdns *server);</span><br><span style="color: hsl(120, 100%, 40%);">+void mslookup_server_mdns_config_apply();</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 26fafba..a03aeff 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -54,8 +54,10 @@</span><br><span> gsup_send.c \</span><br><span> hlr_ussd.c \</span><br><span> lu_fsm.c \</span><br><span style="color: hsl(0, 100%, 40%);">- mslookup_server.c \</span><br><span> timestamp.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ mslookup_server.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ mslookup_server_mdns.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_vty.c \</span><br><span> $(NULL)</span><br><span> </span><br><span> osmo_hlr_LDADD = \</span><br><span>diff --git a/src/dgsm_vty.c b/src/dgsm_vty.c</span><br><span>new file mode 100644</span><br><span>index 0000000..7cbc257</span><br><span>--- /dev/null</span><br><span>+++ b/src/dgsm_vty.c</span><br><span>@@ -0,0 +1,336 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/vty/vty.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/vty/command.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mslookup/mslookup_client_mdns.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr_vty.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/mslookup_server.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/mslookup_server_mdns.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/global_title.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct cmd_node mslookup_node = {</span><br><span style="color: hsl(120, 100%, 40%);">+ MSLOOKUP_NODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s(config-mslookup)# ",</span><br><span style="color: hsl(120, 100%, 40%);">+ 1,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_mslookup,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "mslookup",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure Distributed GSM mslookup")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ vty->node = MSLOOKUP_NODE;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int mslookup_server_mdns_bind(struct vty *vty, int argc, const char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *ip_str = argc > 0? argv[0] : g_hlr->mslookup.server.mdns.bind_addr.ip;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *port_str = argc > 1? argv[1] : NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t port_nr = port_str ? atoi(port_str) : g_hlr->mslookup.server.mdns.bind_addr.port;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_from_str(&addr, ip_str, port_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+ || !osmo_sockaddr_str_is_nonzero(&addr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% mslookup server: Invalid mDNS bind address: %s %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ ip_str, port_nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.server.mdns.bind_addr = addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.server.mdns.enable = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.server.enable = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ mslookup_server_mdns_config_apply();</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define MDNS_IP46_STR "multicast IPv4 address like " OSMO_MSLOOKUP_MDNS_IP4 \</span><br><span style="color: hsl(120, 100%, 40%);">+ " or IPv6 address like " OSMO_MSLOOKUP_MDNS_IP6 "\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define MDNS_PORT_STR "mDNS UDP Port number\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define IP46_STR "IPv4 address like 1.2.3.4 or IPv6 address like a:b:c:d::1\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define PORT_STR "Service-specific port number\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct cmd_node mslookup_server_node = {</span><br><span style="color: hsl(120, 100%, 40%);">+ MSLOOKUP_SERVER_NODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s(config-mslookup-server)# ",</span><br><span style="color: hsl(120, 100%, 40%);">+ 1,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_mslookup_server,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_server_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "server",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable and configure Distributed GSM mslookup server")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ vty->node = MSLOOKUP_SERVER_NODE;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.server.enable = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ mslookup_server_mdns_config_apply();</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_mslookup_no_server,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_no_server_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no server",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "Disable Distributed GSM mslookup server")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.server.enable = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ mslookup_server_mdns_config_apply();</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_mslookup_server_mdns_bind,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_server_mdns_bind_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "mdns [IP] [<1-65535>]",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure where the mDNS server listens for mslookup requests\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ MDNS_IP46_STR MDNS_PORT_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return mslookup_server_mdns_bind(vty, argc, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_mslookup_server_no_mdns,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_server_no_mdns_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no mdns",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "Disable server for mDNS mslookup (do not answer remote requests)\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.server.mdns.enable = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ mslookup_server_mdns_config_apply();</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct cmd_node mslookup_server_msc_node = {</span><br><span style="color: hsl(120, 100%, 40%);">+ MSLOOKUP_SERVER_MSC_NODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s(config-mslookup-server-msc)# ",</span><br><span style="color: hsl(120, 100%, 40%);">+ 1,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_mslookup_server_msc,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_server_msc_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "msc .UNIT_NAME",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure services for individual local MSCs\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "IPA Unit Name of the local MSC to configure\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gt msc_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mslookup_server_msc_cfg *msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gt_set_str(&msc_name, argv_concat(argv, argc, 0));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msc = mslookup_server_msc_get(&msc_name, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error creating MSC %s%s", osmo_gt_name(&msc_name), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ vty->node = MSLOOKUP_SERVER_MSC_NODE;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty->index = msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define SERVICE_NAME_STR \</span><br><span style="color: hsl(120, 100%, 40%);">+ "mslookup service name, e.g. sip.voice or smpp.sms\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static struct mslookup_server_msc_cfg *msc_from_node(struct vty *vty)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (vty->node) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case MSLOOKUP_SERVER_NODE:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* On the mslookup.server node, set services on the wildcard msc, without a particular name. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return mslookup_server_msc_get(&mslookup_server_msc_wildcard, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ case MSLOOKUP_SERVER_MSC_NODE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_mslookup_server_msc_service,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_server_msc_service_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "service NAME at IP <1-65535>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure addresses of local services, as sent in replies to remote mslookup requests.\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ SERVICE_NAME_STR "at\n" IP46_STR PORT_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If this command is run on the 'server' node, it produces an empty unit name and serves as wildcard for all</span><br><span style="color: hsl(120, 100%, 40%);">+ * MSCs. If on a 'server' / 'msc' node, set services only for that MSC Unit Name. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mslookup_server_msc_cfg *msc = msc_from_node(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *service = argv[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *ip_str = argv[1];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *port_str = argv[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str addr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error: no MSC object on this node%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_from_str(&addr, ip_str, atoi(port_str))</span><br><span style="color: hsl(120, 100%, 40%);">+ || !osmo_sockaddr_str_is_nonzero(&addr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% mslookup server: Invalid address for service %s: %s %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ service, ip_str, port_str, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mslookup_server_msc_service_set(msc, service, &addr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% mslookup server: Error setting service %s to %s %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ service, ip_str, port_str, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define NO_SERVICE_AND_NAME_STR NO_STR "Remove one or more service address entries\n" SERVICE_NAME_STR</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_mslookup_server_msc_no_service,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_server_msc_no_service_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no service NAME",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_SERVICE_AND_NAME_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If this command is run on the 'server' node, it produces an empty unit name and serves as wildcard for all</span><br><span style="color: hsl(120, 100%, 40%);">+ * MSCs. If on a 'server' / 'msc' node, set services only for that MSC Unit Name. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mslookup_server_msc_cfg *msc = msc_from_node(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *service = argv[0];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error: no MSC object on this node%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mslookup_server_msc_service_del(msc, service, NULL) < 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% mslookup server: cannot remove service '%s'%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ service, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_mslookup_server_msc_no_service_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_server_msc_no_service_addr_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no service NAME at IP <1-65535>",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_SERVICE_AND_NAME_STR "at\n" IP46_STR PORT_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If this command is run on the 'server' node, it produces an empty unit name and serves as wildcard for all</span><br><span style="color: hsl(120, 100%, 40%);">+ * MSCs. If on a 'server' / 'msc' node, set services only for that MSC Unit Name. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mslookup_server_msc_cfg *msc = msc_from_node(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *service = argv[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *ip_str = argv[1];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *port_str = argv[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str addr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error: no MSC object on this node%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_from_str(&addr, ip_str, atoi(port_str))</span><br><span style="color: hsl(120, 100%, 40%);">+ || !osmo_sockaddr_str_is_nonzero(&addr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% mslookup server: Invalid address for 'no service' %s: %s %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ service, ip_str, port_str, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mslookup_server_msc_service_del(msc, service, &addr) < 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% mslookup server: cannot remove service '%s' to %s %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ service, ip_str, port_str, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void config_write_msc_services(struct vty *vty, const char *indent, struct mslookup_server_msc_cfg *msc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mslookup_service_host *e;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(e, &msc->service_hosts, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_is_nonzero(&e->host_v4))</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%sservice %s at %s %u%s", indent, e->service, e->host_v4.ip, e->host_v4.port,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_is_nonzero(&e->host_v6))</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%sservice %s at %s %u%s", indent, e->service, e->host_v6.ip, e->host_v6.port,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int config_write_mslookup(struct vty *vty)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!g_hlr->mslookup.server.enable</span><br><span style="color: hsl(120, 100%, 40%);">+ && llist_empty(&g_hlr->mslookup.server.local_site_services))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "mslookup%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_hlr->mslookup.server.enable || !llist_empty(&g_hlr->mslookup.server.local_site_services)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mslookup_server_msc_cfg *msc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " server%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_hlr->mslookup.server.mdns.enable</span><br><span style="color: hsl(120, 100%, 40%);">+ && osmo_sockaddr_str_is_nonzero(&g_hlr->mslookup.server.mdns.bind_addr))</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " mdns bind %s %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.server.mdns.bind_addr.ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.server.mdns.bind_addr.port,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msc = mslookup_server_msc_get(&mslookup_server_msc_wildcard, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msc)</span><br><span style="color: hsl(120, 100%, 40%);">+ config_write_msc_services(vty, " ", msc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(msc, &g_hlr->mslookup.server.local_site_services, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_gt_cmp(&mslookup_server_msc_wildcard, &msc->name))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " msc %s%s", osmo_gt_name(&msc->name), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ config_write_msc_services(vty, " ", msc);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If the server is disabled, still output the above to not lose the service config. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!g_hlr->mslookup.server.enable)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " no server%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(do_mslookup_show_services,</span><br><span style="color: hsl(120, 100%, 40%);">+ do_mslookup_show_services_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show mslookup services",</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR "Distributed GSM / mslookup related information\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "List configured service addresses as sent to remote mslookup requests\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mslookup_server_msc_cfg *msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mslookup_service_host *local_hlr = mslookup_server_get_local_gsup_addr();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "Local GSUP HLR address returned in mslookup responses for local IMSIs:");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_is_nonzero(&local_hlr->host_v4))</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " " OSMO_SOCKADDR_STR_FMT,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS(&local_hlr->host_v4));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_is_nonzero(&local_hlr->host_v6))</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " " OSMO_SOCKADDR_STR_FMT,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS(&local_hlr->host_v6));</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msc = mslookup_server_msc_get(&mslookup_server_msc_wildcard, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msc)</span><br><span style="color: hsl(120, 100%, 40%);">+ config_write_msc_services(vty, "", msc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(msc, &g_hlr->mslookup.server.local_site_services, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_gt_cmp(&mslookup_server_msc_wildcard, &msc->name))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "msc %s%s", osmo_gt_name(&msc->name), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ config_write_msc_services(vty, " ", msc);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void dgsm_vty_init(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(CONFIG_NODE, &cfg_mslookup_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ install_node(&mslookup_node, config_write_mslookup);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_NODE, &cfg_mslookup_server_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_NODE, &cfg_mslookup_no_server_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ install_node(&mslookup_server_node, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_SERVER_NODE, &cfg_mslookup_server_mdns_bind_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_SERVER_NODE, &cfg_mslookup_server_no_mdns_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_SERVER_NODE, &cfg_mslookup_server_msc_service_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_SERVER_NODE, &cfg_mslookup_server_msc_no_service_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_SERVER_NODE, &cfg_mslookup_server_msc_no_service_addr_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_SERVER_NODE, &cfg_mslookup_server_msc_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ install_node(&mslookup_server_msc_node, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_SERVER_MSC_NODE, &cfg_mslookup_server_msc_service_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_SERVER_MSC_NODE, &cfg_mslookup_server_msc_no_service_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_SERVER_MSC_NODE, &cfg_mslookup_server_msc_no_service_addr_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&do_mslookup_show_services_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/hlr.c b/src/hlr.c</span><br><span>index 6a55100..b19acf8 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -698,6 +698,7 @@</span><br><span> ctrl_vty_init(hlr_ctx);</span><br><span> handle_options(argc, argv);</span><br><span> hlr_vty_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_vty_init();</span><br><span> </span><br><span> rc = vty_read_config_file(cmdline_opts.config_file, NULL);</span><br><span> if (rc < 0) {</span><br><span>diff --git a/src/mslookup_server_mdns.c b/src/mslookup_server_mdns.c</span><br><span>new file mode 100644</span><br><span>index 0000000..50c13f1</span><br><span>--- /dev/null</span><br><span>+++ b/src/mslookup_server_mdns.c</span><br><span>@@ -0,0 +1,134 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdlib.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mslookup/mslookup.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mslookup/mdns.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/mslookup_server.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/mslookup_server_mdns.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void osmo_mslookup_server_mdns_tx(struct osmo_mslookup_server_mdns *server,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t packet_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_mslookup_query *query,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_mslookup_result *result)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *errmsg = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ctx = talloc_named_const(server, 0, __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = osmo_mdns_result_encode(ctx, packet_id, query, result);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ errmsg = "Error encoding mDNS answer packet";</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (osmo_mdns_sock_send(server->sock, msg))</span><br><span style="color: hsl(120, 100%, 40%);">+ errmsg = "Error sending mDNS answer";</span><br><span style="color: hsl(120, 100%, 40%);">+ if (errmsg)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSLOOKUP, LOGL_ERROR, "%s: mDNS: %s\n", osmo_mslookup_result_name_c(ctx, query, result), errmsg);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void osmo_mslookup_server_mdns_handle_request(uint16_t packet_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mslookup_server_mdns *server,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_mslookup_query *query)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mslookup_result result;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ mslookup_server_rx(query, &result);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Error logging already happens in mslookup_server_rx() */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (result.rc != OSMO_MSLOOKUP_RC_RESULT)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_server_mdns_tx(server, packet_id, query, &result);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int osmo_mslookup_server_mdns_rx(struct osmo_fd *osmo_fd, unsigned int what)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mslookup_server_mdns *server = osmo_fd->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mslookup_query *query;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t packet_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ int n;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t buffer[1024];</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Parse the message and print it */</span><br><span style="color: hsl(120, 100%, 40%);">+ n = read(osmo_fd->fd, buffer, sizeof(buffer));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (n < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return n;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx = talloc_named_const(server, 0, __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ query = osmo_mdns_query_decode(ctx, buffer, n, &packet_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!query) {</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_id_name_buf((char *)buffer, sizeof(buffer), &query->id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSLOOKUP, LOGL_DEBUG, "mDNS rx request: %s.%s\n", query->service, buffer);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_server_mdns_handle_request(packet_id, server, query);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ return n;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_mslookup_server_mdns *osmo_mslookup_server_mdns_start(void *ctx, const struct osmo_sockaddr_str *bind_addr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mslookup_server_mdns *server = talloc_zero(ctx, struct osmo_mslookup_server_mdns);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(server);</span><br><span style="color: hsl(120, 100%, 40%);">+ *server = (struct osmo_mslookup_server_mdns){</span><br><span style="color: hsl(120, 100%, 40%);">+ .bind_addr = *bind_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ server->sock = osmo_mdns_sock_init(server,</span><br><span style="color: hsl(120, 100%, 40%);">+ bind_addr->ip, bind_addr->port,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_server_mdns_rx,</span><br><span style="color: hsl(120, 100%, 40%);">+ server, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!server->sock) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSLOOKUP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "mslookup mDNS server: error initializing multicast bind on " OSMO_SOCKADDR_STR_FMT "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS(bind_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(server);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return server;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void osmo_mslookup_server_mdns_stop(struct osmo_mslookup_server_mdns *server)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!server)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mdns_sock_cleanup(server->sock);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(server);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void mslookup_server_mdns_config_apply()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check whether to start/stop/restart mDNS server */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool should_run;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool should_stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!g_hlr->mslookup.allow_startup)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ should_run = g_hlr->mslookup.server.enable && g_hlr->mslookup.server.mdns.enable;</span><br><span style="color: hsl(120, 100%, 40%);">+ should_stop = g_hlr->mslookup.server.mdns.running</span><br><span style="color: hsl(120, 100%, 40%);">+ && (!should_run</span><br><span style="color: hsl(120, 100%, 40%);">+ || osmo_sockaddr_str_cmp(&g_hlr->mslookup.server.mdns.bind_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ &g_hlr->mslookup.server.mdns.running->bind_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (should_stop) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_server_mdns_stop(g_hlr->mslookup.server.mdns.running);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.server.mdns.running = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSLOOKUP, LOGL_NOTICE, "Stopped mslookup mDNS server\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (should_run && !g_hlr->mslookup.server.mdns.running) {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.server.mdns.running =</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_server_mdns_start(g_hlr, &g_hlr->mslookup.server.mdns.bind_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!g_hlr->mslookup.server.mdns.running)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSLOOKUP, LOGL_ERROR, "Failed to start mslookup mDNS server on " OSMO_SOCKADDR_STR_FMT "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS(&g_hlr->mslookup.server.mdns.running->bind_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSLOOKUP, LOGL_NOTICE, "Started mslookup mDNS server, receiving mDNS requests at multicast "</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS(&g_hlr->mslookup.server.mdns.running->bind_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16257">change 16257</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-hlr/+/16257"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 </div>
<div style="display:none"> Gerrit-Change-Number: 16257 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>