projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tunneling: Simplify path MTU discovery logic.
[openvswitch]
/
lib
/
stream.c
diff --git
a/lib/stream.c
b/lib/stream.c
index eb75be8d74428f59f83a1642e5dde17f8f832382..90ec521428753ab569f4b03eaf9dcf20c33fb86b 100644
(file)
--- a/
lib/stream.c
+++ b/
lib/stream.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 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.
@@
-39,6
+39,9
@@
VLOG_DEFINE_THIS_MODULE(stream);
VLOG_DEFINE_THIS_MODULE(stream);
+COVERAGE_DEFINE(pstream_open);
+COVERAGE_DEFINE(stream_open);
+
/* State of an active stream.*/
enum stream_state {
SCS_CONNECTING, /* Underlying stream is not connected. */
/* State of an active stream.*/
enum stream_state {
SCS_CONNECTING, /* Underlying stream is not connected. */
@@
-280,7
+283,7
@@
stream_get_name(const struct stream *stream)
/* Returns the IP address of the peer, or 0 if the peer is not connected over
* an IP-based protocol or if its IP address is not yet known. */
/* Returns the IP address of the peer, or 0 if the peer is not connected over
* an IP-based protocol or if its IP address is not yet known. */
-uint32_t
+ovs_be32
stream_get_remote_ip(const struct stream *stream)
{
return stream->remote_ip;
stream_get_remote_ip(const struct stream *stream)
{
return stream->remote_ip;
@@
-288,7
+291,7
@@
stream_get_remote_ip(const struct stream *stream)
/* Returns the transport port of the peer, or 0 if the connection does not
* contain a port or if the port is not yet known. */
/* Returns the transport port of the peer, or 0 if the connection does not
* contain a port or if the port is not yet known. */
-uint16_t
+ovs_be16
stream_get_remote_port(const struct stream *stream)
{
return stream->remote_port;
stream_get_remote_port(const struct stream *stream)
{
return stream->remote_port;
@@
-296,7
+299,7
@@
stream_get_remote_port(const struct stream *stream)
/* Returns the IP address used to connect to the peer, or 0 if the connection
* is not an IP-based protocol or if its IP address is not yet known. */
/* Returns the IP address used to connect to the peer, or 0 if the connection
* is not an IP-based protocol or if its IP address is not yet known. */
-uint32_t
+ovs_be32
stream_get_local_ip(const struct stream *stream)
{
return stream->local_ip;
stream_get_local_ip(const struct stream *stream)
{
return stream->local_ip;
@@
-304,7
+307,7
@@
stream_get_local_ip(const struct stream *stream)
/* Returns the transport port used to connect to the peer, or 0 if the
* connection does not contain a port or if the port is not yet known. */
/* Returns the transport port used to connect to the peer, or 0 if the
* connection does not contain a port or if the port is not yet known. */
-uint16_t
+ovs_be16
stream_get_local_port(const struct stream *stream)
{
return stream->local_port;
stream_get_local_port(const struct stream *stream)
{
return stream->local_port;
@@
-623,25
+626,25
@@
stream_init(struct stream *stream, struct stream_class *class,
}
void
}
void
-stream_set_remote_ip(struct stream *stream,
uint32_t
ip)
+stream_set_remote_ip(struct stream *stream,
ovs_be32
ip)
{
stream->remote_ip = ip;
}
void
{
stream->remote_ip = ip;
}
void
-stream_set_remote_port(struct stream *stream,
uint16_t
port)
+stream_set_remote_port(struct stream *stream,
ovs_be16
port)
{
stream->remote_port = port;
}
void
{
stream->remote_port = port;
}
void
-stream_set_local_ip(struct stream *stream,
uint32_t
ip)
+stream_set_local_ip(struct stream *stream,
ovs_be32
ip)
{
stream->local_ip = ip;
}
void
{
stream->local_ip = ip;
}
void
-stream_set_local_port(struct stream *stream,
uint16_t
port)
+stream_set_local_port(struct stream *stream,
ovs_be16
port)
{
stream->local_port = port;
}
{
stream->local_port = port;
}
@@
-779,7
+782,7
@@
stream_report_content(const void *data, size_t size,
vlog_rate_limit(module, VLL_WARN, &rl,
"%s: received %s data on %s channel",
stream_name,
vlog_rate_limit(module, VLL_WARN, &rl,
"%s: received %s data on %s channel",
stream_name,
- stream_content_type_to_string(
expected
_type),
- stream_content_type_to_string(
actual
_type));
+ stream_content_type_to_string(
actual
_type),
+ stream_content_type_to_string(
expected
_type));
}
}
}
}