From e6566439f627e375f12f77044819bbb37b585348 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 26 Jun 2007 02:11:55 +0000 Subject: 2007-06-25 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 --- cpp/src/qpid/sys/posix/Socket.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/sys/posix/Socket.cpp') 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; -- cgit v1.2.1