Commit d51e703f authored by Robert David Graham's avatar Robert David Graham
Browse files

Merge pull request #5 from jedisct1/openbsd 

OpenBSD compatibility
parents c0ac27fb 8cfe2290

Makefile

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ LIBS = -lwpcap 
FLAGS2 = 

endif



# OpenBSD

ifneq (, $(findstring openbsd, $(SYS)))

LIBS = -lpcap -lm -pthread

INCLUDES = -I.

FLAGS2 = 

endif



# this works on llvm or real gcc

CC = gcc

src/pixie-threads.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ pixie_begin_thread( 
#if defined(WIN32)

    UNUSEDPARM(flags);

    return _beginthread(worker_thread, 0, worker_data);

#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)

#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)



    typedef void *(*PTHREADFUNC)(void*);

    pthread_t thread_id;

src/rawsock-getif.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


#include "ranges.h" /*for parsing IPv4 addresses */



#if defined(__APPLE__) || defined(__FreeBSD__)

#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)

#include <unistd.h>

#include <sys/socket.h>

#include <net/route.h>

src/rawsock-getip.c

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ again: 
#include <ifaddrs.h>

#include <stdio.h>

#include <arpa/inet.h>

#include <netinet/in.h>



#ifdef AF_LINK

#   include <net/if_dl.h>

src/rawsock-getroute.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include "ranges.h" /*for parsing IPv4 addresses */





#if defined(__APPLE__) || defined(__FreeBSD__)

#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)

#include <unistd.h>

#include <sys/socket.h>

#include <net/route.h>