From b659218d13c12995f07c2f218bc32664801b8993 Mon Sep 17 00:00:00 2001 From: Proddy Date: Sat, 15 Jul 2023 11:34:57 +0200 Subject: [PATCH] use original formatting --- .../src/Transport/ClientPosix.cpp | 89 +++++++++---------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/lib/espMqttClient/src/Transport/ClientPosix.cpp b/lib/espMqttClient/src/Transport/ClientPosix.cpp index 76ea5649f..83b555d1b 100644 --- a/lib/espMqttClient/src/Transport/ClientPosix.cpp +++ b/lib/espMqttClient/src/Transport/ClientPosix.cpp @@ -13,81 +13,80 @@ the LICENSE file. namespace espMqttClientInternals { ClientPosix::ClientPosix() - : _sockfd(-1) - , _host() { - // empty +: _sockfd(-1) +, _host() { + // empty } ClientPosix::~ClientPosix() { - ClientPosix::stop(); + ClientPosix::stop(); } bool ClientPosix::connect(IPAddress ip, uint16_t port) { - if (connected()) - stop(); + if (connected()) stop(); - _sockfd = ::socket(AF_INET, SOCK_STREAM, 0); - if (_sockfd < 0) { - emc_log_e("Error %d opening socket", errno); - } + _sockfd = ::socket(AF_INET, SOCK_STREAM, 0); + if (_sockfd < 0) { + emc_log_e("Error %d opening socket", errno); + } - int flag = 1; - if (setsockopt(_sockfd, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int)) < 0) { - emc_log_e("Error %d disabling nagle", errno); - } + int flag = 1; + if (setsockopt(_sockfd, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int)) < 0) { + emc_log_e("Error %d disabling nagle", errno); + } - memset(&_host, 0, sizeof(_host)); - _host.sin_family = AF_INET; - _host.sin_addr.s_addr = htonl(uint32_t(ip)); - _host.sin_port = htons(port); + memset(&_host, 0, sizeof(_host)); + _host.sin_family = AF_INET; + _host.sin_addr.s_addr = htonl(uint32_t(ip)); + _host.sin_port = ::htons(port); - int ret = ::connect(_sockfd, (struct sockaddr *)&_host, sizeof(_host)); + int ret = ::connect(_sockfd, (struct sockaddr *)&_host, sizeof(_host)); - if (ret < 0) { - emc_log_e("Error connecting: %d - (%d) %s", ret, errno, strerror(errno)); - return false; - } - - emc_log_i("Connected"); - return true; -} - -bool ClientPosix::connect(const char * host, uint16_t port) { - // tbi - (void)host; - (void)port; + if (ret < 0) { + emc_log_e("Error connecting: %d - (%d) %s", ret, errno, strerror(errno)); return false; + } + + emc_log_i("Connected"); + return true; } -size_t ClientPosix::write(const uint8_t * buf, size_t size) { - return ::send(_sockfd, buf, size, 0); +bool ClientPosix::connect(const char* host, uint16_t port) { + // tbi + (void) host; + (void) port; + return false; } -int ClientPosix::read(uint8_t * buf, size_t size) { - int ret = ::recv(_sockfd, buf, size, MSG_DONTWAIT); - /* +size_t ClientPosix::write(const uint8_t* buf, size_t size) { + return ::send(_sockfd, buf, size, 0); +} + +int ClientPosix::read(uint8_t* buf, size_t size) { + int ret = ::recv(_sockfd, buf, size, MSG_DONTWAIT); + /* if (ret < 0) { emc_log_e("Error reading: %s", strerror(errno)); } */ - return ret; + return ret; } void ClientPosix::stop() { - if (_sockfd >= 0) { - ::close(_sockfd); - _sockfd = -1; - } + if (_sockfd >= 0) { + ::close(_sockfd); + _sockfd = -1; + } } bool ClientPosix::connected() { - return _sockfd >= 0; + return _sockfd >= 0; } bool ClientPosix::disconnected() { - return _sockfd < 0; + return _sockfd < 0; } -} // namespace espMqttClientInternals +} // namespace espMqttClientInternals #endif