// 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.120 2005-08-11 05:49:03 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.124 2005-08-29 06:17:53 bodea Exp $";
#include <arpa/inet.h>
#include <assert.h>
uint8_t *q;
CSTAT(sendipcp);
+ LOG(3, s, t, "IPCP: send ConfigReq\n");
if (!session[s].unique_id)
{
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;
if (amagic == 0) amagic = time_now;
session[s].magic = amagic; // set magic number
session[s].l2tp_flags = aflags; // set flags received
+ session[s].mru = DEFAULT_MRU;
controlnull(t); // ack
- // proxy authentication type is not supported
- if (!(config->radius_authtypes & authtype))
- authtype = config->radius_authprefer;
-
// start LCP
- sendlcp(s, t, config->radius_authprefer);
sess_local[s].lcp.restart = time_now + config->ppp_restart_time;
sess_local[s].lcp.conf_sent = 1;
sess_local[s].lcp.nak_sent = 0;
sess_local[s].lcp_authtype = config->radius_authprefer;
session[s].ppp.lcp = RequestSent;
+ sendlcp(s, t);
break;
case 14: // CDN
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);
change_state(s, lcp, next_state);
}
else
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
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
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