From ed1264093234b1f1354cd5f669eb82a50bb56869 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Fri, 28 Jan 2011 15:34:55 -0800 Subject: Bind addr and prefixLength together in LinkAddress bug:2542681 Change-Id: I90200446216d78c676498144946832afe75efdb8 --- wifi/java/android/net/wifi/WifiStateMachine.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'wifi/java') diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index f0d26d1..b4dcf41 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -1013,8 +1013,7 @@ public class WifiStateMachine extends HierarchicalStateMachine { ifcg = service.getInterfaceConfig(intf); if (ifcg != null) { /* IP/netmask: 192.168.43.1/255.255.255.0 */ - ifcg.addr = InetAddress.getByName("192.168.43.1"); - ifcg.mask = InetAddress.getByName("255.255.255.0"); + ifcg.addr = new LinkAddress(InetAddress.getByName("192.168.43.1"), 24); ifcg.interfaceFlags = "[up]"; service.setInterfaceConfig(intf, ifcg); @@ -2529,9 +2528,7 @@ public class WifiStateMachine extends HierarchicalStateMachine { IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE); INetworkManagementService netd = INetworkManagementService.Stub.asInterface(b); InterfaceConfiguration ifcg = new InterfaceConfiguration(); - ifcg.addr = NetworkUtils.numericToInetAddress(dhcpInfoInternal.ipAddress); - ifcg.mask = NetworkUtils.intToInetAddress( - NetworkUtils.prefixLengthToNetmaskInt(dhcpInfoInternal.prefixLength)); + ifcg.addr = dhcpInfoInternal.makeLinkAddress(); ifcg.interfaceFlags = "[up]"; try { netd.setInterfaceConfig(mInterfaceName, ifcg); -- cgit v1.1