From 4acb3d81f3657598fbc18461ed5ad4afe24922fe Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 23 Nov 2015 13:25:46 -0800 Subject: Rename Common to common.inc.c to indicate that this is an included C file not a primary build C file. --- netcon/Common.c | 197 ------------------------------------------- netcon/Intercept.c | 3 +- netcon/NetconEthernetTap.cpp | 2 +- netcon/common.inc.c | 197 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 200 insertions(+), 199 deletions(-) delete mode 100644 netcon/Common.c create mode 100644 netcon/common.inc.c (limited to 'netcon') diff --git a/netcon/Common.c b/netcon/Common.c deleted file mode 100644 index 2a852b67..00000000 --- a/netcon/Common.c +++ /dev/null @@ -1,197 +0,0 @@ -/* - * ZeroTier One - Network Virtualization Everywhere - * Copyright (C) 2011-2015 ZeroTier, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * -- - * - * ZeroTier may be used and distributed under the terms of the GPLv3, which - * are available at: http://www.gnu.org/licenses/gpl-3.0.html - * - * If you would like to embed ZeroTier into a commercial application or - * redistribute it in a modified binary form, please contact ZeroTier Networks - * LLC. Start here: http://www.zerotier.com/ - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#define DEBUG_LEVEL 3 - -#define MSG_ERROR 0 // Errors -#define MSG_INFO 1 // Information which is generally useful to any user -#define MSG_DEBUG 2 // Information which is only useful to someone debugging -#define MSG_DEBUG_EXTRA 3 // If nothing in your world makes sense - -#ifdef NETCON_INTERCEPT - -static pthread_mutex_t loglock; - -void print_addr(struct sockaddr *addr) -{ - char *s = NULL; - switch(addr->sa_family) { - case AF_INET: { - struct sockaddr_in *addr_in = (struct sockaddr_in *)addr; - s = malloc(INET_ADDRSTRLEN); - inet_ntop(AF_INET, &(addr_in->sin_addr), s, INET_ADDRSTRLEN); - break; - } - case AF_INET6: { - struct sockaddr_in6 *addr_in6 = (struct sockaddr_in6 *)addr; - s = malloc(INET6_ADDRSTRLEN); - inet_ntop(AF_INET6, &(addr_in6->sin6_addr), s, INET6_ADDRSTRLEN); - break; - } - default: - break; - } - fprintf(stderr, "IP address: %s\n", s); - free(s); -} -#endif - -#ifdef NETCON_SERVICE - namespace ZeroTier { -#endif - void dwr(int level, const char *fmt, ... ) - { - if(level > DEBUG_LEVEL) - return; - int saveerr; - saveerr = errno; - va_list ap; - va_start(ap, fmt); - #ifdef VERBOSE // So we can cut out some clutter in the strace output while debugging - char timestring[20]; - time_t timestamp; - timestamp = time(NULL); - strftime(timestring, sizeof(timestring), "%H:%M:%S", localtime(×tamp)); - pid_t pid = getpid(); - fprintf(stderr, "%s [pid=%7d] ", timestring, pid); - #endif - vfprintf(stderr, fmt, ap); - fflush(stderr); - - errno = saveerr; - va_end(ap); - } -#ifdef NETCON_SERVICE -} -#endif - -ssize_t sock_fd_write(int sock, int fd); -ssize_t sock_fd_read(int sock, void *buf, ssize_t bufsize, int *fd); - -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; -} diff --git a/netcon/Intercept.c b/netcon/Intercept.c index 49c41da6..66dd6a59 100644 --- a/netcon/Intercept.c +++ b/netcon/Intercept.c @@ -50,7 +50,8 @@ #include #include "Intercept.h" -#include "Common.c" + +#include "common.inc.c" #ifdef CHECKS #include diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp index f75cb50a..9035c6ef 100644 --- a/netcon/NetconEthernetTap.cpp +++ b/netcon/NetconEthernetTap.cpp @@ -49,7 +49,7 @@ #include "lwip/ip_frag.h" #include "lwip/tcp.h" -#include "Common.c" +#include "common.inc.c" #define APPLICATION_POLL_FREQ 20 #define ZT_LWIP_TCP_TIMER_INTERVAL 5 diff --git a/netcon/common.inc.c b/netcon/common.inc.c new file mode 100644 index 00000000..2a852b67 --- /dev/null +++ b/netcon/common.inc.c @@ -0,0 +1,197 @@ +/* + * ZeroTier One - Network Virtualization Everywhere + * Copyright (C) 2011-2015 ZeroTier, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * -- + * + * ZeroTier may be used and distributed under the terms of the GPLv3, which + * are available at: http://www.gnu.org/licenses/gpl-3.0.html + * + * If you would like to embed ZeroTier into a commercial application or + * redistribute it in a modified binary form, please contact ZeroTier Networks + * LLC. Start here: http://www.zerotier.com/ + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#define DEBUG_LEVEL 3 + +#define MSG_ERROR 0 // Errors +#define MSG_INFO 1 // Information which is generally useful to any user +#define MSG_DEBUG 2 // Information which is only useful to someone debugging +#define MSG_DEBUG_EXTRA 3 // If nothing in your world makes sense + +#ifdef NETCON_INTERCEPT + +static pthread_mutex_t loglock; + +void print_addr(struct sockaddr *addr) +{ + char *s = NULL; + switch(addr->sa_family) { + case AF_INET: { + struct sockaddr_in *addr_in = (struct sockaddr_in *)addr; + s = malloc(INET_ADDRSTRLEN); + inet_ntop(AF_INET, &(addr_in->sin_addr), s, INET_ADDRSTRLEN); + break; + } + case AF_INET6: { + struct sockaddr_in6 *addr_in6 = (struct sockaddr_in6 *)addr; + s = malloc(INET6_ADDRSTRLEN); + inet_ntop(AF_INET6, &(addr_in6->sin6_addr), s, INET6_ADDRSTRLEN); + break; + } + default: + break; + } + fprintf(stderr, "IP address: %s\n", s); + free(s); +} +#endif + +#ifdef NETCON_SERVICE + namespace ZeroTier { +#endif + void dwr(int level, const char *fmt, ... ) + { + if(level > DEBUG_LEVEL) + return; + int saveerr; + saveerr = errno; + va_list ap; + va_start(ap, fmt); + #ifdef VERBOSE // So we can cut out some clutter in the strace output while debugging + char timestring[20]; + time_t timestamp; + timestamp = time(NULL); + strftime(timestring, sizeof(timestring), "%H:%M:%S", localtime(×tamp)); + pid_t pid = getpid(); + fprintf(stderr, "%s [pid=%7d] ", timestring, pid); + #endif + vfprintf(stderr, fmt, ap); + fflush(stderr); + + errno = saveerr; + va_end(ap); + } +#ifdef NETCON_SERVICE +} +#endif + +ssize_t sock_fd_write(int sock, int fd); +ssize_t sock_fd_read(int sock, void *buf, ssize_t bufsize, int *fd); + +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; +} -- cgit v1.2.3