OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Remove more server override cruft

Browse Source
This commit is contained in:
Branan Purvine-Riley
2011-05-05 13:53:37 -07:00
parent 563eebd560
commit 7897fb726e
4 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Sources/Plasma/Apps/plClient/winmain.cpp
View File

@ -1581,21 +1581,20 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC
si.cb = sizeof(si); si.cb = sizeof(si);
wchar cmdLine[MAX_PATH]; wchar cmdLine[MAX_PATH];
const wchar ** addrs; const wchar ** addrs;
unsigned count;
if (!eventExists) // if it is missing, assume patcher wasn't launched if (!eventExists) // if it is missing, assume patcher wasn't launched
{ {
StrCopy(cmdLine, s_patcherExeName, arrsize(cmdLine)); StrCopy(cmdLine, s_patcherExeName, arrsize(cmdLine));
count = GetAuthSrvHostnames(&addrs); GetAuthSrvHostnames(&addrs);
if(count && AuthSrvHostnameOverride()) if(wcslen(addrs[0]))
StrPrintf(cmdLine, arrsize(cmdLine), L"%ws /AuthSrv=%ws", cmdLine, addrs[0]); StrPrintf(cmdLine, arrsize(cmdLine), L"%ws /AuthSrv=%ws", cmdLine, addrs[0]);
count = GetFileSrvHostnames(&addrs); GetFileSrvHostnames(&addrs);
if(count && FileSrvHostnameOverride()) if(wcslen(addrs[0]))
StrPrintf(cmdLine, arrsize(cmdLine), L"%ws /FileSrv=%ws", cmdLine, addrs[0]); StrPrintf(cmdLine, arrsize(cmdLine), L"%ws /FileSrv=%ws", cmdLine, addrs[0]);
count = GetGateKeeperSrvHostnames(&addrs); GetGateKeeperSrvHostnames(&addrs);
if(count && GateKeeperSrvHostnameOverride()) if(wcslen(addrs[0]))
StrPrintf(cmdLine, arrsize(cmdLine), L"%ws /GateKeeperSrv=%ws", cmdLine, addrs[0]); StrPrintf(cmdLine, arrsize(cmdLine), L"%ws /GateKeeperSrv=%ws", cmdLine, addrs[0]);
if(!CreateProcessW(NULL, cmdLine, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) if(!CreateProcessW(NULL, cmdLine, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))

12
Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbSrvs.cpp
View File

@ -88,12 +88,6 @@ void SetAuthSrvHostname (const wchar addr[]) {
StrCopy(s_authAddrConsole, addr, arrsize(s_authAddrConsole)); StrCopy(s_authAddrConsole, addr, arrsize(s_authAddrConsole));
} }
//============================================================================
bool AuthSrvHostnameOverride () {
return s_authAddrConsole[0];
}
//============================================================================ //============================================================================
// File // File
//============================================================================ //============================================================================
@ -109,12 +103,6 @@ void SetFileSrvHostname (const wchar addr[]) {
StrCopy(s_fileAddrConsole, addr, arrsize(s_fileAddrConsole)); StrCopy(s_fileAddrConsole, addr, arrsize(s_fileAddrConsole));
} }
//============================================================================
bool FileSrvHostnameOverride () {
return s_fileAddrConsole[0];
}
//============================================================================ //============================================================================
// Csr // Csr
//============================================================================ //============================================================================

2
Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbSrvs.h
View File

@ -75,11 +75,9 @@ enum ESrvType {
unsigned GetAuthSrvHostnames (const wchar *** addrs); // returns addrCount unsigned GetAuthSrvHostnames (const wchar *** addrs); // returns addrCount
void SetAuthSrvHostname (const wchar addr[]); void SetAuthSrvHostname (const wchar addr[]);
bool AuthSrvHostnameOverride ();
unsigned GetFileSrvHostnames (const wchar *** addrs); // returns addrCount unsigned GetFileSrvHostnames (const wchar *** addrs); // returns addrCount
void SetFileSrvHostname (const wchar addr[]); void SetFileSrvHostname (const wchar addr[]);
bool FileSrvHostnameOverride ();
unsigned GetCsrSrvHostnames (const wchar *** addrs); // returns addrCount unsigned GetCsrSrvHostnames (const wchar *** addrs); // returns addrCount
void SetCsrSrvHostname (const wchar addr[]); void SetCsrSrvHostname (const wchar addr[]);

2
Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp
View File

@ -986,7 +986,7 @@ void NetCommConnect () {
if (!gDataServerLocal) { if (!gDataServerLocal) {
// if a console override was specified for a filesrv, connect directly to the fileserver rather than going through the gatekeeper // if a console override was specified for a filesrv, connect directly to the fileserver rather than going through the gatekeeper
if(GetFileSrvHostnames(&addrs) && FileSrvHostnameOverride()) if(GetFileSrvHostnames(&addrs) && wcslen(addrs[0]))
{ {
NetCliFileStartConnect(addrs, count); NetCliFileStartConnect(addrs, count);
} }