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

Assign specific client address to dhcp server

Browse Source 
Bug: 141256482
Test: manual
      atest TetheringTests

Change-Id: Ief76c98c843ba5420224cbf0f34464f366c891b7
This commit is contained in:
markchien
2020-02-27 20:27:18 +08:00
parent 6d175120a0
commit 245352ed07
5 changed files with 76 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Tethering/common/TetheringLib/src/android/net/TetheringManager.java
View File

@@ -520,9 +520,8 @@ public class TetheringManager {
/**
* Configure tethering with static IPv4 assignment.
*
* The clientAddress must be in the localIPv4Address prefix. A DHCP server will be
* started, but will only be able to offer the client address. The two addresses must
* be in the same prefix.
* A DHCP server will be started, but will only be able to offer the client address.
* The two addresses must be in the same prefix.
*
* @param localIPv4Address The preferred local IPv4 link address to use.
* @param clientAddress The static client address.
@@ -533,10 +532,7 @@ public class TetheringManager {
@NonNull final LinkAddress clientAddress) {
Objects.requireNonNull(localIPv4Address);
Objects.requireNonNull(clientAddress);
if (localIPv4Address.getPrefixLength() != clientAddress.getPrefixLength()
|| !localIPv4Address.isIpv4() || !clientAddress.isIpv4()
|| !new IpPrefix(localIPv4Address.toString()).equals(
new IpPrefix(clientAddress.toString()))) {
if (!checkStaticAddressConfiguration(localIPv4Address, clientAddress)) {
throw new IllegalArgumentException("Invalid server or client addresses");
}
@@ -580,6 +576,19 @@ public class TetheringManager {
}
}
/**
* Check whether the two addresses are ipv4 and in the same prefix.
* @hide
*/
public static boolean checkStaticAddressConfiguration(
@NonNull final LinkAddress localIPv4Address,
@NonNull final LinkAddress clientAddress) {
return localIPv4Address.getPrefixLength() == clientAddress.getPrefixLength()
&& localIPv4Address.isIpv4() && clientAddress.isIpv4()
&& new IpPrefix(localIPv4Address.toString()).equals(
new IpPrefix(clientAddress.toString()));
}
/**
* Get a TetheringRequestParcel from the configuration
* @hide