make BGP keepalive/hold time configurable, revise config syntax

[l2tpns.git] / l2tpns.h

diff --git a/l2tpns.h b/l2tpns.h
index bc7867f..0262ac6 100644 (file)
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
 // L2TPNS Global Stuff

-// $Id: l2tpns.h,v 1.30 2004-11-05 04:55:27 bodea Exp $
+// $Id: l2tpns.h,v 1.33 2004-11-11 03:07:43 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.3"
+#define VERSION        "2.0.6"

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


@@ -460,18 +460,24 @@ struct configt
        int             cluster_hb_timeout;             // How many missed heartbeats trigger an election.
 
 #ifdef BGP
        int             cluster_hb_timeout;             // How many missed heartbeats trigger an election.
 
 #ifdef BGP

+#define BGP_NUM_PEERS  2

        u16             as_number;
        u16             as_number;

-       char            bgp_peer[2][64];
-       u16             bgp_peer_as[2];
+       struct {
+               char    name[64];
+               u16     as;
+               int     keepalive;
+               int     hold;
+       }               neighbour[BGP_NUM_PEERS];

 #endif
 };
 
 #endif
 };
 

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

 struct config_descriptt
 {
        char *key;
        int offset;
        int size;
 struct config_descriptt
 {
        char *key;
        int offset;
        int size;

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

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