Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv6861/src/freenet
Modified Files:
ConnectionHandlerComparator.java PeerHandler.java
OpenConnectionManager.java
Log Message:
Much nicer way of getting the first address of a Peer. Why didn't anyone tell me that
it existed?
Index: ConnectionHandlerComparator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/ConnectionHandlerComparator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- ConnectionHandlerComparator.java 20 Oct 2003 10:41:59 -0000 1.11
+++ ConnectionHandlerComparator.java 29 Oct 2003 10:52:35 -0000 1.12
@@ -95,8 +95,8 @@
{
NodeReference n1 =
freenet.node.Main.node.rt.getNodeReference(ch1.peerIdentity());
NodeReference n2 =
freenet.node.Main.node.rt.getNodeReference(ch2.peerIdentity());
- String
s1=(n1==null?"":(n1.physical.length >0?n1.physical[1]:""));
- String
s2=(n2==null?"":(n2.physical.length >0?n2.physical[1]:""));
+ String
s1=(n1==null?"":n1.firstPhysicalToString());
+ String
s2=(n2==null?"":n2.firstPhysicalToString());
return
secondaryCompare(iSign,s2.compareTo(s1),ch1,ch2); //Reverse order on s1 and s2 is
intended. Better to place non-routable CH:s at the end
}
case DATASENT:
Index: PeerHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PeerHandler.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -w -r1.37 -r1.38
--- PeerHandler.java 23 Oct 2003 18:12:35 -0000 1.37
+++ PeerHandler.java 29 Oct 2003 10:52:35 -0000 1.38
@@ -976,8 +976,8 @@
return 0;
case PEER_ADDRESS :
{
- String s1 = (ph1.ref == null ? "" :
(ph1.ref.physical.length > 0 ? ph1.ref.physical[1] : ""));
- String s2 = (ph2.ref == null ? "" :
(ph2.ref.physical.length > 0 ? ph2.ref.physical[1] : ""));
+ String s1 = (ph1.ref == null ? "" :
ph1.ref.firstPhysicalToString());
+ String s2 = (ph2.ref == null ? "" :
ph2.ref.firstPhysicalToString());
return secondaryCompare(iSign,
s2.compareTo(s1), ph1, ph2);
//Reverse order on s1 and s2 is
intended. Better
//to place PH:s without ref at the end
@@ -998,8 +998,8 @@
{
NodeReference n1 =
freenet.node.Main.node.rt.getNodeReference(ph1.id);
NodeReference n2 =
freenet.node.Main.node.rt.getNodeReference(ph2.id);
- String s1 = (n1 == null ? "" :
(n1.physical.length > 0 ? n1.physical[1] : ""));
- String s2 = (n2 == null ? "" :
(n2.physical.length > 0 ? n2.physical[1] : ""));
+ String s1 = (n1 == null ? "" :
n1.firstPhysicalToString());
+ String s2 = (n2 == null ? "" :
n2.firstPhysicalToString());
return secondaryCompare(iSign,
s2.compareTo(s1), ph1, ph2);
//Reverse order on s1 and s2 is
intended. Better to place non-routable
//PH:s at the end
Index: OpenConnectionManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/OpenConnectionManager.java,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -w -r1.149 -r1.150
--- OpenConnectionManager.java 28 Oct 2003 13:34:32 -0000 1.149
+++ OpenConnectionManager.java 29 Oct 2003 10:52:35 -0000 1.150
@@ -1719,7 +1719,7 @@
messagesReceived = p.getMessageAccounter().getMessagesReceived();
messagesReceiveFailed =
p.getMessageAccounter().getMessgesReceiveFailed();
version = p.ref == null ?"":p.ref.getVersion();
- address = p.ref == null ? "" : (p.ref.physical.length > 0 ?
p.ref.physical[1] : "");
+ address = p.ref == null ? "" : p.ref.firstPhysicalToString();
identity = p.id;
sendQueue = p.queuedBytes();
dataSent = p.getMessageAccounter().getDataSent();
@@ -1807,9 +1807,18 @@
peerAddress = "<Unknown peer address>";
else
if (viewLevel == 0) { //Then add some stupidification
- int iSep = peerAddress.indexOf(":");
+ int iSep = peerAddress.indexOf("/");
+ if(iSep>0)
+ peerAddress =
peerAddress.substring(iSep+1,peerAddress.length());
+ iSep = peerAddress.indexOf(":");
if (iSep > 0)
peerAddress = peerAddress.substring(0,
iSep);
+ }else{
+ if(viewLevel == 1) {//Then add somewhat less
stupidification
+ int iSep = peerAddress.indexOf("/");
+ if(iSep>0)
+ peerAddress =
peerAddress.substring(iSep+1,peerAddress.length());
+ }
}
pw.println("<TD colspan = 2 width = 200
>"+peerAddress+" (version "+peerVersion+")</TD>");
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
