// L2TPNS Radius Stuff
-char const *cvs_id_radius = "$Id: radius.c,v 1.52 2006-07-01 12:40:17 bodea Exp $";
+char const *cvs_id_radius = "$Id: radius.c,v 1.55 2006-08-02 14:17:30 bodea Exp $";
#include <time.h>
#include <stdio.h>
uint8_t *e = buf + len;
for (; p + 2 <= e && p[1] && p + p[1] <= e; p += p[1])
{
+ if (*p == 26 && p[1] >= 7)
+ {
+ // Vendor-Specific Attribute
+ uint32_t vendor = ntohl(*(int *)(p + 2));
+ uint8_t attrib = *(p + 6);
+ int attrib_length = *(p + 7) - 2;
+
+ LOG(4, 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) // Cisco-AVPair
+ {
+ if (attrib_length < 0) continue;
+ LOG(3, s, session[s].tunnel, " Cisco-AVPair value: %.*s\n",
+ attrib_length, p + 8);
+
+ handle_avpair(s, p + 8, attrib_length);
+ continue;
+ }
+ else if (vendor == 529 && attrib >= 135 && attrib <= 136) // Ascend
+ {
+ // handle old-format ascend DNS attributes below
+ p += 6;
+ }
+ else
+ {
+ LOG(3, s, session[s].tunnel, " Unknown vendor-specific\n");
+ continue;
+ }
+ }
+
if (*p == 8)
{
// Framed-IP-Address
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
else if (*p == 27)
{
// Session-Timeout
- uint32_t to = ntohl(*(uint32_t *)(p + 2));
-
- LOG(3, s, session[s].tunnel, " Radius reply contains Session-Timeout = %u\n", to);
- if (to > 0)
- {
- session[s].session_timeout = to;
- }
+ 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
- uint32_t to = ntohl(*(uint32_t *)(p + 2));
-
- LOG(3, s, session[s].tunnel, " Radius reply contains Idle-Timeout = %u\n", to);
- if (to > 0)
- {
- session[s].idle_timeout = to;
- }
- }
- else if (*p == 26 && p[1] >= 7)
- {
- // Vendor-Specific Attribute
- int vendor = ntohl(*(int *)(p + 2));
- char 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);
- if (vendor != 9 || attrib != 1)
- {
- LOG(3, s, session[s].tunnel, " Unknown vendor-specific\n");
- continue;
- }
-
- if (attrib_length > 0)
- {
- LOG(3, s, session[s].tunnel, " Cisco-AVPair value: %.*s\n",
- attrib_length, p + 8);
-
- handle_avpair(s, p + 8, attrib_length);
- }
+ 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 == 99)
{