diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2010-01-26 20:45:03 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2010-01-26 20:45:03 +0000 |
| commit | 832887152f0cfbb0ff1d9ca3d3c5624818ecc87d (patch) | |
| tree | 70f94276df7fb709018d809bdf0f9f597f549d65 /cpp/src/qpid/sys/rdma/RdmaIO.h | |
| parent | faeceaf81e73b23260d32503bc09e87f6ed2e735 (diff) | |
| download | qpid-python-832887152f0cfbb0ff1d9ca3d3c5624818ecc87d.tar.gz | |
Fix memory error in previous SocketAddress refactoring
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@903407 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/sys/rdma/RdmaIO.h')
| -rw-r--r-- | cpp/src/qpid/sys/rdma/RdmaIO.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.h b/cpp/src/qpid/sys/rdma/RdmaIO.h index 12a1b98d24..711685031c 100644 --- a/cpp/src/qpid/sys/rdma/RdmaIO.h +++ b/cpp/src/qpid/sys/rdma/RdmaIO.h @@ -160,12 +160,12 @@ namespace Rdma { virtual ~ConnectionManager(); - void start(qpid::sys::Poller::shared_ptr poller); + void start(qpid::sys::Poller::shared_ptr polle, const qpid::sys::SocketAddress& addrr); private: void event(qpid::sys::DispatchHandle& handle); - virtual void startConnection(Connection::intrusive_ptr ci) = 0; + virtual void startConnection(Connection::intrusive_ptr ci, const qpid::sys::SocketAddress& addr) = 0; virtual void connectionEvent(Connection::intrusive_ptr ci) = 0; }; @@ -174,14 +174,12 @@ namespace Rdma { class Listener : public ConnectionManager { - qpid::sys::SocketAddress src_addr; ConnectionParams checkConnectionParams; ConnectionRequestCallback connectionRequestCallback; EstablishedCallback establishedCallback; public: Listener( - const qpid::sys::SocketAddress& src, const ConnectionParams& cp, EstablishedCallback ec, ErrorCallback errc, @@ -190,7 +188,7 @@ namespace Rdma { ); private: - void startConnection(Connection::intrusive_ptr ci); + void startConnection(Connection::intrusive_ptr ci, const qpid::sys::SocketAddress& addr); void connectionEvent(Connection::intrusive_ptr ci); }; @@ -199,14 +197,12 @@ namespace Rdma { class Connector : public ConnectionManager { - qpid::sys::SocketAddress dst_addr; ConnectionParams connectionParams; RejectedCallback rejectedCallback; ConnectedCallback connectedCallback; public: Connector( - const qpid::sys::SocketAddress& dst, const ConnectionParams& cp, ConnectedCallback cc, ErrorCallback errc, @@ -215,7 +211,7 @@ namespace Rdma { ); private: - void startConnection(Connection::intrusive_ptr ci); + void startConnection(Connection::intrusive_ptr ci, const qpid::sys::SocketAddress& addr); void connectionEvent(Connection::intrusive_ptr ci); }; } |
