CDRIVER-518 fix unix domain socket support

+ some fixes for the relevant documentation

Author: hanumantmk

doc/advanced-connections.page

@@ -140,7 +140,7 @@ main (int   argc,
       The socket path <em>MUST</em> be suffixed with <code>.sock</code>.
     </p>
 
-    <code mime="text/x-csrc">"mongodb:///tmp/mongodb.sock"</code>
+    <code mime="text/x-csrc">"mongodb:///tmp/mongodb-27017.sock"</code>
 
     <note style="warning">
       <p>Connecting directly to a UNIX domain socket is not a common practice.</p>

doc/mongoc_uri_new.page

@@ -45,7 +45,7 @@ mongoc_uri_new (const char *uri_string)
     <p><code mime="text/x-csrc">"mongodb://kerberosuser%[email protected]/?authMechanism=GSSAPI"</code></p>
     <p><code mime="text/x-csrc">"mongodb://[::1]:27017/"</code></p>
     <p><code mime="text/x-csrc">"mongodb://10.0.0.1:27017,10.0.0.1:27018,[::1]:27019/?ssl=true"</code></p>
-    <p><code mime="text/x-csrc">"mongodb:///tmp/mongodb.sock"</code></p>
+    <p><code mime="text/x-csrc">"mongodb:///tmp/mongodb-27017.sock"</code></p>
     <p><code mime="text/x-csrc">"mongodb://localhost,[::1]/mydb?authSource=mydb"</code></p>
   </section>
 

src/mongoc/mongoc-client.c

@@ -220,7 +220,7 @@ mongoc_client_connect_unix (const mongoc_uri_t       *uri,
    memset (&saddr, 0, sizeof saddr);
    saddr.sun_family = AF_UNIX;
    bson_snprintf (saddr.sun_path, sizeof saddr.sun_path - 1,
-                  "%s", host->host_and_port);
+                  "%s", host->host);
 
    sock = mongoc_socket_new (AF_UNIX, SOCK_STREAM, 0);
 

tests/test-mongoc-socket.c

@@ -138,9 +138,6 @@ socket_test_client (void *data_)
    assert (r == 5);
    assert (strcmp (buf, "pong") == 0);
 
-   closed = mongoc_stream_check_closed (stream);
-   assert (closed == false);
-
    mongoc_mutex_lock(&data->cond_mutex);
    while (! data->closed_socket) {
       mongoc_cond_wait(&data->cond, &data->cond_mutex);

tests/test-mongoc-uri.c

@@ -37,7 +37,7 @@ test_mongoc_uri_new (void)
    ASSERT_CMPSTR (hosts->host_and_port, "[::1]:27888");
    mongoc_uri_destroy (uri);
 
-   uri = mongoc_uri_new("mongodb:///tmp/mongodb.sock/?");
+   uri = mongoc_uri_new("mongodb:///tmp/mongodb-27017.sock/?");
    ASSERT(uri);
    mongoc_uri_destroy(uri);
 
@@ -115,14 +115,14 @@ test_mongoc_uri_new (void)
    ASSERT(!bson_iter_next(&iter));
    mongoc_uri_destroy(uri);
 
-   uri = mongoc_uri_new("mongodb:///tmp/mongodb.sock/?ssl=false");
+   uri = mongoc_uri_new("mongodb:///tmp/mongodb-27017.sock/?ssl=false");
    ASSERT(uri);
-   ASSERT_CMPSTR(mongoc_uri_get_hosts(uri)->host, "/tmp/mongodb.sock");
+   ASSERT_CMPSTR(mongoc_uri_get_hosts(uri)->host, "/tmp/mongodb-27017.sock");
    mongoc_uri_destroy(uri);
 
-   uri = mongoc_uri_new("mongodb:///tmp/mongodb.sock,localhost:27017/?ssl=false");
+   uri = mongoc_uri_new("mongodb:///tmp/mongodb-27017.sock,localhost:27017/?ssl=false");
    ASSERT(uri);
-   ASSERT_CMPSTR(mongoc_uri_get_hosts(uri)->host, "/tmp/mongodb.sock");
+   ASSERT_CMPSTR(mongoc_uri_get_hosts(uri)->host, "/tmp/mongodb-27017.sock");
    ASSERT_CMPSTR(mongoc_uri_get_hosts(uri)->next->host_and_port, "localhost:27017");
    ASSERT(!mongoc_uri_get_hosts(uri)->next->next);
    mongoc_uri_destroy(uri);
@@ -134,10 +134,10 @@ test_mongoc_uri_new (void)
    ASSERT_CMPSTR(mongoc_uri_get_hosts(uri)->next->host_and_port, "host2:30000");
    mongoc_uri_destroy(uri);
 
-   uri = mongoc_uri_new("mongodb://localhost:27017,/tmp/mongodb.sock/?ssl=false");
+   uri = mongoc_uri_new("mongodb://localhost:27017,/tmp/mongodb-27017.sock/?ssl=false");
    ASSERT(uri);
    ASSERT_CMPSTR(mongoc_uri_get_hosts(uri)->host_and_port, "localhost:27017");
-   ASSERT_CMPSTR(mongoc_uri_get_hosts(uri)->next->host, "/tmp/mongodb.sock");
+   ASSERT_CMPSTR(mongoc_uri_get_hosts(uri)->next->host, "/tmp/mongodb-27017.sock");
    ASSERT(!mongoc_uri_get_hosts(uri)->next->next);
    mongoc_uri_destroy(uri);