projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timeval: Block SIGALRM when sleeping.
[openvswitch]
/
lib
/
stream.c
diff --git
a/lib/stream.c
b/lib/stream.c
index 271f16b93b650f664e4925f342d764d391a2c710..2ee5731eb23a79ea1b07d3e349bd0d7b6f435bbc 100644
(file)
--- a/
lib/stream.c
+++ b/
lib/stream.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011
, 2012
Nicira, Inc.
*
* 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.
@@
-613,6
+613,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
@@
-778,7
+787,7
@@
stream_guess_content(const uint8_t *data, ssize_t size)
return STREAM_SSL;
case PAIR('{', '"'):
return STREAM_JSONRPC;
return STREAM_SSL;
case PAIR('{', '"'):
return STREAM_JSONRPC;
- case PAIR(OFP10_VERSION,
OFPT_HELLO
):
+ case PAIR(OFP10_VERSION,
0 /* OFPT_HELLO */
):
return STREAM_OPENFLOW;
}
}
return STREAM_OPENFLOW;
}
}