projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-util: New function for parsing key-value pairs.
[openvswitch]
/
lib
/
stream-unix.c
diff --git
a/lib/stream-unix.c
b/lib/stream-unix.c
index a5dfd55b898d4935960c13d331cf60176ff10fc1..14680ac59c22560f6f0c89da832b172702ce5b5d 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, 2011
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.
@@
-21,6
+21,7
@@
#include <inttypes.h>
#include <netdb.h>
#include <poll.h>
#include <inttypes.h>
#include <netdb.h>
#include <poll.h>
+#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/un.h>
#include <stdlib.h>
@@
-32,9
+33,9
@@
#include "util.h"
#include "stream-provider.h"
#include "stream-fd.h"
#include "util.h"
#include "stream-provider.h"
#include "stream-fd.h"
-
#include "vlog.h"
#include "vlog.h"
-#define THIS_MODULE VLM_stream_unix
+
+VLOG_DEFINE_THIS_MODULE(stream_unix);
/* Active UNIX socket. */
/* Active UNIX socket. */
@@
-69,6
+70,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
+81,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
+92,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));
@@
-101,7
+99,7
@@
punix_open(const char *name UNUSED, char *suffix, struct pstream **pstreamp)
return error;
}
return error;
}
- return new_fd_pstream(
"punix"
, fd, punix_accept,
+ return new_fd_pstream(
name
, fd, punix_accept,
xstrdup(suffix), pstreamp);
}
xstrdup(suffix), pstreamp);
}