shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-12 11:10:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

server: Fixed types and checks of fd's.

Browse Source
This commit is contained in:
Andreas Schneider
2010-06-17 13:29:14 +02:00
parent 15e4e7e9da
commit 6127da58f2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libssh/server.c
View File

@@ -129,7 +129,7 @@ ssh_bind ssh_bind_new(void) {
return NULL; return NULL;
} }
ZERO_STRUCTP(ptr); ZERO_STRUCTP(ptr);
ptr->bindfd = -1; ptr->bindfd = SSH_INVALID_SOCKET;
ptr->bindport= 22; ptr->bindport= 22;
ptr->log_verbosity = 0; ptr->log_verbosity = 0;
@@ -138,7 +138,7 @@ ssh_bind ssh_bind_new(void) {
int ssh_bind_listen(ssh_bind sshbind) { int ssh_bind_listen(ssh_bind sshbind) {
const char *host; const char *host;
int fd; socket_t fd;
if (ssh_init() < 0) { if (ssh_init() < 0) {
return -1; return -1;
@@ -185,10 +185,10 @@ void ssh_bind_fd_toaccept(ssh_bind sshbind) {
int ssh_bind_accept(ssh_bind sshbind, ssh_session session) { int ssh_bind_accept(ssh_bind sshbind, ssh_session session) {
ssh_private_key dsa = NULL; ssh_private_key dsa = NULL;
ssh_private_key rsa = NULL; ssh_private_key rsa = NULL;
int fd = -1; socket_t fd = SSH_INVALID_SOCKET;
int i; int i;
if (sshbind->bindfd < 0) { if (sshbind->bindfd == SSH_INVALID_SOCKET) {
ssh_set_error(sshbind, SSH_FATAL, ssh_set_error(sshbind, SSH_FATAL,
"Can't accept new clients on a not bound socket."); "Can't accept new clients on a not bound socket.");
return SSH_ERROR; return SSH_ERROR;
@@ -219,7 +219,7 @@ int ssh_bind_accept(ssh_bind sshbind, ssh_session session) {
} }
fd = accept(sshbind->bindfd, NULL, NULL); fd = accept(sshbind->bindfd, NULL, NULL);
if (fd < 0) { if (fd == SSH_INVALID_SOCKET) {
ssh_set_error(sshbind, SSH_FATAL, ssh_set_error(sshbind, SSH_FATAL,
"Accepting a new connection: %s", "Accepting a new connection: %s",
strerror(errno)); strerror(errno));
@@ -284,7 +284,7 @@ void ssh_bind_free(ssh_bind sshbind){
close(sshbind->bindfd); close(sshbind->bindfd);
#endif #endif
} }
sshbind->bindfd = -1; sshbind->bindfd = SSH_INVALID_SOCKET;
/* options */ /* options */
SAFE_FREE(sshbind->banner); SAFE_FREE(sshbind->banner);