Attachment 66936 Details for Bug 149014

[patch] Fixes the intervals of initial RAs according to RFC 2461, section 6.2.4

radvd-initial_interval.patch (text/plain), 1.27 KB, created by Jiri Bohac on 2006-02-08 10:14:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Bohac

Created: 2006-02-08 10:14:06 UTC

Size: 1.27 KB

patch

obsolete

>diff -Naur radvd-0.9.1/radvd.c radvd-0.9.1-patched/radvd.c
>--- radvd-0.9.1/radvd.c	2005-12-30 16:13:11.000000000 +0100
>+++ radvd-0.9.1-patched/radvd.c	2006-02-07 18:44:09.000000000 +0100
>@@ -302,6 +302,12 @@
> 	send_ra(sock, iface, NULL);
> 
> 	next = rand_between(iface->MinRtrAdvInterval, iface->MaxRtrAdvInterval); 
>+	if (iface->InitialAdvLeft > 1) {
>+		--iface->InitialAdvLeft;
>+		if (next > MAX_INITIAL_RTR_ADVERT_INTERVAL)
>+			next = MAX_INITIAL_RTR_ADVERT_INTERVAL;
>+	} 
>+
> 	set_timer(&iface->tm, next);
> }
> 
>@@ -339,9 +345,11 @@
> 			if (iface->AdvSendAdvert)
> 			{
> 				/* send an initial advertisement */
>+				iface->InitialAdvLeft = MAX_INITIAL_RTR_ADVERTISEMENTS - 1;
> 				send_ra(sock, iface, NULL);
> 
>-				set_timer(&iface->tm, iface->MaxRtrAdvInterval);
>+				set_timer(&iface->tm, iface->MaxRtrAdvInterval > MAX_INITIAL_RTR_ADVERT_INTERVAL ? 
>+					    MAX_INITIAL_RTR_ADVERT_INTERVAL : iface->MaxRtrAdvInterval);
> 			}
> 		}
> 	}
>diff -Naur radvd-0.9.1/radvd.h radvd-0.9.1-patched/radvd.h
>--- radvd-0.9.1/radvd.h	2005-12-30 17:12:23.000000000 +0100
>+++ radvd-0.9.1-patched/radvd.h	2006-02-07 18:44:09.000000000 +0100
>@@ -70,6 +70,7 @@
> 	int			AdvDefaultPreference;
> 	int			AdvSourceLLAddress;
> 	int			UnicastOnly;
>+	int			InitialAdvLeft;
> 
> 	/* Mobile IPv6 extensions */
> 	int			AdvIntervalOpt;

Actions: View | Diff

Attachments on bug 149014: 66936