WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Some cleanup for Windows build.

pull/343/head
John Safranek 2021-10-06 18:08:04 -07:00
parent fde6ce4550
commit a1f90568ab
No known key found for this signature in database
GPG Key ID: 8CE817DE0D3CCB4A
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/echoserver/echoserver.c
View File

@ -87,6 +87,7 @@
#define SOCKET_ECONNABORTED ECONNABORTED
#define SOCKET_EWOULDBLOCK EWOULDBLOCK
#else
#include <WS2tcpip.h>
#define SOCKET_ERRNO WSAGetLastError()
#define SOCKET_ECONNRESET WSAECONNRESET
#define SOCKET_ECONNABORTED WSAECONNABORTED
@ -375,9 +376,10 @@ static int wolfSSH_AGENT_DefaultActions(WS_AgentCbAction action, void* vCtx)
#ifdef WOLFSSH_FWD
static int connect_addr(const char* name, word16 port)
static WS_SOCKET_T connect_addr(const char* name, word16 port)
{
int newSocket = -1, ret;
WS_SOCKET_T newSocket = -1;
int ret;
struct addrinfo hints, *hint, *hint0 = NULL;
char portStr[6];
@ -399,7 +401,8 @@ static int connect_addr(const char* name, word16 port)
if (newSocket < 0)
continue;
if (connect(newSocket, hint->ai_addr, hint->ai_addrlen) < 0) {
if (connect(newSocket, hint->ai_addr,
(WS_SOCKLEN_T)hint->ai_addrlen) < 0) {
WCLOSESOCKET(newSocket);
newSocket = -1;
continue;
@ -421,7 +424,7 @@ static int wolfSSH_FwdDefaultActions(WS_FwdCbAction action, void* vCtx,
int ret = 0;
if (action == WOLFSSH_FWD_LOCAL_SETUP) {
ctx->hostName = strdup(name);
ctx->hostName = WSTRDUP(name, NULL, 0);
ctx->hostPort = port;
ctx->isDirect = 1;
ctx->state = FWD_STATE_DIRECT;
@ -439,7 +442,7 @@ static int wolfSSH_FwdDefaultActions(WS_FwdCbAction action, void* vCtx,
ctx->state = FWD_STATE_INIT;
}
else if (action == WOLFSSH_FWD_REMOTE_SETUP) {
ctx->hostName = strdup(name);
ctx->hostName = WSTRDUP(name, NULL, 0);
ctx->hostPort = port;
ctx->listenFd = socket(AF_INET, SOCK_STREAM, 0);
@ -1061,7 +1064,8 @@ static int ssh_worker(thread_ctx_t* threadCtx)
}
}
if (out != NULL) {
threadCtx->fwdCbCtx.originName = strdup(addr);
threadCtx->fwdCbCtx.originName =
WSTRDUP(addr, NULL, 0);
threadCtx->fwdCbCtx.originPort =
ntohs(originAddr.sin6_port);
}

2
wolfssh/port.h
View File

@ -1247,8 +1247,10 @@ extern "C" {
#if defined(USE_WINDOWS_API)
#define WS_SOCKET_T SOCKET
#define WS_SOCKLEN_T int
#else
#define WS_SOCKET_T int
#define WS_SOCKLEN_T socklen_t
#endif