<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9652">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sccp_demo_user: use point code 23 for server and 1 for client<br><br>Fix previous commit 4dc9088cabedc40cb9072814237ad5926b12bd35 which<br>broke this by using -1 for local and 23 for remote PC, for both<br>server and client.<br><br>Change-Id: I7432e6fc2617e0fd77a098fcd7d14abc40db7229<br>Related: OS#2666<br>---<br>M examples/sccp_demo_user.c<br>1 file changed, 48 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c</span><br><span>index f0b1a3e..9a9d6eb 100644</span><br><span>--- a/examples/sccp_demo_user.c</span><br><span>+++ b/examples/sccp_demo_user.c</span><br><span>@@ -82,12 +82,17 @@</span><br><span> .version = 0,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define DEFAULT_LOCAL_PC -1</span><br><span style="color: hsl(0, 100%, 40%);">-#define DEFAULT_LOCAL_ADDRESS "127.0.0.2"</span><br><span style="color: hsl(0, 100%, 40%);">-#define DEFAULT_LOCAL_PORT M3UA_PORT</span><br><span style="color: hsl(0, 100%, 40%);">-#define DEFAULT_REMOTE_PC 23</span><br><span style="color: hsl(0, 100%, 40%);">-#define DEFAULT_REMOTE_ADDRESS "127.0.0.1"</span><br><span style="color: hsl(0, 100%, 40%);">-#define DEFAULT_REMOTE_PORT M3UA_PORT</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_LOCAL_ADDRESS_SERVER "127.0.0.1"</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_LOCAL_ADDRESS_CLIENT "127.0.0.2"</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_REMOTE_ADDRESS_CLIENT DEFAULT_LOCAL_ADDRESS_SERVER</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_REMOTE_ADDRESS_SERVER DEFAULT_LOCAL_ADDRESS_CLIENT</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_LOCAL_PORT_SERVER M3UA_PORT</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_LOCAL_PORT_CLIENT M3UA_PORT</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_REMOTE_PORT_CLIENT DEFAULT_LOCAL_PORT_SERVER</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_REMOTE_PORT_SERVER DEFAULT_LOCAL_PORT_CLIENT</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_REMOTE_PORT_SERVER_STR DEFAULT_LOCAL_PORT_CLIENT_STR</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_PC_SERVER 1</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_PC_CLIENT 23</span><br><span> </span><br><span> static void usage(void) {</span><br><span> fprintf(stderr, "sccp_demo_user [-c] [-l LOCAL_ADDRESS[:LOCAL_PORT]]\n"</span><br><span>@@ -95,13 +100,18 @@</span><br><span> " [-L LOCAL_POINT_CODE] [-R REMOTE_POINT_CODE]\n"</span><br><span> "Options:\n"</span><br><span> " -c: Run in client mode (default is server mode)\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -l: local IP address and SCTP port (default is %s:%d)\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -r: remote IP address and SCTP port (default is %s:%d)\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -L: local point code (default is %d)\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -R: remote point code (default is %d)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- DEFAULT_LOCAL_ADDRESS, DEFAULT_LOCAL_PORT,</span><br><span style="color: hsl(0, 100%, 40%);">- DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT,</span><br><span style="color: hsl(0, 100%, 40%);">- DEFAULT_LOCAL_PC, DEFAULT_REMOTE_PC);</span><br><span style="color: hsl(120, 100%, 40%);">+ " -l: local IP address and SCTP port (default is %s:%d in server mode,\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " %s:%d in client mode)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -r: remote IP address and SCTP port (default is %s:%d in server mode,\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " %s:%d in client mode)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -L: local point code (default is %d in server mode, %d in client mode)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -R: remote point code (default is %d in server mode, %d in client mode)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEFAULT_LOCAL_ADDRESS_SERVER, DEFAULT_LOCAL_PORT_SERVER,</span><br><span style="color: hsl(120, 100%, 40%);">+ DEFAULT_LOCAL_ADDRESS_CLIENT, DEFAULT_LOCAL_PORT_CLIENT,</span><br><span style="color: hsl(120, 100%, 40%);">+ DEFAULT_REMOTE_ADDRESS_SERVER, DEFAULT_REMOTE_PORT_SERVER,</span><br><span style="color: hsl(120, 100%, 40%);">+ DEFAULT_REMOTE_ADDRESS_CLIENT, DEFAULT_REMOTE_PORT_CLIENT,</span><br><span style="color: hsl(120, 100%, 40%);">+ DEFAULT_PC_SERVER, DEFAULT_PC_CLIENT,</span><br><span style="color: hsl(120, 100%, 40%);">+ DEFAULT_PC_CLIENT, DEFAULT_PC_SERVER);</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span>@@ -151,25 +161,42 @@</span><br><span> {</span><br><span> bool client = false;</span><br><span> int rc, ch;</span><br><span style="color: hsl(0, 100%, 40%);">- char *local_address = DEFAULT_LOCAL_ADDRESS;</span><br><span style="color: hsl(0, 100%, 40%);">- int local_port = DEFAULT_LOCAL_PORT;</span><br><span style="color: hsl(0, 100%, 40%);">- int local_pc = DEFAULT_LOCAL_PC;</span><br><span style="color: hsl(0, 100%, 40%);">- char *remote_address = DEFAULT_REMOTE_ADDRESS;</span><br><span style="color: hsl(0, 100%, 40%);">- int remote_port = DEFAULT_LOCAL_PORT;</span><br><span style="color: hsl(0, 100%, 40%);">- int remote_pc = DEFAULT_REMOTE_PC;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *local_address = DEFAULT_LOCAL_ADDRESS_SERVER;</span><br><span style="color: hsl(120, 100%, 40%);">+ int local_port = DEFAULT_LOCAL_PORT_SERVER;</span><br><span style="color: hsl(120, 100%, 40%);">+ int local_pc = DEFAULT_PC_SERVER;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *remote_address = DEFAULT_REMOTE_ADDRESS_SERVER;</span><br><span style="color: hsl(120, 100%, 40%);">+ int remote_port = DEFAULT_REMOTE_PORT_SERVER;</span><br><span style="color: hsl(120, 100%, 40%);">+ int remote_pc = DEFAULT_PC_CLIENT;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool lflag = false, rflag = false, Lflag = false, Rflag = false;</span><br><span> </span><br><span> while ((ch = getopt(argc, argv, "cl:r:p:L:R:")) != -1) {</span><br><span> switch (ch) {</span><br><span> case 'c':</span><br><span> client = true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Set client-mode defaults unless already overridden during option parsing. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!lflag) {</span><br><span style="color: hsl(120, 100%, 40%);">+ local_address = DEFAULT_LOCAL_ADDRESS_CLIENT;</span><br><span style="color: hsl(120, 100%, 40%);">+ local_port = DEFAULT_LOCAL_PORT_CLIENT;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!Lflag)</span><br><span style="color: hsl(120, 100%, 40%);">+ local_pc = DEFAULT_PC_CLIENT;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!rflag) {</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_address = DEFAULT_REMOTE_ADDRESS_CLIENT;</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_port = DEFAULT_REMOTE_PORT_CLIENT;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!Rflag)</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_pc = DEFAULT_PC_SERVER;</span><br><span> break;</span><br><span> case 'l':</span><br><span> if (parse_address_port(&local_address, &local_port, optarg))</span><br><span> exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ lflag = true;</span><br><span> break;</span><br><span> case 'r':</span><br><span> if (parse_address_port(&remote_address, &remote_port, optarg))</span><br><span> exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ rflag = true;</span><br><span> break;</span><br><span> case 'L':</span><br><span> if (!is_decimal_string(optarg)) {</span><br><span>@@ -177,6 +204,7 @@</span><br><span> exit(1);</span><br><span> }</span><br><span> local_pc = atoi(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ Lflag = true;</span><br><span> break;</span><br><span> case 'R':</span><br><span> if (!is_decimal_string(optarg)) {</span><br><span>@@ -184,6 +212,7 @@</span><br><span> exit(1);</span><br><span> }</span><br><span> remote_pc = atoi(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ Rflag = true;</span><br><span> break;</span><br><span> default:</span><br><span> usage();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9652">change 9652</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/9652"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7432e6fc2617e0fd77a098fcd7d14abc40db7229 </div>
<div style="display:none"> Gerrit-Change-Number: 9652 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <ssperling@sysmocom.de> </div>