libc: add resolver

This isn't yet usable but it's buildable and heading in the right direction

diff --git a/Library/libs/Makefile b/Library/libs/Makefile
index 07c9ac4..95d816b 100644 (file)
--- a/Library/libs/Makefile
+++ b/Library/libs/Makefile
@@ -41,8 +41,10 @@ SRC_C += lrand48.c lseek.c lsearch.c lstat.c ltoa.c ltostr.c
 SRC_C += malloc.c mkfifo.c mkstemps.c nanosleep.c opendir.c opendir_r.c
 SRC_C += pause.c perror.c
 SRC_C += popen.c printf.c putenv.c putgetch.c putpwent.c putw.c pwent.c qsort.c
-SRC_C += raise.c rand.c readdir.c readlink.c realloc.c regerror.c
-SRC_C += regsub.c remove.c rewind.c rewinddir.c rindex.c seekdir.c setbuffer.c setenv.c
+SRC_C += raise.c rand.c readdir.c readlink.c realloc.c recv.c
+SRC_C += recvfrom.c regerror.c
+SRC_C += regsub.c remove.c rewind.c rewinddir.c rindex.c seekdir.c
+SRC_C += send.c sendto.c setbuffer.c setenv.c
 SRC_C += setlocale.c setvbuf.c settimeofday.c sleep.c sprintf.c 
 SRC_C += stat.c stdio0.c stime.c
 SRC_C += strcasecmp.c strcasestr.c strdup.c stricmp.c strlcpy.c strncasecmp.c
@@ -88,6 +90,8 @@ SRC_LM += __expo2f.c __float_bits.c __fpclassifyf.c __log1pf.c __signgam.c
 
 SRC_TM = tinymalloc.c
 
+SRC_RES = resolv.c
+
 OBJ_C = $(SRC_C:.c=.rel)
 OBJ_CURS = $(SRC_CURS:.c=.rel)
 OBJ_CT = $(SRC_CT:.c=.rel)
@@ -95,8 +99,9 @@ OBJ_LM = $(SRC_LM:.c=.rel)
 OBJ_TM = $(SRC_TM:.c=.rel)
 OBJ_HARD = $(SRC_HARD:.c=.rel)
 OBJ_ALL = $(OBJ_ASM) $(OBJ_C) $(OBJ_HARD)
+OBJ_RES = $(SRC_RES:.c=.rel)
 
-all: syslib$(PLATFORM).lib crt0$(PLATFORM).rel crt0nostdio$(PLATFORM).rel liberror.txt curses$(PLATFORM).lib termcap$(PLATFORM).lib m$(PLATFORM).lib tinymalloc$(PLATFORM).lib
+all: syslib$(PLATFORM).lib crt0$(PLATFORM).rel crt0nostdio$(PLATFORM).rel liberror.txt curses$(PLATFORM).lib termcap$(PLATFORM).lib m$(PLATFORM).lib tinymalloc$(PLATFORM).lib resolv$(PLATFORM).lib
 
 libc.l:%.l:$(OBJ_ALL)
        ls $(OBJ_ALL) > libc.l
@@ -139,6 +144,10 @@ tinymalloc$(PLATFORM).lib: $(OBJ_TM)
        $(AR) rc tinymalloc$(PLATFORM).lib $(OBJ_TM)
        $(AR) s tinymalloc$(PLATFORM).lib
 
+resolv$(PLATFORM).lib: $(OBJ_RES)
+       $(AR) rc resolv$(PLATFORM).lib $(OBJ_RES)
+       $(AR) s resolv$(PLATFORM).lib
+
 $(OBJ_ASM):%.rel: %.s
        $(ASM) $(ASM_OPT) $@ $(@:.rel=.s)
 
@@ -163,6 +172,9 @@ $(OBJ_LM):%.rel: %.c
 $(OBJ_TM):%.rel: %.c
        $(CC) $(CC_OPT) $(@:.rel=.c)
 
+$(OBJ_RES):%.rel: %.c
+       $(CC) $(CC_OPT) $(@:.rel=.c)
+
 $(OBJ_HARD):%.rel: %.c
        $(CC) $(CC_NOOPT) $(@:.rel=.c)
 

diff --git a/Library/libs/resolv.c b/Library/libs/resolv.c
index 99b149d..fdb1e74 100644 (file)
--- a/Library/libs/resolv.c
+++ b/Library/libs/resolv.c
@@ -47,11 +47,6 @@
 
 #include "resolv.h"
 
-/* FIXME */
-#define EMSGSIZE EINVAL
-
-
-
 struct res_state res;
 
 static int res_nsend(struct res_state *statp, const char *buf, int buflen,
@@ -105,6 +100,7 @@ static int printable(int ch)
        return (ch > 0x20 && ch < 0x7f);
 }
 
+
 //
 // dn_find
 //
@@ -545,6 +541,48 @@ static int ns_name_unpack(const unsigned char *msg,
        return len;
 }
 
+//
+// dn_comp
+//
+
+int dn_comp(const char *src, unsigned char *dst, int dstsiz,
+           unsigned char **dnptrs, unsigned char **lastdnptr)
+{
+       unsigned char tmp[NS_MAXCDNAME];
+       int rc;
+
+       rc = ns_name_pton(src, tmp, sizeof tmp);
+       if (rc < 0)
+               return rc;
+
+       return ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr);
+}
+
+//
+// dn_expand
+//
+
+int dn_expand(const unsigned char *msg, const unsigned char *eom,
+             const unsigned char *src, char *dst, int dstsiz)
+{
+       unsigned char tmp[NS_MAXCDNAME];
+       int n;
+       int rc;
+
+       n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp);
+       if (n < 0)
+               return n;
+
+       rc = ns_name_ntop(tmp, dst, dstsiz);
+       if (rc < 0)
+               return rc;
+
+       if (n > 0 && dst[0] == '.')
+               dst[0] = '\0';
+       return n;
+}
+
+
 //
 // res_randomid
 //
@@ -652,10 +690,11 @@ static int send_vc(struct res_state *statp,
        int resplen, n;
        unsigned short len;
        unsigned char *cp;
-       struct iovec iov[2];
        int s;
        int rc;
 
+       /* Need a timer on this */
+
        // Connect to name server
        s = socket(AF_INET, SOCK_STREAM, 0);
        if (s < 0) {
@@ -670,16 +709,10 @@ static int send_vc(struct res_state *statp,
                return 0;
        }
 
-       /* FIXME: we don't have writev() */
        // Send length & message
        len = htons((unsigned short) buflen);
-       iov[0].iov_base = &len;
-       iov[0].iov_len = sizeof(unsigned short);
-       iov[1].iov_base = (char *) buf;
-       iov[1].iov_len = buflen;
 
-       rc = writev(s, iov, 2);
-       if (rc != sizeof(unsigned short) + buflen) {
+       if (write(s, &len, 2) != 2 || (rc = write(s, buf, buflen)) != buflen) {
                *terrno = rc;
                close(s);
                return 0;
@@ -772,9 +805,13 @@ static int send_dg(struct res_state *statp,
        if (timeout <= 0)
                timeout = 1;
        timeout = timeout * 1000;
+
+       /* We need to use a timer instead */
+#ifdef FIXME   
        setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(int));
+#endif 
 
-      wait:
+wait:
        fromlen = sizeof(struct sockaddr_in);
        resplen =
            recvfrom(s, (char *) answer, anslen, 0,
@@ -787,7 +824,7 @@ static int send_dg(struct res_state *statp,
        }
 
        if (resplen < 0) {
-               if (errno == ETIMEOUT) {
+               if (errno == ETIMEDOUT) {
                        *gotsomewhere = 1;
                        close(s);
                        return 0;
@@ -843,7 +880,7 @@ static int res_nsend(struct res_state *statp, const char *buf, int buflen,
 
        v_circuit = (statp->options & RES_USEVC) || buflen > NS_PACKETSZ;
        gotsomewhere = 0;
-       terrno = -ETIMEOUT;
+       terrno = -ETIMEDOUT;
 
        // FIXME: add dns cache lookup here
 
@@ -852,12 +889,12 @@ static int res_nsend(struct res_state *statp, const char *buf, int buflen,
                struct sockaddr_in ina;
                int lastns = statp->nscount - 1;
 
-               ina = statp->nsaddr_list[0];
+               memcpy(&ina, &statp->nsaddr_list[0], sizeof(ina));
                for (ns = 0; ns < lastns; ns++) {
-                       statp->nsaddr_list[ns] =
-                           statp->nsaddr_list[ns + 1];
+                       memcpy(&statp->nsaddr_list[ns],
+                           &statp->nsaddr_list[ns + 1], sizeof(struct sockaddr_in));
                }
-               statp->nsaddr_list[lastns] = ina;
+               memcpy(&statp->nsaddr_list[lastns], &ina, sizeof(ina));
        }
        // Send request, RETRY times, or until successful.
        for (try = 0; try < statp->retry; try++) {
@@ -902,7 +939,7 @@ static int res_nsend(struct res_state *statp, const char *buf, int buflen,
                        errno = ECONNREFUSED;   // No nameservers found
                        return -1;
                } else {
-                       errno = ETIMEOUT;       // No answer obtained
+                       errno = ETIMEDOUT;      // No answer obtained
                        return -1;
                }
        } else {
@@ -928,6 +965,7 @@ static int res_nquery(struct res_state *statp, const char *dname,
                      int class, int type, unsigned char *answer,
                      int anslen)
 {
+       /* Big.. ugly, FIXME and brk this */
        unsigned char buf[QUERYBUF_SIZE];
        struct dns_hdr *hp = (struct dns_hdr *) answer;
        int n;
@@ -943,28 +981,8 @@ static int res_nquery(struct res_state *statp, const char *dname,
        if (n < 0)
                return n;
 
-       if (hp->rcode != 0 || ntohs(hp->ancount) == 0) {
-               switch (hp->rcode) {
-               case DNS_ERR_NXDOMAIN:
-                       errno = EHOSTNOTFOUND;
-                       return -1;
-
-               case DNS_ERR_SERVFAIL:
-                       errno = ETRYAGAIN;
-                       return -1;
-
-               case DNS_ERR_NOERROR:
-                       errno = ENODATA;
-                       return -1;
-
-               case DNS_ERR_FORMERR:
-               case DNS_ERR_NOTIMPL:
-               case DNS_ERR_REFUSED:
-               default:
-                       errno = ENORECOVERY;
-                       return -1;
-               }
-       }
+       if (hp->rcode != 0 || ntohs(hp->ancount) == 0)
+               return -1;
 
        return n;
 }
@@ -1043,7 +1061,7 @@ static int res_nsearch(struct res_state *statp, const char *name,
                                return -1;
 
                        switch (errno) {
-                       case ETIMEOUT:
+                       case ETIMEDOUT:
                                got_nodata++;
                                // FALLTHROUGH
 
@@ -1089,7 +1107,7 @@ static int res_nsearch(struct res_state *statp, const char *name,
        if (saved_rc != 0) {
                return saved_rc;
        } else if (got_nodata) {
-               errno = ETIMEOUT;
+               errno = ETIMEDOUT;
                return -1;
        } else if (got_servfail) {
                errno = EAGAIN;
@@ -1298,44 +1316,3 @@ int res_mkquery(int op, const char *dname, int class, int type, char *data,
        return res_nmkquery(&res, op, dname, class, type, data, datalen,
                            newrr, buf, buflen);
 }
-
-//
-// dn_comp
-//
-
-int dn_comp(const char *src, unsigned char *dst, int dstsiz,
-           unsigned char **dnptrs, unsigned char **lastdnptr)
-{
-       unsigned char tmp[NS_MAXCDNAME];
-       int rc;
-
-       rc = ns_name_pton(src, tmp, sizeof tmp);
-       if (rc < 0)
-               return rc;
-
-       return ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr);
-}
-
-//
-// dn_expand
-//
-
-int dn_expand(const unsigned char *msg, const unsigned char *eom,
-             const unsigned char *src, char *dst, int dstsiz)
-{
-       unsigned char tmp[NS_MAXCDNAME];
-       int n;
-       int rc;
-
-       n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp);
-       if (n < 0)
-               return n;
-
-       rc = ns_name_ntop(tmp, dst, dstsiz);
-       if (rc < 0)
-               return rc;
-
-       if (n > 0 && dst[0] == '.')
-               dst[0] = '\0';
-       return n;
-}