commit bd45a7fc0a46a998d48a63762bdf1de3e68b6901
author Xiao Ma <xiaom@google.com> Thu Jun 29 15:07:26 2023 +0900
committer Xiao Ma <xiaom@google.com> Mon Jul 03 05:25:50 2023 +0000
tree 9350f3c2e392db263d4aded98547b18de9447872
parent 61799988584f0a9faba2bfcbeca08f5d100f0e06

Fix transaction ID used in the DHCPv6 message.

Transaction ID is the last 3 octets of first 4-octets appeared in the
DHCPv6 message, given we already fetch the last 3 octets for mTransId
member in both DHCPv6 message decode and encode function, we can just
combine mTransId and message type field when building an DHCPv6 message.

Bug: 260934173
Test: manually test if device can connect to DHCPv6 server
Change-Id: I10700de9c704e86584cde5457d38f4a222283e35

src/android/net/dhcp6/Dhcp6AdvertisePacket.java

diff --git a/src/android/net/dhcp6/Dhcp6AdvertisePacket.java b/src/android/net/dhcp6/Dhcp6AdvertisePacket.java
index 3eb5503..a9fac83 100644
--- a/src/android/net/dhcp6/Dhcp6AdvertisePacket.java
+++ b/src/android/net/dhcp6/Dhcp6AdvertisePacket.java
@@ -42,7 +42,7 @@
      */
     public ByteBuffer buildPacket() {
         final ByteBuffer packet = ByteBuffer.allocate(DHCP_MAX_LENGTH);
-        final int msgTypeAndTransId = (DHCP6_MESSAGE_TYPE_ADVERTISE << 24) | (mTransId & 0x0FFF);
+        final int msgTypeAndTransId = (DHCP6_MESSAGE_TYPE_ADVERTISE << 24) | mTransId;
         packet.putInt(msgTypeAndTransId);
 
         addTlv(packet, DHCP6_CLIENT_IDENTIFIER, mClientDuid);

src/android/net/dhcp6/Dhcp6RebindPacket.java

diff --git a/src/android/net/dhcp6/Dhcp6RebindPacket.java b/src/android/net/dhcp6/Dhcp6RebindPacket.java
index 10c10b9..33a9fc1 100644
--- a/src/android/net/dhcp6/Dhcp6RebindPacket.java
+++ b/src/android/net/dhcp6/Dhcp6RebindPacket.java
@@ -43,7 +43,7 @@
      */
     public ByteBuffer buildPacket() {
         final ByteBuffer packet = ByteBuffer.allocate(DHCP_MAX_LENGTH);
-        final int msgTypeAndTransId = (DHCP6_MESSAGE_TYPE_REBIND << 24) | (mTransId & 0x0FFF);
+        final int msgTypeAndTransId = (DHCP6_MESSAGE_TYPE_REBIND << 24) | mTransId;
         packet.putInt(msgTypeAndTransId);
 
         addTlv(packet, DHCP6_CLIENT_IDENTIFIER, getClientDuid());

src/android/net/dhcp6/Dhcp6RenewPacket.java

diff --git a/src/android/net/dhcp6/Dhcp6RenewPacket.java b/src/android/net/dhcp6/Dhcp6RenewPacket.java
index 8715b59..53ebb68 100644
--- a/src/android/net/dhcp6/Dhcp6RenewPacket.java
+++ b/src/android/net/dhcp6/Dhcp6RenewPacket.java
@@ -43,7 +43,7 @@
      */
     public ByteBuffer buildPacket() {
         final ByteBuffer packet = ByteBuffer.allocate(DHCP_MAX_LENGTH);
-        final int msgTypeAndTransId = (DHCP6_MESSAGE_TYPE_RENEW << 24) | (mTransId & 0x0FFF);
+        final int msgTypeAndTransId = (DHCP6_MESSAGE_TYPE_RENEW << 24) | mTransId;
         packet.putInt(msgTypeAndTransId);
 
         addTlv(packet, DHCP6_SERVER_IDENTIFIER, getServerDuid());

src/android/net/dhcp6/Dhcp6ReplyPacket.java

diff --git a/src/android/net/dhcp6/Dhcp6ReplyPacket.java b/src/android/net/dhcp6/Dhcp6ReplyPacket.java
index 2d41569..15f748b 100644
--- a/src/android/net/dhcp6/Dhcp6ReplyPacket.java
+++ b/src/android/net/dhcp6/Dhcp6ReplyPacket.java
@@ -44,7 +44,7 @@
      */
     public ByteBuffer buildPacket() {
         final ByteBuffer packet = ByteBuffer.allocate(DHCP_MAX_LENGTH);
-        final int msgTypeAndTransId = (DHCP6_MESSAGE_TYPE_REPLY << 24) | (mTransId & 0x0FFF);
+        final int msgTypeAndTransId = (DHCP6_MESSAGE_TYPE_REPLY << 24) | mTransId;
         packet.putInt(msgTypeAndTransId);
 
         addTlv(packet, DHCP6_CLIENT_IDENTIFIER, mClientDuid);

src/android/net/dhcp6/Dhcp6RequestPacket.java

diff --git a/src/android/net/dhcp6/Dhcp6RequestPacket.java b/src/android/net/dhcp6/Dhcp6RequestPacket.java
index f2f398d..b20ff76 100644
--- a/src/android/net/dhcp6/Dhcp6RequestPacket.java
+++ b/src/android/net/dhcp6/Dhcp6RequestPacket.java
@@ -42,7 +42,7 @@
      */
     public ByteBuffer buildPacket() {
         final ByteBuffer packet = ByteBuffer.allocate(DHCP_MAX_LENGTH);
-        final int msgTypeAndTransId = (DHCP6_MESSAGE_TYPE_REQUEST << 24) | (mTransId & 0x0FFF);
+        final int msgTypeAndTransId = (DHCP6_MESSAGE_TYPE_REQUEST << 24) | mTransId;
         packet.putInt(msgTypeAndTransId);
 
         addTlv(packet, DHCP6_SERVER_IDENTIFIER, getServerDuid());

src/android/net/dhcp6/Dhcp6SolicitPacket.java

diff --git a/src/android/net/dhcp6/Dhcp6SolicitPacket.java b/src/android/net/dhcp6/Dhcp6SolicitPacket.java
index 91c0fab..69dc81e 100644
--- a/src/android/net/dhcp6/Dhcp6SolicitPacket.java
+++ b/src/android/net/dhcp6/Dhcp6SolicitPacket.java
@@ -42,7 +42,7 @@
      */
     public ByteBuffer buildPacket() {
         final ByteBuffer packet = ByteBuffer.allocate(DHCP_MAX_LENGTH);
-        final int msgTypeAndTransId = (DHCP6_MESSAGE_TYPE_SOLICIT << 24) | (mTransId & 0x0FFF);
+        final int msgTypeAndTransId = (DHCP6_MESSAGE_TYPE_SOLICIT << 24) | mTransId;
         packet.putInt(msgTypeAndTransId);
 
         addTlv(packet, DHCP6_ELAPSED_TIME, mSecs);