From 1b0845b48a8ec20856ba68e84baad829d83668df Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Thu, 7 May 2020 15:49:54 +0000
Subject: [PATCH] Slirp: Added support for logging packets in text format
 (disabled by default).

---
 bochs/iodev/network/eth_slirp.cc | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/bochs/iodev/network/eth_slirp.cc b/bochs/iodev/network/eth_slirp.cc
index 9c3fd6799..6a09cf495 100644
--- a/bochs/iodev/network/eth_slirp.cc
+++ b/bochs/iodev/network/eth_slirp.cc
@@ -2,7 +2,7 @@
 // $Id$
 /////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (C) 2014-2017  The Bochs Project
+//  Copyright (C) 2014-2020  The Bochs Project
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -54,6 +54,8 @@ void CDECL libslirp_net_plugin_fini(void)
 
 #define LOG_THIS netdev->
 
+#define BX_ETH_SLIRP_LOGGING 0
+
 #define MAX_HOSTFWD 5
 
 static int rx_timer_index = BX_NULL_TIMER_HANDLE;
@@ -89,6 +91,9 @@ private:
   char *smb_export, *smb_tmpdir;
   struct in_addr smb_srv;
 #endif
+#if BX_ETH_SLIRP_LOGGING
+  FILE *pktlog_txt;
+#endif
 
   bx_bool parse_slirp_conf(const char *conf);
   static void rx_timer_handler(void *);
@@ -135,6 +140,9 @@ bx_slirp_pktmover_c::~bx_slirp_pktmover_c()
       signal(SIGPIPE, SIG_DFL);
 #endif
     }
+#if BX_ETH_SLIRP_LOGGING
+    fclose(pktlog_txt);
+#endif
   }
 }
 
@@ -356,12 +364,26 @@ bx_slirp_pktmover_c::bx_slirp_pktmover_c(const char *netif,
       BX_ERROR(("failed to initialize SMB support"));
     }
   }
+#endif
+#if BX_ETH_SLIRP_LOGGING
+  pktlog_txt = fopen("slirp-pktlog.txt", "wb");
+  fprintf(pktlog_txt, "slirp packetmover readable log file\n");
+  fprintf(pktlog_txt, "TFTP root = %s\n", netif);
+  fprintf(pktlog_txt, "guest MAC address = ");
+  int i;
+  for (i=0; i<6; i++)
+    fprintf(pktlog_txt, "%02x%s", 0xff & macaddr[i], i<5?":" : "\n");
+  fprintf(pktlog_txt, "--\n");
+  fflush(pktlog_txt);
 #endif
   bx_slirp_instances++;
 }
 
 void bx_slirp_pktmover_c::sendpkt(void *buf, unsigned io_len)
 {
+#if BX_ETH_SLIRP_LOGGING
+  write_pktlog_txt(pktlog_txt, (const Bit8u*)buf, io_len, 0);
+#endif
   slirp_input(slirp, (Bit8u*)buf, io_len);
 }
 
@@ -407,6 +429,9 @@ void bx_slirp_pktmover_c::receive(void *pkt, unsigned pkt_len)
 {
   if (this->rxstat(this->netdev) & BX_NETDEV_RXREADY) {
     if (pkt_len < MIN_RX_PACKET_LEN) pkt_len = MIN_RX_PACKET_LEN;
+#if BX_ETH_SLIRP_LOGGING
+    write_pktlog_txt(pktlog_txt, (const Bit8u*)pkt, pkt_len, 1);
+#endif
     this->rxh(this->netdev, pkt, pkt_len);
   } else {
     BX_ERROR(("device not ready to receive data"));