BIND 10 trac1239, updated. 5be5e6a639a6a1c74761cae55a97f1fa46de5c6d [1239] lo/lo0 interface detection fix in DHCPv4/DHCPv6 server tests.
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Dec 7 17:22:11 UTC 2011
The branch, trac1239 has been updated
via 5be5e6a639a6a1c74761cae55a97f1fa46de5c6d (commit)
from e722aee2fc22e1b94c49451c35bc5f51c78854d2 (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 5be5e6a639a6a1c74761cae55a97f1fa46de5c6d
Author: Tomek Mrugalski <tomasz at isc.org>
Date: Wed Dec 7 18:21:55 2011 +0100
[1239] lo/lo0 interface detection fix in DHCPv4/DHCPv6 server tests.
-----------------------------------------------------------------------
Summary of changes:
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc | 8 ++++++--
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc | 7 +++++--
2 files changed, 11 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
index 0879b7e..741b832 100644
--- a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
@@ -56,9 +56,13 @@ public:
class Dhcpv4SrvTest : public ::testing::Test {
public:
Dhcpv4SrvTest() {
- unlink(INTERFACE_FILE);
+ unlink(INTERFACE_FILE);
fstream fakeifaces(INTERFACE_FILE, ios::out|ios::trunc);
- fakeifaces << "lo ::1";
+ if (if_nametoindex("lo")>0) {
+ fakeifaces << "lo ::1";
+ } else if (if_nametoindex("lo0")>0) {
+ fakeifaces << "lo0 ::1";
+ }
fakeifaces.close();
}
diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 0eced60..ada7eb0 100644
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -53,9 +53,12 @@ public:
Dhcpv6SrvTest() {
unlink(INTERFACE_FILE);
fstream fakeifaces(INTERFACE_FILE, ios::out|ios::trunc);
- fakeifaces << "lo ::1";
+ if (if_nametoindex("lo")>0) {
+ fakeifaces << "lo ::1";
+ } else if (if_nametoindex("lo0")>0) {
+ fakeifaces << "lo0 ::1";
+ }
fakeifaces.close();
-
}
~Dhcpv6SrvTest() {
unlink(INTERFACE_FILE);
More information about the bind10-changes
mailing list