Changeset 1a26a9

Timestamp:

09/26/09 11:42:32 (3 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

b17790

Parents:

c5bdf0

git-author:

Erik Ekman <yarrick@…> (09/26/09 11:42:32)

git-committer:

Erik Ekman <erik@…> (02/04/12 20:34:04)

Message:

#82, switch to gethostbyname() for win32 support

Files:

• CHANGELOG (modified) (1 diff)
• man/iodine.8 (modified) (1 diff)
• src/client.c (modified) (1 diff)
• src/iodine.c (modified) (1 diff)

CHANGELOG

@@ -29 +29 @@
                 Patch by Anne Bezemer, merge help by logix.
         - Merged low-latency patch from Anne Bezemer, fixes #76.
-        - Resolve client nameserver argument (except on win32), #82.
+        - Resolve client nameserver argument if given as hostname, fixes #82.
 
 2009-06-01: 0.5.2 "WifiFree"

man/iodine.8

@@ -222 +222 @@
 The nameserver to use to relay the dns traffic. This can be any relaying
 nameserver or the server running iodined if reachable. This field can be
-given as an IP address, or as a hostname (except on Win32 currently).
-This argument is optional, and if not specified a nameserver will be read
-from the
+given as an IP address, or as a hostname. This argument is optional, and 
+if not specified a nameserver will be read from the
 .I /etc/resolv.conf
 file.

src/client.c

@@ -146 +146 @@
 
         if (inet_aton(cp, &addr) != 1) {
+                /* try resolving if a domain is given */
+                struct hostent *host;
+                const char *err;
+                host = gethostbyname(cp);
+                if (host != NULL && h_errno > 0) {
+                        int i = 0;
+                        while (host->h_addr_list[i] != 0) {
+                                addr = *(struct in_addr *) host->h_addr_list[i++];
+                                fprintf(stderr, "Resolved %s to %s\n", cp, inet_ntoa(addr));
+                                goto setaddr;
+                        }
+                }
 #ifndef WINDOWS32
-                /* MinGW only supports getaddrinfo on WinXP and higher..
-                 * so turn it off in windows for now
-                 *
-                 * try resolving if a domain is given */
-                struct addrinfo *addrinfo;
-                struct addrinfo *res;
-                if (getaddrinfo(cp, NULL, NULL, &addrinfo) == 0) {
-                        struct sockaddr_in *inaddr;
-                        for (res = addrinfo; res != NULL; res = res->ai_next) {
-                                inaddr = (struct sockaddr_in *) res->ai_addr;
-                                addr = inaddr->sin_addr;
+                err = hstrerror(h_errno);
+#else
+                {
+                        DWORD wserr = WSAGetLastError();
+                        switch (wserr) {
+                        case WSAHOST_NOT_FOUND:
+                                err = "Host not found";
                                 break;
-                        }
-                        freeaddrinfo(addrinfo);
-                } else
-#endif
-                        errx(1, "error parsing nameserver address: '%s'", cp);
-        }
-
+                        case WSANO_DATA:
+                                err = "No data record found";
+                                break;
+                        default:
+                                err = "Unknown error";
+                                break;
+                        }
+                }
+#endif /* !WINDOWS32 */
+                errx(1, "error resolving nameserver '%s': %s", cp, err);
+        }
+
+setaddr:
         memset(&nameserv, 0, sizeof(nameserv));
         nameserv.sin_family = AF_INET;

src/iodine.c

@@ -90 +90 @@
         fprintf(stderr, "  -z context, to apply specified SELinux context after initialization\n");
         fprintf(stderr, "  -F pidfile to write pid to a file\n");
-        fprintf(stderr, "nameserver is the IP number/hostname of the relaying nameserver\n    "
-                        "(hostname not supported on win32). if absent, /etc/resolv.conf is used\n");
+        fprintf(stderr, "nameserver is the IP number/hostname of the relaying nameserver. if absent, /etc/resolv.conf is used\n");
         fprintf(stderr, "topdomain is the FQDN that is delegated to the tunnel endpoint.\n");