Change in libosmocore[master]: OSMO_SOCKADDR_STR_FMT: indicate weird non-AF_INET/AF_INET6 setting

[neels]

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15960 )


Change subject: OSMO_SOCKADDR_STR_FMT: indicate weird non-AF_INET/AF_INET6 setting
......................................................................

OSMO_SOCKADDR_STR_FMT: indicate weird non-AF_INET/AF_INET6 setting

Change-Id: Ia8dd7fcc96ac5b71bdb4dbde1daea4887fa753b0
---
M include/osmocom/core/sockaddr_str.h
M tests/sockaddr_str/sockaddr_str_test.ok
2 files changed, 3 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/15960/1

diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h
index 6dd428c..aa3da6a 100644
--- a/include/osmocom/core/sockaddr_str.h
+++ b/include/osmocom/core/sockaddr_str.h
@@ -61,8 +61,9 @@
  *     struct osmo_sockaddr_str *my_sockaddr_str = ...;
  *     printf("got " OSMO_SOCKADDR_STR_FMT "\n", OSMO_SOCKADDR_STR_FMT_ARGS(my_sockaddr_str));
  */
-#define OSMO_SOCKADDR_STR_FMT "%s%s%s:%u"
+#define OSMO_SOCKADDR_STR_FMT "%s%s%s%s:%u"
 #define OSMO_SOCKADDR_STR_FMT_ARGS(R) \
+	((R) && ((R)->af == AF_INET || (R)->af == AF_INET6)) ? "" : "(AF_UNSPEC)", \
 	((R) && (R)->af == AF_INET6)? "[" : "", \
 	(R)? (R)->ip : "NULL", \
 	((R) && (R)->af == AF_INET6)? "]" : "", \
diff --git a/tests/sockaddr_str/sockaddr_str_test.ok b/tests/sockaddr_str/sockaddr_str_test.ok
index bc18225..52636f0 100644
--- a/tests/sockaddr_str/sockaddr_str_test.ok
+++ b/tests/sockaddr_str/sockaddr_str_test.ok
@@ -232,7 +232,7 @@
 
 
 { .af = AF_UNSPEC, .ip = "1.2.3.4", .port = 5 }
-  OSMO_SOCKADDR_STR_FMT: '1.2.3.4:5'
+  OSMO_SOCKADDR_STR_FMT: '(AF_UNSPEC)1.2.3.4:5'
   osmo_sockaddr_str_is_set() = false
   osmo_sockaddr_str_is_nonzero() = false
   osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15960
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ia8dd7fcc96ac5b71bdb4dbde1daea4887fa753b0
Gerrit-Change-Number: 15960
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191104/54ffbcb7/attachment.htm>