summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Kline <ek@google.com>2018-03-30 09:26:59 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-30 09:26:59 +0000
commit12dc3b7deb325338427f0f359a164331f81d42ad (patch)
treeafa8c34247f3af38f77be45a172c8e80adde1418
parent7db8c52b87d047fb809a8689bf325d2579e9fa11 (diff)
parent6d45688c4e7aabb368705ba813b077cefd2b6d00 (diff)
downloadplatform_external_android-clat-12dc3b7deb325338427f0f359a164331f81d42ad.tar.gz
platform_external_android-clat-12dc3b7deb325338427f0f359a164331f81d42ad.tar.bz2
platform_external_android-clat-12dc3b7deb325338427f0f359a164331f81d42ad.zip
When manipulating flags, |= rather than += am: f1c79f8dac am: c41e1fa305
am: 6d45688c4e Change-Id: I5c13652a2c79c07318cc20311c9666535df91d7d
-rw-r--r--dns64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dns64.c b/dns64.c
index a9ca61d..ed28eb0 100644
--- a/dns64.c
+++ b/dns64.c
@@ -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);