merge

[l2tpns.git] / l2tpns.h

diff --git a/l2tpns.h b/l2tpns.h
index 31ee6a1..59e328b 100644 (file)
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
 // L2TPNS Global Stuff

-// $Id: l2tpns.h,v 1.17 2004/09/02 04:18:07 fred_nerk Exp $
+// $Id: l2tpns.h,v 1.25 2004/10/30 07:17:41 bodea Exp $

 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__


@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <libcli.h>
 
 #include <sys/types.h>
 #include <libcli.h>
 

-#define VERSION        "2.0.1"
+#define VERSION        "2.0.2"

 
 // Limits
 #define MAXTUNNEL      500             // could be up to 65535
 
 // Limits
 #define MAXTUNNEL      500             // could be up to 65535


@@ -40,26 +40,37 @@
 #define MAX_LOG_LENGTH 512             // Maximum size of log message
 #define ECHO_TIMEOUT   60              // Time between last packet sent and LCP ECHO generation
 #define IDLE_TIMEOUT   240             // Time between last packet sent and LCP ECHO generation
 #define MAX_LOG_LENGTH 512             // Maximum size of log message
 #define ECHO_TIMEOUT   60              // Time between last packet sent and LCP ECHO generation
 #define IDLE_TIMEOUT   240             // Time between last packet sent and LCP ECHO generation

-#define BUSY_WAIT_TIMEOUT      3000    // 5 minutes in 1/10th seconds to wait for radius to cleanup on shutdown
+#define BUSY_WAIT_TIME 3000            // 5 minutes in 1/10th seconds to wait for radius to cleanup on shutdown

 
 // Constants
 
 // Constants

-#include "config.h"
-#ifndef PLUGINDIR
-#define PLUGINDIR      LIBDIR                  // Plugins
+#ifndef ETCDIR
+#define ETCDIR         "/etc/l2tpns"

 #endif
 
 #endif
 

-#ifndef PLUGINCONF
-#define PLUGINCONF     ETCDIR                  // Plugin config dir
+#ifndef LIBDIR
+#define LIBDIR         "/usr/lib/l2tpns"

 #endif
 
 #endif
 

-#ifndef DATADIR
-#define DATADIR                "/tmp"
+#ifndef STATEDIR
+#define STATEDIR       "/var/lib/l2tpns"
+#endif
+
+#ifndef PLUGINDIR
+#define PLUGINDIR      LIBDIR          // Plugins
+#endif
+
+#ifndef PLUGINCONF
+#define PLUGINCONF     ETCDIR          // Plugin config dir

 #endif
 
 #ifndef FLASHDIR
 #define FLASHDIR       ETCDIR
 #endif
 
 #endif
 
 #ifndef FLASHDIR
 #define FLASHDIR       ETCDIR
 #endif
 

+#ifndef DATADIR
+#define DATADIR                STATEDIR
+#endif
+

 #define TUNDEVICE      "/dev/net/tun"
 #define STATEFILE      DATADIR "/state.dump"           // State dump file
 #define CONFIGFILE     FLASHDIR "/startup-config"      // Configuration file
 #define TUNDEVICE      "/dev/net/tun"
 #define STATEFILE      DATADIR "/state.dump"           // State dump file
 #define CONFIGFILE     FLASHDIR "/startup-config"      // Configuration file


@@ -408,7 +419,9 @@ struct configt
 
        ipt             default_dns1, default_dns2;
 
 
        ipt             default_dns1, default_dns2;
 

-       unsigned long   rl_rate;
+       unsigned long   rl_rate;                        // throttle rate
+       int             num_tbfs;                       // number of throttle buckets
+

        int             save_state;
        char            accounting_dir[128];
        ipt             bind_address;
        int             save_state;
        char            accounting_dir[128];
        ipt             bind_address;


@@ -455,7 +468,7 @@ struct config_descriptt
        char *key;
        int offset;
        int size;
        char *key;
        int offset;
        int size;

-       enum { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IP } type;
+       enum { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IP, MAC } type;

 };
 
 // arp.c
 };
 
 // arp.c


@@ -484,17 +497,6 @@ void radiusretry(u16 r);
 u16 radiusnew(sessionidt s);
 void radiusclear(u16 r, sessionidt s);
 
 u16 radiusnew(sessionidt s);
 void radiusclear(u16 r, sessionidt s);
 

-// throttle.c
-int throttle_session(sessionidt s, int throttle);
-
-
-// rl.c
-void init_rl();
-u16 rl_create_tbf();
-u16 rl_get_tbf();
-void rl_done_tbf(u16 t);
-void rl_destroy_tbf(u16 t);
-

 
 // l2tpns.c
 clockt now(void);
 
 // l2tpns.c
 clockt now(void);


@@ -502,7 +504,7 @@ clockt backoff(u8 try);
 void routeset(sessionidt, ipt ip, ipt mask, ipt gw, u8 add);
 void inittun(void);
 void initudp(void);
 void routeset(sessionidt, ipt ip, ipt mask, ipt gw, u8 add);
 void inittun(void);
 void initudp(void);

-void initdata(void);
+void initdata(int optdebug, char *optconfig);

 void initippool();
 sessionidt sessionbyip(ipt ip);
 sessionidt sessionbyuser(char *username);
 void initippool();
 sessionidt sessionbyip(ipt ip);
 sessionidt sessionbyuser(char *username);