Rearrange structures to better fit valgrind's memory leak heuristics.

[sliver-openvswitch.git] / lib / stream-provider.h

diff --git a/lib/stream-provider.h b/lib/stream-provider.h
index 872da3c..77d0a10 100644 (file)
--- a/lib/stream-provider.h
+++ b/lib/stream-provider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 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.
@@ -27,22 +27,23 @@
  *
  * 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;
+    ovs_be32 remote_ip;
+    ovs_be16 remote_port;
+    ovs_be32 local_ip;
+    ovs_be16 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);
+void stream_set_remote_ip(struct stream *, ovs_be32 remote_ip);
+void stream_set_dscp(struct stream *, uint8_t dscp);
+void stream_set_remote_port(struct stream *, ovs_be16 remote_port);
+void stream_set_local_ip(struct stream *, ovs_be32 local_ip);
+void stream_set_local_port(struct stream *, ovs_be16 local_port);
 static inline void stream_assert_class(const struct stream *stream,
                                        const struct stream_class *class)
 {
@@ -58,6 +59,10 @@ struct stream_class {
      * 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.  (If no DSCP value should be set in the packet, dscp
+     * will be set to DSCP_INVALID.  If no DSCP value is specified, DSCP_DEFAULT
+     * value will be applied.)
      *
      * Returns 0 if successful, otherwise a positive errno value.  If
      * successful, stores a pointer to the new connection in '*streamp'.
@@ -66,7 +71,8 @@ struct stream_class {
      * 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);
@@ -130,11 +136,11 @@ struct stream_class {
  *
  * This structure should be treated as opaque by stream implementations. */
 struct pstream {
-    struct pstream_class *class;
+    const struct pstream_class *class;
     char *name;
 };
 
-void pstream_init(struct pstream *, struct pstream_class *, const char *name);
+void pstream_init(struct pstream *, const struct pstream_class *, const char *name);
 static inline void pstream_assert_class(const struct pstream *pstream,
                                         const struct pstream_class *class)
 {
@@ -150,6 +156,10 @@ struct pstream_class {
      * 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.  (If no DSCP value should be set in the packet, dscp
+     * will be set to DSCP_INVALID.  If no DSCP value is specified, DSCP_DEFAULT
+     * value will be applied.)
      *
      * Returns 0 if successful, otherwise a positive errno value.  If
      * successful, stores a pointer to the new connection in '*pstreamp'.
@@ -158,7 +168,8 @@ struct pstream_class {
      * 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);
@@ -177,9 +188,13 @@ struct pstream_class {
 };
 
 /* 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;
+extern const struct stream_class unix_stream_class;
+extern const struct pstream_class punix_pstream_class;
+#ifdef HAVE_OPENSSL
+extern const struct stream_class ssl_stream_class;
+extern const struct pstream_class pssl_pstream_class;
+#endif
 
 #endif /* stream-provider.h */