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
ofp-error: Remove ofperr_domain from external API
[sliver-openvswitch.git]
/
lib
/
ofp-errors.c
diff --git
a/lib/ofp-errors.c
b/lib/ofp-errors.c
index
f5af6ba
..
2c71312
100644
(file)
--- a/
lib/ofp-errors.c
+++ b/
lib/ofp-errors.c
@@
-21,20
+21,27
@@
struct pair {
* 'version' (one of the possible values of struct ofp_header's 'version'
* member). Returns NULL if the version isn't defined or isn't understood by
* OVS. */
* 'version' (one of the possible values of struct ofp_header's 'version'
* member). Returns NULL if the version isn't defined or isn't understood by
* OVS. */
-const struct ofperr_domain *
-ofperr_domain_from_version(
uint8_t
version)
+
static
const struct ofperr_domain *
+ofperr_domain_from_version(
enum ofp_version
version)
{
{
- return (version == ofperr_of10.version ? &ofperr_of10
- : version == ofperr_of11.version ? &ofperr_of11
- : version == ofperr_of12.version ? &ofperr_of12
- : NULL);
+ switch (version) {
+ case OFP10_VERSION:
+ return &ofperr_of10;
+ case OFP11_VERSION:
+ return &ofperr_of11;
+ case OFP12_VERSION:
+ return &ofperr_of12;
+ default:
+ return NULL;
+ }
}
}
-/* Returns the name (e.g. "OpenFlow 1.0") of OpenFlow
error domain 'domai
n'. */
+/* Returns the name (e.g. "OpenFlow 1.0") of OpenFlow
version 'versio
n'. */
const char *
const char *
-ofperr_domain_get_name(
const struct ofperr_domain *domai
n)
+ofperr_domain_get_name(
enum ofp_version versio
n)
{
{
- return domain->name;
+ const struct ofperr_domain *domain = ofperr_domain_from_version(version);
+ return domain ? domain->name : NULL;
}
/* Returns true if 'error' is a valid OFPERR_* value, false otherwise. */
}
/* Returns true if 'error' is a valid OFPERR_* value, false otherwise. */
@@
-71,26
+78,31
@@
ofperr_is_nx_extension(enum ofperr error)
* A given error may not be encodable in some domains because each OpenFlow
* version tends to introduce new errors and retire some old ones. */
bool
* A given error may not be encodable in some domains because each OpenFlow
* version tends to introduce new errors and retire some old ones. */
bool
-ofperr_is_encodable(enum ofperr error,
const struct ofperr_domain *domai
n)
+ofperr_is_encodable(enum ofperr error,
enum ofp_version versio
n)
{
{
+ const struct ofperr_domain *domain = ofperr_domain_from_version(version);
return (ofperr_is_valid(error)
return (ofperr_is_valid(error)
- && domain->errors[error - OFPERR_OFS].code >= 0);
+ && domain
&& domain
->errors[error - OFPERR_OFS].code >= 0);
}
/* Returns the OFPERR_* value that corresponds to 'type' and 'code' within
}
/* Returns the OFPERR_* value that corresponds to 'type' and 'code' within
- * 'domain', or 0 if no such OFPERR_* value exists. */
+ * 'version', or 0 if either no such OFPERR_* value exists or 'version' is
+ * unknown. */
enum ofperr
enum ofperr
-ofperr_decode(
const struct ofperr_domain *domai
n, uint16_t type, uint16_t code)
+ofperr_decode(
enum ofp_version versio
n, uint16_t type, uint16_t code)
{
{
- return domain->decode(type, code);
+ const struct ofperr_domain *domain = ofperr_domain_from_version(version);
+ return domain ? domain->decode(type, code) : 0;
}
/* Returns the OFPERR_* value that corresponds to the category 'type' within
}
/* Returns the OFPERR_* value that corresponds to the category 'type' within
- * 'domain', or 0 if no such OFPERR_* value exists. */
+ * 'version', or 0 if either no such OFPERR_* value exists or 'version' is
+ * unknown. */
enum ofperr
enum ofperr
-ofperr_decode_type(
const struct ofperr_domain *domai
n, uint16_t type)
+ofperr_decode_type(
enum ofp_version versio
n, uint16_t type)
{
{
- return domain->decode_type(type);
+ const struct ofperr_domain *domain = ofperr_domain_from_version(version);
+ return domain ? domain->decode_type(type) : 0;
}
/* Returns the name of 'error', e.g. "OFPBRC_BAD_TYPE" if 'error' is
}
/* Returns the name of 'error', e.g. "OFPBRC_BAD_TYPE" if 'error' is
@@
-158,7
+170,7
@@
ofperr_encode_msg__(enum ofperr error, enum ofp_version ofp_version,
return NULL;
}
return NULL;
}
- if (!ofperr_is_encodable(error,
domai
n)) {
+ if (!ofperr_is_encodable(error,
ofp_versio
n)) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
if (!ofperr_is_valid(error)) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
if (!ofperr_is_valid(error)) {
@@
-256,24
+268,28
@@
ofperr_encode_hello(enum ofperr error, enum ofp_version ofp_version,
/* Returns the value that would go into an OFPT_ERROR message's 'type' for
* encoding 'error' in 'domain'. Returns -1 if 'error' is not encodable in
/* Returns the value that would go into an OFPT_ERROR message's 'type' for
* encoding 'error' in 'domain'. Returns -1 if 'error' is not encodable in
- * '
domain'
.
+ * '
version' or 'version' is unknown
.
*
* 'error' must be a valid OFPERR_* code, as checked by ofperr_is_valid(). */
int
*
* 'error' must be a valid OFPERR_* code, as checked by ofperr_is_valid(). */
int
-ofperr_get_type(enum ofperr error,
const struct ofperr_domain *domai
n)
+ofperr_get_type(enum ofperr error,
enum ofp_version versio
n)
{
{
- return ofperr_get_pair__(error, domain)->type;
+ const struct ofperr_domain *domain = ofperr_domain_from_version(version);
+ return domain ? ofperr_get_pair__(error, domain)->type : -1;
}
/* Returns the value that would go into an OFPT_ERROR message's 'code' for
* encoding 'error' in 'domain'. Returns -1 if 'error' is not encodable in
}
/* Returns the value that would go into an OFPT_ERROR message's 'code' for
* encoding 'error' in 'domain'. Returns -1 if 'error' is not encodable in
- * 'domain' or if 'error' represents a category rather than a specific error.
+ * 'version', 'version' is unknown or if 'error' represents a category
+ * rather than a specific error.
+ *
*
* 'error' must be a valid OFPERR_* code, as checked by ofperr_is_valid(). */
int
*
* 'error' must be a valid OFPERR_* code, as checked by ofperr_is_valid(). */
int
-ofperr_get_code(enum ofperr error,
const struct ofperr_domain *domai
n)
+ofperr_get_code(enum ofperr error,
enum ofp_version versio
n)
{
{
- return ofperr_get_pair__(error, domain)->code;
+ const struct ofperr_domain *domain = ofperr_domain_from_version(version);
+ return domain ? ofperr_get_pair__(error, domain)->code : -1;
}
/* Tries to decodes 'oh', which should be an OpenFlow OFPT_ERROR message.
}
/* Tries to decodes 'oh', which should be an OpenFlow OFPT_ERROR message.
@@
-286,7
+302,6
@@
ofperr_decode_msg(const struct ofp_header *oh, struct ofpbuf *payload)
{
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
{
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
- const struct ofperr_domain *domain;
const struct ofp_error_msg *oem;
enum ofpraw raw;
uint16_t type, code;
const struct ofp_error_msg *oem;
enum ofpraw raw;
uint16_t type, code;
@@
-305,12
+320,6
@@
ofperr_decode_msg(const struct ofp_header *oh, struct ofpbuf *payload)
}
oem = ofpbuf_pull(&b, sizeof *oem);
}
oem = ofpbuf_pull(&b, sizeof *oem);
- /* Check version. */
- domain = ofperr_domain_from_version(oh->version);
- if (!domain) {
- return 0;
- }
-
/* Get the error type and code. */
type = ntohs(oem->type);
code = ntohs(oem->code);
/* Get the error type and code. */
type = ntohs(oem->type);
code = ntohs(oem->code);
@@
-331,9
+340,9
@@
ofperr_decode_msg(const struct ofp_header *oh, struct ofpbuf *payload)
/* Translate the error type and code into an ofperr.
* If we don't know the error type and code, at least try for the type. */
/* Translate the error type and code into an ofperr.
* If we don't know the error type and code, at least try for the type. */
- error = ofperr_decode(
domai
n, type, code);
+ error = ofperr_decode(
oh->versio
n, type, code);
if (!error) {
if (!error) {
- error = ofperr_decode_type(
domai
n, type);
+ error = ofperr_decode_type(
oh->versio
n, type);
}
if (error && payload) {
ofpbuf_use_const(payload, b.data, b.size);
}
if (error && payload) {
ofpbuf_use_const(payload, b.data, b.size);