From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 27 Dec 2011 11:49:43 +0000 (+0100)
Subject: [1230] Changes after review:
X-Git-Tag: trac2351_base~310^2~13^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3344e8b8d949fa9b4bcd9cf007f6a234f0fa5b1c;p=thirdparty%2Fkea.git

[1230] Changes after review:

- Vector initialization clean-ups
- Typo in comment
---

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 693108cc95..c42ceb3078 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -169,9 +169,8 @@ void Dhcpv4Srv::copyDefaultFields(const boost::shared_ptr<Pkt4>& question,
     answer->setHops(question->getHops());
 
     // copy MAC address
-    vector<uint8_t> mac;
-    mac.resize(Pkt4::MAX_CHADDR_LEN);
-    memcpy(&mac[0], question->getChaddr(), Pkt4::MAX_CHADDR_LEN);
+    vector<uint8_t> mac(question->getChaddr(),
+                        question->getChaddr() + Pkt4::MAX_CHADDR_LEN);
     answer->setHWAddr(question->getHtype(), question->getHlen(), mac);
 
     // relay address
@@ -230,6 +229,7 @@ void Dhcpv4Srv::assignLease(boost::shared_ptr<Pkt4>& msg) {
     opt = boost::shared_ptr<Option>(new Option(Option::V4, DHO_DHCP_LEASE_TIME));
     opt->setUint32(HARDCODED_LEASE_TIME);
     msg->addOption(opt);
+    // TODO: create Option_IntArray that holds list of integers, similar to Option4_AddrLst
 
     // Subnet mask (type 1)
     opt = boost::shared_ptr<Option>
@@ -247,8 +247,6 @@ Dhcpv4Srv::processDiscover(boost::shared_ptr<Pkt4>& discover) {
     boost::shared_ptr<Pkt4> offer = boost::shared_ptr<Pkt4>
         (new Pkt4(DHCPOFFER, discover->getTransid()));
 
-    boost::shared_ptr<Option> opt;
-
     copyDefaultFields(discover, offer);
     appendDefaultOptions(offer, DHCPOFFER);
     appendRequestedOptions(offer);
@@ -263,29 +261,11 @@ Dhcpv4Srv::processRequest(boost::shared_ptr<Pkt4>& request) {
     boost::shared_ptr<Pkt4> ack = boost::shared_ptr<Pkt4>
         (new Pkt4(DHCPACK, request->getTransid()));
 
-    boost::shared_ptr<Option> opt;
-
     copyDefaultFields(request, ack);
     appendDefaultOptions(ack, DHCPACK);
     appendRequestedOptions(ack);
 
-    // TODO: Implement actual lease assignment here
-    ack->setYiaddr(IOAddress(HARDCODED_LEASE));
-
-    // IP Address Lease time (type 51)
-    opt = boost::shared_ptr<Option>(new Option(Option::V4, DHO_DHCP_LEASE_TIME));
-    opt->setUint32(HARDCODED_LEASE_TIME);
-    ack->addOption(opt);
-    // TODO: create Option_IntArray that holds list of integers, similar to Option4_AddrLst
-
-    // Subnet mask (type 1)
-    opt = boost::shared_ptr<Option>
-        (new Option4AddrLst(DHO_SUBNET_MASK, IOAddress(HARDCODED_NETMASK)));
-    ack->addOption(opt);
-
-    // Router (type 3)
-    opt = boost::shared_ptr<Option>(new Option4AddrLst(DHO_ROUTERS, IOAddress(HARDCODED_GATEWAY)));
-    ack->addOption(opt);
+    assignLease(ack);
 
     return (ack);
 }
diff --git a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
index 48182acb38..cfc12fb844 100644
--- a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
@@ -111,8 +111,7 @@ TEST_F(Dhcpv4SrvTest, basic) {
 
 TEST_F(Dhcpv4SrvTest, processDiscover) {
     NakedDhcpv4Srv* srv = new NakedDhcpv4Srv();
-    vector<uint8_t> mac;
-    mac.resize(6);
+    vector<uint8_t> mac(6);
     for (int i = 0; i < 6; i++) {
         mac[i] = 255 - i;
     }
@@ -170,8 +169,7 @@ TEST_F(Dhcpv4SrvTest, processDiscover) {
 
 TEST_F(Dhcpv4SrvTest, processRequest) {
     NakedDhcpv4Srv* srv = new NakedDhcpv4Srv();
-    vector<uint8_t> mac;
-    mac.resize(6);
+    vector<uint8_t> mac(6);
     for (int i = 0; i < 6; i++) {
         mac[i] = i*10;
     }
diff --git a/src/lib/dhcp/pkt4.cc b/src/lib/dhcp/pkt4.cc
index 2c2936c9e2..9dbffee145 100644
--- a/src/lib/dhcp/pkt4.cc
+++ b/src/lib/dhcp/pkt4.cc
@@ -172,7 +172,7 @@ Pkt4::unpack() {
     size_t opts_len = bufferIn.getLength() - bufferIn.getPosition();
     vector<uint8_t> optsBuffer;
 
-    // fist use of readVector
+    // First use of readVector.
     bufferIn.readVector(optsBuffer, opts_len);
     LibDHCP::unpackOptions4(optsBuffer, options_);