diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-05 04:03:24 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-05 04:03:24 +0000 |
commit | 3d7e939b891bed33b1e7876d602a91079b47b576 (patch) | |
tree | 40b5f91c10af27c34393dcb8c69dce1379af48db | |
parent | 22f8d1e6b7ac061d9c5affb0071b118eebd97350 (diff) | |
parent | f5fe2672d0a4bd307459980018982954f58a46cc (diff) | |
download | platform_external_android-clat-o-mr1-iot-preview-7.tar.gz platform_external_android-clat-o-mr1-iot-preview-7.tar.bz2 platform_external_android-clat-o-mr1-iot-preview-7.zip |
Merge "Revert "clatd.c: remove unsetenv("ANDROID_DNS_MODE")""android-wear-8.0.0_r1android-p-preview-1android-o-mr1-iot-preview-7o-mr1-iot-preview-7
-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); |