Diff for /embedaddon/dnsmasq/src/config.h between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2014/06/15 16:31:38 version 1.1.1.3, 2016/11/02 09:57:01
Line 1 Line 1
/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley/* dnsmasq is Copyright (c) 2000-2016 Simon Kelley
   
    This program is free software; you can redistribute it and/or modify     This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by     it under the terms of the GNU General Public License as published by
Line 17 Line 17
 #define FTABSIZ 150 /* max number of outstanding requests (default) */  #define FTABSIZ 150 /* max number of outstanding requests (default) */
 #define MAX_PROCS 20 /* max no children for TCP requests */  #define MAX_PROCS 20 /* max no children for TCP requests */
 #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */  #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */
   #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */
 #define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */  #define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */
   #define SAFE_PKTSZ 1280 /* "go anywhere" UDP packet size */
 #define KEYBLOCK_LEN 40 /* choose to mininise fragmentation when storing DNSSEC keys */  #define KEYBLOCK_LEN 40 /* choose to mininise fragmentation when storing DNSSEC keys */
 #define DNSSEC_WORK 50 /* Max number of queries to validate one question */  #define DNSSEC_WORK 50 /* Max number of queries to validate one question */
 #define TIMEOUT 10 /* drop UDP queries after TIMEOUT seconds */  #define TIMEOUT 10 /* drop UDP queries after TIMEOUT seconds */
 #define FORWARD_TEST 50 /* try all servers every 50 queries */  #define FORWARD_TEST 50 /* try all servers every 50 queries */
 #define FORWARD_TIME 20 /* or 20 seconds */  #define FORWARD_TIME 20 /* or 20 seconds */
   #define SERVERS_LOGGED 30 /* Only log this many servers when logging state */
 #define RANDOM_SOCKS 64 /* max simultaneous random ports */  #define RANDOM_SOCKS 64 /* max simultaneous random ports */
 #define LEASE_RETRY 60 /* on error, retry writing leasefile after LEASE_RETRY seconds */  #define LEASE_RETRY 60 /* on error, retry writing leasefile after LEASE_RETRY seconds */
 #define CACHESIZ 150 /* default cache size */  #define CACHESIZ 150 /* default cache size */
   #define TTL_FLOOR_LIMIT 3600 /* don't allow --min-cache-ttl to raise TTL above this under any circumstances */
 #define MAXLEASES 1000 /* maximum number of DHCP leases */  #define MAXLEASES 1000 /* maximum number of DHCP leases */
 #define PING_WAIT 3 /* wait for ping address-in-use test */  #define PING_WAIT 3 /* wait for ping address-in-use test */
 #define PING_CACHE_TIME 30 /* Ping test assumed to be valid this long. */  #define PING_CACHE_TIME 30 /* Ping test assumed to be valid this long. */
Line 47 Line 51
 #define SOA_REFRESH 1200 /* SOA refresh default */  #define SOA_REFRESH 1200 /* SOA refresh default */
 #define SOA_RETRY 180 /* SOA retry default */  #define SOA_RETRY 180 /* SOA retry default */
 #define SOA_EXPIRY 1209600 /* SOA expiry default */  #define SOA_EXPIRY 1209600 /* SOA expiry default */
   #define LOOP_TEST_DOMAIN "test" /* domain for loop testing, "test" is reserved by RFC 2606 and won't therefore clash */
   #define LOOP_TEST_TYPE T_TXT
     
 /* compile-time options: uncomment below to enable or do eg.  /* compile-time options: uncomment below to enable or do eg.
    make COPTS=-DHAVE_BROKEN_RTC     make COPTS=-DHAVE_BROKEN_RTC
Line 105  HAVE_AUTH Line 111  HAVE_AUTH
    define this to include the facility to act as an authoritative DNS     define this to include the facility to act as an authoritative DNS
    server for one or more zones.     server for one or more zones.
   
   HAVE_DNSSEC
      include DNSSEC validator.
   
   HAVE_LOOP
      include functionality to probe for and remove DNS forwarding loops.
   
   HAVE_INOTIFY
      use the Linux inotify facility to efficiently re-read configuration files.
   
 NO_IPV6  NO_IPV6
 NO_TFTP  NO_TFTP
 NO_DHCP  NO_DHCP
Line 113  NO_DHCP6 Line 127  NO_DHCP6
 NO_SCRIPT  NO_SCRIPT
 NO_LARGEFILE  NO_LARGEFILE
 NO_AUTH  NO_AUTH
   NO_INOTIFY
    these are avilable to explictly disable compile time options which would      these are avilable to explictly disable compile time options which would 
    otherwise be enabled automatically (HAVE_IPV6, >2Gb file sizes) or      otherwise be enabled automatically (HAVE_IPV6, >2Gb file sizes) or 
    which are enabled  by default in the distributed source tree. Building dnsmasq     which are enabled  by default in the distributed source tree. Building dnsmasq
    with something like "make COPTS=-DNO_SCRIPT" will do the trick.     with something like "make COPTS=-DNO_SCRIPT" will do the trick.
   
   NO_NETTLE_ECC
      Don't include the ECDSA cypher in DNSSEC validation. Needed for older Nettle versions.
   NO_GMP
      Don't use and link against libgmp, Useful if nettle is built with --enable-mini-gmp.
   
 LEASEFILE  LEASEFILE
 CONFFILE  CONFFILE
 RESOLVFILE  RESOLVFILE
Line 141  RESOLVFILE Line 161  RESOLVFILE
 #define HAVE_SCRIPT  #define HAVE_SCRIPT
 #define HAVE_AUTH  #define HAVE_AUTH
 #define HAVE_IPSET   #define HAVE_IPSET 
   #define HAVE_LOOP
   
 /* Build options which require external libraries.  /* Build options which require external libraries.
         
Line 261  HAVE_SOCKADDR_SA_LEN Line 282  HAVE_SOCKADDR_SA_LEN
 /* Select the RFC_3542 version of the IPv6 socket API.   /* Select the RFC_3542 version of the IPv6 socket API. 
    Define before netinet6/in6.h is included. */     Define before netinet6/in6.h is included. */
 #define __APPLE_USE_RFC_3542   #define __APPLE_USE_RFC_3542 
   #define NO_IPSET
   
 #elif defined(__NetBSD__)  #elif defined(__NetBSD__)
 #define HAVE_BSD_NETWORK  #define HAVE_BSD_NETWORK
Line 316  HAVE_SOCKADDR_SA_LEN Line 338  HAVE_SOCKADDR_SA_LEN
 #define HAVE_DHCP  #define HAVE_DHCP
 #endif  #endif
   
#if defined(NO_SCRIPT) || !defined(HAVE_DHCP) || defined(NO_FORK)#if defined(NO_SCRIPT) || defined(NO_FORK)
 #undef HAVE_SCRIPT  #undef HAVE_SCRIPT
 #undef HAVE_LUASCRIPT  #undef HAVE_LUASCRIPT
 #endif  #endif
Line 330  HAVE_SOCKADDR_SA_LEN Line 352  HAVE_SOCKADDR_SA_LEN
 #undef HAVE_AUTH  #undef HAVE_AUTH
 #endif  #endif
   
#if defined(NO_IPSET) || !defined(HAVE_LINUX_NETWORK)#if defined(NO_IPSET)
 #undef HAVE_IPSET  #undef HAVE_IPSET
 #endif  #endif
   
   #ifdef NO_LOOP
   #undef HAVE_LOOP
   #endif
   
   #if defined (HAVE_LINUX_NETWORK) && !defined(NO_INOTIFY)
   #define HAVE_INOTIFY
   #endif
   
 /* Define a string indicating which options are in use.  /* Define a string indicating which options are in use.
    DNSMASQP_COMPILE_OPTS is only defined in dnsmasq.c */     DNSMASQP_COMPILE_OPTS is only defined in dnsmasq.c */
   
Line 403  static char *compile_opts =  Line 433  static char *compile_opts = 
 #ifndef HAVE_DNSSEC  #ifndef HAVE_DNSSEC
 "no-"  "no-"
 #endif  #endif
"DNSSEC";"DNSSEC "
 #ifndef HAVE_LOOP
 "no-"
 #endif
 "loop-detect "
 #ifndef HAVE_INOTIFY
 "no-"
 #endif
 "inotify";
   
   
 #endif  #endif

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>