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

Completely kill pnUtAddr and NetAddress.

Browse Source
This commit is contained in:
Darryl Pogue
2012-03-26 21:49:10 -07:00
parent 3ea3473d13
commit 3ba721711e
17 changed files with 56 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
View File

@ -1528,7 +1528,7 @@ static void Connect (
//============================================================================
static void Connect (
const char name[],
const NetAddress & addr
const plNetAddress& addr
) {
ASSERT(s_running);
@ -5146,7 +5146,7 @@ void NetCliAuthStartConnect (
}
}
if (!name[0]) {
NetAddress addr(authAddrList[i], kNetDefaultClientPort);
plNetAddress addr(authAddrList[i], kNetDefaultClientPort);
Connect(authAddrList[i], addr);
}
}

10
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCsr.cpp
View File

@ -73,7 +73,7 @@ struct CliCsConn : AtomicRef {
AsyncSocket sock;
AsyncCancelId cancelId;
NetCli * cli;
NetAddress addr;
plNetAddress addr;
unsigned seq;
bool abandoned;
unsigned serverChallenge;
@ -369,7 +369,7 @@ static bool SocketNotifyCallback (
//============================================================================
static void Connect (
const NetAddress & addr,
const plNetAddress& addr,
ConnectParam * cp
) {
CliCsConn * conn = NEWZERO(CliCsConn);
@ -415,7 +415,7 @@ static void AsyncLookupCallback (
void * param,
const char name[],
unsigned addrCount,
const NetAddress addrs[]
const plNetAddress addrs[]
) {
if (!addrCount) {
ReportNetError(kNetProtocolCli2Auth, kNetErrNameLookupFailed);
@ -860,8 +860,8 @@ void NetCliCsrStartConnect (
}
}
if (!name[0]) {
NetAddress addr(addrList[i], kNetDefaultClientPort);
plNetAddress addr(addrList[i], kNetDefaultClientPort);
ConnectParam * cp = new ConnectParam;
cp->callback = callback;
cp->param = param;

10
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp
View File

@ -65,7 +65,7 @@ struct CliFileConn : AtomicRef {
CLock sockLock; // to protect the socket pointer so we don't nuke it while using it
AsyncSocket sock;
char name[MAX_PATH];
NetAddress addr;
plNetAddress addr;
unsigned seq;
ARRAY(uint8_t) recvBuffer;
AsyncCancelId cancelId;
@ -540,7 +540,7 @@ static void Connect (CliFileConn * conn) {
//============================================================================
static void Connect (
const char name[],
const NetAddress & addr
const plNetAddress& addr
) {
ASSERT(s_running);
@ -561,7 +561,7 @@ static void AsyncLookupCallback (
void * param,
const char name[],
unsigned addrCount,
const NetAddress addrs[]
const plNetAddress addrs[]
) {
if (!addrCount) {
ReportNetError(kNetProtocolCli2File, kNetErrNameLookupFailed);
@ -1362,7 +1362,7 @@ void NetCliFileStartConnect (
}
}
if (!name[0]) {
NetAddress addr(fileAddrList[i], kNetDefaultClientPort);
plNetAddress addr(fileAddrList[i], kNetDefaultClientPort);
Connect(fileAddrList[i], addr);
}
}
@ -1399,7 +1399,7 @@ void NetCliFileStartConnectAsServer (
}
}
if (!name[0]) {
NetAddress addr(fileAddrList[i], kNetDefaultServerPort);
plNetAddress addr(fileAddrList[i], kNetDefaultServerPort);
Connect(fileAddrList[i], addr);
}
}

4
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
View File

@ -62,7 +62,7 @@ struct CliGmConn : AtomicRef {
AsyncSocket sock;
AsyncCancelId cancelId;
NetCli * cli;
NetAddress addr;
plNetAddress addr;
unsigned seq;
bool abandoned;
@ -354,7 +354,7 @@ static bool SocketNotifyCallback (
//============================================================================
static void Connect (
const NetAddress & addr
const plNetAddress& addr
) {
CliGmConn * conn = NEWZERO(CliGmConn);
conn->addr = addr;

8
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp
View File

@ -90,7 +90,7 @@ struct CliGkConn : AtomicRef {
AsyncSocket sock;
NetCli * cli;
char name[MAX_PATH];
NetAddress addr;
plNetAddress addr;
Uuid token;
unsigned seq;
unsigned serverChallenge;
@ -464,7 +464,7 @@ static void Connect (
//============================================================================
static void Connect (
const char name[],
const NetAddress & addr
const plNetAddress& addr
) {
ASSERT(s_running);
@ -483,7 +483,7 @@ static void AsyncLookupCallback (
void * param,
const char name[],
unsigned addrCount,
const NetAddress addrs[]
const plNetAddress addrs[]
) {
if (!addrCount) {
ReportNetError(kNetProtocolCli2GateKeeper, kNetErrNameLookupFailed);
@ -1076,7 +1076,7 @@ void NetCliGateKeeperStartConnect (
}
}
if (!name[0]) {
NetAddress addr(gateKeeperAddrList[i], kNetDefaultClientPort);
plNetAddress addr(gateKeeperAddrList[i], kNetDefaultClientPort);
Connect(gateKeeperAddrList[i], addr);
}
}