diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-10-13 22:30:27 +0200 |
---|---|---|
committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-10-13 22:30:27 +0200 |
commit | 1fcddebadc178670e49447d4e7f07804add15a46 (patch) | |
tree | f57553200e04b6d892ad0720dd153c73186cc951 | |
parent | 551a0c855b689cb959ff2a6ad2f5fcb1bba407d0 (diff) | |
download | libssh-1fcddebadc178670e49447d4e7f07804add15a46.tar.gz libssh-1fcddebadc178670e49447d4e7f07804add15a46.tar.xz libssh-1fcddebadc178670e49447d4e7f07804add15a46.zip |
server: use app-provided bind socket when available
-rw-r--r-- | src/bind.c | 36 |
1 files changed, 19 insertions, 17 deletions
@@ -208,25 +208,27 @@ int ssh_bind_listen(ssh_bind sshbind) { if (host == NULL) { host = "0.0.0.0"; } + if (sshbind->bindfd != SSH_INVALID_SOCKET){ + fd = bind_socket(sshbind, host, sshbind->bindport); + if (fd == SSH_INVALID_SOCKET) { + ssh_key_free(sshbind->dsa); + ssh_key_free(sshbind->rsa); + return -1; + } + sshbind->bindfd = fd; - fd = bind_socket(sshbind, host, sshbind->bindport); - if (fd == SSH_INVALID_SOCKET) { - ssh_key_free(sshbind->dsa); - ssh_key_free(sshbind->rsa); - return -1; - } - sshbind->bindfd = fd; - - if (listen(fd, 10) < 0) { - ssh_set_error(sshbind, SSH_FATAL, - "Listening to socket %d: %s", - fd, strerror(errno)); - close(fd); - ssh_key_free(sshbind->dsa); - ssh_key_free(sshbind->rsa); - return -1; + if (listen(fd, 10) < 0) { + ssh_set_error(sshbind, SSH_FATAL, + "Listening to socket %d: %s", + fd, strerror(errno)); + close(fd); + ssh_key_free(sshbind->dsa); + ssh_key_free(sshbind->rsa); + return -1; + } + } else { + SSH_LOG(sshbind, SSH_LOG_INFO, "Using app-provided bind socket"); } - return 0; } |