<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11679">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;">Move msgb_push helpers to public header<br><br>The msgb_wrap_with_TL() is generally useful so it make sense to make it<br>public to facilitate code re-use.<br><br>Other helpers can be implemented as trivial wrappers over existing tlv.h<br>functions. Update headers and code accordingly.<br><br>Change-Id: I37e91d031fba28cf1c6735b8069b0265746f55e6<br>---<br>M include/osmocom/core/msgb.h<br>M include/osmocom/gsm/tlv.h<br>M src/gsm/gsm0480.c<br>3 files changed, 25 insertions(+), 39 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 8843db0..2449151 100644</span><br><span>--- a/include/osmocom/core/msgb.h</span><br><span>+++ b/include/osmocom/core/msgb.h</span><br><span>@@ -366,6 +366,15 @@</span><br><span> osmo_store32be(word, space);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 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%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *data = msgb_push(msgb, 2);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ data[0] = tag;</span><br><span style="color: hsl(120, 100%, 40%);">+ data[1] = msgb->len - 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ return data;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! remove (pull) a header from the front of the message buffer</span><br><span> * \param[in] msgb message buffer</span><br><span> * \param[in] len number of octets to be pulled</span><br><span>diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h</span><br><span>index 84fd511..1ab964a 100644</span><br><span>--- a/include/osmocom/gsm/tlv.h</span><br><span>+++ b/include/osmocom/gsm/tlv.h</span><br><span>@@ -341,6 +341,12 @@</span><br><span> return buf;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! push 1-byte tagged value */</span><br><span style="color: hsl(120, 100%, 40%);">+static inline uint8_t *msgb_tlv1_push(struct msgb *msg, uint8_t tag, uint8_t val)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return msgb_tlv_push(msg, tag, 1, &val);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! push (prepend) a TV field to a \ref msgb</span><br><span> * \returns pointer to first byte of newly-pushed information */</span><br><span> static inline uint8_t *msgb_tv_push(struct msgb *msg, uint8_t tag, uint8_t val)</span><br><span>diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c</span><br><span>index 7756ecb..021db62 100644</span><br><span>--- a/src/gsm/gsm0480.c</span><br><span>+++ b/src/gsm/gsm0480.c</span><br><span>@@ -68,35 +68,6 @@</span><br><span> { 0, NULL }</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(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *data = msgb_push(msgb, 2);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- data[0] = tag;</span><br><span style="color: hsl(0, 100%, 40%);">- data[1] = msgb->len - 2;</span><br><span style="color: hsl(0, 100%, 40%);">- return data;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline unsigned char *msgb_push_TLV1(struct msgb *msgb, uint8_t tag,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t value)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *data = msgb_push(msgb, 3);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- data[0] = tag;</span><br><span style="color: hsl(0, 100%, 40%);">- data[1] = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- data[2] = value;</span><br><span style="color: hsl(0, 100%, 40%);">- return data;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline unsigned char *msgb_push_NULL(struct msgb *msgb)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *data = msgb_push(msgb, 2);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- data[0] = ASN1_NULL_TYPE_TAG;</span><br><span style="color: hsl(0, 100%, 40%);">- data[1] = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- return data;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* wrap an invoke around it... the other way around</span><br><span> *</span><br><span> * 1.) Invoke Component tag</span><br><span>@@ -107,10 +78,10 @@</span><br><span> int gsm0480_wrap_invoke(struct msgb *msg, int op, int link_id)</span><br><span> {</span><br><span> /* 3. operation */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_push_TLV1(msg, GSM0480_OPERATION_CODE, op);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tlv1_push(msg, GSM0480_OPERATION_CODE, op);</span><br><span> </span><br><span> /* 2. invoke id tag */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, link_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, link_id);</span><br><span> </span><br><span> /* 1. component tag */</span><br><span> msgb_wrap_with_TL(msg, GSM0480_CTYPE_INVOKE);</span><br><span>@@ -825,20 +796,20 @@</span><br><span> msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG);</span><br><span> </span><br><span> /* Pre-pend the DCS octet string */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_push_TLV1(msg, ASN1_OCTET_STRING_TAG, 0x0F);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tlv1_push(msg, ASN1_OCTET_STRING_TAG, 0x0F);</span><br><span> </span><br><span> /* Then wrap these as a Sequence */</span><br><span> msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG);</span><br><span> </span><br><span> /* Pre-pend the operation code */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_push_TLV1(msg, GSM0480_OPERATION_CODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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> msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG);</span><br><span> </span><br><span> /* Pre-pend the invoke ID */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ 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> msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_RESULT);</span><br><span>@@ -889,10 +860,10 @@</span><br><span> return NULL;</span><br><span> </span><br><span> /* First insert the problem code */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_push_TLV1(msg, GSM_0480_ERROR_CODE_TAG, error_code);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tlv1_push(msg, GSM_0480_ERROR_CODE_TAG, error_code);</span><br><span> </span><br><span> /* Before it, insert the invoke ID */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ 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> msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_ERROR);</span><br><span>@@ -919,13 +890,13 @@</span><br><span> return NULL;</span><br><span> </span><br><span> /* First insert the problem code */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_push_TLV1(msg, problem_tag, problem_code);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tlv1_push(msg, problem_tag, problem_code);</span><br><span> </span><br><span> /* If the Invoke ID is not available, Universal NULL (table 3.9) with length=0 shall be used */</span><br><span> if (invoke_id < 0 || invoke_id > 255)</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_push_NULL(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tv_push(msg, ASN1_NULL_TYPE_TAG, 0);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ 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> msgb_wrap_with_TL(msg, GSM0480_CTYPE_REJECT);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11679">change 11679</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/11679"/><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: I37e91d031fba28cf1c6735b8069b0265746f55e6 </div>
<div style="display:none"> Gerrit-Change-Number: 11679 </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>