commit 8a3230110f3e697f986f5ef38cf01cf445b7d886
author Patrick Rohr <prohr@google.com> Thu Sep 28 12:06:24 2023 -0700
committer Patrick Rohr <prohr@google.com> Fri Sep 29 17:20:57 2023 +0000
tree cfd11a29f9a4862da2a6fc32865b595248bf778a
parent e6d74e877030e807989349d8864c84d8c8754584

Rename PacketRetransmittingState to MessageExchangeState

rfc8415 refers to packet retransmissions as message exchange. So
renaming PacketRetransmittingState to MessageExchangeState gets us a bit
closer to the language used in the rfc.

I realize that PacketRetransmittingState was adopted from our DHCPv4
implementation; however, considering the complexity of DHCPv6, it is
unlikely that we will ever be able to merge parts of the two
implementations (as had previously been the plan). Doing so would only
needlessly complicate the code and increase the potential (negative)
impact of any change.

Bug: 260934173
Test: mm
Change-Id: Iaf39e9e899753c38a2ed3be2a0bb4a7ecdece4bb

src/android/net/dhcp6/Dhcp6Client.java

diff --git a/src/android/net/dhcp6/Dhcp6Client.java b/src/android/net/dhcp6/Dhcp6Client.java
index e820e12..9011e53 100644
--- a/src/android/net/dhcp6/Dhcp6Client.java
+++ b/src/android/net/dhcp6/Dhcp6Client.java
@@ -238,7 +238,7 @@
      * which is called when the alarm fires and a packet needs to be transmitted, and receivePacket,
      * which is triggered by CMD_RECEIVED_PACKET sent by the receive thread.
      */
-    abstract class PacketRetransmittingState extends State {
+    abstract class MessageExchangeState extends State {
         private int mTransId = 0;
         private long mTransStartMs = 0;
 
@@ -249,7 +249,7 @@
         private final long mMaxRetransTimeMs;
         private final int mMaxRetransCount;
 
-        PacketRetransmittingState(final long delay, final long irt, final long mrt, final int mrc) {
+        MessageExchangeState(final long delay, final long irt, final long mrt, final int mrc) {
             mInitialDelayMs = delay;
             mInitialRetransTimeMs = irt;
             mMaxRetransTimeMs = mrt;
@@ -520,7 +520,7 @@
      *
      * Note: Not implement DHCPv6 server selection, always request the first Advertise we receive.
      */
-    class SolicitState extends PacketRetransmittingState {
+    class SolicitState extends MessageExchangeState {
         SolicitState() {
             // First Solicit message should be delayed by a random amount of time between 0
             // and SOL_MAX_DELAY(1s).
@@ -570,7 +570,7 @@
      * Client (re)transmits a Request message to request configuration from a specific server and
      * process the Reply message in this state.
      */
-    class RequestState extends PacketRetransmittingState {
+    class RequestState extends MessageExchangeState {
         RequestState() {
             super((long) 0 /* delay */, REQ_TIMEOUT /* IRT */, REQ_MAX_RT /* MRT */,
                     REQ_MAX_RC /* MRC */);
@@ -694,7 +694,7 @@
         }
     }
 
-    abstract class ReacquireState extends PacketRetransmittingState {
+    abstract class ReacquireState extends MessageExchangeState {
         ReacquireState(final long irt, final long mrt) {
             super(0 /* delay */, irt, mrt, 0 /* MRC */);
         }