sad
/
portspoof
mirror of https://github.com/drk1wi/portspoof.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed POSIX sockets

This commit is contained in:
Piotr Duszynski 2014-06-26 10:57:50 +02:00
parent 5d77885ca1
commit 70b6bf2ad9
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,5 +1,6 @@
1.3 - 26/06/2014 - Linux
* Minor release.
* Better support for POSIX sockets.
* Fix some minor issues.
1.2 - 25/04/2014 - Linux

30
src/connection.cpp
View File

@ -77,12 +77,13 @@ void nonblock(int sockfd)
perror("fcntl(F_GETFL)\n");
exit(1);
}
opts = (opts | O_NONBLOCK);
opts = (opts|O_NONBLOCK );
if(fcntl(sockfd, F_SETFL, opts) < 0)
{
perror("fcntl(F_SETFL)\n");
exit(1);
}
}
void* process_connection(void *arg)
@ -99,7 +100,12 @@ void* process_connection(void *arg)
char* msg;
char ipstr[INET6_ADDRSTRLEN];
memset(ipstr, '\0', INET6_ADDRSTRLEN);
fd_set read_mask;
struct timeval tv;
int select_return;
tv.tv_sec = 1;
tv.tv_usec = 0;
while(1) {
sleep(1);
@ -115,10 +121,22 @@ void* process_connection(void *arg)
n = 1; // just reply...
else
{
buffer_size=configuration->mapPort2Buffer(original_port);
n = recv(threads[tid].clients[i],buffer,buffer_size, 0);
nonblock(threads[tid].clients[i]);
FD_ZERO(&read_mask);
FD_SET(threads[tid].clients[i], &read_mask);
select_return = select(threads[tid].clients[i], &read_mask, (fd_set *)0, (fd_set *)0, &tv);
if(select_return <= 0) /* [timeout=0, -1= ERROR] is returned */
{
n=1;
}
else
{
buffer_size=configuration->mapPort2Buffer(original_port);
n = recv(threads[tid].clients[i],buffer,buffer_size, 0);
}
}
// deal with different recv buffer size
if(n == 0){
@ -288,4 +306,4 @@ void* process_connection(void *arg)
}
return 0;
}
}