summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-31Code Health: Reduce nesting am: 26bc3d1aba am: 5a338fed07Ken Chen
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2406635 Change-Id: Icb95a9744b9e77a2b4d2b93d05b548ecf300d781 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Code Health: Reduce nesting am: 26bc3d1abaKen Chen
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2406635 Change-Id: I8155b2b05ae5e29037bd5b9d24813e816fc5f451 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30Code Health: Reduce nestingKen Chen
A follow-up commit of aosp/2389516. Bug: 265503240 Bug: 263219497 Test: atest Change-Id: I3e646f646508f1f6077d2b20d49f2c40887fca2d
2023-01-18Allow DNS lookup in no default network case am: fd22f385a7 am: 7c5b973df2 ↵Ken Chen
am: 66552adb64 Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2389516 Change-Id: I754d96be81a9d18386a8627d4286527c67737380 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17Allow DNS lookup in no default network case am: fd22f385a7 am: 7c5b973df2Ken Chen
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2389516 Change-Id: I466a3907eac6cf31ff5cdce75e77ca4b506ec393 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17Allow DNS lookup in no default network case am: fd22f385a7Ken Chen
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2389516 Change-Id: Ib86a7e156ad824fb53a90c758d3e65cafc4ce4a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-16Allow DNS lookup in no default network casemain-16k-with-phonesKen Chen
Before aosp/2368708, DNS lookup of "localhost" is allowed when apps don't select a network and there is no default network. It is because the "localhost" exists in etc/hosts. The etc/hosts lookups take precedence over routing decisions. After aosp/2368708, the same DNS lookup is blocked by evaluateDomainNameCallback. It is because app_netid in network context is 0, and there is no corresponding Network object in netd. DNS lookup can be allowed in this case because DNS packets will not be sent out of the device if the hostname is not listed in the etc/hosts. Bug: 265503240 Bug: 263219497 Test: atest com.android.server.connectivity.VpnTest Change-Id: Iff760770706cce23cf25661593dcc67d0b0685e9
2023-01-14Merge changes I6c0d0f92,I21bc0644 am: 6d9f3eee8d am: 8442a0b0e3 am: f5877d2b47Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2370410 Change-Id: Iccf6e4b30cd41ed9ef6ec9164dbca756bfe99f48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14Merge changes I6c0d0f92,I21bc0644 am: 6d9f3eee8d am: 8442a0b0e3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2370410 Change-Id: Ib8d5686c06d2406c00ae05df6f1f9b21a02424f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14Merge changes I6c0d0f92,I21bc0644 am: 6d9f3eee8dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2370410 Change-Id: Ic1b9d322bd6fe17a880026f5fcb659adff1cf2c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14Merge changes I6c0d0f92,I21bc0644Treehugger Robot
* changes: Follow-up commit of aosp/2367328 Restrict DNS by UID-based network permission
2023-01-14Follow-up commit of aosp/2367328Ken Chen
This commit resolves comments addressed in aosp/2367328. - Allow the feature to work on all types of networks. - Improve error handling. - Rename ‘settings’ to ‘rangeConfigs’. - Rename ‘mUidsAbleToSelectThisNetwork’ to ‘mAllowedUids’. - Add more comments. - Extends test to verify if UIDs are reset when the setting for a network is not provided in the INetd::setNetworkAllowlist. Bug: 263219497 Test: netd_integration_tests Change-Id: I6c0d0f92939678b1eac4a7ea621e46bd410199b9
2023-01-13Fix misc-use-anonymous-namespace warning am: 566d531856 am: e558d3d563 am: ↵Yi Kong
ea77124271 Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2387573 Change-Id: Iae331fadd1b12b9314809dbfea156cc2bebb8344 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Fix misc-use-anonymous-namespace warning am: 566d531856 am: e558d3d563Yi Kong
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2387573 Change-Id: I6a79b4e10dbc4e0ac745a5b7be85db2f29757846 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Fix misc-use-anonymous-namespace warning am: 566d531856Yi Kong
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2387573 Change-Id: I2f235fd3178edc35bb1c31f821b94ac842b920db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Restrict DNS by UID-based network permissionKen Chen
Modify evaluateDomainNameCallback to report whether the specified network for DNS query is available for the UID. Bug: 263219497 Test: resolv_integration_tests Change-Id: I21bc06442b91f291efd96db98340ebfba0fee99d
2023-01-13Fix misc-use-anonymous-namespace warningYi Kong
system/netd/tests/benchmarks/bpf_benchmark.cpp:77:1: error: variable '_benchmark_2BpfBenchMark_MapUpdateEntry_Benchmark' declared 'static', move to anonymous namespace instead [misc-use-anonymous-namespace,-warnings-as-errors] BENCHMARK_REGISTER_F(BpfBenchMark, MapUpdateEntry)->Arg(1); ^ external/google-benchmark/include/benchmark/benchmark.h:1252:3: note: expanded from macro 'BENCHMARK_REGISTER_F' BENCHMARK_PRIVATE_REGISTER_F(BENCHMARK_PRIVATE_CONCAT_NAME(BaseClass, Method)) ^ external/google-benchmark/include/benchmark/benchmark.h:1255:3: note: expanded from macro 'BENCHMARK_PRIVATE_REGISTER_F' BENCHMARK_PRIVATE_DECLARE(TestName) = \ ^ external/google-benchmark/include/benchmark/benchmark.h:1114:44: note: expanded from macro 'BENCHMARK_PRIVATE_DECLARE' static ::benchmark::internal::Benchmark* BENCHMARK_PRIVATE_NAME(n) \ ^ Test: presubmit Bug: 264965700 Change-Id: I2b5c13f1f2a530a0d0fa0cb874f1864733abccec
2022-12-27Trim the output of ip rules for more precise testing am: 38bc0844b0 am: ↵Chalard Jean
f49d6ead05 am: 0cb11e791d Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2370411 Change-Id: I2ca7d1447ed94c52917e1fe2688bbd415b42a27c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-27Add local rules for local networks am: e479f31b99 am: 5edbf57b32 am: 6bda9ee8b6Chalard Jean
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2336812 Change-Id: I4a1918262659da1980b53002974d70d8407540b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-27Trim the output of ip rules for more precise testing am: 38bc0844b0 am: ↵Chalard Jean
f49d6ead05 Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2370411 Change-Id: I384bdaf7e4a934d6ba3f0e76b16956c8e0658a5c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-27Add local rules for local networks am: e479f31b99 am: 5edbf57b32Chalard Jean
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2336812 Change-Id: I3398d658b9fbd3c11c7d5b0a8527bfa412cdea09 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-27Trim the output of ip rules for more precise testing am: 38bc0844b0Chalard Jean
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2370411 Change-Id: Iacb4cae65229112b2c1cc3b05237adf1538f5a38 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-27Add local rules for local networks am: e479f31b99Chalard Jean
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2336812 Change-Id: I29f3609c3923f511adb87a4cf0ab49c981b594b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-26Trim the output of ip rules for more precise testingChalard Jean
Test: netd_integration_test Change-Id: Ia4f6d690c39cd7671cdee7f3f0c996a6aa6d5b91
2022-12-26Add local rules for local networksChalard Jean
When a network is a local network, two new IP rules should be installed : • A rule that keeps the traffic to directly connected IPs working when the catch-all local rule is removed. This rule has PRIORITY_LOCAL_NETWORK and matches on the explicit bit being off, because the explicit rule will be installed separately by ConnectivityService in a followup patch at priority EXPLICIT_NETWORK. 20000: from all fwmark 0x0/0x10000 lookup xxxx • A rule that matches on LOCAL_NET_ID explicitly pointing to the same table to keep traffic to netId 99 working. This is necessary for the continued working of dnsmasq, and might be necessary to keep traffic sent to 99 by other means on OEM devices. 16000: from all fwmark 0x10063/0x1ffff iif lo lookup xxxx Test: new tests in this patch Change-Id: If8729fc6f3716a580c936584b851bc38000b5de5
2022-12-26[automerged blank] cleanup a bunch of bpf related things (header files ↵Maciej Żenczykowski
mostly) 2p: ac107a2ef7 Blank merge reason: Change-Id Ifb9cc9b8ed1d49f027fbcebdcb4e39e88341e9b0 with SHA-1 4d913bbcf8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/20827885 Change-Id: I777a9052fdadc245c6edaf1ead5d3187899d8c2b Merged-In: Ifb9cc9b8ed1d49f027fbcebdcb4e39e88341e9b0
2022-12-26cleanup a bunch of bpf related things (header files mostly)Maciej Żenczykowski
Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ifb9cc9b8ed1d49f027fbcebdcb4e39e88341e9b0 (cherry picked from commit 4d913bbcf8e5cc66cf0ea10ccdf59fba7831a26d) Merged-In: Ifb9cc9b8ed1d49f027fbcebdcb4e39e88341e9b0
2022-12-25Merge "Support per-uid explicit selected network permission control" am: ↵Ken Chen
ad4f2f4faf am: 1dc0589e0a am: 3755dbfd12 Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2367328 Change-Id: I71d6fb99d8e7895598405ecb7bba7cbe9d35f937 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-25Merge "Support per-uid explicit selected network permission control" am: ↵Ken Chen
ad4f2f4faf am: 1dc0589e0a Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2367328 Change-Id: I609a19a5de10872a3dd4ebccb93f24e4fb2246ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-25Merge "Support per-uid explicit selected network permission control" am: ↵Ken Chen
ad4f2f4faf Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2367328 Change-Id: I7c631d1b79a184c61d8be7586b5b4178846e73cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-25Merge "Support per-uid explicit selected network permission control"Ken Chen
2022-12-24Support per-uid explicit selected network permission controlKen Chen
Adds a mechanism for CS to restrict explicit network selection per-UID. Bug: 263219497 Test: netd_integration_tests Change-Id: I2ff45a6836e4757239d69ccefd2fa8b8f0f20b45
2022-12-22binder_test - uses KernelVersion.h header file am: 5b02e1224b am: 78f641ed10 ↵Maciej Żenczykowski
am: ada92b6325 Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2366009 Change-Id: I7f7864d35a77d44c552d400e8c17ae88c55b5a05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22binder_test - uses KernelVersion.h header file am: 5b02e1224b am: 78f641ed10Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2366009 Change-Id: I8214d8ba558080601ff39f2bea94f5247ad8ebcb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22binder_test - uses KernelVersion.h header file am: 5b02e1224bMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2366009 Change-Id: I49ff550cf374b82c9b2ab4569fa3a98380e4b5d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22binder_test - uses KernelVersion.h header fileMaciej Żenczykowski
Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ibcbd9cd30ff4fa32a0ab6df4d88fe00e67ea2bb7
2022-12-21Add XFRM_MIGRATE support in NetdNativeService am: f9c4679e6a am: 4b58a6c59b ↵Yan Yan
am: 5fe4e44df0 Original change: https://android-review.googlesource.com/c/platform/system/netd/+/1582463 Change-Id: I1fa4a92a799ea5ff9f0e0cac7e1e53fa8cc1e67a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-21Add XFRM_MIGRATE support in NetdNativeService am: f9c4679e6a am: 4b58a6c59bYan Yan
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/1582463 Change-Id: Ib9fac5eb14bddf61b5745033744aca2d9cd791a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-21Add XFRM_MIGRATE support in NetdNativeService am: f9c4679e6aYan Yan
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/1582463 Change-Id: Id1c704e4e8a0d4c2658f63c999672cb9ff716cf1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20Add XFRM_MIGRATE support in NetdNativeServiceYan Yan
This commit updates NetdNativeService to support migrating IPsec tunnel mode SA to different source and destination addresses. Bug: 169170985 Test: atest netd_integration_test (new tests) Change-Id: I88bcbcb633f09b29f99b237ee84b405295febf49
2022-12-20cleanup a bunch of bpf related things (header files mostly) am: 4d913bbcf8 ↵Maciej Żenczykowski
am: feca8e61ca am: 978b847fff Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2363881 Change-Id: I5a518b89ea718440d614e196e75e4a3780b215b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20cleanup a bunch of bpf related things (header files mostly) am: 4d913bbcf8 ↵Maciej Żenczykowski
am: feca8e61ca Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2363881 Change-Id: I7e7369645d04ccfa62ba8dc2cd2274c5fa3077e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20cleanup a bunch of bpf related things (header files mostly) am: 4d913bbcf8Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2363881 Change-Id: I84e920ef8b53cc01e60935e5f073de001e80ca66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19cleanup a bunch of bpf related things (header files mostly)Maciej Żenczykowski
Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ifb9cc9b8ed1d49f027fbcebdcb4e39e88341e9b0
2022-12-18[automerger skipped] netd - delete bpf_base_test am: 5c83f5ba9a -s oursMaciej Żenczykowski
am skip reason: Merged-In Ie06e487d48711bbfb779f92bf3314746260423a5 with SHA-1 a179dd3402 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/20759872 Change-Id: I2fef794cfdaf10f9f3ed2d3dff1fb9d82496b171 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-18[automerger skipped] Merge "adjust tests for less exposing BpfMap.h" into ↵TreeHugger Robot
tm-mainline-prod am: 8c1ca2c8b1 -s ours am skip reason: Merged-In I142c247650279deeb03af8849263319930d1618d with SHA-1 caa786bd0d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/20777962 Change-Id: I7d9387dac9f14f58c1090b356a0670b03a22cf20 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-18netd - delete bpf_base_testMaciej Żenczykowski
This relies on internal implementation details of the tethering module. As such, we need to simply move the test into the module. Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ie06e487d48711bbfb779f92bf3314746260423a5 (cherry picked from commit a179dd3402f9390c22815c6fc274bb7365d79bf0) Merged-In: Ie06e487d48711bbfb779f92bf3314746260423a5
2022-12-18Merge changes from topic "cherrypicker-L83800000957830186:N27100001321800105"TreeHugger Robot
* changes: [automerged blank] adjust tests for less exposing BpfMap.h 2p: caa786bd0d adjust tests for less exposing BpfMap.h
2022-12-18Merge "adjust tests for less exposing BpfMap.h" into tm-mainline-prodTreeHugger Robot
2022-12-18[automerged blank] adjust tests for less exposing BpfMap.h 2p: caa786bd0dMaciej Żenczykowski
Blank merge reason: Change-Id I142c247650279deeb03af8849263319930d1618d with SHA-1 970fe02ad6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/20777962 Change-Id: Ibdfb22590b6f00d556e73e25cf86c5c1bfbbd372 Merged-In: I142c247650279deeb03af8849263319930d1618d
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 21:02:27 +0000