SocketWrapper: start restucturing lib

Author: facchinm

libraries/SocketWrapper/Ethernet.cpp

@@ -1,3 +1,5 @@
 #include "Ethernet.h"
 
-NetworkInterface Ethernet(1);
+#if DT_HAS_COMPAT_STATUS_OKAY(ethernet_phy)
+EthernetClass Ethernet;
+#endif

libraries/SocketWrapper/Ethernet.h

@@ -1,4 +1,60 @@
-#define SPECIALIZE_FOR_ETHERNET
 #include "SocketHelpers.h"
 
-extern NetworkInterface Ethernet;
+#include <zephyr/net/ethernet.h>
+
+enum EthernetLinkStatus {
+  Unknown,
+  LinkON,
+  LinkOFF
+};
+
+enum EthernetHardwareStatus {
+  EthernetNoHardware,
+  EthernetOk
+};
+
+class EthernetClass: public NetworkInterface
+{
+public:
+	EthernetClass() {}
+	virtual ~EthernetClass() {}
+
+    EthernetLinkStatus linkStatus() {
+        hardwareStatus();
+        if (net_if_is_up(netif)) {
+            return LinkON;
+        } else {
+            return LinkOFF;
+        }
+    }
+
+    bool begin(bool blocking = true, uint32_t additional_event_mask = 0) {
+        hardwareStatus();
+        return NetworkInterface::begin(blocking, additional_event_mask);
+    }
+
+    bool begin(uint8_t* mac_address, int _timeout, int _response_timeout) {
+        return begin();
+    }
+
+    bool begin(uint8_t* mac_address, IPAddress _ip, IPAddress _dns, IPAddress _gateway, IPAddress _netmask, int _timeout, int _response_timeout) {
+        return begin();
+    }
+
+    EthernetHardwareStatus hardwareStatus() {
+        const struct device *const dev = DEVICE_DT_GET(DT_COMPAT_GET_ANY_STATUS_OKAY(ethernet_phy));
+        if (device_is_ready(dev)) {
+            for (int i = 1; i < 3; i++) {
+                auto _if = net_if_get_by_index(i);
+                if (!net_eth_type_is_wifi(_if)) {
+                    netif = _if;
+                    break;
+                }
+            }
+            return EthernetOk;
+        } else {
+            return EthernetNoHardware;
+        }
+    }
+};
+extern EthernetClass Ethernet;

libraries/SocketWrapper/SocketHelpers.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "zephyr/net/dhcpv4.h"
+#include <zephyr/net/dhcpv4.h>
+#include <zephyr/net/dhcpv4_server.h>
 #include <cstddef>
 #include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
@@ -18,28 +19,11 @@
 
 #undef LOG_INF
 #define LOG_INF(...)
-
-#ifdef SPECIALIZE_FOR_ETHERNET
-enum EthernetLinkStatus {
-  Unknown,
-  LinkON,
-  LinkOFF
-};
-
-enum EthernetHardwareStatus {
-  EthernetNoHardware,
-  EthernetOk
-};
-#endif
-
-#ifdef SPECIALIZE_FOR_WIFI
-#include "utility/wl_definitions.h"
-#include <zephyr/net/wifi_mgmt.h>
-#endif
+#undef LOG_ERR
+#define LOG_ERR(...)
 
 class NetworkInterface {
 private:
-    int iface_index = -1;
 
     uint8_t ntp_server[4];
     static struct net_mgmt_event_callback mgmt_cb;
@@ -91,6 +75,9 @@ class NetworkInterface {
             net_addr_ntop(AF_INET, cb->data, buf, sizeof(buf)));
     }
 
+protected:
+
+    struct net_if *netif = nullptr;
     int dhcp()
     {
         net_mgmt_init_event_callback(&mgmt_cb, event_handler, NET_EVENT_IPV4_ADDR_ADD | NET_EVENT_IF_UP | NET_EVENT_IF_DOWN);
@@ -102,23 +89,59 @@ class NetworkInterface {
 
         net_dhcpv4_add_option_callback(&dhcp_cb);
 
-        net_dhcpv4_start(net_if_get_by_index(iface_index));
+        net_dhcpv4_start(netif);
 
         return 0;
     }
 
+    void enable_dhcpv4_server(struct net_if *netif, char* _netmask = "255.255.255.0")
+    {
+        static struct in_addr addr;
+        static struct in_addr netmaskAddr;
+
+        if (net_addr_pton(AF_INET, String(localIP()).c_str(), &addr)) {
+            LOG_ERR("Invalid address: %s", String(localIP()).c_str());
+            return;
+        }
+
+        if (net_addr_pton(AF_INET,  _netmask, &netmaskAddr)) {
+            LOG_ERR("Invalid netmask: %s", _netmask);
+            return;
+        }
+
+        net_if_ipv4_set_gw(netif, &addr);
+
+        if (net_if_ipv4_addr_add(netif, &addr, NET_ADDR_MANUAL, 0) == NULL) {
+            LOG_ERR("unable to set IP address for AP interface");
+        }
+
+        if (!net_if_ipv4_set_netmask_by_addr(netif, &addr, &netmaskAddr)) {
+            LOG_ERR("Unable to set netmask for AP interface: %s", _netmask);
+        }
+
+        addr.s4_addr[3] += 10; /* Starting IPv4 address for DHCPv4 address pool. */
+
+        if (net_dhcpv4_server_start(netif, &addr) != 0) {
+            LOG_ERR("DHCP server is not started for desired IP");
+            return;
+        }
+
+        LOG_INF("DHCPv4 server started...\n");
+    }
+
+
 public:
-    NetworkInterface(int iface_index) : iface_index(iface_index) {}
+    NetworkInterface() {}
     ~NetworkInterface() {}
     IPAddress localIP() {
-        return IPAddress(net_if_get_by_index(iface_index)->config.ip.ipv4->unicast[0].ipv4.address.in_addr.s_addr);
+        return IPAddress(netif->config.ip.ipv4->unicast[0].ipv4.address.in_addr.s_addr);
     }
 
     IPAddress subnetMask() {
-        return IPAddress(net_if_get_by_index(iface_index)->config.ip.ipv4->unicast[0].netmask.s_addr);
+        return IPAddress(netif->config.ip.ipv4->unicast[0].netmask.s_addr);
     }
     IPAddress gatewayIP() {
-        return IPAddress(net_if_get_by_index(iface_index)->config.ip.ipv4->gw.s_addr);
+        return IPAddress(netif->config.ip.ipv4->gw.s_addr);
     }
     IPAddress dnsServerIP() {
         return arduino::INADDR_NONE;
@@ -130,105 +153,16 @@ class NetworkInterface {
 
     bool begin(bool blocking = true, uint32_t additional_event_mask = 0) {
         dhcp();
-        int ret =  net_mgmt_event_wait_on_iface(net_if_get_by_index(iface_index), NET_EVENT_IPV4_ADDR_ADD | additional_event_mask,
+        int ret =  net_mgmt_event_wait_on_iface(netif, NET_EVENT_IPV4_ADDR_ADD | additional_event_mask,
                     NULL, NULL, NULL, blocking ? K_FOREVER : K_SECONDS(1));
         return (ret == 0);
     }
 
     bool disconnect() {
-        return (net_if_down(net_if_get_by_index(iface_index)) == 0);
+        return (net_if_down(netif) == 0);
     }
 
     // TODO: manual functions for setting IP address, subnet mask, gateway, etc.
     // net_if_ipv4_set_netmask_by_addr(iface, &addr4, &nm);
     // net_if_ipv4_addr_add(iface, &addr4, NET_ADDR_MANUAL, 0);
-
-#if defined(SPECIALIZE_FOR_ETHERNET) && DT_HAS_COMPAT_STATUS_OKAY(ethernet_phy)
-    EthernetLinkStatus linkStatus() {
-        if (net_if_is_up(net_if_get_by_index(iface_index))) {
-            return LinkON;
-        } else {
-            return LinkOFF;
-        }
-    }
-
-    bool begin(uint8_t* mac_address, int _timeout, int _response_timeout) {
-        return begin();
-    }
-
-    bool begin(uint8_t* mac_address, IPAddress _ip, IPAddress _dns, IPAddress _gateway, IPAddress _netmask, int _timeout, int _response_timeout) {
-        return begin();
-    }
-
-    EthernetHardwareStatus hardwareStatus() {
-        const struct device *const dev = DEVICE_DT_GET(DT_COMPAT_GET_ANY_STATUS_OKAY(ethernet_phy));
-        if (device_is_ready(dev)) {
-            return EthernetOk;
-        } else {
-            return EthernetNoHardware;
-        }
-    }
-#endif
-
-#ifdef SPECIALIZE_FOR_WIFI
-
-#define NET_EVENT_WIFI_MASK                                                                        \
-	(NET_EVENT_WIFI_CONNECT_RESULT | NET_EVENT_WIFI_DISCONNECT_RESULT |                        \
-	 NET_EVENT_WIFI_AP_ENABLE_RESULT | NET_EVENT_WIFI_AP_DISABLE_RESULT |                      \
-	 NET_EVENT_WIFI_AP_STA_CONNECTED | NET_EVENT_WIFI_AP_STA_DISCONNECTED |                    \
-     NET_EVENT_WIFI_SCAN_RESULT)
-
-    struct net_if *sta_iface;
-    struct net_if *ap_iface;
-
-    struct wifi_connect_req_params ap_config;
-    struct wifi_connect_req_params sta_config;
-
-    bool begin(const char* ssid, const char* passphrase, wl_enc_type security = ENC_TYPE_UNKNOWN, bool blocking = false) {
-        sta_iface = net_if_get_wifi_sta();
-
-        sta_config.ssid = (const uint8_t *)ssid;
-        sta_config.ssid_length = strlen(ssid);
-        sta_config.psk = (const uint8_t *)passphrase;
-        sta_config.psk_length = strlen(passphrase);
-        // TODO: change these fields with scan() results
-        sta_config.security = WIFI_SECURITY_TYPE_PSK;
-        sta_config.channel = WIFI_CHANNEL_ANY;
-        sta_config.band = WIFI_FREQ_BAND_2_4_GHZ;
-	    sta_config.bandwidth = WIFI_FREQ_BANDWIDTH_20MHZ;
-
-        int ret = net_mgmt(NET_REQUEST_WIFI_CONNECT, sta_iface, &sta_config,
-                sizeof(struct wifi_connect_req_params));
-        if (ret) {
-            return false;
-        }
-
-        begin(false, NET_EVENT_WIFI_MASK);
-        if (blocking) {
-            net_mgmt_event_wait_on_iface(sta_iface, NET_EVENT_WIFI_AP_STA_CONNECTED, NULL, NULL, NULL, K_FOREVER);
-        }
-
-        return true;
-    }
-
-    int status() {
-        struct wifi_iface_status status = { 0 };
-
-        if (net_mgmt(NET_REQUEST_WIFI_IFACE_STATUS, net_if_get_by_index(iface_index), &status,
-                sizeof(struct wifi_iface_status))) {
-            return WL_NO_SHIELD;
-        }
-
-	    if (status.state >= WIFI_STATE_ASSOCIATED) {
-            return WL_CONNECTED;
-        } else {
-            return WL_DISCONNECTED;
-        }
-        return WL_NO_SHIELD;
-    }
-
-    int8_t scanNetworks() {
-        // TODO: borrow code from mbed core for scan results handling
-    }
-#endif
 };

libraries/SocketWrapper/WiFi.cpp

@@ -1,3 +1,3 @@
 #include "WiFi.h"
 
-NetworkInterface WiFi(1);
+WiFiClass WiFi;