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

[CLATJ#14] ClatCoordinator: add anycast to raw socket

Browse Source 
Start translating packets to the new prefix.

Bug: 212345928
Test: flash and boot
Run "atest ClatCoordinatorTest" in a followup commit.

Change-Id: I38729c23fce72428919b33ac531ede9593337a0a
This commit is contained in:
Hungming Chen
2021-12-25 21:21:47 +08:00
parent d292f45e16
commit 2c3acb01c9
2 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
service/src/com/android/server/connectivity/ClatCoordinator.java
View File

@@ -32,7 +32,9 @@ import android.os.ServiceSpecificException;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.net.module.util.InterfaceParams;
import java.io.FileDescriptor;
import java.io.IOException;
import java.net.InetAddress;
import java.nio.ByteBuffer;
@@ -63,6 +65,7 @@ public class ClatCoordinator {
static final int INIT_V4ADDR_PREFIX_LEN = 29;
private static final InetAddress GOOGLE_DNS_4 = InetAddress.parseNumericAddress("8.8.8.8");
private static final int INVALID_IFINDEX = 0;
private static final int INVALID_PID = 0;
@NonNull
@@ -89,6 +92,14 @@ public class ClatCoordinator {
return ParcelFileDescriptor.adoptFd(fd);
}
/**
* Get interface index for a given interface.
*/
public int getInterfaceIndex(String ifName) {
final InterfaceParams params = InterfaceParams.getByName(ifName);
return params != null ? params.index : INVALID_IFINDEX;
}
/**
* Create tun interface for a given interface name.
*/
@@ -135,6 +146,14 @@ public class ClatCoordinator {
public int jniOpenRawSocket6(int mark) throws IOException {
return openRawSocket6(mark);
}
/**
* Add anycast setsockopt.
*/
public void jniAddAnycastSetsockopt(@NonNull FileDescriptor sock, String v6, int ifindex)
throws IOException {
addAnycastSetsockopt(sock, v6, ifindex);
}
}
@VisibleForTesting
@@ -258,6 +277,18 @@ public class ClatCoordinator {
throw new IOException("Open raw socket failed: " + e);
}
final int ifaceIndex = mDeps.getInterfaceIndex(iface);
if (ifaceIndex == INVALID_IFINDEX) {
throw new IOException("Fail to get interface index for interface " + iface);
}
// Start translating packets to the new prefix.
try {
mDeps.jniAddAnycastSetsockopt(writeSock6.getFileDescriptor(), v6, ifaceIndex);
} catch (IOException e) {
throw new IOException("add anycast sockopt failed: " + e);
}
// TODO: start clatd and returns local xlat464 v6 address.
return null;
}
@@ -271,4 +302,6 @@ public class ClatCoordinator {
throws IOException;
private static native int openPacketSocket() throws IOException;
private static native int openRawSocket6(int mark) throws IOException;
private static native void addAnycastSetsockopt(FileDescriptor sock, String v6, int ifindex)
throws IOException;
}