diff options
author | Jayachandran Chinnakkannu <jayachandranc@google.com> | 2018-01-04 18:08:53 +0000 |
---|---|---|
committer | Jayachandran Chinnakkannu <jayachandranc@google.com> | 2018-01-05 02:35:41 +0000 |
commit | f5fe2672d0a4bd307459980018982954f58a46cc (patch) | |
tree | d722aceb7f630784862fb793500c79ea48d724da /clatd.c | |
parent | cc94e5f25303bc0ffdc2e327b56564f59f48804f (diff) | |
download | platform_external_android-clat-f5fe2672d0a4bd307459980018982954f58a46cc.tar.gz platform_external_android-clat-f5fe2672d0a4bd307459980018982954f58a46cc.tar.bz2 platform_external_android-clat-f5fe2672d0a4bd307459980018982954f58a46cc.zip |
Revert "clatd.c: remove unsetenv("ANDROID_DNS_MODE")"
This reverts commit cc94e5f25303bc0ffdc2e327b56564f59f48804f.
Reason for revert: XLAT doesn't work in permissive mode
Bug: 69863844
Change-Id: I62e390b960465048fbbd68e60d0a2c9c7d2c82d3
Diffstat (limited to 'clatd.c')
-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); |