From 9b7e2112b16e8cc3c23be06403ad2e057e5ff682 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Wed, 1 Aug 2012 16:01:48 +0900 Subject: [PATCH] ofp-util: Make ofperr_encode_msg__() use correct Open Flow version Make ofperr_encode_msg__() use correct Open Flow version in the header of messages. Signed-off-by: Simon Horman Signed-off-by: Ben Pfaff --- lib/ofp-errors.c | 29 ++++++++++++++++++----------- lib/ofp-errors.h | 5 +++-- lib/vconn.c | 5 ++--- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/lib/ofp-errors.c b/lib/ofp-errors.c index 13b5c4cb..f5af6ba0 100644 --- a/lib/ofp-errors.c +++ b/lib/ofp-errors.c @@ -145,13 +145,15 @@ ofperr_get_pair__(enum ofperr error, const struct ofperr_domain *domain) } static struct ofpbuf * -ofperr_encode_msg__(enum ofperr error, const struct ofperr_domain *domain, +ofperr_encode_msg__(enum ofperr error, enum ofp_version ofp_version, ovs_be32 xid, const void *data, size_t data_len) { struct ofp_error_msg *oem; const struct pair *pair; struct ofpbuf *buf; + const struct ofperr_domain *domain; + domain = ofperr_domain_from_version(ofp_version); if (!domain) { return NULL; } @@ -220,31 +222,36 @@ ofperr_encode_msg__(enum ofperr error, const struct ofperr_domain *domain, struct ofpbuf * ofperr_encode_reply(enum ofperr error, const struct ofp_header *oh) { - const struct ofperr_domain *domain; uint16_t len = ntohs(oh->length); - domain = ofperr_domain_from_version(oh->version); - return ofperr_encode_msg__(error, domain, oh->xid, oh, MIN(len, 64)); + return ofperr_encode_msg__(error, oh->version, oh->xid, oh, MIN(len, 64)); } /* Creates and returns an OpenFlow message of type OFPT_ERROR that conveys the * given 'error', in the error domain 'domain'. The error message will include * the additional null-terminated text string 's'. * - * If 'domain' is NULL, uses the OpenFlow 1.0 error domain. OFPET_HELLO_FAILED - * error messages are supposed to be backward-compatible, so in theory this - * should work. + * If 'version' is an unknown version then OFP10_VERSION is used. + * OFPET_HELLO_FAILED error messages are supposed to be backward-compatible, + * so in theory this should work. * * Returns NULL if 'error' is not an OpenFlow error code or if 'error' cannot * be encoded in 'domain'. */ struct ofpbuf * -ofperr_encode_hello(enum ofperr error, const struct ofperr_domain *domain, +ofperr_encode_hello(enum ofperr error, enum ofp_version ofp_version, const char *s) { - if (!domain) { - domain = &ofperr_of10; + switch (ofp_version) { + case OFP10_VERSION: + case OFP11_VERSION: + case OFP12_VERSION: + break; + + default: + ofp_version = OFP10_VERSION; } - return ofperr_encode_msg__(error, domain, htonl(0), s, strlen(s)); + + return ofperr_encode_msg__(error, ofp_version, htonl(0), s, strlen(s)); } /* Returns the value that would go into an OFPT_ERROR message's 'type' for diff --git a/lib/ofp-errors.h b/lib/ofp-errors.h index 76b65746..ecf10ba1 100644 --- a/lib/ofp-errors.h +++ b/lib/ofp-errors.h @@ -21,8 +21,9 @@ #include #include +#include "openflow/openflow.h" + struct ds; -struct ofp_header; struct ofpbuf; /* Error codes. @@ -515,7 +516,7 @@ enum ofperr ofperr_from_name(const char *); enum ofperr ofperr_decode_msg(const struct ofp_header *, struct ofpbuf *payload); struct ofpbuf *ofperr_encode_reply(enum ofperr, const struct ofp_header *); -struct ofpbuf *ofperr_encode_hello(enum ofperr, const struct ofperr_domain *, +struct ofpbuf *ofperr_encode_hello(enum ofperr, enum ofp_version ofp_version, const char *); int ofperr_get_type(enum ofperr, const struct ofperr_domain *); int ofperr_get_code(enum ofperr, const struct ofperr_domain *); diff --git a/lib/vconn.c b/lib/vconn.c index b2d81e93..6fd73d60 100644 --- a/lib/vconn.c +++ b/lib/vconn.c @@ -461,9 +461,8 @@ vcs_send_error(struct vconn *vconn) snprintf(s, sizeof s, "We support versions 0x%02x to 0x%02x inclusive but " "you support no later than version 0x%02"PRIx8".", - vconn->min_version, OFP10_VERSION, vconn->version); - b = ofperr_encode_hello(OFPERR_OFPHFC_INCOMPATIBLE, - ofperr_domain_from_version(vconn->version), s); + vconn->min_version, OFP12_VERSION, vconn->version); + b = ofperr_encode_hello(OFPERR_OFPHFC_INCOMPATIBLE, vconn->version, s); retval = do_send(vconn, b); if (retval) { ofpbuf_delete(b); -- 2.30.2