Merge pull request #9500 from sepalani/pcap-log-session

PCAP: Improve TCP session logging

Source/Core/Core/IOS/Network/Socket.cpp

@@ -701,6 +701,7 @@ s32 WiiSockMan::AddSocket(s32 fd, bool is_rw)
     WiiSocket& sock = WiiSockets[wii_fd];
     sock.SetFd(fd);
     sock.SetWiiFd(wii_fd);
+    PowerPC::debug_interface.NetworkLogger()->OnNewSocket(fd);
 
 #ifdef __APPLE__
     int opt_no_sigpipe = 1;

Source/Core/Core/NetworkCaptureLogger.cpp

@@ -24,6 +24,10 @@ namespace Core
 NetworkCaptureLogger::NetworkCaptureLogger() = default;
 NetworkCaptureLogger::~NetworkCaptureLogger() = default;
 
+void DummyNetworkCaptureLogger::OnNewSocket(s32 socket)
+{
+}
+
 void DummyNetworkCaptureLogger::LogSSLRead(const void* data, std::size_t length, s32 socket)
 {
 }
@@ -81,6 +85,12 @@ PCAPSSLCaptureLogger::PCAPSSLCaptureLogger()
 
 PCAPSSLCaptureLogger::~PCAPSSLCaptureLogger() = default;
 
+void PCAPSSLCaptureLogger::OnNewSocket(s32 socket)
+{
+  m_read_sequence_number[socket] = 0;
+  m_write_sequence_number[socket] = 0;
+}
+
 PCAPSSLCaptureLogger::ErrorState PCAPSSLCaptureLogger::SaveState() const
 {
   return {
@@ -193,8 +203,8 @@ void PCAPSSLCaptureLogger::LogIPv4(LogType log_type, const u8* data, u16 length,
 
   if (socket_type == SOCK_STREAM)
   {
-    u32& sequence_number =
-        (log_type == LogType::Read) ? m_read_sequence_number : m_write_sequence_number;
+    u32& sequence_number = (log_type == LogType::Read) ? m_read_sequence_number[socket] :
+                                                         m_write_sequence_number[socket];
     Common::TCPHeader tcp_header(from, to, sequence_number, data, length);
     sequence_number += static_cast<u32>(length);
     Common::IPv4Header ip_header(tcp_header.Size() + length, tcp_header.IPProto(), from, to);

Source/Core/Core/NetworkCaptureLogger.h

@@ -6,6 +6,7 @@
 
 #include <array>
 #include <cstddef>
+#include <map>
 #include <memory>
 
 #ifdef _WIN32
@@ -43,6 +44,8 @@ class NetworkCaptureLogger
   NetworkCaptureLogger& operator=(NetworkCaptureLogger&&) = delete;
   virtual ~NetworkCaptureLogger();
 
+  virtual void OnNewSocket(s32 socket) = 0;
+
   virtual void LogSSLRead(const void* data, std::size_t length, s32 socket) = 0;
   virtual void LogSSLWrite(const void* data, std::size_t length, s32 socket) = 0;
 
@@ -55,6 +58,8 @@ class NetworkCaptureLogger
 class DummyNetworkCaptureLogger : public NetworkCaptureLogger
 {
 public:
+  void OnNewSocket(s32 socket) override;
+
   void LogSSLRead(const void* data, std::size_t length, s32 socket) override;
   void LogSSLWrite(const void* data, std::size_t length, s32 socket) override;
 
@@ -79,6 +84,8 @@ class PCAPSSLCaptureLogger final : public NetworkCaptureLogger
   PCAPSSLCaptureLogger();
   ~PCAPSSLCaptureLogger();
 
+  void OnNewSocket(s32 socket) override;
+
   void LogSSLRead(const void* data, std::size_t length, s32 socket) override;
   void LogSSLWrite(const void* data, std::size_t length, s32 socket) override;
 
@@ -108,7 +115,7 @@ class PCAPSSLCaptureLogger final : public NetworkCaptureLogger
                const sockaddr_in& to);
 
   std::unique_ptr<Common::PCAP> m_file;
-  u32 m_read_sequence_number = 0;
-  u32 m_write_sequence_number = 0;
+  std::map<s32, u32> m_read_sequence_number;
+  std::map<s32, u32> m_write_sequence_number;
 };
 }  // namespace Core