ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-24 23:26:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
Joseph Henry 2015-10-23 14:23:04 -07:00
parent b48ed824e6
commit 80a73cb14b
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netcon/Intercept.c
View File

@ -103,9 +103,7 @@ void load_symbols(void);
void set_up_intercept(); void set_up_intercept();
int checkpid(); int checkpid();
#define BUF_SZ 32
#define SERVICE_CONNECT_ATTEMPTS 30 #define SERVICE_CONNECT_ATTEMPTS 30
#define ERR_OK 0
ssize_t sock_fd_read(int sock, void *buf, ssize_t bufsize, int *fd); ssize_t sock_fd_read(int sock, void *buf, ssize_t bufsize, int *fd);

2
netcon/Intercept.h
View File

@ -31,6 +31,8 @@
#include <sys/socket.h> #include <sys/socket.h>
#define BUF_SZ 32
#define ERR_OK 0
/* Userland RPC codes */ /* Userland RPC codes */
#define RPC_UNDEFINED 0 #define RPC_UNDEFINED 0

9
netcon/NetconEthernetTap.cpp
View File

@ -53,7 +53,6 @@
#define ZT_LWIP_TCP_TIMER_INTERVAL 10 #define ZT_LWIP_TCP_TIMER_INTERVAL 10
#define STATUS_TMR_INTERVAL 500 // How often we check connection statuses #define STATUS_TMR_INTERVAL 500 // How often we check connection statuses
namespace ZeroTier { namespace ZeroTier {
NetconEthernetTap::NetconEthernetTap( NetconEthernetTap::NetconEthernetTap(
@ -382,13 +381,15 @@ void NetconEthernetTap::threadMain()
} }
if(!associated){ if(!associated){
// No TCP connections are associated, this is a candidate for removal // No TCP connections are associated, this is a candidate for removal
char c; unsigned char tmpbuf[BUF_SZ];
if(read(_phy.getDescriptor(rpc_sockets[i]),&c,1) < 0) { if(read(_phy.getDescriptor(rpc_sockets[i]),&tmpbuf,BUF_SZ) < 0) {
closeClient(rpc_sockets[i]); closeClient(rpc_sockets[i]);
} }
else { else {
// Handle RPC call, this is rare // Handle RPC call, this is rare
// phyOnUnixData(PhySocket *sock,void **uptr,void *data,unsigned long len) fprintf(stderr, "run(): RPC read during connection check\n");
exit(0);
phyOnUnixData(rpc_sockets[i],NULL,&tmpbuf,BUF_SZ);
} }
} }
} }

BIN
netcon/libintercept.so.1.0
View File

Binary file not shown.