/*
- * 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.
#include "util.h"
#include "stream-provider.h"
#include "stream.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(stream_fd);
}
#endif
if (error != EAGAIN) {
- VLOG_DBG_RL(&rl, "recv: %s", sock_strerror(error));
+ VLOG_DBG_RL(&rl, "send: %s", sock_strerror(error));
}
return -error;
}
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;
};
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;
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,
pfd_close,
pfd_accept,
pfd_wait,
- pfd_set_dscp,
};
\f
/* Helper functions. */