projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/netdev-dpdk: increase ring name length for dpdkr ports
[cascardo/ovs.git]
/
lib
/
stream.c
diff --git
a/lib/stream.c
b/lib/stream.c
index
1dfecf0
..
217191c
100644
(file)
--- a/
lib/stream.c
+++ b/
lib/stream.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013
, 2015
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.
@@
-31,11
+31,13
@@
#include "ofpbuf.h"
#include "openflow/nicira-ext.h"
#include "openflow/openflow.h"
#include "ofpbuf.h"
#include "openflow/nicira-ext.h"
#include "openflow/openflow.h"
+#include "ovs-thread.h"
#include "packets.h"
#include "poll-loop.h"
#include "random.h"
#include "packets.h"
#include "poll-loop.h"
#include "random.h"
+#include "socket-util.h"
#include "util.h"
#include "util.h"
-#include "vlog.h"
+#include "
openvswitch/
vlog.h"
VLOG_DEFINE_THIS_MODULE(stream);
VLOG_DEFINE_THIS_MODULE(stream);
@@
-53,6
+55,8
@@
static const struct stream_class *stream_classes[] = {
&tcp_stream_class,
#ifndef _WIN32
&unix_stream_class,
&tcp_stream_class,
#ifndef _WIN32
&unix_stream_class,
+#else
+ &windows_stream_class,
#endif
#ifdef HAVE_OPENSSL
&ssl_stream_class,
#endif
#ifdef HAVE_OPENSSL
&ssl_stream_class,
@@
-63,6
+67,8
@@
static const struct pstream_class *pstream_classes[] = {
&ptcp_pstream_class,
#ifndef _WIN32
&punix_pstream_class,
&ptcp_pstream_class,
#ifndef _WIN32
&punix_pstream_class,
+#else
+ &pwindows_pstream_class,
#endif
#ifdef HAVE_OPENSSL
&pssl_pstream_class,
#endif
#ifdef HAVE_OPENSSL
&pssl_pstream_class,
@@
-586,15
+592,6
@@
pstream_wait(struct pstream *pstream)
(pstream->class->wait)(pstream);
}
(pstream->class->wait)(pstream);
}
-int
-pstream_set_dscp(struct pstream *pstream, uint8_t dscp)
-{
- if (pstream->class->set_dscp) {
- return pstream->class->set_dscp(pstream, dscp);
- }
- return 0;
-}
-
/* Returns the transport port on which 'pstream' is listening, or 0 if the
* concept doesn't apply. */
ovs_be16
/* Returns the transport port on which 'pstream' is listening, or 0 if the
* concept doesn't apply. */
ovs_be16
@@
-679,13
+676,13
@@
stream_open_with_default_port(const char *name_,
if ((!strncmp(name_, "tcp:", 4) || !strncmp(name_, "ssl:", 4))
&& count_fields(name_) < 3) {
if ((!strncmp(name_, "tcp:", 4) || !strncmp(name_, "ssl:", 4))
&& count_fields(name_) < 3) {
- if (default_port == OFP_
OLD_
PORT) {
- VLOG_WARN_ONCE("The default OpenFlow port number
will change
"
- "from %d to %d
in a future release
",
+ if (default_port == OFP_PORT) {
+ VLOG_WARN_ONCE("The default OpenFlow port number
has changed
"
+ "from %d to %d",
OFP_OLD_PORT, OFP_PORT);
OFP_OLD_PORT, OFP_PORT);
- } else if (default_port == OVSDB_
OLD_
PORT) {
- VLOG_WARN_ONCE("The default OVSDB port number
will change
"
- "from %d to %d
in a future release
",
+ } else if (default_port == OVSDB_PORT) {
+ VLOG_WARN_ONCE("The default OVSDB port number
has changed
"
+ "from %d to %d",
OVSDB_OLD_PORT, OVSDB_PORT);
}
name = xasprintf("%s:%d", name_, default_port);
OVSDB_OLD_PORT, OVSDB_PORT);
}
name = xasprintf("%s:%d", name_, default_port);