Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
BIND
Commits
b8a9a7be
Commit
b8a9a7be
authored
Dec 08, 2010
by
Automatic Updater
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update copyright notice
parent
ead8aa31
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
309 additions
and
40 deletions
+309
-40
bin/named/query.c
bin/named/query.c
+12
-12
bin/named/server.c
bin/named/server.c
+4
-4
bin/tests/system/dns64/clean.sh
bin/tests/system/dns64/clean.sh
+16
-0
bin/tests/system/dns64/conf/bad1.conf
bin/tests/system/dns64/conf/bad1.conf
+18
-0
bin/tests/system/dns64/conf/bad2.conf
bin/tests/system/dns64/conf/bad2.conf
+18
-0
bin/tests/system/dns64/conf/bad3.conf
bin/tests/system/dns64/conf/bad3.conf
+18
-0
bin/tests/system/dns64/conf/bad4.conf
bin/tests/system/dns64/conf/bad4.conf
+18
-0
bin/tests/system/dns64/conf/bad5.conf
bin/tests/system/dns64/conf/bad5.conf
+18
-0
bin/tests/system/dns64/conf/bad6.conf
bin/tests/system/dns64/conf/bad6.conf
+18
-0
bin/tests/system/dns64/conf/good1.conf
bin/tests/system/dns64/conf/good1.conf
+18
-0
bin/tests/system/dns64/conf/good2.conf
bin/tests/system/dns64/conf/good2.conf
+18
-0
bin/tests/system/dns64/conf/good3.conf
bin/tests/system/dns64/conf/good3.conf
+18
-0
bin/tests/system/dns64/conf/good4.conf
bin/tests/system/dns64/conf/good4.conf
+18
-0
bin/tests/system/dns64/conf/good5.conf
bin/tests/system/dns64/conf/good5.conf
+18
-0
bin/tests/system/dns64/ns1/example.db
bin/tests/system/dns64/ns1/example.db
+16
-1
bin/tests/system/dns64/ns1/named.conf
bin/tests/system/dns64/ns1/named.conf
+2
-3
bin/tests/system/dns64/ns1/root.db
bin/tests/system/dns64/ns1/root.db
+16
-1
bin/tests/system/dns64/ns1/sign.sh
bin/tests/system/dns64/ns1/sign.sh
+2
-3
bin/tests/system/dns64/setup.sh
bin/tests/system/dns64/setup.sh
+2
-3
lib/bind9/check.c
lib/bind9/check.c
+2
-2
lib/dns/dns64.c
lib/dns/dns64.c
+19
-5
lib/dns/include/dns/dns64.h
lib/dns/include/dns/dns64.h
+20
-6
No files found.
bin/named/query.c
View file @
b8a9a7be
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: query.c,v 1.34
7
2010/12/08
02:46:15 marka
Exp $ */
/* $Id: query.c,v 1.34
8
2010/12/08
23:47:05 tbox
Exp $ */
/*! \file */
...
...
@@ -2101,12 +2101,12 @@ query_dns64(ns_client_t *client, dns_name_t **namep, dns_rdataset_t *rdataset,
result
=
dns_rdataset_next
(
rdataset
))
{
for
(
dns64
=
ISC_LIST_HEAD
(
client
->
view
->
dns64
);
dns64
!=
NULL
;
dns64
=
dns_dns64_next
(
dns64
))
{
dns_rdataset_current
(
rdataset
,
&
rdata
);
isc__buffer_availableregion
(
buffer
,
&
r
);
INSIST
(
r
.
length
>=
16
);
result
=
dns_dns64_aaaafroma
(
dns64
,
&
netaddr
,
client
->
signer
,
client
->
signer
,
&
ns_g_server
->
aclenv
,
flags
,
rdata
.
data
,
r
.
base
);
if
(
result
!=
ISC_R_SUCCESS
)
{
...
...
@@ -4079,7 +4079,7 @@ dns64_aaaaok(ns_client_t *client, dns_rdataset_t *rdataset,
unsigned
int
flags
=
0
;
unsigned
int
i
,
count
;
isc_boolean_t
*
aaaaok
;
INSIST
(
client
->
query
.
dns64_aaaaok
==
NULL
);
INSIST
(
client
->
query
.
dns64_aaaaoklen
==
0
);
INSIST
(
client
->
query
.
dns64_aaaa
==
NULL
);
...
...
@@ -4619,7 +4619,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
NULL
,
NULL
,
resuming
);
else
if
(
dns64
)
result
=
query_recurse
(
client
,
result
=
query_recurse
(
client
,
dns_rdatatype_a
,
NULL
,
NULL
,
resuming
);
...
...
@@ -4627,7 +4627,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
result
=
query_recurse
(
client
,
qtype
,
fname
,
rdataset
,
resuming
);
if
(
result
==
ISC_R_SUCCESS
)
{
client
->
query
.
attributes
|=
NS_QUERYATTR_RECURSING
;
...
...
@@ -4723,10 +4723,10 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
if
(
dns64_excluded
)
break
;
#endif
}
else
if
(
result
==
DNS_R_NXRRSET
&&
!
ISC_LIST_EMPTY
(
client
->
view
->
dns64
)
&&
client
->
message
->
rdclass
==
dns_rdataclass_in
&&
qtype
==
dns_rdatatype_aaaa
)
}
else
if
(
result
==
DNS_R_NXRRSET
&&
!
ISC_LIST_EMPTY
(
client
->
view
->
dns64
)
&&
client
->
message
->
rdclass
==
dns_rdataclass_in
&&
qtype
==
dns_rdatatype_aaaa
)
{
/*
* Look to see if there are A records for this
...
...
@@ -5565,10 +5565,10 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
query_filter64
(
client
,
&
fname
,
rdataset
,
dbuf
,
DNS_SECTION_ANSWER
);
query_putrdataset
(
client
,
&
rdataset
);
}
else
}
else
query_addrrset
(
client
,
&
fname
,
&
rdataset
,
sigrdatasetp
,
dbuf
,
DNS_SECTION_ANSWER
);
if
(
noqname
!=
NULL
)
query_addnoqnameproof
(
client
,
noqname
);
/*
...
...
bin/named/server.c
View file @
b8a9a7be
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.58
8
2010/12/08
02:46:15 marka
Exp $ */
/* $Id: server.c,v 1.58
9
2010/12/08
23:47:05 tbox
Exp $ */
/*! \file */
...
...
@@ -1647,7 +1647,7 @@ configure_view(dns_view_t *view, cfg_parser_t* parser,
cfg_obj_assockaddr
(
obj
));
}
else
sp
=
NULL
;
clients
=
mapped
=
excluded
=
NULL
;
obj
=
NULL
;
(
void
)
cfg_map_get
(
map
,
"clients"
,
&
obj
);
...
...
@@ -1686,7 +1686,7 @@ configure_view(dns_view_t *view, cfg_parser_t* parser,
(
void
)
cfg_map_get
(
map
,
"break-dnssec"
,
&
obj
);
if
(
obj
!=
NULL
&&
cfg_obj_asboolean
(
obj
))
dns64options
|=
DNS_DNS64_BREAK_DNSSEC
;
result
=
dns_dns64_create
(
mctx
,
&
na
,
prefixlen
,
sp
,
clients
,
mapped
,
excluded
,
dns64options
,
&
dns64
);
...
...
@@ -1702,7 +1702,7 @@ configure_view(dns_view_t *view, cfg_parser_t* parser,
dns_acl_detach
(
&
excluded
);
}
}
obj
=
NULL
;
result
=
ns_config_get
(
maps
,
"dnssec-accept-expired"
,
&
obj
);
INSIST
(
result
==
ISC_R_SUCCESS
);
...
...
bin/tests/system/dns64/clean.sh
View file @
b8a9a7be
#!/bin/sh
#
# Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.3 2010/12/08 23:51:55 tbox Exp $
rm
-f
ns1/K
*
...
...
bin/tests/system/dns64/conf/bad1.conf
View file @
b8a9a7be
/*
*
Copyright
(
C
)
2010
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
*
copyright
notice
and
this
permission
notice
appear
in
all
copies
.
*
*
THE
SOFTWARE
IS
PROVIDED
"AS IS"
AND
ISC
DISCLAIMS
ALL
WARRANTIES
WITH
*
REGARD
TO
THIS
SOFTWARE
INCLUDING
ALL
IMPLIED
WARRANTIES
OF
MERCHANTABILITY
*
AND
FITNESS
.
IN
NO
EVENT
SHALL
ISC
BE
LIABLE
FOR
ANY
SPECIAL
,
DIRECT
,
*
INDIRECT
,
OR
CONSEQUENTIAL
DAMAGES
OR
ANY
DAMAGES
WHATSOEVER
RESULTING
FROM
*
LOSS
OF
USE
,
DATA
OR
PROFITS
,
WHETHER
IN
AN
ACTION
OF
CONTRACT
,
NEGLIGENCE
*
OR
OTHER
TORTIOUS
ACTION
,
ARISING
OUT
OF
OR
IN
CONNECTION
WITH
THE
USE
OR
*
PERFORMANCE
OF
THIS
SOFTWARE
.
*/
/* $
Id
:
bad1
.
conf
,
v
1
.
3
2010
/
12
/
08
23
:
51
:
55
tbox
Exp
$ */
options
{
dns64
::/
0
{ };
};
bin/tests/system/dns64/conf/bad2.conf
View file @
b8a9a7be
/*
*
Copyright
(
C
)
2010
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
*
copyright
notice
and
this
permission
notice
appear
in
all
copies
.
*
*
THE
SOFTWARE
IS
PROVIDED
"AS IS"
AND
ISC
DISCLAIMS
ALL
WARRANTIES
WITH
*
REGARD
TO
THIS
SOFTWARE
INCLUDING
ALL
IMPLIED
WARRANTIES
OF
MERCHANTABILITY
*
AND
FITNESS
.
IN
NO
EVENT
SHALL
ISC
BE
LIABLE
FOR
ANY
SPECIAL
,
DIRECT
,
*
INDIRECT
,
OR
CONSEQUENTIAL
DAMAGES
OR
ANY
DAMAGES
WHATSOEVER
RESULTING
FROM
*
LOSS
OF
USE
,
DATA
OR
PROFITS
,
WHETHER
IN
AN
ACTION
OF
CONTRACT
,
NEGLIGENCE
*
OR
OTHER
TORTIOUS
ACTION
,
ARISING
OUT
OF
OR
IN
CONNECTION
WITH
THE
USE
OR
*
PERFORMANCE
OF
THIS
SOFTWARE
.
*/
/* $
Id
:
bad2
.
conf
,
v
1
.
3
2010
/
12
/
08
23
:
51
:
56
tbox
Exp
$ */
options
{
dns64
::/
96
{
suffix
::
1
; };
};
bin/tests/system/dns64/conf/bad3.conf
View file @
b8a9a7be
/*
*
Copyright
(
C
)
2010
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
*
copyright
notice
and
this
permission
notice
appear
in
all
copies
.
*
*
THE
SOFTWARE
IS
PROVIDED
"AS IS"
AND
ISC
DISCLAIMS
ALL
WARRANTIES
WITH
*
REGARD
TO
THIS
SOFTWARE
INCLUDING
ALL
IMPLIED
WARRANTIES
OF
MERCHANTABILITY
*
AND
FITNESS
.
IN
NO
EVENT
SHALL
ISC
BE
LIABLE
FOR
ANY
SPECIAL
,
DIRECT
,
*
INDIRECT
,
OR
CONSEQUENTIAL
DAMAGES
OR
ANY
DAMAGES
WHATSOEVER
RESULTING
FROM
*
LOSS
OF
USE
,
DATA
OR
PROFITS
,
WHETHER
IN
AN
ACTION
OF
CONTRACT
,
NEGLIGENCE
*
OR
OTHER
TORTIOUS
ACTION
,
ARISING
OUT
OF
OR
IN
CONNECTION
WITH
THE
USE
OR
*
PERFORMANCE
OF
THIS
SOFTWARE
.
*/
/* $
Id
:
bad3
.
conf
,
v
1
.
3
2010
/
12
/
08
23
:
51
:
56
tbox
Exp
$ */
options
{
dns64
::/
96
{
suffix
127
.
0
.
0
.
1
; };
};
bin/tests/system/dns64/conf/bad4.conf
View file @
b8a9a7be
/*
*
Copyright
(
C
)
2010
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
*
copyright
notice
and
this
permission
notice
appear
in
all
copies
.
*
*
THE
SOFTWARE
IS
PROVIDED
"AS IS"
AND
ISC
DISCLAIMS
ALL
WARRANTIES
WITH
*
REGARD
TO
THIS
SOFTWARE
INCLUDING
ALL
IMPLIED
WARRANTIES
OF
MERCHANTABILITY
*
AND
FITNESS
.
IN
NO
EVENT
SHALL
ISC
BE
LIABLE
FOR
ANY
SPECIAL
,
DIRECT
,
*
INDIRECT
,
OR
CONSEQUENTIAL
DAMAGES
OR
ANY
DAMAGES
WHATSOEVER
RESULTING
FROM
*
LOSS
OF
USE
,
DATA
OR
PROFITS
,
WHETHER
IN
AN
ACTION
OF
CONTRACT
,
NEGLIGENCE
*
OR
OTHER
TORTIOUS
ACTION
,
ARISING
OUT
OF
OR
IN
CONNECTION
WITH
THE
USE
OR
*
PERFORMANCE
OF
THIS
SOFTWARE
.
*/
/* $
Id
:
bad4
.
conf
,
v
1
.
3
2010
/
12
/
08
23
:
51
:
56
tbox
Exp
$ */
options
{
dns64
::/
129
{ };
};
bin/tests/system/dns64/conf/bad5.conf
View file @
b8a9a7be
/*
*
Copyright
(
C
)
2010
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
*
copyright
notice
and
this
permission
notice
appear
in
all
copies
.
*
*
THE
SOFTWARE
IS
PROVIDED
"AS IS"
AND
ISC
DISCLAIMS
ALL
WARRANTIES
WITH
*
REGARD
TO
THIS
SOFTWARE
INCLUDING
ALL
IMPLIED
WARRANTIES
OF
MERCHANTABILITY
*
AND
FITNESS
.
IN
NO
EVENT
SHALL
ISC
BE
LIABLE
FOR
ANY
SPECIAL
,
DIRECT
,
*
INDIRECT
,
OR
CONSEQUENTIAL
DAMAGES
OR
ANY
DAMAGES
WHATSOEVER
RESULTING
FROM
*
LOSS
OF
USE
,
DATA
OR
PROFITS
,
WHETHER
IN
AN
ACTION
OF
CONTRACT
,
NEGLIGENCE
*
OR
OTHER
TORTIOUS
ACTION
,
ARISING
OUT
OF
OR
IN
CONNECTION
WITH
THE
USE
OR
*
PERFORMANCE
OF
THIS
SOFTWARE
.
*/
/* $
Id
:
bad5
.
conf
,
v
1
.
3
2010
/
12
/
08
23
:
51
:
56
tbox
Exp
$ */
options
{
dns64
::/
129
{ };
};
bin/tests/system/dns64/conf/bad6.conf
View file @
b8a9a7be
/*
*
Copyright
(
C
)
2010
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
*
copyright
notice
and
this
permission
notice
appear
in
all
copies
.
*
*
THE
SOFTWARE
IS
PROVIDED
"AS IS"
AND
ISC
DISCLAIMS
ALL
WARRANTIES
WITH
*
REGARD
TO
THIS
SOFTWARE
INCLUDING
ALL
IMPLIED
WARRANTIES
OF
MERCHANTABILITY
*
AND
FITNESS
.
IN
NO
EVENT
SHALL
ISC
BE
LIABLE
FOR
ANY
SPECIAL
,
DIRECT
,
*
INDIRECT
,
OR
CONSEQUENTIAL
DAMAGES
OR
ANY
DAMAGES
WHATSOEVER
RESULTING
FROM
*
LOSS
OF
USE
,
DATA
OR
PROFITS
,
WHETHER
IN
AN
ACTION
OF
CONTRACT
,
NEGLIGENCE
*
OR
OTHER
TORTIOUS
ACTION
,
ARISING
OUT
OF
OR
IN
CONNECTION
WITH
THE
USE
OR
*
PERFORMANCE
OF
THIS
SOFTWARE
.
*/
/* $
Id
:
bad6
.
conf
,
v
1
.
3
2010
/
12
/
08
23
:
51
:
56
tbox
Exp
$ */
options
{
dns64
:: { };
};
bin/tests/system/dns64/conf/good1.conf
View file @
b8a9a7be
/*
*
Copyright
(
C
)
2010
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
*
copyright
notice
and
this
permission
notice
appear
in
all
copies
.
*
*
THE
SOFTWARE
IS
PROVIDED
"AS IS"
AND
ISC
DISCLAIMS
ALL
WARRANTIES
WITH
*
REGARD
TO
THIS
SOFTWARE
INCLUDING
ALL
IMPLIED
WARRANTIES
OF
MERCHANTABILITY
*
AND
FITNESS
.
IN
NO
EVENT
SHALL
ISC
BE
LIABLE
FOR
ANY
SPECIAL
,
DIRECT
,
*
INDIRECT
,
OR
CONSEQUENTIAL
DAMAGES
OR
ANY
DAMAGES
WHATSOEVER
RESULTING
FROM
*
LOSS
OF
USE
,
DATA
OR
PROFITS
,
WHETHER
IN
AN
ACTION
OF
CONTRACT
,
NEGLIGENCE
*
OR
OTHER
TORTIOUS
ACTION
,
ARISING
OUT
OF
OR
IN
CONNECTION
WITH
THE
USE
OR
*
PERFORMANCE
OF
THIS
SOFTWARE
.
*/
/* $
Id
:
good1
.
conf
,
v
1
.
3
2010
/
12
/
08
23
:
51
:
56
tbox
Exp
$ */
acl
rfc1918
{
10
/
8
;
192
.
168
/
16
;
172
.
16
/
12
; };
options
{
/*
Well
Known
Prefix
*/
...
...
bin/tests/system/dns64/conf/good2.conf
View file @
b8a9a7be
/*
*
Copyright
(
C
)
2010
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
*
copyright
notice
and
this
permission
notice
appear
in
all
copies
.
*
*
THE
SOFTWARE
IS
PROVIDED
"AS IS"
AND
ISC
DISCLAIMS
ALL
WARRANTIES
WITH
*
REGARD
TO
THIS
SOFTWARE
INCLUDING
ALL
IMPLIED
WARRANTIES
OF
MERCHANTABILITY
*
AND
FITNESS
.
IN
NO
EVENT
SHALL
ISC
BE
LIABLE
FOR
ANY
SPECIAL
,
DIRECT
,
*
INDIRECT
,
OR
CONSEQUENTIAL
DAMAGES
OR
ANY
DAMAGES
WHATSOEVER
RESULTING
FROM
*
LOSS
OF
USE
,
DATA
OR
PROFITS
,
WHETHER
IN
AN
ACTION
OF
CONTRACT
,
NEGLIGENCE
*
OR
OTHER
TORTIOUS
ACTION
,
ARISING
OUT
OF
OR
IN
CONNECTION
WITH
THE
USE
OR
*
PERFORMANCE
OF
THIS
SOFTWARE
.
*/
/* $
Id
:
good2
.
conf
,
v
1
.
3
2010
/
12
/
08
23
:
51
:
56
tbox
Exp
$ */
acl
rfc1918
{
10
/
8
;
192
.
168
/
16
;
172
.
16
/
12
; };
options
{
/*
Well
Known
Prefix
*/
...
...
bin/tests/system/dns64/conf/good3.conf
View file @
b8a9a7be
/*
*
Copyright
(
C
)
2010
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
*
copyright
notice
and
this
permission
notice
appear
in
all
copies
.
*
*
THE
SOFTWARE
IS
PROVIDED
"AS IS"
AND
ISC
DISCLAIMS
ALL
WARRANTIES
WITH
*
REGARD
TO
THIS
SOFTWARE
INCLUDING
ALL
IMPLIED
WARRANTIES
OF
MERCHANTABILITY
*
AND
FITNESS
.
IN
NO
EVENT
SHALL
ISC
BE
LIABLE
FOR
ANY
SPECIAL
,
DIRECT
,
*
INDIRECT
,
OR
CONSEQUENTIAL
DAMAGES
OR
ANY
DAMAGES
WHATSOEVER
RESULTING
FROM
*
LOSS
OF
USE
,
DATA
OR
PROFITS
,
WHETHER
IN
AN
ACTION
OF
CONTRACT
,
NEGLIGENCE
*
OR
OTHER
TORTIOUS
ACTION
,
ARISING
OUT
OF
OR
IN
CONNECTION
WITH
THE
USE
OR
*
PERFORMANCE
OF
THIS
SOFTWARE
.
*/
/* $
Id
:
good3
.
conf
,
v
1
.
3
2010
/
12
/
08
23
:
51
:
56
tbox
Exp
$ */
acl
rfc1918
{
10
/
8
;
192
.
168
/
16
;
172
.
16
/
12
; };
options
{
/*
Well
Known
Prefix
*/
...
...
bin/tests/system/dns64/conf/good4.conf
View file @
b8a9a7be
/*
*
Copyright
(
C
)
2010
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
*
copyright
notice
and
this
permission
notice
appear
in
all
copies
.
*
*
THE
SOFTWARE
IS
PROVIDED
"AS IS"
AND
ISC
DISCLAIMS
ALL
WARRANTIES
WITH
*
REGARD
TO
THIS
SOFTWARE
INCLUDING
ALL
IMPLIED
WARRANTIES
OF
MERCHANTABILITY
*
AND
FITNESS
.
IN
NO
EVENT
SHALL
ISC
BE
LIABLE
FOR
ANY
SPECIAL
,
DIRECT
,
*
INDIRECT
,
OR
CONSEQUENTIAL
DAMAGES
OR
ANY
DAMAGES
WHATSOEVER
RESULTING
FROM
*
LOSS
OF
USE
,
DATA
OR
PROFITS
,
WHETHER
IN
AN
ACTION
OF
CONTRACT
,
NEGLIGENCE
*
OR
OTHER
TORTIOUS
ACTION
,
ARISING
OUT
OF
OR
IN
CONNECTION
WITH
THE
USE
OR
*
PERFORMANCE
OF
THIS
SOFTWARE
.
*/
/* $
Id
:
good4
.
conf
,
v
1
.
3
2010
/
12
/
08
23
:
51
:
56
tbox
Exp
$ */
acl
rfc1918
{
10
/
8
;
192
.
168
/
16
;
172
.
16
/
12
; };
options
{
/*
Well
Known
Prefix
*/
...
...
bin/tests/system/dns64/conf/good5.conf
View file @
b8a9a7be
/*
*
Copyright
(
C
)
2010
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
*
copyright
notice
and
this
permission
notice
appear
in
all
copies
.
*
*
THE
SOFTWARE
IS
PROVIDED
"AS IS"
AND
ISC
DISCLAIMS
ALL
WARRANTIES
WITH
*
REGARD
TO
THIS
SOFTWARE
INCLUDING
ALL
IMPLIED
WARRANTIES
OF
MERCHANTABILITY
*
AND
FITNESS
.
IN
NO
EVENT
SHALL
ISC
BE
LIABLE
FOR
ANY
SPECIAL
,
DIRECT
,
*
INDIRECT
,
OR
CONSEQUENTIAL
DAMAGES
OR
ANY
DAMAGES
WHATSOEVER
RESULTING
FROM
*
LOSS
OF
USE
,
DATA
OR
PROFITS
,
WHETHER
IN
AN
ACTION
OF
CONTRACT
,
NEGLIGENCE
*
OR
OTHER
TORTIOUS
ACTION
,
ARISING
OUT
OF
OR
IN
CONNECTION
WITH
THE
USE
OR
*
PERFORMANCE
OF
THIS
SOFTWARE
.
*/
/* $
Id
:
good5
.
conf
,
v
1
.
3
2010
/
12
/
08
23
:
51
:
56
tbox
Exp
$ */
acl
rfc1918
{
10
/
8
;
192
.
168
/
16
;
172
.
16
/
12
; };
options
{
/*
Well
Known
Prefix
*/
...
...
bin/tests/system/dns64/ns1/example.db
View file @
b8a9a7be
; Copyright
; Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
; copyright notice and this permission notice appear in all copies.
;
; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; $Id: example.db,v 1.3 2010/12/08 23:51:56 tbox Exp $
$TTL 3600
@ SOA ns1 marka.isc.org. 0 0 0 0 1200
@ NS ns1
...
...
bin/tests/system/dns64/ns1/named.conf
View file @
b8a9a7be
/*
*
Copyright
(
C
)
2004
,
2006
,
2007
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
Copyright
(
C
)
2000
,
2001
Internet
Software
Consortium
.
*
Copyright
(
C
)
2010
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
...
...
@@ -15,7 +14,7 @@
*
PERFORMANCE
OF
THIS
SOFTWARE
.
*/
/* $
Id
:
named
.
conf
,
v
1
.
2
2010
/
12
/
08
02
:
46
:
15
marka
Exp
$ */
/* $
Id
:
named
.
conf
,
v
1
.
3
2010
/
12
/
08
23
:
51
:
56
tbox
Exp
$ */
//
NS1
...
...
bin/tests/system/dns64/ns1/root.db
View file @
b8a9a7be
; Copyright
; Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
; copyright notice and this permission notice appear in all copies.
;
; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; $Id: root.db,v 1.3 2010/12/08 23:51:56 tbox Exp $
$TTL 3600
@ SOA a.root-servers.nil. marka.isc.org. 0 0 0 0 0
@ NS a.root-servers.nil.
...
...
bin/tests/system/dns64/ns1/sign.sh
View file @
b8a9a7be
#!/bin/sh -e
#
# Copyright (C) 2004, 2006-2010 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000-2003 Internet Software Consortium.
# Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
...
...
@@ -15,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: sign.sh,v 1.
2
2010/12/08
02:46:16 marka
Exp $
# $Id: sign.sh,v 1.
3
2010/12/08
23:51:56 tbox
Exp $
SYSTEMTESTTOP
=
../..
.
$SYSTEMTESTTOP
/conf.sh
...
...
bin/tests/system/dns64/setup.sh
View file @
b8a9a7be
#!/bin/sh -e
#
# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000, 2001 Internet Software Consortium.
# Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
...
...
@@ -15,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: setup.sh,v 1.
2
2010/12/08
02:46:15 marka
Exp $
# $Id: setup.sh,v 1.
3
2010/12/08
23:51:55 tbox
Exp $
../../../tools/genrandom 400 random.data
...
...
lib/bind9/check.c
View file @
b8a9a7be
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: check.c,v 1.12
1
2010/12/08
02:46:16 marka
Exp $ */
/* $Id: check.c,v 1.12
2
2010/12/08
23:47:06 tbox
Exp $ */
/*! \file */
...
...
@@ -461,7 +461,7 @@ check_dns64(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions,
result
=
ISC_R_FAILURE
;
continue
;
}
if
(
prefixlen
!=
32
&&
prefixlen
!=
40
&&
prefixlen
!=
48
&&
prefixlen
!=
56
&&
prefixlen
!=
64
&&
prefixlen
!=
96
)
{
cfg_obj_log
(
map
,
logctx
,
ISC_LOG_ERROR
,
...
...
lib/dns/dns64.c
View file @
b8a9a7be
/*
* Copyright
* Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dns64.c,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
#include <config.h>
#include <isc/list.h>
...
...
@@ -25,7 +39,7 @@ struct dns_dns64 {
* addresses.
*/
dns_acl_t
*
mapped
;
/*
* IPv4 addresses to be mapped.
* IPv4 addresses to be mapped.
*/
dns_acl_t
*
excluded
;
/*
* IPv6 addresses that are
...
...
@@ -136,7 +150,7 @@ dns_dns64_aaaafroma(const dns_dns64_t *dns64, const isc_netaddr_t *reqaddr,
if
(
match
<=
0
)
return
(
DNS_R_DISALLOWED
);
}
if
(
dns64
->
mapped
!=
NULL
)
{
struct
in_addr
ina
;
isc_netaddr_t
netaddr
;
...
...
@@ -185,7 +199,7 @@ dns_dns64_unlink(dns_dns64list_t *list, dns_dns64_t *dns64) {
isc_boolean_t
dns_dns64_aaaaok
(
const
dns_dns64_t
*
dns64
,
const
isc_netaddr_t
*
reqaddr
,
const
dns_name_t
*
reqsigner
,
const
dns_aclenv_t
*
env
,
const
dns_name_t
*
reqsigner
,
const
dns_aclenv_t
*
env
,
unsigned
int
flags
,
dns_rdataset_t
*
rdataset
,
isc_boolean_t
*
aaaaok
,
size_t
aaaaoklen
)
{
...
...
@@ -202,7 +216,7 @@ dns_dns64_aaaaok(const dns_dns64_t *dns64, const isc_netaddr_t *reqaddr,
REQUIRE
(
rdataset
->
rdclass
==
dns_rdataclass_in
);
if
(
aaaaok
!=
NULL
)
REQUIRE
(
aaaaoklen
==
dns_rdataset_count
(
rdataset
));
for
(;
dns64
!=
NULL
;
dns64
=
ISC_LIST_NEXT
(
dns64
,
link
))
{
if
((
dns64
->
flags
&
DNS_DNS64_RECURSIVE_ONLY
)
!=
0
&&
(
flags
&
DNS_DNS64_RECURSIVE
)
==
0
)
...
...
lib/dns/include/dns/dns64.h
View file @
b8a9a7be
/*
* Copyright
* Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dns64.h,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
#ifndef DNS_DNS64_H
#define DNS_DNS64_H 1
...
...
@@ -41,7 +55,7 @@ dns_dns64_create(isc_mem_t *mctx, isc_netaddr_t *prefix,
*
* 'prefix' and 'prefixlen' defined the leading bits of the AAAA records
* to be synthesised. 'suffix' defines the bits after the A records bits.
* If suffix is NULL zeros will be used for these bits. 'client' defines
* If suffix is NULL zeros will be used for these bits. 'client' defines
* for which clients this record applies. If 'client' is NULL then all
* clients apply. 'mapped' defines which A records are candidated for
* mapping. If 'mapped' is NULL then all A records will be mapped.
...
...
@@ -87,8 +101,8 @@ dns_dns64_destroy(dns_dns64_t **dns64p);
isc_result_t
dns_dns64_aaaafroma
(
const
dns_dns64_t
*
dns64
,
const
isc_netaddr_t
*
reqaddr
,
const
dns_name_t
*
reqsigner
,
const
dns_aclenv_t
*
env
,
unsigned
int
flags
,
unsigned
char
*
a
,
unsigned
char
*
aaaa
);
const
dns_name_t
*
reqsigner
,
const
dns_aclenv_t
*
env
,
unsigned
int
flags
,
unsigned
char
*
a
,
unsigned
char
*
aaaa
);
/*
* dns_dns64_aaaafroma() determines whether to perform a DNS64 address
* synthesis from 'a' based on 'dns64', 'reqaddr', 'reqsigner', 'env',
...
...
@@ -135,8 +149,8 @@ dns_dns64_unlink(dns_dns64list_t *list, dns_dns64_t *dns64);
isc_boolean_t
dns_dns64_aaaaok
(
const
dns_dns64_t
*
dns64
,
const
isc_netaddr_t
*
reqaddr
,
const
dns_name_t
*
reqsigner
,
const
dns_aclenv_t
*
env
,
unsigned
int
flags
,
dns_rdataset_t
*
rdataset
,
const
dns_name_t
*
reqsigner
,
const
dns_aclenv_t
*
env
,
unsigned
int
flags
,
dns_rdataset_t
*
rdataset
,
isc_boolean_t
*
aaaaok
,
size_t
aaaaoklen
);
/*
* Determine if there are any non-excluded AAAA records in from the
...
...
Write
Preview