MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-16 00:03:45 +00:00
Code Issues Releases Wiki Activity

Updated so compiles on MacOS

Browse Source
This commit is contained in:
Bryan Roe
2019-01-11 13:39:09 -08:00
parent 99ff50fcb8
commit 43eb327870
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
microstack/ILibIPAddressMonitor.c
View File

@@ -28,7 +28,7 @@ limitations under the License.
#include "ILibParsers.h" #include "ILibParsers.h"
#ifdef _POSIX #if defined(_POSIX) && !defined(__APPLE__)
#include <netinet/in.h> #include <netinet/in.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
@@ -46,7 +46,7 @@ typedef struct _ILibIPAddressMonitor
SOCKET mSocket; SOCKET mSocket;
DWORD bytesReturned; DWORD bytesReturned;
OVERLAPPED *reserved; OVERLAPPED *reserved;
#elif defined (_POSIX) #elif defined (_POSIX) && !defined(__APPLE__)
int mSocket; int mSocket;
struct sockaddr_nl addr; struct sockaddr_nl addr;
#endif #endif
@@ -86,19 +86,21 @@ void ILibIPAddressMonitor_MicrostackThreadDispatch(void *chain, void *user)
void ILibIPAddressMonitor_Destroy(void *object) void ILibIPAddressMonitor_Destroy(void *object)
{ {
#ifndef __APPLE__
_ILibIPAddressMonitor *obj = (_ILibIPAddressMonitor*)object; _ILibIPAddressMonitor *obj = (_ILibIPAddressMonitor*)object;
#endif
#ifdef WIN32 #ifdef WIN32
obj->reserved->hEvent = NULL; obj->reserved->hEvent = NULL;
closesocket(obj->mSocket); closesocket(obj->mSocket);
obj->mSocket = INVALID_SOCKET; obj->mSocket = INVALID_SOCKET;
#elif defined(_POSIX) #elif defined(_POSIX) && !defined(__APPLE__)
close(obj->mSocket); close(obj->mSocket);
obj->mSocket = -1; obj->mSocket = -1;
#endif #endif
} }
#if defined(_POSIX) #if defined(_POSIX) && !defined(__APPLE__)
void ILibIPAddressMonitor_PreSelect(void* object, fd_set *readset, fd_set *writeset, fd_set *errorset, int* blocktime) void ILibIPAddressMonitor_PreSelect(void* object, fd_set *readset, fd_set *writeset, fd_set *errorset, int* blocktime)
{ {
_ILibIPAddressMonitor *obj = (_ILibIPAddressMonitor*)object; _ILibIPAddressMonitor *obj = (_ILibIPAddressMonitor*)object;
@@ -141,7 +143,7 @@ ILibIPAddressMonitor ILibIPAddressMonitor_Create(void *chain, ILibIPAddressMonit
obj->reserved->hEvent = (HANDLE)obj; obj->reserved->hEvent = (HANDLE)obj;
obj->mSocket = socket(AF_INET, SOCK_DGRAM, 0); obj->mSocket = socket(AF_INET, SOCK_DGRAM, 0);
WSAIoctl(obj->mSocket, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &(obj->bytesReturned), obj->reserved, ILibIPAddressMonitor_dispatch); WSAIoctl(obj->mSocket, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &(obj->bytesReturned), obj->reserved, ILibIPAddressMonitor_dispatch);
#elif defined (_POSIX) #elif defined (_POSIX) && !defined(__APPLE__)
obj->mSocket = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE); obj->mSocket = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE);
int flags = fcntl(obj->mSocket, F_GETFL, 0); int flags = fcntl(obj->mSocket, F_GETFL, 0);
fcntl(obj->mSocket, F_SETFL, O_NONBLOCK | flags); fcntl(obj->mSocket, F_SETFL, O_NONBLOCK | flags);