<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19120">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
neels: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_test: do not access endpoint array elements directly<br><br>The test assumes that the endpoint "rtpbridge/X@mgw" is at array<br>position X in many places. This does not necessarly have to match.<br>Accessing the array elements directly was the prefered way when the MGW<br>did use integer numbers and not strings to identify endpoints. Since the<br>endpoint name strings are used to access the endpoints the unit-test<br>should also reflect this.<br><br>Lets replace the integer variable last_endpoint with a string variable<br>and do related verifications based on strings.<br><br>Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2<br>Related: OS#2659<br>---<br>M tests/mgcp/mgcp_test.c<br>1 file changed, 40 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index 0e87c15..9cafcf7 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -592,7 +592,7 @@</span><br><span> return msg;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int last_endpoint = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+static char last_endpoint[MGCP_ENDPOINT_MAXLEN];</span><br><span> </span><br><span> static int mgcp_test_policy_cb(struct mgcp_endpoint *endp,</span><br><span> int state, const char *transaction_id)</span><br><span>@@ -604,10 +604,11 @@</span><br><span> state, endp->name);</span><br><span> </span><br><span> trunk = endp->trunk;</span><br><span style="color: hsl(0, 100%, 40%);">- last_endpoint = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ last_endpoint[0] = '\0';</span><br><span> for (i = 0; i < trunk->vty_number_endpoints; i++) {</span><br><span> if (strcmp(endp->name, trunk->endpoints[i]->name) == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- last_endpoint = i;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(last_endpoint, trunk->endpoints[i]->name,</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(last_endpoint));</span><br><span> }</span><br><span> </span><br><span> return MGCP_POLICY_CONT;</span><br><span>@@ -787,7 +788,7 @@</span><br><span> printf("\n================================================\n");</span><br><span> printf("Testing %s\n", t->name);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- last_endpoint = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ last_endpoint[0] = '\0';</span><br><span> dummy_packets = 0;</span><br><span> </span><br><span> osmo_talloc_replace_string(cfg, &trunk->audio_fmtp_extra,</span><br><span>@@ -822,8 +823,9 @@</span><br><span> if (dummy_packets)</span><br><span> printf("Dummy packets: %d\n", dummy_packets);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (last_endpoint != -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- endp = trunk->endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (last_endpoint[0] != '\0') {</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = mgcp_endp_by_name(NULL, last_endpoint, cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(endp);</span><br><span> </span><br><span> conn = mgcp_conn_get_rtp(endp, "1");</span><br><span> if (conn) {</span><br><span>@@ -878,10 +880,9 @@</span><br><span> </span><br><span> /* Check detected payload type */</span><br><span> if (conn && t->ptype != PTYPE_IGNORE) {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(last_endpoint != -1);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = trunk->endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(last_endpoint[0] != '\0');</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "endpoint 0x%x: "</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "endpoint:%s: "</span><br><span> "payload type %d (expected %d)\n",</span><br><span> last_endpoint,</span><br><span> conn->end.codec->payload_type, t->ptype);</span><br><span>@@ -1402,7 +1403,7 @@</span><br><span> mgcp_trunk_alloc_endpts(trunk2);</span><br><span> </span><br><span> /* Allocate endpoint 1@mgw with two codecs */</span><br><span style="color: hsl(0, 100%, 40%);">- last_endpoint = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ last_endpoint[0] = '\0';</span><br><span> inp = create_msg(CRCX_MULT_1, NULL);</span><br><span> resp = mgcp_handle_message(cfg, inp);</span><br><span> OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id,</span><br><span>@@ -1410,14 +1411,15 @@</span><br><span> msgb_free(inp);</span><br><span> msgb_free(resp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(last_endpoint == 1);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = trunk->endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/1@mgw") == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = mgcp_endp_by_name(NULL, last_endpoint, cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(endp);</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 18);</span><br><span> </span><br><span> /* Allocate 2@mgw with three codecs, last one ignored */</span><br><span style="color: hsl(0, 100%, 40%);">- last_endpoint = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ last_endpoint[0] = '\0';</span><br><span> inp = create_msg(CRCX_MULT_2, NULL);</span><br><span> resp = mgcp_handle_message(cfg, inp);</span><br><span> OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id,</span><br><span>@@ -1425,8 +1427,9 @@</span><br><span> msgb_free(inp);</span><br><span> msgb_free(resp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(last_endpoint == 2);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = trunk->endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/2@mgw") == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = mgcp_endp_by_name(NULL, last_endpoint, cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(endp);</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 18);</span><br><span>@@ -1437,7 +1440,7 @@</span><br><span> * it makes and since we already decided in OS#2658 that a missing</span><br><span> * LCO should pick a sane default codec, it makes sense to expect</span><br><span> * the same behaviour if SDP lacks proper payload type information */</span><br><span style="color: hsl(0, 100%, 40%);">- last_endpoint = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ last_endpoint[0] = '\0';</span><br><span> inp = create_msg(CRCX_MULT_3, NULL);</span><br><span> resp = mgcp_handle_message(cfg, inp);</span><br><span> OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id,</span><br><span>@@ -1445,14 +1448,15 @@</span><br><span> msgb_free(inp);</span><br><span> msgb_free(resp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(last_endpoint == 3);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = trunk->endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/3@mgw") == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = mgcp_endp_by_name(NULL, last_endpoint, cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(endp);</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 0);</span><br><span> </span><br><span> /* Allocate 4@mgw with a single codec */</span><br><span style="color: hsl(0, 100%, 40%);">- last_endpoint = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ last_endpoint[0] = '\0';</span><br><span> inp = create_msg(CRCX_MULT_4, NULL);</span><br><span> resp = mgcp_handle_message(cfg, inp);</span><br><span> OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id,</span><br><span>@@ -1460,14 +1464,15 @@</span><br><span> msgb_free(inp);</span><br><span> msgb_free(resp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(last_endpoint == 4);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = trunk->endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/4@mgw") == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = mgcp_endp_by_name(NULL, last_endpoint, cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(endp);</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 18);</span><br><span> </span><br><span> /* Allocate 5@mgw and let osmo-mgw pick a codec from the list */</span><br><span style="color: hsl(0, 100%, 40%);">- last_endpoint = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ last_endpoint[0] = '\0';</span><br><span> inp = create_msg(CRCX_MULT_GSM_EXACT, NULL);</span><br><span> trunk->no_audio_transcoding = 1;</span><br><span> resp = mgcp_handle_message(cfg, inp);</span><br><span>@@ -1476,19 +1481,21 @@</span><br><span> msgb_free(inp);</span><br><span> msgb_free(resp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(last_endpoint == 5);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = trunk->endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/5@mgw") == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = mgcp_endp_by_name(NULL, last_endpoint, cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(endp);</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 0);</span><br><span> </span><br><span> inp = create_msg(MDCX_NAT_DUMMY, conn_id);</span><br><span style="color: hsl(0, 100%, 40%);">- last_endpoint = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ last_endpoint[0] = '\0';</span><br><span> resp = mgcp_handle_message(cfg, inp);</span><br><span> msgb_free(inp);</span><br><span> msgb_free(resp);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(last_endpoint == 5);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = trunk->endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/5@mgw") == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = mgcp_endp_by_name(NULL, last_endpoint, cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(endp);</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 3);</span><br><span>@@ -1508,7 +1515,7 @@</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(!conn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- last_endpoint = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ last_endpoint[0] = '\0';</span><br><span> inp = create_msg(CRCX_MULT_GSM_EXACT, NULL);</span><br><span> trunk->no_audio_transcoding = 0;</span><br><span> resp = mgcp_handle_message(cfg, inp);</span><br><span>@@ -1517,8 +1524,9 @@</span><br><span> msgb_free(inp);</span><br><span> msgb_free(resp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(last_endpoint == 5);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = trunk->endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/5@mgw") == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = mgcp_endp_by_name(NULL, last_endpoint, cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(endp);</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 0);</span><br><span>@@ -1543,7 +1551,8 @@</span><br><span> trunk->vty_number_endpoints = 64;</span><br><span> mgcp_trunk_alloc_endpts(trunk);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- endp = trunk->endpoints[1];</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = mgcp_endp_by_name(NULL, "rtpbridge/1@mgw", cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(endp);</span><br><span> </span><br><span> _conn = mgcp_conn_alloc(NULL, endp, MGCP_CONN_TYPE_RTP,</span><br><span> "test-connection");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19120">change 19120</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/+/19120"/><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: Ic950c427f23be4a792af94972554637c2b0fbdf2 </div>
<div style="display:none"> Gerrit-Change-Number: 19120 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </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: 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>