Adding upstream version 1.40.0.upstream/1.40.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 67 insertions, 48 deletions

diff --git a/libnetdata/socket/socket.c b/libnetdata/socket/socket.c
index 7eb212b3..220db760 100644
--- a/libnetdata/socket/socket.c
+++ b/libnetdata/socket/socket.c
@@ -10,6 +10,63 @@
 
 #include "../libnetdata.h"
 
+
+SOCKET_PEERS socket_peers(int sock_fd) {
+    SOCKET_PEERS peers;
+
+    if(sock_fd < 0) {
+        strncpyz(peers.peer.ip, "unknown", sizeof(peers.peer.ip) - 1);
+        peers.peer.port = 0;
+
+        strncpyz(peers.local.ip, "unknown", sizeof(peers.local.ip) - 1);
+        peers.local.port = 0;
+
+        return peers;
+    }
+
+    struct sockaddr_storage addr;
+    socklen_t addr_len = sizeof(addr);
+
+    // Get peer info
+    if (getpeername(sock_fd, (struct sockaddr *)&addr, &addr_len) == 0) {
+        if (addr.ss_family == AF_INET) {  // IPv4
+            struct sockaddr_in *s = (struct sockaddr_in *)&addr;
+            inet_ntop(AF_INET, &s->sin_addr, peers.peer.ip, sizeof(peers.peer.ip));
+            peers.peer.port = ntohs(s->sin_port);
+        }
+        else {  // IPv6
+            struct sockaddr_in6 *s = (struct sockaddr_in6 *)&addr;
+            inet_ntop(AF_INET6, &s->sin6_addr, peers.peer.ip, sizeof(peers.peer.ip));
+            peers.peer.port = ntohs(s->sin6_port);
+        }
+    }
+    else {
+        strncpyz(peers.peer.ip, "unknown", sizeof(peers.peer.ip) - 1);
+        peers.peer.port = 0;
+    }
+
+    // Get local info
+    addr_len = sizeof(addr);
+    if (getsockname(sock_fd, (struct sockaddr *)&addr, &addr_len) == 0) {
+        if (addr.ss_family == AF_INET) {  // IPv4
+            struct sockaddr_in *s = (struct sockaddr_in *) &addr;
+            inet_ntop(AF_INET, &s->sin_addr, peers.local.ip, sizeof(peers.local.ip));
+            peers.local.port = ntohs(s->sin_port);
+        } else {  // IPv6
+            struct sockaddr_in6 *s = (struct sockaddr_in6 *) &addr;
+            inet_ntop(AF_INET6, &s->sin6_addr, peers.local.ip, sizeof(peers.local.ip));
+            peers.local.port = ntohs(s->sin6_port);
+        }
+    }
+    else {
+        strncpyz(peers.local.ip, "unknown", sizeof(peers.local.ip) - 1);
+        peers.local.port = 0;
+    }
+
+    return peers;
+}
+
+
 // --------------------------------------------------------------------------------------------------------------------
 // various library calls
 
@@ -967,49 +1024,11 @@ int connect_to_one_of_urls(const char *destination, int default_port, struct tim
 }
 
 
-#ifdef ENABLE_HTTPS
-ssize_t netdata_ssl_read(SSL *ssl, void *buf, size_t num) {
-    error_limit_static_thread_var(erl, 1, 0);
-
-    int bytes, err;
-
-    bytes = SSL_read(ssl, buf, (int)num);
-    err = SSL_get_error(ssl, bytes);
-
-    if(unlikely(bytes <= 0)) {
-        if (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) {
-            bytes = 0;
-        } else
-            error_limit(&erl, "SSL_write() returned %d bytes, SSL error %d", bytes, err);
-    }
-
-    return bytes;
-}
-
-ssize_t netdata_ssl_write(SSL *ssl, const void *buf, size_t num) {
-    error_limit_static_thread_var(erl, 1, 0);
-
-    int bytes, err;
-
-    bytes = SSL_write(ssl, (uint8_t *)buf, (int)num);
-    err = SSL_get_error(ssl, bytes);
-
-    if(unlikely(bytes <= 0)) {
-        if (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) {
-            bytes = 0;
-        } else
-            error_limit(&erl, "SSL_write() returned %d bytes, SSL error %d", bytes, err);
-    }
-
-    return bytes;
-}
-#endif
-
 // --------------------------------------------------------------------------------------------------------------------
 // helpers to send/receive data in one call, in blocking mode, with a timeout
 
 #ifdef ENABLE_HTTPS
-ssize_t recv_timeout(struct netdata_ssl *ssl,int sockfd, void *buf, size_t len, int flags, int timeout) {
+ssize_t recv_timeout(NETDATA_SSL *ssl,int sockfd, void *buf, size_t len, int flags, int timeout) {
 #else
 ssize_t recv_timeout(int sockfd, void *buf, size_t len, int flags, int timeout) {
 #endif
@@ -1033,24 +1052,24 @@ ssize_t recv_timeout(int sockfd, void *buf, size_t len, int flags, int timeout)
             return -1;
         }
 
-        if(!retval) {
+        if(!retval)
             // timeout
             return 0;
-        }
 
-        if(fd.events & POLLIN) break;
+        if(fd.revents & POLLIN)
+            break;
     }
 
 #ifdef ENABLE_HTTPS
-    if (ssl->conn && ssl->flags == NETDATA_SSL_HANDSHAKE_COMPLETE)
-        return netdata_ssl_read(ssl->conn, buf, len);
+    if (SSL_connection(ssl))
+        return netdata_ssl_read(ssl, buf, len);
 #endif
 
     return recv(sockfd, buf, len, flags);
 }
 
 #ifdef ENABLE_HTTPS
-ssize_t send_timeout(struct netdata_ssl *ssl,int sockfd, void *buf, size_t len, int flags, int timeout) {
+ssize_t send_timeout(NETDATA_SSL *ssl,int sockfd, void *buf, size_t len, int flags, int timeout) {
 #else
 ssize_t send_timeout(int sockfd, void *buf, size_t len, int flags, int timeout) {
 #endif
@@ -1079,13 +1098,13 @@ ssize_t send_timeout(int sockfd, void *buf, size_t len, int flags, int timeout)
             return 0;
         }
 
-        if(fd.events & POLLOUT) break;
+        if(fd.revents & POLLOUT) break;
     }
 
 #ifdef ENABLE_HTTPS
     if(ssl->conn) {
-        if (ssl->flags == NETDATA_SSL_HANDSHAKE_COMPLETE) {
-            return netdata_ssl_write(ssl->conn, buf, len);
+        if (SSL_connection(ssl)) {
+            return netdata_ssl_write(ssl, buf, len);
         }
         else {
             error("cannot write to SSL connection - connection is not ready.");