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

9
Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp
View File

@ -410,7 +410,7 @@ static void Connect(const plNetAddress& addr, ConnectParam * cp) {
//============================================================================
static void AsyncLookupCallback (
void * param,
const wchar_t name[],
const char name[],
unsigned addrCount,
const plNetAddress addrs[]
) {
@ -568,7 +568,7 @@ void SimpleNetDestroyChannel (unsigned channelId) {
//============================================================================
void SimpleNetStartConnecting (
unsigned channelId,
const wchar_t addr[],
const char addr[],
FSimpleNetOnConnect onConnect,
void * param
) {
@ -593,7 +593,7 @@ void SimpleNetStartConnecting (
ASSERT(cp->channel);
// Do we need to lookup the address?
const wchar_t * name = addr;
const char* name = addr;
while (unsigned ch = *name) {
++name;
if (!(isdigit(ch) || ch == L'.' || ch == L':')) {
@ -610,8 +610,7 @@ void SimpleNetStartConnecting (
}
}
if (!name[0]) {
plString saddr = _TEMP_CONVERT_FROM_WCHAR_T(addr);
plNetAddress netAddr(saddr.c_str(), kNetDefaultSimpleNetPort);
plNetAddress netAddr(addr, kNetDefaultSimpleNetPort);
Connect(netAddr, cp);
}
}