mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-17 19:03:42 +01:00
Code Issues Projects Releases Wiki Activity

gossipd: Do not report bind failures for IPv4

Browse Source
This commit is contained in:
Christian Decker 2018-01-26 14:20:25 +01:00 committed by Rusty Russell
parent 8bf9f28a79
commit 3d2ef44064
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gossipd/gossip.c
View File

@ -1194,7 +1194,7 @@ out:
return daemon_conn_read_next(conn, &daemon->master); return daemon_conn_read_next(conn, &daemon->master);
} }
static int make_listen_fd(int domain, void *addr, socklen_t len) static int make_listen_fd(int domain, void *addr, socklen_t len, bool reportfail)
{ {
int fd = socket(domain, SOCK_STREAM, 0); int fd = socket(domain, SOCK_STREAM, 0);
if (fd < 0) { if (fd < 0) {
@ -1212,8 +1212,9 @@ static int make_listen_fd(int domain, void *addr, socklen_t len)
strerror(errno)); strerror(errno));
if (bind(fd, addr, len) != 0) { if (bind(fd, addr, len) != 0) {
status_trace("Failed to bind on %u socket: %s", if (reportfail)
domain, strerror(errno)); status_trace("Failed to bind on %u socket: %s",
domain, strerror(errno));
goto fail; goto fail;
} }
} }
@ -1431,7 +1432,7 @@ static void setup_listeners(struct daemon *daemon, u16 portnum)
addr6.sin6_port = htons(portnum); addr6.sin6_port = htons(portnum);
/* IPv6, since on Linux that (usually) binds to IPv4 too. */ /* IPv6, since on Linux that (usually) binds to IPv4 too. */
fd1 = make_listen_fd(AF_INET6, &addr6, sizeof(addr6)); fd1 = make_listen_fd(AF_INET6, &addr6, sizeof(addr6), true);
if (fd1 >= 0) { if (fd1 >= 0) {
struct sockaddr_in6 in6; struct sockaddr_in6 in6;
@ -1451,7 +1452,7 @@ static void setup_listeners(struct daemon *daemon, u16 portnum)
} }
/* Just in case, aim for the same port... */ /* Just in case, aim for the same port... */
fd2 = make_listen_fd(AF_INET, &addr, sizeof(addr)); fd2 = make_listen_fd(AF_INET, &addr, sizeof(addr), false);
if (fd2 >= 0) { if (fd2 >= 0) {
len = sizeof(addr); len = sizeof(addr);
if (getsockname(fd2, (void *)&addr, &len) != 0) { if (getsockname(fd2, (void *)&addr, &len) != 0) {