X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/272e831e8071da5296e8dd2061f8a166fd70fd07..d2c470fb4e2a7fe6d1d0313a1398f216ae83ec80:/ppp.c diff --git a/ppp.c b/ppp.c index 669651d..2ca71f9 100644 --- a/ppp.c +++ b/ppp.c @@ -1,6 +1,6 @@ // L2TPNS PPP Stuff -char const *cvs_id_ppp = "$Id: ppp.c,v 1.14 2004/09/02 04:18:07 fred_nerk Exp $"; +char const *cvs_id_ppp = "$Id: ppp.c,v 1.21 2004/11/05 04:55:27 bodea Exp $"; #include #include @@ -26,33 +26,37 @@ extern struct configt *config; void sendccp(tunnelidt t, sessionidt s); // Process PAP messages -void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l) +void processpap(tunnelidt t, sessionidt s, u8 *p, u16 l) { char user[129]; char pass[129]; - + u16 hl; CSTAT(call_processpap); - log_hex(5, "PAP", p, l); + LOG_HEX(5, "PAP", p, l); if (l < 4) { - log(1, 0, s, t, "Short PAP %u bytes\n", l); + LOG(1, 0, s, t, "Short PAP %u bytes\n", l); STAT(tunnel_rx_errors); return ; } - if (*p != 1) + + if ((hl = ntohs(*(u16 *) (p + 2))) > l) { - log(1, 0, s, t, "Unexpected PAP code %d\n", *p); + LOG(1, 0, s, t, "Length mismatch PAP %u/%u\n", hl, l); STAT(tunnel_rx_errors); return ; } - if (ntohs(*(u16 *) (p + 2)) > l) + l = hl; + + if (*p != 1) { - log(1, 0, s, t, "Length mismatch PAP %d/%d\n", ntohs(*(u16 *) (p + 2)), l); + LOG(1, 0, s, t, "Unexpected PAP code %d\n", *p); STAT(tunnel_rx_errors); return ; } + { u8 *b = p; b += 4; @@ -63,7 +67,7 @@ void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l) if (*b && *b < sizeof(pass)) memcpy(pass, b + 1, *b); pass[*b] = 0; - log(3, 0, s, t, "PAP login %s/%s\n", user, pass); + LOG(3, 0, s, t, "PAP login %s/%s\n", user, pass); } if (session[s].ip || !session[s].radius) { @@ -72,7 +76,7 @@ void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l) u8 id = p[1]; u8 *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPPAP); if (!p) { // Failed to make ppp header! - log(1,0,0,0, "Failed to make PPP header in process pap!\n"); + LOG(1,0,0,0, "Failed to make PPP header in process pap!\n"); return; } if (session[s].ip) @@ -84,14 +88,14 @@ void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l) p[4] = 0; // no message if (session[s].ip) { - log(3, session[s].ip, s, t, "%d Already an IP allocated: %s (%d)\n", getpid(), inet_toa(htonl(session[s].ip)), session[s].ip_pool_index); + LOG(3, session[s].ip, s, t, "Already an IP allocated: %s (%d)\n", inet_toa(htonl(session[s].ip)), session[s].ip_pool_index); session[s].flags &= ~SF_IPCP_ACKED; } else { - log(1, 0, s, t, "No radius session available to authenticate session...\n"); + LOG(1, 0, s, t, "No radius session available to authenticate session...\n"); } - log(3, 0, s, t, "Fallback response to PAP (%s)\n", (session[s].ip) ? "ACK" : "NAK"); + LOG(3, 0, s, t, "Fallback response to PAP (%s)\n", (session[s].ip) ? "ACK" : "NAK"); tunnelsend(b, 5 + (p - b), t); // send it } else @@ -104,7 +108,7 @@ void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l) run_plugins(PLUGIN_PRE_AUTH, &packet); if (!packet.continue_auth) { - log(3, 0, s, t, "A plugin rejected PRE_AUTH\n"); + LOG(3, 0, s, t, "A plugin rejected PRE_AUTH\n"); if (packet.username) free(packet.username); if (packet.password) free(packet.password); return; @@ -117,59 +121,71 @@ void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l) free(packet.password); radius[r].id = p[1]; - log(3, 0, s, t, "Sending login for %s/%s to radius\n", user, pass); + LOG(3, 0, s, t, "Sending login for %s/%s to radius\n", user, pass); radiussend(r, RADIUSAUTH); } } // Process CHAP messages -void processchap(tunnelidt t, sessionidt s, u8 * p, u16 l) +void processchap(tunnelidt t, sessionidt s, u8 *p, u16 l) { u16 r; - u16 len; - + u16 hl; CSTAT(call_processchap); - log_hex(5, "CHAP", p, l); + LOG_HEX(5, "CHAP", p, l); r = session[s].radius; if (!r) { - log(1, 0, s, t, "Unexpected CHAP message\n"); + LOG(1, 0, s, t, "Unexpected CHAP message\n"); // FIXME: Need to drop the session here. STAT(tunnel_rx_errors); return; } - if (*p != 2) + + if (l < 4) { - log(1, 0, s, t, "Unexpected CHAP response code %d\n", *p); + LOG(1, 0, s, t, "Short CHAP %u bytes\n", l); STAT(tunnel_rx_errors); - return; + return ; } - if (p[1] != radius[r].id) + + if ((hl = ntohs(*(u16 *) (p + 2))) > l) { - log(1, 0, s, t, "Wrong CHAP response ID %d (should be %d) (%d)\n", p[1], radius[r].id, r); + LOG(1, 0, s, t, "Length mismatch CHAP %u/%u\n", hl, l); STAT(tunnel_rx_errors); return ; } - len = ntohs(*(u16 *) (p + 2)); - if (len > l) + l = hl; + + if (*p != 2) { - log(1, 0, s, t, "Bad CHAP length %d\n", len); + LOG(1, 0, s, t, "Unexpected CHAP response code %d\n", *p); + STAT(tunnel_rx_errors); + return; + } + if (p[1] != radius[r].id) + { + LOG(1, 0, s, t, "Wrong CHAP response ID %d (should be %d) (%d)\n", p[1], radius[r].id, r); STAT(tunnel_rx_errors); return ; } - if (p[4] != 16) + + if (l < 5 || p[4] != 16) { - log(1, 0, s, t, "Bad CHAP response length %d\n", p[4]); + LOG(1, 0, s, t, "Bad CHAP response length %d\n", l < 5 ? -1 : p[4]); STAT(tunnel_rx_errors); return ; } - if (len - 21 >= sizeof(session[s].user)) + + l -= 5; + p += 5; + if (l < 16 || l - 16 >= sizeof(session[s].user)) { - log(1, 0, s, t, "CHAP user too long %d\n", len - 21); + LOG(1, 0, s, t, "CHAP user too long %d\n", l - 16); STAT(tunnel_rx_errors); return ; } @@ -178,15 +194,19 @@ void processchap(tunnelidt t, sessionidt s, u8 * p, u16 l) { struct param_pre_auth packet = { &tunnel[t], &session[s], NULL, NULL, PPPCHAP, 1 }; - packet.username = calloc(len-20, 1); - packet.password = calloc(16, 1); - memcpy(packet.username, p + 21, len - 21); - memcpy(packet.password, p + 5, 16); + packet.password = calloc(17, 1); + memcpy(packet.password, p, 16); + + p += 16; + l -= 16; + + packet.username = calloc(l + 1, 1); + memcpy(packet.username, p, l); run_plugins(PLUGIN_PRE_AUTH, &packet); if (!packet.continue_auth) { - log(3, 0, s, t, "A plugin rejected PRE_AUTH\n"); + LOG(3, 0, s, t, "A plugin rejected PRE_AUTH\n"); if (packet.username) free(packet.username); if (packet.password) free(packet.password); return; @@ -200,7 +220,7 @@ void processchap(tunnelidt t, sessionidt s, u8 * p, u16 l) } radius[r].chap = 1; - log(3, 0, s, t, "CHAP login %s\n", session[s].user); + LOG(3, 0, s, t, "CHAP login %s\n", session[s].user); radiussend(r, RADIUSAUTH); } @@ -222,12 +242,12 @@ char *ppp_lcp_types[] = { void dumplcp(u8 *p, int l) { - signed int x = l - 4; + int x = l - 4; u8 *o = (p + 4); - log_hex(5, "PPP LCP Packet", p, l); - log(4, 0, 0, 0, "PPP LCP Packet type %d (%s len %d)\n", *p, ppp_lcp_types[(int)*p], ntohs( ((u16 *) p)[1]) ); - log(4, 0, 0, 0, "Length: %d\n", l); + LOG_HEX(5, "PPP LCP Packet", p, l); + LOG(4, 0, 0, 0, "PPP LCP Packet type %d (%s len %d)\n", *p, ppp_lcp_types[(int)*p], ntohs( ((u16 *) p)[1]) ); + LOG(4, 0, 0, 0, "Length: %d\n", l); if (*p != ConfigReq && *p != ConfigRej && *p != ConfigAck) return; @@ -237,12 +257,12 @@ void dumplcp(u8 *p, int l) int length = o[1]; if (length < 2) { - log(4, 0, 0, 0, " Option length is %d...\n", length); + LOG(4, 0, 0, 0, " Option length is %d...\n", length); break; } if (type == 0) { - log(4, 0, 0, 0, " Option type is 0...\n"); + LOG(4, 0, 0, 0, " Option type is 0...\n"); x -= length; o += length; continue; @@ -251,27 +271,27 @@ void dumplcp(u8 *p, int l) { case 1: // Maximum-Receive-Unit if (length == 4) - log(4, 0, 0, 0, " %s %d\n", lcp_types[type], ntohs(*(u16 *)(o + 2))); + LOG(4, 0, 0, 0, " %s %d\n", lcp_types[type], ntohs(*(u16 *)(o + 2))); else - log(4, 0, 0, 0, " %s odd length %d\n", lcp_types[type], length); + LOG(4, 0, 0, 0, " %s odd length %d\n", lcp_types[type], length); break; case 3: // Authentication-Protocol { if (length == 4) { int proto = ntohs(*(u16 *)(o + 2)); - log(4, 0, 0, 0, " %s 0x%x (%s)\n", lcp_types[type], proto, - proto == 0xC223 ? "CHAP" : - proto == 0xC023 ? "PAP" : "UNKNOWN"); + LOG(4, 0, 0, 0, " %s 0x%x (%s)\n", lcp_types[type], proto, + proto == PPPCHAP ? "CHAP" : + proto == PPPPAP ? "PAP" : "UNKNOWN"); } else - log(4, 0, 0, 0, " %s odd length %d\n", lcp_types[type], length); + LOG(4, 0, 0, 0, " %s odd length %d\n", lcp_types[type], length); break; } case 4: // Quality-Protocol { u32 qp = ntohl(*(u32 *)(o + 2)); - log(4, 0, 0, 0, " %s %x\n", lcp_types[type], qp); + LOG(4, 0, 0, 0, " %s %x\n", lcp_types[type], qp); break; } case 5: // Magic-Number @@ -279,24 +299,24 @@ void dumplcp(u8 *p, int l) if (length == 6) { u32 magicno = ntohl(*(u32 *)(o + 2)); - log(4, 0, 0, 0, " %s %x\n", lcp_types[type], magicno); + LOG(4, 0, 0, 0, " %s %x\n", lcp_types[type], magicno); } else - log(4, 0, 0, 0, " %s odd length %d\n", lcp_types[type], length); + LOG(4, 0, 0, 0, " %s odd length %d\n", lcp_types[type], length); break; } case 7: // Protocol-Field-Compression { - log(4, 0, 0, 0, " %s\n", lcp_types[type]); + LOG(4, 0, 0, 0, " %s\n", lcp_types[type]); break; } case 8: // Address-And-Control-Field-Compression { - log(4, 0, 0, 0, " %s\n", lcp_types[type]); + LOG(4, 0, 0, 0, " %s\n", lcp_types[type]); break; } default: - log(2, 0, 0, 0, " Unknown PPP LCP Option type %d\n", type); + LOG(2, 0, 0, 0, " Unknown PPP LCP Option type %d\n", type); break; } x -= length; @@ -305,34 +325,43 @@ void dumplcp(u8 *p, int l) } // Process LCP messages -void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l) +void processlcp(tunnelidt t, sessionidt s, u8 *p, u16 l) { u8 b[MAXCONTROL]; u8 *q = NULL; - u32 magicno = 0; - + u32 magicno = 0; + u16 hl; CSTAT(call_processlcp); - log_hex(5, "LCP", p, l); + LOG_HEX(5, "LCP", p, l); if (l < 4) { - log(1, session[s].ip, s, t, "Short LCP %d bytes\n", l); + LOG(1, session[s].ip, s, t, "Short LCP %d bytes\n", l); + STAT(tunnel_rx_errors); + return ; + } + + if ((hl = ntohs(*(u16 *) (p + 2))) > l) + { + LOG(1, 0, s, t, "Length mismatch LCP %u/%u\n", hl, l); STAT(tunnel_rx_errors); return ; } + l = hl; + if (*p == ConfigAck) { - log(3, session[s].ip, s, t, "LCP: Discarding ConfigAck\n"); - session[s].flags |= SESSIONLCPACK; + LOG(3, session[s].ip, s, t, "LCP: Discarding ConfigAck\n"); + session[s].flags |= SF_LCP_ACKED; } else if (*p == ConfigReq) { - signed int x = l - 4; + int x = l - 4; u8 *o = (p + 4); - log(3, session[s].ip, s, t, "LCP: ConfigReq (%d bytes)...\n", l); - dumplcp(p, l); + LOG(3, session[s].ip, s, t, "LCP: ConfigReq (%d bytes)...\n", l); + if (config->debug > 3) dumplcp(p, l); while (x > 2) { @@ -345,27 +374,27 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l) session[s].mru = ntohs(*(u16 *)(o + 2)); break; case 2: // asyncmap - log_hex(2, "PPP LCP Packet", p, l); - log(2, 0, 0, 0, "PPP LCP Packet type %d (%s len %d)\n", *p, ppp_lcp_types[(int)*p], ntohs( ((u16 *) p)[1]) ); + LOG_HEX(2, "PPP LCP Packet", p, l); + LOG(2, 0, 0, 0, "PPP LCP Packet type %d (%s len %d)\n", *p, ppp_lcp_types[(int)*p], ntohs( ((u16 *) p)[1]) ); break; case 3: // Authentication-Protocol { int proto = ntohs(*(u16 *)(o + 2)); - if (proto == 0xC223) + if (proto == PPPCHAP) { - log(2, session[s].ip, s, t, " Remote end is trying to do CHAP. Rejecting it.\n"); + LOG(2, session[s].ip, s, t, " Remote end is trying to do CHAP. Rejecting it.\n"); if (!q) { q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP); if (!q) { - log(2, session[s].ip, s, t, " Failed to send packet.\n"); + LOG(2, session[s].ip, s, t, " Failed to send packet.\n"); break; } *q++ = ConfigNak; } memcpy(q, o, length); - *(u16 *)(q += 2) = htons(0xC023); // NAK -> Use PAP instead + *(u16 *)(q += 2) = htons(PPPPAP); // NAK -> Use PAP instead q += length; } break; @@ -384,7 +413,7 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l) case 18: { // Reject LCP CallBack - log(2, session[s].ip, s, t, " PPP LCP Option type %d, len=%d\n", type, length); + LOG(2, session[s].ip, s, t, " PPP LCP Option type %d, len=%d\n", type, length); memcpy(p + 4, o, length); *(u16 *)(p + 2) = htons(length + 4); *p = ConfigRej; @@ -395,7 +424,7 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l) default: // Reject Unknown LCP Option to stop to send it again - log(2, session[s].ip, s, t, " Unknown PPP LCP Option type %d\n", type); + LOG(2, session[s].ip, s, t, " Unknown PPP LCP Option type %d\n", type); memcpy(p + 4, o, length); *(u16 *)(p + 2) = htons(length + 4); *p = ConfigRej; @@ -407,16 +436,17 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l) o += length; } + if (!(session[s].flags & SF_LCP_ACKED)) + initlcp(t, s); + if (!q) { // Send back a ConfigAck - log(3, session[s].ip, s, t, "ConfigReq accepted, sending as Ack\n"); - // for win2k L2TP clientis and LCP renegotiation of alive session - if (magicno || l == 4) initlcp(t, s); + LOG(3, session[s].ip, s, t, "ConfigReq accepted, sending as Ack\n"); q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP); if (!q) { - log(3, session[s].ip, s, t, " failed to create packet.\n"); + LOG(3, session[s].ip, s, t, " failed to create packet.\n"); return; } *q = ConfigAck; @@ -425,17 +455,14 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l) else { // Already built a ConfigNak... send it - log(3, session[s].ip, s, t, "Sending ConfigNak\n"); + LOG(3, session[s].ip, s, t, "Sending ConfigNak\n"); tunnelsend(b, l + (q - b), t); } - - if (!(session[s].flags & SESSIONLCPACK)) - initlcp(t, s); } else if (*p == ConfigNak) { - log(1, session[s].ip, s, t, "Remote end sent a ConfigNak. Ignoring\n"); - dumplcp(p, l); + LOG(1, session[s].ip, s, t, "Remote end sent a ConfigNak. Ignoring\n"); + if (config->debug > 3) dumplcp(p, l); return ; } else if (*p == TerminateReq) @@ -443,10 +470,10 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l) *p = TerminateAck; // close q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP); if (!q) { - log(3, session[s].ip, s, t, "Failed to create PPP packet in processlcp.\n"); + LOG(3, session[s].ip, s, t, "Failed to create PPP packet in processlcp.\n"); return; } - log(3, session[s].ip, s, t, "LCP: Received TerminateReq. Sending TerminateAck\n"); + LOG(3, session[s].ip, s, t, "LCP: Received TerminateReq. Sending TerminateAck\n"); sessionshutdown(s, "Remote end closed connection."); tunnelsend(b, l + (q - b), t); // send it } @@ -460,10 +487,10 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l) *(u32 *) (p + 4) = htonl(session[s].magic); // our magic number q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP); if (!q) { - log(3, session[s].ip, s, t, " failed to send EchoReply.\n"); + LOG(3, session[s].ip, s, t, " failed to send EchoReply.\n"); return; } - log(5, session[s].ip, s, t, "LCP: Received EchoReq. Sending EchoReply\n"); + LOG(5, session[s].ip, s, t, "LCP: Received EchoReq. Sending EchoReply\n"); tunnelsend(b, l + (q - b), t); // send it } else if (*p == EchoReply) @@ -475,44 +502,55 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l) *p = CodeRej; if (l > MAXCONTROL) { - log(1, 0, s, t, "Truncated Ident Packet (length=%d) to 1400 bytes\n", l); + LOG(1, 0, s, t, "Truncated Ident Packet (length=%d) to 1400 bytes\n", l); l = 1400; } q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP); if (!q) { - log(3, session[s].ip, s, t, "Failed to create IdentRej.\n"); + LOG(3, session[s].ip, s, t, "Failed to create IdentRej.\n"); return; } - log_hex(5, "LCPIdentRej", q, l + 4); + LOG_HEX(5, "LCPIdentRej", q, l + 4); tunnelsend(b, 12 + 4 + l, t); } else { - log(1, session[s].ip, s, t, "Unexpected LCP code %d\n", *p); + LOG(1, session[s].ip, s, t, "Unexpected LCP code %d\n", *p); STAT(tunnel_rx_errors); return ; } } // Process IPCP messages -void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l) +void processipcp(tunnelidt t, sessionidt s, u8 *p, u16 l) { + u16 hl; CSTAT(call_processipcp); - log_hex(5, "IPCP", p, l); + LOG_HEX(5, "IPCP", p, l); if (l < 5) { - log(1, 0, s, t, "Short IPCP %d bytes\n", l); + LOG(1, 0, s, t, "Short IPCP %d bytes\n", l); STAT(tunnel_rx_errors); return ; } + + if ((hl = ntohs(*(u16 *) (p + 2))) > l) + { + LOG(1, 0, s, t, "Length mismatch IPCP %u/%u\n", hl, l); + STAT(tunnel_rx_errors); + return ; + } + l = hl; + if (*p == ConfigAck) { // happy with our IPCP u16 r = session[s].radius; - if ((!r || radius[r].state == RADIUSIPCP) && !session[s].walled_garden) { + if ((!r || radius[r].state == RADIUSIPCP) && !session[s].walled_garden) + { if (!r) r = radiusnew(s); if (r) @@ -520,25 +558,20 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l) } session[s].flags |= SF_IPCP_ACKED; - log(3, session[s].ip, s, t, "IPCP Acked, session is now active\n"); + LOG(3, session[s].ip, s, t, "IPCP Acked, session is now active\n"); return; } if (*p != ConfigReq) { - log(1, 0, s, t, "Unexpected IPCP code %d\n", *p); - STAT(tunnel_rx_errors); - return ; - } - log(4, session[s].ip, s, t, "IPCP ConfigReq received\n"); - if (ntohs(*(u16 *) (p + 2)) > l) - { - log(1, 0, s, t, "Length mismatch IPCP %d/%d\n", ntohs(*(u16 *) (p + 2)), l); + LOG(1, 0, s, t, "Unexpected IPCP code %d\n", *p); STAT(tunnel_rx_errors); return ; } + LOG(4, session[s].ip, s, t, "IPCP ConfigReq received\n"); + if (!session[s].ip) { - log(3, 0, s, t, "Waiting on radius reply\n"); + LOG(3, 0, s, t, "Waiting on radius reply\n"); return; // have to wait on RADIUS reply } // form a config reply quoting the IP in the session @@ -547,7 +580,6 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l) u8 *i, *q; - l = ntohs(*(u16 *) (p + 2)); // We must use length from IPCP len field q = p + 4; i = p + l; while (q < i && q[1]) @@ -563,7 +595,7 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l) i = p + l; if (!(q = makeppp(b, sizeof(b), p, l, t, s, PPPIPCP))) { - log(2, 0, s, t, "Failed to send IPCP ConfigRej\n"); + LOG(2, 0, s, t, "Failed to send IPCP ConfigRej\n"); return; } *q = ConfigRej; @@ -572,19 +604,19 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l) { if (*p != 0x81 && *p != 0x83 && *p != 3) { - log(2, 0, s, t, "IPCP reject %d\n", *p); + LOG(2, 0, s, t, "IPCP reject %d\n", *p); memcpy(q + n, p, p[1]); n += p[1]; } p += p[1]; } *(u16 *) (q + 2) = htons(n); - log(4, session[s].ip, s, t, "Sending ConfigRej\n"); + LOG(4, session[s].ip, s, t, "Sending ConfigRej\n"); tunnelsend(b, n + (q - b), t); // send it } else { - log(4, session[s].ip, s, t, "Sending ConfigAck\n"); + LOG(4, session[s].ip, s, t, "Sending ConfigAck\n"); *p = ConfigAck; if ((i = findppp(p, 0x81))) // Primary DNS address { @@ -592,7 +624,7 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l) { *(u32 *) (i + 2) = htonl(session[s].dns1); *p = ConfigNak; - log(5, session[s].ip, s, t, " DNS1 = %s\n", inet_toa(session[s].dns1)); + LOG(5, session[s].ip, s, t, " DNS1 = %s\n", inet_toa(session[s].dns1)); } } if ((i = findppp(p, 0x83))) // Secondary DNS address (TBA, is it) @@ -601,13 +633,13 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l) { *(u32 *) (i + 2) = htonl(session[s].dns2); *p = ConfigNak; - log(5, session[s].ip, s, t, " DNS2 = %s\n", inet_toa(session[s].dns1)); + LOG(5, session[s].ip, s, t, " DNS2 = %s\n", inet_toa(session[s].dns2)); } } i = findppp(p, 3); // IP address if (!i || i[1] != 6) { - log(1, 0, s, t, "No IP in IPCP request\n"); + LOG(1, 0, s, t, "No IP in IPCP request\n"); STAT(tunnel_rx_errors); return ; } @@ -615,12 +647,12 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l) { *(u32 *) (i + 2) = htonl(session[s].ip); *p = ConfigNak; - log(4, session[s].ip, s, t, " No, a ConfigNak, client is requesting IP - sending %s\n", + LOG(4, session[s].ip, s, t, " No, a ConfigNak, client is requesting IP - sending %s\n", inet_toa(htonl(session[s].ip))); } if (!(q = makeppp(b, sizeof(b), p, l, t, s, PPPIPCP))) { - log(2, 0, s, t, " Failed to send IPCP packet.\n"); + LOG(2, 0, s, t, " Failed to send IPCP packet.\n"); return; } tunnelsend(b, l + (q - b), t); // send it @@ -632,20 +664,19 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l) // // This MUST be called with at least 4 byte behind 'p'. // (i.e. this routine writes to p[-4]). -void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l) +void processipin(tunnelidt t, sessionidt s, u8 *p, u16 l) { ipt ip; - CSTAT(call_processipin); - log_hex(5, "IP", p, l); + LOG_HEX(5, "IP", p, l); ip = ntohl(*(u32 *)(p + 12)); if (l > MAXETHER) { - log(1, ip, s, t, "IP packet too long %d\n", l); + LOG(1, ip, s, t, "IP packet too long %d\n", l); STAT(tunnel_rx_errors); return ; } @@ -653,10 +684,16 @@ void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l) // no spoof (do sessionbyip to handled statically routed subnets) if (ip != session[s].ip && sessionbyip(htonl(ip)) != s) { - log(5, ip, s, t, "Dropping packet with spoofed IP %s\n", inet_toa(htonl(ip))); + LOG(5, ip, s, t, "Dropping packet with spoofed IP %s\n", inet_toa(htonl(ip))); return; } + if (session[s].snoop_ip && session[s].snoop_port) + { + // Snooping this session + snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port); + } + // Add on the tun header p -= 4; *(u32 *)p = htonl(0x00000800); @@ -674,11 +711,6 @@ void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l) session[s].pin++; eth_tx += l - 4; - if (session[s].snoop_ip && session[s].snoop_port) - { - // Snooping this session - snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port); - } STAT(tun_tx_packets); INC_STAT(tun_tx_bytes, l); @@ -691,7 +723,7 @@ void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l) if (tun_write(p, l) < 0) { STAT(tun_tx_errors); - log(0, 0, s, t, "Error writing %d bytes to TUN device: %s (tunfd=%d, p=%p)\n", + LOG(0, 0, s, t, "Error writing %d bytes to TUN device: %s (tunfd=%d, p=%p)\n", l, strerror(errno), tunfd, p); } @@ -703,11 +735,11 @@ void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l) // void send_ipin(sessionidt s, u8 *buf, int len) { - log_hex(5, "IP in throttled", buf, len); + LOG_HEX(5, "IP in throttled", buf, len); if (write(tunfd, buf, len) < 0) { STAT(tun_tx_errors); - log(0, 0, 0, 0, "Error writing %d bytes to TUN device: %s (tunfd=%d, p=%p)\n", + LOG(0, 0, 0, 0, "Error writing %d bytes to TUN device: %s (tunfd=%d, p=%p)\n", len, strerror(errno), tunfd, buf); } @@ -721,16 +753,16 @@ void send_ipin(sessionidt s, u8 *buf, int len) } -// Process LCP messages -void processccp(tunnelidt t, sessionidt s, u8 * p, u16 l) +// Process CCP messages +void processccp(tunnelidt t, sessionidt s, u8 *p, u16 l) { CSTAT(call_processccp); - log_hex(5, "CCP", p, l); + LOG_HEX(5, "CCP", p, l); if (l < 2 || (*p != ConfigReq && *p != TerminateReq)) { - log(1, 0, s, t, "Unexpecetd CCP request code %d\n", *p); + LOG(1, 0, s, t, "Unexpected CCP request code %d\n", *p); STAT(tunnel_rx_errors); return ; } @@ -754,7 +786,7 @@ void processccp(tunnelidt t, sessionidt s, u8 * p, u16 l) *p = TerminateAck; // close if (!(q = makeppp(b, sizeof(b), p, l, t, s, PPPCCP))) { - log(1,0,0,0, "Failed to send CCP packet.\n"); + LOG(1,0,0,0, "Failed to send CCP packet.\n"); return; } tunnelsend(b, l + (q - b), t); // send it @@ -772,11 +804,11 @@ void sendchap(tunnelidt t, sessionidt s) if (!r) { - log(1, 0, s, t, "No RADIUS to send challenge\n"); + LOG(1, 0, s, t, "No RADIUS to send challenge\n"); STAT(tunnel_tx_errors); return ; } - log(1, 0, s, t, "Send CHAP challenge\n"); + LOG(1, 0, s, t, "Send CHAP challenge\n"); { // new challenge int n; @@ -797,7 +829,7 @@ void sendchap(tunnelidt t, sessionidt s) } q = makeppp(b, sizeof(b), 0, 0, t, s, PPPCHAP); if (!q) { - log(1, 0, s, t, "failed to send CHAP challenge.\n"); + LOG(1, 0, s, t, "failed to send CHAP challenge.\n"); return; } *q = 1; // challenge @@ -812,7 +844,7 @@ void sendchap(tunnelidt t, sessionidt s) // fill in a L2TP message with a PPP frame, // copies existing PPP message and changes magic number if seen // returns start of PPP frame -u8 *makeppp(u8 * b, int size, u8 * p, int l, tunnelidt t, sessionidt s, u16 mtype) +u8 *makeppp(u8 *b, int size, u8 *p, int l, tunnelidt t, sessionidt s, u16 mtype) { if (size < 12) return NULL; // Need more space than this!! @@ -821,7 +853,7 @@ u8 *makeppp(u8 * b, int size, u8 * p, int l, tunnelidt t, sessionidt s, u16 mtyp *(u16 *) (b + 2) = htons(tunnel[t].far); // tunnel *(u16 *) (b + 4) = htons(session[s].far); // session b += 6; - if (mtype && !(session[s].l2tp_flags & SESSIONACFC)) + if (mtype == PPPLCP || !(session[s].l2tp_flags & SESSIONACFC)) { *(u16 *) b = htons(0xFF03); // HDLC header b += 2; @@ -835,7 +867,7 @@ u8 *makeppp(u8 * b, int size, u8 * p, int l, tunnelidt t, sessionidt s, u16 mtyp } if (l + 12 > size) { - log(3,0,0,0, "Would have overflowed the buffer in makeppp: size %d, len %d.\n", size, l); + LOG(3,0,0,0, "Would have overflowed the buffer in makeppp: size %d, len %d.\n", size, l); return NULL; // Run out of room to hold the packet! } if (p && l) @@ -844,7 +876,7 @@ u8 *makeppp(u8 * b, int size, u8 * p, int l, tunnelidt t, sessionidt s, u16 mtyp } // find a PPP option, returns point to option, or 0 if not found -u8 *findppp(u8 * b, u8 mtype) +u8 *findppp(u8 *b, u8 mtype) { u16 l = ntohs(*(u16 *) (b + 2)); if (l < 4) @@ -870,10 +902,10 @@ void initlcp(tunnelidt t, sessionidt s) q = makeppp(b, sizeof(b), NULL, 0, t, s, PPPLCP); if (!q) { - log(1, 0, s, t, "Failed to send LCP ConfigReq.\n"); + LOG(1, 0, s, t, "Failed to send LCP ConfigReq.\n"); return; } - log(4, 0, s, t, "Sending LCP ConfigReq for PAP\n"); + LOG(4, 0, s, t, "Sending LCP ConfigReq for PAP\n"); *q = ConfigReq; *(u8 *)(q + 1) = (time_now % 255) + 1; // ID *(u16 *)(q + 2) = htons(14); // Length @@ -882,7 +914,7 @@ void initlcp(tunnelidt t, sessionidt s) *(u32 *)(q + 6) = htonl(session[s].magic); *(u8 *)(q + 10) = 3; *(u8 *)(q + 11) = 4; - *(u16 *)(q + 12) = htons(0xC023); // PAP + *(u16 *)(q + 12) = htons(PPPPAP); // PAP tunnelsend(b, 12 + 14, t); } @@ -895,7 +927,7 @@ void sendccp(tunnelidt t, sessionidt s) *q = ConfigReq; *(u8 *)(q + 1) = (time_now % 255) + 1; // ID *(u16 *)(q + 2) = htons(4); // Length - log_hex(5, "PPPCCP", q, 4); + LOG_HEX(5, "PPPCCP", q, 4); tunnelsend(b, (q - b) + 4 , t); }