add cluster_mcast_ttl option

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index b8af6af..6e0c7ee 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,7 +4,7 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.124 2005/08/29 06:17:53 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.128 2005/09/02 23:59:56 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -135,6 +135,7 @@ config_descriptt config_values[] = {
        CONFIG("packet_limit", max_packets, INT),
        CONFIG("cluster_address", cluster_address, IPv4),
        CONFIG("cluster_interface", cluster_interface, STRING),
+       CONFIG("cluster_mcast_ttl", cluster_mcast_ttl, INT),
        CONFIG("cluster_hb_interval", cluster_hb_interval, INT),
        CONFIG("cluster_hb_timeout", cluster_hb_timeout, INT),
        CONFIG("cluster_master_min_adv", cluster_master_min_adv, INT),
@@ -1580,7 +1581,7 @@ void sessionshutdown(sessionidt s, char *reason, int result, int error)
 
 void sendipcp(sessionidt s, tunnelidt t)
 {
-       uint8_t buf[MAXCONTROL];
+       uint8_t buf[MAXETHER];
        uint8_t *q;
 
        CSTAT(sendipcp);
@@ -1592,7 +1593,7 @@ void sendipcp(sessionidt s, tunnelidt t)
                session[s].unique_id = last_id;
        }
 
-       q = makeppp(buf,sizeof(buf), 0, 0, s, t, PPPIPCP);
+       q = makeppp(buf, sizeof(buf), 0, 0, s, t, PPPIPCP);
        if (!q) return;
 
        *q = ConfigReq;
@@ -1609,13 +1610,13 @@ void sendipcp(sessionidt s, tunnelidt t)
 
 void sendipv6cp(sessionidt s, tunnelidt t)
 {
-       uint8_t buf[MAXCONTROL];
+       uint8_t buf[MAXETHER];
        uint8_t *q;
 
        CSTAT(sendipv6cp);
        LOG(3, s, t, "IPV6CP: send ConfigReq\n");
 
-       q = makeppp(buf,sizeof(buf), 0, 0, s, t, PPPIPV6CP);
+       q = makeppp(buf, sizeof(buf), 0, 0, s, t, PPPIPV6CP);
        if (!q) return;
 
        *q = ConfigReq;
@@ -2294,7 +2295,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                                controlt *c = controlnew(2); // sending SCCRP
                                                control16(c, 2, version, 1); // protocol version
                                                control32(c, 3, 3, 1); // framing
-                                               controls(c, 7, tunnel[t].hostname, 1); // host name (TBA)
+                                               controls(c, 7, hostname, 1); // host name
                                                if (chapresponse) controlb(c, 13, chapresponse, 16, 1); // Challenge response
                                                control16(c, 9, t, 1); // assigned tunnel
                                                controladd(c, 0, t); // send the resply
@@ -2645,7 +2646,7 @@ static void regular_cleanups(double period)
                        }
                }
                // Send hello
-               if (tunnel[t].state == TUNNELOPEN && tunnel[t].lastrec < TIME + 600)
+               if (tunnel[t].state == TUNNELOPEN && (time_now - tunnel[t].lastrec) > 60)
                {
                        controlt *c = controlnew(6); // sending HELLO
                        controladd(c, 0, t); // send the message
@@ -2833,7 +2834,7 @@ static void regular_cleanups(double period)
                // No data in ECHO_TIMEOUT seconds, send LCP ECHO
                if (session[s].ppp.phase >= Establish && (time_now - session[s].last_packet >= ECHO_TIMEOUT))
                {
-                       uint8_t b[MAXCONTROL] = {0};
+                       uint8_t b[MAXETHER];
 
                        uint8_t *q = makeppp(b, sizeof(b), 0, 0, s, session[s].tunnel, PPPLCP);
                        if (!q) continue;
@@ -3469,6 +3470,7 @@ static void initdata(int optdebug, char *optconfig)
        config->debug = optdebug;
        config->num_tbfs = MAXTBFS;
        config->rl_rate = 28; // 28kbps
+       config->cluster_mcast_ttl = 1;
        config->cluster_master_min_adv = 1;
        config->ppp_restart_time = 3;
        config->ppp_max_configure = 10;