diff options
author | Jayachandran Chinnakkannu <jayachandranc@google.com> | 2018-01-05 04:13:43 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-01-05 04:13:43 +0000 |
commit | 8deab37e9714de148086643f01b243724da4ccd6 (patch) | |
tree | 40b5f91c10af27c34393dcb8c69dce1379af48db | |
parent | 62c20bd7774c4dbd8b04bd09fa8dc5608d80d434 (diff) | |
parent | 8c846c961e513ed7b1fddec1f7a9a63a029ae968 (diff) | |
download | platform_external_android-clat-8deab37e9714de148086643f01b243724da4ccd6.tar.gz platform_external_android-clat-8deab37e9714de148086643f01b243724da4ccd6.tar.bz2 platform_external_android-clat-8deab37e9714de148086643f01b243724da4ccd6.zip |
Merge "Revert "clatd.c: remove unsetenv("ANDROID_DNS_MODE")"" am: 3d7e939b89 am: e8e758f5f9
am: 8c846c961e
Change-Id: Ib08722fac4a26f25ddba4e10b314e69f9f57a2cb
-rw-r--r-- | clatd.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -503,6 +503,11 @@ int main(int argc, char **argv) { exit(1); } + // When run from netd, the environment variable ANDROID_DNS_MODE is set to + // "local", but that only works for the netd process itself. Removing the + // following line causes XLAT failure in permissive mode. + unsetenv("ANDROID_DNS_MODE"); + configure_interface(uplink_interface, plat_prefix, &tunnel, net_id); update_clat_ipv6_address(&tunnel, uplink_interface); |