ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-29 17:28:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test: Added handle_write call to nc_poll

Browse Source
This commit is contained in:
Joseph Henry 2015-10-09 15:05:45 -04:00
parent 6600b005b6
commit 769bad3320
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
netcon/NetconEthernetTap.cpp
View File

@ -344,7 +344,6 @@ void NetconEthernetTap::threadMain()
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();
//fprintf(stderr, "tcp_tmr\n");
} else { } else {
tcp_remaining = ZT_LWIP_TCP_TIMER_INTERVAL - since_tcp; tcp_remaining = ZT_LWIP_TCP_TIMER_INTERVAL - since_tcp;
} }
@ -354,7 +353,6 @@ void NetconEthernetTap::threadMain()
} else { } else {
etharp_remaining = ARP_TMR_INTERVAL - since_etharp; etharp_remaining = ARP_TMR_INTERVAL - since_etharp;
} }
//fprintf(stderr, "poll_wait_time = %d\n", (unsigned long)std::min(tcp_remaining,etharp_remaining));
_phy.poll((unsigned long)std::min(tcp_remaining,etharp_remaining)); _phy.poll((unsigned long)std::min(tcp_remaining,etharp_remaining));
} }
closeAll(); closeAll();
@ -476,27 +474,6 @@ int NetconEthernetTap::send_return_value(TcpConnection *conn, int retval)
// NOTE: these are called from within LWIP, meaning that lwipstack->_lock is ALREADY // NOTE: these are called from within LWIP, meaning that lwipstack->_lock is ALREADY
// locked in this case! // locked in this case!
/*
* Callback from LWIP to do whatever work we might need to do.
*
* @param associated service state object
* @param PCB we're polling on
* @return ERR_OK if everything is ok, -1 otherwise
*
*/
err_t NetconEthernetTap::nc_poll(void* arg, struct tcp_pcb *tpcb)
{
//fprintf(stderr, "nc_poll\n");
/*
Larg *l = (Larg*)arg;
TcpConnection *conn = l->conn;
NetconEthernetTap *tap = l->tap;
if(conn && conn->idx) // if valid connection and non-zero index (indicating data present)
tap->handle_write(conn);
*/
return ERR_OK;
}
/* /*
* Callback from LWIP for when a connection has been accepted and the PCB has been * Callback from LWIP for when a connection has been accepted and the PCB has been
* put into an ACCEPT state. * put into an ACCEPT state.
@ -552,7 +529,7 @@ err_t NetconEthernetTap::nc_accept(void *arg, struct tcp_pcb *newpcb, err_t err)
tap->lwipstack->_tcp_recv(newpcb, nc_recved); tap->lwipstack->_tcp_recv(newpcb, nc_recved);
tap->lwipstack->_tcp_err(newpcb, nc_err); tap->lwipstack->_tcp_err(newpcb, nc_err);
tap->lwipstack->_tcp_sent(newpcb, nc_sent); tap->lwipstack->_tcp_sent(newpcb, nc_sent);
tap->lwipstack->_tcp_poll(newpcb, nc_poll, 1); tap->lwipstack->_tcp_poll(newpcb, nc_poll, 0.5);
tcp_accepted(conn->pcb); tcp_accepted(conn->pcb);
return ERR_OK; return ERR_OK;
} }
@ -638,6 +615,29 @@ void NetconEthernetTap::nc_err(void *arg, err_t err)
} }
} }
/*
* Callback from LWIP to do whatever work we might need to do.
*
* @param associated service state object
* @param PCB we're polling on
* @return ERR_OK if everything is ok, -1 otherwise
*
*/
err_t NetconEthernetTap::nc_poll(void* arg, struct tcp_pcb *tpcb)
{
uint64_t now = OSUtils::now();
//fprintf(stderr, "nc_poll(): now = %u\n", now);
//fprintf(stderr, "nc_poll\n");
Larg *l = (Larg*)arg;
TcpConnection *conn = l->conn;
NetconEthernetTap *tap = l->tap;
if(conn && conn->idx) // if valid connection and non-zero index (indicating data present)
tap->handle_write(conn);
return ERR_OK;
}
/* /*
* Callback from LWIP to signal that 'len' bytes have successfully been sent. * Callback from LWIP to signal that 'len' bytes have successfully been sent.
* As a result, we should put our socket back into a notify-on-readability state * As a result, we should put our socket back into a notify-on-readability state
@ -657,6 +657,8 @@ err_t NetconEthernetTap::nc_sent(void* arg, struct tcp_pcb *tpcb, u16_t len)
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);
l->tap->_phy.setNotifyReadable(l->conn->dataSock, true); l->tap->_phy.setNotifyReadable(l->conn->dataSock, true);
//uint64_t now = OSUtils::now();
//fprintf(stderr, "nc_sent(): now = %u\n", now);
//l->tap->_phy.whack(); //l->tap->_phy.whack();
//l->tap->handle_write(l->conn); //l->tap->handle_write(l->conn);
} }