<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16258">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">D-GSM 3/n: implement roaming by mslookup in osmo-hlr<br><br>Add mslookup client to find remote home HLRs of unknown IMSIs, and<br>proxy/forward GSUP for those to the right remote HLR instances.<br><br>Add remote_hlr.c to manage one GSUP client per remote HLR GSUP address.<br><br>Add proxy.c to keep state about remotely handled IMSIs (remote GSUP address,<br>MSISDN, and probably more in future patches). The mslookup_server that<br>determines whether a given MSISDN is attached locally now also needs to look in<br>the proxy record: it is always the osmo-hlr immediately peering for the MSC<br>that should respond to mslookup service address queries like SIP and SMPP.<br>(Only gsup.hlr service is always answered by the home HLR.)<br><br>Add dgsm.c to set up an mdns mslookup client, ask for IMSI homes, and to decide<br>which GSUP is handled locally and which needs to go to a remote HLR.<br><br>Add full VTY config and VTY tests.<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: I2fe453553c90e6ee527ed13a13089900efd488aa<br>---<br>M include/osmocom/hlr/Makefile.am<br>A include/osmocom/hlr/dgsm.h<br>M include/osmocom/hlr/gsup_server.h<br>M include/osmocom/hlr/hlr.h<br>M include/osmocom/hlr/hlr_vty.h<br>M include/osmocom/hlr/logging.h<br>M include/osmocom/hlr/mslookup_server.h<br>A include/osmocom/hlr/proxy.h<br>A include/osmocom/hlr/remote_hlr.h<br>M src/Makefile.am<br>A src/dgsm.c<br>M src/dgsm_vty.c<br>M src/gsup_server.c<br>M src/hlr.c<br>M src/hlr_vty.c<br>M src/logging.c<br>M src/mslookup_server.c<br>A src/proxy.c<br>A src/remote_hlr.c<br>M tests/gsup_server/Makefile.am<br>M tests/test_nodes.vty<br>21 files changed, 2,005 insertions(+), 8 deletions(-)<br><br></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 b24f084..aceda4a 100644</span><br><span>--- a/include/osmocom/hlr/Makefile.am</span><br><span>+++ b/include/osmocom/hlr/Makefile.am</span><br><span>@@ -2,6 +2,7 @@</span><br><span> auc.h \</span><br><span> ctrl.h \</span><br><span> db.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm.h \</span><br><span> gsup_router.h \</span><br><span> gsup_server.h \</span><br><span> hlr.h \</span><br><span>@@ -12,6 +13,8 @@</span><br><span> lu_fsm.h \</span><br><span> mslookup_server.h \</span><br><span> mslookup_server_mdns.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy.h \</span><br><span> rand.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr.h \</span><br><span> timestamp.h \</span><br><span> $(NULL)</span><br><span>diff --git a/include/osmocom/hlr/dgsm.h b/include/osmocom/hlr/dgsm.h</span><br><span>new file mode 100644</span><br><span>index 0000000..cc8f3d2</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/hlr/dgsm.h</span><br><span>@@ -0,0 +1,46 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</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%);">+#pragma once</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/hlr/gsup_server.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/gsupclient/cni_peer_id.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/gsup_req.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_DGSM(imsi, level, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, level, "(IMSI-%s) " fmt, imsi, ##args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct vty;</span><br><span style="color: hsl(120, 100%, 40%);">+struct remote_hlr;</span><br><span style="color: hsl(120, 100%, 40%);">+struct hlr_subscriber;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern void *dgsm_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void dgsm_init(void *ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+void dgsm_start(void *ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+void dgsm_stop();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bool dgsm_check_forward_gsup_msg(struct osmo_gsup_req *req);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void dgsm_vty_init();</span><br><span style="color: hsl(120, 100%, 40%);">+void dgsm_mdns_client_config_apply(void);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bool hlr_subscr_lu_age(const struct hlr_subscriber *subscr, uint32_t *age_p);</span><br><span>diff --git a/include/osmocom/hlr/gsup_server.h b/include/osmocom/hlr/gsup_server.h</span><br><span>index 774f750..ce7556e 100644</span><br><span>--- a/include/osmocom/hlr/gsup_server.h</span><br><span>+++ b/include/osmocom/hlr/gsup_server.h</span><br><span>@@ -27,6 +27,9 @@</span><br><span> struct ipa_server_link *link;</span><br><span> osmo_gsup_read_cb_t read_cb;</span><br><span> struct llist_head routes;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Proxy requests from this server's clients to remote GSUP servers. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy *proxy;</span><br><span> };</span><br><span> </span><br><span> </span><br><span>@@ -71,3 +74,5 @@</span><br><span> uint8_t *msisdn_enc, size_t msisdn_enc_size,</span><br><span> uint8_t *apn_buf, size_t apn_buf_size,</span><br><span> enum osmo_gsup_cn_domain cn_domain);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsup_forward_to_local_peer(struct osmo_gsup_server *server, const struct osmo_cni_peer_id *to_peer,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_req *req, struct osmo_gsup_message *modified_gsup);</span><br><span>diff --git a/include/osmocom/hlr/hlr.h b/include/osmocom/hlr/hlr.h</span><br><span>index 8f26704..e8df5cd 100644</span><br><span>--- a/include/osmocom/hlr/hlr.h</span><br><span>+++ b/include/osmocom/hlr/hlr.h</span><br><span>@@ -28,6 +28,8 @@</span><br><span> #include <osmocom/core/tdef.h></span><br><span> #include <osmocom/core/sockaddr_str.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/dgsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define HLR_DEFAULT_DB_FILE_PATH "hlr.db"</span><br><span> </span><br><span> struct hlr_euse;</span><br><span>@@ -85,6 +87,29 @@</span><br><span> struct osmo_mslookup_server_mdns *running;</span><br><span> } mdns;</span><br><span> } server;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The mslookup client in osmo-hlr is used to find out which remote HLRs service a locally unknown IMSI.</span><br><span style="color: hsl(120, 100%, 40%);">+ * (It may also be used to resolve recipients for SMS-over-GSUP in the future.) */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Whether to proxy/forward to remote HLRs */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool enable;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If this is set, all GSUP for unknown IMSIs is forwarded directly to this GSUP address,</span><br><span style="color: hsl(120, 100%, 40%);">+ * unconditionally. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str gsup_gateway_proxy;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* mslookup client request handling */</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int result_timeout_milliseconds;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mslookup_client *client;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Whether to use mDNS for IMSI MS Lookup */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool enable;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str query_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *domain_suffix;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mslookup_client_method *running;</span><br><span style="color: hsl(120, 100%, 40%);">+ } mdns;</span><br><span style="color: hsl(120, 100%, 40%);">+ } client;</span><br><span> } mslookup;</span><br><span> };</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 0ba9821..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>@@ -34,6 +34,7 @@</span><br><span> MSLOOKUP_NODE,</span><br><span> MSLOOKUP_SERVER_NODE,</span><br><span> 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>diff --git a/include/osmocom/hlr/logging.h b/include/osmocom/hlr/logging.h</span><br><span>index 4e0a25c..a8081af 100644</span><br><span>--- a/include/osmocom/hlr/logging.h</span><br><span>+++ b/include/osmocom/hlr/logging.h</span><br><span>@@ -10,6 +10,7 @@</span><br><span> DSS,</span><br><span> DMSLOOKUP,</span><br><span> DLU,</span><br><span style="color: hsl(120, 100%, 40%);">+ DDGSM,</span><br><span> };</span><br><span> </span><br><span> extern const struct log_info hlr_log_info;</span><br><span>diff --git a/include/osmocom/hlr/mslookup_server.h b/include/osmocom/hlr/mslookup_server.h</span><br><span>index 440c451..7c80f2a 100644</span><br><span>--- a/include/osmocom/hlr/mslookup_server.h</span><br><span>+++ b/include/osmocom/hlr/mslookup_server.h</span><br><span>@@ -66,3 +66,7 @@</span><br><span> const 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 style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bool subscriber_has_done_lu_here(const struct osmo_mslookup_query *query,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t *lu_age_p, struct osmo_ipa_name *local_msc_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ char *ret_imsi, size_t ret_imsi_len);</span><br><span>diff --git a/include/osmocom/hlr/proxy.h b/include/osmocom/hlr/proxy.h</span><br><span>new file mode 100644</span><br><span>index 0000000..0169038</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/hlr/proxy.h</span><br><span>@@ -0,0 +1,95 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</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%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <time.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/protocol/gsm_23_003.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/gsupclient/cni_peer_id.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/timestamp.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsup_req;</span><br><span style="color: hsl(120, 100%, 40%);">+struct remote_hlr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct proxy {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head subscr_list;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head pending_gsup_reqs;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* When messages arrive back from a remote HLR that this is the proxy for, reach the VLR to forward the response</span><br><span style="color: hsl(120, 100%, 40%);">+ * to via this osmo_gsup_server. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_server *gsup_server_to_vlr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* How long to keep proxy entries without a refresh, in seconds. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fresh_time;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* How often to garbage collect the proxy cache, period in seconds.</span><br><span style="color: hsl(120, 100%, 40%);">+ * To change this and take effect immediately, rather use proxy_set_gc_period(). */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t gc_period;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_timer_list gc_timer;</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 proxy_subscr_domain_state {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_ipa_name vlr_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ timestamp_t last_lu;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The name from which an Update Location Request was received. Copied to vlr_name as soon as the LU is</span><br><span style="color: hsl(120, 100%, 40%);">+ * completed successfully. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_ipa_name vlr_name_preliminary;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Set if this is a middle proxy, i.e. a proxy behind another proxy.</span><br><span style="color: hsl(120, 100%, 40%);">+ * That is mostly to know whether the MS is attached at a local MSC/SGSN or further away.</span><br><span style="color: hsl(120, 100%, 40%);">+ * It could be a boolean, but store the full name for logging. Set only at successful LU acceptance. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_ipa_name vlr_via_proxy;</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 proxy_subscr {</span><br><span style="color: hsl(120, 100%, 40%);">+ char imsi[GSM23003_IMSI_MAX_DIGITS+1];</span><br><span style="color: hsl(120, 100%, 40%);">+ char msisdn[GSM23003_MSISDN_MAX_DIGITS+1];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str remote_hlr_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr_domain_state cs, ps;</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 proxy_init(struct osmo_gsup_server *gsup_server_to_vlr);</span><br><span style="color: hsl(120, 100%, 40%);">+void proxy_del(struct proxy *proxy);</span><br><span style="color: hsl(120, 100%, 40%);">+void proxy_set_gc_period(struct proxy *proxy, uint32_t gc_period);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* The API to access / modify proxy entries keeps the implementation opaque, to make sure that we can easily move proxy</span><br><span style="color: hsl(120, 100%, 40%);">+ * storage to SQLite db. */</span><br><span style="color: hsl(120, 100%, 40%);">+int proxy_subscr_get_by_imsi(struct proxy_subscr *dst, struct proxy *proxy, const char *imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+int proxy_subscr_get_by_msisdn(struct proxy_subscr *dst, struct proxy *proxy, const char *msisdn);</span><br><span style="color: hsl(120, 100%, 40%);">+void proxy_subscrs_get_by_remote_hlr(struct proxy *proxy, const struct osmo_sockaddr_str *remote_hlr_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ bool (*yield)(struct proxy *proxy, const struct proxy_subscr *subscr, void *data),</span><br><span style="color: hsl(120, 100%, 40%);">+ void *data);</span><br><span style="color: hsl(120, 100%, 40%);">+int proxy_subscr_create_or_update(struct proxy *proxy, const struct proxy_subscr *proxy_subscr);</span><br><span style="color: hsl(120, 100%, 40%);">+int proxy_subscr_del(struct proxy *proxy, const char *imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int proxy_subscr_forward_to_remote_hlr(struct proxy *proxy, const struct proxy_subscr *proxy_subscr,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_req *req);</span><br><span style="color: hsl(120, 100%, 40%);">+void proxy_subscr_forward_to_remote_hlr_resolved(struct proxy *proxy, const struct proxy_subscr *proxy_subscr,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct remote_hlr *remote_hlr, struct osmo_gsup_req *req);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int proxy_subscr_forward_to_vlr(struct proxy *proxy, const struct proxy_subscr *proxy_subscr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_gsup_message *gsup, struct remote_hlr *from_remote_hlr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void proxy_subscr_remote_hlr_resolved(struct proxy *proxy, const struct proxy_subscr *proxy_subscr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr_str *remote_hlr_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+void proxy_subscr_remote_hlr_up(struct proxy *proxy, const struct proxy_subscr *proxy_subscr,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct remote_hlr *remote_hlr);</span><br><span>diff --git a/include/osmocom/hlr/remote_hlr.h b/include/osmocom/hlr/remote_hlr.h</span><br><span>new file mode 100644</span><br><span>index 0000000..6a4e8a1</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/hlr/remote_hlr.h</span><br><span>@@ -0,0 +1,59 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</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%);">+#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/linuxlist.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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsup_client;</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsup_message;</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsup_req;</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_REMOTE_HLR(remote_hlr, level, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, level, "(Proxy HLR-" OSMO_SOCKADDR_STR_FMT ") " fmt, \</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS((remote_hlr) ? &(remote_hlr)->addr : NULL), ##args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_REMOTE_HLR_MSG(remote_hlr, gsup_msg, level, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_REMOTE_HLR(remote_hlr, level, "%s: " fmt, osmo_gsup_message_type_name((gsup_msg)->message_type), ##args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* GSUP client link for proxying to a remote HLR. */</span><br><span style="color: hsl(120, 100%, 40%);">+struct remote_hlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head entry;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_client *gsupc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head pending_up_callbacks;</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%);">+/*! Receive a remote_hlr address when connecting succeeded, or remote_hlr == NULL on error.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param addr GSUP IP address and port for which the connection was requested.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param remote_hlr The connected remote_hlr ready for sending, or NULL if connecting failed.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param data Same a passed to remote_hlr_get_or_connect(). */</span><br><span style="color: hsl(120, 100%, 40%);">+typedef void (*remote_hlr_connect_result_cb_t)(const struct osmo_sockaddr_str *addr, struct remote_hlr *remote_hlr, void *data);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct remote_hlr *remote_hlr_get_or_connect(const struct osmo_sockaddr_str *addr, bool connect,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr_connect_result_cb_t connect_result_cb, void *data);</span><br><span style="color: hsl(120, 100%, 40%);">+void remote_hlr_destroy(struct remote_hlr *remote_hlr);</span><br><span style="color: hsl(120, 100%, 40%);">+int remote_hlr_msgb_send(struct remote_hlr *remote_hlr, struct msgb *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+void remote_hlr_gsup_forward_to_remote_hlr(struct remote_hlr *remote_hlr, struct osmo_gsup_req *req,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message *modified_gsup);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bool remote_hlr_is_up(struct remote_hlr *remote_hlr);</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index ceaa093..09e9101 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -53,6 +53,9 @@</span><br><span> hlr_vty_subscr.c \</span><br><span> gsup_send.c \</span><br><span> hlr_ussd.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr.c \</span><br><span> lu_fsm.c \</span><br><span> timestamp.c \</span><br><span> mslookup_server.c \</span><br><span>diff --git a/src/dgsm.c b/src/dgsm.c</span><br><span>new file mode 100644</span><br><span>index 0000000..bfa5df8</span><br><span>--- /dev/null</span><br><span>+++ b/src/dgsm.c</span><br><span>@@ -0,0 +1,247 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</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%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mslookup/mslookup_client.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/gsupclient/gsup_client.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/cni_peer_id.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/db.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_router.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/dgsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/proxy.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/remote_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%);">+#include <osmocom/hlr/dgsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void *dgsm_ctx = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void resolve_hlr_result_cb(struct osmo_mslookup_client *client,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t request_handle,</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 proxy *proxy = g_hlr->gs->proxy;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr proxy_subscr;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr_str *remote_hlr_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* A remote HLR is answering back, indicating that it is the home HLR for a given IMSI.</span><br><span style="color: hsl(120, 100%, 40%);">+ * There should be a mostly empty proxy entry for that IMSI.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Add the remote address data in the proxy. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (query->id.type != OSMO_MSLOOKUP_ID_IMSI) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_ERROR, "Expected IMSI ID type in mslookup query+result: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_result_name_c(OTC_SELECT, query, 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%);">+</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%);">+ LOG_DGSM(query->id.imsi, LOGL_ERROR, "Failed to resolve remote HLR: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_result_name_c(OTC_SELECT, query, result));</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_del(proxy, query->id.imsi);</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_is_nonzero(&result->host_v4))</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr_addr = &result->host_v4;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (osmo_sockaddr_str_is_nonzero(&result->host_v6))</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr_addr = &result->host_v6;</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_DGSM(query->id.imsi, LOGL_ERROR, "Invalid address for remote HLR: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_result_name_c(OTC_SELECT, query, result));</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_del(proxy, query->id.imsi);</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proxy_subscr_get_by_imsi(&proxy_subscr, proxy, query->id.imsi)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_DGSM(query->id.imsi, LOGL_ERROR, "No proxy entry for mslookup result: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_result_name_c(OTC_SELECT, query, 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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_remote_hlr_resolved(proxy, &proxy_subscr, remote_hlr_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%);">+/* Return true when the message has been handled by D-GSM. */</span><br><span style="color: hsl(120, 100%, 40%);">+bool dgsm_check_forward_gsup_msg(struct osmo_gsup_req *req)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr proxy_subscr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy *proxy = g_hlr->gs->proxy;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mslookup_query query;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mslookup_query_handling handling;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t request_handle;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If the IMSI is known in the local HLR, then we won't proxy. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (db_subscr_exists_by_imsi(g_hlr->dbc, req->gsup.imsi) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Are we already forwarding this IMSI to a remote HLR? */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proxy_subscr_get_by_imsi(&proxy_subscr, proxy, req->gsup.imsi) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_forward_to_remote_hlr(proxy, &proxy_subscr, req);</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</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%);">+ /* The IMSI is not known locally, so we want to proxy to a remote HLR, but no proxy entry exists yet. We need to</span><br><span style="color: hsl(120, 100%, 40%);">+ * look up the subscriber in remote HLRs via D-GSM mslookup, forward GSUP and reply once a result is back from</span><br><span style="color: hsl(120, 100%, 40%);">+ * there. Defer message and kick off MS lookup. */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Add a proxy entry without a remote address to indicate that we are busy querying for a remote HLR. */</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr = (struct proxy_subscr){};</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRLCPY_ARRAY(proxy_subscr.imsi, req->gsup.imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proxy_subscr_create_or_update(proxy, &proxy_subscr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Failed to create proxy entry\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</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%);">+ /* Is a fixed gateway proxy configured? */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_is_nonzero(&g_hlr->mslookup.client.gsup_gateway_proxy)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_remote_hlr_resolved(proxy, &proxy_subscr, &g_hlr->mslookup.client.gsup_gateway_proxy);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Proxy database modified, update info */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proxy_subscr_get_by_imsi(&proxy_subscr, proxy, req->gsup.imsi)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Internal proxy error\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</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%);">+ proxy_subscr_forward_to_remote_hlr(proxy, &proxy_subscr, req);</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</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%);">+ /* Kick off an mslookup for the remote HLR? This check could be up first on the top, but do it only now so that</span><br><span style="color: hsl(120, 100%, 40%);">+ * if the mslookup client disconnected, we still continue to service open proxy entries. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_mslookup_client_active(g_hlr->mslookup.client.client)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_GSUP_REQ(req, LOGL_DEBUG, "mslookup client not running, cannot query remote home HLR\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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%);">+ /* First spool message, then kick off mslookup. If the proxy denies this message type, then don't do anything. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proxy_subscr_forward_to_remote_hlr(proxy, &proxy_subscr, req)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If the proxy denied forwarding, an error response was already generated. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</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%);">+ query = (struct osmo_mslookup_query){</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = OSMO_MSLOOKUP_ID_IMSI,</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_STRLCPY_ARRAY(query.id.imsi, req->gsup.imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRLCPY_ARRAY(query.service, OSMO_MSLOOKUP_SERVICE_HLR_GSUP);</span><br><span style="color: hsl(120, 100%, 40%);">+ handling = (struct osmo_mslookup_query_handling){</span><br><span style="color: hsl(120, 100%, 40%);">+ .min_wait_milliseconds = g_hlr->mslookup.client.result_timeout_milliseconds,</span><br><span style="color: hsl(120, 100%, 40%);">+ .result_cb = resolve_hlr_result_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ request_handle = osmo_mslookup_client_request(g_hlr->mslookup.client.client, &query, &handling);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!request_handle) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_DGSM(req->gsup.imsi, LOGL_ERROR, "Error dispatching mslookup query for home HLR: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_result_name_c(OTC_SELECT, &query, NULL));</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_del(proxy, req->gsup.imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* mslookup seems to not be working. Try handling it locally. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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 true;</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_init(void *ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_ctx = talloc_named_const(ctx, 0, "dgsm");</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&g_hlr->mslookup.server.local_site_services);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.server.local_attach_max_age = 60 * 60;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.result_timeout_milliseconds = 2000;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->gsup_unit_name.unit_name = "HLR";</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->gsup_unit_name.serno = "unnamed-HLR";</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->gsup_unit_name.swversion = PACKAGE_NAME "-" PACKAGE_VERSION;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_from_str(&g_hlr->mslookup.server.mdns.bind_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_MSLOOKUP_MDNS_IP4, OSMO_MSLOOKUP_MDNS_PORT);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_from_str(&g_hlr->mslookup.client.mdns.query_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_MSLOOKUP_MDNS_IP4, OSMO_MSLOOKUP_MDNS_PORT);</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_start(void *ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.client = osmo_mslookup_client_new(dgsm_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(g_hlr->mslookup.client.client);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.allow_startup = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ mslookup_server_mdns_config_apply();</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_mdns_client_config_apply();</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_stop()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.allow_startup = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ mslookup_server_mdns_config_apply();</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_mdns_client_config_apply();</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_mdns_client_config_apply(void)</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 client */</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr_str *current_bind_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *current_domain_suffix;</span><br><span style="color: hsl(120, 100%, 40%);">+ current_bind_addr = osmo_mslookup_client_method_mdns_get_bind_addr(g_hlr->mslookup.client.mdns.running);</span><br><span style="color: hsl(120, 100%, 40%);">+ current_domain_suffix = osmo_mslookup_client_method_mdns_get_domain_suffix(g_hlr->mslookup.client.mdns.running);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bool should_run = g_hlr->mslookup.allow_startup</span><br><span style="color: hsl(120, 100%, 40%);">+ && g_hlr->mslookup.client.enable && g_hlr->mslookup.client.mdns.enable;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bool should_stop = g_hlr->mslookup.client.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.client.mdns.query_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ current_bind_addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ || strcmp(g_hlr->mslookup.client.mdns.domain_suffix,</span><br><span style="color: hsl(120, 100%, 40%);">+ current_domain_suffix));</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_client_method_del(g_hlr->mslookup.client.client, g_hlr->mslookup.client.mdns.running);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.mdns.running = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_NOTICE, "Stopped mslookup mDNS client\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.client.mdns.running) {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.mdns.running =</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_client_add_mdns(g_hlr->mslookup.client.client,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.mdns.query_addr.ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.mdns.query_addr.port,</span><br><span style="color: hsl(120, 100%, 40%);">+ -1,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.mdns.domain_suffix);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!g_hlr->mslookup.client.mdns.running)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_ERROR, "Failed to start mslookup mDNS client with target "</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.client.mdns.query_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_NOTICE, "Started mslookup mDNS client, sending mDNS requests to 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.client.mdns.query_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%);">+ if (g_hlr->mslookup.client.enable && osmo_sockaddr_str_is_nonzero(&g_hlr->mslookup.client.gsup_gateway_proxy))</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "mslookup client: all GSUP requests for unknown IMSIs will be forwarded to"</span><br><span style="color: hsl(120, 100%, 40%);">+ " gateway-proxy " OSMO_SOCKADDR_STR_FMT "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS(&g_hlr->mslookup.client.gsup_gateway_proxy));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/dgsm_vty.c b/src/dgsm_vty.c</span><br><span>index facd2b7..6f29d3b 100644</span><br><span>--- a/src/dgsm_vty.c</span><br><span>+++ b/src/dgsm_vty.c</span><br><span>@@ -61,6 +61,26 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int mslookup_client_mdns_to(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.client.mdns.query_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.client.mdns.query_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 client: Invalid mDNS target 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.client.mdns.query_addr = addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.mdns.enable = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.enable = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_mdns_client_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> #define MDNS_STR "Multicast DNS related configuration\n"</span><br><span> #define MDNS_IP46_STR "multicast IPv4 address like " OSMO_MSLOOKUP_MDNS_IP4 \</span><br><span> " or IPv6 address like " OSMO_MSLOOKUP_MDNS_IP6 "\n"</span><br><span>@@ -71,6 +91,44 @@</span><br><span> #define IP46_STR "IPv4 address like 1.2.3.4 or IPv6 address like a:b:c:d::1\n"</span><br><span> #define PORT_STR "Service-specific port number\n"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_mslookup_mdns,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_mdns_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "mdns bind [IP] [<1-65535>]",</span><br><span style="color: hsl(120, 100%, 40%);">+ MDNS_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Convenience shortcut: enable and configure both server and client for mDNS mslookup\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%);">+ int rc1 = mslookup_server_mdns_bind(vty, argc, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc2 = mslookup_client_mdns_to(vty, argc, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc1 != CMD_SUCCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc2;</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_mdns_domain_suffix,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_mdns_domain_suffix_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "mdns domain-suffix DOMAIN_SUFFIX",</span><br><span style="color: hsl(120, 100%, 40%);">+ MDNS_STR MDNS_DOMAIN_SUFFIX_STR MDNS_DOMAIN_SUFFIX_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(g_hlr, &g_hlr->mslookup.server.mdns.domain_suffix, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(g_hlr, &g_hlr->mslookup.client.mdns.domain_suffix, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ mslookup_server_mdns_config_apply();</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_mdns_client_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_mdns,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_no_mdns_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no mdns bind",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "Disable both server and client for mDNS mslookup\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%);">+ g_hlr->mslookup.client.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%);">+ dgsm_mdns_client_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> struct cmd_node mslookup_server_node = {</span><br><span> MSLOOKUP_SERVER_NODE,</span><br><span> "%s(config-mslookup-server)# ",</span><br><span>@@ -265,6 +323,81 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct cmd_node mslookup_client_node = {</span><br><span style="color: hsl(120, 100%, 40%);">+ MSLOOKUP_CLIENT_NODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s(config-mslookup-client)# ",</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_client,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_client_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "client",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable and configure Distributed GSM mslookup client")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ vty->node = MSLOOKUP_CLIENT_NODE;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.enable = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_mdns_client_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_client,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_no_client_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no client",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "Disable Distributed GSM mslookup client")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.enable = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_mdns_client_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_client_timeout,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_client_timeout_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "timeout <1-100000>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "How long should the mslookup client wait for remote responses before evaluating received results\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "timeout in milliseconds\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t val = atol(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.result_timeout_milliseconds = val;</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 EXIT_HINT() \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vty->type != VTY_FILE) \</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% 'exit' this node to apply changes%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%);">+DEFUN(cfg_mslookup_client_mdns_bind,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_client_mdns_bind_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "mdns bind [IP] [<1-65535>]",</span><br><span style="color: hsl(120, 100%, 40%);">+ MDNS_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable mDNS client, and configure multicast address to send mDNS mslookup requests to\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_client_mdns_to(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_client_mdns_domain_suffix,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_client_mdns_domain_suffix_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "mdns domain-suffix DOMAIN_SUFFIX",</span><br><span style="color: hsl(120, 100%, 40%);">+ MDNS_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ MDNS_DOMAIN_SUFFIX_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ MDNS_DOMAIN_SUFFIX_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(g_hlr, &g_hlr->mslookup.client.mdns.domain_suffix, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_mdns_client_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_client_no_mdns_bind,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_client_no_mdns_bind_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no mdns bind",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "Disable mDNS client, do not query remote services by mDNS\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.mdns.enable = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_mdns_client_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> void config_write_msc_services(struct vty *vty, const char *indent, struct mslookup_server_msc_cfg *msc)</span><br><span> {</span><br><span> struct mslookup_service_host *e;</span><br><span>@@ -282,7 +415,8 @@</span><br><span> int config_write_mslookup(struct vty *vty)</span><br><span> {</span><br><span> if (!g_hlr->mslookup.server.enable</span><br><span style="color: hsl(0, 100%, 40%);">- && llist_empty(&g_hlr->mslookup.server.local_site_services))</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%);">+ && !g_hlr->mslookup.client.enable)</span><br><span> return CMD_SUCCESS;</span><br><span> </span><br><span> vty_out(vty, "mslookup%s", VTY_NEWLINE);</span><br><span>@@ -322,6 +456,57 @@</span><br><span> vty_out(vty, " no server%s", VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_hlr->mslookup.client.enable) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " client%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_is_nonzero(&g_hlr->mslookup.client.gsup_gateway_proxy))</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " gateway-proxy %s %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.gsup_gateway_proxy.ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.gsup_gateway_proxy.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%);">+ if (g_hlr->mslookup.client.mdns.enable</span><br><span style="color: hsl(120, 100%, 40%);">+ && osmo_sockaddr_str_is_nonzero(&g_hlr->mslookup.client.mdns.query_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.client.mdns.query_addr.ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.mdns.query_addr.port,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(g_hlr->mslookup.client.mdns.domain_suffix, OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT))</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " mdns domain-suffix %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.mdns.domain_suffix,</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%);">+ 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_client_gateway_proxy,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_client_gateway_proxy_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "gateway-proxy IP [<1-65535>]",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure a fixed IP address to send all GSUP requests for unknown IMSIs to, without invoking a lookup for IMSI\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "IP address of the remote HLR\n" "GSUP port number (omit for default " OSMO_STRINGIFY_VAL(OSMO_GSUP_PORT) ")\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *ip_str = argv[0];</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%);">+ struct osmo_sockaddr_str addr;</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, port_str ? atoi(port_str) : OSMO_GSUP_PORT)</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 client: Invalid address for gateway-proxy: %s %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ 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%);">+ g_hlr->mslookup.client.gsup_gateway_proxy = addr;</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_client_no_gateway_proxy,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mslookup_client_no_gateway_proxy_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no gateway-proxy",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "Disable gateway proxy for GSUP with unknown IMSIs\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.gsup_gateway_proxy = (struct osmo_sockaddr_str){};</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -361,6 +546,9 @@</span><br><span> install_element(CONFIG_NODE, &cfg_mslookup_cmd);</span><br><span> </span><br><span> install_node(&mslookup_node, config_write_mslookup);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_NODE, &cfg_mslookup_mdns_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_NODE, &cfg_mslookup_mdns_domain_suffix_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_NODE, &cfg_mslookup_no_mdns_cmd);</span><br><span> install_element(MSLOOKUP_NODE, &cfg_mslookup_server_cmd);</span><br><span> install_element(MSLOOKUP_NODE, &cfg_mslookup_no_server_cmd);</span><br><span> </span><br><span>@@ -378,5 +566,15 @@</span><br><span> install_element(MSLOOKUP_SERVER_MSC_NODE, &cfg_mslookup_server_msc_no_service_cmd);</span><br><span> install_element(MSLOOKUP_SERVER_MSC_NODE, &cfg_mslookup_server_msc_no_service_addr_cmd);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_NODE, &cfg_mslookup_client_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_NODE, &cfg_mslookup_no_client_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_node(&mslookup_client_node, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_timeout_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_mdns_bind_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_mdns_domain_suffix_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_no_mdns_bind_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_gateway_proxy_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_no_gateway_proxy_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> install_element_ve(&do_mslookup_show_services_cmd);</span><br><span> }</span><br><span>diff --git a/src/gsup_server.c b/src/gsup_server.c</span><br><span>index 61b9257..15d2f83 100644</span><br><span>--- a/src/gsup_server.c</span><br><span>+++ b/src/gsup_server.c</span><br><span>@@ -502,3 +502,39 @@</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsup_forward_to_local_peer(struct osmo_gsup_server *server, const struct osmo_cni_peer_id *to_peer,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_req *req, struct osmo_gsup_message *modified_gsup)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* To forward to a remote entity (HLR, SMSC,...), we need to indicate the original source name in the Source</span><br><span style="color: hsl(120, 100%, 40%);">+ * Name IE to make sure the reply can be routed back. Store the sender in gsup->source_name -- the remote entity</span><br><span style="color: hsl(120, 100%, 40%);">+ * is required to return this as gsup->destination_name so that the reply gets routed to the original sender. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message forward = *(modified_gsup? : &req->gsup);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (req->source_name.type != OSMO_CNI_PEER_ID_IPA_NAME) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Unsupported GSUP peer id type: %s",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_cni_peer_id_type_name(req->source_name.type));</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -ENOTSUP;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto routing_error;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ forward.source_name = req->source_name.ipa_name.val;</span><br><span style="color: hsl(120, 100%, 40%);">+ forward.source_name_len = req->source_name.ipa_name.len;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (to_peer->type != OSMO_CNI_PEER_ID_IPA_NAME) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Unsupported GSUP peer id type: %s",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_cni_peer_id_type_name(to_peer->type));</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -ENOTSUP;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto routing_error;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_GSUP_REQ(req, LOGL_INFO, "Forwarding to %s\n", osmo_cni_peer_id_to_str(to_peer));</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_gsup_enc_send_to_ipa_name(server, &to_peer->ipa_name, &forward);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto routing_error;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_req_free(req);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+routing_error:</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_ROUTING_ERROR, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</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 5e015b3..7b803e7 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -36,6 +36,7 @@</span><br><span> #include <osmocom/gsm/gsm48_ie.h></span><br><span> #include <osmocom/gsm/gsm_utils.h></span><br><span> #include <osmocom/gsm/gsm23003.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mslookup/mslookup_client.h></span><br><span> </span><br><span> #include <osmocom/gsupclient/cni_peer_id.h></span><br><span> #include <osmocom/hlr/db.h></span><br><span>@@ -47,6 +48,8 @@</span><br><span> #include <osmocom/hlr/rand.h></span><br><span> #include <osmocom/hlr/hlr_vty.h></span><br><span> #include <osmocom/hlr/hlr_ussd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/dgsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/proxy.h></span><br><span> #include <osmocom/hlr/lu_fsm.h></span><br><span> #include <osmocom/mslookup/mdns.h></span><br><span> </span><br><span>@@ -500,6 +503,16 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Distributed GSM: check whether to proxy for / lookup a remote HLR.</span><br><span style="color: hsl(120, 100%, 40%);">+ * It would require less database hits to do this only if a local-only operation fails with "unknown IMSI", but</span><br><span style="color: hsl(120, 100%, 40%);">+ * it becomes semantically easier if we do this once-off ahead of time. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_mslookup_client_active(g_hlr->mslookup.client.client)</span><br><span style="color: hsl(120, 100%, 40%);">+ || osmo_sockaddr_str_is_nonzero(&g_hlr->mslookup.client.gsup_gateway_proxy)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dgsm_check_forward_gsup_msg(req))</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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%);">+ /* HLR related messages that are handled at this HLR instance */</span><br><span> switch (req->gsup.message_type) {</span><br><span> /* requests sent to us */</span><br><span> case OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST:</span><br><span>@@ -699,6 +712,7 @@</span><br><span> INIT_LLIST_HEAD(&g_hlr->mslookup.server.local_site_services);</span><br><span> g_hlr->db_file_path = talloc_strdup(g_hlr, HLR_DEFAULT_DB_FILE_PATH);</span><br><span> g_hlr->mslookup.server.mdns.domain_suffix = talloc_strdup(g_hlr, OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->mslookup.client.mdns.domain_suffix = talloc_strdup(g_hlr, OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT);</span><br><span> </span><br><span> /* Init default (call independent) SS session guard timeout value */</span><br><span> g_hlr->ncss_guard_timeout = NCSS_GUARD_TIMEOUT_DEFAULT;</span><br><span>@@ -709,6 +723,9 @@</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Set up llists and objects, startup is happening from VTY commands. */</span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_init(hlr_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> osmo_stats_init(hlr_ctx);</span><br><span> vty_init(&vty_info);</span><br><span> ctrl_vty_init(hlr_ctx);</span><br><span>@@ -764,10 +781,13 @@</span><br><span> LOGP(DMAIN, LOGL_FATAL, "Error starting GSUP server\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_init(g_hlr->gs);</span><br><span> </span><br><span> g_hlr->ctrl_bind_addr = ctrl_vty_get_bind_addr();</span><br><span> g_hlr->ctrl = hlr_controlif_setup(g_hlr);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_start(hlr_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> osmo_init_ignore_signals();</span><br><span> signal(SIGINT, &signal_hdlr);</span><br><span> signal(SIGTERM, &signal_hdlr);</span><br><span>@@ -784,6 +804,7 @@</span><br><span> while (!quit)</span><br><span> osmo_select_main_ctx(0);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ dgsm_stop();</span><br><span> </span><br><span> osmo_gsup_server_destroy(g_hlr->gs);</span><br><span> db_close(g_hlr->dbc);</span><br><span>diff --git a/src/hlr_vty.c b/src/hlr_vty.c</span><br><span>index 6701cd9..e959be8 100644</span><br><span>--- a/src/hlr_vty.c</span><br><span>+++ b/src/hlr_vty.c</span><br><span>@@ -146,6 +146,24 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_hlr_gsup_ipa_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_hlr_gsup_ipa_name_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ipa-name NAME",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set the IPA name of this HLR, for proxying to remote HLRs\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "A globally unique name for this HLR. For example: PLMN + redundancy server number: HLR-901-70-0. "</span><br><span style="color: hsl(120, 100%, 40%);">+ "This name is used for GSUP routing and must be set if multiple HLRs interconnect (e.g. mslookup "</span><br><span style="color: hsl(120, 100%, 40%);">+ "for Distributed GSM).\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vty->type != VTY_FILE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "gsup/ipa-name: The GSUP IPA name cannot be changed at run-time; "</span><br><span style="color: hsl(120, 100%, 40%);">+ "It can only be set in the configuraton file.%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%);">+ g_hlr->gsup_unit_name.serno = talloc_strdup(g_hlr, argv[0]);</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> /***********************************************************************</span><br><span> * USSD Entity</span><br><span> ***********************************************************************/</span><br><span>@@ -444,6 +462,7 @@</span><br><span> install_node(&gsup_node, config_write_hlr_gsup);</span><br><span> </span><br><span> install_element(GSUP_NODE, &cfg_hlr_gsup_bind_ip_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(GSUP_NODE, &cfg_hlr_gsup_ipa_name_cmd);</span><br><span> </span><br><span> install_element(HLR_NODE, &cfg_database_cmd);</span><br><span> </span><br><span>diff --git a/src/logging.c b/src/logging.c</span><br><span>index 15ef596..eab0510 100644</span><br><span>--- a/src/logging.c</span><br><span>+++ b/src/logging.c</span><br><span>@@ -37,6 +37,12 @@</span><br><span> .color = "\033[1;33m",</span><br><span> .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DDGSM] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DDGSM",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "Distributed GSM: MS lookup and proxy",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;35m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> const struct log_info hlr_log_info = {</span><br><span>diff --git a/src/mslookup_server.c b/src/mslookup_server.c</span><br><span>index 9c4dc58..885adf8 100644</span><br><span>--- a/src/mslookup_server.c</span><br><span>+++ b/src/mslookup_server.c</span><br><span>@@ -27,6 +27,7 @@</span><br><span> #include <osmocom/hlr/db.h></span><br><span> #include <osmocom/hlr/timestamp.h></span><br><span> #include <osmocom/hlr/mslookup_server.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/proxy.h></span><br><span> </span><br><span> static const struct osmo_mslookup_result not_found = {</span><br><span> .rc = OSMO_MSLOOKUP_RC_NOT_FOUND,</span><br><span>@@ -294,13 +295,84 @@</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static bool subscriber_has_done_lu_here(const struct osmo_mslookup_query *query,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t *lu_age_p,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_ipa_name *local_msc_name)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Determine whether the subscriber with the given ID has routed a Location Updating via this HLR as first hop. Return</span><br><span style="color: hsl(120, 100%, 40%);">+ * true if it is attached at a local VLR, and we are serving as proxy for a remote home HLR.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static bool subscriber_has_done_lu_here_proxy(const struct osmo_mslookup_query *query,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t *lu_age,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_ipa_name *local_msc_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr *ret_proxy_subscr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr proxy_subscr;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t age;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* See the local HLR record. If the subscriber is "at home" in this HLR and is also currently located here, we</span><br><span style="color: hsl(120, 100%, 40%);">+ * will find a valid location updating and no vlr_via_proxy entry. */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (query->id.type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_MSLOOKUP_ID_IMSI:</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = proxy_subscr_get_by_imsi(&proxy_subscr, g_hlr->gs->proxy, query->id.imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_MSLOOKUP_ID_MSISDN:</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = proxy_subscr_get_by_msisdn(&proxy_subscr, g_hlr->gs->proxy, query->id.msisdn);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_ERROR, "%s: unknown ID type\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_result_name_c(OTC_SELECT, query, NULL));</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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 (rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_DEBUG, "%s: does not exist in GSUP proxy\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_result_name_c(OTC_SELECT, query, NULL));</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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%);">+ /* We only need to care about CS LU, since only CS services need D-GSM routing. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!timestamp_age(&proxy_subscr.cs.last_lu, &age)</span><br><span style="color: hsl(120, 100%, 40%);">+ || age > g_hlr->mslookup.server.local_attach_max_age) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s: last attach was at local VLR (proxying for remote HLR), but too long ago: %us > %us\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_result_name_c(OTC_SELECT, query, NULL),</span><br><span style="color: hsl(120, 100%, 40%);">+ age, g_hlr->mslookup.server.local_attach_max_age);</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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 (proxy_subscr.cs.vlr_via_proxy.len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_DEBUG, "%s: last attach is not at local VLR, but at VLR '%s' via proxy '%s'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_result_name_c(OTC_SELECT, query, NULL),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ipa_name_to_str(&proxy_subscr.cs.vlr_name),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ipa_name_to_str(&proxy_subscr.cs.vlr_via_proxy));</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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%);">+ *lu_age = age;</span><br><span style="color: hsl(120, 100%, 40%);">+ *local_msc_name = proxy_subscr.cs.vlr_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_DEBUG, "%s: attached %u seconds ago at local VLR %s; proxying for remote HLR "</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mslookup_result_name_c(OTC_SELECT, query, NULL),</span><br><span style="color: hsl(120, 100%, 40%);">+ age, osmo_ipa_name_to_str(local_msc_name),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS(&proxy_subscr.remote_hlr_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret_proxy_subscr)</span><br><span style="color: hsl(120, 100%, 40%);">+ *ret_proxy_subscr = proxy_subscr;</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</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%);">+bool subscriber_has_done_lu_here(const struct osmo_mslookup_query *query,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t *lu_age_p, struct osmo_ipa_name *local_msc_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ char *ret_imsi, size_t ret_imsi_len)</span><br><span> {</span><br><span> bool attached_here;</span><br><span> uint32_t lu_age = 0;</span><br><span> struct osmo_ipa_name msc_name = {};</span><br><span style="color: hsl(120, 100%, 40%);">+ bool attached_here_proxy;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t proxy_lu_age = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_ipa_name proxy_msc_name = {};</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr proxy_subscr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct hlr_subscriber db_subscr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> /* First ask the local HLR db, but if the local proxy record indicates a more recent LU, use that instead.</span><br><span> * For all usual cases, only one of these will reflect a LU, even if a subscriber had more than one home HLR:</span><br><span>@@ -310,9 +382,20 @@</span><br><span> * the local HLR database, there might occur a situation where both reflect a LU. So, to be safe against all</span><br><span> * situations, compare the two entries.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- attached_here = subscriber_has_done_lu_here_hlr(query, &lu_age, &msc_name, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ attached_here = subscriber_has_done_lu_here_hlr(query, &lu_age, &msc_name, &db_subscr);</span><br><span style="color: hsl(120, 100%, 40%);">+ attached_here_proxy = subscriber_has_done_lu_here_proxy(query, &proxy_lu_age, &proxy_msc_name, &proxy_subscr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Future: If proxy has a younger lu, replace. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If proxy has a younger lu, replace. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (attached_here_proxy && (!attached_here || (proxy_lu_age < lu_age))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ attached_here = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ lu_age = proxy_lu_age;</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_name = proxy_msc_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret_imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(ret_imsi, proxy_subscr.imsi, ret_imsi_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (attached_here) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret_imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(ret_imsi, db_subscr.imsi, ret_imsi_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (attached_here && !msc_name.len) {</span><br><span> LOGP(DMSLOOKUP, LOGL_ERROR, "%s: attached here, but no VLR name known\n",</span><br><span>@@ -349,7 +432,7 @@</span><br><span> /* All other service types: answer when the subscriber has done a LU that is either listed in the local HLR or</span><br><span> * in the GSUP proxy database: i.e. if the subscriber has done a Location Updating at an VLR belonging to this</span><br><span> * HLR. Respond with whichever services are configured in the osmo-hlr.cfg. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!subscriber_has_done_lu_here(query, &age, &msc_name)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!subscriber_has_done_lu_here(query, &age, &msc_name, NULL, 0)) {</span><br><span> *result = not_found;</span><br><span> return;</span><br><span> }</span><br><span>diff --git a/src/proxy.c b/src/proxy.c</span><br><span>new file mode 100644</span><br><span>index 0000000..1ae152c</span><br><span>--- /dev/null</span><br><span>+++ b/src/proxy.c</span><br><span>@@ -0,0 +1,554 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</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%);">+#include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <inttypes.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/timer.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsup.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsm23003.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsm48_ie.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/gsup_client.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/gsup_req.h></span><br><span style="color: hsl(120, 100%, 40%);">+</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/proxy.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/remote_hlr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_router.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_PROXY_SUBSCR(proxy_subscr, level, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, level, "(Proxy IMSI-%s MSISDN-%s HLR-" OSMO_SOCKADDR_STR_FMT ") " fmt, \</span><br><span style="color: hsl(120, 100%, 40%);">+ ((proxy_subscr) && *(proxy_subscr)->imsi)? (proxy_subscr)->imsi : "?", \</span><br><span style="color: hsl(120, 100%, 40%);">+ ((proxy_subscr) && *(proxy_subscr)->msisdn)? (proxy_subscr)->msisdn : "?", \</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS((proxy_subscr)? &(proxy_subscr)->remote_hlr_addr : NULL), \</span><br><span style="color: hsl(120, 100%, 40%);">+ ##args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup_msg, level, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR(proxy_subscr, level, "%s: " fmt, \</span><br><span style="color: hsl(120, 100%, 40%);">+ (gsup_msg) ? osmo_gsup_message_type_name((gsup_msg)->message_type) : "NULL", \</span><br><span style="color: hsl(120, 100%, 40%);">+ ##args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* The proxy subscriber database.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Why have a separate struct to add an llist_head entry?</span><br><span style="color: hsl(120, 100%, 40%);">+ * This is to keep the option open to store the proxy data in the database instead, without any visible effect outside</span><br><span style="color: hsl(120, 100%, 40%);">+ * of proxy.c. */</span><br><span style="color: hsl(120, 100%, 40%);">+struct proxy_subscr_listentry {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head entry;</span><br><span style="color: hsl(120, 100%, 40%);">+ timestamp_t last_update;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr data;</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 proxy_pending_gsup_req {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head entry;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_req *req;</span><br><span style="color: hsl(120, 100%, 40%);">+ timestamp_t received_at;</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%);">+/* Defer a GSUP message until we know a remote HLR to proxy to.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Where to send this GSUP message is indicated by its IMSI: as soon as an MS lookup has yielded the IMSI's home HLR,</span><br><span style="color: hsl(120, 100%, 40%);">+ * that's where the message should go. */</span><br><span style="color: hsl(120, 100%, 40%);">+static void proxy_deferred_gsup_req_add(struct proxy *proxy, struct osmo_gsup_req *req)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_pending_gsup_req *m;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ m = talloc_zero(proxy, struct proxy_pending_gsup_req);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(m);</span><br><span style="color: hsl(120, 100%, 40%);">+ m->req = req;</span><br><span style="color: hsl(120, 100%, 40%);">+ timestamp_update(&m->received_at);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add_tail(&m->entry, &proxy->pending_gsup_reqs);</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 proxy_pending_req_remote_hlr_connect_result(struct osmo_gsup_req *req, struct remote_hlr *remote_hlr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!remote_hlr || !remote_hlr_is_up(remote_hlr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_req_respond_err(req, GMM_CAUSE_IMSI_UNKNOWN, "Proxy: Failed to connect to home HLR");</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr_gsup_forward_to_remote_hlr(remote_hlr, req, 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%);">+static bool proxy_deferred_gsup_req_waiting(struct proxy *proxy, const char *imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_pending_gsup_req *p;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(p, &proxy->pending_gsup_reqs, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(p->req->gsup.imsi, imsi))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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%);">+/* Result of looking for remote HLR. If it failed, pass remote_hlr as NULL. On failure, the remote_hlr may be passed</span><br><span style="color: hsl(120, 100%, 40%);">+ * NULL. */</span><br><span style="color: hsl(120, 100%, 40%);">+static void proxy_deferred_gsup_req_pop(struct proxy *proxy, const char *imsi, struct remote_hlr *remote_hlr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_pending_gsup_req *p, *n;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry_safe(p, n, &proxy->pending_gsup_reqs, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(p->req->gsup.imsi, imsi))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_pending_req_remote_hlr_connect_result(p->req, remote_hlr);</span><br><span style="color: hsl(120, 100%, 40%);">+ p->req = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&p->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(p);</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%);">+static bool proxy_subscr_matches_imsi(const struct proxy_subscr *proxy_subscr, const char *imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!proxy_subscr || !imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return strcmp(proxy_subscr->imsi, imsi) == 0;</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 bool proxy_subscr_matches_msisdn(const struct proxy_subscr *proxy_subscr, const char *msisdn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!proxy_subscr || !msisdn)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return strcmp(proxy_subscr->msisdn, msisdn) == 0;</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 struct proxy_subscr_listentry *_proxy_get_by_imsi(struct proxy *proxy, const char *imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr_listentry *e;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!proxy)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(e, &proxy->subscr_list, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proxy_subscr_matches_imsi(&e->data, imsi))</span><br><span style="color: hsl(120, 100%, 40%);">+ return e;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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%);">+static struct proxy_subscr_listentry *_proxy_get_by_msisdn(struct proxy *proxy, const char *msisdn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr_listentry *e;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!proxy)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(e, &proxy->subscr_list, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proxy_subscr_matches_msisdn(&e->data, msisdn))</span><br><span style="color: hsl(120, 100%, 40%);">+ return e;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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%);">+int proxy_subscr_get_by_imsi(struct proxy_subscr *dst, struct proxy *proxy, const char *imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr_listentry *e = _proxy_get_by_imsi(proxy, imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!e)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOENT;</span><br><span style="color: hsl(120, 100%, 40%);">+ *dst = e->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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 proxy_subscr_get_by_msisdn(struct proxy_subscr *dst, struct proxy *proxy, const char *msisdn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr_listentry *e = _proxy_get_by_msisdn(proxy, msisdn);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!e)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOENT;</span><br><span style="color: hsl(120, 100%, 40%);">+ *dst = e->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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 proxy_subscr_create_or_update(struct proxy *proxy, const struct proxy_subscr *proxy_subscr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr_listentry *e = _proxy_get_by_imsi(proxy, proxy_subscr->imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!e) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Does not exist yet */</span><br><span style="color: hsl(120, 100%, 40%);">+ e = talloc_zero(proxy, struct proxy_subscr_listentry);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(&e->entry, &proxy->subscr_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ e->data = *proxy_subscr;</span><br><span style="color: hsl(120, 100%, 40%);">+ timestamp_update(&e->last_update);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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 _proxy_subscr_del(struct proxy_subscr_listentry *e)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&e->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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 proxy_subscr_del(struct proxy *proxy, const char *imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr_listentry *e;</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_deferred_gsup_req_pop(proxy, imsi, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ e = _proxy_get_by_imsi(proxy, imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!e)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOENT;</span><br><span style="color: hsl(120, 100%, 40%);">+ return _proxy_subscr_del(e);</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%);">+/* Discard stale proxy entries. */</span><br><span style="color: hsl(120, 100%, 40%);">+static void proxy_cleanup(void *proxy_v)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy *proxy = proxy_v;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr_listentry *e, *n;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t age;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry_safe(e, n, &proxy->subscr_list, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!timestamp_age(&e->last_update, &age))</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_ERROR, "Invalid timestamp, deleting proxy entry\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (age <= proxy->fresh_time)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR(&e->data, LOGL_INFO, "proxy entry timed out, deleting\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ _proxy_subscr_del(e);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proxy->gc_period)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&proxy->gc_timer, proxy->gc_period, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_NOTICE, "Proxy cleanup is switched off (gc_period == 0)\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%);">+void proxy_set_gc_period(struct proxy *proxy, uint32_t gc_period)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy->gc_period = gc_period;</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_cleanup(proxy);</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 proxy_init(struct osmo_gsup_server *gsup_server_to_vlr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(!gsup_server_to_vlr->proxy);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy *proxy = talloc_zero(gsup_server_to_vlr, struct proxy);</span><br><span style="color: hsl(120, 100%, 40%);">+ *proxy = (struct proxy){</span><br><span style="color: hsl(120, 100%, 40%);">+ .gsup_server_to_vlr = gsup_server_to_vlr,</span><br><span style="color: hsl(120, 100%, 40%);">+ .fresh_time = 60*60,</span><br><span style="color: hsl(120, 100%, 40%);">+ .gc_period = 60,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&proxy->subscr_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&proxy->pending_gsup_reqs);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_setup(&proxy->gc_timer, proxy_cleanup, proxy);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Invoke to trigger the first timer schedule */</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_set_gc_period(proxy, proxy->gc_period);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_server_to_vlr->proxy = proxy;</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 proxy_del(struct proxy *proxy)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_del(&proxy->gc_timer);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(proxy);</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%);">+/* All GSUP messages sent to the remote HLR pass through this function, to modify the subscriber state or disallow</span><br><span style="color: hsl(120, 100%, 40%);">+ * sending the message. Return 0 to allow sending the message. */</span><br><span style="color: hsl(120, 100%, 40%);">+static int proxy_acknowledge_gsup_to_remote_hlr(struct proxy *proxy, const struct proxy_subscr *proxy_subscr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_gsup_req *req)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr proxy_subscr_new = *proxy_subscr;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool ps;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool cs;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (req->source_name.type != OSMO_CNI_PEER_ID_IPA_NAME) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, &req->gsup, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unsupported GSUP peer id type: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_cni_peer_id_type_name(req->source_name.type));</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOTSUP;</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%);">+ switch (req->gsup.message_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Store the CS and PS VLR name in vlr_name_preliminary to later update the right {cs,ps} LU timestamp</span><br><span style="color: hsl(120, 100%, 40%);">+ * when receiving an OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT. Store in vlr_name_preliminary so that in</span><br><span style="color: hsl(120, 100%, 40%);">+ * case the LU fails, we keep the vlr_name intact. */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (req->gsup.cn_domain) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_CN_DOMAIN_CS:</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.cs.vlr_name_preliminary = req->source_name.ipa_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_CN_DOMAIN_PS:</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.ps.vlr_name_preliminary = req->source_name.ipa_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+ ps = cs = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_ipa_name_cmp(&proxy_subscr_new.cs.vlr_name_preliminary, &proxy_subscr->cs.vlr_name_preliminary))</span><br><span style="color: hsl(120, 100%, 40%);">+ cs = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_ipa_name_cmp(&proxy_subscr_new.ps.vlr_name_preliminary, &proxy_subscr->ps.vlr_name_preliminary))</span><br><span style="color: hsl(120, 100%, 40%);">+ ps = true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(cs || ps)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, &req->gsup, LOGL_DEBUG, "VLR names remain unchanged\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+ rc = proxy_subscr_create_or_update(proxy, &proxy_subscr_new);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, &req->gsup, rc ? LOGL_ERROR : LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s: preliminary VLR name for%s%s to %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rc ? "failed to update" : "updated",</span><br><span style="color: hsl(120, 100%, 40%);">+ cs ? " CS" : "", ps ? " PS" : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_cni_peer_id_to_str(&req->source_name));</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: delete proxy entry in case of a Purge Request? */</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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%);">+/* All GSUP messages received from the remote HLR to be sent to a local MSC pass through this function, to modify the</span><br><span style="color: hsl(120, 100%, 40%);">+ * subscriber state or disallow sending the message. Return 0 to allow sending the message.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The local MSC shall be indicated by gsup.destination_name. */</span><br><span style="color: hsl(120, 100%, 40%);">+static int proxy_acknowledge_gsup_from_remote_hlr(struct proxy *proxy, const struct proxy_subscr *proxy_subscr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_gsup_message *gsup,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct remote_hlr *from_remote_hlr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_ipa_name *destination,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_ipa_name *via_peer)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr proxy_subscr_new = *proxy_subscr;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool ps;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool cs;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool vlr_name_changed_cs = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool vlr_name_changed_ps = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_ipa_name via_proxy = {};</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_ipa_name_cmp(via_peer, destination))</span><br><span style="color: hsl(120, 100%, 40%);">+ via_proxy = *via_peer;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (gsup->message_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_MSGT_INSERT_DATA_REQUEST:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Remember the MSISDN of the subscriber. This does not need to be a preliminary record, because when</span><br><span style="color: hsl(120, 100%, 40%);">+ * the HLR tells us about subscriber data, it is definitive info and there is no ambiguity (like there</span><br><span style="color: hsl(120, 100%, 40%);">+ * would be with failed LU attempts from various sources). */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gsup->msisdn_enc_len)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup, LOGL_DEBUG, "No MSISDN in this Insert Data Request\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (gsm48_decode_bcd_number2(proxy_subscr_new.msisdn, sizeof(proxy_subscr_new.msisdn),</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup->msisdn_enc, gsup->msisdn_enc_len, 0))</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup, LOGL_ERROR, "Failed to decode MSISDN\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!osmo_msisdn_str_valid(proxy_subscr_new.msisdn))</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup, LOGL_ERROR, "invalid MSISDN: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_quote_str_c(OTC_SELECT, proxy_subscr_new.msisdn, -1));</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!strcmp(proxy_subscr->msisdn, proxy_subscr_new.msisdn))</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup, LOGL_DEBUG, "already have MSISDN = %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.msisdn);</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (proxy_subscr_create_or_update(proxy, &proxy_subscr_new))</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup, LOGL_ERROR, "failed to update MSISDN to %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.msisdn);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup, LOGL_INFO, "stored MSISDN=%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.msisdn);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Update the Location Updating timestamp */</span><br><span style="color: hsl(120, 100%, 40%);">+ cs = ps = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_ipa_name_cmp(destination, &proxy_subscr->cs.vlr_name_preliminary)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ timestamp_update(&proxy_subscr_new.cs.last_lu);</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.cs.vlr_name_preliminary = (struct osmo_ipa_name){};</span><br><span style="color: hsl(120, 100%, 40%);">+ vlr_name_changed_cs =</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ipa_name_cmp(&proxy_subscr->cs.vlr_name, destination)</span><br><span style="color: hsl(120, 100%, 40%);">+ || osmo_ipa_name_cmp(&proxy_subscr->cs.vlr_via_proxy, &via_proxy);</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.cs.vlr_name = *destination;</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.cs.vlr_via_proxy = via_proxy;</span><br><span style="color: hsl(120, 100%, 40%);">+ cs = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_ipa_name_cmp(destination, &proxy_subscr->ps.vlr_name_preliminary)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ timestamp_update(&proxy_subscr_new.ps.last_lu);</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.ps.vlr_name_preliminary = (struct osmo_ipa_name){};</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.ps.vlr_name = *destination;</span><br><span style="color: hsl(120, 100%, 40%);">+ vlr_name_changed_ps =</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ipa_name_cmp(&proxy_subscr->ps.vlr_name, destination)</span><br><span style="color: hsl(120, 100%, 40%);">+ || osmo_ipa_name_cmp(&proxy_subscr->ps.vlr_via_proxy, &via_proxy);</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.ps.vlr_via_proxy = via_proxy;</span><br><span style="color: hsl(120, 100%, 40%);">+ ps = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(cs || ps)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "destination is neither CS nor PS VLR: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ipa_name_to_str(destination));</span><br><span style="color: hsl(120, 100%, 40%);">+ return GMM_CAUSE_PROTO_ERR_UNSPEC;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = proxy_subscr_create_or_update(proxy, &proxy_subscr_new);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup, rc ? LOGL_ERROR : LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s LU: timestamp for%s%s%s%s%s%s%s%s%s%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rc ? "failed to update" : "updated",</span><br><span style="color: hsl(120, 100%, 40%);">+ cs ? " CS" : "", ps ? " PS" : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ vlr_name_changed_cs? ", CS VLR=" : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ vlr_name_changed_cs? osmo_ipa_name_to_str(&proxy_subscr_new.cs.vlr_name) : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.cs.vlr_via_proxy.len ? " via proxy " : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.cs.vlr_via_proxy.len ?</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ipa_name_to_str(&proxy_subscr_new.cs.vlr_via_proxy) : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ vlr_name_changed_ps? ", PS VLR=" : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ vlr_name_changed_ps? osmo_ipa_name_to_str(&proxy_subscr_new.ps.vlr_name) : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.ps.vlr_via_proxy.len ? " via proxy " : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.ps.vlr_via_proxy.len ?</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ipa_name_to_str(&proxy_subscr_new.ps.vlr_via_proxy) : ""</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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 0;</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 proxy_remote_hlr_connect_result_cb(const struct osmo_sockaddr_str *addr, struct remote_hlr *remote_hlr,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy *proxy = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr_listentry *e;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!proxy)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(e, &proxy->subscr_list, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_sockaddr_str_cmp(addr, &e->data.remote_hlr_addr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_deferred_gsup_req_pop(proxy, e->data.imsi, remote_hlr);</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Store the remote HLR's GSUP address for this proxy subscriber.</span><br><span style="color: hsl(120, 100%, 40%);">+ * This can be set before the remote_hlr is connected, or after.</span><br><span style="color: hsl(120, 100%, 40%);">+ * And, this can be set before the gsup_req has been queued for this HLR, or after.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void proxy_subscr_remote_hlr_resolved(struct proxy *proxy, const struct proxy_subscr *proxy_subscr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr_str *remote_hlr_addr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr proxy_subscr_new;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_is_nonzero(&proxy_subscr->remote_hlr_addr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_sockaddr_str_cmp(remote_hlr_addr, &proxy_subscr->remote_hlr_addr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Already have this remote address */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR(proxy_subscr, LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Remote HLR address changes to " OSMO_SOCKADDR_STR_FMT "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS(remote_hlr_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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Store the address. Make a copy to modify. */</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new = *proxy_subscr;</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr = &proxy_subscr_new;</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_new.remote_hlr_addr = *remote_hlr_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proxy_subscr_create_or_update(proxy, proxy_subscr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR(proxy_subscr, LOGL_ERROR, "Failed to store proxy entry for remote HLR\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If no remote HLR is known for the IMSI, the proxy entry is pointless. */</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_subscr_del(proxy, proxy_subscr->imsi);</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%);">+ LOG_PROXY_SUBSCR(proxy_subscr, LOGL_DEBUG, "Remote HLR resolved, stored address\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If any messages for this HLR are already spooled, connect now. Otherwise wait for</span><br><span style="color: hsl(120, 100%, 40%);">+ * proxy_subscr_forward_to_remote_hlr() to connect then. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proxy_deferred_gsup_req_waiting(proxy, proxy_subscr->imsi))</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr_get_or_connect(&proxy_subscr->remote_hlr_addr, true,</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_remote_hlr_connect_result_cb, proxy);</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 proxy_subscr_forward_to_remote_hlr(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, struct osmo_gsup_req *req)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct remote_hlr *remote_hlr;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = proxy_acknowledge_gsup_to_remote_hlr(proxy, proxy_subscr, req);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_req_respond_err(req, GMM_CAUSE_PROTO_ERR_UNSPEC, "Proxy does not allow this message");</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</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_is_nonzero(&proxy_subscr->remote_hlr_addr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We don't know the remote target yet. Still waiting for an MS lookup response, which will end up</span><br><span style="color: hsl(120, 100%, 40%);">+ * calling proxy_subscr_remote_hlr_resolved(). See dgsm.c. */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, &req->gsup, LOGL_DEBUG, "deferring until remote HLR is known\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_deferred_gsup_req_add(proxy, req);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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_cni_peer_id_is_empty(&req->via_proxy)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, &req->gsup, LOGL_INFO, "VLR->HLR: forwarding from %s via proxy %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_cni_peer_id_to_str(&req->source_name),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_cni_peer_id_to_str(&req->via_proxy));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, &req->gsup, LOGL_INFO, "VLR->HLR: forwarding from %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_cni_peer_id_to_str(&req->source_name));</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%);">+ /* We could always store in the defer queue and empty the queue if the connection is already up.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Slight optimisation: if the remote_hlr is already up and running, skip the defer queue.</span><br><span style="color: hsl(120, 100%, 40%);">+ * First ask for an existing remote_hlr. */</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr = remote_hlr_get_or_connect(&proxy_subscr->remote_hlr_addr, false, NULL, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (remote_hlr && remote_hlr_is_up(remote_hlr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_pending_req_remote_hlr_connect_result(req, remote_hlr);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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%);">+ /* Not existing or not up. Defer req and ask to be notified when it is up.</span><br><span style="color: hsl(120, 100%, 40%);">+ * If the remote_hlr exists but is not connected yet, there should actually already be a pending</span><br><span style="color: hsl(120, 100%, 40%);">+ * proxy_remote_hlr_connect_result_cb queued, but it doesn't hurt to do that more often. */</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_deferred_gsup_req_add(proxy, req);</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr_get_or_connect(&proxy_subscr->remote_hlr_addr, true,</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy_remote_hlr_connect_result_cb, proxy);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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 proxy_subscr_forward_to_vlr(struct proxy *proxy, const struct proxy_subscr *proxy_subscr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_gsup_message *gsup, struct remote_hlr *from_remote_hlr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_ipa_name destination;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_conn *vlr_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_ipa_name_set(&destination, gsup->destination_name, gsup->destination_name_len)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no valid Destination Name IE, cannot route to VLR.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return GMM_CAUSE_INV_MAND_INFO;</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%);">+ /* Route to MSC/SGSN that we're proxying for */</span><br><span style="color: hsl(120, 100%, 40%);">+ vlr_conn = gsup_route_find_by_ipa_name(proxy->gsup_server_to_vlr, &destination);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!vlr_conn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Destination VLR unreachable: %s\n", osmo_ipa_name_to_str(&destination));</span><br><span style="color: hsl(120, 100%, 40%);">+ return GMM_CAUSE_MSC_TEMP_NOTREACH;</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 (proxy_acknowledge_gsup_from_remote_hlr(proxy, proxy_subscr, gsup, from_remote_hlr, &destination,</span><br><span style="color: hsl(120, 100%, 40%);">+ &vlr_conn->peer_name)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Proxy does not allow forwarding this message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return GMM_CAUSE_PROTO_ERR_UNSPEC;</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%);">+ msg = osmo_gsup_msgb_alloc("GSUP proxy to VLR");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_gsup_encode(msg, gsup)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Failed to re-encode GSUP message, cannot forward\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return GMM_CAUSE_INV_MAND_INFO;</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%);">+ LOG_PROXY_SUBSCR_MSG(proxy_subscr, gsup, LOGL_INFO, "VLR<-HLR: forwarding to %s%s%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ipa_name_to_str(&destination),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ipa_name_cmp(&destination, &vlr_conn->peer_name) ? " via " : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ipa_name_cmp(&destination, &vlr_conn->peer_name) ?</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ipa_name_to_str(&vlr_conn->peer_name) : "");</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsup_conn_send(vlr_conn, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/remote_hlr.c b/src/remote_hlr.c</span><br><span>new file mode 100644</span><br><span>index 0000000..00bfbb1</span><br><span>--- /dev/null</span><br><span>+++ b/src/remote_hlr.c</span><br><span>@@ -0,0 +1,252 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</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%);">+#include <osmocom/gsm/protocol/gsm_04_08_gprs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsup.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsm23003.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/abis/ipa.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/gsup_client.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/gsup_server.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_router.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/remote_hlr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/proxy.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static LLIST_HEAD(remote_hlrs);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void remote_hlr_err_reply(struct remote_hlr *rh, const struct osmo_gsup_message *gsup_orig,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm48_gmm_cause cause)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message gsup_reply;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* No need to answer if we couldn't parse an ERROR message type, only REQUESTs need an error reply. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!OSMO_GSUP_IS_MSGT_REQUEST(gsup_orig->message_type))</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%);">+ gsup_reply = (struct osmo_gsup_message){</span><br><span style="color: hsl(120, 100%, 40%);">+ .cause = cause,</span><br><span style="color: hsl(120, 100%, 40%);">+ .message_type = OSMO_GSUP_TO_MSGT_ERROR(gsup_orig->message_type),</span><br><span style="color: hsl(120, 100%, 40%);">+ .message_class = gsup_orig->message_class,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RP-Message-Reference is mandatory for SM Service */</span><br><span style="color: hsl(120, 100%, 40%);">+ .sm_rp_mr = gsup_orig->sm_rp_mr,</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_STRLCPY_ARRAY(gsup_reply.imsi, gsup_orig->imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* For SS/USSD, it's important to keep both session state and ID IEs */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsup_orig->session_state != OSMO_GSUP_SESSION_STATE_NONE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_reply.session_state = OSMO_GSUP_SESSION_STATE_END;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_reply.session_id = gsup_orig->session_id;</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_gsup_client_enc_send(rh->gsupc, &gsup_reply))</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGSUP, LOGL_ERROR, "Failed to send Error reply (imsi=%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_quote_str(gsup_orig->imsi, -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%);">+/* We are receiving a GSUP message from a remote HLR to go back to a local MSC.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The local MSC shall be indicated by gsup.destination_name. */</span><br><span style="color: hsl(120, 100%, 40%);">+static int remote_hlr_rx(struct osmo_gsup_client *gsupc, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct remote_hlr *rh = gsupc->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct proxy_subscr proxy_subscr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message gsup;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_gsup_decode(msgb_l2(msg), msgb_l2len(msg), &gsup);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_REMOTE_HLR(rh, LOGL_ERROR, "Failed to decode GSUP message: '%s' (%d) [ %s]\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(gsm48_gmm_cause_names, -rc),</span><br><span style="color: hsl(120, 100%, 40%);">+ -rc, osmo_hexdump(msg->data, msg->len));</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</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_imsi_str_valid(gsup.imsi)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_REMOTE_HLR_MSG(rh, &gsup, LOGL_ERROR, "Invalid IMSI\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr_err_reply(rh, &gsup, GMM_CAUSE_INV_MAND_INFO);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -GMM_CAUSE_INV_MAND_INFO;</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 (proxy_subscr_get_by_imsi(&proxy_subscr, g_hlr->gs->proxy, gsup.imsi)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_REMOTE_HLR_MSG(rh, &gsup, LOGL_ERROR, "No proxy entry for this IMSI\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr_err_reply(rh, &gsup, GMM_CAUSE_NET_FAIL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -GMM_CAUSE_NET_FAIL;</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%);">+ rc = proxy_subscr_forward_to_vlr(g_hlr->gs->proxy, &proxy_subscr, &gsup, rh);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_REMOTE_HLR_MSG(rh, &gsup, LOGL_ERROR, "Failed to forward GSUP message towards VLR\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr_err_reply(rh, &gsup, GMM_CAUSE_NET_FAIL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -GMM_CAUSE_NET_FAIL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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 remote_hlr_pending_up {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head entry;</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr_connect_result_cb_t connect_result_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+ void *data;</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 bool remote_hlr_up_down(struct osmo_gsup_client *gsupc, bool up)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct remote_hlr *remote_hlr = gsupc->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct remote_hlr_pending_up *p, *n;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!up) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_REMOTE_HLR(remote_hlr, LOGL_NOTICE, "link to remote HLR is down, removing GSUP client\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr_destroy(remote_hlr);</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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%);">+ LOG_REMOTE_HLR(remote_hlr, LOGL_NOTICE, "link up\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry_safe(p, n, &remote_hlr->pending_up_callbacks, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (p->connect_result_cb)</span><br><span style="color: hsl(120, 100%, 40%);">+ p->connect_result_cb(&remote_hlr->addr, remote_hlr, p->data);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&p->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</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%);">+bool remote_hlr_is_up(struct remote_hlr *remote_hlr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return remote_hlr && remote_hlr->gsupc && remote_hlr->gsupc->is_connected;</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 remote_hlr *remote_hlr_get_or_connect(const struct osmo_sockaddr_str *addr, bool connect,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr_connect_result_cb_t connect_result_cb, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct remote_hlr *rh = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct remote_hlr *rh_i;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_client_config cfg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(rh_i, &remote_hlrs, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_sockaddr_str_cmp(&rh_i->addr, addr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rh = rh_i;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+ if (rh)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto add_result_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!connect) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (connect_result_cb)</span><br><span style="color: hsl(120, 100%, 40%);">+ connect_result_cb(addr, NULL, data);</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%);">+ /* Doesn't exist yet, create a GSUP client to remote HLR. */</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg = (struct osmo_gsup_client_config){</span><br><span style="color: hsl(120, 100%, 40%);">+ .ipa_dev = &g_hlr->gsup_unit_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ .ip_addr = addr->ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tcp_port = addr->port,</span><br><span style="color: hsl(120, 100%, 40%);">+ .oapc_config = NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .read_cb = remote_hlr_rx,</span><br><span style="color: hsl(120, 100%, 40%);">+ .up_down_cb = remote_hlr_up_down,</span><br><span style="color: hsl(120, 100%, 40%);">+ .data = rh,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ rh = talloc_zero(dgsm_ctx, struct remote_hlr);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rh);</span><br><span style="color: hsl(120, 100%, 40%);">+ *rh = (struct remote_hlr){</span><br><span style="color: hsl(120, 100%, 40%);">+ .addr = *addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ .gsupc = osmo_gsup_client_create3(rh, &cfg),</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&rh->pending_up_callbacks);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!rh->gsupc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Failed to establish connection to remote HLR " OSMO_SOCKADDR_STR_FMT "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS(addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(rh);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (connect_result_cb)</span><br><span style="color: hsl(120, 100%, 40%);">+ connect_result_cb(addr, NULL, data);</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%);">+ rh->gsupc->data = rh;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(&rh->entry, &remote_hlrs);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+add_result_cb:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (connect_result_cb) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (remote_hlr_is_up(rh)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ connect_result_cb(addr, rh, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct remote_hlr_pending_up *p;</span><br><span style="color: hsl(120, 100%, 40%);">+ p = talloc_zero(rh, struct remote_hlr_pending_up);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(p);</span><br><span style="color: hsl(120, 100%, 40%);">+ p->connect_result_cb = connect_result_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+ p->data = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add_tail(&p->entry, &rh->pending_up_callbacks);</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 rh;</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 remote_hlr_destroy(struct remote_hlr *remote_hlr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_client_destroy(remote_hlr->gsupc);</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hlr->gsupc = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&remote_hlr->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(remote_hlr);</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%);">+/* This function takes ownership of the msg, do not free it after passing to this function. */</span><br><span style="color: hsl(120, 100%, 40%);">+int remote_hlr_msgb_send(struct remote_hlr *remote_hlr, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = osmo_gsup_client_send(remote_hlr->gsupc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDGSM, LOGL_ERROR, "Failed to send GSUP message to " OSMO_SOCKADDR_STR_FMT "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS(&remote_hlr->addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</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%);">+/* A GSUP message was received from the MS/MSC side, forward it to the remote HLR. */</span><br><span style="color: hsl(120, 100%, 40%);">+void remote_hlr_gsup_forward_to_remote_hlr(struct remote_hlr *remote_hlr, struct osmo_gsup_req *req,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message *modified_gsup)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* To forward to a remote HLR, we need to indicate the source MSC's name in the Source Name IE to make sure the</span><br><span style="color: hsl(120, 100%, 40%);">+ * reply can be routed back. Store the sender MSC in gsup->source_name -- the remote HLR is required to return</span><br><span style="color: hsl(120, 100%, 40%);">+ * this as gsup->destination_name so that the reply gets routed to the original MSC. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message forward;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (modified_gsup)</span><br><span style="color: hsl(120, 100%, 40%);">+ forward = *modified_gsup;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ forward = req->gsup;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (req->source_name.type != OSMO_CNI_PEER_ID_IPA_NAME) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Unsupported GSUP peer id type: %s",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_cni_peer_id_type_name(req->source_name.type));</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%);">+ forward.source_name = req->source_name.ipa_name.val;</span><br><span style="color: hsl(120, 100%, 40%);">+ forward.source_name_len = req->source_name.ipa_name.len;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = osmo_gsup_msgb_alloc("GSUP proxy to remote HLR");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_gsup_encode(msg, &forward);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Failed to encode GSUP message for forwarding");</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%);">+ remote_hlr_msgb_send(remote_hlr, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_req_free(req);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/tests/gsup_server/Makefile.am b/tests/gsup_server/Makefile.am</span><br><span>index a32ddf9..34acd30 100644</span><br><span>--- a/tests/gsup_server/Makefile.am</span><br><span>+++ b/tests/gsup_server/Makefile.am</span><br><span>@@ -31,6 +31,7 @@</span><br><span> gsup_server_test_LDADD = \</span><br><span> $(top_srcdir)/src/gsup_server.c \</span><br><span> $(top_srcdir)/src/gsup_router.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_srcdir)/src/gsup_send.c \</span><br><span> $(top_srcdir)/src/gsupclient/cni_peer_id.c \</span><br><span> $(top_srcdir)/src/gsupclient/gsup_req.c \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index ee351e3..d7d25c1 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -61,10 +61,12 @@</span><br><span> OsmoHLR(config-hlr)# gsup</span><br><span> OsmoHLR(config-hlr-gsup)# ?</span><br><span> ...</span><br><span style="color: hsl(0, 100%, 40%);">- bind Listen/Bind related socket option</span><br><span style="color: hsl(120, 100%, 40%);">+ bind Listen/Bind related socket option</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa-name Set the IPA name of this HLR, for proxying to remote HLRs</span><br><span> OsmoHLR(config-hlr-gsup)# list</span><br><span> ...</span><br><span> bind ip A.B.C.D</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa-name NAME</span><br><span> </span><br><span> OsmoHLR(config-hlr-gsup)# exit</span><br><span> OsmoHLR(config-hlr)# exit</span><br><span>@@ -90,6 +92,7 @@</span><br><span> logging level ss info</span><br><span> logging level mslookup notice</span><br><span> logging level lu notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level dgsm notice</span><br><span> ...</span><br><span> hlr</span><br><span> store-imei</span><br><span>@@ -99,3 +102,338 @@</span><br><span> ussd route prefix *#100# internal own-msisdn</span><br><span> ussd route prefix *#101# internal own-imsi</span><br><span> end</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR# configure terminal</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config)# mslookup</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# ?</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns Multicast DNS related configuration</span><br><span style="color: hsl(120, 100%, 40%);">+ no Negate a command or set its defaults</span><br><span style="color: hsl(120, 100%, 40%);">+ server Enable and configure Distributed GSM mslookup server</span><br><span style="color: hsl(120, 100%, 40%);">+ client Enable and configure Distributed GSM mslookup client</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# list</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns bind [IP] [<1-65535>]</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns domain-suffix DOMAIN_SUFFIX</span><br><span style="color: hsl(120, 100%, 40%);">+ no mdns bind</span><br><span style="color: hsl(120, 100%, 40%);">+ server</span><br><span style="color: hsl(120, 100%, 40%);">+ no server</span><br><span style="color: hsl(120, 100%, 40%);">+ client</span><br><span style="color: hsl(120, 100%, 40%);">+ no client</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# ?</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns Multicast DNS related configuration</span><br><span style="color: hsl(120, 100%, 40%);">+ no Negate a command or set its defaults</span><br><span style="color: hsl(120, 100%, 40%);">+ server Enable and configure Distributed GSM mslookup server</span><br><span style="color: hsl(120, 100%, 40%);">+ client Enable and configure Distributed GSM mslookup client</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# no?</span><br><span style="color: hsl(120, 100%, 40%);">+ no Negate a command or set its defaults</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# no ?</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns Disable both server and client for mDNS mslookup</span><br><span style="color: hsl(120, 100%, 40%);">+ server Disable Distributed GSM mslookup server</span><br><span style="color: hsl(120, 100%, 40%);">+ client Disable Distributed GSM mslookup client</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# mdns ?</span><br><span style="color: hsl(120, 100%, 40%);">+ bind Convenience shortcut: enable and configure both server and client for mDNS mslookup</span><br><span style="color: hsl(120, 100%, 40%);">+ domain-suffix mDNS domain suffix (default: mdns.osmocom.org). This is appended and stripped from mDNS packets during encoding/decoding, so we don't collide with top-level domains administrated by IANA</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# mdns bind ?</span><br><span style="color: hsl(120, 100%, 40%);">+ [IP] multicast IPv4 address like 239.192.23.42 or IPv6 address like ff08::23:42</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# mdns bind 1.2.3.4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ [<1-65535>] mDNS UDP Port number</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# mdns domain-suffix ?</span><br><span style="color: hsl(120, 100%, 40%);">+ DOMAIN_SUFFIX mDNS domain suffix (default: mdns.osmocom.org). This is appended and stripped from mDNS packets during encoding/decoding, so we don't collide with top-level domains administrated by IANA</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# server</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# ?</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns Multicast DNS related configuration</span><br><span style="color: hsl(120, 100%, 40%);">+ no Negate a command or set its defaults</span><br><span style="color: hsl(120, 100%, 40%);">+ service Configure addresses of local services, as sent in replies to remote mslookup requests.</span><br><span style="color: hsl(120, 100%, 40%);">+ msc Configure services for individual local MSCs</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# list</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns bind [IP] [<1-65535>]</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns domain-suffix DOMAIN_SUFFIX</span><br><span style="color: hsl(120, 100%, 40%);">+ no mdns bind</span><br><span style="color: hsl(120, 100%, 40%);">+ service NAME at IP <1-65535></span><br><span style="color: hsl(120, 100%, 40%);">+ no service NAME</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%);">+ msc ipa-name .IPA_NAME</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# mdns ?</span><br><span style="color: hsl(120, 100%, 40%);">+ bind Configure where the mDNS server listens for mslookup requests</span><br><span style="color: hsl(120, 100%, 40%);">+ domain-suffix mDNS domain suffix (default: mdns.osmocom.org). This is appended and stripped from mDNS packets during encoding/decoding, so we don't collide with top-level domains administrated by IANA</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# mdns bind ?</span><br><span style="color: hsl(120, 100%, 40%);">+ [IP] multicast IPv4 address like 239.192.23.42 or IPv6 address like ff08::23:42</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# mdns bind 1.2.3.4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ [<1-65535>] mDNS UDP Port number</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# service?</span><br><span style="color: hsl(120, 100%, 40%);">+ service Configure addresses of local services, as sent in replies to remote mslookup requests.</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# service ?</span><br><span style="color: hsl(120, 100%, 40%);">+ NAME mslookup service name, e.g. sip.voice or smpp.sms</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# service foo ?</span><br><span style="color: hsl(120, 100%, 40%);">+ at at</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# service foo at ?</span><br><span style="color: hsl(120, 100%, 40%);">+ IP IPv4 address like 1.2.3.4 or IPv6 address like a:b:c:d::1</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# service foo at 1.2.3.4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ <1-65535> Service-specific port number</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# no ?</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns Disable server for mDNS mslookup (do not answer remote requests)</span><br><span style="color: hsl(120, 100%, 40%);">+ service Remove one or more service address entries</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# no service ?</span><br><span style="color: hsl(120, 100%, 40%);">+ NAME mslookup service name, e.g. sip.voice or smpp.sms</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# no service foo ?</span><br><span style="color: hsl(120, 100%, 40%);">+ at at</span><br><span style="color: hsl(120, 100%, 40%);">+ <cr> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# no service foo at ?</span><br><span style="color: hsl(120, 100%, 40%);">+ IP IPv4 address like 1.2.3.4 or IPv6 address like a:b:c:d::1</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# no service foo at 1.2.3.4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ <1-65535> Service-specific port number</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# msc?</span><br><span style="color: hsl(120, 100%, 40%);">+ msc Configure services for individual local MSCs</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# msc ?</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa-name Identify locally connected MSC by IPA Unit Name</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# msc ipa-name ?</span><br><span style="color: hsl(120, 100%, 40%);">+ IPA_NAME IPA Unit Name of the local MSC to configure</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# msc ipa-name MSC-1</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# ?</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ service Configure addresses of local services, as sent in replies to remote mslookup requests.</span><br><span style="color: hsl(120, 100%, 40%);">+ no Negate a command or set its defaults</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# list</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ service NAME at IP <1-65535></span><br><span style="color: hsl(120, 100%, 40%);">+ no service NAME</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# service?</span><br><span style="color: hsl(120, 100%, 40%);">+ service Configure addresses of local services, as sent in replies to remote mslookup requests.</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# service ?</span><br><span style="color: hsl(120, 100%, 40%);">+ NAME mslookup service name, e.g. sip.voice or smpp.sms</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# service foo ?</span><br><span style="color: hsl(120, 100%, 40%);">+ at at</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# service foo at ?</span><br><span style="color: hsl(120, 100%, 40%);">+ IP IPv4 address like 1.2.3.4 or IPv6 address like a:b:c:d::1</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# service foo at 1.2.3.4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ <1-65535> Service-specific port number</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# no ?</span><br><span style="color: hsl(120, 100%, 40%);">+ service Remove one or more service address entries</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# no service ?</span><br><span style="color: hsl(120, 100%, 40%);">+ NAME mslookup service name, e.g. sip.voice or smpp.sms</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# no service foo ?</span><br><span style="color: hsl(120, 100%, 40%);">+ at at</span><br><span style="color: hsl(120, 100%, 40%);">+ <cr> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# no service foo at ?</span><br><span style="color: hsl(120, 100%, 40%);">+ IP IPv4 address like 1.2.3.4 or IPv6 address like a:b:c:d::1</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# no service foo at 1.2.3.4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ <1-65535> Service-specific port number</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# client</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# ?</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ timeout How long should the mslookup client wait for remote responses before evaluating received results</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns Multicast DNS related configuration</span><br><span style="color: hsl(120, 100%, 40%);">+ no Negate a command or set its defaults</span><br><span style="color: hsl(120, 100%, 40%);">+ gateway-proxy Configure a fixed IP address to send all GSUP requests for unknown IMSIs to, without invoking a lookup for IMSI</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# list</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ timeout <1-100000></span><br><span style="color: hsl(120, 100%, 40%);">+ mdns bind [IP] [<1-65535>]</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns domain-suffix DOMAIN_SUFFIX</span><br><span style="color: hsl(120, 100%, 40%);">+ no mdns bind</span><br><span style="color: hsl(120, 100%, 40%);">+ gateway-proxy IP [<1-65535>]</span><br><span style="color: hsl(120, 100%, 40%);">+ no gateway-proxy</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# timeout?</span><br><span style="color: hsl(120, 100%, 40%);">+ timeout How long should the mslookup client wait for remote responses before evaluating received results</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# timeout ?</span><br><span style="color: hsl(120, 100%, 40%);">+ <1-100000> timeout in milliseconds</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# mdns?</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns Multicast DNS related configuration</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# mdns bind?</span><br><span style="color: hsl(120, 100%, 40%);">+ bind Enable mDNS client, and configure multicast address to send mDNS mslookup requests to</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# mdns bind ?</span><br><span style="color: hsl(120, 100%, 40%);">+ [IP] multicast IPv4 address like 239.192.23.42 or IPv6 address like ff08::23:42</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# mdns bind 1.2.3.4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ [<1-65535>] mDNS UDP Port number</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# mdns domain-suffix?</span><br><span style="color: hsl(120, 100%, 40%);">+ domain-suffix mDNS domain suffix (default: mdns.osmocom.org). This is appended and stripped from mDNS packets during encoding/decoding, so we don't collide with top-level domains administrated by IANA</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# mdns domain-suffix ?</span><br><span style="color: hsl(120, 100%, 40%);">+ DOMAIN_SUFFIX mDNS domain suffix (default: mdns.osmocom.org). This is appended and stripped from mDNS packets during encoding/decoding, so we don't collide with top-level domains administrated by IANA</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%);">+OsmoHLR(config-mslookup-client)# gateway-proxy?</span><br><span style="color: hsl(120, 100%, 40%);">+ gateway-proxy Configure a fixed IP address to send all GSUP requests for unknown IMSIs to, without invoking a lookup for IMSI</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# gateway-proxy ?</span><br><span style="color: hsl(120, 100%, 40%);">+ IP IP address of the remote HLR</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# gateway-proxy 1.2.3.4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ [<1-65535>] GSUP port number (omit for default 4222)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# no?</span><br><span style="color: hsl(120, 100%, 40%);">+ no Negate a command or set its defaults</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# no ?</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns Disable mDNS client, do not query remote services by mDNS</span><br><span style="color: hsl(120, 100%, 40%);">+ gateway-proxy Disable gateway proxy for GSUP with unknown IMSIs</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# gateway-proxy ?</span><br><span style="color: hsl(120, 100%, 40%);">+ IP IP address of the remote HLR</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# gateway-proxy 1.2.3.4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ [<1-65535>] GSUP port number (omit for default 4222)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# do show mslookup?</span><br><span style="color: hsl(120, 100%, 40%);">+ mslookup Distributed GSM / mslookup related information</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# do show mslookup ?</span><br><span style="color: hsl(120, 100%, 40%);">+ services List configured service addresses as sent to remote mslookup requests</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# gateway-proxy 1.2.3.4</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# mdns bind</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# server</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# service qwert at 123.45.67.89 qwert</span><br><span style="color: hsl(120, 100%, 40%);">+% Unknown command.</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# service qwert at qwert 1234</span><br><span style="color: hsl(120, 100%, 40%);">+% mslookup server: Invalid address for service qwert: qwert 1234</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# service foo.bar at 123.45.67.89 1011</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# service baz.bar at 121.31.41.5 1617</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# service baz.bar at a:b:c::d 1819</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# msc ipa-name msc-901-70-23</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# service foo.bar at 76.54.32.10 1234</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# service baz.bar at 12.11.10.98 7654</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# service baz.bar at 999:999:999::999 9999</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# service baz.bar at dd:cc:bb::a 3210</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# msc ipa-name msc-901-70-42</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# service foo.bar at 1.1.1.1 1111</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# service baz.bar at 2.2.2.2 2222</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# service baz.bar at 2222:2222:2222::2 2222</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# do show mslookup services</span><br><span style="color: hsl(120, 100%, 40%);">+Local GSUP HLR address returned in mslookup responses for local IMSIs: 127.0.0.1:4222</span><br><span style="color: hsl(120, 100%, 40%);">+service foo.bar at 123.45.67.89 1011</span><br><span style="color: hsl(120, 100%, 40%);">+service baz.bar at 121.31.41.5 1617</span><br><span style="color: hsl(120, 100%, 40%);">+service baz.bar at a:b:c::d 1819</span><br><span style="color: hsl(120, 100%, 40%);">+msc ipa-name MSC-1</span><br><span style="color: hsl(120, 100%, 40%);">+msc ipa-name msc-901-70-23</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 76.54.32.10 1234</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 12.11.10.98 7654</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at dd:cc:bb::a 3210</span><br><span style="color: hsl(120, 100%, 40%);">+msc ipa-name msc-901-70-42</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 1.1.1.1 1111</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 2.2.2.2 2222</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 2222:2222:2222::2 2222</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# show running-config</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+mslookup</span><br><span style="color: hsl(120, 100%, 40%);">+ server</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns bind 239.192.23.42 4266</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 123.45.67.89 1011</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 121.31.41.5 1617</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at a:b:c::d 1819</span><br><span style="color: hsl(120, 100%, 40%);">+ msc MSC-1</span><br><span style="color: hsl(120, 100%, 40%);">+ msc msc-901-70-23</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 76.54.32.10 1234</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 12.11.10.98 7654</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at dd:cc:bb::a 3210</span><br><span style="color: hsl(120, 100%, 40%);">+ msc msc-901-70-42</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 1.1.1.1 1111</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 2.2.2.2 2222</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 2222:2222:2222::2 2222</span><br><span style="color: hsl(120, 100%, 40%);">+ client</span><br><span style="color: hsl(120, 100%, 40%);">+ gateway-proxy 1.2.3.4 4222</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns bind 239.192.23.42 4266</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%);">+OsmoHLR(config-mslookup-server-msc)# no service baz.bar</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# no service asdf</span><br><span style="color: hsl(120, 100%, 40%);">+% mslookup server: cannot remove service 'asdf'</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# msc ipa-name msc-901-70-23</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# no service baz.bar at dd:cc:bb::a 3210</span><br><span style="color: hsl(120, 100%, 40%);">+% mslookup server: cannot remove service 'baz.bar' to dd:cc:bb::a 3210</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# no service asdf at asdf asdf</span><br><span style="color: hsl(120, 100%, 40%);">+% Unknown command.</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# no service asdf at asdf 3210</span><br><span style="color: hsl(120, 100%, 40%);">+% mslookup server: Invalid address for 'no service' asdf: asdf 3210</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# no service asdf at dd:cc:bb::a 3210</span><br><span style="color: hsl(120, 100%, 40%);">+% mslookup server: cannot remove service 'asdf' to dd:cc:bb::a 3210</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server-msc)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# no service baz.bar at 2.2.2.2 2222</span><br><span style="color: hsl(120, 100%, 40%);">+% mslookup server: cannot remove service 'baz.bar' to 2.2.2.2 2222</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# no service baz.bar at a:b:c::d 1819</span><br><span style="color: hsl(120, 100%, 40%);">+% mslookup server: cannot remove service 'baz.bar' to a:b:c::d 1819</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# client</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# no gateway-proxy</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# do show mslookup services</span><br><span style="color: hsl(120, 100%, 40%);">+Local GSUP HLR address returned in mslookup responses for local IMSIs: 127.0.0.1:4222</span><br><span style="color: hsl(120, 100%, 40%);">+service foo.bar at 123.45.67.89 1011</span><br><span style="color: hsl(120, 100%, 40%);">+service baz.bar at 121.31.41.5 1617</span><br><span style="color: hsl(120, 100%, 40%);">+msc ipa-name MSC-1</span><br><span style="color: hsl(120, 100%, 40%);">+msc ipa-name msc-901-70-23</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 76.54.32.10 1234</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 12.11.10.98 7654</span><br><span style="color: hsl(120, 100%, 40%);">+msc ipa-name msc-901-70-42</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 1.1.1.1 1111</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-client)# show running-config</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+mslookup</span><br><span style="color: hsl(120, 100%, 40%);">+ server</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns bind 239.192.23.42 4266</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 123.45.67.89 1011</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 121.31.41.5 1617</span><br><span style="color: hsl(120, 100%, 40%);">+ msc MSC-1</span><br><span style="color: hsl(120, 100%, 40%);">+ msc msc-901-70-23</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 76.54.32.10 1234</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 12.11.10.98 7654</span><br><span style="color: hsl(120, 100%, 40%);">+ msc msc-901-70-42</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 1.1.1.1 1111</span><br><span style="color: hsl(120, 100%, 40%);">+ client</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns bind 239.192.23.42 4266</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%);">+OsmoHLR(config-mslookup-client)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup)# server</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# service gsup.hlr at 23.42.17.11 4223</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# do show mslookup services</span><br><span style="color: hsl(120, 100%, 40%);">+Local GSUP HLR address returned in mslookup responses for local IMSIs: 23.42.17.11:4223</span><br><span style="color: hsl(120, 100%, 40%);">+service foo.bar at 123.45.67.89 1011</span><br><span style="color: hsl(120, 100%, 40%);">+service baz.bar at 121.31.41.5 1617</span><br><span style="color: hsl(120, 100%, 40%);">+service gsup.hlr at 23.42.17.11 4223</span><br><span style="color: hsl(120, 100%, 40%);">+msc ipa-name MSC-1</span><br><span style="color: hsl(120, 100%, 40%);">+msc ipa-name msc-901-70-23</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 76.54.32.10 1234</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 12.11.10.98 7654</span><br><span style="color: hsl(120, 100%, 40%);">+msc ipa-name msc-901-70-42</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 1.1.1.1 1111</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR(config-mslookup-server)# show running-config</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+mslookup</span><br><span style="color: hsl(120, 100%, 40%);">+ server</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns bind 239.192.23.42 4266</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 123.45.67.89 1011</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 121.31.41.5 1617</span><br><span style="color: hsl(120, 100%, 40%);">+ service gsup.hlr at 23.42.17.11 4223</span><br><span style="color: hsl(120, 100%, 40%);">+ msc MSC-1</span><br><span style="color: hsl(120, 100%, 40%);">+ msc msc-901-70-23</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 76.54.32.10 1234</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 12.11.10.98 7654</span><br><span style="color: hsl(120, 100%, 40%);">+ msc msc-901-70-42</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 1.1.1.1 1111</span><br><span style="color: hsl(120, 100%, 40%);">+ client</span><br><span style="color: hsl(120, 100%, 40%);">+ mdns bind 239.192.23.42 4266</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/+/16258">change 16258</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/+/16258"/><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: I2fe453553c90e6ee527ed13a13089900efd488aa </div>
<div style="display:none"> Gerrit-Change-Number: 16258 </div>
<div style="display:none"> Gerrit-PatchSet: 26 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>