tdb2: don't cancel transactions on lock failures in tdb1 backend.

[ccan] / ccan / net / net.c

diff --git a/ccan/net/net.c b/ccan/net/net.c
index 82d6c4e54bd82e2c02415cb6cd7ebcf721f49659..30f6560ea29a6423be34e4e04373857eb6dcf88e 100644 (file)
--- a/ccan/net/net.c
+++ b/ccan/net/net.c
@@ -1,5 +1,5 @@
+/* Licensed under BSD-MIT - see LICENSE file for details */

 #include <ccan/net/net.h>
 #include <ccan/net/net.h>

-#include <ccan/noerr/noerr.h>

 #include <sys/types.h>
 #include <sys/socket.h>
 #include <poll.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <poll.h>


@@ -10,6 +10,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdbool.h>

+#include <netinet/in.h>

 
 struct addrinfo *net_client_lookup(const char *hostname,
                                   const char *service,
 
 struct addrinfo *net_client_lookup(const char *hostname,
                                   const char *service,


@@ -64,7 +65,7 @@ static void remove_fd(struct pollfd pfd[],
 
 int net_connect(const struct addrinfo *addrinfo)
 {
 
 int net_connect(const struct addrinfo *addrinfo)
 {

-       int sockfd = -1;
+       int sockfd = -1, saved_errno;

        unsigned int i, num;
        const struct addrinfo *ipv4 = NULL, *ipv6 = NULL;
        const struct addrinfo *addr[MAX_PROTOS];
        unsigned int i, num;
        const struct addrinfo *ipv4 = NULL, *ipv6 = NULL;
        const struct addrinfo *addr[MAX_PROTOS];


@@ -142,8 +143,10 @@ got_one:
                sockfd = pfd[i].fd;
 
 out:
                sockfd = pfd[i].fd;
 
 out:

+       saved_errno = errno;

        for (i = 0; i < num; i++)
                if (pfd[i].fd != sockfd)
        for (i = 0; i < num; i++)
                if (pfd[i].fd != sockfd)

-                       close_noerr(pfd[i].fd);
+                       close(pfd[i].fd);
+       errno = saved_errno;

        return sockfd;
 }
        return sockfd;
 }