ambrop7 15 rokov pred
rodič
commit
97c6d3f2a8
2 zmenil súbory, kde vykonal 8 pridanie a 12 odobranie
  1. 7 5
      client/FrameDecider.c
  2. 1 7
      structure/LinkedList2.h

+ 7 - 5
client/FrameDecider.c

@@ -317,6 +317,13 @@ static void lower_group_timers_to_lmqt (FrameDecider *d, uint32_t group)
     }
 }
 
+static void group_entry_timer_handler (struct _FrameDecider_group_entry *group_entry)
+{
+    DebugObject_Access(&group_entry->peer->d_obj);
+    
+    remove_group_entry(group_entry);
+}
+
 static int check_ipv4_packet (uint8_t *data, int data_len, struct ipv4_header **out_header, uint8_t **out_payload, int *out_payload_len)
 {
     // check base header
@@ -587,11 +594,6 @@ FrameDeciderPeer * FrameDecider_NextDestination (FrameDecider *o)
     }
 }
 
-static void group_entry_timer_handler (struct _FrameDecider_group_entry *group_entry)
-{
-    remove_group_entry(group_entry);
-}
-
 int FrameDeciderPeer_Init (FrameDeciderPeer *o, FrameDecider *d)
 {
     // init arguments

+ 1 - 7
structure/LinkedList2.h

@@ -278,9 +278,6 @@ void LinkedList2_InsertAfter (LinkedList2 *list, LinkedList2Node *node, LinkedLi
 
 void LinkedList2_Remove (LinkedList2 *list, LinkedList2Node *node)
 {
-    LinkedList2Iterator *it;
-    LinkedList2Iterator *next;
-    
     // jump iterators
     while (node->it) {
         LinkedList2Iterator_Next(node->it);
@@ -307,10 +304,7 @@ void LinkedList2Iterator_Init (LinkedList2Iterator *it, LinkedList2 *list, int d
     it->dir = dir;
     it->e = node;
     
-    if (!it->e) {
-        it->pi = NULL;
-        it->ni = NULL;
-    } else {
+    if (it->e) {
         // link into node's iterator list
         it->pi = NULL;
         it->ni = it->e->it;