Roshan Pius
cde4484262
Merge "Revert "Send empty LinkProperties when entering StoppedState."" am: e339662247 am: 66c8516600
...
am: a312cf38f9
2017-12-09 02:09:51 +00:00
Treehugger Robot
e339662247
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
2017-12-09 01:34:07 +00:00
Roshan Pius
f1967c4125
Revert "Send empty LinkProperties when entering StoppedState."
...
This reverts commit b3f9f4a305
2017-12-08 22:29:50 +00:00
Erik Kline
60e07a09c9
Merge "Refactor to IpNeighborMonitor and single-threaded semantics" am: b501e7e25b am: c4ca15786f
...
am: 91bb7b17d2
2017-12-08 06:21:03 +00:00
Treehugger Robot
b501e7e25b
Merge "Refactor to IpNeighborMonitor and single-threaded semantics"
2017-12-08 05:44:26 +00:00
Erik Kline
ad2b492fe9
Merge "Send empty LinkProperties when entering StoppedState." am: efdca004ab am: 72aa5bbd4e
...
am: ca08e38e3a
2017-12-08 04:23:50 +00:00
Erik Kline
84714bffa1
Refactor to IpNeighborMonitor and single-threaded semantics
...
IpReachabilityMonitor (and IpNeighborMonitor) are only accessed from
the IpManager StateMachine's thread. Consequently lots of locking can
now be removed.
Additionally:
- rename BlockingSocketReader to PacketReader
- incorporate IpReachabilityMonitor output in dump()
Test: as follows
- runtest frameworks-net passes
- "adb shell ip neigh change <address> dev wlan0 nud failed"
triggers wifi to disconnect
Bug: 62476366
Bug: 67013397
Change-Id: I18aca29ae0019a72a7e559c2832e0d9b0e33d81e
2017-12-08 11:12:05 +09:00
Erik Kline
b3f9f4a305
Send empty LinkProperties when entering StoppedState.
...
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- changing from DHCPv4 to static while continuously pinging the
default gateway works jsut fine
- dumpsys log shows that during the change we send the empty LP:
12-06 08:46:51.085 - CMD_ON_QUIT wlan0/23 0 0 null [rcvd_in=StoppingState, proc_in=StoppingState]
12-06 08:46:51.092 - INVOKE onLinkPropertiesChange({{InterfaceName: wlan0 LinkAddresses: [] Routes: [] DnsAddresses: [] Domains: null MTU: 0}})
Bug: 69800563
Change-Id: I01047e9a72fce718a167c592bf14406c3bab3ba9
2017-12-07 18:07:38 +09:00
ludi
1229bed274
Merge "Cleanup of resource limit tests" am: 39f58678db am: da23b08c6c
...
am: cf1a4315f7
2017-12-06 04:08:23 +00:00
ludi
da23b08c6c
Merge "Cleanup of resource limit tests"
...
am: 39f58678db
2017-12-06 03:29:35 +00:00
Treehugger Robot
39f58678db
Merge "Cleanup of resource limit tests"
2017-12-06 02:58:41 +00:00
Hugo Benichi
f5cf390e41
Merge "Fix bug in MacAddress.fromString()" am: cdb84d2fc7 am: 9d077ecd9d
...
am: 5d2bd6bf0c
2017-12-05 10:09:35 +00:00
Hugo Benichi
9d077ecd9d
Merge "Fix bug in MacAddress.fromString()"
...
am: cdb84d2fc7
2017-12-05 09:47:50 +00:00
Hugo Benichi
d2c5b1925b
Fix bug in MacAddress.fromString()
...
Test: runtest frameworks-net
Bug: 69390696
Change-Id: I83f01e4915092e08ed201d9b6738bb02498d3bba
2017-12-05 13:14:08 +09:00
nharold
b8ab1d404b
Merge "Validate IpSecAlgorithm Length" am: 68b81299d2 am: 5e3d66e78b
...
am: 7a8f0dc0c0
2017-12-05 02:46:06 +00:00
nharold
5e3d66e78b
Merge "Validate IpSecAlgorithm Length"
...
am: 68b81299d2
2017-12-05 02:28:10 +00:00
nharold
68b81299d2
Merge "Validate IpSecAlgorithm Length"
2017-12-05 02:13:55 +00:00
Hugo Benichi
469f4f6010
Merge "MacAddress: light refactors and improve documentation" am: d871cab32d am: 2f7cb5752b
...
am: 13b2fa0f85
2017-12-05 00:06:50 +00:00
Hugo Benichi
2f7cb5752b
Merge "MacAddress: light refactors and improve documentation"
...
am: d871cab32d
2017-12-04 23:38:27 +00:00
Nathan Harold
3349b26630
Validate IpSecAlgorithm Length
...
Improve the Validation of IpSecAlgorithm by
explicitly checking the length in addition to
the truncation length (previously an oversight).
In addition, we now check the lengths during
un-parceling, which will catch someone maliciously
manually building a parcel and passing it, bypassing
the checks in the constructor.
Bug: 68780091
Test: runtest -x IpSecAlgorithmTest.java
Change-Id: I8172762617264d34f47d5144336464510f07a701
2017-12-04 15:12:14 -08:00
Hugo Benichi
84bb7fc761
MacAddress: light refactors and improve documentation
...
This patch does some light refactoring in MacAddress to prepare for
exposing MacAddress in the public api:
- documention is improved
- some method names are renamed
- a toSafeString method is added
- a padding bug in the conversion methods outputting strings for
mac addresses is fixed
Bug: 69390696
Test: runtest frameworks-net
Change-Id: I399a97dabc2dfa8df9c5518c8b12484e43ca05c9
2017-12-04 22:34:43 +09:00
Sudheer Shanka
352dc57186
Track some event history and include it in netpolicy dump.
...
Bug: 66921847
Test: manual
Change-Id: I0c473790f83076def807308fe44db9cb9365769e
2017-11-28 11:33:43 -08:00
ludi
6b7fb6bbec
Cleanup of resource limit tests
...
Test: runtest frameworks-net
Bug: 65688605
Change-Id: Ice3ff2624b83c833a99559485c1e782d36c54ae3
2017-11-28 10:21:18 -08:00
Di Lu
0620c30651
Merge "Add test case for user quota management in IpSecService" am: cf1a4614e1 am: c9c65317e8
...
am: 0ec853390a
2017-11-15 20:39:53 +00:00
Di Lu
c9c65317e8
Merge "Add test case for user quota management in IpSecService"
...
am: cf1a4614e1
2017-11-15 20:23:14 +00:00
Di Lu
cf1a4614e1
Merge "Add test case for user quota management in IpSecService"
2017-11-15 20:12:38 +00:00
Xin Li
220871a697
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
...
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.
Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
2017-11-14 12:31:11 -08:00
Hugo Benichi
9769872de6
Merge "IP connectivity metrics: NetworkEvents have transports" am: f8fdb06c27 am: f3ada43f6e
...
am: 1b2e6c11e7
2017-11-14 12:03:25 +00:00
Hugo Benichi
d80b572c1a
Merge "Add L2~L4 information to packet wakeup logs and metrics" am: 6ee20ca7d3 am: ab15f7fc64
...
am: 4c0b7e52e4
2017-11-14 11:55:45 +00:00
Hugo Benichi
1b2e6c11e7
Merge "IP connectivity metrics: NetworkEvents have transports" am: f8fdb06c27
...
am: f3ada43f6e
2017-11-14 01:46:23 +00:00
Hugo Benichi
4c0b7e52e4
Merge "Add L2~L4 information to packet wakeup logs and metrics" am: 6ee20ca7d3
...
am: ab15f7fc64
2017-11-14 01:40:06 +00:00
ludi
aa5c1dc6d3
Add test case for user quota management in IpSecService
...
Test: runtest frameworks-net
Bug: 65688605
Change-Id: I3210c4920d0ac1d09fecb56c25e392e2bcba641f
2017-11-13 14:14:11 -08:00
Hugo Benichi
97bfd276fb
IP connectivity metrics: NetworkEvents have transports
...
Also removes netId field from inside NetworkEvent and stop populating
the network_id field of the NetworkEvent field, deprecating it.
Bug: 34901696
Test: runtest frameworks-net,
manually looking at $ adb shell dumpsys connmetrics
Change-Id: I2c36860f976898883714f72f4d18e06da250c6a6
2017-11-13 14:15:51 +09:00
Hugo Benichi
d921bce5a6
Add L2~L4 information to packet wakeup logs and metrics
...
Example of $ adb shell dumpsys connmetrics list:
...
WakeupStats(wlan0, 21851s, total: 85, root: 0, system: 4, apps: 63, non-apps: 0, no uid: 18, l2 unicast/multicast/broadcast: 85/0/0, ethertype 0x800: 23, ethertype 0x86dd: 62, ipNxtHdr 6: 74, ipNxtHdr 17: 1, ipproto 58: 10)
...
WakeupEvent(06:55:54.094, wlan0, -1, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=216.58.200.110, dstIp=100.112.108.29, srcPort=443, dstPort=46878)
WakeupEvent(06:57:14.379, wlan0, -1, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=58, srcIp=ff02::1, dstIp=fe80::fa00:4:fd00:1)
WakeupEvent(06:57:52.786, wlan0, 1000, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=172.217.27.67, dstIp=100.112.108.29, srcPort=80, dstPort=49360)
WakeupEvent(06:58:02.919, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:809::200a, srcPort=443, dstPort=46197)
WakeupEvent(06:58:05.586, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:803::200a, srcPort=443, dstPort=46096)
Bug: 66869042
Test: runtest frameworks-net
+ manual testing by monitoring $ dumpsys connmetrics list
Change-Id: I03215c0c9fb7feda3e6ceb1b916f61f4ffb15344
2017-11-12 18:51:28 +09:00
Hugo Benichi
9c114081a8
Merge "MacAddress follow-up: define the core of the class" am: cd35c65b5b am: d39a50350a
...
am: f7c0f2e6bf
2017-11-09 12:55:56 +00:00
Hugo Benichi
f7c0f2e6bf
Merge "MacAddress follow-up: define the core of the class" am: cd35c65b5b
...
am: d39a50350a
2017-11-09 12:43:52 +00:00
Hugo Benichi
cd35c65b5b
Merge "MacAddress follow-up: define the core of the class"
2017-11-09 12:22:17 +00:00
Hugo Benichi
ac52e40049
MacAddress follow-up: define the core of the class
...
Test: new unit test parts of $ runtest frameworks-net
Change-Id: I08c57d2d656802f7bdd7a93fde711a7e77247583
2017-11-09 16:36:45 +09:00
Benedict Wong
cdd1d0ae7f
Merge "Update documentation for AES-GCM-ESP keymat length" am: 3db35dfcd5 am: 6491b03410
...
am: d840f4d667
2017-11-08 18:27:06 +00:00
Benedict Wong
d840f4d667
Merge "Update documentation for AES-GCM-ESP keymat length" am: 3db35dfcd5
...
am: 6491b03410
2017-11-08 18:12:25 +00:00
Benedict Wong
3db35dfcd5
Merge "Update documentation for AES-GCM-ESP keymat length"
2017-11-08 17:47:40 +00:00
Hugo Benichi
ffdbb572e5
Merge "Define MacAddress class" am: 925349ac8f am: 37caaaa705
...
am: 76c2cd2a6a
2017-11-08 06:57:00 +00:00
Hugo Benichi
76c2cd2a6a
Merge "Define MacAddress class" am: 925349ac8f
...
am: 37caaaa705
2017-11-08 06:46:49 +00:00
Hugo Benichi
59c8e423a8
Define MacAddress class
...
Test: new unit tests part of $ runtest frameworks-net
Change-Id: I5a6a868ff86e9bffdc551d4e2bb486b585525c30
2017-11-08 11:09:49 +09:00
Benedict Wong
4ebc2c5968
Update documentation for AES-GCM-ESP keymat length
...
Added notes that keymat length must include 32 bits of salt.
Bug: 68672051
Test: Frameworks-net unit tests & IpSecManager CTS tests run
Change-Id: I0ae0c5be8a45b2374783b3bd1fa8bf930f15e687
2017-11-07 17:39:35 -08:00
Hugo Benichi
aab9077049
Merge "Refactor ApfFilter creation" am: 5e619dce66 am: 6c25e1e24d
...
am: 55939f351b
2017-11-07 23:22:39 +00:00
Hugo Benichi
55939f351b
Merge "Refactor ApfFilter creation" am: 5e619dce66
...
am: 6c25e1e24d
2017-11-07 22:53:09 +00:00
Hugo Benichi
7216636a62
Refactor ApfFilter creation
...
This patch introduces a helper ApfConfiguration class for passing filter
parameters to the constructor of ApfFilter. The benefits are:
- less parameter boilerplate across IpManager, ApfFilter, ApfTest
- easier to add more parameters in the future (useful for hardware
counters options and further gservices configurable options)
There is no functional changes otherwise.
Test: runtest frameworks-net
Change-Id: I47231c21df80bc36b6d4e15369748017b50b8da1
2017-11-07 21:42:39 +09:00
Hugo Benichi
3bac2487a2
Merge "DefaultNetworkEvent metrics: rehaul" am: 69c9402a29 am: d025358166
...
am: 384d458c8f
2017-11-06 07:41:53 +00:00
Hugo Benichi
384d458c8f
Merge "DefaultNetworkEvent metrics: rehaul" am: 69c9402a29
...
am: d025358166
2017-11-06 07:31:39 +00:00
