LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,748 Commits 2 Branches 0 Tags
24ee1bb6a0acaf3cd5e69de219e8ffde1ab8719e
Commit Graph

9748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
24ee1bb6a0 Merge "Dump BPF offload rules for upstream IPv4 and IPv6." am: 0f7f9b6e40 am: 959cc0be9f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560404

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11f2ca833264943c0bab575c90b6d6ba7aca78e7
 2021-01-27 08:28:28 +00:00
Treehugger Robot
b33e05d475 Merge "merge Tether{Down,Up}stream6Value -> Tether6Value" am: 33848955b0 am: 99d1eeebff 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb398ac4c2eb1dcbd13391b06f6277c1a671e540
 2021-01-27 08:28:04 +00:00
Remi NGUYEN VAN
bc2cb208f3 Merge "Move connectivity-sources to frameworks/base" am: f0be057728 am: 9014776664 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552319

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76299a18360a7a94c0861b70faa32a811f5f553b
 2021-01-27 08:27:55 +00:00
Treehugger Robot
959cc0be9f Merge "Dump BPF offload rules for upstream IPv4 and IPv6." am: 0f7f9b6e40 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560404

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99ec4cfef0190254f15ffd0b655c441542325720
 2021-01-27 08:00:33 +00:00
Treehugger Robot
99d1eeebff Merge "merge Tether{Down,Up}stream6Value -> Tether6Value" am: 33848955b0 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If041c4a7e87d7b33fa192f1e11abf986ace7df3f
 2021-01-27 08:00:18 +00:00
Remi NGUYEN VAN
9014776664 Merge "Move connectivity-sources to frameworks/base" am: f0be057728 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552319

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a369158ac3754c47966fa94cb040043573ee2d4
 2021-01-27 07:50:14 +00:00
Treehugger Robot
0f7f9b6e40 Merge "Dump BPF offload rules for upstream IPv4 and IPv6." 2021-01-27 07:23:55 +00:00
Treehugger Robot
33848955b0 Merge "merge Tether{Down,Up}stream6Value -> Tether6Value" 2021-01-27 07:18:35 +00:00
Remi NGUYEN VAN
f0be057728 Merge "Move connectivity-sources to frameworks/base" 2021-01-27 07:15:05 +00:00
Maciej Żenczykowski
7dfbcf58d2 merge Tether{Down,Up}stream6Value -> Tether6Value 
Test: atest TetheringTests TetheringCoverageTests
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibdbba9ef6652dd11bb18eba316045dff440fcf9e
 2021-01-27 06:41:59 +00:00
Lorenzo Colitti
61976f278f Dump BPF offload rules for upstream IPv4 and IPv6. 
Add code to BpfCoordinator to dump upstream IPv4 and IPv6 rules.
For IPv4, currently only the upstream map is printed, because the
downstream map is expected to be symmetrical.

Example output:

=============
    21(21) -> 12(rmnet_data2) 86dd 00:00:00:00:00:00 00:00:00:00:00:00
    [wlan1]: iif(iface) oif(iface) v6addr srcmac dstmac
      12(rmnet_data2) 21(wlan1) /2001:240:2425:b5dc:21a9:995d:bc57:bc37 b2:b5:e0:24:21:c2 ca:06:8d:54:99:ad
    [IPv4]: iif(iface) oif(iface) src nat dst
      21(21) 12(rmnet_data2) 192.168.16.247:41544 -> 100.101.80.108:41544 -> 216.239.36.135:443
      21(21) 12(rmnet_data2) 192.168.16.247:42028 -> 100.101.80.108:42028 -> 8.8.4.4:853
      21(21) 12(rmnet_data2) 192.168.16.247:42032 -> 100.101.80.108:42032 -> 8.8.4.4:853
      21(21) 12(rmnet_data2) 192.168.16.247:42042 -> 100.101.80.108:42042 -> 8.8.4.4:853
      21(21) 12(rmnet_data2) 192.168.16.247:41816 -> 100.101.80.108:41816 -> 8.8.8.8:853
      21(21) 12(rmnet_data2) 192.168.16.247:42040 -> 100.101.80.108:42040 -> 8.8.4.4:853

=============

Also make it possible to do "dumpsys tethering bpf" and get only
the BPF dump.

Test: manual
Change-Id: I2aaa2fdda7d724994090c26feff585f24cd3283b
 2021-01-27 14:30:51 +09:00
Lorenzo Colitti
798f4b0e56 Merge changes Iaac422d7,Ia7638b31 am: 0913a7a415 am: 51875f6043 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560403

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3c2de8b5fe3f64fba280e2637a8d9e9d3e0ea40
 2021-01-27 04:11:05 +00:00
Lorenzo Colitti
51875f6043 Merge changes Iaac422d7,Ia7638b31 am: 0913a7a415 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560403

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I747667f004d2b13fe25789beaf9d6c9101c39692
 2021-01-27 03:38:36 +00:00
Lorenzo Colitti
0913a7a415 Merge changes Iaac422d7,Ia7638b31 
* changes:
  Remove IpServer.Dependencies#getIfIndex.
  Address comments on aosp/1559686.
 2021-01-27 03:04:23 +00:00
Maciej Żenczykowski
08a003ab33 fix comments am: cff64c8561 am: ec92651a11 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fc86e6049d847fbb3f0af8eddb455539d83fa37
 2021-01-27 01:36:46 +00:00
Lorenzo Colitti
bb226600c1 Add an isEmpty convenience method to BpfMap. am: 77262cea76 am: 63585e9630 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560402

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61adb34e62da8862b50a56c27dfee5cd78b705b6
 2021-01-27 01:36:07 +00:00
Lorenzo Colitti
a350221089 Address a TODO in BpfMapTest. am: 7bf39e56e1 am: b62a70bcd2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560401

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If988eb90c7be8176ffa13f0be425428ce4ae7e8a
 2021-01-27 01:36:06 +00:00
Lorenzo Colitti
8c49368ee2 Program the upstream IPv6 map in BpfCoordinator. am: 5b1ed508cf am: e9eb340e3e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I563a8f0d7013a0d6572f90f0dd6c9c165ba89207
 2021-01-27 01:36:05 +00:00
Lorenzo Colitti
80ede0e4d9 Rename TetherDownstream6Value to Tether6Value. am: d69a886235 am: 6482088003 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a949d07a8a1e353030c0957462f20ee3a38ab7b
 2021-01-27 01:36:04 +00:00
Maciej Żenczykowski
ec92651a11 fix comments am: cff64c8561 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I638c660af1b79ef7bec03601f07ef0c336fdcc0b
 2021-01-27 01:15:15 +00:00
Lorenzo Colitti
63585e9630 Add an isEmpty convenience method to BpfMap. am: 77262cea76 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560402

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41ee1a37f33950d725c3349a149eaa6c6ce2c355
 2021-01-27 01:15:03 +00:00
Lorenzo Colitti
b62a70bcd2 Address a TODO in BpfMapTest. am: 7bf39e56e1 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560401

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67a0daacefa9b648a6ba5d18726c60efecf4e215
 2021-01-27 01:15:02 +00:00
Lorenzo Colitti
e9eb340e3e Program the upstream IPv6 map in BpfCoordinator. am: 5b1ed508cf 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39f2b2a1863e8fab3deb7756d9301a1cf1754353
 2021-01-27 01:15:00 +00:00
Lorenzo Colitti
6482088003 Rename TetherDownstream6Value to Tether6Value. am: d69a886235 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a15cf070e2faa159e66577df5de3dc6aa171df8
 2021-01-27 01:14:57 +00:00
Maciej Żenczykowski
cff64c8561 fix comments 
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ic217e08484c39077bcc408195daa3311ed93ad28
 2021-01-26 16:45:21 -08:00
Lorenzo Colitti
f3b201f819 Remove IpServer.Dependencies#getIfIndex. 
This code is unused.

Test: atest TetheringTests
Change-Id: Iaac422d72e8538b67798cb3ae3737deb7b426401
 2021-01-27 00:53:59 +09:00
Lorenzo Colitti
51c1a95c82 Address comments on aosp/1559686. 
Also remove some unnecessary line wrapping.

Test: atest TetheringTests
Change-Id: Ia7638b3198d7811cdbb34e959c50608cf1a656bf
 2021-01-27 00:53:59 +09:00
Lorenzo Colitti
77262cea76 Add an isEmpty convenience method to BpfMap. 
Test: new unit test
Change-Id: Ibec09f328e24111aee4760af2f75ea5a80ba84c3
 2021-01-27 00:53:56 +09:00
Lorenzo Colitti
7bf39e56e1 Address a TODO in BpfMapTest. 
Test: test-only change
Change-Id: I9a47234979cbb161dfcd0c97c54c0476aa753c5e
 2021-01-27 00:53:02 +09:00
Lorenzo Colitti
5b1ed508cf Program the upstream IPv6 map in BpfCoordinator. 
- Add methods to start and stop IPv6 forwarding upstream
- Populate the upstream IPv6 map when the first rule for any
  upstream/downstream pair is created.
- Clear the upstream IPv6 map when the last rule for any
  upstream/downstream pair is deleted.

Test: Added coverage to IpServerTest and BpfCoordinatorTest
Change-Id: Ib041081e95f5f449489ab63138de034222ffac8f
 2021-01-27 00:52:09 +09:00
Lorenzo Colitti
d69a886235 Rename TetherDownstream6Value to Tether6Value. 
The two value types are identical so there is no need to have
separate classes for them.

Test: atest TetheringTests
Change-Id: Ia622b082d0a44373d21f51222f5e675e5bde08e0
 2021-01-27 00:52:09 +09:00
Lorenzo Colitti
177975f25b Merge changes from topic "bpf_tether4_rename" am: 3c35666892 am: 7d0693f6dc 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I056bdd8ef3117a89ff0f4f28a87978f703a325a2
 2021-01-26 14:23:58 +00:00
Lorenzo Colitti
7d0693f6dc Merge changes from topic "bpf_tether4_rename" am: 3c35666892 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0addb9a731cdedfb97db001b8e09cb3409f82008
 2021-01-26 14:06:50 +00:00
Lorenzo Colitti
3c35666892 Merge changes from topic "bpf_tether4_rename" 
* changes:
  merge Tether{Down,Up}stream4{Key,Value} - part 3 - fixups
  merge Tether{Down,Up}stream4{Key,Value} - part 2 - java
  merge Tether{Down,Up}stream4{Key,Value} - part 1 - C portion
 2021-01-26 13:01:22 +00:00
Lorenzo Colitti
8688028150 Mark the EntitlementManager PendingIntents as immutable. am: a36d65da0a am: ec93812466 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557108

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb900d82e5b8a67ae2be1e448966f6199986539d
 2021-01-26 12:03:36 +00:00
Lorenzo Colitti
9d829044e9 Fix a WTF in IpServerTest. am: ae27ecf5ad am: 595a330cc6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557107

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie29e806685ee0930ec00ad85f8f9c15ace3e6cf6
 2021-01-26 12:03:33 +00:00
Lorenzo Colitti
ec93812466 Mark the EntitlementManager PendingIntents as immutable. am: a36d65da0a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557108

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I592fb8876e2c51c5c7c2a043d1a313fe1523ac6a
 2021-01-26 11:20:13 +00:00
Lorenzo Colitti
595a330cc6 Fix a WTF in IpServerTest. am: ae27ecf5ad 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557107

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3da0e7ad36002361287e63a8724e25dcd940bd0c
 2021-01-26 11:20:10 +00:00
Lorenzo Colitti
a36d65da0a Mark the EntitlementManager PendingIntents as immutable. 
These are read-only intents and should not be mutated by any
app receiving them.

Bug: 178324405
Bug: 178249531
Test: atest TetheringTests TetheringCoverageTests GtsTetheringTestCases
Change-Id: I5395e7c19e6453640ad790f2b9a9ba22bbcefa88
 2021-01-26 15:14:26 +09:00
Lorenzo Colitti
ae27ecf5ad Fix a WTF in IpServerTest. 
Bug: 178324405
Test: atest TetheringTests
Change-Id: I2069ea79f982e6bb197388edd7820a05d1e651f1
 2021-01-26 15:14:26 +09:00
Maciej Żenczykowski
911a7267f5 merge Tether{Down,Up}stream4{Key,Value} - part 3 - fixups 
Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia7840698e80ded33d8e0b59efe1ca7267254b892
 2021-01-25 20:32:10 -08:00
Maciej Żenczykowski
32874eb6bc merge Tether{Down,Up}stream4{Key,Value} - part 2 - java 
Generated via:
  git grep 'Tether(Down|Up)stream4(Key|Value)' | cut -d: -f1 | sort -u | while read i; do
    sed -r -i 's@TetherUpstream4Value@Tether4Value@g' "$i"
    sed -r -i 's@TetherDownstream4Value@Tether4Value@g' "$i"
    sed -r -i 's@TetherDownstream4Key@Tether4Key@g' "$i"
    sed -r -i 's@TetherUpstream4Key@Tether4Key@g' "$i"
  done

  cd Tethering/src/com/android/networkstack/tethering
  git mv TetherUpstream4Key.java Tether4Key.java
  git mv TetherUpstream4Value.java Tether4Value.java

  git diff TetherDownstream4Key.java Tether4Key.java
  git diff TetherDownstream4Value.java Tether4Value.java
  git rm TetherDownstream4Key.java
  git rm TetherDownstream4Value.java

Fixup resulting 'import' duplication
  mcedit Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java
  mcedit Tethering/apishim/30/com/android/networkstack/tethering/apishim/api30/BpfCoordinatorShimImpl.java
  mcedit Tethering/apishim/common/com/android/networkstack/tethering/apishim/common/BpfCoordinatorShim.java
  mcedit Tethering/tests/unit/src/android/net/ip/IpServerTest.java

Test: N/A, requires follow up commit
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1dfc3108ca4bbd0cefc3420bc7e421594b62619c
 2021-01-25 20:32:05 -08:00
Maciej Żenczykowski
1feb8b4ac8 merge Tether{Down,Up}stream4{Key,Value} - part 1 - C portion 
The keys are identical, and the values nearly so, this will make everyone's life easier.

Test: git grep 'Tether(Down|Up)stream4(Key|Value)' finds nothing
  (note this requires follow up commits)
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ifbff2c617ac5834ea80f827eaf89ca81e862baec
 2021-01-25 20:31:11 -08:00
Lorenzo Colitti
4158939871 Merge changes I8cd6e49b,Ibb52c7b7 am: dc4189f0e4 am: 3b0f7f1d6e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557658

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebb3cd0581e7262708b825747b990336f87de72a
 2021-01-26 01:45:16 +00:00
Lorenzo Colitti
3b0f7f1d6e Merge changes I8cd6e49b,Ibb52c7b7 am: dc4189f0e4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557658

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc66bcdefb9ca3f1e8d393923d0ce2031cbba302
 2021-01-26 00:57:37 +00:00
Lorenzo Colitti
dc4189f0e4 Merge changes I8cd6e49b,Ibb52c7b7 
* changes:
  [NFCT.TETHER.10] Add/delete IPv4 offload BPF rules to/from BPF map
  [NFCT.TETHER.9] Build IPv4 offload BPF rules for raw ip
 2021-01-26 00:30:15 +00:00
Maciej Żenczykowski
5ccabb7880 offload - begin ipv4 tethering implementation am: c2b0146045 am: 7c3ecd4aee 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I801205435f7617cfe0d49d8c459a538650a5eff4
 2021-01-25 20:35:27 +00:00
Maciej Żenczykowski
7c3ecd4aee offload - begin ipv4 tethering implementation am: c2b0146045 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74f1e77cc5304c380d82d40578f67448c2eb0559
 2021-01-25 20:05:44 +00:00
Maciej Żenczykowski
be68e49daa offload - ignore ethernet packets not destined for us am: 18552e8fb3 am: 258660ccff 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559389

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iceb78013e560cb4550fe7dac5e0619dc11074e90
 2021-01-25 19:50:21 +00:00
Maciej Żenczykowski
6588fd6a86 rename do_forward to do_forward6 am: bf8ec1a21d am: 6b48c492c2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559388

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea4767add4bbf877e2fe79d6578b4ebb82f6a8a7
 2021-01-25 19:49:30 +00:00