Vendor in libmongoc 1.17.4 (#602)

Author: kmahar

Sources/CLibMongoC/bson/bson.c

@@ -2586,7 +2586,7 @@ _bson_as_json_visit_int64 (const bson_iter_t *iter,
 
    if (state->mode == BSON_JSON_MODE_CANONICAL) {
       bson_string_append_printf (
-         state->str, "{ \"$numberLong\" : \"%" "lld" "\"}", v_int64);
+         state->str, "{ \"$numberLong\" : \"%" "lld" "\" }", v_int64);
    } else {
       bson_string_append_printf (state->str, "%" "lld", v_int64);
    }

Sources/CLibMongoC/mongoc/mongoc-client-pool.c

@@ -121,6 +121,7 @@ mongoc_client_pool_new (const mongoc_uri_t *uri)
 
    pool = (mongoc_client_pool_t *) bson_malloc0 (sizeof *pool);
    bson_mutex_init (&pool->mutex);
+   mongoc_cond_init (&pool->cond);
    _mongoc_queue_init (&pool->queue);
    pool->uri = mongoc_uri_copy (uri);
    pool->min_pool_size = 0;

Sources/CLibMongoC/mongoc/mongoc-client-private.h

@@ -155,10 +155,12 @@ typedef struct _mongoc_rr_data_t {
    char *txt_record_opts;
 } mongoc_rr_data_t;
 
+#define MONGOC_RR_DEFAULT_BUFFER_SIZE 1024
 bool
 _mongoc_client_get_rr (const char *service,
                        mongoc_rr_type_t rr_type,
                        mongoc_rr_data_t *rr_data,
+                       size_t initial_buffer_size,
                        bson_error_t *error);
 
 mongoc_client_t *

Sources/CLibMongoC/mongoc/mongoc-client.c

@@ -414,14 +414,15 @@ static bool
 _mongoc_get_rr_search (const char *service,
                        mongoc_rr_type_t rr_type,
                        mongoc_rr_data_t *rr_data,
+                       size_t initial_buffer_size,
                        bson_error_t *error)
 {
 #ifdef MONGOC_HAVE_RES_NSEARCH
    struct __res_state state = {0};
 #endif
    int size = 0;
    unsigned char *search_buf = NULL;
-   size_t buffer_size = 1024;
+   size_t buffer_size = initial_buffer_size;
    ns_msg ns_answer;
    int n;
    int i;
@@ -477,7 +478,7 @@ _mongoc_get_rr_search (const char *service,
                     service,
                     strerror (h_errno));
       }
-   } while (size > buffer_size);
+   } while (size >= buffer_size);
 
    if (ns_initparse (search_buf, size, &ns_answer)) {
       DNS_ERROR ("Invalid %s answer for \"%s\"", rr_type_name, service);
@@ -585,12 +586,14 @@ bool
 _mongoc_client_get_rr (const char *service,
                        mongoc_rr_type_t rr_type,
                        mongoc_rr_data_t *rr_data,
+                       size_t initial_buffer_size,
                        bson_error_t *error)
 {
 #ifdef MONGOC_HAVE_DNSAPI
    return _mongoc_get_rr_dnsapi (service, rr_type, rr_data, error);
 #elif (defined(MONGOC_HAVE_RES_NSEARCH) || defined(MONGOC_HAVE_RES_SEARCH))
-   return _mongoc_get_rr_search (service, rr_type, rr_data, error);
+   return _mongoc_get_rr_search (
+      service, rr_type, rr_data, initial_buffer_size, error);
 #else
    bson_set_error (error,
                    MONGOC_ERROR_STREAM,

Sources/CLibMongoC/mongoc/mongoc-cluster-cyrus.c

@@ -57,6 +57,7 @@ _mongoc_cluster_auth_node_cyrus (mongoc_cluster_t *cluster,
    for (;;) {
       mongoc_cmd_parts_init (
          &parts, cluster->client, "$external", MONGOC_QUERY_SLAVE_OK, &cmd);
+      parts.prohibit_lsid = true;
 
       /* If this is the first step, input buffer is NULL. */
       bson_free (outbuf);

Sources/CLibMongoC/mongoc/mongoc-cluster-sspi.c

@@ -175,6 +175,7 @@ _mongoc_cluster_auth_node_sspi (mongoc_cluster_t *cluster,
    for (step = 0;; step++) {
       mongoc_cmd_parts_init (
          &parts, cluster->client, "$external", MONGOC_QUERY_SLAVE_OK, &cmd);
+      parts.prohibit_lsid = true;
       bson_init (&cmd);
 
       if (res == MONGOC_SSPI_AUTH_GSS_CONTINUE) {

Sources/CLibMongoC/mongoc/mongoc-collection.c

@@ -3414,6 +3414,11 @@ mongoc_collection_find_and_modify_with_opts (
 done:
    mongoc_server_stream_cleanup (server_stream);
    mongoc_server_stream_cleanup (retry_server_stream);
+
+   if (ret && error) {
+      /* if a retry succeeded, clear the initial error */
+      memset (error, 0, sizeof (bson_error_t));
+   }
    mongoc_cmd_parts_cleanup (&parts);
    bson_destroy (&command);
    if (&reply_local == reply_ptr) {

Sources/CLibMongoC/mongoc/mongoc-socket.c

@@ -993,6 +993,9 @@ mongoc_socket_new (int domain,   /* IN */
 #else
    int sd;
 #endif
+#ifdef SO_NOSIGPIPE
+   int on = 1;
+#endif
 
    ENTRY;
 
@@ -1017,6 +1020,12 @@ mongoc_socket_new (int domain,   /* IN */
       _mongoc_socket_setkeepalive (sd);
    }
 
+   /* Set SO_NOSIGPIPE, to ignore SIGPIPE on writes for platforms where
+      setting MSG_NOSIGNAL on writes is not supported (primarily OSX). */
+#ifdef SO_NOSIGPIPE
+   setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on));
+#endif
+
    sock = (mongoc_socket_t *) bson_malloc0 (sizeof *sock);
    sock->sd = sd;
    sock->domain = domain;

Sources/CLibMongoC/mongoc/mongoc-stream-tls-openssl.c

@@ -712,12 +712,13 @@ mongoc_stream_tls_openssl_new (mongoc_stream_t *base_stream,
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
    if (!opt->allow_invalid_hostname) {
       struct in_addr addr;
+      struct in6_addr addr6;
       X509_VERIFY_PARAM *param = X509_VERIFY_PARAM_new ();
 
       X509_VERIFY_PARAM_set_hostflags (param,
                                        X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
       if (inet_pton (AF_INET, host, &addr) ||
-          inet_pton (AF_INET6, host, &addr)) {
+          inet_pton (AF_INET6, host, &addr6)) {
          X509_VERIFY_PARAM_set1_ip_asc (param, host);
       } else {
          X509_VERIFY_PARAM_set1_host (param, host, 0);

Sources/CLibMongoC/mongoc/mongoc-topology-background-monitoring.c

@@ -48,6 +48,12 @@ static BSON_THREAD_FUN (srv_polling_run, topology_void)
       }
 
       /* This will check if a scan is due. */
+      if (!mongoc_topology_should_rescan_srv (topology)) {
+         TRACE ("%s\n", "topology ineligible for SRV polling, stopping");
+         bson_mutex_unlock (&topology->mutex);
+         break;
+      }
+
       mongoc_topology_rescan_srv (topology);
 
       /* Unlock and sleep until next scan is due, or until shutdown signalled.
@@ -142,7 +148,8 @@ _mongoc_topology_background_monitoring_start (mongoc_topology_t *topology)
    /* Reconcile to create the first server monitors. */
    _mongoc_topology_background_monitoring_reconcile (topology);
    /* Start SRV polling thread. */
-   if (mongoc_uri_get_service (topology->uri)) {
+   if (mongoc_topology_should_rescan_srv (topology)) {
+      topology->is_srv_polling = true;
       COMMON_PREFIX (thread_create)
       (&topology->srv_polling_thread, srv_polling_run, topology);
    }
@@ -270,7 +277,6 @@ _mongoc_topology_background_monitoring_stop (mongoc_topology_t *topology)
 {
    mongoc_server_monitor_t *server_monitor;
    int i;
-   bool is_srv_polling;
 
    BSON_ASSERT (!topology->single_threaded);
 
@@ -281,9 +287,8 @@ _mongoc_topology_background_monitoring_stop (mongoc_topology_t *topology)
    topology->scanner_state = MONGOC_TOPOLOGY_SCANNER_SHUTTING_DOWN;
    TRACE ("%s", "background monitoring stopping");
 
-   is_srv_polling = NULL != mongoc_uri_get_service (topology->uri);
    /* Signal SRV polling to shut down (if it is started). */
-   if (is_srv_polling) {
+   if (topology->is_srv_polling) {
       mongoc_cond_signal (&topology->srv_polling_cond);
    }
 
@@ -320,7 +325,7 @@ _mongoc_topology_background_monitoring_stop (mongoc_topology_t *topology)
    }
 
    /* Wait for SRV polling thread. */
-   if (is_srv_polling) {
+   if (topology->is_srv_polling) {
       COMMON_PREFIX (thread_join) (topology->srv_polling_thread);
    }