ofproto: Fix potential leak during flow mods.
[sliver-openvswitch.git] / lib / stream.h
index bd39017..3780ff9 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 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.
@@ -65,23 +65,23 @@ void pstream_close(struct pstream *);
 int pstream_accept(struct pstream *, struct stream **);
 int pstream_accept_block(struct pstream *, struct stream **);
 void pstream_wait(struct pstream *);
+int pstream_set_dscp(struct pstream *, uint8_t dscp);
+
+ovs_be16 pstream_get_bound_port(const struct pstream *);
 \f
 /* Convenience functions. */
 
-int stream_open_with_default_ports(const char *name,
-                                   uint16_t default_tcp_port,
-                                   uint16_t default_ssl_port,
-                                   struct stream **,
+int stream_open_with_default_port(const char *name,
+                                  uint16_t default_port,
+                                  struct stream **,
+                                  uint8_t dscp);
+int pstream_open_with_default_port(const char *name,
+                                   uint16_t default_port,
+                                   struct pstream **,
                                    uint8_t dscp);
-int pstream_open_with_default_ports(const char *name,
-                                    uint16_t default_ptcp_port,
-                                    uint16_t default_pssl_port,
-                                    struct pstream **,
-                                    uint8_t dscp);
-bool stream_parse_target_with_default_ports(const char *target,
-                                           uint16_t default_tcp_port,
-                                           uint16_t default_ssl_port,
-                                           struct sockaddr_in *sin);
+bool stream_parse_target_with_default_port(const char *target,
+                                           uint16_t default_port,
+                                           struct sockaddr_storage *ss);
 int stream_or_pstream_needs_probes(const char *name);
 
 /* Error reporting. */