pmlag

commit aa97a592dc57c4fb94155ad3384702990427d353
parent 74047ad1084a26afea3394506c9da45820f2b0cb
Author: Robin Bron <robin@finwo.nl>
Date:   Thu,  9 Mar 2023 22:20:11 +0100

Print debug headers by compile definition, not commenting

Diffstat:
M
src/task/bond.c
 | 
17
+++++++++--------
M
src/task/iface.c
 | 
16
+++++++++-------

2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/task/bond.c b/src/task/bond.c
@@ -17,14 +17,15 @@ int task_bond_onpacket(struct pmlag_bond *bond, unsigned char *buffer, size_t bu
   struct sockaddr_ll saddr_ll;
   saddr_ll.sll_halen = ETH_ALEN;
 
-  /* // Debug: print eth header */
-  /* printf("%.2x:%.2x:%.2x:%.2x:%.2x:%.2x > %.2x:%.2x:%.2x:%.2x:%.2x:%.2x, %.4x (%ld), %ld\n", */
-  /*   buffer[6],buffer[7],buffer[8],buffer[9],buffer[10],buffer[11], // SRC */
-  /*   buffer[0],buffer[1],buffer[2],buffer[3],buffer[ 4],buffer[ 5], // DST */
-  /*   ((unsigned int)((unsigned char)buffer[12]) << 8) + buffer[13], // PROTO */
-  /*   buflen, */
-  /*   mindex_length(bond->rt) */
-  /* ); */
+#ifdef DEBUG
+  // Debug: print eth header
+  printf("%.2x:%.2x:%.2x:%.2x:%.2x:%.2x > %.2x:%.2x:%.2x:%.2x:%.2x:%.2x, %.4x (%ld)\n",
+    buffer[6],buffer[7],buffer[8],buffer[9],buffer[10],buffer[11], // SRC
+    buffer[0],buffer[1],buffer[2],buffer[3],buffer[ 4],buffer[ 5], // DST
+    ((unsigned int)((unsigned char)buffer[12]) << 8) + buffer[13], // PROTO
+    buflen
+  );
+#endif // DEBUG
 
   // Get interface to send the packet from
   memcpy(saddr_ll.sll_addr, buffer, ETH_ALEN);
diff --git a/src/task/iface.c b/src/task/iface.c
@@ -14,13 +14,15 @@ int task_iface_onpacket(struct pmlag_iface *iface, unsigned char *buffer, size_t
   uint16_t proto;
   int16_t bcidx;
 
-  /* // Debug: print eth header */
-  /* printf("%.2x:%.2x:%.2x:%.2x:%.2x:%.2x < %.2x:%.2x:%.2x:%.2x:%.2x:%.2x, %.4x (%ld)\n", */
-  /*   buffer[0],buffer[1],buffer[2],buffer[3],buffer[ 4],buffer[ 5], // DST */
-  /*   buffer[6],buffer[7],buffer[8],buffer[9],buffer[10],buffer[11], // SRC */
-  /*   ((unsigned int)((unsigned char)buffer[12]) << 8) + buffer[13], // PROTO */
-  /*   buflen */
-  /* ); */
+#ifdef DEBUG
+  // Debug: print eth header
+  printf("%.2x:%.2x:%.2x:%.2x:%.2x:%.2x < %.2x:%.2x:%.2x:%.2x:%.2x:%.2x, %.4x (%ld)\n",
+    buffer[0],buffer[1],buffer[2],buffer[3],buffer[ 4],buffer[ 5], // DST
+    buffer[6],buffer[7],buffer[8],buffer[9],buffer[10],buffer[11], // SRC
+    ((unsigned int)((unsigned char)buffer[12]) << 8) + buffer[13], // PROTO
+    buflen
+  );
+#endif // DEBUG
 
   // Update the routing table as-needed
   proto = ((uint16_t)((unsigned char)buffer[(ETH_ALEN*2)+0]) << 8) + buffer[(ETH_ALEN*2)+1];