cleanup clash between timeout and session_timout
[l2tpns.git] / radius.c
index dd8a3e6..3dabc34 100644 (file)
--- a/radius.c
+++ b/radius.c
@@ -1,6 +1,6 @@
 // L2TPNS Radius Stuff
 
-char const *cvs_id_radius = "$Id: radius.c,v 1.50 2006/04/27 09:53:50 bodea Exp $";
+char const *cvs_id_radius = "$Id: radius.c,v 1.54 2006/08/02 13:35:39 bodea Exp $";
 
 #include <time.h>
 #include <stdio.h>
@@ -45,6 +45,25 @@ static void calc_auth(const void *buf, size_t len, const uint8_t *in, uint8_t *o
 void initrad(void)
 {
        int i;
+       uint16_t port = 0;
+       uint16_t min = config->radius_bind_min;
+       uint16_t max = config->radius_bind_max;
+       int inc = 1;
+       struct sockaddr_in addr;
+
+       if (min)
+       {
+               port = min;
+               if (!max)
+                       max = ~0 - 1;
+       }
+       else if (max) /* no minimum specified, bind from max down */
+       {
+               port = max;
+               min = 1;
+               inc = -1;
+       }
+
        LOG(3, 0, 0, "Creating %d sockets for RADIUS queries\n", RADIUS_FDS);
        radfds = calloc(sizeof(int), RADIUS_FDS);
        for (i = 0; i < RADIUS_FDS; i++)
@@ -53,6 +72,27 @@ void initrad(void)
                radfds[i] = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
                flags = fcntl(radfds[i], F_GETFL, 0);
                fcntl(radfds[i], F_SETFL, flags | O_NONBLOCK);
+
+               if (port)
+               {
+                       int b;
+
+                       memset(&addr, 0, sizeof(addr));
+                       addr.sin_family = AF_INET;
+                       addr.sin_addr.s_addr = INADDR_ANY;
+
+                       do {
+                               addr.sin_port = htons(port);
+                               if ((b = bind(radfds[i], (struct sockaddr *) &addr, sizeof(addr))) < 0)
+                               {
+                                       if ((port += inc) < min || port > max)
+                                       {
+                                               LOG(0, 0, 0, "Can't bind RADIUS socket in range %u-%u\n", min, max);
+                                               exit(1);
+                                       }
+                               }
+                       } while (b < 0);
+               }
        }
 }
 
@@ -330,6 +370,7 @@ void radiussend(uint16_t r, uint8_t state)
                        }
                }
        }
+
        if (s)
        {
                *p = 5;         // NAS-Port
@@ -346,52 +387,73 @@ void radiussend(uint16_t r, uint8_t state)
                p[1] = 6;
                *(uint32_t *) (p + 2) = htonl(1); // PPP
                p += p[1];
-       }
-       if (s && session[s].ip)
-       {
-               *p = 8;                 // Framed-IP-Address
-               p[1] = 6;
-               *(uint32_t *) (p + 2) = htonl(session[s].ip);
-               p += p[1];
-       }
-       if (s && session[s].route[0].ip)
-       {
-               int r;
-               for (r = 0; s && r < MAXROUTE && session[s].route[r].ip; r++)
+
+               if (session[s].ip)
+               {
+                       *p = 8;                 // Framed-IP-Address
+                       p[1] = 6;
+                       *(uint32_t *) (p + 2) = htonl(session[s].ip);
+                       p += p[1];
+               }
+
+               if (session[s].route[0].ip)
                {
-                       int width = 32;
-                       if (session[s].route[r].mask)
+                       int r;
+                       for (r = 0; s && r < MAXROUTE && session[s].route[r].ip; r++)
                        {
-                           int mask = session[s].route[r].mask;
-                           while (!(mask & 1))
-                           {
-                               width--;
-                               mask >>= 1;
-                           }
+                               int width = 32;
+                               if (session[s].route[r].mask)
+                               {
+                                   int mask = session[s].route[r].mask;
+                                   while (!(mask & 1))
+                                   {
+                                       width--;
+                                       mask >>= 1;
+                                   }
+                               }
+
+                               *p = 22;        // Framed-Route
+                               p[1] = sprintf((char *) p + 2, "%s/%d %s 1",
+                                       fmtaddr(htonl(session[s].route[r].ip), 0),
+                                       width, fmtaddr(htonl(session[s].ip), 1)) + 2;
+
+                               p += p[1];
                        }
+               }
 
-                       *p = 22;        // Framed-Route
-                       p[1] = sprintf((char *) p + 2, "%s/%d %s 1",
-                               fmtaddr(htonl(session[s].route[r].ip), 0),
-                               width, fmtaddr(htonl(session[s].ip), 1)) + 2;
+               if (session[s].session_timeout)
+               {
+                       *p = 27;                // Session-Timeout
+                       p[1] = 6;
+                       *(uint32_t *) (p + 2) = htonl(session[s].session_timeout);
+                       p += p[1];
+               }
 
+               if (session[s].idle_timeout)
+               {
+                       *p = 28;                // Idle-Timeout
+                       p[1] = 6;
+                       *(uint32_t *) (p + 2) = htonl(session[s].idle_timeout);
+                       p += p[1];
+               }
+
+               if (*session[s].called)
+               {
+                       *p = 30;                // called
+                       p[1] = strlen(session[s].called) + 2;
+                       strcpy((char *) p + 2, session[s].called);
+                       p += p[1];
+               }
+
+               if (*session[s].calling)
+               {
+                       *p = 31;                // calling
+                       p[1] = strlen(session[s].calling) + 2;
+                       strcpy((char *) p + 2, session[s].calling);
                        p += p[1];
                }
        }
-       if (*session[s].called)
-       {
-               *p = 30;                // called
-               p[1] = strlen(session[s].called) + 2;
-               strcpy((char *) p + 2, session[s].called);
-               p += p[1];
-       }
-       if (*session[s].calling)
-       {
-               *p = 31;                // calling
-               p[1] = strlen(session[s].calling) + 2;
-               strcpy((char *) p + 2, session[s].calling);
-               p += p[1];
-       }
+
        // NAS-IP-Address
        *p = 4;
        p[1] = 6;
@@ -593,19 +655,6 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                                LOG(3, s, session[s].tunnel, "   Radius reply contains primary DNS address %s\n",
                                                        fmtaddr(htonl(session[s].dns1), 0));
                                        }
-                                       else if (*p == 27)
-                                       {
-                                               // Session timeout
-                                               if (p[1] < 6) {
-                                                       LOG(2, s, session[s].tunnel, "Error: Received Session timeout with length %d < 6\n", p[1]);
-                                                       continue;
-                                               }
-
-                                               session[s].timeout = ntohl(*(uint32_t *) (p + 2));
-                                               LOG(3, s, session[s].tunnel, "   Radius reply contains Session timeout %d\n", session[s].timeout);
-                                               if (!session[s].timeout)
-                                                       sessionshutdown(s, "Session timeout is zero", CDN_ADMIN_DISC, TERM_SESSION_TIMEOUT);
-                                       }
                                        else if (*p == 136)
                                        {
                                                // DNS address
@@ -699,14 +748,28 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                                        ip_filters[f].used++;
                                                }
                                        }
+                                       else if (*p == 27)
+                                       {
+                                               // Session-Timeout
+                                               if (p[1] < 6) continue;
+                                               session[s].session_timeout = ntohl(*(uint32_t *)(p + 2));
+                                               LOG(3, s, session[s].tunnel, "   Radius reply contains Session-Timeout = %u\n", session[s].session_timeout);
+                                       }
+                                       else if (*p == 28)
+                                       {
+                                               // Idle-Timeout
+                                               if (p[1] < 6) continue;
+                                               session[s].idle_timeout = ntohl(*(uint32_t *)(p + 2));
+                                               LOG(3, s, session[s].tunnel, "   Radius reply contains Idle-Timeout = %u\n", session[s].idle_timeout);
+                                       }
                                        else if (*p == 26 && p[1] >= 7)
                                        {
                                                // Vendor-Specific Attribute
-                                               int vendor = ntohl(*(int *)(p + 2));
-                                               char attrib = *(p + 6);
+                                               uint32_t vendor = ntohl(*(int *)(p + 2));
+                                               uint8_t attrib = *(p + 6);
                                                int attrib_length = *(p + 7) - 2;
 
-                                               LOG(3, s, session[s].tunnel, "   Radius reply contains Vendor-Specific.  Vendor=%d Attrib=%d Length=%d\n", vendor, attrib, attrib_length);
+                                               LOG(3, s, session[s].tunnel, "   Radius reply contains Vendor-Specific.  Vendor=%u Attrib=%u Length=%d\n", vendor, attrib, attrib_length);
                                                if (vendor != 9 || attrib != 1)
                                                {
                                                        LOG(3, s, session[s].tunnel, "      Unknown vendor-specific\n");