dropbear: dbutil.c comparison

- progress towards client agent forwarding (incomplete and does not compile)

comparison

equal deleted inserted replaced

-:1dbd2473482f
+:ca7e76d981d9
 	TRACE(("leave dropbear_listen: success, %d socks bound", nsock))
 	return nsock;
 }
+/* Connect to a given unix socket. The socket is not non-blocking */
+#ifdef ENABLE_CONNECT_UNIX
+int connect_unix(const char* addr)
+{
+	struct sockaddr_un egdsock;
+	int fd = -1;
+	memset((void*)&egdsock, 0x0, sizeof(egdsock));
+	egdsock.sun_family = AF_UNIX;
+	strlcpy(egdsock.sun_path, addr, sizeof(egdsock.sun_path));
+	fd = socket(PF_UNIX, SOCK_STREAM, 0);
+	return fd;
+}
+#endif
 /* Connect via TCP to a host. Connection will try ipv4 or ipv6, will
 * return immediately if nonblocking is set. On failure, if errstring
 * wasn't null, it will be a newly malloced error message */
 /* TODO: maxfd */
 			err = errno;
 			continue;
 		}
 		if (nonblocking) {
-			if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) {
+			setnonblocking(sock);
-				close(sock);
-				sock = -1;
-				if (errstring != NULL && *errstring == NULL) {
-					*errstring = m_strdup("Failed non-blocking");
-				}
-				TRACE(("Failed non-blocking: %s", strerror(errno)))
-				continue;
-			}
 		}
 		if (connect(sock, res->ai_addr, res->ai_addrlen) < 0) {
 			if (errno == EINPROGRESS && nonblocking) {
 				TRACE(("Connect in progress"))

Mercurial > dropbear