From e91029e67867eac55acfc9597e2cb25e3bda201a Mon Sep 17 00:00:00 2001 From: David Crocker Date: Fri, 15 Jul 2022 15:12:13 +0100 Subject: More work on multicast --- src/Networking/LwipEthernet/LwipEthernetInterface.cpp | 5 ----- src/Networking/LwipEthernet/LwipEthernetInterface.h | 9 +++++++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/Networking/LwipEthernet') diff --git a/src/Networking/LwipEthernet/LwipEthernetInterface.cpp b/src/Networking/LwipEthernet/LwipEthernetInterface.cpp index 69049406..443a09f7 100644 --- a/src/Networking/LwipEthernet/LwipEthernetInterface.cpp +++ b/src/Networking/LwipEthernet/LwipEthernetInterface.cpp @@ -575,11 +575,6 @@ bool LwipEthernetInterface::ConnectionEstablished(tcp_pcb *pcb) noexcept return false; } -IPAddress LwipEthernetInterface::GetIPAddress() const noexcept -{ - return ipAddress; -} - void LwipEthernetInterface::SetIPAddress(IPAddress p_ipAddress, IPAddress p_netmask, IPAddress p_gateway) noexcept { if (GetState() == NetworkState::obtainingIP || GetState() == NetworkState::active) diff --git a/src/Networking/LwipEthernet/LwipEthernetInterface.h b/src/Networking/LwipEthernet/LwipEthernetInterface.h index 12c2bc08..e1a34da5 100644 --- a/src/Networking/LwipEthernet/LwipEthernetInterface.h +++ b/src/Networking/LwipEthernet/LwipEthernetInterface.h @@ -48,8 +48,13 @@ public: bool IsWiFiInterface() const noexcept override { return false; } void UpdateHostname(const char *hostname) noexcept override; - IPAddress GetIPAddress() const noexcept override; + + IPAddress GetIPAddress() const noexcept override { return ipAddress; } + IPAddress GetNetmask() const noexcept override { return netmask; } + IPAddress GetGateway() const noexcept override { return gateway; } + bool UsingDhcp() const noexcept override { return usingDhcp; } void SetIPAddress(IPAddress p_ipAddress, IPAddress p_netmask, IPAddress p_gateway) noexcept override; + GCodeResult SetMacAddress(const MacAddress& mac, const StringRef& reply) noexcept override; const MacAddress& GetMacAddress() const noexcept override { return macAddress; } @@ -91,7 +96,7 @@ private: bool activated; bool initialised; - bool usingDhcp; + bool usingDhcp = true; IPAddress ipAddress; IPAddress netmask; -- cgit v1.2.3