projects
/
ccan
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: fix latent bug in _info example.
[ccan]
/
ccan
/
net
/
_info
diff --git
a/ccan/net/_info
b/ccan/net/_info
index 0b38c440061fd77776091e8813c26e10f14c4937..845458c0eb0e2e4e5b09a161ccf54e1ffdab2bab 100644
(file)
--- a/
ccan/net/_info
+++ b/
ccan/net/_info
@@
-14,6
+14,7
@@
* #include <ccan/net/net.h>
* #include <sys/types.h>
* #include <sys/socket.h>
* #include <ccan/net/net.h>
* #include <sys/types.h>
* #include <sys/socket.h>
+ * #include <netinet/in.h>
* #include <stdio.h>
* #include <err.h>
*
* #include <stdio.h>
* #include <err.h>
*
@@
-22,8
+23,12
@@
* struct addrinfo *addr;
* const char *dest, *port;
* int fd;
* struct addrinfo *addr;
* const char *dest, *port;
* int fd;
- * struct sockaddr saddr;
- * socklen_t slen = sizeof(saddr);
+ * union {
+ * struct sockaddr s;
+ * struct sockaddr_in v4;
+ * struct sockaddr_in6 v6;
+ * } u;
+ * socklen_t slen = sizeof(u);
*
* if (argc == 2) {
* dest = argv[1];
*
* if (argc == 2) {
* dest = argv[1];
@@
-42,10
+47,10
@@
* if (fd < 0)
* err(1, "Failed to connect to %s", dest);
*
* if (fd < 0)
* err(1, "Failed to connect to %s", dest);
*
- * if (getsockname(fd, &
saddr
, &slen) == 0)
+ * if (getsockname(fd, &
u.s
, &slen) == 0)
* printf("Connected via %s\n",
* printf("Connected via %s\n",
- *
saddr
.sa_family == AF_INET6 ? "IPv6"
- * :
saddr
.sa_family == AF_INET ? "IPv4"
+ *
u.s
.sa_family == AF_INET6 ? "IPv6"
+ * :
u.s
.sa_family == AF_INET ? "IPv4"
* : "UNKNOWN??");
* else
* err(1, "Failed to get socket type for connection");
* : "UNKNOWN??");
* else
* err(1, "Failed to get socket type for connection");