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

Tidy up the AddrInfo stuff (not enough though).

Browse Source
This commit is contained in:
Darryl Pogue
2011-08-06 13:49:13 -07:00
parent 42c9df919b
commit e8a0b3f78f
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Sources/Plasma/NucleusLib/pnAddrInfo/pnAddrInfo.cpp
View File

@ -29,12 +29,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h"
#include "pnAddrInfo.h"
#include <string.h>
#if HS_BUILD_FOR_UNIX
#include <unistd.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <net/if.h>
#include <sys/ioctl.h>
# include <unistd.h>
# include <arpa/inet.h>
# include <netinet/in.h>
# include <net/if.h>
# include <sys/ioctl.h>
#endif
const pnAddrInfo* pnAddrInfo::GetInterface()
@ -138,7 +139,8 @@ void pnAddrInfo::GetLocalAddrs(List& addrslist, bool incLoopBack)
SOCKET s = socket(AF_INET, SOCK_DGRAM, 0);
if (WSAIoctl(s,SIO_GET_INTERFACE_LIST,NULL,NULL,(void*)infos,bufSize,&retSize,NULL,NULL) == 0)
if (WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0,
(void*)infos, bufSize, &retSize, NULL, NULL) == 0)
{
unsigned int entries = retSize/sizeof(INTERFACE_INFO);
int i;

16
Sources/Plasma/NucleusLib/pnAddrInfo/pnAddrInfo.h
View File

@ -33,15 +33,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// Unix and XP use native code
#if HS_BUILD_FOR_UNIX
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
# include <sys/types.h>
# include <sys/socket.h>
# include <netdb.h>
#elif HS_BUILD_FOR_WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
# if (_WIN32_WINNT < 0x0501)
# define _WIN32_WINNT 0x0501
# endif
# include <winsock2.h>
# include <ws2tcpip.h>
#else
#error "pnAddrInfo Not Implemented!"
# error "pnAddrInfo Not Implemented!"
#endif
#include "hsTypes.h"
#include "hsStlUtils.h"

2
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xSocket.cpp
View File

@ -605,7 +605,7 @@ void CSocket::ProcessQueue () {
// Dispatch it
switch (command->code) {
case command->WRITE: {
case Command::WRITE: {
AsyncNotifySocketWrite notify;
notify.param = command->param;
notify.asyncId = 0;