summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-06-28 19:55:40 +0000
committerAlan Conway <aconway@apache.org>2012-06-28 19:55:40 +0000
commitb2e4940d55ea0ba42c5420b0f82ebbcd36b0d64f (patch)
tree1c2c07f77884478f12f7a64eadd7cf772cd1953a
parentd5ade7c5a5fd6e26ec678c3ca717702bfc47b693 (diff)
downloadqpid-python-b2e4940d55ea0ba42c5420b0f82ebbcd36b0d64f.tar.gz
NO-JIRA: Add missing EXTERN declarations needed by HA module.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1355138 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/broker/Connection.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/qpid/cpp/src/qpid/broker/Connection.h b/qpid/cpp/src/qpid/broker/Connection.h
index 97de44f94d..d01599ce54 100644
--- a/qpid/cpp/src/qpid/broker/Connection.h
+++ b/qpid/cpp/src/qpid/broker/Connection.h
@@ -27,8 +27,7 @@
#include <vector>
#include <queue>
-#include <boost/ptr_container/ptr_map.hpp>
-
+#include "qpid/broker/BrokerImportExport.h"
#include "qpid/broker/ConnectionHandler.h"
#include "qpid/broker/ConnectionState.h"
#include "qpid/broker/SessionHandler.h"
@@ -94,8 +93,14 @@ class Connection : public sys::ConnectionInputHandler,
/** Get the SessionHandler for channel. Create if it does not already exist */
SessionHandler& getChannel(framing::ChannelId channel);
- /** Close the connection */
- void close(framing::connection::CloseCode code, const std::string& text);
+ /** Close the connection. Waits for the client to respond with close-ok
+ * before actually destroying the connection.
+ */
+ QPID_BROKER_EXTERN void close(
+ framing::connection::CloseCode code, const std::string& text);
+
+ /** Abort the connection. Close abruptly and immediately. */
+ QPID_BROKER_EXTERN void abort();
// ConnectionInputHandler methods
void received(framing::AMQFrame& frame);
@@ -139,8 +144,7 @@ class Connection : public sys::ConnectionInputHandler,
void setHeartbeatInterval(uint16_t heartbeat);
void sendHeartbeat();
void restartTimeout();
- void abort();
-
+
template <class F> void eachSessionHandler(F f) {
for (ChannelMap::iterator i = channels.begin(); i != channels.end(); ++i)
f(*ptr_map_ptr(i));