<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/15915">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add osmo_gsup_msgb_alloc()<br><br>Throughout osmo-hlr's code, the GSUP msgb allocation is duplicated as:<br><br> msgb_alloc_headroom(1024+16, 16, "foo");<br><br>Instead, use one common function to keep the magic numbers in one place.<br><br>Change-Id: I40e99b5bc4fd8f750da7643c03b2119ac3bfd95e<br>---<br>M include/osmocom/hlr/gsup_server.h<br>M src/gsup_server.c<br>M src/hlr.c<br>M src/hlr_ussd.c<br>M src/luop.c<br>5 files changed, 17 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/hlr/gsup_server.h b/include/osmocom/hlr/gsup_server.h</span><br><span>index 9c4d483..14f5013 100644</span><br><span>--- a/include/osmocom/hlr/gsup_server.h</span><br><span>+++ b/include/osmocom/hlr/gsup_server.h</span><br><span>@@ -47,6 +47,7 @@</span><br><span> bool supports_ps; /* client supports OSMO_GSUP_CN_DOMAIN_PS */</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *osmo_gsup_msgb_alloc(const char *label);</span><br><span> </span><br><span> int osmo_gsup_conn_send(struct osmo_gsup_conn *conn, struct msgb *msg);</span><br><span> int osmo_gsup_conn_ccm_get(const struct osmo_gsup_conn *clnt, uint8_t **addr,</span><br><span>diff --git a/src/gsup_server.c b/src/gsup_server.c</span><br><span>index bee6aef..ed1b285 100644</span><br><span>--- a/src/gsup_server.c</span><br><span>+++ b/src/gsup_server.c</span><br><span>@@ -30,6 +30,13 @@</span><br><span> #include <osmocom/hlr/gsup_server.h></span><br><span> #include <osmocom/hlr/gsup_router.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *osmo_gsup_msgb_alloc(const char *label)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = msgb_alloc_headroom(1024+16, 16, label);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return msg;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void osmo_gsup_server_send(struct osmo_gsup_conn *conn,</span><br><span> int proto_ext, struct msgb *msg_tx)</span><br><span> {</span><br><span>diff --git a/src/hlr.c b/src/hlr.c</span><br><span>index 0970bb1..1638e67 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -128,7 +128,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Send ISD to MSC/SGSN */</span><br><span style="color: hsl(0, 100%, 40%);">- msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP ISD UPDATE");</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_out = osmo_gsup_msgb_alloc("GSUP ISD UPDATE");</span><br><span> if (msg_out == NULL) {</span><br><span> LOGP(DLGSUP, LOGL_ERROR,</span><br><span> "IMSI='%s': Cannot notify GSUP client; could not allocate msg buffer "</span><br><span>@@ -271,7 +271,7 @@</span><br><span> gsup_out.num_auth_vectors = rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP AUC response");</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_out = osmo_gsup_msgb_alloc("GSUP AUC response");</span><br><span> osmo_gsup_encode(msg_out, &gsup_out);</span><br><span> return osmo_gsup_conn_send(conn, msg_out);</span><br><span> }</span><br><span>@@ -451,7 +451,7 @@</span><br><span> gsup_reply.cause = GMM_CAUSE_NET_FAIL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP AUC response");</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_out = osmo_gsup_msgb_alloc("GSUP AUC response");</span><br><span> osmo_gsup_encode(msg_out, &gsup_reply);</span><br><span> return osmo_gsup_conn_send(conn, msg_out);</span><br><span> }</span><br><span>@@ -466,8 +466,7 @@</span><br><span> OSMO_STRLCPY_ARRAY(gsup_reply.imsi, imsi);</span><br><span> gsup_reply.message_type = type_err;</span><br><span> gsup_reply.cause = err_cause;</span><br><span style="color: hsl(0, 100%, 40%);">- msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP ERR response");</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msg_out);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_out = osmo_gsup_msgb_alloc("GSUP ERR response");</span><br><span> osmo_gsup_encode(msg_out, &gsup_reply);</span><br><span> LOGP(DMAIN, LOGL_NOTICE, "Tx %s\n", osmo_gsup_message_type_name(type_err));</span><br><span> return osmo_gsup_conn_send(conn, msg_out);</span><br><span>@@ -525,7 +524,7 @@</span><br><span> /* Accept all IMEIs */</span><br><span> gsup_reply.imei_result = OSMO_GSUP_IMEI_RESULT_ACK;</span><br><span> gsup_reply.message_type = OSMO_GSUP_MSGT_CHECK_IMEI_RESULT;</span><br><span style="color: hsl(0, 100%, 40%);">- msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP Check_IMEI response");</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_out = osmo_gsup_msgb_alloc("GSUP Check_IMEI response");</span><br><span> memcpy(gsup_reply.imsi, gsup->imsi, sizeof(gsup_reply.imsi));</span><br><span> osmo_gsup_encode(msg_out, &gsup_reply);</span><br><span> return osmo_gsup_conn_send(conn, msg_out);</span><br><span>@@ -591,8 +590,7 @@</span><br><span> end:</span><br><span> /* Send error back to source */</span><br><span> if (ret) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg_err = msgb_alloc_headroom(1024+16, 16, "GSUP forward ERR response");</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msg_err);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg_err = osmo_gsup_msgb_alloc("GSUP forward ERR response");</span><br><span> gsup_err->message_type = OSMO_GSUP_MSGT_E_ROUTING_ERROR;</span><br><span> osmo_gsup_encode(msg_err, gsup_err);</span><br><span> LOGP_GSUP_FWD(gsup_err, LOGL_NOTICE, "Tx %s\n", osmo_gsup_message_type_name(gsup_err->message_type));</span><br><span>diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c</span><br><span>index 00023ba..8cdc15c 100644</span><br><span>--- a/src/hlr_ussd.c</span><br><span>+++ b/src/hlr_ussd.c</span><br><span>@@ -464,8 +464,7 @@</span><br><span> }</span><br><span> </span><br><span> if (is_euse_originated) {</span><br><span style="color: hsl(0, 100%, 40%);">- msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP USSD FW");</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msg_out);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_out = osmo_gsup_msgb_alloc("GSUP USSD FW");</span><br><span> /* Received from EUSE, Forward to VLR */</span><br><span> osmo_gsup_encode(msg_out, gsup);</span><br><span> ss_gsup_send(ss, conn->server, msg_out);</span><br><span>@@ -481,8 +480,7 @@</span><br><span> LOGPSS(ss, LOGL_ERROR, "Cannot find conn for EUSE %s\n", addr);</span><br><span> ss_tx_error(ss, req->invoke_id, GSM0480_ERR_CODE_SYSTEM_FAILURE);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP USSD FW");</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msg_out);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_out = osmo_gsup_msgb_alloc("GSUP USSD FW");</span><br><span> osmo_gsup_encode(msg_out, gsup);</span><br><span> osmo_gsup_conn_send(conn, msg_out);</span><br><span> }</span><br><span>diff --git a/src/luop.c b/src/luop.c</span><br><span>index 652ce0d..1a2f854 100644</span><br><span>--- a/src/luop.c</span><br><span>+++ b/src/luop.c</span><br><span>@@ -50,8 +50,7 @@</span><br><span> {</span><br><span> struct msgb *msg_out;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP LUOP");</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msg_out);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_out = osmo_gsup_msgb_alloc("GSUP LUOP");</span><br><span> osmo_gsup_encode(msg_out, gsup);</span><br><span> </span><br><span> osmo_gsup_addr_send(luop->gsup_server, luop->peer,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/15915">change 15915</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/+/15915"/><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: I40e99b5bc4fd8f750da7643c03b2119ac3bfd95e </div>
<div style="display:none"> Gerrit-Change-Number: 15915 </div>
<div style="display:none"> Gerrit-PatchSet: 11 </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: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </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>