<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11989">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Stefan Sperling: Looks good to me, but someone else must approve
Vadim Yanitskiy: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsupclient: introduce osmo_gsup_client_enc_send()<br><br>Several parts of OsmoMSC (e.g. GSM 04.11, 09.11, etc.) are dealing<br>with GSUP message encoding and sending towards OsmoHLR. In order<br>to avoid code duplication, let's have a shared function here.<br><br>Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f<br>---<br>M include/osmocom/gsupclient/gsup_client.h<br>M src/gsupclient/gsup_client.c<br>2 files changed, 39 insertions(+), 0 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 95163cd..154e3e0 100644</span><br><span>--- a/include/osmocom/gsupclient/gsup_client.h</span><br><span>+++ b/include/osmocom/gsupclient/gsup_client.h</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include <osmocom/core/timer.h></span><br><span> #include <osmocom/gsm/oap_client.h></span><br><span> #include <osmocom/gsm/ipa.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsup.h></span><br><span> </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>@@ -70,5 +71,7 @@</span><br><span> </span><br><span> void osmo_gsup_client_destroy(struct osmo_gsup_client *gsupc);</span><br><span> int osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsup_client_enc_send(struct osmo_gsup_client *gsupc,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_gsup_message *gsup_msg);</span><br><span> 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 f259bdc..c8408fd 100644</span><br><span>--- a/src/gsupclient/gsup_client.c</span><br><span>+++ b/src/gsupclient/gsup_client.c</span><br><span>@@ -360,6 +360,42 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Encode and send a GSUP message.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] gsupc GSUP client.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] gsup_msg GSUP message to be sent.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 in case of success, negative on error.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsup_client_enc_send(struct osmo_gsup_client *gsupc,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_gsup_message *gsup_msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *gsup_msgb;</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%);">+ gsup_msgb = osmo_gsup_client_msgb_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gsup_msgb) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGSUP, LOGL_ERROR, "Couldn't allocate GSUP message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOMEM;</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 = osmo_gsup_encode(gsup_msgb, gsup_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGSUP, LOGL_ERROR, "Couldn't encode GSUP message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ goto error;</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 = osmo_gsup_client_send(gsupc, gsup_msgb);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGSUP, LOGL_ERROR, "Couldn't send GSUP message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ goto error;</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%);">+error:</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(gsup_msgb);</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> 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></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11989">change 11989</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/11989"/><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: I0589ff27933e9bca2bcf93b8259004935778db8f </div>
<div style="display:none"> Gerrit-Change-Number: 11989 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <stsp@stsp.name> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>