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

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;
}
//===========================================================================
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 (
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];
};
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 NetAddressGetPort (
const NetAddress & addr
);
void NetAddressSetPort (
unsigned port,
NetAddress * addr
);
void NetAddressNodeToString (
NetAddressNode node,
wchar_t * str,
unsigned chars
);
NetAddressNode NetAddressGetNode (
const NetAddress & addr
);
void NetAddressFromNode (
NetAddressNode node,
unsigned port,
NetAddress * addr
);
#endif