Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions aether/client_connectivity_policy.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ class ClientConnectivityPolicy : public Obj {
const noexcept {
return rx_timings_;
}
Event<void()>* suspend_allowed_event() noexcept {
return &suspend_allowed_event_;
Event<void()>::Subscriber suspend_allowed_event() noexcept {
return EventSubscriber{suspend_allowed_event_};
}

ConnectivityStatus GetStatus() const noexcept;
Expand Down
10 changes: 6 additions & 4 deletions aether/client_messages/p2p_message_stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

#include "aether/config.h"

#include "aether/cloud.h"
#include "aether/client.h"
#include "aether/cloud.h"

#include "aether/cloud_connections/cloud_request.h"
#include "aether/cloud_connections/cloud_subscription.h"
Expand Down Expand Up @@ -156,7 +156,9 @@ P2pStream::P2pStream(AeContext const& ae_context, Ptr<Client> const& client,
AE_TELE_DEBUG(kP2pMessageStreamNew, "P2pStream created for {}", destination_);
assert(!destination_.empty());

ConnectReceive();
if (handle_) {
ConnectReceive();
}
ConnectSend();
}

Expand Down Expand Up @@ -202,8 +204,8 @@ void P2pStream::WriteOut(DataBuffer const& data) {
Uid const& P2pStream::destination() const { return destination_; }

void P2pStream::ConnectReceive() {
out_data_sub_ = handle_.out_data_event().Subscribe(
MethodPtr<&P2pStream::WriteOut>{this});
out_data_sub_ =
handle_.out_data_event().Subscribe(MethodPtr<&P2pStream::WriteOut>{this});
}

void P2pStream::ConnectSend() {
Expand Down
4 changes: 2 additions & 2 deletions aether/client_messages/p2p_message_stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@

#include "aether/common.h"

#include "aether/types/uid.h"
#include "aether/ae_context.h"
#include "aether/ptr/ptr_view.h"
#include "aether/types/uid.h"

#include "aether/write_action/buffer_write.h"

#include "aether/client_messages/p2p_port_handle.h"
#include "aether/connection_manager/client_cloud_manager.h"
#include "aether/cloud_connections/cloud_server_connections.h"
#include "aether/connection_manager/client_cloud_manager.h"

namespace ae {
class Client;
Expand Down
Loading