Merge pull request #87 from nhorman/nist_2

Nist 2
nhorman · Mar 27, 2020 · 3b08d1b · 3b08d1b
2 parents 99d6200 + de780aa
commit 3b08d1b
Show file tree

Hide file tree

Showing 4 changed files with 393 additions and 253 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -31,7 +31,7 @@ if RTLSDR
 rngd_SOURCES	+= rngd_rtlsdr.c
 endif
 
-rngd_LDADD	= librngd.a -lsysfs $(LIBS) $(librtlsdr_LIBS) ${libp11_LIBS} ${libcrypto_LIBS} ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} $(PTHREAD_LIBS)
+rngd_LDADD	= librngd.a -lsysfs $(LIBS) $(librtlsdr_LIBS) ${libp11_LIBS} ${libcrypto_LIBS} ${jansson_LIBS} ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} $(PTHREAD_LIBS)
 
 if PKCS11 
 rngd_SOURCES	+= rngd_pkcs11.c

diff --git a/configure.ac b/configure.ac
@@ -100,6 +100,7 @@ AS_IF(
 	[
 		PKG_CHECK_MODULES([libcurl], [libcurl], [], [AC_MSG_ERROR([libcurl is required])])
 		PKG_CHECK_MODULES([libxml2], [libxml-2.0], [], [AC_MSG_ERROR([libxml2 is required])])
+                PKG_CHECK_MODULES([jansson], [jansson], [], [AC_MSG_ERROR([libjansson is required])])
 		AC_DEFINE([HAVE_NISTBEACON],1,[Enable NISTBEACON])
 	]
 )

diff --git a/rngd.h b/rngd.h
@@ -178,6 +178,7 @@ extern bool quiet;
 	free(____buf); \
 } while (0)
 
+extern volatile bool server_running;
 extern int write_pid_file(const char *pid_fn);
 #endif /* RNGD__H */