// L2TPNS PPP Stuff
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.57 2005/05/10 09:57:19 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.63 2005/06/24 06:59:06 bodea Exp $";
#include <stdio.h>
#include <string.h>
{
LOG(1, s, t, "Unexpected CHAP message\n");
STAT(tunnel_rx_errors);
- sessionshutdown(s, "Unexpected CHAP message.", 3, 0);
return;
}
{
int x = l - 4;
uint8_t *o = (p + 4);
- int authtype = 0;
LOG(3, s, t, "LCP: ConfigAck (%d bytes)...\n", l);
if (config->debug > 3) dumplcp(p, 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);
break;
case 3: // Authentication-Protocol
- if (authtype)
+ if (authtype > 0)
break;
{
}
}
- 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);
LOG(3, s, t, "IPCP Acked, session is now active\n");
- // clear LCP_ACKED/CCP_ACKED flag for possible fast renegotiaion for routers
+ // clear LCP_ACKED/CCP_ACKED flag for possible fast renegotiation for routers
session[s].flags &= ~(SF_LCP_ACKED|SF_CCP_ACKED);
return;
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
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);
}
//
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);
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;