Prepare Open vSwitch 1.1.2 release.

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

diff --git a/lib/stream.h b/lib/stream.h
index 256667e..51a7656 100644 (file)
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <sys/types.h>
+#include "openvswitch/types.h"
 #include "vlog.h"
 
 struct pstream;
@@ -33,10 +35,10 @@ int stream_open(const char *name, struct stream **);
 int stream_open_block(int error, struct stream **);
 void stream_close(struct stream *);
 const char *stream_get_name(const struct stream *);
-uint32_t stream_get_remote_ip(const struct stream *);
-uint16_t stream_get_remote_port(const struct stream *);
-uint32_t stream_get_local_ip(const struct stream *);
-uint16_t stream_get_local_port(const struct stream *);
+ovs_be32 stream_get_remote_ip(const struct stream *);
+ovs_be16 stream_get_remote_port(const struct stream *);
+ovs_be32 stream_get_local_ip(const struct stream *);
+ovs_be16 stream_get_local_port(const struct stream *);
 int stream_connect(struct stream *);
 int stream_recv(struct stream *, void *buffer, size_t n);
 int stream_send(struct stream *, const void *buffer, size_t n);
@@ -83,7 +85,7 @@ enum stream_content_type {
     STREAM_JSONRPC
 };
 
-void stream_report_content(const void *, size_t, enum stream_content_type,
-                           enum vlog_module, const char *stream_name);
+void stream_report_content(const void *, ssize_t, enum stream_content_type,
+                           struct vlog_module *, const char *stream_name);
 
 #endif /* stream.h */