fail IPCP negotiation only on ConfigRej of IP-Address

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 1787552..4a91a3f 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,7 +4,7 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 

-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.121 2005/08/11 05:50:24 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.123 2005/08/12 08:35:16 bodea Exp $";

 
 #include <arpa/inet.h>
 #include <assert.h>
 
 #include <arpa/inet.h>
 #include <assert.h>


@@ -1584,6 +1584,7 @@ void sendipcp(sessionidt s, tunnelidt t)
        uint8_t *q;
 
        CSTAT(sendipcp);
        uint8_t *q;
 
        CSTAT(sendipcp);

+       LOG(3, s, t, "IPCP: send ConfigReq\n");

 
        if (!session[s].unique_id)
        {
 
        if (!session[s].unique_id)
        {


@@ -1612,6 +1613,7 @@ void sendipv6cp(sessionidt s, tunnelidt t)
        uint8_t *q;
 
        CSTAT(sendipv6cp);
        uint8_t *q;
 
        CSTAT(sendipv6cp);

+       LOG(3, s, t, "IPV6CP: send ConfigReq\n");

 
        q = makeppp(buf,sizeof(buf), 0, 0, s, t, PPPIPV6CP);
        if (!q) return;
 
        q = makeppp(buf,sizeof(buf), 0, 0, s, t, PPPIPV6CP);
        if (!q) return;


@@ -2715,7 +2717,7 @@ static void regular_cleanups(double period)
                                        LOG(3, s, session[s].tunnel, "No ACK for LCP ConfigReq... resending\n");
                                        sess_local[s].lcp.restart = time_now + config->ppp_restart_time;
                                        sess_local[s].lcp.conf_sent++;
                                        LOG(3, s, session[s].tunnel, "No ACK for LCP ConfigReq... resending\n");
                                        sess_local[s].lcp.restart = time_now + config->ppp_restart_time;
                                        sess_local[s].lcp.conf_sent++;

-                                       sendlcp(s, t, sess_local[s].lcp_authtype);
+                                       sendlcp(s, session[s].tunnel, sess_local[s].lcp_authtype);

                                        change_state(s, lcp, next_state);
                                }
                                else
                                        change_state(s, lcp, next_state);
                                }
                                else


@@ -2746,7 +2748,7 @@ static void regular_cleanups(double period)
                                        LOG(3, s, session[s].tunnel, "No ACK for IPCP ConfigReq... resending\n");
                                        sess_local[s].ipcp.restart = time_now + config->ppp_restart_time;
                                        sess_local[s].ipcp.conf_sent++;
                                        LOG(3, s, session[s].tunnel, "No ACK for IPCP ConfigReq... resending\n");
                                        sess_local[s].ipcp.restart = time_now + config->ppp_restart_time;
                                        sess_local[s].ipcp.conf_sent++;

-                                       sendipcp(s, t);
+                                       sendipcp(s, session[s].tunnel);

                                        change_state(s, ipcp, next_state);
                                }
                                else
                                        change_state(s, ipcp, next_state);
                                }
                                else


@@ -2777,7 +2779,7 @@ static void regular_cleanups(double period)
                                        LOG(3, s, session[s].tunnel, "No ACK for IPV6CP ConfigReq... resending\n");
                                        sess_local[s].ipv6cp.restart = time_now + config->ppp_restart_time;
                                        sess_local[s].ipv6cp.conf_sent++;
                                        LOG(3, s, session[s].tunnel, "No ACK for IPV6CP ConfigReq... resending\n");
                                        sess_local[s].ipv6cp.restart = time_now + config->ppp_restart_time;
                                        sess_local[s].ipv6cp.conf_sent++;

-                                       sendipv6cp(s, t);
+                                       sendipv6cp(s, session[s].tunnel);

                                        change_state(s, ipv6cp, next_state);
                                }
                                else
                                        change_state(s, ipv6cp, next_state);
                                }
                                else


@@ -2805,7 +2807,7 @@ static void regular_cleanups(double period)
                                        LOG(3, s, session[s].tunnel, "No ACK for CCP ConfigReq... resending\n");
                                        sess_local[s].ccp.restart = time_now + config->ppp_restart_time;
                                        sess_local[s].ccp.conf_sent++;
                                        LOG(3, s, session[s].tunnel, "No ACK for CCP ConfigReq... resending\n");
                                        sess_local[s].ccp.restart = time_now + config->ppp_restart_time;
                                        sess_local[s].ccp.conf_sent++;

-                                       sendccp(s, t);
+                                       sendccp(s, session[s].tunnel);

                                        change_state(s, ccp, next_state);
                                }
                                else
                                        change_state(s, ccp, next_state);
                                }
                                else