From 76143e7eb44a029a634d922d3893dd894391b22a Mon Sep 17 00:00:00 2001 From: jim Date: Thu, 17 Nov 2011 20:01:38 +0000 Subject: [PATCH] Revert previous commit git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@10233 ddd99763-3ecb-0310-9145-efcb8ce7c51f --- nerdjack.c | 1 + ue9.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/nerdjack.c b/nerdjack.c index 4bc2b6b..295bcd0 100644 --- a/nerdjack.c +++ b/nerdjack.c @@ -97,6 +97,7 @@ static int discovered_sock_create(struct discover_t *ds, uint32_t local_ip, /* Set nonblocking */ if (soblock(sock, 0) < 0) { verb("can't set nonblocking\n"); + close(sock); return 0; } diff --git a/ue9.c b/ue9.c index d19765f..9f8f2d3 100644 --- a/ue9.c +++ b/ue9.c @@ -402,6 +402,7 @@ int ue9_open(const char *host, int port) /* Set nonblocking */ if (soblock(fd, 0) < 0) { verb("can't set nonblocking\n"); + close(fd); return -1; } @@ -417,6 +418,7 @@ int ue9_open(const char *host, int port) he = gethostbyname(host); if (he == NULL) { verb("gethostbyname(\"%s\") failed\n", host); + close(fd); return -1; } 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) { verb("connection to %s:%d failed: %s\n", inet_ntoa(address.sin_addr), port, compat_strerror(errno)); + close(fd); return -1; }