Commit graph android_packages_modules_Co.../tests/net/java
Message SHA1
Add the default network to NetworkStats and NetworkStatsCollection.
This allows us to maintain NetworkStats entries that track
whether the traffic was on the default network.

At the moment, the stats collection code always passes in
DEFAULT_NETWORK_NO. However, this value is a no-op, since it is
not persisted to disk. Only the ident, the uid/set/tag, and the
packet/byte/operation counters are persisted.

A future change will add defaultNetwork to the ident and start
persisting it.

Bug: 35142602
Test: runtest frameworks-net
Change-Id: Ifa291c62c0fa389b88e5561086a29dcd7cee2253

Lorenzo Colitti   commited 2018-01-19 19:49:16 +09:00
cd969ef97c
Pass all default networks to NetworkStatsService
This will allow NetworkStatsService to treat traffic on these
networks differently from traffic where the app selects a network
that is not the default.

Bug: 35142602
Test: runtest frameworks-net
Change-Id: I5ea9d200d9fb153490c6108bb9390bf152f297da

Lorenzo Colitti   commited 2018-01-19 16:40:10 +09:00
2486188d7b
Add xfrm mark in IpSecConfig
Bug: 63589600
Test: runtest frameworks-net
Change-Id: I2d38d781b8b31d8bf39fd4e9a7e31509f15a9e16

Di Lu   commited 2018-01-18 15:23:56 -08:00
fcf78b1727
Merge "Add "not congested" network capability." am: 8a06cca651 am: 944a9864a2
am: f22a540007

Change-Id: I836fedeab34f34a43e0257e395fca1f735bc6d61

Jeff Sharkey   authored and   android-build-merger   commited 2018-01-18 04:20:44 +00:00
d86a06f7b4
Merge "Add public API methods for private DNS." am: 6cba185910 am: a57e5c074c
am: 2e00fc0771

Change-Id: Icd04bc83624ea4d13ac7737e6f9a7b0c5f0f7314

Lorenzo Colitti   authored and   android-build-merger   commited 2018-01-18 03:36:37 +00:00
482dfac4be
Merge "Add "not congested" network capability."
Jeff Sharkey   authored and   Gerrit Code Review   commited 2018-01-18 03:28:34 +00:00
8a06cca651
Merge "Add public API methods for private DNS."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2018-01-18 01:17:17 +00:00
6cba185910
Merge "IpSec - API Tweak for removeTransportModeTransform" am: 656040874d am: eee6875535
am: e3ba80104d

Change-Id: I479c24d9ac5d4b022ec6310395fdb4274cfd5598

nharold   authored and   android-build-merger   commited 2018-01-17 20:50:14 +00:00
718944eeac
Add public API methods for private DNS.
Test: Small modifications to LinkProperties test.
Bug: 71828272
Change-Id: Id2f5acb5469132ec4a917837739f42085c71498e

dalyk   commited 2018-01-17 15:46:21 -05:00
7643abcbe3
Address comments and final cleanup from refcounting integration
Added some extra comments on reference counting and moved a few methods
around. No significant logical changes made in this CL

Bug: 63409385
Test: CTS, Unit tests (both frameworks-base and netd) and binder tests
all pass

Change-Id: I89f1f4a021db48ae406fefefa6aca7406045736c

Benedict Wong   commited 2018-01-17 12:10:49 -08:00
1142483151
Merge "IpSec - API Tweak for removeTransportModeTransform"
nharold   authored and   Gerrit Code Review   commited 2018-01-17 19:07:10 +00:00
656040874d
Merge changes from topic "ipsec-oneway-transform" am: 60a21328d5 am: ff0e4bc116
am: 00a7fde299

Change-Id: I2a90cf423a3ac9a0526831ef767ad019e7be053c

nharold   authored and   android-build-merger   commited 2018-01-17 10:07:33 +00:00
529d025961
Make Transforms Unidirectional am: 3865a008e7 am: 41fe8097ed
am: 7b0b71c853

Change-Id: I608be255a307891ec3fe2d97cda817d75240c95c

Nathan Harold   authored and   android-build-merger   commited 2018-01-17 10:03:31 +00:00
3da8511490
Make Transforms Unidirectional
am: 3865a008e7

Change-Id: I7e80c75b3b227fdd16479120d8b7203cc5f28d1c

Nathan Harold   authored and   android-build-merger   commited 2018-01-17 09:37:57 +00:00
41fe8097ed
Add "not congested" network capability.
Can be used by a network to indicate when it's congested, meaning that
apps should defer network traffic that could be done at a later time.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.VpnTest,com.android.server.ConnectivityServiceTest
Bug: 64133169
Change-Id: I8a60b6f02dd0f42268b59690556c16335d34e220

Jeff Sharkey   commited 2018-01-17 02:27:04 -07:00
b04d5111ec
IpSec - API Tweak for removeTransportModeTransform
Because IpSecTransforms are now unidirectional,
and because the only mechanism for removing Transforms
removes it from both directions, the API can no longer
use the Transform parameter to meaningfully validate
that the caller had applied a transform. Since that
functionality was as-yet unimplemented and is now
infeasible, the transform parameter is removed.

Bug: 72079356
Test: cts - IpSecManagerTest; runtest frameworks-net
Change-Id: If19b0d34bdc6daf31a40d6d62bff326dcbca08c0

Nathan Harold   commited 2018-01-17 01:11:46 -08:00
dd2ed2bbe7
Merge changes from topic "ipsec-oneway-transform"
* changes:
  Update IpSecService UnitTests
  Make Transforms Unidirectional

nharold   authored and   Gerrit Code Review   commited 2018-01-17 08:40:37 +00:00
60a21328d5
Update IpSecService UnitTests
The IpSecService Unit tests relied on the
directionality of the IpSecConfig and previously
did not specify a source address. Unit tests
updated without functional change other than to
address these two requirements.

Bug: 71717213
Test: runtest frameworks-net
Change-Id: Iedbed735bc50fd4fdfe985f9e173956062a7b0d1

Nathan Harold   commited 2018-01-16 19:38:10 -08:00
f52a471f1a
Make Transforms Unidirectional
Convert the IpSecTransform from being a bi-directional
pair of SAs to a unidirectional single SA. This CL
also removes the concept of "direction from SAs meaning
that a IpSecTransform may now be applied to a socket
in either direction.

-Make transforms unidirectional
-Add Convert allocateSpi() to use destination rather
 than direction and remote address
-Remove directionality from builders for IpSecTransform
-Change applyTransportModeTransform() to take a
 direction in which to apply the transform object.
-Additional minor naming updates
-Restrict IpSecConfig to only print keys on eng builds
-Move DIRECTION constants to IpSecManager
-Add sourceAddress parameter to IpSecTransform to provide
 additional guarantees about the source address of data;
 (explicit failure rather than implicit failure).
-Move SPI to the build() method of IpSecTransform

Bug: 71717213
Test: runtest frameworks-net, CTS - IpSecManagerTest
Change-Id: I0824b37f443f4b8c62536d9801238c63ed8f2a1c

Nathan Harold   commited 2018-01-16 11:08:31 -08:00
3865a008e7
Merge changes I0d0c0fac,Ifb9b00b6 am: 3fbfac269b am: bfaf963337
am: f0c515477e

Change-Id: I919f21566d5caff9fb35f57c439048b9b48f0971

Lorenzo Colitti   authored and   android-build-merger   commited 2018-01-16 18:59:02 +00:00
963aa432c8
Merge changes I0d0c0fac,Ifb9b00b6
* changes:
  Split updateCapabilities into two methods.
  More strictly check NetworkCapabilities callbacks.

Treehugger Robot   authored and   Gerrit Code Review   commited 2018-01-16 14:25:13 +00:00
3fbfac269b
Merge "Update netId to nethandle mapping in NetworkTest." am: 75c5e3dcb5 am: 503135596b
am: d38b9f7acf

Change-Id: I6feaa589fc43ff8ee1635be0fbd58aaa25679a5a

Lorenzo Colitti   authored and   android-build-merger   commited 2018-01-16 13:46:46 +00:00
d4f6b43b19
Merge "Update netId to nethandle mapping in NetworkTest."
Treehugger Robot   authored and   Gerrit Code Review   commited 2018-01-16 12:23:02 +00:00
75c5e3dcb5
Merge "MacAddress: add @NonNull annotations" am: bc3edde9c6 am: a7c125e5b2
am: e1c0b97447

Change-Id: Ib525e2429609ce12c2be5bbeacffa217b65bebe3

Hugo Benichi   authored and   android-build-merger   commited 2018-01-16 10:40:56 +00:00
cc1f4b9dba
Update netId to nethandle mapping in NetworkTest.
Bug: 63052780
Test: NetworkTest now passes
Change-Id: I5f1cb3055b7042a19afb5dd62f082912157612ba

Lorenzo Colitti   commited 2018-01-16 17:19:04 +09:00
959f60b710
MacAddress: add @NonNull annotations
This patch adds to the MacAddress class:
  - getAddressType() method which replaces addressType(), for naming
  consistency
  - @NonNull annotations on all input and output reference values for
  all public methods (@hide and public).

TYPE_UNKNOWN, which currently cannot be observed with a non @hide
method, is also removed from the public api.

Bug: 71866627
Test: $ runtest frameworks-net
Change-Id: I2af70408d46f431b7b32183e6b48ddae9a261a2c

Hugo Benichi   commited 2018-01-16 13:32:59 +09:00
8f21758d4a
More strictly check NetworkCapabilities callbacks.
This change more strictly accounts for onCapabilitiesChanged
callbaks and their values. It exposes several cases where we the
callbacks we send are spurious.

Test: ConnectivityServiceTest continues to pass
Change-Id: Ifb9b00b6f0cae48f8ed41a525100d1744b5f429b

Lorenzo Colitti   commited 2018-01-16 00:25:13 +09:00
7045d61b50
Merge changes I47ccfa99,I5db1de3e am: f98f97fe92 am: 03f3294103
am: 420d020689

Change-Id: Ic774b944238d6df07511df8e467d66cefcd4fa81

Erik Kline   authored and   android-build-merger   commited 2018-01-11 12:52:19 +00:00
292453458a
Extract DNS setting logic into DnsManager class
In future, managing DNS-over-TLS hostname lookup and netd programming
can be encapsulated here.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 64133961
Change-Id: I47ccfa99c30c780524c45c4af605e720ccba34a0

Erik Kline   commited 2018-01-11 18:16:50 +09:00
3212008036
Add minimal test for setting DNS properties
Test: as follows
Change-Id: I5db1de3ee8e179edd56c93988b821242b81c2387

Erik Kline   commited 2018-01-11 18:16:20 +09:00
6e0347d6df
Merge "Move more core networking tests to framework/base/tests/net." am: d207b1faa3 am: 8f852c341f
am: 291e7c4fce

Change-Id: I1eb98a82426d7b7e085316f8a67cdd1e81912538

Lorenzo Colitti   authored and   android-build-merger   commited 2018-01-11 04:17:51 +00:00
389812c768
Merge "Move more core networking tests to framework/base/tests/net."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2018-01-11 03:09:40 +00:00
d207b1faa3
Move more core networking tests to framework/base/tests/net.
Test: "runtest frameworks-net" passes except for already-failing IpConnectivityMetricsTest
Change-Id: I2a20d546089699ac67bc819f10a8fcd50c637ac4

Lorenzo Colitti   commited 2018-01-10 23:35:16 +09:00
a4fdc1204e
Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46 am: c93df5ca1c
am: f85202f016

Change-Id: I7ff85771945c68025ce8d66ca85313bac087b3a5

Benedict Wong   authored and   android-build-merger   commited 2018-01-09 21:23:35 +00:00
d49e808b8e
Add validation to IpSecConfig algorithm setters
Adds checks to ensure that users can only set the correct types of
algorithms for the Authentication, Encryption and Authenticated
Encryption algorithms.

Bug: 65223935
Test: Added tests in IpSecConfigTest, and passed on aosp_marlin-eng
Change-Id: I462c77d9eb5710b8d03a48866453649d3b6fc6bf

Benedict Wong   commited 2018-01-04 16:56:40 -08:00
a708eec031
MacAddress: address api review comments
1) toSafeString() is renamed to toOuiString()
2) toOuiString() returns a String that only contains the first 3 bytes
   of the mac address.

Bug: 70336442
Test: runtest frameworks-net
Change-Id: I798d8fec32dbff5687a682028e5d90eb941f81c1
Merged-In: I798d8fec32dbff5687a682028e5d90eb941f81c1

(cherry pick from commit 3f83b8ad4e)

Hugo Benichi   commited 2017-12-21 08:34:05 +09:00
1f3ce3f31a
Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am: 4edb4c8ec4 am: 5949912523
am: a7d1b22d6d

Change-Id: Id6a5ff71ead4566b9a91b9e9b6c78d81f1ac0f54

Benedict Wong   authored and   android-build-merger   commited 2017-12-20 18:58:30 +00:00
08faba25e6
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: 0b8bf40ae4 am: 8caa274ade
am: b72b41b121

Change-Id: I4140f386687c579044f9b5fe59dd7e05f86000fe

Benedict Wong   authored and   android-build-merger   commited 2017-12-19 00:41:55 +00:00
6b42407013
[ipsec-doze] Add fchown to IpSecService to support doze
Encap sockets are currently created as the system server, and should be
fchown'd to the user for whom it was created on behalf of.

Bug: 62994731
Test: New tests added and run to IpSecService
Change-Id: Icc49e709ae588981e69765fdb77537d7ffbac5fe

Benedict Wong   commited 2017-12-18 16:01:58 -08:00
42e3fa137d
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets"
Benedict Wong   authored and   Gerrit Code Review   commited 2017-12-18 23:50:52 +00:00
0b8bf40ae4
[ipsec-qtaguid] Tag sockets upon creation of encap sockets
Added calls to tag encap sockets to that of the UID for which the encap
socket is being created on behalf of. This ensures that all data
accounting generated for the UDP-encap-ESP socket is correctly billed to
the right UID.

Bug: 62994731
Test: New tests added to IpSecServiceTest.java, passing
Change-Id: I15365ea9c982fd7b4e3cdeff314ddfba2289c86e

Benedict Wong   commited 2017-12-18 19:46:06 +00:00
c41067d51a
MacAddress: address api review comments
1) toSafeString() is renamed to toOuiString()
2) toOuiString() returns a String that only contains the first 3 bytes
   of the mac address.

Bug: 70336442
Test: runtest frameworks-net
Change-Id: I798d8fec32dbff5687a682028e5d90eb941f81c1

Hugo Benichi   commited 2017-12-18 09:22:47 +09:00
3f83b8ad4e
Fix broken test due to API rename
A race condition during an Api rename has caused
the name change from reserveSecurityParameterIndex
to allocateSecurityParameterIndex to be wrong in
a test. Fixing.

Bug: 69128142
Test: runtest frameworks-net
Change-Id: I12fb9832cb938dc19f463b1f1124127435d7b173

Nathan Harold   commited 2017-12-14 23:13:45 +00:00
e5768f496f
Fix broken test due to API rename
A race condition during an Api rename has caused
the name change from reserveSecurityParameterIndex
to allocateSecurityParameterIndex to be wrong in
a test. Fixing.

Bug: 69128142
Test: runtest frameworks-net
Change-Id: I12fb9832cb938dc19f463b1f1124127435d7b173

Nathan Harold   authored and   nharold   commited 2017-12-14 23:04:42 +00:00
bcbe3b6bf2
Merge "Use consistent naming for allocating SPI." am: 37303d5e94 am: 4753ed4b1b
am: b6bca5a59d

Change-Id: Ib6845ab0d7f385fbd1d59c0179771542e12c8be0

nharold   authored and   android-build-merger   commited 2017-12-14 21:48:58 +00:00
2079139e73
Merge "Use consistent naming for allocating SPI."
nharold   authored and   Gerrit Code Review   commited 2017-12-14 21:10:16 +00:00
37303d5e94
Merge "Convert IpSecService resources to use refcounting" am: a87a442c5a am: 8698b33cc2
am: 393a328478

Change-Id: Ib18839d7dff8e25898f81e877337fbb8cb24cc7b

Benedict Wong   authored and   android-build-merger   commited 2017-12-14 02:41:28 +00:00
882e5ed408
Convert IpSecService resources to use refcounting
This is part 2 of 2 of the refcounting refactor for IpSecService
resources.

Switched ManagedResources to use RefcountedResource structure for
managing reference counts and eventual cleanup. Further, resource arrays
and quota management have been aggregated into a UserRecord for better
isolation. UID access checking has been similarly moved into the
UserRecordTracker, and resourceId checking has been rolled into
RefcountedResourceArray's accessor methods.

Bug: 63409385
Test: CTS, all unit tests run on aosp_marlin-eng, new tests added
Change-Id: Iee52dd1c9d2583bb6bfaf65be87569e9d50a5b63

Benedict Wong   commited 2017-12-13 23:28:41 +00:00
d21105064e
Merge "Add reference counted resources to IpSecService" am: 05013f3965 am: adb6437fea
am: 5dd409e76b

Change-Id: Iae17a5d33d71e8abf24211cbf2b215520f45c619

Benedict Wong   authored and   android-build-merger   commited 2017-12-13 22:11:20 +00:00
9802ad3701
Merge "Add reference counted resources to IpSecService"
Benedict Wong   authored and   Gerrit Code Review   commited 2017-12-13 21:33:38 +00:00
05013f3965