<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/15958">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">test: add OSMO_SOCKADDR_STR_FMT to sockaddr_str_test.c<br><br>This shows the weird format choice for showing IPv6 addresses' port, fixed in<br>subsequent patch.<br><br>Change-Id: I8e5ebfbbc3a2b88aed820e8f845d9f6ededb29de<br>---<br>M tests/sockaddr_str/sockaddr_str_test.c<br>M tests/sockaddr_str/sockaddr_str_test.ok<br>2 files changed, 24 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/15958/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/sockaddr_str/sockaddr_str_test.c b/tests/sockaddr_str/sockaddr_str_test.c</span><br><span>index 4284387..bf7d738 100644</span><br><span>--- a/tests/sockaddr_str/sockaddr_str_test.c</span><br><span>+++ b/tests/sockaddr_str/sockaddr_str_test.c</span><br><span>@@ -107,6 +107,8 @@</span><br><span> printf("\n\n");</span><br><span> dump_oip(x);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" OSMO_SOCKADDR_STR_FMT: '" OSMO_SOCKADDR_STR_FMT "'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS(x));</span><br><span> printf(" osmo_sockaddr_str_is_set() = %s\n", osmo_sockaddr_str_is_set(x) ? "true" : "false");</span><br><span> printf(" osmo_sockaddr_str_is_nonzero() = %s\n", osmo_sockaddr_str_is_nonzero(x) ? "true" : "false");</span><br><span> </span><br><span>diff --git a/tests/sockaddr_str/sockaddr_str_test.ok b/tests/sockaddr_str/sockaddr_str_test.ok</span><br><span>index 781e9d1..5ebf7be 100644</span><br><span>--- a/tests/sockaddr_str/sockaddr_str_test.ok</span><br><span>+++ b/tests/sockaddr_str/sockaddr_str_test.ok</span><br><span>@@ -1,6 +1,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET, .ip = "1.2.3.4", .port = 5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '1.2.3.4:5'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = true</span><br><span> osmo_sockaddr_str_to_in_addr() rc == 0 in_addr=01020304</span><br><span>@@ -19,6 +20,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET, .ip = "0.0.0.0", .port = 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '0.0.0.0:0'</span><br><span> osmo_sockaddr_str_is_set() = false</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc == 0 in_addr=00000000</span><br><span>@@ -37,6 +39,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET, .ip = "255.255.255.255", .port = 65535 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '255.255.255.255:65535'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = true</span><br><span> osmo_sockaddr_str_to_in_addr() rc == 0 in_addr=ffffffff</span><br><span>@@ -55,6 +58,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET, .ip = "0.0.0.256", .port = 1 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '0.0.0.256:1'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -68,6 +72,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET, .ip = "not an ip address", .port = 1 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: 'not an ip address:1'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -81,6 +86,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET6, .ip = "1:2:3::4", .port = 5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '1:2:3::4:5'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = true</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -97,6 +103,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET6, .ip = "::", .port = 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: ':::0'</span><br><span> osmo_sockaddr_str_is_set() = false</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -113,6 +120,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET6, .ip = "::1", .port = 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '::1:0'</span><br><span> osmo_sockaddr_str_is_set() = false</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -129,6 +137,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET6, .ip = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", .port = 65535 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:65535'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = true</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -145,6 +154,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET6, .ip = "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF", .port = 65535 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: 'FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:65535'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = true</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -164,6 +174,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET6, .ip = "::fffff", .port = 1 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '::fffff:1'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -177,6 +188,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET6, .ip = "not an ip address", .port = 1 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: 'not an ip address:1'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -190,6 +202,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET6, .ip = "1.2.3.4", .port = 5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '1.2.3.4:5'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -204,6 +217,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET, .ip = "1:2:3::4", .port = 5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '1:2:3::4:5'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -218,6 +232,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_UNSPEC, .ip = "1.2.3.4", .port = 5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '1.2.3.4:5'</span><br><span> osmo_sockaddr_str_is_set() = false</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -232,6 +247,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET, .ip = "", .port = 5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: ':5'</span><br><span> osmo_sockaddr_str_is_set() = false</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -245,6 +261,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET6, .ip = "", .port = 5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: ':5'</span><br><span> osmo_sockaddr_str_is_set() = false</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -258,6 +275,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET, .ip = "1.2.3.4", .port = 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '1.2.3.4:0'</span><br><span> osmo_sockaddr_str_is_set() = false</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc == 0 in_addr=01020304</span><br><span>@@ -276,6 +294,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET, .ip = "1.2.3:4:5", .port = 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '1.2.3:4:5:0'</span><br><span> osmo_sockaddr_str_is_set() = false</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -290,6 +309,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET6, .ip = "::1:10.9.8.7", .port = 1 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '::1:10.9.8.7:1'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = true</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span>@@ -309,6 +329,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET, .ip = "0.0.0.0", .port = 5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: '0.0.0.0:5'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc == 0 in_addr=00000000</span><br><span>@@ -327,6 +348,7 @@</span><br><span> </span><br><span> </span><br><span> { .af = AF_INET6, .ip = "::", .port = 5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT: ':::5'</span><br><span> osmo_sockaddr_str_is_set() = true</span><br><span> osmo_sockaddr_str_is_nonzero() = false</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/15958">change 15958</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/libosmocore/+/15958"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8e5ebfbbc3a2b88aed820e8f845d9f6ededb29de </div>
<div style="display:none"> Gerrit-Change-Number: 15958 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>