projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-sflow: Maintain table of ports even when clearing configuration.
[openvswitch]
/
lib
/
stream-unix.c
diff --git
a/lib/stream-unix.c
b/lib/stream-unix.c
index a5dfd55b898d4935960c13d331cf60176ff10fc1..33f566b371edaa4f6e2e4187b50d6a3850713ed8 100644
(file)
--- a/
lib/stream-unix.c
+++ b/
lib/stream-unix.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009
, 2010
Nicira Networks.
*
* 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.
@@
-69,6
+69,8
@@
struct stream_class unix_stream_class = {
NULL, /* connect */
NULL, /* recv */
NULL, /* send */
NULL, /* connect */
NULL, /* recv */
NULL, /* send */
+ NULL, /* run */
+ NULL, /* run_wait */
NULL, /* wait */
};
\f
NULL, /* wait */
};
\f
@@
-78,7
+80,8
@@
static int punix_accept(int fd, const struct sockaddr *sa, size_t sa_len,
struct stream **streamp);
static int
struct stream **streamp);
static int
-punix_open(const char *name UNUSED, char *suffix, struct pstream **pstreamp)
+punix_open(const char *name OVS_UNUSED, char *suffix,
+ struct pstream **pstreamp)
{
int fd, error;
{
int fd, error;
@@
-88,12
+91,6
@@
punix_open(const char *name UNUSED, char *suffix, struct pstream **pstreamp)
return errno;
}
return errno;
}
- error = set_nonblocking(fd);
- if (error) {
- close(fd);
- return error;
- }
-
if (listen(fd, 10) < 0) {
error = errno;
VLOG_ERR("%s: listen: %s", name, strerror(error));
if (listen(fd, 10) < 0) {
error = errno;
VLOG_ERR("%s: listen: %s", name, strerror(error));