merge in changes from 2.0 branch; fix byte counters in accounting records, add gigawords

[l2tpns.git] / ppp.c

diff --git a/ppp.c b/ppp.c
index 11b4124..0a0dd45 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // 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.62 2005/06/02 11:32:31 bodea Exp $";
 
 #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);
-               sessionshutdown(s, "Unexpected CHAP message.", 3, 0);
                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 authtype = 0;
+               int authtype = -1;
 
                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
-                                       if (authtype)
+                                       if (authtype > 0)
                                                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;
                        }
+                       x -= length;
+                       o += length;
                }
 
                if (!authtype)
+               {
+                       sessionshutdown(s, "Unsupported authentication.", 3, 0);
+                       return;
+               }
+
+               if (authtype == -1)
                        authtype = config->radius_authprefer;
 
                sendlcp(t, s, authtype);
@@ -1014,21 +1015,26 @@ void processipin(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                return;
        }
 
+       p += 4;
+       l -= 4;
+
        if (session[s].snoop_ip && session[s].snoop_port)
        {
                // Snooping this session
-               snoop_send_packet(p + 4, l - 4, session[s].snoop_ip, session[s].snoop_port);
+               snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port);
        }
 
-       session[s].cin += l - 4;
-       session[s].total_cin += l - 4;
-       sess_local[s].cin += l - 4;
-
+       increment_counter(&session[s].cin, &session[s].cin_wrap, l);
+       session[s].cin_delta += l;
        session[s].pin++;
-       eth_tx += l - 4;
+
+       sess_local[s].cin += l;
+       sess_local[s].pin++;
+
+       eth_tx += l;
 
        STAT(tun_tx_packets);
-       INC_STAT(tun_tx_bytes, l - 4);
+       INC_STAT(tun_tx_bytes, l);
 }
 
 // process IPv6 packet received
@@ -1102,21 +1108,26 @@ void processipv6in(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                return;
        }
 
+       p += 4;
+       l -= 4;
+
        if (session[s].snoop_ip && session[s].snoop_port)
        {
                // Snooping this session
-               snoop_send_packet(p + 4, l - 4, session[s].snoop_ip, session[s].snoop_port);
+               snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port);
        }
 
-       session[s].cin += l - 4;
-       session[s].total_cin += l - 4;
-       sess_local[s].cin += l - 4;
-
+       increment_counter(&session[s].cin, &session[s].cin_wrap, l);
+       session[s].cin_delta += l;
        session[s].pin++;
-       eth_tx += l - 4;
+
+       sess_local[s].cin += l;
+       sess_local[s].pin++;
+
+       eth_tx += l;
 
        STAT(tun_tx_packets);
-       INC_STAT(tun_tx_bytes, l - 4);
+       INC_STAT(tun_tx_bytes, l);
 }
 
 //
@@ -1136,19 +1147,24 @@ void send_ipin(sessionidt s, uint8_t *buf, int len)
                return;
        }
 
+       buf += 4;
+       len -= 4;
+
        if (session[s].snoop_ip && session[s].snoop_port)
        {
                // Snooping this session
-               snoop_send_packet(buf + 4, len - 4, session[s].snoop_ip, session[s].snoop_port);
+               snoop_send_packet(buf, len, session[s].snoop_ip, session[s].snoop_port);
        }
 
        // Increment packet counters
-       session[s].cin += len - 4;
-       session[s].total_cin += len - 4;
-       sess_local[s].cin += len - 4;
-
+       increment_counter(&session[s].cin, &session[s].cin_wrap, len);
+       session[s].cin_delta += len;
        session[s].pin++;
-       eth_tx += len - 4;
+
+       sess_local[s].cin += len;
+       sess_local[s].pin++;
+
+       eth_tx += len;
 
        STAT(tun_tx_packets);
        INC_STAT(tun_tx_bytes, len - 4);
@@ -1327,7 +1343,7 @@ void sendlcp(tunnelidt t, sessionidt s, int authtype)
                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;