Update of /cvsroot/freenet/freenet/src/freenet/interfaces
In directory sc8-pr-cvs1:/tmp/cvs-serv4254/src/freenet/interfaces
Modified Files:
TestLocalNIOInterface.java
Log Message:
Build fixes
Index: TestLocalNIOInterface.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/interfaces/TestLocalNIOInterface.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- TestLocalNIOInterface.java 19 Jun 2003 13:31:17 -0000 1.2
+++ TestLocalNIOInterface.java 29 Oct 2003 21:52:41 -0000 1.3
@@ -1,27 +1,24 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.interfaces;
-import freenet.transport.TCP;
-import freenet.Connection;
-import freenet.ListeningAddress;
-import freenet.ListenException;
-import freenet.BadAddressException;
-import java.net.InetAddress;
-import freenet.config.Params;
-import freenet.transport.ReadSelectorLoop;
-import freenet.transport.WriteSelectorLoop;
-import freenet.transport.NIOReader;
-import freenet.transport.NIOWriter;
-import freenet.transport.tcpConnection;
-import freenet.Core;
-import freenet.support.Logger;
import java.io.IOException;
import java.net.Socket;
import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
import java.nio.channels.SelectableChannel;
+import java.nio.channels.SocketChannel;
import java.util.Vector;
+import freenet.Connection;
+import freenet.Core;
+import freenet.ListenException;
+import freenet.ListeningAddress;
+import freenet.support.Logger;
+import freenet.transport.NIOReader;
+import freenet.transport.NIOWriter;
+import freenet.transport.ReadSelectorLoop;
+import freenet.transport.WriteSelectorLoop;
+import freenet.transport.tcpConnection;
+
public class TestLocalNIOInterface extends BaseLocalNIOInterface {
public final ReadSelectorLoop rsl;
@@ -44,10 +41,11 @@
Core.logger.log(this, "Received connection", Logger.DEBUG);
if(!(conn instanceof tcpConnection))
throw new IllegalArgumentException();
+ tcpConnection tc = (tcpConnection)conn;
Core.logger.log(this, "tcpConnection", Logger.DEBUG);
Socket sock;
try {
- sock = ((tcpConnection)conn).getSocket();
+ sock = tc.getSocket();
} catch (IOException e) { return; }
SocketChannel sc = sock.getChannel();
Core.logger.log(this, "Got channel: "+sc, Logger.DEBUG);
@@ -56,7 +54,7 @@
} catch (IOException e) {
Core.logger.log(this, "Cannot configure nonblocking mode on
SocketChannel!", Logger.ERROR);
}
- rsl.register(sock, new TestNIOCallback(sc));
+ rsl.register(sock, new TestNIOCallback(sc, tc));
Core.logger.log(this, "Registered channel", Logger.DEBUG);
}
@@ -66,15 +64,19 @@
public class TestNIOCallback implements NIOReader,NIOWriter {
long connectionNumber;
SelectableChannel sc;
+ ByteBuffer buf;
+ tcpConnection conn;
Vector sending = new Vector();
- public TestNIOCallback(SelectableChannel sc) {
+ public TestNIOCallback(SelectableChannel sc, tcpConnection conn) {
synchronized(ccSync) {
connectionCounter++;
connectionNumber = connectionCounter;
}
this.sc = sc;
+ this.conn = conn;
+ buf = ByteBuffer.allocate(16384);
}
public int process(ByteBuffer b) {
@@ -99,7 +101,7 @@
Core.logger.log(this, "Sending packet of length "+buf.length,
Logger.DEBUG);
try {
- if(!wsl.send(buf, sc, this)) {
+ if(!wsl.send(buf, sc, this, WriteSelectorLoop.MESSAGE)) {
Core.logger.log(this, "Failed send", Logger.DEBUG);
sending.add(buf);
}
@@ -119,7 +121,7 @@
if(sending.size() > 0) {
byte[] buf = (byte[])(sending.remove(0));
try {
- if(!wsl.send(buf, sc, this)) {
+ if(!wsl.send(buf, sc, this, WriteSelectorLoop.MESSAGE)) {
Core.logger.log(this, "Could not send data in jobDone
handler!", Logger.ERROR);
} else {
String s = "Hahahahahahaha\n";
@@ -134,5 +136,56 @@
}
}
}
+
+ /* (non-Javadoc)
+ * @see freenet.transport.NIOReader#getBuf()
+ */
+ public ByteBuffer getBuf() {
+ return buf;
+ }
+
+ /* (non-Javadoc)
+ * @see freenet.transport.NIOCallback#queuedClose()
+ */
+ public void queuedClose() {
+ }
+
+ /* (non-Javadoc)
+ * @see freenet.transport.NIOCallback#registered()
+ */
+ public void registered() {
+ }
+
+ /* (non-Javadoc)
+ * @see freenet.transport.NIOCallback#unregistered()
+ */
+ public void unregistered() {
+ }
+
+ /* (non-Javadoc)
+ * @see freenet.transport.NIOCallback#shouldThrottle()
+ */
+ public boolean shouldThrottle() {
+ return conn.shouldThrottle();
+ }
+
+ /* (non-Javadoc)
+ * @see freenet.transport.NIOCallback#countAsThrottled()
+ */
+ public boolean countAsThrottled() {
+ return conn.countAsThrottled();
+ }
+
+ /* (non-Javadoc)
+ * @see freenet.transport.NIOWriter#jobPartDone(int)
+ */
+ public void jobPartDone(int size) {
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see freenet.interfaces.NIOInterface#starting()
+ */
+ protected void starting() {
}
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
