diff options
| author | Erik Kline <ek@google.com> | 2018-03-29 23:38:49 -0700 |
|---|---|---|
| committer | Erik Kline <ek@google.com> | 2018-03-30 02:32:15 -0700 |
| commit | cdc003dc8a8ffb418f33518ac545016e6991534a (patch) | |
| tree | afa8c34247f3af38f77be45a172c8e80adde1418 | |
| parent | eb5c05baea931ebe37f3fc161e231b7fc56f2aaa (diff) | |
| download | platform_external_android-clat-cdc003dc8a8ffb418f33518ac545016e6991534a.tar.gz platform_external_android-clat-cdc003dc8a8ffb418f33518ac545016e6991534a.tar.bz2 platform_external_android-clat-cdc003dc8a8ffb418f33518ac545016e6991534a.zip | |
When manipulating flags, |= rather than +=
Test: as follows
- builds
- flashes
- boots
- runtest -x external/android-clat/clatd_test.cpp passes
Bug: 64133961
Bug: 72345192
Merged-In: I10367d3b83acce55e3492812fd04cbdf5f0e6e1a
Merged-In: I5c13652a2c79c07318cc20311c9666535df91d7d
Change-Id: Ieb46fa6a158ec7470e261cc6e9345a3266c81a04
(cherry picked from commit f1c79f8dac61141a518b87361cfef0619e3ef49e)
| -rw-r--r-- | dns64.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -49,7 +49,7 @@ int plat_prefix(const char *ipv4_name, unsigned net_id, struct in6_addr *prefix) // Be sure to query local DNS64 servers, bypassing Private DNS (if enabled). if (net_id != NETID_UNSET) { - net_id += NETID_USE_LOCAL_NAMESERVERS; + net_id |= NETID_USE_LOCAL_NAMESERVERS; } status = android_getaddrinfofornet(ipv4_name, NULL, &hints, net_id, MARK_UNSET, &result); |