/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2015 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "flow.h"
#include "mac-learning.h"
#include "odp-util.h"
+#include "ofpbuf.h"
#include "ofp-actions.h"
#include "ofp-util.h"
-#include "ofpbuf.h"
#include "ofproto.h"
#include "ofproto-provider.h"
#include "pktbuf.h"
+#include "dp-packet.h"
#include "poll-loop.h"
#include "rconn.h"
#include "timeval.h"
static void
send_bogus_packet_ins(struct fail_open *fo)
{
- struct ofproto_packet_in pin;
- uint8_t mac[ETH_ADDR_LEN];
- struct ofpbuf b;
+ struct eth_addr mac;
+ struct dp_packet b;
- ofpbuf_init(&b, 128);
- eth_addr_nicira_random(mac);
+ dp_packet_init(&b, 128);
+ eth_addr_nicira_random(&mac);
compose_rarp(&b, mac);
- memset(&pin, 0, sizeof pin);
- pin.up.packet = ofpbuf_data(&b);
- pin.up.packet_len = ofpbuf_size(&b);
- pin.up.reason = OFPR_NO_MATCH;
- pin.up.fmd.in_port = OFPP_LOCAL;
- pin.send_len = ofpbuf_size(&b);
- pin.miss_type = OFPROTO_PACKET_IN_NO_MISS;
- connmgr_send_packet_in(fo->connmgr, &pin);
+ struct ofproto_async_msg am = {
+ .oam = OAM_PACKET_IN,
+ .pin = {
+ .up = {
+ .packet = dp_packet_data(&b),
+ .len = dp_packet_size(&b),
+ .flow_metadata = MATCH_CATCHALL_INITIALIZER,
+ .flow_metadata.flow.in_port.ofp_port = OFPP_LOCAL,
+ .flow_metadata.wc.masks.in_port.ofp_port
+ = u16_to_ofp(UINT16_MAX),
+ .reason = OFPR_NO_MATCH,
+ .cookie = OVS_BE64_MAX,
+ },
+ .max_len = UINT16_MAX,
+ }
+ };
+ connmgr_send_async_msg(fo->connmgr, &am);
- ofpbuf_uninit(&b);
+ dp_packet_uninit(&b);
}
/* Enter fail-open mode if we should be in it. */
* OFPP_NORMAL. */
ofpbuf_init(&ofpacts, OFPACT_OUTPUT_SIZE);
ofpact_put_OUTPUT(&ofpacts)->port = OFPP_NORMAL;
- ofpact_pad(&ofpacts);
match_init_catchall(&match);
ofproto_add_flow(fo->ofproto, &match, FAIL_OPEN_PRIORITY,
- ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts));
+ ofpacts.data, ofpacts.size);
ofpbuf_uninit(&ofpacts);
}