From b8495ea49af82490273bc9a947b337baf90f6c05 Mon Sep 17 00:00:00 2001 From: sebastian-heinz Date: Fri, 7 Jan 2022 16:09:33 +0800 Subject: [PATCH] rename ddo -> ddon --- .github/workflows/release.yml | 36 +++++++++---------- Arrowgene.Ddo.Cli/Arrowgene.Ddo.Cli.csproj | 18 ---------- .../Handler/ClientX3Handler.cs | 25 ------------- .../Handler/ClientX4Handler.cs | 25 ------------- .../Handler/ClientX5Handler.cs | 25 ------------- Arrowgene.Ddon.Cli/Arrowgene.Ddon.Cli.csproj | 18 ++++++++++ .../Command/HelpCommand.cs | 2 +- .../Command/PcapDecryptCommand.cs | 20 +++++++---- .../Command/ServerCommand.cs | 14 ++++---- .../Command/ShowCommand.cs | 2 +- .../Command/TestCommand.cs | 6 ++-- .../CommandParameter.cs | 2 +- .../CommandResultType.cs | 2 +- .../ICommand.cs | 2 +- .../Program.cs | 22 ++++++------ .../Setting.cs | 8 ++--- .../SettingProvider.cs | 4 +-- .../Arrowgene.Ddon.Database.csproj | 8 ++--- .../DatabaseSetting.cs | 5 +-- .../DdonDatabaseBuilder.cs | 18 +++++----- .../Files/Database/Script/data_account.sql | 0 .../Files/Database/Script/schema_sqlite.sql | 0 .../IDatabase.cs | 5 ++- .../Model/Account.cs | 2 +- .../Model/AccountStateType.cs | 2 +- .../Model/DatabaseType.cs | 2 +- .../Sql/Core/DdonSqlDb.cs | 10 +++--- .../Sql/Core/DdonSqlDbAccount.cs | 6 ++-- .../Sql/DdonMariaDb.cs | 10 +++--- .../Sql/DdonSqLiteDb.cs | 12 +++---- .../Sql/ScriptRunner.cs | 2 +- .../Sql/SqlDb.cs | 2 +- .../Util.cs | 2 +- .../Arrowgene.Ddon.GameServer.csproj | 12 +++---- .../ClientLookup.cs | 4 +-- .../DdonGameServer.cs | 30 ++++++++-------- .../Dump/LoginDump.cs | 4 +-- .../Dump/PacketDump.cs | 8 ++--- .../GameServerSetting.cs | 2 +- .../Handler/ClientChallengeHandler.cs | 10 +++--- .../Handler/ClientSessionKeyHandler.cs | 10 +++--- .../Handler/ClientX1Handler.cs | 10 +++--- .../Handler/ClientX3Handler.cs | 25 +++++++++++++ .../Handler/ClientX4Handler.cs | 25 +++++++++++++ .../Handler/GetCharacterListReqHandler.cs | 25 +++++++++++++ .../Handler/GetErrorMessageListReqHandler.cs | 18 +++++----- .../Logging/DdonLogger.cs | 8 ++--- .../Model/ClientState.cs | 2 +- .../Network/Challenge.cs | 4 +-- .../Network/Client.cs | 8 ++--- .../Network/Consumer.cs | 6 ++-- .../Network/IPacketHandler.cs | 2 +- .../Network/Packet.cs | 2 +- .../Network/PacketFactory.cs | 15 +++++--- .../Network/PacketHandler.cs | 8 ++--- .../Network/PacketId.cs | 22 ++++++------ .../Network/PacketSource.cs | 2 +- .../Arrowgene.Ddon.PacketLibrary.csproj | 2 +- .../KaitaiModel/EthernetFrame.cs | 2 +- .../KaitaiModel/IcmpPacket.cs | 2 +- .../KaitaiModel/Ipv4Packet.cs | 2 +- .../KaitaiModel/Ipv6Packet.cs | 2 +- .../KaitaiModel/PacketPpi.cs | 2 +- .../KaitaiModel/Pcap.cs | 2 +- .../KaitaiModel/ProtocolBody.cs | 2 +- .../KaitaiModel/TcpSegment.cs | 2 +- .../KaitaiModel/UdpDatagram.cs | 2 +- .../PlFactory.cs | 6 ++-- .../PlFactoryPacket.cs | 2 +- .../PlJson.cs | 2 +- .../PlPacket.cs | 2 +- .../PlSession.cs | 2 +- .../TcpFlags.cs | 2 +- .../compile-struct.cmd | 2 +- .../Arrowgene.Ddon.Shared.csproj | 8 ++--- .../Crypto/BlowFish.cs | 2 +- .../Crypto/Camellia.cs | 2 +- .../Crypto/CryptoRandom.cs | 2 +- .../Crypto/DdonRandom.cs | 26 +++----------- .../Util.cs | 4 +-- .../Arrowgene.Ddon.WebServer.csproj | 10 +++--- .../DdonWebServer.cs | 8 ++--- .../Files/www/win/exe_version | 0 .../Files/www/win/versionlist | 0 .../IndexRoute.cs | 2 +- .../WebServerSetting.cs | 6 ++-- Arrowgene.DragonsDogmaOnline.sln | 12 +++---- README.md | 18 ++-------- ReleaseFiles/StartServer.cmd | 2 +- ddo.version => ddon.version | 0 publish.cmd | 4 +-- 91 files changed, 353 insertions(+), 370 deletions(-) delete mode 100644 Arrowgene.Ddo.Cli/Arrowgene.Ddo.Cli.csproj delete mode 100644 Arrowgene.Ddo.GameServer/Handler/ClientX3Handler.cs delete mode 100644 Arrowgene.Ddo.GameServer/Handler/ClientX4Handler.cs delete mode 100644 Arrowgene.Ddo.GameServer/Handler/ClientX5Handler.cs create mode 100644 Arrowgene.Ddon.Cli/Arrowgene.Ddon.Cli.csproj rename {Arrowgene.Ddo.Cli => Arrowgene.Ddon.Cli}/Command/HelpCommand.cs (98%) rename {Arrowgene.Ddo.Cli => Arrowgene.Ddon.Cli}/Command/PcapDecryptCommand.cs (82%) rename {Arrowgene.Ddo.Cli => Arrowgene.Ddon.Cli}/Command/ServerCommand.cs (81%) rename {Arrowgene.Ddo.Cli => Arrowgene.Ddon.Cli}/Command/ShowCommand.cs (99%) rename {Arrowgene.Ddo.Cli => Arrowgene.Ddon.Cli}/Command/TestCommand.cs (90%) rename {Arrowgene.Ddo.Cli => Arrowgene.Ddon.Cli}/CommandParameter.cs (96%) rename {Arrowgene.Ddo.Cli => Arrowgene.Ddon.Cli}/CommandResultType.cs (75%) rename {Arrowgene.Ddo.Cli => Arrowgene.Ddon.Cli}/ICommand.cs (85%) rename {Arrowgene.Ddo.Cli => Arrowgene.Ddon.Cli}/Program.cs (93%) rename {Arrowgene.Ddo.Cli => Arrowgene.Ddon.Cli}/Setting.cs (87%) rename {Arrowgene.Ddo.Cli => Arrowgene.Ddon.Cli}/SettingProvider.cs (95%) rename Arrowgene.Ddo.Database/Arrowgene.Ddo.Database.csproj => Arrowgene.Ddon.Database/Arrowgene.Ddon.Database.csproj (78%) rename {Arrowgene.Ddo.Database => Arrowgene.Ddon.Database}/DatabaseSetting.cs (96%) rename Arrowgene.Ddo.Database/DdoDatabaseBuilder.cs => Arrowgene.Ddon.Database/DdonDatabaseBuilder.cs (74%) rename {Arrowgene.Ddo.Database => Arrowgene.Ddon.Database}/Files/Database/Script/data_account.sql (100%) rename {Arrowgene.Ddo.Database => Arrowgene.Ddon.Database}/Files/Database/Script/schema_sqlite.sql (100%) rename {Arrowgene.Ddo.Database => Arrowgene.Ddon.Database}/IDatabase.cs (84%) rename {Arrowgene.Ddo.Database => Arrowgene.Ddon.Database}/Model/Account.cs (94%) rename {Arrowgene.Ddo.Database => Arrowgene.Ddon.Database}/Model/AccountStateType.cs (77%) rename {Arrowgene.Ddo.Database => Arrowgene.Ddon.Database}/Model/DatabaseType.cs (58%) rename Arrowgene.Ddo.Database/Sql/Core/DdoSqlDb.cs => Arrowgene.Ddon.Database/Sql/Core/DdonSqlDb.cs (61%) rename Arrowgene.Ddo.Database/Sql/Core/DdoSqlDbAccount.cs => Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbAccount.cs (97%) rename Arrowgene.Ddo.Database/Sql/DdoMariaDb.cs => Arrowgene.Ddon.Database/Sql/DdonMariaDb.cs (82%) rename Arrowgene.Ddo.Database/Sql/DdoSqLiteDb.cs => Arrowgene.Ddon.Database/Sql/DdonSqLiteDb.cs (91%) rename {Arrowgene.Ddo.Database => Arrowgene.Ddon.Database}/Sql/ScriptRunner.cs (98%) rename {Arrowgene.Ddo.Database => Arrowgene.Ddon.Database}/Sql/SqlDb.cs (99%) rename {Arrowgene.Ddo.Database => Arrowgene.Ddon.Database}/Util.cs (94%) rename Arrowgene.Ddo.GameServer/Arrowgene.Ddo.GameServer.csproj => Arrowgene.Ddon.GameServer/Arrowgene.Ddon.GameServer.csproj (67%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/ClientLookup.cs (93%) rename Arrowgene.Ddo.GameServer/DdoGameServer.cs => Arrowgene.Ddon.GameServer/DdonGameServer.cs (70%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Dump/LoginDump.cs (99%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Dump/PacketDump.cs (91%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/GameServerSetting.cs (98%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Handler/ClientChallengeHandler.cs (77%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Handler/ClientSessionKeyHandler.cs (82%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Handler/ClientX1Handler.cs (76%) create mode 100644 Arrowgene.Ddon.GameServer/Handler/ClientX3Handler.cs create mode 100644 Arrowgene.Ddon.GameServer/Handler/ClientX4Handler.cs create mode 100644 Arrowgene.Ddon.GameServer/Handler/GetCharacterListReqHandler.cs rename Arrowgene.Ddo.GameServer/Handler/ClientX2Handler.cs => Arrowgene.Ddon.GameServer/Handler/GetErrorMessageListReqHandler.cs (53%) rename Arrowgene.Ddo.GameServer/Logging/DdoLogger.cs => Arrowgene.Ddon.GameServer/Logging/DdonLogger.cs (94%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Model/ClientState.cs (68%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Network/Challenge.cs (97%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Network/Client.cs (92%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Network/Consumer.cs (95%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Network/IPacketHandler.cs (73%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Network/Packet.cs (96%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Network/PacketFactory.cs (94%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Network/PacketHandler.cs (70%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Network/PacketId.cs (78%) rename {Arrowgene.Ddo.GameServer => Arrowgene.Ddon.GameServer}/Network/PacketSource.cs (66%) rename Arrowgene.Ddo.PacketLibrary/Arrowgene.Ddo.PacketLibrary.csproj => Arrowgene.Ddon.PacketLibrary/Arrowgene.Ddon.PacketLibrary.csproj (83%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/KaitaiModel/EthernetFrame.cs (99%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/KaitaiModel/IcmpPacket.cs (99%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/KaitaiModel/Ipv4Packet.cs (99%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/KaitaiModel/Ipv6Packet.cs (97%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/KaitaiModel/PacketPpi.cs (99%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/KaitaiModel/Pcap.cs (99%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/KaitaiModel/ProtocolBody.cs (99%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/KaitaiModel/TcpSegment.cs (97%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/KaitaiModel/UdpDatagram.cs (97%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/PlFactory.cs (98%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/PlFactoryPacket.cs (97%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/PlJson.cs (97%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/PlPacket.cs (83%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/PlSession.cs (95%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/TcpFlags.cs (98%) rename {Arrowgene.Ddo.PacketLibrary => Arrowgene.Ddon.PacketLibrary}/compile-struct.cmd (68%) rename Arrowgene.Ddo.Shared/Arrowgene.Ddo.Shared.csproj => Arrowgene.Ddon.Shared/Arrowgene.Ddon.Shared.csproj (63%) rename {Arrowgene.Ddo.Shared => Arrowgene.Ddon.Shared}/Crypto/BlowFish.cs (99%) rename {Arrowgene.Ddo.Shared => Arrowgene.Ddon.Shared}/Crypto/Camellia.cs (99%) rename {Arrowgene.Ddo.Shared => Arrowgene.Ddon.Shared}/Crypto/CryptoRandom.cs (99%) rename Arrowgene.Ddo.Shared/Crypto/DdoRandom.cs => Arrowgene.Ddon.Shared/Crypto/DdonRandom.cs (74%) rename {Arrowgene.Ddo.Shared => Arrowgene.Ddon.Shared}/Util.cs (98%) rename Arrowgene.Ddo.WebServer/Arrowgene.Ddo.WebServer.csproj => Arrowgene.Ddon.WebServer/Arrowgene.Ddon.WebServer.csproj (68%) rename Arrowgene.Ddo.WebServer/DdoWebServer.cs => Arrowgene.Ddon.WebServer/DdonWebServer.cs (91%) rename {Arrowgene.Ddo.WebServer => Arrowgene.Ddon.WebServer}/Files/www/win/exe_version (100%) rename {Arrowgene.Ddo.WebServer => Arrowgene.Ddon.WebServer}/Files/www/win/versionlist (100%) rename {Arrowgene.Ddo.WebServer => Arrowgene.Ddon.WebServer}/IndexRoute.cs (93%) rename {Arrowgene.Ddo.WebServer => Arrowgene.Ddon.WebServer}/WebServerSetting.cs (93%) rename ddo.version => ddon.version (100%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d94c06a6c..642a56505 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,18 +19,18 @@ jobs: - name: Build Release id: build_release run: | - DDO_VERSION_FILE=${{ github.workspace }}/ddo.version - DDO_VERSION=$(<"$DDO_VERSION_FILE") - echo "DDO_VERSION=$DDO_VERSION" >> $GITHUB_ENV - echo "DDO_VERSION_E=$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_ENV + DDON_VERSION_FILE=${{ github.workspace }}/ddon.version + DDON_VERSION=$(<"$DDON_VERSION_FILE") + echo "DDON_VERSION=$DDON_VERSION" >> $GITHUB_ENV + echo "DDON_VERSION_E=$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_ENV mkdir ./release - for DDO_RUNTIME in win-x86 win-x64 linux-x64 osx-x64; do + for DDON_RUNTIME in win-x86 win-x64 linux-x64 osx-x64; do # Server - dotnet publish Arrowgene.Ddo.Cli/Arrowgene.Ddo.Cli.csproj /p:Version=$DDO_VERSION /p:FromMSBuild=true --runtime $DDO_RUNTIME --configuration Release --output ./publish/$DDO_RUNTIME-$DDO_VERSION/Server + dotnet publish Arrowgene.Ddon.Cli/Arrowgene.Ddon.Cli.csproj /p:Version=$DDON_VERSION /p:FromMSBuild=true --runtime $DDON_RUNTIME --configuration Release --output ./publish/$DDON_RUNTIME-$DDON_VERSION/Server # ReleaseFiles - cp -r ./ReleaseFiles/. ./publish/$DDO_RUNTIME-$DDO_VERSION/ + cp -r ./ReleaseFiles/. ./publish/$DDON_RUNTIME-$DDON_VERSION/ # Pack - tar cjf ./release/$DDO_RUNTIME-$DDO_VERSION.tar.gz ./publish/$DDO_RUNTIME-$DDO_VERSION + tar cjf ./release/$DDON_RUNTIME-$DDON_VERSION.tar.gz ./publish/$DDON_RUNTIME-$DDON_VERSION done - name: Create Release @@ -39,8 +39,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: release-${{ env.DDO_VERSION }}-${{ env.DDO_VERSION_E }} - release_name: Release ${{ env.DDO_VERSION }}-${{ env.DDO_VERSION_E }} + tag_name: release-${{ env.DDON_VERSION }}-${{ env.DDON_VERSION_E }} + release_name: Release ${{ env.DDON_VERSION }}-${{ env.DDON_VERSION_E }} draft: false prerelease: false @@ -50,8 +50,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./release/win-x86-${{ env.DDO_VERSION }}.tar.gz - asset_name: win-x86-${{ env.DDO_VERSION }}-${{ env.DDO_VERSION_E }}.tar.gz + asset_path: ./release/win-x86-${{ env.DDON_VERSION }}.tar.gz + asset_name: win-x86-${{ env.DDON_VERSION }}-${{ env.DDON_VERSION_E }}.tar.gz asset_content_type: application/gzip - name: Upload win-x64 Release Asset @@ -60,8 +60,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./release/win-x64-${{ env.DDO_VERSION }}.tar.gz - asset_name: win-x64-${{ env.DDO_VERSION }}-${{ env.DDO_VERSION_E }}.tar.gz + asset_path: ./release/win-x64-${{ env.DDON_VERSION }}.tar.gz + asset_name: win-x64-${{ env.DDON_VERSION }}-${{ env.DDON_VERSION_E }}.tar.gz asset_content_type: application/gzip - name: Upload linux-x64 Release Asset @@ -70,8 +70,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./release/linux-x64-${{ env.DDO_VERSION }}.tar.gz - asset_name: linux-x64-${{ env.DDO_VERSION }}-${{ env.DDO_VERSION_E }}.tar.gz + asset_path: ./release/linux-x64-${{ env.DDON_VERSION }}.tar.gz + asset_name: linux-x64-${{ env.DDON_VERSION }}-${{ env.DDON_VERSION_E }}.tar.gz asset_content_type: application/gzip - name: Upload osx-x64 Release Asset @@ -80,6 +80,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./release/osx-x64-${{ env.DDO_VERSION }}.tar.gz - asset_name: osx-x64-${{ env.DDO_VERSION }}-${{ env.DDO_VERSION_E }}.tar.gz + asset_path: ./release/osx-x64-${{ env.DDON_VERSION }}.tar.gz + asset_name: osx-x64-${{ env.DDON_VERSION }}-${{ env.DDON_VERSION_E }}.tar.gz asset_content_type: application/gzip \ No newline at end of file diff --git a/Arrowgene.Ddo.Cli/Arrowgene.Ddo.Cli.csproj b/Arrowgene.Ddo.Cli/Arrowgene.Ddo.Cli.csproj deleted file mode 100644 index bf2b59f06..000000000 --- a/Arrowgene.Ddo.Cli/Arrowgene.Ddo.Cli.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - Exe - netcoreapp3.0 - Arrowgene.Ddo.Cli - Dragons Dogma Online - Command Line Interface - Ddo Team - Ddo.Cli - $(Version) - Copyright © 2019-2020 DDO Team - - - - - - - - diff --git a/Arrowgene.Ddo.GameServer/Handler/ClientX3Handler.cs b/Arrowgene.Ddo.GameServer/Handler/ClientX3Handler.cs deleted file mode 100644 index 974b338fe..000000000 --- a/Arrowgene.Ddo.GameServer/Handler/ClientX3Handler.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Arrowgene.Ddo.GameServer.Logging; -using Arrowgene.Ddo.GameServer.Model; -using Arrowgene.Ddo.GameServer.Network; -using Arrowgene.Logging; - -namespace Arrowgene.Ddo.GameServer.Handler -{ - public class ClientX3Handler : PacketHandler - { - private static readonly DdoLogger Logger = LogProvider.Logger(typeof(ClientX3Handler)); - - - public ClientX3Handler(DdoGameServer server) : base(server) - { - } - - public override PacketId Id => PacketId.X3_REQ; - - public override void Handle(Client client, Packet packet) - { - client.Send(Dump.LoginDump.Dump_20); - } - - } -} diff --git a/Arrowgene.Ddo.GameServer/Handler/ClientX4Handler.cs b/Arrowgene.Ddo.GameServer/Handler/ClientX4Handler.cs deleted file mode 100644 index 28e0ec940..000000000 --- a/Arrowgene.Ddo.GameServer/Handler/ClientX4Handler.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Arrowgene.Ddo.GameServer.Logging; -using Arrowgene.Ddo.GameServer.Model; -using Arrowgene.Ddo.GameServer.Network; -using Arrowgene.Logging; - -namespace Arrowgene.Ddo.GameServer.Handler -{ - public class ClientX4Handler : PacketHandler - { - private static readonly DdoLogger Logger = LogProvider.Logger(typeof(ClientX4Handler)); - - - public ClientX4Handler(DdoGameServer server) : base(server) - { - } - - public override PacketId Id => PacketId.X4_REQ; - - public override void Handle(Client client, Packet packet) - { - client.Send(Dump.LoginDump.Dump_22); - } - - } -} diff --git a/Arrowgene.Ddo.GameServer/Handler/ClientX5Handler.cs b/Arrowgene.Ddo.GameServer/Handler/ClientX5Handler.cs deleted file mode 100644 index 8e90670a9..000000000 --- a/Arrowgene.Ddo.GameServer/Handler/ClientX5Handler.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Arrowgene.Ddo.GameServer.Logging; -using Arrowgene.Ddo.GameServer.Model; -using Arrowgene.Ddo.GameServer.Network; -using Arrowgene.Logging; - -namespace Arrowgene.Ddo.GameServer.Handler -{ - public class ClientX5Handler : PacketHandler - { - private static readonly DdoLogger Logger = LogProvider.Logger(typeof(ClientX5Handler)); - - - public ClientX5Handler(DdoGameServer server) : base(server) - { - } - - public override PacketId Id => PacketId.X5_REQ; - - public override void Handle(Client client, Packet packet) - { - client.Send(Dump.LoginDump.Dump_24); - } - - } -} diff --git a/Arrowgene.Ddon.Cli/Arrowgene.Ddon.Cli.csproj b/Arrowgene.Ddon.Cli/Arrowgene.Ddon.Cli.csproj new file mode 100644 index 000000000..1c5edba85 --- /dev/null +++ b/Arrowgene.Ddon.Cli/Arrowgene.Ddon.Cli.csproj @@ -0,0 +1,18 @@ + + + Exe + netcoreapp3.0 + Arrowgene.Ddon.Cli + Dragons Dogma Online - Command Line Interface + Ddon Team + Ddon.Cli + $(Version) + Copyright © 2019-2022 DDON Team + + + + + + + + diff --git a/Arrowgene.Ddo.Cli/Command/HelpCommand.cs b/Arrowgene.Ddon.Cli/Command/HelpCommand.cs similarity index 98% rename from Arrowgene.Ddo.Cli/Command/HelpCommand.cs rename to Arrowgene.Ddon.Cli/Command/HelpCommand.cs index 16af81666..2a4709445 100644 --- a/Arrowgene.Ddo.Cli/Command/HelpCommand.cs +++ b/Arrowgene.Ddon.Cli/Command/HelpCommand.cs @@ -3,7 +3,7 @@ using System.Text; using Arrowgene.Logging; -namespace Arrowgene.Ddo.Cli.Command +namespace Arrowgene.Ddon.Cli.Command { public class HelpCommand : ICommand { diff --git a/Arrowgene.Ddo.Cli/Command/PcapDecryptCommand.cs b/Arrowgene.Ddon.Cli/Command/PcapDecryptCommand.cs similarity index 82% rename from Arrowgene.Ddo.Cli/Command/PcapDecryptCommand.cs rename to Arrowgene.Ddon.Cli/Command/PcapDecryptCommand.cs index 07ffbaecb..0e3aa05e1 100644 --- a/Arrowgene.Ddo.Cli/Command/PcapDecryptCommand.cs +++ b/Arrowgene.Ddon.Cli/Command/PcapDecryptCommand.cs @@ -1,13 +1,14 @@ using System; using System.Collections.Generic; +using System.IO; using System.Text; -using Arrowgene.Ddo.GameServer; -using Arrowgene.Ddo.GameServer.Dump; -using Arrowgene.Ddo.GameServer.Network; -using Arrowgene.Ddo.PacketLibrary; -using Arrowgene.Ddo.Shared; +using Arrowgene.Ddon.GameServer; +using Arrowgene.Ddon.GameServer.Dump; +using Arrowgene.Ddon.GameServer.Network; +using Arrowgene.Ddon.PacketLibrary; +using Arrowgene.Ddon.Shared; -namespace Arrowgene.Ddo.Cli.Command +namespace Arrowgene.Ddon.Cli.Command { public class PcapDecryptCommand : ICommand { @@ -23,6 +24,11 @@ public class PcapDecryptCommand : ICommand public CommandResultType Run(CommandParameter parameter) { + // File.WriteAllBytes("F://d8.bin", LoginDump.data_Dump_8); + + + + string pcapPath = parameter.Arguments[0]; string key = parameter.Arguments[1]; byte[] keyBytes = Encoding.UTF8.GetBytes(key); @@ -34,7 +40,7 @@ public CommandResultType Run(CommandParameter parameter) PacketFactory pf = new PacketFactory(new GameServerSetting()); pf.SetCamelliaKey(keyBytes); - // parse ddo packets + // parse ddon packets List packets = new List(); foreach (PlPacket plPacket in encrypted) { diff --git a/Arrowgene.Ddo.Cli/Command/ServerCommand.cs b/Arrowgene.Ddon.Cli/Command/ServerCommand.cs similarity index 81% rename from Arrowgene.Ddo.Cli/Command/ServerCommand.cs rename to Arrowgene.Ddon.Cli/Command/ServerCommand.cs index b53221426..78db01275 100644 --- a/Arrowgene.Ddo.Cli/Command/ServerCommand.cs +++ b/Arrowgene.Ddon.Cli/Command/ServerCommand.cs @@ -1,13 +1,13 @@ using System; -using Arrowgene.Ddo.GameServer; -using Arrowgene.Ddo.WebServer; +using Arrowgene.Ddon.GameServer; +using Arrowgene.Ddon.WebServer; -namespace Arrowgene.Ddo.Cli.Command +namespace Arrowgene.Ddon.Cli.Command { public class ServerCommand : ICommand { - private DdoGameServer _gameServer; - private DdoWebServer _webServer; + private DdonGameServer _gameServer; + private DdonWebServer _webServer; public string Key => "server"; @@ -19,13 +19,13 @@ public CommandResultType Run(CommandParameter parameter) if (_gameServer == null) { GameServerSetting setting = new GameServerSetting(); - _gameServer = new DdoGameServer(setting); + _gameServer = new DdonGameServer(setting); } if (_webServer == null) { WebServerSetting setting = new WebServerSetting(); - _webServer = new DdoWebServer(); + _webServer = new DdonWebServer(); } if (parameter.Arguments.Contains("start")) diff --git a/Arrowgene.Ddo.Cli/Command/ShowCommand.cs b/Arrowgene.Ddon.Cli/Command/ShowCommand.cs similarity index 99% rename from Arrowgene.Ddo.Cli/Command/ShowCommand.cs rename to Arrowgene.Ddon.Cli/Command/ShowCommand.cs index 4607af67c..bcc98ac15 100644 --- a/Arrowgene.Ddo.Cli/Command/ShowCommand.cs +++ b/Arrowgene.Ddon.Cli/Command/ShowCommand.cs @@ -2,7 +2,7 @@ using System.Text; using Arrowgene.Logging; -namespace Arrowgene.Ddo.Cli.Command +namespace Arrowgene.Ddon.Cli.Command { public class ShowCommand : ICommand { diff --git a/Arrowgene.Ddo.Cli/Command/TestCommand.cs b/Arrowgene.Ddon.Cli/Command/TestCommand.cs similarity index 90% rename from Arrowgene.Ddo.Cli/Command/TestCommand.cs rename to Arrowgene.Ddon.Cli/Command/TestCommand.cs index 6b2d7f571..f8e096cd3 100644 --- a/Arrowgene.Ddo.Cli/Command/TestCommand.cs +++ b/Arrowgene.Ddon.Cli/Command/TestCommand.cs @@ -1,9 +1,9 @@ using System; using System.Text; -using Arrowgene.Ddo.Shared; -using Arrowgene.Ddo.Shared.Crypto; +using Arrowgene.Ddon.Shared; +using Arrowgene.Ddon.Shared.Crypto; -namespace Arrowgene.Ddo.Cli.Command +namespace Arrowgene.Ddon.Cli.Command { public class TestCommand : ICommand { diff --git a/Arrowgene.Ddo.Cli/CommandParameter.cs b/Arrowgene.Ddon.Cli/CommandParameter.cs similarity index 96% rename from Arrowgene.Ddo.Cli/CommandParameter.cs rename to Arrowgene.Ddon.Cli/CommandParameter.cs index 30b9fe3a6..6f8032ff0 100644 --- a/Arrowgene.Ddo.Cli/CommandParameter.cs +++ b/Arrowgene.Ddon.Cli/CommandParameter.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Arrowgene.Ddo.Cli +namespace Arrowgene.Ddon.Cli { public class CommandParameter { diff --git a/Arrowgene.Ddo.Cli/CommandResultType.cs b/Arrowgene.Ddon.Cli/CommandResultType.cs similarity index 75% rename from Arrowgene.Ddo.Cli/CommandResultType.cs rename to Arrowgene.Ddon.Cli/CommandResultType.cs index 2d85b57dc..ee1bd0f99 100644 --- a/Arrowgene.Ddo.Cli/CommandResultType.cs +++ b/Arrowgene.Ddon.Cli/CommandResultType.cs @@ -1,4 +1,4 @@ -namespace Arrowgene.Ddo.Cli +namespace Arrowgene.Ddon.Cli { public enum CommandResultType { diff --git a/Arrowgene.Ddo.Cli/ICommand.cs b/Arrowgene.Ddon.Cli/ICommand.cs similarity index 85% rename from Arrowgene.Ddo.Cli/ICommand.cs rename to Arrowgene.Ddon.Cli/ICommand.cs index 0489243f9..1bd0fe351 100644 --- a/Arrowgene.Ddo.Cli/ICommand.cs +++ b/Arrowgene.Ddon.Cli/ICommand.cs @@ -1,4 +1,4 @@ -namespace Arrowgene.Ddo.Cli +namespace Arrowgene.Ddon.Cli { public interface ICommand { diff --git a/Arrowgene.Ddo.Cli/Program.cs b/Arrowgene.Ddon.Cli/Program.cs similarity index 93% rename from Arrowgene.Ddo.Cli/Program.cs rename to Arrowgene.Ddon.Cli/Program.cs index f78478936..3134a0fd3 100644 --- a/Arrowgene.Ddo.Cli/Program.cs +++ b/Arrowgene.Ddon.Cli/Program.cs @@ -1,34 +1,34 @@ /* - * This file is part of Arrowgene.Ddo.Cli + * This file is part of Arrowgene.Ddon.Cli * - * Arrowgene.Ddo.Cli is a server implementation for the game "Dragons Dogma Online". - * Copyright (C) 2019-2020 Ddo Team + * Arrowgene.Ddon.Cli is a server implementation for the game "Dragons Dogma Online". + * Copyright (C) 2019-2020 Ddon Team * - * Github: https://github.com/sebastian-heinz/Ddo-server + * Github: https://github.com/sebastian-heinz/Arrowgene.DragonsDogmaOnline * - * Arrowgene.Ddo.Cli is free software: you can redistribute it and/or modify + * Arrowgene.Ddon.Cli is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Arrowgene.Ddo.Cli is distributed in the hope that it will be useful, + * Arrowgene.Ddon.Cli is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Arrowgene.Ddo.Cli. If not, see . + * along with Arrowgene.Ddon.Cli. If not, see . */ using System; using System.Collections.Generic; using System.Text; using System.Threading; -using Arrowgene.Ddo.Cli.Command; -using Arrowgene.Ddo.GameServer.Network; +using Arrowgene.Ddon.Cli.Command; +using Arrowgene.Ddon.GameServer.Network; using Arrowgene.Logging; -namespace Arrowgene.Ddo.Cli +namespace Arrowgene.Ddon.Cli { internal class Program { @@ -238,7 +238,7 @@ private void ShowCopyright() StringBuilder sb = new StringBuilder(); sb.Append(Environment.NewLine); sb.Append(Environment.NewLine); - sb.Append("Arrowgene.Ddo.Cli Copyright (C) 2019-2020 Ddo Team"); + sb.Append("Arrowgene.Ddon.Cli Copyright (C) 2019-2022 DDON Team"); sb.Append(Environment.NewLine); sb.Append("This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'."); sb.Append(Environment.NewLine); diff --git a/Arrowgene.Ddo.Cli/Setting.cs b/Arrowgene.Ddon.Cli/Setting.cs similarity index 87% rename from Arrowgene.Ddo.Cli/Setting.cs rename to Arrowgene.Ddon.Cli/Setting.cs index 1748ce3b5..0e00a74c2 100644 --- a/Arrowgene.Ddo.Cli/Setting.cs +++ b/Arrowgene.Ddon.Cli/Setting.cs @@ -1,9 +1,9 @@ using System.Runtime.Serialization; -using Arrowgene.Ddo.Database; -using Arrowgene.Ddo.GameServer; -using Arrowgene.Ddo.WebServer; +using Arrowgene.Ddon.Database; +using Arrowgene.Ddon.GameServer; +using Arrowgene.Ddon.WebServer; -namespace Arrowgene.Ddo.Cli +namespace Arrowgene.Ddon.Cli { [DataContract] public class Setting diff --git a/Arrowgene.Ddo.Cli/SettingProvider.cs b/Arrowgene.Ddon.Cli/SettingProvider.cs similarity index 95% rename from Arrowgene.Ddo.Cli/SettingProvider.cs rename to Arrowgene.Ddon.Cli/SettingProvider.cs index e74cfe0c0..abab15b00 100644 --- a/Arrowgene.Ddo.Cli/SettingProvider.cs +++ b/Arrowgene.Ddon.Cli/SettingProvider.cs @@ -1,8 +1,8 @@ using System.IO; using System.Text.Json; -using Arrowgene.Ddo.Shared; +using Arrowgene.Ddon.Shared; -namespace Arrowgene.Ddo.Cli +namespace Arrowgene.Ddon.Cli { public class SettingProvider { diff --git a/Arrowgene.Ddo.Database/Arrowgene.Ddo.Database.csproj b/Arrowgene.Ddon.Database/Arrowgene.Ddon.Database.csproj similarity index 78% rename from Arrowgene.Ddo.Database/Arrowgene.Ddo.Database.csproj rename to Arrowgene.Ddon.Database/Arrowgene.Ddon.Database.csproj index d7f20a71a..5708a320a 100644 --- a/Arrowgene.Ddo.Database/Arrowgene.Ddo.Database.csproj +++ b/Arrowgene.Ddon.Database/Arrowgene.Ddon.Database.csproj @@ -2,12 +2,12 @@ netstandard2.1 - Arrowgene.Ddo.Database + Arrowgene.Ddon.Database Dragons Dogma Online - Database - DDO Team - Ddo.Database + DDON Team + Ddon.Database $(Version) - Copyright © 2019-2020 DDO Team + Copyright © 2019-2022 DDON Team diff --git a/Arrowgene.Ddo.Database/DatabaseSetting.cs b/Arrowgene.Ddon.Database/DatabaseSetting.cs similarity index 96% rename from Arrowgene.Ddo.Database/DatabaseSetting.cs rename to Arrowgene.Ddon.Database/DatabaseSetting.cs index 9c48e1dd5..2be487a6a 100644 --- a/Arrowgene.Ddo.Database/DatabaseSetting.cs +++ b/Arrowgene.Ddon.Database/DatabaseSetting.cs @@ -1,9 +1,10 @@ using System; using System.IO; using System.Runtime.Serialization; -using Ddo.Server.Model; +using Arrowgene.Ddon.Database.Model; -namespace Arrowgene.Ddo.Database + +namespace Arrowgene.Ddon.Database { [DataContract] public class DatabaseSetting diff --git a/Arrowgene.Ddo.Database/DdoDatabaseBuilder.cs b/Arrowgene.Ddon.Database/DdonDatabaseBuilder.cs similarity index 74% rename from Arrowgene.Ddo.Database/DdoDatabaseBuilder.cs rename to Arrowgene.Ddon.Database/DdonDatabaseBuilder.cs index f621c1cd2..fc7b0bb3d 100644 --- a/Arrowgene.Ddo.Database/DdoDatabaseBuilder.cs +++ b/Arrowgene.Ddon.Database/DdonDatabaseBuilder.cs @@ -1,16 +1,16 @@ using System; using System.IO; -using Arrowgene.Ddo.Database.Sql; +using Arrowgene.Ddon.Database.Model; +using Arrowgene.Ddon.Database.Sql; using Arrowgene.Logging; -using Ddo.Server.Model; -namespace Arrowgene.Ddo.Database +namespace Arrowgene.Ddon.Database { - public class DdoDatabaseBuilder + public class DdonDatabaseBuilder { - private static readonly ILogger Logger = LogProvider.Logger(typeof(DdoDatabaseBuilder)); + private static readonly ILogger Logger = LogProvider.Logger(typeof(DdonDatabaseBuilder)); - public DdoDatabaseBuilder() + public DdonDatabaseBuilder() { } @@ -33,10 +33,10 @@ public IDatabase Build(DatabaseSetting settings) return database; } - private DdoSqLiteDb PrepareSqlLiteDb(string sqLiteFolder) + private DdonSqLiteDb PrepareSqlLiteDb(string sqLiteFolder) { - string sqLitePath = Path.Combine(sqLiteFolder, $"db.v{DdoSqLiteDb.Version}.sqlite"); - DdoSqLiteDb db = new DdoSqLiteDb(sqLitePath); + string sqLitePath = Path.Combine(sqLiteFolder, $"db.v{DdonSqLiteDb.Version}.sqlite"); + DdonSqLiteDb db = new DdonSqLiteDb(sqLitePath); if (db.CreateDatabase()) { ScriptRunner scriptRunner = new ScriptRunner(db); diff --git a/Arrowgene.Ddo.Database/Files/Database/Script/data_account.sql b/Arrowgene.Ddon.Database/Files/Database/Script/data_account.sql similarity index 100% rename from Arrowgene.Ddo.Database/Files/Database/Script/data_account.sql rename to Arrowgene.Ddon.Database/Files/Database/Script/data_account.sql diff --git a/Arrowgene.Ddo.Database/Files/Database/Script/schema_sqlite.sql b/Arrowgene.Ddon.Database/Files/Database/Script/schema_sqlite.sql similarity index 100% rename from Arrowgene.Ddo.Database/Files/Database/Script/schema_sqlite.sql rename to Arrowgene.Ddon.Database/Files/Database/Script/schema_sqlite.sql diff --git a/Arrowgene.Ddo.Database/IDatabase.cs b/Arrowgene.Ddon.Database/IDatabase.cs similarity index 84% rename from Arrowgene.Ddo.Database/IDatabase.cs rename to Arrowgene.Ddon.Database/IDatabase.cs index f33bc4271..af44fba4d 100644 --- a/Arrowgene.Ddo.Database/IDatabase.cs +++ b/Arrowgene.Ddon.Database/IDatabase.cs @@ -1,7 +1,6 @@ -using System.Collections.Generic; -using Ddo.Server.Model; +using Arrowgene.Ddon.Database.Model; -namespace Arrowgene.Ddo.Database +namespace Arrowgene.Ddon.Database { public interface IDatabase { diff --git a/Arrowgene.Ddo.Database/Model/Account.cs b/Arrowgene.Ddon.Database/Model/Account.cs similarity index 94% rename from Arrowgene.Ddo.Database/Model/Account.cs rename to Arrowgene.Ddon.Database/Model/Account.cs index ac1dd3b55..263219d01 100644 --- a/Arrowgene.Ddo.Database/Model/Account.cs +++ b/Arrowgene.Ddon.Database/Model/Account.cs @@ -1,6 +1,6 @@ using System; -namespace Ddo.Server.Model +namespace Arrowgene.Ddon.Database.Model { public class Account { diff --git a/Arrowgene.Ddo.Database/Model/AccountStateType.cs b/Arrowgene.Ddon.Database/Model/AccountStateType.cs similarity index 77% rename from Arrowgene.Ddo.Database/Model/AccountStateType.cs rename to Arrowgene.Ddon.Database/Model/AccountStateType.cs index 5ef6d83ee..2434d5438 100644 --- a/Arrowgene.Ddo.Database/Model/AccountStateType.cs +++ b/Arrowgene.Ddon.Database/Model/AccountStateType.cs @@ -1,4 +1,4 @@ -namespace Ddo.Server.Model +namespace Arrowgene.Ddon.Database.Model { public enum AccountStateType { diff --git a/Arrowgene.Ddo.Database/Model/DatabaseType.cs b/Arrowgene.Ddon.Database/Model/DatabaseType.cs similarity index 58% rename from Arrowgene.Ddo.Database/Model/DatabaseType.cs rename to Arrowgene.Ddon.Database/Model/DatabaseType.cs index b729ebf30..50bafb857 100644 --- a/Arrowgene.Ddo.Database/Model/DatabaseType.cs +++ b/Arrowgene.Ddon.Database/Model/DatabaseType.cs @@ -1,4 +1,4 @@ -namespace Ddo.Server.Model +namespace Arrowgene.Ddon.Database.Model { public enum DatabaseType { diff --git a/Arrowgene.Ddo.Database/Sql/Core/DdoSqlDb.cs b/Arrowgene.Ddon.Database/Sql/Core/DdonSqlDb.cs similarity index 61% rename from Arrowgene.Ddo.Database/Sql/Core/DdoSqlDb.cs rename to Arrowgene.Ddon.Database/Sql/Core/DdonSqlDb.cs index 5b4699c31..5a6651105 100644 --- a/Arrowgene.Ddo.Database/Sql/Core/DdoSqlDb.cs +++ b/Arrowgene.Ddon.Database/Sql/Core/DdonSqlDb.cs @@ -2,18 +2,18 @@ using System.Data.Common; using Arrowgene.Logging; -namespace Arrowgene.Ddo.Database.Sql.Core +namespace Arrowgene.Ddon.Database.Sql.Core { /// - /// Implementation of Ddo database operations. + /// Implementation of Ddon database operations. /// - public abstract partial class DdoSqlDb : SqlDb + public abstract partial class DdonSqlDb : SqlDb where TCon : DbConnection where TCom : DbCommand { - private static readonly ILogger Logger = LogProvider.Logger(typeof(DdoSqlDb)); + private static readonly ILogger Logger = LogProvider.Logger(typeof(DdonSqlDb)); - public DdoSqlDb() + public DdonSqlDb() { } diff --git a/Arrowgene.Ddo.Database/Sql/Core/DdoSqlDbAccount.cs b/Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbAccount.cs similarity index 97% rename from Arrowgene.Ddo.Database/Sql/Core/DdoSqlDbAccount.cs rename to Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbAccount.cs index 0942ecfcf..0aa7c4396 100644 --- a/Arrowgene.Ddo.Database/Sql/Core/DdoSqlDbAccount.cs +++ b/Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbAccount.cs @@ -1,10 +1,10 @@ using System; using System.Data.Common; -using Ddo.Server.Model; +using Arrowgene.Ddon.Database.Model; -namespace Arrowgene.Ddo.Database.Sql.Core +namespace Arrowgene.Ddon.Database.Sql.Core { - public abstract partial class DdoSqlDb : SqlDb + public abstract partial class DdonSqlDb : SqlDb where TCon : DbConnection where TCom : DbCommand { diff --git a/Arrowgene.Ddo.Database/Sql/DdoMariaDb.cs b/Arrowgene.Ddon.Database/Sql/DdonMariaDb.cs similarity index 82% rename from Arrowgene.Ddo.Database/Sql/DdoMariaDb.cs rename to Arrowgene.Ddon.Database/Sql/DdonMariaDb.cs index 51f6177b1..afb3a140c 100644 --- a/Arrowgene.Ddo.Database/Sql/DdoMariaDb.cs +++ b/Arrowgene.Ddon.Database/Sql/DdonMariaDb.cs @@ -1,13 +1,13 @@ using System; -using Arrowgene.Ddo.Database.Sql.Core; +using Arrowgene.Ddon.Database.Sql.Core; using MySqlConnector; -namespace Arrowgene.Ddo.Database.Sql +namespace Arrowgene.Ddon.Database.Sql { /// - /// SQLite Ddo database. + /// SQLite Ddon database. /// - public class DdoMariaDb : DdoSqlDb, IDatabase + public class DdonMariaDb : DdonSqlDb, IDatabase { public const string MemoryDatabasePath = ":memory:"; @@ -21,7 +21,7 @@ public bool CreateDatabase() throw new NotImplementedException(); } - public DdoMariaDb(string host, short port, string user, string password, string database) + public DdonMariaDb(string host, short port, string user, string password, string database) { _connectionString = $"host={host};port={port};user id={user};password={password};database={database};"; } diff --git a/Arrowgene.Ddo.Database/Sql/DdoSqLiteDb.cs b/Arrowgene.Ddon.Database/Sql/DdonSqLiteDb.cs similarity index 91% rename from Arrowgene.Ddo.Database/Sql/DdoSqLiteDb.cs rename to Arrowgene.Ddon.Database/Sql/DdonSqLiteDb.cs index f0532493a..a327aa9fb 100644 --- a/Arrowgene.Ddo.Database/Sql/DdoSqLiteDb.cs +++ b/Arrowgene.Ddon.Database/Sql/DdonSqLiteDb.cs @@ -1,17 +1,17 @@ using System; using System.Data.SQLite; using System.IO; -using Arrowgene.Ddo.Database.Sql.Core; +using Arrowgene.Ddon.Database.Sql.Core; using Arrowgene.Logging; -namespace Arrowgene.Ddo.Database.Sql +namespace Arrowgene.Ddon.Database.Sql { /// - /// SQLite Ddo database. + /// SQLite Ddon database. /// - public class DdoSqLiteDb : DdoSqlDb, IDatabase + public class DdonSqLiteDb : DdonSqlDb, IDatabase { - private static readonly ILogger Logger = LogProvider.Logger(typeof(DdoSqLiteDb)); + private static readonly ILogger Logger = LogProvider.Logger(typeof(DdonSqLiteDb)); public const string MemoryDatabasePath = ":memory:"; @@ -22,7 +22,7 @@ public class DdoSqLiteDb : DdoSqlDb, IDatabase private readonly string _databasePath; private string _connectionString; - public DdoSqLiteDb(string databasePath) + public DdonSqLiteDb(string databasePath) { _databasePath = databasePath; Logger.Info($"Database Path: {_databasePath}"); diff --git a/Arrowgene.Ddo.Database/Sql/ScriptRunner.cs b/Arrowgene.Ddon.Database/Sql/ScriptRunner.cs similarity index 98% rename from Arrowgene.Ddo.Database/Sql/ScriptRunner.cs rename to Arrowgene.Ddon.Database/Sql/ScriptRunner.cs index ffd5dfe3d..3cdb6fc16 100644 --- a/Arrowgene.Ddo.Database/Sql/ScriptRunner.cs +++ b/Arrowgene.Ddon.Database/Sql/ScriptRunner.cs @@ -3,7 +3,7 @@ using System.Text; using Arrowgene.Logging; -namespace Arrowgene.Ddo.Database.Sql +namespace Arrowgene.Ddon.Database.Sql { public class ScriptRunner { diff --git a/Arrowgene.Ddo.Database/Sql/SqlDb.cs b/Arrowgene.Ddon.Database/Sql/SqlDb.cs similarity index 99% rename from Arrowgene.Ddo.Database/Sql/SqlDb.cs rename to Arrowgene.Ddon.Database/Sql/SqlDb.cs index b79591726..0bf08cb97 100644 --- a/Arrowgene.Ddo.Database/Sql/SqlDb.cs +++ b/Arrowgene.Ddon.Database/Sql/SqlDb.cs @@ -2,7 +2,7 @@ using System.Data; using System.Data.Common; -namespace Arrowgene.Ddo.Database.Sql +namespace Arrowgene.Ddon.Database.Sql { /// /// Operations for SQL type databases. diff --git a/Arrowgene.Ddo.Database/Util.cs b/Arrowgene.Ddon.Database/Util.cs similarity index 94% rename from Arrowgene.Ddo.Database/Util.cs rename to Arrowgene.Ddon.Database/Util.cs index 3bf9edd69..1a40468ad 100644 --- a/Arrowgene.Ddo.Database/Util.cs +++ b/Arrowgene.Ddon.Database/Util.cs @@ -2,7 +2,7 @@ using System.IO; using System.Reflection; -namespace Arrowgene.Ddo.Database +namespace Arrowgene.Ddon.Database { internal static class Util { diff --git a/Arrowgene.Ddo.GameServer/Arrowgene.Ddo.GameServer.csproj b/Arrowgene.Ddon.GameServer/Arrowgene.Ddon.GameServer.csproj similarity index 67% rename from Arrowgene.Ddo.GameServer/Arrowgene.Ddo.GameServer.csproj rename to Arrowgene.Ddon.GameServer/Arrowgene.Ddon.GameServer.csproj index b9c95721d..3dc6f100a 100644 --- a/Arrowgene.Ddo.GameServer/Arrowgene.Ddo.GameServer.csproj +++ b/Arrowgene.Ddon.GameServer/Arrowgene.Ddon.GameServer.csproj @@ -1,12 +1,12 @@  netstandard2.1 - Arrowgene.Ddo.GameServer + Arrowgene.Ddon.GameServer Dragons Dogma Online - Game Server - DDO Team - Ddo.GameServer + DDON Team + Ddon.GameServer $(Version) - Copyright © 2019-2020 DDO Team + Copyright © 2019-2022 DDON Team @@ -20,7 +20,7 @@ - - + + diff --git a/Arrowgene.Ddo.GameServer/ClientLookup.cs b/Arrowgene.Ddon.GameServer/ClientLookup.cs similarity index 93% rename from Arrowgene.Ddo.GameServer/ClientLookup.cs rename to Arrowgene.Ddon.GameServer/ClientLookup.cs index c94119e38..8c0ee3af7 100644 --- a/Arrowgene.Ddo.GameServer/ClientLookup.cs +++ b/Arrowgene.Ddon.GameServer/ClientLookup.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Arrowgene.Ddo.GameServer.Network; +using Arrowgene.Ddon.GameServer.Network; -namespace Arrowgene.Ddo.GameServer +namespace Arrowgene.Ddon.GameServer { public class ClientLookup { diff --git a/Arrowgene.Ddo.GameServer/DdoGameServer.cs b/Arrowgene.Ddon.GameServer/DdonGameServer.cs similarity index 70% rename from Arrowgene.Ddo.GameServer/DdoGameServer.cs rename to Arrowgene.Ddon.GameServer/DdonGameServer.cs index 11a0346f0..4930816ab 100644 --- a/Arrowgene.Ddo.GameServer/DdoGameServer.cs +++ b/Arrowgene.Ddon.GameServer/DdonGameServer.cs @@ -1,36 +1,36 @@ /* - * This file is part of Arrowgene.Ddo.GameServer + * This file is part of Arrowgene.Ddon.GameServer * - * Arrowgene.Ddo.GameServer is a server implementation for the game "Dragons Dogma Online". - * Copyright (C) 2019-2020 Ddo Team + * Arrowgene.Ddon.GameServer is a server implementation for the game "Dragons Dogma Online". + * Copyright (C) 2019-2022 DDON Team * * Github: https://github.com/sebastian-heinz/Ddo-server * - * Arrowgene.Ddo.GameServer is free software: you can redistribute it and/or modify + * Arrowgene.Ddon.GameServer is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Arrowgene.Ddo.GameServer is distributed in the hope that it will be useful, + * Arrowgene.Ddon.GameServer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Arrowgene.Ddo.GameServer. If not, see . + * along with Arrowgene.Ddon.GameServer. If not, see . */ -using Arrowgene.Ddo.GameServer.Handler; -using Arrowgene.Ddo.GameServer.Logging; -using Arrowgene.Ddo.GameServer.Network; +using Arrowgene.Ddon.GameServer.Handler; +using Arrowgene.Ddon.GameServer.Logging; +using Arrowgene.Ddon.GameServer.Network; using Arrowgene.Logging; using Arrowgene.Networking.Tcp.Server.AsyncEvent; -namespace Arrowgene.Ddo.GameServer +namespace Arrowgene.Ddon.GameServer { - public class DdoGameServer + public class DdonGameServer { - private static readonly DdoLogger Logger = LogProvider.Logger(typeof(DdoGameServer)); + private static readonly DdonLogger Logger = LogProvider.Logger(typeof(DdonGameServer)); public GameServerSetting Setting { get; } public ClientLookup Clients { get; } @@ -38,10 +38,10 @@ public class DdoGameServer private readonly AsyncEventServer _authServer; - public DdoGameServer(GameServerSetting setting) + public DdonGameServer(GameServerSetting setting) { Setting = new GameServerSetting(setting); - LogProvider.Configure(Setting); + LogProvider.Configure(Setting); Clients = new ClientLookup(); @@ -81,7 +81,7 @@ private void LoadPacketHandler() _authConsumer.AddHandler(new ClientChallengeHandler(this)); _authConsumer.AddHandler(new ClientSessionKeyHandler(this)); _authConsumer.AddHandler(new ClientX1Handler(this)); - _authConsumer.AddHandler(new ClientX2Handler(this)); + _authConsumer.AddHandler(new GetErrorMessageListReqHandler(this)); _authConsumer.AddHandler(new ClientX3Handler(this)); _authConsumer.AddHandler(new ClientX4Handler(this)); _authConsumer.AddHandler(new ClientX5Handler(this)); diff --git a/Arrowgene.Ddo.GameServer/Dump/LoginDump.cs b/Arrowgene.Ddon.GameServer/Dump/LoginDump.cs similarity index 99% rename from Arrowgene.Ddo.GameServer/Dump/LoginDump.cs rename to Arrowgene.Ddon.GameServer/Dump/LoginDump.cs index 9e0e37352..73e47733f 100644 --- a/Arrowgene.Ddo.GameServer/Dump/LoginDump.cs +++ b/Arrowgene.Ddon.GameServer/Dump/LoginDump.cs @@ -1,6 +1,6 @@ -using Arrowgene.Ddo.GameServer.Network; +using Arrowgene.Ddon.GameServer.Network; -namespace Arrowgene.Ddo.GameServer.Dump +namespace Arrowgene.Ddon.GameServer.Dump { public static class LoginDump { diff --git a/Arrowgene.Ddo.GameServer/Dump/PacketDump.cs b/Arrowgene.Ddon.GameServer/Dump/PacketDump.cs similarity index 91% rename from Arrowgene.Ddo.GameServer/Dump/PacketDump.cs rename to Arrowgene.Ddon.GameServer/Dump/PacketDump.cs index c11029190..c5551440b 100644 --- a/Arrowgene.Ddo.GameServer/Dump/PacketDump.cs +++ b/Arrowgene.Ddon.GameServer/Dump/PacketDump.cs @@ -1,18 +1,18 @@ using System; using System.Collections.Generic; using System.Text; -using Arrowgene.Ddo.GameServer.Network; +using Arrowgene.Ddon.GameServer.Network; -namespace Arrowgene.Ddo.GameServer.Dump +namespace Arrowgene.Ddon.GameServer.Dump { public static class PacketDump { public static string DumpCSharpStruc(List packets, string name) { StringBuilder sb = new StringBuilder(); - sb.Append($"using Arrowgene.Ddo.GameServer.Network;"); + sb.Append($"using Arrowgene.Ddon.GameServer.Network;"); sb.Append(Environment.NewLine); - sb.Append($"namespace Arrowgene.Ddo.GameServer.Dump"); + sb.Append($"namespace Arrowgene.Ddon.GameServer.Dump"); sb.Append(Environment.NewLine); sb.Append("{"); sb.Append(Environment.NewLine); diff --git a/Arrowgene.Ddo.GameServer/GameServerSetting.cs b/Arrowgene.Ddon.GameServer/GameServerSetting.cs similarity index 98% rename from Arrowgene.Ddo.GameServer/GameServerSetting.cs rename to Arrowgene.Ddon.GameServer/GameServerSetting.cs index 5bbd67f32..38db25348 100644 --- a/Arrowgene.Ddo.GameServer/GameServerSetting.cs +++ b/Arrowgene.Ddon.GameServer/GameServerSetting.cs @@ -2,7 +2,7 @@ using System.Runtime.Serialization; using Arrowgene.Networking.Tcp.Server.AsyncEvent; -namespace Arrowgene.Ddo.GameServer +namespace Arrowgene.Ddon.GameServer { [DataContract] public class GameServerSetting diff --git a/Arrowgene.Ddo.GameServer/Handler/ClientChallengeHandler.cs b/Arrowgene.Ddon.GameServer/Handler/ClientChallengeHandler.cs similarity index 77% rename from Arrowgene.Ddo.GameServer/Handler/ClientChallengeHandler.cs rename to Arrowgene.Ddon.GameServer/Handler/ClientChallengeHandler.cs index c781b5c23..78571ba51 100644 --- a/Arrowgene.Ddo.GameServer/Handler/ClientChallengeHandler.cs +++ b/Arrowgene.Ddon.GameServer/Handler/ClientChallengeHandler.cs @@ -1,16 +1,16 @@ using Arrowgene.Buffers; -using Arrowgene.Ddo.GameServer.Logging; -using Arrowgene.Ddo.GameServer.Network; +using Arrowgene.Ddon.GameServer.Logging; +using Arrowgene.Ddon.GameServer.Network; using Arrowgene.Logging; -namespace Arrowgene.Ddo.GameServer.Handler +namespace Arrowgene.Ddon.GameServer.Handler { public class ClientChallengeHandler : PacketHandler { - private static readonly DdoLogger Logger = LogProvider.Logger(typeof(ClientChallengeHandler)); + private static readonly DdonLogger Logger = LogProvider.Logger(typeof(ClientChallengeHandler)); - public ClientChallengeHandler(DdoGameServer server) : base(server) + public ClientChallengeHandler(DdonGameServer server) : base(server) { } diff --git a/Arrowgene.Ddo.GameServer/Handler/ClientSessionKeyHandler.cs b/Arrowgene.Ddon.GameServer/Handler/ClientSessionKeyHandler.cs similarity index 82% rename from Arrowgene.Ddo.GameServer/Handler/ClientSessionKeyHandler.cs rename to Arrowgene.Ddon.GameServer/Handler/ClientSessionKeyHandler.cs index 174825e94..673b371a4 100644 --- a/Arrowgene.Ddo.GameServer/Handler/ClientSessionKeyHandler.cs +++ b/Arrowgene.Ddon.GameServer/Handler/ClientSessionKeyHandler.cs @@ -1,16 +1,16 @@ using Arrowgene.Buffers; -using Arrowgene.Ddo.GameServer.Logging; -using Arrowgene.Ddo.GameServer.Network; +using Arrowgene.Ddon.GameServer.Logging; +using Arrowgene.Ddon.GameServer.Network; using Arrowgene.Logging; -namespace Arrowgene.Ddo.GameServer.Handler +namespace Arrowgene.Ddon.GameServer.Handler { public class ClientSessionKeyHandler : PacketHandler { - private static readonly DdoLogger Logger = LogProvider.Logger(typeof(ClientSessionKeyHandler)); + private static readonly DdonLogger Logger = LogProvider.Logger(typeof(ClientSessionKeyHandler)); - public ClientSessionKeyHandler(DdoGameServer server) : base(server) + public ClientSessionKeyHandler(DdonGameServer server) : base(server) { } diff --git a/Arrowgene.Ddo.GameServer/Handler/ClientX1Handler.cs b/Arrowgene.Ddon.GameServer/Handler/ClientX1Handler.cs similarity index 76% rename from Arrowgene.Ddo.GameServer/Handler/ClientX1Handler.cs rename to Arrowgene.Ddon.GameServer/Handler/ClientX1Handler.cs index 0cddead0d..22041b007 100644 --- a/Arrowgene.Ddo.GameServer/Handler/ClientX1Handler.cs +++ b/Arrowgene.Ddon.GameServer/Handler/ClientX1Handler.cs @@ -1,16 +1,16 @@ using Arrowgene.Buffers; -using Arrowgene.Ddo.GameServer.Logging; -using Arrowgene.Ddo.GameServer.Network; +using Arrowgene.Ddon.GameServer.Logging; +using Arrowgene.Ddon.GameServer.Network; using Arrowgene.Logging; -namespace Arrowgene.Ddo.GameServer.Handler +namespace Arrowgene.Ddon.GameServer.Handler { public class ClientX1Handler : PacketHandler { - private static readonly DdoLogger Logger = LogProvider.Logger(typeof(ClientX1Handler)); + private static readonly DdonLogger Logger = LogProvider.Logger(typeof(ClientX1Handler)); - public ClientX1Handler(DdoGameServer server) : base(server) + public ClientX1Handler(DdonGameServer server) : base(server) { } diff --git a/Arrowgene.Ddon.GameServer/Handler/ClientX3Handler.cs b/Arrowgene.Ddon.GameServer/Handler/ClientX3Handler.cs new file mode 100644 index 000000000..339d03848 --- /dev/null +++ b/Arrowgene.Ddon.GameServer/Handler/ClientX3Handler.cs @@ -0,0 +1,25 @@ +using Arrowgene.Ddon.GameServer.Logging; +using Arrowgene.Ddon.GameServer.Model; +using Arrowgene.Ddon.GameServer.Network; +using Arrowgene.Logging; + +namespace Arrowgene.Ddon.GameServer.Handler +{ + public class ClientX3Handler : PacketHandler + { + private static readonly DdonLogger Logger = LogProvider.Logger(typeof(ClientX3Handler)); + + + public ClientX3Handler(DdonGameServer server) : base(server) + { + } + + public override PacketId Id => PacketId.X3_REQ; + + public override void Handle(Client client, Packet packet) + { + client.Send(Dump.LoginDump.Dump_20); + } + + } +} diff --git a/Arrowgene.Ddon.GameServer/Handler/ClientX4Handler.cs b/Arrowgene.Ddon.GameServer/Handler/ClientX4Handler.cs new file mode 100644 index 000000000..0493000ec --- /dev/null +++ b/Arrowgene.Ddon.GameServer/Handler/ClientX4Handler.cs @@ -0,0 +1,25 @@ +using Arrowgene.Ddon.GameServer.Logging; +using Arrowgene.Ddon.GameServer.Model; +using Arrowgene.Ddon.GameServer.Network; +using Arrowgene.Logging; + +namespace Arrowgene.Ddon.GameServer.Handler +{ + public class ClientX4Handler : PacketHandler + { + private static readonly DdonLogger Logger = LogProvider.Logger(typeof(ClientX4Handler)); + + + public ClientX4Handler(DdonGameServer server) : base(server) + { + } + + public override PacketId Id => PacketId.X4_REQ; + + public override void Handle(Client client, Packet packet) + { + client.Send(Dump.LoginDump.Dump_22); + } + + } +} diff --git a/Arrowgene.Ddon.GameServer/Handler/GetCharacterListReqHandler.cs b/Arrowgene.Ddon.GameServer/Handler/GetCharacterListReqHandler.cs new file mode 100644 index 000000000..f57b6ef81 --- /dev/null +++ b/Arrowgene.Ddon.GameServer/Handler/GetCharacterListReqHandler.cs @@ -0,0 +1,25 @@ +using Arrowgene.Ddon.GameServer.Logging; +using Arrowgene.Ddon.GameServer.Model; +using Arrowgene.Ddon.GameServer.Network; +using Arrowgene.Logging; + +namespace Arrowgene.Ddon.GameServer.Handler +{ + public class ClientX5Handler : PacketHandler + { + private static readonly DdonLogger Logger = LogProvider.Logger(typeof(ClientX5Handler)); + + + public ClientX5Handler(DdonGameServer server) : base(server) + { + } + + public override PacketId Id => PacketId.C2L_GET_CHARACTER_LIST_REQ; + + public override void Handle(Client client, Packet packet) + { + client.Send(Dump.LoginDump.Dump_24); + } + + } +} diff --git a/Arrowgene.Ddo.GameServer/Handler/ClientX2Handler.cs b/Arrowgene.Ddon.GameServer/Handler/GetErrorMessageListReqHandler.cs similarity index 53% rename from Arrowgene.Ddo.GameServer/Handler/ClientX2Handler.cs rename to Arrowgene.Ddon.GameServer/Handler/GetErrorMessageListReqHandler.cs index 9dffa27a3..1201e7eb1 100644 --- a/Arrowgene.Ddo.GameServer/Handler/ClientX2Handler.cs +++ b/Arrowgene.Ddon.GameServer/Handler/GetErrorMessageListReqHandler.cs @@ -1,23 +1,24 @@ -using Arrowgene.Ddo.GameServer.Logging; -using Arrowgene.Ddo.GameServer.Model; -using Arrowgene.Ddo.GameServer.Network; +using Arrowgene.Ddon.GameServer.Logging; +using Arrowgene.Ddon.GameServer.Model; +using Arrowgene.Ddon.GameServer.Network; using Arrowgene.Logging; -namespace Arrowgene.Ddo.GameServer.Handler +namespace Arrowgene.Ddon.GameServer.Handler { - public class ClientX2Handler : PacketHandler + public class GetErrorMessageListReqHandler : PacketHandler { - private static readonly DdoLogger Logger = LogProvider.Logger(typeof(ClientX2Handler)); + private static readonly DdonLogger Logger = LogProvider.Logger(typeof(GetErrorMessageListReqHandler)); - public ClientX2Handler(DdoGameServer server) : base(server) + public GetErrorMessageListReqHandler(DdonGameServer server) : base(server) { } - public override PacketId Id => PacketId.X2_REQ_CHAR; + public override PacketId Id => PacketId.C2L_GET_ERROR_MESSAGE_LIST_REQ; public override void Handle(Client client, Packet packet) { + //L2C_GET_ERROR_MESSAGE_LIST_NTC client.Send(Dump.LoginDump.Dump_8); client.Send(Dump.LoginDump.Dump_9); client.Send(Dump.LoginDump.Dump_10); @@ -29,6 +30,7 @@ public override void Handle(Client client, Packet packet) client.Send(Dump.LoginDump.Dump_16); client.Send(Dump.LoginDump.Dump_17); + //L2C_GET_ERROR_MESSAGE_LIST_RES client.Send(Dump.LoginDump.Dump_18); } diff --git a/Arrowgene.Ddo.GameServer/Logging/DdoLogger.cs b/Arrowgene.Ddon.GameServer/Logging/DdonLogger.cs similarity index 94% rename from Arrowgene.Ddo.GameServer/Logging/DdoLogger.cs rename to Arrowgene.Ddon.GameServer/Logging/DdonLogger.cs index b581aa9bd..784b4bd26 100644 --- a/Arrowgene.Ddo.GameServer/Logging/DdoLogger.cs +++ b/Arrowgene.Ddon.GameServer/Logging/DdonLogger.cs @@ -1,13 +1,13 @@ using System; using Arrowgene.Buffers; -using Arrowgene.Ddo.GameServer.Network; -using Arrowgene.Ddo.Shared; +using Arrowgene.Ddon.GameServer.Network; +using Arrowgene.Ddon.Shared; using Arrowgene.Logging; using Arrowgene.Networking.Tcp; -namespace Arrowgene.Ddo.GameServer.Logging +namespace Arrowgene.Ddon.GameServer.Logging { - public class DdoLogger : Logger + public class DdonLogger : Logger { public override void Initialize(string identity, string name, Action write, object configuration) { diff --git a/Arrowgene.Ddo.GameServer/Model/ClientState.cs b/Arrowgene.Ddon.GameServer/Model/ClientState.cs similarity index 68% rename from Arrowgene.Ddo.GameServer/Model/ClientState.cs rename to Arrowgene.Ddon.GameServer/Model/ClientState.cs index 5e082222e..bd45df29e 100644 --- a/Arrowgene.Ddo.GameServer/Model/ClientState.cs +++ b/Arrowgene.Ddon.GameServer/Model/ClientState.cs @@ -1,4 +1,4 @@ -namespace Arrowgene.Ddo.GameServer.Model +namespace Arrowgene.Ddon.GameServer.Model { public class ClientState { diff --git a/Arrowgene.Ddo.GameServer/Network/Challenge.cs b/Arrowgene.Ddon.GameServer/Network/Challenge.cs similarity index 97% rename from Arrowgene.Ddo.GameServer/Network/Challenge.cs rename to Arrowgene.Ddon.GameServer/Network/Challenge.cs index 8cda65196..e11b9e110 100644 --- a/Arrowgene.Ddo.GameServer/Network/Challenge.cs +++ b/Arrowgene.Ddon.GameServer/Network/Challenge.cs @@ -1,9 +1,9 @@ using System; using System.Security.Cryptography; using Arrowgene.Buffers; -using Arrowgene.Ddo.Shared.Crypto; +using Arrowgene.Ddon.Shared.Crypto; -namespace Arrowgene.Ddo.GameServer.Network +namespace Arrowgene.Ddon.GameServer.Network { public class Challenge { diff --git a/Arrowgene.Ddo.GameServer/Network/Client.cs b/Arrowgene.Ddon.GameServer/Network/Client.cs similarity index 92% rename from Arrowgene.Ddo.GameServer/Network/Client.cs rename to Arrowgene.Ddon.GameServer/Network/Client.cs index fe9f6597d..b6808ec29 100644 --- a/Arrowgene.Ddo.GameServer/Network/Client.cs +++ b/Arrowgene.Ddon.GameServer/Network/Client.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; -using Arrowgene.Ddo.GameServer.Logging; -using Arrowgene.Ddo.GameServer.Model; +using Arrowgene.Ddon.GameServer.Logging; +using Arrowgene.Ddon.GameServer.Model; using Arrowgene.Logging; using Arrowgene.Networking.Tcp; -namespace Arrowgene.Ddo.GameServer.Network +namespace Arrowgene.Ddon.GameServer.Network { public class Client { - private static readonly DdoLogger Logger = LogProvider.Logger(typeof(Client)); + private static readonly DdonLogger Logger = LogProvider.Logger(typeof(Client)); private ITcpSocket _socket; private PacketFactory _packetFactory; diff --git a/Arrowgene.Ddo.GameServer/Network/Consumer.cs b/Arrowgene.Ddon.GameServer/Network/Consumer.cs similarity index 95% rename from Arrowgene.Ddo.GameServer/Network/Consumer.cs rename to Arrowgene.Ddon.GameServer/Network/Consumer.cs index 8e8ac44cb..5f66708d7 100644 --- a/Arrowgene.Ddo.GameServer/Network/Consumer.cs +++ b/Arrowgene.Ddon.GameServer/Network/Consumer.cs @@ -1,16 +1,16 @@ using System; using System.Collections.Generic; -using Arrowgene.Ddo.GameServer.Logging; +using Arrowgene.Ddon.GameServer.Logging; using Arrowgene.Logging; using Arrowgene.Networking.Tcp; using Arrowgene.Networking.Tcp.Consumer.BlockingQueueConsumption; using Arrowgene.Networking.Tcp.Server.AsyncEvent; -namespace Arrowgene.Ddo.GameServer.Network +namespace Arrowgene.Ddon.GameServer.Network { public class Consumer : ThreadedBlockingQueueConsumer { - private static readonly DdoLogger Logger = LogProvider.Logger(typeof(Consumer)); + private static readonly DdonLogger Logger = LogProvider.Logger(typeof(Consumer)); private readonly Dictionary _packetHandlerLookup; private readonly Dictionary _clients; private readonly object _lock; diff --git a/Arrowgene.Ddo.GameServer/Network/IPacketHandler.cs b/Arrowgene.Ddon.GameServer/Network/IPacketHandler.cs similarity index 73% rename from Arrowgene.Ddo.GameServer/Network/IPacketHandler.cs rename to Arrowgene.Ddon.GameServer/Network/IPacketHandler.cs index ac9abd6fe..d933ae4fc 100644 --- a/Arrowgene.Ddo.GameServer/Network/IPacketHandler.cs +++ b/Arrowgene.Ddon.GameServer/Network/IPacketHandler.cs @@ -1,4 +1,4 @@ -namespace Arrowgene.Ddo.GameServer.Network +namespace Arrowgene.Ddon.GameServer.Network { public interface IPacketHandler { diff --git a/Arrowgene.Ddo.GameServer/Network/Packet.cs b/Arrowgene.Ddon.GameServer/Network/Packet.cs similarity index 96% rename from Arrowgene.Ddo.GameServer/Network/Packet.cs rename to Arrowgene.Ddon.GameServer/Network/Packet.cs index a41c39dfb..b993f3b00 100644 --- a/Arrowgene.Ddo.GameServer/Network/Packet.cs +++ b/Arrowgene.Ddon.GameServer/Network/Packet.cs @@ -1,6 +1,6 @@ using Arrowgene.Buffers; -namespace Arrowgene.Ddo.GameServer.Network +namespace Arrowgene.Ddon.GameServer.Network { public class Packet { diff --git a/Arrowgene.Ddo.GameServer/Network/PacketFactory.cs b/Arrowgene.Ddon.GameServer/Network/PacketFactory.cs similarity index 94% rename from Arrowgene.Ddo.GameServer/Network/PacketFactory.cs rename to Arrowgene.Ddon.GameServer/Network/PacketFactory.cs index bb3a8bb08..c7bc33a21 100644 --- a/Arrowgene.Ddo.GameServer/Network/PacketFactory.cs +++ b/Arrowgene.Ddon.GameServer/Network/PacketFactory.cs @@ -1,16 +1,16 @@ using System; using System.Collections.Generic; using Arrowgene.Buffers; -using Arrowgene.Ddo.GameServer.Logging; -using Arrowgene.Ddo.Shared; -using Arrowgene.Ddo.Shared.Crypto; +using Arrowgene.Ddon.GameServer.Logging; +using Arrowgene.Ddon.Shared; +using Arrowgene.Ddon.Shared.Crypto; using Arrowgene.Logging; -namespace Arrowgene.Ddo.GameServer.Network +namespace Arrowgene.Ddon.GameServer.Network { public class PacketFactory { - private static readonly DdoLogger Logger = LogProvider.Logger(typeof(PacketFactory)); + private static readonly DdonLogger Logger = LogProvider.Logger(typeof(PacketFactory)); private static readonly Camellia _camellia = new Camellia(); private static readonly byte[] CamelliaKey = new byte[] @@ -69,6 +69,11 @@ public byte[] WriteWithoutHeader(Packet packet) public byte[] Write(Packet packet) { byte[] data = packet.Data; + if (data == null) + { + Logger.Error($"data == null, tried to write invalid data"); + return null; + } int totalLength = data.Length + PacketLengthFieldSize + PacketHeaderSize; if (totalLength < 0 || totalLength > ushort.MaxValue) { diff --git a/Arrowgene.Ddo.GameServer/Network/PacketHandler.cs b/Arrowgene.Ddon.GameServer/Network/PacketHandler.cs similarity index 70% rename from Arrowgene.Ddo.GameServer/Network/PacketHandler.cs rename to Arrowgene.Ddon.GameServer/Network/PacketHandler.cs index a99e8ff60..099e53b1e 100644 --- a/Arrowgene.Ddo.GameServer/Network/PacketHandler.cs +++ b/Arrowgene.Ddon.GameServer/Network/PacketHandler.cs @@ -1,18 +1,18 @@ using Arrowgene.Buffers; -using Arrowgene.Ddo.Shared; +using Arrowgene.Ddon.Shared; -namespace Arrowgene.Ddo.GameServer.Network +namespace Arrowgene.Ddon.GameServer.Network { public abstract class PacketHandler : IPacketHandler { - protected PacketHandler(DdoGameServer server) + protected PacketHandler(DdonGameServer server) { Server = server; Settings = server.Setting; } protected IBufferProvider Buffer => Util.Buffer; - protected DdoGameServer Server { get; } + protected DdonGameServer Server { get; } protected GameServerSetting Settings { get; } public abstract PacketId Id { get; } diff --git a/Arrowgene.Ddo.GameServer/Network/PacketId.cs b/Arrowgene.Ddon.GameServer/Network/PacketId.cs similarity index 78% rename from Arrowgene.Ddo.GameServer/Network/PacketId.cs rename to Arrowgene.Ddon.GameServer/Network/PacketId.cs index 0eb968ae9..fa9a4b69e 100644 --- a/Arrowgene.Ddo.GameServer/Network/PacketId.cs +++ b/Arrowgene.Ddon.GameServer/Network/PacketId.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Arrowgene.Ddo.GameServer.Network +namespace Arrowgene.Ddon.GameServer.Network { public readonly struct PacketId { @@ -14,15 +14,15 @@ public readonly struct PacketId public static readonly PacketId L2C_SESSION_KEY_RES = new PacketId(0, 1, 2, "L2C_SESSION_KEY_RES"); public static readonly PacketId X1_REQ = new PacketId(0, 0, 1, "X1_REQ"); public static readonly PacketId X1_RES = new PacketId(0, 0, 2, "X1_RES"); - public static readonly PacketId X2_REQ_CHAR = new PacketId(3, 0, 1, "X2_REQ_CHAR"); - public static readonly PacketId X2_RES_CHAR_DONE = new PacketId(3, 0, 2, "X2_RES_CHAR_DONE"); - public static readonly PacketId X2_RES_CHAR_DATA = new PacketId(3, 0, 0x10, "X2_RES_CHAR_DATA"); + public static readonly PacketId C2L_GET_ERROR_MESSAGE_LIST_REQ = new PacketId(3, 0, 1, "C2L_GET_ERROR_MESSAGE_LIST_REQ"); + public static readonly PacketId L2C_GET_ERROR_MESSAGE_LIST_RES = new PacketId(3, 0, 2, "L2C_GET_ERROR_MESSAGE_LIST_RES"); + public static readonly PacketId L2C_GET_ERROR_MESSAGE_LIST_NTC = new PacketId(3, 0, 0x10, "L2C_GET_ERROR_MESSAGE_LIST_NTC"); public static readonly PacketId X3_REQ = new PacketId(2, 2, 1, "X3_REQ"); public static readonly PacketId X3_RES = new PacketId(2, 2, 2, "X3_RES"); public static readonly PacketId X4_REQ = new PacketId(4, 0, 1, "X4_REQ"); public static readonly PacketId X4_RES = new PacketId(4, 0, 2, "X4_RES"); - public static readonly PacketId X5_REQ = new PacketId(5, 0, 1, "X5_REQ"); - public static readonly PacketId X5_RES = new PacketId(5, 0, 2, "X5_RES"); + public static readonly PacketId C2L_GET_CHARACTER_LIST_REQ = new PacketId(5, 0, 1, "C2L_GET_CHARACTER_LIST_REQ"); + public static readonly PacketId L2C_GET_CHARACTER_LIST_RES = new PacketId(5, 0, 2, "L2C_GET_CHARACTER_LIST_RES"); private static Dictionary InitializePacketIds() { Dictionary packetIds = new Dictionary(); @@ -34,15 +34,15 @@ private static Dictionary InitializePacketIds() AddPacketIdEntry(packetIds, L2C_SESSION_KEY_RES); AddPacketIdEntry(packetIds, X1_REQ); AddPacketIdEntry(packetIds, X1_RES); - AddPacketIdEntry(packetIds, X2_REQ_CHAR); - AddPacketIdEntry(packetIds, X2_RES_CHAR_DONE); - AddPacketIdEntry(packetIds, X2_RES_CHAR_DATA); + AddPacketIdEntry(packetIds, C2L_GET_ERROR_MESSAGE_LIST_REQ); + AddPacketIdEntry(packetIds, L2C_GET_ERROR_MESSAGE_LIST_RES); + AddPacketIdEntry(packetIds, L2C_GET_ERROR_MESSAGE_LIST_NTC); AddPacketIdEntry(packetIds, X3_REQ); AddPacketIdEntry(packetIds, X3_RES); AddPacketIdEntry(packetIds, X4_REQ); AddPacketIdEntry(packetIds, X4_RES); - AddPacketIdEntry(packetIds, X5_REQ); - AddPacketIdEntry(packetIds, X5_RES); + AddPacketIdEntry(packetIds, C2L_GET_CHARACTER_LIST_REQ); + AddPacketIdEntry(packetIds, L2C_GET_CHARACTER_LIST_RES); return packetIds; } diff --git a/Arrowgene.Ddo.GameServer/Network/PacketSource.cs b/Arrowgene.Ddon.GameServer/Network/PacketSource.cs similarity index 66% rename from Arrowgene.Ddo.GameServer/Network/PacketSource.cs rename to Arrowgene.Ddon.GameServer/Network/PacketSource.cs index a4761e099..8cb0f7b2e 100644 --- a/Arrowgene.Ddo.GameServer/Network/PacketSource.cs +++ b/Arrowgene.Ddon.GameServer/Network/PacketSource.cs @@ -1,4 +1,4 @@ -namespace Arrowgene.Ddo.GameServer.Network +namespace Arrowgene.Ddon.GameServer.Network { public enum PacketSource { diff --git a/Arrowgene.Ddo.PacketLibrary/Arrowgene.Ddo.PacketLibrary.csproj b/Arrowgene.Ddon.PacketLibrary/Arrowgene.Ddon.PacketLibrary.csproj similarity index 83% rename from Arrowgene.Ddo.PacketLibrary/Arrowgene.Ddo.PacketLibrary.csproj rename to Arrowgene.Ddon.PacketLibrary/Arrowgene.Ddon.PacketLibrary.csproj index 85d73feca..2ceab7996 100644 --- a/Arrowgene.Ddo.PacketLibrary/Arrowgene.Ddo.PacketLibrary.csproj +++ b/Arrowgene.Ddon.PacketLibrary/Arrowgene.Ddon.PacketLibrary.csproj @@ -1,7 +1,7 @@ netstandard2.1 - Arrowgene.Ddo.PacketLibrary + Arrowgene.Ddon.PacketLibrary disabled disable diff --git a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/EthernetFrame.cs b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/EthernetFrame.cs similarity index 99% rename from Arrowgene.Ddo.PacketLibrary/KaitaiModel/EthernetFrame.cs rename to Arrowgene.Ddon.PacketLibrary/KaitaiModel/EthernetFrame.cs index 9b2264bcf..dc89f0818 100644 --- a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/EthernetFrame.cs +++ b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/EthernetFrame.cs @@ -2,7 +2,7 @@ using Kaitai; -namespace Arrowgene.Ddo.PacketLibrary.KaitaiModel +namespace Arrowgene.Ddon.PacketLibrary.KaitaiModel { /// diff --git a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/IcmpPacket.cs b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/IcmpPacket.cs similarity index 99% rename from Arrowgene.Ddo.PacketLibrary/KaitaiModel/IcmpPacket.cs rename to Arrowgene.Ddon.PacketLibrary/KaitaiModel/IcmpPacket.cs index 5bbbd94b7..80ca4b925 100644 --- a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/IcmpPacket.cs +++ b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/IcmpPacket.cs @@ -2,7 +2,7 @@ using Kaitai; -namespace Arrowgene.Ddo.PacketLibrary.KaitaiModel +namespace Arrowgene.Ddon.PacketLibrary.KaitaiModel { public partial class IcmpPacket : KaitaiStruct { diff --git a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/Ipv4Packet.cs b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/Ipv4Packet.cs similarity index 99% rename from Arrowgene.Ddo.PacketLibrary/KaitaiModel/Ipv4Packet.cs rename to Arrowgene.Ddon.PacketLibrary/KaitaiModel/Ipv4Packet.cs index caf01d759..557f7f2fa 100644 --- a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/Ipv4Packet.cs +++ b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/Ipv4Packet.cs @@ -3,7 +3,7 @@ using Kaitai; using System.Collections.Generic; -namespace Arrowgene.Ddo.PacketLibrary.KaitaiModel +namespace Arrowgene.Ddon.PacketLibrary.KaitaiModel { public partial class Ipv4Packet : KaitaiStruct { diff --git a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/Ipv6Packet.cs b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/Ipv6Packet.cs similarity index 97% rename from Arrowgene.Ddo.PacketLibrary/KaitaiModel/Ipv6Packet.cs rename to Arrowgene.Ddon.PacketLibrary/KaitaiModel/Ipv6Packet.cs index f1af1295f..bebf3b0c3 100644 --- a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/Ipv6Packet.cs +++ b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/Ipv6Packet.cs @@ -2,7 +2,7 @@ using Kaitai; -namespace Arrowgene.Ddo.PacketLibrary.KaitaiModel +namespace Arrowgene.Ddon.PacketLibrary.KaitaiModel { public partial class Ipv6Packet : KaitaiStruct { diff --git a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/PacketPpi.cs b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/PacketPpi.cs similarity index 99% rename from Arrowgene.Ddo.PacketLibrary/KaitaiModel/PacketPpi.cs rename to Arrowgene.Ddon.PacketLibrary/KaitaiModel/PacketPpi.cs index 0e49d283a..514bb274c 100644 --- a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/PacketPpi.cs +++ b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/PacketPpi.cs @@ -3,7 +3,7 @@ using Kaitai; using System.Collections.Generic; -namespace Arrowgene.Ddo.PacketLibrary.KaitaiModel +namespace Arrowgene.Ddon.PacketLibrary.KaitaiModel { /// diff --git a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/Pcap.cs b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/Pcap.cs similarity index 99% rename from Arrowgene.Ddo.PacketLibrary/KaitaiModel/Pcap.cs rename to Arrowgene.Ddon.PacketLibrary/KaitaiModel/Pcap.cs index 54aa7f1aa..c056dd836 100644 --- a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/Pcap.cs +++ b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/Pcap.cs @@ -3,7 +3,7 @@ using Kaitai; using System.Collections.Generic; -namespace Arrowgene.Ddo.PacketLibrary.KaitaiModel +namespace Arrowgene.Ddon.PacketLibrary.KaitaiModel { /// diff --git a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/ProtocolBody.cs b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/ProtocolBody.cs similarity index 99% rename from Arrowgene.Ddo.PacketLibrary/KaitaiModel/ProtocolBody.cs rename to Arrowgene.Ddon.PacketLibrary/KaitaiModel/ProtocolBody.cs index b51f32401..6b3ceb8af 100644 --- a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/ProtocolBody.cs +++ b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/ProtocolBody.cs @@ -2,7 +2,7 @@ using Kaitai; -namespace Arrowgene.Ddo.PacketLibrary.KaitaiModel +namespace Arrowgene.Ddon.PacketLibrary.KaitaiModel { /// diff --git a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/TcpSegment.cs b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/TcpSegment.cs similarity index 97% rename from Arrowgene.Ddo.PacketLibrary/KaitaiModel/TcpSegment.cs rename to Arrowgene.Ddon.PacketLibrary/KaitaiModel/TcpSegment.cs index 474d9a959..0c30f97c4 100644 --- a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/TcpSegment.cs +++ b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/TcpSegment.cs @@ -2,7 +2,7 @@ using Kaitai; -namespace Arrowgene.Ddo.PacketLibrary.KaitaiModel +namespace Arrowgene.Ddon.PacketLibrary.KaitaiModel { /// diff --git a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/UdpDatagram.cs b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/UdpDatagram.cs similarity index 97% rename from Arrowgene.Ddo.PacketLibrary/KaitaiModel/UdpDatagram.cs rename to Arrowgene.Ddon.PacketLibrary/KaitaiModel/UdpDatagram.cs index 63d30d085..2215b4ab6 100644 --- a/Arrowgene.Ddo.PacketLibrary/KaitaiModel/UdpDatagram.cs +++ b/Arrowgene.Ddon.PacketLibrary/KaitaiModel/UdpDatagram.cs @@ -2,7 +2,7 @@ using Kaitai; -namespace Arrowgene.Ddo.PacketLibrary.KaitaiModel +namespace Arrowgene.Ddon.PacketLibrary.KaitaiModel { /// diff --git a/Arrowgene.Ddo.PacketLibrary/PlFactory.cs b/Arrowgene.Ddon.PacketLibrary/PlFactory.cs similarity index 98% rename from Arrowgene.Ddo.PacketLibrary/PlFactory.cs rename to Arrowgene.Ddon.PacketLibrary/PlFactory.cs index ed6138721..e79224604 100644 --- a/Arrowgene.Ddo.PacketLibrary/PlFactory.cs +++ b/Arrowgene.Ddon.PacketLibrary/PlFactory.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Arrowgene.Ddo.PacketLibrary.KaitaiModel; +using Arrowgene.Ddon.PacketLibrary.KaitaiModel; -namespace Arrowgene.Ddo.PacketLibrary +namespace Arrowgene.Ddon.PacketLibrary { public class PlFactory { @@ -111,7 +111,7 @@ private List ExtractPackets(List packets, uint ini || tcpSegment.DstPort == 52000) ) { - // not ddo packet + // not ddon packet continue; } diff --git a/Arrowgene.Ddo.PacketLibrary/PlFactoryPacket.cs b/Arrowgene.Ddon.PacketLibrary/PlFactoryPacket.cs similarity index 97% rename from Arrowgene.Ddo.PacketLibrary/PlFactoryPacket.cs rename to Arrowgene.Ddon.PacketLibrary/PlFactoryPacket.cs index 71b24c853..174ccf7ce 100644 --- a/Arrowgene.Ddo.PacketLibrary/PlFactoryPacket.cs +++ b/Arrowgene.Ddon.PacketLibrary/PlFactoryPacket.cs @@ -1,6 +1,6 @@ using System; -namespace Arrowgene.Ddo.PacketLibrary +namespace Arrowgene.Ddon.PacketLibrary { public class PlFactoryPacket { diff --git a/Arrowgene.Ddo.PacketLibrary/PlJson.cs b/Arrowgene.Ddon.PacketLibrary/PlJson.cs similarity index 97% rename from Arrowgene.Ddo.PacketLibrary/PlJson.cs rename to Arrowgene.Ddon.PacketLibrary/PlJson.cs index 95e3e80da..c14e5e753 100644 --- a/Arrowgene.Ddo.PacketLibrary/PlJson.cs +++ b/Arrowgene.Ddon.PacketLibrary/PlJson.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Arrowgene.Ddo.PacketLibrary +namespace Arrowgene.Ddon.PacketLibrary { public static class PlJson { diff --git a/Arrowgene.Ddo.PacketLibrary/PlPacket.cs b/Arrowgene.Ddon.PacketLibrary/PlPacket.cs similarity index 83% rename from Arrowgene.Ddo.PacketLibrary/PlPacket.cs rename to Arrowgene.Ddon.PacketLibrary/PlPacket.cs index 9a6716355..f39a7e379 100644 --- a/Arrowgene.Ddo.PacketLibrary/PlPacket.cs +++ b/Arrowgene.Ddon.PacketLibrary/PlPacket.cs @@ -1,6 +1,6 @@ using System; -namespace Arrowgene.Ddo.PacketLibrary +namespace Arrowgene.Ddon.PacketLibrary { public class PlPacket { diff --git a/Arrowgene.Ddo.PacketLibrary/PlSession.cs b/Arrowgene.Ddon.PacketLibrary/PlSession.cs similarity index 95% rename from Arrowgene.Ddo.PacketLibrary/PlSession.cs rename to Arrowgene.Ddon.PacketLibrary/PlSession.cs index ca2208558..0cd6f97e9 100644 --- a/Arrowgene.Ddo.PacketLibrary/PlSession.cs +++ b/Arrowgene.Ddon.PacketLibrary/PlSession.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Arrowgene.Ddo.PacketLibrary +namespace Arrowgene.Ddon.PacketLibrary { public class PlSession { diff --git a/Arrowgene.Ddo.PacketLibrary/TcpFlags.cs b/Arrowgene.Ddon.PacketLibrary/TcpFlags.cs similarity index 98% rename from Arrowgene.Ddo.PacketLibrary/TcpFlags.cs rename to Arrowgene.Ddon.PacketLibrary/TcpFlags.cs index 4e9188060..baea8c54b 100644 --- a/Arrowgene.Ddo.PacketLibrary/TcpFlags.cs +++ b/Arrowgene.Ddon.PacketLibrary/TcpFlags.cs @@ -1,7 +1,7 @@ using System; using System.Collections; -namespace Arrowgene.Ddo.PacketLibrary +namespace Arrowgene.Ddon.PacketLibrary { /* * Data offset (4 bits) diff --git a/Arrowgene.Ddo.PacketLibrary/compile-struct.cmd b/Arrowgene.Ddon.PacketLibrary/compile-struct.cmd similarity index 68% rename from Arrowgene.Ddo.PacketLibrary/compile-struct.cmd rename to Arrowgene.Ddon.PacketLibrary/compile-struct.cmd index 28aee5168..b374cbdfe 100644 --- a/Arrowgene.Ddo.PacketLibrary/compile-struct.cmd +++ b/Arrowgene.Ddon.PacketLibrary/compile-struct.cmd @@ -1,2 +1,2 @@ pushd "%~dp0" -kaitai-struct-compiler-0.9/bin/kaitai-struct-compiler kaitai-struct-compiler-0.9/formats/network/pcap.ksy -t csharp -d ./KaitaiModel --dotnet-namespace Arrowgene.Ddo.PacketLibrary.KaitaiModel \ No newline at end of file +kaitai-struct-compiler-0.9/bin/kaitai-struct-compiler kaitai-struct-compiler-0.9/formats/network/pcap.ksy -t csharp -d ./KaitaiModel --dotnet-namespace Arrowgene.Ddon.PacketLibrary.KaitaiModel \ No newline at end of file diff --git a/Arrowgene.Ddo.Shared/Arrowgene.Ddo.Shared.csproj b/Arrowgene.Ddon.Shared/Arrowgene.Ddon.Shared.csproj similarity index 63% rename from Arrowgene.Ddo.Shared/Arrowgene.Ddo.Shared.csproj rename to Arrowgene.Ddon.Shared/Arrowgene.Ddon.Shared.csproj index b20098284..c48180950 100644 --- a/Arrowgene.Ddo.Shared/Arrowgene.Ddo.Shared.csproj +++ b/Arrowgene.Ddon.Shared/Arrowgene.Ddon.Shared.csproj @@ -2,12 +2,12 @@ netstandard2.1 - Arrowgene.Ddo.Shared + Arrowgene.Ddon.Shared Dragons Dogma Online - Shared - DDO Team - Ddo.Shared + DDON Team + Ddon.Shared $(Version) - Copyright © 2019-2020 DDO Team + Copyright © 2019-2022 DDON Team diff --git a/Arrowgene.Ddo.Shared/Crypto/BlowFish.cs b/Arrowgene.Ddon.Shared/Crypto/BlowFish.cs similarity index 99% rename from Arrowgene.Ddo.Shared/Crypto/BlowFish.cs rename to Arrowgene.Ddon.Shared/Crypto/BlowFish.cs index 566932c60..403eb8dd9 100644 --- a/Arrowgene.Ddo.Shared/Crypto/BlowFish.cs +++ b/Arrowgene.Ddon.Shared/Crypto/BlowFish.cs @@ -58,7 +58,7 @@ Use the Encypt_* methods to encrypt the plaintext in the mode that you want. using System.Text; using System.Security.Cryptography; -namespace Arrowgene.Ddo.Shared.Crypto +namespace Arrowgene.Ddon.Shared.Crypto { public class BlowFish { diff --git a/Arrowgene.Ddo.Shared/Crypto/Camellia.cs b/Arrowgene.Ddon.Shared/Crypto/Camellia.cs similarity index 99% rename from Arrowgene.Ddo.Shared/Crypto/Camellia.cs rename to Arrowgene.Ddon.Shared/Crypto/Camellia.cs index f62083a3d..f66bbdb48 100644 --- a/Arrowgene.Ddo.Shared/Crypto/Camellia.cs +++ b/Arrowgene.Ddon.Shared/Crypto/Camellia.cs @@ -1,6 +1,6 @@ using System; -namespace Arrowgene.Ddo.Shared.Crypto +namespace Arrowgene.Ddon.Shared.Crypto { public class Camellia { diff --git a/Arrowgene.Ddo.Shared/Crypto/CryptoRandom.cs b/Arrowgene.Ddon.Shared/Crypto/CryptoRandom.cs similarity index 99% rename from Arrowgene.Ddo.Shared/Crypto/CryptoRandom.cs rename to Arrowgene.Ddon.Shared/Crypto/CryptoRandom.cs index 7619f8410..1a6ada3b1 100644 --- a/Arrowgene.Ddo.Shared/Crypto/CryptoRandom.cs +++ b/Arrowgene.Ddon.Shared/Crypto/CryptoRandom.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; using System.Security.Cryptography; -namespace Arrowgene.Ddo.Shared.Crypto +namespace Arrowgene.Ddon.Shared.Crypto { /* * Original version by Stephen Toub and Shawn Farkas. diff --git a/Arrowgene.Ddo.Shared/Crypto/DdoRandom.cs b/Arrowgene.Ddon.Shared/Crypto/DdonRandom.cs similarity index 74% rename from Arrowgene.Ddo.Shared/Crypto/DdoRandom.cs rename to Arrowgene.Ddon.Shared/Crypto/DdonRandom.cs index 6eb3546f5..9ba96deac 100644 --- a/Arrowgene.Ddo.Shared/Crypto/DdoRandom.cs +++ b/Arrowgene.Ddon.Shared/Crypto/DdonRandom.cs @@ -1,8 +1,8 @@ using System; -namespace Arrowgene.Ddo.Shared.Crypto +namespace Arrowgene.Ddon.Shared.Crypto { - public class DdoRandom + public class DdonRandom { private static string KeyPool = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; @@ -11,7 +11,7 @@ public class DdoRandom private uint _r3; private uint _r4; - public DdoRandom() + public DdonRandom() { byte[] seed = new byte[16]; Util.CryptoRandom.NextBytes(seed); @@ -86,25 +86,7 @@ public void Advance(int steps) } else if (steps < 0) { - throw new NotImplementedException(); - steps = Math.Abs(steps); - for (int i = 0; i < steps; i++) - { - // probably not recoverable - uint d6 = _r4; - _r4 = _r3; - _r3 = _r2; - _r2 = _r1; - uint d2 = _r4 >> 0x11; - // a3 = d5 ^ d6; - // a3 = d2 ^ d3; - // d4 = _r4 ^ d5 - - // uint d6 = d5 ^ a3; - // uint d5 = d4 ^ _r4; - // uint d4 = d3 >> 0x4; - // uint d3 = d2 ^ a3; - } + throw new NotSupportedException(); } } } diff --git a/Arrowgene.Ddo.Shared/Util.cs b/Arrowgene.Ddon.Shared/Util.cs similarity index 98% rename from Arrowgene.Ddo.Shared/Util.cs rename to Arrowgene.Ddon.Shared/Util.cs index 670498697..8418dbebe 100644 --- a/Arrowgene.Ddo.Shared/Util.cs +++ b/Arrowgene.Ddon.Shared/Util.cs @@ -3,9 +3,9 @@ using System.Reflection; using System.Text; using Arrowgene.Buffers; -using Arrowgene.Ddo.Shared.Crypto; +using Arrowgene.Ddon.Shared.Crypto; -namespace Arrowgene.Ddo.Shared +namespace Arrowgene.Ddon.Shared { public static class Util { diff --git a/Arrowgene.Ddo.WebServer/Arrowgene.Ddo.WebServer.csproj b/Arrowgene.Ddon.WebServer/Arrowgene.Ddon.WebServer.csproj similarity index 68% rename from Arrowgene.Ddo.WebServer/Arrowgene.Ddo.WebServer.csproj rename to Arrowgene.Ddon.WebServer/Arrowgene.Ddon.WebServer.csproj index 367220dd8..045cf6a97 100644 --- a/Arrowgene.Ddo.WebServer/Arrowgene.Ddo.WebServer.csproj +++ b/Arrowgene.Ddon.WebServer/Arrowgene.Ddon.WebServer.csproj @@ -1,12 +1,12 @@  netcoreapp3.0 - Arrowgene.Ddo.WebServer + Arrowgene.Ddon.WebServer Dragons Dogma Online - Web Server - DDO Team - Ddo.GameServer + DDON Team + Ddon.GameServer $(Version) - Copyright © 2019-2020 DDO Team + Copyright © 2019-2022 DDON Team @@ -18,6 +18,6 @@ - + diff --git a/Arrowgene.Ddo.WebServer/DdoWebServer.cs b/Arrowgene.Ddon.WebServer/DdonWebServer.cs similarity index 91% rename from Arrowgene.Ddo.WebServer/DdoWebServer.cs rename to Arrowgene.Ddon.WebServer/DdonWebServer.cs index a1562bfdc..0f4ba5f86 100644 --- a/Arrowgene.Ddo.WebServer/DdoWebServer.cs +++ b/Arrowgene.Ddon.WebServer/DdonWebServer.cs @@ -1,20 +1,20 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using Arrowgene.Ddo.Shared; +using Arrowgene.Ddon.Shared; using Arrowgene.WebServer; using Arrowgene.WebServer.Server; using Arrowgene.WebServer.Server.Kestrel; using Arrowgene.WebServer.WebMiddleware; using Microsoft.Extensions.FileProviders; -namespace Arrowgene.Ddo.WebServer +namespace Arrowgene.Ddon.WebServer { - public class DdoWebServer + public class DdonWebServer { private readonly WebService _webService; - public DdoWebServer() + public DdonWebServer() { WebSetting setting = new WebSetting(); setting.ServerHeader = ""; diff --git a/Arrowgene.Ddo.WebServer/Files/www/win/exe_version b/Arrowgene.Ddon.WebServer/Files/www/win/exe_version similarity index 100% rename from Arrowgene.Ddo.WebServer/Files/www/win/exe_version rename to Arrowgene.Ddon.WebServer/Files/www/win/exe_version diff --git a/Arrowgene.Ddo.WebServer/Files/www/win/versionlist b/Arrowgene.Ddon.WebServer/Files/www/win/versionlist similarity index 100% rename from Arrowgene.Ddo.WebServer/Files/www/win/versionlist rename to Arrowgene.Ddon.WebServer/Files/www/win/versionlist diff --git a/Arrowgene.Ddo.WebServer/IndexRoute.cs b/Arrowgene.Ddon.WebServer/IndexRoute.cs similarity index 93% rename from Arrowgene.Ddo.WebServer/IndexRoute.cs rename to Arrowgene.Ddon.WebServer/IndexRoute.cs index 9d1605dc4..fbc283d04 100644 --- a/Arrowgene.Ddo.WebServer/IndexRoute.cs +++ b/Arrowgene.Ddon.WebServer/IndexRoute.cs @@ -2,7 +2,7 @@ using Arrowgene.WebServer; using Arrowgene.WebServer.Route; -namespace Arrowgene.Ddo.WebServer +namespace Arrowgene.Ddon.WebServer { public class IndexRoute : WebRoute { diff --git a/Arrowgene.Ddo.WebServer/WebServerSetting.cs b/Arrowgene.Ddon.WebServer/WebServerSetting.cs similarity index 93% rename from Arrowgene.Ddo.WebServer/WebServerSetting.cs rename to Arrowgene.Ddon.WebServer/WebServerSetting.cs index 91eed65ca..0c6605c1f 100644 --- a/Arrowgene.Ddo.WebServer/WebServerSetting.cs +++ b/Arrowgene.Ddon.WebServer/WebServerSetting.cs @@ -1,8 +1,8 @@ using System.IO; using System.Runtime.Serialization; -using Arrowgene.Ddo.Shared; +using Arrowgene.Ddon.Shared; -namespace Arrowgene.Ddo.WebServer +namespace Arrowgene.Ddon.WebServer { [DataContract] public class WebServerSetting @@ -14,7 +14,7 @@ public WebServerSetting() HttpPort = 80; HttpsEnabled = false; HttpsPort = 443; - HttpsCertPath = Path.Combine(Util.ExecutingDirectory(), "Files/ddo.pfx"); + HttpsCertPath = Path.Combine(Util.ExecutingDirectory(), "Files/ddon.pfx"); } public WebServerSetting(WebServerSetting webSetting) diff --git a/Arrowgene.DragonsDogmaOnline.sln b/Arrowgene.DragonsDogmaOnline.sln index 8165f97a4..be44e3f84 100644 --- a/Arrowgene.DragonsDogmaOnline.sln +++ b/Arrowgene.DragonsDogmaOnline.sln @@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30204.135 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arrowgene.Ddo.GameServer", "Arrowgene.Ddo.GameServer\Arrowgene.Ddo.GameServer.csproj", "{5C0F18BB-B735-4284-82A2-27506DFC9E56}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arrowgene.Ddon.GameServer", "Arrowgene.Ddon.GameServer\Arrowgene.Ddon.GameServer.csproj", "{5C0F18BB-B735-4284-82A2-27506DFC9E56}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arrowgene.Ddo.Cli", "Arrowgene.Ddo.Cli\Arrowgene.Ddo.Cli.csproj", "{72B2D640-DEA0-4BA7-A3B5-899954BFBBF5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arrowgene.Ddon.Cli", "Arrowgene.Ddon.Cli\Arrowgene.Ddon.Cli.csproj", "{72B2D640-DEA0-4BA7-A3B5-899954BFBBF5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arrowgene.Ddo.WebServer", "Arrowgene.Ddo.WebServer\Arrowgene.Ddo.WebServer.csproj", "{B6813ECD-CF44-4899-838B-94D5F85B39A6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arrowgene.Ddon.WebServer", "Arrowgene.Ddon.WebServer\Arrowgene.Ddon.WebServer.csproj", "{B6813ECD-CF44-4899-838B-94D5F85B39A6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arrowgene.Ddo.Database", "Arrowgene.Ddo.Database\Arrowgene.Ddo.Database.csproj", "{E8FD9C06-57D7-4117-97AC-DE7779A73FB1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arrowgene.Ddon.Database", "Arrowgene.Ddon.Database\Arrowgene.Ddon.Database.csproj", "{E8FD9C06-57D7-4117-97AC-DE7779A73FB1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arrowgene.Ddo.Shared", "Arrowgene.Ddo.Shared\Arrowgene.Ddo.Shared.csproj", "{840B5617-2B22-461F-96F5-9062303F08E0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arrowgene.Ddon.Shared", "Arrowgene.Ddon.Shared\Arrowgene.Ddon.Shared.csproj", "{840B5617-2B22-461F-96F5-9062303F08E0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arrowgene.Ddo.PacketLibrary", "Arrowgene.Ddo.PacketLibrary\Arrowgene.Ddo.PacketLibrary.csproj", "{BF629F75-0210-4ACA-B7E7-0E06411DFE08}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arrowgene.Ddon.PacketLibrary", "Arrowgene.Ddon.PacketLibrary\Arrowgene.Ddon.PacketLibrary.csproj", "{BF629F75-0210-4ACA-B7E7-0E06411DFE08}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/README.md b/README.md index e8a7ee56d..65ef7af63 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ C# Plugin: https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp ### Open Project: Open the Project Folder: -`\ddo-server` +`\Arrowgene.DragonsDogmaOnline` ## 3.3) IntelliJ Rider https://www.jetbrains.com/rider/ @@ -49,7 +49,7 @@ https://www.jetbrains.com/rider/ Open the `DragonsDogmaOnline.sln`-file ## 4) Debug the Project -Run the `Ddo.Cli`-Project +Run the `Ddon.Cli`-Project # Server With default configuration the server will listen on following ports: @@ -105,16 +105,4 @@ but will eventually be merged back into develop (to definitely add the new featu - MySqlConnector (https://www.nuget.org/packages/MySqlConnector) - AspNetCore (https://github.com/aspnet/AspNetCore) - .NET Standard (https://github.com/dotnet/standard) -- Arrowgene.Services (https://github.com/Arrowgene/Arrowgene.Services) - - - - -- 1 hardcoded key - s->c -- 2 hardcoded key - c->s -//- 3 hardcoded key - s->c ?? -- 4 generated key - s->c - - - - +- Arrowgene.Networking (https://github.com/sebastian-heinz/Arrowgene.Networking) \ No newline at end of file diff --git a/ReleaseFiles/StartServer.cmd b/ReleaseFiles/StartServer.cmd index 568ba0b78..36260b6fe 100644 --- a/ReleaseFiles/StartServer.cmd +++ b/ReleaseFiles/StartServer.cmd @@ -1,3 +1,3 @@ pushd "%~dp0" cd ./Server. -start Arrowgene.Ddo.Cli.exe server start \ No newline at end of file +start Arrowgene.Ddon.Cli.exe server start \ No newline at end of file diff --git a/ddo.version b/ddon.version similarity index 100% rename from ddo.version rename to ddon.version diff --git a/publish.cmd b/publish.cmd index 4aedef994..29b853dc3 100644 --- a/publish.cmd +++ b/publish.cmd @@ -1,5 +1,5 @@ REM https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-publish?tabs=netcore2x -SET /p VERSION=