Merge branch 'master' of github.com:gjedeer/tuntox

8 files changed, 96 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index edf6645..8b6eea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,7 @@
 *.i*86
 *.x86_64
 *.hex
+
+# tuntox related, not needed in repo
+tuntox
+gitversion.h
diff --git a/BUILD.md b/BUILD.md
index c0d340c..5de078c 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -4,4 +4,17 @@
 * cd tuntox
 * make
 
-The makefile creates a static binary by default. If you're not a fan of static binaries, remove "-static" from LDFLAGS. One reason to do so may be if you'd like to resolve hostnames on the tuntox server (invoke client with -L 80:reddit.com:80 instead of -L 80:198.41.208.138:80). Static linking breaks hostname resolution, but IMHO the pros overweight the cons.
+The makefile creates a static binary by default. If you're not a fan of static binaries, remove `-static` from `LDFLAGS`. 
+
+One reason to do so may be if you'd like to resolve hostnames on the tuntox server (invoke client with `-L 80:reddit.com:80` instead of `-L 80:198.41.208.138:80`). 
+
+Static linking breaks hostname resolution, but IMHO the pros overweight the cons.
+
+## MacOS build
+Basically the same as above but:
+
+* static compiling is removed - you can't do this on MacOS platform (no, just don't)
+* because of removed `-static` you can't resolve hostnames (you can always put it into `hosts` file in your system)
+
+If you'd like to build on Mac do: `make -f Makefile.mac`
+
diff --git a/Makefile.mac b/Makefile.mac
new file mode 100644
index 0000000..ee41cda
--- /dev/null
+++ b/Makefile.mac
@@ -0,0 +1,28 @@
+SOURCES = $(wildcard *.c)
+DEPS=libtoxcore
+CC=gcc
+CFLAGS=-g #-std=c99
+CFLAGS += $(shell pkg-config --cflags $(DEPS))
+LDFLAGS=-g -lm
+LDFLAGS += $(shell pkg-config --libs $(DEPS))
+OBJECTS=$(SOURCES:.c=.o)
+INCLUDES = $(wildcard *.h)
+
+all: cscope.out tuntox 
+
+gitversion.h: .git/HEAD .git/index
+        echo "#define GITVERSION \"$(shell git rev-parse HEAD)\"" > $@
+
+gitversion.c: gitversion.h
+
+.c.o: $(INCLUDES)
+        $(CC) $(CFLAGS) $< -c -o $@
+
+tuntox: $(OBJECTS) $(INCLUDES)
+        $(CC) -o $@ $(OBJECTS) -ltoxcore $(LDFLAGS) /usr/local/lib/libsodium.a /usr/local/lib/libtoxcore.a
+
+cscope.out:
+        cscope -bv ./*.[ch] 
+
+clean:
+        rm -rf *.o tuntox gitversion.h
diff --git a/README.md b/README.md
index 05a98b8..75278ec 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,8 @@ Tuntox is a single binary which may run in client mode or server mode. As a rule
 
 If you don't know what Tox is - it's an instant messenger protocol which is fully P2P, supports audio/video calls and file transfers. Unlike Skype it's fully open and unlike, say, XMPP - the calls and file transfers actually work. Go download a client from http://utox.org/ or read more at https://tox.im/
 
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/5690/badge.svg)](https://scan.coverity.com/projects/5690)
+
 ## Binary
 
 Get the binaries from Releases tab on github. Just download the correct file for your architecture, execute chmod +x and you're done. The binaries are signed with my PGP key, [11C1 B15A 5D5D D662 E469 928A EBDA 6B97 4ED3 D2B7](https://keybase.io/gdr).
@@ -68,6 +70,6 @@ Tuntox is piggybacking on the Tox protocol, which itself has not been audited by
 
 Sorry about GPLv3 - both toxcore and utox (from which I borrowed some code) are GPLv3.
 
-Thank you to the toxcore and utox developers without whom this program would never exist. [Donate to Tox](https://donate.tox.im/) so they can get a proper audit.
+Thank you to the toxcore and utox developers without whom this program would never exist.
 
 Thank you Mr_4551 for your help and motivation.
diff --git a/client.c b/client.c
index fff4620..bfcab14 100644
--- a/client.c
+++ b/client.c
@@ -1,4 +1,10 @@
 #include <time.h>
+
+/* MacOS related */
+#ifdef __MACH__
+#include "mach.h"
+#endif
+
 #include "log.h"
 #include "main.h"
 #include "client.h"
diff --git a/mach.c b/mach.c
new file mode 100644
index 0000000..a9095f6
--- /dev/null
+++ b/mach.c
@@ -0,0 +1,22 @@
+#ifdef __MACH__
+#include "mach.h"
+
+/* there is no clock_gettime on MacOS platform */
+int clock_gettime(int clk_id, struct timespec *t)
+{
+    mach_timebase_info_data_t timebase;
+    mach_timebase_info(&timebase);
+    
+    uint64_t time;
+    
+    time = mach_absolute_time();
+    
+    double nseconds = ((double)time * (double)timebase.numer) / ((double)timebase.denom);
+    double seconds = ((double)time * (double)timebase.numer) / ((double)timebase.denom * 1e9);
+    
+    t->tv_sec = seconds;
+    t->tv_nsec = nseconds;
+    
+    return 0;
+}
+#endif
diff --git a/mach.h b/mach.h
new file mode 100644
index 0000000..5ac9a4e
--- /dev/null
+++ b/mach.h
@@ -0,0 +1,14 @@
+#ifndef _MACH_H
+#define _MACH_H
+
+#include <time.h>
+#include <mach/mach_time.h>
+
+// there is no CLOCK_REALTIME or CLOCK_MONOTONIC on MacOS platform
+#define CLOCK_REALTIME 0
+#define CLOCK_MONOTONIC 0
+
+// MacOS doesn't support the flag MSG_NOSIGNAL
+#define MSG_NOSIGNAL SO_NOSIGPIPE
+
+#endif
\ No newline at end of file
diff --git a/main.c b/main.c
index 24c8df6..0535e67 100644
--- a/main.c
+++ b/main.c
@@ -3,6 +3,10 @@
 #include "tox_bootstrap.h"
 #include "log.h"
 
+#ifdef __MACH__
+    #include "mach.h"
+#endif
+
 static struct Tox_Options tox_options;
 Tox *tox;
 int client_socket = 0;
@@ -1135,7 +1139,7 @@ int main(int argc, char *argv[])
         do_daemonize();
     }
 
-    on_exit(cleanup, NULL);
+    atexit(cleanup);
 
     print_version();