Update of /cvsroot/freenet/freenet/src/freenet/interfaces
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/interfaces
Modified Files:
BaseLocalNIOInterface.java PublicInterface.java
PublicNIOInterface.java LocalNIOInterface.java
FreenetConnectionRunner.java TerminalService.java
LocalHTTPInterface.java LocalInterface.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: BaseLocalNIOInterface.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/interfaces/BaseLocalNIOInterface.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- BaseLocalNIOInterface.java 30 Oct 2003 01:34:09 -0000 1.8
+++ BaseLocalNIOInterface.java 31 Oct 2003 19:21:20 -0000 1.9
@@ -196,7 +196,7 @@
Core.logger.log(
this,
"Unknown Host on incoming connection!!",
- Core.logger.ERROR);
+ Logger.ERROR);
throw new RejectedConnectionException("unknown host on
incoming connection!");
}
@@ -213,7 +213,7 @@
+ Fields.intToHex(maskbits)
+ " for "
+ Fields.intToHex(inta),
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
return allow;
}
@@ -231,12 +231,12 @@
if(logDEBUG)
Core.logger.log(this,
"Dispatching connection on a BaseLocalNIOInterface
from " +
- ha.toString(), Core.logger.DEBUG);
+ ha.toString(), Logger.DEBUG);
if ( hostAllowed(ha)) {
handleConnection(conn);
} else {
if(logDEBUG)
- Core.logger.log(this, "Rejecting local connection",
Core.logger.DEBUG);
+ Core.logger.log(this, "Rejecting local connection",
Logger.DEBUG);
throw new RejectedConnectionException("host not allowed: " + ha);
}
}
Index: PublicInterface.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/interfaces/PublicInterface.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- PublicInterface.java 9 Feb 2003 03:51:41 -0000 1.13
+++ PublicInterface.java 31 Oct 2003 19:21:21 -0000 1.14
@@ -76,7 +76,7 @@
if (timeDoneInboundContacts - start > 10000)
Core.logger.log(this, contactsPrefix+logMessage+" Waited "+
(timeDoneInboundContacts-start)+" millis.",
- new Exception("debug"), Core.logger.NORMAL);
+ new Exception("debug"), Logger.NORMAL);
if (node.rejectingConnections()) {
Core.diagnostics.occurrenceCounting("inboundConnectionsThreadLimitRej",
@@ -92,7 +92,7 @@
Core.logger.log(this, diagnosticsPrefix+logMessage+" Waited "+
(timeDoneDiagnostics - timeDoneInboundContacts)+
" millis.", new Exception("debug"),
- Core.logger.NORMAL);
+ Logger.NORMAL);
if (inboundContacts != null) {
inboundContacts.incSuccesses(conn.getPeerAddress().toString());
@@ -102,13 +102,13 @@
if(time - start > 10000)
Core.logger.log(this, elsePrefix+logMessage+" Waited "+
(time-start)+" millis.", new Exception("debug"),
- Core.logger.NORMAL);
+ Logger.NORMAL);
tf.getThread(new ConnectionShell(conn));
long x = System.currentTimeMillis();
if(x-10000 > time)
Core.logger.log(this, threadPrefix+logMessage+" Waited "+(x-time)+
" millis.", new Exception("debug"),
- Core.logger.NORMAL);
+ Logger.NORMAL);
}
protected class ConnectionShell implements Runnable {
Index: PublicNIOInterface.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/interfaces/PublicNIOInterface.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- PublicNIOInterface.java 22 Jul 2003 02:11:21 -0000 1.5
+++ PublicNIOInterface.java 31 Oct 2003 19:21:21 -0000 1.6
@@ -85,7 +85,7 @@
if (timeDoneInboundContacts - start > 10000)
Core.logger.log(this, contactsPrefix+logMessage+" Waited "+
(timeDoneInboundContacts-start)+" millis.",
- new Exception("debug"), Core.logger.NORMAL);
+ new Exception("debug"), Logger.NORMAL);
if (node.rejectingConnections()) {
Core.diagnostics.occurrenceCounting("inboundConnectionsThreadLimitRej",
@@ -102,7 +102,7 @@
Core.logger.log(this, diagnosticsPrefix+logMessage+" Waited "+
(timeDoneDiagnostics - timeDoneInboundContacts)+
" millis.", new Exception("debug"),
- Core.logger.NORMAL);
+ Logger.NORMAL);
if (inboundContacts != null) {
inboundContacts.incSuccesses(conn.getPeerAddress().toString());
@@ -112,13 +112,13 @@
if(time - start > 10000)
Core.logger.log(this, elsePrefix+logMessage+" Waited "+
(time-start)+" millis.", new Exception("debug"),
- Core.logger.NORMAL);
+ Logger.NORMAL);
tf.getThread(new ConnectionShell(conn));
long x = System.currentTimeMillis();
if(x-10000 > time)
Core.logger.log(this, threadPrefix+logMessage+" Waited "+(x-time)+
" millis.", new Exception("debug"),
- Core.logger.NORMAL);
+ Logger.NORMAL);
}
protected class ConnectionShell implements Runnable {
Index: LocalNIOInterface.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/interfaces/LocalNIOInterface.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- LocalNIOInterface.java 30 Oct 2003 01:34:09 -0000 1.9
+++ LocalNIOInterface.java 31 Oct 2003 19:21:21 -0000 1.10
@@ -191,7 +191,7 @@
String tname = "";
if (t != null) tname = t.toString();
Core.logger.log(this, "Allocated thread for local
connection: "+
- tname+":"+conn,
Core.logger.DEBUG);
+ tname+":"+conn,
Logger.DEBUG);
}
} else {
if(logDEBUG)
@@ -246,7 +246,7 @@
if(logDEBUG)
Core.logger.log(this, "RunningConnections now "+
runningConnections+",
listening = "+
- isListening(),
Core.logger.DEBUG);
+ isListening(),
Logger.DEBUG);
}
protected void finalize() {
@@ -284,7 +284,7 @@
if(logDEBUG)
Core.logger.log(this,
"RunningConnections now "+
runningConnections+", listening = "+
-
isListening(), Core.logger.DEBUG);
+
isListening(), Logger.DEBUG);
if(runningConnections < lowRunningConnections
&& !acceptingConnections) {
Core.logger.log(this, "Restarting
processing connections "+
Index: FreenetConnectionRunner.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/interfaces/FreenetConnectionRunner.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- FreenetConnectionRunner.java 30 Oct 2003 01:34:09 -0000 1.18
+++ FreenetConnectionRunner.java 31 Oct 2003 19:21:21 -0000 1.19
@@ -152,12 +152,12 @@
if(!success) ch.terminate();
}
} catch (IOException e) {
- core.logger.log(this, "Inbound connection failed: "+e+" on "+conn,
+ Core.logger.log(this, "Inbound connection failed: "+e+" on "+conn,
e, Logger.MINOR);
conn.close();
if(ch != null) ch.terminate();
} catch (CommunicationException e) {
- core.logger.log(this, "Inbound connection failed: "+e+" on "+conn,
+ Core.logger.log(this, "Inbound connection failed: "+e+" on "+conn,
e, Logger.MINOR);
conn.close();
if(ch != null) ch.terminate();
Index: TerminalService.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/interfaces/TerminalService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- TerminalService.java 19 Jun 2003 13:31:17 -0000 1.5
+++ TerminalService.java 31 Oct 2003 19:21:21 -0000 1.6
@@ -4,6 +4,7 @@
import freenet.node.*;
import freenet.client.cli.*;
import freenet.config.*;
+import freenet.support.Logger;
import freenet.support.io.ReadInputStream;
import java.io.*;
import java.util.StringTokenizer;
@@ -55,14 +56,14 @@
String[] ss = getCommands(s);
Params p = new Params(CLI.options.getOptions());
p.readArgs(ss);
- (new CLI(p, client, node.logger, in, out, out)).execute();
+ (new CLI(p, client, Core.logger, in, out, out)).execute();
} catch (CLIException e) {
out.println("CLI Error: " + e);
}
}
} catch (IOException e) {
- node.logger.log(this, "IOError : " + e,
- node.logger.MINOR);
+ Core.logger.log(this, "IOError : " + e,
+ Logger.MINOR);
} finally {
c.close();
}
Index: LocalHTTPInterface.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/interfaces/LocalHTTPInterface.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- LocalHTTPInterface.java 30 Oct 2003 01:34:09 -0000 1.8
+++ LocalHTTPInterface.java 31 Oct 2003 19:21:21 -0000 1.9
@@ -215,7 +215,7 @@
Logger.DEBUG);
try {
WriteSelectorLoop wsl = tcpConnection.getWSL();
- if(!wsl.send(buf, sc, this,wsl.MESSAGE)) {
+ if(!wsl.send(buf, sc, this,WriteSelectorLoop.MESSAGE))
{
Core.logger.log(this, "Failed send",
Logger.DEBUG);
sending.add(buf);
}
@@ -237,7 +237,7 @@
byte[] buf = (byte[])(sending.remove(0));
try {
WriteSelectorLoop wsl =
tcpConnection.getWSL();
- if(!wsl.send(buf, sc,
this,wsl.MESSAGE)) {
+ if(!wsl.send(buf, sc,
this,WriteSelectorLoop.MESSAGE)) {
Core.logger.log(this, "Could
not send data in jobDone handler!", Logger.ERROR);
}
Core.logger.log(this, "Sent some data in jobDone",
Logger.DEBUG);
Index: LocalInterface.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/interfaces/LocalInterface.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -w -r1.28 -r1.29
--- LocalInterface.java 17 Oct 2003 03:56:09 -0000 1.28
+++ LocalInterface.java 31 Oct 2003 19:21:21 -0000 1.29
@@ -234,7 +234,7 @@
inta = intAddress(((tcpAddress) ha).getHost());
} catch (java.net.UnknownHostException e) {
Core.logger.log(this, "Unknown Host on incoming connection!!",
- Core.logger.ERROR);
+ Logger.ERROR);
throw new RejectedConnectionException("unknown host on
incoming connection!");
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
