/*
- * 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.
#include "stream-provider.h"
#include <errno.h>
#include <inttypes.h>
+#include <sys/types.h>
#include <netinet/in.h>
#include <poll.h>
#include <stdlib.h>
#include <string.h>
#include "coverage.h"
-#include "dynamic-string.h"
#include "fatal-signal.h"
#include "flow.h"
-#include "ofp-print.h"
-#include "ofpbuf.h"
+#include "jsonrpc.h"
#include "openflow/nicira-ext.h"
#include "openflow/openflow.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/ofp-print.h"
+#include "openvswitch/ofpbuf.h"
+#include "openvswitch/vlog.h"
+#include "ovs-thread.h"
#include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
#include "random.h"
+#include "socket-util.h"
#include "util.h"
-#include "vlog.h"
VLOG_DEFINE_THIS_MODULE(stream);
static const struct stream_class *stream_classes[] = {
&tcp_stream_class,
+#ifndef _WIN32
&unix_stream_class,
+#else
+ &windows_stream_class,
+#endif
#ifdef HAVE_OPENSSL
&ssl_stream_class,
#endif
static const struct pstream_class *pstream_classes[] = {
&ptcp_pstream_class,
+#ifndef _WIN32
&punix_pstream_class,
+#else
+ &pwindows_pstream_class,
+#endif
#ifdef HAVE_OPENSSL
&pssl_pstream_class,
#endif
printf("\n");
if (active) {
printf("Active %s connection methods:\n", name);
- printf(" tcp:IP:PORT "
- "PORT at remote IP\n");
+ printf(" tcp:HOST:PORT "
+ "PORT at remote HOST\n");
#ifdef HAVE_OPENSSL
- printf(" ssl:IP:PORT "
- "SSL PORT at remote IP\n");
+ printf(" ssl:HOST:PORT "
+ "SSL PORT at remote HOST\n");
#endif
printf(" unix:FILE "
"Unix domain socket named FILE\n");
printf(" --bootstrap-ca-cert=FILE file with peer CA certificate "
"to read or create\n");
}
+ printf("SSL options:\n"
+ " --ssl-protocols=PROTOS list of SSL protocols to enable\n"
+ " --ssl-ciphers=CIPHERS list of SSL ciphers to enable\n");
#endif
}
}
/* Blocks until a previously started stream connection attempt succeeds or
- * fails. 'error' should be the value returned by stream_open() and 'streamp'
- * should point to the stream pointer set by stream_open(). Returns 0 if
- * successful, otherwise a positive errno value other than EAGAIN or
- * EINPROGRESS. If successful, leaves '*streamp' untouched; on error, closes
- * '*streamp' and sets '*streamp' to null.
+ * fails, but no more than 'timeout' milliseconds. 'error' should be the
+ * value returned by stream_open() and 'streamp' should point to the stream
+ * pointer set by stream_open(). Returns 0 if successful, otherwise a
+ * positive errno value other than EAGAIN or EINPROGRESS. If successful,
+ * leaves '*streamp' untouched; on error, closes '*streamp' and sets
+ * '*streamp' to null. Negative value of 'timeout' means infinite waiting.
*
* Typical usage:
- * error = stream_open_block(stream_open("tcp:1.2.3.4:5", &stream), &stream);
+ * error = stream_open_block(stream_open("tcp:1.2.3.4:5", &stream), -1,
+ * &stream);
*/
int
-stream_open_block(int error, struct stream **streamp)
+stream_open_block(int error, long long int timeout, struct stream **streamp)
{
struct stream *stream = *streamp;
fatal_signal_run();
if (!error) {
+ long long int deadline = (timeout >= 0
+ ? time_msec() + timeout
+ : LLONG_MAX);
while ((error = stream_connect(stream)) == EAGAIN) {
+ if (deadline != LLONG_MAX && time_msec() > deadline) {
+ error = ETIMEDOUT;
+ break;
+ }
stream_run(stream);
stream_run_wait(stream);
stream_connect_wait(stream);
+ if (deadline != LLONG_MAX) {
+ poll_timer_wait_until(deadline);
+ }
poll_block();
}
ovs_assert(error != EINPROGRESS);
{
if (stream != NULL) {
char *name = stream->name;
+ char *peer_id = stream->peer_id;
(stream->class->close)(stream);
free(name);
+ free(peer_id);
}
}
return stream ? stream->name : "(null)";
}
-/* Returns the IP address of the peer, or 0 if the peer is not connected over
- * an IP-based protocol or if its IP address is not yet known. */
-ovs_be32
-stream_get_remote_ip(const struct stream *stream)
-{
- return stream->remote_ip;
-}
-
-/* Returns the transport port of the peer, or 0 if the connection does not
- * contain a port or if the port is not yet known. */
-ovs_be16
-stream_get_remote_port(const struct stream *stream)
-{
- return stream->remote_port;
-}
-
-/* Returns the IP address used to connect to the peer, or 0 if the connection
- * is not an IP-based protocol or if its IP address is not yet known. */
-ovs_be32
-stream_get_local_ip(const struct stream *stream)
-{
- return stream->local_ip;
-}
-
-/* Returns the transport port used to connect to the peer, or 0 if the
- * connection does not contain a port or if the port is not yet known. */
-ovs_be16
-stream_get_local_port(const struct stream *stream)
-{
- return stream->local_port;
-}
-
static void
scs_connecting(struct stream *stream)
{
return stream->error;
default:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
} while (stream->state != last_state);
stream_wait(stream, STREAM_SEND);
}
+void
+stream_set_peer_id(struct stream *stream, const char *peer_id)
+{
+ free(stream->peer_id);
+ stream->peer_id = xstrdup(peer_id);
+}
+
+const char *
+stream_get_peer_id(const struct stream *stream)
+{
+ return stream->peer_id;
+}
+
/* Given 'name', a pstream name in the form "TYPE:ARGS", stores the class
* named "TYPE" into '*classp' and returns 0. Returns EAFNOSUPPORT and stores
* a null pointer into '*classp' if 'name' is in the wrong form or if no such
(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
* After calling this function, stream_close() must be used to destroy
* 'stream', otherwise resources will be leaked.
*
- * The caller retains ownership of 'name'. */
+ * Takes ownership of 'name'. */
void
stream_init(struct stream *stream, const struct stream_class *class,
- int connect_status, const char *name)
+ int connect_status, char *name)
{
memset(stream, 0, sizeof *stream);
stream->class = class;
: !connect_status ? SCS_CONNECTED
: SCS_DISCONNECTED);
stream->error = connect_status;
- stream->name = xstrdup(name);
+ stream->name = name;
ovs_assert(stream->state != SCS_CONNECTING || class->connect);
}
-void
-stream_set_remote_ip(struct stream *stream, ovs_be32 ip)
-{
- stream->remote_ip = ip;
-}
-
-void
-stream_set_remote_port(struct stream *stream, ovs_be16 port)
-{
- stream->remote_port = port;
-}
-
-void
-stream_set_local_ip(struct stream *stream, ovs_be32 ip)
-{
- stream->local_ip = ip;
-}
-
-void
-stream_set_local_port(struct stream *stream, ovs_be16 port)
-{
- stream->local_port = port;
-}
-
+/* Takes ownership of 'name'. */
void
pstream_init(struct pstream *pstream, const struct pstream_class *class,
- const char *name)
+ char *name)
{
memset(pstream, 0, sizeof *pstream);
pstream->class = class;
- pstream->name = xstrdup(name);
+ pstream->name = name;
}
void
return n;
}
-/* Like stream_open(), but for tcp streams the port defaults to
- * 'default_tcp_port' if no port number is given and for SSL streams the port
- * defaults to 'default_ssl_port' if no port number is given. */
+/* Like stream_open(), but the port defaults to 'default_port' if no port
+ * number is given. */
int
-stream_open_with_default_ports(const char *name_,
- uint16_t default_tcp_port,
- uint16_t default_ssl_port,
- struct stream **streamp,
- uint8_t dscp)
+stream_open_with_default_port(const char *name_,
+ uint16_t default_port,
+ struct stream **streamp,
+ uint8_t dscp)
{
char *name;
int error;
- if (!strncmp(name_, "tcp:", 4) && count_fields(name_) < 3) {
- name = xasprintf("%s:%d", name_, default_tcp_port);
- } else if (!strncmp(name_, "ssl:", 4) && count_fields(name_) < 3) {
- name = xasprintf("%s:%d", name_, default_ssl_port);
+ if ((!strncmp(name_, "tcp:", 4) || !strncmp(name_, "ssl:", 4))
+ && count_fields(name_) < 3) {
+ if (default_port == OFP_PORT) {
+ VLOG_WARN_ONCE("The default OpenFlow port number has changed "
+ "from %d to %d",
+ OFP_OLD_PORT, OFP_PORT);
+ } 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);
} else {
name = xstrdup(name_);
}
return error;
}
-/* Like pstream_open(), but for ptcp streams the port defaults to
- * 'default_ptcp_port' if no port number is given and for passive SSL streams
- * the port defaults to 'default_pssl_port' if no port number is given. */
+/* Like pstream_open(), but port defaults to 'default_port' if no port
+ * number is given. */
int
-pstream_open_with_default_ports(const char *name_,
- uint16_t default_ptcp_port,
- uint16_t default_pssl_port,
- struct pstream **pstreamp,
- uint8_t dscp)
+pstream_open_with_default_port(const char *name_,
+ uint16_t default_port,
+ struct pstream **pstreamp,
+ uint8_t dscp)
{
char *name;
int error;
- if (!strncmp(name_, "ptcp:", 5) && count_fields(name_) < 2) {
- name = xasprintf("%s%d", name_, default_ptcp_port);
- } else if (!strncmp(name_, "pssl:", 5) && count_fields(name_) < 2) {
- name = xasprintf("%s%d", name_, default_pssl_port);
+ if ((!strncmp(name_, "ptcp:", 5) || !strncmp(name_, "pssl:", 5))
+ && count_fields(name_) < 2) {
+ name = xasprintf("%s%d", name_, default_port);
} else {
name = xstrdup(name_);
}
/*
* This function extracts IP address and port from the target string.
*
- * - On success, function returns true and fills *sin structure with port
+ * - On success, function returns true and fills *ss structure with port
* and IP address. If port was absent in target string then it will use
* corresponding default port value.
- * - On error, function returns false and *sin contains garbage.
+ * - On error, function returns false and *ss contains garbage.
*/
bool
-stream_parse_target_with_default_ports(const char *target,
- uint16_t default_tcp_port,
- uint16_t default_ssl_port,
- struct sockaddr_in *sin)
-{
- return (!strncmp(target, "tcp:", 4)
- && inet_parse_active(target + 4, default_tcp_port, sin)) ||
- (!strncmp(target, "ssl:", 4)
- && inet_parse_active(target + 4, default_ssl_port, sin));
+stream_parse_target_with_default_port(const char *target, int default_port,
+ struct sockaddr_storage *ss)
+{
+ return ((!strncmp(target, "tcp:", 4) || !strncmp(target, "ssl:", 4))
+ && inet_parse_active(target + 4, default_port, ss, true));
}
/* Attempts to guess the content type of a stream whose first few bytes were
projects / mirror_ovs.git / blobdiff