projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timeval: Fix occasional backtrace() related deadlock.
[openvswitch]
/
lib
/
stream-tcp.c
diff --git
a/lib/stream-tcp.c
b/lib/stream-tcp.c
index dd55845fc6f751cf91b7a8cd89a20070fcf03a49..05601e19d7963434ef1e279c04cbd15afdd7cd81 100644
(file)
--- a/
lib/stream-tcp.c
+++ b/
lib/stream-tcp.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010
Nicira Networks
.
+ * Copyright (c) 2008, 2009, 2010
, 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.
@@
-23,21
+23,22
@@
#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. */
static int
new_tcp_stream(const char *name, int fd, int connect_status,
/* Active TCP. */
static int
new_tcp_stream(const char *name, int fd, int connect_status,
- const struct sockaddr_in *remote, struct stream **streamp)
+
const struct sockaddr_in *remote, struct stream **streamp)
{
struct sockaddr_in local;
socklen_t local_len = sizeof local;
{
struct sockaddr_in local;
socklen_t local_len = sizeof local;
@@
-57,7
+58,7
@@
new_tcp_stream(const char *name, int fd, int connect_status,
return errno;
}
return errno;
}
- retval = new_fd_stream(name, fd, connect_status,
NULL,
streamp);
+ retval = new_fd_stream(name, fd, connect_status, streamp);
if (!retval) {
struct stream *stream = *streamp;
stream_set_remote_ip(stream, remote->sin_addr.s_addr);
if (!retval) {
struct stream *stream = *streamp;
stream_set_remote_ip(stream, remote->sin_addr.s_addr);
@@
-69,12
+70,12
@@
new_tcp_stream(const char *name, int fd, int connect_status,
}
static int
}
static int
-tcp_open(const char *name, char *suffix, struct stream **streamp)
+tcp_open(const char *name, char *suffix, struct stream **streamp
, uint8_t dscp
)
{
struct sockaddr_in sin;
int fd, error;
{
struct sockaddr_in sin;
int fd, error;
- error = inet_open_active(SOCK_STREAM, suffix, 0, &sin, &fd);
+ error = inet_open_active(SOCK_STREAM, suffix, 0, &sin, &fd
, dscp
);
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 {
@@
-83,8
+84,9
@@
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", /* name */
+ true, /* needs_probes */
tcp_open, /* open */
NULL, /* close */
NULL, /* connect */
tcp_open, /* open */
NULL, /* close */
NULL, /* connect */
@@
-101,16
+103,22
@@
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,
+ uint8_t dscp)
{
{
+ 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, dscp
);
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, set_dscp, NULL,
+ pstreamp);
}
static int
}
static int
@@
-129,11
+137,13
@@
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",
+ true,
ptcp_open,
NULL,
NULL,
ptcp_open,
NULL,
NULL,
- NULL
+ NULL,
+ NULL,
};
};