mirror of
https://github.com/NLnetLabs/unbound.git
synced 2026-09-06 09:57:43 +02:00
Initial commit for interface based ACL.
This commit is contained in:
+1
-1
@@ -974,7 +974,7 @@ service(const char* bind_str, int bindport, const char* serv_str,
|
||||
dl_tv_add(&reuse, &delay);
|
||||
if(reuse.tv_sec == 0)
|
||||
reuse.tv_sec = 1;
|
||||
if(!extstrtoaddr(serv_str, &srv_addr, &srv_len)) {
|
||||
if(!extstrtoaddr(serv_str, &srv_addr, &srv_len, UNBOUND_DNS_PORT)) {
|
||||
printf("cannot parse forward address: %s\n", serv_str);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@@ -1341,6 +1341,7 @@ int resolve_interface_names(char** ATTR_UNUSED(ifs), int ATTR_UNUSED(num_ifs),
|
||||
}
|
||||
|
||||
struct listen_port* listening_ports_open(struct config_file* ATTR_UNUSED(cfg),
|
||||
struct acl_list* ATTR_UNUSED(acl_interface),
|
||||
char** ATTR_UNUSED(ifs), int ATTR_UNUSED(num_ifs),
|
||||
int* ATTR_UNUSED(reuseport))
|
||||
{
|
||||
|
||||
+1
-1
@@ -618,7 +618,7 @@ int main(int argc, char* argv[])
|
||||
printf("error: pass server IP address on commandline.\n");
|
||||
usage(nm);
|
||||
}
|
||||
if(!extstrtoaddr(argv[0], &info.dest, &info.destlen)) {
|
||||
if(!extstrtoaddr(argv[0], &info.dest, &info.destlen, UNBOUND_DNS_PORT)) {
|
||||
printf("Could not parse ip: %s\n", argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
+7
-4
@@ -179,7 +179,8 @@ replay_range_read(char* remain, FILE* in, const char* name,
|
||||
while(isspace((unsigned char)*parse))
|
||||
parse++;
|
||||
strip_end_white(parse);
|
||||
if(!extstrtoaddr(parse, &rng->addr, &rng->addrlen)) {
|
||||
if(!extstrtoaddr(parse, &rng->addr, &rng->addrlen,
|
||||
UNBOUND_DNS_PORT)) {
|
||||
log_err("Line %d: could not read ADDRESS: %s",
|
||||
pstate->lineno, parse);
|
||||
free(rng);
|
||||
@@ -287,7 +288,8 @@ replay_moment_read(char* remain, FILE* in, const char* name,
|
||||
} else if(parse_keyword(&remain, "QUERY")) {
|
||||
mom->evt_type = repevt_front_query;
|
||||
readentry = 1;
|
||||
if(!extstrtoaddr("127.0.0.1", &mom->addr, &mom->addrlen))
|
||||
if(!extstrtoaddr("127.0.0.1", &mom->addr, &mom->addrlen,
|
||||
UNBOUND_DNS_PORT))
|
||||
fatal_exit("internal error");
|
||||
} else if(parse_keyword(&remain, "CHECK_ANSWER")) {
|
||||
mom->evt_type = repevt_front_reply;
|
||||
@@ -354,7 +356,7 @@ replay_moment_read(char* remain, FILE* in, const char* name,
|
||||
m++;
|
||||
while(isspace((unsigned char)*m))
|
||||
m++;
|
||||
if(!extstrtoaddr(s, &mom->addr, &mom->addrlen))
|
||||
if(!extstrtoaddr(s, &mom->addr, &mom->addrlen, UNBOUND_DNS_PORT))
|
||||
fatal_exit("bad infra_rtt address %s", s);
|
||||
strip_end_white(m);
|
||||
mom->variable = strdup(remain);
|
||||
@@ -372,7 +374,8 @@ replay_moment_read(char* remain, FILE* in, const char* name,
|
||||
while(isspace((unsigned char)*remain))
|
||||
remain++;
|
||||
strip_end_white(remain);
|
||||
if(!extstrtoaddr(remain, &mom->addr, &mom->addrlen)) {
|
||||
if(!extstrtoaddr(remain, &mom->addr, &mom->addrlen,
|
||||
UNBOUND_DNS_PORT)) {
|
||||
log_err("line %d: could not parse ADDRESS: %s",
|
||||
pstate->lineno, remain);
|
||||
free(mom);
|
||||
|
||||
@@ -89,7 +89,7 @@ open_svr(const char* svr, int udp)
|
||||
int fd = -1;
|
||||
/* svr can be ip@port */
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
if(!extstrtoaddr(svr, &addr, &addrlen)) {
|
||||
if(!extstrtoaddr(svr, &addr, &addrlen, UNBOUND_DNS_PORT)) {
|
||||
printf("fatal: bad server specs '%s'\n", svr);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user