<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10746">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_client_test: cosmetically re-arrange reply_to() args<br><br>I want to test arbitrary length Conn IDs ('I:'), and hence don't want to pass<br>the conn_id as int, but rather just include it in the message string. Prepare<br>for that by eliminating the extra conn_id arg and just pass a params string.<br><br>Change-Id: Ib2e718dda3aa1f6e9979dee823d973dd002e2318<br>---<br>M tests/mgcp_client/mgcp_client_test.c<br>1 file changed, 6 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/46/10746/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c</span><br><span>index 2662fc1..84ba3b4 100644</span><br><span>--- a/tests/mgcp_client/mgcp_client_test.c</span><br><span>+++ b/tests/mgcp_client/mgcp_client_test.c</span><br><span>@@ -77,14 +77,14 @@</span><br><span> struct mgcp_client *mgcp = NULL;</span><br><span> </span><br><span> static int reply_to(mgcp_trans_id_t trans_id, int code, const char *comment,</span><br><span style="color: hsl(0, 100%, 40%);">-                     int conn_id, const char *params)</span><br><span style="color: hsl(120, 100%, 40%);">+             const char *params)</span><br><span> {</span><br><span>         static char compose[4096 - 128];</span><br><span>     int len;</span><br><span> </span><br><span>         len = snprintf(compose, sizeof(compose),</span><br><span style="color: hsl(0, 100%, 40%);">-                       "%d %u %s\r\nI: %d\n\n%s",</span><br><span style="color: hsl(0, 100%, 40%);">-                    code, trans_id, comment, conn_id, params);</span><br><span style="color: hsl(120, 100%, 40%);">+                    "%d %u %s\r\n%s",</span><br><span style="color: hsl(120, 100%, 40%);">+                   code, trans_id, comment, params);</span><br><span>     OSMO_ASSERT(len < sizeof(compose));</span><br><span>       OSMO_ASSERT(len > 0);</span><br><span> </span><br><span>@@ -148,7 +148,8 @@</span><br><span>   msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK);</span><br><span>       trans_id = dummy_mgcp_send(msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    reply_to(trans_id, 200, "OK", 1,</span><br><span style="color: hsl(120, 100%, 40%);">+    reply_to(trans_id, 200, "OK",</span><br><span style="color: hsl(120, 100%, 40%);">+               "I: 1\n\n"</span><br><span>                 "v=0\r\n"</span><br><span>          "o=- 1 23 IN IP4 10.9.1.120\r\n"</span><br><span>           "s=-\r\n"</span><br><span>@@ -335,7 +336,7 @@</span><br><span>    OSMO_ASSERT(mgcp_client_cancel(mgcp, trans_id) == 0);</span><br><span> </span><br><span>    fprintf(stderr, "- late response gets discarded\n");</span><br><span style="color: hsl(0, 100%, 40%);">-  OSMO_ASSERT(reply_to(trans_id, 200, "OK", 1, "v=0\r\n") == -ENOENT);</span><br><span style="color: hsl(120, 100%, 40%);">+      OSMO_ASSERT(reply_to(trans_id, 200, "OK", "I: 1\n\nv=0\r\n") == -ENOENT);</span><br><span> </span><br><span>    fprintf(stderr, "- canceling again does nothing\n");</span><br><span>       OSMO_ASSERT(mgcp_client_cancel(mgcp, trans_id) == -ENOENT);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10746">change 10746</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/10746"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib2e718dda3aa1f6e9979dee823d973dd002e2318 </div>
<div style="display:none"> Gerrit-Change-Number: 10746 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>