<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23730">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abis_nm_ipaccess_rsl_connect(): use msgb to compose attr<br><br>So far the function uses insane byte array magic numbers to compose the<br>OML "RSL Connect" message. For VAMOS, I intend to modify that message.<br>To ensure sanity, first change the attr composition to msgb_put*().<br><br>Related: OS#4940<br>Change-Id: Iba005635cf86aee1fde77d58ef203e28eed92281<br>---<br>M src/osmo-bsc/abis_nm.c<br>1 file changed, 9 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/30/23730/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c</span><br><span>index ba1075a..a5407ed 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -3014,32 +3014,28 @@</span><br><span> int abis_nm_ipaccess_rsl_connect(struct gsm_bts_trx *trx,</span><br><span>                            uint32_t ip, uint16_t port, uint8_t stream)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+     struct msgb *attr;</span><br><span>   struct in_addr ia;</span><br><span style="color: hsl(0, 100%, 40%);">-      uint8_t attr[] = { NM_ATT_IPACC_STREAM_ID, 0,</span><br><span style="color: hsl(0, 100%, 40%);">-                       NM_ATT_IPACC_DST_IP_PORT, 0, 0,</span><br><span style="color: hsl(0, 100%, 40%);">-                         NM_ATT_IPACC_DST_IP, 0, 0, 0, 0 };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  int attr_len = sizeof(attr);</span><br><span>         int error;</span><br><span> </span><br><span>       osmo_timer_setup(&trx->rsl_connect_timeout, rsl_connect_timeout, trx);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       ia.s_addr = htonl(ip);</span><br><span style="color: hsl(0, 100%, 40%);">-  attr[1] = stream;</span><br><span style="color: hsl(0, 100%, 40%);">-       attr[3] = port >> 8;</span><br><span style="color: hsl(0, 100%, 40%);">-      attr[4] = port & 0xff;</span><br><span style="color: hsl(0, 100%, 40%);">-      memcpy(attr + 6, &ia.s_addr, sizeof(uint32_t));</span><br><span style="color: hsl(120, 100%, 40%);">+   attr = msgb_alloc_c(OTC_SELECT, 32, "RSL-connect-attr");</span><br><span style="color: hsl(120, 100%, 40%);">+    msgb_tv_put(attr, NM_ATT_IPACC_STREAM_ID, stream);</span><br><span style="color: hsl(120, 100%, 40%);">+    msgb_tv16_put(attr, NM_ATT_IPACC_DST_IP_PORT, port);</span><br><span> </span><br><span>     /* if ip == 0, we use the default IP */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ip == 0)</span><br><span style="color: hsl(0, 100%, 40%);">-            attr_len -= 5;</span><br><span style="color: hsl(120, 100%, 40%);">+        if (ip != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                ia.s_addr = htonl(ip);</span><br><span style="color: hsl(120, 100%, 40%);">+                msgb_tv_fixed_put(attr, NM_ATT_IPACC_DST_IP, 4, (void*)&ia.s_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span> </span><br><span>        LOG_TRX(trx, DNM, LOGL_INFO, "IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n",</span><br><span>              inet_ntoa(ia), port, stream);</span><br><span> </span><br><span>    error = abis_nm_ipaccess_msg(trx->bts, NM_MT_IPACC_RSL_CONNECT,</span><br><span>                                NM_OC_BASEB_TRANSC, trx->bts->bts_nr,</span><br><span style="color: hsl(0, 100%, 40%);">-                                     trx->nr, 0xff, attr, attr_len);</span><br><span style="color: hsl(120, 100%, 40%);">+                                    trx->nr, 0xff, attr->data, attr->len);</span><br><span>         if (error == 0)</span><br><span>              osmo_timer_schedule(&trx->rsl_connect_timeout, 60, 0);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23730">change 23730</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-bsc/+/23730"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iba005635cf86aee1fde77d58ef203e28eed92281 </div>
<div style="display:none"> Gerrit-Change-Number: 23730 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>