修正端口监听

Server/Network/PortChecker.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Net;
+using System.Net.Sockets;
+
+public class PortChecker
+{
+    public static bool IsPortListening(int port)
+    {
+        TcpListener listener = null;
+        try
+        {
+            listener = new TcpListener(IPAddress.Any, port);
+            listener.Start();
+            return false; // Port is free
+        }
+        catch (SocketException)
+        {
+            return true; // Port is in use
+        }
+        finally
+        {
+            listener?.Stop(); // Ensure listener is stopped
+        }
+    }
+
+    public static void Main()
+    {
+        int portToCheck = 8080; // Replace with the port you want to check
+        bool isListening = IsPortListening(portToCheck);
+        Console.WriteLine($"Port {portToCheck} is {(isListening ? "in use" : "free")}");
+    }
+}

Server/Packets/Handlers/Login.cs

@@ -97,7 +97,7 @@ namespace PSO2SERVER.Packets.Handlers
                     }
                 }
 
-                context.SendPacket(new LoginDataPacket("Server Block 1", error, (user == null) ? (uint)0 : (uint)user.PlayerId));
+                context.SendPacket(new LoginDataPacket("Server AuthList 1", error, (user == null) ? (uint)0 : (uint)user.PlayerId));
 
                 // Mystery packet
                 //var mystery = new PacketWriter();

Server/Program.cs

@@ -29,6 +29,12 @@ namespace PSO2SERVER
         public const string ServerVersion = "v0.1.2";
         public const string ServerVersionName = "Sancaros";
 
+        public const int ServerShipProtNums = 10;
+        public const int ServerShipProt = 12000;
+
+        public const int ServerShipListProtNums = 10;
+        public const int ServerShipListProt = 12099;
+
         public const string ServerSettingsKey = "Resources\\settings.txt";
 
         // 密钥BLOB格式
@@ -36,7 +42,7 @@ namespace PSO2SERVER
         public const string ServerPublicKeyBlob = "key\\publicKey.blob";
         public const string ServerSEGAKeyBlob = "key\\SEGAKey.blob";
 
-        // 密钥PEM格式
+        // 密钥PEM格式 来自Schthack
         public const string ServerPrivatePem = "key\\privateKey.pem";
         public const string ServerSEGAPem = "key\\SEGAKey.pem";
 
@@ -193,7 +199,10 @@ namespace PSO2SERVER
 
             await InitializeConfigurationAsync();
             await InitializeDatabaseAsync();
-            InitializeQueryServers(); // Assuming this is synchronous
+
+            InitializeQueryServers(QueryMode.AuthList, ServerShipProt, ServerShipProtNums); // Assuming this is synchronous
+
+            InitializeQueryServers(QueryMode.ShipList, ServerShipListProt, ServerShipListProtNums); // Assuming this is synchronous
 
             Logger.WriteInternal("服务器启动完成 " + DateTime.Now);
 
@@ -227,13 +236,27 @@ namespace PSO2SERVER
             });
         }
 
-        private void InitializeQueryServers()
+        public void InitializeQueryServers(QueryMode queryMode, int port, int portnums)
         {
-            for (var i = 0; i < 10; i++)
+            if (portnums <= 0)
+                portnums = 1;
+
+            if (portnums > 0)
             {
-                QueryServers.Add(new QueryServer(QueryMode.ShipList, "舰船", 12099 + (100 * i)));
+                for (var i = 0; i < portnums; i++)
+                {
+                    QueryServers.Add(new QueryServer(queryMode, "舰船", port + (100 * i)));
                 }
             }
+        }
+
+        //private void InitializeQueryServers()
+        //{
+        //    for (var i = 0; i < 10; i++)
+        //    {
+        //        QueryServers.Add(new QueryServer(QueryMode.ShipList, "舰船", 12099 + (100 * i)));
+        //    }
+        //}
 
 
         private static void Exit(object sender, EventArgs e)

Server/QueryServer.cs

@@ -15,7 +15,7 @@ namespace PSO2SERVER
     public enum QueryMode
     {
         ShipList,/*12100 - 12900*/
-        Block
+        AuthList
     }
 
     public class QueryServer
@@ -39,7 +39,7 @@ namespace PSO2SERVER
             Func<Socket, Task> connectionHandler;
             switch (_mode)
             {
-                case QueryMode.Block:
+                case QueryMode.AuthList:
                     connectionHandler = DoBlockBalanceAsync;
                     break;
                 case QueryMode.ShipList:
@@ -65,6 +65,17 @@ namespace PSO2SERVER
             }
         }
 
+        public ShipStatus CheckShipStatus(int port)
+        {
+            //TODO 还有其他状态要判断
+            if (PortChecker.IsPortListening(port))
+            {
+                return ShipStatus.Online;
+            }
+
+            return ShipStatus.Offline;
+        }
+
         private async Task DoShipListAsync(Socket socket)
         {
             var writer = new PacketWriter();
@@ -77,7 +88,7 @@ namespace PSO2SERVER
                     order = (ushort)i,
                     number = (uint)i,
                     //status = i == 2 ? ShipStatus.Online : ShipStatus.Full, // Maybe move to Config?
-                    status = ShipStatus.Online, // Maybe move to Config?
+                    status = CheckShipStatus(ServerApp.ServerShipProt + (100 * (i - 1))), // Maybe move to Config?
                     name = String.Format("Ship{0:0#}", i),
                     ip = ServerApp.BindAddress.GetAddressBytes()
                 };

Server/Server.cs

@@ -28,8 +28,6 @@ namespace PSO2SERVER
             PingTimer = new Timer(1000 * ServerApp.Config.PingTime); // 1 Minute default
             PingTimer.Elapsed += PingClients;
             PingTimer.Start();
-
-            new QueryServer(QueryMode.Block, "认证", 12200); // Block
         }
 
         public void Run()

Server/Server.csproj

@@ -153,6 +153,7 @@
     <Compile Include="Models\PSOData.cs" />
     <Compile Include="Models\PSOObject.cs" />
     <Compile Include="Models\Quest.cs" />
+    <Compile Include="Network\PortChecker.cs" />
     <Compile Include="Object\ObjectManager.cs" />
     <Compile Include="Packets\Handlers\CampshipTeleport.cs" />
     <Compile Include="Packets\Handlers\CasinoTeleportHandler.cs" />