dpif-netdev: Fix typo in comment.

[cascardo/ovs.git] / lib / stream-fd.c

diff --git a/lib/stream-fd.c b/lib/stream-fd.c
index ead8c3e..31bfc6e 100644 (file)
--- a/lib/stream-fd.c
+++ b/lib/stream-fd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2012, 2013, 2014, 2015 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 #include "util.h"
 #include "stream-provider.h"
 #include "stream.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(stream_fd);
 
@@ -39,6 +39,7 @@ struct stream_fd
 {
     struct stream stream;
     int fd;
+    int fd_type;
 };
 
 static const struct stream_class stream_fd_class;
@@ -49,12 +50,13 @@ static void maybe_unlink_and_free(char *path);
 
 /* Creates a new stream named 'name' that will send and receive data on 'fd'
  * and stores a pointer to the stream in '*streamp'.  Initial connection status
- * 'connect_status' is interpreted as described for stream_init().
+ * 'connect_status' is interpreted as described for stream_init(). 'fd_type'
+ * tells whether the socket is TCP or Unix domain socket.
  *
  * Returns 0 if successful, otherwise a positive errno value.  (The current
  * implementation never fails.) */
 int
-new_fd_stream(const char *name, int fd, int connect_status,
+new_fd_stream(const char *name, int fd, int connect_status, int fd_type,
               struct stream **streamp)
 {
     struct stream_fd *s;
@@ -62,6 +64,7 @@ new_fd_stream(const char *name, int fd, int connect_status,
     s = xmalloc(sizeof *s);
     stream_init(&s->stream, &stream_fd_class, connect_status, name);
     s->fd = fd;
+    s->fd_type = fd_type;
     *streamp = &s->stream;
     return 0;
 }
@@ -85,7 +88,11 @@ static int
 fd_connect(struct stream *stream)
 {
     struct stream_fd *s = stream_fd_cast(stream);
-    return check_connection_completion(s->fd);
+    int retval = check_connection_completion(s->fd);
+    if (retval == 0 && s->fd_type == AF_INET) {
+        setsockopt_tcp_nodelay(s->fd);
+    }
+    return retval;
 }
 
 static ssize_t
@@ -127,7 +134,7 @@ fd_send(struct stream *stream, const void *buffer, size_t n)
         }
 #endif
         if (error != EAGAIN) {
-            VLOG_DBG_RL(&rl, "recv: %s", sock_strerror(error));
+            VLOG_DBG_RL(&rl, "send: %s", sock_strerror(error));
         }
         return -error;
     }
@@ -174,7 +181,6 @@ struct fd_pstream
     int fd;
     int (*accept_cb)(int fd, const struct sockaddr_storage *, size_t ss_len,
                      struct stream **);
-    int (*set_dscp_cb)(int fd, uint8_t dscp);
     char *unlink_path;
 };
 
@@ -205,14 +211,12 @@ int
 new_fd_pstream(const char *name, int fd,
                int (*accept_cb)(int fd, const struct sockaddr_storage *ss,
                                 size_t ss_len, struct stream **streamp),
-               int (*set_dscp_cb)(int fd, uint8_t dscp),
                char *unlink_path, struct pstream **pstreamp)
 {
     struct fd_pstream *ps = xmalloc(sizeof *ps);
     pstream_init(&ps->pstream, &fd_pstream_class, name);
     ps->fd = fd;
     ps->accept_cb = accept_cb;
-    ps->set_dscp_cb = set_dscp_cb;
     ps->unlink_path = unlink_path;
     *pstreamp = &ps->pstream;
     return 0;
@@ -266,16 +270,6 @@ pfd_wait(struct pstream *pstream)
     poll_fd_wait(ps->fd, POLLIN);
 }
 
-static int
-pfd_set_dscp(struct pstream *pstream, uint8_t dscp)
-{
-    struct fd_pstream *ps = fd_pstream_cast(pstream);
-    if (ps->set_dscp_cb) {
-        return ps->set_dscp_cb(ps->fd, dscp);
-    }
-    return 0;
-}
-
 static const struct pstream_class fd_pstream_class = {
     "pstream",
     false,
@@ -283,7 +277,6 @@ static const struct pstream_class fd_pstream_class = {
     pfd_close,
     pfd_accept,
     pfd_wait,
-    pfd_set_dscp,
 };
 \f
 /* Helper functions. */