show session open time in "show session"/"show user" detailed output

[l2tpns.git] / ppp.c

diff --git a/ppp.c b/ppp.c
index 11b4124..fe9c7be 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.58 2005/05/10 09:57:50 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.61 2005/05/13 09:23:00 bodea Exp $";

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


@@ -150,7 +150,6 @@ void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        {
                LOG(1, s, t, "Unexpected CHAP message\n");
                STAT(tunnel_rx_errors);
        {
                LOG(1, s, t, "Unexpected CHAP message\n");
                STAT(tunnel_rx_errors);

-               sessionshutdown(s, "Unexpected CHAP message.", 3, 0);

                return;
        }
 
                return;
        }
 


@@ -550,7 +549,7 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        {
                int x = l - 4;
                uint8_t *o = (p + 4);
        {
                int x = l - 4;
                uint8_t *o = (p + 4);

-               int authtype = 0;
+               int authtype = -1;

 
                LOG(3, s, t, "LCP: ConfigNak (%d bytes)...\n", l);
                if (config->debug > 3) dumplcp(p, l);
 
                LOG(3, s, t, "LCP: ConfigNak (%d bytes)...\n", l);
                if (config->debug > 3) dumplcp(p, l);


@@ -569,7 +568,7 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                                        break;
 
                                case 3: // Authentication-Protocol
                                        break;
 
                                case 3: // Authentication-Protocol

-                                       if (authtype)
+                                       if (authtype > 0)

                                                break;
 
                                        {
                                                break;
 
                                        {


@@ -593,21 +592,23 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                                                }
                                        }
 
                                                }
                                        }
 

-                                       if (!authtype)
-                                       {
-                                               sessionshutdown(s, "Unsupported authentication.", 3, 0);
-                                               return;
-                                       }
-

                                        break;
 
                                default:
                                        LOG(2, s, t, "    Remote NAKed LCP type %u?\n", type);
                                        break;
                        }
                                        break;
 
                                default:
                                        LOG(2, s, t, "    Remote NAKed LCP type %u?\n", type);
                                        break;
                        }

+                       x -= length;
+                       o += length;

                }
 
                if (!authtype)
                }
 
                if (!authtype)

+               {
+                       sessionshutdown(s, "Unsupported authentication.", 3, 0);
+                       return;
+               }
+
+               if (authtype == -1)

                        authtype = config->radius_authprefer;
 
                sendlcp(t, s, authtype);
                        authtype = config->radius_authprefer;
 
                sendlcp(t, s, authtype);


@@ -1327,7 +1328,7 @@ void sendlcp(tunnelidt t, sessionidt s, int authtype)
                return;
 
        LOG(4, s, t, "Sending LCP ConfigReq for %s\n",
                return;
 
        LOG(4, s, t, "Sending LCP ConfigReq for %s\n",

-           config->radius_authprefer == AUTHCHAP ? "CHAP" : "PAP");
+           authtype == AUTHCHAP ? "CHAP" : "PAP");

 
        if (!session[s].mru)
                session[s].mru = DEFAULT_MRU;
 
        if (!session[s].mru)
                session[s].mru = DEFAULT_MRU;