- set hostname in CLI prompt

[l2tpns.git] / l2tpns.h

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

-// $Id: l2tpns.h,v 1.8 2004/06/28 02:43:13 fred_nerk Exp $
+// $Id: l2tpns.h,v 1.10 2004/07/07 09:09:53 bodea Exp $

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


@@ -14,7 +14,6 @@
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <libcli.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <libcli.h>

-#include "config.h"

 
 #define VERSION        "2.0.0"
 
 
 #define VERSION        "2.0.0"
 


@@ -43,6 +42,7 @@
 #define IDLE_TIMEOUT   240             // Time between last packet sent and LCP ECHO generation
 
 // Constants
 #define IDLE_TIMEOUT   240             // Time between last packet sent and LCP ECHO generation
 
 // Constants

+#include "config.h"

 #ifndef PLUGINDIR
 #define PLUGINDIR      LIBDIR                  // Plugins
 #endif
 #ifndef PLUGINDIR
 #define PLUGINDIR      LIBDIR                  // Plugins
 #endif


@@ -60,7 +60,6 @@
 #endif
 
 #define TAPDEVICE      "/dev/net/tun"
 #endif
 
 #define TAPDEVICE      "/dev/net/tun"

-#define        UDP             17

 #define STATEFILE      DATADIR "/state.dump"           // State dump file
 #define CONFIGFILE     FLASHDIR "/startup-config"      // Configuration file
 #define CLIUSERS       FLASHDIR "/users"               // CLI Users file
 #define STATEFILE      DATADIR "/state.dump"           // State dump file
 #define CONFIGFILE     FLASHDIR "/startup-config"      // Configuration file
 #define CLIUSERS       FLASHDIR "/users"               // CLI Users file


@@ -403,12 +402,12 @@ struct configt
                                                        // Don't use this unless you have a dual processor machine!
        int             icmp_rate;                      // Max number of ICMP unreachable per second to send
 
                                                        // Don't use this unless you have a dual processor machine!
        int             icmp_rate;                      // Max number of ICMP unreachable per second to send
 

-       u32     cluster_address;                // Multicast address of cluster.
+       u32             cluster_address;                // Multicast address of cluster.

                                                        // Send to this address to have everyone hear.
        char            cluster_interface[64];          // Which interface to listen for multicast on.
        int             cluster_iam_master;             // Are we the cluster master???
        int             cluster_iam_uptodate;           // Set if we've got a full set of state from the master.
                                                        // Send to this address to have everyone hear.
        char            cluster_interface[64];          // Which interface to listen for multicast on.
        int             cluster_iam_master;             // Are we the cluster master???
        int             cluster_iam_uptodate;           // Set if we've got a full set of state from the master.

-       u32     cluster_master_address;         // The network address of the cluster master.
+       u32             cluster_master_address;         // The network address of the cluster master.

                                                        // Zero if i am the cluster master.
        int             cluster_seq_number;             // Sequence number of the next heartbeat we'll send out
                                                        // (or the seq number we're next expecting if we're a slave).
                                                        // Zero if i am the cluster master.
        int             cluster_seq_number;             // Sequence number of the next heartbeat we'll send out
                                                        // (or the seq number we're next expecting if we're a slave).


@@ -525,7 +524,7 @@ int sessionsetup(tunnelidt t, sessionidt s);
 int cluster_send_session(int s);
 int cluster_send_tunnel(int t);
 int cluster_send_goodbye();
 int cluster_send_session(int s);
 int cluster_send_tunnel(int t);
 int cluster_send_goodbye();

-void init_cli();
+void init_cli(char *hostname);

 void cli_do_file(FILE *fh);
 void cli_do(int sockfd);
 int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...);
 void cli_do_file(FILE *fh);
 void cli_do(int sockfd);
 int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...);