Merge pull request #267 from bjori/master

CDRIVER-843 & friends

Author: ajdavis

CMakeLists.txt

@@ -126,6 +126,7 @@ set (HEADERS
    ${SOURCE_DIR}/src/mongoc/mongoc-opcode.h
    ${SOURCE_DIR}/src/mongoc/mongoc-read-prefs.h
    ${SOURCE_DIR}/src/mongoc/mongoc-socket.h
+   ${SOURCE_DIR}/src/mongoc/mongoc-socket-private.h
    ${SOURCE_DIR}/src/mongoc/mongoc-stream.h
    ${SOURCE_DIR}/src/mongoc/mongoc-stream-buffered.h
    ${SOURCE_DIR}/src/mongoc/mongoc-stream-file.h

src/mongoc/Makefile.am

@@ -67,6 +67,7 @@ INST_H_FILES = \
 	src/mongoc/mongoc-sasl-private.h \
 	src/mongoc/mongoc-scram-private.h \
 	src/mongoc/mongoc-socket.h \
+	src/mongoc/mongoc-socket-private.h \
 	src/mongoc/mongoc-ssl-private.h \
 	src/mongoc/mongoc-stream-buffered.h \
 	src/mongoc/mongoc-stream-file.h \

src/mongoc/mongoc-buffer.c

@@ -16,7 +16,6 @@
 
 
 #include <bson.h>
-#include <errno.h>
 #include <stdarg.h>
 
 #include "mongoc-error.h"

src/mongoc/mongoc-cluster.c

@@ -17,7 +17,6 @@
 
 #include "mongoc-config.h"
 
-#include <errno.h>
 #ifdef MONGOC_ENABLE_SASL
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
@@ -954,9 +953,9 @@ _mongoc_cluster_run_command (mongoc_cluster_t      *cluster,
    _mongoc_rpc_swab_to_le(&rpc);
 
    DUMP_IOVEC (((mongoc_iovec_t *)ar.data), ((mongoc_iovec_t *)ar.data), ar.len);
-   if (!mongoc_stream_writev(node->stream, ar.data, ar.len,
-                             cluster->sockettimeoutms)) {
-      GOTO(failure);
+   if (!_mongoc_stream_writev_full (node->stream, ar.data, ar.len,
+                                    cluster->sockettimeoutms, error)) {
+      GOTO (failure);
    }
 
    if (!_mongoc_buffer_append_from_stream(&buffer, node->stream, 4,
@@ -2892,21 +2891,11 @@ _mongoc_cluster_sendv (mongoc_cluster_t             *cluster,
 
    iov = cluster->iov.data;
    iovcnt = cluster->iov.len;
-   errno = 0;
 
    BSON_ASSERT (cluster->iov.len);
 
-   if (!mongoc_stream_writev (node->stream, iov, iovcnt,
-                              cluster->sockettimeoutms)) {
-      char buf[128];
-      char * errstr;
-      errstr = bson_strerror_r(errno, buf, sizeof buf);
-
-      bson_set_error (error,
-                      MONGOC_ERROR_STREAM,
-                      MONGOC_ERROR_STREAM_SOCKET,
-                      "Failure during socket delivery: %s",
-                      errstr);
+   if (!_mongoc_stream_writev_full (node->stream, iov, iovcnt,
+                                    cluster->sockettimeoutms, error)) {
       _mongoc_cluster_disconnect_node (cluster, node);
       RETURN (0);
    }
@@ -3037,17 +3026,8 @@ _mongoc_cluster_try_sendv (mongoc_cluster_t             *cluster,
 
    DUMP_IOVEC (iov, iov, iovcnt);
 
-   if (!mongoc_stream_writev (node->stream, iov, iovcnt,
-                              cluster->sockettimeoutms)) {
-      char buf[128];
-      char * errstr;
-      errstr = bson_strerror_r(errno, buf, sizeof buf);
-
-      bson_set_error (error,
-                      MONGOC_ERROR_STREAM,
-                      MONGOC_ERROR_STREAM_SOCKET,
-                      "Failure during socket delivery: %s",
-                      errstr);
+   if (!_mongoc_stream_writev_full (node->stream, iov, iovcnt,
+                                    cluster->sockettimeoutms, error)) {
       _mongoc_cluster_disconnect_node (cluster, node);
       RETURN (0);
    }

src/mongoc/mongoc-iovec.h

@@ -21,11 +21,12 @@
 
 #include <bson.h>
 
-#ifndef _WIN32
+#ifdef _WIN32
+# include <stddef.h>
+#else
 # include <sys/uio.h>
 #endif
 
-
 BSON_BEGIN_DECLS
 
 
@@ -35,6 +36,11 @@ typedef struct
    u_long  iov_len;
    char   *iov_base;
 } mongoc_iovec_t;
+
+BSON_STATIC_ASSERT(sizeof(mongoc_iovec_t) == sizeof(WSABUF));
+BSON_STATIC_ASSERT(offsetof(mongoc_iovec_t, iov_base) == offsetof(WSABUF, buf));
+BSON_STATIC_ASSERT(offsetof(mongoc_iovec_t, iov_len) == offsetof(WSABUF, len));
+
 #else
 typedef struct iovec mongoc_iovec_t;
 #endif

src/mongoc/mongoc-socket-private.h

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MONGOC_SOCKET_PRIVATE_H
+#define MONGOC_SOCKET_PRIVATE_H
+
+#if !defined (MONGOC_INSIDE) && !defined (MONGOC_COMPILATION)
+# error "Only <mongoc.h> can be included directly."
+#endif
+
+#include "mongoc-socket.h"
+
+BSON_BEGIN_DECLS
+
+struct _mongoc_socket_t
+{
+#ifdef _WIN32
+   SOCKET sd;
+#else
+   int sd;
+#endif
+   int errno_;
+   int domain;
+};
+
+
+BSON_END_DECLS
+
+#endif /* MONGOC_SOCKET_PRIVATE_H */