OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 03:09:13 +00:00
Code Releases Activity

Get rid of pnUtW32Addr and make IP strings char*s.

Browse Source 
IP addresses don't need to be unicode.
pnUtAddr is still around until we replace all NetAddress uses with
plNetAddress (they are typedef'ed to each other right now).
This commit is contained in:
Darryl Pogue
2012-03-26 21:27:55 -07:00
parent 06a561fc85
commit 3ea3473d13
27 changed files with 166 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,11 +110,11 @@ static bool s_loginComplete = false;
static bool s_hasAuthSrvIpAddress = false;
static bool s_hasFileSrvIpAddress = false;
static ENetError s_authResult = kNetErrAuthenticationFailed;
static wchar_t s_authSrvAddr[256];
static wchar_t s_fileSrvAddr[256];
static char s_authSrvAddr[256];
static char s_fileSrvAddr[256];
static wchar_t s_iniServerAddr[256];
static wchar_t s_iniFileServerAddr[256];
static char s_iniServerAddr[256];
static char s_iniFileServerAddr[256];
static wchar_t s_iniAccountUsername[kMaxAccountNameLength];
static ShaDigest s_namePassHash;
static wchar_t s_iniAuthToken[kMaxPublisherAuthKeyLength];
@ -667,7 +667,7 @@ static void AuthSrvIpAddressCallback (
void * param,
const wchar_t addr[]
) {
StrCopy(s_authSrvAddr, addr, arrsize(s_authSrvAddr));
StrToAnsi(s_authSrvAddr, addr, arrsize(s_authSrvAddr));
s_hasAuthSrvIpAddress = true;
}
@ -677,7 +677,7 @@ static void FileSrvIpAddressCallback (
void * param,
const wchar_t addr[]
) {
StrCopy(s_fileSrvAddr, addr, arrsize(s_fileSrvAddr));
StrToAnsi(s_fileSrvAddr, addr, arrsize(s_fileSrvAddr));
s_hasFileSrvIpAddress = true;
}
@ -822,12 +822,12 @@ void NetCommUpdate () {
//============================================================================
void NetCommConnect () {
const wchar_t ** addrs;
const char** addrs;
unsigned count;
hsBool connectedToKeeper = false;
// if a console override was specified for a authserv, connect directly to the authserver rather than going through the gatekeeper
if((count = GetAuthSrvHostnames(&addrs)) && wcslen(addrs[0]))
if((count = GetAuthSrvHostnames(&addrs)) && strlen(addrs[0]))
{
NetCliAuthStartConnect(addrs, count);
}
@ -845,7 +845,7 @@ void NetCommConnect () {
AsyncSleep(10);
}
const wchar_t * authSrv[] = {
const char* authSrv[] = {
s_authSrvAddr
};
NetCliAuthStartConnect(authSrv, 1);
@ -854,7 +854,7 @@ void NetCommConnect () {
if (!gDataServerLocal) {
// if a console override was specified for a filesrv, connect directly to the fileserver rather than going through the gatekeeper
if((count = GetFileSrvHostnames(&addrs)) && wcslen(addrs[0]))
if((count = GetFileSrvHostnames(&addrs)) && strlen(addrs[0]))
{
NetCliFileStartConnect(addrs, count);
}
@ -874,7 +874,7 @@ void NetCommConnect () {
AsyncSleep(10);
}
const wchar_t * fileSrv[] = {
const char* fileSrv[] = {
s_fileSrvAddr
};
NetCliFileStartConnect(fileSrv, 1);