Ethernet lib: add set IP, Subnet, Gateway functions

Author: leonardocavagnis

libraries/SocketWrapper/Ethernet.cpp

@@ -32,7 +32,7 @@ int EthernetClass::begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPAddress ga
 int EthernetClass::begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPAddress gateway, IPAddress subnet, unsigned long timeout, unsigned long responseTimeout) {
     setMACAddress(mac);
 
-    if (!NetworkInterface::setLocalIP(ip, subnet, gateway)) {
+    if (!NetworkInterface::setLocalIPFull(ip, subnet, gateway)) {
         return 0;
     }
 
@@ -72,9 +72,41 @@ void EthernetClass::setMACAddress(const uint8_t *mac_address) {
     }
 }
 
+void EthernetClass::MACAddress(uint8_t *mac_address) {
+    setMACAddress(mac_address);
+}
+
 IPAddress EthernetClass::localIP() {
     return NetworkInterface::localIP();
 }
 
+IPAddress EthernetClass::subnetMask() {
+    return NetworkInterface::subnetMask();
+}
+
+IPAddress EthernetClass::gatewayIP() {
+    return NetworkInterface::gatewayIP();
+}
+
+IPAddress EthernetClass::dnsServerIP() {
+    return NetworkInterface::dnsServerIP();
+}
+
+void EthernetClass::setLocalIP(const IPAddress local_ip) {
+    NetworkInterface::setLocalIP(local_ip);
+}
+
+void EthernetClass::setSubnetMask(const IPAddress subnet) {
+    NetworkInterface::setSubnetMask(subnet);
+}
+
+void EthernetClass::setGatewayIP(const IPAddress gateway) {
+    NetworkInterface::setGatewayIP(gateway);
+}
+
+void EthernetClass::setDnsServerIP(const IPAddress dns_server) {
+    NetworkInterface::setDnsServerIP(dns_server);
+}
+
 EthernetClass Ethernet;
 #endif

libraries/SocketWrapper/Ethernet.h

@@ -31,6 +31,7 @@ class EthernetClass: public NetworkInterface
 	int begin(uint8_t *mac, IPAddress ip, IPAddress dns);
 	int begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPAddress gateway);
     int begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPAddress gateway, IPAddress subnet, unsigned long timeout = 60000, unsigned long responseTimeout = 4000);
+	
 	void init(uint8_t sspin = 10);
 
     void MACAddress(uint8_t *mac_address);
@@ -44,6 +45,7 @@ class EthernetClass: public NetworkInterface
 	void setSubnetMask(const IPAddress subnet);
 	void setGatewayIP(const IPAddress gateway);
 	void setDnsServerIP(const IPAddress dns_server);
+	
 	void setRetransmissionTimeout(uint16_t milliseconds);
 	void setRetransmissionCount(uint8_t num);
 };

libraries/SocketWrapper/SocketHelpers.cpp

@@ -119,10 +119,6 @@ IPAddress NetworkInterface::dnsServerIP() {
     return arduino::INADDR_NONE;
 }
 
-IPAddress NetworkInterface::dnsIP(int n) {
-    //TODO
-}
-
 void NetworkInterface::setMACAddress(const uint8_t* mac) {
     struct net_eth_addr new_mac;
     struct ethernet_req_params params = { 0 };
@@ -153,7 +149,7 @@ bool NetworkInterface::disconnect() {
     return (net_if_down(netif) == 0);
 }
 
-bool NetworkInterface::setLocalIP(IPAddress ip, IPAddress subnet, IPAddress gateway) {
+bool NetworkInterface::setLocalIPFull(IPAddress ip, IPAddress subnet, IPAddress gateway) {
     struct in_addr ip_addr, subnet_addr, gw_addr;
 
     ip_addr.s_addr = ip;
@@ -173,4 +169,43 @@ bool NetworkInterface::setLocalIP(IPAddress ip, IPAddress subnet, IPAddress gate
     net_if_ipv4_set_gw(netif, &gw_addr);
     LOG_INF("Static IP configured");
     return true;
+}
+
+bool NetworkInterface::setLocalIP(IPAddress ip) {
+    struct in_addr addr;
+    addr.s_addr = ip;
+
+    if (!net_if_ipv4_addr_add(netif, &addr, NET_ADDR_MANUAL, 0)) {
+        LOG_ERR("Failed to set local IP address");
+        return false;
+    }
+
+    LOG_INF("Local IP address set: %s", ip.toString().c_str());
+    return true;
+}
+
+bool NetworkInterface::setSubnetMask(IPAddress subnet) {
+    struct in_addr netmask_addr;
+    netmask_addr.s_addr = subnet;
+
+    if (!net_if_ipv4_set_netmask_by_addr(netif, &netmask_addr, &netmask_addr)) {
+        LOG_ERR("Failed to set subnet mask");
+        return false;
+    }
+
+    LOG_INF("Subnet mask set: %s", subnet.toString().c_str());
+    return true;
+}
+
+bool NetworkInterface::setGatewayIP(IPAddress gateway) {
+    struct in_addr gw_addr;
+    gw_addr.s_addr = gateway;
+
+    net_if_ipv4_set_gw(netif, &gw_addr);
+    LOG_INF("Gateway IP set: %s", gateway.toString().c_str());
+    return true;
+}
+
+bool NetworkInterface::setDnsServerIP(IPAddress dns_server) {
+    return false; // DNS server dynamic configuration is not supported
 }

libraries/SocketWrapper/SocketHelpers.h

@@ -49,16 +49,14 @@ class NetworkInterface {
         IPAddress gatewayIP();
         IPAddress dnsServerIP();
 
-        IPAddress dnsIP(int n = 0);
-
         void setMACAddress(const uint8_t* mac);
-        bool setLocalIP(IPAddress ip, IPAddress subnet, IPAddress gateway);
+        bool setLocalIPFull(IPAddress ip, IPAddress subnet, IPAddress gateway);
+        bool setLocalIP(IPAddress ip);
+        bool setSubnetMask(IPAddress subnet);
+        bool setGatewayIP(IPAddress gateway);
+        bool setDnsServerIP(IPAddress dns_server);
 
         int begin(bool blocking = true, uint32_t additional_event_mask = 0);
 
         bool disconnect();
-
-        // 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);
 };