From d5441d45f395a6069cdd884efdf399eec61099b0 Mon Sep 17 00:00:00 2001 From: chenzo Date: Fri, 8 Jun 2012 16:47:46 +0000 Subject: [PATCH] Corrects the received STUN packet address logged in pcap file. --- .../socket/DelegatingDatagramSocket.java | 16 +++++++++++++ src/org/ice4j/stack/MessageProcessor.java | 24 ++++--------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/org/ice4j/socket/DelegatingDatagramSocket.java b/src/org/ice4j/socket/DelegatingDatagramSocket.java index 06f50a3..6e59e58 100644 --- a/src/org/ice4j/socket/DelegatingDatagramSocket.java +++ b/src/org/ice4j/socket/DelegatingDatagramSocket.java @@ -530,9 +530,25 @@ public class DelegatingDatagramSocket throws IOException { if (delegate == null) + { 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); + } + } else + { delegate.receive(p); + } } /** diff --git a/src/org/ice4j/stack/MessageProcessor.java b/src/org/ice4j/stack/MessageProcessor.java index 859ec35..de1e717 100644 --- a/src/org/ice4j/stack/MessageProcessor.java +++ b/src/org/ice4j/stack/MessageProcessor.java @@ -152,27 +152,11 @@ class MessageProcessor logger.finest("Dispatching a StunMessageEvent."); - try - { - StunMessageEvent stunMessageEvent - = new StunMessageEvent(stunStack, rawMessage, - stunMessage); + StunMessageEvent stunMessageEvent + = new StunMessageEvent(stunStack, rawMessage, + stunMessage); - messageEventHandler.handleMessageEvent(stunMessageEvent); - } - finally // make sure we log the packet in case of exception - { - if(StunStack.isPacketLoggerEnabled()) - { - StunStack.getPacketLogger().logPacket( - rawMessage.getRemoteAddress().getAddressBytes(), - rawMessage.getRemoteAddress().getPort(), - rawMessage.getLocalAddress().getAddressBytes(), - rawMessage.getLocalAddress().getPort(), - rawMessage.getBytes(), - false); - } - } + messageEventHandler.handleMessageEvent(stunMessageEvent); } } catch(Throwable err)