From: bodea <bodea>
Date: Mon, 18 Apr 2005 04:18:15 +0000 (+0000)
Subject: more state_state removal
X-Git-Tag: release_2_1_0~60
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/2d5c2464df0baf7f0e127bb90f6717f5f401c972?ds=inline

more state_state removal
---

diff --git a/Makefile b/Makefile
index 1a44ddd..1235b0e 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ statedir = /var/lib/l2tpns
 DEFINES =
 DEFINES += -DLIBDIR='"$(libdir)"'
 DEFINES += -DETCDIR='"$(etcdir)"'
-DEFINES += -DSTATEDIR='"$(statedir)"'
 
 OPTIM =
 OPTIM += -g
diff --git a/l2tpns.h b/l2tpns.h
index 74b8d93..20ec1fe 100644
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
-// $Id: l2tpns.h,v 1.61 2005/03/10 06:18:47 bodea Exp $
+// $Id: l2tpns.h,v 1.62 2005/04/18 04:18:15 bodea Exp $
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
@@ -53,10 +53,6 @@
 #define LIBDIR		"/usr/lib/l2tpns"
 #endif
 
-#ifndef STATEDIR
-#define STATEDIR	"/var/lib/l2tpns"
-#endif
-
 #ifndef PLUGINDIR
 #define PLUGINDIR	LIBDIR		// Plugins
 #endif
@@ -69,13 +65,8 @@
 #define FLASHDIR	ETCDIR
 #endif
 
-#ifndef DATADIR
-#define DATADIR		STATEDIR
-#endif
-
 #define TUNDEVICE	"/dev/net/tun"
 #define RANDOMDEVICE	"/dev/urandom"			// default, not as secure as /dev/random but non-blocking
-#define STATEFILE	DATADIR "/state.dump"		// State dump file
 #define CONFIGFILE	FLASHDIR "/startup-config"	// Configuration file
 #define CLIUSERS	FLASHDIR "/users"		// CLI Users file
 #define IPPOOLFILE	FLASHDIR "/ip_pool"		// Address pool configuration