changeset 1692:db3d4639eec4 draft

Report RA information when testing.
author Roy Marples <roy@marples.name>
date Thu, 28 Jun 2012 09:11:24 +0000
parents 2357dc1fca60
children 829716214dbc
files configure.c dhcpcd-hooks/01-test
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure.c	Tue May 01 21:17:44 2012 +0000
+++ b/configure.c	Thu Jun 28 09:11:24 2012 +0000
@@ -172,7 +172,12 @@
 	int dhcp, ra;
 
 	dhcp = ra = 0;
-	if (strcmp(reason, "ROUTERADVERT") == 0)
+	if (strcmp(reason, "TEST") == 0) {
+		if (iface->ras)
+			ra = 1;
+		else
+			dhcp = 1;
+	} else if (strcmp(reason, "ROUTERADVERT") == 0)
 		ra = 1;
 	else
 		dhcp = 1;
--- a/dhcpcd-hooks/01-test	Tue May 01 21:17:44 2012 +0000
+++ b/dhcpcd-hooks/01-test	Thu Jun 28 09:11:24 2012 +0000
@@ -2,5 +2,5 @@
 
 if [ "$reason" = "TEST" ]; then
 	set | grep "^\(interface\|metric\|pid\|reason\|skip_hooks\)=" | sort
-	set | grep "^\(new_\|old_\)" | sort
+	set | grep "^\(new_\|old_\|ra_count=\|ra[0-9]*_\)" | sort
 fi