[Seq-cvs-commit] SF.net SVN: seq:[1052] showeq/trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1052
          http://sourceforge.net/p/seq/svn/1052
Author:   theblueadept
Date:     2020-10-23 00:54:05 +0000 (Fri, 23 Oct 2020)
Log Message:
-----------
Historical checkin for 10/22/20

- Updated Fixed network packets (cn187)

Version to 5.13.10.103

Modified Paths:
--------------
    showeq/trunk/ChangeLog
    showeq/trunk/configure.in
    showeq/trunk/src/packet.cpp
    showeq/trunk/src/packetcapture.cpp

Modified: showeq/trunk/ChangeLog
===================================================================

--- showeq/trunk/ChangeLog	2020-08-20 13:58:11 UTC (rev 1051)
+++ showeq/trunk/ChangeLog	2020-10-23 00:54:05 UTC (rev 1052)
@@ -1,3 +1,8 @@
+BlueAdept (10/22/20)
+- Updated version to 5.13.10.103
+- Support EQ patch 10/21/20
+- Updated Fixed network packets (cn187)
+
 BlueAdept (08/20/20)
 -------------------
 - Updated version to 5.13.10.102

Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in	2020-08-20 13:58:11 UTC (rev 1051)
+++ showeq/trunk/configure.in	2020-10-23 00:54:05 UTC (rev 1052)
@@ -2,7 +2,7 @@
 dnl $Id$ $Name$
 
 AC_PREREQ(2.59)
-AC_INIT(showeq, 5.13.10.102)
+AC_INIT(showeq, 5.13.10.103)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_SYSTEM

Modified: showeq/trunk/src/packet.cpp
===================================================================
--- showeq/trunk/src/packet.cpp	2020-08-20 13:58:11 UTC (rev 1051)
+++ showeq/trunk/src/packet.cpp	2020-10-23 00:54:05 UTC (rev 1052)
@@ -60,7 +60,8 @@
 //----------------------------------------------------------------------
 // constants
 
-const in_port_t WorldServerGeneralPort = 9000;
+const in_port_t WorldServerGeneralMinPort = 9000;
+const in_port_t WorldServerGeneralMaxPort = 9007;
 const in_port_t WorldServerChatPort = 9876;
 const in_port_t WorldServerChat2Port = 9875; // xgame tells, mail
 const in_port_t LoginServerMinPort = 15900;
@@ -590,7 +591,9 @@
 void EQPacket::dispatchPacket(EQUDPIPPacketFormat& packet)
 {
   // Detect client by world server port traffic...
-  if (m_detectingClient && packet.getSourcePort() == WorldServerGeneralPort)
+  if (m_detectingClient &&
+        (packet.getSourcePort() >= WorldServerGeneralMinPort
+         && packet.getSourcePort() <= WorldServerGeneralMaxPort))
   {
     m_ip = packet.getIPv4DestA();
     m_client_addr = packet.getIPv4DestN();
@@ -598,7 +601,9 @@
     emit clientChanged(m_client_addr);
     seqInfo("Client Detected: %s", (const char*)m_ip);
   }
-  else if (m_detectingClient && packet.getDestPort() == WorldServerGeneralPort)
+  else if (m_detectingClient &&
+            (packet.getDestPort() >= WorldServerGeneralMinPort
+             && packet.getDestPort() <= WorldServerGeneralMaxPort))
   {
     m_ip = packet.getIPv4SourceA();
     m_client_addr = packet.getIPv4SourceN();
@@ -634,8 +639,10 @@
     // Drop login server traffic
     return;
   }
-  else if (packet.getDestPort() == WorldServerGeneralPort ||
-      packet.getSourcePort() == WorldServerGeneralPort)
+  else if ((packet.getDestPort() >= WorldServerGeneralMinPort &&
+            packet.getDestPort() <= WorldServerGeneralMaxPort) ||
+           (packet.getSourcePort() >= WorldServerGeneralMinPort &&
+            packet.getSourcePort() <= WorldServerGeneralMaxPort))
   {
     // World server traffic. Dispatch it.
     if (packet.getIPv4SourceN() == m_client_addr)

Modified: showeq/trunk/src/packetcapture.cpp
===================================================================
--- showeq/trunk/src/packetcapture.cpp	2020-08-20 13:58:11 UTC (rev 1051)
+++ showeq/trunk/src/packetcapture.cpp	2020-10-23 00:54:05 UTC (rev 1052)
@@ -108,18 +108,18 @@
         if (strcmp(host, AUTOMATIC_CLIENT_IP) == 0)
         {
             seqInfo("Filtering packets on device %s, searching for EQ client...", device);
-            sprintf (filter_buf, "udp[0:2] > 1024 and udp[2:2] > 1024 and ether proto 0x0800");
+            sprintf (filter_buf, "udp[0:2] > 1024 and udp[2:2] > 1024 and ether proto 0x0800 and not broadcast and not multicast");
         }
         else
         {
             seqInfo("Filtering packets on device %s, IP host %s", device, host);
-            sprintf (filter_buf, "udp[0:2] > 1024 and udp[2:2] > 1024 and host %s and ether proto 0x0800", host);
+            sprintf (filter_buf, "udp[0:2] > 1024 and udp[2:2] > 1024 and host %s and ether proto 0x0800 and not broadcast and not multicast", host);
         }
     }
     else if (address_type == MAC_ADDRESS_TYPE)
     {
         seqInfo("Filtering packets on device %s, MAC host %s", device, host);
-        sprintf (filter_buf, "udp[0:2] > 1024 and udp[2:2] > 1024 and ether host %s and ether proto 0x0800", host);
+        sprintf (filter_buf, "udp[0:2] > 1024 and udp[2:2] > 1024 and ether host %s and ether proto 0x0800 and not broadcast and not multicast", host);
     }
     else
     {
@@ -444,35 +444,35 @@
     {
         // Restrict to client port and ip, plus world streams.
         sprintf(filter_buf, 
-            "(udp[0:2] = 9000 or udp[2:2] = 9000 or udp[0:2] = 9876 or udp[0:2] = %d or udp[2:2] = %d) and host %s and ether proto 0x0800", 
-            client_port, client_port, hostname);
+            "udp and (portrange 9000-9007 or port 9876 or port %d) and host %s and ether proto 0x0800 and not broadcast and not multicast", 
+            client_port, hostname);
     }
     else if (address_type == IP_ADDRESS_TYPE && zone_port) 
     {
         // Restrict to zone port and world streams.
         sprintf(filter_buf, 
-            "(udp[0:2] = 9000 or udp[2:2] = 9000 or udp[0:2] = 9876 or udp[0:2] = %d or udp[2:2] = %d) and host %s and ether proto 0x0800", 
-            zone_port, zone_port, hostname);
+            "udp and (portrange 9000-9007 or port 9876 or port %d) and host %s and ether proto 0x0800 and not broadcast and not multicast", 
+            zone_port, hostname);
     }
     else if (address_type == MAC_ADDRESS_TYPE && client_port)
     {
         // Restrict to client port and world streams.
         sprintf(filter_buf, 
-            "(udp[0:2] = 9000 or udp[2:2] = 9000 or udp[0:2] = 9876 or udp[0:2] = %d or udp[2:2] = %d) and ether host %s and ether proto 0x0800", 
-            client_port, client_port, hostname);
+            "udp and (portrange 9000-9007 or port 9876 or port %d) and ether host %s and ether proto 0x0800 and not broadcast and not multicast", 
+            client_port, hostname);
     }
     else if (address_type == MAC_ADDRESS_TYPE && zone_port)
     {
         // Restrict to zone port and world streams.
         sprintf(filter_buf, 
-            "(udp[0:2] = 9000 or udp[2:2] = 9000 or udp[0:2] = 9876 or udp[0:2] = %d or udp[2:2] = %d) and ether host %s and ether proto 0x0800", 
-            zone_port, zone_port, hostname);
+            "udp and (portrange 9000-9007 or port 9876 or port %d) and ether host %s and ether proto 0x0800 and not broadcast and not multicast", 
+            zone_port, hostname);
     }
     else if (hostname != NULL && !client_port && !zone_port)
     {
         // Leave wide open.
         sprintf(filter_buf, 
-          "udp[0:2] > 1024 and udp[2:2] > 1024 and ether proto 0x0800 and host %s", 
+          "udp[0:2] > 1024 and udp[2:2] > 1024 and ether proto 0x0800 and host %s and not broadcast and not multicast", 
           hostname);
     }
     else
@@ -481,7 +481,7 @@
         seqInfo("Filtering packets on device %s, searching for EQ client...", 
                 device);
         sprintf(filter_buf, 
-                "udp[0:2] > 1024 and udp[2:2] > 1024 and ether proto 0x0800");
+                "udp[0:2] > 1024 and udp[2:2] > 1024 and ether proto 0x0800 and not broadcast and not multicast");
     }
 
     if (pcap_compile (m_pcache_pcap, &bpp, filter_buf, 1, net) == -1)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



