Merge 864e8090ba into bc8bd8c2f8

network.cpp

@@ -702,7 +702,7 @@ void init_filter(int port) {
         }
     }
 
-    int dummy=0;
+    int dummy;
 
     int ret = setsockopt(raw_recv_fd, SOL_SOCKET, SO_DETACH_FILTER, &dummy, sizeof(dummy));  // in case i forgot to remove
     if (ret != 0) {
@@ -841,7 +841,7 @@ void init_filter(int port) {
 void remove_filter() {
     filter_port = 0;
 #ifdef UDP2RAW_LINUX
-    int dummy=0;
+    int dummy;
     int ret = setsockopt(raw_recv_fd, SOL_SOCKET, SO_DETACH_FILTER, &dummy, sizeof(dummy));
     if (ret != 0) {
         mylog(log_debug, "error remove fiter\n");

network.h

@@ -228,12 +228,12 @@ struct packet_info_t  // todo change this to union
 
     bool has_ts;
 
-    i32_t data_len;
-
 #ifdef UDP2RAW_LINUX
     sockaddr_ll addr_ll;
 #endif
 
+    i32_t data_len;
+
     packet_info_t();
 };