3 files changed, 39 insertions, 4 deletions

@@ -25,9 +25,17 @@ void libwifi_random_mac(unsigned char buf[6], unsigned char prefix[3]) {
     memset(buf, 0, 6);
     if (prefix != NULL) {
         memcpy(buf, prefix, 3);
-        getrandom(buf + 3, 3, 0); 
+#if __APPLE__
+        arc4random_buf(buf + 3, 3);
+#else
+        getrandom(buf + 3, 3, 0);
+#endif /* __APPLE__ */
     } else {
+#if __APPLE__
+        arc4random_buf(buf, 6);
+#else
         getrandom(buf, 6, 0);
+#endif /* __APPLE__ */
     }
 }
 
@@ -16,6 +16,28 @@
 #ifndef LIBWIFI_CORE_BYTESWAP_H
 #define LIBWIFI_CORE_BYTESWAP_H
 
+#if __APPLE__
+#include <libkern/OSByteOrder.h>
+
+#define BYTESWAP16(x) OSSwapInt16(x)
+#define BYTESWAP32(x) OSSwapInt32(x)
+#define BYTESWAP64(x) OSSwapInt64(x)
+
+#define htobe16(x) OSSwapHostToBigInt16(x)
+#define htole16(x) OSSwapHostToLittleInt16(x)
+#define be16toh(x) OSSwapBigToHostInt16(x)
+#define le16toh(x) OSSwapLittleToHostInt16(x)
+
+#define htobe32(x) OSSwapHostToBigInt32(x)
+#define htole32(x) OSSwapHostToLittleInt32(x)
+#define be32toh(x) OSSwapBigToHostInt32(x)
+#define le32toh(x) OSSwapLittleToHostInt32(x)
+
+#define htobe64(x) OSSwapHostToBigInt64(x)
+#define htole64(x) OSSwapHostToLittleInt64(x)
+#define be64toh(x) OSSwapBigToHostInt64(x)
+#define le64toh(x) OSSwapLittleToHostInt64(x)
+#else
 #include <byteswap.h>
 
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
@@ -26,6 +48,7 @@
 #define BYTESWAP16(x) (__bswap_16(x))
 #define BYTESWAP32(x) (__bswap_32(x))
 #define BYTESWAP64(x) (__bswap_32(x))
-#endif
+#endif /* __BYTE_ORDER__ */
+#endif /* __APPLE__ */
 
 #endif /* LIBWIFI_CORE_BYTESWAP_H */
@@ -17,14 +17,18 @@
 #include "../../core/radiotap/radiotap_iter.h"
 
 #include <errno.h>
-#include <endian.h>
 #include <stdint.h>
 
+#if !(__APPLE__)
+#include <endian.h>
+#endif
+
 /**
  * The libwifi radiotap parser uses the usual ieee80211_radiotap_iterator to parse incoming
  * radiotap headers into a consumable libwifi_radiotap_info struct.
  */
-int libwifi_parse_radiotap_info(struct libwifi_radiotap_info *info, const unsigned char *frame, size_t frame_len) {
+int libwifi_parse_radiotap_info(struct libwifi_radiotap_info *info, const unsigned char *frame,
+                                size_t frame_len) {
     memset(info, 0, sizeof(struct libwifi_radiotap_info));
 
     if (frame_len < sizeof(struct ieee80211_radiotap_header)) {