<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12662">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Rename msgb_wrap_with_TL()<br><br>This resolves an issue introduced in 84fb5bb6a09a6a358f98c654c84c3b99a0f24eef<br>when msgb_wrap_with_TL() was introduced as an inline function with<br>*exactly the same name* as in osmo-msc.git and openbsc.git. We *NEVER*<br>do something like this. Functions moved from applications to library<br>*MUST* always be renamed. This has been the case for almost a decade<br>now.<br><br>With this subsequent change we make sure the libosmocore function<br>has a different name and doesn't clash. After this commit, old<br>openbsc.git and osmo-bsc.git should again build fine.<br><br>Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e<br>---<br>M include/osmocom/core/msgb.h<br>M src/gsm/gsm0480.c<br>2 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h</span><br><span>index b7c8422..f006b34 100644</span><br><span>--- a/include/osmocom/core/msgb.h</span><br><span>+++ b/include/osmocom/core/msgb.h</span><br><span>@@ -368,7 +368,7 @@</span><br><span> osmo_store32be(word, space);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline unsigned char *msgb_push_tl(struct msgb *msgb, uint8_t tag)</span><br><span> {</span><br><span> uint8_t *data = msgb_push(msgb, 2);</span><br><span> </span><br><span>diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c</span><br><span>index 01f245a..b5c9844 100644</span><br><span>--- a/src/gsm/gsm0480.c</span><br><span>+++ b/src/gsm/gsm0480.c</span><br><span>@@ -84,7 +84,7 @@</span><br><span> msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, link_id);</span><br><span> </span><br><span> /* 1. component tag */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_wrap_with_TL(msg, GSM0480_CTYPE_INVOKE);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_push_tl(msg, GSM0480_CTYPE_INVOKE);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -92,7 +92,7 @@</span><br><span> /* wrap the GSM 04.08 Facility IE around it */</span><br><span> int gsm0480_wrap_facility(struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_push_tl(msg, GSM0480_IE_FACILITY);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -793,26 +793,26 @@</span><br><span> msgb_put(msg, response_len);</span><br><span> </span><br><span> /* Then wrap it as an Octet String */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_push_tl(msg, ASN1_OCTET_STRING_TAG);</span><br><span> </span><br><span> /* Pre-pend the DCS octet string */</span><br><span> msgb_tlv1_push(msg, ASN1_OCTET_STRING_TAG, 0x0F);</span><br><span> </span><br><span> /* Then wrap these as a Sequence */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_push_tl(msg, GSM_0480_SEQUENCE_TAG);</span><br><span> </span><br><span> /* Pre-pend the operation code */</span><br><span> msgb_tlv1_push(msg, GSM0480_OPERATION_CODE,</span><br><span> GSM0480_OP_CODE_PROCESS_USS_REQ);</span><br><span> </span><br><span> /* Wrap the operation code and IA5 string as a sequence */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_push_tl(msg, GSM_0480_SEQUENCE_TAG);</span><br><span> </span><br><span> /* Pre-pend the invoke ID */</span><br><span> msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id);</span><br><span> </span><br><span> /* Wrap this up as a Return Result component */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_RESULT);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_push_tl(msg, GSM0480_CTYPE_RETURN_RESULT);</span><br><span> </span><br><span> return msg;</span><br><span> }</span><br><span>@@ -832,7 +832,7 @@</span><br><span> return NULL;</span><br><span> </span><br><span> /* Wrap the component in a Facility message */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_push_tl(msg, GSM0480_IE_FACILITY);</span><br><span> </span><br><span> /* And finally pre-pend the L3 header */</span><br><span> gsm48_push_l3hdr_tid(msg, GSM48_PDISC_NC_SS,</span><br><span>@@ -863,7 +863,7 @@</span><br><span> msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id);</span><br><span> </span><br><span> /* Wrap this up as a Reject component */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_ERROR);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_push_tl(msg, GSM0480_CTYPE_RETURN_ERROR);</span><br><span> </span><br><span> /* FIXME: Wrap in Facility + L3? */</span><br><span> return msg;</span><br><span>@@ -896,7 +896,7 @@</span><br><span> msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id);</span><br><span> </span><br><span> /* Wrap this up as a Reject component */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_wrap_with_TL(msg, GSM0480_CTYPE_REJECT);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_push_tl(msg, GSM0480_CTYPE_REJECT);</span><br><span> </span><br><span> /* FIXME: Wrap in Facility + L3? */</span><br><span> return msg;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12662">change 12662</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/12662"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e </div>
<div style="display:none"> Gerrit-Change-Number: 12662 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </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>