Revert previous commit

git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@10233 ddd99763-3ecb-0310-9145-efcb8ce7c51f

nerdjack.c

@@ -97,6 +97,7 @@ static int discovered_sock_create(struct discover_t *ds, uint32_t local_ip,
 	/* Set nonblocking */
 	/* Set nonblocking */
 	if (soblock(sock, 0) < 0) {
 	if (soblock(sock, 0) < 0) {
 		verb("can't set nonblocking\n");
 		verb("can't set nonblocking\n");
+		close(sock);
 		return 0;
 		return 0;
 	}
 	}
 
 

ue9.c

@@ -402,6 +402,7 @@ int ue9_open(const char *host, int port)
 	/* Set nonblocking */
 	/* Set nonblocking */
 	if (soblock(fd, 0) < 0) {
 	if (soblock(fd, 0) < 0) {
 		verb("can't set nonblocking\n");
 		verb("can't set nonblocking\n");
+		close(fd);
 		return -1;
 		return -1;
 	}
 	}
 
 
@@ -417,6 +418,7 @@ int ue9_open(const char *host, int port)
 	he = gethostbyname(host);
 	he = gethostbyname(host);
 	if (he == NULL) {
 	if (he == NULL) {
 		verb("gethostbyname(\"%s\") failed\n", host);
 		verb("gethostbyname(\"%s\") failed\n", host);
+		close(fd);
 		return -1;
 		return -1;
 	}
 	}
 	address.sin_addr = *((struct in_addr *)he->h_addr);
 	address.sin_addr = *((struct in_addr *)he->h_addr);
@@ -429,6 +431,7 @@ int ue9_open(const char *host, int port)
 			    .tv_sec = TIMEOUT}) < 0) {
 			    .tv_sec = TIMEOUT}) < 0) {
 		verb("connection to %s:%d failed: %s\n",
 		verb("connection to %s:%d failed: %s\n",
 		     inet_ntoa(address.sin_addr), port, compat_strerror(errno));
 		     inet_ntoa(address.sin_addr), port, compat_strerror(errno));
+		close(fd);
 		return -1;
 		return -1;
 	}
 	}