OSDN Git Service
Chad Brubaker [Mon, 24 Mar 2014 19:35:26 +0000 (19:35 +0000)]
am
41bec8e5: am
803e8d85: am
e287d24e: Merge "Allow overlap in UidMarkMap" into klp-dev
* commit '
41bec8e5b517c189df908193c4cb6b5b0abdb709':
Allow overlap in UidMarkMap
Chad Brubaker [Mon, 24 Mar 2014 19:35:25 +0000 (19:35 +0000)]
am
4fe6d792: am
6b9ae17f: am
954d5d1b: Merge "Update clearifaceforuidrange to take the interface" into klp-dev
* commit '
4fe6d7923802d463a650b1f2b89dd85a008ca868':
Update clearifaceforuidrange to take the interface
Chad Brubaker [Mon, 24 Mar 2014 17:27:15 +0000 (17:27 +0000)]
am
c7c348d7: am
406edcfd: am
2a390120: Mark uids without rules with PROTECT_MARK
* commit '
c7c348d7cad39f06e8e9454f6128a5911d5fdb10':
Mark uids without rules with PROTECT_MARK
Chad Brubaker [Fri, 21 Mar 2014 21:09:45 +0000 (21:09 +0000)]
am
803e8d85: am
e287d24e: Merge "Allow overlap in UidMarkMap" into klp-dev
* commit '
803e8d85f3b78f06288d4651cd814f3f05fdcebe':
Allow overlap in UidMarkMap
Chad Brubaker [Fri, 21 Mar 2014 21:09:44 +0000 (21:09 +0000)]
am
6b9ae17f: am
954d5d1b: Merge "Update clearifaceforuidrange to take the interface" into klp-dev
* commit '
6b9ae17f88919417991147eba90e7c021e062737':
Update clearifaceforuidrange to take the interface
Chad Brubaker [Fri, 21 Mar 2014 21:02:49 +0000 (21:02 +0000)]
am
e287d24e: Merge "Allow overlap in UidMarkMap" into klp-dev
* commit '
e287d24e9cfd6ed84bdb69a82b6f8357de2fee34':
Allow overlap in UidMarkMap
Chad Brubaker [Fri, 21 Mar 2014 21:02:48 +0000 (21:02 +0000)]
am
954d5d1b: Merge "Update clearifaceforuidrange to take the interface" into klp-dev
* commit '
954d5d1bcdcdfe4522a64ae48827501a6a6d64c0':
Update clearifaceforuidrange to take the interface
Chad Brubaker [Fri, 21 Mar 2014 20:51:59 +0000 (20:51 +0000)]
Merge "Allow overlap in UidMarkMap" into klp-dev
Chad Brubaker [Fri, 21 Mar 2014 20:51:51 +0000 (20:51 +0000)]
Merge "Update clearifaceforuidrange to take the interface" into klp-dev
Chad Brubaker [Fri, 21 Mar 2014 17:48:17 +0000 (17:48 +0000)]
am
406edcfd: am
2a390120: Mark uids without rules with PROTECT_MARK
* commit '
406edcfde29342be37cbbb326e1b9c4697236cd2':
Mark uids without rules with PROTECT_MARK
Chad Brubaker [Fri, 21 Mar 2014 17:43:48 +0000 (17:43 +0000)]
am
2a390120: Mark uids without rules with PROTECT_MARK
* commit '
2a390120a9e90ec414d347921039ff98724d0dda':
Mark uids without rules with PROTECT_MARK
JP Abgrall [Tue, 18 Mar 2014 02:13:48 +0000 (02:13 +0000)]
am
1f1f159f: am
cfb7ebe1: Merge "Fix C++11 violations"
* commit '
1f1f159fdfb0512ddca6221a091805a85b4429f1':
Fix C++11 violations
JP Abgrall [Tue, 18 Mar 2014 02:08:54 +0000 (02:08 +0000)]
am
cfb7ebe1: Merge "Fix C++11 violations"
* commit '
cfb7ebe1b2dfd31b408f6aa6e3f3fcdf89baa6c4':
Fix C++11 violations
JP Abgrall [Tue, 18 Mar 2014 02:03:43 +0000 (02:03 +0000)]
Merge "Fix C++11 violations"
SynergyDev [Sun, 16 Mar 2014 22:48:51 +0000 (15:48 -0700)]
Fix C++11 violations
The C++11 standard requires a space between literals and identifiers
Chad Brubaker [Mon, 24 Feb 2014 23:45:10 +0000 (15:45 -0800)]
Allow overlap in UidMarkMap
To support simultaneous tuns UidMarkMap now allows for
overlaping/duplicate rules. If there are multiple rules for a given uid
the most recently added rule will be used in all cases.
When overlapping rules are added in addUidRule there may be multiple
iptables rules matching the uid. Since addUidRule appends it will use
the most recent rule as well, no change required. Previously
UidMarkMap->add would fail and the rule would never be added.
Bug:
12134439
Change-Id: I5f2976dd3ee334584a9f98f6eacd5edbe5c9bb6b
Chad Brubaker [Mon, 24 Feb 2014 23:41:35 +0000 (15:41 -0800)]
Update clearifaceforuidrange to take the interface
resolv's uid range=>iface map now allows overlap in uid ranges to support
simultaneous tuns. _resolv_clear_iface_for_uid_range now takes the
interface to support removing only one of the rules.
Bug:
12134439
Change-Id: I3e2a167875bbd381846d5c47d7b34c625abfb2e0
Chad Brubaker [Thu, 20 Feb 2014 01:51:05 +0000 (17:51 -0800)]
Mark uids without rules with PROTECT_MARK
The default result for a uid without a mark should be MARK_PROTECT
because the service using the uid's mark may be covered by a VPN that
should not cover the user it is acting for.
Bug:
12608570
Change-Id: I2402cb86ddb2fe6e670d1793263ff6c2c31d32fe
Ruchi Kandoi [Wed, 12 Mar 2014 01:00:44 +0000 (18:00 -0700)]
netd: Add support for timestamp in idletimer netlink notification.
Change-Id: I77e9052e988d65c6b543441a8f03876bcd7c15ce
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Calin Juravle [Tue, 4 Mar 2014 17:55:44 +0000 (17:55 +0000)]
am
a86f2b6c: am
491086e5: Merge "Changed path to the private dns headers Bug:
13219633"
* commit '
a86f2b6c761954b978b3c8346d1040efca8d1ec6':
Changed path to the private dns headers Bug:
13219633
Calin Juravle [Tue, 4 Mar 2014 17:14:55 +0000 (17:14 +0000)]
am
491086e5: Merge "Changed path to the private dns headers Bug:
13219633"
* commit '
491086e5f523b5ae86734e135dd8685499c954fa':
Changed path to the private dns headers Bug:
13219633
Calin Juravle [Tue, 4 Mar 2014 14:26:32 +0000 (14:26 +0000)]
Merge "Changed path to the private dns headers Bug:
13219633"
Calin Juravle [Tue, 4 Mar 2014 12:16:06 +0000 (12:16 +0000)]
Changed path to the private dns headers
Bug:
13219633
Change-Id: Ia7f3da59925621b449bacfeb220ab8f8e3be8d88
Christopher Lane [Mon, 3 Mar 2014 23:28:26 +0000 (23:28 +0000)]
am
c0bc14a3: Add support for custom TXT records
* commit '
c0bc14a3c2f0efe1f368f2120de38e99ccb6d9f0':
Add support for custom TXT records
Christopher Lane [Wed, 26 Feb 2014 03:08:58 +0000 (19:08 -0800)]
Add support for custom TXT records
This isn't supported higher up in the stack yet, so use command line to test.
E.g. "ndc mdns mdnssd register 4 Kitten _kitten._tcp 4242 sound=meow color=pink"
Change-Id: I261c17465ae677f91a289077b6e363a149c94c3e
Ashish Sharma [Wed, 12 Feb 2014 19:53:00 +0000 (11:53 -0800)]
NetlinkHandler: Revert the special handling of event param name.
The kernel change was reverted to remain consistent with past API.
Change-Id: I60a539aaf3bd78a56ab54391685f6aaf07de19ce
Ashish Sharma [Tue, 4 Feb 2014 01:28:04 +0000 (17:28 -0800)]
Initialize IDLETIMER iptables rules for ipv6.
Bug:
12845905
Change-Id: I28f460766a29f0ca4386c8064ffe52c39f907084
Colin Cross [Fri, 24 Jan 2014 18:45:47 +0000 (18:45 +0000)]
am
19d49454: am
2bd389e3: Merge "AArch64: Fix printf format strings."
* commit '
19d494543311f5a51983f82d2a1605461e2a4beb':
AArch64: Fix printf format strings.
Colin Cross [Fri, 24 Jan 2014 18:38:15 +0000 (10:38 -0800)]
am
2bd389e3: Merge "AArch64: Fix printf format strings."
* commit '
2bd389e386feeef0a901ccf68b106eafea6bbcb4':
AArch64: Fix printf format strings.
Colin Cross [Fri, 24 Jan 2014 18:35:13 +0000 (18:35 +0000)]
Merge "AArch64: Fix printf format strings."
Matthew Leach [Mon, 14 Jan 2013 15:07:12 +0000 (15:07 +0000)]
AArch64: Fix printf format strings.
Use the portable printf format strings as defined in:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#64-bit_Portability
These changes are necessary when compiling for LP64 architectures.
Change-Id: I3ff355dda5a7a72a8e659a7e5d2014aa4e62f8c3
Signed-off-by: Matthew Leach <matthew.leach@arm.com>
Signed-off-by: Matteo Franchin <matteo.franchin@arm.com>
Colin Cross [Thu, 23 Jan 2014 23:43:38 +0000 (23:43 +0000)]
am
f8b19aa2: am
05952ccb: Merge "netd: remove from include path"
* commit '
f8b19aa2b6b182261f74ce4265247a2d7a64801b':
netd: remove $(KERNEL_HEADERS) from include path
Colin Cross [Thu, 23 Jan 2014 23:10:07 +0000 (15:10 -0800)]
am
05952ccb: Merge "netd: remove from include path"
* commit '
05952ccb4a2f44ada2eb0d11480eb2780c8caa91':
netd: remove $(KERNEL_HEADERS) from include path
Colin Cross [Thu, 23 Jan 2014 23:02:26 +0000 (23:02 +0000)]
Merge "netd: remove $(KERNEL_HEADERS) from include path"
Colin Cross [Thu, 23 Jan 2014 07:51:53 +0000 (23:51 -0800)]
netd: remove $(KERNEL_HEADERS) from include path
The kernel headers are already in the include path, and manually
adding them again will break on a multiarch build, where the
kernel headers may be different for each arch.
Change-Id: I0f07ecde4c519341153e58e3cdd6441e84362ae1
Dmitry Shmidt [Wed, 18 Dec 2013 22:44:13 +0000 (14:44 -0800)]
resolved conflicts for merge of
124d77eb to master
Change-Id: Ic28a38b2d6acf2b4fb3e0da3794fea6fd37d9981
Dmitry Shmidt [Wed, 18 Dec 2013 20:18:37 +0000 (12:18 -0800)]
am
7f4117ee: Merge "tethering: Add --dhcp-authoritative to dnsmasq daemon"
* commit '
7f4117ee430e5069bffc89ad4e3841845586951a':
tethering: Add --dhcp-authoritative to dnsmasq daemon
Dmitry Shmidt [Wed, 18 Dec 2013 20:12:31 +0000 (20:12 +0000)]
Merge "tethering: Add --dhcp-authoritative to dnsmasq daemon"
Dmitry Shmidt [Fri, 13 Dec 2013 00:41:16 +0000 (16:41 -0800)]
tethering: Add --dhcp-authoritative to dnsmasq daemon
Bug:
12114185
Change-Id: I91e83c78de251ebe88bed30174f1422b62edca07
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Fri, 13 Dec 2013 00:41:16 +0000 (16:41 -0800)]
tethering: Add --dhcp-authoritative to dnsmasq daemon
Bug:
12114185
Change-Id: I91e83c78de251ebe88bed30174f1422b62edca07
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Sreeram Ramachandran [Tue, 10 Dec 2013 18:06:08 +0000 (10:06 -0800)]
Fix duplicate rule count modification.
ag/161626 introduced modifyRuleCount() to centralize rule count mutations, but
didn't remove the redundant block above the callsite in modifyRoute().
Change-Id: I5164ccf0d92041836166dcb5798be168276d3e7d
Sreeram Ramachandran [Mon, 9 Dec 2013 22:43:26 +0000 (14:43 -0800)]
Fix typo in removeFwmarkRoute().
The typo was in the original CL that introduced this code (ag/326064).
Change-Id: Ib424189194f338b195026026c3d767ab0da53175
The Android Open Source Project [Sat, 23 Nov 2013 20:29:40 +0000 (12:29 -0800)]
The Android Open Source Project [Sat, 23 Nov 2013 03:19:58 +0000 (19:19 -0800)]
Dmitry Shmidt [Fri, 22 Nov 2013 21:57:09 +0000 (21:57 +0000)]
Merge "softap: Try wpa/wpa2 as best effort"
The Android Open Source Project [Fri, 22 Nov 2013 19:31:43 +0000 (11:31 -0800)]
Merge commit '
f0aa90f7898502aae6a015b49abcb2a5a0719fad' into HEAD
Change-Id: If9a70bdfa24a37bab6980194af6fa4f73d9f4bd1
Dmitry Shmidt [Fri, 22 Nov 2013 00:50:22 +0000 (16:50 -0800)]
softap: Try wpa/wpa2 as best effort
Change-Id: I02ff0b01e96ac7bb3044df9621ebf7c8a62cb6c2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Lorenzo Colitti [Fri, 22 Nov 2013 04:08:18 +0000 (20:08 -0800)]
am
3ccff3ba: am
22f485dc: Merge "Make netd listen for and notify RDNSS options."
* commit '
3ccff3ba816338b85dd87555a7803cb8e803f4e5':
Make netd listen for and notify RDNSS options.
Lorenzo Colitti [Fri, 22 Nov 2013 04:08:18 +0000 (20:08 -0800)]
am
70cf5074: (-s ours) am
6eeea7cb: Merge "Simplify notification code in NetlinkHandler."
* commit '
70cf50742decc490b93c1d15a49db00125c73d64':
Simplify notification code in NetlinkHandler.
Lorenzo Colitti [Fri, 22 Nov 2013 01:12:16 +0000 (17:12 -0800)]
am
3995bf50: am
634b7b7b: Merge "Don\'t log "Unexpected netlink message" on NDUSEROPT"
* commit '
3995bf502e1298109baba41a7dbc0a272530d9a8':
Don't log "Unexpected netlink message" on NDUSEROPT
Lorenzo Colitti [Fri, 22 Nov 2013 01:12:15 +0000 (17:12 -0800)]
am
6931528a: am
1dc26be0: Merge "Unbreak interface add/delete notifications."
* commit '
6931528a7914737dc5b7f530a4b5db6f1147fe57':
Unbreak interface add/delete notifications.
Lorenzo Colitti [Fri, 22 Nov 2013 01:12:14 +0000 (17:12 -0800)]
am
307650e1: am
4006ada5: (-s ours) Merge "Make netd track and notify IP address changes."
* commit '
307650e17a12452c1ce5ddab02e6027baf6a10cb':
Make netd track and notify IP address changes.
Lorenzo Colitti [Fri, 22 Nov 2013 01:07:29 +0000 (17:07 -0800)]
am
22f485dc: Merge "Make netd listen for and notify RDNSS options."
* commit '
22f485dc390ba75c76645d2ced812cd1988b6bf0':
Make netd listen for and notify RDNSS options.
Lorenzo Colitti [Fri, 22 Nov 2013 01:07:28 +0000 (17:07 -0800)]
am
6eeea7cb: Merge "Simplify notification code in NetlinkHandler."
* commit '
6eeea7cb5a563cf8369c8373ae469ef1f676d7a9':
Simplify notification code in NetlinkHandler.
Lorenzo Colitti [Fri, 22 Nov 2013 01:07:28 +0000 (17:07 -0800)]
am
634b7b7b: Merge "Don\'t log "Unexpected netlink message" on NDUSEROPT"
* commit '
634b7b7b6c83269e5c1ad71b871f8c5a7a020c0d':
Don't log "Unexpected netlink message" on NDUSEROPT
Lorenzo Colitti [Fri, 22 Nov 2013 01:07:27 +0000 (17:07 -0800)]
am
1dc26be0: Merge "Unbreak interface add/delete notifications."
* commit '
1dc26be03b0ace9a52a23caaa669a4edf9b0bd85':
Unbreak interface add/delete notifications.
Lorenzo Colitti [Fri, 22 Nov 2013 01:07:27 +0000 (17:07 -0800)]
am
4006ada5: (-s ours) Merge "Make netd track and notify IP address changes."
* commit '
4006ada573f332b5ef4d32273bd4e2c058aa2b73':
Make netd track and notify IP address changes.
JP Abgrall [Thu, 21 Nov 2013 01:50:52 +0000 (17:50 -0800)]
am
9440e7f9: SecondaryTableController: force the MSS to match pmtu on TCP SYN
* commit '
9440e7f994901ca123393844c95fe5caa6639a3b':
SecondaryTableController: force the MSS to match pmtu on TCP SYN
JP Abgrall [Thu, 21 Nov 2013 01:27:01 +0000 (17:27 -0800)]
SecondaryTableController: force the MSS to match pmtu on TCP SYN
Without this change, the VPN sets up a tun/ppp that needs a small
MTU, and during TCP SYN the MSS will end up matching the outgoing iface
MTU which is potentially too big.
This leads to connection flakiness. The wrong MSS is visible by
tcpdump-ing on the tun/ppp device.
With this change, the MSS now is correct.
It requires the kernel to be configured with
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
If kernel is not configured, it silently fails.
Bug:
11579326
Change-Id: I254d8c39435b92dff91931e461e1efb8b35f6b1e
Lorenzo Colitti [Wed, 20 Nov 2013 02:24:39 +0000 (02:24 +0000)]
Merge "Make netd listen for and notify RDNSS options."
Lorenzo Colitti [Wed, 20 Nov 2013 02:24:18 +0000 (02:24 +0000)]
Merge "Simplify notification code in NetlinkHandler."
Lorenzo Colitti [Wed, 20 Nov 2013 02:23:52 +0000 (02:23 +0000)]
Merge "Don't log "Unexpected netlink message" on NDUSEROPT"
Lorenzo Colitti [Wed, 20 Nov 2013 02:23:43 +0000 (02:23 +0000)]
Merge "Unbreak interface add/delete notifications."
Lorenzo Colitti [Wed, 20 Nov 2013 02:23:28 +0000 (02:23 +0000)]
Merge "Make netd track and notify IP address changes."
Lorenzo Colitti [Thu, 24 Oct 2013 05:51:57 +0000 (14:51 +0900)]
Make netd listen for and notify RDNSS options.
[Cherry-pick of
12acae8db9dee865a41f0fd11dacf01112115920]
Bug:
9180552
Change-Id: Id2485b35c2299cfc455dd2b3b725136e5eb2a7e4
Lorenzo Colitti [Fri, 25 Oct 2013 10:53:31 +0000 (19:53 +0900)]
Simplify notification code in NetlinkHandler.
1. Factor most of the notification code out to a common function.
2. Use vasprintf instead of snprintf so we don't have to worry
about clipping notifications due to fixed-size message
buffers.
[Cherry-pick of
0b454ea4abdc8a563af6da58fa37835729220acf]
Bug:
9180552
Change-Id: Idde16ee6dd56d38dab866f0ea678b04d98b3048d
Lorenzo Colitti [Thu, 12 Sep 2013 15:56:23 +0000 (00:56 +0900)]
Don't log "Unexpected netlink message" on NDUSEROPT
When opening the netlink socket, NetlinkManager specifies it's
interested in ND_USEROPT messages, but we since we don't have
code to parse them yet, we end up logging an error message for
packets that contain them. Get rid of the logspam by not asking
the kernel to receive them.
[Cherry-pick of
a95f8a3426e6a4f17cf41888673f58302781b7be]
Bug:
10718651
Change-Id: Ib1b7748448a983cfa7bb7725e48e238d85152ea2
Lorenzo Colitti [Mon, 2 Sep 2013 15:26:23 +0000 (00:26 +0900)]
Unbreak interface add/delete notifications.
The change to enable address tracking via netlink incorrectly
changed the subsystem of rtnetlink events from "net" to
"interface". This broke interface add/delete notifications,
which come from the kernel with subsystem "net".
Switch back to "net" and deal with address tracking via new
action codes instead of a new subsystem.
[Cherry-pick of
4da12db25b4a2947b1a98b0322e4be56a30c5e17]
Bug:
10433320
Change-Id: I59a50e9c7cb49f46e680c7d84ac8e196a861ca4b
Lorenzo Colitti [Thu, 1 Aug 2013 20:57:47 +0000 (05:57 +0900)]
Make netd track and notify IP address changes.
Subscribe netd's netlink socket to listen to IPv4 and IPv6
address changes (and ND opts, which we'll need for IPv6 DNS
later), and make NetlinkHandler notify the system of address
changes.
[Cherry-pick of
9b3cd7635caf5948d7d4b11f8f588c9d2811d58e]
Bug:
10232006
Change-Id: Ib9dfd58635dce389980d8ee9529a17661a02320a
Lorenzo Colitti [Thu, 24 Oct 2013 05:51:57 +0000 (14:51 +0900)]
Make netd listen for and notify RDNSS options.
Bug:
9180552
Change-Id: Id2485b35c2299cfc455dd2b3b725136e5eb2a7e4
Lorenzo Colitti [Fri, 25 Oct 2013 10:53:31 +0000 (19:53 +0900)]
Simplify notification code in NetlinkHandler.
1. Factor most of the notification code out to a common function.
2. Use vasprintf instead of snprintf so we don't have to worry
about clipping notifications due to fixed-size message
buffers.
Bug:
9180552
Change-Id: Idde16ee6dd56d38dab866f0ea678b04d98b3048d
Ed Heyl [Wed, 9 Oct 2013 16:13:12 +0000 (09:13 -0700)]
Ed Heyl [Tue, 8 Oct 2013 23:03:14 +0000 (16:03 -0700)]
merge in KFS78N (no-op)
Robert Greenwalt [Fri, 4 Oct 2013 18:59:23 +0000 (11:59 -0700)]
am
2dae2f87: Don\'t vpn dns if the vpn didn\'t provide servers
* commit '
2dae2f8729c3254d5f805ce3df535458db193c12':
Don't vpn dns if the vpn didn't provide servers
Robert Greenwalt [Tue, 24 Sep 2013 23:44:22 +0000 (16:44 -0700)]
Don't vpn dns if the vpn didn't provide servers
A split-tunnel vpn shouldn't snarf all dns queries if it's not
going to provide dns servers to service them.
bug:
10115444
Change-Id: I4f8de66b75a04ca0e274edb92ace7acee762bca2
The Android Automerger [Mon, 16 Sep 2013 18:07:04 +0000 (11:07 -0700)]
merge in klp-factoryrom-release history after reset to klp-release
JP Abgrall [Thu, 12 Sep 2013 03:01:59 +0000 (20:01 -0700)]
NatController: Fix tethering-counting iptables rules handling
Fix duplicate tethering-pair detection. It was broken because the
underlying mechanism used quota2 which has a 15char limit and
the two combined interface names were longer than that.
Fix parsing or tether-counting rules when no interfaces are available
vs when parsing is broken.
Now the parser is not invoked if no tether-counting rules were created.
Bug:
10710027
Change-Id: I37899d113a37cd84255d439efa6e2ed3ce712ec0
Lorenzo Colitti [Thu, 12 Sep 2013 15:56:23 +0000 (00:56 +0900)]
Don't log "Unexpected netlink message" on NDUSEROPT
When opening the netlink socket, NetlinkManager specifies it's
interested in ND_USEROPT messages, but we since we don't have
code to parse them yet, we end up logging an error message for
packets that contain them. Get rid of the logspam by not asking
the kernel to receive them.
Bug:
10718651
Change-Id: Ib1b7748448a983cfa7bb7725e48e238d85152ea2
Jeff Sharkey [Wed, 11 Sep 2013 03:53:58 +0000 (20:53 -0700)]
Missing tethering stats isn't an error.
When a device first boots, there won't be any tethering stats, which
isn't an error. Continue checking for partial results.
Bug:
5868832
Change-Id: Ic432f5f159320da9886d85c2525fa2cde8c67750
Lorenzo Colitti [Mon, 2 Sep 2013 15:26:23 +0000 (00:26 +0900)]
Unbreak interface add/delete notifications.
The change to enable address tracking via netlink incorrectly
changed the subsystem of rtnetlink events from "net" to
"interface". This broke interface add/delete notifications,
which come from the kernel with subsystem "net".
Switch back to "net" and deal with address tracking via new
action codes instead of a new subsystem.
Bug:
10433320
Change-Id: I59a50e9c7cb49f46e680c7d84ac8e196a861ca4b
JP Abgrall [Mon, 26 Aug 2013 22:13:10 +0000 (15:13 -0700)]
BandwidthController: fix bad flushing for bw_costly_* tables.
Some of the bw_costly_<iface> rules would not get correctly flushed and
cleared on netd re-start, which would cause a failure when trying to
setup the bw_penalty_box as bw_costly_<iface> would reference it.
The resulting symptom would be that bandwidth could not be re-enabled.
Bug:
10183445
Change-Id: I79a8a73ae52e18b3bff8a58e47ac1aea2454ae63
Lorenzo Colitti [Thu, 1 Aug 2013 20:57:47 +0000 (05:57 +0900)]
Make netd track and notify IP address changes.
Subscribe netd's netlink socket to listen to IPv4 and IPv6
address changes (and ND opts, which we'll need for IPv6 DNS
later), and make NetlinkHandler notify the system of address
changes.
Bug:
10232006
Change-Id: Ib9dfd58635dce389980d8ee9529a17661a02320a
Robert Greenwalt [Thu, 1 Aug 2013 15:26:03 +0000 (08:26 -0700)]
am
bca84afd: Merge "Incorrect memset parameters"
* commit '
bca84afd429667bf25f2288f254f6e854bcb0f04':
Incorrect memset parameters
Robert Greenwalt [Thu, 1 Aug 2013 15:17:47 +0000 (15:17 +0000)]
Merge "Incorrect memset parameters"
Edward Savage-Jones [Fri, 19 Jul 2013 20:09:44 +0000 (22:09 +0200)]
Incorrect memset parameters
Memset parameters swapped
Change-Id: I528c1f6de344447d3c43d89c1dd4cd87e1c5c5a7
Geremy Condra [Tue, 23 Jul 2013 17:57:33 +0000 (17:57 +0000)]
Merge "Host exemption now handles premarked sockets"
Chad Brubaker [Mon, 15 Jul 2013 22:28:59 +0000 (15:28 -0700)]
Host exemption now handles premarked sockets
Host exemption now properly handles routing for sockets that were
already marked
Change-Id: I55d5c00754036a5ef49379170c37607d3e71a1e8
Robert Greenwalt [Thu, 18 Jul 2013 16:12:51 +0000 (09:12 -0700)]
am
8ab6df2e: am
08ff0e40: Merge "Fix memset call"
* commit '
8ab6df2e2a4df8eb2c6bcd3325c8ac7a5b01c63e':
Fix memset call
Robert Greenwalt [Thu, 18 Jul 2013 16:08:46 +0000 (09:08 -0700)]
am
08ff0e40: Merge "Fix memset call"
* commit '
08ff0e408976d541dae0fc36527c15195cc86cda':
Fix memset call
Robert Greenwalt [Thu, 18 Jul 2013 16:07:19 +0000 (16:07 +0000)]
Merge "Fix memset call"
Wang Liyong [Thu, 18 Jul 2013 14:37:07 +0000 (16:37 +0200)]
Fix memset call
Parameters was passed in the wrong order.
Change-Id: I1d4d68f1ba729bf54da84cbcb5f631938ac697f2
Geremy Condra [Fri, 12 Jul 2013 22:28:00 +0000 (22:28 +0000)]
Merge "Add netd commands to get marks for routing"
Geremy Condra [Thu, 11 Jul 2013 22:57:03 +0000 (22:57 +0000)]
Merge "Add destination host exemption to VPN routing"
Geremy Condra [Thu, 11 Jul 2013 22:56:55 +0000 (22:56 +0000)]
Merge "Add support for fwmark split tunneling"
Chad Brubaker [Thu, 11 Jul 2013 19:05:39 +0000 (12:05 -0700)]
Add netd commands to get marks for routing
Add commands for fetching the mark associated with routing a uid and for
fetching the mark associated with avoiding the fwmark routing rules
Change-Id: I4accd1a9aecd91f6f0630eb1a5466a81e309eeac
Geremy Condra [Thu, 11 Jul 2013 22:10:37 +0000 (22:10 +0000)]
Merge "Add netd support for uid based routing for DNS"
Chad Brubaker [Wed, 10 Jul 2013 19:08:08 +0000 (12:08 -0700)]
Add destination host exemption to VPN routing
requestRouteToHost requires the ability to punch holes in the VPN for
certain addresses, this adds support for this under mark based VPNs.
Change-Id: I9d890829048624d43c0f1efaec54563a860e850f
Chad Brubaker [Fri, 28 Jun 2013 00:20:39 +0000 (17:20 -0700)]
Add support for fwmark split tunneling
Packets are now only marked for fwmark if their destination is in one of
the routes for the target interface.
Change-Id: Ided4ad992c4cf957d77ae11fa62ac4843a8592c7
JP Abgrall [Wed, 3 Jul 2013 20:33:05 +0000 (13:33 -0700)]
BandwidthController: prefix chains with bw_
Just a cleanup.
Change-Id: Ic5afd7bd194fdcad604d533ba95e4c23b10b3e24
JP Abgrall [Wed, 3 Jul 2013 19:23:55 +0000 (12:23 -0700)]
BandwidthController: allow UID 0 as a "special uid"
The happy box needs to be able to let UID 0 (dhcp, ...) pass through.
Bug:
6212480
Change-Id: I9867b7db4e5ad71cfb1170659d2d6a14ca9590be