Add support for MAC and hostname rule items

Author: nekohasekai

app/src/main/aidl/io/nekohasekai/sfa/bg/INeighborTableCallback.aidl

@@ -0,0 +1,7 @@
+package io.nekohasekai.sfa.bg;
+
+import io.nekohasekai.sfa.bg.ParceledListSlice;
+
+interface INeighborTableCallback {
+    oneway void onNeighborTableUpdated(in ParceledListSlice entries);
+}

app/src/main/aidl/io/nekohasekai/sfa/bg/IRootService.aidl

@@ -1,6 +1,7 @@
 package io.nekohasekai.sfa.bg;
 
 import android.os.ParcelFileDescriptor;
+import io.nekohasekai.sfa.bg.INeighborTableCallback;
 import io.nekohasekai.sfa.bg.ParceledListSlice;
 
 interface IRootService {
@@ -11,4 +12,8 @@ interface IRootService {
     void installPackage(in ParcelFileDescriptor apk, long size, int userId) = 2;
 
     String exportDebugInfo(String outputPath) = 3;
+
+    void registerNeighborTableCallback(in INeighborTableCallback callback) = 4;
+
+    oneway void unregisterNeighborTableCallback(in INeighborTableCallback callback) = 5;
 }

app/src/main/aidl/io/nekohasekai/sfa/bg/NeighborEntry.aidl

@@ -0,0 +1,3 @@
+package io.nekohasekai.sfa.bg;
+
+parcelable NeighborEntry;

app/src/main/java/io/nekohasekai/sfa/bg/NeighborEntry.java

@@ -0,0 +1,48 @@
+package io.nekohasekai.sfa.bg;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import androidx.annotation.NonNull;
+
+public class NeighborEntry implements Parcelable {
+  @NonNull public final String address;
+  @NonNull public final String macAddress;
+  @NonNull public final String hostname;
+
+  public NeighborEntry(@NonNull String address, @NonNull String macAddress, @NonNull String hostname) {
+    this.address = address;
+    this.macAddress = macAddress;
+    this.hostname = hostname;
+  }
+
+  protected NeighborEntry(Parcel in) {
+    address = in.readString();
+    macAddress = in.readString();
+    hostname = in.readString();
+  }
+
+  @Override
+  public void writeToParcel(@NonNull Parcel dest, int flags) {
+    dest.writeString(address);
+    dest.writeString(macAddress);
+    dest.writeString(hostname);
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  public static final Creator<NeighborEntry> CREATOR =
+      new Creator<>() {
+        @Override
+        public NeighborEntry createFromParcel(Parcel in) {
+          return new NeighborEntry(in);
+        }
+
+        @Override
+        public NeighborEntry[] newArray(int size) {
+          return new NeighborEntry[size];
+        }
+      };
+}

app/src/main/java/io/nekohasekai/sfa/bg/ParceledListSlice.java

@@ -136,7 +136,7 @@ protected boolean onTransact(int code, Parcel data, Parcel reply, int flags)
       new Parcelable.ClassLoaderCreator<ParceledListSlice>() {
         @Override
         public ParceledListSlice createFromParcel(Parcel in) {
-          return new ParceledListSlice(in, null);
+          return new ParceledListSlice(in, ParceledListSlice.class.getClassLoader());
         }
 
         @Override

app/src/main/java/io/nekohasekai/sfa/bg/PlatformInterfaceWrapper.kt

@@ -11,21 +11,28 @@ import io.nekohasekai.libbox.ConnectionOwner
 import io.nekohasekai.libbox.InterfaceUpdateListener
 import io.nekohasekai.libbox.Libbox
 import io.nekohasekai.libbox.LocalDNSTransport
+import io.nekohasekai.libbox.NeighborEntryIterator
+import io.nekohasekai.libbox.NeighborUpdateListener
 import io.nekohasekai.libbox.NetworkInterfaceIterator
 import io.nekohasekai.libbox.PlatformInterface
 import io.nekohasekai.libbox.StringIterator
 import io.nekohasekai.libbox.TunOptions
 import io.nekohasekai.libbox.WIFIState
 import io.nekohasekai.sfa.Application
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
 import java.net.Inet6Address
 import java.net.InetSocketAddress
 import java.net.InterfaceAddress
 import java.net.NetworkInterface
 import java.security.KeyStore
 import kotlin.io.encoding.Base64
 import kotlin.io.encoding.ExperimentalEncodingApi
+import io.nekohasekai.libbox.NeighborEntry as LibboxNeighborEntry
 import io.nekohasekai.libbox.NetworkInterface as LibboxNetworkInterface
 
+private var neighborCallback: INeighborTableCallback.Stub? = null
+
 interface PlatformInterfaceWrapper : PlatformInterface {
     override fun usePlatformAutoDetectInterfaceControl(): Boolean = true
 
@@ -172,6 +179,45 @@ interface PlatformInterfaceWrapper : PlatformInterface {
         return StringArray(certificates.iterator())
     }
 
+    override fun startNeighborMonitor(listener: NeighborUpdateListener?) {
+        if (listener == null) return
+        val callback = object : INeighborTableCallback.Stub() {
+            override fun onNeighborTableUpdated(entries: ParceledListSlice<*>?) {
+                if (entries == null) return
+                @Suppress("UNCHECKED_CAST")
+                val list = entries.list as List<NeighborEntry>
+                listener.updateNeighborTable(NeighborEntryArray(list.map { entry ->
+                    LibboxNeighborEntry().apply {
+                        address = entry.address
+                        macAddress = entry.macAddress
+                        hostname = entry.hostname
+                    }
+                }.iterator()))
+            }
+        }
+        neighborCallback = callback
+        runBlocking(Dispatchers.IO) {
+            RootClient.registerNeighborTableCallback(callback)
+        }
+    }
+
+    override fun registerMyInterface(name: String?) {
+    }
+
+    override fun closeNeighborMonitor(listener: NeighborUpdateListener?) {
+        val callback = neighborCallback ?: return
+        neighborCallback = null
+        runBlocking(Dispatchers.IO) {
+            RootClient.unregisterNeighborTableCallback(callback)
+        }
+    }
+
+    private class NeighborEntryArray(private val iterator: Iterator<LibboxNeighborEntry>) : NeighborEntryIterator {
+        override fun hasNext(): Boolean = iterator.hasNext()
+
+        override fun next(): LibboxNeighborEntry = iterator.next()
+    }
+
     private class InterfaceArray(private val iterator: Iterator<LibboxNetworkInterface>) : NetworkInterfaceIterator {
         override fun hasNext(): Boolean = iterator.hasNext()
 

app/src/main/java/io/nekohasekai/sfa/bg/RootClient.kt

@@ -6,6 +6,7 @@ import android.content.ServiceConnection
 import android.content.pm.PackageInfo
 import android.os.IBinder
 import android.os.RemoteException
+import androidx.core.content.ContextCompat
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ipc.RootService
 import io.nekohasekai.sfa.Application
@@ -17,7 +18,9 @@ import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
+import java.io.IOException
 import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
 
 object RootClient {
     init {
@@ -53,6 +56,10 @@ object RootClient {
     suspend fun bindService(): IRootService = connectionMutex.withLock {
         service?.let { return it }
 
+        if (Shell.isAppGrantedRoot() == false) {
+            throw IOException("permission denied")
+        }
+
         return withContext(Dispatchers.Main) {
             suspendCancellableCoroutine { continuation ->
                 val conn = object : ServiceConnection {
@@ -72,7 +79,30 @@ object RootClient {
                 }
 
                 val intent = Intent(Application.application, RootServer::class.java)
-                RootService.bind(intent, conn)
+                val task = RootService.bindOrTask(
+                    intent,
+                    ContextCompat.getMainExecutor(Application.application),
+                    conn,
+                )
+
+                if (task == null) {
+                    // Already connected, onServiceConnected will fire
+                } else {
+                    Shell.EXECUTOR.execute {
+                        try {
+                            val shell = Shell.getShell()
+                            if (shell.isRoot) {
+                                shell.execTask(task)
+                            } else {
+                                continuation.resumeWithException(
+                                    IOException("permission denied")
+                                )
+                            }
+                        } catch (e: Exception) {
+                            continuation.resumeWithException(e)
+                        }
+                    }
+                }
 
                 continuation.invokeOnCancellation {
                     RootService.unbind(conn)
@@ -103,4 +133,21 @@ object RootClient {
             throw e.rethrowFromSystemServer()
         }
     }
+
+    suspend fun registerNeighborTableCallback(callback: INeighborTableCallback) {
+        val svc = bindService()
+        try {
+            svc.registerNeighborTableCallback(callback)
+        } catch (e: RemoteException) {
+            throw e.rethrowFromSystemServer()
+        }
+    }
+
+    suspend fun unregisterNeighborTableCallback(callback: INeighborTableCallback) {
+        try {
+            service?.unregisterNeighborTableCallback(callback)
+        } catch (e: RemoteException) {
+            throw e.rethrowFromSystemServer()
+        }
+    }
 }