summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xnetcon/Intercept.c190
-rw-r--r--netcon/NetconEthernetTap.cpp17
-rwxr-xr-xnetcon/libintercept.so.1.0bin46264 -> 0 bytes
-rw-r--r--netcon/make-intercept.mk2
4 files changed, 24 insertions, 185 deletions
diff --git a/netcon/Intercept.c b/netcon/Intercept.c
index 40593626..bb5cf9ce 100755
--- a/netcon/Intercept.c
+++ b/netcon/Intercept.c
@@ -111,7 +111,7 @@ int getsockopt(GETSOCKOPT_SIG);
int accept4(ACCEPT4_SIG);
#ifdef USE_SOCKS_DNS
-int res_init(void);
+ int res_init(void);
#endif
int connect_to_service(void);
@@ -122,7 +122,7 @@ void set_up_intercept();
int checkpid();
-#define BUF_SZ 1024
+#define BUF_SZ 32
#define SERVICE_CONNECT_ATTEMPTS 30
#define ERR_OK 0
@@ -137,9 +137,6 @@ pthread_mutex_t loglock;
------------------- Intercept<--->Service Comm mechanisms-----------------------
------------------------------------------------------------------------------*/
-// TODO: Find minimum BUF_SZ for RPC
-// TODO: Refactor RPC send logic
-
static int is_initialized = 0;
static int fdret_sock; // used for fd-transfers
static int newfd; // used for "this_end" socket
@@ -168,10 +165,9 @@ void send_command(int rpc_fd, char *cmd)
if(n_write < 0){
dwr("Error writing command to service (CMD = %d)\n", cmd[0]);
errno = 0;
- //return -1;
}
-
}
+
/*
* Reads a return value from the service and sets errno (if applicable)
*/
@@ -204,22 +200,18 @@ int init_service_connection()
if(!is_initialized)
{
struct sockaddr_un addr;
- int tfd = -1;
+ int tfd = -1, attempts = 0, conn_err = -1;
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, af_sock_name, sizeof(addr.sun_path)-1);
- int attempts = 0;
- int conn_err = -1;
-
if ( (tfd = realsocket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
perror("socket error");
exit(-1);
}
-
while(conn_err < 0 && attempts < SERVICE_CONNECT_ATTEMPTS)
{
- dwr("trying connection (%d): %s\n", tfd, af_sock_name);
+ //dwr("trying connection (%d): %s\n", tfd, af_sock_name);
conn_err = realconnect(tfd, (struct sockaddr*)&addr, sizeof(addr));
if(conn_err < 0) {
@@ -252,19 +244,6 @@ void my_dest(void) {
void load_symbols(void)
{
- /*
- dwr("sizeof(connect_st) = %d\n", sizeof(struct connect_st));
- dwr("sizeof(bind_st) = %d\n", sizeof(struct bind_st));
- dwr("sizeof(close_st) = %d\n", sizeof(struct close_st));
- dwr("sizeof(read_st) = %d\n", sizeof(struct read_st));
- dwr("sizeof(write_st) = %d\n", sizeof(struct write_st));
- dwr("sizeof(listen_st) = %d\n", sizeof(struct listen_st));
- dwr("sizeof(socket_st) = %d\n", sizeof(struct socket_st));
- dwr("sizeof(accept_st) = %d\n", sizeof(struct accept_st));
- dwr("sizeof(shutdown_st) = %d\n", sizeof(struct shutdown_st));
- dwr("sizeof(struct sockaddr) = %d\n", sizeof(struct sockaddr));
- */
-
#ifdef USE_OLD_DLSYM
void *lib;
#endif
@@ -272,8 +251,8 @@ void load_symbols(void)
if(thispid == getpid()) {
dwr("detected duplicate call to global ctor (pid=%d).\n", thispid);
}
- dwr(" -- pid = %d\n", getpid());
- dwr(" -- uid = %d\n", getuid());
+ //dwr(" -- pid = %d\n", getpid());
+ //dwr(" -- uid = %d\n", getuid());
thispid = getpid();
#ifndef USE_OLD_DLSYM
@@ -288,10 +267,9 @@ void load_symbols(void)
realsetsockopt = dlsym(RTLD_NEXT, "setsockopt");
realgetsockopt = dlsym(RTLD_NEXT, "getsockopt");
realaccept4 = dlsym(RTLD_NEXT, "accept4");
-
- #ifdef USE_SOCKS_DNS
+#ifdef USE_SOCKS_DNS
realresinit = dlsym(RTLD_NEXT, "res_init");
- #endif
+#endif
#else
lib = dlopen(LIBCONNECT, RTLD_LAZY);
@@ -305,12 +283,10 @@ void load_symbols(void)
realsetsockopt = dlsym(lib, "setsockopt");
realgetsockopt = dlsym(lib, "getsockopt");
realaccept4 = dlsym(lib), "accept4");
-
- #ifdef USE_SOCKS_DNS
+#ifdef USE_SOCKS_DNS
realresinit = dlsym(lib, "res_init");
- #endif
+#endif
dlclose(lib);
-
lib = dlopen(LIBC, RTLD_LAZY);
dlclose(lib);
#endif
@@ -336,147 +312,6 @@ void set_up_intercept()
/*------------------------------------------------------------------------------
-------------------------- ioctl(), fcntl(), setsockopt()------------------------
-------------------------------------------------------------------------------*/
-
-/*
-char *cmd_to_str(int cmd)
-{
- switch(cmd)
- {
- case F_DUPFD:
- return "F_DUPFD";
- case F_GETFD:
- return "F_GETFD";
- case F_SETFD:
- return "F_SETFD";
- case F_GETFL:
- return "F_GETFL";
- case F_SETFL:
- return "F_SETFL";
- case F_GETLK:
- return "F_GETLK";
- case F_SETLK:
- return "F_SETLK";
- case F_SETLKW:
- return "F_SETLKW";
- default:
- return "?";
- }
- return "?";
-}
-*/
-/*
-void arg_to_str(int arg)
-{
- if(arg & O_RDONLY) dwr("O_RDONLY ");
- if(arg & O_WRONLY) dwr("O_WRONLY ");
- if(arg & O_RDWR) dwr("O_RDWR ");
- if(arg & O_CREAT) dwr("O_CREAT ");
- if(arg & O_EXCL) dwr("O_EXCL ");
- if(arg & O_NOCTTY) dwr("O_NOCTTY ");
- if(arg & O_TRUNC) dwr("O_TRUNC ");
- if(arg & O_APPEND) dwr("O_APPEND ");
- if(arg & O_ASYNC) dwr("O_ASYNC ");
- if(arg & O_DIRECT) dwr("O_DIRECT ");
- if(arg & O_NOATIME) dwr("O_NOATIME ");
- if(arg & O_NONBLOCK) dwr("O_NONBLOCK ");
- if(arg & O_DSYNC) dwr("O_DSYNC ");
- if(arg & O_SYNC) dwr("O_SYNC ");
-}
-*/
-/*
-char* level_to_str(int level)
-{
- switch(level)
- {
- case SOL_SOCKET:
- return "SOL_SOCKET";
- case IPPROTO_TCP:
- return "IPPROTO_TCP";
- default:
- return "?";
- }
- return "?";
-}
-*/
-/*
-char* option_name_to_str(int opt)
-{
- if(opt == SO_DEBUG) return "SO_DEBUG";
- if(opt == SO_BROADCAST) return "SO_BROADCAST";
- if(opt == SO_BINDTODEVICE) return "SO_BINDTODEVICE";
- if(opt == SO_REUSEADDR) return "SO_REUSEADDR";
- if(opt == SO_KEEPALIVE) return "SO_KEEPALIVE";
- if(opt == SO_LINGER) return "SO_LINGER";
- if(opt == SO_OOBINLINE) return "SO_OOBINLINE";
- if(opt == SO_SNDBUF) return "SO_SNDBUF";
- if(opt == SO_RCVBUF) return "SO_RCVBUF";
- if(opt == SO_DONTROUTE) return "SO_DONTROUTEO_ASYNC";
- if(opt == SO_RCVLOWAT) return "SO_RCVLOWAT";
- if(opt == SO_RCVTIMEO) return "SO_RCVTIMEO";
- if(opt == SO_SNDLOWAT) return "SO_SNDLOWAT";
- if(opt == SO_SNDTIMEO)return "SO_SNDTIMEO";
- return "?";
-}
-*/
-
-/*------------------------------------------------------------------------------
----------------------------------- shutdown() ----------------------------------
-------------------------------------------------------------------------------*/
-
-/*
-void shutdown_arg_to_str(int arg)
-{
- if(arg & O_RDONLY) dwr("O_RDONLY ");
- if(arg & O_WRONLY) dwr("O_WRONLY ");
- if(arg & O_RDWR) dwr("O_RDWR ");
- if(arg & O_CREAT) dwr("O_CREAT ");
- if(arg & O_EXCL) dwr("O_EXCL ");
- if(arg & O_NOCTTY) dwr("O_NOCTTY ");
- if(arg & O_TRUNC) dwr("O_TRUNC ");
- if(arg & O_APPEND) dwr("O_APPEND ");
- if(arg & O_ASYNC) dwr("O_ASYNC ");
- if(arg & O_DIRECT) dwr("O_DIRECT ");
- if(arg & O_NOATIME) dwr("O_NOATIME ");
- if(arg & O_NONBLOCK) dwr("O_NONBLOCK ");
- if(arg & O_DSYNC) dwr("O_DSYNC ");
- if(arg & O_SYNC) dwr("O_SYNC ");
-}
-*/
-
-/*
-void sock_type_to_str(int arg)
-{
- if(arg == SOCK_STREAM) printf("SOCK_STREAM ");
- if(arg == SOCK_DGRAM) printf("SOCK_DGRAM ");
- if(arg == SOCK_SEQPACKET) printf("SOCK_SEQPACKET ");
- if(arg == SOCK_RAW) printf("SOCK_RAW ");
- if(arg == SOCK_RDM) printf("SOCK_RDM ");
- if(arg == SOCK_PACKET) printf("SOCK_PACKET ");
- if(arg & SOCK_NONBLOCK) printf("| SOCK_NONBLOCK ");
- if(arg & SOCK_CLOEXEC) printf("| SOCK_CLOEXEC ");
-}
-*/
-
-/*
-void sock_domain_to_str(int domain)
-{
- if(domain == AF_UNIX) printf("AF_UNIX ");
- if(domain == AF_LOCAL) printf("AF_LOCAL ");
- if(domain == AF_INET) printf("AF_INET ");
- if(domain == AF_INET6) printf("AF_INET6 ");
- if(domain == AF_IPX) printf("AF_IPX ");
- if(domain == AF_NETLINK) printf("AF_NETLINK ");
- if(domain == AF_X25) printf("AF_X25 ");
- if(domain == AF_AX25) printf("AF_AX25 ");
- if(domain == AF_ATMPVC) printf("AF_ATMPVC ");
- if(domain == AF_APPLETALK) printf("AF_APPLETALK ");
- if(domain == AF_PACKET) printf("AF_PACKET ");
-}
-*/
-
-/*------------------------------------------------------------------------------
--------------------------------- setsockopt() ---------------------------------
------------------------------------------------------------------------------*/
/* int socket, int level, int option_name, const void *option_value, socklen_t option_len */
@@ -844,7 +679,7 @@ int accept(ACCEPT_SIG)
return -1;
}
pthread_mutex_unlock(&lock);
- errno = ERR_OK;
+ //errno = ERR_OK;
return new_conn_socket; // OK
}
else {
@@ -895,7 +730,6 @@ int listen(LISTEN_SIG)
return(reallisten(sockfd, backlog));
char cmd[BUF_SZ];
- dwr("listen(%d)\n", sockfd);
/* Assemble and route command */
memset(cmd, '\0', BUF_SZ);
struct listen_st rpc_st;
diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp
index 0ef3a6f0..72d6273a 100644
--- a/netcon/NetconEthernetTap.cpp
+++ b/netcon/NetconEthernetTap.cpp
@@ -49,7 +49,9 @@
#include "Intercept.h"
#include "NetconUtilities.hpp"
-#define APPLICATION_POLL_FREQ 1
+#define APPLICATION_POLL_FREQ 1
+#define ZT_LWIP_TCP_TIMER_INTERVAL 10
+
namespace ZeroTier {
@@ -238,7 +240,6 @@ void NetconEthernetTap::scanMulticastGroups(std::vector<MulticastGroup> &added,s
if (!std::binary_search(newGroups.begin(),newGroups.end(),*m))
removed.push_back(*m);
}
-
_multicastGroups.swap(newGroups);
}
@@ -291,8 +292,10 @@ void NetconEthernetTap::closeConnection(TcpConnection *conn)
void NetconEthernetTap::closeClient(PhySocket *sock)
{
for(int i=0; i<rpc_sockets.size(); i++) {
- if(rpc_sockets[i] == sock)
+ if(rpc_sockets[i] == sock){
rpc_sockets.erase(rpc_sockets.begin() + i);
+ break;
+ }
}
close(_phy.getDescriptor(sock));
_phy.close(sock);
@@ -309,8 +312,6 @@ void NetconEthernetTap::closeAll()
closeConnection(tcp_connections.front());
}
-#define ZT_LWIP_TCP_TIMER_INTERVAL 10
-
void NetconEthernetTap::threadMain()
throw()
{
@@ -318,6 +319,7 @@ void NetconEthernetTap::threadMain()
uint64_t prev_tcp_time = 0;
uint64_t prev_etharp_time = 0;
+/*
fprintf(stderr, "- MEM_SIZE = %dM\n", MEM_SIZE / (1024*1024));
fprintf(stderr, "- TCP_SND_BUF = %dK\n", TCP_SND_BUF / 1024);
fprintf(stderr, "- MEMP_NUM_PBUF = %d\n", MEMP_NUM_PBUF);
@@ -332,6 +334,7 @@ void NetconEthernetTap::threadMain()
fprintf(stderr, "- ARP_TMR_INTERVAL = %d\n", ARP_TMR_INTERVAL);
fprintf(stderr, "- TCP_TMR_INTERVAL = %d\n", TCP_TMR_INTERVAL);
fprintf(stderr, "- IP_TMR_INTERVAL = %d\n", IP_TMR_INTERVAL);
+*/
// Main timer loop
while (_run) {
@@ -531,6 +534,7 @@ err_t NetconEthernetTap::nc_accept(void *arg, struct tcp_pcb *newpcb, err_t err)
if(socketpair(PF_LOCAL, SOCK_STREAM, 0, fds) < 0) {
if(errno < 0) {
l->tap->send_return_value(conn, -1, errno);
+ //fprintf(stderr, "**************\n");
return ERR_MEM;
}
}
@@ -745,7 +749,7 @@ 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)
-{
+{fprintf(stderr, "nc_sent()\n");
Larg *l = (Larg*)arg;
if(len) {
//fprintf(stderr, "ACKING len = %d, setting read-notify = true, (sndbuf = %d)\n", len, l->conn->pcb->snd_buf);
@@ -769,6 +773,7 @@ err_t NetconEthernetTap::nc_sent(void* arg, struct tcp_pcb *tpcb, u16_t len)
*/
err_t NetconEthernetTap::nc_connected(void *arg, struct tcp_pcb *tpcb, err_t err)
{
+ fprintf(stderr, "nc_connected()\n");
Larg *l = (Larg*)arg;
l->tap->send_return_value(l->conn, ERR_OK);
return ERR_OK;
diff --git a/netcon/libintercept.so.1.0 b/netcon/libintercept.so.1.0
deleted file mode 100755
index f8a46023..00000000
--- a/netcon/libintercept.so.1.0
+++ /dev/null
Binary files differ
diff --git a/netcon/make-intercept.mk b/netcon/make-intercept.mk
index 77d26de7..a16ff7e7 100644
--- a/netcon/make-intercept.mk
+++ b/netcon/make-intercept.mk
@@ -27,7 +27,7 @@
SHCC=gcc
-intercept_CFLAGS = -c -fPIC -g -O2 -Wall -std=c99 -D_GNU_SOURCE -DCHECKS -DNETCON_INTERCEPT
+intercept_CFLAGS = -c -fPIC -g -O2 -Wall -std=c99 -DCHECKS -D_GNU_SOURCE -DNETCON_INTERCEPT
LIB_NAME = intercept
SHLIB_EXT=dylib
SHLIB_MAJOR = 1
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-26 12:16:58 +0000