summaryrefslogtreecommitdiff
path: root/packages/Tethering/src/android/net/ip/IpServer.java
AgeCommit message (Collapse)Author
2020-10-29Restructure Module code [ com.android.tethering ]Baligh Uddin
Code Migration from frameworks/base/packages/Tethering -> packages/modules/Connectivity/Tethering BUG: 167962976 Test: TH Change-Id: I2accb96abbdfa665ef34aa79e87af040226bcf32
2020-10-06Make the IP subnet persistent till rebootmarkchien
Make the IP subnet persistent if it do not conflict with upstream. It allow client to reuse its IP that usually reduce DHCP procedure. Bug: 168169687 Test: atest TetheringTests Change-Id: Iddc5304730dce7b11c5d124b7eddce057d752bbd
2020-09-22tethering: DAD Proxy DaemonTyler Wear
DAD proxy daemon responsible for forwarding NS/NA between tethered iface and upstream iface. Change-Id: I2e58e10e7fa7dba6a6f63ad03b000549f3afc37e
2020-08-07Revert "Revert "Move Inet[4]AddressUtils to libs/net""Chalard Jean
This patch is still needed and should go in now that the error is fixed. The patch was submitted into rvc-dev and is already in rvc-dev-plus-aosp (patch in in ag/11923559, revert skipped in ag/12072199). A follow-up will remove the unused services.net-module-wifi target. Test: originally tested in aosp/1324109 Test: m; manual: flashed, wifi and telephony working Test: atest NetworkStackCoverageTests Change-Id: I1074eedb0b0f156a1135e11210ec102de15ea674 Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
2020-07-30Merge "Update language to comply with Android's inclusive language guidance"Chiachang Wang
2020-07-29Update language to comply with Android's inclusive language guidanceChiachang Wang
See https://source.android.com/setup/contribute/respectful-code for reference. Test: m ; atest TetheringTests Bug: 161896447 Change-Id: Idc58697c72fb00896bee00185fefc50c1a24dd35
2020-07-29Always stop dhcp server even it is obsoletemarkchien
If dhcp server is obsolete, explicitly stop it to shut down its thread. Bug: 161418295 Test: atest CtsTetheringTest Change-Id: Ic5b876bd23711ec8d832879a7baee0495246b218
2020-07-02Revert "Move Inet[4]AddressUtils to libs/net"Chalard Jean
This reverts commit 57d68e3c55176083ba40947be8f335534d958006. Reason for revert: Breaks the build b/160390899 Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b Change-Id: Ie10e66f61393602f17fbb61bf17230b176bf1f44
2020-07-02Move Inet[4]AddressUtils to libs/netRemi NGUYEN VAN
The classes should not be picked up from frameworks/base, as they are part of several mainline modules. Also refine comments in DhcpResults following feedback in previous change. (cherry-pick from internal branch skipping wifi classes; no other conflict) Bug: 151052811 Test: m; manual: flashed, wifi and telephony working Test: atest NetworkStackCoverageTests Merged-In: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f Change-Id: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
2020-06-22Tethering: Add WiGig supportDedy Lansky
This change is a combination of following changes: 1) Tethering: add TETHERING_WIGIG type Currently both WIFI and WIGIG use the same tethering type, TETHERING_WIFI. This causes conflicts between the frameworks, when both WIFI and WIGIG SoftAPs are started, one or both will not work. Fix this by using a seperate tethering type for WIGIG. 2) Tethering: remove TETHERING_WIGIG state machine on interface down The wigig state machine relies on a TETHERING_STATE_CHANGED broadcast that is sent when the tethering state machine is first created, during interface up. Currently the tethering state machine is not removed on interface down except for TETHERING_BLUETOOTH, and as a result wigig tethering only works the first time SoftAP is started. In order to fix this, remove the tethering state machine on interface down for TETHERING_WIGIG as well. Bug: 143356416 Test: TetheringCoverageTests Change-Id: Ic4d3aca0ed69234093af7f0206dab3335938c52a
2020-06-19Merge "Let only Ethernet manage ethernet interface up and down"Mark Chien
2020-06-19Let only Ethernet manage ethernet interface up and downMilim Lee
When LAN link is changed for using ethernet interface from Ethernet tethering to Ethernet, there is confiict as Ethernet Tethering is trying to make ethernet link down and Ethernet is trying to make ethernet link up. So, this would make Ethernet only manage ethernet interface link state. Test: manual Bug: 130840861 Change-Id: I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc
2020-06-18Memory leak due to no stop for IpNeighborMonitor.h.zhang
1. When Wi-Fi enabled, ap0 interface is added and IpNeighborMonitor's start() is invoked in IpServer's constructor. 2. There's no stop for IpNeighborMonitor when IpServer stop. 3. During overnight test for Wi-Fi, networkstack is too slow to process request due to memory leak in IpNeighborMonitor and binder buffer is blocked causing exception. Solution: Invoke IpNeighborMonitor.stop() in UnavailableState.enter(). Bug: 159097215 Test: automatic, turn on and off Wi-Fi every 6 seconds overnight Change-Id: I8f60c13706f05306e8f25a15f7861d7ecabbc10e
2020-06-09[BOT.6] Make BpfCoordinator to support data limitHungming Chen
The BPF tethering coordinator listens to the forwarding rule changes for updating data limit which is applied in the following conditions. - After adding the first rule on a given upstream, add data limit. - After removing the last rule on a given upstream, clear data limit. - The service applies a new data limit on current upstream. The reason for relying on rule changes is because the Tethering and IpServer objects have multi-internal state machines. It is hard to synchronize all of their states. Note that the data limit cleanup for stopping or switching upstream relies on offload rules are all removed as well. Bug: 150736748 Test: manual Change-Id: I829d36339973f9473fe6b616c48aa288f18d1c46
2020-06-03Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed."Maciej Żenczykowski
2020-06-02Stop reducing RA advertised ipv6 mtu by 16 - not needed.Maciej Żenczykowski
This effectively reverts: commit 34d4361604a0de338220a7c02ed1991a29823e57 Author: Maciej Żenczykowski <maze@google.com> Date: Wed Feb 19 01:24:39 2020 -0800 Reduce advertised ipv6 mtu by 16 to fit ethernet header This is a temporary hack to workaround the inability of current kernel's ebpf bpf_skb_change_mode() function to prefix a 14-byte ethernet header on to a packet without going over the upstream (source, rawip) interface's mtu *before* we bpf_redirect() to the downstream (destination, ethernet) interface. Test: build, atest, atest TetheringTests Bug: 149816401 Test: flashed a flame with new kernel and it works at 1500 mtu Bug: 149816401 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I76a75a16fa27b47d78816b2f9379ef4bb68beb00 Merged-In: I76a75a16fa27b47d78816b2f9379ef4bb68beb00
2020-05-29[BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinatorHungming Chen
This is a preparation for moving adding/removing forwarding rules from IpServer to BpfCoordinator. Bug: 150736748 Test: atest IpServerTest Change-Id: I85316ef09ff3c9389ded11dcc384493d699da48e
2020-05-29[BOT.2] Create a coordinator and stats provider to provide tether statsHungming Chen
Make BPF tethering offload coordinator, BpfCoordinator, registers a network stats provider, BpfTetherStatsProvider, and provide the tethering stats from the BPF map. Bug: 150736748 Test: new test BpfCoordinatorTest Change-Id: I22e71f87b67668f7e733e4f215d93bf5b2c9380d
2020-05-27Tethering: ensure downstream prefix do not conflict with upstreammarkchien
- Add New class PrivateAddressCoordinator to coordinate the private address conflict problem. - Downstream prefix would be random in 192.168.0.0/24 ~ 192.168.255.0/24. - If new upstream prefix is conflict with existing downstream prefix, downstream would be kicked out and it would request a new one. - The last conflict upstream prefixes would be blacklist. Avoid to select downstream prefix which is conflict with prefixes in blacklist. Bug: 130879722 Test: -build, flash, boot -atest TetheringTests Change-Id: Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5
2020-05-24Adjust TTL for ipv6 tetheringmarkchien
If upstream is cellular, set the TTL in Router Advertisements to "network-set TTL - 1" for carrier requirement. For other non-cellular upstream, set TTL as "network-set TTL + 1" to preventing arbitrary distinction between tethered and untethered traffic. Bug: 154776299 Test: atest TetheringTests Change-Id: I7f2696a642f96c6aafb5613b980bf5bcdd08bbda
2020-05-13Support MirrorLink DHCPDECLINE.Xiao Ma
Add the specific implementation of onNewPrefixRequest callback on IpServer side, also refactor some common code. Bug: 130741856 Test: atest TetheringTests Change-Id: If2871bf899cb5890bbfee18063a194c92b6f474e
2020-05-12A minor followup change for BPF offload device option stuffHungming Chen
- Correct description and spelling in the code and xml files. - Add a TODO for refactoring the IpServer constructor. - Refine the if-statement for starting IP neighbor monitor. Test: atest IpServerTest Change-Id: If9c8bc6f785fa80575db56de4e223292e9807ace
2020-05-05Use device option to control BPF offload featuresHungming Chen
If BPF offload device config is not enabled: - Does not add/remove offload forwarding rules through disabling IP neighbor monitor. - Does not apply the RA MTU reduction. Bug: 149997301 Test: atest IpServerTest Change-Id: I2d6f80f0229f580c4b16243a064e889a6c37f77a
2020-04-14Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED.Lorenzo Colitti
These events don't have MAC addresses, so the code attempts to create an Ipv6ForwardingRule with a null MAC address. This crashes when attempting to get the raw MAC address bytes to send to netd in the TetherOffloadRuleParcel. This was not caught by unit tests because the test exercise this code path in a way that is not correct (by sending RTM_DELNEIGH and NUD_FAILED events with MAC addresses). Fix the unit tests to properly pass in null MAC addresses for these events. Bug: 153697068 Test: fixed existing tests to be more realistic Change-Id: I26d89a81f1c448d9b4809652b079a5f5eace3924
2020-04-06Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic."Xiao Ma
2020-04-06Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic.Xiao Ma
Bug: 130741856 Test: atest TetheringTests Change-Id: I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38
2020-04-04Migrate to TetherOffloadRuleParcel in IpServerLorenzo Colitti
The netd tethering offload IPCs are changing from taking a list of primitives to taking a TetherOffloadRuleParcel. Modify their only caller. Bug: 140541991 Test: atest IpServerTest Change-Id: I83718c80ef9d31199c87021b4dd5821717fd5ba5
2020-03-30Merge "Assign specific client address to dhcp server"Treehugger Robot
2020-03-19TetheringManager API clean upmarkchien
Per API review: - @IntDef defined on the type integer parameter - have getters on each parameter that is set in the TetheringRequest.Builder - new added API should not be deprecated Below APIs is moved from system-current to module-lib-current that only plafrom code(e.g. ConnectivityManager and Settings) can use them. TetheringRequest. onTetherableInterfaceRegexpsChanged, TetheringInterfaceRegexps: Only platform code can use them because interfaces by regular expressions are a mechanism which is planning to be deprecated. Also rename some constants for easier to understand. Bug: 149858697 Bug: 151243337 Test: m doc-comment-check-docs atest TetheringTests Change-Id: I45cb21d5bc919f6d32c42650326597d5173ea028 Merged-In: Idd041f0fbeca411ea23e49786a50dd7feb77ef45
2020-03-19Assign specific client address to dhcp servermarkchien
Bug: 141256482 Test: manual atest TetheringTests Change-Id: Ief76c98c843ba5420224cbf0f34464f366c891b7
2020-03-17Merge "Support static address configuration"Mark Chien
2020-03-17Support static address configurationmarkchien
Application can specify static ipv4 server and client address to setup tethering and this is one shot configuration. Tethering service would not save the configuration and the configuration would be reset when tethering stop or start failure. When startTethering callback fired, it just mean tethering is requested successful. Therefore, callers may call startTethering again if startTethering successful but do not receive following tethering active notification for a while. Tethering service never actually does anything synchronously when startTethering is called: -startProvisioningIfNeeded just posts a message to the handler thread. -enableTetheringInternal doesn't do anything synchronously, it just asks the downstreams to get their interfaces ready and waits for callbacks. If tethering is already enabled with a different request, tethering would be disabled and re-enabled. Bug: 141256482 Test: -build, flash, boot -atest TetheringTests -atest CtsTetheringTest Change-Id: I0399917e7cefa1547d617e688225544c4fc1a231
2020-03-13Cleanup the TetheredClients APIRemi NGUYEN VAN
Add comments to getters as requested in API review, and remove the expirationTime private field that was planned to be replaced with LinkAddress expiration. Test: atest TetheringTests Fixes: 150878126 Change-Id: Iecf65859cdeeaac2fa7b817b4f505c510424ac89
2020-02-25Merge changes I4a624ea4,I8626932eLorenzo Colitti
* changes: Fix a logic error in IpServerTest#addRemoveipv6ForwardingRules Clear IPv6 forwarding rules when losing upstream or stopping.
2020-02-25Clear IPv6 forwarding rules when losing upstream or stopping.Lorenzo Colitti
Test: new unit test Change-Id: I8626932e43e0daa300dad5fe6a81f47a6d667030
2020-02-19Merge "Tethering offload: add/remove IPv6 forwarding rules on ND events."Lorenzo Colitti
2020-02-19Tethering offload: add/remove IPv6 forwarding rules on ND events.Lorenzo Colitti
Use IpNeighborMonitor to listen for ND cache events on the downstream interface, and push downstream IPv6 fowarding rules to netd. Rules are pushed when: - IPv6 neighbours appear/disappear on the downstream interface. - The upstream changes. Test: new unit test Change-Id: I7b01ba179a4d6bb248fd6c4994e48800613a4efa
2020-02-19Merge "Reduce advertised ipv6 mtu by 16 to fit ethernet header"Treehugger Robot
2020-02-19Reduce advertised ipv6 mtu by 16 to fit ethernet headerMaciej Żenczykowski
This is a temporary hack to workaround the inability of current kernel's ebpf bpf_skb_change_mode() function to prefix a 14-byte ethernet header on to a packet without going over the upstream (source, rawip) interface's mtu *before* we bpf_redirect() to the downstream (destination, ethernet) interface. Test: build, atest, atest TetheringTests Bug: 149816401 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I646148ebfd978a2489c0cd065e4b671b01150add
2020-02-19Add tethering client callbacksRemi NGUYEN VAN
The callbacks are fired when the list of connected clients or their IP addresses / hostname change. Test: flashed, connected 2 devices, verified callbacks Test: atest TetheringTests Bug: 135411507 Change-Id: I96291038cf7b39a67547a5f74fcd7cbedc1ca002 Merged-In: I96291038cf7b39a67547a5f74fcd7cbedc1ca002
2020-02-15Catch correct exception for adding route failmarkchien
Bug: 149535950 Test: OFF/ON hotspot Change-Id: Ic52e2b2f3cec1a39a70302c41ab67ec1a1a55b1a
2020-01-29Add implementation of getInterfaceHash()Paul Trautrim
Exempt-From-Owner-Approval: cherry-pick from internal Bug: 136065010 Test: m Change-Id: I314f19aeca82cc8653eab71c9526ea7a208e6b50 Merged-In: I314f19aeca82cc8653eab71c9526ea7a208e6b50
2020-01-28Add support for Ethernet tetheringRemi NGUYEN VAN
Ethernet tethering can be started via startTethering(TETHERING_ETHERNET). Test: flashed, enabled ethernet tethering, verified internet access on downstream. Bug: 130840861 Merged-In: I34842acd94b972e440c3622f7617df10c18acf65 Change-Id: I34842acd94b972e440c3622f7617df10c18acf65 (cherry-pick with conflicts in test-current.txt)
2020-01-28Local Tethering with ncm interfaceMilim Lee
Bug: 130840842 Test: build, boot atest TetheringTest manual test (call startTethering(TETHERING_NCM)) Merged-In: Icc6c4d6be39e787503cecf3a5835b40d4be12a57 Change-Id: Icc6c4d6be39e787503cecf3a5835b40d4be12a57 (clean cherry-pick)
2020-01-16p2p: revise tethering handler for shared group interface supportJimmy Chen
When leaving a group, all information are erased and no group interface is passed to tethering service. For separate group interface, tethering could be stopped on p2p group interface removed. For shared group interface, i.e. management interface and group interface share one interface, ex. p2p0, tethering has no chance to be stopped since management interface won't be removed after leaving a group. Bug: 141382930 Test: atest FrameworksNetTests Test: atest FrameworksWifiTests Test: atest TetheringTests Change-Id: Ib611018b67c76ff79c7e6658136721090feb145b
2020-01-14[SP07] Remove reference of NetworkStatsService in IpServerjunyulai
Currently NetworkStatsService is notified when downstream is updated. However, it seems unnecessary given that tether stats is persist since boot, and there is no any upstream change when downstream is changed. Test: atest NetworkStatsServiceTest IpServerTest Bug: 130855321 Change-Id: Ie300bfeb0a04678fcfcf300843b6f859af9df91d
2020-01-08Replace ConnectivityManager constants to TetheringManagermarkchien
Replace some ConnectivityManager constants as TetheringManager inside tethering module. No API change, will have follow up CL to delete @hide tethering constants in ConnectivityManager and replace caller to using TetheringManager. Bug: 144753389 Test: build Change-Id: Ia1b963669722c32d147375763205ed2f3af52fed
2020-01-08[Tether09] Use INetd to call netd directlymarkchien
- Using INetd to communicate with netd directly instead of using NetworkManagementService which is a wrapper of INetd and don't have plan to be updatable. - Also replace InterfaceConfiguration by InterfaceController. - Remove redundant interface flags. Only set interface up/down flag to netd because netd only use these two flags for INetd#interfaceSetCfg. - Note that tethering still use NetworkManagementService to register tethering stats provider and it would also be replaced with other way in follow up change. Bug: 136040414 Test: -build, flash, boot -atest TetheringTests Change-Id: I4ab0ad387d4bd1773ff94d3b380c1720df07f8d5 Merged-In: I4ab0ad387d4bd1773ff94d3b380c1720df07f8d5
2020-01-07Fix some @hide usage in Tetheringmarkchien
Using alternative way to replace some @hide API. Bug: 144814072 Test: build, flash, boot atest TetheringTests Change-Id: I1e12d69db1ad91dff553e142e17c6a70808e1639
2019-12-19[Tether13] Move TetheringManager into frameworkmarkchien
Move tethering out of ConnectivityService. All client would use TetheringManager to talk with TetheringService directly. Bug: 144320246 Test: -build, flash, boot -atest TetheringTests Change-Id: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e Merged-In: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 10:04:00 +0000