aboutsummaryrefslogtreecommitdiff
path: root/libssh
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cynapses.org>2010-06-17 13:29:14 +0200
committerAndreas Schneider <asn@cynapses.org>2010-06-17 13:29:14 +0200
commit6127da58f2a19fbe1aa6d999ad076155ed39afa6 (patch)
treebf850323458c5373b2d6bd47127f2d87cb438333 /libssh
parent15e4e7e9da3b1aa58765b9c48aff96e0899413b3 (diff)
downloadlibssh-6127da58f2a19fbe1aa6d999ad076155ed39afa6.tar.gz
libssh-6127da58f2a19fbe1aa6d999ad076155ed39afa6.tar.xz
libssh-6127da58f2a19fbe1aa6d999ad076155ed39afa6.zip
server: Fixed types and checks of fd's.
Diffstat (limited to 'libssh')
-rw-r--r--libssh/server.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libssh/server.c b/libssh/server.c
index 3fe19d2..ea5a670 100644
--- a/libssh/server.c
+++ b/libssh/server.c
@@ -129,7 +129,7 @@ ssh_bind ssh_bind_new(void) {
return NULL;
}
ZERO_STRUCTP(ptr);
- ptr->bindfd = -1;
+ ptr->bindfd = SSH_INVALID_SOCKET;
ptr->bindport= 22;
ptr->log_verbosity = 0;
@@ -138,7 +138,7 @@ ssh_bind ssh_bind_new(void) {
int ssh_bind_listen(ssh_bind sshbind) {
const char *host;
- int fd;
+ socket_t fd;
if (ssh_init() < 0) {
return -1;
@@ -185,10 +185,10 @@ void ssh_bind_fd_toaccept(ssh_bind sshbind) {
int ssh_bind_accept(ssh_bind sshbind, ssh_session session) {
ssh_private_key dsa = NULL;
ssh_private_key rsa = NULL;
- int fd = -1;
+ socket_t fd = SSH_INVALID_SOCKET;
int i;
- if (sshbind->bindfd < 0) {
+ if (sshbind->bindfd == SSH_INVALID_SOCKET) {
ssh_set_error(sshbind, SSH_FATAL,
"Can't accept new clients on a not bound socket.");
return SSH_ERROR;
@@ -219,7 +219,7 @@ int ssh_bind_accept(ssh_bind sshbind, ssh_session session) {
}
fd = accept(sshbind->bindfd, NULL, NULL);
- if (fd < 0) {
+ if (fd == SSH_INVALID_SOCKET) {
ssh_set_error(sshbind, SSH_FATAL,
"Accepting a new connection: %s",
strerror(errno));
@@ -284,7 +284,7 @@ void ssh_bind_free(ssh_bind sshbind){
close(sshbind->bindfd);
#endif
}
- sshbind->bindfd = -1;
+ sshbind->bindfd = SSH_INVALID_SOCKET;
/* options */
SAFE_FREE(sshbind->banner);