sysInfo gets interface name for MAC adress from networkdiscovery

1 files changed, 5 insertions, 12 deletions

diff --git a/src/fbgui/sysinfo.cpp b/src/fbgui/sysinfo.cpp
index 6338025..807413b 100644
--- a/src/fbgui/sysinfo.cpp
+++ b/src/fbgui/sysinfo.cpp
@@ -41,7 +41,6 @@ SysInfo::~SysInfo() {
  * @see JavascriptInterface::getSysInfo(const QString& info)
  */
 const QString SysInfo::getInfo(const QString& infoName) {
-   LOG4CXX_DEBUG(siLogger, "requested " << infoName);
    if (infoName == QString("mbserial"))
       return getMainboardSerial();
    else if (infoName == QString("usb"))
@@ -55,12 +54,12 @@ const QString SysInfo::getInfo(const QString& infoName) {
 }
 const QString SysInfo::getMACAddress() {
    // Returns MAC address of eth0 for now
-   QNetworkInterface qni = QNetworkInterface::interfaceFromName(QString("eth0"));
+   LOG4CXX_DEBUG(siLogger, "Requesting MAC of: " << interfaceName << " ...");
+   QNetworkInterface qni = QNetworkInterface::interfaceFromName(interfaceName);
    if (!qni.isValid()) {
-      //qxtLog->debug() << "[sysinfo] MAC Address: No interface matching \"eth0\" found.";
-      return "no_eth0";
+	  LOG4CXX_DEBUG(siLogger, "No valid interface with name: " << interfaceName);
+      return "no_interface";
    }
-   //eth0_index = qni.index();
    return qni.hardwareAddress();
 }
 // -----------------------------------------------------------------------------------------------
@@ -82,6 +81,7 @@ const QString SysInfo::getMACAddress() {
  * @see SysInfo::getInfo(const QString& infoName)
  */
 const QString SysInfo::getMainboardSerial() {
+   LOG4CXX_DEBUG(siLogger, "Requesting Mainboard Serial...");
    QString out = "";
    struct sysfs_class_device *class_device = sysfs_open_class_device("dmi",
          "id");
@@ -214,11 +214,4 @@ const QString SysInfo::getUsbVendorIdProductIdSerialNumber() {
    }
    libusb_free_device_list(devs, 1); //free the list, unref the devices in it
    libusb_exit(ctx); //close the session
-
-
-   /*
-   QByteArray json = serializer.serialize(list);
-   LOG4CXX_DEBUG(siLogger, tag + "json object: " + json);
-   return json;
-   */
 }