<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12664">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix build: apply msgb_wrap_with_TL() rename<br><br>After libosmocore commit<br>If1e851ac605c8d2fde3da565b0bd674ea6350c2e<br>b27e6feb699712345373e87a48187dc622e4fa92<br>the openbsc master build is broken.<br><br>Apply the msgb_wrap_with_TL() rename to msgb_push_tl() to unbreak the build.<br><br>Also related is commit e8cd09dd6f3378a8137afb581dcd7ed554daa24c in this<br>repository, which removed the locally defined msgb_wrap_with_TL() definition.<br>The libosmocore mistake should have become obvious then and there...<br><br>Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5<br>---<br>M openbsc/src/libmsc/gsm_04_80.c<br>1 file changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/libmsc/gsm_04_80.c b/openbsc/src/libmsc/gsm_04_80.c</span><br><span>index dc9ae23..1c08d99 100644</span><br><span>--- a/openbsc/src/libmsc/gsm_04_80.c</span><br><span>+++ b/openbsc/src/libmsc/gsm_04_80.c</span><br><span>@@ -67,29 +67,29 @@</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_push_TLV1(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_push_TLV1(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_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, req->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>  /* 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>     gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh));</span><br><span>@@ -115,10 +115,10 @@</span><br><span>       msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, req->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>         /* 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>     gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12664">change 12664</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/12664"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 </div>
<div style="display:none"> Gerrit-Change-Number: 12664 </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>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>