Changeset a76f866 in code

Timestamp:

Mar 7, 2014, 3:45:28 PM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

d06af04

Parents:

7289823

Message:

Improve the read loop in dns_dispatch before we switch to bufferevents

File:

• dns.c (modified) (2 diffs)

dns.c

@@ -124 +124 @@
         struct sockaddr *sa;
         struct icbd_dnsquery q;
+        ssize_t res;
         int gerr;
 
@@ -129 +130 @@
                 return;
 
-        if (read(fd, &q, sizeof q) != sizeof q) {
+        do
+                res = read(fd, &q, sizeof q);
+        while (res == -1 && errno == EINTR);
+        if (res == -1 && errno == EAGAIN)
+                return;
+        if (res < (ssize_t)sizeof q) {
                 syslog(LOG_ERR, "dns read: %m");
-                exit(EX_DATAERR);
+                /* disable dns resolver */
+                dodns = 0;
+                return;
         }