Merge pull request #6 from clevertension/master

fix the code to support mac

Author: antirez

ars.c

@@ -914,7 +914,7 @@ int ars_bsd_fix(struct ars_packet *pkt, unsigned char *packet, size_t size)
 		return -ARS_INVALID;
 	}
 	ip = (struct ars_iphdr*) packet;
-#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI
+#if defined OSTYPE_DARWIN || defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI
 	ip->tot_len = ntohs(ip->tot_len);
 	ip->frag_off = ntohs(ip->frag_off);
 #endif

gethostname.c

@@ -18,8 +18,6 @@
 #include <arpa/inet.h>
 #include <string.h>
 
-size_t strlcpy(char *dst, const char *src, size_t siz);
-
 char *get_hostname(char* addr)
 {
 	static char answer[1024];
@@ -36,7 +34,7 @@ char *get_hostname(char* addr)
 	if (!strcmp(addr, lastreq))
 		return last_answerp;
 
-	strlcpy(lastreq, addr, 1024);
+	strncpy(lastreq, addr, 1024);
 	inet_aton(addr, &naddr);
 	he = gethostbyaddr((char*)&naddr, 4, AF_INET);
 
@@ -45,7 +43,7 @@ char *get_hostname(char* addr)
 		return NULL;
 	}
 
-	strlcpy(answer, he->h_name, 1024);
+	strncpy(answer, he->h_name, 1024);
 	last_answerp = answer;
 
 	return answer;

libpcap_stuff.c

@@ -16,8 +16,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
-#include <pcap.h>
 #include <net/bpf.h>
+#include <pcap.h>
 
 #include "globals.h"
 

script.c

@@ -23,8 +23,8 @@
 #include <sched.h>
 
 #include <sys/ioctl.h>
-#include <pcap.h>
 #include <net/bpf.h>
+#include <pcap.h>
 
 #include "release.h"
 #include "hping2.h"

sendip.c

@@ -48,7 +48,7 @@ void send_ip (char* src, char *dst, char *data, unsigned int datalen,
 	ip->ihl		= (IPHDR_SIZE + optlen + 3) >> 2;
 	ip->tos		= ip_tos;
 
-#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI
+#if defined OSTYPE_DARWIN || defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI
 /* FreeBSD */
 /* NetBSD */
 	ip->tot_len	= packetsize;
@@ -73,7 +73,7 @@ void send_ip (char* src, char *dst, char *data, unsigned int datalen,
 			htons((unsigned short) src_id);
 	}
 
-#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD | defined OSTYPE_BSDI
+#if defined OSTYPE_DARWIN || defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD | defined OSTYPE_BSDI
 /* FreeBSD */
 /* NetBSD */
 	ip->frag_off	|= more_fragments;