<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/16030">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_sockaddr_str: API doc: fix 32bit addr mixup of host/network byte order<br><br>Of course both v4 and v6 addresses are kept in network byte order when<br>represented in bytes, but when writing, I somehow must have assumed that<br>inet_pton() returns host byte order. Fix that mixup in the API docs:<br><br>osmo_sockaddr_str_from_32() and osmo_sockaddr_str_to_32() actually use network<br>byte order.<br><br>osmo_sockaddr_str_from_32n() and osmo_sockaddr_str_to_32n() actually use host<br>byte order, though reflecting 'n' in their name.<br><br>sockaddr_str_test: use hexdump instead of %x to show the<br>osmo_sockaddr_str_to_32*() conversions so that the error becomes obvious.<br>(Printing %x reverses the bytes again and made it look correct.)<br><br>Change-Id: I3cf150cc0cc06dd36039fbde091bc71b01697322<br>---<br>M src/sockaddr_str.c<br>M tests/sockaddr_str/sockaddr_str_test.c<br>M tests/sockaddr_str/sockaddr_str_test.ok<br>3 files changed, 58 insertions(+), 54 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sockaddr_str.c b/src/sockaddr_str.c</span><br><span>index 5c548b4..304363d 100644</span><br><span>--- a/src/sockaddr_str.c</span><br><span>+++ b/src/sockaddr_str.c</span><br><span>@@ -255,7 +255,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Convert IPv4 address from 32bit host-byte-order to osmo_sockaddr_str, and set port.</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Convert IPv4 address from 32bit network-byte-order to osmo_sockaddr_str, and set port.</span><br><span> * \param[out] sockaddr_str The instance to copy to.</span><br><span> * \param[in] addr 32bit IPv4 address data.</span><br><span> * \param[in] port Port number.</span><br><span>@@ -270,7 +270,8 @@</span><br><span> return osmo_sockaddr_str_from_in_addr(sockaddr_str, &addr, port);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Convert IPv4 address from 32bit network-byte-order to osmo_sockaddr_str, and set port.</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Convert IPv4 address from 32bit host-byte-order to osmo_sockaddr_str, and set port.</span><br><span style="color: hsl(120, 100%, 40%);">+ * For legacy reasons, this function has a misleading 'n' in its name.</span><br><span> * \param[out] sockaddr_str The instance to copy to.</span><br><span> * \param[in] addr 32bit IPv4 address data.</span><br><span> * \param[in] port Port number.</span><br><span>@@ -376,9 +377,9 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Convert osmo_sockaddr_str address string to IPv4 address data in host-byte-order.</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Convert osmo_sockaddr_str address string to IPv4 address data in network-byte-order.</span><br><span> * \param[in] sockaddr_str The instance to convert the IP of.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[out] dst IPv4 address data in 32bit host-byte-order format to write to.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] dst IPv4 address data in 32bit network-byte-order format to write to.</span><br><span> * \return 0 on success, negative on error (e.g. invalid IPv4 address string).</span><br><span> */</span><br><span> int osmo_sockaddr_str_to_32(const struct osmo_sockaddr_str *sockaddr_str, uint32_t *ip)</span><br><span>@@ -396,9 +397,10 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Convert osmo_sockaddr_str address string to IPv4 address data in network-byte-order.</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Convert osmo_sockaddr_str address string to IPv4 address data in host-byte-order.</span><br><span style="color: hsl(120, 100%, 40%);">+ * For legacy reasons, this function has a misleading 'n' in its name.</span><br><span> * \param[in] sockaddr_str The instance to convert the IP of.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[out] dst IPv4 address data in 32bit network-byte-order format to write to.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] dst IPv4 address data in 32bit host-byte-order format to write to.</span><br><span> * \return 0 on success, negative on error (e.g. invalid IPv4 address string).</span><br><span> */</span><br><span> int osmo_sockaddr_str_to_32n(const struct osmo_sockaddr_str *sockaddr_str, uint32_t *ip)</span><br><span>diff --git a/tests/sockaddr_str/sockaddr_str_test.c b/tests/sockaddr_str/sockaddr_str_test.c</span><br><span>index 7d8fe4f..7e015ce 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>@@ -149,7 +149,8 @@</span><br><span> uint32_t a = 0;</span><br><span> </span><br><span> rc = osmo_sockaddr_str_to_32(x, &a);</span><br><span style="color: hsl(0, 100%, 40%);">- printf(" osmo_sockaddr_str_to_32() %s uint32_t=0x%x\n", rc_name(rc), a);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" osmo_sockaddr_str_to_32() %s uint8_t[4]=[ %s]\n", rc_name(rc),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump((void*)&a, sizeof(a)));</span><br><span> </span><br><span> if (rc == 0) {</span><br><span> struct osmo_sockaddr_str back;</span><br><span>@@ -165,7 +166,8 @@</span><br><span> uint32_t a = 0;</span><br><span> </span><br><span> rc = osmo_sockaddr_str_to_32n(x, &a);</span><br><span style="color: hsl(0, 100%, 40%);">- printf(" osmo_sockaddr_str_to_32n() %s uint32_t=0x%x\n", rc_name(rc), a);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" osmo_sockaddr_str_to_32n() %s uint8_t[4]=[ %s]\n", rc_name(rc),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump((void*)&a, sizeof(a)));</span><br><span> </span><br><span> if (rc == 0) {</span><br><span> struct osmo_sockaddr_str back;</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 31f630f..33d9d7e 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>@@ -7,9 +7,9 @@</span><br><span> osmo_sockaddr_str_to_in_addr() rc == 0 in_addr=01020304</span><br><span> -> osmo_sockaddr_str_from_in_addr() rc == 0 { .af = AF_INET, .ip = "1.2.3.4", .port = 5 }</span><br><span> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc == 0 uint32_t=0x4030201</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc == 0 uint8_t[4]=[ 01 02 03 04 ]</span><br><span> -> osmo_sockaddr_str_from_32() rc == 0 { .af = AF_INET, .ip = "1.2.3.4", .port = 5 }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc == 0 uint32_t=0x1020304</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc == 0 uint8_t[4]=[ 04 03 02 01 ]</span><br><span> -> osmo_sockaddr_str_from_32n() rc == 0 { .af = AF_INET, .ip = "1.2.3.4", .port = 5 }</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc == 0 sockaddr_in=02000005010203040000000000000000</span><br><span> -> osmo_sockaddr_str_from_sockaddr_in() rc == 0 { .af = AF_INET, .ip = "1.2.3.4", .port = 5 }</span><br><span>@@ -26,9 +26,9 @@</span><br><span> osmo_sockaddr_str_to_in_addr() rc == 0 in_addr=00000000</span><br><span> -> osmo_sockaddr_str_from_in_addr() rc == 0 { .af = AF_INET, .ip = "0.0.0.0", .port = 0 }</span><br><span> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc == 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc == 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> -> osmo_sockaddr_str_from_32() rc == 0 { .af = AF_INET, .ip = "0.0.0.0", .port = 0 }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc == 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc == 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> -> osmo_sockaddr_str_from_32n() rc == 0 { .af = AF_INET, .ip = "0.0.0.0", .port = 0 }</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc == 0 sockaddr_in=02000000000000000000000000000000</span><br><span> -> osmo_sockaddr_str_from_sockaddr_in() rc == 0 { .af = AF_INET, .ip = "0.0.0.0", .port = 0 }</span><br><span>@@ -45,9 +45,9 @@</span><br><span> osmo_sockaddr_str_to_in_addr() rc == 0 in_addr=ffffffff</span><br><span> -> osmo_sockaddr_str_from_in_addr() rc == 0 { .af = AF_INET, .ip = "255.255.255.255", .port = 65535 }</span><br><span> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc == 0 uint32_t=0xffffffff</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc == 0 uint8_t[4]=[ ff ff ff ff ]</span><br><span> -> osmo_sockaddr_str_from_32() rc == 0 { .af = AF_INET, .ip = "255.255.255.255", .port = 65535 }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc == 0 uint32_t=0xffffffff</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc == 0 uint8_t[4]=[ ff ff ff ff ]</span><br><span> -> osmo_sockaddr_str_from_32n() rc == 0 { .af = AF_INET, .ip = "255.255.255.255", .port = 65535 }</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc == 0 sockaddr_in=0200ffffffffffff0000000000000000</span><br><span> -> osmo_sockaddr_str_from_sockaddr_in() rc == 0 { .af = AF_INET, .ip = "255.255.255.255", .port = 65535 }</span><br><span>@@ -63,8 +63,8 @@</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> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=02000001000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=00000000000000000000000000000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr() rc < 0 sockaddr_storage=0200000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</span><br><span>@@ -77,8 +77,8 @@</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> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=02000001000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=00000000000000000000000000000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr() rc < 0 sockaddr_storage=0200000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</span><br><span>@@ -92,8 +92,8 @@</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span> osmo_sockaddr_str_to_in6_addr() rc == 0 in6_addr=00010002000300000000000000000004</span><br><span> -> osmo_sockaddr_str_from_in6_addr() rc == 0 { .af = AF_INET6, .ip = "1:2:3::4", .port = 5 }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=00000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc == 0 sockaddr_in6=0a000005000000000001000200030000000000000000000400000000</span><br><span> -> osmo_sockaddr_str_from_sockaddr_in6() rc == 0 { .af = AF_INET6, .ip = "1:2:3::4", .port = 5 }</span><br><span>@@ -109,8 +109,8 @@</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span> osmo_sockaddr_str_to_in6_addr() rc == 0 in6_addr=00000000000000000000000000000000</span><br><span> -> osmo_sockaddr_str_from_in6_addr() rc == 0 { .af = AF_INET6, .ip = "::", .port = 0 }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=00000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc == 0 sockaddr_in6=0a000000000000000000000000000000000000000000000000000000</span><br><span> -> osmo_sockaddr_str_from_sockaddr_in6() rc == 0 { .af = AF_INET6, .ip = "::", .port = 0 }</span><br><span>@@ -126,8 +126,8 @@</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span> osmo_sockaddr_str_to_in6_addr() rc == 0 in6_addr=00000000000000000000000000000001</span><br><span> -> osmo_sockaddr_str_from_in6_addr() rc == 0 { .af = AF_INET6, .ip = "::1", .port = 0 }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=00000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc == 0 sockaddr_in6=0a000000000000000000000000000000000000000000000100000000</span><br><span> -> osmo_sockaddr_str_from_sockaddr_in6() rc == 0 { .af = AF_INET6, .ip = "::1", .port = 0 }</span><br><span>@@ -143,8 +143,8 @@</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span> osmo_sockaddr_str_to_in6_addr() rc == 0 in6_addr=ffffffffffffffffffffffffffffffff</span><br><span> -> osmo_sockaddr_str_from_in6_addr() rc == 0 { .af = AF_INET6, .ip = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", .port = 65535 }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=00000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc == 0 sockaddr_in6=0a00ffff00000000ffffffffffffffffffffffffffffffff00000000</span><br><span> -> osmo_sockaddr_str_from_sockaddr_in6() rc == 0 { .af = AF_INET6, .ip = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", .port = 65535 }</span><br><span>@@ -161,8 +161,8 @@</span><br><span> osmo_sockaddr_str_to_in6_addr() rc == 0 in6_addr=ffffffffffffffffffffffffffffffff</span><br><span> -> osmo_sockaddr_str_from_in6_addr() rc == 0 { .af = AF_INET6, .ip = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", .port = 65535 }</span><br><span> DIFFERS!</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=00000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc == 0 sockaddr_in6=0a00ffff00000000ffffffffffffffffffffffffffffffff00000000</span><br><span> -> osmo_sockaddr_str_from_sockaddr_in6() rc == 0 { .af = AF_INET6, .ip = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", .port = 65535 }</span><br><span>@@ -179,8 +179,8 @@</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> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=00000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=0a000001000000000000000000000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr() rc < 0 sockaddr_storage=0a00000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</span><br><span>@@ -193,8 +193,8 @@</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> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=00000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=0a000001000000000000000000000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr() rc < 0 sockaddr_storage=0a00000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</span><br><span>@@ -207,8 +207,8 @@</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> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=00000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=0a000005000000000000000000000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr() rc < 0 sockaddr_storage=0a00000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</span><br><span>@@ -222,8 +222,8 @@</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> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=02000005000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=00000000000000000000000000000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr() rc < 0 sockaddr_storage=0200000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</span><br><span>@@ -237,8 +237,8 @@</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> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=00000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=00000000000000000000000000000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr() rc < 0 sockaddr_storage=0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</span><br><span>@@ -252,8 +252,8 @@</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> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=02000005000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=00000000000000000000000000000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr() rc < 0 sockaddr_storage=0200000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</span><br><span>@@ -266,8 +266,8 @@</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> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=00000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=0a000005000000000000000000000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr() rc < 0 sockaddr_storage=0a00000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</span><br><span>@@ -281,9 +281,9 @@</span><br><span> osmo_sockaddr_str_to_in_addr() rc == 0 in_addr=01020304</span><br><span> -> osmo_sockaddr_str_from_in_addr() rc == 0 { .af = AF_INET, .ip = "1.2.3.4", .port = 0 }</span><br><span> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc == 0 uint32_t=0x4030201</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc == 0 uint8_t[4]=[ 01 02 03 04 ]</span><br><span> -> osmo_sockaddr_str_from_32() rc == 0 { .af = AF_INET, .ip = "1.2.3.4", .port = 0 }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc == 0 uint32_t=0x1020304</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc == 0 uint8_t[4]=[ 04 03 02 01 ]</span><br><span> -> osmo_sockaddr_str_from_32n() rc == 0 { .af = AF_INET, .ip = "1.2.3.4", .port = 0 }</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc == 0 sockaddr_in=02000000010203040000000000000000</span><br><span> -> osmo_sockaddr_str_from_sockaddr_in() rc == 0 { .af = AF_INET, .ip = "1.2.3.4", .port = 0 }</span><br><span>@@ -299,8 +299,8 @@</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> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=02000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=00000000000000000000000000000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr() rc < 0 sockaddr_storage=0200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</span><br><span>@@ -316,8 +316,8 @@</span><br><span> osmo_sockaddr_str_to_in6_addr() rc == 0 in6_addr=0000000000000000000000010a090807</span><br><span> -> osmo_sockaddr_str_from_in6_addr() rc == 0 { .af = AF_INET6, .ip = "::1:a09:807", .port = 1 }</span><br><span> DIFFERS!</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=00000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc == 0 sockaddr_in6=0a000001000000000000000000000000000000010a09080700000000</span><br><span> -> osmo_sockaddr_str_from_sockaddr_in6() rc == 0 { .af = AF_INET6, .ip = "::1:a09:807", .port = 1 }</span><br><span>@@ -335,9 +335,9 @@</span><br><span> osmo_sockaddr_str_to_in_addr() rc == 0 in_addr=00000000</span><br><span> -> osmo_sockaddr_str_from_in_addr() rc == 0 { .af = AF_INET, .ip = "0.0.0.0", .port = 5 }</span><br><span> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc == 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc == 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> -> osmo_sockaddr_str_from_32() rc == 0 { .af = AF_INET, .ip = "0.0.0.0", .port = 5 }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc == 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc == 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> -> osmo_sockaddr_str_from_32n() rc == 0 { .af = AF_INET, .ip = "0.0.0.0", .port = 5 }</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc == 0 sockaddr_in=02000005000000000000000000000000</span><br><span> -> osmo_sockaddr_str_from_sockaddr_in() rc == 0 { .af = AF_INET, .ip = "0.0.0.0", .port = 5 }</span><br><span>@@ -354,8 +354,8 @@</span><br><span> osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000</span><br><span> osmo_sockaddr_str_to_in6_addr() rc == 0 in6_addr=00000000000000000000000000000000</span><br><span> -> osmo_sockaddr_str_from_in6_addr() rc == 0 { .af = AF_INET6, .ip = "::", .port = 5 }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=00000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc == 0 sockaddr_in6=0a000005000000000000000000000000000000000000000000000000</span><br><span> -> osmo_sockaddr_str_from_sockaddr_in6() rc == 0 { .af = AF_INET6, .ip = "::", .port = 5 }</span><br><span>@@ -372,8 +372,8 @@</span><br><span> osmo_sockaddr_str_to_in6_addr() rc == 0 in6_addr=00000000000000000000000000000000</span><br><span> -> osmo_sockaddr_str_from_in6_addr() rc == 0 { .af = AF_INET6, .ip = "::", .port = 5 }</span><br><span> DIFFERS!</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint32_t=0x0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span> osmo_sockaddr_str_to_sockaddr_in() rc < 0 sockaddr_in=00000000000000000000000000000000</span><br><span> osmo_sockaddr_str_to_sockaddr_in6() rc == 0 sockaddr_in6=0a000005000000000000000000000000000000000000000000000000</span><br><span> -> osmo_sockaddr_str_from_sockaddr_in6() rc == 0 { .af = AF_INET6, .ip = "::", .port = 5 }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/16030">change 16030</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/+/16030"/><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: I3cf150cc0cc06dd36039fbde091bc71b01697322 </div>
<div style="display:none"> Gerrit-Change-Number: 16030 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>