/*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2012, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#ifndef STREAM_PROVIDER_H
#define STREAM_PROVIDER_H 1
-#include <assert.h>
#include <sys/types.h>
#include "stream.h"
*
* This structure should be treated as opaque by implementation. */
struct stream {
- struct stream_class *class;
+ const struct stream_class *class;
int state;
int error;
- uint32_t remote_ip;
- uint16_t remote_port;
- uint32_t local_ip;
- uint16_t local_port;
char *name;
};
-void stream_init(struct stream *, struct stream_class *, int connect_status,
- const char *name);
-void stream_set_remote_ip(struct stream *, uint32_t remote_ip);
-void stream_set_remote_port(struct stream *, uint16_t remote_port);
-void stream_set_local_ip(struct stream *, uint32_t local_ip);
-void stream_set_local_port(struct stream *, uint16_t local_port);
+void stream_init(struct stream *, const struct stream_class *,
+ int connect_status, const char *name);
static inline void stream_assert_class(const struct stream *stream,
const struct stream_class *class)
{
- assert(stream->class == class);
+ ovs_assert(stream->class == class);
}
struct stream_class {
/* Prefix for connection names, e.g. "tcp", "ssl", "unix". */
const char *name;
+ /* True if this stream needs periodic probes to verify connectivity. For
+ * streams which need probes, it can take a long time to notice the
+ * connection was dropped. */
+ bool needs_probes;
+
/* Attempts to connect to a peer. 'name' is the full connection name
* provided by the user, e.g. "tcp:1.2.3.4". This name is useful for error
* messages but must not be modified.
*
* 'suffix' is a copy of 'name' following the colon and may be modified.
+ * 'dscp' is the DSCP value that the new connection should use in the IP
+ * packets it sends.
*
* Returns 0 if successful, otherwise a positive errno value. If
* successful, stores a pointer to the new connection in '*streamp'.
* If the connection cannot be completed immediately, it should return
* EAGAIN (not EINPROGRESS, as returned by the connect system call) and
* continue the connection in the background. */
- int (*open)(const char *name, char *suffix, struct stream **streamp);
+ int (*open)(const char *name, char *suffix, struct stream **streamp,
+ uint8_t dscp);
/* Closes 'stream' and frees associated memory. */
void (*close)(struct stream *stream);
*
* This structure should be treated as opaque by stream implementations. */
struct pstream {
- struct pstream_class *class;
+ const struct pstream_class *class;
char *name;
+ ovs_be16 bound_port;
};
-void pstream_init(struct pstream *, struct pstream_class *, const char *name);
+void pstream_init(struct pstream *, const struct pstream_class *, const char *name);
+void pstream_set_bound_port(struct pstream *, ovs_be16 bound_port);
static inline void pstream_assert_class(const struct pstream *pstream,
const struct pstream_class *class)
{
- assert(pstream->class == class);
+ ovs_assert(pstream->class == class);
}
struct pstream_class {
/* Prefix for connection names, e.g. "ptcp", "pssl", "punix". */
const char *name;
+ /* True if this pstream needs periodic probes to verify connectivity. For
+ * pstreams which need probes, it can take a long time to notice the
+ * connection was dropped. */
+ bool needs_probes;
+
/* Attempts to start listening for stream connections. 'name' is the full
* connection name provided by the user, e.g. "ptcp:1234". This name is
* useful for error messages but must not be modified.
*
* 'suffix' is a copy of 'name' following the colon and may be modified.
+ * 'dscp' is the DSCP value that the new connection should use in the IP
+ * packets it sends.
*
* Returns 0 if successful, otherwise a positive errno value. If
* successful, stores a pointer to the new connection in '*pstreamp'.
* completed immediately, it should return EAGAIN (not EINPROGRESS, as
* returned by the connect system call) and continue the connection in the
* background. */
- int (*listen)(const char *name, char *suffix, struct pstream **pstreamp);
+ int (*listen)(const char *name, char *suffix, struct pstream **pstreamp,
+ uint8_t dscp);
/* Closes 'pstream' and frees associated memory. */
void (*close)(struct pstream *pstream);
/* Arranges for the poll loop to wake up when a connection is ready to be
* accepted on 'pstream'. */
void (*wait)(struct pstream *pstream);
+
+ /* Set DSCP value of the listening socket. */
+ int (*set_dscp)(struct pstream *pstream, uint8_t dscp);
};
/* Active and passive stream classes. */
-extern struct stream_class tcp_stream_class;
-extern struct pstream_class ptcp_pstream_class;
-extern struct stream_class unix_stream_class;
-extern struct pstream_class punix_pstream_class;
+extern const struct stream_class tcp_stream_class;
+extern const struct pstream_class ptcp_pstream_class;
+#ifndef _WIN32
+extern const struct stream_class unix_stream_class;
+extern const struct pstream_class punix_pstream_class;
+#else
+extern const struct stream_class windows_stream_class;
+extern const struct pstream_class pwindows_pstream_class;
+#endif
#ifdef HAVE_OPENSSL
-extern struct stream_class ssl_stream_class;
-extern struct pstream_class pssl_pstream_class;
+extern const struct stream_class ssl_stream_class;
+extern const struct pstream_class pssl_pstream_class;
#endif
#endif /* stream-provider.h */
git://git.onelab.eu / sliver-openvswitch.git / blobdiff