<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10114">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Vadim Yanitskiy: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsup_client: rename gsup_client_* to osmo_gsup_client_*<br><br>As we're moving this to a common/shared library now, we need to use<br>the osmo_ namespace prefix for symbol names, struct/type names and<br>constants.<br><br>Change-Id: I294f8f96af4c5daa2b128962534426e04909290e<br>---<br>M include/osmocom/gsupclient/gsup_client.h<br>M src/gsupclient/gsup_client.c<br>M src/gsupclient/gsup_test_client.c<br>3 files changed, 49 insertions(+), 50 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsupclient/gsup_client.h b/include/osmocom/gsupclient/gsup_client.h</span><br><span>index f4362df..981751b 100644</span><br><span>--- a/include/osmocom/gsupclient/gsup_client.h</span><br><span>+++ b/include/osmocom/gsupclient/gsup_client.h</span><br><span>@@ -27,22 +27,21 @@</span><br><span> /* a loss of GSUP between MSC and HLR is considered quite serious, let's try to recover as quickly as</span><br><span> * possible. Even one new connection attempt per second should be quite acceptable until the link is</span><br><span> * re-established */</span><br><span style="color: hsl(0, 100%, 40%);">-#define GSUP_CLIENT_RECONNECT_INTERVAL 1</span><br><span style="color: hsl(0, 100%, 40%);">-#define GSUP_CLIENT_PING_INTERVAL 20</span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMO_GSUP_CLIENT_RECONNECT_INTERVAL 1</span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMO_GSUP_CLIENT_PING_INTERVAL 20</span><br><span> </span><br><span> struct msgb;</span><br><span> struct ipa_client_conn;</span><br><span style="color: hsl(0, 100%, 40%);">-struct gsup_client;</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsup_client;</span><br><span> </span><br><span> /* Expects message in msg->l2h */</span><br><span style="color: hsl(0, 100%, 40%);">-typedef int (*gsup_client_read_cb_t)(struct gsup_client *gsupc,</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+typedef int (*osmo_gsup_client_read_cb_t)(struct osmo_gsup_client *gsupc, struct msgb *msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gsup_client {</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsup_client {</span><br><span> const char *unit_name;</span><br><span> </span><br><span> struct ipa_client_conn *link;</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_client_read_cb_t read_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_client_read_cb_t read_cb;</span><br><span> void *data;</span><br><span> </span><br><span> struct osmo_oap_client_state oap_state;</span><br><span>@@ -53,14 +52,14 @@</span><br><span> int got_ipa_pong;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gsup_client *gsup_client_create(void *talloc_ctx,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *unit_name,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *ip_addr,</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int tcp_port,</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_client_read_cb_t read_cb,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_oap_client_config *oapc_config);</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsup_client *osmo_gsup_client_create(void *talloc_ctx,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *unit_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *ip_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int tcp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_client_read_cb_t read_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_oap_client_config *oapc_config);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void gsup_client_destroy(struct gsup_client *gsupc);</span><br><span style="color: hsl(0, 100%, 40%);">-int gsup_client_send(struct gsup_client *gsupc, struct msgb *msg);</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gsup_client_msgb_alloc(void);</span><br><span style="color: hsl(120, 100%, 40%);">+void osmo_gsup_client_destroy(struct osmo_gsup_client *gsupc);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *osmo_gsup_client_msgb_alloc(void);</span><br><span> </span><br><span>diff --git a/src/gsupclient/gsup_client.c b/src/gsupclient/gsup_client.c</span><br><span>index 761e8bd..a7fdc5f 100644</span><br><span>--- a/src/gsupclient/gsup_client.c</span><br><span>+++ b/src/gsupclient/gsup_client.c</span><br><span>@@ -32,11 +32,11 @@</span><br><span> #include <errno.h></span><br><span> #include <string.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void start_test_procedure(struct gsup_client *gsupc);</span><br><span style="color: hsl(120, 100%, 40%);">+static void start_test_procedure(struct osmo_gsup_client *gsupc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gsup_client_send_ping(struct gsup_client *gsupc)</span><br><span style="color: hsl(120, 100%, 40%);">+static void gsup_client_send_ping(struct osmo_gsup_client *gsupc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = gsup_client_msgb_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = osmo_gsup_client_msgb_alloc();</span><br><span> </span><br><span> msg->l2h = msgb_put(msg, 1);</span><br><span> msg->l2h[0] = IPAC_MSGT_PING;</span><br><span>@@ -44,7 +44,7 @@</span><br><span> ipa_client_conn_send(gsupc->link, msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int gsup_client_connect(struct gsup_client *gsupc)</span><br><span style="color: hsl(120, 100%, 40%);">+static int gsup_client_connect(struct osmo_gsup_client *gsupc)</span><br><span> {</span><br><span> int rc;</span><br><span> </span><br><span>@@ -82,7 +82,7 @@</span><br><span> return rc;</span><br><span> </span><br><span> osmo_timer_schedule(&gsupc->connect_timer,</span><br><span style="color: hsl(0, 100%, 40%);">- GSUP_CLIENT_RECONNECT_INTERVAL, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_CLIENT_RECONNECT_INTERVAL, 0);</span><br><span> </span><br><span> LOGP(DLGSUP, LOGL_INFO, "Scheduled timer to retry GSUP connect to %s:%d\n",</span><br><span> gsupc->link->addr, gsupc->link->port);</span><br><span>@@ -92,7 +92,7 @@</span><br><span> </span><br><span> static void connect_timer_cb(void *gsupc_)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsup_client *gsupc = gsupc_;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_client *gsupc = gsupc_;</span><br><span> </span><br><span> if (gsupc->is_connected)</span><br><span> return;</span><br><span>@@ -100,7 +100,7 @@</span><br><span> gsup_client_connect(gsupc);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void client_send(struct gsup_client *gsupc, int proto_ext,</span><br><span style="color: hsl(120, 100%, 40%);">+static void client_send(struct osmo_gsup_client *gsupc, int proto_ext,</span><br><span> struct msgb *msg_tx)</span><br><span> {</span><br><span> ipa_prepend_header_ext(msg_tx, proto_ext);</span><br><span>@@ -109,7 +109,7 @@</span><br><span> /* msg_tx is now queued and will be freed. */</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gsup_client_oap_register(struct gsup_client *gsupc)</span><br><span style="color: hsl(120, 100%, 40%);">+static void gsup_client_oap_register(struct osmo_gsup_client *gsupc)</span><br><span> {</span><br><span> struct msgb *msg_tx;</span><br><span> int rc;</span><br><span>@@ -125,7 +125,7 @@</span><br><span> </span><br><span> static void gsup_client_updown_cb(struct ipa_client_conn *link, int up)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsup_client *gsupc = link->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_client *gsupc = link->data;</span><br><span> </span><br><span> LOGP(DLGSUP, LOGL_INFO, "GSUP link to %s:%d %s\n",</span><br><span> link->addr, link->port, up ? "UP" : "DOWN");</span><br><span>@@ -143,11 +143,11 @@</span><br><span> osmo_timer_del(&gsupc->ping_timer);</span><br><span> </span><br><span> osmo_timer_schedule(&gsupc->connect_timer,</span><br><span style="color: hsl(0, 100%, 40%);">- GSUP_CLIENT_RECONNECT_INTERVAL, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_CLIENT_RECONNECT_INTERVAL, 0);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int gsup_client_oap_handle(struct gsup_client *gsupc, struct msgb *msg_rx)</span><br><span style="color: hsl(120, 100%, 40%);">+static int gsup_client_oap_handle(struct osmo_gsup_client *gsupc, struct msgb *msg_rx)</span><br><span> {</span><br><span> int rc;</span><br><span> struct msgb *msg_tx;</span><br><span>@@ -168,7 +168,7 @@</span><br><span> {</span><br><span> struct ipaccess_head *hh = (struct ipaccess_head *) msg->data;</span><br><span> struct ipaccess_head_ext *he = (struct ipaccess_head_ext *) msgb_l2(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsup_client *gsupc = (struct gsup_client *)link->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_client *gsupc = (struct osmo_gsup_client *)link->data;</span><br><span> int rc;</span><br><span> struct ipaccess_unit ipa_dev = {</span><br><span> /* see gsup_client_create() on const vs non-const */</span><br><span>@@ -234,7 +234,7 @@</span><br><span> </span><br><span> static void ping_timer_cb(void *gsupc_)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsup_client *gsupc = gsupc_;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_client *gsupc = gsupc_;</span><br><span> </span><br><span> LOGP(DLGSUP, LOGL_INFO, "GSUP ping callback (%s, %s PONG)\n",</span><br><span> gsupc->is_connected ? "connected" : "not connected",</span><br><span>@@ -252,27 +252,27 @@</span><br><span> gsup_client_connect(gsupc);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void start_test_procedure(struct gsup_client *gsupc)</span><br><span style="color: hsl(120, 100%, 40%);">+static void start_test_procedure(struct osmo_gsup_client *gsupc)</span><br><span> {</span><br><span> osmo_timer_setup(&gsupc->ping_timer, ping_timer_cb, gsupc);</span><br><span> </span><br><span> gsupc->got_ipa_pong = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_schedule(&gsupc->ping_timer, GSUP_CLIENT_PING_INTERVAL, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&gsupc->ping_timer, OSMO_GSUP_CLIENT_PING_INTERVAL, 0);</span><br><span> LOGP(DLGSUP, LOGL_DEBUG, "GSUP sending PING\n");</span><br><span> gsup_client_send_ping(gsupc);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gsup_client *gsup_client_create(void *talloc_ctx,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *unit_name,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *ip_addr,</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int tcp_port,</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_client_read_cb_t read_cb,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_oap_client_config *oapc_config)</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsup_client *osmo_gsup_client_create(void *talloc_ctx,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *unit_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *ip_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int tcp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_client_read_cb_t read_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_oap_client_config *oapc_config)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsup_client *gsupc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_client *gsupc;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gsupc = talloc_zero(talloc_ctx, struct gsup_client);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsupc = talloc_zero(talloc_ctx, struct osmo_gsup_client);</span><br><span> OSMO_ASSERT(gsupc);</span><br><span> </span><br><span> /* struct ipaccess_unit has a non-const unit_name, so let's copy to be</span><br><span>@@ -309,11 +309,11 @@</span><br><span> return gsupc;</span><br><span> </span><br><span> failed:</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_client_destroy(gsupc);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_client_destroy(gsupc);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void gsup_client_destroy(struct gsup_client *gsupc)</span><br><span style="color: hsl(120, 100%, 40%);">+void osmo_gsup_client_destroy(struct osmo_gsup_client *gsupc)</span><br><span> {</span><br><span> osmo_timer_del(&gsupc->connect_timer);</span><br><span> osmo_timer_del(&gsupc->ping_timer);</span><br><span>@@ -326,7 +326,7 @@</span><br><span> talloc_free(gsupc);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int gsup_client_send(struct gsup_client *gsupc, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg)</span><br><span> {</span><br><span> if (!gsupc || !gsupc->is_connected) {</span><br><span> LOGP(DLGSUP, LOGL_ERROR, "GSUP not connected, unable to send %s\n", msgb_hexdump(msg));</span><br><span>@@ -339,7 +339,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gsup_client_msgb_alloc(void)</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *osmo_gsup_client_msgb_alloc(void)</span><br><span> {</span><br><span> return msgb_alloc_headroom(4000, 64, __func__);</span><br><span> }</span><br><span>diff --git a/src/gsupclient/gsup_test_client.c b/src/gsupclient/gsup_test_client.c</span><br><span>index cfbd55e..b0362ad 100644</span><br><span>--- a/src/gsupclient/gsup_test_client.c</span><br><span>+++ b/src/gsupclient/gsup_test_client.c</span><br><span>@@ -13,7 +13,7 @@</span><br><span> </span><br><span> #include <osmocom/gsupclient/gsup_client.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsup_client *g_gc;</span><br><span style="color: hsl(120, 100%, 40%);">+static struct osmo_gsup_client *g_gc;</span><br><span> </span><br><span> </span><br><span> /***********************************************************************</span><br><span>@@ -117,7 +117,7 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gsup_client_send(g_gc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsup_client_send(g_gc, msg);</span><br><span> }</span><br><span> </span><br><span> /* allocate + generate + send Send-Auth-Info */</span><br><span>@@ -137,7 +137,7 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gsup_client_send(g_gc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsup_client_send(g_gc, msg);</span><br><span> }</span><br><span> </span><br><span> static int resp_isd(struct imsi_op *io)</span><br><span>@@ -157,7 +157,7 @@</span><br><span> </span><br><span> imsi_op_release(io);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gsup_client_send(g_gc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsup_client_send(g_gc, msg);</span><br><span> }</span><br><span> </span><br><span> /* receive an incoming GSUP message */</span><br><span>@@ -214,7 +214,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int gsupc_read_cb(struct gsup_client *gsupc, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+static int gsupc_read_cb(struct osmo_gsup_client *gsupc, struct msgb *msg)</span><br><span> {</span><br><span> struct osmo_gsup_message gsup_msg = {0};</span><br><span> struct imsi_op *io = NULL;</span><br><span>@@ -293,8 +293,8 @@</span><br><span> </span><br><span> osmo_init_logging2(ctx, &gsup_test_client_log_info);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- g_gc = gsup_client_create(ctx, "GSUPTEST", server_host, server_port,</span><br><span style="color: hsl(0, 100%, 40%);">- gsupc_read_cb, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_gc = osmo_gsup_client_create(ctx, "GSUPTEST", server_host, server_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ gsupc_read_cb, NULL);</span><br><span> </span><br><span> </span><br><span> signal(SIGINT, sig_cb);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10114">change 10114</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/10114"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I294f8f96af4c5daa2b128962534426e04909290e </div>
<div style="display:none"> Gerrit-Change-Number: 10114 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>