void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor changes

Browse source
This commit is contained in:
Joseph Henry 2015-09-23 19:45:44 -04:00
parent c85dd262ed
commit 557c0c29b0
3 changed files with 11 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
netcon/NetconEthernetTap.cpp
View file

@ -372,12 +372,10 @@ void NetconEthernetTap::threadMain()
// TODO: cleanup -- destroy LWIP state, kill any clients, unload .so, etc. // TODO: cleanup -- destroy LWIP state, kill any clients, unload .so, etc.
} }
void NetconEthernetTap::phyOnSocketPairEndpointClose(PhySocket *sock, void **uptr) void NetconEthernetTap::phyOnUnixClose(PhySocket *sock,void **uptr)
{ {
//fprintf(stderr, "phyOnSocketPairEndpointClose\n"); fprintf(stderr, "phyOnUnixClose()\n");
_phy.setNotifyWritable(sock, false); close(_phy.getDescriptor(sock));
//NetconClient *client = (NetconClient*)*uptr;
//closeConnection(client->getConnection(sock));
} }
/* /*
@ -397,12 +395,6 @@ void NetconEthernetTap::phyOnFileDescriptorActivity(PhySocket *sock,void **uptr,
} }
} }
void NetconEthernetTap::phyOnSocketPairEndpointWritable(PhySocket *sock, void **uptr)
{
//fprintf(stderr, "phyOnSocketPairEndpointWritable\n");
_phy.setNotifyWritable(sock, false);
}
// Unused -- no UDP or TCP from this thread/Phy<> // Unused -- no UDP or TCP from this thread/Phy<>
void NetconEthernetTap::phyOnDatagram(PhySocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len) {} void NetconEthernetTap::phyOnDatagram(PhySocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len) {}
void NetconEthernetTap::phyOnTcpConnect(PhySocket *sock,void **uptr,bool success) {} void NetconEthernetTap::phyOnTcpConnect(PhySocket *sock,void **uptr,bool success) {}
@ -425,12 +417,6 @@ void NetconEthernetTap::phyOnUnixAccept(PhySocket *sockL,PhySocket *sockN,void *
clients.push_back(newClient); clients.push_back(newClient);
} }
void NetconEthernetTap::phyOnUnixClose(PhySocket *sock,void **uptr)
{
fprintf(stderr, "phyOnUnixClose()\n");
close(_phy.getDescriptor(sock));
}
/* /*
* Processes incoming data on a client-specific RPC connection * Processes incoming data on a client-specific RPC connection
*/ */
@ -442,39 +428,39 @@ void NetconEthernetTap::phyOnUnixData(PhySocket *sock,void **uptr,void *data,uns
switch(buf[0]) switch(buf[0])
{ {
case RPC_SOCKET: case RPC_SOCKET:
//fprintf(stderr, "RPC_SOCKET\n"); fprintf(stderr, "RPC_SOCKET\n");
struct socket_st socket_rpc; struct socket_st socket_rpc;
memcpy(&socket_rpc, &buf[1], sizeof(struct socket_st)); memcpy(&socket_rpc, &buf[1], sizeof(struct socket_st));
client->tid = socket_rpc.__tid; client->tid = socket_rpc.__tid;
handle_socket(client, &socket_rpc); handle_socket(client, &socket_rpc);
break; break;
case RPC_LISTEN: case RPC_LISTEN:
//fprintf(stderr, "RPC_LISTEN\n"); fprintf(stderr, "RPC_LISTEN\n");
struct listen_st listen_rpc; struct listen_st listen_rpc;
memcpy(&listen_rpc, &buf[1], sizeof(struct listen_st)); memcpy(&listen_rpc, &buf[1], sizeof(struct listen_st));
client->tid = listen_rpc.__tid; client->tid = listen_rpc.__tid;
handle_listen(client, &listen_rpc); handle_listen(client, &listen_rpc);
break; break;
case RPC_BIND: case RPC_BIND:
//fprintf(stderr, "RPC_BIND\n"); fprintf(stderr, "RPC_BIND\n");
struct bind_st bind_rpc; struct bind_st bind_rpc;
memcpy(&bind_rpc, &buf[1], sizeof(struct bind_st)); memcpy(&bind_rpc, &buf[1], sizeof(struct bind_st));
client->tid = bind_rpc.__tid; client->tid = bind_rpc.__tid;
handle_bind(client, &bind_rpc); handle_bind(client, &bind_rpc);
break; break;
case RPC_KILL_INTERCEPT: case RPC_KILL_INTERCEPT:
//fprintf(stderr, "RPC_KILL_INTERCEPT\n"); fprintf(stderr, "RPC_KILL_INTERCEPT\n");
closeClient(client); closeClient(client);
break; break;
case RPC_CONNECT: case RPC_CONNECT:
//fprintf(stderr, "RPC_CONNECT\n"); fprintf(stderr, "RPC_CONNECT\n");
struct connect_st connect_rpc; struct connect_st connect_rpc;
memcpy(&connect_rpc, &buf[1], sizeof(struct connect_st)); memcpy(&connect_rpc, &buf[1], sizeof(struct connect_st));
client->tid = connect_rpc.__tid; client->tid = connect_rpc.__tid;
handle_connect(client, &connect_rpc); handle_connect(client, &connect_rpc);
break; break;
case RPC_FD_MAP_COMPLETION: case RPC_FD_MAP_COMPLETION:
//fprintf(stderr, "RPC_FD_MAP_COMPLETION\n"); fprintf(stderr, "RPC_FD_MAP_COMPLETION\n");
handle_retval(client, buf); handle_retval(client, buf);
break; break;
default: default:
@ -482,9 +468,6 @@ void NetconEthernetTap::phyOnUnixData(PhySocket *sock,void **uptr,void *data,uns
} }
} }
void NetconEthernetTap::phyOnUnixWritable(PhySocket *sock,void **uptr)
{
}
/* /*
* Send a return value to the client for an RPC * Send a return value to the client for an RPC
*/ */
@ -523,10 +506,8 @@ err_t NetconEthernetTap::nc_poll(void* arg, struct tcp_pcb *tpcb)
Larg *l = (Larg*)arg; Larg *l = (Larg*)arg;
NetconConnection *c = l->tap->getConnectionByPCB(tpcb); NetconConnection *c = l->tap->getConnectionByPCB(tpcb);
NetconEthernetTap *tap = l->tap; NetconEthernetTap *tap = l->tap;
if(c && c->idx > 0){ if(c)
fprintf(stderr, "nc_poll(): calling handle_write()\n");
tap->handle_write(c); tap->handle_write(c);
}
return ERR_OK; return ERR_OK;
} }
@ -562,7 +543,6 @@ err_t NetconEthernetTap::nc_accept(void *arg, struct tcp_pcb *newpcb, err_t err)
socketpair(PF_LOCAL, SOCK_STREAM, 0, fds); socketpair(PF_LOCAL, SOCK_STREAM, 0, fds);
NetconConnection *new_conn = client->addConnection(BUFFER, tap->_phy.wrapSocket(fds[0], client)); NetconConnection *new_conn = client->addConnection(BUFFER, tap->_phy.wrapSocket(fds[0], client));
client->connections.push_back(new_conn); client->connections.push_back(new_conn);
new_conn->their_fd = fds[1];
new_conn->pcb = newpcb; new_conn->pcb = newpcb;
int send_fd = tap->_phy.getDescriptor(client->rpc->sock); int send_fd = tap->_phy.getDescriptor(client->rpc->sock);
int n = write(larg_fd, "z", 1); int n = write(larg_fd, "z", 1);
@ -621,7 +601,6 @@ err_t NetconEthernetTap::nc_recved(void *arg, struct tcp_pcb *tpcb, struct pbuf
if(p == NULL) { if(p == NULL) {
if(c) { if(c) {
fprintf(stderr, "nc_recved(): closing connection\n"); fprintf(stderr, "nc_recved(): closing connection\n");
//tap->_phy.lwipstack->tcp_close(tpcb);
tap->_phy.close(c->sock); tap->_phy.close(c->sock);
tap->closeConnection(c); tap->closeConnection(c);
} }
@ -637,7 +616,6 @@ err_t NetconEthernetTap::nc_recved(void *arg, struct tcp_pcb *tpcb, struct pbuf
if((n = tap->_phy.streamSend(c->sock,p->payload, p->len)) > 0) { if((n = tap->_phy.streamSend(c->sock,p->payload, p->len)) > 0) {
if(n < p->len) { if(n < p->len) {
fprintf(stderr, "nc_recved(): unable to write entire pbuf to buffer\n"); fprintf(stderr, "nc_recved(): unable to write entire pbuf to buffer\n");
//tap->_phy.setNotifyWritable(l->sock, true);
} }
tap->lwipstack->tcp_recved(tpcb, n); tap->lwipstack->tcp_recved(tpcb, n);
} }
@ -747,7 +725,6 @@ void NetconEthernetTap::handle_bind(NetconClient *client, struct bind_st *bind_r
d[3] = (ip >> 24) & 0xFF; d[3] = (ip >> 24) & 0xFF;
fprintf(stderr, "handle_bind(): error binding to %d.%d.%d.%d : %d\n", d[0],d[1],d[2],d[3], conn_port); fprintf(stderr, "handle_bind(): error binding to %d.%d.%d.%d : %d\n", d[0],d[1],d[2],d[3], conn_port);
} }
//else fprintf(stderr, "bind successful\n");
} }
else fprintf(stderr, "handle_bind(): PCB not in CLOSED state. Ignoring BIND request.\n"); else fprintf(stderr, "handle_bind(): PCB not in CLOSED state. Ignoring BIND request.\n");
} }
@ -823,7 +800,6 @@ void NetconEthernetTap::handle_socket(NetconClient *client, struct socket_st* so
ZT_PHY_SOCKFD_TYPE fds[2]; ZT_PHY_SOCKFD_TYPE fds[2];
socketpair(PF_LOCAL, SOCK_STREAM, 0, fds); socketpair(PF_LOCAL, SOCK_STREAM, 0, fds);
NetconConnection *new_conn = client->addConnection(BUFFER, _phy.wrapSocket(fds[0], client)); NetconConnection *new_conn = client->addConnection(BUFFER, _phy.wrapSocket(fds[0], client));
new_conn->their_fd = fds[1];
new_conn->pcb = pcb; new_conn->pcb = pcb;
PhySocket *sock = client->rpc->sock; PhySocket *sock = client->rpc->sock;
sock_fd_write(_phy.getDescriptor(sock), fds[1]); sock_fd_write(_phy.getDescriptor(sock), fds[1]);

7
netcon/NetconEthernetTap.hpp
View file

@ -111,7 +111,6 @@ private:
void handle_connect(NetconClient *client, struct connect_st* connect_rpc); void handle_connect(NetconClient *client, struct connect_st* connect_rpc);
void handle_write(NetconConnection *c); void handle_write(NetconConnection *c);
void phyOnDatagram(PhySocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len); void phyOnDatagram(PhySocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len);
void phyOnTcpConnect(PhySocket *sock,void **uptr,bool success); void phyOnTcpConnect(PhySocket *sock,void **uptr,bool success);
void phyOnTcpAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from); void phyOnTcpAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from);
@ -121,12 +120,6 @@ private:
void phyOnUnixAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN); void phyOnUnixAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN);
void phyOnUnixClose(PhySocket *sock,void **uptr); void phyOnUnixClose(PhySocket *sock,void **uptr);
void phyOnUnixData(PhySocket *sock,void **uptr,void *data,unsigned long len); void phyOnUnixData(PhySocket *sock,void **uptr,void *data,unsigned long len);
void phyOnUnixWritable(PhySocket *sock,void **uptr);
void phyOnSocketPairEndpointClose(PhySocket *sock, void **uptr);
void phyOnSocketPairEndpointData(PhySocket *sock, void **uptr, void *buf, unsigned long n);
void phyOnSocketPairEndpointWritable(PhySocket *sock, void **uptr);
void phyOnFileDescriptorActivity(PhySocket *sock,void **uptr,bool readable,bool writable); void phyOnFileDescriptorActivity(PhySocket *sock,void **uptr,bool readable,bool writable);
int send_return_value(NetconClient *client, int retval); int send_return_value(NetconClient *client, int retval);

2
osdep/Phy.hpp
View file

@ -929,7 +929,7 @@ public:
} }
if ((FD_ISSET(sock,&wfds))&&(FD_ISSET(sock,&_writefds))) { if ((FD_ISSET(sock,&wfds))&&(FD_ISSET(sock,&_writefds))) {
try { try {
_handler->phyOnUnixWritable((PhySocket *)&(*s),&(s->uptr)); //_handler->phyOnUnixWritable((PhySocket *)&(*s),&(s->uptr));
} catch ( ... ) {} } catch ( ... ) {}
} }
#endif // __UNIX_LIKE__ #endif // __UNIX_LIKE__