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
xenserver/README: Remove bad instructions.
[sliver-openvswitch.git]
/
lib
/
stream-tcp.c
diff --git
a/lib/stream-tcp.c
b/lib/stream-tcp.c
index
dd55845
..
9a7614d
100644
(file)
--- a/
lib/stream-tcp.c
+++ b/
lib/stream-tcp.c
@@
-23,15
+23,16
@@
#include <netinet/tcp.h>
#include <stdlib.h>
#include <string.h>
#include <netinet/tcp.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/socket.h>
#include <unistd.h>
#include "packets.h"
#include "socket-util.h"
#include "util.h"
#include "stream-provider.h"
#include "stream-fd.h"
#include <unistd.h>
#include "packets.h"
#include "socket-util.h"
#include "util.h"
#include "stream-provider.h"
#include "stream-fd.h"
-
#include "vlog.h"
#include "vlog.h"
-#define THIS_MODULE VLM_stream_tcp
+
+VLOG_DEFINE_THIS_MODULE(stream_tcp);
/* Active TCP. */
/* Active TCP. */
@@
-83,7
+84,7
@@
tcp_open(const char *name, char *suffix, struct stream **streamp)
}
}
}
}
-struct stream_class tcp_stream_class = {
+
const
struct stream_class tcp_stream_class = {
"tcp", /* name */
tcp_open, /* open */
NULL, /* close */
"tcp", /* name */
tcp_open, /* open */
NULL, /* close */
@@
-101,16
+102,20
@@
static int ptcp_accept(int fd, const struct sockaddr *sa, size_t sa_len,
struct stream **streamp);
static int
struct stream **streamp);
static int
-ptcp_open(const char *name UNUSED, char *suffix, struct pstream **pstreamp)
+ptcp_open(const char *name
OVS_
UNUSED, char *suffix, struct pstream **pstreamp)
{
{
+ struct sockaddr_in sin;
+ char bound_name[128];
int fd;
int fd;
- fd = inet_open_passive(SOCK_STREAM, suffix, -1,
NULL
);
+ fd = inet_open_passive(SOCK_STREAM, suffix, -1,
&sin
);
if (fd < 0) {
return -fd;
if (fd < 0) {
return -fd;
- } else {
- return new_fd_pstream("ptcp", fd, ptcp_accept, NULL, pstreamp);
}
}
+
+ sprintf(bound_name, "ptcp:%"PRIu16":"IP_FMT,
+ ntohs(sin.sin_port), IP_ARGS(&sin.sin_addr.s_addr));
+ return new_fd_pstream(bound_name, fd, ptcp_accept, NULL, pstreamp);
}
static int
}
static int
@@
-129,7
+134,7
@@
ptcp_accept(int fd, const struct sockaddr *sa, size_t sa_len,
return new_tcp_stream(name, fd, 0, sin, streamp);
}
return new_tcp_stream(name, fd, 0, sin, streamp);
}
-struct pstream_class ptcp_pstream_class = {
+
const
struct pstream_class ptcp_pstream_class = {
"ptcp",
ptcp_open,
NULL,
"ptcp",
ptcp_open,
NULL,