From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 16 Dec 2014 15:18:44 +0000 (+0100)
Subject: [3554] Fix in Pkt::MACSourceFromText()
X-Git-Tag: trac3504_base~21^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=417c41301a953be3e8f09518740d1d37240d88cc;p=thirdparty%2Fkea.git

[3554] Fix in Pkt::MACSourceFromText()
---

diff --git a/src/lib/dhcp/pkt.cc b/src/lib/dhcp/pkt.cc
index 9428c131e7..c5abdcc0e7 100644
--- a/src/lib/dhcp/pkt.cc
+++ b/src/lib/dhcp/pkt.cc
@@ -233,7 +233,7 @@ Pkt::getMACFromIPv6(const isc::asiolink::IOAddress& addr) {
     return (HWAddrPtr(new HWAddr(bin, hwtype)));
 }
 
-uint16_t Pkt::MACSourceFromText(const std::string& name) {
+uint32_t Pkt::MACSourceFromText(const std::string& name) {
 
     struct {
         const char * name;
@@ -253,7 +253,7 @@ uint16_t Pkt::MACSourceFromText(const std::string& name) {
     };
 
     for (int i=0; i < sizeof(sources)/sizeof(sources[0]); ++i) {
-        if (name.compare(sources[i].name)) {
+        if (name.compare(sources[i].name) == 0) {
             return (sources[i].type);
         }
     }
diff --git a/src/lib/dhcp/pkt.h b/src/lib/dhcp/pkt.h
index 9917ac03cf..24bb1ee690 100644
--- a/src/lib/dhcp/pkt.h
+++ b/src/lib/dhcp/pkt.h
@@ -99,7 +99,7 @@ public:
     ///
     /// @throw BadValue if specified string is unknown
     /// @return bitmask version of a given method
-    static uint16_t MACSourceFromText(const std::string& name);
+    static uint32_t MACSourceFromText(const std::string& name);
 
 protected: