Changeset 9c04f2a in code

Timestamp:

Mar 7, 2014, 4:40:24 PM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

82d3c1f

Parents:

2cdab10

Message:

Make dns_done read loop work the same way dns_dispatch does

File:

• dns.c (modified) (4 diffs)

dns.c

@@ -136 +136 @@
                 return;
         if (res < (ssize_t)sizeof q) {
-                syslog(LOG_ERR, "dns read: %m");
+                syslog(LOG_ERR, "dns_dispatch read: %m");
                 /* disable dns resolver */
                 dodns = 0;
@@ -154 +154 @@
         memcpy(&q.u.rep, host, sizeof host);
         if (write(fd, &q, sizeof q) != sizeof q)
-                syslog(LOG_ERR, "dns write: %m");
+                syslog(LOG_ERR, "dns_dispatch write: %m");
 }
 
@@ -162 +162 @@
         struct icb_session *is;
         struct icbd_dnsquery q;
+        ssize_t res;
 
         if (event != EV_READ)
                 return;
 
-        if (read(fd, &q, sizeof q) != sizeof q) {
-                syslog(LOG_ERR, "read: %m");
+        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_done read: %m");
                 return;
         }
@@ -202 +208 @@
         memcpy(&q.u.req, ss, sizeof *ss);
         if (write(dns_pipe, &q, sizeof q) != sizeof q) {
-                syslog(LOG_ERR, "write: %m");
+                syslog(LOG_ERR, "dns_rresolv write: %m");
                 exit(EX_OSERR);
         }