tyler.durden
/
Win32-OpenSSH
mirror of https://github.com/PowerShell/Win32-OpenSSH.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2-28 C4

This commit is contained in:
manojampalam 2016-02-28 15:25:33 -08:00
parent a98327775b
commit 6c4b701dd6
2 changed files with 71 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
contrib/win32/w32-posix-prototype/win32posix/Tests/socketiotests.cpp
View File

@ -104,21 +104,6 @@ namespace UnitTests
int ret;
ret = socket_prepare("::1");
Assert::AreEqual(ret, 0, L"failed to prepare sockets", LINE_INFO());
//set_nonblock(listen_fd);
//set_nonblock(connect_fd);
//fd_set read_set;
//fd_set write_set;
//FD_ZERO(&read_set);
//FD_ZERO(&write_set);
//FD_SET(listen_fd, &read_set);
//FD_SET(connect_fd, &write_set);
//sin_size = sizeof(their_addr);
//accept_fd = accept(listen_fd, (struct sockaddr *)&their_addr, &sin_size);
//Assert::AreEqual(accept_fd, -1, L"", LINE_INFO());
//Assert::AreEqual(errno, EAGAIN, L"", LINE_INFO());
ret = connect(connect_fd, servinfo->ai_addr, servinfo->ai_addrlen);
Assert::AreEqual(ret, 0, L"", LINE_INFO());
@ -126,14 +111,73 @@ namespace UnitTests
accept_fd = accept(listen_fd, NULL, NULL);
Assert::AreNotEqual(accept_fd, -1, L"", LINE_INFO());
int c = connect_fd;
int s = accept_fd;
set_nonblock(c);
set_nonblock(s);
#define WRITE_BUF_SIZE 1024 * 1024 * 5
char to_write[1024 * 1024 * 5]; //5MB
#define READ_BUf_SIZE 1024 * 1024 * 2
char read_to[READ_BUf_SIZE]; //2MB
//write from c, read from s
fd_set read_set;
fd_set write_set;
FD_ZERO(&read_set);
FD_ZERO(&write_set);
FD_SET(s, &read_set);
FD_SET(c, &write_set);
int max_fd = max(c, s) + 1;
timeval time;
time.tv_sec = 60 * 60;
time.tv_usec = 0;
long long bytes_written = 0;
long long bytes_read = 0;
/* accept_fd = accept(listen_fd, (struct sockaddr *)&their_addr, &sin_size);
Assert::AreNotEqual(accept_fd, -1, L"", LINE_INFO());
*/
/* ret = connect(connect_fd, servinfo->ai_addr, servinfo->ai_addrlen);
Assert::AreEqual(ret, 0, L"", LINE_INFO());*/
while (-1 != select(max_fd, &read_set, &write_set, NULL, &time))
{
BOOL read_ready = FD_ISSET(s, &read_set);
BOOL write_ready = FD_ISSET(c, &write_set);
FD_ZERO(&read_set);
FD_ZERO(&write_set);
if (bytes_written > WRITE_BUF_SIZE * 100)
{
ret = shutdown(c, SD_SEND), 0, L"", LINE_INFO();
Assert::AreEqual(ret, 0, L"", LINE_INFO());
}
else if (write_ready)
{
int bw = send(c, to_write, WRITE_BUF_SIZE, 0);
while (bw != -1) {
bytes_written += bw;
bw = send(c, to_write, WRITE_BUF_SIZE, 0);
}
ret = errno;
Assert::AreEqual(ret, EAGAIN, L"", LINE_INFO());
FD_SET(c, &write_set);
}
if (read_ready)
{
int br = read(s, read_to, READ_BUf_SIZE);
while (br > 1) {
bytes_read += br;
br = read(s, read_to, READ_BUf_SIZE);
}
if (br == 0) //send from other side is done
break;
ret = errno;
Assert::AreEqual(ret, EAGAIN, L"", LINE_INFO());
FD_SET(s, &read_set);
}
}
//Assert::AreEqual(bytes_written, bytes_read, L"", LINE_INFO());
}
TEST_METHOD(TestMethod)

7
contrib/win32/w32-posix-prototype/win32posix/win32posix/socketio.c
View File

@ -507,7 +507,14 @@ int socketio_close(struct w32_io* pio) {
if (pio->read_overlapped.hEvent)
CloseHandle(pio->read_overlapped.hEvent);
if (pio->context)
{
struct acceptEx_context *ctx = (struct acceptEx_context*)pio->context;
if (ctx->accept_socket != INVALID_SOCKET)
closesocket(ctx->accept_socket);
if (ctx->lpOutputBuf)
free(ctx->lpOutputBuf);
free(pio->context);
}
//TODO: cleanup other details in pio->context
}
else if (pio->type == CONNECT_FD) {