Merge branch 'common-cvs-git-upstream' into fdn-mods

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
This commit is contained in:
Benjamin Cama 2012-02-02 02:15:14 +01:00
commit 99921507eb
30 changed files with 115 additions and 213 deletions

View file

@ -1,7 +1,5 @@
// L2TPNS Radius Stuff
char const *cvs_id_radius = "$Id: radius.c,v 1.56 2009/12/08 14:49:28 bodea Exp $";
#include <time.h>
#include <stdio.h>
#include <sys/types.h>
@ -365,6 +363,13 @@ void radiussend(uint16_t r, uint8_t state)
}
}
if (session[s].classlen) {
*p = 25; // class
p[1] = session[s].classlen + 2;
memcpy(p + 2, session[s].class, session[s].classlen);
p += p[1];
}
{
struct param_radius_account acct = { &tunnel[session[s].tunnel], &session[s], &p };
run_plugins(PLUGIN_RADIUS_ACCOUNT, &acct);
@ -809,6 +814,15 @@ void processrad(uint8_t *buf, int len, char socket_index)
session[s].ipv6prefixlen = prefixlen;
}
}
else if (*p == 25)
{
// Class
if (p[1] < 3) continue;
session[s].classlen = p[1] - 2;
if (session[s].classlen > MAXCLASS)
session[s].classlen = MAXCLASS;
memcpy(session[s].class, p + 2, session[s].classlen);
}
}
}
else if (r_code == AccessReject)