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

Remove unnecessary ifindex arg from destroyUdpSocket

Browse source 
Bug: 311792075
Test: m
Change-Id: I0eb70c1248aff347e6f988789f340e117fceea33
This commit is contained in:
Motomu Utsumi 2025-03-12 08:55:50 +09:00
commit 58498d1eee
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
service/src/com/android/server/connectivity/QuicConnectionCloser.java
View file

@ -139,7 +139,7 @@ public class QuicConnectionCloser {
public void destroyUdpSocket(final InetSocketAddress src, final InetSocketAddress dst,
final long cookie)
throws SocketException, InterruptedIOException, ErrnoException {
InetDiagMessage.destroyUdpSocket(src, dst, 0 /* ifindex */, cookie);
InetDiagMessage.destroyUdpSocket(src, dst, cookie);
}
/**

4
staticlibs/device/com/android/net/module/util/netlink/InetDiagMessage.java
View file

@ -491,7 +491,7 @@ public class InetDiagMessage extends NetlinkMessage {
* Close the udp socket which can be uniquely identified with the cookie and other information.
*/
public static void destroyUdpSocket(final InetSocketAddress src, final InetSocketAddress dst,
final int ifIndex, final long cookie)
final long cookie)
throws ErrnoException, SocketException, InterruptedIOException {
FileDescriptor fd = null;
@ -502,7 +502,7 @@ public class InetDiagMessage extends NetlinkMessage {
final StructInetDiagSockId id = new StructInetDiagSockId(
src,
dst,
ifIndex,
0 /* ifIndex */,
cookie
);
sendNetlinkDestroyRequest(fd, IPPROTO_UDP, id, (short) family, 0 /* state */);