2007-06-25 <aconway@redhat.com>

	Cluster class implementing cluster membership map.
	* src/qpid/cluster/Cluster.cpp: Cluster membership implementation.
	* src/qpid/cluster/Cpg.cpp: Support for boost::function callbacks.
	* src/tests/Url.cpp: Implements AMQP-95 URL format.
	* xml/cluster.xml: Cluster join method.

	Build/packaging
	* README: Remove mention of openais till clustering is functional.
	For now it is optional and we depend on an unpackaged version. 
	* configure.ac: Check openais has cpg_local_get().
	* Makefile.am: Added cluster.xml to EXTRA_DIST.
	* src/generate.sh: add cluster.xml to codegen.
	* src/tests/Makefile.am:
	 - Generate individual "sudo -u ais" wrappers for openais tests.
	 - Drop "unit" directory, all unit tests in "tests" directory

	Minor changes:
	* src/qpid/sys/posix/Socket.cpp:
	* src/qpid/sys/posix/PosixAcceptor.cpp: 
	* src/qpid/sys/posix/EventChannelAcceptor.cpp: 
	* src/qpid/sys/apr/APRAcceptor.cpp: 
	* src/qpid/sys/Acceptor.h (getHost): Added getHost()
	* src/tests/.valgrind.supp-default: Suppress benign valgrind
	warning in libcpg.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@550658 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 29 insertions, 1 deletions

diff --git a/cpp/src/qpid/sys/Acceptor.h b/cpp/src/qpid/sys/Acceptor.h
index 5e624a956e..8d6bca8f29 100644
--- a/cpp/src/qpid/sys/Acceptor.h
+++ b/cpp/src/qpid/sys/Acceptor.h
@@ -36,6 +36,7 @@ class Acceptor : public qpid::SharedObject<Acceptor>
     static Acceptor::shared_ptr create(int16_t port, int backlog, int threads, bool trace = false);
     virtual ~Acceptor() = 0;
     virtual uint16_t getPort() const = 0;
+    virtual std::string getHost() const = 0;
     virtual void run(qpid::sys::ConnectionInputHandlerFactory* factory) = 0;
     virtual void shutdown() = 0;
 };
diff --git a/cpp/src/qpid/sys/apr/APRAcceptor.cpp b/cpp/src/qpid/sys/apr/APRAcceptor.cpp
index 0f0853b35d..8662e602c2 100644
--- a/cpp/src/qpid/sys/apr/APRAcceptor.cpp
+++ b/cpp/src/qpid/sys/apr/APRAcceptor.cpp
@@ -35,6 +35,7 @@ class APRAcceptor : public Acceptor
   public:
     APRAcceptor(int16_t port, int backlog, int threads, bool trace);
     virtual uint16_t getPort() const;
+    virtual std::string getHost() const;
     virtual void run(qpid::sys::ConnectionInputHandlerFactory* factory);
     virtual void shutdown();
 
@@ -72,6 +73,12 @@ APRAcceptor::APRAcceptor(int16_t port_, int backlog, int threads, bool trace_) :
     CHECK_APR_SUCCESS(apr_socket_listen(socket, backlog));
 }
 
+std::string APRAcceptor::getHost() const {
+    apr_sockaddr_t* address;
+    CHECK_APR_SUCCESS(apr_socket_addr_get(&address, APR_LOCAL, socket));
+    return address->hostname;
+}
+
 uint16_t APRAcceptor::getPort() const {
     apr_sockaddr_t* address;
     CHECK_APR_SUCCESS(apr_socket_addr_get(&address, APR_LOCAL, socket));
diff --git a/cpp/src/qpid/sys/posix/EventChannelAcceptor.cpp b/cpp/src/qpid/sys/posix/EventChannelAcceptor.cpp
index 1a5fceb56e..cbda216cfc 100644
--- a/cpp/src/qpid/sys/posix/EventChannelAcceptor.cpp
+++ b/cpp/src/qpid/sys/posix/EventChannelAcceptor.cpp
@@ -52,6 +52,7 @@ class EventChannelAcceptor : public Acceptor {
     );
         
     uint16_t getPort() const;
+    std::string getHost() const;
     
     void run(ConnectionInputHandlerFactory* factory);
 
@@ -100,6 +101,10 @@ uint16_t EventChannelAcceptor::getPort() const {
     return port;                // Immutable no need for lock.
 }
     
+uint16_t EventChannelAcceptor::getPort() const {
+    return port;                // Immutable no need for lock.
+}
+    
 void EventChannelAcceptor::run(ConnectionInputHandlerFactory* f) {
     {
         Mutex::ScopedLock l(lock);
diff --git a/cpp/src/qpid/sys/posix/PosixAcceptor.cpp b/cpp/src/qpid/sys/posix/PosixAcceptor.cpp
index af200d393d..0575380a14 100644
--- a/cpp/src/qpid/sys/posix/PosixAcceptor.cpp
+++ b/cpp/src/qpid/sys/posix/PosixAcceptor.cpp
@@ -32,6 +32,7 @@ void fail() { throw qpid::Exception("PosixAcceptor not implemented"); }
 class PosixAcceptor : public Acceptor {
   public:
     virtual uint16_t getPort() const { fail(); return 0; }
+    virtual std::string getPort() const { fail(); return std::string(); }
     virtual void run(qpid::sys::ConnectionInputHandlerFactory* ) { fail(); }
     virtual void shutdown() { fail(); }
 };
diff --git a/cpp/src/qpid/sys/posix/Socket.cpp b/cpp/src/qpid/sys/posix/Socket.cpp
index 39651fa821..50cbfa7c4d 100644
--- a/cpp/src/qpid/sys/posix/Socket.cpp
+++ b/cpp/src/qpid/sys/posix/Socket.cpp
@@ -112,7 +112,21 @@ int Socket::listen(int port, int backlog)
     return ntohs(name.sin_port);
 }
 
-
+std::string getHost() const {
+    // TODO aconway 2007-06-11: Won't work for ip6
+    struct sockaddr_in name;    
+    socklen_t namelen = sizeof(name);
+    if (::getsockname(socket, (struct sockaddr*)&name, &namelen) < 0)
+        throw QPID_POSIX_ERROR(errno);
+    uint32_t addr = name.sin_host.s_addr;
+    ostringstream os;
+    os << uint8_t(addr >> 24) << '.'
+       << uint8_t(addr >> 16) << '.' 
+       << uint8_t(addr >> 8) << '.' 
+       << uint8_t(addr);
+    return os.str();
+}
+    
 int Socket::fd() 
 {
     return socket;