Pull new version of libweave and update weaved's implementation
libweave had some interface clean-up work done, so reflecting the
current state of library in Brillo.
Change-Id: I987ed3721df917fe59f623a8e00110e2ede4f72f
diff --git a/buffet/socket_stream.h b/buffet/socket_stream.h
index 757190c..968acb9 100644
--- a/buffet/socket_stream.h
+++ b/buffet/socket_stream.h
@@ -20,29 +20,26 @@
~SocketStream() override = default;
- void ReadAsync(
- void* buffer,
- size_t size_to_read,
- const base::Callback<void(size_t)>& success_callback,
- const base::Callback<void(const weave::Error*)>& error_callback) override;
+ void Read(void* buffer,
+ size_t size_to_read,
+ const ReadSuccessCallback& success_callback,
+ const weave::ErrorCallback& error_callback) override;
- void WriteAllAsync(
- const void* buffer,
- size_t size_to_write,
- const base::Closure& success_callback,
- const base::Callback<void(const weave::Error*)>& error_callback) override;
+ void Write(const void* buffer,
+ size_t size_to_write,
+ const weave::SuccessCallback& success_callback,
+ const weave::ErrorCallback& error_callback) override;
- void CancelPendingAsyncOperations() 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 base::Callback<void(const weave::Error*)>& error_callback);
+ 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);
private:
chromeos::StreamPtr ptr_;