buffet: Switch XmppChannel to use asynchronous socket streams
Changed XmppClient from using raw socket file descriptors to
chromeos::Stream in preparation of adding TLS support (via subsituting
the regular socket-based FileStream with TlsStream once TLS handshake
is initiated by the XMPP server).
Also implemented exponential backoff for reconnecting to the server
in case of a network error as well as more comprehensive network
read/write mechanism which will tie better into more strict XML-based
parser/communication and renamed XmppClient to XmppChannel after
adding a generic interface for NotificationChannel and NotificationDelegate
which will help us implement other notification channels such as
GCM and periodic polling.
BUG=brillo:458
TEST=`FEATURES=test emerge-link buffet`
Tested XMPP operation on DUT.
Change-Id: I88d593692ca56d03356155e12cde2f2942f8391e
Reviewed-on: https://chromium-review.googlesource.com/271151
Trybot-Ready: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Nathan Bullock <nathanbullock@google.com>
Reviewed-by: Vitaly Buka <vitalybuka@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/buffet/utils.cc b/buffet/utils.cc
index 5a9c154..7e50d0f 100644
--- a/buffet/utils.cc
+++ b/buffet/utils.cc
@@ -5,7 +5,11 @@
#include "buffet/utils.h"
#include <map>
+#include <netdb.h>
#include <string>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
#include <base/files/file_util.h>
#include <base/json/json_reader.h>
@@ -75,4 +79,28 @@
return result;
}
+int ConnectSocket(const std::string& host, uint16_t port) {
+ std::string service = std::to_string(port);
+ addrinfo hints = {0, AF_UNSPEC, SOCK_STREAM};
+ addrinfo* result = nullptr;
+ if (getaddrinfo(host.c_str(), service.c_str(), &hints, &result))
+ return -1;
+
+ int socket_fd = -1;
+ for (const addrinfo* info = result; info != nullptr; info = info->ai_next) {
+ socket_fd = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
+ if (socket_fd < 0)
+ continue;
+
+ if (connect(socket_fd, info->ai_addr, info->ai_addrlen) == 0)
+ break; // Success.
+
+ close(socket_fd);
+ socket_fd = -1;
+ }
+
+ freeaddrinfo(result);
+ return socket_fd;
+}
+
} // namespace buffet
