wLobbies;
- GetLobbyList(lobbies);
-
- // Strip off the shard name and just leave the address
- for (int i = 0; i < lobbies.size(); i++)
- {
- std::string& str = lobbies[i];
-
- std::string::size_type endofname = str.find('\t');
- if (endofname != std::string::npos)
- str.erase(str.begin() + endofname, str.end());
-
- wchar_t *wLobby = hsStringToWString(str.c_str());
- wLobbies.push_back(wLobby);
- delete [] wLobby;
- }
-
- fLobbyList.Empty();
-
-#ifdef PLASMA_EXTERNAL_RELEASE
- // In release mode, put the user in a random lobby for rudimentary load balancing
- int numLobbies = lobbies.size();
- if (numLobbies > 0)
- {
- srand(time(NULL));
- int rnum = rand();
- int whichLobby = rnum % numLobbies;
-
- fLobbyList.AddString(wLobbies[whichLobby].c_str());
- }
-
- fLobbyList.SetCurrent(0);
-#else
- if (AllowSinglePlayerLobby())
- fLobbyList.AddString(L"Single Player");
- fLobbyList.AddStrings(wLobbies);
-
- wchar_t *wLobby = hsStringToWString(fLobbyVal.GetValue().c_str());
- int index = fLobbyList.FindStringExact(wLobby);
- if (index==LB_ERR && fLobbyVal.GetValue().length()>0)
- {
- fLobbyList.AddString(wLobby);
- index = fLobbyList.FindStringExact(wLobby);
- }
- delete [] wLobby;
-
- fLobbyList.SetCurrent((index!=LB_ERR)?index:0);
-#endif // PLASMA_EXTERNAL_RELEASE
-
- SelectedLobbyChanged();
-
- fStatusBar.SetText(L"");
- return true;
-}
-
-void plLoginDialog::OnLobbyListLostFocus()
-{
- std::string value = fLobbyList.GetValue();
- if (value.length()==0)
- {
- fLobbyList.SetCurrent(0);
- fLobbyList.SetValue(MakeSafeLobbyServerName(fLobbyList.GetValue()).c_str());
- SelectedLobbyChanged();
- }
-}
-
-#if 0
-void plLoginDialog::UpdateCtrls()
-{
- bool networkEnabled = IsNetworkPlayEnabled();
- bool loggedIn = GetLoggedIn();
- bool loggingIn = GetLoggingIn();
- bool loggedOut = GetLoggedOut();
- if (!networkEnabled && (loggedIn || loggingIn))
- {
- Logout();
-
- // these don't do anything. need to set the vars in fMainDIalog?
- loggedIn = false;
- loggingIn = false;
- loggedOut = true;
- }
-}
-#endif
-
-bool plLoginDialog::IsNetworkPlayDisabled()
-{
-#ifdef PLASMA_EXTERNAL_RELEASE
- return false;
-#else
- xtl::istring tmp = fLobbyVal.GetValue().c_str();
- return (tmp.compare("single player")==0);
-#endif
-}
-
-bool plLoginDialog::IsNetworkPlayEnabled()
-{
- return !IsNetworkPlayDisabled();
-}
-
-void plLoginDialog::OnInitDialog()
-{
- plDialog::OnInitDialog();
-
- if ( fParentWnd )
- SetParent( Handle(), fParentWnd );
-
- fStatusBar.OpenWindow(this,true);
-
-#ifdef PLASMA_EXTERNAL_RELEASE
- fLobbyList.Show(false);
- fLobbyText.Show(false);
-#endif
-
-#ifndef PLASMA_EXTERNAL_RELEASE
- fServerQueryBtn.Show(true);
-#endif
-
- bool rememberPwd = (fRememberPasswordVal.GetValue()=="true");
- fAccountName.SetValue(fAccountNameVal.GetValue().c_str());
- if (rememberPwd)
- {
- int len = atoi(fPasswordLen.GetValue().c_str());
- std::string fakePwd(len, '*');
- fPassword.SetValue(fakePwd.c_str());
- }
-
- fRememberPassword.Check(rememberPwd);
-
- RefreshLobbyList();
-
- if ( fAutoLogin )
- fLoginBtn.Click();
-
-// SetForegroundWindow(*this);
-}
-
-bool plLoginDialog::Login()
-{
- int ret = DoModal();
- if (ret<0)
- {
- hsAssert(false, xtl::format("plLoginDialog failed to initialize, err code %d, GetLastError %d",
- ret, GetLastError()).c_str());
- }
-
- return (ret != 0);
-}
-
-void plLoginDialog::ILogin()
-{
- OnLoginClicked();
-
- fAccountNameVal.SetValue(fAccountName.GetValue().c_str());
-
- std::string pwd = fPassword.GetValue();
- int pwdSize = pwd.size();
-
- std::string fakePwd = "*" + std::string(pwdSize-1, '*');
- if (pwd != fakePwd) // user has entered a real pwd
- {
- fPasswordLen.SetValue(xtl::format("%d",pwd.size()).c_str());
- // MD5 HASH the pwd
- std::string hex;
- plChallengeResponse::HashPassword(pwd.c_str(), hex);
- fPasswordVal.SetValue(hex.c_str());
- }
-
- SetDataServerUserName(true, fAccountNameVal.GetValue().c_str());
- SetDataServerPassword(true, fPasswordVal.GetValue().c_str());
- SetDataServerUserName(false, fAccountNameVal.GetValue().c_str());
- SetDataServerPassword(false, fPasswordVal.GetValue().c_str());
-
- if (IsNetworkPlayEnabled())
- StartLogin();
- else
- CompleteLogin();
-}
-
-void plLoginDialog::IOnRememberPwdChanged()
-{
- fRememberPasswordVal.SetValue(fRememberPassword.IsChecked() ? "true" : "false");
-}
-
-void plLoginDialog::IExit()
-{
- fAccountNameVal.SetValue(fAccountName.GetValue().c_str());
- fPasswordVal.SetValue(fPassword.GetValue().c_str());
- fLobbyVal.SetValue(fLobbyList.GetValue().c_str());
- SetDataServerUserName(true, fAccountNameVal.GetValue().c_str());
- SetDataServerPassword(true, fPasswordVal.GetValue().c_str());
- SetDataServerUserName(false, fAccountNameVal.GetValue().c_str());
- SetDataServerPassword(false, fPasswordVal.GetValue().c_str());
- SHORT state = GetKeyState(VK_SHIFT);
- if (state&0x8000)
- EndDialogTrue();
- else
- EndDialogFalse();
- fCancelled=true;
-}
-
-int plLoginDialog::ICheckNetVersion(plNetMsgAuthenticateChallenge * msg)
-{
- if (msg)
- {
- if (msg->GetVersionMajor() != plNetMessage::kVerMajor ||
- msg->GetVersionMinor() != plNetMessage::kVerMinor)
- {
- std::string str = xtl::format("Login Failed, client/server version mismatch, client %d.%d, server %d.%d",
- plNetMessage::kVerMajor, plNetMessage::kVerMinor,
- msg->GetVersionMajor(),
- msg->GetVersionMinor());
- FailLogin(str.c_str());
- return hsFail;
- }
- return hsOK;
- }
- return hsFail;
-}
-
-void plLoginDialog::HandleAuthChallenge(plNetMsgAuthenticateChallenge * msg)
-{
- int cnt = msg->PeekBuffer(msg->GetNetCoreMsg()->GetData(),msg->GetNetCoreMsg()->GetLen());
-
- // check protocol version first, in case msg contents are hosed
- if (ICheckNetVersion(msg) == hsFail)
- return; // version err
-
- if (msg->IsContinuing())
- {
- // Respond to the Challenge
- std::string hex = plChallengeResponse::GetBufferAsHexStr(msg->GetChallenge().data(), msg->GetChallenge().size(), true);
- fChallengeResponse.SetChallenge(hex);
- fChallengeResponse.GenerateResponse(fAccountNameVal.GetValue().c_str(),fPasswordVal.GetValue().c_str());
- KillTimer(*this,kAuthTimedOut);
- SendAuthenticateResponse();
- }
- else
- {
- FailLogin(msg->GetHelloResult());
- }
-}
-
-void plLoginDialog::HandleAccountAuthenticated(plNetMsgAccountAuthenticated * msg)
-{
- int cnt = msg->PeekBuffer(msg->GetNetCoreMsg()->GetData(),msg->GetNetCoreMsg()->GetLen());
- if (msg->IsAuthenticated())
- {
- CompleteLogin();
- }
- else
- {
- FailLogin(msg->GetAuthResult());
- }
-}
-
-
-void plLoginDialog::StartLogin()
-{
- fLoginBtn.SetEnabled(false);
- std::string value = fLobbyList.GetValue();
- if (value.length()==0)
- {
- fLobbyList.SetCurrent(0);
- fLobbyList.SetValue(MakeSafeLobbyServerName(fLobbyList.GetValue()).c_str());
- SelectedLobbyChanged();
- }
- fStatusBar.SetText(L"Authenticating...");
-// fMainDialog->InitNetCore();
-// fMainDialog->fLoginState = kLoggingIn;
-// fAccountTab.UpdateCtrls();
-// fPlayerTab.SetPlayerVault(nil);
- SendAuthenticateHello();
-}
-
-void plLoginDialog::CompleteLogin()
-{
- if ( Handle() )
- fLoginBtn.SetEnabled(true);
-
- KillTimer(*this,kAuthTimedOut);
-
- fStatusBar.SetText(L"");
- if (IsNetworkPlayEnabled())
- NotifyConnected();
- else
- NotifyDisconnected();
-
- EndDialogTrue();
-
- GetClientManifests();
- UpdateAllCtrls();
-}
-
-void plLoginDialog::FailLogin(const char* str)
-{
- fLoginBtn.SetEnabled(true);
- KillTimer(*this, kAuthTimedOut);
- fStatusBar.SetText(L"");
- hsMessageBoxWithOwner((void*)*this,str,"Error",hsMessageBoxNormal);
- Logout();
-}
-
-void plLoginDialog::FailLogin(int reasonCode)
-{
- std::string str = xtl::format("Failed to login to lobby server %s: %s",
- fLobbyVal.GetValue().c_str(), plNetMsgAccountAuthenticated::GetAuthResultString(reasonCode));
- FailLogin(str.c_str());
-}
-
-void plLoginDialog::TimeoutLogin()
-{
- fLoginBtn.SetEnabled(true);
-
- wchar_t *wStr = hsStringToWString(xtl::format("Timed out logging into lobby server %s.", fLobbyVal.GetValue().c_str()).c_str());
- fStatusBar.SetText(wStr);
- delete [] wStr;
-
- KillTimer(*this, kAuthTimedOut);
- Logout();
-}
-
-void plLoginDialog::Logout()
-{
- KillTimer(*this, kAuthTimedOut);
- SendLobbyLeave();
- //fMainDialog->ShutdownNetCore();
- NotifyDisconnected();
-}
-
-void plLoginDialog::SendLobbyLeave()
-{
- plNetMsgLeave msg;
- msg.SetReason( plPlayerUpdateConstants::kPlayerQuitting );
- SendMsg(&msg,plNetAddress(fLobbyVal.GetValue().c_str(),plNetLobbyServerConstants::GetPort()));
- RemoveLobbyPeer();
-}
-
-#define MSG_TIMEOUT 8000
-#include "../pnNetCommon/plNetAddress.h"
-
-void plLoginDialog::SendAuthenticateHello()
-{
- SetTimer(*this,kAuthTimedOut,MSG_TIMEOUT,nil);
- plNetMsgAuthenticateHello msg;
- msg.SetAccountName(fAccountNameVal.GetValue().c_str());
- msg.SetMaxPacketSize(GetPacketSize());
- SendMsg(&msg,plNetAddress(fLobbyVal.GetValue().c_str(),plNetLobbyServerConstants::GetPort()));
-}
-
-void plLoginDialog::SendAuthenticateResponse()
-{
- SetTimer(*this,kAuthTimedOut,MSG_TIMEOUT,nil);
- plNetMsgAuthenticateResponse msg;
- msg.SetResponse(fChallengeResponse.GetResponse());
- SendMsg(&msg,plNetAddress(fLobbyVal.GetValue().c_str(),plNetLobbyServerConstants::GetPort()));
-}
-
-int plLoginDialog::CallDefaultProc( unsigned int message, unsigned int wParam, LONG lParam )
-{
- switch (message)
- {
- case WM_TIMER:
- switch (wParam)
- {
- case kAuthTimedOut:
- TimeoutLogin();
- break;
- }
- }
-
- return 0;
-}
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-#ifndef PLASMA_EXTERNAL_RELEASE
-#define kServerInfoFilename "server_info.html"
-
-static void StringToLines(std::string str, plStringList & lines, bool includeBlankLines=true)
-{
- xtl::trim(str);
- if (str.length()==0)
- return;
- str.append("\n");
- int pos;
- while ((pos=str.find("\n"))!=std::string::npos)
- {
- std::string line = xtl::trim(str.substr(0,pos).c_str());
- str.erase(0,pos+1);
- if (includeBlankLines || (!includeBlankLines && line.length()>0))
- lines.push_back(line);
- }
-}
-
-static void GetPathElements(std::string filename, plStringList & lst)
-{
- int pos;
- while ((pos=filename.find_first_of("\\/"))!=std::string::npos)
- {
- std::string element = filename.substr(0,pos);
- filename.erase(0,pos+1);
- if (element.length())
- lst.push_back(element);
- }
-}
-
-struct SDLInfoParser
-{
- std::string fFilename;
- std::string fDescriptorName;
- int fVersion;
- void ParseString( const char * s )
- {
- std::string str = s;
- int p = str.find(",");
- fFilename = str.substr(0,p);
- str.erase(0,p+1);
- p = str.find(",");
- fDescriptorName = str.substr(0,p);
- str.erase(0,p+1);
- fVersion = atoi(str.c_str());
-
- p = fFilename.find_last_of("\\");
- if( p!=std::string::npos )
- fFilename.erase(0,p+1);
- p = fFilename.find_last_of("/");
- if( p!=std::string::npos )
- fFilename.erase(0,p+1);
- }
-};
-
-
-struct DescriptorReport
-{
- int fServerVersion; // 0 means the descriptor is missing
- int fClientVersion;
- DescriptorReport(): fServerVersion(0),fClientVersion(0){}
-};
-
-#define kStyleSheet \
- ""
-
-void plLoginDialog::ServerQueryBtnClicked()
-{
- hsUNIXStream file;
- file.Open( kServerInfoFilename, "wt" );
- file.WriteString(""kStyleSheet"\n");
-
- try
- {
- typedef std::map< std::string, DescriptorReport > DescriptorReports;
- typedef std::map< std::string, DescriptorReports > FileReports;
-
- FileReports fileReports;
-
-
- /*plURL url;
- plHttpRequest request;
- plHttpResponse response;
-
- // read server build date etc.
- url.SetHost( fLobbyList.GetValue().c_str() );
- url.SetPort( 7676 );
- url.SetFile( "VersionInfo" );
- request.SetUrl( url );
- request.SetType( plHttpRequest::kGet );
- if ( !request.MakeRequest( response ) )
- throw 0;
- file.WriteString("\n" );
- file.WriteString( "\n" );
- file.WriteString( response.c_str() );
- file.WriteString( "
\n" );
-
- // get server's SDL info
- url.SetFile( "SDLInfo" );
- request.SetUrl( url );
- if ( !request.MakeRequest( response ) )
- throw 0;
- plStringList lines;
- StringToLines( response, lines, false );
- SDLInfoParser parser;
- {for ( plStringList::iterator ii=lines.begin(); ii!=lines.end(); ++ii )
- {
- parser.ParseString( (*ii).c_str() );
- fileReports[ parser.fFilename ][ parser.fDescriptorName ].fServerVersion = parser.fVersion;
- }}
-
- // get client's SDL info
- plSDLMgr::GetInstance()->DeInit();
- plSDLMgr::GetInstance()->SetSDLDir( "SDL" );
- plSDLMgr::GetInstance()->Init();
- const plSDL::DescriptorList * cds = plSDLMgr::GetInstance()->GetDescriptors();
- {for ( plSDL::DescriptorList::const_iterator ii=cds->begin(); ii!=cds->end(); ++ii )
- {
- plStateDescriptor * descriptor = *ii;
- std::string filename = descriptor->GetFilename();
- int p = filename.find_last_of(PATH_SEPARATOR_STR);
- if( p!=std::string::npos )
- filename.erase(0,p+1);
- fileReports[ filename ][ descriptor->GetName() ].fClientVersion = descriptor->GetVersion();
- }}
-
- // write SDL comparison report
- file.WriteString("\n" );
- file.WriteString("Version=0 means descriptor doesn't exist.
\n" );
- file.WriteString( "| File | Server Version | Client Version | Status |
\n" );
-
-
- { for ( FileReports::iterator ii=fileReports.begin(); ii!=fileReports.end(); ++ii )
- {
- std::string sdlFilename = ii->first;
- DescriptorReports & descrReports = ii->second;
- file.WriteFmt( "| %s |
\n", sdlFilename.c_str() );
- { for ( DescriptorReports::iterator jj=descrReports.begin(); jj!=descrReports.end(); ++jj )
- {
-#define kSDLBad "Bad"
-#define kSDLOk "Ok"
- std::string descrName = jj->first;
- DescriptorReport & descrReport = jj->second;
- file.WriteFmt( "| %s | %d | %d | %s |
\n",
- descrName.c_str(), descrReport.fServerVersion, descrReport.fClientVersion,
- ( descrReport.fServerVersion==descrReport.fClientVersion ) ? kSDLOk:kSDLBad );
- }}
- }}
-
- file.WriteString("
\n");*/
- }
- catch (...)
- {
- file.WriteString("An error occurred while querying the server.\n");
- }
-
- file.WriteString("\n");
- file.Close();
-
- ShellExecute( nil, nil, kServerInfoFilename, nil, nil, SW_SHOWNORMAL );
-}
-#endif
-/////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.h b/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.h
deleted file mode 100644
index af22dc80..00000000
--- a/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program 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.
-
-This program 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 this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-#ifndef plLoginDialog_h_inc
-#define plLoginDialog_h_inc
-
-#include "plWndCtrls/plWndCtrls.h"
-// #include "plEncryption/plChallengeResponse.h"
-#include "pnNetCommon/plNetAddress.h"
-
-class plMainDialog;
-class plNetMsgAuthenticateChallenge;
-class plNetMsgAccountAuthenticated;
-class plNetMessage;
-
-class plLoginDialog : public plDialog
-{
- HWND fParentWnd;
-public:
- DECLARE_WINDOWCLASS(plLoginDialog, plDialog);
-
- plLoginDialog( HWND parentWnd=nil );
-
- bool Login();
-
- void OnInitDialog();
-
- void HandleAuthChallenge(plNetMsgAuthenticateChallenge * msg);
- void HandleAccountAuthenticated(plNetMsgAccountAuthenticated * msg);
- void StartLogin();
- void CompleteLogin();
- void FailLogin(int reasonCode);
- void FailLogin(const char* str);
- void TimeoutLogin();
- void Logout();
- void SendAuthenticateHello();
- void SendAuthenticateResponse();
-
- bool IsNetworkPlayDisabled();
- bool IsNetworkPlayEnabled();
-// void UpdateCtrls();
- void SelectedLobbyChanged();
- void SelectedLobbyTextEdited();
- void OnLobbyListLostFocus();
- void SendLobbyLeave();
- bool RefreshLobbyList();
- bool GetCancelled() const { return fCancelled; }
- bool GetRememberPassword() const { return fRememberPassword.IsChecked(); }
-
- // callbacks
- virtual void GetLobbyList(plStringList& lobbies) = 0;
- virtual bool AllowSinglePlayerLobby() { return true; } // checked in non external-release build
- virtual void SetDataServerUserName(bool local, const char* s) {}
- virtual void SetDataServerPassword(bool local, const char* s) {}
- virtual void RemoveLobbyPeer() {}
- virtual void NotifyConnected() {}
- virtual void NotifyDisconnected() {}
- virtual void GetClientManifests() {}
- virtual void UpdateAllCtrls() {}
- virtual unsigned int GetPacketSize() = 0;
- virtual bool SendMsg(plNetMessage * msg, plNetAddress & addr) = 0;
- virtual void OnLoginClicked() {}
-
- std::string MakeSafeLobbyServerName(const std::string & value);
-
- int CallDefaultProc( unsigned int message, unsigned int wParam, LONG lParam );
-
- plEdit fAccountName;
- plEdit fPassword;
- plChallengeResponse fChallengeResponse;
- plComboBox fLobbyList;
- plLabel fLobbyText;
- plCheckBox fRememberPassword;
-
-#ifndef PLASMA_EXTERNAL_RELEASE
- plButton fServerQueryBtn;
- void ServerQueryBtnClicked();
-#endif
-
- plConfigValue fAccountNameVal;
- plConfigValue fPasswordVal; // the pwd as a MD5 hash
- plConfigValue fRememberPasswordVal; // the checkbox state
- plConfigValue fPasswordLen; // the length of the original pwd
- plConfigValue fLobbyVal;
- bool fAutoLogin;
-
- plStatusBar fStatusBar;
-
-protected:
- int ICheckNetVersion(plNetMsgAuthenticateChallenge * msg);
- void ILogin();
- void IExit();
- void IOnRememberPwdChanged();
-
- bool fCancelled;
- plButton fLoginBtn;
- plButton fCancelBtn;
-};
-
-#endif // plLoginDialog_h_inc
diff --git a/Sources/Plasma/FeatureLib/pfLoginDialog/resource.h b/Sources/Plasma/FeatureLib/pfLoginDialog/resource.h
deleted file mode 100644
index df4b2921..00000000
--- a/Sources/Plasma/FeatureLib/pfLoginDialog/resource.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by pfLoginDialog.rc
-//
-#define IDD_DIALOG_LOGIN 326
-#define IDC_LOGIN_USERNAME 3029
-#define IDC_LOGIN_PASSWORD 3031
-#define IDC_LOGIN_LOBBYLIST 3033
-#define IDC_LOGIN_STATIC_SERVER 3127
-#define IDC_LOGIN_LOGIN 3130
-#define IDC_LOGIN_CANCEL 3131
-#define IDC_SERVER_QUERY_BTN 3132
-#define IDC_REMEMBER_PASSWORD 3133
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 327
-#define _APS_NEXT_COMMAND_VALUE 42001
-#define _APS_NEXT_CONTROL_VALUE 3134
-#define _APS_NEXT_SYMED_VALUE 327
-#endif
-#endif
diff --git a/Sources/Plasma/NucleusLib/CMakeLists.txt b/Sources/Plasma/NucleusLib/CMakeLists.txt
index bbaebdea..06e94361 100644
--- a/Sources/Plasma/NucleusLib/CMakeLists.txt
+++ b/Sources/Plasma/NucleusLib/CMakeLists.txt
@@ -4,8 +4,6 @@ add_subdirectory(inc)
add_subdirectory(pnAddrInfo)
add_subdirectory(pnAsyncCore)
add_subdirectory(pnAsyncCoreExe)
-#add_subdirectory(pnCsrCli) # Not being used in any current sln
-add_subdirectory(pnCsrNet)
add_subdirectory(pnDispatch)
add_subdirectory(pnEncryption)
add_subdirectory(pnFactory)
@@ -20,7 +18,6 @@ add_subdirectory(pnNetCommon)
add_subdirectory(pnNetProtocol)
add_subdirectory(pnProduct)
add_subdirectory(pnSceneObject)
-add_subdirectory(pnSimpleNet)
add_subdirectory(pnTimer)
add_subdirectory(pnUtils)
add_subdirectory(pnUtilsExe)
diff --git a/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcIo.h b/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcIo.h
index 5fd04990..4d22c11e 100644
--- a/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcIo.h
+++ b/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcIo.h
@@ -162,8 +162,8 @@ enum EConnType {
kConnTypeSrvToState = 17,
kConnTypeSrvToLog = 18,
kConnTypeSrvToScore = 19,
- kConnTypeCliToCsr = 20,
- kConnTypeSimpleNet = 21,
+ kConnTypeCliToCsr = 20, // DEAD
+ kConnTypeSimpleNet = 21, // DEAD
kConnTypeCliToGateKeeper = 22,
// Text connections
diff --git a/Sources/Plasma/NucleusLib/pnCsrCli/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnCsrCli/CMakeLists.txt
deleted file mode 100644
index da5b045d..00000000
--- a/Sources/Plasma/NucleusLib/pnCsrCli/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-include_directories(../../CoreLib)
-include_directories(../../NucleusLib)
-
-set(pnCsrCli_SOURCES
- pnCsrCli.cpp
-)
-
-set(pnCsrCli_HEADERS
- Pch.h
- pnCsrCli.h
-)
-
-add_library(pnCsrCli STATIC ${pnCsrCli_SOURCES} ${pnCsrCli_HEADERS})
-
-source_group("Source Files" FILES ${pnCsrCli_SOURCES})
-source_group("Header Files" FILES ${pnCsrCli_HEADERS})
\ No newline at end of file
diff --git a/Sources/Plasma/NucleusLib/pnCsrCli/Pch.h b/Sources/Plasma/NucleusLib/pnCsrCli/Pch.h
deleted file mode 100644
index fe3ec30d..00000000
--- a/Sources/Plasma/NucleusLib/pnCsrCli/Pch.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program 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.
-
-This program 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 this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-* $/Plasma20/Sources/Plasma/NucleusLib/pnCsrCli/Pch.h
-*
-***/
-
-#ifdef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNCSRCLI_PCH_H
-#error "Header $/Plasma20/Sources/Plasma/NucleusLib/pnCsrCli/Pch.h included more than once"
-#endif
-#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNCSRCLI_PCH_H
-
-
-#include "pnCsrCli.h"
-
-#include
diff --git a/Sources/Plasma/NucleusLib/pnCsrCli/pnCsrCli.cpp b/Sources/Plasma/NucleusLib/pnCsrCli/pnCsrCli.cpp
deleted file mode 100644
index de85ebf0..00000000
--- a/Sources/Plasma/NucleusLib/pnCsrCli/pnCsrCli.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program 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.
-
-This program 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 this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-* $/Plasma20/Sources/Plasma/NucleusLib/pnCsrCli/pnCsrCli.cpp
-*
-***/
-
-#include "Pch.h"
-#pragma hdrstop
-
-
-/*****************************************************************************
-*
-* Local types
-*
-***/
-
-
-/*****************************************************************************
-*
-* Local data
-*
-***/
-
-static bool s_running;
-static CCritSect s_critsect;
-static SimpleNetConn * s_conn;
-static FCsrCliOnError s_onError;
-
-
-/*****************************************************************************
-*
-* Local functions
-*
-***/
-
-//============================================================================
-static SimpleNetConn * GetConnIncRef () {
-
- SimpleNetConn * conn;
- s_critsect.Enter();
- {
- if (nil != (conn = s_conn))
- SimpleNetConnIncRef(conn);
- }
- s_critsect.Leave();
- return conn;
-}
-
-//============================================================================
-static bool SimpleNetOnMsg (
- SimpleNetConn * ,
- SimpleNet_MsgHeader *
-) {
- LogMsg(kLogPerf, L"pnCsrCli: Rcvd unexpected message from peer");
- return false;
-}
-
-//============================================================================
-static void SimpleNetOnError (
- SimpleNetConn * ,
- ENetError error
-) {
- if (!s_running)
- return;
-
- LogMsg(kLogPerf, L"pnCsrCli: NetError: %s", NetErrorToString(error));
-
- if (error == kNetErrDisconnected)
- CsrCliDisconnect();
-
- s_onError(error);
-}
-
-//============================================================================
-static void SimpleNetOnConnect (
- void * param,
- SimpleNetConn * conn,
- ENetError result
-) {
- FCsrCliOnConnect onConnect = (FCsrCliOnConnect)param;
-
- LogMsg(kLogPerf, L"pnCsrCli: OnConnect: %s", NetErrorToString(result));
-
- if (s_conn)
- CsrCliDisconnect();
-
- if (IS_NET_SUCCESS(result)) {
- s_critsect.Enter();
- {
- s_conn = conn;
- }
- s_critsect.Leave();
- }
-
- if (onConnect)
- onConnect(result);
-}
-
-//============================================================================
-static void Send_ExecConsoleCmd (const char cmd[]) {
-
- SimpleNetConn * conn = GetConnIncRef();
- if (!conn)
- return;
-
- unsigned cmdBytes = StrBytes(cmd);
-
- CsrNet_ExecConsoleCmd * msg;
-
- unsigned msgBytes
- = sizeof(*msg)
- - sizeof(msg->cmd)
- + cmdBytes
- + sizeof(cmd[0])
- ;
-
- msg = new(_alloca(msgBytes)) CsrNet_ExecConsoleCmd();
- msg->messageBytes = msgBytes;
-
- StrCopy(msg->cmd, cmd, cmdBytes / sizeof(cmd[0]));
- msg->cmd[cmdBytes] = 0;
-
- SimpleNetSend(conn, msg);
- SimpleNetConnDecRef(conn);
-}
-
-
-/*****************************************************************************
-*
-* Exports
-*
-***/
-
-//============================================================================
-void CsrCliInitialize (FCsrCliOnError onError) {
-
- ASSERT(!s_running);
- ASSERT(onError);
-
- s_running = true;
- s_onError = onError;
-
- SimpleNetInitialize();
- SimpleNetCreateChannel(kSimpleNetChannelCsr, SimpleNetOnMsg, SimpleNetOnError);
-};
-
-//============================================================================
-void CsrCliShutdown () {
-
- s_running = false;
- s_onError = nil;
-
- CsrCliDisconnect();
- SimpleNetDestroyChannel(kSimpleNetChannelCsr);
- SimpleNetShutdown();
-}
-
-//============================================================================
-void CsrCliStartConnecting (
- const wchar_t addr[],
- FCsrCliOnConnect onConnect
-) {
- ASSERT(s_running);
-
- CsrCliDisconnect();
- SimpleNetStartConnecting(kSimpleNetChannelCsr, addr, SimpleNetOnConnect, onConnect);
-}
-
-//============================================================================
-void CsrCliDisconnect () {
-
- SimpleNetConn * conn = nil;
- s_critsect.Enter();
- {
- SWAP(conn, s_conn);
- }
- s_critsect.Leave();
- if (conn)
- SimpleNetDisconnect(conn);
-}
-
-//============================================================================
-void CsrCliToggleAvatarPhysical () {
-
- ASSERT(s_running);
-
- Send_ExecConsoleCmd("Avatar.Physics.TogglePhysical");
-}
-
-//============================================================================
-void CsrCliWarpPlayerHere (unsigned playerId) {
-
- ASSERT(s_running);
-
- char cmd[1024];
- StrPrintf(cmd, arrsize(cmd), "CCR.WarpPlayerHere %u", playerId);
- Send_ExecConsoleCmd(cmd);
-}
-
-//============================================================================
-void CsrCliWarpToPlayer (unsigned playerId) {
-
- ASSERT(s_running);
-
- char cmd[1024];
- StrPrintf(cmd, arrsize(cmd), "CCR.WarpToPlayer %u", playerId);
- Send_ExecConsoleCmd(cmd);
-}
-
-//============================================================================
-void CsrCliLinkPlayerHere (unsigned playerId) {
-
- ASSERT(s_running);
-
- char cmd[1024];
- StrPrintf(cmd, arrsize(cmd), "CCR.LinkPlayerHere %u", playerId);
- Send_ExecConsoleCmd(cmd);
-}
-
-//============================================================================
-void CsrCliLinkToPlayer (unsigned playerId) {
-
- ASSERT(s_running);
-
- char cmd[1024];
- StrPrintf(cmd, arrsize(cmd), "CCR.LinkToPlayer %u", playerId);
- Send_ExecConsoleCmd(cmd);
-}
diff --git a/Sources/Plasma/NucleusLib/pnCsrCli/pnCsrCli.h b/Sources/Plasma/NucleusLib/pnCsrCli/pnCsrCli.h
deleted file mode 100644
index 2a123f07..00000000
--- a/Sources/Plasma/NucleusLib/pnCsrCli/pnCsrCli.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program 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.
-
-This program 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 this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-* $/Plasma20/Sources/Plasma/NucleusLib/pnCsrCli/pnCsrCli.h
-*
-***/
-
-#ifndef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNCSRCLI_PNCSRCLI_H
-#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNCSRCLI_PNCSRCLI_H
-
-
-#include "pnCsrNet/pnCsrNet.h"
-
-
-/*****************************************************************************
-*
-* pnCsrCli
-* - Connects to pfCsrSrv in remote CSR client.
-* - Sends commands to pfCsrSrv for remote execution.
-*
-***/
-
-typedef void (*FCsrCliOnError) (ENetError error);
-
-void CsrCliInitialize (FCsrCliOnError onError);
-void CsrCliShutdown ();
-
-typedef void (*FCsrCliOnConnect) (ENetError result);
-
-void CsrCliStartConnecting (
- const wchar_t addr[],
- FCsrCliOnConnect onConnect
-);
-void CsrCliDisconnect ();
-
-void CsrCliToggleAvatarPhysical ();
-void CsrCliWarpPlayerHere (unsigned playerId);
-void CsrCliWarpToPlayer (unsigned playerId);
-void CsrCliLinkPlayerHere (unsigned playerId);
-void CsrCliLinkToPlayer (unsigned playerId);
-
-
-#endif // PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNCSRCLI_PNCSRCLI_H
diff --git a/Sources/Plasma/NucleusLib/pnCsrNet/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnCsrNet/CMakeLists.txt
deleted file mode 100644
index b942717b..00000000
--- a/Sources/Plasma/NucleusLib/pnCsrNet/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-include_directories(../../CoreLib)
-include_directories(../../NucleusLib)
-
-set(pnCsrNet_SOURCES
- pnCsrNet.cpp
-)
-
-set(pnCsrNet_HEADERS
- Pch.h
- pnCsrNet.h
-)
-
-add_library(pnCsrNet STATIC ${pnCsrNet_SOURCES} ${pnCsrNet_HEADERS})
-
-source_group("Source Files" FILES ${pnCsrNet_SOURCES})
-source_group("Header Files" FILES ${pnCsrNet_HEADERS})
\ No newline at end of file
diff --git a/Sources/Plasma/NucleusLib/pnCsrNet/Pch.h b/Sources/Plasma/NucleusLib/pnCsrNet/Pch.h
deleted file mode 100644
index 1298d8d1..00000000
--- a/Sources/Plasma/NucleusLib/pnCsrNet/Pch.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program 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.
-
-This program 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 this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-* $/Plasma20/Sources/Plasma/NucleusLib/pnCsrNet/Pch.h
-*
-***/
-
-#ifdef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNCSRNET_PCH_H
-#error "Header $/Plasma20/Sources/Plasma/NucleusLib/pnCsrNet/Pch.h included more than once"
-#endif
-#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNCSRNET_PCH_H
-
-
-#include "pnCsrNet.h"
diff --git a/Sources/Plasma/NucleusLib/pnCsrNet/pnCsrNet.cpp b/Sources/Plasma/NucleusLib/pnCsrNet/pnCsrNet.cpp
deleted file mode 100644
index d68887a6..00000000
--- a/Sources/Plasma/NucleusLib/pnCsrNet/pnCsrNet.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program 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.
-
-This program 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 this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-* $/Plasma20/Sources/Plasma/NucleusLib/pnCsrNet/pnCsrNet.cpp
-*
-***/
-
-#include "Pch.h"
-#pragma hdrstop
diff --git a/Sources/Plasma/NucleusLib/pnCsrNet/pnCsrNet.h b/Sources/Plasma/NucleusLib/pnCsrNet/pnCsrNet.h
deleted file mode 100644
index f5de1923..00000000
--- a/Sources/Plasma/NucleusLib/pnCsrNet/pnCsrNet.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program 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.
-
-This program 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 this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-* $/Plasma20/Sources/Plasma/NucleusLib/pnCsrNet/pnCsrNet.h
-*
-***/
-
-#ifndef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNCSRNET_PNCSRNET_H
-#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNCSRNET_PNCSRNET_H
-
-
-#include "pnSimpleNet/pnSimpleNet.h"
-
-
-/*****************************************************************************
-*
-* CSR Client Automation - Types and Constants
-*
-***/
-
-// Newer CSR game clients must remain compatible with older CSR tools,
-// therefore these values may not change. Only append to this enum.
-enum {
- kCsrNet_ExecConsoleCmd,
-};
-
-//============================================================================
-// BEGIN PACKED DATA STRUCTURES
-//============================================================================
-#pragma pack(push,1)
-
-#define CSRNET_MSG(a) \
- CsrNet_##a () : SimpleNet_MsgHeader(kSimpleNetChannelCsr, kCsrNet_##a) { }
-
-struct CsrNet_ExecConsoleCmd : SimpleNet_MsgHeader {
- CSRNET_MSG (ExecConsoleCmd);
-
- char cmd[1]; // null-terminated string
-};
-
-#undef CSRNET_MSG
-//============================================================================
-// END PACKED DATA STRUCTURES
-//============================================================================
-#pragma pack(pop)
-
-
-#endif // PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNCSRNET_PNCSRNET_H
diff --git a/Sources/Plasma/NucleusLib/pnNetBase/pnNbConst.h b/Sources/Plasma/NucleusLib/pnNetBase/pnNbConst.h
index 5700e2b2..ca26c243 100644
--- a/Sources/Plasma/NucleusLib/pnNetBase/pnNbConst.h
+++ b/Sources/Plasma/NucleusLib/pnNetBase/pnNbConst.h
@@ -121,20 +121,6 @@ const AccountRoleInfo kAccountRoles[] = {
{ kAccountRolesAllUserFlags, "End" }
};
-
-/*****************************************************************************
-*
-* Csr
-*
-***/
-
-enum ECsrFlags {
- kCsrFlagAdmin = 1 << 0,
- kCsrFlagDisabled = 1 << 1,
- kCsrFlagServer = 1 << 2,
-};
-
-
/*****************************************************************************
*
* Game Score Types
diff --git a/Sources/Plasma/NucleusLib/pnNetBase/pnNbKeys.cpp b/Sources/Plasma/NucleusLib/pnNetBase/pnNbKeys.cpp
index 689013c2..4c421a73 100644
--- a/Sources/Plasma/NucleusLib/pnNetBase/pnNbKeys.cpp
+++ b/Sources/Plasma/NucleusLib/pnNetBase/pnNbKeys.cpp
@@ -46,10 +46,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
uint8_t kAuthDhNData[kNetDiffieHellmanKeyBits / 8] = {0};
uint8_t kAuthDhXData[kNetDiffieHellmanKeyBits / 8] = {0};
-// CSR Server
-uint8_t kCsrDhNData[kNetDiffieHellmanKeyBits / 8] = {0};
-uint8_t kCsrDhXData[kNetDiffieHellmanKeyBits / 8] = {0};
-
// Game Server
uint8_t kGameDhNData[kNetDiffieHellmanKeyBits / 8] = {0};
uint8_t kGameDhXData[kNetDiffieHellmanKeyBits / 8] = {0};
diff --git a/Sources/Plasma/NucleusLib/pnNetBase/pnNbKeys.h b/Sources/Plasma/NucleusLib/pnNetBase/pnNbKeys.h
index f5dce58b..235795f2 100644
--- a/Sources/Plasma/NucleusLib/pnNetBase/pnNbKeys.h
+++ b/Sources/Plasma/NucleusLib/pnNetBase/pnNbKeys.h
@@ -51,11 +51,6 @@ static const unsigned kAuthDhGValue = 41;
extern uint8_t kAuthDhNData[kNetDiffieHellmanKeyBits / 8];
extern uint8_t kAuthDhXData[kNetDiffieHellmanKeyBits / 8];
-// CSR Server
-static const unsigned kCsrDhGValue = 97;
-extern uint8_t kCsrDhNData[kNetDiffieHellmanKeyBits / 8];
-extern uint8_t kCsrDhXData[kNetDiffieHellmanKeyBits / 8];
-
// Game Server
static const unsigned kGameDhGValue = 73;
extern uint8_t kGameDhNData[kNetDiffieHellmanKeyBits / 8];
diff --git a/Sources/Plasma/NucleusLib/pnNetBase/pnNbProtocol.cpp b/Sources/Plasma/NucleusLib/pnNetBase/pnNbProtocol.cpp
index 80b5955d..a6946de0 100644
--- a/Sources/Plasma/NucleusLib/pnNetBase/pnNbProtocol.cpp
+++ b/Sources/Plasma/NucleusLib/pnNetBase/pnNbProtocol.cpp
@@ -59,12 +59,12 @@ const wchar_t * NetProtocolToString (ENetProtocol protocol) {
{ kNetProtocolDebug, L"kNetProtocolDebug" },
// Client connections
- { kNetProtocolCli2Csr, L"GateKeeper Server" },
- { kNetProtocolCli2Csr, L"Csr Server" },
- { kNetProtocolCli2Auth, L"Auth Server" },
- { kNetProtocolCli2Game, L"Game Server" },
- { kNetProtocolCli2File, L"File Server" },
- { kNetProtocolCli2Unused_01, L"kNetProtocolCli2Unused_01" },
+ { kNetProtocolCli2GateKeeper, L"GateKeeper Server" },
+ { kNetProtocolCli2Unused_02, L"kNetProtocolCli2Unused_02" },
+ { kNetProtocolCli2Auth, L"Auth Server" },
+ { kNetProtocolCli2Game, L"Game Server" },
+ { kNetProtocolCli2File, L"File Server" },
+ { kNetProtocolCli2Unused_01, L"kNetProtocolCli2Unused_01" },
// Server connections
{ kNetProtocolSrvConn, L"kNetProtocolSrvConn" },
diff --git a/Sources/Plasma/NucleusLib/pnNetBase/pnNbProtocol.h b/Sources/Plasma/NucleusLib/pnNetBase/pnNbProtocol.h
index 63fa92cb..e3df91b3 100644
--- a/Sources/Plasma/NucleusLib/pnNetBase/pnNbProtocol.h
+++ b/Sources/Plasma/NucleusLib/pnNetBase/pnNbProtocol.h
@@ -64,7 +64,7 @@ enum ENetProtocol {
// Client connections
kNetProtocolCli2GateKeeper = 2,
- kNetProtocolCli2Csr = 3,
+ kNetProtocolCli2Unused_02 = 3,
kNetProtocolCli2Auth = 4,
kNetProtocolCli2Game = 5,
kNetProtocolCli2File = 6,
diff --git a/Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.cpp b/Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.cpp
index 47dfa188..0daab489 100644
--- a/Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.cpp
+++ b/Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.cpp
@@ -65,12 +65,6 @@ static const char* s_fileAddrs[] = {
};
-static char s_csrAddrConsole[64] = {0};
-static const char* s_csrAddrs[] = {
- s_csrAddrConsole
-};
-
-
static char s_gateKeeperAddrConsole[64] = {0};
static const char* s_gateKeeperAddrs[] = {
s_gateKeeperAddrConsole
@@ -113,22 +107,6 @@ void SetFileSrvHostname (const char addr[]) {
strncpy(s_fileAddrConsole, addr, arrsize(s_fileAddrConsole));
}
-//============================================================================
-// Csr
-//============================================================================
-unsigned GetCsrSrvHostnames (const char*** addrs) {
-
- *addrs = s_csrAddrs;
- return arrsize(s_csrAddrs);
-}
-
-//============================================================================
-void SetCsrSrvHostname (const char addr[]) {
-
- strncpy(s_csrAddrConsole, addr, arrsize(s_csrAddrConsole));
-}
-
-
//============================================================================
// GateKeeper
//============================================================================
diff --git a/Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.h b/Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.h
index a7746e12..88850b0f 100644
--- a/Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.h
+++ b/Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.h
@@ -68,7 +68,7 @@ enum ESrvType {
kSrvTypeLog = 9,
kSrvTypeDll = 10,
kSrvTypeScore = 11,
- kSrvTypeCsr = 12,
+ kSrvTypeCsr = 12, // DEAD
kSrvTypeGateKeeper = 13,
kNumSrvTypes,
@@ -90,9 +90,6 @@ void SetAuthSrvHostname (const char addr[]);
unsigned GetFileSrvHostnames (const char*** addrs); // returns addrCount
void SetFileSrvHostname (const char addr[]);
-unsigned GetCsrSrvHostnames (const char*** addrs); // returns addrCount
-void SetCsrSrvHostname (const char addr[]);
-
unsigned GetGateKeeperSrvHostnames (const char*** addrs); // returns addrCount
void SetGateKeeperSrvHostname (const char addr[]);
diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt
index 4c936d2a..a6a65a51 100644
--- a/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt
+++ b/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt
@@ -22,11 +22,6 @@ set(pnNetProtocol_PROTO_CLI2AUTH
Private/Protocols/Cli2Auth/pnNpCli2Auth.cpp
)
-set(pnNetProtocol_PROTO_CLI2CSR
- Private/Protocols/Cli2Csr/pnNpCli2Csr.h
- Private/Protocols/Cli2Csr/pnNpCli2Csr.cpp
-)
-
set(pnNetProtocol_PROTO_CLI2FILE
Private/Protocols/Cli2File/pnNpCli2File.h
Private/Protocols/Cli2File/pnNpCli2File.cpp
@@ -73,18 +68,16 @@ set(pnNetProtocol_PROTO_SRV2VAULT
)
add_library(pnNetProtocol STATIC ${pnNetProtocol_HEADERS} ${pnNetProtocol_PRIVATE}
- ${pnNetProtocol_PROTO_CLI2AUTH} ${pnNetProtocol_PROTO_CLI2CSR}
- ${pnNetProtocol_PROTO_CLI2FILE} ${pnNetProtocol_PROTO_CLI2GAME}
- ${pnNetProtocol_PROTO_CLI2GK} ${pnNetProtocol_PROTO_SRV2DB}
- ${pnNetProtocol_PROTO_SRV2LOG} ${pnNetProtocol_PROTO_SRV2MCP}
- ${pnNetProtocol_PROTO_SRV2SCORE} ${pnNetProtocol_PROTO_SRV2STATE}
- ${pnNetProtocol_PROTO_SRV2VAULT}
+ ${pnNetProtocol_PROTO_CLI2AUTH} ${pnNetProtocol_PROTO_CLI2FILE}
+ ${pnNetProtocol_PROTO_CLI2GAME} ${pnNetProtocol_PROTO_CLI2GK}
+ ${pnNetProtocol_PROTO_SRV2DB} ${pnNetProtocol_PROTO_SRV2LOG}
+ ${pnNetProtocol_PROTO_SRV2MCP} ${pnNetProtocol_PROTO_SRV2SCORE}
+ ${pnNetProtocol_PROTO_SRV2STATE} ${pnNetProtocol_PROTO_SRV2VAULT}
)
source_group("Header Files" FILES ${pnNetProtocol_HEADERS})
source_group("Private" FILES ${pnNetProtocol_PRIVATE})
source_group("Private\\Cli2Auth" FILES ${pnNetProtocol_PROTO_CLI2AUTH})
-source_group("Private\\Cli2Csr" FILES ${pnNetProtocol_PROTO_CLI2CSR})
source_group("Private\\Cli2File" FILES ${pnNetProtocol_PROTO_CLI2FILE})
source_group("Private\\Cli2Game" FILES ${pnNetProtocol_PROTO_CLI2GAME})
source_group("Private\\Cli2GateKeeper" FILES ${pnNetProtocol_PROTO_CLI2GK})
diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.cpp b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.cpp
deleted file mode 100644
index cc73a041..00000000
--- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program 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.
-
-This program 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 this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-* $/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.cpp
-*
-***/
-
-#define USES_PROTOCOL_CLI2CSR
-#include "../../../Pch.h"
-#pragma hdrstop
-
-
-namespace Cli2Csr {
-/*****************************************************************************
-*
-* Cli2Csr message field definitions
-*
-***/
-
-static const NetMsgField kPingRequestFields[] = {
- kNetMsgFieldTransId, // transId
- kNetMsgFieldTimeMs, // pingTimeMs
- NET_MSG_FIELD_VAR_COUNT(1, 64 * 1024), // payloadBytes
- NET_MSG_FIELD_VAR_PTR(), // payload
-};
-
-static const NetMsgField kRegisterRequestFields[] = {
- kNetMsgFieldTransId, // transId
-};
-
-static const NetMsgField kLoginRequestFields[] = {
- kNetMsgFieldTransId, // transId
- NET_MSG_FIELD_DWORD(), // clientChallenge
- kNetMsgFieldAccountName, // csrName
- kNetMsgFieldShaDigest, // challenge
-};
-
-
-/*****************************************************************************
-*
-* Csr2Cli message field definitions
-*
-***/
-
-static const NetMsgField kPingReplyFields[] = {
- kNetMsgFieldTransId, // transId
- kNetMsgFieldTimeMs, // pingTimeMs
- NET_MSG_FIELD_VAR_COUNT(1, 64 * 1024), // payloadBytes
- NET_MSG_FIELD_VAR_PTR(), // payload
-};
-
-static const NetMsgField kRegisterReplyFields[] = {
- kNetMsgFieldTransId, // transId
- NET_MSG_FIELD_DWORD(), // serverChallenge
- NET_MSG_FIELD_DWORD(), // latestBuildId
-};
-
-static const NetMsgField kLoginReplyFields[] = {
- kNetMsgFieldTransId, // transId
- kNetMsgFieldENetError, // result
- kNetMsgFieldUuid, // csrId
- NET_MSG_FIELD_DWORD(), // csrFlags
-};
-
-
-} using namespace Cli2Csr;
-
-
-/*****************************************************************************
-*
-* Exports
-*
-***/
-
-const NetMsg kNetMsg_Cli2Csr_PingRequest = NET_MSG(kCli2Csr_PingRequest, kPingRequestFields);
-const NetMsg kNetMsg_Cli2Csr_RegisterRequest = NET_MSG(kCli2Csr_RegisterRequest, kRegisterRequestFields);
-const NetMsg kNetMsg_Cli2Csr_LoginRequest = NET_MSG(kCli2Csr_LoginRequest, kLoginRequestFields);
-
-const NetMsg kNetMsg_Csr2Cli_PingReply = NET_MSG(kCsr2Cli_PingReply, kPingReplyFields);
-const NetMsg kNetMsg_Csr2Cli_RegisterReply = NET_MSG(kCsr2Cli_RegisterReply, kRegisterReplyFields);
-const NetMsg kNetMsg_Csr2Cli_LoginReply = NET_MSG(kCsr2Cli_LoginReply, kLoginReplyFields);
-
diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.h
deleted file mode 100644
index df373048..00000000
--- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program 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.
-
-This program 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 this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-* $/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.h
-*
-***/
-
-#ifdef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETPROTOCOL_PRIVATE_PROTOCOLS_CLI2CSR_PNNPCLI2CSR_H
-#error "Header $/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.h included more than once"
-#endif
-#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETPROTOCOL_PRIVATE_PROTOCOLS_CLI2CSR_PNNPCLI2CSR_H
-
-
-/*****************************************************************************
-*
-* kNetProtocolCli2Csr message ids
-*
-***/
-
-// Because SrvCsr must remain backward compatible with all client builds,
-// the following enum values may never change under any circumstances.
-
-//============================================================================
-// Cli2Csr
-
-enum {
- // Misc
- kCli2Csr_PingRequest = 0,
- // Encrypt
- kCli2Csr_RegisterRequest = 1,
- // Login
- kCli2Csr_LoginRequest = 2,
- // Patch
- kCli2Csr_PatchRequest = 3,
-
- kNumCli2CsrMessages
-};
-COMPILER_ASSERT_HEADER(Cli2Scr, kNumCli2CsrMessages <= (uint16_t)-1);
-
-
-//============================================================================
-// Csr2Cli
-
-enum {
- // Misc
- kCsr2Cli_PingReply = 0,
- // Encrypt
- kCsr2Cli_RegisterReply = 1,
- // Login
- kCsr2Cli_LoginReply = 2,
- // Patch
- kCli2Csr_PatchReply = 3,
-
- kNumCsr2CliMessages
-};
-COMPILER_ASSERT_HEADER(Cli2Scr, kNumCsr2CliMessages <= (uint16_t)-1);
-
-
-/*****************************************************************************
-*
-* Networked structures
-*
-***/
-#pragma pack(push,1)
-
-//============================================================================
-// Connect packet
-
-struct Cli2Csr_ConnData {
- uint32_t dataBytes;
-};
-struct Cli2Csr_Connect {
- AsyncSocketConnectPacket hdr;
- Cli2Csr_ConnData data;
-};
-
-//============================================================================
-// Message header
-
-struct Cli2Csr_MsgHeader {
- uint32_t messageId;
- uint32_t transId;
-};
-
-//============================================================================
-// Cli --> Csr message structures
-
-// PingRequest
-extern const NetMsg kNetMsg_Cli2Csr_PingRequest;
-struct Cli2Csr_PingRequest : Cli2Csr_MsgHeader {
- uint32_t pingTimeMs;
- uint32_t payloadBytes;
- uint8_t payload[1]; // [payloadBytes]
-};
-
-// RegisterRequest
-extern const NetMsg kNetMsg_Cli2Csr_RegisterRequest;
-struct Cli2Csr_RegisterRequest : Cli2Csr_MsgHeader {
-};
-
-// LoginRequest
-extern const NetMsg kNetMsg_Cli2Csr_LoginRequest;
-struct Cli2Csr_LoginRequest : Cli2Csr_MsgHeader {
- uint32_t clientChallenge;
- wchar_t csrName[kMaxAccountNameLength];
- ShaDigest challengeHash;
-};
-
-
-//============================================================================
-// Csr --> Cli message structures
-
-// PingReply
-extern const NetMsg kNetMsg_Csr2Cli_PingReply;
-struct Csr2Cli_PingReply : Cli2Csr_MsgHeader {
- uint32_t pingTimeMs;
- uint32_t payloadBytes;
- uint8_t payload[1]; // [payloadBytes]
-};
-
-// RegisterReply
-extern const NetMsg kNetMsg_Csr2Cli_RegisterReply;
-struct Csr2Cli_RegisterReply : Cli2Csr_MsgHeader {
- uint32_t serverChallenge;
- uint32_t csrBuildId; // buildId of the latest csr client
-};
-
-// LoginReply
-extern const NetMsg kNetMsg_Csr2Cli_LoginReply;
-struct Csr2Cli_LoginReply : Cli2Csr_MsgHeader {
- ENetError result;
- Uuid csrId;
- uint32_t csrFlags;
-};
-
-
-#pragma pack(pop)
-
diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpAllIncludes.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpAllIncludes.h
index 6526fe3c..10b64ca9 100644
--- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpAllIncludes.h
+++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpAllIncludes.h
@@ -76,10 +76,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
# include "Protocols/Cli2Game/pnNpCli2Game.h"
# endif
-# ifdef USES_PROTOCOL_CLI2CSR
-# include "Protocols/Cli2Csr/pnNpCli2Csr.h"
-# endif
-
# ifdef USES_PROTOCOL_CLI2GATEKEEPER
# include "Protocols/Cli2GateKeeper/pnNpCli2GateKeeper.h"
# endif
diff --git a/Sources/Plasma/NucleusLib/pnSimpleNet/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnSimpleNet/CMakeLists.txt
deleted file mode 100644
index 77d60d72..00000000
--- a/Sources/Plasma/NucleusLib/pnSimpleNet/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-include_directories("../../CoreLib")
-include_directories("../../NucleusLib")
-
-set(pnSimpleNet_HEADERS
- pnSimpleNet.h
-)
-
-set(pnSimpleNet_SOURCES
- pnSimpleNet.cpp
-)
-
-add_library(pnSimpleNet STATIC ${pnSimpleNet_HEADERS} ${pnSimpleNet_SOURCES})
-
-source_group("Header Files" FILES ${pnSimpleNet_HEADERS})
-source_group("Source Files" FILES ${pnSimpleNet_SOURCES})
diff --git a/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp b/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp
deleted file mode 100644
index 865dae2e..00000000
--- a/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp
+++ /dev/null
@@ -1,658 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program 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.
-
-This program 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 this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-* $/Plasma20/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp
-*
-***/
-
-#include "pnSimpleNet.h"
-#include "hsThread.h"
-
-#include
-#include