Merge pull request #143 from fabik111/add-get-setting

Add getter of network settings

Author: andreagilardoni

src/ConnectionHandlerInterface.h

@@ -101,6 +101,11 @@ class ConnectionHandler {
       return false;
     }
 
+    virtual void getSetting(models::NetworkSetting& s) {
+      memcpy(&s, &_settings, sizeof(s));
+      return;
+    }
+
     virtual void setKeepAlive(bool keep_alive=true) { this->_keep_alive = keep_alive; }
 
   protected:

src/EthernetConnectionHandler.cpp

@@ -41,6 +41,7 @@ EthernetConnectionHandler::EthernetConnectionHandler(
   bool const keep_alive)
 : ConnectionHandler{keep_alive, NetworkAdapter::ETHERNET}
 {
+  _settings.type = NetworkAdapter::ETHERNET;
   memset(_settings.eth.ip.dword, 0, sizeof(_settings.eth.ip.dword));
   memset(_settings.eth.dns.dword, 0, sizeof(_settings.eth.dns.dword));
   memset(_settings.eth.gateway.dword, 0, sizeof(_settings.eth.gateway.dword));
@@ -54,6 +55,7 @@ EthernetConnectionHandler::EthernetConnectionHandler(
   unsigned long const timeout, unsigned long const responseTimeout, bool const keep_alive)
 : ConnectionHandler{keep_alive, NetworkAdapter::ETHERNET}
 {
+  _settings.type = NetworkAdapter::ETHERNET;
   fromIPAddress(ip, _settings.eth.ip);
   fromIPAddress(dns, _settings.eth.dns);
   fromIPAddress(gateway, _settings.eth.gateway);

src/GenericConnectionHandler.cpp

@@ -46,6 +46,14 @@ bool GenericConnectionHandler::updateSetting(const models::NetworkSetting& s) {
     }
 }
 
+void GenericConnectionHandler::getSetting(models::NetworkSetting& s) {
+    if(_ch != nullptr) {
+        _ch->getSetting(s);
+    } else {
+        s.type = NetworkAdapter::NONE;
+    }
+}
+
 NetworkConnectionState GenericConnectionHandler::updateConnectionState() {
     return _ch != nullptr ? _ch->updateConnectionState() : NetworkConnectionState::INIT;
 }

src/GenericConnectionHandler.h

@@ -49,6 +49,7 @@ class GenericConnectionHandler : public ConnectionHandler
     #endif
 
     bool updateSetting(const models::NetworkSetting& s) override;
+    void getSetting(models::NetworkSetting& s) override;
 
     void connect() override;
     void disconnect() override;