projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Generalize facet_put__() so that it is more useful.
[openvswitch]
/
lib
/
stream-tcp.c
diff --git
a/lib/stream-tcp.c
b/lib/stream-tcp.c
index ecd96865fc286536584dd5d6e41ca49531a29962..d92fe3af502080917d18075352be559c4c399b06 100644
(file)
--- a/
lib/stream-tcp.c
+++ b/
lib/stream-tcp.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.
@@
-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. */
@@
-74,7
+75,7
@@
tcp_open(const char *name, char *suffix, struct stream **streamp)
struct sockaddr_in sin;
int fd, error;
struct sockaddr_in sin;
int fd, error;
- error =
tcp_open_active(
suffix, 0, &sin, &fd);
+ error =
inet_open_active(SOCK_STREAM,
suffix, 0, &sin, &fd);
if (fd >= 0) {
return new_tcp_stream(name, fd, error, &sin, streamp);
} else {
if (fd >= 0) {
return new_tcp_stream(name, fd, error, &sin, streamp);
} else {
@@
-90,6
+91,8
@@
struct stream_class tcp_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
@@
-99,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 =
tcp_open_passive(suffix, 0
);
+ 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