read config from CONFDIR

gamelinux · Jun 17, 2010 · 96cf398 · 96cf398
1 parent e074e69
commit 96cf398
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -1,7 +1,8 @@
 #Makefile
 #CC=gcc
 LDFLAGS=-lpcap -lpcre
-CFLAGS=-O3 
+CONFDIR=../etc
+CFLAGS=-O3 -DCONFDIR='"${CONFDIR}"'
 DCFLAGS=-g
 PCFLAGS=-g -pg
 ifneq (${DEBUG},)

diff --git a/src/config.c b/src/config.c
@@ -86,13 +86,13 @@ void set_default_config_options()
     // default source net owns everything
     config.s_net   = "0.0.0.0/0,::/0";
     config.errbuf[0] = '\0';
-    config.configpath = "../etc/";
+    config.configpath = CONFDIR "";
     // files should be relative to configpath somehow
-    config.sig_file_syn = "../etc/tcp-syn.fp";
-    config.sig_file_synack = "../etc/tcp-synack.fp";
-    config.sig_file_ack = "../etc/tcp-stray-ack.fp";
-    config.sig_file_fin = "../etc/tcp-fin.fp";
-    config.sig_file_rst = "../etc/tcp-rst.fp";
+    config.sig_file_syn = CONFDIR "tcp-syn.fp";
+    config.sig_file_synack = CONFDIR "tcp-synack.fp";
+    config.sig_file_ack = CONFDIR "tcp-stray-ack.fp";
+    config.sig_file_fin = CONFDIR "tcp-fin.fp";
+    config.sig_file_rst = CONFDIR "tcp-rst.fp";
     config.sig_syn = NULL;
     config.sig_synack = NULL;
     config.sig_ack = NULL;