Allow using libsodium instead of NaCl

As libsodium has some strange include files (like a version.h), we try to use
absolute include paths whenever possible in fastd now and rename our generated
headers.

1 files changed, 9 insertions, 1 deletions

diff --git a/src/fastd.c b/src/fastd.c
index c434216..ea197d3 100644
--- a/src/fastd.c
+++ b/src/fastd.c
@@ -28,7 +28,7 @@
 #include "crypto.h"
 #include "handshake.h"
 #include "peer.h"
-#include <version.h>
+#include <fastd_version.h>
 
 #include <fcntl.h>
 #include <grp.h>
@@ -39,6 +39,10 @@
 #include <syslog.h>
 #include <sys/resource.h>
 
+#ifdef USE_LIBSODIUM
+#include <sodium/core.h>
+#endif
+
 
 static volatile bool sighup = false;
 static volatile bool terminate = false;
@@ -751,6 +755,10 @@ static void drop_caps(fastd_context_t *ctx) {
 }
 
 int main(int argc, char *argv[]) {
+#ifdef USE_LIBSODIUM
+	sodium_init();
+#endif
+
 	fastd_context_t ctx = {};
 
 	close_fds(&ctx);