X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-msgs.c;h=092741fd7a4e84dc89a81f84db26156288355480;hb=df1e5a3bc7d772237de0ca19663e4a5a9b8f403b;hp=9f1b453b23039e1991ac473cf095745eedc3ed4f;hpb=76ec08e01b4075b2e6d76ecbc5872513dd5b873f;p=sliver-openvswitch.git diff --git a/lib/ofp-msgs.c b/lib/ofp-msgs.c index 9f1b453b2..092741fd7 100644 --- a/lib/ofp-msgs.c +++ b/lib/ofp-msgs.c @@ -268,6 +268,7 @@ ofp_is_stat_request(enum ofp_version version, uint8_t type) case OFP11_VERSION: case OFP12_VERSION: case OFP13_VERSION: + case OFP14_VERSION: return type == OFPT11_STATS_REQUEST; } @@ -283,6 +284,7 @@ ofp_is_stat_reply(enum ofp_version version, uint8_t type) case OFP11_VERSION: case OFP12_VERSION: case OFP13_VERSION: + case OFP14_VERSION: return type == OFPT11_STATS_REPLY; } @@ -322,6 +324,7 @@ ofphdrs_len(const struct ofphdrs *hdrs) case OFP11_VERSION: case OFP12_VERSION: case OFP13_VERSION: + case OFP14_VERSION: if (hdrs->type == OFPT11_STATS_REQUEST || hdrs->type == OFPT11_STATS_REPLY) { return (hdrs->stat == OFPST_VENDOR @@ -693,7 +696,7 @@ ofpraw_put__(enum ofpraw raw, uint8_t version, ovs_be32 xid, nsm->subtype = htonl(hdrs->subtype); memset(nsm->pad, 0, sizeof nsm->pad); } else { - NOT_REACHED(); + OVS_NOT_REACHED(); } } } else if (version != OFP10_VERSION @@ -714,7 +717,7 @@ ofpraw_put__(enum ofpraw raw, uint8_t version, ovs_be32 xid, nsm->subtype = htonl(hdrs->subtype); } else { - NOT_REACHED(); + OVS_NOT_REACHED(); } } } @@ -753,11 +756,12 @@ ofpraw_stats_request_to_reply(enum ofpraw raw, uint8_t version) case OFP11_VERSION: case OFP12_VERSION: case OFP13_VERSION: + case OFP14_VERSION: ovs_assert(hdrs.type == OFPT11_STATS_REQUEST); hdrs.type = OFPT11_STATS_REPLY; break; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } error = ofpraw_from_ofphdrs(&reply_raw, &hdrs); @@ -939,9 +943,10 @@ ofpmp_flags__(const struct ofp_header *oh) case OFP11_VERSION: case OFP12_VERSION: case OFP13_VERSION: + case OFP14_VERSION: return &((struct ofp11_stats_msg *) oh)->flags; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } }