diff --git a/src/org/ice4j/socket/DelegatingDatagramSocket.java b/src/org/ice4j/socket/DelegatingDatagramSocket.java
index 05e80d2..06f50a3 100644
--- a/src/org/ice4j/socket/DelegatingDatagramSocket.java
+++ b/src/org/ice4j/socket/DelegatingDatagramSocket.java
@@ -11,6 +11,8 @@ import java.io.*;
import java.net.*;
import java.nio.channels.*;
+import org.ice4j.stack.*;
+
/**
* Implements a DatagramSocket which delegates its calls to a specific
* DatagramSocket.
@@ -558,10 +560,28 @@ public class DelegatingDatagramSocket
public void send(DatagramPacket p)
throws IOException
{
+ // Sends the packet to the final DatagramSocket
if (delegate == null)
+ {
super.send(p);
+
+ // no exception packet is successfully sent, log it
+ if(StunStack.isPacketLoggerEnabled())
+ {
+ StunStack.getPacketLogger().logPacket(
+ super.getLocalAddress().getAddress(),
+ super.getLocalPort(),
+ p.getAddress().getAddress(),
+ p.getPort(),
+ p.getData(),
+ true);
+ }
+ }
+ // Else, the delegate socket will encapsulate the packet.
else
+ {
delegate.send(p);
+ }
}
/**
diff --git a/src/org/ice4j/socket/DelegatingSocket.java b/src/org/ice4j/socket/DelegatingSocket.java
index 2daf805..16667e6 100644
--- a/src/org/ice4j/socket/DelegatingSocket.java
+++ b/src/org/ice4j/socket/DelegatingSocket.java
@@ -10,6 +10,8 @@ import java.io.*;
import java.nio.channels.*;
import java.net.*;
+import org.ice4j.stack.*;
+
/**
* Implements a Socket which delegates its calls to a specific
* Socket.
@@ -745,6 +747,7 @@ public class DelegatingSocket
*/
public void send(DatagramPacket p) throws IOException
{
+ // The delegate socket will encapsulate the packet.
if (delegate != null && delegate instanceof DelegatingSocket)
{
((DelegatingSocket) delegate).send(p);
@@ -756,7 +759,22 @@ public class DelegatingSocket
outputStream = getOutputStream();
}
+ // Else, sends the packet to the final socket (outputStream).
outputStream.write(p.getData(), p.getOffset(), p.getLength());
+
+ // no exception packet is successfully sent, log it
+ if(StunStack.isPacketLoggerEnabled())
+ {
+ InetSocketAddress localAddress
+ = (InetSocketAddress) super.getLocalSocketAddress();
+ StunStack.getPacketLogger().logPacket(
+ localAddress.getAddress().getAddress(),
+ localAddress.getPort(),
+ p.getAddress().getAddress(),
+ p.getPort(),
+ p.getData(),
+ true);
+ }
}
/**
diff --git a/src/org/ice4j/stack/Connector.java b/src/org/ice4j/stack/Connector.java
index 88334af..96ec6aa 100644
--- a/src/org/ice4j/stack/Connector.java
+++ b/src/org/ice4j/stack/Connector.java
@@ -265,18 +265,6 @@ class Connector
message, 0, message.length, address);
sock.send(datagramPacket);
-
- // no exception packet is successfully sent, log it
- if(StunStack.isPacketLoggerEnabled())
- {
- StunStack.getPacketLogger().logPacket(
- sock.getLocalAddress().getAddress(),
- sock.getLocalPort(),
- address.getAddressBytes(),
- address.getPort(),
- message,
- true);
- }
}
/**
diff --git a/src/org/ice4j/stack/StunStack.java b/src/org/ice4j/stack/StunStack.java
index 5ae984c..1f668c5 100644
--- a/src/org/ice4j/stack/StunStack.java
+++ b/src/org/ice4j/stack/StunStack.java
@@ -1113,7 +1113,7 @@ public class StunStack
* Returns the currently set packet logger.
* @return the currently available packet logger.
*/
- static PacketLogger getPacketLogger()
+ public static PacketLogger getPacketLogger()
{
return packetLogger;
}
@@ -1132,7 +1132,7 @@ public class StunStack
* @return true if we have a packet logger instance and
* it is enabled.
*/
- static boolean isPacketLoggerEnabled()
+ public static boolean isPacketLoggerEnabled()
{
return packetLogger != null && packetLogger.isEnabled();
}