X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ofproto%2Ffail-open.c;h=a28acefdc9d0feaf4009a3dd7ac178db608cd8af;hb=250bd94d1e500a89c76cac944e660bd9c07ac364;hp=c8d553e4678593bed6853df5412aae771f3da996;hpb=bdd0bd2873415838643e42a1e4c08319fe8d3b8b;p=cascardo%2Fovs.git

diff --git a/ofproto/fail-open.c b/ofproto/fail-open.c
index c8d553e46..a28acefdc 100644
--- a/ofproto/fail-open.c
+++ b/ofproto/fail-open.c
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -118,22 +118,30 @@ fail_open_is_active(const struct fail_open *fo)
 static void
 send_bogus_packet_ins(struct fail_open *fo)
 {
-    struct ofproto_packet_in pin;
-    uint8_t mac[ETH_ADDR_LEN];
+    struct eth_addr mac;
     struct dp_packet b;
 
     dp_packet_init(&b, 128);
-    eth_addr_nicira_random(mac);
+    eth_addr_nicira_random(&mac);
     compose_rarp(&b, mac);
 
-    memset(&pin, 0, sizeof pin);
-    pin.up.packet = dp_packet_data(&b);
-    pin.up.packet_len = dp_packet_size(&b);
-    pin.up.reason = OFPR_NO_MATCH;
-    pin.up.fmd.in_port = OFPP_LOCAL;
-    pin.send_len = dp_packet_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);
 
     dp_packet_uninit(&b);
 }
@@ -228,7 +236,6 @@ fail_open_flushed(struct fail_open *fo)
          * 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,