projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INSTALL: Recommend installing kernel modules with "make modules_install".
[openvswitch]
/
lib
/
stream-unix.c
diff --git
a/lib/stream-unix.c
b/lib/stream-unix.c
index d2e8e82382ab2b3bd6bcb8cd929a5d511688868f..689dcf1cfaaeba79abf825b405f71927eb21be24 100644
(file)
--- a/
lib/stream-unix.c
+++ b/
lib/stream-unix.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira
Networks
.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira
, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-40,12
+40,13
@@
VLOG_DEFINE_THIS_MODULE(stream_unix);
/* Active UNIX socket. */
static int
/* Active UNIX socket. */
static int
-unix_open(const char *name, char *suffix, struct stream **streamp)
+unix_open(const char *name, char *suffix, struct stream **streamp,
+ uint8_t dscp OVS_UNUSED)
{
const char *connect_path = suffix;
int fd;
{
const char *connect_path = suffix;
int fd;
- fd = make_unix_socket(SOCK_STREAM, true,
false,
NULL, connect_path);
+ fd = make_unix_socket(SOCK_STREAM, true, NULL, connect_path);
if (fd < 0) {
VLOG_ERR("%s: connection failed (%s)", connect_path, strerror(-fd));
return -fd;
if (fd < 0) {
VLOG_ERR("%s: connection failed (%s)", connect_path, strerror(-fd));
return -fd;
@@
-56,6
+57,7
@@
unix_open(const char *name, char *suffix, struct stream **streamp)
const struct stream_class unix_stream_class = {
"unix", /* name */
const struct stream_class unix_stream_class = {
"unix", /* name */
+ false, /* needs_probes */
unix_open, /* open */
NULL, /* close */
NULL, /* connect */
unix_open, /* open */
NULL, /* close */
NULL, /* connect */
@@
-73,11
+75,11
@@
static int punix_accept(int fd, const struct sockaddr *sa, size_t sa_len,
static int
punix_open(const char *name OVS_UNUSED, char *suffix,
static int
punix_open(const char *name OVS_UNUSED, char *suffix,
- struct pstream **pstreamp)
+ struct pstream **pstreamp
, uint8_t dscp OVS_UNUSED
)
{
int fd, error;
{
int fd, error;
- fd = make_unix_socket(SOCK_STREAM, true,
true,
suffix, NULL);
+ fd = make_unix_socket(SOCK_STREAM, true, suffix, NULL);
if (fd < 0) {
VLOG_ERR("%s: binding failed: %s", suffix, strerror(errno));
return errno;
if (fd < 0) {
VLOG_ERR("%s: binding failed: %s", suffix, strerror(errno));
return errno;
@@
-112,6
+114,7
@@
punix_accept(int fd, const struct sockaddr *sa, size_t sa_len,
const struct pstream_class punix_pstream_class = {
"punix",
const struct pstream_class punix_pstream_class = {
"punix",
+ false,
punix_open,
NULL,
NULL,
punix_open,
NULL,
NULL,