projects / l2tpns.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
merge
[l2tpns.git] / ppp.c
diff --git a/ppp.c b/ppp.c
index deab284..c2c3379 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -1,5 +1,6 @@
 // L2TPNS PPP Stuff
 // L2TPNS PPP Stuff
-// $Id: ppp.c,v 1.5 2004-06-23 03:52:24 fred_nerk Exp $
+
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.17 2004-10-29 04:01:53 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -16,25 +17,27 @@
 extern tunnelt *tunnel;
 extern sessiont *session;
 extern radiust *radius;
 extern tunnelt *tunnel;
 extern sessiont *session;
 extern radiust *radius;
-extern int tapfd;
+extern int tunfd;
 extern char hostname[];
 extern u32 eth_tx;
 extern time_t time_now;
 extern struct configt *config;
 
 extern char hostname[];
 extern u32 eth_tx;
 extern time_t time_now;
 extern struct configt *config;
 
+void sendccp(tunnelidt t, sessionidt s);
+
 // Process PAP messages
 void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l)
 {
        char user[129];
        char pass[129];
 
 // Process PAP messages
 void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l)
 {
        char user[129];
        char pass[129];
 
-#ifdef STAT_CALLS
-       STAT(call_processpap);
-#endif
+
+       CSTAT(call_processpap);
+
        log_hex(5, "PAP", p, l);
        if (l < 4)
        {
        log_hex(5, "PAP", p, l);
        if (l < 4)
        {
-               log(1, 0, s, t, "Short PAP %u bytes", l);
+               log(1, 0, s, t, "Short PAP %u bytes\n", l);
                STAT(tunnel_rx_errors);
                return ;
        }
                STAT(tunnel_rx_errors);
                return ;
        }
@@ -73,25 +76,27 @@ void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l)
                        return;
                }
                if (session[s].ip)
                        return;
                }
                if (session[s].ip)
-                       *p = 2;              // ACK
+                       *p = 2;                 // ACK
                else
                else
-                       *p = 3;              // cant authorise
+                       *p = 3;                 // cant authorise
                p[1] = id;
                p[1] = id;
-               *(u16 *) (p + 2) = htons(5); // length
-               p[4] = 0;               // no message
+               *(u16 *) (p + 2) = htons(5);    // length
+               p[4] = 0;                       // no message
                if (session[s].ip)
                {
                if (session[s].ip)
                {
-                   log(3, session[s].ip, s, t, "%d Already an IP allocated: %s (%d)\n", getpid(), inet_toa(htonl(session[s].ip)), session[s].ip_pool_index);
+                       log(3, session[s].ip, s, t, "%d Already an IP allocated: %s (%d)\n", getpid(), inet_toa(htonl(session[s].ip)), session[s].ip_pool_index);
+                       session[s].flags &= ~SF_IPCP_ACKED;
                }
                else
                {
                }
                else
                {
-                   log(1, 0, s, t, "No radius session available to authenticate session...\n");
+                       log(1, 0, s, t, "No radius session available to authenticate session...\n");
                }
                log(3, 0, s, t, "Fallback response to PAP (%s)\n", (session[s].ip) ? "ACK" : "NAK");
                tunnelsend(b, 5 + (p - b), t); // send it
        }
        else
                }
                log(3, 0, s, t, "Fallback response to PAP (%s)\n", (session[s].ip) ? "ACK" : "NAK");
                tunnelsend(b, 5 + (p - b), t); // send it
        }
        else
-       {                          // set up RADIUS request
+       {
+               // set up RADIUS request
                u16 r = session[s].radius;
 
                // Run PRE_AUTH plugins
                u16 r = session[s].radius;
 
                // Run PRE_AUTH plugins
@@ -123,9 +128,9 @@ void processchap(tunnelidt t, sessionidt s, u8 * p, u16 l)
        u16 r;
        u16 len;
 
        u16 r;
        u16 len;
 
-#ifdef STAT_CALLS
-       STAT(call_processchap);
-#endif
+
+       CSTAT(call_processchap);
+
        log_hex(5, "CHAP", p, l);
        r = session[s].radius;
        if (!r)
        log_hex(5, "CHAP", p, l);
        r = session[s].radius;
        if (!r)
@@ -212,6 +217,7 @@ char *ppp_lcp_types[] = {
        "EchoReq",
        "EchoReply",
        "DiscardRequest",
        "EchoReq",
        "EchoReply",
        "DiscardRequest",
+       "IdentRequest",
 };
 
 void dumplcp(u8 *p, int l)
 };
 
 void dumplcp(u8 *p, int l)
@@ -229,9 +235,9 @@ void dumplcp(u8 *p, int l)
        {
                int type = o[0];
                int length = o[1];
        {
                int type = o[0];
                int length = o[1];
-               if (length == 0)
+               if (length < 2)
                {
                {
-                       log(4, 0, 0, 0, "       Option length is 0...\n");
+                       log(4, 0, 0, 0, "       Option length is %d...\n", length);
                        break;
                }
                if (type == 0)
                        break;
                }
                if (type == 0)
@@ -244,13 +250,22 @@ void dumplcp(u8 *p, int l)
                switch (type)
                {
                        case 1: // Maximum-Receive-Unit
                switch (type)
                {
                        case 1: // Maximum-Receive-Unit
-                               log(4, 0, 0, 0, "    %s %d\n", lcp_types[type], ntohs(*(u16 *)(o + 2)));
+                               if (length == 4)
+                                       log(4, 0, 0, 0, "    %s %d\n", lcp_types[type], ntohs(*(u16 *)(o + 2)));
+                               else
+                                       log(4, 0, 0, 0, "    %s odd length %d\n", lcp_types[type], length);
                                break;
                        case 3: // Authentication-Protocol
                                {
                                break;
                        case 3: // Authentication-Protocol
                                {
-                                       int proto = ntohs(*(u16 *)(o + 2));
-                                       log(4, 0, 0, 0, "    %s %s\n", lcp_types[type],
-                                                       proto == 0xC223 ? "CHAP" : "PAP");
+                                       if (length == 4)
+                                       {
+                                               int proto = ntohs(*(u16 *)(o + 2));
+                                               log(4, 0, 0, 0, "   %s 0x%x (%s)\n", lcp_types[type], proto,
+                                                       proto == 0xC223 ? "CHAP" :
+                                                       proto == 0xC023 ? "PAP"  : "UNKNOWN");
+                                       }
+                                       else
+                                               log(4, 0, 0, 0, "   %s odd length %d\n", lcp_types[type], length);
                                        break;
                                }
                        case 4: // Quality-Protocol
                                        break;
                                }
                        case 4: // Quality-Protocol
@@ -261,20 +276,23 @@ void dumplcp(u8 *p, int l)
                                }
                        case 5: // Magic-Number
                                {
                                }
                        case 5: // Magic-Number
                                {
-                                       u32 magicno = ntohl(*(u32 *)(o + 2));
-                                       log(4, 0, 0, 0, "    %s %x\n", lcp_types[type], magicno);
+                                       if (length == 6)
+                                       {
+                                               u32 magicno = ntohl(*(u32 *)(o + 2));
+                                               log(4, 0, 0, 0, "    %s %x\n", lcp_types[type], magicno);
+                                       }
+                                       else
+                                               log(4, 0, 0, 0, "   %s odd length %d\n", lcp_types[type], length);
                                        break;
                                }
                        case 7: // Protocol-Field-Compression
                                {
                                        break;
                                }
                        case 7: // Protocol-Field-Compression
                                {
-                                       u32 pfc = ntohl(*(u32 *)(o + 2));
-                                       log(4, 0, 0, 0, "    %s %x\n", lcp_types[type], pfc);
+                                       log(4, 0, 0, 0, "    %s\n", lcp_types[type]);
                                        break;
                                }
                        case 8: // Address-And-Control-Field-Compression
                                {
                                        break;
                                }
                        case 8: // Address-And-Control-Field-Compression
                                {
-                                       u32 afc = ntohl(*(u32 *)(o + 2));
-                                       log(4, 0, 0, 0, "    %s %x\n", lcp_types[type], afc);
+                                       log(4, 0, 0, 0, "    %s\n", lcp_types[type]);
                                        break;
                                }
                        default:
                                        break;
                                }
                        default:
@@ -291,23 +309,26 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
 {
        u8 b[MAXCONTROL];
        u8 *q = NULL;
 {
        u8 b[MAXCONTROL];
        u8 *q = NULL;
+       u32  magicno = 0;
+
+
+       CSTAT(call_processlcp);
 
 
-#ifdef STAT_CALLS
-       STAT(call_processlcp);
-#endif
        log_hex(5, "LCP", p, l);
        if (l < 4)
        {
        log_hex(5, "LCP", p, l);
        if (l < 4)
        {
-               log(1, session[s].ip, s, t, "Short LCP %d bytes", l);
+               log(1, session[s].ip, s, t, "Short LCP %d bytes\n", l);
                STAT(tunnel_rx_errors);
                return ;
        }
        if (*p == ConfigAck)
        {
                log(3, session[s].ip, s, t, "LCP: Discarding ConfigAck\n");
                STAT(tunnel_rx_errors);
                return ;
        }
        if (*p == ConfigAck)
        {
                log(3, session[s].ip, s, t, "LCP: Discarding ConfigAck\n");
+               session[s].flags |= SESSIONLCPACK;
        }
        else if (*p == ConfigReq)
        {
        }
        else if (*p == ConfigReq)
        {
+               l =  ntohs(*(u16 *)(p + 2));
                signed int x = l - 4;
                u8 *o = (p + 4);
 
                signed int x = l - 4;
                u8 *o = (p + 4);
 
@@ -324,6 +345,10 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
                                case 1: // Maximum-Receive-Unit
                                        session[s].mru = ntohs(*(u16 *)(o + 2));
                                        break;
                                case 1: // Maximum-Receive-Unit
                                        session[s].mru = ntohs(*(u16 *)(o + 2));
                                        break;
+                               case 2: // asyncmap
+                                       log_hex(2, "PPP LCP Packet", p, l);
+                                       log(2, 0, 0, 0, "PPP LCP Packet type %d (%s len %d)\n", *p, ppp_lcp_types[(int)*p], ntohs( ((u16 *) p)[1]) );
+                                       break;
                                case 3: // Authentication-Protocol
                                        {
                                                int proto = ntohs(*(u16 *)(o + 2));
                                case 3: // Authentication-Protocol
                                        {
                                                int proto = ntohs(*(u16 *)(o + 2));
@@ -348,27 +373,36 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
                                        }
                                case 5: // Magic-Number
                                        {
                                        }
                                case 5: // Magic-Number
                                        {
-//                                             u32 magicno = ntohl(*(u32 *)(o + 2));
+                                               magicno = ntohl(*(u32 *)(o + 2));
                                                break;
                                        }
                                case 4: // Quality-Protocol
                                                break;
                                        }
                                case 4: // Quality-Protocol
-                                       {
-//                                             u32 qp = ntohl(*(u32 *)(o + 2));
-                                               break;
-                                       }
                                case 7: // Protocol-Field-Compression
                                case 7: // Protocol-Field-Compression
-                                       {
-//                                             u32 pfc = ntohl(*(u32 *)(o + 2));
-                                               break;
-                                       }
                                case 8: // Address-And-Control-Field-Compression
                                case 8: // Address-And-Control-Field-Compression
-                                       {
-//                                             u32 afc = ntohl(*(u32 *)(o + 2));
                                                break;
                                                break;
+                               case 13: // CallBack option for LCP extention of win2000/routers L2TP client
+                               case 17:
+                               case 18:
+                               {
+                                       // Reject LCP CallBack
+                                       log(2, session[s].ip, s, t, "    PPP LCP Option type %d, len=%d\n", type, length);
+                                       memcpy(p + 4, o, length);
+                                       *(u16 *)(p + 2) = htons(length + 4);
+                                       *p = ConfigRej;
+                                       q = makeppp(b,sizeof(b), p, length + 4, t, s, PPPLCP);
+                                       tunnelsend(b, 12 + length + 4, t);
+                                       return;
                                        }
                                        }
+
                                default:
                                default:
+                                       // Reject Unknown LCP Option to stop to send it again
                                        log(2, session[s].ip, s, t, "    Unknown PPP LCP Option type %d\n", type);
                                        log(2, session[s].ip, s, t, "    Unknown PPP LCP Option type %d\n", type);
-                                       break;
+                                       memcpy(p + 4, o, length);
+                                       *(u16 *)(p + 2) = htons(length + 4);
+                                       *p = ConfigRej;
+                                       q = makeppp(b,sizeof(b), p, length + 4, t, s, PPPLCP);
+                                       tunnelsend(b, 12 + length + 4, t);
+                                       return;
                        }
                        x -= length;
                        o += length;
                        }
                        x -= length;
                        o += length;
@@ -378,8 +412,11 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
                {
                        // Send back a ConfigAck
                        log(3, session[s].ip, s, t, "ConfigReq accepted, sending as Ack\n");
                {
                        // Send back a ConfigAck
                        log(3, session[s].ip, s, t, "ConfigReq accepted, sending as Ack\n");
+                       // for win2k L2TP clients and LCP renegotiation of alive session
+                       if (magicno || l == 4 || (session[s].mru && l == 8)) initlcp(t, s);
                        q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
                        q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
-                       if (!q) {
+                       if (!q)
+                       {
                                log(3, session[s].ip, s, t, " failed to create packet.\n");
                                return;
                        }
                                log(3, session[s].ip, s, t, " failed to create packet.\n");
                                return;
                        }
@@ -391,15 +428,10 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
                        // Already built a ConfigNak... send it
                        log(3, session[s].ip, s, t, "Sending ConfigNak\n");
                        tunnelsend(b, l + (q - b), t);
                        // Already built a ConfigNak... send it
                        log(3, session[s].ip, s, t, "Sending ConfigNak\n");
                        tunnelsend(b, l + (q - b), t);
-
-                       log(3, session[s].ip, s, t, "Sending ConfigReq, requesting PAP login\n");
-                       q = makeppp(b, sizeof(b), NULL, 0, t, s, PPPLCP);
-                       *q++ = ConfigReq;
-                       *(u8 *)(q++) = 3;
-                       *(u8 *)(q++) = 4;
-                       *(u16 *)(q += 2) = htons(0xC023);
-                       tunnelsend(b, l + (q - b), t);
                }
                }
+
+               if (!(session[s].flags & SESSIONLCPACK))
+                       initlcp(t, s);
        }
        else if (*p == ConfigNak)
        {
        }
        else if (*p == ConfigNak)
        {
@@ -409,7 +441,7 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
        }
        else if (*p == TerminateReq)
        {
        }
        else if (*p == TerminateReq)
        {
-               *p = TerminateAck;     // close
+               *p = TerminateAck;      // close
                q = makeppp(b, sizeof(b),  p, l, t, s, PPPLCP);
                if (!q) {
                        log(3, session[s].ip, s, t, "Failed to create PPP packet in processlcp.\n");
                q = makeppp(b, sizeof(b),  p, l, t, s, PPPLCP);
                if (!q) {
                        log(3, session[s].ip, s, t, "Failed to create PPP packet in processlcp.\n");
@@ -419,13 +451,13 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
                sessionshutdown(s, "Remote end closed connection.");
                tunnelsend(b, l + (q - b), t); // send it
        }
                sessionshutdown(s, "Remote end closed connection.");
                tunnelsend(b, l + (q - b), t); // send it
        }
-       else if (*p == TerminateReq)
+       else if (*p == TerminateAck)
        {
        {
-               sessionshutdown(s, "Remote end closed connection.");
+               sessionshutdown(s, "Connection closed.");
        }
        else if (*p == EchoReq)
        {
        }
        else if (*p == EchoReq)
        {
-               *p = EchoReply;      // reply
+               *p = EchoReply;         // reply
                *(u32 *) (p + 4) = htonl(session[s].magic); // our magic number
                q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
                if (!q) {
                *(u32 *) (p + 4) = htonl(session[s].magic); // our magic number
                q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
                if (!q) {
@@ -439,6 +471,23 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
        {
                // Ignore it, last_packet time is set earlier than this.
        }
        {
                // Ignore it, last_packet time is set earlier than this.
        }
+       else if (*p == IdentRequest)
+       {
+               *p = CodeRej;
+               if (l > MAXCONTROL)
+               {
+                       log(1, 0, s, t, "Truncated Ident Packet (length=%d) to 1400 bytes\n", l);
+                       l = 1400;
+               }
+               q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
+               if (!q)
+               {
+                       log(3, session[s].ip, s, t, "Failed to create IdentRej.\n");
+                       return;
+               }
+               log_hex(5, "LCPIdentRej", q, l + 4);
+               tunnelsend(b, 12 + 4 + l, t);
+       }
        else
        {
                log(1, session[s].ip, s, t, "Unexpected LCP code %d\n", *p);
        else
        {
                log(1, session[s].ip, s, t, "Unexpected LCP code %d\n", *p);
@@ -450,20 +499,22 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
 // Process IPCP messages
 void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
 {
 // Process IPCP messages
 void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
 {
-#ifdef STAT_CALLS
-       STAT(call_processipcp);
-#endif
+
+       CSTAT(call_processipcp);
+
        log_hex(5, "IPCP", p, l);
        if (l < 5)
        {
        log_hex(5, "IPCP", p, l);
        if (l < 5)
        {
-               log(1, 0, s, t, "Short IPCP %d bytes", l);
+               log(1, 0, s, t, "Short IPCP %d bytes\n", l);
                STAT(tunnel_rx_errors);
                return ;
        }
        if (*p == ConfigAck)
                STAT(tunnel_rx_errors);
                return ;
        }
        if (*p == ConfigAck)
-       {                          // happy with our IPCP
+       {
+               // happy with our IPCP
                u16 r = session[s].radius;
                u16 r = session[s].radius;
-               if ((!r || radius[r].state == RADIUSIPCP) && !session[s].walled_garden) {
+               if ((!r || radius[r].state == RADIUSIPCP) && !session[s].walled_garden)
+               {
                        if (!r)
                                r = radiusnew(s);
                        if (r)
                        if (!r)
                                r = radiusnew(s);
                        if (r)
@@ -471,7 +522,8 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
                }
                session[s].flags |= SF_IPCP_ACKED;
 
                }
                session[s].flags |= SF_IPCP_ACKED;
 
-               return ;                 // done
+               log(3, session[s].ip, s, t, "IPCP Acked, session is now active\n");
+               return;
        }
        if (*p != ConfigReq)
        {
        }
        if (*p != ConfigReq)
        {
@@ -479,6 +531,7 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
                STAT(tunnel_rx_errors);
                return ;
        }
                STAT(tunnel_rx_errors);
                return ;
        }
+       log(4, session[s].ip, s, t, "IPCP ConfigReq received\n");
        if (ntohs(*(u16 *) (p + 2)) > l)
        {
                log(1, 0, s, t, "Length mismatch IPCP %d/%d\n", ntohs(*(u16 *) (p + 2)), l);
        if (ntohs(*(u16 *) (p + 2)) > l)
        {
                log(1, 0, s, t, "Length mismatch IPCP %d/%d\n", ntohs(*(u16 *) (p + 2)), l);
@@ -488,7 +541,7 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
        if (!session[s].ip)
        {
                log(3, 0, s, t, "Waiting on radius reply\n");
        if (!session[s].ip)
        {
                log(3, 0, s, t, "Waiting on radius reply\n");
-               return ;                   // have to wait on RADIUS reply
+               return;                 // have to wait on RADIUS reply
        }
        // form a config reply quoting the IP in the session
        {
        }
        // form a config reply quoting the IP in the session
        {
@@ -496,6 +549,7 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
                u8 *i,
                *q;
 
                u8 *i,
                *q;
 
+               l = ntohs(*(u16 *) (p + 2)); // We must use length from IPCP len field
                q = p + 4;
                i = p + l;
                while (q < i && q[1])
                q = p + 4;
                i = p + l;
                while (q < i && q[1])
@@ -505,12 +559,13 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
                        q += q[1];
                }
                if (q < i)
                        q += q[1];
                }
                if (q < i)
-               {                       // reject
+               {
+                       // reject
                        u16 n = 4;
                        i = p + l;
                        u16 n = 4;
                        i = p + l;
-                       q = makeppp(b, sizeof(b), p, l, t, s, PPPIPCP);
-                       if (!q) {
-                               log(2, 0, s, t, "Failed to send IPCP.\n");
+                       if (!(q = makeppp(b, sizeof(b), p, l, t, s, PPPIPCP)))
+                       {
+                               log(2, 0, s, t, "Failed to send IPCP ConfigRej\n");
                                return;
                        }
                        *q = ConfigRej;
                                return;
                        }
                        *q = ConfigRej;
@@ -526,30 +581,32 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
                                p += p[1];
                        }
                        *(u16 *) (q + 2) = htons(n);
                                p += p[1];
                        }
                        *(u16 *) (q + 2) = htons(n);
+                       log(4, session[s].ip, s, t, "Sending ConfigRej\n");
                        tunnelsend(b, n + (q - b), t); // send it
                }
                else
                {
                        tunnelsend(b, n + (q - b), t); // send it
                }
                else
                {
+                       log(4, session[s].ip, s, t, "Sending ConfigAck\n");
                        *p = ConfigAck;
                        *p = ConfigAck;
-                       i = findppp(p, 0x81); // Primary DNS address
-                       if (i)
+                       if ((i = findppp(p, 0x81))) // Primary DNS address
                        {
                                if (*(u32 *) (i + 2) != htonl(session[s].dns1))
                                {
                                        *(u32 *) (i + 2) = htonl(session[s].dns1);
                                        *p = ConfigNak;
                        {
                                if (*(u32 *) (i + 2) != htonl(session[s].dns1))
                                {
                                        *(u32 *) (i + 2) = htonl(session[s].dns1);
                                        *p = ConfigNak;
+                                       log(5, session[s].ip, s, t, "   DNS1 = %s\n", inet_toa(session[s].dns1));
                                }
                        }
                                }
                        }
-                       i = findppp(p, 0x83); // Secondary DNS address (TBA, is it)
-                       if (i)
+                       if ((i = findppp(p, 0x83))) // Secondary DNS address (TBA, is it)
                        {
                                if (*(u32 *) (i + 2) != htonl(session[s].dns2))
                                {
                                        *(u32 *) (i + 2) = htonl(session[s].dns2);
                                        *p = ConfigNak;
                        {
                                if (*(u32 *) (i + 2) != htonl(session[s].dns2))
                                {
                                        *(u32 *) (i + 2) = htonl(session[s].dns2);
                                        *p = ConfigNak;
+                                       log(5, session[s].ip, s, t, "   DNS2 = %s\n", inet_toa(session[s].dns1));
                                }
                        }
                                }
                        }
-                       i = findppp(p, 3);   // IP address
+                       i = findppp(p, 3);              // IP address
                        if (!i || i[1] != 6)
                        {
                                log(1, 0, s, t, "No IP in IPCP request\n");
                        if (!i || i[1] != 6)
                        {
                                log(1, 0, s, t, "No IP in IPCP request\n");
@@ -560,9 +617,11 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
                        {
                                *(u32 *) (i + 2) = htonl(session[s].ip);
                                *p = ConfigNak;
                        {
                                *(u32 *) (i + 2) = htonl(session[s].ip);
                                *p = ConfigNak;
+                               log(4, session[s].ip, s, t, " No, a ConfigNak, client is requesting IP - sending %s\n",
+                                               inet_toa(htonl(session[s].ip)));
                        }
                        }
-                       q = makeppp(b, sizeof(b), p, l, t, s, PPPIPCP);
-                       if (!q) {
+                       if (!(q = makeppp(b, sizeof(b), p, l, t, s, PPPIPCP)))
+                       {
                                log(2, 0, s, t, " Failed to send IPCP packet.\n");
                                return;
                        }
                                log(2, 0, s, t, " Failed to send IPCP packet.\n");
                                return;
                        }
@@ -579,9 +638,8 @@ void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l)
 {
        ipt ip;
 
 {
        ipt ip;
 
-#ifdef STAT_CALLS
-       STAT(call_processipin);
-#endif
+       CSTAT(call_processipin);
+
        log_hex(5, "IP", p, l);
 
        ip = ntohl(*(u32 *)(p + 12));
        log_hex(5, "IP", p, l);
 
        ip = ntohl(*(u32 *)(p + 12));
@@ -619,11 +677,11 @@ void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l)
 
        if (session[s].snoop_ip && session[s].snoop_port)
        {
 
        if (session[s].snoop_ip && session[s].snoop_port)
        {
-               // Snooping this session, send it to ASIO
+               // Snooping this session
                snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port);
        }
                snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port);
        }
-       STAT(tap_tx_packets);
-       INC_STAT(tap_tx_bytes, l);
+       STAT(tun_tx_packets);
+       INC_STAT(tun_tx_bytes, l);
 
        if (session[s].tbf_in && config->cluster_iam_master) { // Are we throttled and a master?? actually handle the throttled packets.
                tbf_queue_packet(session[s].tbf_in, p, l);
 
        if (session[s].tbf_in && config->cluster_iam_master) { // Are we throttled and a master?? actually handle the throttled packets.
                tbf_queue_packet(session[s].tbf_in, p, l);
@@ -633,9 +691,9 @@ void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l)
        // send to ethernet
        if (tun_write(p, l) < 0)
        {
        // send to ethernet
        if (tun_write(p, l) < 0)
        {
-               STAT(tap_tx_errors);
-               log(0, 0, s, t, "Error writing %d bytes to TAP device: %s (tapfd=%d, p=%p)\n",
-                       l, strerror(errno), tapfd, p);
+               STAT(tun_tx_errors);
+               log(0, 0, s, t, "Error writing %d bytes to TUN device: %s (tunfd=%d, p=%p)\n",
+                       l, strerror(errno), tunfd, p);
        }
 
 }
        }
 
 }
@@ -647,11 +705,11 @@ void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l)
 void send_ipin(sessionidt s, u8 *buf, int len)
 {
        log_hex(5, "IP in throttled", buf, len);
 void send_ipin(sessionidt s, u8 *buf, int len)
 {
        log_hex(5, "IP in throttled", buf, len);
-       if (write(tapfd, buf, len) < 0)
+       if (write(tunfd, buf, len) < 0)
        {
        {
-               STAT(tap_tx_errors);
-               log(0, 0, 0, 0, "Error writing %d bytes to TAP device: %s (tapfd=%d, p=%p)\n",
-                       len, strerror(errno), tapfd, buf);
+               STAT(tun_tx_errors);
+               log(0, 0, 0, 0, "Error writing %d bytes to TUN device: %s (tunfd=%d, p=%p)\n",
+                       len, strerror(errno), tunfd, buf);
        }
 
        // Increment packet counters
        }
 
        // Increment packet counters
@@ -667,13 +725,13 @@ void send_ipin(sessionidt s, u8 *buf, int len)
 // Process LCP messages
 void processccp(tunnelidt t, sessionidt s, u8 * p, u16 l)
 {
 // Process LCP messages
 void processccp(tunnelidt t, sessionidt s, u8 * p, u16 l)
 {
-#ifdef STAT_CALLS
-       STAT(call_processccp);
-#endif
+
+       CSTAT(call_processccp);
+
        log_hex(5, "CCP", p, l);
        if (l < 2 || (*p != ConfigReq && *p != TerminateReq))
        {
        log_hex(5, "CCP", p, l);
        if (l < 2 || (*p != ConfigReq && *p != TerminateReq))
        {
-               log(1, 0, s, t, "Unexpecetd CCP request code %d\n", *p);
+               log(1, 0, s, t, "Unexpected CCP request code %d\n", *p);
                STAT(tunnel_rx_errors);
                return ;
        }
                STAT(tunnel_rx_errors);
                return ;
        }
@@ -689,13 +747,14 @@ void processccp(tunnelidt t, sessionidt s, u8 * p, u16 l)
                        }
                        else
                        {
                        }
                        else
                        {
-                               *p = ConfigRej;        // reject
+                               *p = ConfigRej;         // reject
+                               sendccp(t, s);
                        }
                }
                else
                        }
                }
                else
-                       *p = TerminateAck;     // close
-               q = makeppp(b, sizeof(b), p, l, t, s, PPPCCP);
-               if (!q) {
+                       *p = TerminateAck;              // close
+               if (!(q = makeppp(b, sizeof(b), p, l, t, s, PPPCCP)))
+               {
                        log(1,0,0,0, "Failed to send CCP packet.\n");   
                        return;
                }
                        log(1,0,0,0, "Failed to send CCP packet.\n");   
                        return;
                }
@@ -709,9 +768,9 @@ void sendchap(tunnelidt t, sessionidt s)
        u8 b[MAXCONTROL];
        u16 r = session[s].radius;
        u8 *q;
        u8 b[MAXCONTROL];
        u16 r = session[s].radius;
        u8 *q;
-#ifdef STAT_CALLS
-       STAT(call_sendchap);
-#endif
+
+       CSTAT(call_sendchap);
+
        if (!r)
        {
                log(1, 0, s, t, "No RADIUS to send challenge\n");
        if (!r)
        {
                log(1, 0, s, t, "No RADIUS to send challenge\n");
@@ -719,12 +778,13 @@ void sendchap(tunnelidt t, sessionidt s)
                return ;
        }
        log(1, 0, s, t, "Send CHAP challenge\n");
                return ;
        }
        log(1, 0, s, t, "Send CHAP challenge\n");
-       {                            // new challenge
+       {
+               // new challenge
                int n;
                for (n = 0; n < 15; n++)
                        radius[r].auth[n] = rand();
        }
                int n;
                for (n = 0; n < 15; n++)
                        radius[r].auth[n] = rand();
        }
-       radius[r].chap = 1;          // CHAP not PAP
+       radius[r].chap = 1;             // CHAP not PAP
        radius[r].id++;
        if (radius[r].state != RADIUSCHAP)
                radius[r].try = 0;
        radius[r].id++;
        if (radius[r].state != RADIUSCHAP)
                radius[r].try = 0;
@@ -741,11 +801,11 @@ void sendchap(tunnelidt t, sessionidt s)
                log(1, 0, s, t, "failed to send CHAP challenge.\n");
                return;
        }
                log(1, 0, s, t, "failed to send CHAP challenge.\n");
                return;
        }
-       *q = 1;                      // challenhe
-       q[1] = radius[r].id;         // ID
-       q[4] = 16;                   // length
-       memcpy(q + 5, radius[r].auth, 16); // challenge
-       strcpy(q + 21, hostname);    // our name
+       *q = 1;                                 // challenge
+       q[1] = radius[r].id;                    // ID
+       q[4] = 16;                              // length
+       memcpy(q + 5, radius[r].auth, 16);      // challenge
+       strcpy(q + 21, hostname);               // our name
        *(u16 *) (q + 2) = htons(strlen(hostname) + 21); // length
        tunnelsend(b, strlen(hostname) + 21 + (q - b), t); // send it
 }
        *(u16 *) (q + 2) = htons(strlen(hostname) + 21); // length
        tunnelsend(b, strlen(hostname) + 21 + (q - b), t); // send it
 }
@@ -755,7 +815,6 @@ void sendchap(tunnelidt t, sessionidt s)
 // returns start of PPP frame
 u8 *makeppp(u8 * b, int size, u8 * p, int l, tunnelidt t, sessionidt s, u16 mtype)
 {
 // returns start of PPP frame
 u8 *makeppp(u8 * b, int size, u8 * p, int l, tunnelidt t, sessionidt s, u16 mtype)
 {
-
        if (size < 12)
                return NULL;    // Need more space than this!!
 
        if (size < 12)
                return NULL;    // Need more space than this!!
 
@@ -763,7 +822,7 @@ u8 *makeppp(u8 * b, int size, u8 * p, int l, tunnelidt t, sessionidt s, u16 mtyp
        *(u16 *) (b + 2) = htons(tunnel[t].far); // tunnel
        *(u16 *) (b + 4) = htons(session[s].far); // session
        b += 6;
        *(u16 *) (b + 2) = htons(tunnel[t].far); // tunnel
        *(u16 *) (b + 4) = htons(session[s].far); // session
        b += 6;
-       if (mtype != PPPLCP && !(session[s].l2tp_flags & SESSIONACFC))
+       if (mtype == PPPLCP || !(session[s].l2tp_flags & SESSIONACFC))
        {
                *(u16 *) b = htons(0xFF03); // HDLC header
                b += 2;
        {
                *(u16 *) b = htons(0xFF03); // HDLC header
                b += 2;
@@ -796,7 +855,7 @@ u8 *findppp(u8 * b, u8 mtype)
        while (l)
        {
                if (l < b[1] || !b[1])
        while (l)
        {
                if (l < b[1] || !b[1])
-                       return 0;            // faulty
+                       return 0;               // faulty
                if (*b == mtype)
                        return b;
                l -= b[1];
                if (*b == mtype)
                        return b;
                l -= b[1];
@@ -818,10 +877,26 @@ void initlcp(tunnelidt t, sessionidt s)
        log(4, 0, s, t, "Sending LCP ConfigReq for PAP\n");
        *q = ConfigReq;
        *(u8 *)(q + 1) = (time_now % 255) + 1; // ID
        log(4, 0, s, t, "Sending LCP ConfigReq for PAP\n");
        *q = ConfigReq;
        *(u8 *)(q + 1) = (time_now % 255) + 1; // ID
-       *(u16 *)(q + 2) = htons(8); // Length
-       *(u8 *)(q + 4) = 3;
-       *(u8 *)(q + 5) = 4;
-       *(u16 *)(q + 6) = htons(0xC023); // PAP
-       tunnelsend(b, 12 + 8, t);
+       *(u16 *)(q + 2) = htons(14); // Length
+       *(u8 *)(q + 4) = 5;
+       *(u8 *)(q + 5) = 6;
+       *(u32 *)(q + 6) = htonl(session[s].magic);
+       *(u8 *)(q + 10) = 3;
+       *(u8 *)(q + 11) = 4;
+       *(u16 *)(q + 12) = htons(0xC023); // PAP
+       tunnelsend(b, 12 + 14, t);
+}
+
+// Send CCP reply
+void sendccp(tunnelidt t, sessionidt s)
+{
+       char *q, b[500] = {0};
+
+       q = makeppp(b, sizeof(b), NULL, 0, t, s, PPPCCP);
+       *q = ConfigReq;
+       *(u8 *)(q + 1) = (time_now % 255) + 1; // ID
+       *(u16 *)(q + 2) = htons(4); // Length
+       log_hex(5, "PPPCCP", q, 4);
+       tunnelsend(b, (q - b) + 4 , t);
 }
 
 }
 
for cloning use: "git clone git://git.sameswireless.fr/l2tpns.git" ; For add to your sources.list: "deb http://package.sameswifi.fr/ jessie main"