ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-26 05:49:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Naming convention update

Browse Source
This commit is contained in:
Joseph Henry 2016-01-14 14:15:50 -08:00
parent 6cf478c1b2
commit 45f0737a00
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
netcon/NetconEthernetTap.cpp
View File

@ -116,14 +116,13 @@ class TcpConnection
public: public:
bool pending, listening; bool pending, listening;
int pid, idx; int pid, txidx, rxidx;
PhySocket *rpcsock; PhySocket *rpcsock;
PhySocket *sock; PhySocket *sock;
struct tcp_pcb *pcb; struct tcp_pcb *pcb;
struct sockaddr_storage *addr; struct sockaddr_storage *addr;
unsigned char buf[DEFAULT_READ_BUFFER_SIZE]; unsigned char txbuf[DEFAULT_READ_BUFFER_SIZE];
unsigned char rcq[DEFAULT_READ_BUFFER_SIZE]; unsigned char rxbuf[DEFAULT_READ_BUFFER_SIZE];
int rcqidx;
}; };
/* /*
@ -361,7 +360,7 @@ void NetconEthernetTap::threadMain()
fcntl(fd, F_SETFL, O_NONBLOCK); fcntl(fd, F_SETFL, O_NONBLOCK);
unsigned char tmpbuf[BUF_SZ]; unsigned char tmpbuf[BUF_SZ];
int n = read(fd,&tmpbuf,BUF_SZ); int n = read(fd,&tmpbuf,BUF_SZ);
dwr(MSG_DEBUG_EXTRA," tap_thread(): <%x> conn->idx = %d\n", tcp_connections[i]->sock, tcp_connections[i]->idx); dwr(MSG_DEBUG_EXTRA," tap_thread(): <%x> conn->txidx = %d\n", tcp_connections[i]->sock, tcp_connections[i]->txidx);
if(tcp_connections[i]->pcb->state == SYN_SENT) { if(tcp_connections[i]->pcb->state == SYN_SENT) {
dwr(MSG_DEBUG_EXTRA," tap_thread(): <%x> state = SYN_SENT, candidate for removal\n", tcp_connections[i]->sock); dwr(MSG_DEBUG_EXTRA," tap_thread(): <%x> state = SYN_SENT, candidate for removal\n", tcp_connections[i]->sock);
} }
@ -383,7 +382,7 @@ void NetconEthernetTap::threadMain()
// Makeshift poll // Makeshift poll
for(size_t i=0; i<tcp_connections.size(); i++) { for(size_t i=0; i<tcp_connections.size(); i++) {
if(tcp_connections[i]->idx > 0){ if(tcp_connections[i]->txidx > 0){
lwipstack->_lock.lock(); lwipstack->_lock.lock();
handle_write(tcp_connections[i]); handle_write(tcp_connections[i]);
lwipstack->_lock.unlock(); lwipstack->_lock.unlock();
@ -513,18 +512,18 @@ void NetconEthernetTap::unload_rpc(void *data, pid_t &pid, pid_t &tid,
void NetconEthernetTap::phyOnUnixWritable(PhySocket *sock,void **uptr) void NetconEthernetTap::phyOnUnixWritable(PhySocket *sock,void **uptr)
{ {
TcpConnection *conn = getConnection(sock); TcpConnection *conn = getConnection(sock);
int len = conn->rcqidx; int len = conn->rxidx;
int n = _phy.streamSend(conn->sock, conn->rcq, len); int n = _phy.streamSend(conn->sock, conn->rxbuf, len);
if(n > 0) { if(n > 0) {
if(n < len) { if(n < len) {
dwr(MSG_INFO,"\n phyOnUnixWritable(): unable to write entire \"block\" to stream\n"); dwr(MSG_INFO,"\n phyOnUnixWritable(): unable to write entire \"block\" to stream\n");
} }
memcpy(conn->rcq, conn->rcq+n, conn->rcqidx-n); memcpy(conn->rxbuf, conn->rxbuf+n, conn->rxidx-n);
conn->rcqidx -= n; conn->rxidx -= n;
lwipstack->_tcp_recved(conn->pcb, n); lwipstack->_tcp_recved(conn->pcb, n);
if(conn->rcqidx == 0) if(conn->rxidx == 0)
_phy.setNotifyWritable(conn->sock, false); // Nothing more to be notified about _phy.setNotifyWritable(conn->sock, false); // Nothing more to be notified about
dwr(MSG_DEBUG," phyOnUnixWritable(): wrote %d bytes from RX buffer to <%x> (idx = %d)\n", n, conn->sock, conn->rcqidx); dwr(MSG_DEBUG," phyOnUnixWritable(): wrote %d bytes from RX buffer to <%x> (idx = %d)\n", n, conn->sock, conn->rxidx);
} }
else { else {
perror("\n"); perror("\n");
@ -610,7 +609,7 @@ void NetconEthernetTap::phyOnUnixData(PhySocket *sock,void **uptr,void *data,uns
return; return;
if(padding_pos == -1) { // [DATA] if(padding_pos == -1) { // [DATA]
memcpy(&conn->buf[conn->idx], buf, wlen); memcpy(&conn->txbuf[conn->txidx], buf, wlen);
} }
else { // Padding found, implies a token is present else { // Padding found, implies a token is present
// [TOKEN] // [TOKEN]
@ -622,30 +621,30 @@ void NetconEthernetTap::phyOnUnixData(PhySocket *sock,void **uptr,void *data,uns
if(len > TOKEN_SIZE && token_pos == 0) { if(len > TOKEN_SIZE && token_pos == 0) {
wlen = len - TOKEN_SIZE; wlen = len - TOKEN_SIZE;
data_start = padding_pos+CANARY_PADDING_SIZE; data_start = padding_pos+CANARY_PADDING_SIZE;
memcpy((&conn->buf)+conn->idx, buf+data_start, wlen); memcpy((&conn->txbuf)+conn->txidx, buf+data_start, wlen);
} }
// [DATA] + [TOKEN] // [DATA] + [TOKEN]
if(len > TOKEN_SIZE && token_pos > 0 && token_pos == len - TOKEN_SIZE) { if(len > TOKEN_SIZE && token_pos > 0 && token_pos == len - TOKEN_SIZE) {
wlen = len - TOKEN_SIZE; wlen = len - TOKEN_SIZE;
data_start = 0; data_start = 0;
memcpy((&conn->buf)+conn->idx, buf+data_start, wlen); memcpy((&conn->txbuf)+conn->txidx, buf+data_start, wlen);
} }
// [DATA] + [TOKEN] + [DATA] // [DATA] + [TOKEN] + [DATA]
if(len > TOKEN_SIZE && token_pos > 0 && len > (token_pos + TOKEN_SIZE)) { if(len > TOKEN_SIZE && token_pos > 0 && len > (token_pos + TOKEN_SIZE)) {
wlen = len - TOKEN_SIZE; wlen = len - TOKEN_SIZE;
data_start = 0; data_start = 0;
data_end = padding_pos-CANARY_SIZE; data_end = padding_pos-CANARY_SIZE;
memcpy((&conn->buf)+conn->idx, buf+data_start, (data_end-data_start)+1); memcpy((&conn->txbuf)+conn->txidx, buf+data_start, (data_end-data_start)+1);
memcpy((&conn->buf)+conn->idx, buf+(padding_pos+CANARY_PADDING_SIZE), len-(token_pos+TOKEN_SIZE)); memcpy((&conn->txbuf)+conn->txidx, buf+(padding_pos+CANARY_PADDING_SIZE), len-(token_pos+TOKEN_SIZE));
} }
} }
} }
// Write data from stream // Write data from stream
if(conn->idx > (DEFAULT_READ_BUFFER_SIZE / 2)) { if(conn->txidx > (DEFAULT_READ_BUFFER_SIZE / 2)) {
_phy.setNotifyReadable(sock, false); _phy.setNotifyReadable(sock, false);
} }
lwipstack->_lock.lock(); lwipstack->_lock.lock();
conn->idx += wlen; conn->txidx += wlen;
handle_write(conn); handle_write(conn);
lwipstack->_lock.unlock(); lwipstack->_lock.unlock();
} }
@ -854,19 +853,19 @@ err_t NetconEthernetTap::nc_recved(void *arg, struct tcp_pcb *tpcb, struct pbuf
while(p != NULL) { while(p != NULL) {
if(p->len <= 0) if(p->len <= 0)
break; break;
int avail = DEFAULT_READ_BUFFER_SIZE - l->conn->rcqidx; int avail = DEFAULT_READ_BUFFER_SIZE - l->conn->rxidx;
int len = p->len; int len = p->len;
if(avail < len) { if(avail < len) {
dwr(MSG_DEBUG," nc_recv(): not enough room (%d bytes) on RX buffer\n", avail); dwr(MSG_DEBUG," nc_recv(): not enough room (%d bytes) on RX buffer\n", avail);
exit(1); exit(1);
} }
memcpy(l->conn->rcq + (l->conn->rcqidx), p->payload, len); memcpy(l->conn->rxbuf + (l->conn->rxidx), p->payload, len);
l->conn->rcqidx += len; l->conn->rxidx += len;
l->tap->_phy.setNotifyWritable(l->conn->sock, true); // Signal that we're interested in knowing when we can write l->tap->_phy.setNotifyWritable(l->conn->sock, true); // Signal that we're interested in knowing when we can write
p = p->next; p = p->next;
tot += len; tot += len;
} }
dwr(MSG_DEBUG," nc_recv(): wrote %d bytes to RX buffer for <%x> (idx = %d)\n", tot, l->conn->sock, l->conn->rcqidx); dwr(MSG_DEBUG," nc_recv(): wrote %d bytes to RX buffer for <%x> (idx = %d)\n", tot, l->conn->sock, l->conn->rxidx);
l->tap->lwipstack->_pbuf_free(q); l->tap->lwipstack->_pbuf_free(q);
return ERR_OK; return ERR_OK;
} }
@ -985,7 +984,7 @@ err_t NetconEthernetTap::nc_sent(void* arg, struct tcp_pcb *tpcb, u16_t len)
{ {
Larg *l = (Larg*)arg; Larg *l = (Larg*)arg;
if(len) { if(len) {
if(l->conn->idx < DEFAULT_READ_BUFFER_SIZE / 2) { if(l->conn->txidx < DEFAULT_READ_BUFFER_SIZE / 2) {
l->tap->_phy.setNotifyReadable(l->conn->sock, true); l->tap->_phy.setNotifyReadable(l->conn->sock, true);
l->tap->_phy.whack(); l->tap->_phy.whack();
} }
@ -1340,7 +1339,7 @@ void NetconEthernetTap::handle_connect(PhySocket *sock, PhySocket *rpcsock, TcpC
*/ */
void NetconEthernetTap::handle_write(TcpConnection *conn) void NetconEthernetTap::handle_write(TcpConnection *conn)
{ {
dwr(MSG_DEBUG_EXTRA,"handle_write(): conn->idx = %d, conn->sock = %x\n", conn->idx, conn->sock); dwr(MSG_DEBUG_EXTRA,"handle_write(): conn->txidx = %d, conn->sock = %x\n", conn->txidx, conn->sock);
if(!conn) { if(!conn) {
dwr(MSG_ERROR," handle_write(): invalid connection\n"); dwr(MSG_ERROR," handle_write(): invalid connection\n");
return; return;
@ -1358,22 +1357,22 @@ void NetconEthernetTap::handle_write(TcpConnection *conn)
_phy.setNotifyReadable(conn->sock, false); _phy.setNotifyReadable(conn->sock, false);
return; return;
} }
if(conn->idx <= 0) { if(conn->txidx <= 0) {
dwr(MSG_DEBUG,"handle_write(): conn->idx <= 0, nothing in buffer to write\n"); dwr(MSG_DEBUG,"handle_write(): conn->txidx <= 0, nothing in buffer to write\n");
return; return;
} }
if(!conn->listening) if(!conn->listening)
lwipstack->_tcp_output(conn->pcb); lwipstack->_tcp_output(conn->pcb);
if(conn->sock) { if(conn->sock) {
r = conn->idx < sndbuf ? conn->idx : sndbuf; r = conn->txidx < sndbuf ? conn->txidx : sndbuf;
dwr(MSG_DEBUG,"handle_write(): r = %d, sndbuf = %d\n", r, sndbuf); dwr(MSG_DEBUG,"handle_write(): r = %d, sndbuf = %d\n", r, sndbuf);
/* Writes data pulled from the client's socket buffer to LWIP. This merely sends the /* Writes data pulled from the client's socket buffer to LWIP. This merely sends the
* data to LWIP to be enqueued and eventually sent to the network. */ * data to LWIP to be enqueued and eventually sent to the network. */
if(r > 0) { if(r > 0) {
// 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.
err = lwipstack->_tcp_write(conn->pcb, &conn->buf, r, TCP_WRITE_FLAG_COPY); err = lwipstack->_tcp_write(conn->pcb, &conn->txbuf, r, TCP_WRITE_FLAG_COPY);
lwipstack->_tcp_output(conn->pcb); lwipstack->_tcp_output(conn->pcb);
if(err != ERR_OK) { if(err != ERR_OK) {
dwr(MSG_ERROR," handle_write(): error while writing to PCB, (err = %d)\n", err); dwr(MSG_ERROR," handle_write(): error while writing to PCB, (err = %d)\n", err);
@ -1382,10 +1381,10 @@ void NetconEthernetTap::handle_write(TcpConnection *conn)
return; return;
} }
else { else {
sz = (conn->idx)-r; sz = (conn->txidx)-r;
if(sz) if(sz)
memmove(&conn->buf, (conn->buf+r), sz); memmove(&conn->txbuf, (conn->txbuf+r), sz);
conn->idx -= r; conn->txidx -= r;
return; return;
} }
} }