resolve gcc 4.1 warning by changing ip_hash to a union

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index f950c58..515efc8 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
 
 // 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.165 2006/05/04 01:01:56 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.170 2006/07/01 14:07:35 bodea Exp $";

 
 #include <arpa/inet.h>
 #include <assert.h>
 
 #include <arpa/inet.h>
 #include <assert.h>


@@ -82,9 +82,13 @@ uint16_t MSS = 0;            // TCP MSS
 struct cli_session_actions *cli_session_actions = NULL;        // Pending session changes requested by CLI
 struct cli_tunnel_actions *cli_tunnel_actions = NULL;  // Pending tunnel changes required by CLI
 
 struct cli_session_actions *cli_session_actions = NULL;        // Pending session changes requested by CLI
 struct cli_tunnel_actions *cli_tunnel_actions = NULL;  // Pending tunnel changes required by CLI
 

-static void *ip_hash[256];     // Mapping from IP address to session structures.
+union iphash {
+       sessionidt sess;
+       union iphash *idx;
+} ip_hash[256];                        // Mapping from IP address to session structures.
+

 struct ipv6radix {
 struct ipv6radix {

-       int sess;
+       sessionidt sess;

        struct ipv6radix *branch;
 } ipv6_hash[256];              // Mapping from IPv6 address to session structures.
 
        struct ipv6radix *branch;
 } ipv6_hash[256];              // Mapping from IPv6 address to session structures.
 


@@ -126,6 +130,8 @@ config_descriptt config_values[] = {
        CONFIG("radius_secret", radiussecret, STRING),
        CONFIG("radius_authtypes", radius_authtypes_s, STRING),
        CONFIG("radius_dae_port", radius_dae_port, SHORT),
        CONFIG("radius_secret", radiussecret, STRING),
        CONFIG("radius_authtypes", radius_authtypes_s, STRING),
        CONFIG("radius_dae_port", radius_dae_port, SHORT),

+       CONFIG("radius_bind_min", radius_bind_min, SHORT),
+       CONFIG("radius_bind_max", radius_bind_max, SHORT),

        CONFIG("allow_duplicate_users", allow_duplicate_users, BOOL),
        CONFIG("guest_account", guest_user, STRING),
        CONFIG("bind_address", bind_address, IPv4),
        CONFIG("allow_duplicate_users", allow_duplicate_users, BOOL),
        CONFIG("guest_account", guest_user, STRING),
        CONFIG("bind_address", bind_address, IPv4),


@@ -187,9 +193,9 @@ struct Tstats *_statistics = NULL;
 struct Tringbuffer *ringbuffer = NULL;
 #endif
 
 struct Tringbuffer *ringbuffer = NULL;
 #endif
 

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

 static void uncache_ipmap(in_addr_t ip);
 static void uncache_ipmap(in_addr_t ip);

-static void cache_ipv6map(struct in6_addr ip, int prefixlen, int s);
+static void cache_ipv6map(struct in6_addr ip, int prefixlen, sessionidt s);

 static void free_ip_address(sessionidt s);
 static void dump_acct_info(int all);
 static void sighup_handler(int sig);
 static void free_ip_address(sessionidt s);
 static void dump_acct_info(int all);
 static void sighup_handler(int sig);


@@ -625,7 +631,7 @@ static void initudp(void)
                int flags = fcntl(udpfd, F_GETFL, 0);
                fcntl(udpfd, F_SETFL, flags | O_NONBLOCK);
        }
                int flags = fcntl(udpfd, F_GETFL, 0);
                fcntl(udpfd, F_SETFL, flags | O_NONBLOCK);
        }

-       if (bind(udpfd, (void *) &addr, sizeof(addr)) < 0)
+       if (bind(udpfd, (struct sockaddr *) &addr, sizeof(addr)) < 0)

        {
                LOG(0, 0, 0, "Error in UDP bind: %s\n", strerror(errno));
                exit(1);
        {
                LOG(0, 0, 0, "Error in UDP bind: %s\n", strerror(errno));
                exit(1);


@@ -638,7 +644,7 @@ static void initudp(void)
        controlfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
        setsockopt(controlfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
        setsockopt(controlfd, SOL_IP, IP_PKTINFO, &on, sizeof(on)); // recvfromto
        controlfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
        setsockopt(controlfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
        setsockopt(controlfd, SOL_IP, IP_PKTINFO, &on, sizeof(on)); // recvfromto

-       if (bind(controlfd, (void *) &addr, sizeof(addr)) < 0)
+       if (bind(controlfd, (struct sockaddr *) &addr, sizeof(addr)) < 0)

        {
                LOG(0, 0, 0, "Error in control bind: %s\n", strerror(errno));
                exit(1);
        {
                LOG(0, 0, 0, "Error in control bind: %s\n", strerror(errno));
                exit(1);


@@ -651,7 +657,7 @@ static void initudp(void)
        daefd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
        setsockopt(daefd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
        setsockopt(daefd, SOL_IP, IP_PKTINFO, &on, sizeof(on)); // recvfromto
        daefd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
        setsockopt(daefd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
        setsockopt(daefd, SOL_IP, IP_PKTINFO, &on, sizeof(on)); // recvfromto

-       if (bind(daefd, (void *) &addr, sizeof(addr)) < 0)
+       if (bind(daefd, (struct sockaddr *) &addr, sizeof(addr)) < 0)

        {
                LOG(0, 0, 0, "Error in DAE bind: %s\n", strerror(errno));
                exit(1);
        {
                LOG(0, 0, 0, "Error in DAE bind: %s\n", strerror(errno));
                exit(1);


@@ -676,19 +682,19 @@ static void initudp(void)
 // IP address.
 //
 
 // IP address.
 //
 

-static int lookup_ipmap(in_addr_t ip)
+static sessionidt lookup_ipmap(in_addr_t ip)

 {
        uint8_t *a = (uint8_t *) &ip;
 {
        uint8_t *a = (uint8_t *) &ip;

-       uint8_t **d = (uint8_t **) ip_hash;
+       union iphash *h = ip_hash;

 
 

-       if (!(d = (uint8_t **) d[(size_t) *a++])) return 0;
-       if (!(d = (uint8_t **) d[(size_t) *a++])) return 0;
-       if (!(d = (uint8_t **) d[(size_t) *a++])) return 0;
+       if (!(h = h[*a++].idx)) return 0;
+       if (!(h = h[*a++].idx)) return 0;
+       if (!(h = h[*a++].idx)) return 0;

 
 

-       return (int) (intptr_t) d[(size_t) *a];
+       return h[*a].sess;

 }
 
 }
 

-static int lookup_ipv6map(struct in6_addr ip)
+static sessionidt lookup_ipv6map(struct in6_addr ip)

 {
        struct ipv6radix *curnode;
        int i;
 {
        struct ipv6radix *curnode;
        int i;


@@ -716,18 +722,18 @@ static int lookup_ipv6map(struct in6_addr ip)
 
 sessionidt sessionbyip(in_addr_t ip)
 {
 
 sessionidt sessionbyip(in_addr_t ip)
 {

-       int s = lookup_ipmap(ip);
+       sessionidt s = lookup_ipmap(ip);

        CSTAT(sessionbyip);
 
        if (s > 0 && s < MAXSESSION && session[s].opened)
        CSTAT(sessionbyip);
 
        if (s > 0 && s < MAXSESSION && session[s].opened)

-               return (sessionidt) s;
+               return s;

 
        return 0;
 }
 
 sessionidt sessionbyipv6(struct in6_addr ip)
 {
 
        return 0;
 }
 
 sessionidt sessionbyipv6(struct in6_addr ip)
 {

-       int s;
+       sessionidt s;

        CSTAT(sessionbyipv6);
 
        if (!memcmp(&config->ipv6_prefix, &ip, 8) ||
        CSTAT(sessionbyipv6);
 
        if (!memcmp(&config->ipv6_prefix, &ip, 8) ||


@@ -753,25 +759,22 @@ 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, int s)
+static 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;

-       uint8_t **d = (uint8_t **) ip_hash;
+       union iphash *h = ip_hash;

        int i;
 
        for (i = 0; i < 3; i++)
        {
        int i;
 
        for (i = 0; i < 3; i++)
        {

-               if (!d[(size_t) a[i]])
-               {
-                       if (!(d[(size_t) a[i]] = calloc(256, sizeof(void *))))
-                               return;
-               }
+               if (!(h[a[i]].idx || (h[a[i]].idx = calloc(256, sizeof(union iphash)))))
+                       return;

 
 

-               d = (uint8_t **) d[(size_t) a[i]];
+               h = h[a[i]].idx;

        }
 
        }
 

-       d[(size_t) a[3]] = (uint8_t *) (intptr_t) s;
+       h[a[3]].sess = s;

 
        if (s > 0)
                LOG(4, s, session[s].tunnel, "Caching ip address %s\n", fmtaddr(nip, 0));
 
        if (s > 0)
                LOG(4, s, session[s].tunnel, "Caching ip address %s\n", fmtaddr(nip, 0));


@@ -786,7 +789,7 @@ static void uncache_ipmap(in_addr_t ip)
        cache_ipmap(ip, 0);     // Assign it to the NULL session.
 }
 
        cache_ipmap(ip, 0);     // Assign it to the NULL session.
 }
 

-static void cache_ipv6map(struct in6_addr ip, int prefixlen, int s)
+static void cache_ipv6map(struct in6_addr ip, int prefixlen, sessionidt s)

 {
        int i;
        int bytes;
 {
        int i;
        int bytes;


@@ -827,7 +830,7 @@ static void cache_ipv6map(struct in6_addr ip, int prefixlen, int s)
 //
 int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc)
 {
 //
 int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc)
 {

-       char **d = (char **) ip_hash, **e, **f, **g;
+       union iphash *d = ip_hash, *e, *f, *g;

        int i, j, k, l;
        int count = 0;
 
        int i, j, k, l;
        int count = 0;
 


@@ -838,24 +841,28 @@ int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc)
 
        for (i = 0; i < 256; ++i)
        {
 
        for (i = 0; i < 256; ++i)
        {

-               if (!d[i])
+               if (!d[i].idx)

                        continue;
                        continue;

-               e = (char **) d[i];
+
+               e = d[i].idx;

                for (j = 0; j < 256; ++j)
                {
                for (j = 0; j < 256; ++j)
                {

-                       if (!e[j])
+                       if (!e[j].idx)

                                continue;
                                continue;

-                       f = (char **) e[j];
+
+                       f = e[j].idx;

                        for (k = 0; k < 256; ++k)
                        {
                        for (k = 0; k < 256; ++k)
                        {

-                               if (!f[k])
+                               if (!f[k].idx)

                                        continue;
                                        continue;

-                               g = (char **)f[k];
+
+                               g = f[k].idx;

                                for (l = 0; l < 256; ++l)
                                {
                                for (l = 0; l < 256; ++l)
                                {

-                                       if (!g[l])
+                                       if (!g[l].sess)

                                                continue;
                                                continue;

-                                       cli_print(cli, "%7d %d.%d.%d.%d", (int) (intptr_t) g[l], i, j, k, l);
+
+                                       cli_print(cli, "%7d %d.%d.%d.%d", g[l].sess, i, j, k, l);

                                        ++count;
                                }
                        }
                                        ++count;
                                }
                        }


@@ -1075,25 +1082,27 @@ void processmpframe(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l, uint8_t e
                p += 2;
                l -= 2;
        }
                p += 2;
                l -= 2;
        }

+

        if (proto == PPPIP)
        {
                if (session[s].die)
                {
        if (proto == PPPIP)
        {
                if (session[s].die)
                {

-                       LOG(4, s, t, "MPPP: Session %d is closing.  Don't process PPP packets\n", s);
+                       LOG(4, s, t, "MPPP: Session %u is closing.  Don't process PPP packets\n", s);

                        return;              // closing session, PPP not processed
                }
                        return;              // closing session, PPP not processed
                }

-               session[s].last_packet = time_now;
+
+               session[s].last_packet = session[s].last_data = time_now;

                processipin(s, t, p, l);
        }
        else if (proto == PPPIPV6 && config->ipv6_prefix.s6_addr[0])
        {
                if (session[s].die)
                {
                processipin(s, t, p, l);
        }
        else if (proto == PPPIPV6 && config->ipv6_prefix.s6_addr[0])
        {
                if (session[s].die)
                {

-                       LOG(4, s, t, "MPPP: Session %d is closing.  Don't process PPP packets\n", s);
+                       LOG(4, s, t, "MPPP: Session %u is closing.  Don't process PPP packets\n", s);

                        return;              // closing session, PPP not processed
                }
 
                        return;              // closing session, PPP not processed
                }
 

-               session[s].last_packet = time_now;
+               session[s].last_packet = session[s].last_data = time_now;

                processipv6in(s, t, p, l);
        }
        else
                processipv6in(s, t, p, l);
        }
        else


@@ -1166,6 +1175,7 @@ static void processipout(uint8_t *buf, int len)
        }
        t = session[s].tunnel;
        sp = &session[s];
        }
        t = session[s].tunnel;
        sp = &session[s];

+       sp->last_data = time_now;

 
        // DoS prevention: enforce a maximum number of packets per 0.1s for a session
        if (config->max_packets > 0)
 
        // DoS prevention: enforce a maximum number of packets per 0.1s for a session
        if (config->max_packets > 0)


@@ -1242,7 +1252,7 @@ static void processipout(uint8_t *buf, int len)
                {
                        bid = session[s].bundle;
                        s = bundle[bid].members[bundle[bid].current_ses = ++bundle[bid].current_ses % bundle[bid].num_of_links];
                {
                        bid = session[s].bundle;
                        s = bundle[bid].members[bundle[bid].current_ses = ++bundle[bid].current_ses % bundle[bid].num_of_links];

-                       LOG(4, s, t, "MPPP: (1)Session number becomes: %d\n", s);
+                       LOG(4, s, t, "MPPP: (1)Session number becomes: %u\n", s);

                        if (len > 256)
                        {
                                // Partition the packet to 2 fragments
                        if (len > 256)
                        {
                                // Partition the packet to 2 fragments


@@ -1254,7 +1264,7 @@ static void processipout(uint8_t *buf, int len)
                                if (!p) return;
                                tunnelsend(b1, frag1len + (p-b1), t); // send it...
                                s = bundle[bid].members[bundle[bid].current_ses = ++bundle[bid].current_ses % bundle[bid].num_of_links];
                                if (!p) return;
                                tunnelsend(b1, frag1len + (p-b1), t); // send it...
                                s = bundle[bid].members[bundle[bid].current_ses = ++bundle[bid].current_ses % bundle[bid].num_of_links];

-                               LOG(4, s, t, "MPPP: (2)Session number becomes: %d\n", s);
+                               LOG(4, s, t, "MPPP: (2)Session number becomes: %u\n", s);

                                q = makeppp(b2, sizeof(b2), buf+frag1len, frag2len, s, t, PPPIP, 0, bid, MP_END);
                                if (!q) return;
                                tunnelsend(b2, frag2len + (q-b2), t); // send it...
                                q = makeppp(b2, sizeof(b2), buf+frag1len, frag2len, s, t, PPPIP, 0, bid, MP_END);
                                if (!q) return;
                                tunnelsend(b2, frag2len + (q-b2), t); // send it...


@@ -1359,10 +1369,11 @@ static void processipv6out(uint8_t * buf, int len)
        {
                bundleidt bid = session[s].bundle;
                s = bundle[bid].members[bundle[bid].current_ses = ++bundle[bid].current_ses % bundle[bid].num_of_links];
        {
                bundleidt bid = session[s].bundle;
                s = bundle[bid].members[bundle[bid].current_ses = ++bundle[bid].current_ses % bundle[bid].num_of_links];

-               LOG(3, s, session[s].tunnel, "MPPP: Session number becomes: %d\n", s);
+               LOG(3, s, session[s].tunnel, "MPPP: Session number becomes: %u\n", s);

        }
        t = session[s].tunnel;
        sp = &session[s];
        }
        t = session[s].tunnel;
        sp = &session[s];

+       sp->last_data = time_now;

 
        // FIXME: add DoS prevention/filters?
 
 
        // FIXME: add DoS prevention/filters?
 


@@ -1663,7 +1674,7 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
        if (!session[s].die)
        {
                struct param_kill_session data = { &tunnel[session[s].tunnel], &session[s] };
        if (!session[s].die)
        {
                struct param_kill_session data = { &tunnel[session[s].tunnel], &session[s] };

-               LOG(2, s, session[s].tunnel, "Shutting down session %d: %s\n", s, reason);
+               LOG(2, s, session[s].tunnel, "Shutting down session %u: %s\n", s, reason);

                run_plugins(PLUGIN_KILL_SESSION, &data);
        }
 
                run_plugins(PLUGIN_KILL_SESSION, &data);
        }
 


@@ -1832,7 +1843,7 @@ void sessionkill(sessionidt s, char *reason)
 
        if (session[s].next)
        {
 
        if (session[s].next)
        {

-               LOG(0, s, session[s].tunnel, "Tried to kill a session with next pointer set (%d)\n", session[s].next);
+               LOG(0, s, session[s].tunnel, "Tried to kill a session with next pointer set (%u)\n", session[s].next);

                return;
        }
 
                return;
        }
 


@@ -1841,16 +1852,16 @@ 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
 

-       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 %u (%s): %s\n", s, session[s].user, reason);

        if ((b = session[s].bundle))
        {
                // This session was part of a bundle
                bundle[b].num_of_links--;
        if ((b = session[s].bundle))
        {
                // This session was part of a bundle
                bundle[b].num_of_links--;

-               LOG(3, s, 0, "MPPP: Dropping member link: %d from bundle %d\n",s,b);
+               LOG(3, s, 0, "MPPP: Dropping member link: %u from bundle %u\n", s, b);

                if (bundle[b].num_of_links == 0)
                {
                        bundleclear(b);
                if (bundle[b].num_of_links == 0)
                {
                        bundleclear(b);

-                       LOG(3, s, 0, "MPPP: Kill bundle: %d (No remaing member links)\n",b);
+                       LOG(3, s, 0, "MPPP: Kill bundle: %u (No remaing member links)\n", b);

                }
                else
                {
                }
                else
                {


@@ -1918,7 +1929,7 @@ static void tunnelkill(tunnelidt t, char *reason)
 
        // free tunnel
        tunnelclear(t);
 
        // free tunnel
        tunnelclear(t);

-       LOG(1, 0, t, "Kill tunnel %d: %s\n", t, reason);
+       LOG(1, 0, t, "Kill tunnel %u: %s\n", t, reason);

        cli_tunnel_actions[t].action = 0;
        cluster_send_tunnel(t);
 }
        cli_tunnel_actions[t].action = 0;
        cluster_send_tunnel(t);
 }


@@ -1936,7 +1947,7 @@ static void tunnelshutdown(tunnelidt t, char *reason, int result, int error, cha
                tunnelkill(t, reason);
                return;
        }
                tunnelkill(t, reason);
                return;
        }

-       LOG(1, 0, t, "Shutting down tunnel %d (%s)\n", t, reason);
+       LOG(1, 0, t, "Shutting down tunnel %u (%s)\n", t, reason);

 
        // close session
        for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
 
        // close session
        for (s = 1; s <= config->cluster_highest_sessionid ; ++s)


@@ -1999,7 +2010,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
        }
        if ((buf[1] & 0x0F) != 2)
        {
        }
        if ((buf[1] & 0x0F) != 2)
        {

-               LOG(1, 0, 0, "Bad L2TP ver %d\n", (buf[1] & 0x0F) != 2);
+               LOG(1, 0, 0, "Bad L2TP ver %d\n", buf[1] & 0x0F);

                STAT(tunnel_rx_errors);
                return;
        }
                STAT(tunnel_rx_errors);
                return;
        }


@@ -2096,7 +2107,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                        }
                }
 
                        }
                }
 

-               LOG(3, s, t, "Control message (%d bytes): (unacked %d) l-ns %d l-nr %d r-ns %d r-nr %d\n",
+               LOG(3, s, t, "Control message (%d bytes): (unacked %d) l-ns %u l-nr %u r-ns %u r-nr %u\n",

                        l, tunnel[t].controlc, tunnel[t].ns, tunnel[t].nr, ns, nr);
 
                // if no tunnel specified, assign one
                        l, tunnel[t].controlc, tunnel[t].ns, tunnel[t].nr, ns, nr);
 
                // if no tunnel specified, assign one


@@ -2113,7 +2124,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                        tunnel[t].port = ntohs(addr->sin_port);
                        tunnel[t].window = 4; // default window
                        STAT(tunnel_created);
                        tunnel[t].port = ntohs(addr->sin_port);
                        tunnel[t].window = 4; // default window
                        STAT(tunnel_created);

-                       LOG(1, 0, t, "   New tunnel from %s:%u ID %d\n",
+                       LOG(1, 0, t, "   New tunnel from %s:%u ID %u\n",

                                fmtaddr(htonl(tunnel[t].ip), 0), tunnel[t].port, t);
                }
 
                                fmtaddr(htonl(tunnel[t].ip), 0), tunnel[t].port, t);
                }
 


@@ -2127,7 +2138,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                {
                        // is this the sequence we were expecting?
                        STAT(tunnel_rx_errors);
                {
                        // is this the sequence we were expecting?
                        STAT(tunnel_rx_errors);

-                       LOG(1, 0, t, "   Out of sequence tunnel %d, (%d is not the expected %d)\n",
+                       LOG(1, 0, t, "   Out of sequence tunnel %u, (%u is not the expected %u)\n",

                                t, ns, tunnel[t].nr);
 
                        if (l)  // Is this not a ZLB?
                                t, ns, tunnel[t].nr);
 
                        if (l)  // Is this not a ZLB?


@@ -2180,9 +2191,10 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                        int error = 0;
                        char *msg = 0;
 
                        int error = 0;
                        char *msg = 0;
 

-                       // default disconnect cause/message on receipt
-                       // of CDN (set to more specific value from
-                       // attribute 46 if present below).
+                       // Default disconnect cause/message on receipt of CDN.  Set to
+                       // more specific value from attribute 1 (result code) or 46
+                       // (disconnect cause) if present below.
+                       int disc_cause_set = 0;

                        int disc_cause = TERM_NAS_REQUEST;
                        char const *disc_reason = "Closed (Received CDN).";
 
                        int disc_cause = TERM_NAS_REQUEST;
                        char const *disc_reason = "Closed (Received CDN).";
 


@@ -2214,7 +2226,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                b += 2;
                                if (*(uint16_t *) (b))
                                {
                                b += 2;
                                if (*(uint16_t *) (b))
                                {

-                                       LOG(2, s, t, "Unknown AVP vendor %d\n", ntohs(*(uint16_t *) (b)));
+                                       LOG(2, s, t, "Unknown AVP vendor %u\n", ntohs(*(uint16_t *) (b)));

                                        fatal = flags;
                                        result = 2; // general error
                                        error = 6; // generic vendor-specific error
                                        fatal = flags;
                                        result = 2; // general error
                                        error = 6; // generic vendor-specific error


@@ -2279,7 +2291,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                        n = orig_len;
                                }
 
                                        n = orig_len;
                                }
 

-                               LOG(4, s, t, "   AVP %d (%s) len %d%s%s\n", mtype, l2tp_avp_name(mtype), n,
+                               LOG(4, s, t, "   AVP %u (%s) len %d%s%s\n", mtype, l2tp_avp_name(mtype), n,

                                        flags & 0x40 ? ", hidden" : "", flags & 0x80 ? ", mandatory" : "");
 
                                switch (mtype)
                                        flags & 0x40 ? ", hidden" : "", flags & 0x80 ? ", mandatory" : "");
 
                                switch (mtype)


@@ -2287,37 +2299,53 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                case 0:     // message type
                                        message = ntohs(*(uint16_t *) b);
                                        mandatory = flags & 0x80;
                                case 0:     // message type
                                        message = ntohs(*(uint16_t *) b);
                                        mandatory = flags & 0x80;

-                                       LOG(4, s, t, "   Message type = %d (%s)\n", *b, l2tp_code(message));
+                                       LOG(4, s, t, "   Message type = %u (%s)\n", *b, l2tp_code(message));

                                        break;
                                case 1:     // result code
                                        {
                                                uint16_t rescode = ntohs(*(uint16_t *) b);
                                        break;
                                case 1:     // result code
                                        {
                                                uint16_t rescode = ntohs(*(uint16_t *) b);

-                                               const char* resdesc = "(unknown)";
+                                               char const *resdesc = "(unknown)";
+                                               char const *errdesc = NULL;
+                                               int cause = 0;
+

                                                if (message == 4)
                                                { /* StopCCN */
                                                        resdesc = l2tp_stopccn_result_code(rescode);
                                                if (message == 4)
                                                { /* StopCCN */
                                                        resdesc = l2tp_stopccn_result_code(rescode);

+                                                       cause = TERM_LOST_SERVICE;

                                                }
                                                else if (message == 14)
                                                { /* CDN */
                                                        resdesc = l2tp_cdn_result_code(rescode);
                                                }
                                                else if (message == 14)
                                                { /* CDN */
                                                        resdesc = l2tp_cdn_result_code(rescode);

+                                                       if (rescode == 1)
+                                                               cause = TERM_LOST_CARRIER;
+                                                       else
+                                                               cause = TERM_ADMIN_RESET;

                                                }
 
                                                }
 

-                                               LOG(4, s, t, "   Result Code %d: %s\n", rescode, resdesc);
+                                               LOG(4, s, t, "   Result Code %u: %s\n", rescode, resdesc);

                                                if (n >= 4)
                                                {
                                                        uint16_t errcode = ntohs(*(uint16_t *)(b + 2));
                                                if (n >= 4)
                                                {
                                                        uint16_t errcode = ntohs(*(uint16_t *)(b + 2));

-                                                       LOG(4, s, t, "   Error Code %d: %s\n", errcode, l2tp_error_code(errcode));
+                                                       errdesc = l2tp_error_code(errcode);
+                                                       LOG(4, s, t, "   Error Code %u: %s\n", errcode, errdesc);

                                                }
                                                if (n > 4)
                                                        LOG(4, s, t, "   Error String: %.*s\n", n-4, b+4);
 
                                                }
                                                if (n > 4)
                                                        LOG(4, s, t, "   Error String: %.*s\n", n-4, b+4);
 

+                                               if (cause && disc_cause_set < mtype) // take cause from attrib 46 in preference
+                                               {
+                                                       disc_cause_set = mtype;
+                                                       disc_reason = errdesc ? errdesc : resdesc;
+                                                       disc_cause = cause;
+                                               }
+

                                                break;
                                        }
                                        break;
                                case 2:     // protocol version
                                        {
                                                version = ntohs(*(uint16_t *) (b));
                                                break;
                                        }
                                        break;
                                case 2:     // protocol version
                                        {
                                                version = ntohs(*(uint16_t *) (b));

-                                               LOG(4, s, t, "   Protocol version = %d\n", version);
+                                               LOG(4, s, t, "   Protocol version = %u\n", version);

                                                if (version && version != 0x0100)
                                                {   // allow 0.0 and 1.0
                                                        LOG(1, s, t, "   Bad protocol version %04X\n", version);
                                                if (version && version != 0x0100)
                                                {   // allow 0.0 and 1.0
                                                        LOG(1, s, t, "   Bad protocol version %04X\n", version);


@@ -2351,13 +2379,13 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                        break;
                                case 9:     // assigned tunnel
                                        tunnel[t].far = ntohs(*(uint16_t *) (b));
                                        break;
                                case 9:     // assigned tunnel
                                        tunnel[t].far = ntohs(*(uint16_t *) (b));

-                                       LOG(4, s, t, "   Remote tunnel id = %d\n", tunnel[t].far);
+                                       LOG(4, s, t, "   Remote tunnel id = %u\n", tunnel[t].far);

                                        break;
                                case 10:    // rx window
                                        tunnel[t].window = ntohs(*(uint16_t *) (b));
                                        if (!tunnel[t].window)
                                                tunnel[t].window = 1; // window of 0 is silly
                                        break;
                                case 10:    // rx window
                                        tunnel[t].window = ntohs(*(uint16_t *) (b));
                                        if (!tunnel[t].window)
                                                tunnel[t].window = 1; // window of 0 is silly

-                                       LOG(4, s, t, "   rx window = %d\n", tunnel[t].window);
+                                       LOG(4, s, t, "   rx window = %u\n", tunnel[t].window);

                                        break;
                                case 11:        // Challenge
                                        {
                                        break;
                                case 11:        // Challenge
                                        {


@@ -2372,17 +2400,17 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 
                                case 14:    // assigned session
                                        asession = session[s].far = ntohs(*(uint16_t *) (b));
 
                                case 14:    // assigned session
                                        asession = session[s].far = ntohs(*(uint16_t *) (b));

-                                       LOG(4, s, t, "   assigned session = %d\n", asession);
+                                       LOG(4, s, t, "   assigned session = %u\n", asession);

                                        break;
                                case 15:    // call serial number
                                        break;
                                case 15:    // call serial number

-                                       LOG(4, s, t, "   call serial number = %d\n", ntohl(*(uint32_t *)b));
+                                       LOG(4, s, t, "   call serial number = %u\n", ntohl(*(uint32_t *)b));

                                        break;
                                case 18:    // bearer type
                                        break;
                                case 18:    // bearer type

-                                       LOG(4, s, t, "   bearer type = %d\n", ntohl(*(uint32_t *)b));
+                                       LOG(4, s, t, "   bearer type = %u\n", ntohl(*(uint32_t *)b));

                                        // TBA - for RADIUS
                                        break;
                                case 19:    // framing type
                                        // TBA - for RADIUS
                                        break;
                                case 19:    // framing type

-                                       LOG(4, s, t, "   framing type = %d\n", ntohl(*(uint32_t *)b));
+                                       LOG(4, s, t, "   framing type = %u\n", ntohl(*(uint32_t *)b));

                                        // TBA
                                        break;
                                case 21:    // called number
                                        // TBA
                                        break;
                                case 21:    // called number


@@ -2436,7 +2464,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                case 29:    // Proxy Authentication Type
                                        {
                                                uint16_t atype = ntohs(*(uint16_t *)b);
                                case 29:    // Proxy Authentication Type
                                        {
                                                uint16_t atype = ntohs(*(uint16_t *)b);

-                                               LOG(4, s, t, "   Proxy Auth Type %d (%s)\n", atype, ppp_auth_type(atype));
+                                               LOG(4, s, t, "   Proxy Auth Type %u (%s)\n", atype, ppp_auth_type(atype));

                                                break;
                                        }
                                case 30:    // Proxy Authentication Name
                                                break;
                                        }
                                case 30:    // Proxy Authentication Name


@@ -2456,7 +2484,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                case 32:    // Proxy Authentication ID
                                        {
                                                uint16_t authid = ntohs(*(uint16_t *)(b));
                                case 32:    // Proxy Authentication ID
                                        {
                                                uint16_t authid = ntohs(*(uint16_t *)(b));

-                                               LOG(4, s, t, "   Proxy Auth ID (%d)\n", authid);
+                                               LOG(4, s, t, "   Proxy Auth ID (%u)\n", authid);

                                                break;
                                        }
                                case 33:    // Proxy Authentication Response
                                                break;
                                        }
                                case 33:    // Proxy Authentication Response


@@ -2502,6 +2530,8 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                                        "(code=%u, proto=%04X, dir=%u, msg=\"%.*s\")\n",
                                                        code, proto, dir, n - 5, b + 5);
 
                                                        "(code=%u, proto=%04X, dir=%u, msg=\"%.*s\")\n",
                                                        code, proto, dir, n - 5, b + 5);
 

+                                               disc_cause_set = mtype;
+

                                                switch (code)
                                                {
                                                case 1: // admin disconnect
                                                switch (code)
                                                {
                                                case 1: // admin disconnect


@@ -2572,7 +2602,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                default:
                                        {
                                                static char e[] = "unknown AVP 0xXXXX";
                                default:
                                        {
                                                static char e[] = "unknown AVP 0xXXXX";

-                                               LOG(2, s, t, "   Unknown AVP type %d\n", mtype);
+                                               LOG(2, s, t, "   Unknown AVP type %u\n", mtype);

                                                fatal = flags;
                                                result = 2; // general error
                                                error = 8; // unknown mandatory AVP
                                                fatal = flags;
                                                result = 2; // general error
                                                error = 8; // unknown mandatory AVP


@@ -2642,8 +2672,8 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                                session[s].opened = time_now;
                                                session[s].tunnel = t;
                                                session[s].far = asession;
                                                session[s].opened = time_now;
                                                session[s].tunnel = t;
                                                session[s].far = asession;

-                                               session[s].last_packet = time_now;
-                                               LOG(3, s, t, "New session (%d/%d)\n", tunnel[t].far, session[s].far);
+                                               session[s].last_packet = session[s].last_data = time_now;
+                                               LOG(3, s, t, "New session (%u/%u)\n", tunnel[t].far, session[s].far);

                                                control16(c, 14, s, 1); // assigned session
                                                controladd(c, asession, t); // send the reply
 
                                                control16(c, 14, s, 1); // assigned session
                                                controladd(c, asession, t); // send the reply
 


@@ -2705,7 +2735,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                        if (mandatory)
                                                tunnelshutdown(t, "Unknown message type", 2, 6, "unknown message type");
                                        else
                                        if (mandatory)
                                                tunnelshutdown(t, "Unknown message type", 2, 6, "unknown message type");
                                        else

-                                               LOG(1, s, t, "Unknown message type %d\n", message);
+                                               LOG(1, s, t, "Unknown message type %u\n", message);

                                        break;
                                }
                        if (chapresponse) free(chapresponse);
                                        break;
                                }
                        if (chapresponse) free(chapresponse);


@@ -2799,11 +2829,11 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                {
                        if (session[s].die)
                        {
                {
                        if (session[s].die)
                        {

-                               LOG(4, s, t, "Session %d is closing.  Don't process PPP packets\n", s);
+                               LOG(4, s, t, "Session %u is closing.  Don't process PPP packets\n", s);

                                return;              // closing session, PPP not processed
                        }
 
                                return;              // closing session, PPP not processed
                        }
 

-                       session[s].last_packet = time_now;
+                       session[s].last_packet = session[s].last_data = time_now;

                        if (session[s].walled_garden && !config->cluster_iam_master)
                        {
                                master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
                        if (session[s].walled_garden && !config->cluster_iam_master)
                        {
                                master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);


@@ -2816,11 +2846,11 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                {
                        if (session[s].die)
                        {
                {
                        if (session[s].die)
                        {

-                               LOG(4, s, t, "Session %d is closing.  Don't process PPP packets\n", s);
+                               LOG(4, s, t, "Session %u is closing.  Don't process PPP packets\n", s);

                                return;              // closing session, PPP not processed
                        }
 
                                return;              // closing session, PPP not processed
                        }
 

-                       session[s].last_packet = time_now;
+                       session[s].last_packet = session[s].last_data = time_now;

                        if (session[s].walled_garden && !config->cluster_iam_master)
                        {
                                master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
                        if (session[s].walled_garden && !config->cluster_iam_master)
                        {
                                master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);


@@ -2833,11 +2863,11 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                {
                        if (session[s].die)
                        {
                {
                        if (session[s].die)
                        {

-                               LOG(4, s, t, "Session %d is closing.  Don't process PPP packets\n", s);
+                               LOG(4, s, t, "Session %u is closing.  Don't process PPP packets\n", s);

                                return;              // closing session, PPP not processed
                        }
 
                                return;              // closing session, PPP not processed
                        }
 

-                       session[s].last_packet = time_now;
+                       session[s].last_packet = session[s].last_data = time_now;

                        if (session[s].walled_garden && !config->cluster_iam_master)
                        {
                                master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
                        if (session[s].walled_garden && !config->cluster_iam_master)
                        {
                                master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);


@@ -3195,6 +3225,24 @@ static void regular_cleanups(double period)
                        s_actions++;
                }
 
                        s_actions++;
                }
 

+               // Drop sessions who have reached session_timeout seconds
+               if (session[s].session_timeout && (time_now - session[s].opened >= session[s].session_timeout))
+               {
+                       sessionshutdown(s, "Session Timeout Reached", CDN_ADMIN_DISC, TERM_SESSION_TIMEOUT);
+                       STAT(session_timeout);
+                       s_actions++;
+                       continue;
+               }
+
+               // Drop sessions who have reached idle_timeout seconds
+               if (session[s].last_data && session[s].idle_timeout && (time_now - session[s].last_data >= session[s].idle_timeout))
+               {
+                       sessionshutdown(s, "Idle Timeout Reached", CDN_ADMIN_DISC, TERM_IDLE_TIMEOUT);
+                       STAT(session_timeout);
+                       s_actions++;
+                       continue;
+               }
+

                // Check for actions requested from the CLI
                if ((a = cli_session_actions[s].action))
                {
                // Check for actions requested from the CLI
                if ((a = cli_session_actions[s].action))
                {


@@ -3219,7 +3267,7 @@ static void regular_cleanups(double period)
                        }
                        else if (a & CLI_SESS_SNOOP)
                        {
                        }
                        else if (a & CLI_SESS_SNOOP)
                        {

-                               LOG(2, s, session[s].tunnel, "Snooping session by CLI (to %s:%d)\n",
+                               LOG(2, s, session[s].tunnel, "Snooping session by CLI (to %s:%u)\n",

                                    fmtaddr(cli_session_actions[s].snoop_ip, 0),
                                    cli_session_actions[s].snoop_port);
 
                                    fmtaddr(cli_session_actions[s].snoop_ip, 0),
                                    cli_session_actions[s].snoop_port);
 


@@ -3362,7 +3410,7 @@ static int still_busy(void)
 
                if (last_talked != TIME)
                {
 
                if (last_talked != TIME)
                {

-                       LOG(2, 0, 0, "Tunnel %d still has un-acked control messages.\n", i);
+                       LOG(2, 0, 0, "Tunnel %u still has un-acked control messages.\n", i);

                        last_talked = TIME;
                }
                return 1;
                        last_talked = TIME;
                }
                return 1;


@@ -3384,7 +3432,7 @@ static int still_busy(void)
 
                if (last_talked != TIME)
                {
 
                if (last_talked != TIME)
                {

-                       LOG(2, 0, 0, "Radius session %d is still busy (sid %d)\n", i, radius[i].session);
+                       LOG(2, 0, 0, "Radius session %u is still busy (sid %u)\n", i, radius[i].session);

                        last_talked = TIME;
                }
                return 1;
                        last_talked = TIME;
                }
                return 1;


@@ -4107,7 +4155,7 @@ void rebuild_address_pool(void)
                        if (ipid < 1)                   // Not found in the pool either? good.
                                continue;
 
                        if (ipid < 1)                   // Not found in the pool either? good.
                                continue;
 

-                       LOG(0, i, 0, "Session %d has an IP address (%s) that was marked static, but is in the pool (%d)!\n",
+                       LOG(0, i, 0, "Session %u has an IP address (%s) that was marked static, but is in the pool (%d)!\n",

                                i, fmtaddr(session[i].ip, 0), ipid);
 
                        // Fall through and process it as part of the pool.
                                i, fmtaddr(session[i].ip, 0), ipid);
 
                        // Fall through and process it as part of the pool.


@@ -4116,7 +4164,7 @@ void rebuild_address_pool(void)
 
                if (ipid > MAXIPPOOL || ipid < 0)
                {
 
                if (ipid > MAXIPPOOL || ipid < 0)
                {

-                       LOG(0, i, 0, "Session %d has a pool IP that's not found in the pool! (%d)\n", i, ipid);
+                       LOG(0, i, 0, "Session %u has a pool IP that's not found in the pool! (%d)\n", i, ipid);

                        ipid = -1;
                        session[i].ip_pool_index = ipid;
                        continue;
                        ipid = -1;
                        session[i].ip_pool_index = ipid;
                        continue;


@@ -4264,7 +4312,7 @@ void snoop_send_packet(uint8_t *packet, uint16_t size, in_addr_t destination, ui
        snoop_addr.sin_addr.s_addr = destination;
        snoop_addr.sin_port = ntohs(port);
 
        snoop_addr.sin_addr.s_addr = destination;
        snoop_addr.sin_port = ntohs(port);
 

-       LOG(5, 0, 0, "Snooping %d byte packet to %s:%d\n", size,
+       LOG(5, 0, 0, "Snooping %d byte packet to %s:%u\n", size,

                fmtaddr(snoop_addr.sin_addr.s_addr, 0),
                htons(snoop_addr.sin_port));
 
                fmtaddr(snoop_addr.sin_addr.s_addr, 0),
                htons(snoop_addr.sin_port));
 


@@ -4876,7 +4924,7 @@ int sessionsetup(sessionidt s, tunnelidt t)
        if (session[s].throttle_in || session[s].throttle_out)
                throttle_session(s, session[s].throttle_in, session[s].throttle_out);
 
        if (session[s].throttle_in || session[s].throttle_out)
                throttle_session(s, session[s].throttle_in, session[s].throttle_out);
 

-       session[s].last_packet = time_now;
+       session[s].last_packet = session[s].last_data = time_now;

 
        LOG(2, s, t, "Login by %s at %s from %s (%s)\n", session[s].user,
                fmtaddr(htonl(session[s].ip), 0),
 
        LOG(2, s, t, "Login by %s at %s from %s (%s)\n", session[s].user,
                fmtaddr(htonl(session[s].ip), 0),


@@ -4979,13 +5027,13 @@ int load_session(sessionidt s, sessiont *new)
        // check filters
        if (new->filter_in && (new->filter_in > MAXFILTER || !ip_filters[new->filter_in - 1].name[0]))
        {
        // check filters
        if (new->filter_in && (new->filter_in > MAXFILTER || !ip_filters[new->filter_in - 1].name[0]))
        {

-               LOG(2, s, session[s].tunnel, "Dropping invalid input filter %d\n", (int) new->filter_in);
+               LOG(2, s, session[s].tunnel, "Dropping invalid input filter %u\n", (int) new->filter_in);

                new->filter_in = 0;
        }
 
        if (new->filter_out && (new->filter_out > MAXFILTER || !ip_filters[new->filter_out - 1].name[0]))
        {
                new->filter_in = 0;
        }
 
        if (new->filter_out && (new->filter_out > MAXFILTER || !ip_filters[new->filter_out - 1].name[0]))
        {

-               LOG(2, s, session[s].tunnel, "Dropping invalid output filter %d\n", (int) new->filter_out);
+               LOG(2, s, session[s].tunnel, "Dropping invalid output filter %u\n", (int) new->filter_out);

                new->filter_out = 0;
        }
 
                new->filter_out = 0;
        }
 


@@ -5369,7 +5417,7 @@ static tunnelidt new_tunnel()
        {
                if (tunnel[i].state == TUNNELFREE)
                {
        {
                if (tunnel[i].state == TUNNELFREE)
                {

-                       LOG(4, 0, i, "Assigning tunnel ID %d\n", i);
+                       LOG(4, 0, i, "Assigning tunnel ID %u\n", i);

                        if (i > config->cluster_highest_tunnelid)
                                config->cluster_highest_tunnelid = i;
                        return i;
                        if (i > config->cluster_highest_tunnelid)
                                config->cluster_highest_tunnelid = i;
                        return i;


@@ -5439,7 +5487,7 @@ int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc
                if (!session[s].opened)
                        continue;
 
                if (!session[s].opened)
                        continue;
 

-               idle = time_now - session[s].last_packet;
+               idle = time_now - session[s].last_data;

                idle /= 5 ; // In multiples of 5 seconds.
                if (idle < 0)
                        idle = 0;
                idle /= 5 ; // In multiples of 5 seconds.
                if (idle < 0)
                        idle = 0;