commit e75695a1f2b8e3687428b7d2c71cc727492e8f48
author Linux Build Service Account <lnxbuild@localhost> Wed Jul 22 20:06:13 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jul 22 20:06:13 2015 -0700
tree 6d5788d14dbcb882ca03888df26ac29e295683d9
parent 6344d49d45e6c9b94dff702d1665b7c2a523e9e5
parent d5611c71c1d965ada3567dee743cf910331bccfe

Merge "IPACM: Fix the filter index while deleting the rule"

ipacm/src/IPACM_Lan.cpp

diff --git a/ipacm/src/IPACM_Lan.cpp b/ipacm/src/IPACM_Lan.cpp
index f3bb6f8..6e5f006 100644
--- a/ipacm/src/IPACM_Lan.cpp
+++ b/ipacm/src/IPACM_Lan.cpp
@@ -477,7 +477,13 @@
 						{
 							install_ipv6_icmp_flt_rule();
 						}
+
+#ifdef FEATURE_IPA_ANDROID
+						add_dummy_private_subnet_flt_rule(data->iptype);
+						handle_private_subnet_android(data->iptype);
+#else
 						handle_private_subnet(data->iptype);
+#endif
 
 						if (IPACM_Wan::isWanUP())
 						{
@@ -4361,9 +4367,9 @@
 					memset(lan_client, 0, sizeof(ipacm_event_lan_client));
 					lan_client->iptype = IPA_IP_v6;
 					lan_client->ipv6_addr[0] = get_client_memptr(eth_client, i)->v6_addr[j][0];
-					lan_client->ipv6_addr[0] = get_client_memptr(eth_client, i)->v6_addr[j][0];
-					lan_client->ipv6_addr[0] = get_client_memptr(eth_client, i)->v6_addr[j][0];
-					lan_client->ipv6_addr[0] = get_client_memptr(eth_client, i)->v6_addr[j][0];
+					lan_client->ipv6_addr[1] = get_client_memptr(eth_client, i)->v6_addr[j][1];
+					lan_client->ipv6_addr[2] = get_client_memptr(eth_client, i)->v6_addr[j][2];
+					lan_client->ipv6_addr[3] = get_client_memptr(eth_client, i)->v6_addr[j][3];
 					lan_client->p_iface = this;
 
 					memset(&evt_data, 0, sizeof(ipacm_cmd_q_data));