interface: and ip-address:

also includes for newer ldns in pythonmod. 


git-svn-id: file:///svn/unbound/trunk@3014 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2013-11-06 02:48:59 +00:00
parent 789ccae281
commit e704e27be6
6 changed files with 1164 additions and 1128 deletions

View file

@ -1,6 +1,8 @@
5 Nov 2013: Wouter 5 Nov 2013: Wouter
- Patch from Neel Goyal to fix async id assignment if callback - Patch from Neel Goyal to fix async id assignment if callback
is called by libunbound in the mesh attach. is called by libunbound in the mesh attach.
- Accept ip-address: as an alternative for interface: for
consistency with nsd.conf syntax.
4 Nov 2013: Wouter 4 Nov 2013: Wouter
- Patch from Neel Goyal to fix callback in libunbound. - Patch from Neel Goyal to fix callback in libunbound.

View file

@ -122,6 +122,9 @@ A port number can be specified with @port (without spaces between
interface and port number), if not specified the default port (from interface and port number), if not specified the default port (from
\fBport\fR) is used. \fBport\fR) is used.
.TP .TP
.B ip\-address: \fI<ip address[@port]>
Same as interface: (for easy of compatibility with nsd.conf).
.TP
.B interface\-automatic: \fI<yes or no> .B interface\-automatic: \fI<yes or no>
Detect source interface on UDP queries and copy them to replies. This Detect source interface on UDP queries and copy them to replies. This
feature is experimental, and needs support in your OS for particular socket feature is experimental, and needs support in your OS for particular socket

View file

@ -45,7 +45,7 @@
#endif #endif
#include "config.h" #include "config.h"
#include <ldns/ldns.h> #include "ldns/sbuffer.h"
#undef _POSIX_C_SOURCE #undef _POSIX_C_SOURCE
#undef _XOPEN_SOURCE #undef _XOPEN_SOURCE

View file

@ -48,6 +48,7 @@
#include "util/data/msgreply.h" #include "util/data/msgreply.h"
#include "util/storage/slabhash.h" #include "util/storage/slabhash.h"
#include "util/regional.h" #include "util/regional.h"
#include "ldns/sbuffer.h"
#undef _POSIX_C_SOURCE #undef _POSIX_C_SOURCE
#undef _XOPEN_SOURCE #undef _XOPEN_SOURCE

File diff suppressed because it is too large Load diff

View file

@ -221,6 +221,7 @@ ssl-service-pem{COLON} { YDVAR(1, VAR_SSL_SERVICE_PEM) }
ssl-port{COLON} { YDVAR(1, VAR_SSL_PORT) } ssl-port{COLON} { YDVAR(1, VAR_SSL_PORT) }
do-daemonize{COLON} { YDVAR(1, VAR_DO_DAEMONIZE) } do-daemonize{COLON} { YDVAR(1, VAR_DO_DAEMONIZE) }
interface{COLON} { YDVAR(1, VAR_INTERFACE) } interface{COLON} { YDVAR(1, VAR_INTERFACE) }
ip-address{COLON} { YDVAR(1, VAR_INTERFACE) }
outgoing-interface{COLON} { YDVAR(1, VAR_OUTGOING_INTERFACE) } outgoing-interface{COLON} { YDVAR(1, VAR_OUTGOING_INTERFACE) }
interface-automatic{COLON} { YDVAR(1, VAR_INTERFACE_AUTOMATIC) } interface-automatic{COLON} { YDVAR(1, VAR_INTERFACE_AUTOMATIC) }
so-rcvbuf{COLON} { YDVAR(1, VAR_SO_RCVBUF) } so-rcvbuf{COLON} { YDVAR(1, VAR_SO_RCVBUF) }