commit 9300aad1fcd86b96997562bcd1555550357ffad8
author Linux Build Service Account <lnxbuild@localhost> Wed May 13 10:07:29 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Wed May 13 10:07:29 2020 -0700
tree ce3c46ad6002c63c3f782c5dd6804cfaad2eed3d
parent 14eb665983d744be20bd9941584c5bb5ac6784c0
parent 00a8ef4f4a227818c0dd8c57d2b694bfdfab74a4

Merge 00a8ef4f4a227818c0dd8c57d2b694bfdfab74a4 on remote branch

Change-Id: I235f85ef4fa6d56fc7334f308a22d4794a374eb0

ipacm/Android.bp

diff --git a/ipacm/Android.bp b/ipacm/Android.bp
index b0d705b..0ce21f7 100644
--- a/ipacm/Android.bp
+++ b/ipacm/Android.bp
@@ -7,6 +7,7 @@
 
     cflags: ["-v"] + ["-DFEATURE_IPA_ANDROID"] + ["-DFEATURE_IPACM_RESTART"] + [
         "-DFEATURE_IPACM_HAL",
+	"-DDEBUG",
         "-Wall",
         "-Werror",
         "-Wno-error=macro-redefined",

ipacm/src/IPACM_Wan.cpp

diff --git a/ipacm/src/IPACM_Wan.cpp b/ipacm/src/IPACM_Wan.cpp
index 847e08d..a475894 100644
--- a/ipacm/src/IPACM_Wan.cpp
+++ b/ipacm/src/IPACM_Wan.cpp
@@ -7342,10 +7342,10 @@
 			rt_rule_entry = &rt_rule->rules[0];
 			rt_rule_entry->at_rear = false;
 			rt_rule_entry->rule.attrib.attrib_mask = IPA_FLT_DST_ADDR;
-			rt_rule_entry->rule.attrib.u.v6.dst_addr[0] = ipv6_addr[num_dft_rt_v6][0];
-			rt_rule_entry->rule.attrib.u.v6.dst_addr[1] = ipv6_addr[num_dft_rt_v6][1];
-			rt_rule_entry->rule.attrib.u.v6.dst_addr[2] = ipv6_addr[num_dft_rt_v6][2];
-			rt_rule_entry->rule.attrib.u.v6.dst_addr[3] = ipv6_addr[num_dft_rt_v6][3];
+			rt_rule_entry->rule.attrib.u.v6.dst_addr[0] = ipv6_addr[i][0];
+			rt_rule_entry->rule.attrib.u.v6.dst_addr[1] = ipv6_addr[i][1];
+			rt_rule_entry->rule.attrib.u.v6.dst_addr[2] = ipv6_addr[i][2];
+			rt_rule_entry->rule.attrib.u.v6.dst_addr[3] = ipv6_addr[i][3];
 			rt_rule_entry->rule.attrib.u.v6.dst_addr_mask[0] = 0xFFFFFFFF;
 			rt_rule_entry->rule.attrib.u.v6.dst_addr_mask[1] = 0xFFFFFFFF;
 			rt_rule_entry->rule.attrib.u.v6.dst_addr_mask[2] = 0xFFFFFFFF;