Add grouping session functionality for load balancing and failover

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index d4bb9ca..52872a5 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -56,6 +56,7 @@
 #ifdef LAC
 #include "l2tplac.h"
 #endif
 #ifdef LAC
 #include "l2tplac.h"
 #endif

+#include "pppoe.h"

 
 #ifdef LAC
 char * Vendor_name = "Linux L2TPNS";
 
 #ifdef LAC
 char * Vendor_name = "Linux L2TPNS";


@@ -67,6 +68,9 @@ configt *config = NULL;               // all configuration
 int nlfd = -1;                 // netlink socket
 int tunfd = -1;                        // tun interface file handle. (network device)
 int udpfd = -1;                        // UDP file handle
 int nlfd = -1;                 // netlink socket
 int tunfd = -1;                        // tun interface file handle. (network device)
 int udpfd = -1;                        // UDP file handle

+#ifdef LAC
+int udplacfd = -1;             // UDP LAC file handle
+#endif

 int controlfd = -1;            // Control signal handle
 int clifd = -1;                        // Socket listening for CLI connections.
 int daefd = -1;                        // Socket listening for DAE connections.
 int controlfd = -1;            // Control signal handle
 int clifd = -1;                        // Socket listening for CLI connections.
 int daefd = -1;                        // Socket listening for DAE connections.


@@ -77,7 +81,7 @@ int cluster_sockfd = -1;      // Intra-cluster communications socket.
 int epollfd = -1;              // event polling
 time_t basetime = 0;           // base clock
 char hostname[MAXHOSTNAME] = "";       // us.
 int epollfd = -1;              // event polling
 time_t basetime = 0;           // base clock
 char hostname[MAXHOSTNAME] = "";       // us.

-static int tunidx;             // ifr_ifindex of tun device
+int tunidx;                            // ifr_ifindex of tun device

 int nlseqnum = 0;              // netlink sequence number
 int min_initok_nlseqnum = 0;   // minimun seq number for messages after init is ok
 static int syslog_log = 0;     // are we logging to syslog
 int nlseqnum = 0;              // netlink sequence number
 int min_initok_nlseqnum = 0;   // minimun seq number for messages after init is ok
 static int syslog_log = 0;     // are we logging to syslog


@@ -175,7 +179,21 @@ config_descriptt config_values[] = {
 #endif
        CONFIG("echo_timeout", echo_timeout, INT),
        CONFIG("idle_echo_timeout", idle_echo_timeout, INT),
 #endif
        CONFIG("echo_timeout", echo_timeout, INT),
        CONFIG("idle_echo_timeout", idle_echo_timeout, INT),

-       { NULL, 0, 0, 0 },
+       CONFIG("iftun_address", iftun_address, IPv4),
+       CONFIG("tundevicename", tundevicename, STRING),
+#ifdef LAC
+       CONFIG("disable_lac_func", disable_lac_func, BOOL),
+       CONFIG("auth_tunnel_change_addr_src", auth_tunnel_change_addr_src, BOOL),
+       CONFIG("bind_address_remotelns", bind_address_remotelns, IPv4),
+       CONFIG("bind_portremotelns", bind_portremotelns, SHORT),
+#endif
+       CONFIG("pppoe_if_to_bind", pppoe_if_to_bind, STRING),
+       CONFIG("pppoe_service_name", pppoe_service_name, STRING),
+       CONFIG("pppoe_ac_name", pppoe_ac_name, STRING),
+       CONFIG("disable_sending_hello", disable_sending_hello, BOOL),
+       CONFIG("disable_no_spoof", disable_no_spoof, BOOL),
+       CONFIG("grp_txrate_average_time", grp_txrate_average_time, INT),
+       { NULL, 0, 0, 0 }

 };
 
 static char *plugin_functions[] = {
 };
 
 static char *plugin_functions[] = {


@@ -203,6 +221,7 @@ tunnelt *tunnel = NULL;                     // Array of tunnel structures.
 bundlet *bundle = NULL;                        // Array of bundle structures.
 fragmentationt *frag = NULL;           // Array of fragmentation structures.
 sessiont *session = NULL;              // Array of session structures.
 bundlet *bundle = NULL;                        // Array of bundle structures.
 fragmentationt *frag = NULL;           // Array of fragmentation structures.
 sessiont *session = NULL;              // Array of session structures.

+groupsesst *grpsession = NULL;         // Array of groupsesst structures.

 sessionlocalt *sess_local = NULL;      // Array of local per-session counters.
 radiust *radius = NULL;                        // Array of radius structures.
 ippoolt *ip_address_pool = NULL;       // Array of dynamic IP addresses.
 sessionlocalt *sess_local = NULL;      // Array of local per-session counters.
 radiust *radius = NULL;                        // Array of radius structures.
 ippoolt *ip_address_pool = NULL;       // Array of dynamic IP addresses.


@@ -213,9 +232,6 @@ struct Tstats *_statistics = NULL;
 struct Tringbuffer *ringbuffer = NULL;
 #endif
 
 struct Tringbuffer *ringbuffer = NULL;
 #endif
 

-static ssize_t netlink_send(struct nlmsghdr *nh);
-static void netlink_addattr(struct nlmsghdr *nh, int type, const void *data, int alen);
-static void cache_ipmap(in_addr_t ip, sessionidt s);

 static void uncache_ipmap(in_addr_t ip);
 static void cache_ipv6map(struct in6_addr ip, int prefixlen, sessionidt s);
 static void free_ip_address(sessionidt s);
 static void uncache_ipmap(in_addr_t ip);
 static void cache_ipv6map(struct in6_addr ip, int prefixlen, sessionidt s);
 static void free_ip_address(sessionidt s);


@@ -244,12 +260,14 @@ static clockt now(double *f)
        if (f) *f = t.tv_sec + t.tv_usec / 1000000.0;
        if (t.tv_sec != time_now)
        {
        if (f) *f = t.tv_sec + t.tv_usec / 1000000.0;
        if (t.tv_sec != time_now)
        {

-           time_now = t.tv_sec;
-           time_changed++;
+               time_now = t.tv_sec;
+               time_changed++;
+               grp_time_changed();

        }
 
        // Time in milliseconds
        }
 
        // Time in milliseconds

-       time_now_ms = (t.tv_sec * 1000) + (t.tv_usec/1000);
+       // TODO FOR MLPPP DEV
+       //time_now_ms = (t.tv_sec * 1000) + (t.tv_usec/1000);

 
        return (t.tv_sec - basetime) * 10 + t.tv_usec / 100000 + 1;
 }
 
        return (t.tv_sec - basetime) * 10 + t.tv_usec / 100000 + 1;
 }


@@ -285,7 +303,7 @@ void _log(int level, sessionidt s, tunnelidt t, const char *format, ...)
                ringbuffer->buffer[ringbuffer->tail].session = s;
                ringbuffer->buffer[ringbuffer->tail].tunnel = t;
                va_start(ap, format);
                ringbuffer->buffer[ringbuffer->tail].session = s;
                ringbuffer->buffer[ringbuffer->tail].tunnel = t;
                va_start(ap, format);

-               vsnprintf(ringbuffer->buffer[ringbuffer->tail].message, 4095, format, ap);
+               vsnprintf(ringbuffer->buffer[ringbuffer->tail].message, MAX_LOG_LENGTH, format, ap);

                va_end(ap);
        }
 #endif
                va_end(ap);
        }
 #endif


@@ -603,7 +621,7 @@ static void initnetlink(void)
        }
 }
 
        }
 }
 

-static ssize_t netlink_send(struct nlmsghdr *nh)
+ssize_t netlink_send(struct nlmsghdr *nh)

 {
        struct sockaddr_nl nladdr;
        struct iovec iov;
 {
        struct sockaddr_nl nladdr;
        struct iovec iov;


@@ -639,7 +657,7 @@ static ssize_t netlink_recv(void *buf, ssize_t len)
 }
 
 /* adapted from iproute2 */
 }
 
 /* adapted from iproute2 */

-static void netlink_addattr(struct nlmsghdr *nh, int type, const void *data, int alen)
+void netlink_addattr(struct nlmsghdr *nh, int type, const void *data, int alen)

 {
        int len = RTA_LENGTH(alen);
        struct rtattr *rta;
 {
        int len = RTA_LENGTH(alen);
        struct rtattr *rta;


@@ -680,15 +698,19 @@ static void inittun(void)
                int flags = fcntl(tunfd, F_GETFL, 0);
                fcntl(tunfd, F_SETFL, flags | O_NONBLOCK);
        }
                int flags = fcntl(tunfd, F_GETFL, 0);
                fcntl(tunfd, F_SETFL, flags | O_NONBLOCK);
        }

+
+   if (*config->tundevicename)
+         strncpy(ifr.ifr_name, config->tundevicename, IFNAMSIZ);
+

        if (ioctl(tunfd, TUNSETIFF, (void *) &ifr) < 0)
        {
                LOG(0, 0, 0, "Can't set tun interface: %s\n", strerror(errno));
                exit(1);
        }
        if (ioctl(tunfd, TUNSETIFF, (void *) &ifr) < 0)
        {
                LOG(0, 0, 0, "Can't set tun interface: %s\n", strerror(errno));
                exit(1);
        }

-       assert(strlen(ifr.ifr_name) < sizeof(config->tundevice) - 1);
-       strncpy(config->tundevice, ifr.ifr_name, sizeof(config->tundevice));
+       assert(strlen(ifr.ifr_name) < sizeof(config->tundevicename) - 1);
+       strncpy(config->tundevicename, ifr.ifr_name, sizeof(config->tundevicename));

 
 

-       tunidx = if_nametoindex(config->tundevice);
+       tunidx = if_nametoindex(config->tundevicename);

        if (tunidx == 0)
        {
                LOG(0, 0, 0, "Can't get tun interface index\n");
        if (tunidx == 0)
        {
                LOG(0, 0, 0, "Can't get tun interface index\n");


@@ -740,8 +762,8 @@ static void inittun(void)
                req.ifmsg.ifaddr.ifa_scope = RT_SCOPE_UNIVERSE;
                req.ifmsg.ifaddr.ifa_index = tunidx;
 
                req.ifmsg.ifaddr.ifa_scope = RT_SCOPE_UNIVERSE;
                req.ifmsg.ifaddr.ifa_index = tunidx;
 

-               if (config->bind_address)
-                       ip = config->bind_address;
+               if (config->iftun_address)
+                       ip = config->iftun_address;

                else
                        ip = 0x01010101; // 1.1.1.1
                netlink_addattr(&req.nh, IFA_LOCAL, &ip, sizeof(ip));
                else
                        ip = 0x01010101; // 1.1.1.1
                netlink_addattr(&req.nh, IFA_LOCAL, &ip, sizeof(ip));


@@ -866,6 +888,25 @@ static void initudp(void)
                exit(1);
        }
 
                exit(1);
        }
 

+#ifdef LAC
+       // Tunnel to Remote LNS
+       memset(&addr, 0, sizeof(addr));
+       addr.sin_family = AF_INET;
+       addr.sin_port = htons(config->bind_portremotelns);
+       addr.sin_addr.s_addr = config->bind_address_remotelns;
+       udplacfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+       setsockopt(udplacfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+       {
+               int flags = fcntl(udplacfd, F_GETFL, 0);
+               fcntl(udplacfd, F_SETFL, flags | O_NONBLOCK);
+       }
+       if (bind(udplacfd, (struct sockaddr *) &addr, sizeof(addr)) < 0)
+       {
+               LOG(0, 0, 0, "Error in UDP REMOTE LNS bind: %s\n", strerror(errno));
+               exit(1);
+       }
+#endif
+

        // Intercept
        snoopfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 }
        // Intercept
        snoopfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 }


@@ -962,7 +1003,7 @@ sessionidt sessionbyipv6(struct in6_addr ip)
 //
 // (It's actually cached in network order)
 //
 //
 // (It's actually cached in network order)
 //

-static void cache_ipmap(in_addr_t ip, sessionidt s)
+void cache_ipmap(in_addr_t ip, sessionidt s)

 {
        in_addr_t nip = htonl(ip);      // MUST be in network order. I.e. MSB must in be ((char *) (&ip))[0]
        uint8_t *a = (uint8_t *) &nip;
 {
        in_addr_t nip = htonl(ip);      // MUST be in network order. I.e. MSB must in be ((char *) (&ip))[0]
        uint8_t *a = (uint8_t *) &nip;


@@ -1160,6 +1201,12 @@ void tunnelsend(uint8_t * buf, uint16_t l, tunnelidt t)
                return;
        }
 
                return;
        }
 

+       if (t == TUNNEL_ID_PPPOE)
+       {
+               pppoe_sess_send(buf, l, t);
+               return;
+       }
+

        if (!tunnel[t].ip)
        {
                LOG(1, 0, t, "Error sending data out tunnel: no remote endpoint (tunnel not set up)\n");
        if (!tunnel[t].ip)
        {
                LOG(1, 0, t, "Error sending data out tunnel: no remote endpoint (tunnel not set up)\n");


@@ -1186,8 +1233,11 @@ void tunnelsend(uint8_t * buf, uint16_t l, tunnelidt t)
                        LOG(3, 0, t, "Control message resend try %d\n", tunnel[t].try);
                }
        }
                        LOG(3, 0, t, "Control message resend try %d\n", tunnel[t].try);
                }
        }

-
+#ifdef LAC
+       if (sendto((tunnel[t].isremotelns?udplacfd:udpfd), buf, l, 0, (void *) &addr, sizeof(addr)) < 0)
+#else

        if (sendto(udpfd, buf, l, 0, (void *) &addr, sizeof(addr)) < 0)
        if (sendto(udpfd, buf, l, 0, (void *) &addr, sizeof(addr)) < 0)

+#endif

        {
                LOG(0, ntohs((*(uint16_t *) (buf + 6))), t, "Error sending data out tunnel: %s (udpfd=%d, buf=%p, len=%d, dest=%s)\n",
                                strerror(errno), udpfd, buf, l, inet_ntoa(addr.sin_addr));
        {
                LOG(0, ntohs((*(uint16_t *) (buf + 6))), t, "Error sending data out tunnel: %s (udpfd=%d, buf=%p, len=%d, dest=%s)\n",
                                strerror(errno), udpfd, buf, l, inet_ntoa(addr.sin_addr));


@@ -1325,6 +1375,7 @@ static void update_session_out_stat(sessionidt s, sessiont *sp, int len)
 {
        increment_counter(&sp->cout, &sp->cout_wrap, len); // byte count
        sp->cout_delta += len;
 {
        increment_counter(&sp->cout, &sp->cout_wrap, len); // byte count
        sp->cout_delta += len;

+       sp->coutgrp_delta += len;

        sp->pout++;
        sp->last_data = time_now;
 
        sp->pout++;
        sp->last_data = time_now;
 


@@ -1338,6 +1389,7 @@ static void update_session_out_stat(sessionidt s, sessiont *sp, int len)
 void processipout(uint8_t *buf, int len)
 {
        sessionidt s;
 void processipout(uint8_t *buf, int len)
 {
        sessionidt s;

+       groupidt g;

        sessiont *sp;
        tunnelidt t;
        in_addr_t ip;
        sessiont *sp;
        tunnelidt t;
        in_addr_t ip;


@@ -1374,7 +1426,31 @@ void processipout(uint8_t *buf, int len)
        }
 
        ip = *(uint32_t *)(buf + 16);
        }
 
        ip = *(uint32_t *)(buf + 16);

-       if (!(s = sessionbyip(ip)))
+       if ((g = grp_groupbyip(ip)))
+       {
+               s = grp_getnextsession(g, ip);
+               if (!s)
+               {
+                       // Is this a packet for a session that doesn't exist?
+                       static int rate = 0;    // Number of ICMP packets we've sent this second.
+                       static int last = 0;    // Last time we reset the ICMP packet counter 'rate'.
+
+                       if (last != time_now)
+                       {
+                               last = time_now;
+                               rate = 0;
+                       }
+
+                       if (rate++ < config->icmp_rate) // Only send a max of icmp_rate per second.
+                       {
+                               LOG(4, 0, 0, "IP: Sending ICMP host unreachable to %s\n", fmtaddr(*(in_addr_t *)(buf + 12), 0));
+                               host_unreachable(*(in_addr_t *)(buf + 12), *(uint16_t *)(buf + 4),
+                                       config->bind_address ? config->bind_address : my_address, buf, len);
+                       }
+                       return;
+               }
+       }
+       else if (!(s = sessionbyip(ip)))

        {
                // Is this a packet for a session that doesn't exist?
                static int rate = 0;    // Number of ICMP packets we've sent this second.
        {
                // Is this a packet for a session that doesn't exist?
                static int rate = 0;    // Number of ICMP packets we've sent this second.


@@ -1576,17 +1652,15 @@ void processipout(uint8_t *buf, int len)
                else
                {
                        // Send it as one frame (NO MPPP Frame)
                else
                {
                        // Send it as one frame (NO MPPP Frame)

-                       uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, 0, 0);
-                       if (!p) return;
-                       tunnelsend(fragbuf, len + (p-fragbuf), t); // send it...
+                       uint8_t *p = opt_makeppp(buf, len, s, t, PPPIP, 0, 0, 0);
+                       tunnelsend(p, len + (buf-p), t); // send it...

                        update_session_out_stat(s, sp, len);
                }
        }
        else
        {
                        update_session_out_stat(s, sp, len);
                }
        }
        else
        {

-               uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, 0, 0);
-               if (!p) return;
-               tunnelsend(fragbuf, len + (p-fragbuf), t); // send it...
+               uint8_t *p = opt_makeppp(buf, len, s, t, PPPIP, 0, 0, 0);
+               tunnelsend(p, len + (buf-p), t); // send it...

                update_session_out_stat(s, sp, len);
        }
 
                update_session_out_stat(s, sp, len);
        }
 


@@ -1711,6 +1785,7 @@ static void processipv6out(uint8_t * buf, int len)
 
        increment_counter(&sp->cout, &sp->cout_wrap, len); // byte count
        sp->cout_delta += len;
 
        increment_counter(&sp->cout, &sp->cout_wrap, len); // byte count
        sp->cout_delta += len;

+       sp->coutgrp_delta += len;

        sp->pout++;
        udp_tx += len;
 
        sp->pout++;
        udp_tx += len;
 


@@ -1760,6 +1835,7 @@ static void send_ipout(sessionidt s, uint8_t *buf, int len)
 
        increment_counter(&sp->cout, &sp->cout_wrap, len); // byte count
        sp->cout_delta += len;
 
        increment_counter(&sp->cout, &sp->cout_wrap, len); // byte count
        sp->cout_delta += len;

+       sp->coutgrp_delta += len;

        sp->pout++;
        udp_tx += len;
 
        sp->pout++;
        udp_tx += len;
 


@@ -1978,7 +2054,6 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
                struct param_kill_session data = { &tunnel[session[s].tunnel], &session[s] };
                LOG(2, s, session[s].tunnel, "Shutting down session %u: %s\n", s, reason);
                run_plugins(PLUGIN_KILL_SESSION, &data);
                struct param_kill_session data = { &tunnel[session[s].tunnel], &session[s] };
                LOG(2, s, session[s].tunnel, "Shutting down session %u: %s\n", s, reason);
                run_plugins(PLUGIN_KILL_SESSION, &data);

-               session[s].die = TIME + 150; // Clean up in 15 seconds

        }
 
        if (session[s].ip && !walled_garden && !session[s].die)
        }
 
        if (session[s].ip && !walled_garden && !session[s].die)


@@ -2003,8 +2078,11 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
                        memcpy(&shut_acct[shut_acct_n++], &session[s], sizeof(session[s]));
        }
 
                        memcpy(&shut_acct[shut_acct_n++], &session[s], sizeof(session[s]));
        }
 

+       if (!session[s].die)
+               session[s].die = TIME + 150; // Clean up in 15 seconds
+

        if (session[s].ip)
        if (session[s].ip)

-       {                          // IP allocated, clear and unroute
+       {       // IP allocated, clear and unroute

                int r;
                int routed = 0;
                for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
                int r;
                int routed = 0;
                for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)


@@ -2096,20 +2174,28 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
                throttle_session(s, 0, 0);
 
        if (cdn_result)
                throttle_session(s, 0, 0);
 
        if (cdn_result)

-       {                            // Send CDN
-               controlt *c = controlnew(14); // sending CDN
-               if (cdn_error)
+       {
+               if (session[s].tunnel == TUNNEL_ID_PPPOE)

                {
                {

-                       uint16_t buf[2];
-                       buf[0] = htons(cdn_result);
-                       buf[1] = htons(cdn_error);
-                       controlb(c, 1, (uint8_t *)buf, 4, 1);
+                       pppoe_shutdown_session(s);

                }
                else
                }
                else

-                       control16(c, 1, cdn_result, 1);
+               {
+                       // Send CDN
+                       controlt *c = controlnew(14); // sending CDN
+                       if (cdn_error)
+                       {
+                               uint16_t buf[2];
+                               buf[0] = htons(cdn_result);
+                               buf[1] = htons(cdn_error);
+                               controlb(c, 1, (uint8_t *)buf, 4, 1);
+                       }
+                       else
+                               control16(c, 1, cdn_result, 1);

 
 

-               control16(c, 14, s, 1);   // assigned session (our end)
-               controladd(c, session[s].far, session[s].tunnel); // send the message
+                       control16(c, 14, s, 1);   // assigned session (our end)
+                       controladd(c, session[s].far, session[s].tunnel); // send the message
+               }

        }
 
        // update filter refcounts
        }
 
        // update filter refcounts


@@ -2149,7 +2235,7 @@ void sendipcp(sessionidt s, tunnelidt t)
        q[4] = 3;                               // ip address option
        q[5] = 6;                               // option length
        *(in_addr_t *) (q + 6) = config->peer_address ? config->peer_address :
        q[4] = 3;                               // ip address option
        q[5] = 6;                               // option length
        *(in_addr_t *) (q + 6) = config->peer_address ? config->peer_address :

-                                config->bind_address ? config->bind_address :
+                                config->iftun_address ? config->iftun_address :

                                 my_address; // send my IP
 
        tunnelsend(buf, 10 + (q - buf), t); // send it
                                 my_address; // send my IP
 
        tunnelsend(buf, 10 + (q - buf), t); // send it


@@ -2196,6 +2282,8 @@ static void sessionclear(sessionidt s)
 // kill a session now
 void sessionkill(sessionidt s, char *reason)
 {
 // kill a session now
 void sessionkill(sessionidt s, char *reason)
 {

+       groupidt g;
+

        CSTAT(sessionkill);
 
        if (!session[s].opened) // not alive
        CSTAT(sessionkill);
 
        if (!session[s].opened) // not alive


@@ -2213,7 +2301,25 @@ void sessionkill(sessionidt s, char *reason)
        if (sess_local[s].radius)
                radiusclear(sess_local[s].radius, s); // cant send clean accounting data, session is killed
 
        if (sess_local[s].radius)
                radiusclear(sess_local[s].radius, s); // cant send clean accounting data, session is killed
 

+#ifdef LAC
+       if (session[s].forwardtosession)
+       {
+               sessionidt sess = session[s].forwardtosession;
+               if (session[sess].forwardtosession == s)
+               {
+                       // Shutdown the linked session also.
+                       sessionshutdown(sess, reason, CDN_ADMIN_DISC, TERM_ADMIN_RESET);
+               }
+       }
+#endif
+

        LOG(2, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);
        LOG(2, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);

+
+       if ((g = grp_groupbysession(s)))
+       {
+               grp_removesession(g, s);
+       }
+

        sessionclear(s);
        cluster_send_session(s);
 }
        sessionclear(s);
        cluster_send_session(s);
 }


@@ -2364,6 +2470,12 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                STAT(tunnel_rx_errors);
                return;
        }
                STAT(tunnel_rx_errors);
                return;
        }

+       if (t == TUNNEL_ID_PPPOE)
+       {
+               LOG(1, s, t, "Received UDP packet with tunnel ID reserved for pppoe\n");
+               STAT(tunnel_rx_errors);
+               return;
+       }

        if (*buf & 0x08)
        {                          // ns/nr
                ns = ntohs(*(uint16_t *) p);
        if (*buf & 0x08)
        {                          // ns/nr
                ns = ntohs(*(uint16_t *) p);


@@ -2724,11 +2836,11 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                        break;
                                case 13:    // Response
 #ifdef LAC
                                        break;
                                case 13:    // Response
 #ifdef LAC

-                                       if (istunneltolns(t))
+                                       if (tunnel[t].isremotelns)

                                        {
                                                chapresponse = calloc(17, 1);
                                                memcpy(chapresponse, b, (n < 17) ? n : 16);
                                        {
                                                chapresponse = calloc(17, 1);
                                                memcpy(chapresponse, b, (n < 17) ? n : 16);

-                                               LOG(1, s, t, "received challenge response from (REMOTE LNS)\n");
+                                               LOG(3, s, t, "received challenge response from REMOTE LNS\n");

                                        }
                                        else
 #endif /* LAC */
                                        }
                                        else
 #endif /* LAC */


@@ -2957,8 +3069,10 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                {
                                case 1:       // SCCRQ - Start Control Connection Request
                                        tunnel[t].state = TUNNELOPENING;
                                {
                                case 1:       // SCCRQ - Start Control Connection Request
                                        tunnel[t].state = TUNNELOPENING;

+                                       LOG(3, s, t, "Received SCCRQ\n");

                                        if (main_quit != QUIT_SHUTDOWN)
                                        {
                                        if (main_quit != QUIT_SHUTDOWN)
                                        {

+                                               LOG(3, s, t, "sending SCCRP\n");

                                                controlt *c = controlnew(2); // sending SCCRP
                                                control16(c, 2, version, 1); // protocol version
                                                control32(c, 3, 3, 1); // framing
                                                controlt *c = controlnew(2); // sending SCCRP
                                                control16(c, 2, version, 1); // protocol version
                                                control32(c, 3, 3, 1); // framing


@@ -2976,17 +3090,18 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                        tunnel[t].state = TUNNELOPEN;
                                        tunnel[t].lastrec = time_now;
 #ifdef LAC
                                        tunnel[t].state = TUNNELOPEN;
                                        tunnel[t].lastrec = time_now;
 #ifdef LAC

-                                       LOG(1, s, t, "Recieved SCCRP (REMOTE LNS)\n");
+                                       LOG(3, s, t, "Received SCCRP\n");

                                        if (main_quit != QUIT_SHUTDOWN)
                                        {
                                        if (main_quit != QUIT_SHUTDOWN)
                                        {

-                                               if (istunneltolns(t) && chapresponse)
+                                               if (tunnel[t].isremotelns && chapresponse)

                                                {
                                                        hasht hash;
 
                                                {
                                                        hasht hash;
 

-                                                       calc_lac_auth(t, 2, hash); // id = 2 (SCCRP)
+                                                       lac_calc_rlns_auth(t, 2, hash); // id = 2 (SCCRP)

                                                        // check authenticator
                                                        if (memcmp(hash, chapresponse, 16) == 0)
                                                        {
                                                        // check authenticator
                                                        if (memcmp(hash, chapresponse, 16) == 0)
                                                        {

+                                                               LOG(3, s, t, "sending SCCCN to REMOTE LNS\n");

                                                                controlt *c = controlnew(3); // sending SCCCN
                                                                controls(c, 7, hostname, 1); // host name
                                                                controls(c, 8, Vendor_name, 1); // Vendor name
                                                                controlt *c = controlnew(3); // sending SCCCN
                                                                controls(c, 7, hostname, 1); // host name
                                                                controls(c, 8, Vendor_name, 1); // Vendor name


@@ -2994,12 +3109,10 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                                                control32(c, 3, 3, 1); // framing Capabilities
                                                                control16(c, 9, t, 1); // assigned tunnel
                                                                controladd(c, 0, t); // send
                                                                control32(c, 3, 3, 1); // framing Capabilities
                                                                control16(c, 9, t, 1); // assigned tunnel
                                                                controladd(c, 0, t); // send

-
-                                                               LOG(1, s, t, "sending SCCCN (REMOTE LNS)\n");

                                                        }
                                                        else
                                                        {
                                                        }
                                                        else
                                                        {

-                                                               tunnelshutdown(t, "(REMOTE LNS) Bad chap response", 4, 0, 0);
+                                                               tunnelshutdown(t, "Bad chap response from REMOTE LNS", 4, 0, 0);

                                                        }
                                                }
                                        }
                                                        }
                                                }
                                        }


@@ -3010,31 +3123,40 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 #endif /* LAC */
                                        break;
                                case 3:       // SCCN
 #endif /* LAC */
                                        break;
                                case 3:       // SCCN

+                                       LOG(3, s, t, "Received SCCN\n");

                                        tunnel[t].state = TUNNELOPEN;
                                        tunnel[t].lastrec = time_now;
                                        controlnull(t); // ack
                                        break;
                                case 4:       // StopCCN
                                        tunnel[t].state = TUNNELOPEN;
                                        tunnel[t].lastrec = time_now;
                                        controlnull(t); // ack
                                        break;
                                case 4:       // StopCCN

+                                       LOG(3, s, t, "Received StopCCN\n");

                                        controlnull(t); // ack
                                        tunnelshutdown(t, "Stopped", 0, 0, 0); // Shut down cleanly
                                        break;
                                case 6:       // HELLO
                                        controlnull(t); // ack
                                        tunnelshutdown(t, "Stopped", 0, 0, 0); // Shut down cleanly
                                        break;
                                case 6:       // HELLO

+                                       LOG(3, s, t, "Received HELLO\n");

                                        controlnull(t); // simply ACK
                                        break;
                                case 7:       // OCRQ
                                        // TBA
                                        controlnull(t); // simply ACK
                                        break;
                                case 7:       // OCRQ
                                        // TBA

+                                       LOG(3, s, t, "Received OCRQ\n");

                                        break;
                                case 8:       // OCRO
                                        // TBA
                                        break;
                                case 8:       // OCRO
                                        // TBA

+                                       LOG(3, s, t, "Received OCRO\n");

                                        break;
                                case 9:       // OCCN
                                        // TBA
                                        break;
                                case 9:       // OCCN
                                        // TBA

+                                       LOG(3, s, t, "Received OCCN\n");

                                        break;
                                case 10:      // ICRQ
                                        break;
                                case 10:      // ICRQ

+                                       LOG(3, s, t, "Received ICRQ\n");

                                        if (sessionfree && main_quit != QUIT_SHUTDOWN)
                                        {
                                                controlt *c = controlnew(11); // ICRP
 
                                        if (sessionfree && main_quit != QUIT_SHUTDOWN)
                                        {
                                                controlt *c = controlnew(11); // ICRP
 

+                                               LOG(3, s, t, "Sending ICRP\n");
+

                                                s = sessionfree;
                                                sessionfree = session[s].next;
                                                memset(&session[s], 0, sizeof(session[s]));
                                                s = sessionfree;
                                                sessionfree = session[s].next;
                                                memset(&session[s], 0, sizeof(session[s]));


@@ -3062,6 +3184,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 
                                        {
                                                controlt *c = controlnew(14); // CDN
 
                                        {
                                                controlt *c = controlnew(14); // CDN

+                                               LOG(3, s, t, "Sending CDN\n");

                                                if (!sessionfree)
                                                {
                                                        STAT(session_overflow);
                                                if (!sessionfree)
                                                {
                                                        STAT(session_overflow);


@@ -3076,7 +3199,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                        return;
                                case 11:      // ICRP
 #ifdef LAC
                                        return;
                                case 11:      // ICRP
 #ifdef LAC

-                               LOG(1, s, t, "Recieved ICRP (REMOTE LNS)\n");
+                               LOG(3, s, t, "Received ICRP\n");

                                if (session[s].forwardtosession)
                                {
                                        controlt *c = controlnew(12); // ICCN
                                if (session[s].forwardtosession)
                                {
                                        controlt *c = controlnew(12); // ICCN


@@ -3089,11 +3212,12 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                        control32(c, 19, 1, 1); // Framing Type
                                        control32(c, 24, 10000000, 1); // Tx Connect Speed
                                        controladd(c, asession, t); // send the message
                                        control32(c, 19, 1, 1); // Framing Type
                                        control32(c, 24, 10000000, 1); // Tx Connect Speed
                                        controladd(c, asession, t); // send the message

-                                       LOG(1, s, t, "Sending ICCN (REMOTE LNS)\n");
+                                       LOG(3, s, t, "Sending ICCN\n");

                                }
 #endif /* LAC */
                                        break;
                                case 12:      // ICCN
                                }
 #endif /* LAC */
                                        break;
                                case 12:      // ICCN

+                                       LOG(3, s, t, "Received ICCN\n");

                                        if (amagic == 0) amagic = time_now;
                                        session[s].magic = amagic; // set magic number
                                        session[s].flags = aflags; // set flags received
                                        if (amagic == 0) amagic = time_now;
                                        session[s].magic = amagic; // set magic number
                                        session[s].flags = aflags; // set flags received


@@ -3106,17 +3230,15 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 
                                        // Set multilink options before sending initial LCP packet
                                        sess_local[s].mp_mrru = 1614;
 
                                        // Set multilink options before sending initial LCP packet
                                        sess_local[s].mp_mrru = 1614;

-                                       sess_local[s].mp_epdis = ntohl(config->bind_address ? config->bind_address : my_address);
+                                       sess_local[s].mp_epdis = ntohl(config->iftun_address ? config->iftun_address : my_address);

 
                                        sendlcp(s, t);
                                        change_state(s, lcp, RequestSent);
                                        break;
 
                                case 14:      // CDN
 
                                        sendlcp(s, t);
                                        change_state(s, lcp, RequestSent);
                                        break;
 
                                case 14:      // CDN

+                                       LOG(3, s, t, "Received CDN\n");

                                        controlnull(t); // ack
                                        controlnull(t); // ack

-#ifdef LAC
-
-#endif /* LAC */

                                        sessionshutdown(s, disc_reason, CDN_NONE, disc_cause);
                                        break;
                                case 0xFFFF:
                                        sessionshutdown(s, disc_reason, CDN_NONE, disc_cause);
                                        break;
                                case 0xFFFF:


@@ -3169,11 +3291,23 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 #ifdef LAC
                if (session[s].forwardtosession)
                {
 #ifdef LAC
                if (session[s].forwardtosession)
                {

-                       LOG(4, s, t, "Forwarding data session to %u (REMOTE LNS)\n", session[s].forwardtosession);
-                       // Forward to Remote LNS
-                       session_forward_tolns(buf, len, s, proto);
+                       LOG(5, s, t, "Forwarding data session to session %u\n", session[s].forwardtosession);
+                       // Forward to LAC/BAS or Remote LNS session
+                       lac_session_forward(buf, len, s, proto, addr->sin_addr.s_addr, addr->sin_port);

                        return;
                }
                        return;
                }

+               else if (config->auth_tunnel_change_addr_src)
+               {
+                       if (tunnel[t].ip != ntohl(addr->sin_addr.s_addr) &&
+                               tunnel[t].port == ntohs(addr->sin_port))
+                       {
+                               // The remotes BAS are a clustered l2tpns server and the source IP has changed
+                               LOG(5, s, t, "The tunnel IP source (%s) has changed by new IP (%s)\n",
+                                       fmtaddr(htonl(tunnel[t].ip), 0), fmtaddr(addr->sin_addr.s_addr, 0));
+
+                               tunnel[t].ip = ntohl(addr->sin_addr.s_addr);
+                       }
+               }

 #endif /* LAC */
 
                if (s && !session[s].opened)    // Is something wrong??
 #endif /* LAC */
 
                if (s && !session[s].opened)    // Is something wrong??


@@ -3369,6 +3503,9 @@ static void regular_cleanups(double period)
                if (t > config->cluster_highest_tunnelid)
                        t = 1;
 
                if (t > config->cluster_highest_tunnelid)
                        t = 1;
 

+               if (t == TUNNEL_ID_PPPOE)
+                       continue;
+

                // check for expired tunnels
                if (tunnel[t].die && tunnel[t].die <= TIME)
                {
                // check for expired tunnels
                if (tunnel[t].die && tunnel[t].die <= TIME)
                {


@@ -3401,10 +3538,13 @@ static void regular_cleanups(double period)
                // Send hello
                if (tunnel[t].state == TUNNELOPEN && !tunnel[t].controlc && (time_now - tunnel[t].lastrec) > 60)
                {
                // Send hello
                if (tunnel[t].state == TUNNELOPEN && !tunnel[t].controlc && (time_now - tunnel[t].lastrec) > 60)
                {

-                       controlt *c = controlnew(6); // sending HELLO
-                       controladd(c, 0, t); // send the message
-                       LOG(3, 0, t, "Sending HELLO message\n");
-                       t_actions++;
+                       if (!config->disable_sending_hello)
+                       {
+                               controlt *c = controlnew(6); // sending HELLO
+                               controladd(c, 0, t); // send the message
+                               LOG(3, 0, t, "Sending HELLO message\n");
+                               t_actions++;
+                       }

                }
 
                // Check for tunnel changes requested from the CLI
                }
 
                // Check for tunnel changes requested from the CLI


@@ -3578,7 +3718,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 >= config->echo_timeout) &&
 
                // No data in ECHO_TIMEOUT seconds, send LCP ECHO
                if (session[s].ppp.phase >= Establish && (time_now - session[s].last_packet >= config->echo_timeout) &&

-                       (time_now - sess_local[s].last_echo >= ECHO_TIMEOUT))
+                       (time_now - sess_local[s].last_echo >= config->echo_timeout))

                {
                        uint8_t b[MAXETHER];
 
                {
                        uint8_t b[MAXETHER];
 


@@ -3592,7 +3732,8 @@ static void regular_cleanups(double period)
 
                        LOG(4, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n",
                                        (int)(time_now - session[s].last_packet));
 
                        LOG(4, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n",
                                        (int)(time_now - session[s].last_packet));

-                       tunnelsend(b, 24, session[s].tunnel); // send it
+
+                       tunnelsend(b, (q - b) + 8, session[s].tunnel); // send it

                        sess_local[s].last_echo = time_now;
                        s_actions++;
                }
                        sess_local[s].last_echo = time_now;
                        s_actions++;
                }


@@ -3843,8 +3984,13 @@ static int still_busy(void)
 # include "fake_epoll.h"
 #endif
 
 # include "fake_epoll.h"
 #endif
 

-// the base set of fds polled: cli, cluster, tun, udp, control, dae, netlink
-#define BASE_FDS       7
+#ifdef LAC
+// the base set of fds polled: cli, cluster, tun, udp, control, dae, netlink, udplac, pppoedisc, pppoesess
+#define BASE_FDS       10
+#else
+// the base set of fds polled: cli, cluster, tun, udp, control, dae, netlink, pppoedisc, pppoesess
+#define BASE_FDS       9
+#endif

 
 // additional polled fds
 #ifdef BGP
 
 // additional polled fds
 #ifdef BGP


@@ -3858,8 +4004,9 @@ static void mainloop(void)
 {
        int i;
        uint8_t buf[65536];
 {
        int i;
        uint8_t buf[65536];

-       uint8_t *p = buf + 8; // for the hearder of the forwarded MPPP packet (see C_MPPP_FORWARD)
-       int size_bufp = sizeof(buf) - 8;
+       uint8_t *p = buf + 32; // for the hearder of the forwarded MPPP packet (see C_MPPP_FORWARD)
+                                               // and the forwarded pppoe session
+       int size_bufp = sizeof(buf) - 32;

        clockt next_cluster_ping = 0;   // send initial ping immediately
        struct epoll_event events[BASE_FDS + RADIUS_FDS + EXTRA_FDS];
        int maxevent = sizeof(events)/sizeof(*events);
        clockt next_cluster_ping = 0;   // send initial ping immediately
        struct epoll_event events[BASE_FDS + RADIUS_FDS + EXTRA_FDS];
        int maxevent = sizeof(events)/sizeof(*events);


@@ -3870,8 +4017,13 @@ static void mainloop(void)
                exit(1);
        }
 
                exit(1);
        }
 

-       LOG(4, 0, 0, "Beginning of main loop.  clifd=%d, cluster_sockfd=%d, tunfd=%d, udpfd=%d, controlfd=%d, daefd=%d, nlfd=%d\n",
-               clifd, cluster_sockfd, tunfd, udpfd, controlfd, daefd, nlfd);
+#ifdef LAC
+       LOG(4, 0, 0, "Beginning of main loop.  clifd=%d, cluster_sockfd=%d, tunfd=%d, udpfd=%d, controlfd=%d, daefd=%d, nlfd=%d , udplacfd=%d, pppoefd=%d, pppoesessfd=%d\n",
+               clifd, cluster_sockfd, tunfd, udpfd, controlfd, daefd, nlfd, udplacfd, pppoediscfd, pppoesessfd);
+#else
+       LOG(4, 0, 0, "Beginning of main loop.  clifd=%d, cluster_sockfd=%d, tunfd=%d, udpfd=%d, controlfd=%d, daefd=%d, nlfd=%d, pppoefd=%d, pppoesessfd=%d\n",
+               clifd, cluster_sockfd, tunfd, udpfd, controlfd, daefd, nlfd, pppoediscfd, pppoesessfd);
+#endif

 
        /* setup our fds to poll for input */
        {
 
        /* setup our fds to poll for input */
        {


@@ -3911,6 +4063,20 @@ static void mainloop(void)
                d[i].type = FD_TYPE_NETLINK;
                e.data.ptr = &d[i++];
                epoll_ctl(epollfd, EPOLL_CTL_ADD, nlfd, &e);
                d[i].type = FD_TYPE_NETLINK;
                e.data.ptr = &d[i++];
                epoll_ctl(epollfd, EPOLL_CTL_ADD, nlfd, &e);

+
+#ifdef LAC
+               d[i].type = FD_TYPE_UDPLAC;
+               e.data.ptr = &d[i++];
+               epoll_ctl(epollfd, EPOLL_CTL_ADD, udplacfd, &e);
+#endif
+
+               d[i].type = FD_TYPE_PPPOEDISC;
+               e.data.ptr = &d[i++];
+               epoll_ctl(epollfd, EPOLL_CTL_ADD, pppoediscfd, &e);
+
+               d[i].type = FD_TYPE_PPPOESESS;
+               e.data.ptr = &d[i++];
+               epoll_ctl(epollfd, EPOLL_CTL_ADD, pppoesessfd, &e);

        }
 
 #ifdef BGP
        }
 
 #ifdef BGP


@@ -3973,6 +4139,12 @@ static void mainloop(void)
                        socklen_t alen;
                        int c, s;
                        int udp_ready = 0;
                        socklen_t alen;
                        int c, s;
                        int udp_ready = 0;

+#ifdef LAC
+                       int udplac_ready = 0;
+                       int udplac_pkts = 0;
+#endif
+                       int pppoesess_ready = 0;
+                       int pppoesess_pkts = 0;

                        int tun_ready = 0;
                        int cluster_ready = 0;
                        int udp_pkts = 0;
                        int tun_ready = 0;
                        int cluster_ready = 0;
                        int udp_pkts = 0;


@@ -4010,29 +4182,39 @@ static void mainloop(void)
                                case FD_TYPE_CLUSTER:   cluster_ready++; break;
                                case FD_TYPE_TUN:       tun_ready++; break;
                                case FD_TYPE_UDP:       udp_ready++; break;
                                case FD_TYPE_CLUSTER:   cluster_ready++; break;
                                case FD_TYPE_TUN:       tun_ready++; break;
                                case FD_TYPE_UDP:       udp_ready++; break;

+#ifdef LAC
+                               case FD_TYPE_UDPLAC:    udplac_ready++; break;
+#endif
+                               case FD_TYPE_PPPOESESS: pppoesess_ready++; break;
+
+                               case FD_TYPE_PPPOEDISC: // pppoe discovery
+                                       s = read(pppoediscfd, p, size_bufp);
+                                       if (s > 0) process_pppoe_disc(p, s);
+                                       n--;
+                                       break;

 
                                case FD_TYPE_CONTROL: // nsctl commands
                                        alen = sizeof(addr);
 
                                case FD_TYPE_CONTROL: // nsctl commands
                                        alen = sizeof(addr);

-                                       s = recvfromto(controlfd, buf, sizeof(buf), MSG_WAITALL, (struct sockaddr *) &addr, &alen, &local);
-                                       if (s > 0) processcontrol(buf, s, &addr, alen, &local);
+                                       s = recvfromto(controlfd, p, size_bufp, MSG_WAITALL, (struct sockaddr *) &addr, &alen, &local);
+                                       if (s > 0) processcontrol(p, s, &addr, alen, &local);

                                        n--;
                                        break;
 
                                case FD_TYPE_DAE: // DAE requests
                                        alen = sizeof(addr);
                                        n--;
                                        break;
 
                                case FD_TYPE_DAE: // DAE requests
                                        alen = sizeof(addr);

-                                       s = recvfromto(daefd, buf, sizeof(buf), MSG_WAITALL, (struct sockaddr *) &addr, &alen, &local);
-                                       if (s > 0) processdae(buf, s, &addr, alen, &local);
+                                       s = recvfromto(daefd, p, size_bufp, MSG_WAITALL, (struct sockaddr *) &addr, &alen, &local);
+                                       if (s > 0) processdae(p, s, &addr, alen, &local);

                                        n--;
                                        break;
 
                                case FD_TYPE_RADIUS: // RADIUS response
                                        alen = sizeof(addr);
                                        n--;
                                        break;
 
                                case FD_TYPE_RADIUS: // RADIUS response
                                        alen = sizeof(addr);

-                                       s = recvfrom(radfds[d->index], buf, sizeof(buf), MSG_WAITALL, (struct sockaddr *) &addr, &alen);
+                                       s = recvfrom(radfds[d->index], p, size_bufp, MSG_WAITALL, (struct sockaddr *) &addr, &alen);

                                        if (s >= 0 && config->cluster_iam_master)
                                        {
                                                if (addr.sin_addr.s_addr == config->radiusserver[0] ||
                                                    addr.sin_addr.s_addr == config->radiusserver[1])
                                        if (s >= 0 && config->cluster_iam_master)
                                        {
                                                if (addr.sin_addr.s_addr == config->radiusserver[0] ||
                                                    addr.sin_addr.s_addr == config->radiusserver[1])

-                                                       processrad(buf, s, d->index);
+                                                       processrad(p, s, d->index);

                                                else
                                                        LOG(3, 0, 0, "Dropping RADIUS packet from unknown source %s\n",
                                                                fmtaddr(addr.sin_addr.s_addr, 0));
                                                else
                                                        LOG(3, 0, 0, "Dropping RADIUS packet from unknown source %s\n",
                                                                fmtaddr(addr.sin_addr.s_addr, 0));


@@ -4050,8 +4232,8 @@ static void mainloop(void)
 
                                case FD_TYPE_NETLINK:
                                {
 
                                case FD_TYPE_NETLINK:
                                {

-                                       struct nlmsghdr *nh = (struct nlmsghdr *)buf;
-                                       s = netlink_recv(buf, sizeof(buf));
+                                       struct nlmsghdr *nh = (struct nlmsghdr *)p;
+                                       s = netlink_recv(p, size_bufp);

                                        if (nh->nlmsg_type == NLMSG_ERROR)
                                        {
                                                struct nlmsgerr *errmsg = NLMSG_DATA(nh);
                                        if (nh->nlmsg_type == NLMSG_ERROR)
                                        {
                                                struct nlmsgerr *errmsg = NLMSG_DATA(nh);


@@ -4089,9 +4271,9 @@ static void mainloop(void)
                                if (udp_ready)
                                {
                                        alen = sizeof(addr);
                                if (udp_ready)
                                {
                                        alen = sizeof(addr);

-                                       if ((s = recvfrom(udpfd, buf, sizeof(buf), 0, (void *) &addr, &alen)) > 0)
+                                       if ((s = recvfrom(udpfd, p, size_bufp, 0, (void *) &addr, &alen)) > 0)

                                        {
                                        {

-                                               processudp(buf, s, &addr);
+                                               processudp(p, s, &addr);

                                                udp_pkts++;
                                        }
                                        else
                                                udp_pkts++;
                                        }
                                        else


@@ -4100,14 +4282,32 @@ static void mainloop(void)
                                                n--;
                                        }
                                }
                                                n--;
                                        }
                                }

+#ifdef LAC
+                               // L2TP REMOTE LNS
+                               if (udplac_ready)
+                               {
+                                       alen = sizeof(addr);
+                                       if ((s = recvfrom(udplacfd, p, size_bufp, 0, (void *) &addr, &alen)) > 0)
+                                       {
+                                               if (!config->disable_lac_func)
+                                                       processudp(p, s, &addr);

 
 

+                                               udplac_pkts++;
+                                       }
+                                       else
+                                       {
+                                               udplac_ready = 0;
+                                               n--;
+                                       }
+                               }
+#endif

                                // incoming IP
                                if (tun_ready)
                                {
                                        if ((s = read(tunfd, p, size_bufp)) > 0)
                                        {
                                                processtun(p, s);
                                // incoming IP
                                if (tun_ready)
                                {
                                        if ((s = read(tunfd, p, size_bufp)) > 0)
                                        {
                                                processtun(p, s);

-                                               tun_pkts++;
+                                               tun_pkts++;

                                        }
                                        else
                                        {
                                        }
                                        else
                                        {


@@ -4116,13 +4316,28 @@ static void mainloop(void)
                                        }
                                }
 
                                        }
                                }
 

+                               // pppoe session
+                               if (pppoesess_ready)
+                               {
+                                       if ((s = read(pppoesessfd, p, size_bufp)) > 0)
+                                       {
+                                               process_pppoe_sess(p, s);
+                                               pppoesess_pkts++;
+                                       }
+                                       else
+                                       {
+                                               pppoesess_ready = 0;
+                                               n--;
+                                       }
+                               }
+

                                // cluster
                                if (cluster_ready)
                                {
                                        alen = sizeof(addr);
                                // cluster
                                if (cluster_ready)
                                {
                                        alen = sizeof(addr);

-                                       if ((s = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen)) > 0)
+                                       if ((s = recvfrom(cluster_sockfd, p, size_bufp, MSG_WAITALL, (void *) &addr, &alen)) > 0)

                                        {
                                        {

-                                               processcluster(buf, s, addr.sin_addr.s_addr);
+                                               processcluster(p, s, addr.sin_addr.s_addr);

                                                cluster_pkts++;
                                        }
                                        else
                                                cluster_pkts++;
                                        }
                                        else


@@ -4138,9 +4353,13 @@ static void mainloop(void)
 
                        if (c >= config->multi_read_count)
                        {
 
                        if (c >= config->multi_read_count)
                        {

-                               LOG(3, 0, 0, "Reached multi_read_count (%d); processed %d udp, %d tun and %d cluster packets\n",
-                                       config->multi_read_count, udp_pkts, tun_pkts, cluster_pkts);
-
+#ifdef LAC
+                               LOG(3, 0, 0, "Reached multi_read_count (%d); processed %d udp, %d tun %d cluster %d rmlns and %d pppoe packets\n",
+                                       config->multi_read_count, udp_pkts, tun_pkts, cluster_pkts, udplac_pkts, pppoesess_pkts);
+#else
+                               LOG(3, 0, 0, "Reached multi_read_count (%d); processed %d udp, %d tun %d cluster and %d pppoe packets\n",
+                                       config->multi_read_count, udp_pkts, tun_pkts, cluster_pkts, pppoesess_pkts);
+#endif

                                STAT(multi_read_exceeded);
                                more++;
                        }
                                STAT(multi_read_exceeded);
                                more++;
                        }


@@ -4476,8 +4695,10 @@ static void initdata(int optdebug, char *optconfig)
 #endif /* BGP */
 
 #ifdef LAC
 #endif /* BGP */
 
 #ifdef LAC

-       initremotelnsdata();
+       lac_initremotelnsdata();

 #endif
 #endif

+
+       grp_initdata();

 }
 
 static int assign_ip_address(sessionidt s)
 }
 
 static int assign_ip_address(sessionidt s)


@@ -4764,7 +4985,11 @@ void snoop_send_packet(uint8_t *packet, uint16_t size, in_addr_t destination, ui
 
 static int dump_session(FILE **f, sessiont *s)
 {
 
 static int dump_session(FILE **f, sessiont *s)
 {

+#ifdef LAC
+       if (!s->opened || (!s->ip && !s->forwardtosession) || !(s->cin_delta || s->cout_delta) || !*s->user || s->walled_garden)
+#else

        if (!s->opened || !s->ip || !(s->cin_delta || s->cout_delta) || !*s->user || s->walled_garden)
        if (!s->opened || !s->ip || !(s->cin_delta || s->cout_delta) || !*s->user || s->walled_garden)

+#endif

                return 1;
 
        if (!*f)
                return 1;
 
        if (!*f)


@@ -4790,7 +5015,7 @@ static int dump_session(FILE **f, sessiont *s)
                        "# uptime: %ld\n"
                        "# format: username ip qos uptxoctets downrxoctets\n",
                        hostname,
                        "# uptime: %ld\n"
                        "# format: username ip qos uptxoctets downrxoctets\n",
                        hostname,

-                       fmtaddr(config->bind_address ? config->bind_address : my_address, 0),
+                       fmtaddr(config->iftun_address ? config->iftun_address : my_address, 0),

                        now,
                        now - basetime);
        }
                        now,
                        now - basetime);
        }


@@ -4937,8 +5162,13 @@ int main(int argc, char *argv[])
                exit(1);
 
        inittun();
                exit(1);
 
        inittun();

-       LOG(1, 0, 0, "Set up on interface %s\n", config->tundevice);
+       LOG(1, 0, 0, "Set up on interface %s\n", config->tundevicename);

 
 

+       if (*config->pppoe_if_to_bind)
+       {
+               init_pppoe();
+               LOG(1, 0, 0, "Set up on pppoe interface %s\n", config->pppoe_if_to_bind);
+       }

        initudp();
        initrad();
        initippool();
        initudp();
        initrad();
        initippool();


@@ -5171,6 +5401,18 @@ static void update_config()
        if (!config->radius_dae_port)
                config->radius_dae_port = DAEPORT;
 
        if (!config->radius_dae_port)
                config->radius_dae_port = DAEPORT;
 

+#ifdef LAC
+       if(!config->bind_portremotelns)
+               config->bind_portremotelns = L2TPLACPORT;
+       if(!config->bind_address_remotelns)
+               config->bind_address_remotelns = INADDR_ANY;
+#endif
+       if(!config->iftun_address)
+               config->iftun_address = config->bind_address;
+
+       if (!*config->pppoe_ac_name)
+               strncpy(config->pppoe_ac_name, DEFAULT_PPPOE_AC_NAME, sizeof(config->pppoe_ac_name) - 1);
+

        // re-initialise the random number source
        initrandom(config->random_device);
 
        // re-initialise the random number source
        initrandom(config->random_device);
 


@@ -5349,8 +5591,7 @@ int sessionsetup(sessionidt s, tunnelidt t)
 
                        if (ip == session[i].ip)
                        {
 
                        if (ip == session[i].ip)
                        {

-                               sessionkill(i, "Duplicate IP address");
-                               cluster_listinvert_session(s, i);
+                               sessionshutdown(i, "Duplicate IP address", CDN_ADMIN_DISC, TERM_ADMIN_RESET);  // close radius/routes, etc.

                                continue;
                        }
 
                                continue;
                        }
 


@@ -5371,7 +5612,7 @@ int sessionsetup(sessionidt s, tunnelidt t)
 
                        // Drop the new session in case of duplicate sessionss, not the old one.
                        if (!strcasecmp(user, session[i].user))
 
                        // Drop the new session in case of duplicate sessionss, not the old one.
                        if (!strcasecmp(user, session[i].user))

-                               sessionkill(i, "Duplicate session for users");
+                               sessionshutdown(i, "Duplicate session for users", CDN_ADMIN_DISC, TERM_ADMIN_RESET);  // close radius/routes, etc.

                }
        }
 
                }
        }
 


@@ -5379,6 +5620,7 @@ int sessionsetup(sessionidt s, tunnelidt t)
        if (!session[s].bundle || (bundle[session[s].bundle].num_of_links == 1))
        {
                int routed = 0;
        if (!session[s].bundle || (bundle[session[s].bundle].num_of_links == 1))
        {
                int routed = 0;

+               groupidt g;

 
                // Add the route for this session.
                for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
 
                // Add the route for this session.
                for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)


@@ -5401,6 +5643,11 @@ int sessionsetup(sessionidt s, tunnelidt t)
                }
                else
                        cache_ipmap(session[s].ip, s);
                }
                else
                        cache_ipmap(session[s].ip, s);

+
+               if ((g = grp_groupbysession(s)))
+               {
+                       grp_setgrouproute(g, 1);
+               }

        }
 
        sess_local[s].lcp_authtype = 0; // RADIUS authentication complete
        }
 
        sess_local[s].lcp_authtype = 0; // RADIUS authentication complete


@@ -5907,7 +6154,7 @@ static tunnelidt new_tunnel()
        tunnelidt i;
        for (i = 1; i < MAXTUNNEL; i++)
        {
        tunnelidt i;
        for (i = 1; i < MAXTUNNEL; i++)
        {

-               if (tunnel[i].state == TUNNELFREE)
+               if ((tunnel[i].state == TUNNELFREE) && (i != TUNNEL_ID_PPPOE))

                {
                        LOG(4, 0, i, "Assigning tunnel ID %u\n", i);
                        if (i > config->cluster_highest_tunnelid)
                {
                        LOG(4, 0, i, "Assigning tunnel ID %u\n", i);
                        if (i > config->cluster_highest_tunnelid)


@@ -6251,7 +6498,7 @@ void lac_send_SCCRQ(tunnelidt t, uint8_t * auth, unsigned int auth_len)
        control32(c, 3, 3, 1); // framing Capabilities
        control16(c, 9, t, 1); // assigned tunnel
        controlb(c, 11, (uint8_t *) auth, auth_len, 1);  // CHAP Challenge
        control32(c, 3, 3, 1); // framing Capabilities
        control16(c, 9, t, 1); // assigned tunnel
        controlb(c, 11, (uint8_t *) auth, auth_len, 1);  // CHAP Challenge

-       LOG(1, 0, t, "Sent SCCRQ tunnel (REMOTE LNS)\n");
+       LOG(3, 0, t, "Sent SCCRQ to REMOTE LNS\n");

        controladd(c, 0, t); // send
 }
 
        controladd(c, 0, t); // send
 }
 


@@ -6263,7 +6510,7 @@ void lac_send_ICRQ(tunnelidt t, sessionidt s)
        control16(c, 14, s, 1); // assigned sesion
        call_serial_number++;
        control32(c, 15, call_serial_number, 1);  // call serial number
        control16(c, 14, s, 1); // assigned sesion
        call_serial_number++;
        control32(c, 15, call_serial_number, 1);  // call serial number

-       LOG(1, s, t, "Sent ICRQ (REMOTE LNS) (tunnel far ID %u)\n", tunnel[t].far);
+       LOG(3, s, t, "Sent ICRQ to REMOTE LNS (far ID %u)\n", tunnel[t].far);

        controladd(c, 0, t); // send
 }
 
        controladd(c, 0, t); // send
 }