BIND 10 trac2025_2, updated. 9b410a87bfebfb3329e30f5949070a81bb22235a [2025] Make xfr master/slaves run on IPv6 entirely (to avoid issues with certain ports on 127.0.0.1)
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Jun 25 19:42:42 UTC 2012
The branch, trac2025_2 has been updated
via 9b410a87bfebfb3329e30f5949070a81bb22235a (commit)
via d6c5f0605f3d7ad837905a13d1d46fe41f3cf7f7 (commit)
via 05b81acbc6b6504b9d5f869465266b8cfa45ace1 (commit)
via 84d243249151b4f949eb88ae16ded1e46f1f2943 (commit)
from 0cd3e789df96be0f94030fffbdfa5675a76ea6a2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9b410a87bfebfb3329e30f5949070a81bb22235a
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Jun 26 01:12:22 2012 +0530
[2025] Make xfr master/slaves run on IPv6 entirely (to avoid issues with certain ports on 127.0.0.1)
commit d6c5f0605f3d7ad837905a13d1d46fe41f3cf7f7
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Jun 26 00:11:17 2012 +0530
[2025] Remove spec schema that was left in by mistake
commit 05b81acbc6b6504b9d5f869465266b8cfa45ace1
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Jun 26 00:03:39 2012 +0530
[2025] Remove redundant .getText() calls
commit 84d243249151b4f949eb88ae16ded1e46f1f2943
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Jun 26 00:02:04 2012 +0530
[2025] Rename message id and description
This is done so there is no misunderstanding about whether b10-auth is
processing NOTIFYs.
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/auth_messages.mes | 4 ++--
src/bin/auth/auth_srv.cc | 4 ++--
src/bin/xfrout/xfrout.spec.pre.in | 12 ------------
.../lettuce/configurations/xfrin/inmem_slave.conf | 4 ++--
.../configurations/xfrin/retransfer_master.conf | 4 ++--
.../configurations/xfrin/retransfer_slave.conf | 4 ++--
.../xfrin/retransfer_slave_notify.conf | 4 ++--
.../lettuce/features/inmemory_over_sqlite3.feature | 8 ++++----
tests/lettuce/features/terrain/transfer.py | 4 ++--
tests/lettuce/features/xfrin_bind10.feature | 6 +++---
.../lettuce/features/xfrin_notify_handling.feature | 6 +++---
11 files changed, 24 insertions(+), 36 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/auth_messages.mes b/src/bin/auth/auth_messages.mes
index 0805d85..61de3ee 100644
--- a/src/bin/auth/auth_messages.mes
+++ b/src/bin/auth/auth_messages.mes
@@ -110,8 +110,8 @@ look into the cause and address the issue. The log message includes
the client's address (and port), and the error message sent from the
lower layer that detects the failure.
-% AUTH_PROCESS_NOTIFY processing incoming NOTIFY for zone name %1, zone class %2
-This is a debug message reporting that an incoming NOTIFY is being processed.
+% AUTH_RECEIVED_NOTIFY received incoming NOTIFY for zone name %1, zone class %2
+This is a debug message reporting that an incoming NOTIFY was received.
% AUTH_NOTIFY_QUESTIONS invalid number of questions (%1) in incoming NOTIFY
This debug message is logged by the authoritative server when it receives
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index f06f023..7b8e963 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -828,8 +828,8 @@ AuthSrvImpl::processNotify(const IOMessage& io_message, Message& message,
return (false);
}
- LOG_DEBUG(auth_logger, DBG_AUTH_DETAIL, AUTH_PROCESS_NOTIFY)
- .arg(question->getName().toText()).arg(question->getClass().toText());
+ LOG_DEBUG(auth_logger, DBG_AUTH_DETAIL, AUTH_RECEIVED_NOTIFY)
+ .arg(question->getName()).arg(question->getClass());
const string remote_ip_address =
io_message.getRemoteEndpoint().getAddress().toText();
diff --git a/src/bin/xfrout/xfrout.spec.pre.in b/src/bin/xfrout/xfrout.spec.pre.in
index a0e9665..f31c9df 100644
--- a/src/bin/xfrout/xfrout.spec.pre.in
+++ b/src/bin/xfrout/xfrout.spec.pre.in
@@ -43,18 +43,6 @@
"item_type": "integer",
"item_optional": false,
"item_default": 0
- },
- {
- "item_name": "transfer_acl",
- "item_type": "list",
- "item_optional": true,
- "item_default": [{"action": "ACCEPT"}],
- "list_item_spec":
- {
- "item_name": "acl_element",
- "item_type": "any",
- "item_optional": true
- }
}
]
}
diff --git a/tests/lettuce/configurations/xfrin/inmem_slave.conf b/tests/lettuce/configurations/xfrin/inmem_slave.conf
index a6d88ee..9b69300 100644
--- a/tests/lettuce/configurations/xfrin/inmem_slave.conf
+++ b/tests/lettuce/configurations/xfrin/inmem_slave.conf
@@ -19,8 +19,8 @@
} ]
} ],
"listen_on": [ {
- "port": 47806,
- "address": "127.0.0.1"
+ "address": "::1",
+ "port": 47806
} ]
},
"Boss": {
diff --git a/tests/lettuce/configurations/xfrin/retransfer_master.conf b/tests/lettuce/configurations/xfrin/retransfer_master.conf
index 3f91a5a..5efd133 100644
--- a/tests/lettuce/configurations/xfrin/retransfer_master.conf
+++ b/tests/lettuce/configurations/xfrin/retransfer_master.conf
@@ -10,7 +10,7 @@
"Auth": {
"database_file": "data/example.org.sqlite3",
"listen_on": [ {
- "address": "127.0.0.1",
+ "address": "::1",
"port": 47807
} ]
},
@@ -19,7 +19,7 @@
"origin": "example.org"
} ],
"test_notify_slaves": [ {
- "address": "127.0.0.1",
+ "address": "::1",
"port": 47806
} ]
},
diff --git a/tests/lettuce/configurations/xfrin/retransfer_slave.conf b/tests/lettuce/configurations/xfrin/retransfer_slave.conf
index 2296b8f..260147d 100644
--- a/tests/lettuce/configurations/xfrin/retransfer_slave.conf
+++ b/tests/lettuce/configurations/xfrin/retransfer_slave.conf
@@ -10,8 +10,8 @@
"Auth": {
"database_file": "data/test_nonexistent_db.sqlite3",
"listen_on": [ {
- "port": 47806,
- "address": "127.0.0.1"
+ "address": "::1",
+ "port": 47806
} ]
},
"Boss": {
diff --git a/tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf b/tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf
index 383a395..57244a4 100644
--- a/tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf
+++ b/tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf
@@ -10,14 +10,14 @@
"Auth": {
"database_file": "data/xfrin-notify.sqlite3",
"listen_on": [ {
- "address": "127.0.0.1",
+ "address": "::1",
"port": 47806
} ]
},
"Xfrin": {
"zones": [ {
"name": "example.org",
- "master_addr": "127.0.0.1",
+ "master_addr": "::1",
"master_port": 47807
} ]
},
diff --git a/tests/lettuce/features/inmemory_over_sqlite3.feature b/tests/lettuce/features/inmemory_over_sqlite3.feature
index 2e48689..851caca 100644
--- a/tests/lettuce/features/inmemory_over_sqlite3.feature
+++ b/tests/lettuce/features/inmemory_over_sqlite3.feature
@@ -26,18 +26,18 @@ Feature: In-memory zone using SQLite3 backend
And wait for bind10 stderr message XFRIN_STARTED
And wait for bind10 stderr message ZONEMGR_STARTED
- A query for www.example.org should have rcode NOERROR
+ A query for www.example.org to [::1]:47806 should have rcode NOERROR
"""
www.example.org. 3600 IN A 192.0.2.63
"""
- A query for mail.example.org should have rcode NXDOMAIN
+ A query for mail.example.org to [::1]:47806 should have rcode NXDOMAIN
When I send bind10 the command Xfrin retransfer example.org IN ::1 47807
Then wait for new bind10 stderr message XFRIN_TRANSFER_SUCCESS not XFRIN_XFR_PROCESS_FAILURE
Then wait for new bind10 stderr message AUTH_LOAD_ZONE
- A query for www.example.org should have rcode NOERROR
+ A query for www.example.org to [::1]:47807 should have rcode NOERROR
The answer section of the last query response should be
"""
www.example.org. 3600 IN A 192.0.2.1
"""
- A query for mail.example.org should have rcode NOERROR
+ A query for mail.example.org to [::1]:47806 should have rcode NOERROR
diff --git a/tests/lettuce/features/terrain/transfer.py b/tests/lettuce/features/terrain/transfer.py
index 4ba45b8..eb4ddc0 100644
--- a/tests/lettuce/features/terrain/transfer.py
+++ b/tests/lettuce/features/terrain/transfer.py
@@ -67,11 +67,11 @@ def perform_axfr(step, zone_name, address, port):
Step definition:
An AXFR transfer of <zone_name> [from <address>:<port>]
- Address defaults to 127.0.0.1
+ Address defaults to ::1
Port defaults to 47806
"""
if address is None:
- address = "127.0.0.1"
+ address = "::1"
# convert [IPv6_addr] to IPv6_addr:
address = re.sub(r"\[(.+)\]", r"\1", address)
if port is None:
diff --git a/tests/lettuce/features/xfrin_bind10.feature b/tests/lettuce/features/xfrin_bind10.feature
index a967e70..7a45ddd 100644
--- a/tests/lettuce/features/xfrin_bind10.feature
+++ b/tests/lettuce/features/xfrin_bind10.feature
@@ -23,11 +23,11 @@ Feature: Xfrin
# Now we use the first step again to see if the file has been created
The file data/test_nonexistent_db.sqlite3 should exist
- A query for www.example.org should have rcode REFUSED
- When I send bind10 the command Xfrin retransfer example.org IN 127.0.0.1 47807
+ A query for www.example.org to [::1]:47806 should have rcode REFUSED
+ When I send bind10 the command Xfrin retransfer example.org IN ::1 47807
Then wait for new bind10 stderr message XFRIN_TRANSFER_SUCCESS not XFRIN_XFR_PROCESS_FAILURE
Then wait for new bind10 stderr message ZONEMGR_RECEIVE_XFRIN_SUCCESS
- A query for www.example.org should have rcode NOERROR
+ A query for www.example.org to [::1]:47806 should have rcode NOERROR
# The transferred zone should have 11 non-NSEC3 RRs and 1 NSEC3 RR.
# The following check will get these by AXFR, so the total # of RRs
diff --git a/tests/lettuce/features/xfrin_notify_handling.feature b/tests/lettuce/features/xfrin_notify_handling.feature
index 06bda77..e514b83 100644
--- a/tests/lettuce/features/xfrin_notify_handling.feature
+++ b/tests/lettuce/features/xfrin_notify_handling.feature
@@ -16,14 +16,14 @@ Feature: Xfrin incoming notify handling
And wait for bind10 stderr message XFRIN_STARTED
And wait for bind10 stderr message ZONEMGR_STARTED
- A query for www.example.org should have rcode NXDOMAIN
+ A query for www.example.org to [::1]:47806 should have rcode NXDOMAIN
When I send bind10 with cmdctl port 47804 the command Xfrout notify example.org IN
Then wait for new master stderr message XFROUT_NOTIFY_COMMAND
- Then wait for new bind10 stderr message AUTH_PROCESS_NOTIFY
+ Then wait for new bind10 stderr message AUTH_RECEIVED_NOTIFY
Then wait for new bind10 stderr message ZONEMGR_RECEIVE_NOTIFY
Then wait for new bind10 stderr message XFRIN_XFR_TRANSFER_STARTED
Then wait for new bind10 stderr message XFRIN_TRANSFER_SUCCESS not XFRIN_XFR_PROCESS_FAILURE
Then wait for new bind10 stderr message ZONEMGR_RECEIVE_XFRIN_SUCCESS
- A query for www.example.org should have rcode NOERROR
+ A query for www.example.org to [::1]:47806 should have rcode NOERROR
More information about the bind10-changes
mailing list