joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Refactor IngressDiscardKey to support generic IP addresses" into main

Browse source
This commit is contained in:
Treehugger Robot 2025-08-21 09:32:10 -07:00 • committed by Android (Google) Code Review
commit 09662addd6
1 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
common/src/com/android/net/module/util/bpf/IngressDiscardKey.java
View file

@ -16,30 +16,17 @@
package com.android.net.module.util.bpf;
import com.android.net.module.util.InetAddressUtils;
import com.android.net.module.util.Struct;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
/** Key type for ingress discard map */
public class IngressDiscardKey extends Struct {
// The destination ip of the incoming packet. IPv4 uses IPv4-mapped IPv6 address.
@Field(order = 0, type = Type.Ipv6Address)
public final Inet6Address dstAddr;
@Field(order = 0, type = Type.IpAddress)
public final InetAddress dstAddr;
public IngressDiscardKey(final Inet6Address dstAddr) {
public IngressDiscardKey(final InetAddress dstAddr) {
this.dstAddr = dstAddr;
}
private static Inet6Address getInet6Address(final InetAddress addr) {
return (addr instanceof Inet4Address)
? InetAddressUtils.v4MappedV6Address((Inet4Address) addr)
: (Inet6Address) addr;
}
public IngressDiscardKey(final InetAddress dstAddr) {
this(getInet6Address(dstAddr));
}
}