From: Ilkka Tengvall <ilkka.tengvall@iki.fi>
Date: Wed, 20 Oct 2010 18:16:21 +0000 (+0300)
Subject: fixed an error in storing macs with zeroes.
X-Git-Url: http://git.maemo.org/git/?p=woller;a=commitdiff_plain;h=b6a113a8f1edc7cff68ab36d33570b528500a2b6

fixed an error in storing macs with zeroes.

There was an error in Host Editor MAC string handling, all the zeroes
got removed thus causing the MAC to be incorrect.
---

diff --git a/woller.cpp b/woller.cpp
index ba596e2..d78162c 100644
--- a/woller.cpp
+++ b/woller.cpp
@@ -389,7 +389,7 @@ HostWidget::HostWidget(QWidget *parent, host_s *host)
             tr("HW address of target, e.g. 00:01:02:AA:BB:CC. "
                "Hint, in Linux/Unix: \"ifconfig\","
                "in Windows \"ipconfig /all\""));
-    mac->setInputMask("HH:HH:HH:HH:HH:HH;0");
+    mac->setInputMask("HH:HH:HH:HH:HH:HH;_");
     mac_row->addWidget(mac_lbl);
     mac_row->addWidget(mac);
     vlayout->addLayout(mac_row);
@@ -442,11 +442,13 @@ void HostWidget::ok_sig()
         msgBox.exec();
         return;
     }
-    new_host->mac= this->mac->text();
-    if (new_host->mac.isEmpty())
+
+    new_host->mac = this->mac->text();
+    if (new_host->mac.length() != MAX_MAC_STR_LEN)
     {
         QMessageBox msgBox;
-        msgBox.setText("You must set mac!");
+        msgBox.setText("You must set mac to full 12 digits!\n" \
+                       "E.g. 00:11:22:33:44:55:66");
         msgBox.exec();
         return;
     }
diff --git a/woller.h b/woller.h
index 8963279..902866b 100644
--- a/woller.h
+++ b/woller.h
@@ -142,6 +142,8 @@ private:
 
 
 #define MAX_MAC_LEN 12
+#define MAC_COLON_CNT 5
+#define MAX_MAC_STR_LEN (MAX_MAC_LEN + MAC_COLON_CNT)
 #define MAX_IP_LEN 15