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

Use LinkAddress in address notifications.

Browse Source 
Currently address{Updated,Removed} pass in the address as a
string such as "fe80::1/64". Use LinkAddresses instead, since
that's what it is.

This makes the code more robust in the unlikely case that netd
passes in an invalid string. In the future we can move flags and
scope into the LinkAddress itself and simplify the code further.

Bug: 9180552
Change-Id: I66599f9529cf421caa7676fdd0141bb110b8589e
This commit is contained in:
Lorenzo Colitti
2013-11-17 15:05:02 +09:00
parent 7d0a830d80
commit eb91fd778c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java
View File

@@ -17,6 +17,7 @@
package com.android.server; package com.android.server;
import android.content.Context; import android.content.Context;
import android.net.LinkAddress;
import android.net.LocalSocket; import android.net.LocalSocket;
import android.net.LocalServerSocket; import android.net.LocalServerSocket;
import android.os.Binder; import android.os.Binder;
@@ -157,19 +158,22 @@ public class NetworkManagementServiceTest extends AndroidTestCase {
* IP address changes. * IP address changes.
*/ */
sendMessage("614 Address updated fe80::1/64 wlan0 128 253"); sendMessage("614 Address updated fe80::1/64 wlan0 128 253");
expectSoon(observer).addressUpdated("fe80::1/64", "wlan0", 128, 253); expectSoon(observer).addressUpdated(
new LinkAddress("fe80::1/64"), "wlan0", 128, 253);
// There is no "added". // There is no "added", so we take this as "removed".
sendMessage("614 Address added fe80::1/64 wlan0 128 253"); sendMessage("614 Address added fe80::1/64 wlan0 128 253");
expectSoon(observer).addressRemoved("fe80::1/64", "wlan0", 128, 253); expectSoon(observer).addressRemoved(
new LinkAddress("fe80::1/64"), "wlan0", 128, 253);
sendMessage("614 Address removed 2001:db8::1/64 wlan0 1 0"); sendMessage("614 Address removed 2001:db8::1/64 wlan0 1 0");
expectSoon(observer).addressRemoved("2001:db8::1/64", "wlan0", 1, 0); expectSoon(observer).addressRemoved(
new LinkAddress("2001:db8::1/64"), "wlan0", 1, 0);
sendMessage("614 Address removed 2001:db8::1/64 wlan0 1"); sendMessage("614 Address removed 2001:db8::1/64 wlan0 1");
// Not enough arguments. // Not enough arguments.
sendMessage("666 Address added 2001:db8::1/64 wlan0 1 0"); sendMessage("666 Address removed 2001:db8::1/64 wlan0 1 0");
// Invalid code. // Invalid code.