<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11336">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp: osmux: Move parse_cid of legacy dummy frames to own function<br><br>Change-Id: If9249fb0ee2e33c7dd2ab817480776acaa784cc2<br>---<br>M openbsc/src/libmgcp/mgcp_osmux.c<br>1 file changed, 15 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/36/11336/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>index 7590f18..ea0372b 100644</span><br><span>--- a/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>+++ b/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>@@ -261,6 +261,20 @@</span><br><span> return msg;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int osmux_legacy_dummy_parse_cid(struct sockaddr_in *addr, struct msgb *msg,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *osmux_cid)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msg->len < 1 + sizeof(osmux_cid)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Discarding truncated Osmux dummy load\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* extract the osmux CID from the dummy message */</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(osmux_cid, &msg->data[1], sizeof(*osmux_cid));</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define osmux_chunk_length(msg, rem) (rem - msg->len);</span><br><span> </span><br><span> int osmux_read_from_bsc_nat_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span>@@ -316,17 +330,8 @@</span><br><span> struct mgcp_endpoint *endp;</span><br><span> uint8_t osmux_cid;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (msg->len < 1 + sizeof(osmux_cid)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMGCP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Discarding truncated Osmux dummy load\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmux_legacy_dummy_parse_cid(addr, msg, &osmux_cid) < 0)</span><br><span> goto out;</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%);">- LOGP(DMGCP, LOGL_DEBUG, "Received Osmux dummy load from %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- inet_ntoa(addr->sin_addr));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* extract the osmux CID from the dummy message */</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(&osmux_cid, &msg->data[1], sizeof(osmux_cid));</span><br><span> </span><br><span> endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, MGCP_DEST_BTS);</span><br><span> if (!endp) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11336">change 11336</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/11336"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If9249fb0ee2e33c7dd2ab817480776acaa784cc2 </div>
<div style="display:none"> Gerrit-Change-Number: 11336 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>