// L2TPNS PPP Stuff
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.39 2004-12-16 08:49:53 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.61 2005-05-13 09:23:00 bodea Exp $";
#include <stdio.h>
#include <string.h>
extern configt *config;
static void initccp(tunnelidt t, sessionidt s);
+static uint8_t *add_lcp_auth(uint8_t *b, int size, int authtype);
// Process PAP messages
void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
{
- char user[129];
- char pass[129];
+ char user[MAXUSER];
+ char pass[MAXPASS];
uint16_t hl;
- CSTAT(call_processpap);
+ CSTAT(processpap);
LOG_HEX(5, "PAP", p, l);
if (l < 4)
{
LOG(1, s, t, "Short PAP %u bytes\n", l);
STAT(tunnel_rx_errors);
- return ;
+ sessionshutdown(s, "Short PAP packet.", 3, 0);
+ return;
}
if ((hl = ntohs(*(uint16_t *) (p + 2))) > l)
{
LOG(1, s, t, "Length mismatch PAP %u/%u\n", hl, l);
STAT(tunnel_rx_errors);
- return ;
+ sessionshutdown(s, "PAP length mismatch.", 3, 0);
+ return;
}
l = hl;
{
LOG(1, s, t, "Unexpected PAP code %d\n", *p);
STAT(tunnel_rx_errors);
- return ;
+ sessionshutdown(s, "Unexpected PAP code.", 3, 0);
+ return;
}
{
uint8_t *b = p;
b += 4;
+ user[0] = pass[0] = 0;
if (*b && *b < sizeof(user))
+ {
memcpy(user, b + 1, *b);
- user[*b] = 0;
- b += 1 + *b;
- if (*b && *b < sizeof(pass))
- memcpy(pass, b + 1, *b);
- pass[*b] = 0;
+ user[*b] = 0;
+ b += 1 + *b;
+ if (*b && *b < sizeof(pass))
+ {
+ memcpy(pass, b + 1, *b);
+ pass[*b] = 0;
+ }
+ }
LOG(3, s, t, "PAP login %s/%s\n", user, pass);
}
- if (session[s].ip || !session[s].radius)
+ if (session[s].ip || !sess_local[s].radius)
{
// respond now, either no RADIUS available or already authenticated
uint8_t b[MAXCONTROL];
}
LOG(3, s, t, "Fallback response to PAP (%s)\n", (session[s].ip) ? "ACK" : "NAK");
tunnelsend(b, 5 + (p - b), t); // send it
+ sessionshutdown(s, "PAP authentication failed.", 3, 0);
}
else
{
// set up RADIUS request
- uint16_t r = session[s].radius;
+ uint16_t r = sess_local[s].radius;
// Run PRE_AUTH plugins
struct param_pre_auth packet = { &tunnel[t], &session[s], strdup(user), strdup(pass), PPPPAP, 1 };
uint16_t r;
uint16_t hl;
- CSTAT(call_processchap);
+ CSTAT(processchap);
LOG_HEX(5, "CHAP", p, l);
- r = session[s].radius;
+ r = sess_local[s].radius;
if (!r)
{
LOG(1, s, t, "Unexpected CHAP message\n");
-
-// FIXME: Need to drop the session here.
-
STAT(tunnel_rx_errors);
return;
}
{
LOG(1, s, t, "Short CHAP %u bytes\n", l);
STAT(tunnel_rx_errors);
- return ;
+ sessionshutdown(s, "Short CHAP packet.", 3, 0);
+ return;
}
if ((hl = ntohs(*(uint16_t *) (p + 2))) > l)
{
LOG(1, s, t, "Length mismatch CHAP %u/%u\n", hl, l);
STAT(tunnel_rx_errors);
- return ;
+ sessionshutdown(s, "CHAP length mismatch.", 3, 0);
+ return;
}
l = hl;
{
LOG(1, s, t, "Unexpected CHAP response code %d\n", *p);
STAT(tunnel_rx_errors);
+ sessionshutdown(s, "CHAP length mismatch.", 3, 0);
return;
}
if (p[1] != radius[r].id)
{
LOG(1, s, t, "Wrong CHAP response ID %d (should be %d) (%d)\n", p[1], radius[r].id, r);
STAT(tunnel_rx_errors);
- return ;
+ sessionshutdown(s, "Unexpected CHAP response ID.", 3, 0);
+ return;
}
if (l < 5 || p[4] != 16)
{
LOG(1, s, t, "Bad CHAP response length %d\n", l < 5 ? -1 : p[4]);
STAT(tunnel_rx_errors);
- return ;
+ sessionshutdown(s, "Bad CHAP response length.", 3, 0);
+ return;
}
l -= 5;
{
LOG(1, s, t, "CHAP user too long %d\n", l - 16);
STAT(tunnel_rx_errors);
- return ;
+ sessionshutdown(s, "CHAP username too long.", 3, 0);
+ return;
}
// Run PRE_AUTH plugins
radiussend(r, RADIUSAUTH);
}
-static char *ppp_lcp_types[] = {
- NULL,
- "ConfigReq",
- "ConfigAck",
- "ConfigNak",
- "ConfigRej",
- "TerminateReq",
- "TerminateAck",
- "CodeRej",
- "ProtocolRej",
- "EchoReq",
- "EchoReply",
- "DiscardRequest",
- "IdentRequest",
-};
-
static void dumplcp(uint8_t *p, int l)
{
int x = l - 4;
uint8_t *o = (p + 4);
LOG_HEX(5, "PPP LCP Packet", p, l);
- LOG(4, 0, 0, "PPP LCP Packet type %d (%s len %d)\n", *p, ppp_lcp_types[(int)*p], ntohs( ((uint16_t *) p)[1]) );
+ LOG(4, 0, 0, "PPP LCP Packet type %d (%s len %d)\n", *p, ppp_lcp_type((int)*p), ntohs( ((uint16_t *) p)[1]) );
LOG(4, 0, 0, "Length: %d\n", l);
if (*p != ConfigReq && *p != ConfigRej && *p != ConfigAck)
return;
{
case 1: // Maximum-Receive-Unit
if (length == 4)
- LOG(4, 0, 0, " %s %d\n", lcp_types[type], ntohs(*(uint16_t *)(o + 2)));
+ LOG(4, 0, 0, " %s %d\n", lcp_type(type), ntohs(*(uint16_t *)(o + 2)));
else
- LOG(4, 0, 0, " %s odd length %d\n", lcp_types[type], length);
+ LOG(4, 0, 0, " %s odd length %d\n", lcp_type(type), length);
break;
case 2: // Async-Control-Character-Map
if (length == 6)
{
uint32_t asyncmap = ntohl(*(uint32_t *)(o + 2));
- LOG(4, 0, 0, " %s %x\n", lcp_types[type], asyncmap);
+ LOG(4, 0, 0, " %s %x\n", lcp_type(type), asyncmap);
}
else
- LOG(4, 0, 0, " %s odd length %d\n", lcp_types[type], length);
+ LOG(4, 0, 0, " %s odd length %d\n", lcp_type(type), length);
break;
case 3: // Authentication-Protocol
if (length == 4)
{
int proto = ntohs(*(uint16_t *)(o + 2));
- LOG(4, 0, 0, " %s 0x%x (%s)\n", lcp_types[type], proto,
- proto == PPPCHAP ? "CHAP" :
- proto == PPPPAP ? "PAP" : "UNKNOWN");
+ LOG(4, 0, 0, " %s 0x%x (%s)\n", lcp_type(type), proto,
+ proto == PPPPAP ? "PAP" : "UNSUPPORTED");
+ }
+ else if (length == 5)
+ {
+ int proto = ntohs(*(uint16_t *)(o + 2));
+ int algo = *(uint8_t *)(o + 4);
+ LOG(4, 0, 0, " %s 0x%x 0x%x (%s)\n", lcp_type(type), proto, algo,
+ (proto == PPPCHAP && algo == 5) ? "CHAP MD5" : "UNSUPPORTED");
}
else
- LOG(4, 0, 0, " %s odd length %d\n", lcp_types[type], length);
+ LOG(4, 0, 0, " %s odd length %d\n", lcp_type(type), length);
break;
case 4: // Quality-Protocol
{
uint32_t qp = ntohl(*(uint32_t *)(o + 2));
- LOG(4, 0, 0, " %s %x\n", lcp_types[type], qp);
+ LOG(4, 0, 0, " %s %x\n", lcp_type(type), qp);
}
break;
case 5: // Magic-Number
if (length == 6)
{
uint32_t magicno = ntohl(*(uint32_t *)(o + 2));
- LOG(4, 0, 0, " %s %x\n", lcp_types[type], magicno);
+ LOG(4, 0, 0, " %s %x\n", lcp_type(type), magicno);
}
else
- LOG(4, 0, 0, " %s odd length %d\n", lcp_types[type], length);
+ LOG(4, 0, 0, " %s odd length %d\n", lcp_type(type), length);
break;
case 7: // Protocol-Field-Compression
case 8: // Address-And-Control-Field-Compression
- LOG(4, 0, 0, " %s\n", lcp_types[type]);
+ LOG(4, 0, 0, " %s\n", lcp_type(type));
break;
default:
LOG(2, 0, 0, " Unknown PPP LCP Option type %d\n", type);
uint32_t magicno = 0;
uint16_t hl;
- CSTAT(call_processlcp);
+ CSTAT(processlcp);
LOG_HEX(5, "LCP", p, l);
if (l < 4)
if (*p == ConfigAck)
{
- LOG(3, s, t, "LCP: Discarding ConfigAck\n");
+ int x = l - 4;
+ uint8_t *o = (p + 4);
+
+ LOG(3, s, t, "LCP: ConfigAck (%d bytes)...\n", l);
+ if (config->debug > 3) dumplcp(p, l);
+
+ while (x > 2)
+ {
+ int type = o[0];
+ int length = o[1];
+
+ if (length == 0 || type == 0 || x < length) break;
+ switch (type)
+ {
+ case 3: // Authentication-Protocol
+ {
+ int proto = ntohs(*(uint16_t *)(o + 2));
+ if (proto == PPPCHAP && *(o + 4) == 5)
+ sendchap(t, s);
+ }
+
+ break;
+ }
+ x -= length;
+ o += length;
+ }
+
session[s].flags |= SF_LCP_ACKED;
}
else if (*p == ConfigReq)
*q++ = 6;
memset(q, 0, 4); // asyncmap 0
q += 4;
- *((uint16_t *) (response + 2)) = htons(q - response); // LCP header length
break;
case 3: // Authentication-Protocol
{
int proto = ntohs(*(uint16_t *)(o + 2));
char proto_name[] = "0x0000";
+ uint8_t *a;
+
if (proto == PPPPAP)
- break;
+ {
+ if (config->radius_authtypes & AUTHPAP)
+ break;
- if (response && *response != ConfigNak) // rej already queued
- break;
+ strcpy(proto_name, "PAP");
+ }
+ else if (proto == PPPCHAP)
+ {
+ if (config->radius_authtypes & AUTHCHAP
+ && *(o + 4) == 5) // MD5
+ break;
- if (proto == PPPCHAP)
strcpy(proto_name, "CHAP");
+ }
else
sprintf(proto_name, "%#4.4x", proto);
+ if (response && *response != ConfigNak) // rej already queued
+ break;
+
LOG(2, s, t, " Remote requesting %s authentication. Rejecting.\n", proto_name);
if (!response)
q += 4;
}
- if ((q - b + length) > sizeof(b))
+ a = add_lcp_auth(q, sizeof(b) - (q - b), config->radius_authprefer);
+ if (!a)
{
LOG(2, s, t, "LCP overflow for %s ConfigNak.\n", proto_name);
break;
}
- memcpy(q, o, length);
- *(uint16_t *)(q += 2) = htons(PPPPAP); // NAK -> Use PAP instead
- q += length;
- *((uint16_t *) (response + 2)) = htons(q - response);
+ q = a;
+
+ if (config->radius_authtypes != config->radius_authprefer)
+ {
+ a = add_lcp_auth(q, sizeof(b) - (q - b), config->radius_authtypes & ~config->radius_authprefer);
+ if (!a)
+ {
+ LOG(2, s, t, "LCP overflow for %s ConfigNak.\n", proto_name);
+ break;
+ }
+
+ q = a;
+ }
+
+ break;
}
break;
memcpy(q, o, length);
q += length;
- *((uint16_t *) (response + 2)) = htons(q - response); // LCP header length
}
x -= length;
o += length;
}
- if (!response)
+ if (response)
{
- // Send back a ConfigAck
- q = response = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
- if (!q) return;
- *q = ConfigAck;
+ l = q - response; // LCP packet length
+ *((uint16_t *) (response + 2)) = htons(l); // update header
+ }
+ else
+ {
+ // Send packet back as ConfigAck
+ response = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
+ if (!response) return;
+ *response = ConfigAck;
}
- LOG(3, s, t, "Sending %s\n", ppp_lcp_types[*response]);
- tunnelsend(b, l + (q - b), t);
+ LOG(3, s, t, "Sending %s\n", ppp_lcp_type(*response));
+ tunnelsend(b, l + response - b, t);
if (!(session[s].flags & SF_LCP_ACKED))
- initlcp(t, s);
+ sendlcp(t, s, config->radius_authprefer);
}
else if (*p == ConfigNak)
{
- LOG(1, s, t, "Remote end sent a ConfigNak. Ignoring\n");
+ int x = l - 4;
+ uint8_t *o = (p + 4);
+ int authtype = -1;
+
+ LOG(3, s, t, "LCP: ConfigNak (%d bytes)...\n", l);
if (config->debug > 3) dumplcp(p, l);
- return ;
+
+ while (x > 2)
+ {
+ int type = o[0];
+ int length = o[1];
+
+ if (length == 0 || type == 0 || x < length) break;
+ switch (type)
+ {
+ case 1: // Maximum-Receive-Unit
+ session[s].mru = ntohs(*(uint16_t *)(o + 2));
+ LOG(3, s, t, " Remote requested MRU of %u\n", session[s].mru);
+ break;
+
+ case 3: // Authentication-Protocol
+ if (authtype > 0)
+ break;
+
+ {
+ int proto = ntohs(*(uint16_t *)(o + 2));
+ if (proto == PPPPAP)
+ {
+ authtype = config->radius_authtypes & AUTHPAP;
+ LOG(3, s, t, " Remote requested PAP authentication...%sing\n",
+ authtype ? "accept" : "reject");
+ }
+ else if (proto == PPPCHAP && *(o + 4) == 5)
+ {
+ authtype = config->radius_authtypes & AUTHCHAP;
+ LOG(3, s, t, " Remote requested CHAP authentication...%sing\n",
+ authtype ? "accept" : "reject");
+ }
+ else
+ {
+ LOG(3, s, t, " Rejecting unsupported authentication %#4x\n",
+ proto);
+ }
+ }
+
+ 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);
}
else if (*p == TerminateReq)
{
q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
if (!q) return;
tunnelsend(b, l + (q - b), t); // send it
- sessionshutdown(s, "Remote end closed connection.");
+ sessionshutdown(s, "Remote end closed connection.", 3, 0);
}
else if (*p == TerminateAck)
{
- sessionshutdown(s, "Connection closed.");
+ sessionshutdown(s, "Connection closed.", 3, 0);
+ }
+ else if (*p == ProtocolRej)
+ {
+ if (*(uint16_t *) (p+4) == htons(PPPIPV6CP))
+ {
+ LOG(3, s, t, "IPv6 rejected\n");
+ session[s].flags |= SF_IPV6_NACKED;
+ }
+ else
+ {
+ LOG(1, s, t, "Unexpected LCP protocol reject 0x%X\n",
+ ntohs(*(uint16_t *) (p+4)));
+ STAT(tunnel_rx_errors);
+ }
}
else if (*p == EchoReq)
{
{
LOG(1, s, t, "Unexpected LCP code %d\n", *p);
STAT(tunnel_rx_errors);
- return ;
}
}
{
uint16_t hl;
- CSTAT(call_processipcp);
+ CSTAT(processipcp);
LOG_HEX(5, "IPCP", p, l);
if (l < 5)
if (*p == ConfigAck)
{
// happy with our IPCP
- uint16_t r = session[s].radius;
+ uint16_t r = sess_local[s].radius;
if ((!r || radius[r].state == RADIUSIPCP) && !session[s].walled_garden)
{
if (!r)
}
}
+// Process IPV6CP messages
+void processipv6cp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
+{
+
+ CSTAT(processipv6cp);
+
+ LOG_HEX(5, "IPV6CP", p, l);
+ if (l < 4)
+ {
+ LOG(1, s, t, "Short IPV6CP %d bytes\n", l);
+ STAT(tunnel_rx_errors);
+ return ;
+ }
+ if (*p == ConfigAck)
+ {
+ // happy with our IPV6CP
+ session[s].flags |= SF_IPV6CP_ACKED;
+
+ LOG(3, s, t, "IPV6CP Acked, IPv6 is now active\n");
+ // Add a routed block if configured.
+ if (session[s].ipv6prefixlen)
+ {
+ route6set(s, session[s].ipv6route, session[s].ipv6prefixlen, 1);
+ session[s].flags |= SF_IPV6_ROUTED;
+ }
+
+ // Send an initial RA (TODO: Should we send these regularly?)
+ send_ipv6_ra(t, s, NULL);
+ return;
+ }
+ if (*p != ConfigReq)
+ {
+ LOG(1, s, t, "Unexpected IPV6CP code %d\n", *p);
+ STAT(tunnel_rx_errors);
+ return;
+ }
+
+ LOG(4, s, t, "IPV6CP ConfigReq received\n");
+ if (ntohs(*(uint16_t *) (p + 2)) > l)
+ {
+ LOG(1, s, t, "Length mismatch IPV6CP %d/%d\n", ntohs(*(uint16_t *) (p + 2)), l);
+ STAT(tunnel_rx_errors);
+ return ;
+ }
+ if (!session[s].ip)
+ {
+ LOG(3, s, t, "Waiting on radius reply\n");
+ return; // have to wait on RADIUS reply
+ }
+ // form a config reply quoting the IP in the session
+ {
+ uint8_t b[MAXCONTROL];
+ uint8_t *i,
+ *q;
+
+ l = ntohs(*(uint16_t *) (p + 2)); // We must use length from IPV6CP len field
+ q = p + 4;
+ i = p + l;
+ while (q < i && q[1])
+ {
+ if (*q != 1)
+ break;
+ q += q[1];
+ }
+ if (q < i)
+ {
+ // reject
+ uint16_t n = 4;
+ i = p + l;
+ if (!(q = makeppp(b, sizeof(b), p, l, t, s, PPPIPV6CP)))
+ {
+ LOG(2, s, t, "Failed to send IPV6CP ConfigRej\n");
+ return;
+ }
+ *q = ConfigRej;
+ p += 4;
+ while (p < i && p[1])
+ {
+ if (*p != 1)
+ {
+ LOG(2, s, t, "IPV6CP reject %d\n", *p);
+ memcpy(q + n, p, p[1]);
+ n += p[1];
+ }
+ p += p[1];
+ }
+ *(uint16_t *) (q + 2) = htons(n);
+ LOG(4, s, t, "Sending ConfigRej\n");
+ tunnelsend(b, n + (q - b), t); // send it
+ }
+ else
+ {
+ LOG(4, s, t, "Sending ConfigAck\n");
+ *p = ConfigAck;
+ i = findppp(p, 1); // IP address
+ if (!i || i[1] != 10)
+ {
+ LOG(1, s, t, "No IP in IPV6CP request\n");
+ STAT(tunnel_rx_errors);
+ return ;
+ }
+ if ((*(uint32_t *) (i + 2) != htonl(session[s].ip)) ||
+ (*(uint32_t *) (i + 6) != 0))
+ {
+ *(uint32_t *) (i + 2) = htonl(session[s].ip);
+ *(uint32_t *) (i + 6) = 0;
+ *p = ConfigNak;
+ LOG(4, s, t,
+ " No, a ConfigNak, client is "
+ "requesting IP - sending %s\n",
+ fmtaddr(htonl(session[s].ip), 0));
+ }
+ if (!(q = makeppp(b, sizeof(b), p, l, t, s, PPPIPV6CP)))
+ {
+ LOG(2, s, t, " Failed to send IPV6CP packet.\n");
+ return;
+ }
+ tunnelsend(b, l + (q - b), t); // send it
+ }
+ }
+}
+
// process IP packet received
//
// This MUST be called with at least 4 byte behind 'p'.
{
in_addr_t ip;
- CSTAT(call_processipin);
+ CSTAT(processipin);
LOG_HEX(5, "IP", p, l);
// Add on the tun header
p -= 4;
- *(uint32_t *) p = htonl(0x00000800);
+ *(uint32_t *) p = htonl(PKTIP);
l += 4;
- if (session[s].tbf_in && !config->cluster_iam_master) { // Are we throttled and a slave?
- master_throttle_packet(session[s].tbf_in, p, l); // Pass it to the master for handling.
+ // Are we throttled and a slave?
+ if (session[s].tbf_in && !config->cluster_iam_master) {
+ // Pass it to the master for handling.
+ master_throttle_packet(session[s].tbf_in, p, l);
return;
}
- if (session[s].tbf_in && config->cluster_iam_master) { // Are we throttled and a master?? actually handle the throttled packets.
+ // Are we throttled and a master??
+ if (session[s].tbf_in && config->cluster_iam_master) {
+ // Actually handle the throttled packets.
tbf_queue_packet(session[s].tbf_in, p, l);
return;
}
session[s].cin += l - 4;
session[s].total_cin += l - 4;
- sess_count[s].cin += l - 4;
+ sess_local[s].cin += l - 4;
+
+ session[s].pin++;
+ eth_tx += l - 4;
+
+ STAT(tun_tx_packets);
+ INC_STAT(tun_tx_bytes, l - 4);
+}
+
+// process IPv6 packet received
+//
+// This MUST be called with at least 4 byte behind 'p'.
+// (i.e. this routine writes to p[-4]).
+void processipv6in(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
+{
+ struct in6_addr ip;
+ in_addr_t ipv4;
+
+ CSTAT(processipv6in);
+
+ LOG_HEX(5, "IPv6", p, l);
+
+ ip = *(struct in6_addr *) (p + 8);
+ ipv4 = ntohl(*(uint32_t *)(p + 16));
+
+ if (l > MAXETHER)
+ {
+ LOG(1, s, t, "IP packet too long %d\n", l);
+ STAT(tunnel_rx_errors);
+ return ;
+ }
+
+ // no spoof
+ if (ipv4 != session[s].ip && memcmp(&config->ipv6_prefix, &ip, 8) && sessionbyipv6(ip) != s)
+ {
+ char str[INET6_ADDRSTRLEN];
+ LOG(5, s, t, "Dropping packet with spoofed IP %s\n",
+ inet_ntop(AF_INET6, &ip, str, INET6_ADDRSTRLEN));
+ return;
+ }
+
+ // Check if it's a Router Solicition message.
+ if (*(p + 6) == 58 && *(p + 7) == 255 && *(p + 24) == 0xFF && *(p + 25) == 2 &&
+ *(uint32_t *)(p + 26) == 0 && *(uint32_t *)(p + 30) == 0 &&
+ *(uint32_t *)(p + 34) == 0 &&
+ *(p + 38) == 0 && *(p + 39) == 2 && *(p + 40) == 133) {
+ LOG(3, s, t, "Got IPv6 RS\n");
+ send_ipv6_ra(t, s, &ip);
+ return;
+ }
+
+ // Add on the tun header
+ p -= 4;
+ *(uint32_t *) p = htonl(PKTIPV6);
+ l += 4;
+
+ // Are we throttled and a slave?
+ if (session[s].tbf_in && !config->cluster_iam_master) {
+ // Pass it to the master for handling.
+ master_throttle_packet(session[s].tbf_in, p, l);
+ return;
+ }
+
+ // Are we throttled and a master??
+ if (session[s].tbf_in && config->cluster_iam_master) {
+ // Actually handle the throttled packets.
+ tbf_queue_packet(session[s].tbf_in, p, l);
+ return;
+ }
+
+ // send to ethernet
+ if (tun_write(p, l) < 0)
+ {
+ STAT(tun_tx_errors);
+ LOG(0, s, t, "Error writing %d bytes to TUN device: %s (tunfd=%d, p=%p)\n",
+ l, strerror(errno), tunfd, p);
+
+ return;
+ }
+
+ 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);
+ }
+
+ session[s].cin += l - 4;
+ session[s].total_cin += l - 4;
+ sess_local[s].cin += l - 4;
session[s].pin++;
eth_tx += l - 4;
// Increment packet counters
session[s].cin += len - 4;
session[s].total_cin += len - 4;
- sess_count[s].cin += len - 4;
+ sess_local[s].cin += len - 4;
session[s].pin++;
eth_tx += len - 4;
uint8_t b[MAXCONTROL];
uint8_t *q;
- CSTAT(call_processccp);
+ CSTAT(processccp);
LOG_HEX(5, "CCP", p, l);
switch (l > 1 ? *p : 0)
tunnelsend(b, l + (q - b), t); // send it
}
-// send a CHAP PP packet
+// send a CHAP challenge
void sendchap(tunnelidt t, sessionidt s)
{
uint8_t b[MAXCONTROL];
- uint16_t r = session[s].radius;
+ uint16_t r = sess_local[s].radius;
uint8_t *q;
- CSTAT(call_sendchap);
+ CSTAT(sendchap);
if (!r)
{
LOG(1, s, t, "No RADIUS to send challenge\n");
STAT(tunnel_tx_errors);
- return ;
+ return;
}
+
LOG(1, s, t, "Send CHAP challenge\n");
- {
- // new challenge
- int n;
- for (n = 0; n < 15; n++)
- radius[r].auth[n] = rand();
- }
+
radius[r].chap = 1; // CHAP not PAP
radius[r].id++;
if (radius[r].state != RADIUSCHAP)
radius[r].try = 0;
+
radius[r].state = RADIUSCHAP;
radius[r].retry = backoff(radius[r].try++);
if (radius[r].try > 5)
{
- sessionshutdown(s, "Timeout CHAP");
+ sessionshutdown(s, "CHAP timeout.", 3, 0);
STAT(tunnel_tx_errors);
return ;
}
*q = 1; // challenge
q[1] = radius[r].id; // ID
- q[4] = 16; // length
+ q[4] = 16; // value size (size of challenge)
memcpy(q + 5, radius[r].auth, 16); // challenge
strcpy(q + 21, hostname); // our name
*(uint16_t *) (q + 2) = htons(strlen(hostname) + 21); // length
return b;
}
-// Send initial LCP ConfigReq for PAP, set magic no.
-void initlcp(tunnelidt t, sessionidt s)
+static uint8_t *add_lcp_auth(uint8_t *b, int size, int authtype)
{
- char b[500], *q;
+ if ((authtype == AUTHCHAP && size < 5) || size < 4)
+ return 0;
+
+ *b++ = 3; // Authentication-Protocol
+ if (authtype == AUTHCHAP)
+ {
+ *b++ = 5; // length
+ *(uint16_t *) b = htons(PPPCHAP); b += 2;
+ *b++ = 5; // MD5
+ }
+ else if (authtype == AUTHPAP)
+ {
+ *b++ = 4; // length
+ *(uint16_t *) b = htons(PPPPAP); b += 2;
+ }
+ else
+ {
+ LOG(0, 0, 0, "add_lcp_auth called with unsupported auth type %d\n", authtype);
+ }
+
+ return b;
+}
+
+// Send initial LCP ConfigReq for MRU, authentication type and magic no
+void sendlcp(tunnelidt t, sessionidt s, int authtype)
+{
+ char b[500], *q, *l;
if (!(q = makeppp(b, sizeof(b), NULL, 0, t, s, PPPLCP)))
return;
- LOG(4, s, t, "Sending LCP ConfigReq for PAP\n");
- *q = ConfigReq;
- *(uint8_t *)(q + 1) = (time_now % 255) + 1; // ID
- *(uint16_t *)(q + 2) = htons(14); // Length
- *(uint8_t *)(q + 4) = 5;
- *(uint8_t *)(q + 5) = 6;
- *(uint32_t *)(q + 6) = htonl(session[s].magic);
- *(uint8_t *)(q + 10) = 3;
- *(uint8_t *)(q + 11) = 4;
- *(uint16_t *)(q + 12) = htons(PPPPAP); // PAP
-
- LOG_HEX(5, "PPPLCP", q, 14);
- tunnelsend(b, (q - b) + 14, t);
+ LOG(4, s, t, "Sending LCP ConfigReq for %s\n",
+ authtype == AUTHCHAP ? "CHAP" : "PAP");
+
+ if (!session[s].mru)
+ session[s].mru = DEFAULT_MRU;
+
+ l = q;
+ *l++ = ConfigReq;
+ *l++ = (time_now % 255) + 1; // ID
+
+ l += 2; //Save space for length
+
+ *l++ = 1; *l++ = 4; // Maximum-Receive-Unit (length 4)
+ *(uint16_t *) l = htons(session[s].mru); l += 2;
+
+ l = add_lcp_auth(l, sizeof(b) - (l - b), authtype);
+
+ *l++ = 5; *l++ = 6; // Magic-Number (length 6)
+ *(uint32_t *) l = htonl(session[s].magic);
+ l += 4;
+
+ *(uint16_t *)(q + 2) = htons(l - q); // Length
+
+ LOG_HEX(5, "PPPLCP", q, l - q);
+ tunnelsend(b, (l - b), t);
}
// Send CCP request for no compression
projects / l2tpns.git / blobdiff