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

RPC Reliability improvements and partial getsockname() fix

Browse source
This commit is contained in:
Joseph Henry 2015-12-16 18:05:47 -08:00
parent 7d001458cb
commit e3eea6fcbd
4 changed files with 85 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
make-linux.mk
View file

@ -102,7 +102,7 @@ netcon: $(OBJS)
# Build netcon/liblwip.so which must be placed in ZT home for zerotier-netcon-service to work # Build netcon/liblwip.so which must be placed in ZT home for zerotier-netcon-service to work
cd netcon ; make -f make-liblwip.mk cd netcon ; make -f make-liblwip.mk
# Use gcc not clang to build standalone intercept library since gcc is typically used for libc and we want to ensure maximal ABI compatibility # Use gcc not clang to build standalone intercept library since gcc is typically used for libc and we want to ensure maximal ABI compatibility
cd netcon ; gcc -g -O2 -Wall -std=c99 -fPIC -DDEBUG_RPC -DCHECKS -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o ../libzerotierintercept.so Intercept.c -ldl cd netcon ; gcc -g -O2 -Wall -std=c99 -fPIC -DVERBOSE -DDEBUG_RPC -DCHECKS -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o ../libzerotierintercept.so Intercept.c -ldl
ln -sf zerotier-netcon-service zerotier-cli ln -sf zerotier-netcon-service zerotier-cli
ln -sf zerotier-netcon-service zerotier-idtool ln -sf zerotier-netcon-service zerotier-idtool

64
netcon/Intercept.c
View file

@ -214,27 +214,26 @@ static int send_cmd(int rpc_fd, char *cmd)
#endif #endif
/* Combine command flag+payload with RPC metadata */ /* Combine command flag+payload with RPC metadata */
memcpy(&metabuf[IDX_PAYLOAD], cmd, PAYLOAD_SZ); memcpy(&metabuf[IDX_PAYLOAD], cmd, PAYLOAD_SZ);
//usleep(100000);
int n_write = write(rpc_fd, &metabuf, BUF_SZ); int n_write = write(rpc_fd, &metabuf, BUF_SZ);
if(n_write < 0){ if(n_write < 0){
dwr(MSG_DEBUG,"Error writing command to service (CMD = %d)\n", cmd[0]); dwr(MSG_DEBUG,"Error writing command to service (CMD = %d)\n", cmd[0]);
errno = 0; errno = 0;
} }
int ret = ERR_OK; int ret = ERR_OK;
if(n_write > 0) { if(n_write > 0) {
if(cmd[0]==RPC_SOCKET) { if(cmd[0]==RPC_SOCKET) {
ret = get_new_fd(fdret_sock); ret = get_new_fd(fdret_sock);
} }
if(cmd[0]==RPC_MAP) { if(cmd[0]==RPC_MAP_REQ
ret = n_write; || cmd[0]==RPC_CONNECT
} || cmd[0]==RPC_BIND
if(cmd[0]==RPC_MAP_REQ || cmd[0]==RPC_CONNECT || cmd[0]==RPC_BIND) { || cmd[0]==RPC_LISTEN
|| cmd[0]==RPC_MAP) {
ret = get_retval(); ret = get_retval();
} }
if(cmd[0]==RPC_LISTEN || cmd[0]==RPC_GETSOCKNAME) { if(cmd[0]==RPC_GETSOCKNAME) {
/* Do Nothing */ ret = n_write;
} }
} }
else { else {
@ -643,6 +642,17 @@ int bind(BIND_SIG)
dwr(MSG_DEBUG,"realbind, err = %d\n", err); dwr(MSG_DEBUG,"realbind, err = %d\n", err);
return err; return err;
} }
int port = connaddr->sin_port;
int ip = connaddr->sin_addr.s_addr;
unsigned char d[4];
d[0] = ip & 0xFF;
d[1] = (ip >> 8) & 0xFF;
d[2] = (ip >> 16) & 0xFF;
d[3] = (ip >> 24) & 0xFF;
dwr(MSG_DEBUG, "bind(): %d.%d.%d.%d: %d\n", d[0],d[1],d[2],d[3], ntohs(port));
/* Assemble and send RPC */ /* Assemble and send RPC */
char cmd[BUF_SZ]; char cmd[BUF_SZ];
struct bind_st rpc_st; struct bind_st rpc_st;
@ -768,13 +778,14 @@ int accept(ACCEPT_SIG)
memcpy(&cmd[1], &new_conn_socket, sizeof(new_conn_socket)); memcpy(&cmd[1], &new_conn_socket, sizeof(new_conn_socket));
dwr(MSG_DEBUG, "accept(): sending perceived fd (%d) to service.\n", new_conn_socket); dwr(MSG_DEBUG, "accept(): sending perceived fd (%d) to service.\n", new_conn_socket);
int n_write = send_cmd(fdret_sock, cmd); send_cmd(fdret_sock, cmd);
/*
if(n_write < 0) { if(n_write < 0) {
errno = ECONNABORTED; errno = ECONNABORTED;
handle_error("accept", "ECONNABORTED - Error sending perceived FD to service", -1); handle_error("accept", "ECONNABORTED - Error sending perceived FD to service", -1);
return -1; return -1;
} }
*/
errno = ERR_OK; errno = ERR_OK;
dwr(MSG_DEBUG,"accept()=%d\n", new_conn_socket); dwr(MSG_DEBUG,"accept()=%d\n", new_conn_socket);
return new_conn_socket; /* OK */ return new_conn_socket; /* OK */
@ -938,13 +949,15 @@ int getsockname(GETSOCKNAME_SIG)
dwr(MSG_ERROR, "getsockname(): SYMBOL NOT FOUND. \n"); dwr(MSG_ERROR, "getsockname(): SYMBOL NOT FOUND. \n");
return -1; return -1;
} }
dwr(MSG_DEBUG, "getsockname(%d)\n", sockfd);
if(!is_mapped_to_service(sockfd))
return realgetsockname(sockfd, addr, addrlen);
/* return realgetsockname(sockfd, addr, addrlen); */ dwr(MSG_DEBUG, "getsockname(): sockfd = %d is mapped\n", sockfd);
/* This is kind of a hack as it stands -- assumes sockaddr is sockaddr_in /* This is kind of a hack as it stands -- assumes sockaddr is sockaddr_in
* and is an IPv4 address. */ * and is an IPv4 address. */
/* assemble command */ /* assemble and send command */
char cmd[BUF_SZ]; char cmd[BUF_SZ];
struct getsockname_st rpc_st; struct getsockname_st rpc_st;
rpc_st.sockfd = sockfd; rpc_st.sockfd = sockfd;
@ -952,19 +965,19 @@ int getsockname(GETSOCKNAME_SIG)
memcpy(&rpc_st.addrlen, &addrlen, sizeof(socklen_t)); memcpy(&rpc_st.addrlen, &addrlen, sizeof(socklen_t));
cmd[0] = RPC_GETSOCKNAME; cmd[0] = RPC_GETSOCKNAME;
memcpy(&cmd[1], &rpc_st, sizeof(struct getsockname_st)); memcpy(&cmd[1], &rpc_st, sizeof(struct getsockname_st));
send_cmd(fdret_sock, cmd); send_cmd(fdret_sock, cmd);
//pthread_mutex_lock(&lock);
/* read address info from service */
char addrbuf[sizeof(struct sockaddr_storage)]; char addrbuf[sizeof(struct sockaddr_storage)];
memset(addrbuf, 0, sizeof(struct sockaddr_storage)); memset(&addrbuf, '\0', sizeof(struct sockaddr_storage));
read(fdret_sock, &addrbuf, sizeof(struct sockaddr_storage)); /* read address from service */ int n = read(fdret_sock, &addrbuf, sizeof(struct sockaddr_storage));
dwr(MSG_DEBUG, "getsockname(): read %d bytes\n", n);
struct sockaddr_storage sock_storage;
memcpy(&sock_storage, &addrbuf, sizeof(struct sockaddr_storage));
memcpy(addr, addrbuf, sizeof(struct sockaddr_in)); struct sockaddr_in *connaddr = (struct sockaddr_in *)&sock_storage;
addr->sa_family = AF_INET; //addr = (struct sockaddr *)&sock_storage;
*addrlen = sizeof(struct sockaddr_in);
struct sockaddr_in *connaddr;
connaddr = (struct sockaddr_in *)&addr;
unsigned int ip = connaddr->sin_addr.s_addr; unsigned int ip = connaddr->sin_addr.s_addr;
unsigned char d[4]; unsigned char d[4];
@ -973,8 +986,11 @@ int getsockname(GETSOCKNAME_SIG)
d[2] = (ip >> 16) & 0xFF; d[2] = (ip >> 16) & 0xFF;
d[3] = (ip >> 24) & 0xFF; d[3] = (ip >> 24) & 0xFF;
int port = connaddr->sin_port; int port = connaddr->sin_port;
dwr(MSG_ERROR, " handle_getsockname(): returning address: %d.%d.%d.%d: %d\n", d[0],d[1],d[2],d[3], port); dwr(MSG_ERROR, "getsockname(): %d.%d.%d.%d: %d\n", d[0],d[1],d[2],d[3], ntohs(port));
//pthread_mutex_unlock(&lock);
addr->sa_family = AF_INET;
*addrlen = sizeof(struct sockaddr_in);
return 0; return 0;
} }
@ -987,7 +1003,7 @@ long syscall(SYSCALL_SIG){
dwr(MSG_ERROR, "syscall(): SYMBOL NOT FOUND.\n"); dwr(MSG_ERROR, "syscall(): SYMBOL NOT FOUND.\n");
return -1; return -1;
} }
dwr(MSG_DEBUG_EXTRA,"syscall(%u, ...):\n", number); //dwr(MSG_DEBUG_EXTRA,"syscall(%u, ...):\n", number);
va_list ap; va_list ap;
uintptr_t a,b,c,d,e,f; uintptr_t a,b,c,d,e,f;

90
netcon/NetconEthernetTap.cpp
View file

@ -129,7 +129,7 @@ public:
PhySocket *dataSock; PhySocket *dataSock;
struct tcp_pcb *pcb; struct tcp_pcb *pcb;
struct sockaddr_in *addr; struct sockaddr_storage *addr;
unsigned char buf[DEFAULT_READ_BUFFER_SIZE]; unsigned char buf[DEFAULT_READ_BUFFER_SIZE];
int idx; int idx;
@ -828,7 +828,7 @@ err_t NetconEthernetTap::nc_accept(void *arg, struct tcp_pcb *newpcb, err_t err)
dwr(MSG_DEBUG, " nc_accept(): socketpair = {%d, %d}\n", fds[0], fds[1]); dwr(MSG_DEBUG, " nc_accept(): socketpair = {%d, %d}\n", fds[0], fds[1]);
int send_fd = tap->_phy.getDescriptor(conn->rpcSock); int send_fd = tap->_phy.getDescriptor(conn->rpcSock);
dwr(MSG_DEBUG, "nc_accept(): sending %d via %d\n", fds[1], listening_fd); dwr(MSG_DEBUG, " nc_accept(): sending %d via %d\n", fds[1], listening_fd);
if(sock_fd_write(listening_fd, fds[1]) < 0){ if(sock_fd_write(listening_fd, fds[1]) < 0){
dwr(MSG_ERROR, " nc_accept(%d): error writing signal byte (listen_fd = %d, perceived_fd = %d)\n", listening_fd, send_fd, fds[1]); dwr(MSG_ERROR, " nc_accept(%d): error writing signal byte (listen_fd = %d, perceived_fd = %d)\n", listening_fd, send_fd, fds[1]);
@ -1100,12 +1100,15 @@ void NetconEthernetTap::handle_retval(PhySocket *sock, void **uptr, int rpc_coun
{ {
dwr(MSG_DEBUG, " handle_retval()\n"); dwr(MSG_DEBUG, " handle_retval()\n");
TcpConnection *conn = (TcpConnection*)*uptr; TcpConnection *conn = (TcpConnection*)*uptr;
if(!conn->pending) if(!conn->pending){
send_return_value(conn, -1, -1);
return; return;
}
conn->pending = false; conn->pending = false;
conn->perceived_fd = newfd; conn->perceived_fd = newfd;
if(rpc_count==rpc_counter) { if(rpc_count==rpc_counter) {
dwr(MSG_ERROR, " handle_retval(): Detected repeat RPC.\n"); dwr(MSG_ERROR, " handle_retval(): Detected repeat RPC.\n");
send_return_value(conn, -1, -1);
//return; //return;
} }
else else
@ -1138,6 +1141,7 @@ void NetconEthernetTap::handle_retval(PhySocket *sock, void **uptr, int rpc_coun
} }
} }
} }
send_return_value(conn, ERR_OK, ERR_OK); // Success
} }
@ -1145,26 +1149,30 @@ void NetconEthernetTap::handle_retval(PhySocket *sock, void **uptr, int rpc_coun
void NetconEthernetTap::handle_getsockname(PhySocket *sock, void **uptr, struct getsockname_st *getsockname_rpc) void NetconEthernetTap::handle_getsockname(PhySocket *sock, void **uptr, struct getsockname_st *getsockname_rpc)
{ {
TcpConnection *conn = getConnectionByTheirFD(sock, getsockname_rpc->sockfd); TcpConnection *conn = getConnectionByTheirFD(sock, getsockname_rpc->sockfd);
dwr(MSG_DEBUG, "handle_getsockname(): sockfd = %d\n", getsockname_rpc->sockfd); dwr(MSG_DEBUG, " handle_getsockname(): sockfd = %d\n", getsockname_rpc->sockfd);
dwr(MSG_DEBUG, " handle_getsockname(): conn = 0x%x\n", conn);
/*
int port = conn->addr->sin_port; /*
int ip = conn->addr->sin_addr.s_addr; if(!conn){
return;
}
struct sockaddr_in * myaddr = (struct sockaddr_in*)conn->addr;
int port = myaddr->sin_port;
int ip = myaddr->sin_addr.s_addr;
unsigned char d[4]; unsigned char d[4];
d[0] = ip & 0xFF; d[0] = ip & 0xFF;
d[1] = (ip >> 8) & 0xFF; d[1] = (ip >> 8) & 0xFF;
d[2] = (ip >> 16) & 0xFF; d[2] = (ip >> 16) & 0xFF;
d[3] = (ip >> 24) & 0xFF; d[3] = (ip >> 24) & 0xFF;
dwr(MSG_ERROR, " handle_getsockname(): returning address: %d.%d.%d.%d: %d\n", d[0],d[1],d[2],d[3], port); dwr(MSG_ERROR, " handle_getsockname(): addr = %d.%d.%d.%d: %d\n", d[0],d[1],d[2],d[3], lwipstack->ntohs(port));
*/ */
// Assemble address "command" to send to intercept // Assemble address "command" to send to intercept
char retmsg[sizeof(struct sockaddr_storage)]; char retmsg[sizeof(struct sockaddr_storage)];
memset(&retmsg, 0, sizeof(retmsg)); memset(&retmsg, 0, sizeof(retmsg));
dwr(MSG_ERROR, " handle_getsockname(): %d\n", sizeof(retmsg));
if ((conn)&&(conn->addr)) if ((conn)&&(conn->addr))
memcpy(&retmsg, conn->addr, sizeof(struct sockaddr_in)); memcpy(&retmsg, conn->addr, sizeof(struct sockaddr_storage));
write(_phy.getDescriptor(conn->rpcSock), &retmsg, sizeof(struct sockaddr_storage)); int n = write(_phy.getDescriptor(conn->rpcSock), &retmsg, sizeof(struct sockaddr_storage));
dwr(MSG_DEBUG, " handle_getsockname(): wrote %d bytes\n", n);
} }
/* /*
@ -1216,16 +1224,17 @@ void NetconEthernetTap::handle_bind(PhySocket *sock, void **uptr, struct bind_st
if(conn) { if(conn) {
if(conn->pcb->state == CLOSED){ if(conn->pcb->state == CLOSED){
int err = lwipstack->tcp_bind(conn->pcb, &conn_addr, conn_port); int err = lwipstack->tcp_bind(conn->pcb, &conn_addr, conn_port);
if(err != ERR_OK) {
int ip = connaddr->sin_addr.s_addr;
unsigned char d[4];
d[0] = ip & 0xFF;
d[1] = (ip >> 8) & 0xFF;
d[2] = (ip >> 16) & 0xFF;
d[3] = (ip >> 24) & 0xFF;
dwr(MSG_ERROR, " handle_bind(): error binding to %d.%d.%d.%d : %d\n", d[0],d[1],d[2],d[3], conn_port);
dwr(MSG_ERROR, " handle_bind(): err = %d\n", err);
int ip = connaddr->sin_addr.s_addr;
unsigned char d[4];
d[0] = ip & 0xFF;
d[1] = (ip >> 8) & 0xFF;
d[2] = (ip >> 16) & 0xFF;
d[3] = (ip >> 24) & 0xFF;
dwr(MSG_DEBUG, " handle_bind(): %d.%d.%d.%d : %d\n", d[0],d[1],d[2],d[3], conn_port);
if(err != ERR_OK) {
dwr(MSG_ERROR, " handle_bind(): err = %d\n", err);
if(err == ERR_USE) if(err == ERR_USE)
send_return_value(conn, -1, EADDRINUSE); send_return_value(conn, -1, EADDRINUSE);
if(err == ERR_MEM) if(err == ERR_MEM)
@ -1233,9 +1242,8 @@ void NetconEthernetTap::handle_bind(PhySocket *sock, void **uptr, struct bind_st
if(err == ERR_BUF) if(err == ERR_BUF)
send_return_value(conn, -1, ENOMEM); // FIXME: Closest match send_return_value(conn, -1, ENOMEM); // FIXME: Closest match
} }
else else {
{ conn->addr = (struct sockaddr_storage *) &bind_rpc->addr;
conn->addr = (struct sockaddr_in *) &bind_rpc->addr;
send_return_value(conn, ERR_OK, ERR_OK); // Success send_return_value(conn, ERR_OK, ERR_OK); // Success
} }
} }
@ -1275,13 +1283,14 @@ void NetconEthernetTap::handle_listen(PhySocket *sock, void **uptr, struct liste
TcpConnection *conn = getConnectionByTheirFD(sock, listen_rpc->sockfd); TcpConnection *conn = getConnectionByTheirFD(sock, listen_rpc->sockfd);
if(!conn){ if(!conn){
dwr(MSG_ERROR, " handle_listen(): unable to locate connection object\n"); dwr(MSG_ERROR, " handle_listen(): unable to locate connection object\n");
// ? send_return_value(conn, -1, EBADF); send_return_value(conn, -1, EBADF);
return; return;
} }
dwr(3, " handle_listen(our=%d -> their=%d)\n", _phy.getDescriptor(conn->dataSock), conn->perceived_fd); dwr(3, " handle_listen(our=%d -> their=%d)\n", _phy.getDescriptor(conn->dataSock), conn->perceived_fd);
if(conn->pcb->state == LISTEN) { if(conn->pcb->state == LISTEN) {
dwr(MSG_ERROR, " handle_listen(): PCB is already in listening state.\n"); dwr(MSG_ERROR, " handle_listen(): PCB is already in listening state.\n");
send_return_value(conn, ERR_OK, ERR_OK);
return; return;
} }
struct tcp_pcb* listening_pcb; struct tcp_pcb* listening_pcb;
@ -1302,19 +1311,9 @@ void NetconEthernetTap::handle_listen(PhySocket *sock, void **uptr, struct liste
conn->listening = true; conn->listening = true;
conn->pending = true; conn->pending = true;
send_return_value(conn, ERR_OK, ERR_OK); send_return_value(conn, ERR_OK, ERR_OK);
return;
} }
else { send_return_value(conn, -1, -1);
/*
dwr"handle_listen(): unable to allocate memory for new listening PCB\n");
// FIXME: This does not have an equivalent errno value
// lwip will reclaim space with a tcp_listen call since a PCB in a LISTEN
// state takes up less space. If something goes wrong during the creation of a
// new listening socket we should return an error that implies we can't use this
// socket, even if the reason isn't describing what really happened internally.
// See: http://lwip.wikia.com/wiki/Raw/TCP
send_return_value(conn, -1, EBADF);
*/
}
} }
/* /*
@ -1370,15 +1369,12 @@ TcpConnection * NetconEthernetTap::handle_socket(PhySocket *sock, void **uptr, s
close(fds[1]); // close other end of socketpair close(fds[1]); // close other end of socketpair
// Once the client tells us what its fd is on the other end, we can then complete the mapping // Once the client tells us what its fd is on the other end, we can then complete the mapping
new_conn->pending = true; new_conn->pending = true;
send_return_value(rpc_fd, 0, ERR_OK);
return new_conn; return new_conn;
} }
else { sock_fd_write(rpc_fd, -1); // Send a bad fd, to signal error
sock_fd_write(rpc_fd, -1); // Send a bad fd, to signal error dwr(MSG_ERROR, " handle_socket(): Memory not available for new PCB\n");
dwr(MSG_ERROR, " handle_socket(): Memory not available for new PCB\n"); send_return_value(rpc_fd, -1, ENOMEM);
send_return_value(rpc_fd, -1, ENOMEM); return NULL;
return NULL;
}
} }
/* /*

2
netcon/common.inc.c
View file

@ -39,7 +39,7 @@
#include <fcntl.h> #include <fcntl.h>
#define DEBUG_LEVEL 0 #define DEBUG_LEVEL 4
#define MSG_WARNING 4 #define MSG_WARNING 4
#define MSG_ERROR 1 // Errors #define MSG_ERROR 1 // Errors