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
d7dde8f
..
6dee17d
100644
(file)
--- a/
lib/stream-unix.c
+++ b/
lib/stream-unix.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011
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.
@@
-39,32
+39,25
@@
VLOG_DEFINE_THIS_MODULE(stream_unix);
/* Active UNIX socket. */
/* Active UNIX socket. */
-/* Number of unix sockets created so far, to ensure binding path uniqueness. */
-static int n_unix_sockets;
-
static int
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;
{
const char *connect_path = suffix;
- char *bind_path;
int fd;
int fd;
- bind_path = xasprintf("/tmp/stream-unix.%ld.%d",
- (long int) getpid(), n_unix_sockets++);
- fd = make_unix_socket(SOCK_STREAM, true, false, bind_path, connect_path);
+ fd = make_unix_socket(SOCK_STREAM, true, NULL, connect_path);
if (fd < 0) {
if (fd < 0) {
- VLOG_ERR("%s: connection to %s failed: %s",
- bind_path, connect_path, strerror(-fd));
- free(bind_path);
+ VLOG_DBG("%s: connection failed (%s)", connect_path, strerror(-fd));
return -fd;
}
return -fd;
}
- return new_fd_stream(name, fd, check_connection_completion(fd),
- bind_path, streamp);
+ return new_fd_stream(name, fd, check_connection_completion(fd), 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 */
@@
-82,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;
@@
-99,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);
}
@@
-116,14
+109,16
@@
punix_accept(int fd, const struct sockaddr *sa, size_t sa_len,
} else {
strcpy(name, "unix");
}
} else {
strcpy(name, "unix");
}
- return new_fd_stream(name, fd, 0,
NULL,
streamp);
+ return new_fd_stream(name, fd, 0, streamp);
}
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,
- NULL
+ NULL,
+ NULL,
};
};