git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
stream-unix.c
diff --git
a/lib/stream-unix.c
b/lib/stream-unix.c
index
40ef012
..
6dee17d
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.
@@
-46,9
+46,9
@@
unix_open(const char *name, char *suffix, struct stream **streamp,
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) {
if (fd < 0) {
- VLOG_
ERR
("%s: connection failed (%s)", connect_path, strerror(-fd));
+ VLOG_
DBG
("%s: connection failed (%s)", connect_path, strerror(-fd));
return -fd;
}
return -fd;
}
@@
-79,7
+79,7
@@
punix_open(const char *name OVS_UNUSED, char *suffix,
{
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;
@@
-92,7
+92,7
@@
punix_open(const char *name OVS_UNUSED, char *suffix,
return error;
}
return error;
}
- return new_fd_pstream(name, fd, punix_accept,
+ return new_fd_pstream(name, fd, punix_accept,
NULL,
xstrdup(suffix), pstreamp);
}
xstrdup(suffix), pstreamp);
}
@@
-118,6
+118,7
@@
const struct pstream_class punix_pstream_class = {
punix_open,
NULL,
NULL,
punix_open,
NULL,
NULL,
- NULL
+ NULL,
+ NULL,
};
};