From c1dfd4e92894105d7042336ff22bffae1ce7a776 Mon Sep 17 00:00:00 2001
From: root <root@vultr.guest>
Date: Mon, 15 Jul 2019 15:33:16 +0000
Subject: [PATCH] --fix-gro works

---
 connection.cpp | 8 ++++----
 network.cpp    | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/connection.cpp b/connection.cpp
index 69d0d96..beea633 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -653,14 +653,14 @@ int recv_safer_multi(conn_info_t &conn_info,vector<char> &type_arr,vector<string
     } else
     {
         char *ori_recv_data=recv_data;
-        mylog(log_debug,"recv_len:%d\n",recv_len);
+        //mylog(log_debug,"recv_len:%d\n",recv_len);
         while(recv_len>2)
         {
-            recv_len-=2;
             int single_len;
             //recv_data[0]^=gro_xor[0];
             //recv_data[1]^=gro_xor[1];
             single_len=read_u16(recv_data);
+            recv_len-=2;
             recv_data+=2;
             if(single_len > recv_len)
             {
@@ -676,14 +676,14 @@ int recv_safer_multi(conn_info_t &conn_info,vector<char> &type_arr,vector<string
 
             if(ret!=0)
             {
-                mylog(log_debug,"parse failed, offset= %d,single_len=%d\n",ori_recv_data-recv_data,single_len);
+                mylog(log_debug,"parse failed, offset= %d,single_len=%d\n",recv_data-ori_recv_data,single_len);
             } else{
                 type_arr.push_back(type);
                 data_arr.emplace_back(data,data+len);
                 //std::copy(data,data+len,data_arr[data_arr.size()-1]);
             }
             recv_data+=single_len;
-            
+            recv_len-=single_len;
         }
         return 0;
     }
diff --git a/network.cpp b/network.cpp
index c29a3a1..0585c79 100644
--- a/network.cpp
+++ b/network.cpp
@@ -1944,9 +1944,8 @@ int recv_raw_tcp(raw_info_t &raw_info,char * &payload,int &payloadlen)
 
     if(tcp_chk!=0)
     {
-    	mylog(log_debug,"tcp_chk:%x\n",tcp_chk);
-    	mylog(log_debug,"tcp header error\n");
-    	return -1;
+    	mylog(log_debug,"tcp_chk:%x, tcp checksum failed, ignored\n",tcp_chk);
+    	//return -1;
 
     }