Restoring authorship annotation for <orivej@yandex-team.ru>. Commit 2 of 2.

1 files changed, 109 insertions, 109 deletions

diff --git a/contrib/libs/curl/lib/connect.c b/contrib/libs/curl/lib/connect.c
index 97489c0f1b..e65d24d9e9 100644
--- a/contrib/libs/curl/lib/connect.c
+++ b/contrib/libs/curl/lib/connect.c
@@ -75,8 +75,8 @@
 #include "conncache.h"
 #include "multihandle.h"
 #include "version_win32.h"
-#include "quic.h" 
-#include "socks.h" 
+#include "quic.h"
+#include "socks.h"
 
 /* The last 3 #include files should be in this order */
 #include "curl_printf.h"
@@ -355,7 +355,7 @@ static CURLcode bindlocal(struct connectdata *conn,
         conn->ip_version = CURL_IPRESOLVE_V6;
 #endif
 
-      rc = Curl_resolv(conn, dev, 0, FALSE, &h); 
+      rc = Curl_resolv(conn, dev, 0, FALSE, &h);
       if(rc == CURLRESOLV_PENDING)
         (void)Curl_resolver_wait_resolv(conn, &h);
       conn->ip_version = ipver;
@@ -366,11 +366,11 @@ static CURLcode bindlocal(struct connectdata *conn,
         infof(data, "Name '%s' family %i resolved to '%s' family %i\n",
               dev, af, myhost, h->addr->ai_family);
         Curl_resolv_unlock(data, h);
-        if(af != h->addr->ai_family) { 
-          /* bad IP version combo, signal the caller to try another address 
-             family if available */ 
-          return CURLE_UNSUPPORTED_PROTOCOL; 
-        } 
+        if(af != h->addr->ai_family) {
+          /* bad IP version combo, signal the caller to try another address
+             family if available */
+          return CURLE_UNSUPPORTED_PROTOCOL;
+        }
         done = 1;
       }
       else {
@@ -449,10 +449,10 @@ static CURLcode bindlocal(struct connectdata *conn,
       curl_socklen_t size = sizeof(add);
       memset(&add, 0, sizeof(struct Curl_sockaddr_storage));
       if(getsockname(sockfd, (struct sockaddr *) &add, &size) < 0) {
-        char buffer[STRERROR_LEN]; 
+        char buffer[STRERROR_LEN];
         data->state.os_errno = error = SOCKERRNO;
         failf(data, "getsockname() failed with errno %d: %s",
-              error, Curl_strerror(error, buffer, sizeof(buffer))); 
+              error, Curl_strerror(error, buffer, sizeof(buffer)));
         return CURLE_INTERFACE_FAILED;
       }
       infof(data, "Local port: %hu\n", port);
@@ -474,12 +474,12 @@ static CURLcode bindlocal(struct connectdata *conn,
     else
       break;
   }
-  { 
-    char buffer[STRERROR_LEN]; 
-    data->state.os_errno = error = SOCKERRNO; 
-    failf(data, "bind failed with errno %d: %s", 
-          error, Curl_strerror(error, buffer, sizeof(buffer))); 
-  } 
+  {
+    char buffer[STRERROR_LEN];
+    data->state.os_errno = error = SOCKERRNO;
+    failf(data, "bind failed with errno %d: %s",
+          error, Curl_strerror(error, buffer, sizeof(buffer)));
+  }
 
   return CURLE_INTERFACE_FAILED;
 }
@@ -586,7 +586,7 @@ static CURLcode trynextip(struct connectdata *conn,
 
     while(ai) {
       if(ai) {
-        result = singleipconnect(conn, ai, tempindex); 
+        result = singleipconnect(conn, ai, tempindex);
         if(result == CURLE_COULDNT_CONNECT) {
           ai = ainext(conn, tempindex, TRUE);
           continue;
@@ -616,8 +616,8 @@ void Curl_persistconninfo(struct connectdata *conn)
 
 /* retrieves ip address and port from a sockaddr structure.
    note it calls Curl_inet_ntop which sets errno on fail, not SOCKERRNO. */
-bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen, 
-                      char *addr, long *port) 
+bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
+                      char *addr, long *port)
 {
   struct sockaddr_in *si = NULL;
 #ifdef ENABLE_IPV6
@@ -625,8 +625,8 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
 #endif
 #if defined(HAVE_SYS_UN_H) && defined(AF_UNIX)
   struct sockaddr_un *su = NULL;
-#else 
-  (void)salen; 
+#else
+  (void)salen;
 #endif
 
   switch(sa->sa_family) {
@@ -634,7 +634,7 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
       si = (struct sockaddr_in *)(void *) sa;
       if(Curl_inet_ntop(sa->sa_family, &si->sin_addr,
                         addr, MAX_IPADR_LEN)) {
-        unsigned short us_port = ntohs(si->sin_port); 
+        unsigned short us_port = ntohs(si->sin_port);
         *port = us_port;
         return TRUE;
       }
@@ -644,7 +644,7 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
       si6 = (struct sockaddr_in6 *)(void *) sa;
       if(Curl_inet_ntop(sa->sa_family, &si6->sin6_addr,
                         addr, MAX_IPADR_LEN)) {
-        unsigned short us_port = ntohs(si6->sin6_port); 
+        unsigned short us_port = ntohs(si6->sin6_port);
         *port = us_port;
         return TRUE;
       }
@@ -653,11 +653,11 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
 #if defined(HAVE_SYS_UN_H) && defined(AF_UNIX)
     case AF_UNIX:
       if(salen > (curl_socklen_t)sizeof(sa_family_t)) {
-        su = (struct sockaddr_un*)sa; 
-        msnprintf(addr, MAX_IPADR_LEN, "%s", su->sun_path); 
-      } 
-      else 
-        addr[0] = 0; /* socket with no name */ 
+        su = (struct sockaddr_un*)sa;
+        msnprintf(addr, MAX_IPADR_LEN, "%s", su->sun_path);
+      }
+      else
+        addr[0] = 0; /* socket with no name */
       *port = 0;
       return TRUE;
 #endif
@@ -703,7 +703,7 @@ void Curl_conninfo_remote(struct connectdata *conn, curl_socket_t sockfd)
    connection */
 void Curl_conninfo_local(struct connectdata *conn, curl_socket_t sockfd)
 {
-#ifdef HAVE_GETSOCKNAME 
+#ifdef HAVE_GETSOCKNAME
   char buffer[STRERROR_LEN];
   struct Curl_sockaddr_storage ssloc;
   curl_socklen_t slen;
@@ -724,7 +724,7 @@ void Curl_conninfo_local(struct connectdata *conn, curl_socket_t sockfd)
 #else
   (void)conn;
   (void)sockfd;
-#endif 
+#endif
 }
 
 /* retrieves the start/end point information of a socket of an established
@@ -745,20 +745,20 @@ void Curl_updateconninfo(struct connectdata *conn, curl_socket_t sockfd)
 /* After a TCP connection to the proxy has been verified, this function does
    the next magic steps. If 'done' isn't set TRUE, it is not done yet and
    must be called again.
- 
-   Note: this function's sub-functions call failf() 
- 
-*/ 
+
+   Note: this function's sub-functions call failf()
+
+*/
 static CURLcode connect_SOCKS(struct connectdata *conn, int sockindex,
                               bool *done)
-{ 
-  CURLcode result = CURLE_OK; 
+{
+  CURLcode result = CURLE_OK;
 #ifndef CURL_DISABLE_PROXY
   CURLproxycode pxresult = CURLPX_OK;
-  if(conn->bits.socksproxy) { 
-    /* for the secondary socket (FTP), use the "connect to host" 
-     * but ignore the "connect to port" (use the secondary port) 
-     */ 
+  if(conn->bits.socksproxy) {
+    /* for the secondary socket (FTP), use the "connect to host"
+     * but ignore the "connect to port" (use the secondary port)
+     */
     const char * const host =
       conn->bits.httpproxy ?
       conn->http_proxy.host.name :
@@ -771,38 +771,38 @@ static CURLcode connect_SOCKS(struct connectdata *conn, int sockindex,
       sockindex == SECONDARYSOCKET ? conn->secondary_port :
       conn->bits.conn_to_port ? conn->conn_to_port :
       conn->remote_port;
-    switch(conn->socks_proxy.proxytype) { 
-    case CURLPROXY_SOCKS5: 
-    case CURLPROXY_SOCKS5_HOSTNAME: 
+    switch(conn->socks_proxy.proxytype) {
+    case CURLPROXY_SOCKS5:
+    case CURLPROXY_SOCKS5_HOSTNAME:
       pxresult = Curl_SOCKS5(conn->socks_proxy.user, conn->socks_proxy.passwd,
                              host, port, sockindex, conn, done);
-      break; 
- 
-    case CURLPROXY_SOCKS4: 
-    case CURLPROXY_SOCKS4A: 
+      break;
+
+    case CURLPROXY_SOCKS4:
+    case CURLPROXY_SOCKS4A:
       pxresult = Curl_SOCKS4(conn->socks_proxy.user, host, port, sockindex,
                              conn, done);
-      break; 
- 
-    default: 
-      failf(conn->data, "unknown proxytype option given"); 
-      result = CURLE_COULDNT_CONNECT; 
-    } /* switch proxytype */ 
+      break;
+
+    default:
+      failf(conn->data, "unknown proxytype option given");
+      result = CURLE_COULDNT_CONNECT;
+    } /* switch proxytype */
     if(pxresult) {
       result = CURLE_PROXY;
       conn->data->info.pxcode = pxresult;
     }
   }
   else
-#else 
+#else
     (void)conn;
     (void)sockindex;
-#endif /* CURL_DISABLE_PROXY */ 
+#endif /* CURL_DISABLE_PROXY */
     *done = TRUE; /* no SOCKS proxy, so consider us connected */
- 
-  return result; 
-} 
- 
+
+  return result;
+}
+
 /*
  * post_SOCKS() is called after a successful connect to the peer, which
  * *could* be a SOCKS proxy
@@ -871,23 +871,23 @@ CURLcode Curl_is_connected(struct connectdata *conn,
     if(conn->tempsock[i] == CURL_SOCKET_BAD)
       continue;
     error = 0;
-#ifdef ENABLE_QUIC 
-    if(conn->transport == TRNSPRT_QUIC) { 
-      result = Curl_quic_is_connected(conn, i, connected); 
+#ifdef ENABLE_QUIC
+    if(conn->transport == TRNSPRT_QUIC) {
+      result = Curl_quic_is_connected(conn, i, connected);
       if(!result && *connected) {
-        /* use this socket from now on */ 
-        conn->sock[sockindex] = conn->tempsock[i]; 
-        conn->ip_addr = conn->tempaddr[i]; 
-        conn->tempsock[i] = CURL_SOCKET_BAD; 
+        /* use this socket from now on */
+        conn->sock[sockindex] = conn->tempsock[i];
+        conn->ip_addr = conn->tempaddr[i];
+        conn->tempsock[i] = CURL_SOCKET_BAD;
         post_SOCKS(conn, sockindex, connected);
-        connkeep(conn, "HTTP/3 default"); 
+        connkeep(conn, "HTTP/3 default");
         return CURLE_OK;
-      } 
+      }
       if(result)
         error = SOCKERRNO;
-    } 
+    }
     else
-#endif 
+#endif
     {
 #ifdef mpeix
       /* Call this function once now, and ignore the results. We do this to
@@ -904,7 +904,7 @@ CURLcode Curl_is_connected(struct connectdata *conn,
     if(rc == 0) { /* no connection yet */
       if(Curl_timediff(now, conn->connecttime) >=
          conn->timeoutms_per_addr[i]) {
-        infof(data, "After %" CURL_FORMAT_TIMEDIFF_T 
+        infof(data, "After %" CURL_FORMAT_TIMEDIFF_T
               "ms connect time, move on!\n", conn->timeoutms_per_addr[i]);
         error = ETIMEDOUT;
       }
@@ -961,20 +961,20 @@ CURLcode Curl_is_connected(struct connectdata *conn,
         CURLcode status;
 #ifndef CURL_DISABLE_VERBOSE_STRINGS
         char ipaddress[MAX_IPADR_LEN];
-        char buffer[STRERROR_LEN]; 
+        char buffer[STRERROR_LEN];
         Curl_printable_address(conn->tempaddr[i], ipaddress,
                                sizeof(ipaddress));
         infof(data, "connect to %s port %ld failed: %s\n",
-              ipaddress, conn->port, 
-              Curl_strerror(error, buffer, sizeof(buffer))); 
+              ipaddress, conn->port,
+              Curl_strerror(error, buffer, sizeof(buffer)));
 #endif
 
         conn->timeoutms_per_addr[i] = conn->tempaddr[i]->ai_next == NULL ?
-          allow : allow / 2; 
+          allow : allow / 2;
         ainext(conn, i, TRUE);
         status = trynextip(conn, sockindex, i);
-        if((status != CURLE_COULDNT_CONNECT) || 
-           conn->tempsock[other] == CURL_SOCKET_BAD) 
+        if((status != CURLE_COULDNT_CONNECT) ||
+           conn->tempsock[other] == CURL_SOCKET_BAD)
           /* the last attempt failed and no other sockets remain open */
           result = status;
       }
@@ -986,7 +986,7 @@ CURLcode Curl_is_connected(struct connectdata *conn,
      (conn->tempsock[1] == CURL_SOCKET_BAD)) {
     /* no more addresses to try */
     const char *hostname;
-    char buffer[STRERROR_LEN]; 
+    char buffer[STRERROR_LEN];
 
     /* if the first address family runs out of addresses to try before the
        happy eyeball timeout, go ahead and try the next family now */
@@ -1007,8 +1007,8 @@ CURLcode Curl_is_connected(struct connectdata *conn,
       hostname = conn->host.name;
 
     failf(data, "Failed to connect to %s port %ld: %s",
-          hostname, conn->port, 
-          Curl_strerror(error, buffer, sizeof(buffer))); 
+          hostname, conn->port,
+          Curl_strerror(error, buffer, sizeof(buffer)));
 
     Curl_quic_disconnect(conn, 0);
     Curl_quic_disconnect(conn, 1);
@@ -1027,14 +1027,14 @@ CURLcode Curl_is_connected(struct connectdata *conn,
   return result;
 }
 
-static void tcpnodelay(struct connectdata *conn, curl_socket_t sockfd) 
+static void tcpnodelay(struct connectdata *conn, curl_socket_t sockfd)
 {
 #if defined(TCP_NODELAY)
   curl_socklen_t onoff = (curl_socklen_t) 1;
   int level = IPPROTO_TCP;
 #if !defined(CURL_DISABLE_VERBOSE_STRINGS)
   struct Curl_easy *data = conn->data;
-  char buffer[STRERROR_LEN]; 
+  char buffer[STRERROR_LEN];
 #else
   (void) conn;
 #endif
@@ -1042,7 +1042,7 @@ static void tcpnodelay(struct connectdata *conn, curl_socket_t sockfd)
   if(setsockopt(sockfd, level, TCP_NODELAY, (void *)&onoff,
                 sizeof(onoff)) < 0)
     infof(data, "Could not set TCP_NODELAY: %s\n",
-          Curl_strerror(SOCKERRNO, buffer, sizeof(buffer))); 
+          Curl_strerror(SOCKERRNO, buffer, sizeof(buffer)));
 #else
   (void)conn;
   (void)sockfd;
@@ -1060,11 +1060,11 @@ static void nosigpipe(struct connectdata *conn,
   struct Curl_easy *data = conn->data;
   int onoff = 1;
   if(setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&onoff,
-                sizeof(onoff)) < 0) { 
-    char buffer[STRERROR_LEN]; 
+                sizeof(onoff)) < 0) {
+    char buffer[STRERROR_LEN];
     infof(data, "Could not set SO_NOSIGPIPE: %s\n",
-          Curl_strerror(SOCKERRNO, buffer, sizeof(buffer))); 
-  } 
+          Curl_strerror(SOCKERRNO, buffer, sizeof(buffer)));
+  }
 }
 #else
 #define nosigpipe(x,y) Curl_nop_stmt
@@ -1140,7 +1140,7 @@ static CURLcode singleipconnect(struct connectdata *conn,
 #ifdef TCP_FASTOPEN_CONNECT
   int optval = 1;
 #endif
-  char buffer[STRERROR_LEN]; 
+  char buffer[STRERROR_LEN];
   curl_socket_t *sockp = &conn->tempsock[tempindex];
   *sockp = CURL_SOCKET_BAD;
 
@@ -1149,15 +1149,15 @@ static CURLcode singleipconnect(struct connectdata *conn,
     return result;
 
   /* store remote address and port used in this connection attempt */
-  if(!Curl_addr2string((struct sockaddr*)&addr.sa_addr, addr.addrlen, 
-                       ipaddress, &port)) { 
+  if(!Curl_addr2string((struct sockaddr*)&addr.sa_addr, addr.addrlen,
+                       ipaddress, &port)) {
     /* malformed address or bug in inet_ntop, try next address */
     failf(data, "sa_addr inet_ntop() failed with errno %d: %s",
-          errno, Curl_strerror(errno, buffer, sizeof(buffer))); 
+          errno, Curl_strerror(errno, buffer, sizeof(buffer)));
     Curl_closesocket(conn, sockfd);
     return CURLE_OK;
   }
-  infof(data, "  Trying %s:%ld...\n", ipaddress, port); 
+  infof(data, "  Trying %s:%ld...\n", ipaddress, port);
 
 #ifdef ENABLE_IPV6
   is_tcp = (addr.family == AF_INET || addr.family == AF_INET6) &&
@@ -1166,7 +1166,7 @@ static CURLcode singleipconnect(struct connectdata *conn,
   is_tcp = (addr.family == AF_INET) && addr.socktype == SOCK_STREAM;
 #endif
   if(is_tcp && data->set.tcp_nodelay)
-    tcpnodelay(conn, sockfd); 
+    tcpnodelay(conn, sockfd);
 
   nosigpipe(conn, sockfd);
 
@@ -1219,8 +1219,8 @@ static CURLcode singleipconnect(struct connectdata *conn,
     Curl_expire(data, conn->timeoutms_per_addr[1], EXPIRE_DNS_PER_NAME2);
   }
 
-  /* Connect TCP and QUIC sockets */ 
-  if(!isconnected && (conn->transport != TRNSPRT_UDP)) { 
+  /* Connect TCP and QUIC sockets */
+  if(!isconnected && (conn->transport != TRNSPRT_UDP)) {
     if(conn->bits.tcp_fastopen) {
 #if defined(CONNECT_DATA_IDEMPOTENT) /* Darwin */
 #  if defined(HAVE_BUILTIN_AVAILABLE)
@@ -1264,16 +1264,16 @@ static CURLcode singleipconnect(struct connectdata *conn,
 
     if(-1 == rc)
       error = SOCKERRNO;
-#ifdef ENABLE_QUIC 
-    else if(conn->transport == TRNSPRT_QUIC) { 
-      /* pass in 'sockfd' separately since it hasn't been put into the 
-         tempsock array at this point */ 
+#ifdef ENABLE_QUIC
+    else if(conn->transport == TRNSPRT_QUIC) {
+      /* pass in 'sockfd' separately since it hasn't been put into the
+         tempsock array at this point */
       result = Curl_quic_connect(conn, sockfd, tempindex,
-                                 &addr.sa_addr, addr.addrlen); 
-      if(result) 
-        error = SOCKERRNO; 
-    } 
-#endif 
+                                 &addr.sa_addr, addr.addrlen);
+      if(result)
+        error = SOCKERRNO;
+    }
+#endif
   }
   else {
     *sockp = sockfd;
@@ -1299,7 +1299,7 @@ static CURLcode singleipconnect(struct connectdata *conn,
     default:
       /* unknown error, fallthrough and try another address! */
       infof(data, "Immediate connect fail for %s: %s\n",
-            ipaddress, Curl_strerror(error, buffer, sizeof(buffer))); 
+            ipaddress, Curl_strerror(error, buffer, sizeof(buffer)));
       data->state.os_errno = error;
 
       /* connect failed */
@@ -1523,9 +1523,9 @@ CURLcode Curl_socket(struct connectdata *conn,
    */
 
   addr->family = ai->ai_family;
-  addr->socktype = (conn->transport == TRNSPRT_TCP) ? SOCK_STREAM : SOCK_DGRAM; 
-  addr->protocol = conn->transport != TRNSPRT_TCP ? IPPROTO_UDP : 
-    ai->ai_protocol; 
+  addr->socktype = (conn->transport == TRNSPRT_TCP) ? SOCK_STREAM : SOCK_DGRAM;
+  addr->protocol = conn->transport != TRNSPRT_TCP ? IPPROTO_UDP :
+    ai->ai_protocol;
   addr->addrlen = ai->ai_addrlen;
 
   if(addr->addrlen > sizeof(struct Curl_sockaddr_storage))
@@ -1589,7 +1589,7 @@ void Curl_conncontrol(struct connectdata *conn,
   if((ctrl == CONNCTRL_STREAM) &&
      (conn->handler->flags & PROTOPT_STREAM))
     DEBUGF(infof(conn->data, "Kill stream: %s\n", reason));
-  else if((bit)closeit != conn->bits.close) { 
+  else if((bit)closeit != conn->bits.close) {
     DEBUGF(infof(conn->data, "Marked for [%s]: %s\n",
                  closeit?"closure":"keep alive", reason));
     conn->bits.close = closeit; /* the only place in the source code that