welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the strange bundles' members looping use.

Browse source 
Avoids gcc warnings.

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
This commit is contained in:
Benjamin Cama 2011-09-24 17:14:57 +02:00
parent 6a529fb49e
commit 036223c418
1 changed files with 70 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

136
l2tpns.c
View file

@ -1462,75 +1462,76 @@ static void processipout(uint8_t *buf, int len)
return; return;
} }
// Add on L2TP header if(session[s].bundle != 0 && bundle[session[s].bundle].num_of_links > 1)
{ {
bundleidt bid = 0; // Add on L2TP header
if(session[s].bundle != 0 && bundle[session[s].bundle].num_of_links > 1) bundleidt bid = session[s].bundle;
{ bundlet *b = &bundle[bid];
bid = session[s].bundle;
s = bundle[bid].members[bundle[bid].current_ses = ++bundle[bid].current_ses % bundle[bid].num_of_links];
t = session[s].tunnel;
sp = &session[s];
LOG(4, s, t, "MPPP: (1)Session number becomes: %d\n", s);
if(len > MINFRAGLEN)
{
// Partition the packet to "bundle[b].num_of_links" fragments
bundlet *b = &bundle[bid];
uint32_t num_of_links = b->num_of_links;
uint32_t fraglen = len / num_of_links;
fraglen = (fraglen > session[s].mru ? session[s].mru : fraglen);
uint32_t last_fraglen = fraglen + len % num_of_links;
last_fraglen = (last_fraglen > session[s].mru ? len % num_of_links : last_fraglen);
uint32_t remain = len;
// send the first packet b->current_ses = (b->current_ses + 1) % b->num_of_links;
uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, fraglen, s, t, PPPIP, 0, bid, MP_BEGIN); s = b->members[b->current_ses];
if (!p) return; t = session[s].tunnel;
tunnelsend(fragbuf, fraglen + (p-fragbuf), t); // send it... sp = &session[s];
// statistics LOG(4, s, t, "MPPP: (1)Session number becomes: %d\n", s);
update_session_out_stat(s, sp, fraglen); if(len > MINFRAGLEN)
remain -= fraglen; {
while (remain > last_fraglen) // Partition the packet to "bundle[b].num_of_links" fragments
{ uint32_t num_of_links = b->num_of_links;
s = b->members[b->current_ses = ++b->current_ses % num_of_links]; uint32_t fraglen = len / num_of_links;
t = session[s].tunnel; fraglen = (fraglen > session[s].mru ? session[s].mru : fraglen);
sp = &session[s]; uint32_t last_fraglen = fraglen + len % num_of_links;
LOG(4, s, t, "MPPP: (2)Session number becomes: %d\n", s); last_fraglen = (last_fraglen > session[s].mru ? len % num_of_links : last_fraglen);
p = makeppp(fragbuf, sizeof(fragbuf), buf+(len - remain), fraglen, s, t, PPPIP, 0, bid, 0); uint32_t remain = len;
if (!p) return;
tunnelsend(fragbuf, fraglen + (p-fragbuf), t); // send it... // send the first packet
update_session_out_stat(s, sp, fraglen); uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, fraglen, s, t, PPPIP, 0, bid, MP_BEGIN);
remain -= fraglen; if (!p) return;
} tunnelsend(fragbuf, fraglen + (p-fragbuf), t); // send it...
// send the last fragment // statistics
s = b->members[b->current_ses = ++b->current_ses % num_of_links]; update_session_out_stat(s, sp, fraglen);
remain -= fraglen;
while (remain > last_fraglen)
{
b->current_ses = (b->current_ses + 1) % num_of_links;
s = b->members[b->current_ses];
t = session[s].tunnel; t = session[s].tunnel;
sp = &session[s]; sp = &session[s];
LOG(4, s, t, "MPPP: (2)Session number becomes: %d\n", s); LOG(4, s, t, "MPPP: (2)Session number becomes: %d\n", s);
p = makeppp(fragbuf, sizeof(fragbuf), buf+(len - remain), remain, s, t, PPPIP, 0, bid, MP_END); p = makeppp(fragbuf, sizeof(fragbuf), buf+(len - remain), fraglen, s, t, PPPIP, 0, bid, 0);
if (!p) return; if (!p) return;
tunnelsend(fragbuf, remain + (p-fragbuf), t); // send it... tunnelsend(fragbuf, fraglen + (p-fragbuf), t); // send it...
update_session_out_stat(s, sp, remain); update_session_out_stat(s, sp, fraglen);
if (remain != last_fraglen) remain -= fraglen;
LOG(3, s, t, "PROCESSIPOUT ERROR REMAIN != LAST_FRAGLEN, %d != %d\n", remain, last_fraglen); }
} // send the last fragment
else { b->current_ses = (b->current_ses + 1) % num_of_links;
// Send it as one frame s = b->members[b->current_ses];
uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, bid, MP_BOTH_BITS); t = session[s].tunnel;
if (!p) return; sp = &session[s];
tunnelsend(fragbuf, len + (p-fragbuf), t); // send it... LOG(4, s, t, "MPPP: (2)Session number becomes: %d\n", s);
LOG(4, s, t, "MPPP: packet sent as one frame\n"); p = makeppp(fragbuf, sizeof(fragbuf), buf+(len - remain), remain, s, t, PPPIP, 0, bid, MP_END);
update_session_out_stat(s, sp, len); if (!p) return;
} tunnelsend(fragbuf, remain + (p-fragbuf), t); // send it...
} update_session_out_stat(s, sp, remain);
else if (remain != last_fraglen)
{ LOG(3, s, t, "PROCESSIPOUT ERROR REMAIN != LAST_FRAGLEN, %d != %d\n", remain, last_fraglen);
uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, 0, 0); }
if (!p) return; else {
tunnelsend(fragbuf, len + (p-fragbuf), t); // send it... // Send it as one frame
uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, bid, MP_BOTH_BITS);
if (!p) return;
tunnelsend(fragbuf, len + (p-fragbuf), t); // send it...
LOG(4, s, t, "MPPP: packet sent as one frame\n");
update_session_out_stat(s, sp, len); update_session_out_stat(s, sp, len);
} }
} }
else
{
uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, 0, 0);
if (!p) return;
tunnelsend(fragbuf, len + (p-fragbuf), t); // send it...
update_session_out_stat(s, sp, len);
}
// Snooping this session, send it to intercept box // Snooping this session, send it to intercept box
if (sp->snoop_ip && sp->snoop_port) if (sp->snoop_ip && sp->snoop_port)
@ -1610,7 +1611,10 @@ static void processipv6out(uint8_t * buf, int len)
if (session[s].bundle && bundle[session[s].bundle].num_of_links > 1) if (session[s].bundle && bundle[session[s].bundle].num_of_links > 1)
{ {
bundleidt bid = session[s].bundle; bundleidt bid = session[s].bundle;
s = bundle[bid].members[bundle[bid].current_ses = ++bundle[bid].current_ses % bundle[bid].num_of_links]; bundlet *b = &bundle[bid];
b->current_ses = (b->current_ses + 1) % b->num_of_links;
s = b->members[b->current_ses];
LOG(3, s, session[s].tunnel, "MPPP: Session number becomes: %u\n", s); LOG(3, s, session[s].tunnel, "MPPP: Session number becomes: %u\n", s);
} }
t = session[s].tunnel; t = session[s].tunnel;