mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-24 13:47:46 +00:00
Code Activity

Changed folder from Proxy to World. Did some nlog configing.

Browse source
This commit is contained in:
Filip Maj 2016-08-28 14:25:37 -04:00
parent 364ab40b3f
commit bd26a71fef
21 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
FFXIVClassic Common Class Lib/FFXIVClassic Common Class Lib.csproj
View file

@ -36,6 +36,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetZip">
<HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
<Private>True</Private>

6
FFXIVClassic Lobby Server/NLog.config
View file

@ -38,13 +38,13 @@
<target xsi:type="ColoredConsole" name="packets"
layout="${message}">
<highlight-row
condition="equals('${logger}', 'FFXIVClassic_Lobby_Server.packets.BasePacket') and equals('${event-context:item=color}', '6')"
condition="equals('${logger}', 'FFXIVClassic.Common.BasePacket') and equals('${event-context:item=color}', '6')"
backgroundColor="DarkYellow" foregroundColor="NoChange" />
<highlight-row
condition="equals('${logger}', 'FFXIVClassic_Lobby_Server.packets.SubPacket') and equals('${event-context:item=color}', '4')"
condition="equals('${logger}', 'FFXIVClassic.Common.SubPacket') and equals('${event-context:item=color}', '4')"
backgroundColor="DarkRed" foregroundColor="NoChange" />
<highlight-row
condition="equals('${logger}', 'FFXIVClassic_Lobby_Server.packets.SubPacket') and equals('${event-context:item=color}', '5')"
condition="equals('${logger}', 'FFXIVClassic.Common.SubPacket') and equals('${event-context:item=color}', '5')"
backgroundColor="DarkMagenta" foregroundColor="NoChange" />
</target>
</targets>

4
FFXIVClassic Proxy Server/App.config → FFXIVClassic World Server/App.config
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
<system.data>
<DbProviderFactories>

8
FFXIVClassic Proxy Server/ConfigConstants.cs → FFXIVClassic World Server/ConfigConstants.cs
View file

@ -18,18 +18,18 @@ namespace FFXIVClassic_World_Server
public static bool Load()
{
Program.Log.Info("Loading world_config.ini");
Program.Log.Info("Loading config.ini");
if (!File.Exists("./world_config.ini"))
if (!File.Exists("./config.ini"))
{
Program.Log.Error("FILE NOT FOUND!");
return false;
}
INIFile configIni = new INIFile("./world_config.ini");
INIFile configIni = new INIFile("./config.ini");
ConfigConstants.OPTIONS_BINDIP = configIni.GetValue("General", "server_ip", "127.0.0.1");
ConfigConstants.OPTIONS_PORT = configIni.GetValue("General", "server_port", "54994");
ConfigConstants.OPTIONS_PORT = configIni.GetValue("General", "server_port", "54992");
ConfigConstants.OPTIONS_TIMESTAMP = configIni.GetValue("General", "showtimestamp", "true").ToLower().Equals("true");
ConfigConstants.DATABASE_HOST = configIni.GetValue("Database", "host", "");

0
FFXIVClassic Proxy Server/DataObjects/ClientConnection.cs → FFXIVClassic World Server/DataObjects/ClientConnection.cs
View file

2
FFXIVClassic Proxy Server/DataObjects/Session.cs → FFXIVClassic World Server/DataObjects/Session.cs
View file

@ -16,7 +16,7 @@ namespace FFXIVClassic_World_Server.DataObjects
public readonly Channel type;
public ZoneServer routing1, routing2;
public Session(ulong sessionId, ClientConnection connection, Channel type)
public Session(uint sessionId, ClientConnection connection, Channel type)
{
this.sessionId = sessionId;
this.clientConnection = connection;

0
FFXIVClassic Proxy Server/DataObjects/ZoneServer.cs → FFXIVClassic World Server/DataObjects/ZoneServer.cs
View file

7
FFXIVClassic Proxy Server/FFXIVClassic World Server.csproj → FFXIVClassic World Server/FFXIVClassic World Server.csproj
View file

@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FFXIVClassic_World_Server</RootNamespace>
<AssemblyName>FFXIVClassic World Server</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@ -69,7 +70,9 @@
<Compile Include="DataObjects\Session.cs" />
<Compile Include="PacketProcessor.cs" />
<Compile Include="Packets\Receive\HelloPacket.cs" />
<Compile Include="Packets\Send\0x7ResponsePacket.cs" />
<Compile Include="Packets\Send\_0x2Packet.cs" />
<Compile Include="Packets\Send\_0x7Packet.cs" />
<Compile Include="Packets\Send\_0x8PingPacket.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Server.cs" />

6
FFXIVClassic Proxy Server/NLog.config → FFXIVClassic World Server/NLog.config
View file

@ -38,13 +38,13 @@
<target xsi:type="ColoredConsole" name="packets"
layout="${message}">
<highlight-row
condition="equals('${logger}', 'FFXIVClassic_Map_Server.packets.BasePacket') and equals('${event-context:item=color}', '6')"
condition="equals('${logger}', 'FFXIVClassic.Common.BasePacket') and equals('${event-context:item=color}', '6')"
backgroundColor="DarkYellow" foregroundColor="NoChange" />
<highlight-row
condition="equals('${logger}', 'FFXIVClassic_Map_Server.packets.SubPacket') and equals('${event-context:item=color}', '4')"
condition="equals('${logger}', 'FFXIVClassic.Common.SubPacket') and equals('${event-context:item=color}', '4')"
backgroundColor="DarkRed" foregroundColor="NoChange" />
<highlight-row
condition="equals('${logger}', 'FFXIVClassic_Map_Server.packets.SubPacket') and equals('${event-context:item=color}', '5')"
condition="equals('${logger}', 'FFXIVClassic.Common.SubPacket') and equals('${event-context:item=color}', '5')"
backgroundColor="DarkMagenta" foregroundColor="NoChange" />
</target>
</targets>

0
FFXIVClassic Proxy Server/NLog.xsd → FFXIVClassic World Server/NLog.xsd
View file

2
FFXIVClassic Proxy Server/PacketProcessor.cs → FFXIVClassic World Server/PacketProcessor.cs
View file

@ -41,6 +41,8 @@ namespace FFXIVClassic_World_Server
List<SubPacket> subPackets = packet.GetSubpackets();
foreach (SubPacket subpacket in subPackets)
{
subpacket.DebugPrintSubPacket();
//Initial Connect Packet, Create session
if (subpacket.header.type == 0x01)
{

0
FFXIVClassic Proxy Server/Packets/Receive/HelloPacket.cs → FFXIVClassic World Server/Packets/Receive/HelloPacket.cs
View file

0
FFXIVClassic Proxy Server/Packets/Send/_0x2Packet.cs → FFXIVClassic World Server/Packets/Send/_0x2Packet.cs
View file

0
FFXIVClassic Proxy Server/Packets/Send/_0x7Packet.cs → FFXIVClassic World Server/Packets/Send/_0x7Packet.cs
View file

0
FFXIVClassic Proxy Server/Packets/Send/_0x8PingPacket.cs → FFXIVClassic World Server/Packets/Send/_0x8PingPacket.cs
View file

0
FFXIVClassic Proxy Server/Program.cs → FFXIVClassic World Server/Program.cs
View file

0
FFXIVClassic Proxy Server/Properties/AssemblyInfo.cs → FFXIVClassic World Server/Properties/AssemblyInfo.cs
View file

8
FFXIVClassic Proxy Server/Server.cs → FFXIVClassic World Server/Server.cs
View file

@ -149,16 +149,16 @@ namespace FFXIVClassic_World_Server
case Session.Channel.ZONE:
if (mZoneSessionList.ContainsKey(id))
{
mZoneSessionList[id].clientSocket.Disconnect();
mConnectionList.Remove(mZoneSessionList[id].clientSocket);
mZoneSessionList[id].clientConnection.Disconnect();
mConnectionList.Remove(mZoneSessionList[id].clientConnection);
mZoneSessionList.Remove(id);
}
break;
case Session.Channel.CHAT:
if (mChatSessionList.ContainsKey(id))
{
mChatSessionList[id].clientSocket.Disconnect();
mConnectionList.Remove(mChatSessionList[id].clientSocket);
mChatSessionList[id].clientConnection.Disconnect();
mConnectionList.Remove(mChatSessionList[id].clientConnection);
mChatSessionList.Remove(id);
}
break;

0
FFXIVClassic Proxy Server/WorldMaster.cs → FFXIVClassic World Server/WorldMaster.cs
View file

2
FFXIVClassic Proxy Server/packages.config → FFXIVClassic World Server/packages.config
View file

@ -6,5 +6,5 @@
<package id="NLog" version="4.3.5" targetFramework="net452" />
<package id="NLog.Config" version="4.3.5" targetFramework="net452" />
<package id="NLog.Schema" version="4.3.4" targetFramework="net452" />
<package id="RabbitMQ.Client" version="4.0.0" targetFramework="net452" />
<package id="RabbitMQ.Client" version="4.0.0" targetFramework="net452" requireReinstallation="True" />
</packages>

2
FFXIVClassic.sln
View file

@ -15,7 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFXIVClassic Lobby Server",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFXIVClassic Common Class Lib", "FFXIVClassic Common Class Lib\FFXIVClassic Common Class Lib.csproj", "{3A3D6626-C820-4C18-8C81-64811424F20E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFXIVClassic World Server", "FFXIVClassic Proxy Server\FFXIVClassic World Server.csproj", "{3067889D-8A50-40D6-9CD5-23AA8EA96F26}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFXIVClassic World Server", "FFXIVClassic World Server\FFXIVClassic World Server.csproj", "{3067889D-8A50-40D6-9CD5-23AA8EA96F26}"
ProjectSection(ProjectDependencies) = postProject
{3A3D6626-C820-4C18-8C81-64811424F20E} = {3A3D6626-C820-4C18-8C81-64811424F20E}
EndProjectSection