Unverified Commit 05b100ae authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

cleanup: make local functions static 

urlapi: turn three local-only functions into statics

conncache: make conncache_find_first_connection static

multi: make detach_connnection static

connect: make getaddressinfo static

curl_ntlm_core: make hmac_md5 static

http2: make two functions static

http: make http_setup_conn static

connect: make tcpnodelay static

tests: make UNITTEST a thing to mark functions with, so they can be static for
normal builds and non-static for unit test builds

... and mark Curl_shuffle_addr accordingly.

url: make up_free static

setopt: make vsetopt static

curl_endian: make write32_le static

rtsp: make rtsp_connisdead static

warnless: remove unused functions

memdebug: remove one unused function, made another static
parent 9a36c0ae

lib/conncache.c

+4 −4
Original line number Diff line number Diff line
@@ -392,8 +392,8 @@ bool Curl_conncache_foreach(struct Curl_easy *data, 
   NOTE: no locking is done here as this is presumably only done when cleaning

   up a cache!

*/

struct connectdata *

Curl_conncache_find_first_connection(struct conncache *connc)

static struct connectdata *

conncache_find_first_connection(struct conncache *connc)

{

  struct curl_hash_iterator iter;

  struct curl_hash_element *he;
@@ -566,7 +566,7 @@ void Curl_conncache_close_all_connections(struct conncache *connc) 
{

  struct connectdata *conn;



  conn = Curl_conncache_find_first_connection(connc);

  conn = conncache_find_first_connection(connc);

  while(conn) {

    SIGPIPE_VARIABLE(pipe_st);

    conn->data = connc->closure_handle;
@@ -577,7 +577,7 @@ void Curl_conncache_close_all_connections(struct conncache *connc) 
    (void)Curl_disconnect(connc->closure_handle, conn, FALSE);

    sigpipe_restore(&pipe_st);



    conn = Curl_conncache_find_first_connection(connc);

    conn = conncache_find_first_connection(connc);

  }



  if(connc->closure_handle) {

lib/connect.c

+14 −11
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -617,9 +617,12 @@ void Curl_persistconninfo(struct connectdata *conn) 
  conn->data->info.conn_local_port = conn->local_port;

}



UNITTEST bool getaddressinfo(struct sockaddr *sa, char *addr,

                             long *port);



/* retrieves ip address and port from a sockaddr structure.

   note it calls Curl_inet_ntop which sets errno on fail, not SOCKERRNO. */

bool Curl_getaddressinfo(struct sockaddr *sa, char *addr,

UNITTEST bool getaddressinfo(struct sockaddr *sa, char *addr,

                             long *port)

{

  unsigned short us_port;
@@ -700,7 +703,7 @@ void Curl_updateconninfo(struct connectdata *conn, curl_socket_t sockfd) 
      return;

    }



    if(!Curl_getaddressinfo((struct sockaddr*)&ssrem,

    if(!getaddressinfo((struct sockaddr*)&ssrem,

                       conn->primary_ip, &conn->primary_port)) {

      failf(data, "ssrem inet_ntop() failed with errno %d: %s",

            errno, Curl_strerror(conn, errno));
@@ -708,7 +711,7 @@ void Curl_updateconninfo(struct connectdata *conn, curl_socket_t sockfd) 
    }

    memcpy(conn->ip_addr_str, conn->primary_ip, MAX_IPADR_LEN);



    if(!Curl_getaddressinfo((struct sockaddr*)&ssloc,

    if(!getaddressinfo((struct sockaddr*)&ssloc,

                       conn->local_ip, &conn->local_port)) {

      failf(data, "ssloc inet_ntop() failed with errno %d: %s",

            errno, Curl_strerror(conn, errno));
@@ -881,7 +884,7 @@ CURLcode Curl_is_connected(struct connectdata *conn, 
  return result;

}



void Curl_tcpnodelay(struct connectdata *conn, curl_socket_t sockfd)

static void tcpnodelay(struct connectdata *conn, curl_socket_t sockfd)

{

#if defined(TCP_NODELAY)

#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
@@ -1006,7 +1009,7 @@ static CURLcode singleipconnect(struct connectdata *conn, 
    return CURLE_OK;



  /* store remote address and port used in this connection attempt */

  if(!Curl_getaddressinfo((struct sockaddr*)&addr.sa_addr,

  if(!getaddressinfo((struct sockaddr*)&addr.sa_addr,

                     ipaddress, &port)) {

    /* malformed address or bug in inet_ntop, try next address */

    failf(data, "sa_addr inet_ntop() failed with errno %d: %s",
@@ -1023,7 +1026,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)

    Curl_tcpnodelay(conn, sockfd);

    tcpnodelay(conn, sockfd);



  nosigpipe(conn, sockfd);

lib/connect.h

+1 −8
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -75,11 +75,6 @@ void Curl_updateconninfo(struct connectdata *conn, curl_socket_t sockfd); 
void Curl_persistconninfo(struct connectdata *conn);

int Curl_closesocket(struct connectdata *conn, curl_socket_t sock);



/*

 * Get presentation format IP address and port from a sockaddr.

 */

bool Curl_getaddressinfo(struct sockaddr *sa, char *addr, long *port);



/*

 * The Curl_sockaddr_ex structure is basically libcurl's external API

 * curl_sockaddr structure with enough space available to directly hold any
@@ -111,8 +106,6 @@ CURLcode Curl_socket(struct connectdata *conn, 
                     struct Curl_sockaddr_ex *addr,

                     curl_socket_t *sockfd);



void Curl_tcpnodelay(struct connectdata *conn, curl_socket_t sockfd);



/*

 * Curl_conncontrol() marks the end of a connection/stream. The 'closeit'

 * argument specifies if it is the end of a connection or a stream.

lib/curl_endian.c

+5 −5
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -82,7 +82,7 @@ unsigned short Curl_read16_be(const unsigned char *buf) 
}



/*

 * Curl_write32_le()

 * write32_le()

 *

 * This function converts a 32-bit integer from the native endian format,

 * to little endian format ready for sending down the wire.
@@ -92,7 +92,7 @@ unsigned short Curl_read16_be(const unsigned char *buf) 
 * value    [in]     - The 32-bit integer value.

 * buffer   [in]     - A pointer to the output buffer.

 */

void Curl_write32_le(const int value, unsigned char *buffer)

static void write32_le(const int value, unsigned char *buffer)

{

  buffer[0] = (char)(value & 0x000000FF);

  buffer[1] = (char)((value & 0x0000FF00) >> 8);
@@ -118,7 +118,7 @@ void Curl_write64_le(const long long value, unsigned char *buffer) 
void Curl_write64_le(const __int64 value, unsigned char *buffer)

#endif

{

  Curl_write32_le((int)value, buffer);

  Curl_write32_le((int)(value >> 32), buffer + 4);

  write32_le((int)value, buffer);

  write32_le((int)(value >> 32), buffer + 4);

}

#endif /* CURL_SIZEOF_CURL_OFF_T > 4 */

lib/curl_ntlm_core.c

+9 −10
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -621,7 +621,7 @@ CURLcode Curl_ntlm_core_mk_nt_hash(struct Curl_easy *data, 
#if defined(USE_NTLM_V2) && !defined(USE_WINDOWS_SSPI)



/* This returns the HMAC MD5 digest */

CURLcode Curl_hmac_md5(const unsigned char *key, unsigned int keylen,

static CURLcode hmac_md5(const unsigned char *key, unsigned int keylen,

                         const unsigned char *data, unsigned int datalen,

                         unsigned char *output)

{
@@ -668,9 +668,8 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_hash(const char *user, size_t userlen, 
  ascii_uppercase_to_unicode_le(identity, user, userlen);

  ascii_to_unicode_le(identity + (userlen << 1), domain, domlen);



  result = Curl_hmac_md5(ntlmhash, 16, identity, curlx_uztoui(identity_len),

  result = hmac_md5(ntlmhash, 16, identity, curlx_uztoui(identity_len),

                    ntlmv2hash);



  free(identity);



  return result;
@@ -756,7 +755,7 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash, 


  /* Concatenate the Type 2 challenge with the BLOB and do HMAC MD5 */

  memcpy(ptr + 8, &ntlm->nonce[0], 8);

  result = Curl_hmac_md5(ntlmv2hash, NTLM_HMAC_MD5_LEN, ptr + 8,

  result = hmac_md5(ntlmv2hash, NTLM_HMAC_MD5_LEN, ptr + 8,

                    NTLMv2_BLOB_LEN + 8, hmac_output);

  if(result) {

    free(ptr);
@@ -799,7 +798,7 @@ CURLcode Curl_ntlm_core_mk_lmv2_resp(unsigned char *ntlmv2hash, 
  memcpy(&data[0], challenge_server, 8);

  memcpy(&data[8], challenge_client, 8);



  result = Curl_hmac_md5(ntlmv2hash, 16, &data[0], 16, hmac_output);

  result = hmac_md5(ntlmv2hash, 16, &data[0], 16, hmac_output);

  if(result)

    return result;