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

app framework project change

Browse Source
This commit is contained in:
Joseph Henry
2016-12-08 12:18:07 -08:00
parent b42046ba2a
commit 946fddd04c
22 changed files with 83 additions and 2144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/stack_drivers/jip/jip.hpp
View File

@@ -63,7 +63,7 @@ namespace ZeroTier {
void *_libref;
void close() {
#if defined(__STATIC__LWIP__)
#if defined(__STATIC_STACK__)
return;
#elif defined(__DYNAMIC_STACK__)
dlclose(_libref);

2
src/stack_drivers/lwip/lwip.cpp
View File

@@ -1130,4 +1130,4 @@ namespace ZeroTier
DEBUG_ERROR(" closing connection");
l->tap->closeConnection(l->conn->sock);
}
}
}

2
src/stack_drivers/lwip/lwip.hpp
View File

@@ -266,7 +266,7 @@ namespace ZeroTier {
void *_libref;
void close() {
#if defined(__STATIC__LWIP__)
#if defined(__STATIC_STACK__)
return;
#elif defined(__DYNAMIC_STACK__)
dlclose(_libref);

4
src/stack_drivers/picotcp/picotcp.cpp
View File

@@ -678,7 +678,7 @@ namespace ZeroTier {
Connection *conn = picotap->getConnection(sock);
if(conn && conn->rxsz) {
float max = conn->type == SOCK_STREAM ? (float)DEFAULT_TCP_RX_BUF_SZ : (float)DEFAULT_UDP_RX_BUF_SZ;
long n = -1;
int n = -1;
// extract address and payload size info
if(conn->type==SOCK_DGRAM) {
@@ -703,7 +703,7 @@ namespace ZeroTier {
}
if(n) {
if(conn->type==SOCK_STREAM) {
DEBUG_TRANS("[TCP RX] <--- :: {TX: %.3f%%, RX: %.3f%%, physock=%p} :: %ld bytes",
DEBUG_TRANS("[TCP RX] <--- :: {TX: %.3f%%, RX: %.3f%%, physock=%p} :: %d bytes",
(float)conn->txsz / max, (float)conn->rxsz / max, conn->sock, n);
}
if(conn->rxsz == 0) {

8
src/stack_drivers/picotcp/picotcp.hpp
View File

@@ -132,7 +132,7 @@ namespace ZeroTier {
void *_libref;
void close() {
#if defined(__STATIC__LWIP__)
#if defined(__STATIC_STACK__)
return;
#elif defined(__DYNAMIC_STACK__)
dlclose(_libref);
@@ -176,7 +176,7 @@ namespace ZeroTier {
#define __STATIC_STACK__
#elif defined(__linux__)
#define __DYNAMIC_STACK__
// Dynamically load liblwip.so
// Dynamically load stack library
_libref = dlmopen(LM_ID_NEWLM, path, RTLD_NOW);
#elif defined(__APPLE__)
#include "TargetConditionals.h"
@@ -187,7 +187,7 @@ namespace ZeroTier {
// Do nothing, symbols are statically-linked
#elif TARGET_OS_MAC && !defined(SDK_BUNDLED)
#define __DYNAMIC_STACK__
// Dynamically load liblwip.so
// Dynamically load stack library
_libref = dlopen(path, RTLD_NOW);
#else
#define __STATIC_STACK__
@@ -214,7 +214,7 @@ namespace ZeroTier {
_pico_socket_recvfrom = (int32_t(*)(PICO_SOCKET_RECVFROM_SIG))&pico_socket_recvfrom;
_pico_socket_open = (struct pico_socket*(*)(PICO_SOCKET_OPEN_SIG))&pico_socket_open;
_pico_socket_bind = (int(*)(PICO_SOCKET_BIND_SIG))&pico_socket_bind;
_pico_socket_connect = (int(*)(PICO_SOCKET_CONNECT_SIG))xt;
_pico_socket_connect = (int(*)(PICO_SOCKET_CONNECT_SIG))&pico_socket_connect;
_pico_socket_listen = (int(*)(PICO_SOCKET_LISTEN_SIG))&pico_socket_listen;
_pico_socket_read = (int(*)(PICO_SOCKET_READ_SIG))&pico_socket_read;
_pico_socket_write = (int(*)(PICO_SOCKET_WRITE_SIG))&pico_socket_write;