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

TCP/IP Forwarding 

1. Fixed an issue with the FD_SET copy.
2. Fixed some memory issues discovered with Valgrind.
pull/98/head
John Safranek 2018-09-04 15:05:48 -07:00
parent dfbfe8d93f
commit cbeb2cf566
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/wolffwd/wolffwd.c
View File

@ -327,7 +327,7 @@ THREAD_RETURN WOLFSSH_THREAD wolffwd_worker(void* args)
printf("Entering the run loop...\n"); printf("Entering the run loop...\n");
while (!done) { while (!done) {
FD_COPY(&templateFds, &rxFds); rxFds = templateFds;
to.tv_sec = 1; to.tv_sec = 1;
to.tv_usec = 0; to.tv_usec = 0;
ret = select(nFds, &rxFds, NULL, &errFds, &to); ret = select(nFds, &rxFds, NULL, &errFds, &to);

15
src/internal.c
View File

@ -1033,14 +1033,18 @@ int ChannelUpdateForward(WOLFSSH_CHANNEL* channel,
int ret = WS_SUCCESS; int ret = WS_SUCCESS;
char* hostCopy = NULL; char* hostCopy = NULL;
char* originCopy = NULL; char* originCopy = NULL;
word32 hostSz;
word32 originSz;
if (channel == NULL || host == NULL || origin == NULL) if (channel == NULL || host == NULL || origin == NULL)
ret = WS_BAD_ARGUMENT; ret = WS_BAD_ARGUMENT;
else { else {
void* heap = channel->ssh->ctx->heap; void* heap = channel->ssh->ctx->heap;
hostCopy = (char*)WMALLOC(WSTRLEN(host) + 1, heap, DYNTYPE_STRING); hostSz = (word32)WSTRLEN(host) + 1;
originCopy = (char*)WMALLOC(WSTRLEN(origin) + 1, heap, DYNTYPE_STRING); originSz = (word32)WSTRLEN(origin) + 1;
hostCopy = (char*)WMALLOC(hostSz, heap, DYNTYPE_STRING);
originCopy = (char*)WMALLOC(originSz, heap, DYNTYPE_STRING);
if (hostCopy == NULL || originCopy == NULL) { if (hostCopy == NULL || originCopy == NULL) {
WFREE(hostCopy, heap, DYNTYPE_STRING); WFREE(hostCopy, heap, DYNTYPE_STRING);
WFREE(originCopy, heap, DYNTYPE_STRING); WFREE(originCopy, heap, DYNTYPE_STRING);
@ -1049,6 +1053,8 @@ int ChannelUpdateForward(WOLFSSH_CHANNEL* channel,
} }
if (ret == WS_SUCCESS) { if (ret == WS_SUCCESS) {
WSTRNCPY(hostCopy, host, hostSz);
WSTRNCPY(originCopy, origin, originSz);
channel->host = hostCopy; channel->host = hostCopy;
channel->hostPort = hostPort; channel->hostPort = hostPort;
channel->origin = originCopy; channel->origin = originCopy;
@ -6719,7 +6725,8 @@ int SendChannelOpenForward(WOLFSSH* ssh, WOLFSSH_CHANNEL* channel)
WLOG(WS_LOG_DEBUG, "Entering SendChannelOpenForward()"); WLOG(WS_LOG_DEBUG, "Entering SendChannelOpenForward()");
if (ssh == NULL || channel->host == NULL || channel->origin == NULL) if (ssh == NULL || channel == NULL ||
channel->host == NULL || channel->origin == NULL)
ret = WS_BAD_ARGUMENT; ret = WS_BAD_ARGUMENT;
if (ret == WS_SUCCESS) { if (ret == WS_SUCCESS) {
@ -6739,7 +6746,7 @@ int SendChannelOpenForward(WOLFSSH* ssh, WOLFSSH_CHANNEL* channel)
idx += hostSz; idx += hostSz;
c32toa(channel->hostPort, forwardData + idx); c32toa(channel->hostPort, forwardData + idx);
idx += UINT32_SZ; idx += UINT32_SZ;
c32toa(originSz, forwardData); c32toa(originSz, forwardData + idx);
idx += LENGTH_SZ; idx += LENGTH_SZ;
WMEMCPY(forwardData + idx, channel->origin, originSz); WMEMCPY(forwardData + idx, channel->origin, originSz);
idx += originSz; idx += originSz;