weaved: Uprev libweave and fix public interfaces
libweave includes these two new commits now:
- 11956f74 Added version field to state and migrate from unversioned data
- c37cbb8b Use single callback for replies to async operations
Change-Id: I67f67c735b538c2a4dc161464ac7796c4d114ca6
diff --git a/buffet/socket_stream.h b/buffet/socket_stream.h
index 9ad4b84..aef8b99 100644
--- a/buffet/socket_stream.h
+++ b/buffet/socket_stream.h
@@ -10,6 +10,7 @@
#include <base/callback.h>
#include <base/macros.h>
#include <brillo/streams/stream.h>
+#include <weave/provider/network.h>
#include <weave/stream.h>
namespace buffet {
@@ -22,24 +23,21 @@
void Read(void* buffer,
size_t size_to_read,
- const ReadSuccessCallback& success_callback,
- const weave::ErrorCallback& error_callback) override;
+ const ReadCallback& callback) override;
void Write(const void* buffer,
size_t size_to_write,
- const weave::SuccessCallback& success_callback,
- const weave::ErrorCallback& error_callback) override;
+ const WriteCallback& callback) override;
void CancelPendingOperations() override;
static std::unique_ptr<weave::Stream> ConnectBlocking(const std::string& host,
uint16_t port);
- static void TlsConnect(std::unique_ptr<weave::Stream> socket,
- const std::string& host,
- const base::Callback<void(
- std::unique_ptr<weave::Stream>)>& success_callback,
- const weave::ErrorCallback& error_callback);
+ static void TlsConnect(
+ std::unique_ptr<weave::Stream> socket,
+ const std::string& host,
+ const weave::provider::Network::OpenSslSocketCallback& callback);
private:
brillo::StreamPtr ptr_;