OSDN Git Service
Elliott Hughes [Sat, 5 Dec 2015 00:55:50 +0000 (00:55 +0000)]
Merge "Track rename from base/ to android-base/." am:
c4f60ec960
am:
569ec05819
* commit '
569ec05819d63f57e680a01f54119ea2df462192':
Track rename from base/ to android-base/.
Elliott Hughes [Fri, 4 Dec 2015 23:57:31 +0000 (23:57 +0000)]
Merge "Track rename from base/ to android-base/."
am:
c4f60ec960
* commit '
c4f60ec960885154863824dc2f9eb1e4b84f4b9d':
Track rename from base/ to android-base/.
Elliott Hughes [Fri, 4 Dec 2015 23:45:39 +0000 (23:45 +0000)]
Merge "Track rename from base/ to android-base/."
Elliott Hughes [Fri, 4 Dec 2015 23:45:10 +0000 (15:45 -0800)]
Track rename from base/ to android-base/.
Change-Id: Ice6d43c0f9b16b8fb441158a0f7344dfbf969dea
Lorenzo Colitti [Wed, 25 Nov 2015 13:13:57 +0000 (22:13 +0900)]
Support scoped addresses as tethered DNS servers.
Bug:
9580643
Change-Id: Id086ff9194097fc1e0ab8e2e58e6ff843303f051
Sreeram Ramachandran [Fri, 20 Nov 2015 04:28:36 +0000 (04:28 +0000)]
Don\'t use framework permission strings for netd permissions. am:
5c8c42e90f am:
3b61825abc am:
a8c4601961 am:
296f2ef5c1
am:
b338d7c705
* commit '
b338d7c705e81fefd8a2b8d2613ce05986c2809e':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Fri, 20 Nov 2015 04:21:09 +0000 (04:21 +0000)]
Don\'t use framework permission strings for netd permissions. am:
5c8c42e90f am:
3b61825abc am:
a8c4601961
am:
296f2ef5c1
* commit '
296f2ef5c1fc8b7d865cbad7c071d5d9dc7a4698':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:19:47 +0000 (16:19 +0000)]
Don\'t use framework permission strings for netd permissions. am:
5c8c42e90f am:
3b61825abc
am:
a8c4601961
* commit '
a8c4601961ee82d9e5a1646cda5e6dec491b98f6':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:14:41 +0000 (16:14 +0000)]
Don\'t use framework permission strings for netd permissions. am:
5c8c42e90f
am:
3b61825abc
* commit '
3b61825abc108135f992f7fe1ffbe8d99f5fd85d':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:04:24 +0000 (16:04 +0000)]
Don\'t use framework permission strings for netd permissions.
am:
5c8c42e90f
* commit '
5c8c42e90f7c5ad609c477f54dc9a62ddea7875a':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Tue, 4 Nov 2014 18:18:25 +0000 (10:18 -0800)]
Don't use framework permission strings for netd permissions.
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.
This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port
a120442.
Bug:
21900139
Bug:
18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit
584dbee59ceb7750e22c48371342635aa6a98517)
Erik Kline [Fri, 13 Nov 2015 07:26:27 +0000 (16:26 +0900)]
Pass both IPv4 and IPv6 nameservers to dnsmasq
Additionally, store and return a list of strings for
DNS forwarders, since that's what is most useful. These
strings are guaranteed to be valid IP string literals by
virtue of validation on input.
Bug:
9580643
Change-Id: I4fbaf19835055b12e38d585c0bfba0d2b18b9717
Erik Kline [Thu, 12 Nov 2015 08:49:23 +0000 (17:49 +0900)]
Change dnsmasq input command argument separator
Heretofore netd issued commands to dnsmasq over a stdin channel
using ":" as an argument separator. This make it very complicated
to issue commands that involve IPv6 addresses.
This changes the separator from ":" to "|".
Additionally:
- Pass DHCP range string literals through to startTethering(),
still performing string literal to IPv4 address validation.
Bug:
9580643
Change-Id: I210daf311a4c3d84dae3ed054b92c9fa399a791f
Kenny Root [Thu, 5 Nov 2015 19:56:13 +0000 (19:56 +0000)]
Merge "system/netd: check return value of PKCS5_PBKDF2_HMAC_SHA1."
am:
b407c9b318
* commit '
b407c9b318b07c0f659444d0295380e7fd48ed77':
system/netd: check return value of PKCS5_PBKDF2_HMAC_SHA1.
Kenny Root [Thu, 5 Nov 2015 19:29:20 +0000 (19:29 +0000)]
Merge "system/netd: check return value of PKCS5_PBKDF2_HMAC_SHA1."
Adam Langley [Wed, 4 Nov 2015 22:35:25 +0000 (14:35 -0800)]
system/netd: check return value of PKCS5_PBKDF2_HMAC_SHA1.
The function PKCS5_PBKDF2_HMAC_SHA1 can fail for a number of reasons and
thus its return value should be checked and handled.
Change-Id: I63bd1378e78926372309072c3fa821666cac1b01
Gaurav Shah [Mon, 2 Nov 2015 06:02:30 +0000 (06:02 +0000)]
Merge "netd: Add NOTICE and MODULE_LICENSE_* files" am:
04c820c5f1
am:
8a55a1b087
* commit '
8a55a1b087de5882808495e1a85e5ca52ef470a1':
netd: Add NOTICE and MODULE_LICENSE_* files
Gaurav Shah [Mon, 2 Nov 2015 02:35:03 +0000 (02:35 +0000)]
Merge "netd: Add NOTICE and MODULE_LICENSE_* files"
am:
04c820c5f1
* commit '
04c820c5f1591e1afd287519efd1a4df162d2551':
netd: Add NOTICE and MODULE_LICENSE_* files
Gaurav Shah [Mon, 2 Nov 2015 02:33:15 +0000 (02:33 +0000)]
Merge "netd: Add NOTICE and MODULE_LICENSE_* files"
Gaurav Shah [Fri, 2 Oct 2015 22:47:47 +0000 (15:47 -0700)]
netd: Add NOTICE and MODULE_LICENSE_* files
BUG:
24605215
Change-Id: Ice2df1dcaca7af089e6228c4bbf5b5b285b51622
Erik Kline [Fri, 2 Oct 2015 08:52:37 +0000 (17:52 +0900)]
Always add costly interfaces to the bw_FORWARD chain
This adds a jump to bw_costly_<ifname> for traffic forwarded out
interface <ifname> to the bw_FORWARD chain, regardless of tethering
state (as having it safely in place is harmless).
Bug:
24497044
Change-Id: I165724c319051ddf29a2833912eb286368b0570d
Lorenzo Colitti [Thu, 3 Sep 2015 17:35:36 +0000 (17:35 +0000)]
am
4485c500: am
c8683d7e: Don\'t break IPv6 connectivity when in doze mode.
* commit '
4485c500f838726ded5a910364469eace225db28':
Don't break IPv6 connectivity when in doze mode.
Lorenzo Colitti [Thu, 3 Sep 2015 06:21:38 +0000 (06:21 +0000)]
am
c8683d7e: Don\'t break IPv6 connectivity when in doze mode.
* commit '
c8683d7eb9bb95de2090431e8daaa45d92b45e38':
Don't break IPv6 connectivity when in doze mode.
Lorenzo Colitti [Tue, 1 Sep 2015 07:53:35 +0000 (16:53 +0900)]
Don't break IPv6 connectivity when in doze mode.
Working IPv6 connectivity relies on the kernel being able to
receive certain ICMPv6 packets (router advertisements, neighbour
solicitations, neighbour advertisements) at all times. Allow
these packets when in doze mode.
This is not necessary for IPv4 because in IPv4 these functions
use ARP, which is invisible to iptables.
Bug:
23158230
Change-Id: I29ed77561db9688486cf58cd14ac3bce7fce4b40
Tom Cherry [Thu, 27 Aug 2015 20:21:55 +0000 (20:21 +0000)]
am
88d94fd9: am
f228899a: (-s ours) am
8246d45e: Merge "bundle init.rc contents with its service"
* commit '
88d94fd9f69942b0a0789af26d32d4046c715855':
Yusuke Sato [Thu, 27 Aug 2015 20:21:54 +0000 (20:21 +0000)]
am
916188db: am
56cc45f1: (-s ours) am
f2fed764: Make iptables -L and -S calls wait for xtables lock
* commit '
916188db012f458aeab7c6857db2dc1618a98a26':
Yusuke Sato [Thu, 27 Aug 2015 20:21:54 +0000 (20:21 +0000)]
am
d9c0c36a: am
c132be49: (-s ours) am
93e6f6a7: Merge "Make iptables -L and -S calls wait for xtables lock"
* commit '
d9c0c36ad3141d23a8621ce0325bf727c035b5cf':
Tom Cherry [Thu, 27 Aug 2015 11:28:08 +0000 (11:28 +0000)]
am
f228899a: (-s ours) am
8246d45e: Merge "bundle init.rc contents with its service"
* commit '
f228899aef79c5bad319aa88e1861da225b18fc0':
Yusuke Sato [Thu, 27 Aug 2015 11:28:07 +0000 (11:28 +0000)]
am
56cc45f1: (-s ours) am
f2fed764: Make iptables -L and -S calls wait for xtables lock
* commit '
56cc45f112c1bb21784e1763a4bf748351063f5a':
Yusuke Sato [Thu, 27 Aug 2015 11:28:06 +0000 (11:28 +0000)]
am
c132be49: (-s ours) am
93e6f6a7: Merge "Make iptables -L and -S calls wait for xtables lock"
* commit '
c132be495ffeae7c393175c66943195dee84479e':
Tom Cherry [Fri, 21 Aug 2015 18:31:28 +0000 (18:31 +0000)]
am
4e9e23c5: am
8246d45e: Merge "bundle init.rc contents with its service"
* commit '
4e9e23c50a080719f55e54db783f0c2cb130c95b':
bundle init.rc contents with its service
Tom Cherry [Fri, 21 Aug 2015 18:24:15 +0000 (18:24 +0000)]
am
8246d45e: Merge "bundle init.rc contents with its service"
* commit '
8246d45e94bfb0ce878f41a01602b7b8d78c40ad':
bundle init.rc contents with its service
Tom Cherry [Fri, 21 Aug 2015 18:20:20 +0000 (18:20 +0000)]
am
8246d45e: Merge "bundle init.rc contents with its service"
* commit '
8246d45e94bfb0ce878f41a01602b7b8d78c40ad':
bundle init.rc contents with its service
Tom Cherry [Fri, 21 Aug 2015 17:42:33 +0000 (17:42 +0000)]
Merge "bundle init.rc contents with its service"
Yusuke Sato [Fri, 21 Aug 2015 03:05:28 +0000 (03:05 +0000)]
am
fc794e75: am
f2fed764: Make iptables -L and -S calls wait for xtables lock
* commit '
fc794e75599c1de7bab68fda54b7fdcb191834f9':
Make iptables -L and -S calls wait for xtables lock
Yusuke Sato [Fri, 21 Aug 2015 02:59:13 +0000 (02:59 +0000)]
am
f2fed764: Make iptables -L and -S calls wait for xtables lock
* commit '
f2fed7647ede2ae39a76d50cf4abc9e57b49d40d':
Make iptables -L and -S calls wait for xtables lock
Yusuke Sato [Fri, 21 Aug 2015 01:49:23 +0000 (01:49 +0000)]
am
f2fed764: Make iptables -L and -S calls wait for xtables lock
* commit '
f2fed7647ede2ae39a76d50cf4abc9e57b49d40d':
Make iptables -L and -S calls wait for xtables lock
Yusuke Sato [Thu, 20 Aug 2015 19:31:51 +0000 (19:31 +0000)]
am
93e6f6a7: Merge "Make iptables -L and -S calls wait for xtables lock"
* commit '
93e6f6a70c83b700aacaa16396449c3d9946b94c':
Make iptables -L and -S calls wait for xtables lock
Tom Cherry [Fri, 14 Aug 2015 20:06:31 +0000 (13:06 -0700)]
bundle init.rc contents with its service
Bug:
23186545
Change-Id: Iab00111d55494def6009c7b6c0da56ecd4b6aa9f
Yusuke Sato [Wed, 19 Aug 2015 20:47:30 +0000 (13:47 -0700)]
Make iptables -L and -S calls wait for xtables lock
(cherry picked from commit
99b40503edccae74d0917b9d1e17a5939ac7193b)
Bug:
22802665
Change-Id: Ief59212ab976af940887508fab706b5be07005c6
Yusuke Sato [Thu, 20 Aug 2015 04:10:33 +0000 (04:10 +0000)]
am
7e5323d7: am
93e6f6a7: Merge "Make iptables -L and -S calls wait for xtables lock"
* commit '
7e5323d7663710208036e08a6fd43929739939cd':
Make iptables -L and -S calls wait for xtables lock
Yusuke Sato [Thu, 20 Aug 2015 04:04:04 +0000 (04:04 +0000)]
am
93e6f6a7: Merge "Make iptables -L and -S calls wait for xtables lock"
* commit '
93e6f6a70c83b700aacaa16396449c3d9946b94c':
Make iptables -L and -S calls wait for xtables lock
Yusuke Sato [Thu, 20 Aug 2015 03:49:15 +0000 (03:49 +0000)]
Merge "Make iptables -L and -S calls wait for xtables lock"
Yusuke Sato [Wed, 19 Aug 2015 20:47:30 +0000 (13:47 -0700)]
Make iptables -L and -S calls wait for xtables lock
Bug:
22802665
Change-Id: I95b83ec0a926208e20659ad4b5355cf8500821f5
Stephen Hines [Tue, 18 Aug 2015 00:16:59 +0000 (17:16 -0700)]
Remove unnecessary __attribute__((optnone)).
Bug:
23239997
Now that the underlying bug has been fixed, we no longer need to
suppress optimizations to work around it.
Change-Id: I9d450636598f62f4b890e09861b89853193b0a29
Stephen Hines [Tue, 18 Aug 2015 16:19:27 +0000 (16:19 +0000)]
am
f86df558: Move local union such that it doesn\'t escape (and get optimized out).
* commit '
f86df5580e86c2405c71c708408eeee57b38c0d3':
Move local union such that it doesn't escape (and get optimized out).
Stephen Hines [Tue, 18 Aug 2015 00:16:59 +0000 (17:16 -0700)]
Move local union such that it doesn't escape (and get optimized out).
Bug:
23239997
The Clang update exposed a latent bug in the code here, where a pointer
to a local variable escaped the encapsulating block. Clang noticed the
end of this object's lifetime, and removed assignments to its original
storage (because they are now dead assignments). By moving the union out
of the block, it will survive until the sendmsg() call, and the expected
writes will be restored.
Change-Id: If2106d2f53d761ddca6dd26ab2648244d737dcd9
Stephen Hines [Sun, 16 Aug 2015 19:45:13 +0000 (12:45 -0700)]
WAR: Set optnone for FwmarkClient::send to work around LLVM update bug.
Bug:
23239997
Without this attribute, we constantly see SocketClient unable to write
because of a broken pipe. Skipping optimizations on this function allows
things to work properly again.
Change-Id: I6b5a16a0bae86f4a12f59842b5563e0b815fcd9d
Erik Kline [Thu, 30 Jul 2015 03:35:36 +0000 (12:35 +0900)]
Pass through AI_ADDRCONFIG
In combination with the use of the use_oif_addrs_only sysctl, the bionic
getaddrinfo behaviour on non-default networks is now the same as it has
been for default networks.
Bug:
20733156
Change-Id: I37e764f1bc1c8efb0c1b47da35558717d2aa5756
Paul Jensen [Tue, 4 Aug 2015 18:37:33 +0000 (18:37 +0000)]
am
451ca998: Merge "Make netd calls to iptables wait for xtables lock" into mnc-dev
* commit '
451ca998f1eed36d5fefb5593ed43605c4d6c0bd':
Make netd calls to iptables wait for xtables lock
Paul Jensen [Tue, 4 Aug 2015 17:56:55 +0000 (17:56 +0000)]
Merge "Make netd calls to iptables wait for xtables lock" into mnc-dev
Paul Jensen [Tue, 4 Aug 2015 14:35:05 +0000 (10:35 -0400)]
Make netd calls to iptables wait for xtables lock
Without this wait iptables commands can fail with various unpleasant
consequences like Log.wtf() or missing iptables rules. The most
critical calls to iptables in NetdConstants.cpp already wait for the
lock.
Bug:
22802665
Change-Id: I7d542c3d4f0e005618e368da674159b90d652c8a
Erik Kline [Thu, 30 Jul 2015 03:16:30 +0000 (03:16 +0000)]
am
7adf8d71: Enable use_oif_addrs_only in netd.
* commit '
7adf8d71b80a729354c358d7a0110651750db5f2':
Enable use_oif_addrs_only in netd.
Erik Kline [Tue, 28 Jul 2015 09:51:01 +0000 (18:51 +0900)]
Enable use_oif_addrs_only in netd.
Bug:
19470192
Bug:
21832279
Bug:
22464419
Change-Id: I53a9e592a03fd16c124dcae2a47c6ac2e9049c48
Erik Kline [Mon, 6 Jul 2015 16:03:02 +0000 (16:03 +0000)]
am
cea2d345: Use struct android_net_context when interfacing with bionic
* commit '
cea2d3455eb7c0d9ad1430607cbe98cc09251c1f':
Use struct android_net_context when interfacing with bionic
Erik Kline [Thu, 25 Jun 2015 09:24:46 +0000 (18:24 +0900)]
Use struct android_net_context when interfacing with bionic
Add a new NetworkController::getNetworkContext() that builds the
contents of a struct net_context out of getNetworkForConnect()
and getNetworkForDns().
Bug:
19470192
Bug:
20733156
Bug:
21832279
Change-Id: I5a69b0413a83d33be28b78c0a99359b109517a8f
Xiaohui Chen [Fri, 26 Jun 2015 17:33:14 +0000 (17:33 +0000)]
am
feb2b61d: netd: add default fw white list for system uids
* commit '
feb2b61d3010d52e530357116c3b22c6d77da3cf':
netd: add default fw white list for system uids
Xiaohui Chen [Fri, 26 Jun 2015 04:19:38 +0000 (21:19 -0700)]
netd: add default fw white list for system uids
In uid firewall white list, we white list the system uid range
by default to make sure system processes will always have network
access.
BUG:
22094135
Change-Id: I8f472a98a9fd93591a2887982cec1458d7683613
Xiaohui Chen [Thu, 18 Jun 2015 00:22:38 +0000 (00:22 +0000)]
am
1cdfa9ad: netd: add two child chains to firewall
* commit '
1cdfa9adfa584029cb6d9ac13a2896786001b3a1':
netd: add two child chains to firewall
Xiaohui Chen [Mon, 8 Jun 2015 23:28:12 +0000 (16:28 -0700)]
netd: add two child chains to firewall
This is an attempt to speed up getting out of device idle. It groups
uid firewall rules in these child chains so we can attach/detach a whole
chain instead of individual uid rules.
BUG:
21446713
Change-Id: I61dc7d14110e633c5994e466481b9cac633a7a4f
Erik Kline [Wed, 3 Jun 2015 19:22:43 +0000 (19:22 +0000)]
am
3f95777d: Fix boolean to integer return value conversion.
* commit '
3f95777d2aafa6c0ac4671d55557cad0d04a223f':
Fix boolean to integer return value conversion.
Erik Kline [Wed, 3 Jun 2015 08:44:24 +0000 (17:44 +0900)]
Fix boolean to integer return value conversion.
Change-Id: Ie996c9b4f84f9cd8395abb592ecf0c04cfdc4023
Erik Kline [Wed, 13 May 2015 07:42:00 +0000 (07:42 +0000)]
am
fef7e149: Merge "InterfaceController::setBaseReachableTimeMs()" into mnc-dev
* commit '
fef7e149224681ba49bc39856c25610bb04c3735':
InterfaceController::setBaseReachableTimeMs()
Erik Kline [Wed, 13 May 2015 07:41:59 +0000 (07:41 +0000)]
am
660064bc: Merge "Partial refactoring and Android-type style changes." into mnc-dev
* commit '
660064bc50ce27913594399dece629254b00ad49':
Partial refactoring and Android-type style changes.
Erik Kline [Wed, 13 May 2015 07:20:22 +0000 (07:20 +0000)]
Merge "InterfaceController::setBaseReachableTimeMs()" into mnc-dev
Erik Kline [Wed, 13 May 2015 07:16:56 +0000 (07:16 +0000)]
Merge "Partial refactoring and Android-type style changes." into mnc-dev
Erik Kline [Tue, 12 May 2015 06:58:49 +0000 (15:58 +0900)]
InterfaceController::setBaseReachableTimeMs()
Add an InterfaceController::setBaseReachableTimeMs() method to set
the ARP/ND default reachable time, as configured in:
/proc/sys/net/ipv4/{interface}/base_reachable_time_ms
/proc/sys/net/ipv6/{interface}/base_reachable_time_ms
Bug:
18581716
Change-Id: Idc652e81396d81efe0f08bb1d6dc38bc8e554a56
Erik Kline [Tue, 12 May 2015 06:56:06 +0000 (15:56 +0900)]
Partial refactoring and Android-type style changes.
Bug:
18581716
Change-Id: I85aec575a318861468ea4707b70ed747c27293c7
Paul Jensen [Tue, 12 May 2015 14:57:31 +0000 (14:57 +0000)]
am
d1df5970: Add FwmarkServer support for querying whether a UID can access a NetID
* commit '
d1df597001aadd5d83c9a3d1fe8bbde2bc9256ca':
Add FwmarkServer support for querying whether a UID can access a NetID
Paul Jensen [Wed, 6 May 2015 11:29:56 +0000 (07:29 -0400)]
Add FwmarkServer support for querying whether a UID can access a NetID
This new FwmarkServer API is only accessible from system apps.
Bug:
20470604
Change-Id: Ie2376cdddc10f658fcc5802ef3e8dc9f1948d5c0
Amith Yamasani [Wed, 29 Apr 2015 23:04:52 +0000 (23:04 +0000)]
am
390e4ea8: Blacklist uids for network access
* commit '
390e4ea8106f9e741bc80fb962aaee94d5b28cbb':
Blacklist uids for network access
Amith Yamasani [Sun, 26 Apr 2015 02:08:57 +0000 (19:08 -0700)]
Blacklist uids for network access
FirewallController can now be in blacklist mode (aka disabled)
or whitelist mode (aka enabled).
Some of the methods don't do anything when in blacklist mode.
Uid rules updated to allow dropping packets to uids that
shouldn't get any network access, usually for idle apps.
Added a wait option to iptables calls to make sure it doesn't
fail if there's contention. Fixes a flakiness I was seeing in
removing rules.
Bug:
20066058
Change-Id: I815bcb45aa06d04020e902df8c67bb3894e98f40
Ruchi Kandoi [Wed, 29 Apr 2015 02:25:56 +0000 (02:25 +0000)]
am
52e673f5: netd: Adds support for uid in idletimer netlink notification.
* commit '
52e673f59eecf3e24b3b257bec0f977da5c35325':
netd: Adds support for uid in idletimer netlink notification.
Ruchi Kandoi [Thu, 23 Apr 2015 19:40:56 +0000 (12:40 -0700)]
netd: Adds support for uid in idletimer netlink notification.
Change-Id: Ib85b85fc12b20436e0d788d5c3ec66306c632b57
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Bug:
20264396
(cherry picked from commit
05c39f0a048abf6b8a44f17063f0c1f8c16285ed)
Ruchi Kandoi [Thu, 23 Apr 2015 19:40:56 +0000 (12:40 -0700)]
netd: Adds support for uid in idletimer netlink notification.
Change-Id: Ib85b85fc12b20436e0d788d5c3ec66306c632b57
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Bug:
20264396
Erik Kline [Wed, 1 Apr 2015 02:38:14 +0000 (11:38 +0900)]
Corrently log /set/ MTU error.
Change-Id: I90e2d4f64a5c3ec9f640fd7dc41438517110cf68
Dan Albert [Fri, 27 Mar 2015 18:29:29 +0000 (11:29 -0700)]
Remove uses of libcxx.mk.
This is a no-op.
Change-Id: Ic9d3070b7c329d9744ed660e426c5f39704ffccc
Dan Albert [Mon, 16 Mar 2015 22:39:22 +0000 (22:39 +0000)]
am
200e0b53: (-s ours) Merge "Revert "Revert "Update for libbase."""
* commit '
200e0b53817227453418a432b1384792c1bc29da':
Revert "Revert "Update for libbase.""
Dan Albert [Mon, 16 Mar 2015 21:05:25 +0000 (21:05 +0000)]
Merge "Revert "Revert "Update for libbase."""
Dan Albert [Mon, 16 Mar 2015 21:02:33 +0000 (21:02 +0000)]
Merge "Revert "Revert "Update for libbase."""
Dan Albert [Mon, 16 Mar 2015 17:05:59 +0000 (10:05 -0700)]
Revert "Revert "Update for libbase.""
This reverts commit
4a0ab5ff4a87cfc4a987da99546b01e44875a2e5.
(cherry picked from commit
3e87c785434fdfed2fb00496cb391c411a426bdd)
Change-Id: I042f485f3cc84206766298853491ddd26dbba13f
Dan Albert [Mon, 16 Mar 2015 17:05:59 +0000 (10:05 -0700)]
Revert "Revert "Update for libbase.""
This reverts commit
4a0ab5ff4a87cfc4a987da99546b01e44875a2e5.
Change-Id: Idd2947bbdaef267ffd68179b4d3fe267870b9de4
Dan Albert [Mon, 16 Mar 2015 17:05:59 +0000 (10:05 -0700)]
Revert "Revert "Update for libbase.""
This reverts commit
4a0ab5ff4a87cfc4a987da99546b01e44875a2e5.
Nicolas Geoffray [Mon, 16 Mar 2015 11:58:06 +0000 (11:58 +0000)]
Forgot this in merge resolution.
Change-Id: Ieb26ec5fc333743b86d414ee558c978334647853
Nicolas Geoffray [Mon, 16 Mar 2015 11:54:19 +0000 (11:54 +0000)]
resolved conflicts for merge of
6066d418 to master
Change-Id: I2aa9721365e96c363648dd8e9e15718ed50e3c12
Nicolas Geoffray [Mon, 16 Mar 2015 11:11:51 +0000 (11:11 +0000)]
Merge "Revert "Update for libbase.""
Nicolas Geoffray [Mon, 16 Mar 2015 10:28:37 +0000 (10:28 +0000)]
Revert "Update for libbase."
Breaks internal master.
This reverts commit
b67219a71d1d896bcb34c4a7a797824b88515b2c.
Change-Id: I43145f0724ad2d669b65d20b6fd6ccc44b8f0a4f
Vinit Deshpande [Mon, 16 Mar 2015 08:28:03 +0000 (01:28 -0700)]
Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'
Change-Id: I51337014e2851f47dd5e183c4bfdf39bafa59942
Dan Albert [Sun, 15 Mar 2015 22:34:02 +0000 (22:34 +0000)]
am
e3734499: Merge "Update for libbase."
* commit '
e37344992f49c8e0e6e9b816f590afbd00a961ca':
Update for libbase.
Dan Albert [Sat, 14 Mar 2015 23:54:37 +0000 (23:54 +0000)]
Merge "Update for libbase."
Dan Albert [Sat, 14 Mar 2015 05:35:27 +0000 (22:35 -0700)]
Update for libbase.
StringPrintf and the string based file I/O are being moved to libbase.
Change-Id: I765d9e53f65a76d318d9d0d9503403fc092254d5
Jeff Sharkey [Fri, 13 Mar 2015 20:35:17 +0000 (13:35 -0700)]
Follow NetlinkEvent refactoring.
Change-Id: Ibb6101c8741f862f4732fb200f646dfd329f4782
Vinit Deshpande [Tue, 10 Mar 2015 01:35:41 +0000 (18:35 -0700)]
am "Parse all netids with stringToNetId."
merged from partner/m-wireless-wifi-dev
6c65afd Parse all netids with stringToNetId.
Vinit Deshpande [Tue, 10 Mar 2015 01:35:41 +0000 (18:35 -0700)]
am "server: softap: Set hw_mode according to selected channel [DO NOT MERGE]"
merged from partner/m-wireless-wifi-dev
2f8e725 server: softap: Set hw_mode according to selected channel [DO NOT MERGE]
Vinit Deshpande [Tue, 10 Mar 2015 01:35:41 +0000 (18:35 -0700)]
am "set softAP on a specified band, including both 2.4 and 5 GHz band"
merged from partner/m-wireless-wifi-dev
1ecc6c9 set softAP on a specified band, including both 2.4 and 5 GHz band
Lorenzo Colitti [Tue, 3 Mar 2015 08:22:57 +0000 (17:22 +0900)]
Flush tethering rules on interface remove.
Bug:
19500693
Change-Id: I25b7942784ec026d30c60273c9e13e34d082d25a
Lorenzo Colitti [Fri, 27 Feb 2015 07:45:55 +0000 (16:45 +0900)]
Add oif rules that allow UID 0 to bypass the VPN.
This is needed for wifi calling so that the kernel (which does
not set marks) can tee packets towards the modem. It also fixes
things like not being able to reply to DHCP requests from
tethered clients when a VPN is up.
System apps can already bypass the VPN using explicit marks, so
allowing UID 0 to do so does not create additional bypass VPN
issues.
Bug:
19500693
Change-Id: Ie324026893637e9bd8e7aa65a37579569390e7b7
Lorenzo Colitti [Wed, 25 Feb 2015 16:26:53 +0000 (01:26 +0900)]
Separate NAT from forwarding.
Bug:
19500693
Change-Id: Ib3871106ea3c0d68327611e7568c0710210e4ff2
Lorenzo Colitti [Thu, 26 Feb 2015 08:34:32 +0000 (17:34 +0900)]
Make the VPN rule only to originated, not forwarded, traffic.
Currently the VPN rule for the primary user will match every
forwarded packet on the system, because it specifies a UID range
that includes 0, and forwarded packets have UID 0.
Use "iif lo" to limit the rule match to locally-originated
traffic. This requires a kernel that sets the loopback ifindex.
when originating packets. Anything based on 3.10 is fine, but
devices using 3.4 will need a one-line change for IPv6.
Bug:
19500693
Change-Id: Iaab88bed62716dc1cea33b45c4e258f6b3bfc9d0
Lorenzo Colitti [Wed, 25 Feb 2015 01:26:19 +0000 (10:26 +0900)]
Add a dummy network that discards all packets.
Bug:
19500693
Change-Id: Ic25f2d8c481f1528e887e43ca3fa868189582110