"sizeof(sun->sun_path)" is not always the same as "sizeof(addr->u.soc…

…kname)" on all platforms; because of that BUILD_ASSERT was failing on macOS. (on macOS "sizeof(sun->sun_path) == 104" and "sizeof(addr->u.sockname) == 108") [ Linux man page says it can be as small as 92, so let's use the real value. I also cleaned up the incorrect comment order on that struct! --RR ] Signed-off-by: Rusty Russell <[email protected]>
78bash · May 9, 2018 · 855d0b9 · 855d0b9
1 parent c33bbb2
commit 855d0b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/common/wireaddr.c b/common/wireaddr.c
@@ -8,9 +8,7 @@
 #include <common/wireaddr.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#include <sys/socket.h>
 #include <sys/types.h>
-#include <sys/un.h>
 #include <wire/wire.h>
 
 /* Returns false if we didn't parse it, and *cursor == NULL if malformed. */

diff --git a/common/wireaddr.h b/common/wireaddr.h
@@ -5,6 +5,8 @@
 #include <ccan/tal/tal.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 
 struct in6_addr;
 struct in_addr;
@@ -87,12 +89,12 @@ enum wireaddr_internal_type {
 struct wireaddr_internal {
 	enum wireaddr_internal_type itype;
 	union {
-		/* ADDR_INTERNAL_SOCKNAME */
+		/* ADDR_INTERNAL_WIREADDR */
 		struct wireaddr wireaddr;
 		/* ADDR_INTERNAL_ALLPROTO */
 		u16 port;
-		/* ADDR_INTERNAL_WIREADDR */
-		char sockname[108];
+		/* ADDR_INTERNAL_SOCKNAME */
+		char sockname[sizeof(((struct sockaddr_un *)0)->sun_path)];
 	} u;
 };
 bool parse_wireaddr_internal(const char *arg, struct wireaddr_internal *addr, u16 port, bool wildcard_ok, const char **err_msg);