[4267] Finished merge of (rebased) trac4108 (Reorganize DHCP server code flow)

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index b96e62a18e7dbfc9654904b93223b1c2eb12d6ce..a65b7c464a360cc39f07c6445811c086e0ec9b63 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -509,7 +509,7 @@ Dhcpv4Srv::processPacket(Pkt4Ptr& query) {
 
     // Log reception of the packet. We need to increase it early, as any
     // failures in unpacking will cause the packet to be dropped. We
-    // will increase type specific packets further down the road.
+    // will increase type specific statistoc further down the road.
     // See processStatsReceived().
     isc::stats::StatsMgr::instance().addValue("pkt4-received",
                                               static_cast<int64_t>(1));

diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h
index 429ff7c1338bd10358ea896f52505491c4866a1f..bed9764df1ee61ed8348cf41a7e9973e0719fddf 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -209,7 +209,7 @@ public:
     /// @brief Main server processing loop.
     ///
     /// Main server processing loop. Receives incoming packets, and calls
-    /// processPakcet for each of them.
+    /// processPacket for each of them.
     ///
     /// @return true, if being shut down gracefully, fail if experienced
     ///         critical error.