[freenet-cvs] r10835 - in trunk/freenet/src/freenet: . io/comm node support support/transport support/transport/ip
Author: toad
Date: 2006-11-08 17:47:54 + (Wed, 08 Nov 2006)
New Revision: 10835
Added:
trunk/freenet/src/freenet/support/transport/
trunk/freenet/src/freenet/support/transport/ip/
trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
trunk/freenet/src/freenet/support/transport/ip/IPUtil.java
Removed:
trunk/freenet/src/freenet/transport/
Modified:
trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
trunk/freenet/src/freenet/io/comm/Peer.java
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
trunk/freenet/src/freenet/node/NodeIPDetector.java
Log:
move freenet.transport to freenet.support.transport.ip
Modified: trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
===
--- trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java 2006-11-08
17:37:51 UTC (rev 10834)
+++ trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java 2006-11-08
17:47:54 UTC (rev 10835)
@@ -11,7 +11,7 @@
import freenet.io.AddressIdentifier;
import freenet.support.Logger;
-import freenet.transport.IPUtil;
+import freenet.support.transport.ip.IPUtil;
/**
* Long-term InetAddress. If created with an IP address, then the IP address
is primary.
Modified: trunk/freenet/src/freenet/io/comm/Peer.java
===
--- trunk/freenet/src/freenet/io/comm/Peer.java 2006-11-08 17:37:51 UTC (rev
10834)
+++ trunk/freenet/src/freenet/io/comm/Peer.java 2006-11-08 17:47:54 UTC (rev
10835)
@@ -23,7 +23,7 @@
import java.net.*;
import freenet.io.WritableToDataOutputStream;
-import freenet.transport.IPUtil;
+import freenet.support.transport.ip.IPUtil;
/**
* @author ian
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2006-11-08
17:37:51 UTC (rev 10834)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2006-11-08
17:47:54 UTC (rev 10835)
@@ -11,7 +11,7 @@
import freenet.pluginmanager.DetectedIP;
import freenet.pluginmanager.FredPluginIPDetector;
import freenet.support.Logger;
-import freenet.transport.IPUtil;
+import freenet.support.transport.ip.IPUtil;
/**
* Tracks all known IP address detection plugins, and runs them when
appropriate.
Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===
--- trunk/freenet/src/freenet/node/NodeIPDetector.java 2006-11-08 17:37:51 UTC
(rev 10834)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java 2006-11-08 17:47:54 UTC
(rev 10835)
@@ -20,8 +20,8 @@
import freenet.pluginmanager.DetectedIP;
import freenet.pluginmanager.FredPluginIPDetector;
import freenet.support.Logger;
-import freenet.transport.IPAddressDetector;
-import freenet.transport.IPUtil;
+import freenet.support.transport.ip.IPAddressDetector;
+import freenet.support.transport.ip.IPUtil;
public class NodeIPDetector {
Copied: trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
(from rev 10830, trunk/freenet/src/freenet/transport/IPAddressDetector.java)
===
--- trunk/freenet/src/freenet/transport/IPAddressDetector.java 2006-11-05
20:30:44 UTC (rev 10830)
+++ trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
2006-11-08 17:47:54 UTC (rev 10835)
@@ -0,0 +1,232 @@
+/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
+package freenet.support.transport.ip;
+
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import freenet.node.NodeIPDetector;
+import freenet.support.Logger;
+
+/**
+ * A class to autodetect our IP address(es)
+ */
+
+public class IPAddressDetector implements Runnable {
+
+ //private String preferedAddressString = null;
+ private final int interval;
+ private final NodeIPDetector detector;
+ public IPAddressDetector(int interval, NodeIPDetector detector) {
+ this.interval = interval;
+ this.detector = detector;
+ }
+
+ /**
+* @return our name
+*/
+ public String getCheckpointName() {
+ return "Autodetection of IP addresses";
+ }
+
+ /**
+* @return next scheduling point
+*/
+ public long nextCheckpoint() {
+ return System.currentTimeMillis() + interval; // We are pretty
cheap
+ }
+
+ InetAddress lastInetAddress = null;
+ InetAddress[] lastAddressList = null;
+ long lastDetectedTime = -1;
+
+ /**
+* Fetches the currently detected IP address. If not detected yet a
detection is forced
+* @return Detected ip address
+*/
+
[freenet-cvs] r10835 - in trunk/freenet/src/freenet: . io/comm node support support/transport support/transport/ip
Author: toad
Date: 2006-11-08 17:47:54 + (Wed, 08 Nov 2006)
New Revision: 10835
Added:
trunk/freenet/src/freenet/support/transport/
trunk/freenet/src/freenet/support/transport/ip/
trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
trunk/freenet/src/freenet/support/transport/ip/IPUtil.java
Removed:
trunk/freenet/src/freenet/transport/
Modified:
trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
trunk/freenet/src/freenet/io/comm/Peer.java
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
trunk/freenet/src/freenet/node/NodeIPDetector.java
Log:
move freenet.transport to freenet.support.transport.ip
Modified: trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
===
--- trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java 2006-11-08
17:37:51 UTC (rev 10834)
+++ trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java 2006-11-08
17:47:54 UTC (rev 10835)
@@ -11,7 +11,7 @@
import freenet.io.AddressIdentifier;
import freenet.support.Logger;
-import freenet.transport.IPUtil;
+import freenet.support.transport.ip.IPUtil;
/**
* Long-term InetAddress. If created with an IP address, then the IP address
is primary.
Modified: trunk/freenet/src/freenet/io/comm/Peer.java
===
--- trunk/freenet/src/freenet/io/comm/Peer.java 2006-11-08 17:37:51 UTC (rev
10834)
+++ trunk/freenet/src/freenet/io/comm/Peer.java 2006-11-08 17:47:54 UTC (rev
10835)
@@ -23,7 +23,7 @@
import java.net.*;
import freenet.io.WritableToDataOutputStream;
-import freenet.transport.IPUtil;
+import freenet.support.transport.ip.IPUtil;
/**
* @author ian
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2006-11-08
17:37:51 UTC (rev 10834)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2006-11-08
17:47:54 UTC (rev 10835)
@@ -11,7 +11,7 @@
import freenet.pluginmanager.DetectedIP;
import freenet.pluginmanager.FredPluginIPDetector;
import freenet.support.Logger;
-import freenet.transport.IPUtil;
+import freenet.support.transport.ip.IPUtil;
/**
* Tracks all known IP address detection plugins, and runs them when
appropriate.
Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===
--- trunk/freenet/src/freenet/node/NodeIPDetector.java 2006-11-08 17:37:51 UTC
(rev 10834)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java 2006-11-08 17:47:54 UTC
(rev 10835)
@@ -20,8 +20,8 @@
import freenet.pluginmanager.DetectedIP;
import freenet.pluginmanager.FredPluginIPDetector;
import freenet.support.Logger;
-import freenet.transport.IPAddressDetector;
-import freenet.transport.IPUtil;
+import freenet.support.transport.ip.IPAddressDetector;
+import freenet.support.transport.ip.IPUtil;
public class NodeIPDetector {
Copied: trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
(from rev 10830, trunk/freenet/src/freenet/transport/IPAddressDetector.java)
===
--- trunk/freenet/src/freenet/transport/IPAddressDetector.java 2006-11-05
20:30:44 UTC (rev 10830)
+++ trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
2006-11-08 17:47:54 UTC (rev 10835)
@@ -0,0 +1,232 @@
+/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
+package freenet.support.transport.ip;
+
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import freenet.node.NodeIPDetector;
+import freenet.support.Logger;
+
+/**
+ * A class to autodetect our IP address(es)
+ */
+
+public class IPAddressDetector implements Runnable {
+
+ //private String preferedAddressString = null;
+ private final int interval;
+ private final NodeIPDetector detector;
+ public IPAddressDetector(int interval, NodeIPDetector detector) {
+ this.interval = interval;
+ this.detector = detector;
+ }
+
+ /**
+* @return our name
+*/
+ public String getCheckpointName() {
+ return "Autodetection of IP addresses";
+ }
+
+ /**
+* @return next scheduling point
+*/
+ public long nextCheckpoint() {
+ return System.currentTimeMillis() + interval; // We are pretty
cheap
+ }
+
+ InetAddress lastInetAddress = null;
+ InetAddress[] lastAddressList = null;
+ long lastDetectedTime = -1;
+
+ /**
+* Fetches the currently detected IP address. If not detected yet a
detection is forced
+* @return Detected ip address
+*/
