diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2008-05-22 12:42:09 +0000 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2008-05-22 12:42:09 +0000 |
| commit | 58f28617b8c6ca02889f8d116c9a7cd31f7a22a1 (patch) | |
| tree | 8b82c6ee1187c740083b5a4bb378526842110df8 /libssh | |
| parent | 8b9841dd5714879b27ecb4532dfbbfe08e3b718d (diff) | |
| download | libssh-58f28617b8c6ca02889f8d116c9a7cd31f7a22a1.tar.gz libssh-58f28617b8c6ca02889f8d116c9a7cd31f7a22a1.tar.xz libssh-58f28617b8c6ca02889f8d116c9a7cd31f7a22a1.zip | |
some changes so it compiles better under windows
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@159 7dcaeef0-15fb-0310-b436-a5af3365683c
Diffstat (limited to 'libssh')
| -rw-r--r-- | libssh/connect.c | 10 | ||||
| -rw-r--r-- | libssh/dh.c | 2 | ||||
| -rw-r--r-- | libssh/server.c | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/libssh/connect.c b/libssh/connect.c index 6470b5a..9f865bb 100644 --- a/libssh/connect.c +++ b/libssh/connect.c @@ -29,6 +29,7 @@ MA 02111-1307, USA. */ #define _WIN32_WINNT 0x0501 //getaddrinfo, freeaddrinfo, getnameinfo #include <winsock2.h> #include <ws2tcpip.h> +#include "wspiapi.h" #else #include <netdb.h> #include <sys/socket.h> @@ -62,6 +63,13 @@ static void sock_set_blocking(socket_t sock){ u_long nonblocking = 0; ioctlsocket(sock, FIONBIO, &nonblocking); } + +char WSAAPI *gai_strerrorA(int code){ + static char buffer[256]; + snprintf(buffer,256,"Undetermined error code (%d)",code); + return buffer; +} + #endif static int getai(const char *host, int port, struct addrinfo **ai) @@ -111,7 +119,7 @@ int ssh_connect_ai_timeout(SSH_SESSION *session, const char *host, int port, str } ret = 0; /* get connect(2) return code. zero means no error */ - getsockopt(s,SOL_SOCKET,SO_ERROR,&ret,&len); + getsockopt(s,SOL_SOCKET,SO_ERROR,(char *)&ret,&len); if (ret!=0){ ssh_set_error(session,SSH_FATAL,"Connecting : %s",strerror(ret)); close(s); diff --git a/libssh/dh.c b/libssh/dh.c index b8d6824..be66088 100644 --- a/libssh/dh.c +++ b/libssh/dh.c @@ -288,6 +288,8 @@ void dh_build_k(SSH_SESSION *session){ } #endif #ifdef DEBUG_CRYPTO + ssh_print_hexa("session server cookie",session->server_kex.cookie,16); + ssh_print_hexa("session client cookie",session->client_kex.cookie,16); ssh_print_bignum("shared secret key",session->next_crypto->k); #endif #ifdef HAVE_LIBCRYPTO diff --git a/libssh/server.c b/libssh/server.c index cbc6eea..ee9f6d4 100644 --- a/libssh/server.c +++ b/libssh/server.c @@ -68,7 +68,7 @@ static socket_t bind_socket(SSH_BIND *ssh_bind,char *hostname, int port) { memcpy(&myaddr.sin_addr,hp->h_addr,hp->h_length); myaddr.sin_family=hp->h_addrtype; myaddr.sin_port = htons(port); - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); + 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, strerror(errno)); |