LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Relief unnecessary dependencies of code order" into main

Browse Source
This commit is contained in:
KH Shi
2023-08-31 05:36:40 +00:00
committed by Gerrit Code Review
parent e423ae1076 6877034343
commit c022bd47a8
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Tethering/src/android/net/ip/IpServer.java
View File

@@ -283,6 +283,7 @@ public class IpServer extends StateMachine {
private List<TetheredClient> mDhcpLeases = Collections.emptyList(); private List<TetheredClient> mDhcpLeases = Collections.emptyList();
private int mLastIPv6UpstreamIfindex = 0; private int mLastIPv6UpstreamIfindex = 0;
private boolean mUpstreamSupportsBpf = false;
private class MyNeighborEventConsumer implements IpNeighborMonitor.NeighborEventConsumer { private class MyNeighborEventConsumer implements IpNeighborMonitor.NeighborEventConsumer {
public void accept(NeighborEvent e) { public void accept(NeighborEvent e) {
@@ -779,15 +780,15 @@ public class IpServer extends StateMachine {
// If v6only is null, we pass in null to setRaParams(), which handles // If v6only is null, we pass in null to setRaParams(), which handles
// deprecation of any existing RA data. // deprecation of any existing RA data.
setRaParams(params); setRaParams(params);
// Be aware that updateIpv6ForwardingRules use mLastIPv6LinkProperties, so this line should
// be eariler than updateIpv6ForwardingRules.
// TODO: avoid this dependencies and move this logic into BpfCoordinator.
mLastIPv6LinkProperties = v6only;
updateIpv6ForwardingRules(mLastIPv6UpstreamIfindex, upstreamIfIndex, null); // Not support BPF on virtual upstream interface
final boolean upstreamSupportsBpf = upstreamIface != null && !isVcnInterface(upstreamIface);
updateIpv6ForwardingRules(
mLastIPv6UpstreamIfindex, upstreamIfIndex, upstreamSupportsBpf, null);
mLastIPv6LinkProperties = v6only;
mLastIPv6UpstreamIfindex = upstreamIfIndex; mLastIPv6UpstreamIfindex = upstreamIfIndex;
mUpstreamSupportsBpf = upstreamSupportsBpf;
if (mDadProxy != null) { if (mDadProxy != null) {
mDadProxy.setUpstreamIface(upstreamIfaceParams); mDadProxy.setUpstreamIface(upstreamIfaceParams);
} }
@@ -921,20 +922,14 @@ public class IpServer extends StateMachine {
mBpfCoordinator.tetherOffloadRuleUpdate(this, newIfindex); mBpfCoordinator.tetherOffloadRuleUpdate(this, newIfindex);
} }
private boolean isIpv6VcnNetworkInterface() {
if (mLastIPv6LinkProperties == null) return false;
return isVcnInterface(mLastIPv6LinkProperties.getInterfaceName());
}
// Handles all updates to IPv6 forwarding rules. These can currently change only if the upstream // Handles all updates to IPv6 forwarding rules. These can currently change only if the upstream
// changes or if a neighbor event is received. // changes or if a neighbor event is received.
private void updateIpv6ForwardingRules(int prevUpstreamIfindex, int upstreamIfindex, private void updateIpv6ForwardingRules(int prevUpstreamIfindex, int upstreamIfindex,
NeighborEvent e) { boolean upstreamSupportsBpf, NeighborEvent e) {
// If no longer have an upstream or it is virtual network, clear forwarding rules and do // If no longer have an upstream or upstream not supports BPF, clear forwarding rules and do
// nothing else. // nothing else.
// TODO: Rather than always clear rules, ensure whether ipv6 ever enable first. // TODO: Rather than always clear rules, ensure whether ipv6 ever enable first.
if (upstreamIfindex == 0 || isIpv6VcnNetworkInterface()) { if (upstreamIfindex == 0 || !upstreamSupportsBpf) {
clearIpv6ForwardingRules(); clearIpv6ForwardingRules();
return; return;
} }
@@ -995,7 +990,8 @@ public class IpServer extends StateMachine {
if (mInterfaceParams != null if (mInterfaceParams != null
&& mInterfaceParams.index == e.ifindex && mInterfaceParams.index == e.ifindex
&& mInterfaceParams.hasMacAddress) { && mInterfaceParams.hasMacAddress) {
updateIpv6ForwardingRules(mLastIPv6UpstreamIfindex, mLastIPv6UpstreamIfindex, e); updateIpv6ForwardingRules(mLastIPv6UpstreamIfindex, mLastIPv6UpstreamIfindex,
mUpstreamSupportsBpf, e);
updateClientInfoIpv4(e); updateClientInfoIpv4(e);
} }
} }