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

Add more error checks to bind_socket().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@647 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-29 11:45:56 +00:00
parent 29035f952c
commit afeaea318c
1 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
libssh/server.c
View File

@@ -63,34 +63,53 @@ inline char *hstrerror(int h_errno_val) {
#endif /* _WIN32 */ #endif /* _WIN32 */
// TODO: must use getaddrinfo /* TODO FIXME: must use getaddrinfo */
static socket_t bind_socket(SSH_BIND *ssh_bind, const char *hostname, static socket_t bind_socket(SSH_BIND *ssh_bind, const char *hostname,
int port) { int port) {
struct sockaddr_in myaddr; struct sockaddr_in myaddr;
int opt = 1; struct hostent *hp=NULL;
socket_t s = socket(PF_INET, SOCK_STREAM, 0); socket_t s;
struct hostent *hp=NULL; int opt = 1;
#ifdef HAVE_GETHOSTBYNAME
hp=gethostbyname(hostname);
#endif
if(!hp){
ssh_set_error(ssh_bind,SSH_FATAL,"resolving %s: %s",hostname,hstrerror(h_errno));
close(s);
return -1;
}
memset(&myaddr, 0, sizeof(myaddr)); s = socket(PF_INET, SOCK_STREAM, 0);
memcpy(&myaddr.sin_addr,hp->h_addr,hp->h_length); if (s < 0) {
myaddr.sin_family=hp->h_addrtype; ssh_set_error(ssh_bind, SSH_FATAL, "%s", strerror(errno));
myaddr.sin_port = htons(port); return -1;
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, sizeof(opt)); }
if (bind(s, (struct sockaddr *) &myaddr, sizeof(myaddr)) < 0) {
ssh_set_error(ssh_bind,SSH_FATAL,"Binding to %s:%d : %s",hostname,port, #ifdef HAVE_GETHOSTBYNAME
strerror(errno)); hp = gethostbyname(hostname);
close(s); #endif
return -1;
} if (hp == NULL) {
return s; ssh_set_error(ssh_bind, SSH_FATAL,
"Resolving %s: %s", hostname, hstrerror(h_errno));
close(s);
return -1;
}
memset(&myaddr, 0, sizeof(myaddr));
memcpy(&myaddr.sin_addr, hp->h_addr, hp->h_length);
myaddr.sin_family = hp->h_addrtype;
myaddr.sin_port = htons(port);
if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, sizeof(opt)) < 0) {
ssh_set_error(ssh_bind, SSH_FATAL,
"Setting socket options failed: %s", hstrerror(h_errno));
close(s);
return -1;
}
if (bind(s, (struct sockaddr *) &myaddr, sizeof(myaddr)) < 0) {
ssh_set_error(ssh_bind, SSH_FATAL, "Binding to %s:%d: %s",
hostname,
port,
strerror(errno));
close(s);
return -1;
}
return s;
} }
SSH_BIND *ssh_bind_new(void){ SSH_BIND *ssh_bind_new(void){