ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-18 18:56:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed more bugs in duplicate broadcast quenching.

Browse Source 
looks like it might be working right now.
This commit is contained in:
gardners 2012-04-14 11:16:59 +09:30
parent 3e2213db61
commit 4a1e4eca55
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
overlay.c
View File

@ -271,6 +271,8 @@ int overlay_frame_process(int interface,overlay_frame *f)
if (nhbroadcast) {
if (overlay_broadcast_drop_check(f->nexthop)) duplicateBroadcast=1;
printf("DUPCHECK nexthop is %s\n",overlay_render_sid(f->nexthop));
forMe=1; }
if (overlay_address_is_local(f->nexthop)) forMe=1;
@ -355,14 +357,30 @@ int overlay_frame_process(int interface,overlay_frame *f)
}
f->ttl--;
printf("considering forwarding frame to %s (forme=%d, broadcast=%d)\n",
overlay_render_sid(f->destination),ultimatelyForMe,broadcast);
printf("considering forwarding frame to %s (forme=%d, broadcast=%d, dup=%d)\n",
overlay_render_sid(f->destination),ultimatelyForMe,broadcast,
duplicateBroadcast);
if (overlay_address_is_broadcast(f->destination))
if (overlay_broadcast_drop_check(f->destination))
{
dontForward=1;
return WHY("Not forwarding or reading duplicate broadcast");
}
{
/* if nexthop and destination address are the same, and nexthop was shown
not to be a duplicate, then we don't need to test the destination
address for being a duplicate broadcast. */
int sameAsNextHop=1,i;
for(i=0;i<SID_SIZE;i++)
if (f->nexthop[i]!=f->destination[i])
{ sameAsNextHop=0; break; }
if ((!sameAsNextHop)&&overlay_broadcast_drop_check(f->destination))
duplicateBroadcast=1;
if (duplicateBroadcast)
{
printf("reject src is %s\n",overlay_render_sid(f->source));
printf("reject nexthop is %s\n",overlay_render_sid(f->nexthop));
printf("reject destination is %s\n",
overlay_render_sid(f->destination));
return WHY("Not forwarding or reading duplicate broadcast");
}
}
if (!dontForward) {
/* Queue frame for dispatch.