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

Start killing off NetAddress.

Browse Source
This commit is contained in:
Darryl Pogue
2012-03-11 23:12:03 -07:00
parent 7bd51c923f
commit 72d92bc66e
10 changed files with 38 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,7 +368,7 @@ static bool AsyncNotifySocketProc (
}
//============================================================================
static void Connect (const NetAddress & addr, ConnectParam * cp) {
static void Connect(const plNetAddress& addr, ConnectParam * cp) {
SimpleNetConn * conn = NEWZERO(SimpleNetConn);
conn->channelId = cp->channel->channelId;
@ -410,9 +410,9 @@ static void Connect (const NetAddress & addr, ConnectParam * cp) {
//============================================================================
static void AsyncLookupCallback (
void * param,
const wchar_t name[],
const wchar_t name[],
unsigned addrCount,
const NetAddress addrs[]
const plNetAddress addrs[]
) {
ConnectParam * cp = (ConnectParam *)param;
@ -487,8 +487,9 @@ bool SimpleNetStartListening (
s_queryAccept = queryAccept;
s_queryAcceptParam = param;
NetAddress addr;
NetAddressFromNode(0, kNetDefaultSimpleNetPort, &addr);
plNetAddress addr;
addr.SetPort(kNetDefaultSimpleNetPort);
addr.SetAnyAddr();
return (0 != AsyncSocketStartListening(addr, nil));
}
@ -497,8 +498,9 @@ void SimpleNetStopListening () {
ASSERT(s_running);
NetAddress addr;
NetAddressFromNode(0, kNetDefaultSimpleNetPort, &addr);
plNetAddress addr;
addr.SetPort(kNetDefaultSimpleNetPort);
addr.SetAnyAddr();
AsyncSocketStopListening(addr, nil);
s_queryAccept = nil;
@ -608,8 +610,8 @@ void SimpleNetStartConnecting (
}
}
if (!name[0]) {
NetAddress netAddr;
NetAddressFromString(&netAddr, addr, kNetDefaultSimpleNetPort);
plString saddr = _TEMP_CONVERT_FROM_WCHAR_T(addr);
plNetAddress netAddr(saddr.c_str(), kNetDefaultSimpleNetPort);
Connect(netAddr, cp);
}
}

3
Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.h
View File

@ -53,6 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnProduct/pnProduct.h"
#include "pnNetBase/pnNetBase.h"
#include "pnAsyncCore/pnAsyncCore.h"
#include "pnNetCommon/plNetAddress.h"
/*****************************************************************************
*
@ -148,7 +149,7 @@ typedef bool (*FSimpleNetQueryAccept) ( // return true to accept incoming connec
void * param,
unsigned channel,
SimpleNetConn * conn,
const NetAddress & addr
const plNetAddress& addr
);
void SimpleNetCreateChannel (