aboutsummaryrefslogtreecommitdiff
path: root/src/bind.c
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2015-04-10 10:40:48 +0200
committerAndreas Schneider <asn@cryptomilk.org>2015-04-10 13:32:09 +0200
commit3f04367fb8fbcf18e46cb09a766b18f36ffd9602 (patch)
treea885fcb931f0202f304c8ee62cb75575a6a239b6 /src/bind.c
parent6c7e55250927859ad2b7fee06e710402ff564f4c (diff)
downloadlibssh-3f04367fb8fbcf18e46cb09a766b18f36ffd9602.tar.gz
libssh-3f04367fb8fbcf18e46cb09a766b18f36ffd9602.tar.xz
libssh-3f04367fb8fbcf18e46cb09a766b18f36ffd9602.zip
bind: Correctly close sockets and invalidate them.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src/bind.c')
-rw-r--r--src/bind.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/bind.c b/src/bind.c
index be348651..6b0fb238 100644
--- a/src/bind.c
+++ b/src/bind.c
@@ -109,7 +109,7 @@ static socket_t bind_socket(ssh_bind sshbind, const char *hostname,
"Setting socket options failed: %s",
strerror(errno));
freeaddrinfo (ai);
- close(s);
+ CLOSE_SOCKET(s);
return -1;
}
@@ -121,7 +121,7 @@ static socket_t bind_socket(ssh_bind sshbind, const char *hostname,
port,
strerror(errno));
freeaddrinfo (ai);
- close(s);
+ CLOSE_SOCKET(s);
return -1;
}
@@ -259,7 +259,7 @@ int ssh_bind_listen(ssh_bind sshbind) {
ssh_set_error(sshbind, SSH_FATAL,
"Listening to socket %d: %s",
fd, strerror(errno));
- close(fd);
+ CLOSE_SOCKET(fd);
ssh_key_free(sshbind->dsa);
sshbind->dsa = NULL;
ssh_key_free(sshbind->rsa);
@@ -350,11 +350,7 @@ void ssh_bind_free(ssh_bind sshbind){
}
if (sshbind->bindfd >= 0) {
-#ifdef _WIN32
- closesocket(sshbind->bindfd);
-#else
- close(sshbind->bindfd);
-#endif
+ CLOSE_SOCKET(sshbind->bindfd);
}
sshbind->bindfd = SSH_INVALID_SOCKET;
@@ -499,11 +495,7 @@ int ssh_bind_accept(ssh_bind sshbind, ssh_session session) {
rc = ssh_bind_accept_fd(sshbind, session, fd);
if(rc == SSH_ERROR){
-#ifdef _WIN32
- closesocket(fd);
-#else
- close(fd);
-#endif
+ CLOSE_SOCKET(fd);
ssh_socket_free(session->socket);
}
return rc;