run PLUGIN_RADIUS_ACCOUNT for Start records

[l2tpns.git] / ppp.c

diff --git a/ppp.c b/ppp.c
index 0f87c97..17fde89 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.86 2005/11/17 05:24:17 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.88 2005/12/07 05:21:37 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -449,6 +449,7 @@ static void ppp_code_rej(sessionidt s, tunnelidt t, uint16_t proto,
 {
        uint8_t *q;
        int mru = session[s].mru;
+       if (mru < MINMTU) mru = MINMTU;
        if (mru > size) mru = size;
 
        l += 4;
@@ -577,7 +578,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                case 1: // Maximum-Receive-Unit
                                        {
                                                uint16_t mru = ntohs(*(uint16_t *)(o + 2));
-                                               if (mru >= 576)
+                                               if (mru >= MINMTU)
                                                {
                                                        session[s].mru = mru;
                                                        break;
@@ -1037,7 +1038,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        case 131: // secondary DNS
                                if (o[1] != 6 || o[1] > length) return;
 
-                               addr = htonl(session[s].dns1);
+                               addr = htonl(session[s].dns2);
                                if (memcmp(o + 2, &addr, sizeof(addr)))
                                {
                                        q = ppp_conf_nak(s, b, sizeof(b), PPPIPCP, &response, q, p, o, (uint8_t *) &addr, sizeof(addr));
@@ -1877,3 +1878,33 @@ void sendccp(sessionidt s, tunnelidt t)
        tunnelsend(b, (q - b) + 4 , t);
        restart_timer(s, ccp);
 }
+
+// Reject unknown/unconfigured protocols
+void protoreject(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l, uint16_t proto)
+{
+
+       uint8_t buf[MAXETHER];
+       uint8_t *q;
+       int mru = session[s].mru;
+       if (mru < MINMTU) mru = MINMTU;
+       if (mru > sizeof(buf)) mru = sizeof(buf);
+
+       l += 6;
+       if (l > mru) l = mru;
+
+       q = makeppp(buf, sizeof(buf), 0, 0, s, t, PPPLCP);
+       if (!q) return;
+
+       *q = ProtocolRej;
+       *(q + 1) = ++sess_local[s].lcp_ident;
+       *(uint16_t *)(q + 2) = htons(l);
+       *(uint16_t *)(q + 4) = htons(proto);
+       memcpy(q + 6, p, l - 6);
+
+       if (proto == PPPIPV6CP)
+               LOG(3, s, t, "LCP: send ProtocolRej (IPV6CP: not configured)\n");
+       else
+               LOG(2, s, t, "LCP: sent ProtocolRej (0x%04X: unsupported)\n", proto);
+
+       tunnelsend(buf, l + (q - buf), t);
+}