X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/0f28e4f9648818750fad1dbbe7991ddc9a7327e8..6f7d8eb27fcd243080d62ed0f05f928110f11e1d:/ppp.c?ds=sidebyside diff --git a/ppp.c b/ppp.c index 0832f97..0d3b168 100644 --- a/ppp.c +++ b/ppp.c @@ -1,6 +1,6 @@ // L2TPNS PPP Stuff -char const *cvs_id_ppp = "$Id: ppp.c,v 1.49 2005-05-07 08:17:25 bodea Exp $"; +char const *cvs_id_ppp = "$Id: ppp.c,v 1.64 2005-06-24 08:34:53 bodea Exp $"; #include #include @@ -24,6 +24,7 @@ extern time_t time_now; 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) @@ -40,7 +41,7 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) LOG(1, s, t, "Short PAP %u bytes\n", l); STAT(tunnel_rx_errors); sessionshutdown(s, "Short PAP packet.", 3, 0); - return ; + return; } if ((hl = ntohs(*(uint16_t *) (p + 2))) > l) @@ -48,7 +49,7 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) LOG(1, s, t, "Length mismatch PAP %u/%u\n", hl, l); STAT(tunnel_rx_errors); sessionshutdown(s, "PAP length mismatch.", 3, 0); - return ; + return; } l = hl; @@ -57,7 +58,7 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) LOG(1, s, t, "Unexpected PAP code %d\n", *p); STAT(tunnel_rx_errors); sessionshutdown(s, "Unexpected PAP code.", 3, 0); - return ; + return; } { @@ -156,14 +157,16 @@ void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) { 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; @@ -171,20 +174,23 @@ void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) { 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; @@ -193,7 +199,8 @@ void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) { 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 @@ -285,7 +292,7 @@ static void dumplcp(uint8_t *p, int l) { 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_types[type], proto, algo, + LOG(4, 0, 0, " %s 0x%x 0x%x (%s)\n", lcp_type(type), proto, algo, (proto == PPPCHAP && algo == 5) ? "CHAP MD5" : "UNSUPPORTED"); } else @@ -347,7 +354,33 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) 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) @@ -397,14 +430,13 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) *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)); - uint16_t wanted_proto; char proto_name[] = "0x0000"; + uint8_t *a; if (proto == PPPPAP) { @@ -437,26 +469,27 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) q += 4; } - if ((q - b + 5) > sizeof(b)) // 5 is the larger (CHAP+MD5) of the two NAKs + 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; } - *q++ = type; - if (config->radius_authprefer == AUTHCHAP) - { - *q++ = 5; - *(uint16_t *) q = htons(PPPCHAP); q += 2; - *q++ = 5; // MD5 - } - else + q = a; + + if (config->radius_authtypes != config->radius_authprefer) { - *q++ = 4; - *(uint16_t *) q = htons(PPPPAP); q += 2; + 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; } - *((uint16_t *) (response + 2)) = htons(q - response); // LCP header length break; } break; @@ -488,31 +521,97 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) 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_type(*response)); - tunnelsend(b, l + (q - b), t); + 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) { @@ -571,7 +670,6 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) { LOG(1, s, t, "Unexpected LCP code %d\n", *p); STAT(tunnel_rx_errors); - return ; } } @@ -620,22 +718,32 @@ void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) if (*p == ConfigAck) { - // happy with our IPCP uint16_t r = sess_local[s].radius; - if ((!r || radius[r].state == RADIUSIPCP) && !session[s].walled_garden) - { - if (!r) - r = radiusnew(s); - if (r) - radiussend(r, RADIUSSTART); // send radius start, having got IPCP at last - } + + // ignore duplicate ACKs + if (session[s].flags & SF_IPCP_ACKED) + return; + + // happy with our IPCP session[s].flags |= SF_IPCP_ACKED; 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); + if (r && session[s].walled_garden) + { + radiusclear(r, s); + return; + } + + if (!r) + r = radiusnew(s); + + if (r) + radiussend(r, RADIUSSTART); // send radius start, having got IPCP at last + return; } if (*p != ConfigReq) @@ -917,21 +1025,26 @@ void processipin(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) 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 @@ -1005,21 +1118,26 @@ void processipv6in(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l) 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); } // @@ -1039,19 +1157,24 @@ void send_ipin(sessionidt s, uint8_t *buf, int len) 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); @@ -1196,39 +1319,64 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, tunnelidt t, sessionid 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; - int size; - - if (!(q = makeppp(b, sizeof(b), NULL, 0, t, s, PPPLCP))) - return; + if ((authtype == AUTHCHAP && size < 5) || size < 4) + return 0; - 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; - if (config->radius_authprefer == AUTHCHAP) + *b++ = 3; // Authentication-Protocol + if (authtype == AUTHCHAP) { - *(uint8_t *)(q + 11) = 5; - *(uint16_t *)(q + 12) = htons(PPPCHAP); - *(uint8_t *)(q + 14) = 5; // MD5 - size = 15; + *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 { - *(uint8_t *)(q + 11) = 4; - *(uint16_t *)(q + 12) = htons(PPPPAP); - size = 14; + LOG(0, 0, 0, "add_lcp_auth called with unsupported auth type %d\n", authtype); } - LOG_HEX(5, "PPPLCP", q, size); - tunnelsend(b, (q - b) + size, t); + 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 %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