projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rearrange structures to better fit valgrind's memory leak heuristics.
[openvswitch]
/
lib
/
stream.h
diff --git
a/lib/stream.h
b/lib/stream.h
index 256667e6852039e057dc0cc33a96b1048a658914..c1f3adb6b33ddbdc38ff26dadbd2f0a662d8d418 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-20,7
+20,10
@@
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
+#include <sys/types.h>
+#include "openvswitch/types.h"
#include "vlog.h"
#include "vlog.h"
+#include "socket-util.h"
struct pstream;
struct stream;
struct pstream;
struct stream;
@@
-29,14
+32,14
@@
void stream_usage(const char *name, bool active, bool passive, bool bootstrap);
/* Bidirectional byte streams. */
int stream_verify_name(const char *name);
/* Bidirectional byte streams. */
int stream_verify_name(const char *name);
-int stream_open(const char *name, struct stream **);
+int stream_open(const char *name, struct stream **
, uint8_t dscp
);
int stream_open_block(int error, struct stream **);
void stream_close(struct stream *);
const char *stream_get_name(const 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);
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);
@@
-56,7
+59,7
@@
void stream_send_wait(struct stream *);
/* Passive streams: listeners for incoming stream connections. */
int pstream_verify_name(const char *name);
/* Passive streams: listeners for incoming stream connections. */
int pstream_verify_name(const char *name);
-int pstream_open(const char *name, struct pstream **);
+int pstream_open(const char *name, struct pstream **
, uint8_t dscp
);
const char *pstream_get_name(const struct pstream *);
void pstream_close(struct pstream *);
int pstream_accept(struct pstream *, struct stream **);
const char *pstream_get_name(const struct pstream *);
void pstream_close(struct pstream *);
int pstream_accept(struct pstream *, struct stream **);
@@
-68,12
+71,18
@@
void pstream_wait(struct pstream *);
int stream_open_with_default_ports(const char *name,
uint16_t default_tcp_port,
uint16_t default_ssl_port,
int stream_open_with_default_ports(const char *name,
uint16_t default_tcp_port,
uint16_t default_ssl_port,
- struct stream **);
+ struct stream **,
+ uint8_t dscp);
int pstream_open_with_default_ports(const char *name,
uint16_t default_ptcp_port,
uint16_t default_pssl_port,
int pstream_open_with_default_ports(const char *name,
uint16_t default_ptcp_port,
uint16_t default_pssl_port,
- struct pstream **);
-
\f
+ 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);
+
/* Error reporting. */
enum stream_content_type {
/* Error reporting. */
enum stream_content_type {
@@
-83,7
+92,7
@@
enum stream_content_type {
STREAM_JSONRPC
};
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 *, s
s
ize_t, enum stream_content_type,
+
struct vlog_module *
, const char *stream_name);
#endif /* stream.h */
#endif /* stream.h */