Attachment #66936 for bug #149014

View | Details | Raw Unified | Return to bug 149014
Collapse All | Expand All




	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);
}


			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 > MAX_INITIAL_RTR_ADVERT_INTERVAL ? 
					    MAX_INITIAL_RTR_ADVERT_INTERVAL : iface->MaxRtrAdvInterval);
			}
		}
	}

Lines 70-75 Link Here

(-)radvd-0.9.1/radvd.h (+1 lines)
70	int AdvDefaultPreference;	70	int AdvDefaultPreference;
71	int AdvSourceLLAddress;	71	int AdvSourceLLAddress;
72	int UnicastOnly;	72	int UnicastOnly;
		73	int InitialAdvLeft;
73		74
74	/* Mobile IPv6 extensions */	75	/* Mobile IPv6 extensions */
75	int AdvIntervalOpt;	76	int AdvIntervalOpt;

Return to bug 149014

Lines 302-307 Link Here

(-)radvd-0.9.1/radvd.c (-1 / +9 lines)
302	send_ra(sock, iface, NULL);	302	send_ra(sock, iface, NULL);
303		303
304	next = rand_between(iface->MinRtrAdvInterval, iface->MaxRtrAdvInterval);	304	next = rand_between(iface->MinRtrAdvInterval, iface->MaxRtrAdvInterval);
		305	if (iface->InitialAdvLeft > 1) {
		306	--iface->InitialAdvLeft;
		307	if (next > MAX_INITIAL_RTR_ADVERT_INTERVAL)
		308	next = MAX_INITIAL_RTR_ADVERT_INTERVAL;
		309	}
		310
305	set_timer(&iface->tm, next);	311	set_timer(&iface->tm, next);
306	}	312	}
307		313
Lines 339-347 Link Here
339	if (iface->AdvSendAdvert)	345	if (iface->AdvSendAdvert)
340	{	346	{
341	/* send an initial advertisement */	347	/* send an initial advertisement */
		348	iface->InitialAdvLeft = MAX_INITIAL_RTR_ADVERTISEMENTS - 1;
342	send_ra(sock, iface, NULL);	349	send_ra(sock, iface, NULL);
343		350
344	set_timer(&iface->tm, iface->MaxRtrAdvInterval);	351	set_timer(&iface->tm, iface->MaxRtrAdvInterval > MAX_INITIAL_RTR_ADVERT_INTERVAL ?
		352	MAX_INITIAL_RTR_ADVERT_INTERVAL : iface->MaxRtrAdvInterval);
345	}	353	}
346	}	354	}
347	}	355	}