Author: toad Date: 2007-05-30 20:39:21 +0000 (Wed, 30 May 2007) New Revision: 13400
Removed: trunk/freenet/src/freenet/io/comm/DummyPeerContext.java Modified: trunk/freenet/src/freenet/io/comm/UdpSocketManager.java Log: Remove DummyPeerContext. Deleted: trunk/freenet/src/freenet/io/comm/DummyPeerContext.java =================================================================== --- trunk/freenet/src/freenet/io/comm/DummyPeerContext.java 2007-05-30 20:34:00 UTC (rev 13399) +++ trunk/freenet/src/freenet/io/comm/DummyPeerContext.java 2007-05-30 20:39:21 UTC (rev 13400) @@ -1,54 +0,0 @@ -/* This code is part of Freenet. It is distributed under the GNU General - * Public License, version 2 (or at your option any later version). See - * http://www.gnu.org/ for further details of the GPL. */ -package freenet.io.comm; - -/** - * @author amphibian - * - * Default PeerContext if we don't have a IncomingPacketFilter installed. - * Just carries the Peer. - */ -public class DummyPeerContext implements PeerContext { - - private final Peer peer; - private final UdpSocketManager usm; - - public Peer getPeer() { - return peer; - } - - DummyPeerContext(Peer p, UdpSocketManager usm) { - peer = p; - this.usm = usm; - } - - public void forceDisconnect() { - // Do nothing - } - - public boolean isRoutable() { - return false; - } - - public boolean isConnected() { - return false; - } - - public void reportOutgoingBytes(int length) { - // Ignore - } - - public int getVersionNumber() { - return -1; - } - - public void sendAsync(Message msg, AsyncMessageCallback cb, int alreadyReportedBytes, ByteCounter ctr) throws NotConnectedException { - usm.send(this, msg, ctr); - try { - cb.sent(); - } catch (Throwable t) { - // FIXME do something with it - } - } -} Modified: trunk/freenet/src/freenet/io/comm/UdpSocketManager.java =================================================================== --- trunk/freenet/src/freenet/io/comm/UdpSocketManager.java 2007-05-30 20:34:00 UTC (rev 13399) +++ trunk/freenet/src/freenet/io/comm/UdpSocketManager.java 2007-05-30 20:39:21 UTC (rev 13400) @@ -238,31 +238,22 @@ byte[] data = packet.getData(); int offset = packet.getOffset(); int length = packet.getLength(); - if (lowLevelFilter != null) { - try { - if(logMINOR) Logger.minor(this, "Processing packet of length "+length+" from "+peer); - startTime = System.currentTimeMillis(); - lowLevelFilter.process(data, offset, length, peer); - endTime = System.currentTimeMillis(); - if(endTime - startTime > 50) { - if(endTime-startTime > 3000) - Logger.error(this, "processing packet took "+(endTime-startTime)+"ms"); - else - if(logMINOR) Logger.minor(this, "processing packet took "+(endTime-startTime)+"ms"); - } - if(logMINOR) Logger.minor(this, - "Successfully handled packet length " + length); - } catch (Throwable t) { - Logger.error(this, "Caught " + t + " from " - + lowLevelFilter, t); + try { + if(logMINOR) Logger.minor(this, "Processing packet of length "+length+" from "+peer); + startTime = System.currentTimeMillis(); + lowLevelFilter.process(data, offset, length, peer); + endTime = System.currentTimeMillis(); + if(endTime - startTime > 50) { + if(endTime-startTime > 3000) + Logger.error(this, "processing packet took "+(endTime-startTime)+"ms"); + else + if(logMINOR) Logger.minor(this, "processing packet took "+(endTime-startTime)+"ms"); } - } else { - // Create a bogus context since no filter - Message m = decodeSingleMessage(data, offset, length, - new DummyPeerContext(peer, this), 0); - if (m != null) { - checkFilters(m); - } + if(logMINOR) Logger.minor(this, + "Successfully handled packet length " + length); + } catch (Throwable t) { + Logger.error(this, "Caught " + t + " from " + + lowLevelFilter, t); } } else if(logMINOR) Logger.minor(this, "Null packet"); } @@ -655,6 +646,7 @@ _dispatcher = d; } + /** Must be called, or we will NPE */ public void setLowLevelFilter(IncomingPacketFilter f) { lowLevelFilter = f; }
