1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
diff --git a/configure.ac b/configure.ac
index 8ec1711..1de7be7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,7 @@ AC_INIT([nftlb], [1.0.8], [netfilter-devel@vger.kernel.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects
tar-pax no-dist-gzip dist-bzip2 1.6])
@@ -25,5 +26,7 @@ AC_CHECK_HEADER([ev.h], [EVENTINC="-include ev.h"],
[EVENTINC="-include libev/ev.h"],
[AC_MSG_ERROR([ev.h not found])])])
+AC_CHECK_HEADERS([execinfo.h])
+
AC_CONFIG_FILES([Makefile src/Makefile])
AC_OUTPUT
diff --git a/src/main.c b/src/main.c
index 2149e34..9ff3f7b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
@@ -25,6 +26,10 @@
#include <errno.h>
#include <unistd.h>
+#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
+#endif /* HAVE_EXECINFO_H */
+
#include "config.h"
#include "objects.h"
#include "server.h"
@@ -88,6 +93,7 @@ static void nftlb_sighandler(int signo)
exit(EXIT_SUCCESS);
}
+#ifdef HAVE_EXECINFO_H
static void nftlb_trace() {
int level;
@@ -100,6 +106,7 @@ static void nftlb_trace() {
if (!obj_recovery())
exit(EXIT_FAILURE);
}
+#endif /* HAVE_EXECINFO_H */
static int main_process(const char *config, int mode)
{
@@ -189,9 +196,13 @@ int main(int argc, char *argv[])
if (signal(SIGINT, nftlb_sighandler) == SIG_ERR ||
signal(SIGTERM, nftlb_sighandler) == SIG_ERR ||
+#ifdef HAVE_EXECINFO_H
signal(SIGPIPE, SIG_IGN) == SIG_ERR ||
signal(SIGABRT, nftlb_trace) == SIG_ERR ||
signal(SIGSEGV, nftlb_trace) == SIG_ERR) {
+#else
+ signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
+#endif /* HAVE_EXECINFO_H */
zcu_log_print(LOG_ERR, "Error assigning signals");
return EXIT_FAILURE;
}
|
GitWeb
