From 1373eac3f8305f6ad834ba8e3fc4f1a75cd8ac5a Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Mon, 4 Mar 2013 18:13:40 +0900 Subject: Stop setting accept_ra, now that netd does it. Bug: 8276725 Change-Id: Iedbd34bc94f678afe51429078e6c06ff144e6373 --- clatd.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/clatd.c b/clatd.c index b46c355..203714c 100644 --- a/clatd.c +++ b/clatd.c @@ -79,36 +79,6 @@ void set_forwarding(int fd, const char *setting) { } } -/* function: set_accept_ra - * accepts IPv6 RAs on all interfaces, even when forwarding is on - */ -void set_accept_ra() { - int fd, i; - const char *interface_names[] = {"wlan0","default",NULL}; - const char ipv6_sysctl[] = "/proc/sys/net/ipv6/conf/"; - const char accept_ra[] = "/accept_ra"; - - for(i = 0; interface_names[i]; i++) { - ssize_t sysctl_path_len = strlen(ipv6_sysctl)+strlen(interface_names[i])+strlen(accept_ra)+1; - char *sysctl_path = malloc(sysctl_path_len); - if(!sysctl_path) { - logmsg(ANDROID_LOG_FATAL,"set_accept_ra: malloc failed"); - exit(1); - } - snprintf(sysctl_path, sysctl_path_len, "%s%s%s", ipv6_sysctl, interface_names[i], accept_ra); - - fd = open(sysctl_path, O_RDWR); - free(sysctl_path); - if(fd < 0) { - continue; - } - if(write(fd, "2\n", 2) < 0) { - logmsg(ANDROID_LOG_WARN,"write to (%s)accept_ra failed: %s",interface_names[i],strerror(errno)); - } - close(fd); - } -} - /* function: stop_loop * signal handler: stop the event loop */ @@ -496,10 +466,6 @@ int main(int argc, char **argv) { exit(1); } - // forwarding slows down IPv6 config while transitioning to wifi - // forwarding also removes default routes learned from a RA - set_accept_ra(); - // run under a regular user drop_root(); -- cgit v1.2.3