ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/evdns.c
(Generate patch)

Comparing libev/evdns.c (file contents):
Revision 1.1 by root, Thu Nov 1 15:46:43 2007 UTC vs.
Revision 1.3 by root, Thu Nov 1 17:35:02 2007 UTC

1/* $Id: evdns.c,v 1.1 2007/11/01 15:46:43 root Exp $ */ 1#define DNS_USE_GETTIMEOFDAY_FOR_ID 1
2 2
3/* The original version of this module was written by Adam Langley; for 3/* The original version of this module was written by Adam Langley; for
4 * a history of modifications, check out the subversion logs. 4 * a history of modifications, check out the subversion logs.
5 * 5 *
6 * When editing this module, try to keep it re-mergeable by Adam. Don't 6 * When editing this module, try to keep it re-mergeable by Adam. Don't
… …
92#include <ctype.h> 92#include <ctype.h>
93#include <stdio.h> 93#include <stdio.h>
94#include <stdarg.h> 94#include <stdarg.h>
95 95
96#include "evdns.h" 96#include "evdns.h"
97/*#include "log.h"*/
98#ifdef WIN32 97#ifdef WIN32
99#include <windows.h> 98#include <windows.h>
100#include <winsock2.h> 99#include <winsock2.h>
101#include <iphlpapi.h> 100#include <iphlpapi.h>
102#else 101#else
… …
174 char request_appended; /* true if the request pointer is data which follows this struct */ 173 char request_appended; /* true if the request pointer is data which follows this struct */
175 char transmit_me; /* needs to be transmitted */ 174 char transmit_me; /* needs to be transmitted */
176}; 175};
177 176
178#ifndef HAVE_STRUCT_IN6_ADDR 177#ifndef HAVE_STRUCT_IN6_ADDR
179struct in6_addr { 178struct xin6_addr {
180 u8 s6_addr[16]; 179 u8 s6_addr[16];
181}; 180};
182#endif 181#endif
183 182
184struct reply { 183struct reply {
… …
189 u32 addrcount; 188 u32 addrcount;
190 u32 addresses[MAX_ADDRS]; 189 u32 addresses[MAX_ADDRS];
191 } a; 190 } a;
192 struct { 191 struct {
193 u32 addrcount; 192 u32 addrcount;
194 struct in6_addr addresses[MAX_ADDRS]; 193 struct xin6_addr addresses[MAX_ADDRS];
195 } aaaa; 194 } aaaa;
196 struct { 195 struct {
197 char name[HOST_NAME_MAX]; 196 char name[HOST_NAME_MAX];
198 } ptr; 197 } ptr;
199 } data; 198 } data;
… …
2264 if (!req) return 1; 2263 if (!req) return 1;
2265 request_submit(req); 2264 request_submit(req);
2266 return 0; 2265 return 0;
2267} 2266}
2268 2267
2269int evdns_resolve_reverse_ipv6(struct in6_addr *in, int flags, evdns_callback_type callback, void *ptr) { 2268int evdns_resolve_reverse_ipv6(struct xin6_addr *in, int flags, evdns_callback_type callback, void *ptr) {
2270 char buf[64]; 2269 char buf[96];
2271 char *cp; 2270 char *cp;
2272 struct request *req; 2271 struct request *req;
2273 int i; 2272 int i;
2274 assert(in); 2273 assert(in);
2275 cp = buf; 2274 cp = buf;
… …
2543 /* if the file isn't found then we assume a local resolver */ 2542 /* if the file isn't found then we assume a local resolver */
2544 if (flags & DNS_OPTION_SEARCH) search_set_from_hostname(); 2543 if (flags & DNS_OPTION_SEARCH) search_set_from_hostname();
2545 if (flags & DNS_OPTION_NAMESERVERS) evdns_nameserver_ip_add("127.0.0.1"); 2544 if (flags & DNS_OPTION_NAMESERVERS) evdns_nameserver_ip_add("127.0.0.1");
2546} 2545}
2547 2546
2548#ifndef HAVE_STRTOK_R
2549static char *
2550strtok_r(char *s, const char *delim, char **state) {
2551 return strtok(s, delim);
2552}
2553#endif
2554 2547
2555/* helper version of atoi which returns -1 on error */ 2548/* helper version of atoi which returns -1 on error */
2556static int 2549static int
2557strtoint(const char *const str) { 2550strtoint(const char *const str) {
2558 char *endptr; 2551 char *endptr;
… …
2621 2614
2622static void 2615static void
2623resolv_conf_parse_line(char *const start, int flags) { 2616resolv_conf_parse_line(char *const start, int flags) {
2624 char *strtok_state; 2617 char *strtok_state;
2625 static const char *const delims = " \t"; 2618 static const char *const delims = " \t";
2626#define NEXT_TOKEN strtok_r(NULL, delims, &strtok_state) 2619#define NEXT_TOKEN strtok(NULL, delims, &strtok_state)
2627 2620
2628 char *const first_token = strtok_r(start, delims, &strtok_state); 2621 char *const first_token = strtok(start, delims, &strtok_state);
2629 if (!first_token) return; 2622 if (!first_token) return;
2630 2623
2631 if (!strcmp(first_token, "nameserver") && (flags & DNS_OPTION_NAMESERVERS)) { 2624 if (!strcmp(first_token, "nameserver") && (flags & DNS_OPTION_NAMESERVERS)) {
2632 const char *const nameserver = NEXT_TOKEN; 2625 const char *const nameserver = NEXT_TOKEN;
2633 struct in_addr ina; 2626 struct in_addr ina;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines