set socket pgrp to avoid races; block SIGURG till done;

[unix-history] / usr / src / lib / libc / net / res_send.c

diff --git a/usr/src/lib/libc/net/res_send.c b/usr/src/lib/libc/net/res_send.c
index e189878..3bdf9de 100644 (file)
--- a/usr/src/lib/libc/net/res_send.c
+++ b/usr/src/lib/libc/net/res_send.c
@@ -5,25 +5,27 @@
  * specifies the terms and conditions for redistribution.
  */
 
  * specifies the terms and conditions for redistribution.
  */
 

-#ifndef lint
-static char sccsid[] = "@(#)res_send.c 6.1 (Berkeley) %G%";
-#endif not lint
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)res_send.c 6.8 (Berkeley) %G%";
+#endif LIBC_SCCS and not lint

 
 /*
  * Send query to name server and wait for reply.
  */
 
 
 /*
  * Send query to name server and wait for reply.
  */
 

-#include <sys/types.h>
+#include <sys/param.h>

 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <stdio.h>
 #include <errno.h>
 #include <arpa/nameser.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <stdio.h>
 #include <errno.h>
 #include <arpa/nameser.h>

-#include <arpa/resolv.h>
+#include <resolv.h>

 
 extern int errno;
 
 
 extern int errno;
 

+#define KEEPOPEN (RES_USEVC|RES_STAYOPEN)
+

 res_send(buf, buflen, answer, anslen)
        char *buf;
        int buflen;
 res_send(buf, buflen, answer, anslen)
        char *buf;
        int buflen;


@@ -31,7 +33,9 @@ res_send(buf, buflen, answer, anslen)
        int anslen;
 {
        register int n;
        int anslen;
 {
        register int n;

-       int s, retry, v_circuit, resplen, ns;
+       int retry, v_circuit, resplen, ns;
+       static int s = -1;
+       int gotsomewhere = 0;

        u_short id, len;
        char *cp;
        int dsmask;
        u_short id, len;
        char *cp;
        int dsmask;


@@ -49,7 +53,6 @@ res_send(buf, buflen, answer, anslen)
                if (res_init() == -1) {
                        return(-1);
                }
                if (res_init() == -1) {
                        return(-1);
                }

-       s = -1;

        v_circuit = (_res.options & RES_USEVC) || buflen > PACKETSZ;
        id = hp->id;
        /*
        v_circuit = (_res.options & RES_USEVC) || buflen > PACKETSZ;
        id = hp->id;
        /*


@@ -66,17 +69,25 @@ res_send(buf, buflen, answer, anslen)
                        /*
                         * Use virtual circuit.
                         */
                        /*
                         * Use virtual circuit.
                         */

-                       if (s < 0)
+                       if (s < 0) {

                                s = socket(AF_INET, SOCK_STREAM, 0);
                                s = socket(AF_INET, SOCK_STREAM, 0);

-                       if (connect(s, &(_res.nsaddr_list[ns]), 
-                          sizeof(struct sockaddr)) < 0) {
+                               if (s < 0) {

 #ifdef DEBUG
 #ifdef DEBUG

-                               if (_res.options & RES_DEBUG)
-                                       printf("connect failed %d\n", errno);
+                                       if (_res.options & RES_DEBUG)
+                                           printf("socket failed %d\n",errno);

 #endif DEBUG
 #endif DEBUG

-                               (void) close(s);
-                               s = -1;
-                               continue;
+                                       continue;
+                               }
+                               if (connect(s, &(_res.nsaddr_list[ns]), 
+                                  sizeof(struct sockaddr)) < 0) {
+#ifdef DEBUG
+                                       if (_res.options & RES_DEBUG)
+                                           printf("connect failed %d\n",errno);
+#endif DEBUG
+                                       (void) close(s);
+                                       s = -1;
+                                       continue;
+                               }

                        }
                        /*
                         * Send length & message
                        }
                        /*
                         * Send length & message


@@ -131,19 +142,34 @@ res_send(buf, buflen, answer, anslen)
                         */
                        if (s < 0)
                                s = socket(AF_INET, SOCK_DGRAM, 0);
                         */
                        if (s < 0)
                                s = socket(AF_INET, SOCK_DGRAM, 0);

+#if    BSD >= 43
+                       if (connect(s, &_res.nsaddr_list[ns],
+                           sizeof(struct sockaddr)) < 0 ||
+                           send(s, buf, buflen, 0) != buflen) {
+#ifdef DEBUG
+                               if (_res.options & RES_DEBUG) 
+                                       printf("connect/send errno = %d\n",
+                                           errno);
+#endif DEBUG
+                               continue;
+                       }
+#else BSD

                        if (sendto(s, buf, buflen, 0, &_res.nsaddr_list[ns],
                            sizeof(struct sockaddr)) != buflen) {
 #ifdef DEBUG
                                if (_res.options & RES_DEBUG) 
                                        printf("sendto errno = %d\n", errno);
 #endif DEBUG
                        if (sendto(s, buf, buflen, 0, &_res.nsaddr_list[ns],
                            sizeof(struct sockaddr)) != buflen) {
 #ifdef DEBUG
                                if (_res.options & RES_DEBUG) 
                                        printf("sendto errno = %d\n", errno);
 #endif DEBUG

+                               continue;

                        }
                        }

+#endif BSD

                        /*
                         * Wait for reply 
                         */
                        timeout.tv_sec = 
                                ((_res.retrans * _res.retry) / _res.nscount);
                        timeout.tv_usec = 0;
                        /*
                         * Wait for reply 
                         */
                        timeout.tv_sec = 
                                ((_res.retrans * _res.retry) / _res.nscount);
                        timeout.tv_usec = 0;

+wait:

                        dsmask = 1 << s;
                        n = select(s+1, &dsmask, 0, 0, &timeout);
                        if (n < 0) {
                        dsmask = 1 << s;
                        n = select(s+1, &dsmask, 0, 0, &timeout);
                        if (n < 0) {


@@ -161,6 +187,7 @@ res_send(buf, buflen, answer, anslen)
                                if (_res.options & RES_DEBUG)
                                        printf("timeout\n");
 #endif DEBUG
                                if (_res.options & RES_DEBUG)
                                        printf("timeout\n");
 #endif DEBUG

+                               gotsomewhere = 1;

                                continue;
                        }
                        if ((resplen = recv(s, answer, anslen, 0)) <= 0) {
                                continue;
                        }
                        if ((resplen = recv(s, answer, anslen, 0)) <= 0) {


@@ -170,6 +197,7 @@ res_send(buf, buflen, answer, anslen)
 #endif DEBUG
                                continue;
                        }
 #endif DEBUG
                                continue;
                        }

+                       gotsomewhere = 1;

                        if (id != anhp->id) {
                                /*
                                 * response from old query, ignore it
                        if (id != anhp->id) {
                                /*
                                 * response from old query, ignore it


@@ -180,7 +208,7 @@ res_send(buf, buflen, answer, anslen)
                                        p_query(answer);
                                }
 #endif DEBUG
                                        p_query(answer);
                                }
 #endif DEBUG

-                               continue;
+                               goto wait;

                        }
                        if (!(_res.options & RES_IGNTC) && anhp->tc) {
                                /*
                        }
                        if (!(_res.options & RES_IGNTC) && anhp->tc) {
                                /*


@@ -203,11 +231,25 @@ res_send(buf, buflen, answer, anslen)
                        p_query(answer);
                }
 #endif DEBUG
                        p_query(answer);
                }
 #endif DEBUG

-               (void) close(s);
-               return (resplen);
+               /*
+                * We are going to assume that the first server is preferred
+                * over the rest (i.e. it is on the local machine) and only
+                * keep that one open.
+                */
+               if ((_res.options & KEEPOPEN) == KEEPOPEN && ns == 0) {
+                       return (resplen);
+               } else {
+                       (void) close(s);
+                       s = -1;
+                       return (resplen);
+               }

           }
        }
        (void) close(s);
           }
        }
        (void) close(s);

-       errno = ETIMEDOUT;
+       s = -1;
+       if (v_circuit == 0 && gotsomewhere == 0)
+               errno = ECONNREFUSED;
+       else
+               errno = ETIMEDOUT;

        return (-1);
 }
        return (-1);
 }