/*
- * Copyright (c) 2008, 2009, 2010, 2012 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2012, 2013, 2014 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 <sys/types.h>
#include <unistd.h>
#include "fatal-signal.h"
-#include "leak-checker.h"
#include "poll-loop.h"
#include "socket-util.h"
-#include "stress.h"
#include "util.h"
#include "stream-provider.h"
#include "stream.h"
return check_connection_completion(s->fd);
}
-STRESS_OPTION(
- stream_flaky_recv, "simulate failure of fd stream recvs",
- 100, 0, -1, 0);
-
static ssize_t
fd_recv(struct stream *stream, void *buffer, size_t n)
{
struct stream_fd *s = stream_fd_cast(stream);
ssize_t retval;
- if (STRESS(stream_flaky_recv)) {
- return -EIO;
- }
-
retval = read(s->fd, buffer, n);
return retval >= 0 ? retval : -errno;
}
-STRESS_OPTION(
- stream_flaky_send, "simulate failure of fd stream sends",
- 100, 0, -1, 0);
-
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;
- if (STRESS(stream_flaky_send)) {
- return -EIO;
- }
-
retval = write(s->fd, buffer, n);
return (retval > 0 ? retval
: retval == 0 ? -EAGAIN
break;
default:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
}
{
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 **);
int (*set_dscp_cb)(int fd, uint8_t dscp);
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),
int (*set_dscp_cb)(int fd, uint8_t dscp),
char *unlink_path, struct pstream **pstreamp)
{
if (new_fd < 0) {
retval = errno;
if (retval != EAGAIN) {
- VLOG_DBG_RL(&rl, "accept: %s", strerror(retval));
+ VLOG_DBG_RL(&rl, "accept: %s", ovs_strerror(retval));
}
return retval;
}
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
return 0;
}
-static struct pstream_class fd_pstream_class = {
+static const struct pstream_class fd_pstream_class = {
"pstream",
false,
NULL,