X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-util.c;h=5171900a77ecc5da665382f5df82b281f1b45d0e;hb=fb8c93473efacd67a50117d0f2a3084f2d96ceca;hp=cedeb6702b8a911b964ebc6f485d2c6887c72be5;hpb=81f3cad4d38768c35dce97e63ba9dd3225e5d59f;p=openvswitch diff --git a/lib/ofp-util.c b/lib/ofp-util.c index cedeb670..5171900a 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -22,10 +22,10 @@ #include "ofpbuf.h" #include "packets.h" #include "random.h" +#include "vlog.h" #include "xtoxll.h" -#define THIS_MODULE VLM_ofp_util -#include "vlog.h" +VLOG_DEFINE_THIS_MODULE(ofp_util) /* Rate limit for OpenFlow message parse errors. These always indicate a bug * in the peer and so there's not much point in showing a lot of them. */ @@ -125,10 +125,10 @@ put_openflow_xid(size_t openflow_len, uint8_t type, uint32_t xid, /* Updates the 'length' field of the OpenFlow message in 'buffer' to * 'buffer->size'. */ void -update_openflow_length(struct ofpbuf *buffer) +update_openflow_length(struct ofpbuf *buffer) { struct ofp_header *oh = ofpbuf_at_assert(buffer, 0, sizeof *oh); - oh->length = htons(buffer->size); + oh->length = htons(buffer->size); } struct ofpbuf * @@ -303,7 +303,7 @@ make_echo_reply(const struct ofp_header *rq) } static int -check_message_type(uint8_t got_type, uint8_t want_type) +check_message_type(uint8_t got_type, uint8_t want_type) { if (got_type != want_type) { char *want_type_name = ofp_message_type_to_string(want_type); @@ -564,6 +564,7 @@ check_nicira_action(const union ofp_action *a, unsigned int len) switch (ntohs(nah->subtype)) { case NXAST_RESUBMIT: case NXAST_SET_TUNNEL: + case NXAST_DROP_SPOOFED_ARP: return check_action_exact_len(a, len, 16); default: return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_VENDOR_TYPE);