ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-01 15:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added status debugs

Browse Source
This commit is contained in:
Joseph Henry 2015-10-16 19:30:01 -04:00
parent 0405ba1ccf
commit 8b03965912
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netcon/Intercept.c
View File

@ -496,10 +496,9 @@ int connect(CONNECT_SIG)
//int flags = fcntl(__fd, F_GETFD); //int flags = fcntl(__fd, F_GETFD);
//dwr("connect(): socket flags = %d\n", flags); //dwr("connect(): socket flags = %d\n", flags);
//if(sock_type && O_NONBLOCK) {
if(sock_type && O_NONBLOCK) { // dwr("connect(): O_NONBLOCK\n");
dwr("connect(): O_NONBLOCK\n"); //}
}
/* assemble and route command */ /* assemble and route command */
int err; int err;
@ -656,6 +655,11 @@ int accept(ACCEPT_SIG)
errno = EMFILE; errno = EMFILE;
return -1; return -1;
} }
/* Check address length */
if(addrlen < 0) {
errno = EINVAL;
return -1;
}
#endif #endif
/* make sure we don't touch any standard outputs */ /* make sure we don't touch any standard outputs */

26
netcon/NetconEthernetTap.cpp
View File

@ -51,6 +51,7 @@
#define APPLICATION_POLL_FREQ 1 #define APPLICATION_POLL_FREQ 1
#define ZT_LWIP_TCP_TIMER_INTERVAL 10 #define ZT_LWIP_TCP_TIMER_INTERVAL 10
#define STATUS_TMR_INTERVAL 1000
namespace ZeroTier { namespace ZeroTier {
@ -317,9 +318,8 @@ void NetconEthernetTap::threadMain()
{ {
fprintf(stderr, "_threadMain()\n"); fprintf(stderr, "_threadMain()\n");
uint64_t prev_tcp_time = 0; uint64_t prev_tcp_time = 0;
uint64_t prev_status_time = 0;
uint64_t prev_etharp_time = 0; uint64_t prev_etharp_time = 0;
fprintf(stderr, "- TCP_SND_QUEUELEN = %d\n", TCP_SND_QUEUELEN);
fprintf(stderr, "- TCP_MAXRTX = %d\n", TCP_MAXRTX);
/* /*
fprintf(stderr, "- MEM_SIZE = %dM\n", MEM_SIZE / (1024*1024)); fprintf(stderr, "- MEM_SIZE = %dM\n", MEM_SIZE / (1024*1024));
@ -329,7 +329,8 @@ fprintf(stderr, "- TCP_MAXRTX = %d\n", TCP_MAXRTX);
fprintf(stderr, "- MEMP_NUM_TCP_PCB_LISTEN = %d\n", MEMP_NUM_TCP_PCB_LISTEN); fprintf(stderr, "- MEMP_NUM_TCP_PCB_LISTEN = %d\n", MEMP_NUM_TCP_PCB_LISTEN);
fprintf(stderr, "- MEMP_NUM_TCP_SEG = %d\n", MEMP_NUM_TCP_SEG); fprintf(stderr, "- MEMP_NUM_TCP_SEG = %d\n", MEMP_NUM_TCP_SEG);
fprintf(stderr, "- PBUF_POOL_SIZE = %d\n", PBUF_POOL_SIZE); fprintf(stderr, "- PBUF_POOL_SIZE = %d\n", PBUF_POOL_SIZE);
fprintf(stderr, "- TCP_SND_QUEUELEN = %d\n", TCP_SND_QUEUELEN);
fprintf(stderr, "- TCP_MAXRTX = %d\n", TCP_MAXRTX);
fprintf(stderr, "- IP_REASSEMBLY = %d\n", IP_REASSEMBLY); fprintf(stderr, "- IP_REASSEMBLY = %d\n", IP_REASSEMBLY);
fprintf(stderr, "- TCP_WND = %d\n", TCP_WND); fprintf(stderr, "- TCP_WND = %d\n", TCP_WND);
fprintf(stderr, "- TCP_MSS = %d\n", TCP_MSS); fprintf(stderr, "- TCP_MSS = %d\n", TCP_MSS);
@ -340,14 +341,20 @@ fprintf(stderr, "- TCP_MAXRTX = %d\n", TCP_MAXRTX);
// Main timer loop // Main timer loop
while (_run) { while (_run) {
uint64_t now = OSUtils::now(); uint64_t now = OSUtils::now();
uint64_t since_tcp = now - prev_tcp_time; uint64_t since_tcp = now - prev_tcp_time;
uint64_t since_etharp = now - prev_etharp_time; uint64_t since_etharp = now - prev_etharp_time;
uint64_t since_status = now - prev_status_time;
uint64_t tcp_remaining = ZT_LWIP_TCP_TIMER_INTERVAL; uint64_t tcp_remaining = ZT_LWIP_TCP_TIMER_INTERVAL;
uint64_t etharp_remaining = ARP_TMR_INTERVAL; uint64_t etharp_remaining = ARP_TMR_INTERVAL;
uint64_t status_remaining = STATUS_TMR_INTERVAL;
if (since_status >= STATUS_TMR_INTERVAL) {
prev_status_time = now;
fprintf(stderr, "tcp_conns = %d, rpc_socks = %d\n", tcp_connections.size(), rpc_sockets.size());
}
if (since_tcp >= ZT_LWIP_TCP_TIMER_INTERVAL) { if (since_tcp >= ZT_LWIP_TCP_TIMER_INTERVAL) {
prev_tcp_time = now; prev_tcp_time = now;
lwipstack->tcp_tmr(); lwipstack->tcp_tmr();
@ -381,9 +388,9 @@ void NetconEthernetTap::phyOnFileDescriptorActivity(PhySocket *sock,void **uptr,
if(conn->dataSock) // Sometimes a connection may be closed via nc_recved, check first if(conn->dataSock) // Sometimes a connection may be closed via nc_recved, check first
{ {
//Mutex::Lock _l(lwipstack->_lock); //Mutex::Lock _l(lwipstack->_lock);
//lwipstack->_lock.lock(); lwipstack->_lock.lock();
handle_write(conn); handle_write(conn);
//lwipstack->_lock.unlock(); lwipstack->_lock.unlock();
} }
} }
else { else {
@ -515,7 +522,7 @@ int NetconEthernetTap::send_return_value(int fd, int retval, int _errno = 0)
[I] ECONNABORTED - A connection has been aborted. [I] ECONNABORTED - A connection has been aborted.
[i] EFAULT - The addr argument is not in a writable part of the user address space. [i] EFAULT - The addr argument is not in a writable part of the user address space.
[-] EINTR - The system call was interrupted by a signal that was caught before a valid connection arrived; see signal(7). [-] EINTR - The system call was interrupted by a signal that was caught before a valid connection arrived; see signal(7).
[?] EINVAL - Socket is not listening for connections, or addrlen is invalid (e.g., is negative). [I] EINVAL - Socket is not listening for connections, or addrlen is invalid (e.g., is negative).
[I] EINVAL - (accept4()) invalid value in flags. [I] EINVAL - (accept4()) invalid value in flags.
[I] EMFILE - The per-process limit of open file descriptors has been reached. [I] EMFILE - The per-process limit of open file descriptors has been reached.
[ ] ENFILE - The system limit on the total number of open files has been reached. [ ] ENFILE - The system limit on the total number of open files has been reached.
@ -755,7 +762,8 @@ err_t NetconEthernetTap::nc_poll(void* arg, struct tcp_pcb *tpcb)
* *
*/ */
err_t NetconEthernetTap::nc_sent(void* arg, struct tcp_pcb *tpcb, u16_t len) err_t NetconEthernetTap::nc_sent(void* arg, struct tcp_pcb *tpcb, u16_t len)
{fprintf(stderr, "nc_sent()\n"); {
//fprintf(stderr, "nc_sent()\n");
Larg *l = (Larg*)arg; Larg *l = (Larg*)arg;
if(len) { if(len) {
//fprintf(stderr, "ACKING len = %d, setting read-notify = true, (sndbuf = %d)\n", len, l->conn->pcb->snd_buf); //fprintf(stderr, "ACKING len = %d, setting read-notify = true, (sndbuf = %d)\n", len, l->conn->pcb->snd_buf);
@ -1150,7 +1158,7 @@ void NetconEthernetTap::handle_write(TcpConnection *conn)
// NOTE: this assumes that lwipstack->_lock is locked, either // NOTE: this assumes that lwipstack->_lock is locked, either
// because we are in a callback or have locked it manually. // because we are in a callback or have locked it manually.
int err = lwipstack->_tcp_write(conn->pcb, &conn->buf, r, TCP_WRITE_FLAG_COPY); int err = lwipstack->_tcp_write(conn->pcb, &conn->buf, r, TCP_WRITE_FLAG_COPY);
lwipstack->_tcp_output(conn->pcb); //lwipstack->_tcp_output(conn->pcb);
if(err != ERR_OK) { if(err != ERR_OK) {
fprintf(stderr, "handle_write(): error while writing to PCB, (err = %d)\n", err); fprintf(stderr, "handle_write(): error while writing to PCB, (err = %d)\n", err);
return; return;

BIN
netcon/libintercept.so.1.0
View File

Binary file not shown.