OSDN Git Service
Elliott Hughes [Tue, 3 Feb 2015 23:51:28 +0000 (23:51 +0000)]
am
a0b6b3a6: am
50c6639a: Merge "Use StringPrintf."
* commit '
a0b6b3a6ec2090ebd6cae611ec35fc670857331b':
Use StringPrintf.
Elliott Hughes [Tue, 3 Feb 2015 23:46:26 +0000 (23:46 +0000)]
am
50c6639a: Merge "Use StringPrintf."
* commit '
50c6639a55b3208b64adc691b181a90e1e6de223':
Use StringPrintf.
Elliott Hughes [Tue, 3 Feb 2015 23:33:40 +0000 (23:33 +0000)]
Merge "Use StringPrintf."
Elliott Hughes [Tue, 3 Feb 2015 23:31:07 +0000 (15:31 -0800)]
Use StringPrintf.
This doesn't replace every asprintf in netd, but it replaces the ones in code
I touched.
Change-Id: I2de5c7772523372bb36145e66e885aa8132ad58e
Elliott Hughes [Tue, 3 Feb 2015 22:56:41 +0000 (22:56 +0000)]
am
561ad8c1: resolved conflicts for merge of
c9692899 to lmp-mr1-dev-plus-aosp
* commit '
561ad8c1a4fd519a6ae632ea1d414f90e62da95f':
Switch netd over to <utils/file.h>.
Nick Kralevich [Tue, 3 Feb 2015 22:56:28 +0000 (22:56 +0000)]
am
69766c22: am
6c08cd6a: Merge "Avoid leaking file descriptors"
* commit '
69766c22edb99338c3b703aeadbaa286f6b78334':
Avoid leaking file descriptors
Elliott Hughes [Tue, 3 Feb 2015 22:31:35 +0000 (14:31 -0800)]
resolved conflicts for merge of
c9692899 to lmp-mr1-dev-plus-aosp
Change-Id: I8f4c9ae0d13d30e69b7a197eafdfcb9b2b9050c0
Nick Kralevich [Tue, 3 Feb 2015 22:25:02 +0000 (22:25 +0000)]
am
6c08cd6a: Merge "Avoid leaking file descriptors"
* commit '
6c08cd6aa7aee66b973ee4861237ad36560e0239':
Avoid leaking file descriptors
Elliott Hughes [Tue, 3 Feb 2015 22:12:23 +0000 (22:12 +0000)]
Merge "Switch netd over to <utils/file.h>."
Elliott Hughes [Tue, 3 Feb 2015 02:08:59 +0000 (18:08 -0800)]
Switch netd over to <utils/file.h>.
Change-Id: Id79961cc4feee1c307dad06d64e3f4ffe060c4da
Nick Kralevich [Sat, 31 Jan 2015 22:16:14 +0000 (22:16 +0000)]
Merge "Avoid leaking file descriptors"
Nick Kralevich [Sat, 31 Jan 2015 21:54:00 +0000 (13:54 -0800)]
Avoid leaking file descriptors
Add O_CLOEXEC on open() calls, and SOCK_CLOEXEC on socket calls.
This avoids leaking file descriptors across execs.
Addresses the following SELinux denial:
audit(
1422740213.283:8): avc: denied { read write } for pid=2597 comm="clatd" path="socket:[6709]" dev="sockfs" ino=6709 scontext=u:r:clatd:s0 tcontext=u:r:netd:s0 tclass=netlink_socket
and allows the removal of some other SELinux rules which were
inappropriately added because of leaking file descriptors.
Change-Id: I9c180488ea1969d610e488f967a7276a672bb477
Lorenzo Colitti [Thu, 29 Jan 2015 18:37:20 +0000 (18:37 +0000)]
am
623e69e6: am
aea68fdd: Merge "Don\'t fail when trying to add routes that already exist."
* commit '
623e69e66b18fb3af840369633548bbd6c098580':
Don't fail when trying to add routes that already exist.
Lorenzo Colitti [Thu, 29 Jan 2015 16:46:39 +0000 (16:46 +0000)]
am
aea68fdd: Merge "Don\'t fail when trying to add routes that already exist."
* commit '
aea68fddd979bf6852b8aef9bc718567f9da935a':
Don't fail when trying to add routes that already exist.
Lorenzo Colitti [Thu, 29 Jan 2015 08:44:09 +0000 (08:44 +0000)]
Merge "Don't fail when trying to add routes that already exist."
Sreeram Ramachandran [Thu, 30 Oct 2014 17:01:07 +0000 (10:01 -0700)]
Don't fail when trying to add routes that already exist.
Previously, we suppressed failures for the special case of
requestRouteToHost() being called multiple times. Turns out that other
parts of the system also try to add duplicate routes, so just suppress
EEXIST errors in general (as far as adding routes is concerned). For
example, this happens when the WiFi P2P DHCP client renews its lease
and blindly requests to add a route that it had already added before.
(cherry picked from commit
64166e7666e3cc7f4b9c715f2b4e19d28ae44c5a)
Bug:
17205769
Change-Id: I11d50052f616cb48a912d647b8024ccef01b736d
Elliott Hughes [Wed, 28 Jan 2015 22:08:00 +0000 (22:08 +0000)]
am
29cbbf2a: am
b1842acd: Merge "Add missing <string.h> include."
* commit '
29cbbf2a37ceb841c20004189bac2bc2895aff2f':
Add missing <string.h> include.
Elliott Hughes [Wed, 28 Jan 2015 22:07:59 +0000 (22:07 +0000)]
am
750f9d0a: am
883d129b: Merge "Add missing <malloc.h> include."
* commit '
750f9d0abe7d3f06b7a2f8dcfee780fd956023d4':
Add missing <malloc.h> include.
Elliott Hughes [Wed, 28 Jan 2015 19:35:28 +0000 (19:35 +0000)]
am
b1842acd: Merge "Add missing <string.h> include."
* commit '
b1842acd6fcba8a1d80efd95ea3e88c2faf7eeb0':
Add missing <string.h> include.
Elliott Hughes [Wed, 28 Jan 2015 19:35:28 +0000 (19:35 +0000)]
am
883d129b: Merge "Add missing <malloc.h> include."
* commit '
883d129ba24bfc599b65b09fd0b5aaa0946d1958':
Add missing <malloc.h> include.
Elliott Hughes [Wed, 28 Jan 2015 19:27:52 +0000 (19:27 +0000)]
Merge "Add missing <string.h> include."
Elliott Hughes [Wed, 28 Jan 2015 19:25:33 +0000 (19:25 +0000)]
Merge "Add missing <malloc.h> include."
Elliott Hughes [Wed, 28 Jan 2015 19:22:38 +0000 (11:22 -0800)]
Add missing <malloc.h> include.
Change-Id: I0259da35f2dc8ff87c928eb5bd378f39cbfc9f9c
Elliott Hughes [Wed, 28 Jan 2015 19:22:06 +0000 (11:22 -0800)]
Add missing <string.h> include.
Change-Id: I14ea45e98b8271d6b53ac86e92ad3b5c7dac8f75
Erik Kline [Tue, 20 Jan 2015 04:36:05 +0000 (13:36 +0900)]
Parse all netids with stringToNetId.
Bug:
19049156
Change-Id: Iaa3b1a84afa469dfbc0cd0798271467528196c9d
Jeff Sharkey [Fri, 23 Jan 2015 20:03:46 +0000 (20:03 +0000)]
am
51f7a8ee: am
6ef96c48: Merge "Config NFLOG target before listening."
* commit '
51f7a8ee6eb051b939bd02bf82a399da676bf32f':
Config NFLOG target before listening.
Jeff Sharkey [Fri, 23 Jan 2015 19:37:36 +0000 (19:37 +0000)]
am
6ef96c48: Merge "Config NFLOG target before listening."
* commit '
6ef96c4862428e02a0c4aebbfa1ed0ccbf58b46e':
Config NFLOG target before listening.
Jeff Sharkey [Fri, 23 Jan 2015 19:26:42 +0000 (19:26 +0000)]
Merge "Config NFLOG target before listening."
Jeff Sharkey [Fri, 23 Jan 2015 19:09:49 +0000 (12:09 -0700)]
Config NFLOG target before listening.
Otherwise the listener thread races with us and can eat the
responses to the config messages.
Bug:
19066761
Change-Id: I484fd79414731ab74ebc3ea50446e374a50eac77
Jeff Sharkey [Fri, 16 Jan 2015 02:33:03 +0000 (02:33 +0000)]
am
732c34ee: am
535b94fa: Merge "Offer to detect non-SSL/TLS network traffic."
* commit '
732c34ee7cf9fdd93e8e2aa41bac1df231d9b50b':
Offer to detect non-SSL/TLS network traffic.
Jeff Sharkey [Fri, 16 Jan 2015 01:49:08 +0000 (01:49 +0000)]
am
535b94fa: Merge "Offer to detect non-SSL/TLS network traffic."
* commit '
535b94fa9d88097220de3ea04cb8d9a91114baa8':
Offer to detect non-SSL/TLS network traffic.
Jeff Sharkey [Fri, 16 Jan 2015 01:11:18 +0000 (01:11 +0000)]
Merge "Offer to detect non-SSL/TLS network traffic."
Jeff Sharkey [Tue, 28 Oct 2014 23:50:07 +0000 (16:50 -0700)]
Offer to detect non-SSL/TLS network traffic.
Introduces new module that provides network-related features for
the StrictMode developer API. The first feature offers to detect
sockets sending data not wrapped inside a layer of SSL/TLS
encryption.
This carefully only adds overhead to UIDs that have requested
detection, and it uses CONNMARK to quickly accept/reject packets
from streams that have already been inspected. Detection is done
by looking for a well-known TLS handshake header; it's not future
proof, but it's a good start. Handles both IPv4 and IPv6.
When requested, we also log the triggering packet through NFLOG and
back up to the framework to aid investigation.
Bug:
18335678
Change-Id: Ie8fab785139dfb55a71b6dc7a0f3c75a8408224b
Lorenzo Colitti [Fri, 9 Jan 2015 02:09:32 +0000 (02:09 +0000)]
am
7e9527b4: am
32b2e795: exit instead of returning when execv()ing clatd fails.
* commit '
7e9527b45d818829093545bf6abe3e1952c73e86':
exit instead of returning when execv()ing clatd fails.
Lorenzo Colitti [Fri, 9 Jan 2015 02:01:09 +0000 (02:01 +0000)]
am
32b2e795: exit instead of returning when execv()ing clatd fails.
* commit '
32b2e795204887feb324d5cfa405bc40d8c81d0e':
exit instead of returning when execv()ing clatd fails.
Lorenzo Colitti [Wed, 7 Jan 2015 06:11:30 +0000 (15:11 +0900)]
exit instead of returning when execv()ing clatd fails.
Returning instead of exiting when execv() fails causes mayhem, as
it results in two netd processes running, and netd commands being
processed by one of the two at random.
Bug:
18893886
Change-Id: I25afbabaef5955c9af7053b0333969b4e83549f1
Dmitry Shmidt [Tue, 6 Jan 2015 21:41:50 +0000 (13:41 -0800)]
server: softap: Set hw_mode according to selected channel
Change-Id: If3d12d33e857b1438edd504ddbd5e5504673725c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dan Albert [Tue, 6 Jan 2015 19:56:56 +0000 (19:56 +0000)]
am
3dc3e542: am
1a3c689b: Merge "Fix missing errno.h includes after libc cleanup."
* commit '
3dc3e5423a183930fa981fa010f653be03201774':
Fix missing errno.h includes after libc cleanup.
Dan Albert [Tue, 6 Jan 2015 18:17:46 +0000 (18:17 +0000)]
am
1a3c689b: Merge "Fix missing errno.h includes after libc cleanup."
* commit '
1a3c689be29bfbe0c7f3eb3134e9b2a2208f839c':
Fix missing errno.h includes after libc cleanup.
Dan Albert [Tue, 6 Jan 2015 18:02:09 +0000 (18:02 +0000)]
Merge "Fix missing errno.h includes after libc cleanup."
Dan Albert [Tue, 6 Jan 2015 17:36:17 +0000 (09:36 -0800)]
Fix missing errno.h includes after libc cleanup.
These issues hadn't been found yet because a libc++ header was
unconditionally pulling in errno.h. I've fixed the libc++ header now.
Change-Id: Ib096634cdd231fc75bf7548e4b99babc7442dc53
Elliott Hughes [Mon, 29 Dec 2014 20:07:31 +0000 (20:07 +0000)]
am
9fb832c0: am
8a8b0c6a: Merge "Include what you use: <errno.h>."
* commit '
9fb832c0ee33c74f28cca8593b87ec1942684756':
Include what you use: <errno.h>.
Elliott Hughes [Mon, 29 Dec 2014 20:04:55 +0000 (20:04 +0000)]
am
8a8b0c6a: Merge "Include what you use: <errno.h>."
* commit '
8a8b0c6af6ba45b549228ca4339277f18894f909':
Include what you use: <errno.h>.
Elliott Hughes [Mon, 29 Dec 2014 19:55:14 +0000 (19:55 +0000)]
Merge "Include what you use: <errno.h>."
Elliott Hughes [Mon, 29 Dec 2014 19:48:03 +0000 (11:48 -0800)]
Include what you use: <errno.h>.
Change-Id: Ic970f6bf4558e8e0ef3d7e480c2532c102abfd7c
Erik Kline [Wed, 10 Dec 2014 22:30:05 +0000 (22:30 +0000)]
am
1df4f67e: am
59273ede: Re-add netd support for enabling IPv6 optimistic mode.
* commit '
1df4f67ee49a1ae06478d34167027296d28bffea':
Re-add netd support for enabling IPv6 optimistic mode.
Erik Kline [Wed, 10 Dec 2014 22:21:52 +0000 (22:21 +0000)]
am
59273ede: Re-add netd support for enabling IPv6 optimistic mode.
* commit '
59273ede02fc91d2a3297547d959159c8c6f69f3':
Re-add netd support for enabling IPv6 optimistic mode.
Erik Kline [Tue, 9 Dec 2014 00:57:16 +0000 (00:57 +0000)]
am
67a07780: am
9ccaa16e: Revert "Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev"
* commit '
67a0778055a6ea97331aa1d25b442e3a164a68a2':
Revert "Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev"
Erik Kline [Mon, 8 Dec 2014 19:16:44 +0000 (19:16 +0000)]
am
9ccaa16e: Revert "Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev"
* commit '
9ccaa16ece9059a0e62e16dbc0f8a64fec7eb7a3':
Revert "Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev"
Erik Kline [Mon, 8 Dec 2014 07:05:28 +0000 (16:05 +0900)]
Re-add netd support for enabling IPv6 optimistic mode.
Enables optimistic_dad and use_optimistic on all interfaces
by default.
---
This functionality was originally submitted in ag/569594. Owing
to issues with bind()ing to optimistic addresses (see b/
18609055)
this was reverted in ag/598690.
This reverts the revert. :-)
Bug:
17769720
Change-Id: I156e5636341a846f41fb9a15c84cf06878b239d8
Erik Kline [Fri, 5 Dec 2014 11:17:10 +0000 (20:17 +0900)]
Revert "Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev"
This is to undo ag/569594.
This reverts commit
828f8b88c78e7d7c31b098768df403e4596a91d4, reversing
changes made to
ac7fefcf3d90cf856b0f1664207d056ed1dd4725.
Bug:
18609055
Bug:
17769720
Change-Id: I120745d9d01d731174f477dff9b463dede8523d7
Lorenzo Colitti [Tue, 2 Dec 2014 07:07:43 +0000 (07:07 +0000)]
am
3c34ff3d: am
dadc5f85: Add a command to clear a network\'s DNS servers.
* commit '
3c34ff3d8f53e1bfa4d6b0f790d72317da8c45cf':
Add a command to clear a network's DNS servers.
Lorenzo Colitti [Tue, 2 Dec 2014 07:00:48 +0000 (07:00 +0000)]
am
dadc5f85: Add a command to clear a network\'s DNS servers.
* commit '
dadc5f850ee7a4dbe9ed418ae9d363b237f7a0e8':
Add a command to clear a network's DNS servers.
Lorenzo Colitti [Sat, 29 Nov 2014 04:54:25 +0000 (13:54 +0900)]
Add a command to clear a network's DNS servers.
Bug:
18327075
Change-Id: I0df13ff4a17ee65e640be96695a3af31b020963a
Elliott Hughes [Tue, 25 Nov 2014 19:56:42 +0000 (19:56 +0000)]
am
2ac0dcb4: am
a0b06f61: Merge "Plug some leaks"
* commit '
2ac0dcb47d959c4944a8e38d6b5bdf8daaf86fb5':
Plug some leaks
Elliott Hughes [Tue, 25 Nov 2014 18:52:06 +0000 (18:52 +0000)]
am
a0b06f61: Merge "Plug some leaks"
* commit '
a0b06f61c55be2ecea35d14b621553c00bf287a6':
Plug some leaks
Elliott Hughes [Mon, 24 Nov 2014 18:58:35 +0000 (18:58 +0000)]
Merge "Plug some leaks"
Jesper Hansson [Fri, 27 Apr 2012 11:54:27 +0000 (13:54 +0200)]
Plug some leaks
Change-Id: I4268ea32cfb0ebd6ce5711e30865750dffa94e92
Elliott Hughes [Fri, 14 Nov 2014 00:44:52 +0000 (00:44 +0000)]
am
9aaad858: am
ce0b69e2: Merge "Don\'t send structs containing pointers over sockets."
* commit '
9aaad8581005ec7e0248508ebc3c5f91e4c50913':
Don't send structs containing pointers over sockets.
Elliott Hughes [Thu, 13 Nov 2014 18:03:08 +0000 (18:03 +0000)]
am
ce0b69e2: Merge "Don\'t send structs containing pointers over sockets."
* commit '
ce0b69e25ae35f93ff7253855bf8a38c7fbf0232':
Don't send structs containing pointers over sockets.
Elliott Hughes [Thu, 13 Nov 2014 17:56:05 +0000 (17:56 +0000)]
Merge "Don't send structs containing pointers over sockets."
Elliott Hughes [Thu, 13 Nov 2014 01:01:46 +0000 (17:01 -0800)]
Don't send structs containing pointers over sockets.
Fixes x86-64 netd.
Change-Id: Iee5ef802ebbf2e000b2593643de4eec46f296c04
Sreeram Ramachandran [Tue, 4 Nov 2014 22:24:38 +0000 (22:24 +0000)]
am
02828009: am
584dbee5: Don\'t use framework permission strings for netd permissions.
* commit '
02828009b2ca2d91262b370d58ccee36fe67be06':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Tue, 4 Nov 2014 22:15:52 +0000 (22:15 +0000)]
am
584dbee5: Don\'t use framework permission strings for netd permissions.
* commit '
584dbee59ceb7750e22c48371342635aa6a98517':
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.
Bug:
18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
Robert Greenwalt [Tue, 4 Nov 2014 01:17:17 +0000 (01:17 +0000)]
am
5e1d88b5: Write pid file so we can tell when netd bounces. automerge:
347f693
* commit '
5e1d88b58d42b0cb4c3bc9ce1b347a0127a0ea10':
Write pid file so we can tell when netd bounces.
Robert Greenwalt [Mon, 3 Nov 2014 23:59:47 +0000 (23:59 +0000)]
Write pid file so we can tell when netd bounces.
automerge:
347f693
* commit '
347f69312176a54250a35afdc712b044c466fc73':
Write pid file so we can tell when netd bounces.
Robert Greenwalt [Sat, 1 Nov 2014 01:54:06 +0000 (18:54 -0700)]
Write pid file so we can tell when netd bounces.
We clear the file early so people know it's died and rewrite after all the
setup and flushing of data is done so people know when it's safe to
repopulate the data.
bug:
18069270
Change-Id: I954cf43ff02f1d352015f128ef88b659e6d0f95a
Sreeram Ramachandran [Fri, 31 Oct 2014 00:36:24 +0000 (00:36 +0000)]
am
eb4325b0: am
64166e76: Don\'t fail when trying to add routes that already exist.
* commit '
eb4325b0499bc246ed104cf4ad46b84b4e78599e':
Don't fail when trying to add routes that already exist.
Sreeram Ramachandran [Fri, 31 Oct 2014 00:29:45 +0000 (00:29 +0000)]
am
64166e76: Don\'t fail when trying to add routes that already exist.
* commit '
64166e7666e3cc7f4b9c715f2b4e19d28ae44c5a':
Don't fail when trying to add routes that already exist.
Lorenzo Colitti [Fri, 31 Oct 2014 00:24:58 +0000 (00:24 +0000)]
am
dce9d895: am
2b8d1ead: Merge "Add a netd interface command to disable ND offload." into lmp-mr1-dev
* commit '
dce9d8959ac937249d62aebe3d6e044c015b7cff':
Add a netd interface command to disable ND offload.
Erik Kline [Fri, 31 Oct 2014 00:24:57 +0000 (00:24 +0000)]
am
4c631b0d: am
828f8b88: Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev
* commit '
4c631b0d17fcc3bc2d0d43fadeee2296a2aa9d76':
Add netd support for configuring IPv6 optimistic mode.
Lorenzo Colitti [Fri, 31 Oct 2014 00:15:57 +0000 (00:15 +0000)]
am
2b8d1ead: Merge "Add a netd interface command to disable ND offload." into lmp-mr1-dev
* commit '
2b8d1ead4ea2ff8cb5af1ce88033a8ea0d691402':
Add a netd interface command to disable ND offload.
Erik Kline [Fri, 31 Oct 2014 00:15:27 +0000 (00:15 +0000)]
am
828f8b88: Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev
* commit '
828f8b88c78e7d7c31b098768df403e4596a91d4':
Add netd support for configuring IPv6 optimistic mode.
Sreeram Ramachandran [Thu, 30 Oct 2014 17:01:07 +0000 (10:01 -0700)]
Don't fail when trying to add routes that already exist.
Previously, we suppressed failures for the special case of
requestRouteToHost() being called multiple times. Turns out that other
parts of the system also try to add duplicate routes, so just suppress
EEXIST errors in general (as far as adding routes is concerned). For
example, this happens when the WiFi P2P DHCP client renews its lease
and blindly requests to add a route that it had already added before.
Bug:
17205769
Change-Id: I3de557ddb82c95899623aa31b4b3ec7c955f5609
Lorenzo Colitti [Thu, 30 Oct 2014 13:24:39 +0000 (13:24 +0000)]
Merge "Add a netd interface command to disable ND offload." into lmp-mr1-dev
Lorenzo Colitti [Mon, 27 Oct 2014 15:15:07 +0000 (00:15 +0900)]
Add a netd interface command to disable ND offload.
This will be used to support 464xlat on wifi and IPv6 tethering.
Bug:
12111730
Change-Id: I3b97f4dfb787b2c5d5021811c6da51850bdc70d1
Erik Kline [Thu, 30 Oct 2014 03:42:18 +0000 (03:42 +0000)]
Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev
Lorenzo Colitti [Wed, 29 Oct 2014 17:37:31 +0000 (17:37 +0000)]
am
9b1b22ef: Support more than one clatd at a time. automerge:
ac7fefc
* commit '
9b1b22ef23b807897ea5747fbb817e4a75222b2b':
Support more than one clatd at a time.
Lorenzo Colitti [Wed, 29 Oct 2014 17:16:23 +0000 (17:16 +0000)]
Support more than one clatd at a time.
automerge:
ac7fefc
* commit '
ac7fefcf3d90cf856b0f1664207d056ed1dd4725':
Support more than one clatd at a time.
Robert Greenwalt [Wed, 29 Oct 2014 07:12:48 +0000 (07:12 +0000)]
am
3d6c5b01: am
4bcd2b13: am
388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"
* commit '
3d6c5b01355a10469ac10538bea365ec34e8e23f':
Lorenzo Colitti [Wed, 29 Oct 2014 07:12:48 +0000 (07:12 +0000)]
am
50b90a07: am
4dc100c4: am
a1067c8d: Improve error return values on network selection.
* commit '
50b90a07f68335492a34e0e85a69413ea22cc43e':
Lorenzo Colitti [Wed, 29 Oct 2014 07:12:47 +0000 (07:12 +0000)]
Gordon Gao [Wed, 29 Oct 2014 07:12:47 +0000 (07:12 +0000)]
Lorenzo Colitti [Wed, 29 Oct 2014 07:12:46 +0000 (07:12 +0000)]
Robert Greenwalt [Wed, 29 Oct 2014 07:00:21 +0000 (07:00 +0000)]
am
4bcd2b13: am
388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"
* commit '
4bcd2b139cdb67cfcea47d15b58f38afec0b0859':
Lorenzo Colitti [Wed, 29 Oct 2014 07:00:20 +0000 (07:00 +0000)]
am
4dc100c4: am
a1067c8d: Improve error return values on network selection.
* commit '
4dc100c4e79200152ab5c0f9bc3e00033bfff104':
Lorenzo Colitti [Wed, 29 Oct 2014 07:00:20 +0000 (07:00 +0000)]
Gordon Gao [Wed, 29 Oct 2014 07:00:19 +0000 (07:00 +0000)]
am
bc9da4e6: am
6b6f22fa: Enable tcp mss clamp for Tethering
* commit '
bc9da4e633165700bbcc6ba33e09f100acb88d3f':
Lorenzo Colitti [Wed, 29 Oct 2014 07:00:18 +0000 (07:00 +0000)]
am
10f9a166: am
4c95a125: Support manipulating throw routes.
* commit '
10f9a166f6bfc625a07f67cf3bcc3d96b170a5de':
Lorenzo Colitti [Mon, 20 Oct 2014 08:14:13 +0000 (17:14 +0900)]
Support more than one clatd at a time.
1. Change from a single PID to a map of interface names to PIDs.
2. Make clatd commands take an interface argument.
3. Give the clatd processes names that depend on their parent
interface, e.g., clatd-rmnet0.
Bug:
12111730
Change-Id: Ia770952d6511f8598a3356be5911da4ffa01b46a
Erik Kline [Thu, 9 Oct 2014 06:37:01 +0000 (15:37 +0900)]
Add netd support for configuring IPv6 optimistic mode.
Enables optimistic_dad and use_optimistic on all interfaces
by default.
Bug:
17769720
Change-Id: Ide492e18aa94064b890fef30d31c3a14cfdf4052
Robert Greenwalt [Thu, 9 Oct 2014 22:19:28 +0000 (22:19 +0000)]
am
8214b178: am
388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"
* commit '
8214b1782bb67d22629af35e34244f69adb80e02':
Fix MDnsSdListener::Monitor::Monitor()
Robert Greenwalt [Thu, 9 Oct 2014 22:10:38 +0000 (22:10 +0000)]
am
388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"
* commit '
388cd671ff5237aabcd728794af49d33e18fda8b':
Fix MDnsSdListener::Monitor::Monitor()
Robert Greenwalt [Thu, 9 Oct 2014 22:07:03 +0000 (22:07 +0000)]
am
388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"
* commit '
388cd671ff5237aabcd728794af49d33e18fda8b':
Fix MDnsSdListener::Monitor::Monitor()
Robert Greenwalt [Thu, 9 Oct 2014 19:13:59 +0000 (19:13 +0000)]
Merge "Fix MDnsSdListener::Monitor::Monitor()"
Kévin Petit [Thu, 9 Oct 2014 14:20:56 +0000 (15:20 +0100)]
Fix MDnsSdListener::Monitor::Monitor()
* Initialisation of mLiveCount
The value of mLiveCount was being used without being initialised, and
this was causing the CTS class android.net.wifi.cts.NsdManagerTest
method testAndroidTestCaseSetupProperly test to fail when the calls
to calloc in the MDnsSdListener::Monitor::rescan() method returned a
value of NULL due to the large value of mPollSize, which had been set
to "mLiveCount + 5". The mPollFds and mPollRefs pointers were then used
without checking that they were not NULL, resulting in a segmentation
violation when the NULL pointer value was dereferenced. Initialising
the value of mLiveCount to zero in MDnsSdListener::Monitor::Monitor()
fixes this problem, and the test then passes.
* Also initilize mPollFds, mPollRefs and mPollSize
Change-Id: I1a8f7ee0f3ed38f46854e9ba6d5c432c9412b7c3
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin Petit <kevin.petit@arm.com>
Lorenzo Colitti [Fri, 3 Oct 2014 06:19:49 +0000 (06:19 +0000)]
am
e871b627: am
3d48bc23: am
a1067c8d: Improve error return values on network selection.
* commit '
e871b627fdc4f8d54ae506a83f9024c64ddba260':
Improve error return values on network selection.
Lorenzo Colitti [Fri, 3 Oct 2014 06:19:49 +0000 (06:19 +0000)]
Dmitry Shmidt [Fri, 3 Oct 2014 06:19:48 +0000 (06:19 +0000)]
am
bd0405f3: am
6fa06b78: softap: Ensure entropy file creation
* commit '
bd0405f3c3fb1ca62ee82610b7fb6ad1227e05c3':
softap: Ensure entropy file creation