CNetIf - added config method to apply new static IP settings

in CWifi::_config netif_set_address call was missing.
in Ethernet::begin static IP was not applied if invoked second time
now the new CNetIf.config does the static IP change for both.

Author: JAndrassy

libraries/WiFi/src/WiFi.cpp

@@ -79,22 +79,18 @@ void CWifi::config(IPAddress local_ip) { // FIXME
 extern uint8_t *IpAddress2uint8(IPAddress a);
 
 /* -------------------------------------------------------------------------- */
-void CWifi::_config(IPAddress local_ip, IPAddress gateway, IPAddress subnet) { // FIXME
-/* -------------------------------------------------------------------------- */
-    // _useStaticIp = local_ip != INADDR_NONE;
-    // if(ni != nullptr) {
-    //     ni->DhcpStop();
-    //     ni->DhcpNotUsed();
-    //     IP_ADDR4(&ni->ip, local_ip[0], local_ip[1], local_ip[2], local_ip[3]);
-    //     IP_ADDR4(&ni->gw, gateway[0], gateway[1], gateway[2], gateway[3]);
-    //     IP_ADDR4(&ni->nm, subnet[0], subnet[1], subnet[2], subnet[3]);
-    // }
-    // else {
-    //     CNetIf::default_ip = local_ip;
-    //     CNetIf::default_nm = subnet;
-    //     CNetIf::default_gw = gateway;
-    //     CNetIf::default_dhcp_server_ip = local_ip;
-    // }
+void CWifi::_config(IPAddress local_ip, IPAddress gateway, IPAddress subnet) {
+/* -------------------------------------------------------------------------- */    
+   _useStaticIp = local_ip != INADDR_NONE;
+   if(ni != nullptr) {
+     ni->config(local_ip, gateway, subnet);
+   }
+   else {
+      CNetIf::default_ip = local_ip;
+      CNetIf::default_nm = subnet; 
+      CNetIf::default_gw = gateway;
+      CNetIf::default_dhcp_server_ip = local_ip;
+   }
 }
 
 /* -------------------------------------------------------------------------- */

libraries/lwIpWrapper/src/CNetIf.cpp

@@ -948,7 +948,7 @@ err_t CWifiSoftAp::output(struct netif* _ni, struct pbuf* p) {
         errval = ERR_OK;
         // NETIF_STATS_INCREMENT_TX_BYTES(this->stats, size);
         // NETIF_STATS_TX_TIME_AVERAGE(this->stats);
-    } else {
+            } else {
         // NETIF_STATS_INCREMENT_ERROR(this->stats, err);
         // NETIF_STATS_INCREMENT_TX_TRANSMIT_FAILED_CALLS(this->stats);
     }
@@ -961,6 +961,25 @@ err_t CWifiSoftAp::output(struct netif* _ni, struct pbuf* p) {
     return errval;
 }
 
+/* -------------------------------------------------------------------------- */
+void CNetIf::config(IPAddress _ip, IPAddress _gw, IPAddress _nm)
+{
+    DhcpStop();
+    DhcpNotUsed();
+
+    IP_ADDR4(&ip, _ip[0], _ip[1], _ip[2], _ip[3]);
+    IP_ADDR4(&nm, _nm[0], _nm[1], _nm[2], _nm[3]);
+    IP_ADDR4(&gw, _gw[0], _gw[1], _gw[2], _gw[3]);
+
+    netif_set_addr(&ni, &ip, &nm, &gw);
+
+    if (netif_is_link_up(&ni)) {
+        netif_set_down(&ni);
+        netif_set_up(&ni);
+    }
+}
+
+
 void CWifiSoftAp::task() {
     // calling the base class task, in order to make thigs work
     CNetIf::task();

libraries/lwIpWrapper/src/CNetIf.h

@@ -160,6 +160,7 @@ class CNetIf: public NetworkInterface {
     //     memset(hostname, 0x00, MAX_HOSTNAME_DIM);
     //     memcpy(hostname, name, strlen(name) < MAX_HOSTNAME_DIM ? strlen(name) : MAX_HOSTNAME_DIM);
     // }
+    void config(IPAddress _ip, IPAddress _gw, IPAddress _nm);
 
 
     virtual int getMacAddress(uint8_t* mac) = 0;