X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/5e631c6978946b8333bcd49b79ae5d009ba93413..d674ec8153ca664525d38bab8c761cc34ecd79bd:/ppp.c diff --git a/ppp.c b/ppp.c index afacd90..3f5a9a5 100644 --- a/ppp.c +++ b/ppp.c @@ -1,6 +1,6 @@ // L2TPNS PPP Stuff -char const *cvs_id_ppp = "$Id: ppp.c,v 1.100 2006/04/27 09:53:50 bodea Exp $"; +char const *cvs_id_ppp = "$Id: ppp.c,v 1.104 2009/12/08 14:49:28 bodea Exp $"; #include #include @@ -31,6 +31,16 @@ static int epdiscmp(epdist, epdist); static void setepdis(epdist *, epdist); static void ipcp_open(sessionidt s, tunnelidt t); +static int first_session_in_bundle(sessionidt s) +{ + bundleidt i; + for (i = 1; i < MAXBUNDLE; i++) + if (bundle[i].state != BUNDLEFREE) + if (epdiscmp(session[s].epdis,bundle[i].epdis) && !strcmp(session[s].user, bundle[i].user)) + return 0; + return 1; +} + // Process PAP messages void processpap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) { @@ -69,7 +79,7 @@ void processpap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) if (session[s].ppp.phase != Authenticate) { - LOG(2, s, t, "PAP ignored in %s phase\n", ppp_phase(session[s].ppp.phase)); + LOG(2, s, t, "PAP ignored in %s phase\n", ppp_phase(session[s].ppp.phase)); return; } @@ -140,7 +150,10 @@ void processpap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) radius[r].id = p[1]; LOG(3, s, t, "Sending login for %s/%s to RADIUS\n", user, pass); - radiussend(r, RADIUSAUTH); + if ((session[s].mrru) && (!first_session_in_bundle(s))) + radiussend(r, RADIUSJUSTAUTH); + else + radiussend(r, RADIUSAUTH); } } @@ -179,16 +192,24 @@ void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) return; } - r = sess_local[s].radius; - if (!r) + if (session[s].ppp.phase != Authenticate) { - LOG(3, s, t, "Unexpected CHAP message\n"); + LOG(2, s, t, "CHAP ignored in %s phase\n", ppp_phase(session[s].ppp.phase)); return; } - if (session[s].ppp.phase != Authenticate) + r = sess_local[s].radius; + if (!r) { - LOG(2, s, t, "CHAP ignored in %s phase\n", ppp_phase(session[s].ppp.phase)); + LOG(3, s, t, "Unexpected CHAP message\n"); + + // Some modems (Netgear DM602, possibly others) persist in using CHAP even + // after ACKing our ConfigReq for PAP. + if (sess_local[s].lcp_authtype == AUTHPAP && config->radius_authtypes & AUTHCHAP) + { + sess_local[s].lcp_authtype = AUTHCHAP; + sendchap(s, t); + } return; } @@ -249,7 +270,10 @@ void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) radius[r].chap = 1; LOG(3, s, t, "CHAP login %s\n", session[s].user); - radiussend(r, RADIUSAUTH); + if ((session[s].mrru) && (!first_session_in_bundle(s))) + radiussend(r, RADIUSJUSTAUTH); + else + radiussend(r, RADIUSAUTH); } static void dumplcp(uint8_t *p, int l) @@ -358,17 +382,7 @@ void lcp_open(sessionidt s, tunnelidt t) } else { - if (session[s].bundle && bundle[session[s].bundle].num_of_links > 1) - { - sessionidt first_ses = bundle[session[s].bundle].members[0]; - LOG(3, s, t, "MPPP: Skipping IPCP negotiation for session:%d, first session of bundle is:%d\n", s, first_ses); - session[s].ip = session[first_ses].ip; - session[s].dns1 = session[first_ses].dns1; - session[s].dns2 = session[first_ses].dns2; - session[s].timeout = session[first_ses].timeout; - ipcp_open(s, t); - } - else + if(session[s].bundle == 0 || bundle[session[s].bundle].num_of_links == 1) { // This-Layer-Up sendipcp(s, t); @@ -381,6 +395,12 @@ void lcp_open(sessionidt s, tunnelidt t) change_state(s, ccp, Stopped); } + else + { + sessionidt first_ses = bundle[session[s].bundle].members[0]; + LOG(3, s, t, "MPPP: Skipping IPCP negotiation for session:%d, first session of bundle is:%d\n",s,first_ses); + ipcp_open(s, t); + } } } @@ -420,7 +440,7 @@ static uint8_t *ppp_conf_nak(sessionidt s, uint8_t *buf, size_t blen, uint16_t m uint8_t **response, uint8_t *queued, uint8_t *packet, uint8_t *option, uint8_t *value, size_t vlen) { - int *nak_sent; + int *nak_sent; switch (mtype) { case PPPLCP: nak_sent = &sess_local[s].lcp.nak_sent; break; @@ -431,7 +451,7 @@ static uint8_t *ppp_conf_nak(sessionidt s, uint8_t *buf, size_t blen, uint16_t m if (*response && **response != ConfigNak) { - if (*nak_sent < config->ppp_max_failure) // reject queued + if (*nak_sent < config->ppp_max_failure) // reject queued return queued; return ppp_conf_rej(s, buf, blen, mtype, response, 0, packet, option); @@ -439,7 +459,7 @@ static uint8_t *ppp_conf_nak(sessionidt s, uint8_t *buf, size_t blen, uint16_t m if (!*response) { - if (*nak_sent >= config->ppp_max_failure) + if (*nak_sent >= config->ppp_max_failure) return ppp_conf_rej(s, buf, blen, mtype, response, 0, packet, option); queued = *response = makeppp(buf, blen, packet, 2, s, session[s].tunnel, mtype, 0, 0, 0); @@ -557,13 +577,13 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) switch (session[s].ppp.lcp) { case RequestSent: - initialise_restart_count(s, lcp); + initialise_restart_count(s, lcp); change_state(s, lcp, AckReceived); break; case AckReceived: case Opened: - LOG(2, s, t, "LCP: ConfigAck in state %s? Sending ConfigReq\n", ppp_state(session[s].ppp.lcp)); + LOG(2, s, t, "LCP: ConfigAck in state %s? Sending ConfigReq\n", ppp_state(session[s].ppp.lcp)); if (session[s].ppp.lcp == Opened) lcp_restart(s); @@ -576,7 +596,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; default: - LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp)); + LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp)); } } else if (*p == ConfigReq) @@ -660,7 +680,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) config->radius_authtypes != config->radius_authprefer) { // alternate type - alen = add_lcp_auth(authproto, sizeof(authproto), config->radius_authtypes & ~config->radius_authprefer); + alen = add_lcp_auth(authproto, sizeof(authproto), config->radius_authtypes & ~config->radius_authprefer); if (alen < 2) break; q = ppp_conf_nak(s, b, sizeof(b), PPPLCP, &response, q, p, o, authproto + 2, alen - 2); } @@ -767,7 +787,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; case Stopped: - initialise_restart_count(s, lcp); + initialise_restart_count(s, lcp); sendlcp(s, t); if (*response == ConfigAck) change_state(s, lcp, AckSent); @@ -789,7 +809,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; case Opened: - lcp_restart(s); + lcp_restart(s); sendlcp(s, t); /* fallthrough */ @@ -801,8 +821,12 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; + case Closing: + sessionshutdown(s, "LCP: ConfigReq in state Closing. This should not happen. Killing session.", CDN_ADMIN_DISC, TERM_LOST_SERVICE); + break; + default: - LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp)); + LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp)); return; } @@ -872,7 +896,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) else { LOG(2, s, t, "LCP: remote rejected auth negotiation\n"); - authtype = 0; // shutdown + authtype = 0; // shutdown } break; @@ -938,7 +962,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; default: - LOG(2, s, t, "LCP: remote sent %s for type %u?\n", ppp_code(*p), type); + LOG(2, s, t, "LCP: remote sent %s for type %u?\n", ppp_code(*p), type); sessionshutdown(s, "Unable to negotiate LCP.", CDN_ADMIN_DISC, TERM_USER_ERROR); return; } @@ -959,7 +983,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) { case Closed: case Stopped: - { + { uint8_t *response = makeppp(b, sizeof(b), p, 2, s, t, PPPLCP, 0, 0, 0); if (!response) return; *response = TerminateAck; @@ -974,22 +998,22 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) case RequestSent: case AckSent: - initialise_restart_count(s, lcp); + initialise_restart_count(s, lcp); sendlcp(s, t); break; case AckReceived: - LOG(2, s, t, "LCP: ConfigNak in state %s? Sending ConfigReq\n", ppp_state(session[s].ppp.lcp)); + LOG(2, s, t, "LCP: ConfigNak in state %s? Sending ConfigReq\n", ppp_state(session[s].ppp.lcp)); sendlcp(s, t); break; case Opened: - lcp_restart(s); + lcp_restart(s); sendlcp(s, t); break; default: - LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp)); + LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp)); return; } } @@ -1004,16 +1028,16 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) case RequestSent: case AckReceived: case AckSent: - break; + break; case Opened: - lcp_restart(s); - zero_restart_count(s, lcp); + lcp_restart(s); + zero_restart_count(s, lcp); change_state(s, lcp, Closing); break; default: - LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp)); + LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp)); return; } @@ -1028,7 +1052,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) } else if (*p == ProtocolRej) { - uint16_t proto = 0; + uint16_t proto = 0; if (l > 4) { @@ -1083,10 +1107,20 @@ int join_bundle(sessionidt s) { if (epdiscmp(session[s].epdis,bundle[i].epdis) && !strcmp(session[s].user, bundle[i].user)) { + sessionidt first_ses = bundle[i].members[0]; + if (bundle[i].mssf != session[s].mssf) + { + // uniformity of sequence number format must be insured + LOG(3, s, session[s].tunnel, "MPPP: unable to bundle session %d in bundle %d cause of different mssf\n", s, i); + return -1; + } session[s].bundle = i; - bundle[i].mrru = session[s].mrru; - bundle[i].mssf = session[s].mssf; - if (session[s].epdis.length > 0) + session[s].ip = session[first_ses].ip; + session[s].dns1 = session[first_ses].dns1; + session[s].dns2 = session[first_ses].dns2; + session[s].timeout = session[first_ses].timeout; + + if(session[s].epdis.length > 0) setepdis(&bundle[i].epdis, session[s].epdis); strcpy(bundle[i].user, session[s].user); @@ -1104,11 +1138,19 @@ int join_bundle(sessionidt s) session[s].bundle = b; bundle[b].mrru = session[s].mrru; bundle[b].mssf = session[s].mssf; - if (session[s].epdis.length > 0) + // FIXME !!! to enable l2tpns reading mssf frames receiver_max_seq, sender_max_seq must be introduce + // now session[s].mssf flag indecates that the receiver wish to receive frames in mssf, so max_seq (i.e. recv_max_seq) = 1<<24 + /* + if (bundle[b].mssf) + bundle[b].max_seq = 1 << 12; + else */ + bundle[b].max_seq = 1 << 24; + if(session[s].epdis.length > 0) setepdis(&bundle[b].epdis, session[s].epdis); strcpy(bundle[b].user, session[s].user); bundle[b].members[0] = s; + bundle[b].timeout = session[s].timeout; LOG(3, s, session[s].tunnel, "MPPP: Created a new bundle (%d)\n", b); return b; } @@ -1147,9 +1189,10 @@ static bundleidt new_bundle() { LOG(4, 0, 0, "MPPP: Assigning bundle ID %d\n", i); bundle[i].num_of_links = 1; - bundle[i].last_check = time_now; // Initialize last_check value + bundle[i].last_check = time_now; // Initialize last_check value bundle[i].state = BUNDLEOPEN; - bundle[i].current_ses = -1; // This is to enforce the first session 0 to be used at first + bundle[i].current_ses = -1; // This is to enforce the first session 0 to be used at first + memset(&frag[i], 0, sizeof(fragmentationt)); if (i > config->cluster_highest_bundleid) config->cluster_highest_bundleid = i; return i; @@ -1213,7 +1256,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) if (session[s].ppp.phase < Network) { - LOG(2, s, t, "IPCP %s ignored in %s phase\n", ppp_code(*p), ppp_phase(session[s].ppp.phase)); + LOG(2, s, t, "IPCP %s ignored in %s phase\n", ppp_code(*p), ppp_phase(session[s].ppp.phase)); return; } @@ -1224,13 +1267,13 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) switch (session[s].ppp.ipcp) { case RequestSent: - initialise_restart_count(s, ipcp); + initialise_restart_count(s, ipcp); change_state(s, ipcp, AckReceived); break; case AckReceived: case Opened: - LOG(2, s, t, "IPCP: ConfigAck in state %s? Sending ConfigReq\n", ppp_state(session[s].ppp.ipcp)); + LOG(2, s, t, "IPCP: ConfigAck in state %s? Sending ConfigReq\n", ppp_state(session[s].ppp.ipcp)); sendipcp(s, t); change_state(s, ipcp, RequestSent); break; @@ -1240,7 +1283,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; default: - LOG(2, s, t, "IPCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipcp)); + LOG(2, s, t, "IPCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipcp)); } } else if (*p == ConfigReq) @@ -1338,7 +1381,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; case Stopped: - initialise_restart_count(s, ipcp); + initialise_restart_count(s, ipcp); sendipcp(s, t); if (*response == ConfigAck) change_state(s, ipcp, AckSent); @@ -1360,7 +1403,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; case Opened: - initialise_restart_count(s, ipcp); + initialise_restart_count(s, ipcp); sendipcp(s, t); /* fallthrough */ @@ -1373,7 +1416,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; default: - LOG(2, s, t, "IPCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipcp)); + LOG(2, s, t, "IPCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipcp)); return; } @@ -1391,15 +1434,15 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) case RequestSent: case AckReceived: case AckSent: - break; + break; case Opened: - zero_restart_count(s, ipcp); + zero_restart_count(s, ipcp); change_state(s, ipcp, Closing); break; default: - LOG(2, s, t, "IPCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipcp)); + LOG(2, s, t, "IPCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipcp)); return; } @@ -1455,7 +1498,7 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) if (session[s].ppp.phase < Network) { - LOG(2, s, t, "IPV6CP %s ignored in %s phase\n", ppp_code(*p), ppp_phase(session[s].ppp.phase)); + LOG(2, s, t, "IPV6CP %s ignored in %s phase\n", ppp_code(*p), ppp_phase(session[s].ppp.phase)); return; } @@ -1472,13 +1515,13 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) switch (session[s].ppp.ipv6cp) { case RequestSent: - initialise_restart_count(s, ipv6cp); + initialise_restart_count(s, ipv6cp); change_state(s, ipv6cp, AckReceived); break; case AckReceived: case Opened: - LOG(2, s, t, "IPV6CP: ConfigAck in state %s? Sending ConfigReq\n", ppp_state(session[s].ppp.ipv6cp)); + LOG(2, s, t, "IPV6CP: ConfigAck in state %s? Sending ConfigReq\n", ppp_state(session[s].ppp.ipv6cp)); sendipv6cp(s, t); change_state(s, ipv6cp, RequestSent); break; @@ -1488,7 +1531,7 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; default: - LOG(2, s, t, "IPV6CP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipv6cp)); + LOG(2, s, t, "IPV6CP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipv6cp)); } } else if (*p == ConfigReq) @@ -1497,7 +1540,7 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) uint8_t *o = p + 4; int length = l - 4; int gotip = 0; - uint8_t ident[8]; + uint32_t ident[2]; while (length > 2) { @@ -1509,12 +1552,12 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) gotip++; // seen address if (o[1] != 10) return; - *(uint32_t *) ident = htonl(session[s].ip); - *(uint32_t *) (ident + 4) = 0; + ident[0] = htonl(session[s].ip); + ident[1] = 0; if (memcmp(o + 2, ident, sizeof(ident))) { - q = ppp_conf_nak(s, b, sizeof(b), PPPIPV6CP, &response, q, p, o, ident, sizeof(ident)); + q = ppp_conf_nak(s, b, sizeof(b), PPPIPV6CP, &response, q, p, o, (uint8_t *)ident, sizeof(ident)); if (!q) return; } @@ -1559,7 +1602,7 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; case Stopped: - initialise_restart_count(s, ipv6cp); + initialise_restart_count(s, ipv6cp); sendipv6cp(s, t); if (*response == ConfigAck) change_state(s, ipv6cp, AckSent); @@ -1581,7 +1624,7 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; case Opened: - initialise_restart_count(s, ipv6cp); + initialise_restart_count(s, ipv6cp); sendipv6cp(s, t); /* fallthrough */ @@ -1594,7 +1637,7 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; default: - LOG(2, s, t, "IPV6CP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipv6cp)); + LOG(2, s, t, "IPV6CP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipv6cp)); return; } @@ -1612,15 +1655,15 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) case RequestSent: case AckReceived: case AckSent: - break; + break; case Opened: - zero_restart_count(s, ipv6cp); + zero_restart_count(s, ipv6cp); change_state(s, ipv6cp, Closing); break; default: - LOG(2, s, t, "IPV6CP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipv6cp)); + LOG(2, s, t, "IPV6CP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipv6cp)); return; } @@ -1637,6 +1680,39 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) } } +static void update_sessions_in_stat(sessionidt s, uint16_t l) +{ + bundleidt b = session[s].bundle; + if (!b) + { + increment_counter(&session[s].cin, &session[s].cin_wrap, l); + session[s].cin_delta += l; + session[s].pin++; + + sess_local[s].cin += l; + sess_local[s].pin++; + } + else + { + int i = frag[b].re_frame_begin_index; + int end = frag[b].re_frame_end_index; + for (;;) + { + l = frag[b].fragment[i].length; + s = frag[b].fragment[i].sid; + increment_counter(&session[s].cin, &session[s].cin_wrap, l); + session[s].cin_delta += l; + session[s].pin++; + + sess_local[s].cin += l; + sess_local[s].pin++; + if (i == end) + return; + i = (i + 1) & MAXFRAGNUM_MASK; + } + } +} + // process IP packet received // // This MUST be called with at least 4 byte behind 'p'. @@ -1695,17 +1771,13 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) *(uint32_t *) p = htonl(PKTIP); 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); + if (session[s].tbf_in) + { + // Are we throttling this session? + if (config->cluster_iam_master) + tbf_queue_packet(session[s].tbf_in, p, l); + else + master_throttle_packet(session[s].tbf_in, p, l); return; } @@ -1728,12 +1800,7 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port); } - increment_counter(&session[s].cin, &session[s].cin_wrap, l); - session[s].cin_delta += l; - session[s].pin++; - - sess_local[s].cin += l; - sess_local[s].pin++; + update_sessions_in_stat(s, l); eth_tx += l; @@ -1745,161 +1812,246 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) { bundleidt b = session[s].bundle; - uint8_t begin_frame; - uint8_t end_frame; + bundlet * this_bundle = &bundle[b]; + uint32_t frag_offset, M_offset; + uint16_t frag_index, M_index; + fragmentationt *this_fragmentation = &frag[b]; + uint8_t begin_frame = (*p & MP_BEGIN); + uint8_t end_frame = (*p & MP_END); uint32_t seq_num; - uint32_t offset; + uint8_t flags = *p; + uint16_t begin_index, end_index; - if (!b) + // Perform length checking + if(l > MAXFRAGLEN) { - LOG(3, s, t, "MPPP: Invalid bundle id: 0\n"); + LOG(2, s, t, "MPPP: discarding fragment larger than MAXFRAGLEN\n"); return; } - begin_frame = (*p & 0x80); - end_frame = (*p & 0x40); - if (session[s].mssf) + if(!b) + { + LOG(2, s, t, "MPPP: Invalid bundle id: 0\n"); + return; + } + // FIXME !! session[s].mssf means that the receiver wants to receive frames in mssf not means the receiver will send frames in mssf + /* if(session[s].mssf) { // Get 12 bit for seq number - uint16_t short_seq_num = ntohs((*(uint16_t *) p) & 0xFF0F); - uint16_t short_seq_num2 = short_seq_num >> 4; + seq_num = ntohs((*(uint16_t *) p) & 0xFF0F); p += 2; l -= 2; - seq_num = short_seq_num2; // After this point the pointer should be advanced 2 bytes - LOG(3, s, t, "MPPP: 12 bits, sequence number: %d, short1: %d, short2: %d\n",seq_num, short_seq_num, short_seq_num2); + LOG(3, s, t, "MPPP: 12 bits, sequence number: %d\n",seq_num); } - else + else */ { // Get 24 bit for seq number - p++; seq_num = ntohl((*(uint32_t *) p) & 0xFFFFFF00); - seq_num = seq_num >> 8; - p += 3; + p += 4; l -= 4; // After this point the pointer should be advanced 4 bytes LOG(4, s, t, "MPPP: 24 bits sequence number:%d\n",seq_num); } - if (seq_num - bundle[b].offset < 0) + // calculate this fragment's offset from the begin seq in the bundle + frag_offset = (seq_num + this_bundle->max_seq - this_fragmentation->start_seq) & (this_bundle->max_seq-1); + + // discard this fragment if frag_offset is bigger that the fragmentation buffer size + if (frag_offset >= MAXFRAGNUM) { - bundle[b].offset = 0; - bundle[b].pending_frag = 0; + LOG(3, s, t, "MPPP: Index out of range, received more than MAXFRAGNUM fragment (lost frag) seq:%d, begin_seq:%d, bundle:%d, max:%d\n",seq_num, this_fragmentation->start_seq, b, this_bundle->max_seq); + return; } + + // update M + sess_local[s].last_seq = seq_num; + { + /* seq # can be spread over the wrapping limit, and we must + choose the "lowest" one, taking into account the wrapping: + + |-#-##--#----------------------M--###-#| - offset = bundle[b].offset; - if (begin_frame) + but we must also care when the last highest seq # wraps, + so we keep two minimums: one for the higher limit, and + one for the lower one. + + In the nominal case, low_min = high_min. + */ + uint32_t i, low_min, high_min; + low_min = sess_local[(this_bundle->members[0])].last_seq;; + high_min = this_bundle->max_seq; // max_seq is impossible to reach + + for (i = 0; i < this_bundle->num_of_links; i++) + { + uint32_t s_seq = sess_local[(this_bundle->members[i])].last_seq; + if (s_seq < low_min) + low_min = s_seq; + if (s_seq >= this_fragmentation->M && s_seq < high_min) + high_min = s_seq; + } + + // if high_min was found, it's the "lowest" one + if (high_min < this_bundle->max_seq) + this_fragmentation->M = high_min; + else + this_fragmentation->M = low_min; + } + + LOG(4, s, t, "MPPP: Setting M to %d\n", this_fragmentation->M); + //calculate M's offset from the begin seq in the bundle + M_offset = (this_fragmentation->M + this_bundle->max_seq - this_fragmentation->start_seq) & (this_bundle->max_seq-1); + + //caculate M's index in the fragment array + M_index = (M_offset + this_fragmentation->start_index) & MAXFRAGNUM_MASK; + + //caculate received fragment's index in the fragment array + frag_index = (frag_offset + this_fragmentation->start_index) & MAXFRAGNUM_MASK; + + //frame with a single fragment + if (begin_frame && end_frame) + { + // process and reset fragmentation + LOG(4, s, t, "MPPP: Both bits are set (Begin and End).\n"); + this_fragmentation->fragment[frag_index].length = l; + this_fragmentation->fragment[frag_index].sid = s; + this_fragmentation->fragment[frag_index].flags = flags; + this_fragmentation->fragment[frag_index].seq = seq_num; + this_fragmentation->re_frame_begin_index = frag_index; + this_fragmentation->re_frame_end_index = frag_index; + processmpframe(s, t, p, l, 0); + this_fragmentation->fragment[frag_index].length = 0; + this_fragmentation->fragment[frag_index].flags = 0; + end_index = frag_index; + } + else { - // Check for previous non-assembled frames - int error = 0; - if (bundle[b].pending_frag) + // insert the frame in it's place + fragmentt *this_frag = &this_fragmentation->fragment[frag_index]; + this_frag->length = l; + this_frag->sid = s; + this_frag->flags = flags; + this_frag->seq = seq_num; + memcpy(this_frag->data, p, l); + + // try to assemble the frame that has the received fragment as a member + // get the beginning of this frame + begin_index = end_index = frag_index; + while (this_fragmentation->fragment[begin_index].length) { - uint32_t fn = bundle[b].seq_num_m - offset; - uint16_t cur_len; - bundle[b].pending_frag = 0; - // Check for array indexes - if (fn < 0 || fn > MAXFRAGNUM) - { - LOG(2, s, t, "ERROR: Index out of range fn:%d, bundle:%d\n",fn,b); - return; - } + if (this_fragmentation->fragment[begin_index].flags & MP_BEGIN) + break; + begin_index = (begin_index ? (begin_index -1) : (MAXFRAGNUM -1)); + } - if (seq_num-offset < 0 || seq_num-offset > MAXFRAGNUM) - { - LOG(2, s, t, "ERROR: Index out of range fn(last):%d, bundle:%d\n",fn,b); - return; - } - ///////////////////////////////////////////////////// - cur_len = 4; // This is set to 4 to leave 4 bytes for function processipin - for (fn = bundle[b].seq_num_m - offset; fn < seq_num - offset; fn++) - { - if (!frag[b].fragment[fn].length) - { - LOG(4, s, t, "MPPP: Found lost fragment while reassembling frame %d in (%d,%d)\n",fn, bundle[b].seq_num_m-offset, seq_num-offset); - error = 1; - break; - } + // return if a lost fragment is found + if (!(this_fragmentation->fragment[begin_index].length)) + return; // assembling frame failed + // get the end of his frame + while (this_fragmentation->fragment[end_index].length) + { + if (this_fragmentation->fragment[end_index].flags & MP_END) + break; + end_index = (end_index +1) & MAXFRAGNUM_MASK; + } - if (cur_len + frag[b].fragment[fn].length > MAXETHER) - { - LOG(2, s, t, "MPPP: ERROR: very long frame after assembling %d\n", frag[b].fragment[fn].length+cur_len); - error = 1; - break; - } + // return if a lost fragment is found + if (!(this_fragmentation->fragment[end_index].length)) + return; // assembling frame failed - memcpy(frag[b].reassembled_frame+cur_len, frag[b].fragment[fn].data, frag[b].fragment[fn].length); - cur_len += frag[b].fragment[fn].length; - frag[b].fragment[fn].length = 0; // Indicates that this fragment has been consumed - // This is usefull for compression - memset(frag[b].fragment[fn].data, 0, sizeof(frag[b].fragment[fn].data)); - } + // assemble the packet + //assemble frame, process it, reset fragmentation + uint16_t cur_len = 4; // This is set to 4 to leave 4 bytes for function processipin + uint32_t i; - if (!error) + LOG(4, s, t, "MPPP: processing fragments from %d to %d\n", begin_index, end_index); + // Push to the receive buffer + + for (i = begin_index;; i = (i + 1) & MAXFRAGNUM_MASK) + { + this_frag = &this_fragmentation->fragment[i]; + if(cur_len + this_frag->length > MAXETHER) + { + LOG(2, s, t, "MPPP: discarding reassembled frames larger than MAXETHER\n"); + break; + } + memcpy(this_fragmentation->reassembled_frame+cur_len, this_frag->data, this_frag->length); + LOG(5, s, t, "MPPP: processing frame at %d, with len %d\n", i, this_frag->length); + cur_len += this_frag->length; + if (i == end_index) { - frag[b].re_frame_len = cur_len; + this_fragmentation->re_frame_len = cur_len; + this_fragmentation->re_frame_begin_index = begin_index; + this_fragmentation->re_frame_end_index = end_index; // Process the resassembled frame - LOG(4, s, t, "MPPP: Process the reassembled frame, len=%d\n",cur_len); - processmpframe(s, t, frag[b].reassembled_frame, frag[b].re_frame_len, 1); - // Set reassembled frame length to zero after processing it - frag[b].re_frame_len = 0; - memset(frag[b].reassembled_frame, 0, sizeof(frag[b].reassembled_frame)); + LOG(5, s, t, "MPPP: Process the reassembled frame, len=%d\n",cur_len); + processmpframe(s, t, this_fragmentation->reassembled_frame, this_fragmentation->re_frame_len, 1); + break; } } - ////////////////////////////////////////// - bundle[b].seq_num_m = seq_num; - if (end_frame) + // Set reassembled frame length to zero after processing it + this_fragmentation->re_frame_len = 0; + for (i = begin_index;; i = (i + 1) & MAXFRAGNUM_MASK) { - // Both bits are set - LOG(4, s, t, "MPPP: Both bits are set (Begin and End).\n"); - processmpframe(s, t, p, l, 0); - // The maximum number of fragments is 1500 - if (seq_num - bundle[b].offset >= 1400) - { - bundle[b].offset = seq_num; - LOG(4, s, t, "MPPP: Setting offset to: %d\n",bundle[b].offset); - } + this_fragmentation->fragment[i].length = 0; // Indicates that this fragment has been consumed + this_fragmentation->fragment[i].flags = 0; + if (i == end_index) + break; } - else + } + +discard_lost_frames: + //discard fragments numbererd below M and part of an unassembled frame, + //but not the one from the frame beginning just before M + + // if we have something to discard + if (M_index != this_fragmentation->start_index) + { + uint8_t end_found = 0; + // look for end of previous frame + // start at M-1, going backward + for (end_index = (M_index + (MAXFRAGNUM-1)) & MAXFRAGNUM_MASK; + end_index != this_fragmentation->start_index; + end_index = (end_index + (MAXFRAGNUM-1)) & MAXFRAGNUM_MASK) { - bundle[b].pending_frag = 1; - // End bit is clear - LOG(4, s, t, "MPPP: Push to receive buffer\n"); - // Push to the receive buffer - // Array indexes checking - if (seq_num-offset < 0 || seq_num-offset >= MAXFRAGNUM) + fragmentt *this_frag = &this_fragmentation->frag[end_index]; + fragmentt *front_frag = &this_fragmentation->frag[(end_index+1)&MAXFRAGNUM_MASK]; + // before a MP_BEGIN, we must be a MP_END + if (front_frag->length && (front_frag->flags & MP_BEGIN)) { - LOG(2, s, t, "ERROR: Index out of range, push to receive buffer(1) seq:%d, offset:%d, bundle:%d\n",seq_num,offset,b); - return; + end_found = 1; + break; } - // Perform length checking - if (l > MAXFRAGLEN) + // we are a MP_END + if (this_frag->length && (this_frag->flags & MP_END)) { - LOG(2, s, t, "MPPP: ERROR: very long fragment length (1)\n"); - return; + end_found = 1; + break; } - frag[b].fragment[seq_num - offset].length = l; - memcpy(frag[b].fragment[seq_num - offset].data, p, l); } - } - else - { - LOG(4, s, t, "MPPP: Push to receive buffer\n"); - // Push to the receive buffer - // Array indexes checking - if (seq_num-offset < 0 || seq_num-offset >= MAXFRAGNUM) - { - LOG(2, s, t, "ERROR: Index out of range, push to receive buffer(2) seq:%d, offset:%d, bundle:%d\n",seq_num,offset,b); - return; - } - // Perform length checking - if (l > MAXFRAGLEN) + // ok, we may not count it for found if end_index == this_fragmentation->start_index + // but it complicates things too much and it will be discarded on next round anyway + + //clear length and flags of the discarded fragments + if (end_found) { - LOG(2, s, t, "MPPP: ERROR: very long fragment length (2).\n"); - return; + begin_index = this_fragmentation->start_index; + while (begin_index != end_index) + { + this_fragmentation->fragment[begin_index].flags = 0; + this_fragmentation->fragment[begin_index].length = 0; + begin_index = (begin_index + 1) & MAXFRAGNUM_MASK; + } + this_fragmentation->fragment[begin_index].flags = 0; + this_fragmentation->fragment[begin_index].length = 0; + + this_fragmentation->start_index = (end_index + 1) & MAXFRAGNUM_MASK; + this_fragmentation->start_seq = (this_fragmentation->fragment[end_index].seq + 1) & (this_bundle->max_seq-1); } - frag[b].fragment[seq_num - offset].length = l; - memcpy(frag[b].fragment[seq_num - offset].data, p, l); } + + LOG(4, s, t, "MPPP after assembling: M index is =%d, start index is = %d, start seq=%d\n",M_index, this_fragmentation->start_index, this_fragmentation->start_seq); + return; } // process IPv6 packet received @@ -1985,12 +2137,7 @@ void processipv6in(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port); } - increment_counter(&session[s].cin, &session[s].cin_wrap, l); - session[s].cin_delta += l; - session[s].pin++; - - sess_local[s].cin += l; - sess_local[s].pin++; + update_sessions_in_stat(s, l); eth_tx += l; @@ -2051,7 +2198,7 @@ void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) if (session[s].ppp.phase < Network) { - LOG(2, s, t, "CCP %s ignored in %s phase\n", ppp_code(*p), ppp_phase(session[s].ppp.phase)); + LOG(2, s, t, "CCP %s ignored in %s phase\n", ppp_code(*p), ppp_phase(session[s].ppp.phase)); return; } @@ -2067,13 +2214,13 @@ void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) switch (session[s].ppp.ccp) { case RequestSent: - initialise_restart_count(s, ccp); + initialise_restart_count(s, ccp); change_state(s, ccp, AckReceived); break; case AckReceived: case Opened: - LOG(2, s, t, "CCP: ConfigAck in state %s? Sending ConfigReq\n", ppp_state(session[s].ppp.ccp)); + LOG(2, s, t, "CCP: ConfigAck in state %s? Sending ConfigReq\n", ppp_state(session[s].ppp.ccp)); sendccp(s, t); change_state(s, ccp, RequestSent); break; @@ -2084,7 +2231,7 @@ void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; default: - LOG(2, s, t, "CCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ccp)); + LOG(2, s, t, "CCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ccp)); } } else if (*p == ConfigReq) @@ -2107,7 +2254,7 @@ void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; case Stopped: - initialise_restart_count(s, ccp); + initialise_restart_count(s, ccp); sendccp(s, t); if (*q == ConfigAck) change_state(s, ccp, AckSent); @@ -2129,7 +2276,7 @@ void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; case Opened: - initialise_restart_count(s, ccp); + initialise_restart_count(s, ccp); sendccp(s, t); /* fallthrough */ @@ -2142,7 +2289,7 @@ void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l) break; default: - LOG(2, s, t, "CCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ccp)); + LOG(2, s, t, "CCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ccp)); return; } @@ -2261,7 +2408,7 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid { // Set the multilink bits uint16_t bits_send = mp_bits; - *(uint16_t *) b = htons((bundle[bid].seq_num_t & 0xFF0F)|bits_send); + *(uint16_t *) b = htons((bundle[bid].seq_num_t & 0x0FFF)|bits_send); b += 2; } else @@ -2285,7 +2432,7 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid if ((b - start) + l > size) { - LOG(2, s, t, "makeppp would overflow buffer (size=%d, header+payload=%d)\n", size, (b - start) + l); + LOG(2, s, t, "makeppp would overflow buffer (size=%d, header+payload=%td)\n", size, (b - start) + l); return NULL; } @@ -2328,10 +2475,10 @@ void sendlcp(sessionidt s, tunnelidt t) uint8_t b[500], *q, *l; int authtype = sess_local[s].lcp_authtype; - if (!(q = makeppp(b, sizeof(b), NULL, 0, s, t, PPPLCP, 0, 0, 0))) + if (!(q = makeppp(b, sizeof(b), NULL, 0, s, t, PPPLCP, 0, 0, 0))) return; - LOG(3, s, t, "LCP: send ConfigReq%s%s%s including MP options\n", + LOG(3, s, t, "LCP: send ConfigReq%s%s%s including MP options\n", authtype ? " (" : "", authtype ? (authtype == AUTHCHAP ? "CHAP" : "PAP") : "", authtype ? ")" : ""); @@ -2358,14 +2505,14 @@ void sendlcp(sessionidt s, tunnelidt t) l += 4; } - if (sess_local[s].mp_mrru) - { + if (sess_local[s].mp_mrru) + { *l++ = 17; *l++ = 4; // Multilink Max-Receive-Reconstructed-Unit (length 4) *(uint16_t *) l = htons(sess_local[s].mp_mrru); l += 2; } - if (sess_local[s].mp_epdis) - { + if (sess_local[s].mp_epdis) + { *l++ = 19; *l++ = 7; // Multilink Endpoint Discriminator (length 7) *l++ = IPADDR; // Endpoint Discriminator class *(uint32_t *) l = htonl(sess_local[s].mp_epdis);