/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * 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.
#include <config.h>
#include "stream-fd.h"
-#include <assert.h>
#include <errno.h>
#include <poll.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
#include "fatal-signal.h"
-#include "leak-checker.h"
#include "poll-loop.h"
#include "socket-util.h"
#include "util.h"
#include "stream-provider.h"
#include "stream.h"
+#include "openvswitch/vlog.h"
-#include "vlog.h"
-#define THIS_MODULE VLM_stream_fd
+VLOG_DEFINE_THIS_MODULE(stream_fd);
/* Active file descriptor stream. */
{
struct stream stream;
int fd;
- char *unlink_path;
+ int fd_type;
};
-static struct stream_class stream_fd_class;
+static const struct stream_class stream_fd_class;
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(10, 25);
/* 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().
- *
- * When '*streamp' is closed, then 'unlink_path' (if nonnull) will be passed to
- * fatal_signal_unlink_file_now() and then freed with free().
+ * '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,
- char *unlink_path, struct stream **streamp)
+new_fd_stream(const char *name, int fd, int connect_status, int fd_type,
+ struct stream **streamp)
{
struct stream_fd *s;
s = xmalloc(sizeof *s);
stream_init(&s->stream, &stream_fd_class, connect_status, name);
s->fd = fd;
- s->unlink_path = unlink_path;
+ s->fd_type = fd_type;
*streamp = &s->stream;
return 0;
}
fd_close(struct stream *stream)
{
struct stream_fd *s = stream_fd_cast(stream);
- close(s->fd);
- maybe_unlink_and_free(s->unlink_path);
+ closesocket(s->fd);
free(s);
}
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
fd_recv(struct stream *stream, void *buffer, size_t n)
{
struct stream_fd *s = stream_fd_cast(stream);
- ssize_t retval = read(s->fd, buffer, n);
- return retval >= 0 ? retval : -errno;
+ ssize_t retval;
+ int error;
+
+ retval = recv(s->fd, buffer, n, 0);
+ if (retval < 0) {
+ error = sock_errno();
+#ifdef _WIN32
+ if (error == WSAEWOULDBLOCK) {
+ error = EAGAIN;
+ }
+#endif
+ if (error != EAGAIN) {
+ VLOG_DBG_RL(&rl, "recv: %s", sock_strerror(error));
+ }
+ return -error;
+ }
+ return retval;
}
static ssize_t
fd_send(struct stream *stream, const void *buffer, size_t n)
{
struct stream_fd *s = stream_fd_cast(stream);
- ssize_t retval = write(s->fd, buffer, n);
- return (retval > 0 ? retval
- : retval == 0 ? -EAGAIN
- : -errno);
+ ssize_t retval;
+ int error;
+
+ retval = send(s->fd, buffer, n, 0);
+ if (retval < 0) {
+ error = sock_errno();
+#ifdef _WIN32
+ if (error == WSAEWOULDBLOCK) {
+ error = EAGAIN;
+ }
+#endif
+ if (error != EAGAIN) {
+ VLOG_DBG_RL(&rl, "send: %s", sock_strerror(error));
+ }
+ return -error;
+ }
+ return (retval > 0 ? retval : -EAGAIN);
}
static void
break;
default:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
}
-static struct stream_class stream_fd_class = {
+static const struct stream_class stream_fd_class = {
"fd", /* name */
+ false, /* needs_probes */
NULL, /* open */
fd_close, /* close */
fd_connect, /* connect */
{
struct pstream pstream;
int fd;
- int (*accept_cb)(int fd, const struct sockaddr *, size_t sa_len,
+ int (*accept_cb)(int fd, const struct sockaddr_storage *, size_t ss_len,
struct stream **);
char *unlink_path;
};
-static struct pstream_class fd_pstream_class;
+static const struct pstream_class fd_pstream_class;
static struct fd_pstream *
fd_pstream_cast(struct pstream *pstream)
* implementation never fails.) */
int
new_fd_pstream(const char *name, int fd,
- int (*accept_cb)(int fd, const struct sockaddr *sa,
- size_t sa_len, struct stream **streamp),
+ int (*accept_cb)(int fd, const struct sockaddr_storage *ss,
+ size_t ss_len, struct stream **streamp),
char *unlink_path, struct pstream **pstreamp)
{
struct fd_pstream *ps = xmalloc(sizeof *ps);
pfd_close(struct pstream *pstream)
{
struct fd_pstream *ps = fd_pstream_cast(pstream);
- close(ps->fd);
+ closesocket(ps->fd);
maybe_unlink_and_free(ps->unlink_path);
free(ps);
}
new_fd = accept(ps->fd, (struct sockaddr *) &ss, &ss_len);
if (new_fd < 0) {
- int retval = errno;
+ retval = sock_errno();
+#ifdef _WIN32
+ if (retval == WSAEWOULDBLOCK) {
+ retval = EAGAIN;
+ }
+#endif
if (retval != EAGAIN) {
- VLOG_DBG_RL(&rl, "accept: %s", strerror(retval));
+ VLOG_DBG_RL(&rl, "accept: %s", sock_strerror(retval));
}
return retval;
}
retval = set_nonblocking(new_fd);
if (retval) {
- close(new_fd);
+ closesocket(new_fd);
return retval;
}
- return ps->accept_cb(new_fd, (const struct sockaddr *) &ss, ss_len,
- new_streamp);
+ return ps->accept_cb(new_fd, &ss, ss_len, new_streamp);
}
static void
poll_fd_wait(ps->fd, POLLIN);
}
-static struct pstream_class fd_pstream_class = {
+static const struct pstream_class fd_pstream_class = {
"pstream",
+ false,
NULL,
pfd_close,
pfd_accept,
- pfd_wait
+ pfd_wait,
};
\f
/* Helper functions. */
projects / cascardo / ovs.git / blobdiff