OSDN Git Service

android-x86/system-extras.git
9 years agoam b7f56ac0: Merge "fs_mgr exports its headers."
Elliott Hughes [Tue, 31 Mar 2015 02:05:10 +0000 (02:05 +0000)]
am b7f56ac0: Merge "fs_mgr exports its headers."

* commit 'b7f56ac0176ae78e083bc8f95081b0befe2b17a2':
  fs_mgr exports its headers.

9 years agoMerge "fs_mgr exports its headers."
Elliott Hughes [Tue, 31 Mar 2015 01:36:03 +0000 (01:36 +0000)]
Merge "fs_mgr exports its headers."

9 years agofs_mgr exports its headers.
Elliott Hughes [Tue, 31 Mar 2015 00:48:49 +0000 (17:48 -0700)]
fs_mgr exports its headers.

Change-Id: I6fddb60a902be5ac216d32a751ec8c178c26ebaf

9 years agoam 17fb21d0: Merge "Clean up includes"
Paul Lawrence [Mon, 30 Mar 2015 17:27:35 +0000 (17:27 +0000)]
am 17fb21d0: Merge "Clean up includes"

* commit '17fb21d013743a93bab3cdfc899e952184cae58c':
  Clean up includes

9 years agoMerge "Clean up includes"
Paul Lawrence [Mon, 30 Mar 2015 16:51:54 +0000 (16:51 +0000)]
Merge "Clean up includes"

9 years agoClean up includes
Paul Lawrence [Mon, 30 Mar 2015 16:16:09 +0000 (09:16 -0700)]
Clean up includes

Remove two system files
Remove a circular include dependency by using a callback function

Change-Id: I159357b3a0ad06d0a7ebf45feb82989bcc1b303a

9 years agoam abe6f251: Merge "Don\'t #include "../"."
Elliott Hughes [Sat, 28 Mar 2015 18:16:28 +0000 (18:16 +0000)]
am abe6f251: Merge "Don\'t #include "../"."

* commit 'abe6f251d1b836516514b88a6f2582fdb1f23ec4':
  Don't #include "../".

9 years agoMerge "Don't #include "../"."
Elliott Hughes [Sat, 28 Mar 2015 17:49:57 +0000 (17:49 +0000)]
Merge "Don't #include "../"."

9 years agoDon't #include "../".
Elliott Hughes [Sat, 28 Mar 2015 17:39:46 +0000 (10:39 -0700)]
Don't #include "../".

If you have to use a relative path (especially one out of the current
git project), you probably shouldn't be using those headers...

(cherrypick of 0c58a04b5567b84a13269835d9365a045d85b95e.)

Change-Id: Ifef6945cf1e884a4aa7f8f5532f1de660a22dafc

9 years agoDon't #include "../".
Elliott Hughes [Sat, 28 Mar 2015 17:39:46 +0000 (10:39 -0700)]
Don't #include "../".

If you have to use a relative path (especially one out of the current
git project), you probably shouldn't be using those headers...

Change-Id: Ifef6945cf1e884a4aa7f8f5532f1de660a22dafc

9 years agoam 75c6509b: Merge "[HACK] Adding e4crypt support"
Paul Lawrence [Fri, 27 Mar 2015 23:43:18 +0000 (23:43 +0000)]
am 75c6509b: Merge "[HACK] Adding e4crypt support"

* commit '75c6509ba647dd3d6fb61df6e59c52b16b7cda3f':
  [HACK] Adding e4crypt support

9 years agoMerge "[HACK] Adding e4crypt support"
Paul Lawrence [Fri, 27 Mar 2015 20:36:19 +0000 (20:36 +0000)]
Merge "[HACK] Adding e4crypt support"

9 years ago[HACK] Adding e4crypt support
Paul Lawrence [Wed, 25 Feb 2015 23:11:13 +0000 (15:11 -0800)]
[HACK] Adding e4crypt support

This is a dirty hack requiring a lot of clean up.
Needed to allow other parts to make progress.

Add e4crypt functions to libext4_utils
Add e4crypt command line tool

Change-Id: Iac5ae75e7f39cccc87701faf1f590e44f5209c0e

9 years agoam 99918d02: Merge "Special-case "su --help"."
Elliott Hughes [Fri, 27 Mar 2015 02:28:01 +0000 (02:28 +0000)]
am 99918d02: Merge "Special-case "su --help"."

* commit '99918d024a0b361f48162599c968fb100e1dcc3e':
  Special-case "su --help".

9 years agoMerge "Special-case "su --help"."
Elliott Hughes [Fri, 27 Mar 2015 02:01:27 +0000 (02:01 +0000)]
Merge "Special-case "su --help"."

9 years agoSpecial-case "su --help".
Elliott Hughes [Fri, 27 Mar 2015 00:09:41 +0000 (17:09 -0700)]
Special-case "su --help".

Rather than force people to move from "su system echo -n hello", where
the -n gets interpreted by getopt_long(3), to "su system -- echo -n hello",
just hard-code the recognition of --help. This seems easier than moving
people over to the more traditional "su -c 'echo -n hello'" style.

Bug: 19948740
Change-Id: I248269343b452a381effb7b8926ac7f2522b941b

9 years agoMerge "[HACK] Adding e4crypt support"
Paul Lawrence [Thu, 26 Mar 2015 14:15:11 +0000 (14:15 +0000)]
Merge "[HACK] Adding e4crypt support"

9 years ago[HACK] Adding e4crypt support
Paul Lawrence [Wed, 25 Feb 2015 23:11:13 +0000 (15:11 -0800)]
[HACK] Adding e4crypt support

This is a dirty hack requiring a lot of clean up.
Needed to allow other parts to make progress.

Add e4crypt functions to libext4_utils
Add e4crypt command line tool

Change-Id: Iac5ae75e7f39cccc87701faf1f590e44f5209c0e

9 years agoam d56e76f0: Merge "Use PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP."
Elliott Hughes [Tue, 24 Mar 2015 04:07:20 +0000 (04:07 +0000)]
am d56e76f0: Merge "Use PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP."

* commit 'd56e76f04b1f2ec89c52f68941591c54b8da21b3':
  Use PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP.

9 years agoMerge "Use PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP."
Elliott Hughes [Tue, 24 Mar 2015 03:41:09 +0000 (03:41 +0000)]
Merge "Use PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP."

9 years agoUse PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP.
Elliott Hughes [Tue, 24 Mar 2015 03:20:54 +0000 (20:20 -0700)]
Use PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP.

Change-Id: Ifa87d9a9406acec1d5cdf7dd63af0df52c5cfb3c

9 years agoam efa04370: Merge "system/extras/verity: BoringSSL fix."
Kenny Root [Wed, 18 Mar 2015 17:51:48 +0000 (17:51 +0000)]
am efa04370: Merge "system/extras/verity: BoringSSL fix."

* commit 'efa043704bcbdc98b6c29a27f3a42caccb174664':
  system/extras/verity: BoringSSL fix.

9 years agoMerge "system/extras/verity: BoringSSL fix."
Kenny Root [Wed, 18 Mar 2015 17:35:47 +0000 (17:35 +0000)]
Merge "system/extras/verity: BoringSSL fix."

9 years agoam 04892232: Merge "Remove perm_checker and mounts-test.sh."
Elliott Hughes [Wed, 18 Mar 2015 16:08:06 +0000 (16:08 +0000)]
am 04892232: Merge "Remove perm_checker and mounts-test.sh."

* commit '04892232fb748347f4b6ebbe2b41db80b58b86a0':
  Remove perm_checker and mounts-test.sh.

9 years agoMerge "Remove perm_checker and mounts-test.sh."
Elliott Hughes [Wed, 18 Mar 2015 15:47:55 +0000 (15:47 +0000)]
Merge "Remove perm_checker and mounts-test.sh."

9 years agoRemove perm_checker and mounts-test.sh.
Elliott Hughes [Wed, 18 Mar 2015 15:37:08 +0000 (08:37 -0700)]
Remove perm_checker and mounts-test.sh.

These are enforced by SELinux and tested by CTS now.

Change-Id: If506327f108c39449c611264a10623be9f1782fa

9 years agoam c87b4134: Merge "Add 64 bit support to verity build."
Sami Tolvanen [Wed, 18 Mar 2015 10:58:27 +0000 (10:58 +0000)]
am c87b4134: Merge "Add 64 bit support to verity build."

* commit 'c87b4134e5504bec39c4ed36b97863d7ed51dee1':
  Add 64 bit support to verity build.

9 years agoam 57526daf: Merge "su should reset PATH, IFS, LOGNAME, and USER."
Elliott Hughes [Wed, 18 Mar 2015 10:58:26 +0000 (10:58 +0000)]
am 57526daf: Merge "su should reset PATH, IFS, LOGNAME, and USER."

* commit '57526dafbf62f003d74fc48084cc252843f061f7':
  su should reset PATH, IFS, LOGNAME, and USER.

9 years agoMerge "Add 64 bit support to verity build."
Sami Tolvanen [Wed, 18 Mar 2015 09:02:13 +0000 (09:02 +0000)]
Merge "Add 64 bit support to verity build."

9 years agoMerge "su should reset PATH, IFS, LOGNAME, and USER."
Elliott Hughes [Wed, 18 Mar 2015 04:30:03 +0000 (04:30 +0000)]
Merge "su should reset PATH, IFS, LOGNAME, and USER."

9 years agosu should reset PATH, IFS, LOGNAME, and USER.
Elliott Hughes [Wed, 18 Mar 2015 04:19:25 +0000 (21:19 -0700)]
su should reset PATH, IFS, LOGNAME, and USER.

Also add -h and --help while we're here (since all the toybox commands carry
their own documentation, and our su isn't much like the real su).

Bug: 19647373
Bug: 19564110
Change-Id: If2e6117b6701dcac03b5831f251e60a272bf0d61

9 years agoam f1380e5b: Merge "Fix su."
Elliott Hughes [Tue, 17 Mar 2015 21:29:09 +0000 (21:29 +0000)]
am f1380e5b: Merge "Fix su."

* commit 'f1380e5ba41393dd2fd605692a0cd207782418b6':
  Fix su.

9 years agoMerge "Fix su."
Elliott Hughes [Tue, 17 Mar 2015 21:14:28 +0000 (21:14 +0000)]
Merge "Fix su."

9 years agosystem/extras/verity: BoringSSL fix.
Adam Langley [Tue, 17 Mar 2015 21:08:40 +0000 (14:08 -0700)]
system/extras/verity: BoringSSL fix.

In BoringSSL, the functions that references BIOs have been moved out of
ERR in order to have some reasonable layering of the code.

A recent addition here referenced ERR_print_errors, which is now
BIO_print_errors in BoringSSL for that reason. Additionally, the
BoringSSL headers don't #include so many standard headers for you so an
explicit #include of errno.h is needed here.

Change-Id: Iebcc353b1354bd85d432deebeb7873aae46b0d2a

9 years agoFix su.
Elliott Hughes [Tue, 17 Mar 2015 19:35:45 +0000 (12:35 -0700)]
Fix su.

Manually NULL-terminate the arguments array instead of trying to use memset.
This was accidentally working on LP64 but fails reliably on LP32.

Change-Id: Ic2ecb8ed2019f260c720f27dbd018a55e7cfa569

9 years agoam 79522851: Merge "Clean up su."
Elliott Hughes [Sun, 15 Mar 2015 22:34:17 +0000 (22:34 +0000)]
am 79522851: Merge "Clean up su."

* commit '79522851f014d82768d7d27d5676bdf98cbb595a':
  Clean up su.

9 years agoMerge "Clean up su."
Elliott Hughes [Sun, 15 Mar 2015 17:00:43 +0000 (17:00 +0000)]
Merge "Clean up su."

9 years agoClean up su.
Elliott Hughes [Sat, 14 Mar 2015 17:15:06 +0000 (10:15 -0700)]
Clean up su.

Stop building su as a static executable. We don't rely on the getuid
implementation for security, so we have nothing to fear from the dynamic
linker.

Add some missing error checking and improve error reporting.

Remove various special cases that can all be rolled into the general
case.

Bug: 19647373
Change-Id: I2689b8957a89da1f3be571fcdc966b1084efca9a

9 years agoAdd 64 bit support to verity build.
Qin Ying [Tue, 14 Oct 2014 02:53:23 +0000 (11:53 +0900)]
Add 64 bit support to verity build.

Now build verity only support 32bit environment, when the image
size is bigger than 2^32 the verity image size calculation will
be mistake.

Change-Id: I41e5fe720c1269d6c06e23bfce5bc65226fb6e77

9 years agoam 50cf3c84: am d62c4159: Merge "Add tests for cross-family bind() and connect()...
Lorenzo Colitti [Thu, 5 Mar 2015 08:44:38 +0000 (08:44 +0000)]
am 50cf3c84: am d62c4159: Merge "Add tests for cross-family bind() and connect() operations."

* commit '50cf3c84c5bb88b3798a561d742c2e87ef02a8b3':
  Add tests for cross-family bind() and connect() operations.

9 years agoam d62c4159: Merge "Add tests for cross-family bind() and connect() operations."
Lorenzo Colitti [Thu, 5 Mar 2015 08:35:35 +0000 (08:35 +0000)]
am d62c4159: Merge "Add tests for cross-family bind() and connect() operations."

* commit 'd62c415953ebc69b179cc2d250965754917dccd9':
  Add tests for cross-family bind() and connect() operations.

9 years agoMerge "Add tests for cross-family bind() and connect() operations."
Lorenzo Colitti [Thu, 5 Mar 2015 08:29:01 +0000 (08:29 +0000)]
Merge "Add tests for cross-family bind() and connect() operations."

9 years agoAdd tests for cross-family bind() and connect() operations.
Lorenzo Colitti [Tue, 3 Mar 2015 06:30:23 +0000 (15:30 +0900)]
Add tests for cross-family bind() and connect() operations.

Change-Id: Ie11d593c1ed16e674da6f64dc153dd15b9a4c988

9 years agoam ba00318a: am 7846062d: Merge "Introduce mksquashfsimage.sh"
Mohamad Ayyash [Wed, 4 Mar 2015 03:13:54 +0000 (03:13 +0000)]
am ba00318a: am 7846062d: Merge "Introduce mksquashfsimage.sh"

* commit 'ba00318ad2303f66c7bd99408ff2872c14437c7d':
  Introduce mksquashfsimage.sh

9 years agoam 7846062d: Merge "Introduce mksquashfsimage.sh"
Mohamad Ayyash [Wed, 4 Mar 2015 03:04:16 +0000 (03:04 +0000)]
am 7846062d: Merge "Introduce mksquashfsimage.sh"

* commit '7846062d8e8b545f8a54a0ddc950f3e9fb7f5eb1':
  Introduce mksquashfsimage.sh

9 years agoMerge "Introduce mksquashfsimage.sh"
Mohamad Ayyash [Wed, 4 Mar 2015 02:58:26 +0000 (02:58 +0000)]
Merge "Introduce mksquashfsimage.sh"

9 years agoIntroduce mksquashfsimage.sh
Mohamad Ayyash [Tue, 3 Mar 2015 20:33:48 +0000 (12:33 -0800)]
Introduce mksquashfsimage.sh

Change-Id: I2b916ef3ef60b40f506e1f1be59482f7b071cdb2
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
9 years agoMerge "Introduce mksquashfsimage.sh"
Mohamad Ayyash [Tue, 3 Mar 2015 23:21:04 +0000 (23:21 +0000)]
Merge "Introduce mksquashfsimage.sh"

9 years agoam 8a226653: am f924e231: Merge "Make UID rules specify "iif lo" to match real device...
Lorenzo Colitti [Tue, 3 Mar 2015 22:23:59 +0000 (22:23 +0000)]
am 8a226653: am f924e231: Merge "Make UID rules specify "iif lo" to match real device configs."

* commit '8a226653ee8e4b39f373cb2d805e7b5c9d23d2ec':
  Make UID rules specify "iif lo" to match real device configs.

9 years agoam f911182c: am 312d567a: Merge "Add Python wrappers for bind and connect as well...
Lorenzo Colitti [Tue, 3 Mar 2015 22:23:26 +0000 (22:23 +0000)]
am f911182c: am 312d567a: Merge "Add Python wrappers for bind and connect as well as sendmsg."

* commit 'f911182ccf9d6972b6edb522c4aba71b7b7da4d3':
  Add Python wrappers for bind and connect as well as sendmsg.

9 years agoIntroduce mksquashfsimage.sh
Mohamad Ayyash [Tue, 3 Mar 2015 20:33:48 +0000 (12:33 -0800)]
Introduce mksquashfsimage.sh

Change-Id: I2b916ef3ef60b40f506e1f1be59482f7b071cdb2
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
9 years agoam f924e231: Merge "Make UID rules specify "iif lo" to match real device configs."
Lorenzo Colitti [Tue, 3 Mar 2015 12:57:52 +0000 (12:57 +0000)]
am f924e231: Merge "Make UID rules specify "iif lo" to match real device configs."

* commit 'f924e231377fbf13c9ec352b5de0e79501c41c0f':
  Make UID rules specify "iif lo" to match real device configs.

9 years agoMerge "Make UID rules specify "iif lo" to match real device configs."
Lorenzo Colitti [Tue, 3 Mar 2015 12:51:23 +0000 (12:51 +0000)]
Merge "Make UID rules specify "iif lo" to match real device configs."

9 years agoMake UID rules specify "iif lo" to match real device configs.
Lorenzo Colitti [Tue, 3 Mar 2015 06:29:10 +0000 (15:29 +0900)]
Make UID rules specify "iif lo" to match real device configs.

Change-Id: Ieddb54dfdf0ea66a13f5ebd3fbeeea786e0c1505

9 years agoam 312d567a: Merge "Add Python wrappers for bind and connect as well as sendmsg."
Lorenzo Colitti [Tue, 3 Mar 2015 08:19:25 +0000 (08:19 +0000)]
am 312d567a: Merge "Add Python wrappers for bind and connect as well as sendmsg."

* commit '312d567ad893f2bab54970471b716e46d68dfcaf':
  Add Python wrappers for bind and connect as well as sendmsg.

9 years agoMerge "Add Python wrappers for bind and connect as well as sendmsg."
Lorenzo Colitti [Tue, 3 Mar 2015 08:14:02 +0000 (08:14 +0000)]
Merge "Add Python wrappers for bind and connect as well as sendmsg."

9 years agoAdd Python wrappers for bind and connect as well as sendmsg.
Lorenzo Colitti [Tue, 3 Mar 2015 06:28:15 +0000 (15:28 +0900)]
Add Python wrappers for bind and connect as well as sendmsg.

Change-Id: Ie75ec2d56a58a74e1680eb01993797a48cec7c70

9 years agoam 1e370e6c: am 7e1e0791: Merge "Add a program to display a slideshow at early boot"
Sami Tolvanen [Fri, 27 Feb 2015 23:31:27 +0000 (23:31 +0000)]
am 1e370e6c: am 7e1e0791: Merge "Add a program to display a slideshow at early boot"

* commit '1e370e6ce4c320727841b8246e3ad335dcafe54b':
  Add a program to display a slideshow at early boot

9 years agoam 7e1e0791: Merge "Add a program to display a slideshow at early boot"
Sami Tolvanen [Fri, 27 Feb 2015 23:19:15 +0000 (23:19 +0000)]
am 7e1e0791: Merge "Add a program to display a slideshow at early boot"

* commit '7e1e079174f9c78e954d15c086acdbfba8d73e83':
  Add a program to display a slideshow at early boot

9 years agoMerge "Add a program to display a slideshow at early boot"
Sami Tolvanen [Fri, 27 Feb 2015 22:23:24 +0000 (22:23 +0000)]
Merge "Add a program to display a slideshow at early boot"

9 years agoAdd a program to display a slideshow at early boot
Sami Tolvanen [Thu, 19 Feb 2015 10:44:12 +0000 (10:44 +0000)]
Add a program to display a slideshow at early boot

Add a small program to display a slideshow of images (specified
on the command line) on the framebuffer device. Images are switched
after a timeout, or user input. The timeout can be optionally set
using the -t command line parameter and defaults to 5s.

If user input occurred, the program will wait for the power button
to be pressed after the last image before exiting. To avoid draining
the battery after an accidental reboot, the program exists after 30s
even if the power button is not pressed.

Change-Id: I58c79a7f3ac747eec0d73a10f018d3d8ade9df7d
(Moved from I743c68b5f38038abcaaf5ae08233fa72fd823c8e)

9 years agoam c11e670a: am 3d5ff951: Merge "Add missing include."
Elliott Hughes [Fri, 20 Feb 2015 07:16:44 +0000 (07:16 +0000)]
am c11e670a: am 3d5ff951: Merge "Add missing include."

* commit 'c11e670a4209b05e1d05646cc81dd67bebd7693b':
  Add missing include.

9 years agoam 3d5ff951: Merge "Add missing include."
Elliott Hughes [Fri, 20 Feb 2015 07:04:31 +0000 (07:04 +0000)]
am 3d5ff951: Merge "Add missing include."

* commit '3d5ff951a033ffa7b679fac3e3a5a6c03fcbe15a':
  Add missing include.

9 years agoMerge "Add missing include."
Elliott Hughes [Fri, 20 Feb 2015 06:59:49 +0000 (06:59 +0000)]
Merge "Add missing include."

9 years agoAdd missing include.
Elliott Hughes [Fri, 20 Feb 2015 06:22:48 +0000 (22:22 -0800)]
Add missing include.

...and remove an unused one.

Change-Id: I7949964b6d74f861ad07ed56f5092014fdfc7c8a

9 years agoam 365f575b: am ae48cd80: Merge "Download the rootfs instead of expecting it to be...
Lorenzo Colitti [Wed, 11 Feb 2015 05:55:38 +0000 (05:55 +0000)]
am 365f575b: am ae48cd80: Merge "Download the rootfs instead of expecting it to be in the tree."

* commit '365f575b81f2b2fd521151f2db70b868a135aafa':
  Download the rootfs instead of expecting it to be in the tree.

9 years agoam ae48cd80: Merge "Download the rootfs instead of expecting it to be in the tree."
Lorenzo Colitti [Wed, 11 Feb 2015 05:49:18 +0000 (05:49 +0000)]
am ae48cd80: Merge "Download the rootfs instead of expecting it to be in the tree."

* commit 'ae48cd80a5d656714694f3b6b4f132603ce36284':
  Download the rootfs instead of expecting it to be in the tree.

9 years agoMerge "Download the rootfs instead of expecting it to be in the tree."
Lorenzo Colitti [Wed, 11 Feb 2015 05:36:17 +0000 (05:36 +0000)]
Merge "Download the rootfs instead of expecting it to be in the tree."

9 years agoDownload the rootfs instead of expecting it to be in the tree.
Lorenzo Colitti [Tue, 3 Feb 2015 07:20:57 +0000 (16:20 +0900)]
Download the rootfs instead of expecting it to be in the tree.

Change-Id: I17ee3a8389a141218ce8ce99a71e41b9832e8533

9 years agoam 54ccfcc3: am ffe4195c: Merge "A simple script to run all tests."
Erik Kline [Wed, 4 Feb 2015 18:58:43 +0000 (18:58 +0000)]
am 54ccfcc3: am ffe4195c: Merge "A simple script to run all tests."

* commit '54ccfcc3716f76f166579ff3c6d87527e11884f4':
  A simple script to run all tests.

9 years agoam 31c84024: am edce3c3e: Merge "Improvements to iproute."
Lorenzo Colitti [Wed, 4 Feb 2015 18:58:43 +0000 (18:58 +0000)]
am 31c84024: am edce3c3e: Merge "Improvements to iproute."

* commit '31c84024db64da50ca67b819af4554f116562d1c':
  Improvements to iproute.

9 years agoam 7866c507: am 6f6d494b: Merge "Improve the dump code."
Lorenzo Colitti [Wed, 4 Feb 2015 18:58:42 +0000 (18:58 +0000)]
am 7866c507: am 6f6d494b: Merge "Improve the dump code."

* commit '7866c507378fbb69ccf5077d3d2586eadc49e56e':
  Improve the dump code.

9 years agoam aa498ec8: am 25e83795: Unbreak srcaddr_selection_test.
Lorenzo Colitti [Wed, 4 Feb 2015 18:58:03 +0000 (18:58 +0000)]
am aa498ec8: am 25e83795: Unbreak srcaddr_selection_test.

* commit 'aa498ec8ec818dea3457a2b5a82a79d7dd970588':
  Unbreak srcaddr_selection_test.

9 years agoam e57ab91a: am a9d58ca9: Stop requiring a live Internet connection in ping6_test.py.
Lorenzo Colitti [Wed, 4 Feb 2015 18:58:03 +0000 (18:58 +0000)]
am e57ab91a: am a9d58ca9: Stop requiring a live Internet connection in ping6_test.py.

* commit 'e57ab91aa0b2773f00e09ecde2d146418574cf1b':
  Stop requiring a live Internet connection in ping6_test.py.

9 years agoam 544a0f50: am 78bf9487: Disable the ping6 flowlabel test, since it doesn\'t work.
Lorenzo Colitti [Wed, 4 Feb 2015 18:58:02 +0000 (18:58 +0000)]
am 544a0f50: am 78bf9487: Disable the ping6 flowlabel test, since it doesn\'t work.

* commit '544a0f505cf14f4be49d09bf1949757f586536f6':
  Disable the ping6 flowlabel test, since it doesn't work.

9 years agoam f81293a0: am f5f1c43d: Support setting and clearing the default network.
Lorenzo Colitti [Wed, 4 Feb 2015 18:58:01 +0000 (18:58 +0000)]
am f81293a0: am f5f1c43d: Support setting and clearing the default network.

* commit 'f81293a03658956af4039e7838d6afe8bc37d386':
  Support setting and clearing the default network.

9 years agoam 3636471d: am 334a05a2: Clean up code in preparation for AOSP.
Lorenzo Colitti [Wed, 4 Feb 2015 18:58:00 +0000 (18:58 +0000)]
am 3636471d: am 334a05a2: Clean up code in preparation for AOSP.

* commit '3636471deb513368ef51bea7910702e77eddf3eb':
  Clean up code in preparation for AOSP.

9 years agoam 08350a96: am 105bda9c: Move all setup code to a new multinetwork_base.py
Lorenzo Colitti [Wed, 4 Feb 2015 18:58:00 +0000 (18:58 +0000)]
am 08350a96: am 105bda9c: Move all setup code to a new multinetwork_base.py

* commit '08350a96baa90372f27084115558340285432537':
  Move all setup code to a new multinetwork_base.py

9 years agoam e987fd4a: am 78a9a2c9: Remove the EXPERIMENTAL from UID routing.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:59 +0000 (18:57 +0000)]
am e987fd4a: am 78a9a2c9: Remove the EXPERIMENTAL from UID routing.

* commit 'e987fd4a67c4df7e1d794725c5de734899d5a4e2':
  Remove the EXPERIMENTAL from UID routing.

9 years agoam 7bd37f8a: am 90fdc219: Verify no NSes from optimistic addresses
Erik Kline [Wed, 4 Feb 2015 18:57:58 +0000 (18:57 +0000)]
am 7bd37f8a: am 90fdc219: Verify no NSes from optimistic addresses

* commit '7bd37f8aa00d5dbe0c0116edee2feb9162865487':
  Verify no NSes from optimistic addresses

9 years agoam 8d6c1f6f: am a0142797: Add a test for cross-protocol ping crash.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:57 +0000 (18:57 +0000)]
am 8d6c1f6f: am a0142797: Add a test for cross-protocol ping crash.

* commit '8d6c1f6f0ad29922084b9067a5ada0abb69668fd':
  Add a test for cross-protocol ping crash.

9 years agoam 8c5b38d2: am cbcbda6d: Skip ping tests instead of failing if the VM has no connect...
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:56 +0000 (18:57 +0000)]
am 8c5b38d2: am cbcbda6d: Skip ping tests instead of failing if the VM has no connectivity.

* commit '8c5b38d2fba6e5e2a26e2b8bef9318dbbdb91fb8':
  Skip ping tests instead of failing if the VM has no connectivity.

9 years agoam b4619aab: am 1892b4be: Don\'t infinite loop if read() on tun returns 0
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:55 +0000 (18:57 +0000)]
am b4619aab: am 1892b4be: Don\'t infinite loop if read() on tun returns 0

* commit 'b4619aab410db150c90bc16f6253df3ba070ed6b':
  Don't infinite loop if read() on tun returns 0

9 years agoam 13ec0df4: am b2ea5d6f: Further testing for optimistic address scenarios.
Erik Kline [Wed, 4 Feb 2015 18:57:54 +0000 (18:57 +0000)]
am 13ec0df4: am b2ea5d6f: Further testing for optimistic address scenarios.

* commit '13ec0df4756a2ddad73125b69ec68e354b026ae5':
  Further testing for optimistic address scenarios.

9 years agoam 2405886f: am b87c8131: Fix lint warnings.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:53 +0000 (18:57 +0000)]
am 2405886f: am b87c8131: Fix lint warnings.

* commit '2405886f639d55d1fa1927df3c89d04394f9ef77':
  Fix lint warnings.

9 years agoam b1f7c364: am de7c4f07: Manually add directly-connected routes as well as default...
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:52 +0000 (18:57 +0000)]
am b1f7c364: am de7c4f07: Manually add directly-connected routes as well as default routes

* commit 'b1f7c36400b92d1f38b926b7027ae630ed8bc00d':
  Manually add directly-connected routes as well as default routes

9 years agoam aa024919: am f36fcbac: Don\'t specify lladdr when deleting a neighbour.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:52 +0000 (18:57 +0000)]
am aa024919: am f36fcbac: Don\'t specify lladdr when deleting a neighbour.

* commit 'aa024919886b97144544bfd30d64a36fc7cc08cb':
  Don't specify lladdr when deleting a neighbour.

9 years agoam bcffe413: am 852c1e29: Add debugging capabilities to iproute.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:51 +0000 (18:57 +0000)]
am bcffe413: am 852c1e29: Add debugging capabilities to iproute.

* commit 'bcffe41370460887934702933bf74334a996478f':
  Add debugging capabilities to iproute.

9 years agoam 4ab2b397: am fd95dbbd: Add test for source address selection behaviour.
Erik Kline [Wed, 4 Feb 2015 18:57:50 +0000 (18:57 +0000)]
am 4ab2b397: am fd95dbbd: Add test for source address selection behaviour.

* commit '4ab2b3974630b207eb0f3165fee6e050a3c2a247':
  Add test for source address selection behaviour.

9 years agoam 863df489: am ea56ba43: net_test environment changes
Erik Kline [Wed, 4 Feb 2015 18:57:49 +0000 (18:57 +0000)]
am 863df489: am ea56ba43: net_test environment changes

* commit '863df489fda16b330986ab4f07d389890f8f643d':
  net_test environment changes

9 years agoam d888f836: am aca27221: Add basic RTM_GETADDR support.
Erik Kline [Wed, 4 Feb 2015 18:57:48 +0000 (18:57 +0000)]
am d888f836: am aca27221: Add basic RTM_GETADDR support.

* commit 'd888f836d9b20b7d2426cb968dc77856d53a2165':
  Add basic RTM_GETADDR support.

9 years agoam 7001575a: am d7c39756: Make net_test work on 3.1 kernels.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:47 +0000 (18:57 +0000)]
am 7001575a: am d7c39756: Make net_test work on 3.1 kernels.

* commit '7001575a5ad099719a52079a7276115eec3a7cde':
  Make net_test work on 3.1 kernels.

9 years agoam 8e29d0d4: am e84f2c1e: Don\'t skip the LeftoverRoutes test.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:46 +0000 (18:57 +0000)]
am 8e29d0d4: am e84f2c1e: Don\'t skip the LeftoverRoutes test.

* commit '8e29d0d470ec6e0d631f36bc3bdb061439ab7fa0':
  Don't skip the LeftoverRoutes test.

9 years agoam d0404545: am 61074387: When changing UID, become a member of AID_INET.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:45 +0000 (18:57 +0000)]
am d0404545: am 61074387: When changing UID, become a member of AID_INET.

* commit 'd040454516c67039554141a942a9d0185f6ed5a5':
  When changing UID, become a member of AID_INET.

9 years agoam 28376ed1: am 1904b962: Use the right version in the rule deletion test.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:44 +0000 (18:57 +0000)]
am 28376ed1: am 1904b962: Use the right version in the rule deletion test.

* commit '28376ed172774b32aadeae0f7a6fdd21a1b152cd':
  Use the right version in the rule deletion test.

9 years agoam 26fe7c38: am ab798de7: Return route attribute types as strings.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:43 +0000 (18:57 +0000)]
am 26fe7c38: am ab798de7: Return route attribute types as strings.

* commit '26fe7c38c2fa2ea66ee248fa75bab940fca942f6':
  Return route attribute types as strings.

9 years agoam da368198: am de6b710f: Also check the MTU via netlink.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:42 +0000 (18:57 +0000)]
am da368198: am de6b710f: Also check the MTU via netlink.

* commit 'da3681980074af732ecc2be37047ef32aba824f9':
  Also check the MTU via netlink.

9 years agoam e15f0056: am a207bc0c: Support decoding route attributes, cacheinfo, uid.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:41 +0000 (18:57 +0000)]
am e15f0056: am a207bc0c: Support decoding route attributes, cacheinfo, uid.

* commit 'e15f00568f3b86ca94cfd93f6b61fb3a2fe20303':
  Support decoding route attributes, cacheinfo, uid.

9 years agoam 655537da: am 7ba0cb5b: Fix lint error.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:41 +0000 (18:57 +0000)]
am 655537da: am 7ba0cb5b: Fix lint error.

* commit '655537da1cfb79b71db83c265a95fe4bcb4abf11':
  Fix lint error.

9 years agoam 0c543eab: am f4f1424e: Check that route deletion does not ignore the table.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:40 +0000 (18:57 +0000)]
am 0c543eab: am f4f1424e: Check that route deletion does not ignore the table.

* commit '0c543eabbe35f10e14733268b09d9c307205129e':
  Check that route deletion does not ignore the table.