[freenet-cvs] r12392 - in trunk/freenet/src/freenet: node support

[t...@freenetproject.org]

Author: toad
Date: 2007-03-27 22:41:37 +0000 (Tue, 27 Mar 2007)
New Revision: 12392

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/support/SimpleFieldSet.java
Log:
Add auth.negTypes to public noderef

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java        2007-03-27 
21:28:41 UTC (rev 12391)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java        2007-03-27 
22:41:37 UTC (rev 12392)
@@ -1559,4 +1559,8 @@
        public void resend(ResendPacketItem item) throws 
PacketSequenceException, WouldBlockException, KeyChangedException, 
NotConnectedException {
                processOutgoingPreformatted(item.buf, 0, item.buf.length, 
item.kt, item.packetNumber, item.callbacks, 0);
        }
+
+       public static int[] supportedNegTypes() {
+               return new int[] { 0 };
+       }
 }

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2007-03-27 21:28:41 UTC (rev 
12391)
+++ trunk/freenet/src/freenet/node/Node.java    2007-03-27 22:41:37 UTC (rev 
12392)
@@ -1603,11 +1603,15 @@
         */
        SimpleFieldSet exportPublicFieldSet(boolean forSetup) {
                SimpleFieldSet fs = new SimpleFieldSet(true);
+               // IP addresses
                Peer[] ips = ipDetector.getPrimaryIPAddress();
                if(ips != null) {
                        for(int i=0;i<ips.length;i++)
                                fs.putAppend("physical.udp", 
ips[i].toString()); // Keep; important that node know all our IPs
                }
+               // Negotiation types
+               int[] negTypes = FNPPacketMangler.supportedNegTypes();
+               fs.put("auth.negTypes", negTypes);
                fs.putSingle("identity", Base64.encode(myIdentity)); // FIXME 
!forSetup after 11104 is mandatory
                fs.put("location", lm.getLocation().getValue()); // FIXME maybe 
!forSetup; see #943
                fs.putSingle("version", Version.getVersionString()); // Keep, 
vital that peer know our version. For example, some types may be sent in 
different formats to different node versions (e.g. Peer).

Modified: trunk/freenet/src/freenet/support/SimpleFieldSet.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleFieldSet.java       2007-03-27 
21:28:41 UTC (rev 12391)
+++ trunk/freenet/src/freenet/support/SimpleFieldSet.java       2007-03-27 
22:41:37 UTC (rev 12392)
@@ -636,4 +636,11 @@
                return Fields.stringToBool(get(key), def);
        }

+       public void put(String key, int[] value) {
+               // FIXME this could be more efficient...
+               removeValue(key);
+               for(int i=0;i<value.length;i++)
+                       putAppend(key, Integer.toString(value[i]));
+       }
+
 }