Merged in takhlaq/ffxiv-classic-server/ezpz (pull request #32)

added launch args for ip/port and default config loading

FFXIVClassic Lobby Server/ConfigConstants.cs

@@ -1,6 +1,8 @@
 using FFXIVClassic.Common;
 using System;
 using System.IO;
+using System.Linq;
+using System.Net;
 
 namespace FFXIVClassic_Lobby_Server
 {
@@ -23,7 +25,7 @@ namespace FFXIVClassic_Lobby_Server
             if (!File.Exists("./lobby_config.ini"))
             {
                 Program.Log.Error("FILE NOT FOUND!");
-                return false;
+                Program.Log.Error("Loading defaults...");
             }
 
             INIFile configIni = new INIFile("./lobby_config.ini");
@@ -40,5 +42,34 @@ namespace FFXIVClassic_Lobby_Server
 
             return true;
         }
+        public static void ApplyLaunchArgs(string[] launchArgs)
+        {
+            var args = (from arg in launchArgs select arg.ToLower().Trim().TrimStart('-')).ToList();
+
+            for (var i = 0; i + 1 < args.Count; i += 2)
+            {
+                var arg = args[i];
+                var val = args[i + 1];
+                var legit = false;
+
+                if (arg == "ip")
+                {
+                    IPAddress ip;
+                    if (IPAddress.TryParse(val, out ip) && (legit = true))
+                        OPTIONS_BINDIP = val;
+                }
+                else if (arg == "port")
+                {
+                    UInt16 port;
+                    if (UInt16.TryParse(val, out port) && (legit = true))
+                        OPTIONS_PORT = val;
+                }
+
+                if (!legit)
+                {
+                    Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg);
+                }
+            }
+        }
     }
 }

FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj

@@ -133,7 +133,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy "$(SolutionDir)data\lobby_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)"</PostBuildEvent>
+    <PostBuildEvent>xcopy "$(SolutionDir)data\lobby_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)" /y</PostBuildEvent>
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

FFXIVClassic Lobby Server/Program.cs

@@ -25,8 +25,8 @@ namespace FFXIVClassic_Lobby_Server
             bool startServer = true;
 
             //Load Config
-            if (!ConfigConstants.Load())
+            ConfigConstants.Load();
-                startServer = false;
+            ConfigConstants.ApplyLaunchArgs(args);
             
             //Test DB Connection
             Program.Log.Info("Testing DB connection to \"{0}\"... ", ConfigConstants.DATABASE_HOST);

FFXIVClassic Map Server/ConfigConstants.cs

@@ -1,6 +1,11 @@
 using FFXIVClassic.Common;
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Net.Sockets;
+using MoonSharp.Interpreter.Interop;
+using System.Linq;
+using System.Net;
 
 namespace FFXIVClassic_Map_Server
 {
@@ -24,7 +29,7 @@ namespace FFXIVClassic_Map_Server
             if (!File.Exists("./map_config.ini"))
             {
                 Program.Log.Error("FILE NOT FOUND");
-                return false;
+                Program.Log.Error("Loading defaults... ");
             }
 
             INIFile configIni = new INIFile("./map_config.ini");
@@ -42,5 +47,35 @@ namespace FFXIVClassic_Map_Server
 
             return true;
         }
+
+        public static void ApplyLaunchArgs(string[] launchArgs)
+        {
+            var args = (from arg in launchArgs select arg.ToLower().Trim().TrimStart('-')).ToList();
+
+            for (var i = 0; i + 1 < args.Count; i += 2)
+            {
+                var arg = args[i];
+                var val = args[i + 1];
+                var legit = false;
+
+                if (arg == "ip")
+                {
+                    IPAddress ip;
+                    if (IPAddress.TryParse(val, out ip) && (legit = true))
+                        OPTIONS_BINDIP = val;
+                }
+                else if (arg == "port")
+                {
+                    UInt16 port;
+                    if (UInt16.TryParse(val, out port) && (legit = true))
+                        OPTIONS_PORT = val;
+                }
+
+                if (!legit)
+                {
+                    Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg);
+                }
+            }
+        }
     }
 }

FFXIVClassic Map Server/FFXIVClassic Map Server.csproj

@@ -35,6 +35,9 @@
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Cyotek.Collections.Generic.CircularBuffer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=58daa28b0b2de221, processorArchitecture=MSIL">
       <HintPath>..\packages\Cyotek.CircularBuffer.1.0.0.0\lib\net20\Cyotek.Collections.Generic.CircularBuffer.dll</HintPath>
@@ -313,7 +316,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy "$(SolutionDir)data\map_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)"</PostBuildEvent>
+    <PostBuildEvent>xcopy "$(SolutionDir)data\map_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)" /d
+xcopy "$(SolutionDir)data\scripts" "$(SolutionDir)$(ProjectName)\$(OutDir)scripts" /e /d /y /s</PostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

FFXIVClassic Map Server/Program.cs

@@ -31,8 +31,8 @@ namespace FFXIVClassic_Map_Server
             Program.Log.Info("---------FFXIV 1.0 Map Server---------");
 
             //Load Config
-            if (!ConfigConstants.Load())
+            ConfigConstants.Load();
-                startServer = false;
+            ConfigConstants.ApplyLaunchArgs(args);
 
             //Test DB Connection
             Program.Log.Info("Testing DB connection... ");

FFXIVClassic Map Server/lua/LuaEngine.cs

@@ -207,7 +207,7 @@ namespace FFXIVClassic_Map_Server.lua
         public static void RunGMCommand(Player player, String cmd, string[] param, bool help = false)
         {
             // load from scripts/commands/gm/ directory
-            var path = String.Format("./scripts/commands/gm/{0}.lua", cmd.ToString().ToLower());
+            var path = String.Format("./scripts/commands/gm/{0}.lua", cmd.ToLower());
 
             // check if the file exists
             if (File.Exists(path))

FFXIVClassic World Server/ConfigConstants.cs

@@ -1,6 +1,8 @@
 using FFXIVClassic.Common;
 using System;
 using System.IO;
+using System.Linq;
+using System.Net;
 
 namespace FFXIVClassic_World_Server
 {
@@ -23,7 +25,7 @@ namespace FFXIVClassic_World_Server
             if (!File.Exists("./world_config.ini"))
             {
                 Program.Log.Error("FILE NOT FOUND!");
-                return false;
+                Program.Log.Error("Loading defaults...");
             }
 
             INIFile configIni = new INIFile("./world_config.ini");
@@ -40,5 +42,35 @@ namespace FFXIVClassic_World_Server
 
             return true;
         }
+
+        public static void ApplyLaunchArgs(string[] launchArgs)
+        {
+            var args = (from arg in launchArgs select arg.ToLower().Trim().TrimStart('-')).ToList();
+
+            for (var i = 0; i + 1 < args.Count; i += 2)
+            {
+                var arg = args[i];
+                var val = args[i + 1];
+                var legit = false;
+
+                if (arg == "ip")
+                {
+                    IPAddress ip;
+                    if (IPAddress.TryParse(val, out ip) && (legit = true))
+                        OPTIONS_BINDIP = val;
+                }
+                else if (arg == "port")
+                {
+                    UInt16 port;
+                    if (UInt16.TryParse(val, out port) && (legit = true))
+                        OPTIONS_PORT = val;
+                }
+
+                if (!legit)
+                {
+                    Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg);
+                }
+            }
+        }
     }
 }

FFXIVClassic World Server/FFXIVClassic World Server.csproj

@@ -102,6 +102,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(SolutionDir)data\world_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)" /d</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

FFXIVClassic World Server/Program.cs

@@ -36,8 +36,8 @@ namespace FFXIVClassic_World_Server
             Log.Info("==================================");
 
             //Load Config
-            if (!ConfigConstants.Load())
+            ConfigConstants.Load();
-                startServer = false;
+            ConfigConstants.ApplyLaunchArgs(args);
 
             //Test DB Connection
             Log.Info("Testing DB connection... ");

data/lobby_config.ini

@@ -1,5 +1,5 @@
 [General]
-server_ip=127.0.0.1
+server_ip=0.0.0.0
 showtimestamp = true
 
 [Database]

data/world_config.ini

@@ -1,5 +1,5 @@
 [General]
-server_ip=127.0.0.1
+server_ip=0.0.0.0
 showtimestamp = true
 
 [Database]

sql/characters.sql

@@ -11,6 +11,7 @@ SET FOREIGN_KEY_CHECKS=0;
 -- ----------------------------
 -- Table structure for characters
 -- ----------------------------
+DROP TABLE IF EXISTS `characters`;
 CREATE TABLE `characters` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `userId` int(11) unsigned NOT NULL,
@@ -30,11 +31,11 @@ CREATE TABLE `characters` (
   `currentZoneId` smallint(5) unsigned DEFAULT '0',
   `destinationZoneId` smallint(5) unsigned DEFAULT '0',
   `destinationSpawnType` tinyint(3) unsigned DEFAULT '0',
-  `guardian` tinyint(3) unsigned NOT NULL,
+  `guardian` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `birthDay` tinyint(3) unsigned NOT NULL,
+  `birthDay` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `birthMonth` tinyint(3) unsigned NOT NULL,
+  `birthMonth` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `initialTown` tinyint(3) unsigned NOT NULL,
+  `initialTown` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `tribe` tinyint(3) unsigned NOT NULL,
+  `tribe` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `gcCurrent` tinyint(3) unsigned DEFAULT '0',
   `gcLimsaRank` tinyint(3) unsigned DEFAULT '127',
   `gcGridaniaRank` tinyint(3) unsigned DEFAULT '127',