ambrop7 14 лет назад
Родитель
Сommit
10c9e5f498
3 измененных файлов с 5 добавлено и 10 удалено
  1. 0 3
      client/DPReceive.c
  2. 0 1
      client/DPReceive.h
  3. 5 6
      tuntap/BTap.c

+ 0 - 3
client/DPReceive.c

@@ -186,9 +186,6 @@ int DPReceiveDevice_Init (DPReceiveDevice *o, int device_mtu, DPReceiveDevice_ou
     // have no peer ID
     o->have_peer_id = 0;
     
-    // set not freeing
-    o->freeing = 0;
-    
     // init peers list
     LinkedList2_Init(&o->peers_list);
     

+ 0 - 1
client/DPReceive.h

@@ -51,7 +51,6 @@ typedef struct {
     DPRelayRouter relay_router;
     int have_peer_id;
     peerid_t peer_id;
-    int freeing;
     LinkedList2 peers_list;
     DebugObject d_obj;
 } DPReceiveDevice;

+ 5 - 6
tuntap/BTap.c

@@ -86,8 +86,8 @@ static void recv_olap_handler (BTap *o, int event, DWORD bytes)
 
 static void fd_handler (BTap *o, int events)
 {
-    DebugError_AssertNoError(&o->d_err);
     DebugObject_Access(&o->d_obj);
+    DebugError_AssertNoError(&o->d_err);
     
     if (events&BREACTOR_ERROR) {
         BLog(BLOG_WARNING, "device fd reports error?");
@@ -131,10 +131,10 @@ void report_error (BTap *o)
 
 void output_handler_recv (BTap *o, uint8_t *data)
 {
+    DebugObject_Access(&o->d_obj);
+    DebugError_AssertNoError(&o->d_err);
     ASSERT(data)
     ASSERT(!o->output_packet)
-    DebugError_AssertNoError(&o->d_err);
-    DebugObject_Access(&o->d_obj);
     
 #ifdef BADVPN_USE_WINAPI
     
@@ -416,16 +416,15 @@ success:
     // set no output packet
     o->output_packet = NULL;
     
-    DebugObject_Init(&o->d_obj);
     DebugError_Init(&o->d_err, BReactor_PendingGroup(o->reactor));
-    
+    DebugObject_Init(&o->d_obj);
     return 1;
 }
 
 void BTap_Free (BTap *o)
 {
-    DebugError_Free(&o->d_err);
     DebugObject_Free(&o->d_obj);
+    DebugError_Free(&o->d_err);
     
     // free output
     PacketRecvInterface_Free(&o->output);