Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Framework to support multiple dhpc ranges

Browse Source 
Previously we only supported a single range - this was inadequate for
multiple interfaces.  Adding a second range so we can support
both usb and wifi tethering.

Also moving out of the zero-conf range as our dhcp client won't
accept ip addrs in that range (no nexus to nexus wifi action).

bug: 2537963
bug: 2533491
bug: 2538303
Change-Id: I600b421343c28c2f9839ed2076122ae3d0ff5d3d
This commit is contained in:
Robert Greenwalt
2010-03-24 16:03:21 -07:00
parent 838bfef915
commit bfb7bfa538
4 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/NetworkManagementService.java
View File

@@ -312,11 +312,17 @@ class NetworkManagementService extends INetworkManagementService.Stub {
mConnector.doCommand(String.format("ipfwd %sable", (enable ? "en" : "dis")));
}
public void startTethering(String dhcpRangeStart, String dhcpRangeEnd)
public void startTethering(String[] dhcpRange)
throws IllegalStateException {
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.CHANGE_NETWORK_STATE, "NetworkManagementService");
mConnector.doCommand(String.format("tether start %s %s", dhcpRangeStart, dhcpRangeEnd));
// cmd is "tether start first_start first_stop second_start second_stop ..."
// an odd number of addrs will fail
String cmd = "tether start";
for (String d : dhcpRange) {
cmd += " " + d;
}
mConnector.doCommand(cmd);
}
public void stopTethering() throws IllegalStateException {