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

Build fixes for NO_STACK and ztproxy

Browse Source
This commit is contained in:
Joseph Henry
2017-10-18 21:56:34 -07:00
parent 2c218ca7cc
commit ad99e14301
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -392,7 +392,7 @@ nativetest:
@date +"Build script finished on %F %T"
ztproxy:
$(CXX) $(CXXFLAGS) $(SANFLAGS) $(LIBZT_INCLUDES) $(LIBZT_DEFS) $(ZT_INCLUDES) \
examples/apps/ztproxy/ztproxy.cpp -o $(BUILD)/ztproxy $< -L$(BUILD) -lzt $(WINDEFS)
examples/apps/ztproxy/ztproxy.cpp -o $(BUILD)/ztproxy $< -L$(BUILD) -lzt -lpthread $(WINDEFS)
@./check.sh $(BUILD)/ztproxy
@date +"Build script finished on %F %T"
intercept:

2
src/libzt.cpp
View File

@@ -84,6 +84,7 @@ void fix_addr_socket_family(struct sockaddr *addr)
so we must compensate here before feeding it into the stack. Due to this limitation
we must cast the pointer to the address into two different address
*/
#if defined(STACK_LWIP)
if (addr->sa_len == 2) {
if (addr->sa_family == 0) {
addr->sa_family = addr->sa_len;
@@ -96,6 +97,7 @@ void fix_addr_socket_family(struct sockaddr *addr)
addr->sa_len = 0;
}
}
#endif
/* once we've moved the value to its anticipated location, convert it from
its platform-specific value to one that the network stack can work with */
#endif