Author: j16sdiz
Date: 2008-10-24 16:15:14 +0000 (Fri, 24 Oct 2008)
New Revision: 23086
Modified:
trunk/freenet/src/freenet/io/AddressTracker.java
trunk/freenet/src/freenet/io/AllowedHosts.java
trunk/freenet/src/freenet/io/NetworkInterface.java
Log:
generic
Modified: trunk/freenet/src/freenet/io/AddressTracker.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressTracker.java 2008-10-24 16:14:53 UTC
(rev 23085)
+++ trunk/freenet/src/freenet/io/AddressTracker.java 2008-10-24 16:15:14 UTC
(rev 23086)
@@ -44,10 +44,10 @@
public class AddressTracker {
/** PeerAddressTrackerItem's by Peer */
- private final HashMap peerTrackers;
+ private final HashMap<Peer, PeerAddressTrackerItem> peerTrackers;
/** InetAddressAddressTrackerItem's by InetAddress */
- private final HashMap ipTrackers;
+ private final HashMap<InetAddress, InetAddressAddressTrackerItem>
ipTrackers;
/** Maximum number of Item's of either type */
static final int MAX_ITEMS = 1000;
@@ -55,7 +55,6 @@
private long timeDefinitelyNoPacketsReceived;
private long timeDefinitelyNoPacketsSent;
- private boolean isBroken;
private long brokenTime;
public static AddressTracker create(long lastBootID, File nodeDir, int
port) {
@@ -89,8 +88,8 @@
private AddressTracker() {
timeDefinitelyNoPacketsReceived = System.currentTimeMillis();
timeDefinitelyNoPacketsSent = System.currentTimeMillis();
- peerTrackers = new HashMap();
- ipTrackers = new HashMap();
+ peerTrackers = new HashMap<Peer, PeerAddressTrackerItem>();
+ ipTrackers = new HashMap<InetAddress,
InetAddressAddressTrackerItem>();
}
private AddressTracker(SimpleFieldSet fs, long lastBootID) throws
FSParseException {
@@ -104,25 +103,25 @@
//timeDefinitelyNoPacketsReceived =
fs.getLong("TimeDefinitelyNoPacketsReceived");
timeDefinitelyNoPacketsReceived = System.currentTimeMillis();
timeDefinitelyNoPacketsSent =
fs.getLong("TimeDefinitelyNoPacketsSent");
- peerTrackers = new HashMap();
+ peerTrackers = new HashMap<Peer, PeerAddressTrackerItem>();
SimpleFieldSet peers = fs.subset("Peers");
if(peers != null) {
- Iterator i = peers.directSubsetNameIterator();
+ Iterator<String> i = peers.directSubsetNameIterator();
if(i != null) {
while(i.hasNext()) {
- SimpleFieldSet peer = peers.subset((String)i.next());
+ SimpleFieldSet peer = peers.subset(i.next());
PeerAddressTrackerItem item = new
PeerAddressTrackerItem(peer);
peerTrackers.put(item.peer, item);
}
}
}
- ipTrackers = new HashMap();
+ ipTrackers = new HashMap<InetAddress,
InetAddressAddressTrackerItem>();
SimpleFieldSet ips = fs.subset("IPs");
if(ips != null) {
- Iterator i = ips.directSubsetNameIterator();
+ Iterator<String> i = ips.directSubsetNameIterator();
if(i != null) {
while(i.hasNext()) {
- SimpleFieldSet peer = ips.subset((String)i.next());
+ SimpleFieldSet peer = ips.subset(i.next());
InetAddressAddressTrackerItem item = new
InetAddressAddressTrackerItem(peer);
ipTrackers.put(item.addr, item);
}
@@ -143,7 +142,7 @@
InetAddress ip = peer.getAddress();
long now = System.currentTimeMillis();
synchronized(this) {
- PeerAddressTrackerItem peerItem =
(PeerAddressTrackerItem) peerTrackers.get(peer);
+ PeerAddressTrackerItem peerItem =
peerTrackers.get(peer);
if(peerItem == null) {
peerItem = new
PeerAddressTrackerItem(timeDefinitelyNoPacketsReceived,
timeDefinitelyNoPacketsSent, peer);
if(peerTrackers.size() > MAX_ITEMS) {
@@ -158,7 +157,7 @@
peerItem.sentPacket(now);
else
peerItem.receivedPacket(now);
- InetAddressAddressTrackerItem ipItem =
(InetAddressAddressTrackerItem) ipTrackers.get(ip);
+ InetAddressAddressTrackerItem ipItem =
ipTrackers.get(ip);
if(ipItem == null) {
ipItem = new
InetAddressAddressTrackerItem(timeDefinitelyNoPacketsReceived,
timeDefinitelyNoPacketsSent, ip);
if(ipTrackers.size() > MAX_ITEMS) {
@@ -186,12 +185,12 @@
public synchronized PeerAddressTrackerItem[]
getPeerAddressTrackerItems() {
PeerAddressTrackerItem[] items = new
PeerAddressTrackerItem[peerTrackers.size()];
- return (PeerAddressTrackerItem[])
peerTrackers.values().toArray(items);
+ return peerTrackers.values().toArray(items);
}
public synchronized InetAddressAddressTrackerItem[]
getInetAddressTrackerItems() {
InetAddressAddressTrackerItem[] items = new
InetAddressAddressTrackerItem[ipTrackers.size()];
- return (InetAddressAddressTrackerItem[])
ipTrackers.values().toArray(items);
+ return ipTrackers.values().toArray(items);
}
public static final int DEFINITELY_PORT_FORWARDED = 2;
Modified: trunk/freenet/src/freenet/io/AllowedHosts.java
===================================================================
--- trunk/freenet/src/freenet/io/AllowedHosts.java 2008-10-24 16:14:53 UTC
(rev 23085)
+++ trunk/freenet/src/freenet/io/AllowedHosts.java 2008-10-24 16:15:14 UTC
(rev 23086)
@@ -26,7 +26,7 @@
/** Implementation of allowedHosts */
public class AllowedHosts {
- protected final List addressMatchers = new ArrayList();
+ protected final List<AddressMatcher> addressMatchers = new
ArrayList<AddressMatcher>();
public AllowedHosts(String allowedHosts) {
setAllowedHosts(allowedHosts);
@@ -42,7 +42,7 @@
public void setAllowedHosts(String allowedHosts) {
if(allowedHosts == null || allowedHosts.equals(""))
allowedHosts = NetworkInterface.DEFAULT_BIND_TO;
StringTokenizer allowedHostsTokens = new
StringTokenizer(allowedHosts, ",");
- List newAddressMatchers = new ArrayList();
+ List<AddressMatcher> newAddressMatchers = new
ArrayList<AddressMatcher>();
while (allowedHostsTokens.hasMoreTokens()) {
String allowedHost =
allowedHostsTokens.nextToken().trim();
String hostname = allowedHost;
@@ -73,9 +73,7 @@
}
public synchronized boolean allowed(AddressType clientAddressType,
InetAddress clientAddress) {
- for(int i=0;i<addressMatchers.size();i++) {
- AddressMatcher matcher = (AddressMatcher)
addressMatchers.get(i);
-
+ for(AddressMatcher matcher: addressMatchers) {
if (clientAddressType == matcher.getAddressType()) {
if(matcher.matches(clientAddress)) return true;
}
@@ -86,7 +84,7 @@
public synchronized String getAllowedHosts() {
StringBuilder sb = new StringBuilder();
for(int i=0;i<addressMatchers.size();i++) {
- AddressMatcher matcher = (AddressMatcher)
addressMatchers.get(i);
+ AddressMatcher matcher = addressMatchers.get(i);
if(matcher instanceof EverythingMatcher) return "*";
if(i != 0) sb.append(',');
sb.append(matcher.getHumanRepresentation());
Modified: trunk/freenet/src/freenet/io/NetworkInterface.java
===================================================================
--- trunk/freenet/src/freenet/io/NetworkInterface.java 2008-10-24 16:14:53 UTC
(rev 23085)
+++ trunk/freenet/src/freenet/io/NetworkInterface.java 2008-10-24 16:15:14 UTC
(rev 23086)
@@ -26,7 +26,6 @@
import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
@@ -49,10 +48,10 @@
protected final Object syncObject = new Object();
/** Acceptors created by this interface. */
- private final List/* <Acceptor> */acceptors = new ArrayList();
+ private final List<Acceptor> acceptors = new ArrayList<Acceptor>();
/** Queue of accepted client connections. */
- protected final List/* <Socket> */acceptedSockets = new ArrayList();
+ protected final List<Socket> acceptedSockets = new ArrayList<Socket>();
/** AllowedHosts structure */
protected final AllowedHosts allowedHosts;
@@ -112,13 +111,13 @@
public void setBindTo(String bindTo, boolean ignoreUnbindableIP6)
throws IOException {
if(bindTo == null || bindTo.equals("")) bindTo =
NetworkInterface.DEFAULT_BIND_TO;
StringTokenizer bindToTokens = new StringTokenizer(bindTo, ",");
- List bindToTokenList = new ArrayList();
+ List<String> bindToTokenList = new ArrayList<String>();
while (bindToTokens.hasMoreTokens()) {
bindToTokenList.add(bindToTokens.nextToken().trim());
}
/* stop the old acceptors. */
for (int acceptorIndex = 0, acceptorCount = acceptors.size();
acceptorIndex < acceptorCount; acceptorIndex++) {
- Acceptor acceptor = (Acceptor)
acceptors.get(acceptorIndex);
+ Acceptor acceptor = acceptors.get(acceptorIndex);
try {
acceptor.close();
} catch (IOException e) {
@@ -138,7 +137,7 @@
ServerSocket serverSocket = createServerSocket();
InetSocketAddress addr = null;
try {
- addr = new InetSocketAddress((String)
bindToTokenList.get(serverSocketIndex), port);
+ addr = new
InetSocketAddress(bindToTokenList.get(serverSocketIndex), port);
serverSocket.setReuseAddress(true);
serverSocket.bind(addr);
} catch (SocketException e) {
@@ -152,9 +151,7 @@
}
setSoTimeout(timeout);
synchronized (syncObject) {
- Iterator acceptors = this.acceptors.iterator();
- while (acceptors.hasNext()) {
- Acceptor acceptor=(Acceptor) acceptors.next();
+ for (Acceptor acceptor : this.acceptors) {
executor.execute(acceptor, "Network Interface
Acceptor for "+acceptor.serverSocket);
}
}
@@ -174,9 +171,8 @@
* @see ServerSocket#setSoTimeout(int)
*/
public void setSoTimeout(int timeout) throws SocketException {
- Iterator acceptors = this.acceptors.iterator();
- while (acceptors.hasNext()) {
- ((Acceptor) acceptors.next()).setSoTimeout(timeout);
+ for (Acceptor acceptor : acceptors) {
+ acceptor.setSoTimeout(timeout);
}
}
@@ -202,7 +198,7 @@
throw new SocketTimeoutException();
}
}
- return (Socket) acceptedSockets.remove(0);
+ return acceptedSockets.remove(0);
}
}
@@ -215,9 +211,7 @@
*/
public void close() throws IOException {
IOException exception = null;
- Iterator acceptors = this.acceptors.iterator();
- while (acceptors.hasNext()) {
- Acceptor acceptor = (Acceptor) acceptors.next();
+ for (Acceptor acceptor : acceptors) {
try {
acceptor.close();
} catch (IOException ioe1) {
@@ -225,7 +219,7 @@
}
}
if (exception != null) {
- throw (exception);
+ throw exception;
}
}
