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

Update the echoserver to look up addresses used.

pull/343/head
John Safranek 2021-10-05 19:35:13 -07:00
parent 1ad3fc052b
commit d66fb26158
No known key found for this signature in database
GPG Key ID: 8CE817DE0D3CCB4A
2 changed files with 61 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
examples/echoserver/echoserver.c
View File

@ -375,6 +375,45 @@ static int wolfSSH_AGENT_DefaultActions(WS_AgentCbAction action, void* vCtx)
#ifdef WOLFSSH_FWD
static int connect_addr(const char* name, word16 port)
{
int newSocket = -1, ret;
struct addrinfo hints, *hint, *hint0 = NULL;
char portStr[6];
WMEMSET(&hints, 0, sizeof hints);
hints.ai_family = AF_INET;
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_PASSIVE;
snprintf(portStr, sizeof portStr, "%u", port);
ret = getaddrinfo(name, portStr, &hints, &hint0);
if (ret)
return -1;
for (hint = hint0; hint != NULL; hint = hint->ai_next) {
newSocket = socket(hint->ai_family,
hint->ai_socktype, hint->ai_protocol);
if (newSocket < 0)
continue;
if (connect(newSocket, hint->ai_addr, hint->ai_addrlen) < 0) {
WCLOSESOCKET(newSocket);
newSocket = -1;
continue;
}
break;
}
freeaddrinfo(hint0);
return newSocket;
}
static int wolfSSH_FwdDefaultActions(WS_FwdCbAction action, void* vCtx,
const char* name, word32 port)
{
@ -410,14 +449,26 @@ static int wolfSSH_FwdDefaultActions(WS_FwdCbAction action, void* vCtx,
if (ret == 0) {
struct sockaddr_in addr;
socklen_t addrSz = 0;
WMEMSET(&addr, 0, sizeof addr);
addr.sin_family = AF_INET;
addr.sin_port = htons((word16)port);
addr.sin_addr.s_addr = INADDR_ANY;
if (WSTRCMP(name, "") == 0 ||
WSTRCMP(name, "0.0.0.0") == 0 ||
WSTRCMP(name, "localhost") == 0 ||
WSTRCMP(name, "127.0.0.1") == 0) {
addr.sin_addr.s_addr = INADDR_ANY;
addr.sin_family = AF_INET;
addr.sin_port = htons((word16)port);
addrSz = sizeof addr;
}
else {
printf("Not using IPv6 yet.\n");
WEXIT(EXIT_FAILURE);
}
ret = bind(ctx->listenFd,
(const struct sockaddr*)&addr, sizeof addr);
(const struct sockaddr*)&addr, addrSz);
}
if (ret == 0) {
@ -1027,30 +1078,12 @@ static int ssh_worker(thread_ctx_t* threadCtx)
}
}
if (threadCtx->fwdCbCtx.state == FWD_STATE_DIRECT) {
int ret = 0;
fwdFd = connect_addr(threadCtx->fwdCbCtx.hostName,
threadCtx->fwdCbCtx.hostPort);
fwdFd = socket(AF_INET, SOCK_STREAM, 0);
if (fwdFd == -1) {
ret = -1;
if (fwdFd > 0) {
threadCtx->fwdCbCtx.state = FWD_STATE_CONNECTED;
}
if (ret == 0) {
struct sockaddr_in addr;
WMEMSET(&addr, 0, sizeof addr);
addr.sin_family = AF_INET;
addr.sin_addr.s_addr =
inet_addr(threadCtx->fwdCbCtx.hostName);
addr.sin_port = htons(threadCtx->fwdCbCtx.hostPort);
ret = connect(fwdFd,
(const struct sockaddr*)&addr, sizeof addr);
if (ret == 0)
threadCtx->fwdCbCtx.state = FWD_STATE_CONNECTED;
else
WCLOSESOCKET(fwdFd);
}
}
#endif
}

4
wolfssh/port.h
View File

@ -388,6 +388,7 @@ extern "C" {
#define WSTRLEN(s1) strlen((s1))
#define WSTRSTR(s1,s2) strstr((s1),(s2))
#define WSTRCMP(s1,s2) strcmp((s1),(s2))
#define WSTRNCMP(s1,s2,n) strncmp((s1),(s2),(n))
#define WSTRSPN(s1,s2) strspn((s1),(s2))
#define WSTRCSPN(s1,s2) strcspn((s1),(s2))
@ -399,8 +400,7 @@ extern "C" {
#define WSTRNSTR(s1,s2,n) wstrnstr((s1),(s2),(n))
#define WSTRNCAT(s1,s2,n) wstrncat((s1),(s2),(n))
#define WSTRDUP(s,h,t) wstrdup((s),(h),(t))
#define WSTRCHR(s,c) strchr((s),(c))
#define WSTRCHR(s,c) strchr((s),(c))
#ifdef USE_WINDOWS_API
#define WSTRNCPY(s1,s2,n) strncpy_s((s1),(n),(s2),(n))