<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24182">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_client: fix error handling in mgcp message generation<br><br>The functions add_lco and add_sdp assert when the codec string can not<br>be generated. This is the case when an unexpected codec is addressed in<br>the input parameter mgcp_msg for mgcp_msg_gen(). Even though the API<br>user is expected only to use the codec identifiers in mgcp_client.h the<br>check should not be done with an assert. Instead mgcp_msg_gen() should<br>just return NULL imediately.<br><br>Also all generation functions should not use magic numbers as return<br>codes. Instead constants from errno.h should be used. It is also<br>problematic that the return codes from msgb_printf are added up.<br>Depending. It makes more sense to use an OR operator since msgb_printf<br>only returns 0 or -EINVAL, so the end result will be -EINVAL if one or<br>more msgb_printf fail and not just a random negative value.<br><br>Change-Id: Ibb788343e0bec9c0eaf33e6e4727d4d36c100017<br>Related: OS#5119<br>---<br>M src/libosmo-mgcp-client/mgcp_client.c<br>M tests/mgcp_client/mgcp_client_test.err<br>2 files changed, 67 insertions(+), 48 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>index 55ce7b2..8e6780e 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>@@ -1105,30 +1105,40 @@</span><br><span> const char *codec;</span><br><span> unsigned int pt;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "L:");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "L:");</span><br><span> </span><br><span> if (mgcp_msg->ptime)</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, " p:%u,", mgcp_msg->ptime);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, " p:%u,", mgcp_msg->ptime);</span><br><span> </span><br><span> if (mgcp_msg->codecs_len) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, " a:");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, " a:");</span><br><span> for (i = 0; i < mgcp_msg->codecs_len; i++) {</span><br><span> pt = mgcp_msg->codecs[i];</span><br><span> codec = get_value_string_or_null(osmo_mgcpc_codec_names, pt);</span><br><span> </span><br><span> /* Note: Use codec descriptors from enum mgcp_codecs</span><br><span> * in mgcp_client only! */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(codec);</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "%s", extract_codec_name(codec));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!codec) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</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%);">+ rc |= msgb_printf(msg, "%s", extract_codec_name(codec));</span><br><span> if (i < mgcp_msg->codecs_len - 1)</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, ";");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, ";");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, ",");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, ",");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, " nt:IN\r\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, " nt:IN\r\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "message buffer to small, can not generate MGCP message (LCO)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOBUFS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /* Helper function for mgcp_msg_gen(): Add SDP information to MGCP message */</span><br><span>@@ -1142,64 +1152,64 @@</span><br><span> unsigned int pt;</span><br><span> </span><br><span> /* Add separator to mark the beginning of the SDP block */</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "\r\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "\r\n");</span><br><span> </span><br><span> /* Add SDP protocol version */</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "v=0\r\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "v=0\r\n");</span><br><span> </span><br><span> /* Determine local IP-Address */</span><br><span> if (osmo_sock_local_ip(local_ip, mgcp->actual.remote_addr) < 0) {</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "Could not determine local IP-Address!\n");</span><br><span> msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return -2;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> }</span><br><span> local_ip_family = osmo_ip_str_type(local_ip);</span><br><span> if (local_ip_family == AF_UNSPEC) {</span><br><span> msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return -2;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> }</span><br><span> audio_ip_family = osmo_ip_str_type(mgcp_msg->audio_ip);</span><br><span> if (audio_ip_family == AF_UNSPEC) {</span><br><span> msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return -2;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> }</span><br><span> </span><br><span> /* Add owner/creator (SDP) */</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "o=- %x 23 IN IP%c %s\r\n", mgcp_msg->call_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "o=- %x 23 IN IP%c %s\r\n", mgcp_msg->call_id,</span><br><span> local_ip_family == AF_INET6 ? '6' : '4',</span><br><span> local_ip);</span><br><span> </span><br><span> /* Add session name (none) */</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "s=-\r\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "s=-\r\n");</span><br><span> </span><br><span> /* Add RTP address and port */</span><br><span> if (mgcp_msg->audio_port == 0) {</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "Invalid port number, can not generate MGCP message\n");</span><br><span> msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return -2;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> }</span><br><span> if (strlen(mgcp_msg->audio_ip) <= 0) {</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "Empty ip address, can not generate MGCP message\n");</span><br><span> msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return -2;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "c=IN IP%c %s\r\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "c=IN IP%c %s\r\n",</span><br><span> audio_ip_family == AF_INET6 ? '6' : '4',</span><br><span> mgcp_msg->audio_ip);</span><br><span> </span><br><span> /* Add time description, active time (SDP) */</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "t=0 0\r\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "t=0 0\r\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "m=audio %u RTP/AVP", mgcp_msg->audio_port);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "m=audio %u RTP/AVP", mgcp_msg->audio_port);</span><br><span> for (i = 0; i < mgcp_msg->codecs_len; i++) {</span><br><span> pt = map_codec_to_pt(mgcp_msg->ptmap, mgcp_msg->ptmap_len, mgcp_msg->codecs[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, " %u", pt);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, " %u", pt);</span><br><span> </span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "\r\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "\r\n");</span><br><span> </span><br><span> /* Add optional codec parameters (fmtp) */</span><br><span> if (mgcp_msg->param_present) {</span><br><span>@@ -1209,9 +1219,9 @@</span><br><span> continue;</span><br><span> pt = map_codec_to_pt(mgcp_msg->ptmap, mgcp_msg->ptmap_len, mgcp_msg->codecs[i]);</span><br><span> if (mgcp_msg->param.amr_octet_aligned_present && mgcp_msg->param.amr_octet_aligned)</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "a=fmtp:%u octet-align=1\r\n", pt);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "a=fmtp:%u octet-align=1\r\n", pt);</span><br><span> else if (mgcp_msg->param.amr_octet_aligned_present && !mgcp_msg->param.amr_octet_aligned)</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "a=fmtp:%u octet-align=0\r\n", pt);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "a=fmtp:%u octet-align=0\r\n", pt);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -1226,16 +1236,26 @@</span><br><span> </span><br><span> /* Note: Use codec descriptors from enum mgcp_codecs</span><br><span> * in mgcp_client only! */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(codec);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!codec) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "a=rtpmap:%u %s\r\n", pt, codec);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "a=rtpmap:%u %s\r\n", pt, codec);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> if (mgcp_msg->ptime)</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "a=ptime:%u\r\n", mgcp_msg->ptime);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "a=ptime:%u\r\n", mgcp_msg->ptime);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "message buffer to small, can not generate MGCP message (SDP)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOBUFS;</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%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /*! Generate an MGCP message</span><br><span>@@ -1248,7 +1268,6 @@</span><br><span> uint32_t mandatory_mask;</span><br><span> struct msgb *msg = msgb_alloc_headroom(4096, 128, "MGCP tx");</span><br><span> int rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc_sdp;</span><br><span> bool use_sdp = false;</span><br><span> char buf[32];</span><br><span> </span><br><span>@@ -1259,23 +1278,23 @@</span><br><span> switch (mgcp_msg->verb) {</span><br><span> case MGCP_VERB_CRCX:</span><br><span> mandatory_mask = MGCP_CRCX_MANDATORY;</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "CRCX %u", trans_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "CRCX %u", trans_id);</span><br><span> break;</span><br><span> case MGCP_VERB_MDCX:</span><br><span> mandatory_mask = MGCP_MDCX_MANDATORY;</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "MDCX %u", trans_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "MDCX %u", trans_id);</span><br><span> break;</span><br><span> case MGCP_VERB_DLCX:</span><br><span> mandatory_mask = MGCP_DLCX_MANDATORY;</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "DLCX %u", trans_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "DLCX %u", trans_id);</span><br><span> break;</span><br><span> case MGCP_VERB_AUEP:</span><br><span> mandatory_mask = MGCP_AUEP_MANDATORY;</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "AUEP %u", trans_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "AUEP %u", trans_id);</span><br><span> break;</span><br><span> case MGCP_VERB_RSIP:</span><br><span> mandatory_mask = MGCP_RSIP_MANDATORY;</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "RSIP %u", trans_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "RSIP %u", trans_id);</span><br><span> break;</span><br><span> default:</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span>@@ -1309,15 +1328,15 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, " %s", mgcp_msg->endpoint);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, " %s", mgcp_msg->endpoint);</span><br><span> }</span><br><span> </span><br><span> /* Add protocol version */</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, " MGCP 1.0\r\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, " MGCP 1.0\r\n");</span><br><span> </span><br><span> /* Add call id */</span><br><span> if (mgcp_msg->presence & MGCP_MSG_PRESENCE_CALL_ID)</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "C: %x\r\n", mgcp_msg->call_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "C: %x\r\n", mgcp_msg->call_id);</span><br><span> </span><br><span> /* Add connection id */</span><br><span> if (mgcp_msg->presence & MGCP_MSG_PRESENCE_CONN_ID) {</span><br><span>@@ -1327,7 +1346,7 @@</span><br><span> msgb_free(msg);</span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rc += msgb_printf(msg, "I: %s\r\n", mgcp_msg->conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= msgb_printf(msg, "I: %s\r\n", mgcp_msg->conn_id);</span><br><span> }</span><br><span> </span><br><span> /* Using SDP makes sense when a valid IP/Port combination is specifiec,</span><br><span>@@ -1339,19 +1358,21 @@</span><br><span> /* Add local connection options (LCO) */</span><br><span> if (!use_sdp</span><br><span> && (mgcp_msg->verb == MGCP_VERB_CRCX</span><br><span style="color: hsl(0, 100%, 40%);">- || mgcp_msg->verb == MGCP_VERB_MDCX))</span><br><span style="color: hsl(0, 100%, 40%);">- rc += add_lco(msg, mgcp_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ || mgcp_msg->verb == MGCP_VERB_MDCX)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (add_lco(msg, mgcp_msg) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Add mode */</span><br><span> if (mgcp_msg->presence & MGCP_MSG_PRESENCE_CONN_MODE)</span><br><span style="color: hsl(0, 100%, 40%);">- rc +=</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |=</span><br><span> msgb_printf(msg, "M: %s\r\n",</span><br><span> mgcp_client_cmode_name(mgcp_msg->conn_mode));</span><br><span> </span><br><span> /* Add X-Osmo-IGN */</span><br><span> if ((mgcp_msg->presence & MGCP_MSG_PRESENCE_X_OSMO_IGN)</span><br><span> && (mgcp_msg->x_osmo_ign != 0))</span><br><span style="color: hsl(0, 100%, 40%);">- rc +=</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |=</span><br><span> msgb_printf(msg, MGCP_X_OSMO_IGN_HEADER "%s\r\n",</span><br><span> mgcp_msg->x_osmo_ign & MGCP_X_OSMO_IGN_CALLID ? " C": "");</span><br><span> </span><br><span>@@ -1365,7 +1386,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> snprintf(buf, sizeof(buf), " %d", mgcp_msg->x_osmo_osmux_cid);</span><br><span style="color: hsl(0, 100%, 40%);">- rc +=</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |=</span><br><span> msgb_printf(msg, MGCP_X_OSMO_OSMUX_HEADER "%s\r\n",</span><br><span> mgcp_msg->x_osmo_osmux_cid == -1 ? " *": buf);</span><br><span> }</span><br><span>@@ -1375,10 +1396,8 @@</span><br><span> if (use_sdp</span><br><span> && (mgcp_msg->verb == MGCP_VERB_CRCX</span><br><span> || mgcp_msg->verb == MGCP_VERB_MDCX)) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc_sdp = add_sdp(msg, mgcp_msg, mgcp);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc_sdp == -2)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (add_sdp(msg, mgcp_msg, mgcp) < 0)</span><br><span> return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- rc += rc_sdp;</span><br><span> }</span><br><span> </span><br><span> if (rc != 0) {</span><br><span>diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err</span><br><span>index ac13f03..80119cb 100644</span><br><span>--- a/tests/mgcp_client/mgcp_client_test.err</span><br><span>+++ b/tests/mgcp_client/mgcp_client_test.err</span><br><span>@@ -1,5 +1,5 @@</span><br><span> DLMGCP MGCP client: using endpoint domain '@mgw'</span><br><span style="color: hsl(0, 100%, 40%);">-DLMGCP message buffer to small, can not generate MGCP message</span><br><span style="color: hsl(120, 100%, 40%);">+DLMGCP message buffer to small, can not generate MGCP message (SDP)</span><br><span> </span><br><span> test_mgcp_client_cancel():</span><br><span> DLMGCP MGCP client: using endpoint domain '@mgw'</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24182">change 24182</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-mgw/+/24182"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ibb788343e0bec9c0eaf33e6e4727d4d36c100017 </div>
<div style="display:none"> Gerrit-Change-Number: 24182 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>