BIND 10 trac1486, updated. fab53a075c7817cf2e8bfe06e76851d81c3e0d5c [1486] Rename IOAddress::from_bytes() to IOAddress::fromBytes()
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Nov 19 14:26:37 UTC 2012
The branch, trac1486 has been updated
via fab53a075c7817cf2e8bfe06e76851d81c3e0d5c (commit)
from 504f64b2975180c69805756c4e6997c9dfdf140c (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 fab53a075c7817cf2e8bfe06e76851d81c3e0d5c
Author: Stephen Morris <stephen at isc.org>
Date: Mon Nov 19 14:25:31 2012 +0000
[1486] Rename IOAddress::from_bytes() to IOAddress::fromBytes()
... to conform to coding standards.
-----------------------------------------------------------------------
Summary of changes:
src/lib/asiolink/io_address.cc | 2 +-
src/lib/asiolink/io_address.h | 2 +-
src/lib/asiolink/tests/io_address_unittest.cc | 6 +++---
src/lib/dhcp/iface_mgr.cc | 4 ++--
src/lib/dhcp/iface_mgr_linux.cc | 2 +-
src/lib/dhcp/option6_addrlst.cc | 2 +-
src/lib/dhcp/option6_iaaddr.cc | 2 +-
src/lib/dhcpsrv/addr_utilities.cc | 4 ++--
src/lib/dhcpsrv/alloc_engine.cc | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/asiolink/io_address.cc b/src/lib/asiolink/io_address.cc
index 832452c..c805d51 100644
--- a/src/lib/asiolink/io_address.cc
+++ b/src/lib/asiolink/io_address.cc
@@ -61,7 +61,7 @@ IOAddress::toText() const {
}
IOAddress
-IOAddress::from_bytes(short family, const uint8_t* data) {
+IOAddress::fromBytes(short family, const uint8_t* data) {
if (data == NULL) {
isc_throw(BadValue, "NULL pointer received.");
} else
diff --git a/src/lib/asiolink/io_address.h b/src/lib/asiolink/io_address.h
index 6c18a66..042588c 100644
--- a/src/lib/asiolink/io_address.h
+++ b/src/lib/asiolink/io_address.h
@@ -111,7 +111,7 @@ public:
///
/// \return Created IOAddress object
static IOAddress
- from_bytes(short family, const uint8_t* data);
+ fromBytes(short family, const uint8_t* data);
/// \brief Compare addresses for equality
///
diff --git a/src/lib/asiolink/tests/io_address_unittest.cc b/src/lib/asiolink/tests/io_address_unittest.cc
index a1a9076..5e621f3 100644
--- a/src/lib/asiolink/tests/io_address_unittest.cc
+++ b/src/lib/asiolink/tests/io_address_unittest.cc
@@ -64,7 +64,7 @@ TEST(IOAddressTest, Family) {
EXPECT_EQ(AF_INET6, IOAddress("2001:0DB8:0:0::0012").getFamily());
}
-TEST(IOAddressTest, from_bytes) {
+TEST(IOAddressTest, fromBytes) {
// 2001:db8:1::dead:beef
uint8_t v6[] = {
0x20, 0x01, 0x0d, 0xb8, 0x00, 0x01, 0, 0,
@@ -74,12 +74,12 @@ TEST(IOAddressTest, from_bytes) {
IOAddress addr("::");
EXPECT_NO_THROW({
- addr = IOAddress::from_bytes(AF_INET6, v6);
+ addr = IOAddress::fromBytes(AF_INET6, v6);
});
EXPECT_EQ("2001:db8:1::dead:beef", addr.toText());
EXPECT_NO_THROW({
- addr = IOAddress::from_bytes(AF_INET, v4);
+ addr = IOAddress::fromBytes(AF_INET, v4);
});
EXPECT_EQ(addr.toText(), IOAddress("192.0.2.3").toText());
}
diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc
index 2f1199e..adf1731 100644
--- a/src/lib/dhcp/iface_mgr.cc
+++ b/src/lib/dhcp/iface_mgr.cc
@@ -1098,9 +1098,9 @@ Pkt6Ptr IfaceMgr::receive6(uint32_t timeout_sec, uint32_t timeout_usec /* = 0 */
pkt->updateTimestamp();
- pkt->setLocalAddr(IOAddress::from_bytes(AF_INET6,
+ pkt->setLocalAddr(IOAddress::fromBytes(AF_INET6,
reinterpret_cast<const uint8_t*>(&to_addr)));
- pkt->setRemoteAddr(IOAddress::from_bytes(AF_INET6,
+ pkt->setRemoteAddr(IOAddress::fromBytes(AF_INET6,
reinterpret_cast<const uint8_t*>(&from.sin6_addr)));
pkt->setRemotePort(ntohs(from.sin6_port));
pkt->setIndex(ifindex);
diff --git a/src/lib/dhcp/iface_mgr_linux.cc b/src/lib/dhcp/iface_mgr_linux.cc
index 38189aa..e7d5048 100644
--- a/src/lib/dhcp/iface_mgr_linux.cc
+++ b/src/lib/dhcp/iface_mgr_linux.cc
@@ -302,7 +302,7 @@ void Netlink::ipaddrs_get(IfaceMgr::Iface& iface, NetlinkMessages& addr_info) {
memcpy(addr, RTA_DATA(rta_tb[IFLA_ADDRESS]),
ifa->ifa_family==AF_INET?V4ADDRESS_LEN:V6ADDRESS_LEN);
- IOAddress a = IOAddress::from_bytes(ifa->ifa_family, addr);
+ IOAddress a = IOAddress::fromBytes(ifa->ifa_family, addr);
iface.addAddress(a);
/// TODO: Read lifetimes of configured IPv6 addresses
diff --git a/src/lib/dhcp/option6_addrlst.cc b/src/lib/dhcp/option6_addrlst.cc
index 1af10b5..c53fe78 100644
--- a/src/lib/dhcp/option6_addrlst.cc
+++ b/src/lib/dhcp/option6_addrlst.cc
@@ -84,7 +84,7 @@ void Option6AddrLst::unpack(OptionBufferConstIter begin,
<< " is not divisible by 16.");
}
while (begin != end) {
- addrs_.push_back(IOAddress::from_bytes(AF_INET6, &(*begin)));
+ addrs_.push_back(IOAddress::fromBytes(AF_INET6, &(*begin)));
begin += V6ADDRESS_LEN;
}
}
diff --git a/src/lib/dhcp/option6_iaaddr.cc b/src/lib/dhcp/option6_iaaddr.cc
index b021ce9..b503a91 100644
--- a/src/lib/dhcp/option6_iaaddr.cc
+++ b/src/lib/dhcp/option6_iaaddr.cc
@@ -69,7 +69,7 @@ void Option6IAAddr::unpack(OptionBuffer::const_iterator begin,
}
// 16 bytes: IPv6 address
- addr_ = IOAddress::from_bytes(AF_INET6, &(*begin));
+ addr_ = IOAddress::fromBytes(AF_INET6, &(*begin));
begin += V6ADDRESS_LEN;
preferred_ = readUint32( &(*begin) );
diff --git a/src/lib/dhcpsrv/addr_utilities.cc b/src/lib/dhcpsrv/addr_utilities.cc
index a519016..a2d9960 100644
--- a/src/lib/dhcpsrv/addr_utilities.cc
+++ b/src/lib/dhcpsrv/addr_utilities.cc
@@ -79,7 +79,7 @@ isc::asiolink::IOAddress firstAddrInPrefix6(const isc::asiolink::IOAddress& pref
}
// Finally, let's wrap this into nice and easy IOAddress object.
- return (isc::asiolink::IOAddress::from_bytes(AF_INET6, packed));
+ return (isc::asiolink::IOAddress::fromBytes(AF_INET6, packed));
}
/// @brief calculates the first IPv4 address in a IPv4 prefix
@@ -159,7 +159,7 @@ isc::asiolink::IOAddress lastAddrInPrefix6(const isc::asiolink::IOAddress& prefi
}
// Finally, let's wrap this into nice and easy IOAddress object.
- return (isc::asiolink::IOAddress::from_bytes(AF_INET6, packed));
+ return (isc::asiolink::IOAddress::fromBytes(AF_INET6, packed));
}
}; // end of anonymous namespace
diff --git a/src/lib/dhcpsrv/alloc_engine.cc b/src/lib/dhcpsrv/alloc_engine.cc
index 4f20276..3a53887 100644
--- a/src/lib/dhcpsrv/alloc_engine.cc
+++ b/src/lib/dhcpsrv/alloc_engine.cc
@@ -51,7 +51,7 @@ AllocEngine::IterativeAllocator::increaseAddress(const isc::asiolink::IOAddress&
}
}
- return (IOAddress::from_bytes(addr.getFamily(), packed));
+ return (IOAddress::fromBytes(addr.getFamily(), packed));
}
More information about the bind10-changes
mailing list