Refactor debug macros, header guard & logging

Rename debug macros for consistency (DEBUG_NET_NETIF -> DEBUG_NETIF, DEBUG_NET_TCP -> DEBUG_TCP, DEBUG_NET_UDP -> DEBUG_UDP). Normalize the internal header guard (NET_NET_PRIVATE_H_ -> NETWORK_PRIVATE_H_) and remove a stray blank include line. Replace network::Error(...) calls with the ERROR(...) logging macro in TCP code and add a guard (CONFIG_TCP_NO_OPTIMIZE) around GCC optimization pragmas to allow disabling TCP optimizations. Also apply a minor brace/formatting cleanup in tcp.cpp.

Author: vanvught

lib-network/src/core/netif.cpp

@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 
-#if defined(DEBUG_NET_NETIF)
+#if defined(DEBUG_NETIF)
 #undef NDEBUG
 #endif
 

lib-network/src/core/network_private.h

@@ -23,8 +23,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef NET_NET_PRIVATE_H_
-#define NET_NET_PRIVATE_H_
+#ifndef NETWORK_PRIVATE_H_
+#define NETWORK_PRIVATE_H_
 
 #include <cstdint>
 #include <cstdio>
@@ -33,7 +33,6 @@
 #include "core/protocol/igmp.h"
 #include "core/protocol/udp.h"
 #include "core/protocol/tcp.h"
-
 #include "net_platform.h" // IWYU pragma: keep
 
 #ifndef ALIGNED
@@ -127,4 +126,4 @@ void Run();
 } // namespace tcp
 } // namespace network
 
-#endif // NET_NET_PRIVATE_H_
+#endif // NETWORK_PRIVATE_H_

lib-network/src/core/tcp.cpp

@@ -43,17 +43,19 @@
  * - Zero-window probing
  */
 
-#if defined(DEBUG_NET_TCP)
+#if defined(DEBUG_TCP)
 #undef NDEBUG
 #endif
 #pragma GCC diagnostic push
 #if (__GNUC__ < 10)
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
 #endif
+#if !defined(CONFIG_TCP_NO_OPTIMIZE)
 #pragma GCC push_options
 #pragma GCC optimize("O2")
 #pragma GCC optimize("no-tree-loop-distribute-patterns")
+#endif
 
 #include <cstdint>
 #include <cstring>
@@ -1494,15 +1496,15 @@ static uint16_t s_local_port = kLocalPortRangeStart;
 ConnHandle Connect(uint32_t remote_ip, uint16_t remote_port, CallbackConnect cb_connect, CallbackData cb_data, void* context) {
     const auto& netif = netif::global::netif_default;
     if (__builtin_expect((netif.ip.addr == 0), 0)) {
-        network::Error(__func__, "Connect: No ip!");
+        ERROR("Connect: No ip!");
         return kInvalidConnHandle;
     }
 
     uint32_t out_index = 0;
 
     auto* tcb = AllocTcb(remote_port, &out_index);
     if (tcb == nullptr) {
-        network::Error(__func__, "Connect: No TCB!");
+        ERROR("Connect: No TCB!");
         return kInvalidConnHandle;
     }
 
@@ -1542,14 +1544,14 @@ ConnHandle Connect(uint32_t remote_ip, uint16_t remote_port, CallbackConnect cb_
 int32_t Close(ConnHandle conn_handle) // graceful FIN
 {
     if (conn_handle >= TCP_MAX_TCBS_ALLOWED) {
-        network::Error(__func__, "Close: Connection handle!");
+        ERROR("Close: Connection handle!");
         return -1;
     }
 
     auto* c = &s_tcbs[conn_handle];
 
     if (!c->in_use || c->state == kStateClosed) {
-        network::Error(__func__, "Close: TCB!");
+        ERROR("Close: TCB!");
         return -1;
     }
 
@@ -1568,7 +1570,7 @@ int32_t Close(ConnHandle conn_handle) // graceful FIN
 
     // We only support graceful close from states where FIN makes sense here.
     if (c->state != kStateEstablished && c->state != kStateCloseWait) {
-        network::Error(__func__, "Close: Not graceful!");
+        ERROR("Close: Not graceful!");
         return -1;
     }
 
@@ -1588,8 +1590,7 @@ int32_t Close(ConnHandle conn_handle) // graceful FIN
 
     if (c->state == kStateEstablished) {
         NEW_STATE(c, kStateFinWait1);
-    } else /* kStateCloseWait */
-    {
+    } else {
         NEW_STATE(c, kStateLastAck);
     }
 

lib-network/src/core/udp.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "core/protocol/ethernet.h"
-#if defined(DEBUG_NET_UDP)
+#if defined(DEBUG_UDP)
 #undef NDEBUG
 #endif