diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-26 13:24:34 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-26 13:24:34 +0000 |
| commit | eb188ecb147e72b9bbc47f49d1d80fb8ac70f818 (patch) | |
| tree | ccd5405f38eabe68fefa97192fc0b20e5baf21da /qpid/java/broker-core/src | |
| parent | 404704e3106d12050853a36476fc333394772e9b (diff) | |
| download | qpid-python-eb188ecb147e72b9bbc47f49d1d80fb8ac70f818.tar.gz | |
QPID-6044 : [Java Broker] [AMQP 1.0] cache the valid host names for the local machine
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620593 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src')
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java | 3 | ||||
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java | 100 |
2 files changed, 102 insertions, 1 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java index 6937d31b3a..d8b81a25b5 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java @@ -65,4 +65,7 @@ public interface Port<X extends Port<X>> extends ConfiguredObject<X> Collection<Connection> getConnections(); void start(); + + boolean isLocalMachine(final String host); + } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java index d1abded988..c90215f141 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java @@ -21,6 +21,11 @@ package org.apache.qpid.server.model.port; +import java.net.InetAddress; +import java.net.InterfaceAddress; +import java.net.NetworkInterface; +import java.net.SocketException; +import java.net.UnknownHostException; import java.security.AccessControlException; import java.util.ArrayList; import java.util.Collection; @@ -29,6 +34,10 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; import org.apache.log4j.Logger; @@ -54,6 +63,60 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo { private static final Logger LOGGER = Logger.getLogger(AbstractPort.class); + private static final Set<InetAddress> LOCAL_ADDRESSES = new CopyOnWriteArraySet<>(); + private static final Set<String> LOCAL_ADDRESS_NAMES = new CopyOnWriteArraySet<>(); + private static final Lock ADDRESS_LOCK = new ReentrantLock(); + private static final AtomicBoolean ADDRESSES_COMPUTED = new AtomicBoolean(); + + static + { + Thread thread = new Thread(new Runnable() + { + public void run() + { + Lock lock = ADDRESS_LOCK; + + lock.lock(); + try + { + for (NetworkInterface networkInterface : Collections.list(NetworkInterface.getNetworkInterfaces())) + { + for (InterfaceAddress inetAddress : networkInterface.getInterfaceAddresses()) + { + InetAddress address = inetAddress.getAddress(); + LOCAL_ADDRESSES.add(address); + String hostAddress = address.getHostAddress(); + if (hostAddress != null) + { + LOCAL_ADDRESS_NAMES.add(hostAddress); + } + String hostName = address.getHostName(); + if (hostName != null) + { + LOCAL_ADDRESS_NAMES.add(hostName); + } + String canonicalHostName = address.getCanonicalHostName(); + if (canonicalHostName != null) + { + LOCAL_ADDRESS_NAMES.add(canonicalHostName); + } + } + } + } + catch (SocketException e) + { + // ignore + } + finally + { + ADDRESSES_COMPUTED.set(true); + lock.unlock(); + } + } + }, "Network Address Resolver"); + thread.start(); + } + private final Broker<?> _broker; private State _state = State.UNINITIALIZED; @@ -335,7 +398,7 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo Collection<Protocol> portProtocols = existingPort.getProtocols(); if (portProtocols != null) { - final ArrayList<Protocol> intersection = new ArrayList(portProtocols); + final ArrayList<Protocol> intersection = new ArrayList<>(portProtocols); intersection.retainAll(getProtocols()); if(!intersection.isEmpty()) { @@ -345,4 +408,39 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo } } } + + public boolean isLocalMachine(final String host) + { + while(!ADDRESSES_COMPUTED.get()) + { + Lock lock = ADDRESS_LOCK; + lock.lock(); + lock.unlock(); + } + + boolean isNetworkAddress = true; + if (!LOCAL_ADDRESS_NAMES.contains(host)) + { + try + { + InetAddress inetAddress = InetAddress.getByName(host); + if (!LOCAL_ADDRESSES.contains(inetAddress)) + { + isNetworkAddress = false; + } + else + { + LOCAL_ADDRESS_NAMES.add(host); + } + } + catch (UnknownHostException e) + { + // ignore + isNetworkAddress = false; + } + } + return isNetworkAddress; + + } + } |
