diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2014-07-15 13:34:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-15 13:34:17 +0000 |
| commit | c8fc2affe7308e0a48ca3df7d7f38c5172dacdc7 (patch) | |
| tree | b8ae9770a4298455972d8e26a66966687324a351 | |
| parent | 615c0385e7ef3aae9ea8b9ba4d00e3fb3c94512f (diff) | |
| parent | bea91cfdd43d843cdda5ce473d84b7cfcdd566ec (diff) | |
| download | android_external_dhcpcd-c8fc2affe7308e0a48ca3df7d7f38c5172dacdc7.tar.gz android_external_dhcpcd-c8fc2affe7308e0a48ca3df7d7f38c5172dacdc7.tar.bz2 android_external_dhcpcd-c8fc2affe7308e0a48ca3df7d7f38c5172dacdc7.zip | |
am bea91cfd: Merge "Really disable IPv6 RA processing in dhcpcd."
* commit 'bea91cfdd43d843cdda5ce473d84b7cfcdd566ec':
Really disable IPv6 RA processing in dhcpcd.
| -rw-r--r-- | if-options.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/if-options.c b/if-options.c index 3f52bfe..4fbdf13 100644 --- a/if-options.c +++ b/if-options.c @@ -796,7 +796,13 @@ read_config(const char *file, ifo = xzalloc(sizeof(*ifo)); ifo->options |= DHCPCD_GATEWAY | DHCPCD_DAEMONISE | DHCPCD_LINK; ifo->options |= DHCPCD_ARP | DHCPCD_IPV4LL; +#ifndef ANDROID + /* On Android, don't enable IPv6 RS processing. This is because we + * already process RAs in the kernel and netd and because we've seen + * dhcpcd crashes when parsing certain RA options. + * See http://b/15268738 and http://b/15779617 . */ ifo->options |= DHCPCD_IPV6RS | DHCPCD_IPV6RA_REQRDNSS; +#endif ifo->timeout = DEFAULT_TIMEOUT; ifo->reboot = DEFAULT_REBOOT; ifo->metric = -1; |