/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
static void
send_bogus_packet_ins(struct fail_open *fo)
{
- struct ofputil_packet_in pin;
+ struct ofproto_packet_in pin;
uint8_t mac[ETH_ADDR_LEN];
struct ofpbuf b;
compose_rarp(&b, mac);
memset(&pin, 0, sizeof pin);
- pin.packet = b.data;
- pin.packet_len = b.size;
- pin.reason = OFPR_NO_MATCH;
- pin.send_len = b.size;
- pin.fmd.in_port = OFPP_LOCAL;
+ 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);
ofpbuf_uninit(&b);
* controller, exits fail open mode. */
void
fail_open_maybe_recover(struct fail_open *fo)
+ OVS_EXCLUDED(ofproto_mutex)
{
if (fail_open_is_active(fo)
&& connmgr_is_any_controller_admitted(fo->connmgr)) {
static void
fail_open_recover(struct fail_open *fo)
+ OVS_EXCLUDED(ofproto_mutex)
{
struct match match;
void
fail_open_flushed(struct fail_open *fo)
+ OVS_EXCLUDED(ofproto_mutex)
{
int disconn_secs = connmgr_failure_duration(fo->connmgr);
bool open = disconn_secs >= trigger_duration(fo);
match_init_catchall(&match);
ofproto_add_flow(fo->ofproto, &match, FAIL_OPEN_PRIORITY,
- ofpacts.data, ofpacts.size);
+ ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts));
ofpbuf_uninit(&ofpacts);
}
/* Destroys 'fo'. */
void
fail_open_destroy(struct fail_open *fo)
+ OVS_EXCLUDED(ofproto_mutex)
{
if (fo) {
if (fail_open_is_active(fo)) {