typo

[l2tpns.git] / ppp.c

diff --git a/ppp.c b/ppp.c
index 0ad3044..e3a2c74 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
 // L2TPNS PPP Stuff
 

-char const *cvs_id_ppp = "$Id: ppp.c,v 1.43 2005-01-25 04:38:49 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.48 2005-05-05 10:02:08 bodea Exp $";

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -28,8 +28,8 @@ static void initccp(tunnelidt t, sessionidt s);
 // Process PAP messages
 void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 {
 // Process PAP messages
 void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 {

-       char user[129];
-       char pass[129];
+       char user[MAXUSER];
+       char pass[MAXPASS];

        uint16_t hl;
 
        CSTAT(processpap);
        uint16_t hl;
 
        CSTAT(processpap);


@@ -39,6 +39,7 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        {
                LOG(1, s, t, "Short PAP %u bytes\n", l);
                STAT(tunnel_rx_errors);
        {
                LOG(1, s, t, "Short PAP %u bytes\n", l);
                STAT(tunnel_rx_errors);

+               sessionshutdown(s, "Short PAP packet.", 3, 0);

                return ;
        }
 
                return ;
        }
 


@@ -46,6 +47,7 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        {
                LOG(1, s, t, "Length mismatch PAP %u/%u\n", hl, l);
                STAT(tunnel_rx_errors);
        {
                LOG(1, s, t, "Length mismatch PAP %u/%u\n", hl, l);
                STAT(tunnel_rx_errors);

+               sessionshutdown(s, "PAP length mismatch.", 3, 0);

                return ;
        }
        l = hl;
                return ;
        }
        l = hl;


@@ -54,22 +56,28 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        {
                LOG(1, s, t, "Unexpected PAP code %d\n", *p);
                STAT(tunnel_rx_errors);
        {
                LOG(1, s, t, "Unexpected PAP code %d\n", *p);
                STAT(tunnel_rx_errors);

+               sessionshutdown(s, "Unexpected PAP code.", 3, 0);

                return ;
        }
 
        {
                uint8_t *b = p;
                b += 4;
                return ;
        }
 
        {
                uint8_t *b = p;
                b += 4;

+               user[0] = pass[0] = 0;

                if (*b && *b < sizeof(user))
                if (*b && *b < sizeof(user))

+               {

                        memcpy(user, b + 1, *b);
                        memcpy(user, b + 1, *b);

-               user[*b] = 0;
-               b += 1 + *b;
-               if (*b && *b < sizeof(pass))
-                       memcpy(pass, b + 1, *b);
-               pass[*b] = 0;
+                       user[*b] = 0;
+                       b += 1 + *b;
+                       if (*b && *b < sizeof(pass))
+                       {
+                               memcpy(pass, b + 1, *b);
+                               pass[*b] = 0;
+                       }
+               }

                LOG(3, s, t, "PAP login %s/%s\n", user, pass);
        }
                LOG(3, s, t, "PAP login %s/%s\n", user, pass);
        }

-       if (session[s].ip || !session[s].radius)
+       if (session[s].ip || !sess_local[s].radius)

        {
                // respond now, either no RADIUS available or already authenticated
                uint8_t b[MAXCONTROL];
        {
                // respond now, either no RADIUS available or already authenticated
                uint8_t b[MAXCONTROL];


@@ -97,11 +105,12 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                }
                LOG(3, s, t, "Fallback response to PAP (%s)\n", (session[s].ip) ? "ACK" : "NAK");
                tunnelsend(b, 5 + (p - b), t); // send it
                }
                LOG(3, s, t, "Fallback response to PAP (%s)\n", (session[s].ip) ? "ACK" : "NAK");
                tunnelsend(b, 5 + (p - b), t); // send it

+               sessionshutdown(s, "PAP authentication failed.", 3, 0);

        }
        else
        {
                // set up RADIUS request
        }
        else
        {
                // set up RADIUS request

-               uint16_t r = session[s].radius;
+               uint16_t r = sess_local[s].radius;

 
                // Run PRE_AUTH plugins
                struct param_pre_auth packet = { &tunnel[t], &session[s], strdup(user), strdup(pass), PPPPAP, 1 };
 
                // Run PRE_AUTH plugins
                struct param_pre_auth packet = { &tunnel[t], &session[s], strdup(user), strdup(pass), PPPPAP, 1 };


@@ -135,7 +144,7 @@ void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        CSTAT(processchap);
 
        LOG_HEX(5, "CHAP", p, l);
        CSTAT(processchap);
 
        LOG_HEX(5, "CHAP", p, l);

-       r = session[s].radius;
+       r = sess_local[s].radius;

        if (!r)
        {
                LOG(1, s, t, "Unexpected CHAP message\n");
        if (!r)
        {
                LOG(1, s, t, "Unexpected CHAP message\n");


@@ -483,11 +492,11 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                q = makeppp(b, sizeof(b),  p, l, t, s, PPPLCP);
                if (!q) return;
                tunnelsend(b, l + (q - b), t); // send it
                q = makeppp(b, sizeof(b),  p, l, t, s, PPPLCP);
                if (!q) return;
                tunnelsend(b, l + (q - b), t); // send it

-               sessionshutdown(s, "Remote end closed connection.");
+               sessionshutdown(s, "Remote end closed connection.", 3, 0);

        }
        else if (*p == TerminateAck)
        {
        }
        else if (*p == TerminateAck)
        {

-               sessionshutdown(s, "Connection closed.");
+               sessionshutdown(s, "Connection closed.", 3, 0);

        }
        else if (*p == ProtocolRej)
        {
        }
        else if (*p == ProtocolRej)
        {


@@ -583,7 +592,7 @@ void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        if (*p == ConfigAck)
        {
                // happy with our IPCP
        if (*p == ConfigAck)
        {
                // happy with our IPCP

-               uint16_t r = session[s].radius;
+               uint16_t r = sess_local[s].radius;

                if ((!r || radius[r].state == RADIUSIPCP) && !session[s].walled_garden)
                {
                        if (!r)
                if ((!r || radius[r].state == RADIUSIPCP) && !session[s].walled_garden)
                {
                        if (!r)


@@ -1071,11 +1080,11 @@ void processccp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        tunnelsend(b, l + (q - b), t); // send it
 }
 
        tunnelsend(b, l + (q - b), t); // send it
 }
 

-// send a CHAP PP packet
+// send a CHAP challenge

 void sendchap(tunnelidt t, sessionidt s)
 {
        uint8_t b[MAXCONTROL];
 void sendchap(tunnelidt t, sessionidt s)
 {
        uint8_t b[MAXCONTROL];

-       uint16_t r = session[s].radius;
+       uint16_t r = sess_local[s].radius;

        uint8_t *q;
 
        CSTAT(sendchap);
        uint8_t *q;
 
        CSTAT(sendchap);


@@ -1100,7 +1109,7 @@ void sendchap(tunnelidt t, sessionidt s)
        radius[r].retry = backoff(radius[r].try++);
        if (radius[r].try > 5)
        {
        radius[r].retry = backoff(radius[r].try++);
        if (radius[r].try > 5)
        {

-               sessionshutdown(s, "Timeout CHAP");
+               sessionshutdown(s, "CHAP timeout.", 3, 0);

                STAT(tunnel_tx_errors);
                return ;
        }
                STAT(tunnel_tx_errors);
                return ;
        }


@@ -1109,7 +1118,7 @@ void sendchap(tunnelidt t, sessionidt s)
 
        *q = 1;                                 // challenge
        q[1] = radius[r].id;                    // ID
 
        *q = 1;                                 // challenge
        q[1] = radius[r].id;                    // ID

-       q[4] = 16;                              // length
+       q[4] = 16;                              // value size (size of challenge)

        memcpy(q + 5, radius[r].auth, 16);      // challenge
        strcpy(q + 21, hostname);               // our name
        *(uint16_t *) (q + 2) = htons(strlen(hostname) + 21); // length
        memcpy(q + 5, radius[r].auth, 16);      // challenge
        strcpy(q + 21, hostname);               // our name
        *(uint16_t *) (q + 2) = htons(strlen(hostname) + 21); // length