break LCP configure loop with shutdown

[l2tpns.git] / ppp.c

diff --git a/ppp.c b/ppp.c
index 17fde89..6af5066 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.88 2005/12/07 05:21:37 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.91 2005/12/15 14:23:03 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -499,7 +499,9 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
        if (session[s].die) // going down...
                return;
 
-       LOG(*p == EchoReq ? 4 : 3, s, t, "LCP: recv %s\n", ppp_code(*p));
+       LOG((*p == EchoReq || *p == EchoReply) ? 4 : 3, s, t,
+               "LCP: recv %s\n", ppp_code(*p));
+
        if (config->debug > 3) dumplcp(p, l);
 
        if (*p == ConfigAck)
@@ -794,6 +796,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
                                default:
                                        LOG(2, s, t, "LCP: remote sent %s for type %u?\n", ppp_code(*p), type);
+                                       sessionshutdown(s, "Unable to negotiate LCP.", 3, 0);
                                        break;
                        }
                        x -= length;
@@ -1755,9 +1758,7 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
 {
        if (size < 12) // Need more space than this!!
        {
-               static int backtrace_count = 0;
                LOG(0, s, t, "makeppp buffer too small for L2TP header (size=%d)\n", size);
-               log_backtrace(backtrace_count, 5)
                return NULL;
        }
 
@@ -1780,9 +1781,7 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
 
        if (l + 12 > size)
        {
-               static int backtrace_count = 0;
                LOG(2, s, t, "makeppp would overflow buffer (size=%d, header+payload=%d)\n", size, l + 12);
-               log_backtrace(backtrace_count, 5)
                return NULL;
        }