Refactor network interface and protocol headers

Renamed and reorganized network interface and protocol header files from 'net/' to 'core/' for improved clarity and modularity. Updated all relevant includes and references throughout the codebase. Consolidated and refactored DHCP and AutoIP status checks, and replaced GetHostName() with HostName() for hostname retrieval. Moved global network variables and logic from emac/net.cpp to emac/network.cpp, removing the obsolete net.cpp file.

Author: vanvught

lib-artnet/src/controller/artnetcontroller.cpp

@@ -99,7 +99,7 @@ ArtNetController::ArtNetController()
     art_poll_reply_.Status2 |=
         artnet::Status2::kPortAddress15Bit | (artnet::kVersion >= 4 ? artnet::Status2::kSacnAbleToSwitch : artnet::Status2::kSacnNoSwitch);
     art_poll_reply_.Status2 &= static_cast<uint8_t>(~artnet::Status2::kIpDhcp);
-    art_poll_reply_.Status2 |= network::iface::IsDhcpUsed() ? artnet::Status2::kIpDhcp : artnet::Status2::kIpManualy;
+    art_poll_reply_.Status2 |= network::iface::Dhcp() ? artnet::Status2::kIpDhcp : artnet::Status2::kIpManualy;
     art_poll_reply_.Status2 &= static_cast<uint8_t>(~artnet::Status2::kDhcpCapable);
     art_poll_reply_.Status2 |= network::iface::IsDhcpCapable() ? artnet::Status2::kDhcpCapable : static_cast<uint8_t>(0);
 

lib-artnet/src/node/artnetnode.cpp

@@ -165,7 +165,7 @@ void ArtNetNode::Start()
     art_poll_reply_.Status2 |=
         artnet::Status2::kPortAddress15Bit | (artnet::kVersion >= 4 ? artnet::Status2::kSacnAbleToSwitch : artnet::Status2::kSacnNoSwitch);
     art_poll_reply_.Status2 &= static_cast<uint8_t>(~artnet::Status2::kIpDhcp);
-    art_poll_reply_.Status2 |=  network::iface::IsDhcpUsed() ? artnet::Status2::kIpDhcp : artnet::Status2::kIpManualy;
+    art_poll_reply_.Status2 |=  network::iface::Dhcp() ? artnet::Status2::kIpDhcp : artnet::Status2::kIpManualy;
     art_poll_reply_.Status2 &= static_cast<uint8_t>(~artnet::Status2::kDhcpCapable);
     art_poll_reply_.Status2 |=  network::iface::IsDhcpCapable() ? artnet::Status2::kDhcpCapable : static_cast<uint8_t>(0);
 #if defined(ENABLE_HTTPD) && defined(ENABLE_CONTENT)

lib-artnet/src/node/artnetnodehandleipprog.cpp

@@ -51,7 +51,7 @@ void ArtNetNode::HandleIpProg()
     const auto* const kPArtIpProg = reinterpret_cast<artnet::ArtIpProg*>(receive_buffer_);
     const auto kCommand = kPArtIpProg->command;
     auto* reply = reinterpret_cast<artnet::ArtIpProgReply*>(receive_buffer_);
-    const auto kIsDhcp =  network::iface::IsDhcpUsed();
+    const auto kIsDhcp =  network::iface::Dhcp();
 
     reply->op_code = static_cast<uint16_t>(artnet::OpCodes::kOpIpprogreply);
 
@@ -83,7 +83,7 @@ void ArtNetNode::HandleIpProg()
         network::SetGatewayIp(ip.u32);
     }
 
-    if ( network::iface::IsDhcpUsed())
+    if ( network::iface::Dhcp())
     {
         reply->status = (1U << 6);
     }
@@ -94,7 +94,7 @@ void ArtNetNode::HandleIpProg()
 
     reply->spare2 = 0;
 
-    auto is_changed = (kIsDhcp !=  network::iface::IsDhcpUsed());
+    auto is_changed = (kIsDhcp !=  network::iface::Dhcp());
 
     ip.u32 = network::GetPrimaryIp();
     is_changed |= (memcmp(&kPArtIpProg->prog_ip_hi, ip.u8, artnet::kIpSize) != 0);
@@ -116,7 +116,7 @@ void ArtNetNode::HandleIpProg()
     if (is_changed)
     {
         art_poll_reply_.Status2 = static_cast<uint8_t>((art_poll_reply_.Status2 & (~(artnet::Status2::kIpDhcp))) |
-                                                       ( network::iface::IsDhcpUsed() ? artnet::Status2::kIpDhcp : artnet::Status2::kIpManualy));
+                                                       ( network::iface::Dhcp() ? artnet::Status2::kIpDhcp : artnet::Status2::kIpManualy));
 
         memcpy(art_poll_reply_.IPAddress, &reply->prog_ip_hi, artnet::kIpSize);
 #if (ARTNET_VERSION >= 4)

lib-displayudf/include/displayudf.h

@@ -198,7 +198,7 @@ class DisplayUdf final : public Display
     void ShowHostName()
     {
         ClearEndOfLine();
-        Write(labels_[static_cast<uint32_t>(displayudf::Labels::kHostname)],  network::iface::GetHostName());
+        Write(labels_[static_cast<uint32_t>(displayudf::Labels::kHostname)],  network::iface::HostName());
     }
 
     void ShowDhcpStatus(network::dhcp::State state)

lib-e131/src/controller/e131controller.cpp

@@ -61,7 +61,7 @@ E131Controller::E131Controller()
 
     char aSourceName[e131::kSourceNameLength];
     uint8_t nLength;
-    snprintf(aSourceName, e131::kSourceNameLength, "%.48s %s", network::iface::GetHostName(), hal::BoardName(nLength));
+    snprintf(aSourceName, e131::kSourceNameLength, "%.48s %s", network::iface::HostName(), hal::BoardName(nLength));
     SetSourceName(aSourceName);
 
     hal::UuidCopy(cid_);

lib-e131/src/node/e131bridge.cpp

@@ -79,7 +79,7 @@ E131Bridge::E131Bridge()
 #if defined(E131_HAVE_DMXIN) || defined(NODE_SHOWFILE)
     char source_name[e131::kSourceNameLength];
     uint8_t length;
-    snprintf(source_name, e131::kSourceNameLength, "%.48s %s",  network::iface::GetHostName(), hal::BoardName(length));
+    snprintf(source_name, e131::kSourceNameLength, "%.48s %s",  network::iface::HostName(), hal::BoardName(length));
     SetSourceName(source_name);
 
     hal::UuidCopy(cid_);

lib-midi/src/net/applemidi.cpp

@@ -132,7 +132,7 @@ AppleMidi::AppleMidi()
     memcpy(cast32.u8, &mac_address[2], 4);
     ssrc_ = cast32.u32;
 
-    SetSessionName( network::iface::GetHostName());
+    SetSessionName( network::iface::HostName());
 
     memset(&session_status_, 0, sizeof(struct applemidi::SessionStatus));
 

lib-network/include/apps/mdns.h

@@ -23,8 +23,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef NET_APPS_MDNS_H_
-#define NET_APPS_MDNS_H_
+#ifndef APPS_MDNS_H_
+#define APPS_MDNS_H_
 
 #include <cstdint>
 
@@ -65,4 +65,4 @@ bool ServiceRecordDelete(mdns::Services service);
 void SendAnnouncement(uint32_t ttl);
 } // namespace mdns
 
-#endif  // NET_APPS_MDNS_H_
+#endif  // APPS_MDNS_H_

lib-network/include/apps/ntpclient.h

@@ -23,8 +23,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef NET_APPS_NTPCLIENT_H_
-#define NET_APPS_NTPCLIENT_H_
+#ifndef APPS_NTPCLIENT_H_
+#define APPS_NTPCLIENT_H_
 
 #include <cstdint>
 
@@ -71,4 +71,4 @@ ntp::Status GetStatus();
 
 } // namespace ntpclient
 
-#endif  // NET_APPS_NTPCLIENT_H_
+#endif  // APPS_NTPCLIENT_H_

lib-network/include/apps/tftpdaemon.h

@@ -23,8 +23,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef NET_APPS_TFTPDAEMON_H_
-#define NET_APPS_TFTPDAEMON_H_
+#ifndef APPS_TFTPDAEMON_H_
+#define APPS_TFTPDAEMON_H_
 
 #include <cstdint>
 #include <cstddef>
@@ -94,4 +94,4 @@ class TFTPDaemon
     static inline TFTPDaemon* s_this;
 };
 
-#endif  // NET_APPS_TFTPDAEMON_H_
+#endif  // APPS_TFTPDAEMON_H_