fix mp compile; fix tcp option bug

qisimanxiang · Feb 17, 2021 · 25d3323 · 25d3323
1 parent b8e9095
commit 25d3323
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/makefile b/makefile
@@ -91,22 +91,22 @@ release: ${TARGETS}
 
 #targets for multi-platform version (native compile)
 cygwin:git_version
-	${cc_local}   -o ${NAME}_$@          -I. ${SOURCES} pcap_wrapper.cpp ${FLAGS} -lrt -ggdb -static -O2 -D_GNU_SOURCE
+	${cc_local}   -o ${NAME}_$@          -I. ${SOURCES} pcap_wrapper.cpp ${FLAGS} -lrt -ggdb -static -O2 -D_GNU_SOURCE ${MP}
 
 mingw:git_version
-	${cc_local}   -o ${NAME}_$@         -I. ${SOURCES} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -lws2_32
+	${cc_local}   -o ${NAME}_$@         -I. ${SOURCES} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -lws2_32 ${MP}
 
 mingw_wepoll:git_version
-	${cc_local}   -o ${NAME}_$@        -I. ${SOURCES0} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -DNO_LIBEV_EMBED -D_WIN32 -lev -lws2_32
+	${cc_local}   -o ${NAME}_$@        -I. ${SOURCES0} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -DNO_LIBEV_EMBED -D_WIN32 -lev -lws2_32 ${MP}
 
 linux:git_version
-	${cc_local}   -o ${NAME}_$@          -I. ${SOURCES} ${PCAP} ${FLAGS} -lrt -ggdb -static -O2
+	${cc_local}   -o ${NAME}_$@          -I. ${SOURCES} ${PCAP} ${FLAGS} -lrt -ggdb -static -O2 ${MP}
 
 freebsd:git_version
-	${cc_local}   -o ${NAME}_$@        -I. ${SOURCES} ${PCAP} ${FLAGS} -lrt -ggdb -static -O2
+	${cc_local}   -o ${NAME}_$@        -I. ${SOURCES} ${PCAP} ${FLAGS} -lrt -ggdb -static -O2 ${MP}
 
 mac:git_version
-	${cc_local}   -o ${NAME}_$@        -I. ${SOURCES} ${PCAP} ${FLAGS} -ggdb -O2
+	${cc_local}   -o ${NAME}_$@        -I. ${SOURCES} ${PCAP} ${FLAGS} -ggdb -O2 ${MP}
 
 #targets for multi-platform version (cross compile)
 

diff --git a/network.cpp b/network.cpp
@@ -2444,7 +2444,7 @@ int parse_tcp_option(char * option_begin,char * option_end,packet_info_t &recv_i
     		//printf("<%d %d>!\n",recv_info.ts,recv_info.ts_ack);
 
     		//return 0;//we currently only parse ts, so just return after its found
-    		ptr+=8;
+    		ptr+=10;
     	}
     	else
     	{
-Original file line number
+Diff line change
@@ Expand Up @@
         		//printf("<%d %d>!\n",recv_info.ts,recv_info.ts_ack);
         		//return 0;//we currently only parse ts, so just return after its found
-        		ptr+=8;
+        		ptr+=10;
         	}
         	else
         	{
@@ Expand Down @@