Changeset 120eedd in code

Timestamp:

Jun 17, 2014, 11:46:35 AM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

e68221b

Parents:

9440414

Message:

prevent icbd_drop from freeing an icb session while dns is in progress

Files:

• dns.c (modified) (4 diffs)
• icb.h (modified) (1 diff)
• icbd.c (modified) (1 diff)

dns.c

@@ -56 +56 @@
                 icbd_log(is, LOG_WARNING, "dns resolution failed: %s",
                     gai_strerror(ar->ar_gai_errno));
+
+        if (ISSETF(is->flags, ICB_SF_PENDINGDROP)) {
+                free(is);
+                return;
+        }
+
+        CLRF(is->flags, ICB_SF_DNSINPROGRESS);
 }
 
@@ -65 +72 @@
         struct addrinfo hints;
 
+        if (ISSETF(is->flags, ICB_SF_PENDINGDROP)) {
+                free(is);
+                return;
+        }
+
         if (ar->ar_gai_errno == 0) {
                 icbd_log(is, LOG_DEBUG, "reverse dns resolved %s to %s",
@@ -73 +85 @@
                 as = getaddrinfo_async(is->hostname, NULL, &hints, NULL);
                 event_asr_run(as, dns_done_host, is);
-        } else
+        } else {
                 icbd_log(is, LOG_WARNING, "reverse dns resolution failed: %s",
                     gai_strerror(ar->ar_gai_errno));
+                CLRF(is->flags, ICB_SF_DNSINPROGRESS);
+        }
 }
 
@@ -86 +100 @@
                 return;
 
+        SETF(is->flags, ICB_SF_DNSINPROGRESS);
+
         if (verbose)
                 icbd_log(is, LOG_DEBUG, "resolving: %s", is->host);

icb.h

@@ -90 +90 @@
 #define CLRF(t, f)               ((t) &= ~(f))
 #define ISSETF(t, f)             ((t) & (f))
-#define ICB_SF_PROTOSENT         0x01
-#define ICB_SF_LOGGEDIN          0x02
-#define ICB_SF_NOGROUP           0x08
-#define ICB_SF_NOBEEP            0x10
-#define ICB_SF_NOBEEP2           0x20
+#define ICB_SF_PROTOSENT         0x0001
+#define ICB_SF_LOGGEDIN          0x0002
+#define ICB_SF_NOGROUP           0x0008
+#define ICB_SF_NOBEEP            0x0010
+#define ICB_SF_NOBEEP2           0x0020
+
+#define ICB_SF_DNSINPROGRESS     0x1000
+#define ICB_SF_PENDINGDROP       0x2000
 
         /* in-group linkage */

icbd.c

@@ -420 +420 @@
         (void)close(EVBUFFER_FD(is->bev));
         bufferevent_free(is->bev);
-        free(is);
+        if (!ISSETF(is->flags, ICB_SF_DNSINPROGRESS))
+                free(is);
+        else
+                SETF(is->flags, ICB_SF_PENDINGDROP);
 }