Commit 6ae0d625 authored by Jeremy C. Reed's avatar Jeremy C. Reed

[master] many misspelling and typo fixes

reviewed by jelte via jabber.

Changes some log message descriptions and some
function arguments and some output.
parent 4246e4ed
...@@ -261,8 +261,8 @@ Group Subscriptions (type "subscribe") ...@@ -261,8 +261,8 @@ Group Subscriptions (type "subscribe")
-------------------------------------- --------------------------------------
A subscription requires the "group", "instance", and a flag to A subscription requires the "group", "instance", and a flag to
indicate the subscription type ("sybtype"). If instance is "*" the indicate the subscription type ("subtype"). If instance is "*" the
instance name will be ignored when decising to forward a message to instance name will be ignored when deciding to forward a message to
this client or not. this client or not.
"subtype" is a DATA element, and contains "normal" for normal channel "subtype" is a DATA element, and contains "normal" for normal channel
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* @section b10-cfgmgr b10-cfgmgr Overview * @section b10-cfgmgr b10-cfgmgr Overview
* *
* @todo: Descibe b10-cfgmgr here. * @todo: Describe b10-cfgmgr here.
* *
* *
*/ */
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
* *
* DHCPv4 server component is now integrated with the BIND10 message queue. * DHCPv4 server component is now integrated with the BIND10 message queue.
* The integration is performed by establishSession() and disconnectSession() * The integration is performed by establishSession() and disconnectSession()
* functions in isc::dhcp::ControlledDhcpv4Srv class. main() method deifined * functions in isc::dhcp::ControlledDhcpv4Srv class. main() method defined
* in the src/bin/dhcp4/main.cc file instantiates isc::dhcp::ControlledDhcpv4Srv * in the src/bin/dhcp4/main.cc file instantiates isc::dhcp::ControlledDhcpv4Srv
* class that establishes connection with msgq and install necessary handlers * class that establishes connection with msgq and install necessary handlers
* for receiving commands and configuration updates. It is derived from * for receiving commands and configuration updates. It is derived from
......
...@@ -31,7 +31,7 @@ sinclude(m4/ax_boost_include.m4) ...@@ -31,7 +31,7 @@ sinclude(m4/ax_boost_include.m4)
sinclude(m4/ax_isc_bind10.m4) sinclude(m4/ax_isc_bind10.m4)
(and same for other m4 files as they are added under m4/) (and same for other m4 files as they are added under m4/)
On some systems, espeically if you have installed the BIND 10 On some systems, especially if you have installed the BIND 10
libraries in an uncommon path, programs linked with the BIND 10 libraries in an uncommon path, programs linked with the BIND 10
library may not work at run time due to the "missing" shared library. library may not work at run time due to the "missing" shared library.
Normally, you should be able to avoid this problem by making sure Normally, you should be able to avoid this problem by making sure
......
...@@ -228,7 +228,7 @@ public: ...@@ -228,7 +228,7 @@ public:
* \brief Set and get the addresses we listen on. * \brief Set and get the addresses we listen on.
*/ */
void setListenAddresses(const isc::server_common::portconfig::AddressList& void setListenAddresses(const isc::server_common::portconfig::AddressList&
addreses); addresses);
const isc::server_common::portconfig::AddressList& getListenAddresses() const isc::server_common::portconfig::AddressList& getListenAddresses()
const; const;
......
...@@ -289,7 +289,7 @@ def generate_cxx(itemsfile, ccfile, utfile, def_mtime): ...@@ -289,7 +289,7 @@ def generate_cxx(itemsfile, ccfile, utfile, def_mtime):
This method recursively builds two lists: This method recursively builds two lists:
- msg_counter_types consists of strings for all leaf items, each - msg_counter_types consists of strings for all leaf items, each
defines one enum element with a comment, e.g. defines one enum element with a comment, e.g.
COUNTER_ITEM, ///< item's descriptin COUNTER_ITEM, ///< item's description
- item_names consists of tuples of three elements, depending on - item_names consists of tuples of three elements, depending on
whether it's a leaf element (no child from it) or not: whether it's a leaf element (no child from it) or not:
(leaf) ( "item_name", NULL, COUNTER_ITEM ) (leaf) ( "item_name", NULL, COUNTER_ITEM )
......
...@@ -373,7 +373,7 @@ Query::process(datasrc::ClientList& client_list, ...@@ -373,7 +373,7 @@ Query::process(datasrc::ClientList& client_list,
// If we have no matching authoritative zone for the query name, return // If we have no matching authoritative zone for the query name, return
// REFUSED. In short, this is to be compatible with BIND 9, but the // REFUSED. In short, this is to be compatible with BIND 9, but the
// background discussion is not that simple. See the relevant topic // background discussion is not that simple. See the relevant topic
// at the BIND 10 developers's ML: // at the BIND 10 developers' ML:
// https://lists.isc.org/mailman/htdig/bind10-dev/2010-December/001633.html // https://lists.isc.org/mailman/htdig/bind10-dev/2010-December/001633.html
if (result.dsrc_client_ == NULL) { if (result.dsrc_client_ == NULL) {
// If we tried to find a "parent zone" for a DS query and failed, // If we tried to find a "parent zone" for a DS query and failed,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- Stop a component - Stop a component
- Force-stop a component - Force-stop a component
- Mechanism to wait for child to start before continuing - Mechanism to wait for child to start before continuing
- Use .spec file to define comands - Use .spec file to define commands
- Rename "c-channel" stuff to msgq for clarity - Rename "c-channel" stuff to msgq for clarity
- Reply to shutdown message? - Reply to shutdown message?
- Some sort of group creation so termination signals can be sent to - Some sort of group creation so termination signals can be sent to
......
...@@ -34,7 +34,7 @@ The named component is about to be started by the b10-init process. ...@@ -34,7 +34,7 @@ The named component is about to be started by the b10-init process.
% BIND10_COMPONENT_START_EXCEPTION component %1 failed to start: %2 % BIND10_COMPONENT_START_EXCEPTION component %1 failed to start: %2
An exception (mentioned in the message) happened during the startup of the An exception (mentioned in the message) happened during the startup of the
named component. The componet is not considered started and further actions named component. The component is not considered started and further actions
will be taken about it. will be taken about it.
% BIND10_COMPONENT_STOP component %1 is being stopped % BIND10_COMPONENT_STOP component %1 is being stopped
......
1. Start bindctl by run command "sh bindctl". 1. Start bindctl by run command "sh bindctl".
2. Login to b10-cmdctld with the username and password. The username and password will be saved in file default_user.csv automatcally after logining successfully, so next time bindctl will login with the username and password saved in default_user.csv. For more usage information, please turn to "man bindctl". 2. Login to b10-cmdctl with the username and password. The username and password will be saved in file default_user.csv automatically after logining successfully, so next time bindctl will login with the username and password saved in default_user.csv. For more usage information, please turn to "man bindctl".
\ No newline at end of file
...@@ -62,7 +62,7 @@ usage() { ...@@ -62,7 +62,7 @@ usage() {
std::cout << "Options:" << std::endl; std::cout << "Options:" << std::endl;
std::cout << "-c, --certfile=FILE\t\tfile to read or store the certificate" std::cout << "-c, --certfile=FILE\t\tfile to read or store the certificate"
<< std::endl; << std::endl;
std::cout << "-f, --force\t\t\toverwrite existing certficate even if it" std::cout << "-f, --force\t\t\toverwrite existing certificate even if it"
<< std::endl <<"\t\t\t\tis valid" << std::endl; << std::endl <<"\t\t\t\tis valid" << std::endl;
std::cout << "-h, --help\t\t\tshow this help" << std::endl; std::cout << "-h, --help\t\t\tshow this help" << std::endl;
std::cout << "-k, --keyfile=FILE\t\tfile to store the generated private key" std::cout << "-k, --keyfile=FILE\t\tfile to store the generated private key"
...@@ -194,7 +194,7 @@ public: ...@@ -194,7 +194,7 @@ public:
print("Creating certificate file " + cert_file_name); print("Creating certificate file " + cert_file_name);
// The exact call changed aftert 1.8, adding the // The exact call changed after 1.8, adding the
// hash function option // hash function option
#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,0) #if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,0)
X509_Certificate cert = X509_Certificate cert =
...@@ -229,7 +229,7 @@ public: ...@@ -229,7 +229,7 @@ public:
validateCertificate(const std::string& certfile) { validateCertificate(const std::string& certfile) {
// Since we are dealing with a self-signed certificate here, we // Since we are dealing with a self-signed certificate here, we
// also use the certificate to check itself; i.e. we add it // also use the certificate to check itself; i.e. we add it
// as a trusted certificate, then validate the certficate itself. // as a trusted certificate, then validate the certificate itself.
//const X509_Certificate cert(certfile); //const X509_Certificate cert(certfile);
try { try {
X509_Store store; X509_Store store;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
""" """
@file Dabase Utilities @file Database Utilities
This file holds the "dbutil" program, a general utility program for doing This file holds the "dbutil" program, a general utility program for doing
management of the BIND 10 database. There are two modes of operation: management of the BIND 10 database. There are two modes of operation:
......
...@@ -132,7 +132,7 @@ check_no_backup() { ...@@ -132,7 +132,7 @@ check_no_backup() {
# .schema command, with spaces removed and upper converted to lowercase. # .schema command, with spaces removed and upper converted to lowercase.
# #
# The database is copied before the schema is taken (and removed after) # The database is copied before the schema is taken (and removed after)
# as SQLite3 assummes a writeable database, which may not be the case if # as SQLite3 assumes a writeable database, which may not be the case if
# getting the schema from a reference copy. # getting the schema from a reference copy.
# #
# @param $1 Database for which the schema is required # @param $1 Database for which the schema is required
......
...@@ -236,7 +236,7 @@ class DDNSServer: ...@@ -236,7 +236,7 @@ class DDNSServer:
'''Exception for internal errors in an update session. '''Exception for internal errors in an update session.
This exception is expected to be caught within the server class, This exception is expected to be caught within the server class,
only used for controling the code flow. only used for controlling the code flow.
''' '''
pass pass
...@@ -511,7 +511,7 @@ class DDNSServer: ...@@ -511,7 +511,7 @@ class DDNSServer:
Right now, this is a straightforward subroutine of handle_request(), Right now, this is a straightforward subroutine of handle_request(),
but is intended to be extended evetually so that it can handle more but is intended to be extended evetually so that it can handle more
comlicated operations for TCP (which requires asynchronous write). complicated operations for TCP (which requires asynchronous write).
Further, when we support multiple requests over a single TCP Further, when we support multiple requests over a single TCP
connection, this method may even be shared by multiple methods. connection, this method may even be shared by multiple methods.
......
...@@ -40,7 +40,7 @@ READ_ZONE_DB_FILE = TESTDATA_PATH + "rwtest.sqlite3" # original, to be copied ...@@ -40,7 +40,7 @@ READ_ZONE_DB_FILE = TESTDATA_PATH + "rwtest.sqlite3" # original, to be copied
TEST_ZONE_NAME = Name('example.org') TEST_ZONE_NAME = Name('example.org')
TEST_ZONE_NAME_STR = TEST_ZONE_NAME.to_text() TEST_ZONE_NAME_STR = TEST_ZONE_NAME.to_text()
UPDATE_RRTYPE = RRType.SOA UPDATE_RRTYPE = RRType.SOA
TEST_QID = 5353 # arbitrary chosen TEST_QID = 5353 # arbitrarily chosen
TEST_RRCLASS = RRClass.IN TEST_RRCLASS = RRClass.IN
TEST_RRCLASS_STR = TEST_RRCLASS.to_text() TEST_RRCLASS_STR = TEST_RRCLASS.to_text()
TEST_SERVER6 = ('2001:db8::53', 53, 0, 0) TEST_SERVER6 = ('2001:db8::53', 53, 0, 0)
...@@ -53,7 +53,7 @@ TEST_ACL_CONTEXT = isc.acl.dns.RequestContext( ...@@ -53,7 +53,7 @@ TEST_ACL_CONTEXT = isc.acl.dns.RequestContext(
socket.IPPROTO_UDP, socket.AI_NUMERICHOST)[0][4]) socket.IPPROTO_UDP, socket.AI_NUMERICHOST)[0][4])
# TSIG key for tests when needed. The key name is TEST_ZONE_NAME. # TSIG key for tests when needed. The key name is TEST_ZONE_NAME.
TEST_TSIG_KEY = TSIGKey("example.org:SFuWd/q99SzF8Yzd1QbB9g==") TEST_TSIG_KEY = TSIGKey("example.org:SFuWd/q99SzF8Yzd1QbB9g==")
# TSIG keyring that contanins the test key # TSIG keyring that contains the test key
TEST_TSIG_KEYRING = TSIGKeyRing() TEST_TSIG_KEYRING = TSIGKeyRing()
TEST_TSIG_KEYRING.add(TEST_TSIG_KEY) TEST_TSIG_KEYRING.add(TEST_TSIG_KEY)
# Another TSIG key not in the keyring, making verification fail # Another TSIG key not in the keyring, making verification fail
...@@ -450,7 +450,7 @@ class TestDDNSServer(unittest.TestCase): ...@@ -450,7 +450,7 @@ class TestDDNSServer(unittest.TestCase):
self.assertEqual(1, isc.config.parse_answer(answer)[0]) self.assertEqual(1, isc.config.parse_answer(answer)[0])
self.assertEqual({}, self.ddns_server._zone_config) self.assertEqual({}, self.ddns_server._zone_config)
# the first zone cofig is valid, but not the second. the first one # the first zone config is valid, but not the second. the first one
# shouldn't be installed. # shouldn't be installed.
bad_config = { 'zones': [ { 'origin': TEST_ZONE_NAME_STR, bad_config = { 'zones': [ { 'origin': TEST_ZONE_NAME_STR,
'class': TEST_RRCLASS_STR, 'class': TEST_RRCLASS_STR,
...@@ -856,7 +856,7 @@ class TestDDNSServer(unittest.TestCase): ...@@ -856,7 +856,7 @@ class TestDDNSServer(unittest.TestCase):
def test_select_multi_tcp(self): def test_select_multi_tcp(self):
'''Test continuation of sending a TCP response, multiple sockets.''' '''Test continuation of sending a TCP response, multiple sockets.'''
# Check if the implementation still works with multiple outstanding # Check if the implementation still works with multiple outstanding
# TCP contexts. We use three (arbitray choice), of which two will be # TCP contexts. We use three (arbitrary choice), of which two will be
# writable after select and complete the send. # writable after select and complete the send.
tcp_socks = [] tcp_socks = []
for i in range(0, 3): for i in range(0, 3):
......
...@@ -156,7 +156,7 @@ void ControlledDhcpv4Srv::establishSession() { ...@@ -156,7 +156,7 @@ void ControlledDhcpv4Srv::establishSession() {
// Dumy configuration handler is internally invoked by the // Dumy configuration handler is internally invoked by the
// constructor and on success the constructor updates // constructor and on success the constructor updates
// the current session with the configuration that had been // the current session with the configuration that had been
// commited in the previous session. If we did not install // committed in the previous session. If we did not install
// the dummy handler, the previous configuration would have // the dummy handler, the previous configuration would have
// been lost. // been lost.
config_session_ = new ModuleCCSession(specfile, *cc_session_, config_session_ = new ModuleCCSession(specfile, *cc_session_,
......
...@@ -136,7 +136,7 @@ protected: ...@@ -136,7 +136,7 @@ protected:
/// @brief Helper session object that represents raw connection to msgq. /// @brief Helper session object that represents raw connection to msgq.
isc::cc::Session* cc_session_; isc::cc::Session* cc_session_;
/// @brief Session that receives configuation and commands /// @brief Session that receives configuration and commands
isc::config::ModuleCCSession* config_session_; isc::config::ModuleCCSession* config_session_;
}; };
......
...@@ -33,7 +33,7 @@ assigned is not implemented in IfaceMgr yet. ...@@ -33,7 +33,7 @@ assigned is not implemented in IfaceMgr yet.
DHCPv4 server component is now integrated with BIND10 message queue. DHCPv4 server component is now integrated with BIND10 message queue.
The integration is performed by establishSession() and disconnectSession() The integration is performed by establishSession() and disconnectSession()
functions in isc::dhcp::ControlledDhcpv4Srv class. main() method deifined functions in isc::dhcp::ControlledDhcpv4Srv class. main() method defined
in the src/bin/dhcp4/main.cc file instantiates isc::dhcp::ControlledDhcpv4Srv in the src/bin/dhcp4/main.cc file instantiates isc::dhcp::ControlledDhcpv4Srv
class that establishes connection with msgq and install necessary handlers class that establishes connection with msgq and install necessary handlers
for receiving commands and configuration updates. It is derived from for receiving commands and configuration updates. It is derived from
......
...@@ -487,7 +487,7 @@ TEST_F(Dhcp4ParserTest, optionDefIpv4Address) { ...@@ -487,7 +487,7 @@ TEST_F(Dhcp4ParserTest, optionDefIpv4Address) {
EXPECT_TRUE(def->getEncapsulatedSpace().empty()); EXPECT_TRUE(def->getEncapsulatedSpace().empty());
} }
// The goal of this test is to check whether an option definiiton // The goal of this test is to check whether an option definition
// that defines an option carrying a record of data fields can // that defines an option carrying a record of data fields can
// be created. // be created.
TEST_F(Dhcp4ParserTest, optionDefRecord) { TEST_F(Dhcp4ParserTest, optionDefRecord) {
...@@ -1060,7 +1060,7 @@ TEST_F(Dhcp4ParserTest, optionDataTwoSpaces) { ...@@ -1060,7 +1060,7 @@ TEST_F(Dhcp4ParserTest, optionDataTwoSpaces) {
ASSERT_TRUE(status); ASSERT_TRUE(status);
checkResult(status, 0); checkResult(status, 0);
// Options should be now availabe for the subnet. // Options should be now available for the subnet.
Subnet4Ptr subnet = CfgMgr::instance().getSubnet4(IOAddress("192.0.2.200")); Subnet4Ptr subnet = CfgMgr::instance().getSubnet4(IOAddress("192.0.2.200"));
ASSERT_TRUE(subnet); ASSERT_TRUE(subnet);
// Try to get the option from the space dhcp4. // Try to get the option from the space dhcp4.
...@@ -1430,7 +1430,7 @@ TEST_F(Dhcp4ParserTest, optionDataInvalidChar) { ...@@ -1430,7 +1430,7 @@ TEST_F(Dhcp4ParserTest, optionDataInvalidChar) {
testInvalidOptionParam("01020R", "data"); testInvalidOptionParam("01020R", "data");
} }
// Verify that option data containins '0x' prefix is rejected // Verify that option data containing '0x' prefix is rejected
// by the configuration. // by the configuration.
TEST_F(Dhcp4ParserTest, optionDataUnexpectedPrefix) { TEST_F(Dhcp4ParserTest, optionDataUnexpectedPrefix) {
// Option code 0 is reserved and should not be accepted // Option code 0 is reserved and should not be accepted
...@@ -1530,7 +1530,7 @@ TEST_F(Dhcp4ParserTest, stdOptionData) { ...@@ -1530,7 +1530,7 @@ TEST_F(Dhcp4ParserTest, stdOptionData) {
boost::shared_ptr<Option4AddrLst> option_addrs = boost::shared_ptr<Option4AddrLst> option_addrs =
boost::dynamic_pointer_cast<Option4AddrLst>(option); boost::dynamic_pointer_cast<Option4AddrLst>(option);
// If cast is unsuccessful than option returned was of a // If cast is unsuccessful than option returned was of a
// differnt type than Option6IA. This is wrong. // different type than Option6IA. This is wrong.
ASSERT_TRUE(option_addrs); ASSERT_TRUE(option_addrs);
// Get addresses from the option. // Get addresses from the option.
......
...@@ -155,7 +155,7 @@ void ControlledDhcpv6Srv::establishSession() { ...@@ -155,7 +155,7 @@ void ControlledDhcpv6Srv::establishSession() {
// Dumy configuration handler is internally invoked by the // Dumy configuration handler is internally invoked by the
// constructor and on success the constructor updates // constructor and on success the constructor updates
// the current session with the configuration that had been // the current session with the configuration that had been
// commited in the previous session. If we did not install // committed in the previous session. If we did not install
// the dummy handler, the previous configuration would have // the dummy handler, the previous configuration would have
// been lost. // been lost.
config_session_ = new ModuleCCSession(specfile, *cc_session_, config_session_ = new ModuleCCSession(specfile, *cc_session_,
......
...@@ -134,7 +134,7 @@ protected: ...@@ -134,7 +134,7 @@ protected:
/// @brief Helper session object that represents raw connection to msgq. /// @brief Helper session object that represents raw connection to msgq.
isc::cc::Session* cc_session_; isc::cc::Session* cc_session_;
/// @brief Session that receives configuation and commands /// @brief Session that receives configuration and commands
isc::config::ModuleCCSession* config_session_; isc::config::ModuleCCSession* config_session_;
}; };
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
list of parsers for each received entry. Parser is an object that is derived list of parsers for each received entry. Parser is an object that is derived
from a DhcpConfigParser class. Once a parser is created from a DhcpConfigParser class. Once a parser is created
(constructor), its value is set (using build() method). Once all parsers are (constructor), its value is set (using build() method). Once all parsers are
build, the configuration is then applied ("commited") and commit() method is build, the configuration is then applied ("committed") and commit() method is
called. called.
All parsers are defined in src/bin/dhcp6/config_parser.cc file. Some of them All parsers are defined in src/bin/dhcp6/config_parser.cc file. Some of them
......
...@@ -353,7 +353,7 @@ Dhcpv6Srv::generateServerID() { ...@@ -353,7 +353,7 @@ Dhcpv6Srv::generateServerID() {
} }
// Some interfaces (like lo on Linux) report 6-bytes long // Some interfaces (like lo on Linux) report 6-bytes long
// MAC adress 00:00:00:00:00:00. Let's not use such weird interfaces // MAC address 00:00:00:00:00:00. Let's not use such weird interfaces
// to generate DUID. // to generate DUID.
if (isRangeZero(iface->getMac(), iface->getMac() + iface->getMacLen())) { if (isRangeZero(iface->getMac(), iface->getMac() + iface->getMacLen())) {
continue; continue;
......
...@@ -598,7 +598,7 @@ TEST_F(Dhcp6ParserTest, optionDefIpv6Address) { ...@@ -598,7 +598,7 @@ TEST_F(Dhcp6ParserTest, optionDefIpv6Address) {
EXPECT_EQ(OPT_IPV6_ADDRESS_TYPE, def->getType()); EXPECT_EQ(OPT_IPV6_ADDRESS_TYPE, def->getType());
} }
// The goal of this test is to check whether an option definiiton // The goal of this test is to check whether an option definition
// that defines an option carrying a record of data fields can // that defines an option carrying a record of data fields can
// be created. // be created.
TEST_F(Dhcp6ParserTest, optionDefRecord) { TEST_F(Dhcp6ParserTest, optionDefRecord) {
...@@ -1176,7 +1176,7 @@ TEST_F(Dhcp6ParserTest, optionDataTwoSpaces) { ...@@ -1176,7 +1176,7 @@ TEST_F(Dhcp6ParserTest, optionDataTwoSpaces) {
ASSERT_TRUE(status); ASSERT_TRUE(status);
checkResult(status, 0); checkResult(status, 0);
// Options should be now availabe for the subnet. // Options should be now available for the subnet.
Subnet6Ptr subnet = CfgMgr::instance().getSubnet6(IOAddress("2001:db8:1::5")); Subnet6Ptr subnet = CfgMgr::instance().getSubnet6(IOAddress("2001:db8:1::5"));
ASSERT_TRUE(subnet); ASSERT_TRUE(subnet);
// Try to get the option from the space dhcp6. // Try to get the option from the space dhcp6.
...@@ -1484,7 +1484,7 @@ TEST_F(Dhcp6ParserTest, optionDataInvalidChar) { ...@@ -1484,7 +1484,7 @@ TEST_F(Dhcp6ParserTest, optionDataInvalidChar) {
testInvalidOptionParam("01020R", "data"); testInvalidOptionParam("01020R", "data");
} }
// Verify that option data containins '0x' prefix is rejected // Verify that option data containing '0x' prefix is rejected
// by the configuration. // by the configuration.
TEST_F(Dhcp6ParserTest, optionDataUnexpectedPrefix) { TEST_F(Dhcp6ParserTest, optionDataUnexpectedPrefix) {
// Option code 0 is reserved and should not be accepted // Option code 0 is reserved and should not be accepted
...@@ -1582,7 +1582,7 @@ TEST_F(Dhcp6ParserTest, stdOptionData) { ...@@ -1582,7 +1582,7 @@ TEST_F(Dhcp6ParserTest, stdOptionData) {
boost::shared_ptr<Option6IA> optionIA = boost::shared_ptr<Option6IA> optionIA =
boost::dynamic_pointer_cast<Option6IA>(option); boost::dynamic_pointer_cast<Option6IA>(option);
// If cast is unsuccessful than option returned was of a // If cast is unsuccessful than option returned was of a
// differnt type than Option6IA. This is wrong. // different type than Option6IA. This is wrong.
ASSERT_TRUE(optionIA); ASSERT_TRUE(optionIA);
// If cast was successful we may use accessors exposed by // If cast was successful we may use accessors exposed by
// Option6IA to validate that the content of this option // Option6IA to validate that the content of this option
......
...@@ -41,7 +41,7 @@ ORIG_SOA_TXT = 'example.org. 3600 IN SOA ns1.example.org. ' +\ ...@@ -41,7 +41,7 @@ ORIG_SOA_TXT = 'example.org. 3600 IN SOA ns1.example.org. ' +\
'admin.example.org. 1234 3600 1800 2419200 7200\n' 'admin.example.org. 1234 3600 1800 2419200 7200\n'
NEW_SOA_TXT = 'example.org. 3600 IN SOA ns.example.org. ' +\ NEW_SOA_TXT = 'example.org. 3600 IN SOA ns.example.org. ' +\
'admin.example.org. 1235 3600 1800 2419200 7200\n' 'admin.example.org. 1235 3600 1800 2419200 7200\n'
# This is the brandnew SOA for a newly created zone # This is the brand new SOA for a newly created zone
ALT_NEW_SOA_TXT = 'example.com. 3600 IN SOA ns.example.com. ' +\ ALT_NEW_SOA_TXT = 'example.com. 3600 IN SOA ns.example.com. ' +\
'admin.example.com. 1234 3600 1800 2419200 7200\n' 'admin.example.com. 1234 3600 1800 2419200 7200\n'
......
...@@ -406,7 +406,7 @@ class MsgQ: ...@@ -406,7 +406,7 @@ class MsgQ:
routing, data = self.read_packet(fd, sock) routing, data = self.read_packet(fd, sock)
except (MsgQReceiveError, MsgQCloseOnReceive) as err: except (MsgQReceiveError, MsgQCloseOnReceive) as err:
# If it's MsgQCloseOnReceive and that happens without reading # If it's MsgQCloseOnReceive and that happens without reading
# any data, it basically means the remote clinet has closed the # any data, it basically means the remote client has closed the
# socket, so we log it as debug information. Otherwise, it's # socket, so we log it as debug information. Otherwise, it's
# a somewhat unexpected event, so we consider it an "error". # a somewhat unexpected event, so we consider it an "error".
if isinstance(err, MsgQCloseOnReceive) and not err.partial_read: if isinstance(err, MsgQCloseOnReceive) and not err.partial_read:
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
/// unsigned data in a response is more of a problem. (Note that even data from /// unsigned data in a response is more of a problem. (Note that even data from
/// signed zones may be not be signed, e.g. delegations are not signed.) In /// signed zones may be not be signed, e.g. delegations are not signed.) In
/// particular, how do we know that the server from which the response was /// particular, how do we know that the server from which the response was
/// received was authoritive for the data it returned? /// received was authoritative for the data it returned?
/// ///
/// The part of the code that checks for this is the "Data Scrubbing" module. /// The part of the code that checks for this is the "Data Scrubbing" module.
/// Although it includes the checking of IP addresses and ports, it is called /// Although it includes the checking of IP addresses and ports, it is called
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
/// referral been to the com nameservers, it would be a valid response; the com /// referral been to the com nameservers, it would be a valid response; the com
/// zone could well be serving all the data for example.com. Having said that, /// zone could well be serving all the data for example.com. Having said that,
/// the A record for ns1.example.net would still be regarded as being out of /// the A record for ns1.example.net would still be regarded as being out of
/// bailiwick becase the nameserver is not authoritative for the .net zone. /// bailiwick because the nameserver is not authoritative for the .net zone.
/// ///
/// \subsection DataScrubbingEx4 Example 4: Inconsistent Answer Section /// \subsection DataScrubbingEx4 Example 4: Inconsistent Answer Section
/// Qu: www.example.com\n /// Qu: www.example.com\n
......
...@@ -99,7 +99,7 @@ udpCheck(const int socknum) { ...@@ -99,7 +99,7 @@ udpCheck(const int socknum) {
} }
// The check function (tcpCheck/udpCheck) is passed as a parameter to the test // The check function (tcpCheck/udpCheck) is passed as a parameter to the test
// code, so provide a conveniet typedef. // code, so provide a convenient typedef.
typedef void (*socket_check_t)(const int); typedef void (*socket_check_t)(const int);
// Address-family-specific scoket checks. // Address-family-specific scoket checks.
......