Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv24146/src/freenet
Modified Files:
OpenConnectionManager.java ConnectionHandler.java
Log Message:
Display descriptions of connection state instead of negative numbers when connection
is in process of closing or opening
Index: OpenConnectionManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/OpenConnectionManager.java,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -w -r1.168 -r1.169
--- OpenConnectionManager.java 18 Nov 2003 14:32:21 -0000 1.168
+++ OpenConnectionManager.java 19 Nov 2003 09:20:59 -0000 1.169
@@ -1512,7 +1512,16 @@
buffer.append("<center><img src='" + imageURL + "' height =
'15' width = '24'>" + "</center></td>");
}
if(useOldStyle || viewLevel>0)
- buffer.append("<TD>" + ch.getLocalPort()+"</TD>");
+ {
+ int localPort = ch.getLocalPort();
+ String localPortString = String.valueOf(localPort);
+ if(localPort ==
ConnectionHandler.CONNECTION_TERMINATED_PORTNUMBER)
+ localPortString = "Closed";
+ if(localPort ==
ConnectionHandler.CHANNEL_CLOSED_PORTNUMBER)
+ localPortString = "Channel
closed";
+ buffer.append("<TD>" + localPortString +"</TD>");
+ }
+
NodeReference n =
Main.node.rt.getNodeReference(ch.peerIdentity());
NodeReference nPrev = (chPrev == null)
? null
Index: ConnectionHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/ConnectionHandler.java,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -w -r1.208 -r1.209
--- ConnectionHandler.java 18 Nov 2003 03:46:37 -0000 1.208
+++ ConnectionHandler.java 19 Nov 2003 09:20:59 -0000 1.209
@@ -137,6 +137,9 @@
private SocketChannel chan;
private Socket sock;
+ public static final int CHANNEL_CLOSED_PORTNUMBER = -5;
+ public static final int CONNECTION_TERMINATED_PORTNUMBER = -4;
+
public long trailerLengthAvailable() {
if(sendClosed.state()) return 0;
synchronized(trailerSendLock) {
@@ -484,8 +487,8 @@
}
public int getLocalPort() {
- if(finalized.state()) return -4;
- if(!chan.isOpen()) return -5;
+ if(finalized.state()) return CHANNEL_CLOSED_PORTNUMBER;
+ if(!chan.isOpen()) return CHANNEL_CLOSED_PORTNUMBER;
return sock.getLocalPort();
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
