<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/16167">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_sockaddr_str: deprecate osmo_sockaddr_str_*_32n()<br><br>Follow up for patch I3cf150cc0cc06dd36039fbde091bc71b01697322<br><br>osmo_sockaddr_str_{from,to}_32n actually use host byte order. Deprecate these<br>and introduce a more accurately named version ending in h.<br><br>Change-Id: Ic7fc279bf3c741811cfc002538e28e8f8560e338<br>---<br>M TODO-RELEASE<br>M include/osmocom/core/sockaddr_str.h<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>5 files changed, 60 insertions(+), 36 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/16167/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index 692bdc1..be858ae 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -11,3 +11,7 @@</span><br><span> core struct osmo_tdef fields min_val,max_val added, ABI break (arrays of structs used in programs)</span><br><span> gsm API added osmo_gsm48_rfpowercap2powerclass()</span><br><span> gb API added bssgp_bvc_ctx_free()</span><br><span style="color: hsl(120, 100%, 40%);">+core osmo_sockaddr_str_from_32n(),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32n() Deprecate: named 'n' but use host byte order.</span><br><span style="color: hsl(120, 100%, 40%);">+core osmo_sockaddr_str_from_32h(),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() New, use host byte order and are named appropriately.</span><br><span>diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h</span><br><span>index d7a8cdf..e42216a 100644</span><br><span>--- a/include/osmocom/core/sockaddr_str.h</span><br><span>+++ b/include/osmocom/core/sockaddr_str.h</span><br><span>@@ -31,6 +31,7 @@</span><br><span> #include <stdint.h></span><br><span> #include <stdbool.h></span><br><span> #include <arpa/inet.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/defs.h></span><br><span> </span><br><span> struct in_addr;</span><br><span> struct in6_addr;</span><br><span>@@ -77,7 +78,7 @@</span><br><span> int osmo_sockaddr_str_from_in_addr(struct osmo_sockaddr_str *sockaddr_str, const struct in_addr *addr, uint16_t port);</span><br><span> int osmo_sockaddr_str_from_in6_addr(struct osmo_sockaddr_str *sockaddr_str, const struct in6_addr *addr, uint16_t port);</span><br><span> int osmo_sockaddr_str_from_32(struct osmo_sockaddr_str *sockaddr_str, uint32_t ip, uint16_t port);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_sockaddr_str_from_32n(struct osmo_sockaddr_str *sockaddr_str, uint32_t ip, uint16_t port);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sockaddr_str_from_32h(struct osmo_sockaddr_str *sockaddr_str, uint32_t ip, uint16_t port);</span><br><span> int osmo_sockaddr_str_from_sockaddr_in(struct osmo_sockaddr_str *sockaddr_str, const struct sockaddr_in *src);</span><br><span> int osmo_sockaddr_str_from_sockaddr_in6(struct osmo_sockaddr_str *sockaddr_str, const struct sockaddr_in6 *src);</span><br><span> int osmo_sockaddr_str_from_sockaddr(struct osmo_sockaddr_str *sockaddr_str, const struct sockaddr_storage *src);</span><br><span>@@ -85,9 +86,14 @@</span><br><span> int osmo_sockaddr_str_to_in_addr(const struct osmo_sockaddr_str *sockaddr_str, struct in_addr *dst);</span><br><span> int osmo_sockaddr_str_to_in6_addr(const struct osmo_sockaddr_str *sockaddr_str, struct in6_addr *dst);</span><br><span> int osmo_sockaddr_str_to_32(const struct osmo_sockaddr_str *sockaddr_str, uint32_t *ip);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_sockaddr_str_to_32n(const struct osmo_sockaddr_str *sockaddr_str, uint32_t *ip);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sockaddr_str_to_32h(const struct osmo_sockaddr_str *sockaddr_str, uint32_t *ip);</span><br><span> int osmo_sockaddr_str_to_sockaddr_in(const struct osmo_sockaddr_str *sockaddr_str, struct sockaddr_in *dst);</span><br><span> int osmo_sockaddr_str_to_sockaddr_in6(const struct osmo_sockaddr_str *sockaddr_str, struct sockaddr_in6 *dst);</span><br><span> int osmo_sockaddr_str_to_sockaddr(const struct osmo_sockaddr_str *sockaddr_str, struct sockaddr_storage *dst);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sockaddr_str_from_32n(struct osmo_sockaddr_str *sockaddr_str, uint32_t ip, uint16_t port)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_DEPRECATED("osmo_sockaddr_str_from_32n() actually uses *host* byte order. Use osmo_sockaddr_str_from_32h() instead");</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sockaddr_str_to_32n(const struct osmo_sockaddr_str *sockaddr_str, uint32_t *ip)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_DEPRECATED("osmo_sockaddr_str_to_32n() actually uses *host* byte order. Use osmo_sockaddr_str_to_32h() instead");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! @} */</span><br><span>diff --git a/src/sockaddr_str.c b/src/sockaddr_str.c</span><br><span>index 304363d..c38a05c 100644</span><br><span>--- a/src/sockaddr_str.c</span><br><span>+++ b/src/sockaddr_str.c</span><br><span>@@ -277,13 +277,20 @@</span><br><span> * \param[in] port Port number.</span><br><span> * \return 0 on success, negative on error.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_sockaddr_str_from_32n(struct osmo_sockaddr_str *sockaddr_str, uint32_t ip, uint16_t port)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sockaddr_str_from_32h(struct osmo_sockaddr_str *sockaddr_str, uint32_t ip, uint16_t port)</span><br><span> {</span><br><span> if (!sockaddr_str)</span><br><span> return -ENOSPC;</span><br><span> return osmo_sockaddr_str_from_32(sockaddr_str, osmo_ntohl(ip), port);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! DEPRECATED: the name suggests a conversion from network byte order, but actually converts from host byte order. Use</span><br><span style="color: hsl(120, 100%, 40%);">+ * osmo_sockaddr_str_from_32 for network byte order and osmo_sockaddr_str_from_32h for host byte order. */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sockaddr_str_from_32n(struct osmo_sockaddr_str *sockaddr_str, uint32_t ip, uint16_t port)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_sockaddr_str_from_32h(sockaddr_str, ip, port);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Convert IPv4 address and port to osmo_sockaddr_str.</span><br><span> * \param[out] sockaddr_str The instance to copy to.</span><br><span> * \param[in] src IPv4 address and port data.</span><br><span>@@ -403,7 +410,7 @@</span><br><span> * \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 style="color: hsl(0, 100%, 40%);">-int osmo_sockaddr_str_to_32n(const struct osmo_sockaddr_str *sockaddr_str, uint32_t *ip)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sockaddr_str_to_32h(const struct osmo_sockaddr_str *sockaddr_str, uint32_t *ip)</span><br><span> {</span><br><span> int rc;</span><br><span> uint32_t ip_h;</span><br><span>@@ -418,6 +425,13 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! DEPRECATED: the name suggests a conversion to network byte order, but actually converts to host byte order. Use</span><br><span style="color: hsl(120, 100%, 40%);">+ * osmo_sockaddr_str_to_32() for network byte order and osmo_sockaddr_str_to_32h() for host byte order. */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sockaddr_str_to_32n(const struct osmo_sockaddr_str *sockaddr_str, uint32_t *ip)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_sockaddr_str_to_32h(sockaddr_str, ip);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Convert osmo_sockaddr_str address string and port to IPv4 address and port data.</span><br><span> * \param[in] sockaddr_str The instance to convert the IP and port of.</span><br><span> * \param[out] dst IPv4 address and port data to write to.</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 7e015ce..64a6104 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>@@ -165,14 +165,14 @@</span><br><span> {</span><br><span> uint32_t a = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_sockaddr_str_to_32n(x, &a);</span><br><span style="color: hsl(0, 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%);">+ rc = osmo_sockaddr_str_to_32h(x, &a);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" osmo_sockaddr_str_to_32h() %s uint8_t[4]=[ %s]\n", rc_name(rc),</span><br><span> 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 style="color: hsl(0, 100%, 40%);">- rc = osmo_sockaddr_str_from_32n(&back, a, x->port);</span><br><span style="color: hsl(0, 100%, 40%);">- printf(" -> osmo_sockaddr_str_from_32n() %s ", rc_name(rc));</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sockaddr_str_from_32h(&back, a, x->port);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -> osmo_sockaddr_str_from_32h() %s ", rc_name(rc));</span><br><span> dump_oip(&back);</span><br><span> if (memcmp(x, &back, sizeof(back)))</span><br><span> printf(" DIFFERS!\n");</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 33d9d7e..910e919 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>@@ -9,8 +9,8 @@</span><br><span> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span> 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 uint8_t[4]=[ 04 03 02 01 ]</span><br><span style="color: hsl(0, 100%, 40%);">- -> osmo_sockaddr_str_from_32n() rc == 0 { .af = AF_INET, .ip = "1.2.3.4", .port = 5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() rc == 0 uint8_t[4]=[ 04 03 02 01 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ -> osmo_sockaddr_str_from_32h() 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> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=00000000000000000000000000000000000000000000000000000000</span><br><span>@@ -28,8 +28,8 @@</span><br><span> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span> 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 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- -> osmo_sockaddr_str_from_32n() rc == 0 { .af = AF_INET, .ip = "0.0.0.0", .port = 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() rc == 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ -> osmo_sockaddr_str_from_32h() 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> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=00000000000000000000000000000000000000000000000000000000</span><br><span>@@ -47,8 +47,8 @@</span><br><span> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span> 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 uint8_t[4]=[ ff ff ff ff ]</span><br><span style="color: hsl(0, 100%, 40%);">- -> osmo_sockaddr_str_from_32n() rc == 0 { .af = AF_INET, .ip = "255.255.255.255", .port = 65535 }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() rc == 0 uint8_t[4]=[ ff ff ff ff ]</span><br><span style="color: hsl(120, 100%, 40%);">+ -> osmo_sockaddr_str_from_32h() 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> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=00000000000000000000000000000000000000000000000000000000</span><br><span>@@ -64,7 +64,7 @@</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_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -78,7 +78,7 @@</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_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -93,7 +93,7 @@</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> osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -110,7 +110,7 @@</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> osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -127,7 +127,7 @@</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> osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -144,7 +144,7 @@</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> osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -162,7 +162,7 @@</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> osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -180,7 +180,7 @@</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_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -194,7 +194,7 @@</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_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -208,7 +208,7 @@</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_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -223,7 +223,7 @@</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_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -238,7 +238,7 @@</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_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -253,7 +253,7 @@</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_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -267,7 +267,7 @@</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_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -283,8 +283,8 @@</span><br><span> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span> 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 uint8_t[4]=[ 04 03 02 01 ]</span><br><span style="color: hsl(0, 100%, 40%);">- -> osmo_sockaddr_str_from_32n() rc == 0 { .af = AF_INET, .ip = "1.2.3.4", .port = 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() rc == 0 uint8_t[4]=[ 04 03 02 01 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ -> osmo_sockaddr_str_from_32h() 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> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=00000000000000000000000000000000000000000000000000000000</span><br><span>@@ -300,7 +300,7 @@</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_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -317,7 +317,7 @@</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> osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -337,8 +337,8 @@</span><br><span> osmo_sockaddr_str_to_in6_addr() rc < 0 in6_addr=00000000000000000000000000000000</span><br><span> 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 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- -> osmo_sockaddr_str_from_32n() rc == 0 { .af = AF_INET, .ip = "0.0.0.0", .port = 5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() rc == 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ -> osmo_sockaddr_str_from_32h() 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> osmo_sockaddr_str_to_sockaddr_in6() rc < 0 sockaddr_in6=00000000000000000000000000000000000000000000000000000000</span><br><span>@@ -355,7 +355,7 @@</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> osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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>@@ -373,7 +373,7 @@</span><br><span> -> osmo_sockaddr_str_from_in6_addr() rc == 0 { .af = AF_INET6, .ip = "::", .port = 5 }</span><br><span> DIFFERS!</span><br><span> osmo_sockaddr_str_to_32() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_to_32n() rc < 0 uint8_t[4]=[ 00 00 00 00 ]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_32h() 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/+/16167">change 16167</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/+/16167"/><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: Ic7fc279bf3c741811cfc002538e28e8f8560e338 </div>
<div style="display:none"> Gerrit-Change-Number: 16167 </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>