gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweaks for Windows cmake build

Browse Source
This commit is contained in:
joseph.henry
2018-01-30 17:27:40 -08:00
parent cc52c3c59c
commit 2c5634343a
15 changed files with 336 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
CMakeLists.txt
View File

@@ -36,7 +36,8 @@ set (EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
set (LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) set (LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
if (WIN32) if (WIN32)
set (CMAKE_C_FLAGS "-DZT_SDK=1") add_definitions(-DSDK=1)
add_definitions(-DZT_SDK=1)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc -DNOMINMAX") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc -DNOMINMAX")
set (LWIP_PORT_DIR ${PROJ_DIR}/ext/lwip-contrib/ports/win32/include) set (LWIP_PORT_DIR ${PROJ_DIR}/ext/lwip-contrib/ports/win32/include)
#set (COMMON_DEBUG_FLAGS "-DLIBZT_TRACE=1 -DLIBZT_DEBUG=1 -DNS_TRACE=1 -DNS_DEBUG=1") #set (COMMON_DEBUG_FLAGS "-DLIBZT_TRACE=1 -DLIBZT_DEBUG=1 -DNS_TRACE=1 -DNS_DEBUG=1")
@@ -79,7 +80,6 @@ file (GLOB lwip_src_glob
${LWIP_SRC_DIR}/core/ipv6/*.c) ${LWIP_SRC_DIR}/core/ipv6/*.c)
add_library (lwip STATIC ${lwip_src_glob}) add_library (lwip STATIC ${lwip_src_glob})
add_library (lwip_pic STATIC ${lwip_src_glob}) add_library (lwip_pic STATIC ${lwip_src_glob})
#target_compile_options (lwip_pic PRIVATE ${NS_DEFS})
set_target_properties (lwip_pic PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties (lwip_pic PROPERTIES POSITION_INDEPENDENT_CODE ON)
@@ -97,7 +97,6 @@ file (GLOB zto_src_glob
${ZTO_SRC_DIR}/controller/*.cpp ${ZTO_SRC_DIR}/controller/*.cpp
${ZTO_SRC_DIR}/osdep/ManagedRoute.cpp) ${ZTO_SRC_DIR}/osdep/ManagedRoute.cpp)
add_library (zto STATIC ${zto_src_glob}) add_library (zto STATIC ${zto_src_glob})
#set (zto "--whole-archive")
target_link_libraries (zto http) target_link_libraries (zto http)
target_link_libraries (zto zt) target_link_libraries (zto zt)
add_library (zto_pic STATIC ${zto_src_glob}) add_library (zto_pic STATIC ${zto_src_glob})
@@ -119,38 +118,37 @@ include_directories ("${LIBZT_SRC_DIR}")
include_directories ("${PROJ_DIR}/include") include_directories ("${PROJ_DIR}/include")
file (GLOB libzt_src_glob ${LIBZT_SRC_DIR}/*.cpp) file (GLOB libzt_src_glob ${LIBZT_SRC_DIR}/*.cpp)
add_library (zt ${libzt_src_glob}) add_library (zt ${libzt_src_glob})
#set (zt "--whole-archive")
target_link_libraries (zt lwip zto) target_link_libraries (zt lwip zto)
set_target_properties (zt PROPERTIES OUTPUT_NAME zt) #set_target_properties (zt PROPERTIES OUTPUT_NAME zt)
# (libzt) Shared Library variant of ZeroTier paired with userspace stack and virtual tap interface # (libzt) Shared Library variant of ZeroTier paired with userspace stack and virtual tap interface
add_library (ztshared SHARED ${libzt_src_glob}) #add_library (ztshared SHARED ${libzt_src_glob})
target_link_libraries (ztshared zto_pic lwip_pic) #target_link_libraries (ztshared zto_pic lwip_pic)
set_target_properties (ztshared PROPERTIES OUTPUT_NAME zt) #set_target_properties (ztshared PROPERTIES OUTPUT_NAME zt)
# --- Test applications, examples, etc --- # --- Test applications, examples, etc ---
file (GLOB APP_SOURCES ${PROJ_DIR}/examples/bindings/cpp/ipv4simple/* #file (GLOB APP_SOURCES ${PROJ_DIR}/examples/bindings/cpp/ipv4simple/*
${PROJ_DIR}/examples/bindings/cpp/ipv6simple/* # ${PROJ_DIR}/examples/bindings/cpp/ipv6simple/*
${PROJ_DIR}/examples/bindings/cpp/ipv6adhoc/* # ${PROJ_DIR}/examples/bindings/cpp/ipv6adhoc/*
${PROJ_DIR}/examples/apps/ztproxy/*.cpp # ${PROJ_DIR}/examples/apps/ztproxy/*.cpp
) #)
foreach (testsourcefile ${APP_SOURCES}) #foreach (testsourcefile ${APP_SOURCES})
string (REPLACE ".cpp" "" testname ${testsourcefile}) # string (REPLACE ".cpp" "" testname ${testsourcefile})
get_filename_component (testname ${testname} NAME) # get_filename_component (testname ${testname} NAME)
add_executable (${testname} ${testsourcefile}) # add_executable (${testname} ${testsourcefile})
target_link_libraries (${testname} lwip zto zt pthread) # target_link_libraries (${testname} lwip zto zt pthread)
endforeach (testsourcefile ${APP_SOURCES}) #endforeach (testsourcefile ${APP_SOURCES})
# selftest # selftest
add_executable (selftest ${PROJ_DIR}/test/selftest.cpp) add_executable (selftest ${PROJ_DIR}/test/selftest.cpp)
target_compile_options (selftest PRIVATE -D__SELFTEST__) target_compile_options (selftest PRIVATE -std=c++1 -D__SELFTEST__)
target_link_libraries (selftest lwip zto zt pthread) target_link_libraries (selftest lwip zto zt)
# nativetest # nativetest
add_executable (nativetest ${PROJ_DIR}/test/selftest.cpp) #add_executable (nativetest ${PROJ_DIR}/test/selftest.cpp)
target_compile_options (nativetest PRIVATE -D__NATIVETEST__) #target_compile_options (nativetest PRIVATE -D__NATIVETEST__)
target_link_libraries (nativetest lwip zto zt pthread) #target_link_libraries (nativetest lwip zto zt pthread)
# Clean up intermediate library targets # Clean up intermediate library targets
#file (REMOVE ${LIBRARY_OUTPUT_PATH}/libhttp.a) #file (REMOVE ${LIBRARY_OUTPUT_PATH}/libhttp.a)
@@ -163,7 +161,7 @@ target_link_libraries (nativetest lwip zto zt pthread)
# --- INSTALL # --- INSTALL
install (TARGETS zt DESTINATION lib) #install (TARGETS zt DESTINATION lib)
# --- CONFIGURATION # --- CONFIGURATION

8
examples/bindings/cpp/ipv4simple/ipv4client.cpp
View File

@@ -72,13 +72,14 @@ int main(int argc, char **argv)
zts_startjoin(path.c_str(), nwid); zts_startjoin(path.c_str(), nwid);
uint64_t nodeId = zts_get_node_id(); uint64_t nodeId = zts_get_node_id();
DEBUG_TEST("I am %llx", nodeId); DEBUG_TEST("I am %llx", nodeId);
sleep(2);
if ((sockfd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) if ((sockfd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
}
if ((err = zts_connect(sockfd, (const struct sockaddr *)&in4, sizeof(in4))) < 0) if ((err = zts_connect(sockfd, (const struct sockaddr *)&in4, sizeof(in4))) < 0) {
DEBUG_ERROR("error connecting to remote host (%d)", err); DEBUG_ERROR("error connecting to remote host (%d)", err);
}
DEBUG_TEST("sending to server..."); DEBUG_TEST("sending to server...");
w = zts_write(sockfd, msg, strlen(msg)); w = zts_write(sockfd, msg, strlen(msg));
@@ -89,7 +90,6 @@ int main(int argc, char **argv)
DEBUG_TEST("Sent : %s", msg); DEBUG_TEST("Sent : %s", msg);
DEBUG_TEST("Received : %s", rbuf); DEBUG_TEST("Received : %s", rbuf);
sleep(2);
err = zts_close(sockfd); err = zts_close(sockfd);
return err; return err;

28
examples/bindings/cpp/ipv4simple/ipv4server.cpp
View File

@@ -25,22 +25,20 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <unistd.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
#include <inttypes.h>
#if defined(__linux__) || defined(__APPLE__) #if defined(_WIN32)
#include <WinSock2.h>
#include <stdint.h>
#else
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <unistd.h>
#endif #endif
#if defined(__MINGW32__) || defined(__MINGW64__)
#include <WinSock2.h>
#include <stdint.h>
#endif
#include "libzt.h" #include "libzt.h"
int main(int argc, char **argv) int main(int argc, char **argv)
@@ -70,20 +68,23 @@ int main(int argc, char **argv)
zts_startjoin(path.c_str(), nwid); zts_startjoin(path.c_str(), nwid);
uint64_t nodeId = zts_get_node_id(); uint64_t nodeId = zts_get_node_id();
DEBUG_TEST("I am %llx", nodeId); DEBUG_TEST("I am %llx", nodeId);
sleep(2);
if ((sockfd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) if ((sockfd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
}
if ((err = zts_bind(sockfd, (struct sockaddr *)&in4, sizeof(struct sockaddr_in)) < 0)) if ((err = zts_bind(sockfd, (struct sockaddr *)&in4, sizeof(struct sockaddr_in)) < 0)) {
DEBUG_ERROR("error binding to interface (%d)", err); DEBUG_ERROR("error binding to interface (%d)", err);
}
if ((err = zts_listen(sockfd, 100)) < 0) if ((err = zts_listen(sockfd, 100)) < 0) {
DEBUG_ERROR("error placing socket in LISTENING state (%d)", err); DEBUG_ERROR("error placing socket in LISTENING state (%d)", err);
}
socklen_t client_addrlen = sizeof(sockaddr_in); socklen_t client_addrlen = sizeof(sockaddr_in);
if ((accfd = zts_accept(sockfd, (struct sockaddr *)&acc_in4, &client_addrlen)) < 0) if ((accfd = zts_accept(sockfd, (struct sockaddr *)&acc_in4, &client_addrlen)) < 0) {
DEBUG_ERROR("error accepting connection (%d)", err); DEBUG_ERROR("error accepting connection (%d)", err);
}
socklen_t peer_addrlen = sizeof(struct sockaddr_storage); socklen_t peer_addrlen = sizeof(struct sockaddr_storage);
zts_getpeername(accfd, (struct sockaddr*)&acc_in4, &peer_addrlen); zts_getpeername(accfd, (struct sockaddr*)&acc_in4, &peer_addrlen);
@@ -97,7 +98,6 @@ int main(int argc, char **argv)
DEBUG_TEST("Received : %s", rbuf); DEBUG_TEST("Received : %s", rbuf);
sleep(2);
err = zts_close(sockfd); err = zts_close(sockfd);
err = zts_close(accfd); err = zts_close(accfd);

20
examples/bindings/cpp/ipv6adhoc/ipv6adhocclient.cpp
View File

@@ -25,21 +25,19 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <unistd.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
#include <inttypes.h> #include <inttypes.h>
#if defined(__linux__) || defined(__APPLE__) #if defined(_WIN32)
#include <WinSock2.h>
#include <stdint.h>
#else
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #include <unistd.h>
#if defined(__MINGW32__) || defined(__MINGW64__)
#include <WinSock2.h>
#include <stdint.h>
#endif #endif
#include "libzt.h" #include "libzt.h"
@@ -93,13 +91,13 @@ int main(int argc, char **argv)
uint64_t nodeId = zts_get_node_id(); uint64_t nodeId = zts_get_node_id();
DEBUG_TEST("I am %llx", nodeId); DEBUG_TEST("I am %llx", nodeId);
sleep(5); if ((sockfd = zts_socket(AF_INET6, SOCK_STREAM, 0)) < 0) {
if ((sockfd = zts_socket(AF_INET6, SOCK_STREAM, 0)) < 0)
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
}
if ((err = zts_connect(sockfd, (const struct sockaddr *)&in6, sizeof(in6))) < 0) if ((err = zts_connect(sockfd, (const struct sockaddr *)&in6, sizeof(in6))) < 0) {
DEBUG_ERROR("error connecting to remote host (%d)", err); DEBUG_ERROR("error connecting to remote host (%d)", err);
}
DEBUG_TEST("sending to server..."); DEBUG_TEST("sending to server...");
w = zts_write(sockfd, msg, strlen(msg)); w = zts_write(sockfd, msg, strlen(msg));

25
examples/bindings/cpp/ipv6adhoc/ipv6adhocserver.cpp
View File

@@ -25,20 +25,19 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <unistd.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
#include <inttypes.h>
#if defined(__linux__) || defined(__APPLE__) #if defined(_WIN32)
#include <WinSock2.h>
#include <stdint.h>
#else
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #include <unistd.h>
#if defined(__MINGW32__) || defined(__MINGW64__)
#include <WinSock2.h>
#include <stdint.h>
#endif #endif
#include "libzt.h" #include "libzt.h"
@@ -92,18 +91,22 @@ int main(int argc, char **argv)
uint64_t nodeId = zts_get_node_id(); uint64_t nodeId = zts_get_node_id();
DEBUG_TEST("I am %llx", nodeId); DEBUG_TEST("I am %llx", nodeId);
if ((sockfd = zts_socket(AF_INET6, SOCK_STREAM, 0)) < 0) if ((sockfd = zts_socket(AF_INET6, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
}
if ((err = zts_bind(sockfd, (struct sockaddr *)&in6, sizeof(struct sockaddr_in6)) < 0)) if ((err = zts_bind(sockfd, (struct sockaddr *)&in6, sizeof(struct sockaddr_in6)) < 0)) {
DEBUG_ERROR("error binding to interface (%d)", err); DEBUG_ERROR("error binding to interface (%d)", err);
}
if ((err = zts_listen(sockfd, 100)) < 0) if ((err = zts_listen(sockfd, 100)) < 0) {
DEBUG_ERROR("error placing socket in LISTENING state (%d)", err); DEBUG_ERROR("error placing socket in LISTENING state (%d)", err);
}
socklen_t client_addrlen = sizeof(sockaddr_in6); socklen_t client_addrlen = sizeof(sockaddr_in6);
if ((accfd = zts_accept(sockfd, (struct sockaddr *)&acc_in6, &client_addrlen)) < 0) if ((accfd = zts_accept(sockfd, (struct sockaddr *)&acc_in6, &client_addrlen)) < 0) {
DEBUG_ERROR("error accepting connection (%d)", err); DEBUG_ERROR("error accepting connection (%d)", err);
}
socklen_t peer_addrlen = sizeof(struct sockaddr_storage); socklen_t peer_addrlen = sizeof(struct sockaddr_storage);
zts_getpeername(accfd, (struct sockaddr*)&acc_in6, &peer_addrlen); zts_getpeername(accfd, (struct sockaddr*)&acc_in6, &peer_addrlen);

20
examples/bindings/cpp/ipv6simple/ipv6client.cpp
View File

@@ -25,21 +25,19 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <unistd.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
#include <inttypes.h> #include <inttypes.h>
#if defined(__linux__) || defined(__APPLE__) #if defined(_WIN32)
#include <WinSock2.h>
#include <stdint.h>
#else
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #include <unistd.h>
#if defined(__MINGW32__) || defined(__MINGW64__)
#include <WinSock2.h>
#include <stdint.h>
#endif #endif
#include "libzt.h" #include "libzt.h"
@@ -75,13 +73,13 @@ int main(int argc, char **argv)
uint64_t nodeId = zts_get_node_id(); uint64_t nodeId = zts_get_node_id();
DEBUG_TEST("I am %llx", nodeId); DEBUG_TEST("I am %llx", nodeId);
sleep(5); if ((sockfd = zts_socket(AF_INET6, SOCK_STREAM, 0)) < 0) {
if ((sockfd = zts_socket(AF_INET6, SOCK_STREAM, 0)) < 0)
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
}
if ((err = zts_connect(sockfd, (const struct sockaddr *)&in6, sizeof(in6))) < 0) if ((err = zts_connect(sockfd, (const struct sockaddr *)&in6, sizeof(in6))) < 0) {
DEBUG_ERROR("error connecting to remote host (%d)", err); DEBUG_ERROR("error connecting to remote host (%d)", err);
}
DEBUG_TEST("sending to server..."); DEBUG_TEST("sending to server...");
w = zts_write(sockfd, msg, strlen(msg)); w = zts_write(sockfd, msg, strlen(msg));

25
examples/bindings/cpp/ipv6simple/ipv6server.cpp
View File

@@ -25,20 +25,19 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <unistd.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
#include <inttypes.h>
#if defined(__linux__) || defined(__APPLE__) #if defined(_WIN32)
#include <WinSock2.h>
#include <stdint.h>
#else
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #include <unistd.h>
#if defined(__MINGW32__) || defined(__MINGW64__)
#include <WinSock2.h>
#include <stdint.h>
#endif #endif
#include "libzt.h" #include "libzt.h"
@@ -71,18 +70,22 @@ int main(int argc, char **argv)
uint64_t nodeId = zts_get_node_id(); uint64_t nodeId = zts_get_node_id();
DEBUG_TEST("I am %llx", nodeId); DEBUG_TEST("I am %llx", nodeId);
if ((sockfd = zts_socket(AF_INET6, SOCK_STREAM, 0)) < 0) if ((sockfd = zts_socket(AF_INET6, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
}
if ((err = zts_bind(sockfd, (struct sockaddr *)&in6, sizeof(struct sockaddr_in6)) < 0)) if ((err = zts_bind(sockfd, (struct sockaddr *)&in6, sizeof(struct sockaddr_in6)) < 0)) {
DEBUG_ERROR("error binding to interface (%d)", err); DEBUG_ERROR("error binding to interface (%d)", err);
}
if ((err = zts_listen(sockfd, 100)) < 0) if ((err = zts_listen(sockfd, 100)) < 0) {
DEBUG_ERROR("error placing socket in LISTENING state (%d)", err); DEBUG_ERROR("error placing socket in LISTENING state (%d)", err);
}
socklen_t client_addrlen = sizeof(sockaddr_in6); socklen_t client_addrlen = sizeof(sockaddr_in6);
if ((accfd = zts_accept(sockfd, (struct sockaddr *)&acc_in6, &client_addrlen)) < 0) if ((accfd = zts_accept(sockfd, (struct sockaddr *)&acc_in6, &client_addrlen)) < 0) {
DEBUG_ERROR("error accepting connection (%d)", err); DEBUG_ERROR("error accepting connection (%d)", err);
}
socklen_t peer_addrlen = sizeof(struct sockaddr_storage); socklen_t peer_addrlen = sizeof(struct sockaddr_storage);
zts_getpeername(accfd, (struct sockaddr*)&acc_in6, &peer_addrlen); zts_getpeername(accfd, (struct sockaddr*)&acc_in6, &peer_addrlen);

4
include/libzt.h
View File

@@ -480,6 +480,10 @@ ZT_SOCKET_API int ZTCALL zts_select(
* @param flags * @param flags
* @return * @return
*/ */
#if defined(_WIN32)
#define F_SETFL 0
#define O_NONBLOCK 0
#endif
ZT_SOCKET_API int ZTCALL zts_fcntl(int fd, int cmd, int flags); ZT_SOCKET_API int ZTCALL zts_fcntl(int fd, int cmd, int flags);
/** /**

24
include/libztDebug.h
View File

@@ -101,8 +101,8 @@ extern unsigned int gettid();
"STACK[%ld]: %17s:%5d:%20s: " fmt "\n", ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args)) "STACK[%ld]: %17s:%5d:%20s: " fmt "\n", ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args))
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
#define DEBUG_STACK(fmt, args, ...) fprintf(stderr, ZT_YEL "STACK[%ld]: %17s:%5d:%25s: " fmt \ #define DEBUG_STACK(fmt, ...) fprintf(stderr, ZT_YEL "STACK[%ld]: %17s:%5d:%25s: " fmt \
ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args) ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, __VA_ARGS__)
#else #else
#define DEBUG_STACK(fmt, args ...) fprintf(stderr, ZT_YEL "STACK[%ld]: %17s:%5d:%25s: " fmt \ #define DEBUG_STACK(fmt, args ...) fprintf(stderr, ZT_YEL "STACK[%ld]: %17s:%5d:%25s: " fmt \
ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args) ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args)
@@ -117,8 +117,8 @@ extern unsigned int gettid();
"TEST : %17s:%5d:%25s: " fmt "\n", ZT_FILENAME, __LINE__, __FUNCTION__, ##args)) "TEST : %17s:%5d:%25s: " fmt "\n", ZT_FILENAME, __LINE__, __FUNCTION__, ##args))
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
#define DEBUG_TEST(fmt, args, ...) fprintf(stderr, ZT_CYN "TEST [%ld]: %17s:%5d:%25s: " fmt "\n" \ #define DEBUG_TEST(fmt, ...) fprintf(stderr, ZT_CYN "TEST [%ld]: %17s:%5d:%25s: " fmt "\n" \
ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args) ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, __VA_ARGS__)
#else #else
#define DEBUG_TEST(fmt, args ...) fprintf(stderr, ZT_CYN "TEST [%ld]: %17s:%5d:%25s: " fmt "\n" \ #define DEBUG_TEST(fmt, args ...) fprintf(stderr, ZT_CYN "TEST [%ld]: %17s:%5d:%25s: " fmt "\n" \
ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args) ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args)
@@ -134,8 +134,8 @@ extern unsigned int gettid();
"ERROR: %17s:%5d:%20s: " fmt "\n", ZT_FILENAME, __LINE__, __FUNCTION__, ##args)) "ERROR: %17s:%5d:%20s: " fmt "\n", ZT_FILENAME, __LINE__, __FUNCTION__, ##args))
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
#define DEBUG_ERROR(fmt, args, ...) fprintf(stderr, ZT_RED "ERROR[%ld]: %17s:%5d:%25s: " fmt "\n" \ #define DEBUG_ERROR(fmt, ...) fprintf(stderr, ZT_RED "ERROR[%ld]: %17s:%5d:%25s: " fmt "\n" \
ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args) ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, __VA_ARGS__)
#else #else
#define DEBUG_ERROR(fmt, args ...) fprintf(stderr, ZT_RED "ERROR[%ld]: %17s:%5d:%25s: " fmt "\n" \ #define DEBUG_ERROR(fmt, args ...) fprintf(stderr, ZT_RED "ERROR[%ld]: %17s:%5d:%25s: " fmt "\n" \
ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args) ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args)
@@ -151,8 +151,8 @@ extern unsigned int gettid();
"INFO : %17s:%5d:%20s: " fmt "\n", ZT_FILENAME, __LINE__, __FUNCTION__, ##args)) "INFO : %17s:%5d:%20s: " fmt "\n", ZT_FILENAME, __LINE__, __FUNCTION__, ##args))
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
#define DEBUG_INFO(fmt, args, ...) fprintf(stderr, ZT_WHT "INFO [%ld]: %17s:%5d:%25s: " fmt "\n" \ #define DEBUG_INFO(fmt, ...) fprintf(stderr, ZT_WHT "INFO [%ld]: %17s:%5d:%25s: " fmt "\n" \
ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args) ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, __VA_ARGS__)
#else #else
#define DEBUG_INFO(fmt, args ...) fprintf(stderr, ZT_WHT "INFO [%ld]: %17s:%5d:%25s: " fmt "\n" \ #define DEBUG_INFO(fmt, args ...) fprintf(stderr, ZT_WHT "INFO [%ld]: %17s:%5d:%25s: " fmt "\n" \
ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args) ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args)
@@ -168,8 +168,8 @@ extern unsigned int gettid();
"TRANS: %17s:%5d:%25s: " fmt "\n", ZT_FILENAME, __LINE__, __FUNCTION__, ##args)) "TRANS: %17s:%5d:%25s: " fmt "\n", ZT_FILENAME, __LINE__, __FUNCTION__, ##args))
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
#define DEBUG_TRANS(fmt, args, ...) fprintf(stderr, ZT_GRN "TRANS[%ld]: %17s:%5d:%25s: " fmt "\n" \ #define DEBUG_TRANS(fmt, ...) fprintf(stderr, ZT_GRN "TRANS[%ld]: %17s:%5d:%25s: " fmt "\n" \
ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args) ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, __VA_ARGS__)
#else #else
#define DEBUG_TRANS(fmt, args ...) fprintf(stderr, ZT_GRN "TRANS[%ld]: %17s:%5d:%25s: " fmt "\n" \ #define DEBUG_TRANS(fmt, args ...) fprintf(stderr, ZT_GRN "TRANS[%ld]: %17s:%5d:%25s: " fmt "\n" \
ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args) ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args)
@@ -185,8 +185,8 @@ extern unsigned int gettid();
"EXTRA: %17s:%5d:%25s: " fmt "\n", ZT_FILENAME, __LINE__, __FUNCTION__, ##args)) "EXTRA: %17s:%5d:%25s: " fmt "\n", ZT_FILENAME, __LINE__, __FUNCTION__, ##args))
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
#define DEBUG_EXTRA(fmt, args, ...) fprintf(stderr, ZT_WHT "EXTRA[%ld]: %17s:%5d:%25s: " fmt "\n" \ #define DEBUG_EXTRA(fmt, ...) fprintf(stderr, ZT_WHT "EXTRA[%ld]: %17s:%5d:%25s: " fmt "\n" \
ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args, (long)0) ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, __VA_ARGS__, (long)0)
#else #else
#define DEBUG_EXTRA(fmt, args ...) fprintf(stderr, ZT_WHT "EXTRA[%ld]: %17s:%5d:%25s: " fmt "\n" \ #define DEBUG_EXTRA(fmt, args ...) fprintf(stderr, ZT_WHT "EXTRA[%ld]: %17s:%5d:%25s: " fmt "\n" \
ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args) ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args)

16
src/VirtualTap.cpp
View File

@@ -150,7 +150,7 @@ bool VirtualTap::addIp(const InetAddress &ip)
bool VirtualTap::removeIp(const InetAddress &ip) bool VirtualTap::removeIp(const InetAddress &ip)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
Mutex::Lock _l(_ips_m); Mutex::Lock _l(_ips_m);
std::vector<InetAddress>::iterator i(std::find(_ips.begin(),_ips.end(),ip)); std::vector<InetAddress>::iterator i(std::find(_ips.begin(),_ips.end(),ip));
//if (i == _ips.end()) { //if (i == _ips.end()) {
@@ -257,12 +257,12 @@ void VirtualTap::threadMain()
void VirtualTap::phyOnUnixClose(PhySocket *sock, void **uptr) void VirtualTap::phyOnUnixClose(PhySocket *sock, void **uptr)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
} }
void VirtualTap::phyOnUnixData(PhySocket *sock, void **uptr, void *data, ssize_t len) void VirtualTap::phyOnUnixData(PhySocket *sock, void **uptr, void *data, ssize_t len)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
#if defined(LIBZT_RAW) #if defined(LIBZT_RAW)
VirtualSocket *vs = (VirtualSocket*)*uptr; VirtualSocket *vs = (VirtualSocket*)*uptr;
if (vs == NULL) { if (vs == NULL) {
@@ -276,7 +276,7 @@ void VirtualTap::phyOnUnixData(PhySocket *sock, void **uptr, void *data, ssize_t
void VirtualTap::phyOnUnixWritable(PhySocket *sock, void **uptr, bool stack_invoked) void VirtualTap::phyOnUnixWritable(PhySocket *sock, void **uptr, bool stack_invoked)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
#if defined(LIBZT_RAW) #if defined(LIBZT_RAW)
if (sock) { if (sock) {
Read(sock,uptr,stack_invoked); Read(sock,uptr,stack_invoked);
@@ -289,7 +289,7 @@ void VirtualTap::phyOnUnixWritable(PhySocket *sock, void **uptr, bool stack_invo
bool VirtualTap::routeAdd(const InetAddress &ip, const InetAddress &nm, const InetAddress &gw) bool VirtualTap::routeAdd(const InetAddress &ip, const InetAddress &nm, const InetAddress &gw)
{ {
bool err = false; bool err = false;
DEBUG_EXTRA(); DEBUG_EXTRA("");
#if defined(STACK_LWIP) #if defined(STACK_LWIP)
// general_lwip_init_interface(this, NULL, "n1", _mac, ip, nm, gw); // general_lwip_init_interface(this, NULL, "n1", _mac, ip, nm, gw);
// general_turn_on_interface(NULL); // general_turn_on_interface(NULL);
@@ -307,7 +307,7 @@ bool VirtualTap::routeAdd(const InetAddress &ip, const InetAddress &nm, const In
bool VirtualTap::routeDelete(const InetAddress &ip, const InetAddress &nm) bool VirtualTap::routeDelete(const InetAddress &ip, const InetAddress &nm)
{ {
bool err = false; bool err = false;
DEBUG_EXTRA(); DEBUG_EXTRA("");
#if defined(STACK_LWIP) #if defined(STACK_LWIP)
// general_lwip_init_interface(this, NULL, "n1", _mac, ip, nm, gw); // general_lwip_init_interface(this, NULL, "n1", _mac, ip, nm, gw);
// general_turn_on_interface(NULL); // general_turn_on_interface(NULL);
@@ -325,7 +325,7 @@ bool VirtualTap::routeDelete(const InetAddress &ip, const InetAddress &nm)
void VirtualTap::addVirtualSocket(VirtualSocket *vs) void VirtualTap::addVirtualSocket(VirtualSocket *vs)
{ {
#if defined(LIBZT_RAW) #if defined(LIBZT_RAW)
DEBUG_EXTRA(); DEBUG_EXTRA("");
Mutex::Lock _l(_tcpconns_m); Mutex::Lock _l(_tcpconns_m);
_VirtualSockets.push_back(vs); _VirtualSockets.push_back(vs);
#endif #endif
@@ -334,7 +334,7 @@ void VirtualTap::addVirtualSocket(VirtualSocket *vs)
void VirtualTap::removeVirtualSocket() void VirtualTap::removeVirtualSocket()
{ {
#if defined(LIBZT_RAW) #if defined(LIBZT_RAW)
DEBUG_EXTRA(); DEBUG_EXTRA("");
Mutex::Lock _l(_tcpconns_m); Mutex::Lock _l(_tcpconns_m);
for (int i=0; i<_VirtualSockets.size(); i++) { for (int i=0; i<_VirtualSockets.size(); i++) {
if (vs == _VirtualSockets[i]) { if (vs == _VirtualSockets[i]) {

22
src/ZT1Service.cpp
View File

@@ -170,7 +170,7 @@ VirtualTap *getAnyTap()
uint64_t zts_get_node_id_from_file(const char *filepath) uint64_t zts_get_node_id_from_file(const char *filepath)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
std::string fname("identity.public"); std::string fname("identity.public");
std::string fpath(filepath); std::string fpath(filepath);
std::string oldid; std::string oldid;
@@ -362,7 +362,7 @@ void zts_get_rfc4193_addr(struct sockaddr_storage *addr, const uint64_t nwid, co
int zts_join(const uint64_t nwid) int zts_join(const uint64_t nwid)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
if (nwid == 0) { if (nwid == 0) {
return -1; return -1;
} }
@@ -382,7 +382,7 @@ int zts_join(const uint64_t nwid)
int zts_leave(const uint64_t nwid) int zts_leave(const uint64_t nwid)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
if (nwid == 0) { if (nwid == 0) {
return -1; return -1;
} }
@@ -413,7 +413,7 @@ int zts_ready()
int zts_start(const char *path, bool blocking = false) int zts_start(const char *path, bool blocking = false)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
if (zt1Service) { if (zt1Service) {
return 0; // already initialized, ok return 0; // already initialized, ok
} }
@@ -448,7 +448,7 @@ int zts_start(const char *path, bool blocking = false)
int zts_startjoin(const char *path, const uint64_t nwid) int zts_startjoin(const char *path, const uint64_t nwid)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
int err = zts_start(path, true); int err = zts_start(path, true);
while (true) { while (true) {
try { try {
@@ -468,7 +468,7 @@ int zts_startjoin(const char *path, const uint64_t nwid)
void zts_stop() void zts_stop()
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
if (zt1Service) { if (zt1Service) {
zt1Service->terminate(); zt1Service->terminate();
// disableTaps(); // disableTaps();
@@ -480,7 +480,7 @@ void zts_stop()
void zts_get_path(char *homePath, size_t len) void zts_get_path(char *homePath, size_t len)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
if (homeDir.length()) { if (homeDir.length()) {
memset(homePath, 0, len); memset(homePath, 0, len);
size_t buf_len = len < homeDir.length() ? len : homeDir.length(); size_t buf_len = len < homeDir.length() ? len : homeDir.length();
@@ -490,7 +490,7 @@ void zts_get_path(char *homePath, size_t len)
uint64_t zts_get_node_id() uint64_t zts_get_node_id()
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
if (zt1Service) { if (zt1Service) {
return zt1Service->getNode()->address(); return zt1Service->getNode()->address();
} }
@@ -499,7 +499,7 @@ uint64_t zts_get_node_id()
unsigned long zts_get_peer_count() unsigned long zts_get_peer_count()
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
if (zt1Service) { if (zt1Service) {
return zt1Service->getNode()->peers()->peerCount; return zt1Service->getNode()->peers()->peerCount;
} }
@@ -510,7 +510,7 @@ unsigned long zts_get_peer_count()
int zts_get_peer_address(char *peer, const uint64_t nodeId) int zts_get_peer_address(char *peer, const uint64_t nodeId)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
if (zt1Service) { if (zt1Service) {
ZT_PeerList *pl = zt1Service->getNode()->peers(); ZT_PeerList *pl = zt1Service->getNode()->peers();
// uint64_t addr; // uint64_t addr;
@@ -527,7 +527,7 @@ int zts_get_peer_address(char *peer, const uint64_t nodeId)
void zts_allow_http_control(bool allowed) void zts_allow_http_control(bool allowed)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
// TODO // TODO
} }

10
src/libzt.cpp
View File

@@ -257,7 +257,7 @@ int zts_getpeername(int fd, struct sockaddr *addr, socklen_t *addrlen)
int zts_gethostname(char *name, size_t len) int zts_gethostname(char *name, size_t len)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
if (zts_ready() == false) { if (zts_ready() == false) {
DEBUG_ERROR("service not started yet, call zts_startjoin()"); DEBUG_ERROR("service not started yet, call zts_startjoin()");
return -1; return -1;
@@ -275,7 +275,7 @@ int zts_gethostname(char *name, size_t len)
int zts_sethostname(const char *name, size_t len) int zts_sethostname(const char *name, size_t len)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
if (zts_ready() == false) { if (zts_ready() == false) {
DEBUG_ERROR("service not started yet, call zts_startjoin()"); DEBUG_ERROR("service not started yet, call zts_startjoin()");
return -1; return -1;
@@ -373,7 +373,7 @@ int zts_poll(struct pollfd *fds, nfds_t nfds, int timeout)
int zts_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, int zts_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
struct timeval *timeout) struct timeval *timeout)
{ {
//DEBUG_EXTRA(); //DEBUG_EXTRA("");
/* /*
if (zts_ready() == false) { if (zts_ready() == false) {
DEBUG_ERROR("service not started yet, call zts_startjoin()"); DEBUG_ERROR("service not started yet, call zts_startjoin()");
@@ -611,7 +611,7 @@ int zts_shutdown(int fd, int how)
int zts_add_dns_nameserver(struct sockaddr *addr) int zts_add_dns_nameserver(struct sockaddr *addr)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
if (zts_ready() == false) { if (zts_ready() == false) {
DEBUG_ERROR("service not started yet, call zts_startjoin()"); DEBUG_ERROR("service not started yet, call zts_startjoin()");
return -1; return -1;
@@ -634,7 +634,7 @@ int zts_add_dns_nameserver(struct sockaddr *addr)
int zts_del_dns_nameserver(struct sockaddr *addr) int zts_del_dns_nameserver(struct sockaddr *addr)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
if (zts_ready() == false) { if (zts_ready() == false) {
DEBUG_ERROR("service not started yet, call zts_startjoin()"); DEBUG_ERROR("service not started yet, call zts_startjoin()");
return -1; return -1;

4
src/lwIP.cpp
View File

@@ -90,7 +90,7 @@ err_t tapif_init(struct netif *netif)
/* /*
static void tcp_timeout(void *data) static void tcp_timeout(void *data)
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
LWIP_UNUSED_ARG(data); LWIP_UNUSED_ARG(data);
#if TCP_DEBUG && LWIP_TCP #if TCP_DEBUG && LWIP_TCP
// tcp_debug_print_pcbs(); // tcp_debug_print_pcbs();
@@ -129,7 +129,7 @@ static void main_thread(void *arg)
// initialize the lwIP stack // initialize the lwIP stack
void lwip_driver_init() void lwip_driver_init()
{ {
DEBUG_EXTRA(); DEBUG_EXTRA("");
driver_m.lock(); // unlocked from callback indicating completion of driver init driver_m.lock(); // unlocked from callback indicating completion of driver init
if (lwip_driver_initialized == true) { if (lwip_driver_initialized == true) {
return; return;

347
test/selftest.cpp
View File

@@ -24,21 +24,6 @@
* of your own application. * of your own application.
*/ */
#if defined(__linux__) || defined(__APPLE__)
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <netdb.h>
#include <poll.h>
#endif
#if defined(__MINGW32__) || defined(__MINGW64__)
#include <WinSock2.h>
#include <stdint.h>
#endif
#include <unistd.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -51,10 +36,10 @@
#include <fstream> #include <fstream>
#include <map> #include <map>
#include <ctime> #include <ctime>
#include <sys/time.h>
#include <pthread.h>
#include <signal.h> #include <signal.h>
#include <cstring> #include <cstring>
#include <chrono>
#include <thread>
#include "libzt.h" #include "libzt.h"
@@ -62,15 +47,94 @@
#include "Utils.hpp" #include "Utils.hpp"
#endif #endif
#if defined(__linux__) || defined(__APPLE__)
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <netdb.h>
#include <poll.h>
#include <unistd.h>
#include <pthread.h>
#include <sys/time.h>
#endif
#if defined(_WIN32)
#include <WinSock2.h>
#include <WS2tcpip.h>
#include <Ws2def.h>
#include <stdint.h>
#include <windows.h>
#include <time.h>
void sleep(unsigned long ms)
{
Sleep(ms);
}
void micro_sleep(unsigned long us)
{
std::this_thread::sleep_for(std::chrono::microseconds(us));
}
#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64
#else
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
#endif
struct timezone
{
int tz_minuteswest;
int tz_dsttime;
};
int gettimeofday(struct timeval *tv, struct timezone *tz)
{
FILETIME ft;
unsigned __int64 tmpres = 0;
static int tzflag;
if (NULL != tv)
{
GetSystemTimeAsFileTime(&ft);
tmpres |= ft.dwHighDateTime;
tmpres <<= 32;
tmpres |= ft.dwLowDateTime;
/*converting file time to unix epoch*/
tmpres -= DELTA_EPOCH_IN_MICROSECS;
tmpres /= 10; /*convert into microseconds*/
tv->tv_sec = (long)(tmpres / 1000000UL);
tv->tv_usec = (long)(tmpres % 1000000UL);
}
if (NULL != tz)
{
if (!tzflag)
{
_tzset();
tzflag++;
}
tz->tz_minuteswest = _timezone / 60;
tz->tz_dsttime = _daylight;
}
return 0;
}
#endif
#define EXIT_ON_FAIL false #define EXIT_ON_FAIL false
#define PASSED 1 #define TEST_PASSED 1
#define FAILED 0 #define TEST_FAILED 0
#define ECHO_INTERVAL 1000000 // microseconds #define ECHO_INTERVAL 1000000 // microseconds
#define SLAM_INTERVAL 500000 // microseconds #define SLAM_INTERVAL 500000 // microseconds
#define WAIT_FOR_TEST_TO_CONCLUDE 0
#define ARTIFICIAL_SOCKET_LINGER 1 #define ARTIFICIAL_SOCKET_LINGER 1
#define STR_SIZE 32 #define STR_SIZE 32
@@ -90,21 +154,15 @@
#define MIN_PORT 5000 #define MIN_PORT 5000
#define MAX_PORT 50000 #define MAX_PORT 50000
#define TCP_UNIT_TEST_SIG_4 struct sockaddr_in *addr, int op, int cnt, char *details, \ #define TCP_UNIT_TEST_SIG_4 struct sockaddr_in *addr, int op, int cnt, char *details, bool *passed
bool *passed #define UDP_UNIT_TEST_SIG_4 struct sockaddr_in *local_addr, struct sockaddr_in *remote_addr, int op, int cnt, char *details, bool *passed
#define UDP_UNIT_TEST_SIG_4 struct sockaddr_in *local_addr, struct sockaddr_in *remote_addr, \
int op, int cnt, char *details, bool *passed
#define TCP_UNIT_TEST_SIG_6 struct sockaddr_in6 *addr, int op, int cnt, char *details, \ #define TCP_UNIT_TEST_SIG_6 struct sockaddr_in6 *addr, int op, int cnt, char *details, bool *passed
bool *passed #define UDP_UNIT_TEST_SIG_6 struct sockaddr_in6 *local_addr, struct sockaddr_in6 *remote_addr, int op, int cnt, char *details, bool *passed
#define UDP_UNIT_TEST_SIG_6 struct sockaddr_in6 *local_addr, struct sockaddr_in6 *remote_addr, \
int op, int cnt, char *details, bool *passed
#define ECHOTEST_MODE_RX 333 #define ECHOTEST_MODE_RX 333
#define ECHOTEST_MODE_TX 666 #define ECHOTEST_MODE_TX 666
#define DATA_BUF_SZ 1024*32
#define MAX_RX_BUF_SZ 2048 #define MAX_RX_BUF_SZ 2048
#define MAX_TX_BUF_SZ 2048 #define MAX_TX_BUF_SZ 2048
@@ -112,10 +170,9 @@
#define DETAILS_STR_LEN 128 #define DETAILS_STR_LEN 128
// If running a self test, use libzt calls // If running a self test, use libzt calls
#if defined(__SELFTEST__) #if defined(__SELFTEST__)
#define SOCKET zts_socket //#define SOCKET zts_socket
#define BIND zts_bind #define BIND zts_bind
#define LISTEN zts_listen #define LISTEN zts_listen
#define ACCEPT zts_accept #define ACCEPT zts_accept
@@ -157,8 +214,6 @@ inline unsigned int gettid()
#define LISTEN listen #define LISTEN listen
#define ACCEPT accept #define ACCEPT accept
#define CONNECT connect #define CONNECT connect
#define READ read
#define WRITE write
#define RECV recvmsg #define RECV recvmsg
#define SEND send #define SEND send
#define RECVFROM recvfrom #define RECVFROM recvfrom
@@ -170,7 +225,15 @@ inline unsigned int gettid()
#define IOCTL ioctl #define IOCTL ioctl
#define FCNTL fcntl #define FCNTL fcntl
#define SELECT select #define SELECT select
#if defined(_WIN32)
#define READ recv
#define WRITE send
#define CLOSE closesocket
#else
#define READ read
#define WRITE write
#define CLOSE close #define CLOSE close
#endif
#define GETPEERNAME getpeername #define GETPEERNAME getpeername
#endif #endif
@@ -220,6 +283,21 @@ std::map<std::string, std::string> testConf;
/* Helper Functions */ /* Helper Functions */
/****************************************************************************/ /****************************************************************************/
/** Returns true on success, or false if there was an error */
bool SetSocketBlockingEnabled(int fd, bool blocking)
{
if (fd < 0) return false;
#ifdef _WIN32
unsigned long mode = blocking ? 0 : 1;
return (ioctlsocket(fd, FIONBIO, &mode) == 0) ? true : false;
#else
int flags = FCNTL(fd, F_GETFL, 0);
if (flags == -1) return false;
flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK);
return (FCNTL(fd, F_SETFL, flags) == 0) ? true : false;
#endif
}
void displayResults(int *results, int size) void displayResults(int *results, int size)
{ {
int success = 0, failure = 0; int success = 0, failure = 0;
@@ -322,7 +400,7 @@ void RECORD_RESULTS(bool passed, char *details, std::vector<std::string> *result
{ {
char *ok_str = (char*)"[ OK ]"; char *ok_str = (char*)"[ OK ]";
char *fail_str = (char*)"[ FAIL ]"; char *fail_str = (char*)"[ FAIL ]";
if (passed == PASSED) { if (passed == TEST_PASSED) {
DEBUG_TEST("%s", ok_str); DEBUG_TEST("%s", ok_str);
results->push_back(std::string(ok_str) + " " + std::string(details)); results->push_back(std::string(ok_str) + " " + std::string(details));
} else { } else {
@@ -345,7 +423,7 @@ void wait_until_everyone_is_ready(struct sockaddr *local_addr, struct sockaddr *
int accepted_fd; int accepted_fd;
// listen socket setup // listen socket setup
int listen_fd; int listen_fd;
if ((listen_fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) { if ((listen_fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
perror("socket"); perror("socket");
exit(0); exit(0);
} if ((err = BIND(listen_fd, (struct sockaddr *)local_addr, sizeof(struct sockaddr_in)) < 0)) { } if ((err = BIND(listen_fd, (struct sockaddr *)local_addr, sizeof(struct sockaddr_in)) < 0)) {
@@ -354,19 +432,15 @@ void wait_until_everyone_is_ready(struct sockaddr *local_addr, struct sockaddr *
} if ((err = LISTEN(listen_fd, 0)) < 0) { } if ((err = LISTEN(listen_fd, 0)) < 0) {
perror("listen"); perror("listen");
exit(0); exit(0);
} if ((err = FCNTL(listen_fd, F_SETFL, O_NONBLOCK) < 0)) { }
perror("fcntl"); SetSocketBlockingEnabled(listen_fd, true);
exit(0);
}
// connect socket setup // connect socket setup
int conn_fd; int conn_fd;
if ((conn_fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) { if ((conn_fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
perror("socket"); perror("socket");
exit(0); exit(0);
} if ((err = FCNTL(conn_fd, F_SETFL, O_NONBLOCK) < 0)) {
perror("fcntl");
exit(0);
} }
SetSocketBlockingEnabled(conn_fd, true);
while(connected == false) { while(connected == false) {
if ((err = CONNECT(conn_fd, (const struct sockaddr *)remote_addr, sizeof(*remote_addr))) < 0) { if ((err = CONNECT(conn_fd, (const struct sockaddr *)remote_addr, sizeof(*remote_addr))) < 0) {
if (errno == EISCONN) { if (errno == EISCONN) {
@@ -409,7 +483,7 @@ void tcp_select_server(TCP_UNIT_TEST_SIG_4)
int w=0, r=0, fd, client_fd, err, len = strlen(msg.c_str()); int w=0, r=0, fd, client_fd, err, len = strlen(msg.c_str());
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -498,7 +572,7 @@ void tcp_select_client(TCP_UNIT_TEST_SIG_4)
int r, w, fd, err, len = strlen(msg.c_str()); int r, w, fd, err, len = strlen(msg.c_str());
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -580,7 +654,7 @@ void tcp_client_4(TCP_UNIT_TEST_SIG_4)
int r, w, fd, err, len = strlen(msg.c_str()); int r, w, fd, err, len = strlen(msg.c_str());
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -627,7 +701,7 @@ void tcp_server_4(TCP_UNIT_TEST_SIG_4)
int w=0, r=0, fd, client_fd, err, len = strlen(msg.c_str()); int w=0, r=0, fd, client_fd, err, len = strlen(msg.c_str());
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -687,7 +761,7 @@ void tcp_client_6(TCP_UNIT_TEST_SIG_6)
int r, w, fd, err, len = strlen(msg.c_str()); int r, w, fd, err, len = strlen(msg.c_str());
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET6, SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(AF_INET6, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -734,7 +808,7 @@ void tcp_server_6(TCP_UNIT_TEST_SIG_6)
int w=0, r=0, fd, client_fd, err, len = strlen(msg.c_str()); int w=0, r=0, fd, client_fd, err, len = strlen(msg.c_str());
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET6, SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(AF_INET6, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -799,18 +873,13 @@ void udp_client_4(UDP_UNIT_TEST_SIG_4)
int r, w, fd, err, len = strlen(msg.c_str()); int r, w, fd, err, len = strlen(msg.c_str());
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET, SOCK_DGRAM, 0)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
return; return;
} }
if ((err = FCNTL(fd, F_SETFL, O_NONBLOCK) < 0)) { SetSocketBlockingEnabled(fd, true);
fprintf(stderr, "error setting O_NONBLOCK (errno=%d)", errno);
perror("fcntl");
*passed = false;
return;
}
DEBUG_TEST("sending UDP packets until I get a single response..."); DEBUG_TEST("sending UDP packets until I get a single response...");
if ((err = BIND(fd, (struct sockaddr *)local_addr, sizeof(struct sockaddr_in)) < 0)) { if ((err = BIND(fd, (struct sockaddr *)local_addr, sizeof(struct sockaddr_in)) < 0)) {
DEBUG_ERROR("error binding to interface (%d)", err); DEBUG_ERROR("error binding to interface (%d)", err);
@@ -855,7 +924,7 @@ void udp_server_4(UDP_UNIT_TEST_SIG_4)
int r, w, fd, err, len = strlen(msg.c_str()); int r, w, fd, err, len = strlen(msg.c_str());
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET, SOCK_DGRAM, 0)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -932,19 +1001,13 @@ void udp_client_6(UDP_UNIT_TEST_SIG_6)
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET6, SOCK_DGRAM, 0)) < 0) { if ((fd = zts_socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
return; return;
} }
if ((err = FCNTL(fd, F_SETFL, O_NONBLOCK) < 0)) { SetSocketBlockingEnabled(fd, true);
std::cout << "error setting O_NONBLOCK (errno=" << strerror(errno) << ")" << std::endl;
perror("fcntl");
*passed = false;
return;
}
DEBUG_TEST("[1] binding and sending UDP packets until I get a single response..."); DEBUG_TEST("[1] binding and sending UDP packets until I get a single response...");
if ((err = BIND(fd, (struct sockaddr*)local_addr, sizeof(struct sockaddr_in6)) < 0)) { if ((err = BIND(fd, (struct sockaddr*)local_addr, sizeof(struct sockaddr_in6)) < 0)) {
DEBUG_ERROR("error binding to interface (err=%d, errno=%d)", err, errno); DEBUG_ERROR("error binding to interface (err=%d, errno=%d)", err, errno);
@@ -959,7 +1022,7 @@ void udp_client_6(UDP_UNIT_TEST_SIG_6)
if ((w = SENDTO(fd, msg.c_str(), len, 0, (struct sockaddr *)remote_addr, sizeof(*remote_addr))) < 0) { if ((w = SENDTO(fd, msg.c_str(), len, 0, (struct sockaddr *)remote_addr, sizeof(*remote_addr))) < 0) {
DEBUG_ERROR("error sending packet, err=%d", errno); DEBUG_ERROR("error sending packet, err=%d", errno);
} }
usleep(100000); micro_sleep(100000);
memset(rbuf, 0, sizeof(rbuf)); memset(rbuf, 0, sizeof(rbuf));
int serverlen = sizeof(struct sockaddr_storage); int serverlen = sizeof(struct sockaddr_storage);
// rx // rx
@@ -990,7 +1053,7 @@ void udp_server_6(UDP_UNIT_TEST_SIG_6)
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET6, SOCK_DGRAM, 0)) < 0) { if ((fd = zts_socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
DEBUG_ERROR("error creating socket"); DEBUG_ERROR("error creating socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -1022,7 +1085,7 @@ void udp_server_6(UDP_UNIT_TEST_SIG_6)
// tx // tx
long int tx_ti = get_now_ts(); long int tx_ti = get_now_ts();
while (true) { while (true) {
usleep(100000); micro_sleep(100000);
//DEBUG_TEST("sending UDP packet"); //DEBUG_TEST("sending UDP packet");
if ((w = SENDTO(fd, msg.c_str(), len, 0, (struct sockaddr *)remote_addr, sizeof(*remote_addr))) < 0) { if ((w = SENDTO(fd, msg.c_str(), len, 0, (struct sockaddr *)remote_addr, sizeof(*remote_addr))) < 0) {
DEBUG_ERROR("error sending packet, err=%d", errno); DEBUG_ERROR("error sending packet, err=%d", errno);
@@ -1065,7 +1128,7 @@ void tcp_client_sustained_4(TCP_UNIT_TEST_SIG_4)
char *txbuf = (char*)malloc(cnt*sizeof(char)); char *txbuf = (char*)malloc(cnt*sizeof(char));
generate_random_data(txbuf, cnt, 0, 9); generate_random_data(txbuf, cnt, 0, 9);
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -1083,7 +1146,9 @@ void tcp_client_sustained_4(TCP_UNIT_TEST_SIG_4)
long int tx_ti = get_now_ts(); long int tx_ti = get_now_ts();
while (wrem) { while (wrem) {
int next_write = std::min(4096, wrem); int next_write = std::min(4096, wrem);
#if !defined(_WIN32)
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
#endif
DEBUG_TEST("writing..."); DEBUG_TEST("writing...");
n = WRITE(fd, &txbuf[w], next_write); n = WRITE(fd, &txbuf[w], next_write);
DEBUG_TEST("wrote=%d", n); DEBUG_TEST("wrote=%d", n);
@@ -1148,7 +1213,7 @@ void tcp_client_sustained_6(TCP_UNIT_TEST_SIG_6)
char *rxbuf = (char*)malloc(cnt*sizeof(char)); char *rxbuf = (char*)malloc(cnt*sizeof(char));
char *txbuf = (char*)malloc(cnt*sizeof(char)); char *txbuf = (char*)malloc(cnt*sizeof(char));
generate_random_data(txbuf, cnt, 0, 9); generate_random_data(txbuf, cnt, 0, 9);
if ((fd = SOCKET(AF_INET6, SOCK_STREAM, 0)) < 0){ if ((fd = zts_socket(AF_INET6, SOCK_STREAM, 0)) < 0){
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -1228,7 +1293,7 @@ void tcp_server_sustained_4(TCP_UNIT_TEST_SIG_4)
char *rxbuf = (char*)malloc(cnt*sizeof(char)); char *rxbuf = (char*)malloc(cnt*sizeof(char));
memset(rxbuf, 0, cnt); memset(rxbuf, 0, cnt);
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -1312,7 +1377,7 @@ void tcp_server_sustained_6(TCP_UNIT_TEST_SIG_6)
char *rxbuf = (char*)malloc(cnt*sizeof(char)); char *rxbuf = (char*)malloc(cnt*sizeof(char));
memset(rxbuf, 0, cnt); memset(rxbuf, 0, cnt);
if ((fd = SOCKET(AF_INET6, SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(AF_INET6, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -1399,18 +1464,13 @@ void udp_client_sustained_4(UDP_UNIT_TEST_SIG_4)
int w, fd, err, len = strlen(msg.c_str()); int w, fd, err, len = strlen(msg.c_str());
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET, SOCK_DGRAM, 0)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
return; return;
} }
if ((err = FCNTL(fd, F_SETFL, O_NONBLOCK) < 0)) { SetSocketBlockingEnabled(fd, true);
fprintf(stderr, "error setting O_NONBLOCK (errno=%d)", errno);
perror("fcntl");
*passed = false;
return;
}
DEBUG_TEST("sending UDP packets until I get a single response..."); DEBUG_TEST("sending UDP packets until I get a single response...");
if ((err = BIND(fd, (struct sockaddr *)local_addr, sizeof(struct sockaddr_in)) < 0)) { if ((err = BIND(fd, (struct sockaddr *)local_addr, sizeof(struct sockaddr_in)) < 0)) {
DEBUG_ERROR("error binding to interface (%d)", err); DEBUG_ERROR("error binding to interface (%d)", err);
@@ -1447,7 +1507,7 @@ void udp_server_sustained_4(UDP_UNIT_TEST_SIG_4)
int r, fd, err, len = strlen(msg.c_str()); int r, fd, err, len = strlen(msg.c_str());
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET, SOCK_DGRAM, 0)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -1495,18 +1555,13 @@ void udp_client_sustained_6(UDP_UNIT_TEST_SIG_6)
int w, fd, err, len = strlen(msg.c_str()); int w, fd, err, len = strlen(msg.c_str());
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET6, SOCK_DGRAM, 0)) < 0) { if ((fd = zts_socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
return; return;
} }
if ((err = FCNTL(fd, F_SETFL, O_NONBLOCK) < 0)) { SetSocketBlockingEnabled(fd, true);
fprintf(stderr, "error setting O_NONBLOCK (errno=%d)", errno);
perror("fcntl");
*passed = false;
return;
}
DEBUG_TEST("sending UDP packets until I get a single response..."); DEBUG_TEST("sending UDP packets until I get a single response...");
if ((err = BIND(fd, (struct sockaddr *)local_addr, sizeof(struct sockaddr_in6)) < 0)) { if ((err = BIND(fd, (struct sockaddr *)local_addr, sizeof(struct sockaddr_in6)) < 0)) {
DEBUG_ERROR("error binding to interface (%d)", err); DEBUG_ERROR("error binding to interface (%d)", err);
@@ -1544,7 +1599,7 @@ void udp_server_sustained_6(UDP_UNIT_TEST_SIG_6)
int r, fd, err, len = strlen(msg.c_str()); int r, fd, err, len = strlen(msg.c_str());
char rbuf[STR_SIZE]; char rbuf[STR_SIZE];
memset(rbuf, 0, sizeof rbuf); memset(rbuf, 0, sizeof rbuf);
if ((fd = SOCKET(AF_INET6, SOCK_DGRAM, 0)) < 0) { if ((fd = zts_socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
perror("socket"); perror("socket");
*passed = false; *passed = false;
@@ -1597,7 +1652,7 @@ void tcp_client_perf_4(TCP_UNIT_TEST_SIG_4)
for (int i=arbitrary_chunk_sz_min; (i*2) < arbitrary_chunk_sz_max; i*=2) { for (int i=arbitrary_chunk_sz_min; (i*2) < arbitrary_chunk_sz_max; i*=2) {
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0)
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
if ((err = CONNECT(fd, (const struct sockaddr *)addr, sizeof(addr))) < 0) if ((err = CONNECT(fd, (const struct sockaddr *)addr, sizeof(addr))) < 0)
DEBUG_ERROR("error connecting to remote host (%d)", err); DEBUG_ERROR("error connecting to remote host (%d)", err);
@@ -1618,7 +1673,7 @@ void tcp_client_perf_4(TCP_UNIT_TEST_SIG_4)
sprintf(details, "tot=%d, dt=%.2f, rate=%.2f MB/s", w, ts_delta, (rate / float(ONE_MEGABYTE) )); sprintf(details, "tot=%d, dt=%.2f, rate=%.2f MB/s", w, ts_delta, (rate / float(ONE_MEGABYTE) ));
CLOSE(fd); CLOSE(fd);
} }
*passed = (w == total_test_sz && !err) ? PASSED : FAILED; *passed = (w == total_test_sz && !err) ? TEST_PASSED : TEST_FAILED;
*/ */
} }
@@ -1636,7 +1691,7 @@ void tcp_server_perf_4(TCP_UNIT_TEST_SIG_4)
for (int i=arbitrary_chunk_sz_min; (i*2) < arbitrary_chunk_sz_max; i*=2) { for (int i=arbitrary_chunk_sz_min; (i*2) < arbitrary_chunk_sz_max; i*=2) {
DEBUG_ERROR("TESTING chunk size = %d", i); DEBUG_ERROR("TESTING chunk size = %d", i);
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0)
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
if ((err = BIND(fd, (struct sockaddr *)addr, (socklen_t)sizeof(struct sockaddr_in)) < 0)) if ((err = BIND(fd, (struct sockaddr *)addr, (socklen_t)sizeof(struct sockaddr_in)) < 0))
DEBUG_ERROR("error binding to interface (%d)", err); DEBUG_ERROR("error binding to interface (%d)", err);
@@ -1665,7 +1720,7 @@ void tcp_server_perf_4(TCP_UNIT_TEST_SIG_4)
CLOSE(fd); CLOSE(fd);
CLOSE(client_fd); CLOSE(client_fd);
} }
*passed = (r == total_test_sz && !err) ? PASSED : FAILED; *passed = (r == total_test_sz && !err) ? TEST_PASSED : TEST_FAILED;
*/ */
} }
@@ -1693,7 +1748,7 @@ void tcp_perf_tx_echo_4(TCP_UNIT_TEST_SIG_4)
mode = ECHOTEST_MODE_TX; mode = ECHOTEST_MODE_TX;
// connect to remote echotest host // connect to remote echotest host
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
return; return;
} }
@@ -1742,7 +1797,7 @@ void tcp_perf_tx_echo_4(TCP_UNIT_TEST_SIG_4)
sleep(ARTIFICIAL_SOCKET_LINGER); sleep(ARTIFICIAL_SOCKET_LINGER);
err = CLOSE(fd); err = CLOSE(fd);
*passed = (tot == cnt && !err) ? PASSED : FAILED; *passed = (tot == cnt && !err) ? TEST_PASSED : TEST_FAILED;
} }
@@ -1763,7 +1818,7 @@ void tcp_perf_rx_echo_4(TCP_UNIT_TEST_SIG_4)
mode = ECHOTEST_MODE_RX; mode = ECHOTEST_MODE_RX;
// connect to remote echotest host // connect to remote echotest host
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
return; return;
} }
@@ -1785,7 +1840,7 @@ void tcp_perf_rx_echo_4(TCP_UNIT_TEST_SIG_4)
// begin // begin
DEBUG_TEST("beginning test, as soon as bytes are read we will start keeping time..."); DEBUG_TEST("beginning test, as soon as bytes are read we will start keeping time...");
if ((r = read(fd, tbuf, sizeof tbuf)) < 0) { if ((r = READ(fd, tbuf, sizeof tbuf)) < 0) {
DEBUG_ERROR("there was an error reading the test stream. aborting (err=%d, errno=%s)", r, strerror(errno)); DEBUG_ERROR("there was an error reading the test stream. aborting (err=%d, errno=%s)", r, strerror(errno));
return; return;
} }
@@ -1796,7 +1851,7 @@ void tcp_perf_rx_echo_4(TCP_UNIT_TEST_SIG_4)
DEBUG_TEST("Received first set of bytes in test stream. now keeping time"); DEBUG_TEST("Received first set of bytes in test stream. now keeping time");
while (tot < cnt) { while (tot < cnt) {
if ((r = read(fd, tbuf, sizeof tbuf)) < 0) { if ((r = READ(fd, tbuf, sizeof tbuf)) < 0) {
DEBUG_ERROR("there was an error reading the test stream. aborting (err=%d)", r); DEBUG_ERROR("there was an error reading the test stream. aborting (err=%d)", r);
return; return;
} }
@@ -1810,7 +1865,7 @@ void tcp_perf_rx_echo_4(TCP_UNIT_TEST_SIG_4)
sleep(ARTIFICIAL_SOCKET_LINGER); sleep(ARTIFICIAL_SOCKET_LINGER);
err = CLOSE(fd); err = CLOSE(fd);
*passed = (tot == cnt && !err) ? PASSED : FAILED; *passed = (tot == cnt && !err) ? TEST_PASSED : TEST_FAILED;
} }
/****************************************************************************/ /****************************************************************************/
@@ -1828,7 +1883,7 @@ int obscure_api_test(bool *passed)
int fd, client_fd; int fd, client_fd;
// after accept() // after accept()
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0)
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
if ((err = BIND(fd, (struct sockaddr *)addr, sizeof(struct sockaddr_in)) < 0)) if ((err = BIND(fd, (struct sockaddr *)addr, sizeof(struct sockaddr_in)) < 0))
DEBUG_ERROR("error binding to interface (%d)", err); DEBUG_ERROR("error binding to interface (%d)", err);
@@ -1849,7 +1904,7 @@ int obscure_api_test(bool *passed)
// compate getpeername() result to address returned by accept() // compate getpeername() result to address returned by accept()
// after connect // after connect
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0)
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
if ((err = CONNECT(fd, (const struct sockaddr *)addr, sizeof(*addr))) < 0) if ((err = CONNECT(fd, (const struct sockaddr *)addr, sizeof(*addr))) < 0)
DEBUG_ERROR("error connecting to remote host (%d)", err); DEBUG_ERROR("error connecting to remote host (%d)", err);
@@ -1887,7 +1942,7 @@ int levels[] = {
int optname = TCP_NODELAY; int optname = TCP_NODELAY;
int optval = 1; int optval = 1;
socklen_t flag_len = sizeof(optval); socklen_t flag_len = sizeof(optval);
int fd = SOCKET(AF_INET, SOCK_STREAM, 0); int fd = zts_socket(AF_INET, SOCK_STREAM, 0);
DEBUG_TEST("setting level=%d, optname=%d, optval=%d...", level, optname, optval); DEBUG_TEST("setting level=%d, optname=%d, optval=%d...", level, optname, optval);
err = SETSOCKOPT(fd, level, optname, (char *)&optval, sizeof(int)); err = SETSOCKOPT(fd, level, optname, (char *)&optval, sizeof(int));
if (err < 0) { if (err < 0) {
@@ -2012,6 +2067,7 @@ int ZT_control_semantics_test(bool *passed)
#define SLAM_NUMBER 16 #define SLAM_NUMBER 16
#define SLAM_REPEAT 1 #define SLAM_REPEAT 1
/*
int slam_api_test() int slam_api_test()
{ {
int err = 0; int err = 0;
@@ -2031,11 +2087,11 @@ int slam_api_test()
// open and close SLAM_NUMBER*SLAM_REPEAT sockets // open and close SLAM_NUMBER*SLAM_REPEAT sockets
for (int j=0; j<SLAM_REPEAT; j++) { for (int j=0; j<SLAM_REPEAT; j++) {
std::cout << "slamming " << j << " time(s)" << std::endl; std::cout << "slamming " << j << " time(s)" << std::endl;
usleep(SLAM_INTERVAL); micro_sleep(SLAM_INTERVAL);
// create sockets // create sockets
int fds[SLAM_NUMBER]; int fds[SLAM_NUMBER];
for (int i = 0; i<SLAM_NUMBER; i++) { for (int i = 0; i<SLAM_NUMBER; i++) {
if ((err = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) { if ((err = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
std::cout << "error creating socket (errno = " << strerror(errno) << ")" << std::endl; std::cout << "error creating socket (errno = " << strerror(errno) << ")" << std::endl;
if (errno == EMFILE) if (errno == EMFILE)
break; break;
@@ -2059,9 +2115,9 @@ int slam_api_test()
} }
} }
//if (zts_num_active_virt_sockets() == 0) //if (zts_num_active_virt_sockets() == 0)
// std::cout << "PASSED [slam open and close]" << std::endl; // std::cout << "TEST_PASSED [slam open and close]" << std::endl;
//else //else
// std::cout << "FAILED [slam open and close] - sockets left unclosed" << std::endl; // std::cout << "TEST_FAILED [slam open and close] - sockets left unclosed" << std::endl;
} }
// --- // ---
@@ -2079,10 +2135,10 @@ int slam_api_test()
for (int j=0; j<SLAM_REPEAT; j++) { for (int j=0; j<SLAM_REPEAT; j++) {
std::cout << "slamming " << j << " time(s)" << std::endl; std::cout << "slamming " << j << " time(s)" << std::endl;
usleep(SLAM_INTERVAL); micro_sleep(SLAM_INTERVAL);
for (int i = 0; i<SLAM_NUMBER; i++) { for (int i = 0; i<SLAM_NUMBER; i++) {
if ((sock = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) { if ((sock = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
std::cout << "error creating socket (errno = " << strerror(errno) << ")" << std::endl; std::cout << "error creating socket (errno = " << strerror(errno) << ")" << std::endl;
if (errno == EMFILE) if (errno == EMFILE)
break; break;
@@ -2090,7 +2146,7 @@ int slam_api_test()
return -1; return -1;
} }
std::cout << "socket() = " << sock << std::endl; std::cout << "socket() = " << sock << std::endl;
usleep(SLAM_INTERVAL); micro_sleep(SLAM_INTERVAL);
int port; int port;
while ((std::find(used_ports.begin(),used_ports.end(),port) == used_ports.end()) == false) { while ((std::find(used_ports.begin(),used_ports.end(),port) == used_ports.end()) == false) {
@@ -2131,9 +2187,9 @@ int slam_api_test()
} }
used_ports.clear(); used_ports.clear();
//if (zts_num_active_virt_sockets() == 0) //if (zts_num_active_virt_sockets() == 0)
// std::cout << "PASSED [slam open, bind, listen, accept, close]" << std::endl; // std::cout << "TEST_PASSED [slam open, bind, listen, accept, close]" << std::endl;
//else //else
// std::cout << "FAILED [slam open, bind, listen, accept, close]" << std::endl; // std::cout << "TEST_FAILED [slam open, bind, listen, accept, close]" << std::endl;
} }
// TESTS: // TESTS:
@@ -2152,17 +2208,15 @@ int slam_api_test()
int sock = 0; int sock = 0;
errno = 0; errno = 0;
usleep(SLAM_INTERVAL); micro_sleep(SLAM_INTERVAL);
// socket() // socket()
printf("creating socket... (%d)\n", j); printf("creating socket... (%d)\n", j);
if ((sock = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) if ((sock = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0)
std::cout << "error creating socket (errno = " << strerror(errno) << ")" << std::endl; std::cout << "error creating socket (errno = " << strerror(errno) << ")" << std::endl;
results[j] = std::min(results[j], sock); results[j] = std::min(results[j], sock);
// set O_NONBLOCK SetSocketBlockingEnabled(sock, true);
if ((err = FCNTL(sock, F_SETFL, O_NONBLOCK) < 0))
std::cout << "error setting O_NONBLOCK (errno=" << strerror(errno) << ")" << std::endl;
results[j] = std::min(results[j], err); results[j] = std::min(results[j], err);
// connect() // connect()
@@ -2197,12 +2251,13 @@ int slam_api_test()
displayResults(results, num_times); displayResults(results, num_times);
//if (zts_num_active_virt_sockets() == 0) //if (zts_num_active_virt_sockets() == 0)
// std::cout << "PASSED [slam open, connect, close]" << std::endl; // std::cout << "TEST_PASSED [slam open, connect, close]" << std::endl;
//else //else
// std::cout << "FAILED [slam open, connect, close]" << std::endl; // std::cout << "TEST_FAILED [slam open, connect, close]" << std::endl;
} }
return 0; return 0;
} }
*/
/* /*
void get_network_routes(char *nwid) void get_network_routes(char *nwid)
@@ -2230,7 +2285,7 @@ void get_network_routes(char *nwid)
int random_api_test() int random_api_test()
{ {
// PASSED implies we didn't segfault or hang anywhere // TEST_PASSED implies we didn't segfault or hang anywhere
// variables which will be populated with random values // variables which will be populated with random values
/* /*
@@ -2268,7 +2323,7 @@ int random_api_test()
switch(opbuf[i]) switch(opbuf[i])
{ {
case 0: case 0:
SOCKET(); zts_socket();
case 1: case 1:
CONNECT(); CONNECT();
case 2: case 2:
@@ -2282,7 +2337,7 @@ int random_api_test()
} }
} }
SOCKET() zts_socket()
CONNECT() CONNECT()
LISTEN() LISTEN()
ACCEPT() ACCEPT()
@@ -2300,7 +2355,7 @@ int random_api_test()
*/ */
return PASSED; return TEST_PASSED;
} }
@@ -2311,12 +2366,15 @@ int random_api_test()
- Check for specific errno values for each function - Check for specific errno values for each function
*/ */
/*
void test_bad_args() void test_bad_args()
{ {
// Protocol Family test set // Protocol Family test set
int proto_families[] = { int proto_families[] = {
AF_UNIX, AF_UNIX,
#if !defined(_WIN32)
AF_LOCAL, AF_LOCAL,
#endif
AF_INET, AF_INET,
AF_INET6, AF_INET6,
AF_IPX, AF_IPX,
@@ -2387,13 +2445,13 @@ void test_bad_args()
min_protocol_value = std::min(protocol, min_protocol_value); min_protocol_value = std::min(protocol, min_protocol_value);
max_protocol_value = std::max(protocol, max_protocol_value); max_protocol_value = std::max(protocol, max_protocol_value);
err = SOCKET(protocol_family, socket_type, protocol); err = zts_socket(protocol_family, socket_type, protocol);
usleep(100000); micro_sleep(100000);
if (err < 0) { if (err < 0) {
DEBUG_ERROR("SOCKET(%d, %d, %d) = %d, errno=%d (%s)", protocol_family, socket_type, protocol, err, errno, strerror(errno)); DEBUG_ERROR("zts_socket(%d, %d, %d) = %d, errno=%d (%s)", protocol_family, socket_type, protocol, err, errno, strerror(errno));
} }
else { else {
DEBUG_TEST("SOCKET(%d, %d, %d) = %d, errno=%d (%s)", protocol_family, socket_type, protocol, err, errno, strerror(errno)); DEBUG_TEST("zts_socket(%d, %d, %d) = %d, errno=%d (%s)", protocol_family, socket_type, protocol, err, errno, strerror(errno));
} }
} }
} }
@@ -2413,6 +2471,7 @@ void test_bad_args()
DEBUG_TEST("SOCK_STREAM = %d", SOCK_STREAM); DEBUG_TEST("SOCK_STREAM = %d", SOCK_STREAM);
DEBUG_TEST("SOCK_DGRAM = %d", SOCK_DGRAM); DEBUG_TEST("SOCK_DGRAM = %d", SOCK_DGRAM);
} }
*/
void dns_test(struct sockaddr *addr) void dns_test(struct sockaddr *addr)
{ {
@@ -2432,6 +2491,7 @@ void close_while_writing_test()
/* test thread model, and locking */ /* test thread model, and locking */
/****************************************************************************/ /****************************************************************************/
/*
#define CONCURRENCY_LEVEL 8 // how many threads we want to test with #define CONCURRENCY_LEVEL 8 // how many threads we want to test with
#define TIME_GRANULARITY 10000 // multiple in microseconds #define TIME_GRANULARITY 10000 // multiple in microseconds
#define TIME_MULTIPLIER_MIN 1 // #define TIME_MULTIPLIER_MIN 1 //
@@ -2457,20 +2517,20 @@ void* worker_create_socket(void *arg)
rs = rand_in_range(TIME_MULTIPLIER_MIN, TIME_MULTIPLIER_MAX); rs = rand_in_range(TIME_MULTIPLIER_MIN, TIME_MULTIPLIER_MAX);
rc = rand_in_range(TIME_MULTIPLIER_MIN, TIME_MULTIPLIER_MAX); rc = rand_in_range(TIME_MULTIPLIER_MIN, TIME_MULTIPLIER_MAX);
//fprintf(stderr, "id=%d, rs = %d, rc = %d\n", id, rs, rc); //fprintf(stderr, "id=%d, rs = %d, rc = %d\n", id, rs, rc);
usleep(rs * TIME_GRANULARITY); micro_sleep(rs * TIME_GRANULARITY);
fd = SOCKET(AF_INET, SOCK_STREAM, 0); fd = zts_socket(AF_INET, SOCK_STREAM, 0);
usleep(rc * TIME_GRANULARITY); micro_sleep(rc * TIME_GRANULARITY);
CLOSE(fd); CLOSE(fd);
} }
return NULL; return NULL;
} }
// test the core locking logic by creating large numbers of threads and performing random operations over an extended period of time // test the core locking logic by creating large numbers of threads and performing random operations over an extended period of time
void multithread_test(int num_iterations, bool *passed) void multithread_test(int num_iterations, bool *passed)
{ {
int err = 0; int err = 0;
fprintf(stderr, "\n\nmultithread_socket_creation\n\n"); fprintf(stderr, "\n\nmultithread_socket_creation\n\n");
// test zts_socket() and zts_close()
for (int j=0; j<num_iterations; j++) { for (int j=0; j<num_iterations; j++) {
fprintf(stderr, "iteration=%d\n", j); fprintf(stderr, "iteration=%d\n", j);
// create threads // create threads
@@ -2505,7 +2565,7 @@ void* worker_write_to_udp_socket(void *arg) {
int w = 0; int w = 0;
for (int i=0; i<WORKER_ITERATIONS; i++) { for (int i=0; i<WORKER_ITERATIONS; i++) {
int r = rand_in_range(TIME_MULTIPLIER_MIN, TIME_MULTIPLIER_MAX); int r = rand_in_range(TIME_MULTIPLIER_MIN, TIME_MULTIPLIER_MAX);
usleep(r * TIME_GRANULARITY); micro_sleep(r * TIME_GRANULARITY);
if ((w = SENDTO(fd, "hello", 5, 0, (struct sockaddr *)remote_addr, sizeof(*remote_addr))) < 0) { if ((w = SENDTO(fd, "hello", 5, 0, (struct sockaddr *)remote_addr, sizeof(*remote_addr))) < 0) {
DEBUG_ERROR("error sending packet, err=%d", errno); DEBUG_ERROR("error sending packet, err=%d", errno);
} }
@@ -2514,11 +2574,12 @@ void* worker_write_to_udp_socket(void *arg) {
} }
// create a single socket and many threads to write to that single socket // create a single socket and many threads to write to that single socket
void multithread_udp_write(struct sockaddr_in *local_addr, struct sockaddr_in *remote_addr, bool *passed) void multithread_udp_write(struct sockaddr_in *local_addr, struct sockaddr_in *remote_addr, bool *passed)
{ {
fprintf(stderr, "\n\nmultithread_udp_broadcast\n\n"); fprintf(stderr, "\n\nmultithread_udp_broadcast\n\n");
int fd, err; int fd, err;
if((fd = SOCKET(AF_INET, SOCK_DGRAM, 0)) < 0) { if((fd = zts_socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
DEBUG_ERROR("error while creating socket"); DEBUG_ERROR("error while creating socket");
*passed = false; *passed = false;
return; return;
@@ -2565,6 +2626,8 @@ void multithread_rw_client()
fprintf(stderr, "\n\nmultithread_rw_client\n\n"); fprintf(stderr, "\n\nmultithread_rw_client\n\n");
} }
*/
/****************************************************************************/ /****************************************************************************/
/* close() */ /* close() */
/****************************************************************************/ /****************************************************************************/
@@ -2582,14 +2645,14 @@ void close_test(struct sockaddr *bind_addr)
for (int i=0; i<tries; i++) for (int i=0; i<tries; i++)
{ {
int fd; int fd;
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
DEBUG_ERROR("error creating socket. sleeping until timers are released"); DEBUG_ERROR("error creating socket. sleeping until timers are released");
sleep(30); sleep(30);
} }
if ((err = BIND(fd, (struct sockaddr *)bind_addr, sizeof(struct sockaddr_in)) < 0)) { if ((err = BIND(fd, (struct sockaddr *)bind_addr, sizeof(struct sockaddr_in)) < 0)) {
DEBUG_ERROR("error binding to interface (%d)", err); DEBUG_ERROR("error binding to interface (%d)", err);
} }
usleep(100000); micro_sleep(100000);
if ((err = CLOSE(fd)) < 0) { if ((err = CLOSE(fd)) < 0) {
DEBUG_ERROR("error closing socket (%d)", err); DEBUG_ERROR("error closing socket (%d)", err);
} }
@@ -2606,9 +2669,9 @@ void bind_to_localhost_test(int port)
struct sockaddr_storage bind_addr; struct sockaddr_storage bind_addr;
DEBUG_TEST("binding to 0.0.0.0"); DEBUG_TEST("binding to 0.0.0.0");
str2addr("0.0.0.0", port, 4, (struct sockaddr *)&bind_addr); str2addr("0.0.0.0", port, 4, (struct sockaddr *)&bind_addr);
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) > 0) { if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) > 0) {
if ((err = BIND(fd, (struct sockaddr *)&bind_addr, sizeof(struct sockaddr_in))) == 0) { if ((err = BIND(fd, (struct sockaddr *)&bind_addr, sizeof(struct sockaddr_in))) == 0) {
usleep(100000); micro_sleep(100000);
if ((err = CLOSE(fd)) < 0) { if ((err = CLOSE(fd)) < 0) {
DEBUG_ERROR("error closing socket (%d)", err); DEBUG_ERROR("error closing socket (%d)", err);
} }
@@ -2627,9 +2690,9 @@ void bind_to_localhost_test(int port)
// ipv4, 127.0.0.1 // ipv4, 127.0.0.1
DEBUG_TEST("binding to 127.0.0.1"); DEBUG_TEST("binding to 127.0.0.1");
str2addr("127.0.0.1", port, 4, (struct sockaddr *)&bind_addr); str2addr("127.0.0.1", port, 4, (struct sockaddr *)&bind_addr);
if ((fd = SOCKET(AF_INET, SOCK_STREAM, 0)) > 0) { if ((fd = zts_socket(AF_INET, SOCK_STREAM, 0)) > 0) {
if ((err = BIND(fd, (struct sockaddr *)&bind_addr, sizeof(struct sockaddr_in))) == 0) { if ((err = BIND(fd, (struct sockaddr *)&bind_addr, sizeof(struct sockaddr_in))) == 0) {
usleep(100000); micro_sleep(100000);
if ((err = CLOSE(fd)) < 0) { if ((err = CLOSE(fd)) < 0) {
DEBUG_ERROR("error closing socket (%d)", err); DEBUG_ERROR("error closing socket (%d)", err);
} }
@@ -2648,9 +2711,9 @@ void bind_to_localhost_test(int port)
// ipv6, [::] // ipv6, [::]
DEBUG_TEST("binding to [::]"); DEBUG_TEST("binding to [::]");
str2addr("::", port, 6, (struct sockaddr *)&bind_addr); str2addr("::", port, 6, (struct sockaddr *)&bind_addr);
if ((fd = SOCKET(AF_INET6, SOCK_STREAM, 0)) > 0) { if ((fd = zts_socket(AF_INET6, SOCK_STREAM, 0)) > 0) {
if ((err = BIND(fd, (struct sockaddr *)&bind_addr, sizeof(struct sockaddr_in))) == 0) { if ((err = BIND(fd, (struct sockaddr *)&bind_addr, sizeof(struct sockaddr_in))) == 0) {
usleep(100000); micro_sleep(100000);
if ((err = CLOSE(fd)) < 0) { if ((err = CLOSE(fd)) < 0) {
DEBUG_ERROR("error closing socket (%d)", err); DEBUG_ERROR("error closing socket (%d)", err);
} }
@@ -2857,6 +2920,7 @@ for (int i=0; i<num_repeats; i++)
exit(0); exit(0);
} }
// Spam a SOCK_DGRAM socket from many threads // Spam a SOCK_DGRAM socket from many threads
/*
if (false) { if (false) {
ipv = 4; ipv = 4;
port = start_port; port = start_port;
@@ -2868,6 +2932,7 @@ for (int i=0; i<num_repeats; i++)
if (false) { if (false) {
multithread_test(10, &passed); multithread_test(10, &passed);
} }
*/
// make sure the address sanitizer is available // make sure the address sanitizer is available
if (false) { if (false) {
trigger_address_sanitizer(); trigger_address_sanitizer();

2
zto

Submodule zto updated: 0fb22df633...e5d1243dd2