remove dead session fields

[l2tpns.git] / radius.c

diff --git a/radius.c b/radius.c
index 6a206ea..0059ed7 100644 (file)
--- a/radius.c
+++ b/radius.c
@@ -1,6 +1,6 @@
 // L2TPNS Radius Stuff
 
 // L2TPNS Radius Stuff
 

-char const *cvs_id_radius = "$Id: radius.c,v 1.24 2005-02-14 06:58:39 bodea Exp $";
+char const *cvs_id_radius = "$Id: radius.c,v 1.26 2005-04-18 05:07:20 bodea Exp $";

 
 #include <time.h>
 #include <stdio.h>
 
 #include <time.h>
 #include <stdio.h>


@@ -140,7 +140,7 @@ void radiussend(uint16_t r, uint8_t state)
                if (s)
                {
                        if (state == RADIUSAUTH)
                if (s)
                {
                        if (state == RADIUSAUTH)

-                               sessionshutdown(s, "RADIUS timeout");
+                               sessionshutdown(s, "RADIUS timeout", 3, 0);

                        else
                        {
                                LOG(1, s, session[s].tunnel, "RADIUS timeout, but in state %s so don't timeout session\n",
                        else
                        {
                                LOG(1, s, session[s].tunnel, "RADIUS timeout, but in state %s so don't timeout session\n",


@@ -239,7 +239,7 @@ void radiussend(uint16_t r, uint8_t state)
                {
                        *p = 44;           // session ID
                        p[1] = 18;
                {
                        *p = 44;           // session ID
                        p[1] = 18;

-                       sprintf(p + 2, "%08X%08X", session[s].id, session[s].opened);
+                       sprintf(p + 2, "%08X%08X", session[s].unique_id, session[s].opened);

                        p += p[1];
                        if (state == RADIUSSTOP)
                        {                // stop
                        p += p[1];
                        if (state == RADIUSSTOP)
                        {                // stop


@@ -581,7 +581,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                                // Vendor-Specific Attribute
                                                int vendor = ntohl(*(int *)(p + 2));
                                                char attrib = *(p + 6);
                                                // Vendor-Specific Attribute
                                                int vendor = ntohl(*(int *)(p + 2));
                                                char attrib = *(p + 6);

-                                               char attrib_length = *(p + 7) - 2;
+                                               int attrib_length = *(p + 7) - 2;

                                                char *avpair, *value, *key, *newp;
 
                                                LOG(3, s, session[s].tunnel, "   Radius reply contains Vendor-Specific.  Vendor=%d Attrib=%d Length=%d\n", vendor, attrib, attrib_length);
                                                char *avpair, *value, *key, *newp;
 
                                                LOG(3, s, session[s].tunnel, "   Radius reply contains Vendor-Specific.  Vendor=%d Attrib=%d Length=%d\n", vendor, attrib, attrib_length);