Skip to content

Commit e561016

Browse files
committed
ethernet: remove setter overloads
1 parent 7a10967 commit e561016

File tree

5 files changed

+16
-55
lines changed

5 files changed

+16
-55
lines changed

libraries/Ethernet/src/Ethernet.cpp

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@ void EthernetClass::end() {
7575
disconnect();
7676
}
7777

78-
void EthernetClass::setMACAddress(const uint8_t *mac_address) {
79-
if (mac_address != nullptr) {
80-
NetworkInterface::setMACAddress(mac_address);
81-
}
82-
}
83-
8478
IPAddress EthernetClass::localIP() {
8579
return NetworkInterface::localIP();
8680
}
@@ -97,21 +91,5 @@ IPAddress EthernetClass::dnsServerIP() {
9791
return NetworkInterface::dnsServerIP();
9892
}
9993

100-
void EthernetClass::setLocalIP(const IPAddress local_ip) {
101-
NetworkInterface::setLocalIP(local_ip);
102-
}
103-
104-
void EthernetClass::setSubnetMask(const IPAddress subnet) {
105-
NetworkInterface::setSubnetMask(subnet);
106-
}
107-
108-
void EthernetClass::setGatewayIP(const IPAddress gateway) {
109-
NetworkInterface::setGatewayIP(gateway);
110-
}
111-
112-
void EthernetClass::setDnsServerIP(const IPAddress dns_server) {
113-
NetworkInterface::setDnsServerIP(dns_server);
114-
}
115-
11694
EthernetClass Ethernet;
11795
#endif

libraries/Ethernet/src/Ethernet.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@ class EthernetClass : public NetworkInterface {
6262
IPAddress gatewayIP();
6363
IPAddress dnsServerIP();
6464

65-
void setMACAddress(const uint8_t *mac_address);
66-
void setLocalIP(const IPAddress local_ip);
67-
void setSubnetMask(const IPAddress subnet);
68-
void setGatewayIP(const IPAddress gateway);
69-
void setDnsServerIP(const IPAddress dns_server);
70-
7165
void setRetransmissionTimeout(uint16_t milliseconds);
7266
void setRetransmissionCount(uint8_t num);
7367
};

libraries/SocketWrapper/SocketHelpers.cpp

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -163,51 +163,40 @@ bool NetworkInterface::setLocalIPFull(IPAddress ip, IPAddress subnet, IPAddress
163163
return false;
164164
}
165165

166-
if (!net_if_ipv4_set_netmask_by_addr(netif, &ip_addr, &subnet_addr)) {
167-
LOG_ERR("Failed to set subnet mask");
168-
return false;
169-
}
170-
166+
net_if_ipv4_set_netmask(netif, &subnet_addr);
171167
net_if_ipv4_set_gw(netif, &gw_addr);
172168
LOG_INF("Static IP configured");
173169
return true;
174170
}
175171

176-
bool NetworkInterface::setLocalIP(IPAddress ip) {
172+
void NetworkInterface::setLocalIP(const IPAddress ip) {
177173
struct in_addr addr;
178174
addr.s_addr = ip;
179175

180176
if (!net_if_ipv4_addr_add(netif, &addr, NET_ADDR_MANUAL, 0)) {
181177
LOG_ERR("Failed to set local IP address");
182-
return false;
178+
return;
183179
}
184-
185180
LOG_INF("Local IP address set: %s", ip.toString().c_str());
186-
return true;
181+
return;
187182
}
188183

189-
bool NetworkInterface::setSubnetMask(IPAddress subnet) {
184+
void NetworkInterface::setSubnetMask(const IPAddress subnet) {
190185
struct in_addr netmask_addr;
191186
netmask_addr.s_addr = subnet;
192-
193-
if (!net_if_ipv4_set_netmask_by_addr(netif, &netmask_addr, &netmask_addr)) {
194-
LOG_ERR("Failed to set subnet mask");
195-
return false;
196-
}
197-
187+
net_if_ipv4_set_netmask(netif, &netmask_addr);
198188
LOG_INF("Subnet mask set: %s", subnet.toString().c_str());
199-
return true;
189+
return;
200190
}
201191

202-
bool NetworkInterface::setGatewayIP(IPAddress gateway) {
192+
void NetworkInterface::setGatewayIP(const IPAddress gateway) {
203193
struct in_addr gw_addr;
204194
gw_addr.s_addr = gateway;
205-
206195
net_if_ipv4_set_gw(netif, &gw_addr);
207196
LOG_INF("Gateway IP set: %s", gateway.toString().c_str());
208-
return true;
197+
return;
209198
}
210199

211-
bool NetworkInterface::setDnsServerIP(IPAddress dns_server) {
212-
return false; // DNS server dynamic configuration is not supported
200+
void NetworkInterface::setDnsServerIP(const IPAddress dns_server) {
201+
return; // DNS server dynamic configuration is not supported
213202
}

libraries/SocketWrapper/SocketHelpers.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ class NetworkInterface {
5151

5252
void setMACAddress(const uint8_t *mac);
5353
bool setLocalIPFull(IPAddress ip, IPAddress subnet, IPAddress gateway);
54-
bool setLocalIP(IPAddress ip);
55-
bool setSubnetMask(IPAddress subnet);
56-
bool setGatewayIP(IPAddress gateway);
57-
bool setDnsServerIP(IPAddress dns_server);
54+
void setLocalIP(const IPAddress ip);
55+
void setSubnetMask(const IPAddress subnet);
56+
void setGatewayIP(const IPAddress gateway);
57+
void setDnsServerIP(const IPAddress dns_server);
5858

5959
int begin(bool blocking = true, uint32_t additional_event_mask = 0);
6060

loader/llext_exports.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ FORCE_EXPORT_SYM(net_if_ipv4_maddr_add);
7878
FORCE_EXPORT_SYM(net_if_ipv4_maddr_join);
7979
FORCE_EXPORT_SYM(net_if_ipv4_set_gw);
8080
FORCE_EXPORT_SYM(net_if_ipv4_addr_add);
81-
FORCE_EXPORT_SYM(net_if_ipv4_set_netmask_by_addr);
81+
FORCE_EXPORT_SYM(net_if_ipv4_set_netmask);
8282
#endif
8383
FORCE_EXPORT_SYM(net_if_lookup_by_dev);
8484
#endif

0 commit comments

Comments
 (0)