commit d0e8d6b9b566e9f0be64de0021b7c489e601a2fa
author Neels Hofmeyr <neels@hofmeyr.de> Thu Oct 24 04:08:16 2019 +0200
committer Neels Hofmeyr <neels@hofmeyr.de> Mon Nov 11 20:14:01 2019 +0100
tree 72b18b9605c0777d9f6bad9b8e143cfba67d4879
parent 83d691048b8d181da610ddd45e9a7091310bcd28

fix OSMO_SOCKADDR_STR_FMT for IPv6

The format prints IP:port separated by a colon, which of course is confusing
when the IPv6 address itself contains mostly colons. The new format adds square
braces.

  cafe:face::1:42 -> [cafe:face::1]:42

The IPv4 format remains unchanged:
  1.2.3.4:42

Change-Id: I161f8427729ae31be0eac719b7a4a9290715e37f

tests/sockaddr_str/sockaddr_str_test.ok

diff --git a/tests/sockaddr_str/sockaddr_str_test.ok b/tests/sockaddr_str/sockaddr_str_test.ok
index 5ebf7be..bc18225 100644
--- a/tests/sockaddr_str/sockaddr_str_test.ok
+++ b/tests/sockaddr_str/sockaddr_str_test.ok
@@ -86,7 +86,7 @@
 
 
 { .af = AF_INET6, .ip = "1:2:3::4", .port = 5 }
-  OSMO_SOCKADDR_STR_FMT: '1:2:3::4:5'
+  OSMO_SOCKADDR_STR_FMT: '[1:2:3::4]:5'
   osmo_sockaddr_str_is_set() = true
   osmo_sockaddr_str_is_nonzero() = true
   osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000
@@ -103,7 +103,7 @@
 
 
 { .af = AF_INET6, .ip = "::", .port = 0 }
-  OSMO_SOCKADDR_STR_FMT: ':::0'
+  OSMO_SOCKADDR_STR_FMT: '[::]:0'
   osmo_sockaddr_str_is_set() = false
   osmo_sockaddr_str_is_nonzero() = false
   osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000
@@ -120,7 +120,7 @@
 
 
 { .af = AF_INET6, .ip = "::1", .port = 0 }
-  OSMO_SOCKADDR_STR_FMT: '::1:0'
+  OSMO_SOCKADDR_STR_FMT: '[::1]:0'
   osmo_sockaddr_str_is_set() = false
   osmo_sockaddr_str_is_nonzero() = false
   osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000
@@ -137,7 +137,7 @@
 
 
 { .af = AF_INET6, .ip = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", .port = 65535 }
-  OSMO_SOCKADDR_STR_FMT: 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:65535'
+  OSMO_SOCKADDR_STR_FMT: '[ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:65535'
   osmo_sockaddr_str_is_set() = true
   osmo_sockaddr_str_is_nonzero() = true
   osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000
@@ -154,7 +154,7 @@
 
 
 { .af = AF_INET6, .ip = "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF", .port = 65535 }
-  OSMO_SOCKADDR_STR_FMT: 'FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:65535'
+  OSMO_SOCKADDR_STR_FMT: '[FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF]:65535'
   osmo_sockaddr_str_is_set() = true
   osmo_sockaddr_str_is_nonzero() = true
   osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000
@@ -174,7 +174,7 @@
 
 
 { .af = AF_INET6, .ip = "::fffff", .port = 1 }
-  OSMO_SOCKADDR_STR_FMT: '::fffff:1'
+  OSMO_SOCKADDR_STR_FMT: '[::fffff]:1'
   osmo_sockaddr_str_is_set() = true
   osmo_sockaddr_str_is_nonzero() = false
   osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000
@@ -188,7 +188,7 @@
 
 
 { .af = AF_INET6, .ip = "not an ip address", .port = 1 }
-  OSMO_SOCKADDR_STR_FMT: 'not an ip address:1'
+  OSMO_SOCKADDR_STR_FMT: '[not an ip address]:1'
   osmo_sockaddr_str_is_set() = true
   osmo_sockaddr_str_is_nonzero() = false
   osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000
@@ -202,7 +202,7 @@
 
 
 { .af = AF_INET6, .ip = "1.2.3.4", .port = 5 }
-  OSMO_SOCKADDR_STR_FMT: '1.2.3.4:5'
+  OSMO_SOCKADDR_STR_FMT: '[1.2.3.4]:5'
   osmo_sockaddr_str_is_set() = true
   osmo_sockaddr_str_is_nonzero() = false
   osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000
@@ -261,7 +261,7 @@
 
 
 { .af = AF_INET6, .ip = "", .port = 5 }
-  OSMO_SOCKADDR_STR_FMT: ':5'
+  OSMO_SOCKADDR_STR_FMT: '[]:5'
   osmo_sockaddr_str_is_set() = false
   osmo_sockaddr_str_is_nonzero() = false
   osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000
@@ -309,7 +309,7 @@
 
 
 { .af = AF_INET6, .ip = "::1:10.9.8.7", .port = 1 }
-  OSMO_SOCKADDR_STR_FMT: '::1:10.9.8.7:1'
+  OSMO_SOCKADDR_STR_FMT: '[::1:10.9.8.7]:1'
   osmo_sockaddr_str_is_set() = true
   osmo_sockaddr_str_is_nonzero() = true
   osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000
@@ -348,7 +348,7 @@
 
 
 { .af = AF_INET6, .ip = "::", .port = 5 }
-  OSMO_SOCKADDR_STR_FMT: ':::5'
+  OSMO_SOCKADDR_STR_FMT: '[::]:5'
   osmo_sockaddr_str_is_set() = true
   osmo_sockaddr_str_is_nonzero() = false
   osmo_sockaddr_str_to_in_addr() rc < 0 in_addr=00000000