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 "Use NLM_F_REQUEST_ACK in createGetLinkMessage()" into main am: 9981725b18

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3475690

Change-Id: I34801cf2a59aa72c783c1f50467fe209b170fd09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chuwei He 2025-03-13 18:01:25 -07:00 • committed by Automerger Merge Worker
commit 3bc13845a9
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
staticlibs/device/com/android/net/module/util/netlink/RtNetlinkLinkMessage.java
View file

@ -22,7 +22,6 @@ import static com.android.net.module.util.NetworkStackConstants.ETHER_ADDR_LEN;
import static com.android.net.module.util.netlink.NetlinkConstants.IFF_UP;
import static com.android.net.module.util.netlink.NetlinkConstants.RTM_GETLINK;
import static com.android.net.module.util.netlink.NetlinkConstants.RTM_NEWLINK;
import static com.android.net.module.util.netlink.StructNlMsgHdr.NLM_F_REQUEST;
import static com.android.net.module.util.netlink.StructNlMsgHdr.NLM_F_REQUEST_ACK;
import android.net.MacAddress;
@ -307,7 +306,7 @@ public class RtNetlinkLinkMessage extends NetlinkMessage {
}
return RtNetlinkLinkMessage.build(
new StructNlMsgHdr(0, RTM_GETLINK, NLM_F_REQUEST, sequenceNumber),
new StructNlMsgHdr(0, RTM_GETLINK, NLM_F_REQUEST_ACK, sequenceNumber),
new StructIfinfoMsg((short) AF_UNSPEC, (short) 0, interfaceIndex, 0, 0),
DEFAULT_MTU, null, null);
}

2
staticlibs/tests/unit/src/com/android/net/module/util/netlink/RtNetlinkLinkMessageTest.java
View file

@ -290,7 +290,7 @@ public class RtNetlinkLinkMessageTest {
@Test
public void testCreateGetLinkMessage() {
final String expectedHexBytes =
"20000000120001006824000000000000" // struct nlmsghdr
"20000000120005006824000000000000" // struct nlmsghdr
+ "00000000080000000000000000000000"; // struct ifinfomsg
final String interfaceName = "wlan0";
final int interfaceIndex = 8;