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

Comparing libev/evdns.c (file contents):
Revision 1.4 by root, Thu Nov 1 17:45:30 2007 UTC vs.
Revision 1.14 by root, Mon Nov 5 16:45:43 2007 UTC

1#define DNS_USE_GETTIMEOFDAY_FOR_ID 1 1/* $Id: evdns.c,v 1.14 2007/11/05 16:45:43 root Exp $ */
2#define HAVE_STRUCT_IN6_ADDR 1
3 2
4/* 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
5 * a history of modifications, check out the subversion logs. 4 * a history of modifications, check out the subversion logs.
6 * 5 *
7 * 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
39#ifdef HAVE_CONFIG_H 38#ifdef HAVE_CONFIG_H
40#include "config.h" 39#include "config.h"
41#endif 40#endif
42 41
43#ifdef WIN32 42#ifdef WIN32
43#ifndef EV_STANDALONE
44#include "misc.h" 44#include "misc.h"
45#endif
45#endif 46#endif
46 47
47/* #define NDEBUG */ 48/* #define NDEBUG */
48 49
49#ifndef DNS_USE_CPU_CLOCK_FOR_ID 50#ifndef DNS_USE_CPU_CLOCK_FOR_ID
2545 if (flags & DNS_OPTION_NAMESERVERS) evdns_nameserver_ip_add("127.0.0.1"); 2546 if (flags & DNS_OPTION_NAMESERVERS) evdns_nameserver_ip_add("127.0.0.1");
2546} 2547}
2547 2548
2548#ifndef HAVE_STRTOK_R 2549#ifndef HAVE_STRTOK_R
2549static char * 2550static char *
2550fake_strtok_r(char *s, const char *delim, char **state) { 2551strtok_r(char *s, const char *delim, char **state) {
2551 return strtok(s, delim); 2552 return strtok(s, delim);
2552} 2553}
2553#endif 2554#endif
2554 2555
2555/* helper version of atoi which returns -1 on error */ 2556/* helper version of atoi which returns -1 on error */
2621 2622
2622static void 2623static void
2623resolv_conf_parse_line(char *const start, int flags) { 2624resolv_conf_parse_line(char *const start, int flags) {
2624 char *strtok_state; 2625 char *strtok_state;
2625 static const char *const delims = " \t"; 2626 static const char *const delims = " \t";
2626#define NEXT_TOKEN fake_strtok_r(NULL, delims, &strtok_state) 2627#define NEXT_TOKEN strtok_r(NULL, delims, &strtok_state)
2627 2628
2628 char *const first_token = fake_strtok_r(start, delims, &strtok_state); 2629 char *const first_token = strtok_r(start, delims, &strtok_state);
2629 if (!first_token) return; 2630 if (!first_token) return;
2630 2631
2631 if (!strcmp(first_token, "nameserver") && (flags & DNS_OPTION_NAMESERVERS)) { 2632 if (!strcmp(first_token, "nameserver") && (flags & DNS_OPTION_NAMESERVERS)) {
2632 const char *const nameserver = NEXT_TOKEN; 2633 const char *const nameserver = NEXT_TOKEN;
2633 struct in_addr ina; 2634 struct in_addr ina;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines