<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16459">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">2/2: fixup: add osmo_gsup_peer_id with type enum and union<br><br>During code review it was requested to insert an ability to handle different<br>kinds of peer id, in order to be able to add a Global Title in the future.<br><br>Add this, but only in the publicly visible API. For osmo-hlr internal code, I<br>intend to push implementing this into the future, when a different peer<br>identification actually gets introduced.<br><br>This way we don't need to implement it now in all osmo-hlr code paths (save<br>time now), but still make all API users aware that this type may be extended in<br>the future.<br><br>Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5<br>---<br>M include/Makefile.am<br>A include/osmocom/gsupclient/gsup_peer_id.h<br>M include/osmocom/gsupclient/gsup_req.h<br>D include/osmocom/gsupclient/ipa_name.h<br>M include/osmocom/hlr/db.h<br>M include/osmocom/hlr/gsup_server.h<br>M src/Makefile.am<br>M src/db_hlr.c<br>M src/gsup_server.c<br>M src/gsupclient/Makefile.am<br>A src/gsupclient/gsup_peer_id.c<br>M src/gsupclient/gsup_req.c<br>D src/gsupclient/ipa_name.c<br>M src/hlr.c<br>M src/hlr_ussd.c<br>M src/lu_fsm.c<br>M tests/db/Makefile.am<br>M tests/db/db_test.c<br>M tests/gsup_server/Makefile.am<br>19 files changed, 329 insertions(+), 174 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/59/16459/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/Makefile.am b/include/Makefile.am</span><br><span>index aeeb03f..cf95854 100644</span><br><span>--- a/include/Makefile.am</span><br><span>+++ b/include/Makefile.am</span><br><span>@@ -1,7 +1,7 @@</span><br><span> SUBDIRS = osmocom</span><br><span> </span><br><span> nobase_include_HEADERS = \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom/gsupclient/ipa_name.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmocom/gsupclient/gsup_peer_id.h \</span><br><span> osmocom/gsupclient/gsup_client.h \</span><br><span> osmocom/gsupclient/gsup_req.h \</span><br><span> osmocom/mslookup/mdns.h \</span><br><span>diff --git a/include/osmocom/gsupclient/gsup_peer_id.h b/include/osmocom/gsupclient/gsup_peer_id.h</span><br><span>new file mode 100644</span><br><span>index 0000000..f67671b</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/gsupclient/gsup_peer_id.h</span><br><span>@@ -0,0 +1,64 @@</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 General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 2 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 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 General Public License along</span><br><span style="color: hsl(120, 100%, 40%);">+ * 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%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+#include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! IPA Name: Arbitrary length blob, not necessarily zero-terminated.</span><br><span style="color: hsl(120, 100%, 40%);">+ * In osmo-hlr, struct hlr_subscriber is mostly used as static reference and cannot serve as talloc context, which is</span><br><span style="color: hsl(120, 100%, 40%);">+ * why this is also implemented as a fixed-maximum-size buffer instead of a talloc'd arbitrary sized buffer.</span><br><span style="color: hsl(120, 100%, 40%);">+ * NOTE: The length of val may be extended in the future if it becomes necessary.</span><br><span style="color: hsl(120, 100%, 40%);">+ * At the time of writing, this holds IPA unit name strings of very limited length.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_ipa_name {</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t len;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t val[128];</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 osmo_ipa_name_is_empty(struct osmo_ipa_name *ipa_name);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_ipa_name_set(struct osmo_ipa_name *ipa_name, const uint8_t *val, size_t len);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_ipa_name_set_str(struct osmo_ipa_name *ipa_name, const char *str_fmt, ...);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_ipa_name_cmp(const struct osmo_ipa_name *a, const struct osmo_ipa_name *b);</span><br><span style="color: hsl(120, 100%, 40%);">+const char *osmo_ipa_name_to_str(const struct osmo_ipa_name *ipa_name);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum osmo_gsup_peer_id_type {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_PEER_ID_EMPTY=0,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_PEER_ID_IPA_NAME,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* OSMO_GSUP_PEER_ID_GLOBAL_TITLE, <-- currently not implemented, but likely future possibility */</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%);">+extern const struct value_string osmo_gsup_peer_id_type_names[];</span><br><span style="color: hsl(120, 100%, 40%);">+static inline const char *osmo_gsup_peer_id_type_name(enum osmo_gsup_peer_id_type val)</span><br><span style="color: hsl(120, 100%, 40%);">+{ return get_value_string(osmo_gsup_peer_id_type_names, val); }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsup_peer_id {</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_gsup_peer_id_type type;</span><br><span style="color: hsl(120, 100%, 40%);">+ union {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_ipa_name ipa_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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bool osmo_gsup_peer_id_is_empty(struct osmo_gsup_peer_id *gsup_peer_id);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsup_peer_id_set(struct osmo_gsup_peer_id *gsup_peer_id, enum osmo_gsup_peer_id_type type,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *val, size_t len);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsup_peer_id_set_str(struct osmo_gsup_peer_id *gsup_peer_id, enum osmo_gsup_peer_id_type type,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *str_fmt, ...);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsup_peer_id_cmp(const struct osmo_gsup_peer_id *a, const struct osmo_gsup_peer_id *b);</span><br><span style="color: hsl(120, 100%, 40%);">+const char *osmo_gsup_peer_id_to_str(const struct osmo_gsup_peer_id *gsup_peer_id);</span><br><span>diff --git a/include/osmocom/gsupclient/gsup_req.h b/include/osmocom/gsupclient/gsup_req.h</span><br><span>index 09959f0..a8d74f5 100644</span><br><span>--- a/include/osmocom/gsupclient/gsup_req.h</span><br><span>+++ b/include/osmocom/gsupclient/gsup_req.h</span><br><span>@@ -19,14 +19,14 @@</span><br><span> #pragma once</span><br><span> </span><br><span> #include <osmocom/gsm/gsup.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsupclient/ipa_name.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/gsup_peer_id.h></span><br><span> </span><br><span> struct osmo_gsup_req;</span><br><span> </span><br><span> #define LOG_GSUP_REQ_CAT_SRC(req, subsys, level, file, line, fmt, args...) \</span><br><span> LOGPSRC(subsys, level, file, line, "GSUP %u: %s: IMSI-%s %s: " fmt, \</span><br><span> (req) ? (req)->nr : 0, \</span><br><span style="color: hsl(0, 100%, 40%);">- (req) ? osmo_ipa_name_to_str(&(req)->source_name) : "NULL", \</span><br><span style="color: hsl(120, 100%, 40%);">+ (req) ? osmo_gsup_peer_id_to_str(&(req)->source_name) : "NULL", \</span><br><span> (req) ? (req)->gsup.imsi : "NULL", \</span><br><span> (req) ? osmo_gsup_message_type_name((req)->gsup.message_type) : "NULL", \</span><br><span> ##args)</span><br><span>@@ -56,11 +56,11 @@</span><br><span> /* The ultimate source of this message: the source_name form the GSUP message, or, if not present, then the</span><br><span> * immediate GSUP peer. GSUP messages going via a proxy reflect the initial source in the source_name.</span><br><span> * This source_name is implicitly added to the routes for the conn the message was received on. */</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_ipa_name source_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_peer_id source_name;</span><br><span> </span><br><span> /* If the source_name is not an immediate GSUP peer, this is set to the closest intermediate peer between here</span><br><span> * and source_name. */</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_ipa_name via_proxy;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_peer_id via_proxy;</span><br><span> </span><br><span> /* Identify this request by number, for logging. */</span><br><span> unsigned int nr;</span><br><span>@@ -82,7 +82,7 @@</span><br><span> struct msgb *msg;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_ipa_name *from_peer, struct msgb *msg,</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_gsup_peer_id *from_peer, struct msgb *msg,</span><br><span> osmo_gsup_req_send_response_t send_response_cb, void *cb_data,</span><br><span> struct llist_head *add_to_list);</span><br><span> void osmo_gsup_req_free(struct osmo_gsup_req *req);</span><br><span>diff --git a/include/osmocom/gsupclient/ipa_name.h b/include/osmocom/gsupclient/ipa_name.h</span><br><span>deleted file mode 100644</span><br><span>index 5016f48..0000000</span><br><span>--- a/include/osmocom/gsupclient/ipa_name.h</span><br><span>+++ /dev/null</span><br><span>@@ -1,37 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * All Rights Reserved</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; either version 2 of the License, or</span><br><span style="color: hsl(0, 100%, 40%);">- * (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * You should have received a copy of the GNU General Public License along</span><br><span style="color: hsl(0, 100%, 40%);">- * with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#pragma once</span><br><span style="color: hsl(0, 100%, 40%);">-#include <unistd.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdint.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*! IPA Name: Arbitrary length blob, not necessarily zero-terminated.</span><br><span style="color: hsl(0, 100%, 40%);">- * In osmo-hlr, struct hlr_subscriber is mostly used as static reference and cannot serve as talloc context, which is</span><br><span style="color: hsl(0, 100%, 40%);">- * why this is also implemented as a fixed-maximum-size buffer instead of a talloc'd arbitrary sized buffer.</span><br><span style="color: hsl(0, 100%, 40%);">- * NOTE: The length of val may be extended in the future if it becomes necessary.</span><br><span style="color: hsl(0, 100%, 40%);">- * At the time of writing, this holds IPA unit name strings of very limited length.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_ipa_name {</span><br><span style="color: hsl(0, 100%, 40%);">- size_t len;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t val[128];</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_ipa_name_set(struct osmo_ipa_name *ipa_name, const uint8_t *val, size_t len);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_ipa_name_set_str(struct osmo_ipa_name *ipa_name, const char *str_fmt, ...);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_ipa_name_cmp(const struct osmo_ipa_name *a, const struct osmo_ipa_name *b);</span><br><span style="color: hsl(0, 100%, 40%);">-const char *osmo_ipa_name_to_str(const struct osmo_ipa_name *ipa_name);</span><br><span>diff --git a/include/osmocom/hlr/db.h b/include/osmocom/hlr/db.h</span><br><span>index 5c627be..02ab7e2 100644</span><br><span>--- a/include/osmocom/hlr/db.h</span><br><span>+++ b/include/osmocom/hlr/db.h</span><br><span>@@ -3,7 +3,7 @@</span><br><span> #include <stdbool.h></span><br><span> #include <sqlite3.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsupclient/ipa_name.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/gsup_peer_id.h></span><br><span> </span><br><span> struct hlr;</span><br><span> </span><br><span>diff --git a/include/osmocom/hlr/gsup_server.h b/include/osmocom/hlr/gsup_server.h</span><br><span>index 149971a..0ecf42c 100644</span><br><span>--- a/include/osmocom/hlr/gsup_server.h</span><br><span>+++ b/include/osmocom/hlr/gsup_server.h</span><br><span>@@ -5,7 +5,7 @@</span><br><span> #include <osmocom/abis/ipa.h></span><br><span> #include <osmocom/abis/ipaccess.h></span><br><span> #include <osmocom/gsm/gsup.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsupclient/ipa_name.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/gsup_peer_id.h></span><br><span> #include <osmocom/gsupclient/gsup_req.h></span><br><span> </span><br><span> #ifndef OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index bfbe775..7841d42 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -72,7 +72,7 @@</span><br><span> logging.c \</span><br><span> rand_urandom.c \</span><br><span> dbd_decode_binary.c \</span><br><span style="color: hsl(0, 100%, 40%);">- $(srcdir)/gsupclient/ipa_name.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(srcdir)/gsupclient/gsup_peer_id.c \</span><br><span> $(NULL)</span><br><span> </span><br><span> osmo_hlr_db_tool_LDADD = \</span><br><span>diff --git a/src/db_hlr.c b/src/db_hlr.c</span><br><span>index fdac75f..ba13324 100644</span><br><span>--- a/src/db_hlr.c</span><br><span>+++ b/src/db_hlr.c</span><br><span>@@ -37,7 +37,7 @@</span><br><span> #include <osmocom/hlr/logging.h></span><br><span> #include <osmocom/hlr/hlr.h></span><br><span> #include <osmocom/hlr/db.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsupclient/ipa_name.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/gsup_peer_id.h></span><br><span> </span><br><span> #define LOGHLR(imsi, level, fmt, args ...) LOGP(DAUC, level, "IMSI='%s': " fmt, imsi, ## args)</span><br><span> </span><br><span>diff --git a/src/gsup_server.c b/src/gsup_server.c</span><br><span>index a6cca81..053151f 100644</span><br><span>--- a/src/gsup_server.c</span><br><span>+++ b/src/gsup_server.c</span><br><span>@@ -65,13 +65,21 @@</span><br><span> static void gsup_server_send_req_response(struct osmo_gsup_req *req, struct osmo_gsup_message *response)</span><br><span> {</span><br><span> struct osmo_gsup_server *server = req->cb_data;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_gsup_conn *conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_conn *conn = NULL;</span><br><span> struct msgb *msg = osmo_gsup_msgb_alloc("GSUP Tx");</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- conn = gsup_route_find_by_ipa_name(server, &req->source_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (req->source_name.type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_PEER_ID_IPA_NAME:</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = gsup_route_find_by_ipa_name(server, &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%);">+ LOG_GSUP_REQ(req, LOGL_ERROR, "GSUP peer id kind not supported: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_peer_id_type_name(req->source_name.type));</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> if (!conn) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_GSUP_REQ(req, LOGL_ERROR, "GSUP client that sent this request was disconnected, cannot respond\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_GSUP_REQ(req, LOGL_ERROR, "GSUP client that sent this request not found, cannot respond\n");</span><br><span> msgb_free(msg);</span><br><span> return;</span><br><span> }</span><br><span>@@ -91,19 +99,34 @@</span><br><span> </span><br><span> struct osmo_gsup_req *osmo_gsup_conn_rx(struct osmo_gsup_conn *conn, struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_gsup_req *req = osmo_gsup_req_new(conn->server, &conn->peer_name, msg, gsup_server_send_req_response,</span><br><span style="color: hsl(0, 100%, 40%);">- conn->server, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_req *req;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_peer_id gpi = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = OSMO_GSUP_PEER_ID_IPA_NAME,</span><br><span style="color: hsl(120, 100%, 40%);">+ .ipa_name = conn->peer_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%);">+ req = osmo_gsup_req_new(conn->server, &gpi, msg, gsup_server_send_req_response, conn->server, NULL);</span><br><span> if (!req)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (req->via_proxy.len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_gsup_peer_id_is_empty(&req->via_proxy)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (req->via_proxy.type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_PEER_ID_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%);">+ LOG_GSUP_REQ(req, LOGL_ERROR, "GSUP peer id kind not supported: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_peer_id_type_name(req->source_name.type));</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 NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* The source of the GSUP message is not the immediate GSUP peer, but that peer is our proxy for that</span><br><span> * source. Add it to the routes for this conn (so we can route responses back). */</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsup_route_add_ipa_name(conn, &req->source_name)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsup_route_add_ipa_name(conn, &req->source_name.ipa_name)) {</span><br><span> LOG_GSUP_REQ(req, LOGL_ERROR,</span><br><span> "GSUP message received from %s via peer %s, but there already exists a"</span><br><span> " different route to this source, message is not routable\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_ipa_name_to_str(&req->source_name),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_peer_id_to_str(&req->source_name),</span><br><span> osmo_ipa_name_to_str(&conn->peer_name));</span><br><span> osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_ROUTING_ERROR, true);</span><br><span> return NULL;</span><br><span>diff --git a/src/gsupclient/Makefile.am b/src/gsupclient/Makefile.am</span><br><span>index 38b1582..a8674e4 100644</span><br><span>--- a/src/gsupclient/Makefile.am</span><br><span>+++ b/src/gsupclient/Makefile.am</span><br><span>@@ -9,7 +9,7 @@</span><br><span> lib_LTLIBRARIES = libosmo-gsup-client.la</span><br><span> </span><br><span> libosmo_gsup_client_la_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">- ipa_name.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_peer_id.c \</span><br><span> gsup_client.c \</span><br><span> gsup_req.c \</span><br><span> $(NULL)</span><br><span>diff --git a/src/gsupclient/gsup_peer_id.c b/src/gsupclient/gsup_peer_id.c</span><br><span>new file mode 100644</span><br><span>index 0000000..9ac3af9</span><br><span>--- /dev/null</span><br><span>+++ b/src/gsupclient/gsup_peer_id.c</span><br><span>@@ -0,0 +1,172 @@</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 General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 2 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 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 General Public License along</span><br><span style="color: hsl(120, 100%, 40%);">+ * 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%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/gsup_peer_id.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bool osmo_ipa_name_is_empty(struct osmo_ipa_name *ipa_name)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return (!ipa_name) || (!ipa_name->len);</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 osmo_ipa_name_set(struct osmo_ipa_name *ipa_name, const uint8_t *val, size_t len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!val || !len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *ipa_name = (struct osmo_ipa_name){};</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%);">+ if (len > sizeof(ipa_name->val))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOSPC;</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_name->len = len;</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(ipa_name->val, val, len);</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 int osmo_ipa_name_set_str_va(struct osmo_ipa_name *ipa_name, const char *str_fmt, va_list ap)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!str_fmt)</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_ipa_name_set(ipa_name, NULL, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ vsnprintf((char*)(ipa_name->val), sizeof(ipa_name->val), str_fmt, ap);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_name->len = strlen((char*)(ipa_name->val))+1;</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 osmo_ipa_name_set_str(struct osmo_ipa_name *ipa_name, const char *str_fmt, ...)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ va_list ap;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ va_start(ap, str_fmt);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_ipa_name_set_str_va(ipa_name, str_fmt, ap);</span><br><span style="color: hsl(120, 100%, 40%);">+ va_end(ap);</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%);">+int osmo_ipa_name_cmp(const struct osmo_ipa_name *a, const struct osmo_ipa_name *b)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int cmp;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (a == b)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!a)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!b)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!a->len && !b->len)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!a->len && b->len)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!b->len && a->len)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (a->len == b->len)</span><br><span style="color: hsl(120, 100%, 40%);">+ return memcmp(a->val, b->val, a->len);</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (a->len < b->len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ cmp = memcmp(a->val, b->val, a->len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cmp)</span><br><span style="color: hsl(120, 100%, 40%);">+ cmp = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return cmp;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* a->len > b->len */</span><br><span style="color: hsl(120, 100%, 40%);">+ cmp = memcmp(a->val, b->val, b->len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cmp)</span><br><span style="color: hsl(120, 100%, 40%);">+ cmp = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return cmp;</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%);">+/* Return an unquoted string, not including the terminating zero. Used for writing VTY config. */</span><br><span style="color: hsl(120, 100%, 40%);">+const char *osmo_ipa_name_to_str(const struct osmo_ipa_name *ipa_name)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t len = ipa_name->len;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!len)</span><br><span style="color: hsl(120, 100%, 40%);">+ return "";</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ipa_name->val[len-1] == '\0')</span><br><span style="color: hsl(120, 100%, 40%);">+ len--;</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_escape_str_c(OTC_SELECT, (char*)ipa_name->val, len);</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 osmo_gsup_peer_id_is_empty(struct osmo_gsup_peer_id *gsup_peer_id)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gsup_peer_id)</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (gsup_peer_id->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_PEER_ID_EMPTY:</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_PEER_ID_IPA_NAME:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_ipa_name_is_empty(&gsup_peer_id->ipa_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</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%);">+int osmo_gsup_peer_id_set(struct osmo_gsup_peer_id *gsup_peer_id, enum osmo_gsup_peer_id_type type,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *val, size_t len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_peer_id->type = type;</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_PEER_ID_IPA_NAME:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_ipa_name_set(&gsup_peer_id->ipa_name, val, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsup_peer_id_set_str(struct osmo_gsup_peer_id *gsup_peer_id, enum osmo_gsup_peer_id_type type,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *str_fmt, ...)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ va_list ap;</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%);">+ switch (type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_PEER_ID_IPA_NAME:</span><br><span style="color: hsl(120, 100%, 40%);">+ va_start(ap, str_fmt);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_ipa_name_set_str_va(&gsup_peer_id->ipa_name, str_fmt, ap);</span><br><span style="color: hsl(120, 100%, 40%);">+ va_end(ap);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsup_peer_id_cmp(const struct osmo_gsup_peer_id *a, const struct osmo_gsup_peer_id *b)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (a->type != b->type)</span><br><span style="color: hsl(120, 100%, 40%);">+ return OSMO_CMP(a->type, b->type);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (a->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_PEER_ID_IPA_NAME:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_ipa_name_cmp(&a->ipa_name, &b->ipa_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</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%);">+const struct value_string osmo_gsup_peer_id_type_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { OSMO_GSUP_PEER_ID_IPA_NAME, "IPA-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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Return an unquoted string, not including the terminating zero. Used for writing VTY config. */</span><br><span style="color: hsl(120, 100%, 40%);">+const char *osmo_gsup_peer_id_to_str(const struct osmo_gsup_peer_id *gpi)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (gpi->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_PEER_ID_IPA_NAME:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_ipa_name_to_str(&gpi->ipa_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsup_peer_id_type_name(gpi->type);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/gsupclient/gsup_req.c b/src/gsupclient/gsup_req.c</span><br><span>index df834eb..7cefbdf 100644</span><br><span>--- a/src/gsupclient/gsup_req.c</span><br><span>+++ b/src/gsupclient/gsup_req.c</span><br><span>@@ -44,7 +44,7 @@</span><br><span> * \param[inout] add_to_list List to which to append this request, or NULL for no list.</span><br><span> * \return a newly allocated osmo_gsup_req, or NULL on error.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_ipa_name *from_peer, struct msgb *msg,</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_gsup_peer_id *from_peer, struct msgb *msg,</span><br><span> osmo_gsup_req_send_response_t send_response_cb, void *cb_data,</span><br><span> struct llist_head *add_to_list)</span><br><span> {</span><br><span>@@ -54,7 +54,7 @@</span><br><span> </span><br><span> if (!msgb_l2(msg) || !msgb_l2len(msg)) {</span><br><span> LOGP(DLGSUP, LOGL_ERROR, "Rx GSUP from %s: missing or empty L2 data\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_ipa_name_to_str(from_peer));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_peer_id_to_str(from_peer));</span><br><span> msgb_free(msg);</span><br><span> return NULL;</span><br><span> }</span><br><span>@@ -70,7 +70,7 @@</span><br><span> req->source_name = *from_peer;</span><br><span> rc = osmo_gsup_decode(msgb_l2(req->msg), msgb_l2len(req->msg), (struct osmo_gsup_message*)&req->gsup);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLGSUP, LOGL_ERROR, "Rx GSUP from %s: cannot decode (rc=%d)\n", osmo_ipa_name_to_str(from_peer), rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGSUP, LOGL_ERROR, "Rx GSUP from %s: cannot decode (rc=%d)\n", osmo_gsup_peer_id_to_str(from_peer), rc);</span><br><span> osmo_gsup_req_free(req);</span><br><span> return NULL;</span><br><span> }</span><br><span>@@ -78,17 +78,18 @@</span><br><span> LOG_GSUP_REQ(req, LOGL_DEBUG, "new request: {%s}\n", osmo_gsup_message_to_str_c(OTC_SELECT, &req->gsup));</span><br><span> </span><br><span> if (req->gsup.source_name_len) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_ipa_name_set(&req->source_name, req->gsup.source_name, req->gsup.source_name_len)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_gsup_peer_id_set(&req->source_name, OSMO_GSUP_PEER_ID_IPA_NAME,</span><br><span style="color: hsl(120, 100%, 40%);">+ req->gsup.source_name, req->gsup.source_name_len)) {</span><br><span> LOGP(DLGSUP, LOGL_ERROR,</span><br><span> "Rx GSUP from %s: failed to decode source_name, message is not routable\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_ipa_name_to_str(from_peer));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_peer_id_to_str(from_peer));</span><br><span> osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_ROUTING_ERROR, true);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span> /* The source of the GSUP message is not the immediate GSUP peer; the peer is our proxy for that source.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_ipa_name_cmp(&req->source_name, from_peer))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_gsup_peer_id_cmp(&req->source_name, from_peer))</span><br><span> req->via_proxy = *from_peer;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gsupclient/ipa_name.c b/src/gsupclient/ipa_name.c</span><br><span>deleted file mode 100644</span><br><span>index 716259e..0000000</span><br><span>--- a/src/gsupclient/ipa_name.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,91 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * All Rights Reserved</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; either version 2 of the License, or</span><br><span style="color: hsl(0, 100%, 40%);">- * (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * You should have received a copy of the GNU General Public License along</span><br><span style="color: hsl(0, 100%, 40%);">- * with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <errno.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <string.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/utils.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsupclient/ipa_name.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_ipa_name_set(struct osmo_ipa_name *ipa_name, const uint8_t *val, size_t len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (!val || !len) {</span><br><span style="color: hsl(0, 100%, 40%);">- *ipa_name = (struct osmo_ipa_name){};</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (len > sizeof(ipa_name->val))</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENOSPC;</span><br><span style="color: hsl(0, 100%, 40%);">- ipa_name->len = len;</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(ipa_name->val, val, len);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_ipa_name_set_str(struct osmo_ipa_name *ipa_name, const char *str_fmt, ...)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- va_list ap;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!str_fmt)</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_ipa_name_set(ipa_name, NULL, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- va_start(ap, str_fmt);</span><br><span style="color: hsl(0, 100%, 40%);">- vsnprintf((char*)(ipa_name->val), sizeof(ipa_name->val), str_fmt, ap);</span><br><span style="color: hsl(0, 100%, 40%);">- va_end(ap);</span><br><span style="color: hsl(0, 100%, 40%);">- ipa_name->len = strlen((char*)(ipa_name->val))+1;</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_ipa_name_cmp(const struct osmo_ipa_name *a, const struct osmo_ipa_name *b)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int cmp;</span><br><span style="color: hsl(0, 100%, 40%);">- if (a == b)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!a)</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!b)</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!a->len && !b->len)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!a->len && b->len)</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!b->len && a->len)</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (a->len == b->len)</span><br><span style="color: hsl(0, 100%, 40%);">- return memcmp(a->val, b->val, a->len);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (a->len < b->len) {</span><br><span style="color: hsl(0, 100%, 40%);">- cmp = memcmp(a->val, b->val, a->len);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!cmp)</span><br><span style="color: hsl(0, 100%, 40%);">- cmp = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- return cmp;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* a->len > b->len */</span><br><span style="color: hsl(0, 100%, 40%);">- cmp = memcmp(a->val, b->val, b->len);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!cmp)</span><br><span style="color: hsl(0, 100%, 40%);">- cmp = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- return cmp;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Return an unquoted string, not including the terminating zero. Used for writing VTY config. */</span><br><span style="color: hsl(0, 100%, 40%);">-const char *osmo_ipa_name_to_str(const struct osmo_ipa_name *ipa_name)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- size_t len = ipa_name->len;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!len)</span><br><span style="color: hsl(0, 100%, 40%);">- return "";</span><br><span style="color: hsl(0, 100%, 40%);">- if (ipa_name->val[len-1] == '\0')</span><br><span style="color: hsl(0, 100%, 40%);">- len--;</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_escape_str_c(OTC_SELECT, (char*)ipa_name->val, len);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/hlr.c b/src/hlr.c</span><br><span>index 65da84e..512c10e 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -37,7 +37,7 @@</span><br><span> #include <osmocom/gsm/gsm_utils.h></span><br><span> #include <osmocom/gsm/gsm23003.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsupclient/ipa_name.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/gsup_peer_id.h></span><br><span> #include <osmocom/hlr/db.h></span><br><span> #include <osmocom/hlr/hlr.h></span><br><span> #include <osmocom/hlr/ctrl.h></span><br><span>diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c</span><br><span>index 5203f26..1992e43 100644</span><br><span>--- a/src/hlr_ussd.c</span><br><span>+++ b/src/hlr_ussd.c</span><br><span>@@ -416,22 +416,24 @@</span><br><span> }</span><br><span> </span><br><span> /* is this GSUP connection an EUSE (true) or not (false)? */</span><br><span style="color: hsl(0, 100%, 40%);">-static bool peer_name_is_euse(const struct osmo_ipa_name *peer_name)</span><br><span style="color: hsl(120, 100%, 40%);">+static bool peer_name_is_euse(const struct osmo_gsup_peer_id *peer_name)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (peer_name->len <= 5)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (peer_name->type != OSMO_GSUP_PEER_ID_IPA_NAME)</span><br><span> return false;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!strncmp((char *)(peer_name->val), "EUSE-", 5))</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(120, 100%, 40%);">+ if (peer_name->ipa_name.len <= 5)</span><br><span> return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return strncmp((char *)(peer_name->ipa_name.val), "EUSE-", 5) == 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct hlr_euse *euse_by_name(const struct osmo_ipa_name *peer_name)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct hlr_euse *euse_by_name(const struct osmo_gsup_peer_id *peer_name)</span><br><span> {</span><br><span> if (!peer_name_is_euse(peer_name))</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return euse_find(g_hlr, (const char*)(peer_name->val)+5);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* above peer_name_is_euse() ensures this: */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(peer_name->type == OSMO_GSUP_PEER_ID_IPA_NAME);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return euse_find(g_hlr, (const char*)(peer_name->ipa_name.val)+5);</span><br><span> }</span><br><span> </span><br><span> static int handle_ss(struct ss_session *ss, bool is_euse_originated, const struct osmo_gsup_message *gsup,</span><br><span>@@ -520,6 +522,14 @@</span><br><span> LOGP(DSS, LOGL_DEBUG, "%s/0x%08x: Process SS (%s)\n", gsup->imsi, gsup->session_id,</span><br><span> osmo_gsup_session_state_name(gsup->session_state));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsup_req->source_name.type != OSMO_GSUP_PEER_ID_IPA_NAME) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSS, LOGL_ERROR, "%s/0x%082x: Unable to process SS request: Unsupported GSUP peer id type%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup->imsi, gsup->session_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_peer_id_type_name(gsup_req->source_name.type));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_req_respond_err(gsup_req, GMM_CAUSE_PROTO_ERR_UNSPEC, "error processing SS request");</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> /* decode and find out what kind of SS message it is */</span><br><span> if (gsup->ss_info && gsup->ss_info_len) {</span><br><span> if (gsm0480_parse_facility_ie(gsup->ss_info, gsup->ss_info_len, &req)) {</span><br><span>@@ -557,7 +567,8 @@</span><br><span> if (!is_euse_originated) {</span><br><span> ss->initial_req_from_ms = gsup_req;</span><br><span> free_gsup_req = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- ss->vlr_name = gsup_req->source_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gsup_req->source_name.type == OSMO_GSUP_PEER_ID_IPA_NAME); /* checked above */</span><br><span style="color: hsl(120, 100%, 40%);">+ ss->vlr_name = gsup_req->source_name.ipa_name;</span><br><span> } else {</span><br><span> ss->initial_req_from_euse = gsup_req;</span><br><span> free_gsup_req = NULL;</span><br><span>diff --git a/src/lu_fsm.c b/src/lu_fsm.c</span><br><span>index f430793..af3bed3 100644</span><br><span>--- a/src/lu_fsm.c</span><br><span>+++ b/src/lu_fsm.c</span><br><span>@@ -26,7 +26,7 @@</span><br><span> #include <osmocom/gsm/apn.h></span><br><span> #include <osmocom/gsm/gsm48_ie.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsupclient/ipa_name.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/gsup_peer_id.h></span><br><span> #include <osmocom/gsupclient/gsup_req.h></span><br><span> #include <osmocom/hlr/logging.h></span><br><span> #include <osmocom/hlr/hlr.h></span><br><span>@@ -52,11 +52,11 @@</span><br><span> bool is_ps;</span><br><span> </span><br><span> /* VLR requesting the LU. */</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_ipa_name vlr_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_peer_id vlr_name;</span><br><span> </span><br><span> /* If the LU request was received via a proxy and not immediately from a local VLR, this indicates the closest</span><br><span> * peer that forwarded the GSUP message. */</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_ipa_name via_proxy;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_peer_id via_proxy;</span><br><span> };</span><br><span> LLIST_HEAD(g_all_lu);</span><br><span> </span><br><span>@@ -130,7 +130,7 @@</span><br><span> </span><br><span> osmo_fsm_inst_update_id_f_sanitize(fi, '_', "%s:IMSI-%s", lu->is_ps ? "PS" : "CS", update_location_req->gsup.imsi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!lu->vlr_name.len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_gsup_peer_id_is_empty(&lu->vlr_name)) {</span><br><span> lu_failure(lu, GMM_CAUSE_NET_FAIL, "LU without a VLR");</span><br><span> return;</span><br><span> }</span><br><span>@@ -163,18 +163,30 @@</span><br><span> #endif</span><br><span> </span><br><span> /* Store the VLR / SGSN number with the subscriber, so we know where it was last seen. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lu->via_proxy.len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_gsup_peer_id_is_empty(&lu->via_proxy)) {</span><br><span> LOG_GSUP_REQ(update_location_req, LOGL_DEBUG, "storing %s = %s, via proxy %s\n",</span><br><span> lu->is_ps ? "SGSN number" : "VLR number",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_ipa_name_to_str(&lu->vlr_name),</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_ipa_name_to_str(&lu->via_proxy));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_peer_id_to_str(&lu->vlr_name),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_peer_id_to_str(&lu->via_proxy));</span><br><span> } else {</span><br><span> LOG_GSUP_REQ(update_location_req, LOGL_DEBUG, "storing %s = %s\n",</span><br><span> lu->is_ps ? "SGSN number" : "VLR number",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_ipa_name_to_str(&lu->vlr_name));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_peer_id_to_str(&lu->vlr_name));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (db_subscr_lu(g_hlr->dbc, lu->subscr.id, &lu->vlr_name, lu->is_ps, &lu->via_proxy)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_gsup_peer_id_is_empty(&lu->vlr_name)</span><br><span style="color: hsl(120, 100%, 40%);">+ || (lu->vlr_name.type != OSMO_GSUP_PEER_ID_IPA_NAME)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ lu_failure(lu, GMM_CAUSE_PROTO_ERR_UNSPEC, "Unsupported GSUP peer id type for vlr_name: %s",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_peer_id_type_name(lu->vlr_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%);">+ if (!osmo_gsup_peer_id_is_empty(&lu->via_proxy) && (lu->via_proxy.type != OSMO_GSUP_PEER_ID_IPA_NAME)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ lu_failure(lu, GMM_CAUSE_PROTO_ERR_UNSPEC, "Unsupported GSUP peer id type for via_proxy: %s",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_peer_id_type_name(lu->via_proxy.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%);">+ if (db_subscr_lu(g_hlr->dbc, lu->subscr.id, &lu->vlr_name.ipa_name, lu->is_ps,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_peer_id_is_empty(&lu->via_proxy)? NULL : &lu->via_proxy.ipa_name)) {</span><br><span> lu_failure(lu, GMM_CAUSE_NET_FAIL, "Cannot update %s in the database",</span><br><span> lu->is_ps ? "SGSN number" : "VLR number");</span><br><span> return;</span><br><span>diff --git a/tests/db/Makefile.am b/tests/db/Makefile.am</span><br><span>index 0194957..d1fdb48 100644</span><br><span>--- a/tests/db/Makefile.am</span><br><span>+++ b/tests/db/Makefile.am</span><br><span>@@ -30,7 +30,7 @@</span><br><span> $(top_builddir)/src/db_auc.o \</span><br><span> $(top_builddir)/src/db_hlr.o \</span><br><span> $(top_builddir)/src/db.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/ipa_name.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/gsup_peer_id.o \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span> $(LIBOSMOABIS_LIBS) \</span><br><span>diff --git a/tests/db/db_test.c b/tests/db/db_test.c</span><br><span>index c53baed..4a0f3e8 100644</span><br><span>--- a/tests/db/db_test.c</span><br><span>+++ b/tests/db/db_test.c</span><br><span>@@ -27,7 +27,7 @@</span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/core/logging.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsupclient/ipa_name.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/gsup_peer_id.h></span><br><span> #include <osmocom/hlr/db.h></span><br><span> #include <osmocom/hlr/logging.h></span><br><span> </span><br><span>diff --git a/tests/gsup_server/Makefile.am b/tests/gsup_server/Makefile.am</span><br><span>index 48fda88..6df538f 100644</span><br><span>--- a/tests/gsup_server/Makefile.am</span><br><span>+++ b/tests/gsup_server/Makefile.am</span><br><span>@@ -31,7 +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(0, 100%, 40%);">- $(top_srcdir)/src/gsupclient/ipa_name.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_srcdir)/src/gsupclient/gsup_peer_id.c \</span><br><span> $(top_srcdir)/src/gsupclient/gsup_req.c \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16459">change 16459</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/+/16459"/><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: Ide9dcdca283ab989240cfc6e53e9211862a199c5 </div>
<div style="display:none"> Gerrit-Change-Number: 16459 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>