summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Kline <ek@google.com>2018-03-30 08:51:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-30 08:51:21 +0000
commitc41e1fa3054df40aadc1da2849dd2e51c87326f5 (patch)
treeafa8c34247f3af38f77be45a172c8e80adde1418
parent705b616b808c590b9799b97f228ee8c1b5312b62 (diff)
parentf1c79f8dac61141a518b87361cfef0619e3ef49e (diff)
downloadplatform_external_android-clat-c41e1fa3054df40aadc1da2849dd2e51c87326f5.tar.gz
platform_external_android-clat-c41e1fa3054df40aadc1da2849dd2e51c87326f5.tar.bz2
platform_external_android-clat-c41e1fa3054df40aadc1da2849dd2e51c87326f5.zip
When manipulating flags, |= rather than +=
am: f1c79f8dac Change-Id: I0fe4f5d00a48f63fb38a9600fac1acd3b5f79ce1
-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);