gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added state dump, fixed numerous RPC related bugs

Browse Source
This commit is contained in:
Joseph Henry
2015-10-29 17:57:59 -07:00
parent f6e0bdb2f2
commit 96eb0ce492
10 changed files with 256 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netcon/Intercept.c
View File

@@ -202,7 +202,6 @@ int is_mapped_to_service(int sockfd)
return get_retval();
}
/*------------------------------------------------------------------------------
---------- Unix-domain socket lazy initializer (for fd-transfers)--------------
------------------------------------------------------------------------------*/
@@ -439,10 +438,10 @@ int socket(SOCKET_SIG)
memset(cmd, '\0', BUF_SZ);
cmd[0] = RPC_SOCKET;
memcpy(&cmd[1], &rpc_st, sizeof(struct socket_st));
dwr("pid = %d\n", thispid);
memcpy(&cmd[1], &thispid, sizeof(pid_t));
memcpy(&cmd[1]+sizeof(pid_t), &rpc_st, sizeof(struct socket_st));
pthread_mutex_lock(&lock);
dwr("sending RPC...\n");
send_command(fdret_sock, cmd);
/* get new fd */