Archives
/
lokinet
mirror of https://github.com/oxen-io/lokinet
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

update libtuntap, make it compile without warnings and add to CMakeLists.txt

Browse Source
pull/5/head
Jeff Becker 6 years ago
parent 0af33b4205
commit 64d12086c9
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
5 changed files with 336 additions and 266 deletions
Show Stats Download Patch File Download Diff File

32
CMakeLists.txt
Unescape Escape View File

@ -100,6 +100,35 @@ set(LIB llarp)
set(SHARED_LIB ${LIB})
set(STATIC_LIB ${LIB}-static)
set(TT_ROOT vendor/libtuntap-master)
add_definitions(-D${CMAKE_SYSTEM_NAME})
add_definitions(-DUNIX)
if(UNIX)
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-linux.c)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-openbsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-netbsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-freebsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-darwin.c ${TT_ROOT}/tuntap-unix-bsd.c)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-freebsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
else()
message(FATAL_ERROR "Your operating system is not supported yet")
endif()
endif(UNIX)
set(LIBTUNTAP_SRC
${TT_ROOT}/tuntap.c
${TT_ROOT}/tuntap_log.c
${TT_ROOT}/tuntap-unix.c
${LIBTUNTAP_IMPL})
set(LIB_SRC
llarp/address_info.cpp
llarp/bencode.c
@ -160,6 +189,7 @@ set(LIB_SRC
vendor/cppbackport-master/lib/fs/copyfile.cpp
vendor/cppbackport-master/lib/fs/absolute.cpp
vendor/cppbackport-master/lib/fs/direntry.cpp
${LIBTUNTAP_SRC}
)
set(TEST_SRC
@ -183,8 +213,6 @@ include_directories(llarp)
include_directories(include)
include_directories(vendor/cppbackport-master/lib)
if(SHADOW)
add_shadow_plugin(shadow-plugin-${SHARED_LIB} ${EXE_SRC} ${LIB_SRC})
target_link_libraries(shadow-plugin-${SHARED_LIB} ${LIBS})

BIN
vendor/libtuntap-master/lib/libtuntap.2.1.dylib vendored
View File

Binary file not shown.

1
vendor/libtuntap-master/lib/libtuntap.dylib vendored
Unescape Escape View File

@ -1 +0,0 @@
libtuntap.2.1.dylib

327
vendor/libtuntap-master/tuntap.c vendored
Unescape Escape View File

@ -28,196 +28,223 @@
#include <sys/types.h>
#if defined Windows
# include <winsock2.h>
# include <ws2tcpip.h>
#include <winsock2.h>
#include <ws2tcpip.h>
#else
# include <netinet/in.h>
# include <arpa/inet.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#endif
#include <stdio.h>
#include <ctype.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <stdarg.h>
#include "tuntap.h"
struct device *
tuntap_init(void) {
struct device *dev = NULL;
tuntap_init(void)
{
struct device *dev = NULL;
if ((dev = (struct device *)malloc(sizeof(*dev))) == NULL)
return NULL;
if((dev = (struct device *)malloc(sizeof(*dev))) == NULL)
return NULL;
(void)memset(dev->if_name, '\0', sizeof(dev->if_name));
(void)memset(dev->hwaddr, '\0', sizeof(dev->hwaddr));
dev->tun_fd = TUNFD_INVALID_VALUE;
dev->ctrl_sock = -1;
dev->flags = 0;
(void)memset(dev->if_name, '\0', sizeof(dev->if_name));
(void)memset(dev->hwaddr, '\0', sizeof(dev->hwaddr));
dev->tun_fd = TUNFD_INVALID_VALUE;
dev->ctrl_sock = -1;
dev->flags = 0;
tuntap_log = tuntap_log_default;
return dev;
tuntap_log = tuntap_log_default;
return dev;
}
void
tuntap_destroy(struct device *dev) {
tuntap_sys_destroy(dev);
tuntap_release(dev);
tuntap_destroy(struct device *dev)
{
tuntap_sys_destroy(dev);
tuntap_release(dev);
}
char *
tuntap_get_ifname(struct device *dev) {
return dev->if_name;
tuntap_get_ifname(struct device *dev)
{
return dev->if_name;
}
int
tuntap_version(void) {
return TUNTAP_VERSION;
tuntap_version(void)
{
return TUNTAP_VERSION;
}
#if !defined(FreeBSD)
int
tuntap_set_ip_old(struct device *dev, const char *addr, int netmask) {
t_tun_in_addr baddr4;
t_tun_in6_addr baddr6;
uint32_t mask;
int errval;
/* Only accept started device */
if (dev->tun_fd == TUNFD_INVALID_VALUE) {
tuntap_log(TUNTAP_LOG_NOTICE, "Device is not started");
return 0;
}
if (addr == NULL) {
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameter 'addr'");
return -1;
}
if (netmask < 0 || netmask > 128) {
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameter 'netmask'");
return -1;
}
/* Netmask */
mask = ~0;
mask = ~(mask >> netmask);
mask = htonl(mask);
/*
* Destination address parsing: we try IPv4 first and fall back to
* IPv6 if inet_pton return 0
*/
(void)memset(&baddr4, '\0', sizeof(baddr4));
(void)memset(&baddr6, '\0', sizeof(baddr6));
errval = inet_pton(AF_INET, addr, &(baddr4));
if (errval == 1) {
return tuntap_sys_set_ipv4(dev, &baddr4, mask);
} else if (errval == 0) {
if (inet_pton(AF_INET6, addr, &(baddr6)) == -1) {
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameters");
return -1;
}
return tuntap_sys_set_ipv6(dev, &baddr6, mask);
} else if (errval == -1) {
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameters");
return -1;
}
/* NOTREACHED */
return -1;
tuntap_set_ip_old(struct device *dev, const char *addr, int netmask)
{
t_tun_in_addr baddr4;
t_tun_in6_addr baddr6;
uint32_t mask;
int errval;
/* Only accept started device */
if(dev->tun_fd == TUNFD_INVALID_VALUE)
{
tuntap_log(TUNTAP_LOG_NOTICE, "Device is not started");
return 0;
}
if(addr == NULL)
{
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameter 'addr'");
return -1;
}
if(netmask < 0 || netmask > 128)
{
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameter 'netmask'");
return -1;
}
/* Netmask */
mask = ~0;
mask = ~(mask >> netmask);
mask = htonl(mask);
/*
* Destination address parsing: we try IPv4 first and fall back to
* IPv6 if inet_pton return 0
*/
(void)memset(&baddr4, '\0', sizeof(baddr4));
(void)memset(&baddr6, '\0', sizeof(baddr6));
errval = inet_pton(AF_INET, addr, &(baddr4));
if(errval == 1)
{
return tuntap_sys_set_ipv4(dev, &baddr4, mask);
}
else if(errval == 0)
{
if(inet_pton(AF_INET6, addr, &(baddr6)) == -1)
{
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameters");
return -1;
}
return tuntap_sys_set_ipv6(dev, &baddr6, mask);
}
else if(errval == -1)
{
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameters");
return -1;
}
/* NOTREACHED */
return -1;
}
#endif
int
tuntap_set_ip(struct device *dev, ...)
{
va_list vl;
char *saddr;
char *daddr;
int netmask;
t_tun_in_addr sbaddr4;
t_tun_in_addr dbaddr4;
t_tun_in6_addr sbaddr6;
t_tun_in6_addr dbaddr6;
uint32_t mask;
int errval;
saddr = daddr = NULL;
netmask = -1;
va_start(vl, dev);
saddr = va_arg(vl, char *);
netmask = va_arg(vl, int);
va_list vl;
char *saddr;
char *daddr;
int netmask;
t_tun_in_addr sbaddr4;
t_tun_in6_addr sbaddr6;
#if defined(FreeBSD)
if (dev->mode == TUNTAP_MODE_TUNNEL)
daddr = va_arg(vl, char *);
t_tun_in_addr dbaddr4;
t_tun_in6_addr dbaddr6;
#endif
va_end(vl);
/* Only accept started device */
if (dev->tun_fd == TUNFD_INVALID_VALUE) {
tuntap_log(TUNTAP_LOG_NOTICE, "Device is not started");
return 0;
}
if (saddr == NULL) {
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameter 'saddr'");
return -1;
}
if (netmask < 0 || netmask > 128) {
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameter 'netmask'");
return -1;
}
/* Netmask */
mask = ~0;
mask = ~(mask >> netmask);
mask = htonl(mask);
/*
* Destination address parsing: we try IPv4 first and fall back to
* IPv6 if inet_pton return 0
*/
(void)memset(&sbaddr4, 0, sizeof(sbaddr4));
(void)memset(&sbaddr6, 0, sizeof(sbaddr6));
errval = inet_pton(AF_INET, saddr, &(sbaddr4));
if (errval == 1) {
uint32_t mask;
int errval;
saddr = daddr = NULL;
netmask = -1;
va_start(vl, dev);
saddr = va_arg(vl, char *);
netmask = va_arg(vl, int);
#if defined(FreeBSD)
if(dev->mode == TUNTAP_MODE_TUNNEL)
daddr = va_arg(vl, char *);
#endif
va_end(vl);
/* Only accept started device */
if(dev->tun_fd == TUNFD_INVALID_VALUE)
{
tuntap_log(TUNTAP_LOG_NOTICE, "Device is not started");
return 0;
}
if(saddr == NULL)
{
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameter 'saddr'");
return -1;
}
if(netmask < 0 || netmask > 128)
{
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameter 'netmask'");
return -1;
}
/* Netmask */
mask = ~0;
mask = ~(mask >> netmask);
mask = htonl(mask);
/*
* Destination address parsing: we try IPv4 first and fall back to
* IPv6 if inet_pton return 0
*/
(void)memset(&sbaddr4, 0, sizeof(sbaddr4));
(void)memset(&sbaddr6, 0, sizeof(sbaddr6));
errval = inet_pton(AF_INET, saddr, &(sbaddr4));
if(errval == 1)
{
#if defined(FreeBSD)
#define tuntap_sys_set_ipv4 tuntap_sys_set_ipv4_tap
if (dev->mode == TUNTAP_MODE_TUNNEL) {
if (daddr == NULL) {
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameter 'daddr'");
return -1;
}
(void)memset(&dbaddr4, 0, sizeof(dbaddr4));
(void)inet_pton(AF_INET, daddr, &(dbaddr4));
return tuntap_sys_set_ipv4_tun(dev, &sbaddr4, &dbaddr4, mask);
} else
if(dev->mode == TUNTAP_MODE_TUNNEL)
{
if(daddr == NULL)
{
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameter 'daddr'");
return -1;
}
(void)memset(&dbaddr4, 0, sizeof(dbaddr4));
(void)inet_pton(AF_INET, daddr, &(dbaddr4));
return tuntap_sys_set_ipv4_tun(dev, &sbaddr4, &dbaddr4, mask);
}
else
#endif
{
return tuntap_sys_set_ipv4(dev, &sbaddr4, mask);
}
} else if (errval == 0) {
{
return tuntap_sys_set_ipv4(dev, &sbaddr4, mask);
}
}
else if(errval == 0)
{
#if !defined(FreeBSD) /* No IPV6 tests YET */
if (inet_pton(AF_INET6, saddr, &(sbaddr6)) == -1) {
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameters");
return -1;
}
return tuntap_sys_set_ipv6(dev, &sbaddr6, mask);
} else if (errval == -1) {
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameters");
return -1;
if(inet_pton(AF_INET6, saddr, &(sbaddr6)) == -1)
{
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameters");
return -1;
}
return tuntap_sys_set_ipv6(dev, &sbaddr6, mask);
}
else if(errval == -1)
{
tuntap_log(TUNTAP_LOG_ERR, "Invalid parameters");
return -1;
#endif
}
/* NOTREACHED */
return -1;
}
/* NOTREACHED */
return -1;
}

242
vendor/libtuntap-master/tuntap_log.c vendored
Unescape Escape View File

@ -13,135 +13,151 @@
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
**/
**/
#if defined Windows
# include <windows.h>
#include <windows.h>
#endif
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include "tuntap.h"
void
tuntap_log_set_cb(t_tuntap_log cb) {
if (cb == NULL)
tuntap_log = tuntap_log_default;
tuntap_log = cb;
tuntap_log_set_cb(t_tuntap_log cb)
{
if(cb == NULL)
{
tuntap_log = tuntap_log_default;
}
tuntap_log = cb;
}
void
tuntap_log_default(int level, const char *errmsg) {
char *name;
switch(level) {
case TUNTAP_LOG_DEBUG:
name = "Debug";
break;
case TUNTAP_LOG_INFO:
name = "Info";
break;
case TUNTAP_LOG_NOTICE:
name = "Notice";
break;
case TUNTAP_LOG_WARN:
name = "Warning";
break;
case TUNTAP_LOG_ERR:
name = "Error";
break;
case TUNTAP_LOG_NONE:
default:
name = NULL;
break;
}
if (name == NULL) {
(void)fprintf(stderr, "%s\n", errmsg);
} else {
(void)fprintf(stderr, "%s: %s\n", name, errmsg);
}
tuntap_log_default(int level, const char *errmsg)
{
char *name;
switch(level)
{
case TUNTAP_LOG_DEBUG:
name = "Debug";
break;
case TUNTAP_LOG_INFO:
name = "Info";
break;
case TUNTAP_LOG_NOTICE:
name = "Notice";
break;
case TUNTAP_LOG_WARN:
name = "Warning";
break;
case TUNTAP_LOG_ERR:
name = "Error";
break;
case TUNTAP_LOG_NONE:
default:
name = NULL;
break;
}
if(name == NULL)
{
(void)fprintf(stderr, "%s\n", errmsg);
}
else
{
(void)fprintf(stderr, "%s: %s\n", name, errmsg);
}
}
void
tuntap_log_hexdump(void *data, size_t size) {
unsigned char *p = (unsigned char *)data;
unsigned int c;
size_t n;
char bytestr[4] = {0};
char addrstr[10] = {0};
char hexstr[16 * 3 + 5] = {0};
char charstr[16 * 1 + 5] = {0};
char buf[1024];
for (n = 1; n <= size; n++) {
if (n % 16 == 1) {
/* store address for this line */
snprintf(addrstr, sizeof(addrstr), "%.4lx",
((uintptr_t)p - (uintptr_t)data) );
}
c = *p;
if (isalnum(c) == 0) {
c = '.';
}
/* store hex str (for left side) */
snprintf(bytestr, sizeof(bytestr), "%02X ", *p);
strncat(hexstr, bytestr, sizeof(hexstr)-strlen(hexstr)-1);
/* store char str (for right side) */
snprintf(bytestr, sizeof(bytestr), "%c", c);
strncat(charstr, bytestr, sizeof(charstr)-strlen(charstr)-1);
if (n % 16 == 0) {
/* line completed */
(void)memset(buf, 0, sizeof buf);
(void)snprintf(buf, sizeof buf,
"[%4.4s] %-50.50s %s", addrstr, hexstr, charstr);
tuntap_log(TUNTAP_LOG_NONE, buf);
hexstr[0] = 0;
charstr[0] = 0;
} else if (n % 8 == 0) {
/* half line: add whitespaces */
strncat(hexstr, " ", sizeof(hexstr)-strlen(hexstr)-1);
strncat(charstr, " ", sizeof(charstr)-strlen(charstr)-1);
}
p++; /* next byte */
}
/* print the rest of the buffer if not empty */
if (strlen(hexstr) > 0) {
(void)memset(buf, 0, sizeof buf);
(void)snprintf(buf, sizeof buf, "[%4.4s] %-50.50s %s",
addrstr, hexstr, charstr);
tuntap_log(TUNTAP_LOG_NONE, buf);
}
tuntap_log_hexdump(void *data, size_t size)
{
unsigned char *p = (unsigned char *)data;
unsigned int c;
size_t n;
char bytestr[4] = {0};
char addrstr[10] = {0};
char hexstr[16 * 3 + 5] = {0};
char charstr[16 * 1 + 5] = {0};
char buf[1024];
for(n = 1; n <= size; n++)
{
if(n % 16 == 1)
{
/* store address for this line */
snprintf(addrstr, sizeof(addrstr), "%.4lx",
((uintptr_t)p - (uintptr_t)data));
}
c = *p;
if(isalnum(c) == 0)
{
c = '.';
}
/* store hex str (for left side) */
snprintf(bytestr, sizeof(bytestr), "%02X ", *p);
strncat(hexstr, bytestr, sizeof(hexstr) - strlen(hexstr) - 1);
/* store char str (for right side) */
snprintf(bytestr, sizeof(bytestr), "%c", c);
strncat(charstr, bytestr, sizeof(charstr) - strlen(charstr) - 1);
if(n % 16 == 0)
{
/* line completed */
(void)memset(buf, 0, sizeof buf);
(void)snprintf(buf, sizeof buf, "[%4.4s] %-50.50s %s", addrstr, hexstr,
charstr);
tuntap_log(TUNTAP_LOG_NONE, buf);
hexstr[0] = 0;
charstr[0] = 0;
}
else if(n % 8 == 0)
{
/* half line: add whitespaces */
strncat(hexstr, " ", sizeof(hexstr) - strlen(hexstr) - 1);
strncat(charstr, " ", sizeof(charstr) - strlen(charstr) - 1);
}
p++; /* next byte */
}
/* print the rest of the buffer if not empty */
if(strlen(hexstr) > 0)
{
(void)memset(buf, 0, sizeof buf);
(void)snprintf(buf, sizeof buf, "[%4.4s] %-50.50s %s", addrstr, hexstr,
charstr);
tuntap_log(TUNTAP_LOG_NONE, buf);
}
}
void
tuntap_log_chksum(void *addr, int count) {
int sum;
short *sptr;
char buf[32];
sum = 0;
sptr = (short *)addr;
while (count > 1)
{
sum = sum + *sptr;
count = count - 2;
sptr++;
}
addr = (char *)sptr;
if (count > 0)
sum = sum + *((char *) addr);
sum = ~sum;
(void)memset(buf, 0, sizeof buf);
(void)snprintf(buf, sizeof buf, "Checksum of this block: %0#4x", sum);
tuntap_log(TUNTAP_LOG_NONE, buf);
}
tuntap_log_chksum(void *addr, int count)
{
int sum;
short *sptr;
char buf[32];
sum = 0;
sptr = (short *)addr;
while(count > 1)
{
sum = sum + *sptr;
count = count - 2;
sptr++;
}
addr = (char *)sptr;
if(count > 0)
sum = sum + *((char *)addr);
sum = ~sum;
(void)memset(buf, 0, sizeof buf);
(void)snprintf(buf, sizeof buf, "Checksum of this block: %0#4x", sum);
tuntap_log(TUNTAP_LOG_NONE, buf);
}

Write Preview
Loading…
Cancel
Save