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

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

10
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp
View File

@ -540,8 +540,8 @@ static SOCKET ListenSocket (NetAddress * listenAddr) {
); );
*/ */
NetAddressNode node = NetAddressGetNode(*listenAddr); NetAddressNode node = listenAddr->GetHost();
unsigned port = NetAddressGetPort(*listenAddr); unsigned port = listenAddr->GetPort();
// bind socket to port // bind socket to port
sockaddr_in addr; sockaddr_in addr;
@ -581,13 +581,13 @@ static SOCKET ListenSocket (NetAddress * listenAddr) {
} }
// success! // success!
NetAddressSetPort(port, listenAddr); listenAddr->SetPort(port);
return s; return s;
} while (false); } while (false);
// failure! // failure!
closesocket(s); closesocket(s);
NetAddressSetPort(0, listenAddr); listenAddr->SetPort(0);
return INVALID_SOCKET; return INVALID_SOCKET;
} }
@ -1152,7 +1152,7 @@ unsigned NtSocketStartListening (
} }
s_listenCrit.Leave(); s_listenCrit.Leave();
unsigned port = NetAddressGetPort(addr); unsigned port = addr.GetPort();
if (port) if (port)
SetEvent(s_listenEvent); SetEvent(s_listenEvent);

1
Sources/Plasma/NucleusLib/pnNetCli/pnNetCli.h
View File

@ -48,6 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETCLI_PNNETCLI_H #ifndef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETCLI_PNNETCLI_H
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETCLI_PNNETCLI_H #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETCLI_PNNETCLI_H
#include "pnEncryption/plBigNum.h"
/***************************************************************************** /*****************************************************************************
* *

2
Sources/Plasma/NucleusLib/pnNetDiag/pnNdDns.cpp
View File

@ -80,7 +80,7 @@ static void LookupCallback (
) { ) {
DNSParam * p = (DNSParam *)param; DNSParam * p = (DNSParam *)param;
if (addrCount) { if (addrCount) {
unsigned node = NetAddressGetNode(addrs[0]); unsigned node = addrs[0].GetHost();
p->diag->critsect.Enter(); p->diag->critsect.Enter();
{ {
p->diag->nodes[p->srv] = node; p->diag->nodes[p->srv] = node;

11
Sources/Plasma/NucleusLib/pnNetDiag/pnNdTcp.cpp
View File

@ -828,8 +828,7 @@ void NetDiagTcp (
return; return;
} }
unsigned node; unsigned node;
NetAddress addr;
diag->critsect.Enter(); diag->critsect.Enter();
{ {
node = diag->nodes[srv]; node = diag->nodes[srv];
@ -842,17 +841,17 @@ void NetDiagTcp (
return; return;
} }
NetAddressFromNode(node, port, &addr); plNetAddress addr(node, port);
switch (protocol) { switch (protocol) {
case kNetProtocolCli2Auth: case kNetProtocolCli2Auth:
StartAuthTcpTest(diag, addr, dump, callback, param); StartAuthTcpTest(diag, addr, dump, callback, param);
break; break;
case kNetProtocolCli2File: case kNetProtocolCli2File:
StartFileTcpTest(diag, addr, dump, callback, param); StartFileTcpTest(diag, addr, dump, callback, param);
break; break;
DEFAULT_FATAL(protocol); DEFAULT_FATAL(protocol);
} }
} }

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); SimpleNetConn * conn = NEWZERO(SimpleNetConn);
conn->channelId = cp->channel->channelId; conn->channelId = cp->channel->channelId;
@ -410,9 +410,9 @@ static void Connect (const NetAddress & addr, ConnectParam * cp) {
//============================================================================ //============================================================================
static void AsyncLookupCallback ( static void AsyncLookupCallback (
void * param, void * param,
const wchar_t name[], const wchar_t name[],
unsigned addrCount, unsigned addrCount,
const NetAddress addrs[] const plNetAddress addrs[]
) { ) {
ConnectParam * cp = (ConnectParam *)param; ConnectParam * cp = (ConnectParam *)param;
@ -487,8 +487,9 @@ bool SimpleNetStartListening (
s_queryAccept = queryAccept; s_queryAccept = queryAccept;
s_queryAcceptParam = param; s_queryAcceptParam = param;
NetAddress addr; plNetAddress addr;
NetAddressFromNode(0, kNetDefaultSimpleNetPort, &addr); addr.SetPort(kNetDefaultSimpleNetPort);
addr.SetAnyAddr();
return (0 != AsyncSocketStartListening(addr, nil)); return (0 != AsyncSocketStartListening(addr, nil));
} }
@ -497,8 +498,9 @@ void SimpleNetStopListening () {
ASSERT(s_running); ASSERT(s_running);
NetAddress addr; plNetAddress addr;
NetAddressFromNode(0, kNetDefaultSimpleNetPort, &addr); addr.SetPort(kNetDefaultSimpleNetPort);
addr.SetAnyAddr();
AsyncSocketStopListening(addr, nil); AsyncSocketStopListening(addr, nil);
s_queryAccept = nil; s_queryAccept = nil;
@ -608,8 +610,8 @@ void SimpleNetStartConnecting (
} }
} }
if (!name[0]) { if (!name[0]) {
NetAddress netAddr; plString saddr = _TEMP_CONVERT_FROM_WCHAR_T(addr);
NetAddressFromString(&netAddr, addr, kNetDefaultSimpleNetPort); plNetAddress netAddr(saddr.c_str(), kNetDefaultSimpleNetPort);
Connect(netAddr, cp); 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 "pnProduct/pnProduct.h"
#include "pnNetBase/pnNetBase.h" #include "pnNetBase/pnNetBase.h"
#include "pnAsyncCore/pnAsyncCore.h" #include "pnAsyncCore/pnAsyncCore.h"
#include "pnNetCommon/plNetAddress.h"
/***************************************************************************** /*****************************************************************************
* *
@ -148,7 +149,7 @@ typedef bool (*FSimpleNetQueryAccept) ( // return true to accept incoming connec
void * param, void * param,
unsigned channel, unsigned channel,
SimpleNetConn * conn, SimpleNetConn * conn,
const NetAddress & addr const plNetAddress& addr
); );
void SimpleNetCreateChannel ( void SimpleNetCreateChannel (

33
Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Addr.cpp
View File

@ -156,39 +156,6 @@ bool NetAddressFromString (NetAddress * addr, const wchar_t str[], unsigned defa
return false; return false;
} }
//===========================================================================
unsigned NetAddressGetPort (
const NetAddress & addr
) {
return ntohs(((sockaddr_in *) &addr)->sin_port);
}
//===========================================================================
void NetAddressSetPort (
unsigned port,
NetAddress * addr
) {
((sockaddr_in *) addr)->sin_port = htons((uint16_t) port);
}
//============================================================================
NetAddressNode NetAddressGetNode (const NetAddress & addr) {
return ntohl(((const sockaddr_in *) &addr)->sin_addr.S_un.S_addr);
}
//===========================================================================
void NetAddressFromNode (
NetAddressNode node,
unsigned port,
NetAddress * addr
) {
memset(addr, 0, sizeof(*addr));
sockaddr_in * inetaddr = (sockaddr_in *) addr;
inetaddr->sin_family = AF_INET;
inetaddr->sin_addr.S_un.S_addr = htonl(node);
inetaddr->sin_port = htons((uint16_t) port);
}
//=========================================================================== //===========================================================================
void NetAddressNodeToString ( void NetAddressNodeToString (
NetAddressNode node, NetAddressNode node,

25
Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.h
View File

@ -57,11 +57,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
***/ ***/
struct NetAddress { /*struct NetAddress {
uint8_t data[24]; uint8_t data[24];
}; };
typedef unsigned NetAddressNode; typedef unsigned NetAddressNode;*/
#include "pnNetCommon/plNetAddress.h"
typedef plNetAddress NetAddress;
typedef uint32_t NetAddressNode;
/***************************************************************************** /*****************************************************************************
* *
@ -95,26 +100,10 @@ bool NetAddressFromString (
unsigned defaultPort unsigned defaultPort
); );
unsigned NetAddressGetPort (
const NetAddress & addr
);
void NetAddressSetPort (
unsigned port,
NetAddress * addr
);
void NetAddressNodeToString ( void NetAddressNodeToString (
NetAddressNode node, NetAddressNode node,
wchar_t * str, wchar_t * str,
unsigned chars unsigned chars
); );
NetAddressNode NetAddressGetNode (
const NetAddress & addr
);
void NetAddressFromNode (
NetAddressNode node,
unsigned port,
NetAddress * addr
);
#endif #endif

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

@ -2194,18 +2194,11 @@ static bool Recv_ServerAddr (
{ {
if (s_active) { if (s_active) {
s_active->token = msg.token; s_active->token = msg.token;
NetAddressFromNode( s_active->addr.SetHost(msg.srvAddr);
msg.srvAddr,
NetAddressGetPort(s_active->addr), plString logmsg = _TEMP_CONVERT_FROM_LITERAL("SrvAuth addr: ");
&s_active->addr logmsg += s_active->addr.GetHostString();
); LogMsg(kLogPerf, L"SrvAuth addr: %s", logmsg.c_str());
wchar_t addrStr[64];
NetAddressNodeToString(
msg.srvAddr,
addrStr,
arrsize(addrStr)
);
LogMsg(kLogPerf, L"SrvAuth addr: %s", addrStr);
} }
} }
s_critsect.Leave(); s_critsect.Leave();

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

@ -798,8 +798,7 @@ void GamePingEnable (bool enable) {
void NetCliGameStartConnect ( void NetCliGameStartConnect (
const NetAddressNode & node const NetAddressNode & node
) { ) {
NetAddress addr; plNetAddress addr(node, kNetDefaultClientPort);
NetAddressFromNode(node, kNetDefaultClientPort, &addr);
Connect(addr); Connect(addr);
} }