Test/Code Refactor in preparation for merge

1 files changed, 0 insertions, 123 deletions

diff --git a/netcon/NetconUtilities.cpp b/netcon/NetconUtilities.cpp
index 71b139ad..9f8b902f 100644
--- a/netcon/NetconUtilities.cpp
+++ b/netcon/NetconUtilities.cpp
@@ -40,36 +40,11 @@
 #ifndef _NETCON_UTILITIES_CPP
 #define _NETCON_UTILITIES_CPP
 
-#define DEBUG_LEVEL	4
-
 namespace ZeroTier
 {
-	/*
-	void dwr(int level, char *fmt, ... )
-	{
-		if(level > DEBUG_LEVEL)
-			return;
-		va_list ap;
-		va_start(ap, fmt);
-		vfprintf(stderr, fmt, ap);
-		fflush(stderr);
-		va_end(ap);
-	}
-
-	void dwr(char *fmt, ... )
-	{
-		va_list ap;
-		va_start(ap, fmt);
-		vfprintf(stderr, fmt, ap);
-		fflush(stderr);
-		va_end(ap);
-	}
-*/
 	void clearscreen(){
 		fprintf(stderr, "\033[2J");
 	}
-
-	//void reset_cursor()
 	void gotoxy(int x,int y) {
 	    fprintf(stderr, "%c[%d;%df",0x1B,y,x);
 	}
@@ -91,104 +66,6 @@ namespace ZeroTier
 		if (readlink (ppfd, dest, 80) != -1){
 		}
 	}
-
-	// Functions used to pass file descriptors between processes
-	ssize_t sock_fd_write(int sock, int fd)
-	{
-		ssize_t size;
-		struct msghdr msg;
-		struct iovec iov;
-		char buf = '\0';
-		int buflen = 1;
-
-		union
-		{
-			  struct cmsghdr  cmsghdr;
-			  char control[CMSG_SPACE(sizeof (int))];
-		} cmsgu;
-		struct cmsghdr *cmsg;
-
-		iov.iov_base = &buf;
-		iov.iov_len = buflen;
-
-		msg.msg_name = NULL;
-		msg.msg_namelen = 0;
-		msg.msg_iov = &iov;
-		msg.msg_iovlen = 1;
-
-		if (fd != -1) {
-			  msg.msg_control = cmsgu.control;
-			  msg.msg_controllen = sizeof(cmsgu.control);
-			  cmsg = CMSG_FIRSTHDR(&msg);
-			  cmsg->cmsg_len = CMSG_LEN(sizeof (int));
-			  cmsg->cmsg_level = SOL_SOCKET;
-			  cmsg->cmsg_type = SCM_RIGHTS;
-			  *((int *) CMSG_DATA(cmsg)) = fd;
-		} else {
-			  msg.msg_control = NULL;
-			  msg.msg_controllen = 0;
-		}
-
-		size = sendmsg(sock, &msg, 0);
-		if (size < 0)
-			  perror ("sendmsg");
-		return size;
-	}
-
-
-	ssize_t sock_fd_read(int sock, void *buf, ssize_t bufsize, int *fd)
-	{
-	    ssize_t size;
-
-	    if (fd) {
-	        struct msghdr msg;
-	        struct iovec iov;
-	        union
-					{
-	            struct cmsghdr cmsghdr;
-	            char control[CMSG_SPACE(sizeof (int))];
-	        } cmsgu;
-	        struct cmsghdr *cmsg;
-
-	        iov.iov_base = buf;
-	        iov.iov_len = bufsize;
-
-	        msg.msg_name = NULL;
-	        msg.msg_namelen = 0;
-	        msg.msg_iov = &iov;
-	        msg.msg_iovlen = 1;
-	        msg.msg_control = cmsgu.control;
-	        msg.msg_controllen = sizeof(cmsgu.control);
-	        size = recvmsg (sock, &msg, 0);
-	        if (size < 0) {
-	            perror ("recvmsg");
-	            exit(1);
-	        }
-	        cmsg = CMSG_FIRSTHDR(&msg);
-	        if (cmsg && cmsg->cmsg_len == CMSG_LEN(sizeof(int))) {
-	            if (cmsg->cmsg_level != SOL_SOCKET) {
-	                fprintf (stderr, "invalid cmsg_level %d\n",
-	                     cmsg->cmsg_level);
-	                exit(1);
-	            }
-	            if (cmsg->cmsg_type != SCM_RIGHTS) {
-	                fprintf (stderr, "invalid cmsg_type %d\n",
-	                     cmsg->cmsg_type);
-	                exit(1);
-	            }
-
-	            *fd = *((int *) CMSG_DATA(cmsg));
-	        } else
-	            *fd = -1;
-	    } else {
-	        size = read (sock, buf, bufsize);
-	        if (size < 0) {
-	            perror("read");
-	            exit(1);
-	        }
-	    }
-	    return size;
-	}
 }
 
 #endif