From 2cd278fd1f47add0f9297f582e5fcc5edf10a6a3 Mon Sep 17 00:00:00 2001
From: Boris Grozev <boris@jitsi.org>
Date: Thu, 8 Aug 2024 15:48:48 -0500
Subject: [PATCH] squash: Fix setting initial addresses.

---
 src/main/java/org/ice4j/ice/Component.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/ice4j/ice/Component.java b/src/main/java/org/ice4j/ice/Component.java
index 25798062..144f7030 100644
--- a/src/main/java/org/ice4j/ice/Component.java
+++ b/src/main/java/org/ice4j/ice/Component.java
@@ -1243,8 +1243,13 @@ public void send(byte[] buffer, int offset, int length)
         {
             CandidatePair selectedPair = getSelectedPair();
             LocalCandidate localCandidate = selectedPair == null ? null : selectedPair.getLocalCandidate();
-            socket = localCandidate == null ? null : localCandidate.getCandidateIceSocketWrapper();
             remoteAddress = selectedPair == null ? null : selectedPair.getRemoteCandidate().getTransportAddress();
+            socket = localCandidate == null ? null : localCandidate.getCandidateIceSocketWrapper(remoteAddress);
+            if (localCandidate != null)
+            {
+                lastLocalAddress = localCandidate.getTransportAddress();
+                lastRemoteAddress = remoteAddress;
+            }
         }
 
         if (socket == null)