BIND 10 trac1298, updated. ac552055bc8a4d996a0c24eb5f13d01667a3d77a [1298] add test with bad master port as well
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Nov 7 15:45:07 UTC 2011
The branch, trac1298 has been updated
via ac552055bc8a4d996a0c24eb5f13d01667a3d77a (commit)
via 26aaecc388f8c152b5d63a1f3906ba5a625b0e31 (commit)
via 10c84106e8b34d78fa1916e4bc3db15030fd94f9 (commit)
via 23cfc5b4d9b384172d0eadd2269ed6a6121966a8 (commit)
from 007d31f50876cd58a031dd86b461145e77bea63e (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 ac552055bc8a4d996a0c24eb5f13d01667a3d77a
Author: Jelte Jansen <jelte at isc.org>
Date: Mon Nov 7 16:44:53 2011 +0100
[1298] add test with bad master port as well
commit 26aaecc388f8c152b5d63a1f3906ba5a625b0e31
Author: Jelte Jansen <jelte at isc.org>
Date: Mon Nov 7 16:29:44 2011 +0100
[1298] only check family, address and port
commit 10c84106e8b34d78fa1916e4bc3db15030fd94f9
Author: Jelte Jansen <jelte at isc.org>
Date: Mon Nov 7 15:31:58 2011 +0100
[1298] tests for format_ functions
commit 23cfc5b4d9b384172d0eadd2269ed6a6121966a8
Author: Jelte Jansen <jelte at isc.org>
Date: Mon Nov 7 15:00:39 2011 +0100
[1298] add omit_final_dot support to isc.dns.Name.to_text()
-----------------------------------------------------------------------
Summary of changes:
src/bin/xfrin/tests/xfrin_test.py | 59 ++++++++++++++++++++++++++
src/bin/xfrin/xfrin.py.in | 23 ++++++----
src/bin/xfrin/xfrin_messages.mes | 2 +-
src/lib/dns/python/name_python.cc | 29 ++++++++++--
src/lib/dns/python/tests/name_python_test.py | 9 ++++
5 files changed, 107 insertions(+), 15 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/xfrin/tests/xfrin_test.py b/src/bin/xfrin/tests/xfrin_test.py
index dbdb0bf..9d3fa0b 100644
--- a/src/bin/xfrin/tests/xfrin_test.py
+++ b/src/bin/xfrin/tests/xfrin_test.py
@@ -1907,6 +1907,19 @@ class TestXfrin(unittest.TestCase):
self.assertEqual(self.xfr.command_handler("notify",
self.args)['result'][0], 1)
+ # also try a different port in the actual command
+ zones = { 'zones': [
+ { 'name': TEST_ZONE_NAME_STR,
+ 'master_addr': TEST_MASTER_IPV6_ADDRESS,
+ 'master_port': str(int(TEST_MASTER_PORT) + 1)
+ }
+ ]}
+ self.xfr.config_handler(zones)
+ # the command should now fail
+ self.assertEqual(self.xfr.command_handler("notify",
+ self.args)['result'][0], 1)
+
+
def test_command_handler_notify_known_zone(self):
# try it with a known zone
self.args['master'] = TEST_MASTER_IPV6_ADDRESS
@@ -2146,6 +2159,52 @@ class TestMain(unittest.TestCase):
MockXfrin.check_command_hook = raise_exception
main(MockXfrin, False)
+class TestFormatting(unittest.TestCase):
+ # If the formatting functions are moved to a more general library
+ # (ticket #1379), these tests should be moved with them.
+ def test_format_zone_str(self):
+ self.assertEqual("example.com/IN",
+ format_zone_str(isc.dns.Name("example.com"),
+ isc.dns.RRClass("IN")))
+ self.assertEqual("example.com/CH",
+ format_zone_str(isc.dns.Name("example.com"),
+ isc.dns.RRClass("CH")))
+ self.assertEqual("example.org/IN",
+ format_zone_str(isc.dns.Name("example.org"),
+ isc.dns.RRClass("IN")))
+
+ def test_format_addrinfo(self):
+ # This test may need to be updated if the input type is changed,
+ # right now it is a nested tuple:
+ # (family, sockettype, (address, port))
+ # of which sockettype is ignored
+ self.assertEqual("192.0.2.1:53",
+ format_addrinfo((socket.AF_INET, None,
+ ("192.0.2.1", 53))))
+ self.assertEqual("192.0.2.2:53",
+ format_addrinfo((socket.AF_INET, None,
+ ("192.0.2.2", 53))))
+ self.assertEqual("192.0.2.1:54",
+ format_addrinfo((socket.AF_INET, None,
+ ("192.0.2.1", 54))))
+ self.assertEqual("[::1]:53",
+ format_addrinfo((socket.AF_INET6, None,
+ ("::1", 53))))
+ self.assertEqual("[::2]:53",
+ format_addrinfo((socket.AF_INET6, None,
+ ("::2", 53))))
+ self.assertEqual("[::1]:54",
+ format_addrinfo((socket.AF_INET6, None,
+ ("::1", 54))))
+ self.assertEqual("/some/file",
+ format_addrinfo((socket.AF_UNIX, None,
+ "/some/file")))
+ self.assertRaises(TypeError, format_addrinfo, 1)
+ self.assertRaises(TypeError, format_addrinfo,
+ (socket.AF_INET, "asdf"))
+ self.assertRaises(TypeError, format_addrinfo,
+ (socket.AF_INET, "asdf", ()))
+
if __name__== "__main__":
try:
isc.log.resetUnitTestRootLogger()
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index fb81f71..efe972c 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -129,7 +129,7 @@ def format_zone_str(zone_name, zone_class):
zone_name (isc.dns.Name) name to format
zone_class (isc.dns.RRClass) class to format
"""
- return zone_name.to_text() + '/' + str(zone_class)
+ return zone_name.to_text(True) + '/' + str(zone_class)
def format_addrinfo(addrinfo):
"""Helper function to format the addrinfo as a string of the form
@@ -141,12 +141,16 @@ def format_addrinfo(addrinfo):
depending on the family, either a 2-tuple with the address
and port, or a filename
"""
- if addrinfo[0] == socket.AF_INET:
- return str(addrinfo[2][0]) + ":" + str(addrinfo[2][1])
- elif addrinfo[0] == socket.AF_INET6:
- return "[" + str(addrinfo[2][0]) + "]:" + str(addrinfo[2][1])
- else:
- return str(addrinfo[2])
+ try:
+ if addrinfo[0] == socket.AF_INET:
+ return str(addrinfo[2][0]) + ":" + str(addrinfo[2][1])
+ elif addrinfo[0] == socket.AF_INET6:
+ return "[" + str(addrinfo[2][0]) + "]:" + str(addrinfo[2][1])
+ else:
+ return str(addrinfo[2])
+ except IndexError:
+ raise TypeError("addrinfo argument to format_addrinfo() does not"
+ "appear to be consisting of (family, socktype, (addr, port))")
def get_soa_serial(soa_rdata):
'''Extract the serial field of an SOA RDATA and returns it as an intger.
@@ -1093,12 +1097,13 @@ class Xfrin:
if zone_info is None:
# TODO what to do? no info known about zone. defaults?
errmsg = "Got notification to retransfer unknown zone " + zone_str
- logger.error(XFRIN_RETRANSFER_UNKNOWN_ZONE, zone_str)
+ logger.info(XFRIN_RETRANSFER_UNKNOWN_ZONE, zone_str)
answer = create_answer(1, errmsg)
else:
master_addr = zone_info.get_master_addr_info()
request_type = RRType.AXFR()
- if notify_addr == master_addr:
+ if notify_addr[0] == master_addr[0] and\
+ notify_addr[2] == master_addr[2]:
ret = self.xfrin_start(zone_name,
rrclass,
self._get_db_file(),
diff --git a/src/bin/xfrin/xfrin_messages.mes b/src/bin/xfrin/xfrin_messages.mes
index c5f2dfb..e5d1733 100644
--- a/src/bin/xfrin/xfrin_messages.mes
+++ b/src/bin/xfrin/xfrin_messages.mes
@@ -70,7 +70,7 @@ was killed.
There was a problem sending a message to the zone manager. This most
likely means that the msgq daemon has quit or was killed.
-% XFRIN_NOTIFY_UNKNOWN_MASTER got notification to retransfer zone %1 from %2/%3, expected %4/%5
+% XFRIN_NOTIFY_UNKNOWN_MASTER got notification to retransfer zone %1 from %2, expected %3
The system received a notify for the given zone, but the address it came
from does not match the master address in the Xfrin configuration. The notify
is ignored. This may indicate that the configuration for the master is wrong,
diff --git a/src/lib/dns/python/name_python.cc b/src/lib/dns/python/name_python.cc
index 4043445..c511570 100644
--- a/src/lib/dns/python/name_python.cc
+++ b/src/lib/dns/python/name_python.cc
@@ -25,6 +25,8 @@
#include "messagerenderer_python.h"
#include "name_python.h"
+#include <iostream>
+
using namespace isc::dns;
using namespace isc::dns::python;
using namespace isc::util;
@@ -97,7 +99,7 @@ int Name_init(s_Name* self, PyObject* args);
void Name_destroy(s_Name* self);
PyObject* Name_toWire(s_Name* self, PyObject* args);
-PyObject* Name_toText(s_Name* self);
+PyObject* Name_toText(s_Name* self, PyObject* args);
PyObject* Name_str(PyObject* self);
PyObject* Name_getLabelCount(s_Name* self);
PyObject* Name_at(s_Name* self, PyObject* args);
@@ -120,8 +122,9 @@ PyMethodDef Name_methods[] = {
"Returns the length" },
{ "get_labelcount", reinterpret_cast<PyCFunction>(Name_getLabelCount), METH_NOARGS,
"Returns the number of labels" },
- { "to_text", reinterpret_cast<PyCFunction>(Name_toText), METH_NOARGS,
- "Returns the string representation" },
+ { "to_text", reinterpret_cast<PyCFunction>(Name_toText), METH_VARARGS,
+ "Returns the string representation. The optional argument must be either"
+ "True of False. If True, the final dot will be omitted." },
{ "to_wire", reinterpret_cast<PyCFunction>(Name_toWire), METH_VARARGS,
"Converts the Name object to wire format.\n"
"The argument can be either a MessageRenderer or an object that "
@@ -278,8 +281,24 @@ Name_getLabelCount(s_Name* self) {
}
PyObject*
-Name_toText(s_Name* self) {
- return (Py_BuildValue("s", self->cppobj->toText().c_str()));
+Name_toText(s_Name* self, PyObject* args) {
+ PyObject* omit_final_dot_obj = NULL;
+ if (PyArg_ParseTuple(args, "|O", &omit_final_dot_obj)) {
+ bool omit_final_dot = false;
+ if (omit_final_dot_obj != NULL) {
+ if (PyBool_Check(omit_final_dot_obj)) {
+ omit_final_dot = (omit_final_dot_obj == Py_True);
+ } else {
+ PyErr_SetString(PyExc_TypeError,
+ "Optional argument 1 of to_text() should be True of False");
+ return (NULL);
+ }
+ }
+ return (Py_BuildValue("s",
+ self->cppobj->toText(omit_final_dot).c_str()));
+ } else {
+ return (NULL);
+ }
}
PyObject*
diff --git a/src/lib/dns/python/tests/name_python_test.py b/src/lib/dns/python/tests/name_python_test.py
index b8e625a..5263412 100644
--- a/src/lib/dns/python/tests/name_python_test.py
+++ b/src/lib/dns/python/tests/name_python_test.py
@@ -121,6 +121,15 @@ class NameTest(unittest.TestCase):
self.assertEqual(".", str(self.name2))
self.assertEqual("something.completely.different.", self.name3.to_text())
+ self.assertEqual("example.com.", self.name1.to_text(False))
+ self.assertEqual("example.com", self.name1.to_text(True))
+
+ # make sure it does not behave unexpectedly on wrong arguments
+ self.assertRaises(TypeError, self.name1.to_text, True, 1)
+ self.assertRaises(TypeError, self.name1.to_text, 1)
+ self.assertRaises(TypeError, self.name1.to_text, [])
+ self.assertRaises(TypeError, self.name1.to_text, "foo")
+
def test_to_wire(self):
b1 = bytearray()
self.name1.to_wire(b1)
More information about the bind10-changes
mailing list