tdb2: tdb1: use same expansion factor logic when expanding for new recovery area.

[ccan] / ccan / net / test / run.c

diff --git a/ccan/net/test/run.c b/ccan/net/test/run.c
index 955550bcf8f88b010aa89dac8479aa5d1143e777..bff1b6a79e47a47ec0ba994f4a83f980a2d91d27 100644 (file)
--- a/ccan/net/test/run.c
+++ b/ccan/net/test/run.c
@@ -69,6 +69,10 @@ static struct addrinfo* double_addr_lookup(char* buf)
                                addr2 = net_client_lookup("localhost6", buf,
                                                          AF_UNSPEC,
                                                          SOCK_STREAM);
+                       if (!addr2)
+                               addr2 = net_client_lookup("::1", buf,
+                                                         AF_UNSPEC,
+                                                         SOCK_STREAM);
                } else if (addr->ai_family == AF_INET6)
                        /* IPv6 only?  This is a guess... */
                        addr2 = net_client_lookup("ip4-localhost", buf,
@@ -106,7 +110,7 @@ int main(void)
        struct addrinfo *addr;
        int fd, status;
        struct sockaddr saddr;
-       socklen_t slen = sizeof(saddr);
+       socklen_t slen;
        char buf[20];
        unsigned int port;
 
@@ -119,6 +123,7 @@ int main(void)
        fd = net_connect(addr);
        ok1(fd >= 0);
 
+       slen = sizeof(saddr);
        ok1(getsockname(fd, &saddr, &slen) == 0);
        diag("family = %d", saddr.sa_family);
        ok1(saddr.sa_family == AF_INET);
@@ -137,6 +142,7 @@ int main(void)
        fd = net_connect(addr);
        ok1(fd >= 0);
 
+       slen = sizeof(saddr);
        ok1(getsockname(fd, &saddr, &slen) == 0);
        ok1(saddr.sa_family == AF_INET6);
        status = read(fd, buf, sizeof(buf));