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

Fix bugs with plNetAddress.

Browse Source 
This allows the patcher to successfully connect to both GateKeeper and
FileSrv.
This commit is contained in:
Darryl Pogue
2012-03-26 19:03:43 -07:00
parent fbc6e33f7d
commit 06a561fc85
7 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,13 +95,10 @@ static NetAddressNode NodeFromString (const wchar_t * string[]) {
***/
//===========================================================================
bool NetAddressFromString (NetAddress * addr, const wchar_t str[], unsigned defaultPort) {
bool NetAddressFromString (NetAddress * addr, const wchar_t str[], uint16_t defaultPort) {
ASSERT(addr);
ASSERT(str);
// NetAddress is bigger than sockaddr_in so start by zeroing the whole thing
memset(addr, 0, sizeof(*addr));
for (;;) {
NetAddressNode node = NodeFromString(&str);
if (node == (unsigned)-1)
@ -110,12 +107,8 @@ bool NetAddressFromString (NetAddress * addr, const wchar_t str[], unsigned defa
if (*str == L':')
defaultPort = StrToUnsigned(str + 1, nil, 10);
sockaddr_in * inetaddr = (sockaddr_in *) addr;
inetaddr->sin_family = AF_INET;
inetaddr->sin_port = htons((uint16_t) defaultPort);
inetaddr->sin_addr.S_un.S_addr = htonl(node);
// inetaddr->sin_zero already zeroed
addr->SetPort((uint16_t)defaultPort);
addr->SetHostLE(node);
return true;
}

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

@ -79,7 +79,7 @@ typedef uint32_t NetAddressNode;
bool NetAddressFromString (
NetAddress * addr,
const wchar_t str[],
unsigned defaultPort
uint16_t defaultPort
);
#endif