git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed missing dependency
[sliver-openvswitch.git]
/
lib
/
stream.c
diff --git
a/lib/stream.c
b/lib/stream.c
index
2c7bfc3
..
0c6a8c1
100644
(file)
--- a/
lib/stream.c
+++ b/
lib/stream.c
@@
-16,7
+16,6
@@
#include <config.h>
#include "stream-provider.h"
#include <config.h>
#include "stream-provider.h"
-#include <assert.h>
#include <errno.h>
#include <inttypes.h>
#include <netinet/in.h>
#include <errno.h>
#include <inttypes.h>
#include <netinet/in.h>
@@
-74,14
+73,14
@@
check_stream_classes(void)
for (i = 0; i < ARRAY_SIZE(stream_classes); i++) {
const struct stream_class *class = stream_classes[i];
for (i = 0; i < ARRAY_SIZE(stream_classes); i++) {
const struct stream_class *class = stream_classes[i];
- assert(class->name != NULL);
- assert(class->open != NULL);
+
ovs_
assert(class->name != NULL);
+
ovs_
assert(class->open != NULL);
if (class->close || class->recv || class->send || class->run
|| class->run_wait || class->wait) {
if (class->close || class->recv || class->send || class->run
|| class->run_wait || class->wait) {
- assert(class->close != NULL);
- assert(class->recv != NULL);
- assert(class->send != NULL);
- assert(class->wait != NULL);
+
ovs_
assert(class->close != NULL);
+
ovs_
assert(class->recv != NULL);
+
ovs_
assert(class->send != NULL);
+
ovs_
assert(class->wait != NULL);
} else {
/* This class delegates to another one. */
}
} else {
/* This class delegates to another one. */
}
@@
-89,12
+88,12
@@
check_stream_classes(void)
for (i = 0; i < ARRAY_SIZE(pstream_classes); i++) {
const struct pstream_class *class = pstream_classes[i];
for (i = 0; i < ARRAY_SIZE(pstream_classes); i++) {
const struct pstream_class *class = pstream_classes[i];
- assert(class->name != NULL);
- assert(class->listen != NULL);
+
ovs_
assert(class->name != NULL);
+
ovs_
assert(class->listen != NULL);
if (class->close || class->accept || class->wait) {
if (class->close || class->accept || class->wait) {
- assert(class->close != NULL);
- assert(class->accept != NULL);
- assert(class->wait != NULL);
+
ovs_
assert(class->close != NULL);
+
ovs_
assert(class->accept != NULL);
+
ovs_
assert(class->wait != NULL);
} else {
/* This class delegates to another one. */
}
} else {
/* This class delegates to another one. */
}
@@
-250,7
+249,7
@@
stream_open_block(int error, struct stream **streamp)
stream_connect_wait(stream);
poll_block();
}
stream_connect_wait(stream);
poll_block();
}
- assert(error != EINPROGRESS);
+
ovs_
assert(error != EINPROGRESS);
}
if (error) {
}
if (error) {
@@
-317,7
+316,7
@@
static void
scs_connecting(struct stream *stream)
{
int retval = (stream->class->connect)(stream);
scs_connecting(struct stream *stream)
{
int retval = (stream->class->connect)(stream);
- assert(retval != EINPROGRESS);
+
ovs_
assert(retval != EINPROGRESS);
if (!retval) {
stream->state = SCS_CONNECTED;
} else if (retval != EAGAIN) {
if (!retval) {
stream->state = SCS_CONNECTED;
} else if (retval != EAGAIN) {
@@
-419,8
+418,8
@@
stream_run_wait(struct stream *stream)
void
stream_wait(struct stream *stream, enum stream_wait_type wait)
{
void
stream_wait(struct stream *stream, enum stream_wait_type wait)
{
- assert(wait == STREAM_CONNECT || wait == STREAM_RECV
- || wait == STREAM_SEND);
+
ovs_
assert(wait == STREAM_CONNECT || wait == STREAM_RECV
+
|| wait == STREAM_SEND);
switch (stream->state) {
case SCS_CONNECTING:
switch (stream->state) {
case SCS_CONNECTING:
@@
-580,8
+579,8
@@
pstream_accept(struct pstream *pstream, struct stream **new_stream)
if (retval) {
*new_stream = NULL;
} else {
if (retval) {
*new_stream = NULL;
} else {
- assert((*new_stream)->state != SCS_CONNECTING
- || (*new_stream)->class->connect);
+
ovs_
assert((*new_stream)->state != SCS_CONNECTING
+
|| (*new_stream)->class->connect);
}
return retval;
}
}
return retval;
}
@@
-613,6
+612,15
@@
pstream_wait(struct pstream *pstream)
{
(pstream->class->wait)(pstream);
}
{
(pstream->class->wait)(pstream);
}
+
+int
+pstream_set_dscp(struct pstream *pstream, uint8_t dscp)
+{
+ if (pstream->class->set_dscp) {
+ return pstream->class->set_dscp(pstream, dscp);
+ }
+ return 0;
+}
\f
/* Initializes 'stream' as a new stream named 'name', implemented via 'class'.
* The initial connection status, supplied as 'connect_status', is interpreted
\f
/* Initializes 'stream' as a new stream named 'name', implemented via 'class'.
* The initial connection status, supplied as 'connect_status', is interpreted
@@
-642,7
+650,7
@@
stream_init(struct stream *stream, const struct stream_class *class,
: SCS_DISCONNECTED);
stream->error = connect_status;
stream->name = xstrdup(name);
: SCS_DISCONNECTED);
stream->error = connect_status;
stream->name = xstrdup(name);
- assert(stream->state != SCS_CONNECTING || class->connect);
+
ovs_
assert(stream->state != SCS_CONNECTING || class->connect);
}
void
}
void