From da9780acee344e22c681ce4d17adc119c7c7a68e Mon Sep 17 00:00:00 2001 From: Vincent Lucas Date: Fri, 8 Jun 2012 16:53:48 +0000 Subject: [PATCH] Updates ice4j library (revision #305): Corrects the received STUN packet address logged in pcap file. And corrects the received/send STUN packet address logged in pcap file for JingleNodes. --- lib/installer-exclude/ice4j.jar | Bin 359134 -> 358904 bytes .../JingleNodesCandidateDatagramSocket.java | 51 ++++++++++++++++-- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/lib/installer-exclude/ice4j.jar b/lib/installer-exclude/ice4j.jar index fc587fbcdf7ba6f96bd44f197e804641ea087cbf..8806069d13c54cfd1d6986f2d093a3afb0a8507c 100644 GIT binary patch delta 9746 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 RJXmKEx|V5H5o~>={{z;k`;7nq delta 10082 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 diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesCandidateDatagramSocket.java b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesCandidateDatagramSocket.java index 95fa709a7..54b6ba699 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesCandidateDatagramSocket.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesCandidateDatagramSocket.java @@ -10,6 +10,7 @@ import java.net.*; import org.ice4j.*; +import org.ice4j.stack.*; /** * Represents an application-purposed (as opposed to an ICE-specific) @@ -70,12 +71,56 @@ public void send(DatagramPacket p) int dataOffset = p.getOffset(); /* send to Jingle Nodes relay address on local port */ - DatagramPacket packet = new DatagramPacket(data, dataOffset, dataLen, - new InetSocketAddress(localEndPoint.getAddress(), - localEndPoint.getPort())); + DatagramPacket packet = new DatagramPacket( + data, + dataOffset, + dataLen, + new InetSocketAddress( + localEndPoint.getAddress(), + localEndPoint.getPort())); //XXX reuse an existing DatagramPacket ? super.send(packet); + + // no exception packet is successfully sent, log it + if(StunStack.isPacketLoggerEnabled()) + { + StunStack.getPacketLogger().logPacket( + super.getLocalAddress().getAddress(), + super.getLocalPort(), + packet.getAddress().getAddress(), + packet.getPort(), + packet.getData(), + true); + } + } + + + /** + * Receives a DatagramPacket from this socket. The DatagramSocket + * is overridden to log the received packet into the "pcap" (packet capture) + * log. + * + * @param p DatagramPacket + * @throws IOException if something goes wrong + */ + @Override + public void receive(DatagramPacket p) + throws IOException + { + super.receive(p); + + // no exception packet is successfully received, log it + if(StunStack.isPacketLoggerEnabled()) + { + StunStack.getPacketLogger().logPacket( + p.getAddress().getAddress(), + p.getPort(), + super.getLocalAddress().getAddress(), + super.getLocalPort(), + p.getData(), + false); + } } /**