github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-14 02:27:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Misc changes

Browse source
This commit is contained in:
Joseph Henry 2015-10-16 18:02:07 -04:00
commit 0405ba1ccf
9 changed files with 128 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

11
netcon/Intercept.c
View file

@ -494,6 +494,13 @@ int connect(CONNECT_SIG)
return err;
}
//int flags = fcntl(__fd, F_GETFD);
//dwr("connect(): socket flags = %d\n", flags);
if(sock_type && O_NONBLOCK) {
dwr("connect(): O_NONBLOCK\n");
}
/* assemble and route command */
int err;
char cmd[BUF_SZ];
@ -507,6 +514,10 @@ int connect(CONNECT_SIG)
memcpy(&cmd[1], &rpc_st, sizeof(struct connect_st));
pthread_mutex_lock(&lock);
send_command(fdret_sock, cmd);
if(sock_type && O_NONBLOCK) {
//pthread_mutex_unlock(&lock);
//return EINPROGRESS;
}
err = get_retval();
pthread_mutex_unlock(&lock);
return err;