OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +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

64
Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.cpp
View File

@ -53,26 +53,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
static wchar_t s_authAddrConsole[64] = {0};
static const wchar_t * s_authAddrs[] = {
static char s_authAddrConsole[64] = {0};
static const char* s_authAddrs[] = {
s_authAddrConsole
};
static wchar_t s_fileAddrConsole[64] = {0};
static const wchar_t * s_fileAddrs[] = {
static char s_fileAddrConsole[64] = {0};
static const char* s_fileAddrs[] = {
s_fileAddrConsole
};
static wchar_t s_csrAddrConsole[64] = {0};
static const wchar_t * s_csrAddrs[] = {
static char s_csrAddrConsole[64] = {0};
static const char* s_csrAddrs[] = {
s_csrAddrConsole
};
static wchar_t s_gateKeeperAddrConsole[64] = {0};
static const wchar_t * s_gateKeeperAddrs[] = {
static char s_gateKeeperAddrConsole[64] = {0};
static const char* s_gateKeeperAddrs[] = {
s_gateKeeperAddrConsole
};
@ -86,97 +86,97 @@ static const wchar_t * s_gateKeeperAddrs[] = {
//============================================================================
// Auth
//============================================================================
unsigned GetAuthSrvHostnames (const wchar_t *** addrs) {
unsigned GetAuthSrvHostnames (const char*** addrs) {
*addrs = s_authAddrs;
return arrsize(s_authAddrs);
}
//============================================================================
void SetAuthSrvHostname (const wchar_t addr[]) {
void SetAuthSrvHostname (const char addr[]) {
wcsncpy(s_authAddrConsole, addr, arrsize(s_authAddrConsole));
strncpy(s_authAddrConsole, addr, arrsize(s_authAddrConsole));
}
//============================================================================
// File
//============================================================================
unsigned GetFileSrvHostnames (const wchar_t *** addrs) {
unsigned GetFileSrvHostnames (const char*** addrs) {
*addrs = s_fileAddrs;
return arrsize(s_fileAddrs);
}
//============================================================================
void SetFileSrvHostname (const wchar_t addr[]) {
void SetFileSrvHostname (const char addr[]) {
wcsncpy(s_fileAddrConsole, addr, arrsize(s_fileAddrConsole));
strncpy(s_fileAddrConsole, addr, arrsize(s_fileAddrConsole));
}
//============================================================================
// Csr
//============================================================================
unsigned GetCsrSrvHostnames (const wchar_t *** addrs) {
unsigned GetCsrSrvHostnames (const char*** addrs) {
*addrs = s_csrAddrs;
return arrsize(s_csrAddrs);
}
//============================================================================
void SetCsrSrvHostname (const wchar_t addr[]) {
void SetCsrSrvHostname (const char addr[]) {
wcsncpy(s_csrAddrConsole, addr, arrsize(s_csrAddrConsole));
strncpy(s_csrAddrConsole, addr, arrsize(s_csrAddrConsole));
}
//============================================================================
// GateKeeper
//============================================================================
unsigned GetGateKeeperSrvHostnames (const wchar_t *** addrs) {
unsigned GetGateKeeperSrvHostnames (const char*** addrs) {
*addrs = s_gateKeeperAddrs;
return arrsize(s_gateKeeperAddrs);
}
//============================================================================
void SetGateKeeperSrvHostname (const wchar_t addr[]) {
wcsncpy(s_gateKeeperAddrConsole, addr, arrsize(s_gateKeeperAddrConsole));
void SetGateKeeperSrvHostname (const char addr[]) {
strncpy(s_gateKeeperAddrConsole, addr, arrsize(s_gateKeeperAddrConsole));
}
//============================================================================
// User-visible Server
//============================================================================
static wchar_t s_serverStatusUrl[256] = {0};
static wchar_t s_serverSignupUrl[256] = {0};
static wchar_t s_serverName[256] = {0};
static char s_serverStatusUrl[256] = {0};
static char s_serverSignupUrl[256] = {0};
static char s_serverName[256] = {0};
//============================================================================
const wchar_t *GetServerStatusUrl () {
const char* GetServerStatusUrl () {
return s_serverStatusUrl;
}
//============================================================================
void SetServerStatusUrl (const wchar_t url[]) {
wcsncpy(s_serverStatusUrl, url, arrsize(s_serverStatusUrl));
void SetServerStatusUrl (const char url[]) {
strncpy(s_serverStatusUrl, url, arrsize(s_serverStatusUrl));
}
//============================================================================
const wchar_t *GetServerSignupUrl () {
const char* GetServerSignupUrl () {
return s_serverSignupUrl;
}
//============================================================================
void SetServerSignupUrl (const wchar_t url[]) {
wcsncpy(s_serverSignupUrl, url, arrsize(s_serverSignupUrl));
void SetServerSignupUrl (const char url[]) {
strncpy(s_serverSignupUrl, url, arrsize(s_serverSignupUrl));
}
//============================================================================
const wchar_t *GetServerDisplayName () {
const char* GetServerDisplayName () {
return s_serverName;
}
//============================================================================
void SetServerDisplayName (const wchar_t name[]) {
wcsncpy(s_serverName, name, arrsize(s_serverName));
void SetServerDisplayName (const char name[]) {
strncpy(s_serverName, name, arrsize(s_serverName));
}

28
Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.h
View File

@ -84,25 +84,25 @@ enum ESrvType {
*
***/
unsigned GetAuthSrvHostnames (const wchar_t *** addrs); // returns addrCount
void SetAuthSrvHostname (const wchar_t addr[]);
unsigned GetAuthSrvHostnames (const char*** addrs); // returns addrCount
void SetAuthSrvHostname (const char addr[]);
unsigned GetFileSrvHostnames (const wchar_t *** addrs); // returns addrCount
void SetFileSrvHostname (const wchar_t addr[]);
unsigned GetFileSrvHostnames (const char*** addrs); // returns addrCount
void SetFileSrvHostname (const char addr[]);
unsigned GetCsrSrvHostnames (const wchar_t *** addrs); // returns addrCount
void SetCsrSrvHostname (const wchar_t addr[]);
unsigned GetCsrSrvHostnames (const char*** addrs); // returns addrCount
void SetCsrSrvHostname (const char addr[]);
unsigned GetGateKeeperSrvHostnames (const wchar_t *** addrs); // returns addrCount
void SetGateKeeperSrvHostname (const wchar_t addr[]);
unsigned GetGateKeeperSrvHostnames (const char*** addrs); // returns addrCount
void SetGateKeeperSrvHostname (const char addr[]);
const wchar_t *GetServerStatusUrl ();
void SetServerStatusUrl (const wchar_t url[]);
const char *GetServerStatusUrl ();
void SetServerStatusUrl (const char url[]);
const wchar_t *GetServerSignupUrl ();
void SetServerSignupUrl (const wchar_t url[]);
const char *GetServerSignupUrl ();
void SetServerSignupUrl (const char url[]);
const wchar_t *GetServerDisplayName ();
void SetServerDisplayName (const wchar_t name[]);
const char *GetServerDisplayName ();
void SetServerDisplayName (const char name[]);
#endif // pnNbSrvs_inc