From 7c7fb56ad67990bc3674730d658b0e574177af64 Mon Sep 17 00:00:00 2001
From: IWASE Yusuke <iwase.yusuke0@gmail.com>
Date: Mon, 26 Oct 2015 17:30:53 +0900
Subject: [PATCH] packet_data: Fix wildcarded match value in OF1.0

OpenFlow Spec 1.0 does not define clearly the match value when the
corresponding wildcard flags are set, but OpenFlow 1.3.2 mandate
that masked value must be 0-bits in match.
This patch fixes wildcarded match value (dl_src) into 0-bits.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
 .../packet_data/of10/1-2-ofp_flow_mod.packet      | Bin 80 -> 80 bytes
 ryu/tests/packet_data_generator/src/x1.erl        |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryu/tests/packet_data/of10/1-2-ofp_flow_mod.packet b/ryu/tests/packet_data/of10/1-2-ofp_flow_mod.packet
index 11c4def98e8d66670e002d70bdb3ffc7374e6d02..881f4946964f1c52fdc3afaf08ec8ee5a6492494 100644
GIT binary patch
delta 38
ncmWFtkYeOx2w(sK`~Tm;G?4hjy`=WXtBHzo6AjoW+6w{zoE-_s

delta 38
ocmWFtkYeOx2w(sK`~Tk=82*F7C+;P+KVD5#l$&V4KG9wf01CYi!T<mO

diff --git a/ryu/tests/packet_data_generator/src/x1.erl b/ryu/tests/packet_data_generator/src/x1.erl
index ff5d4fb3..6935e021 100644
--- a/ryu/tests/packet_data_generator/src/x1.erl
+++ b/ryu/tests/packet_data_generator/src/x1.erl
@@ -49,7 +49,7 @@ x() ->
                     % XXX ryu and flower have different defaults for the
                     % followin fields.
                     in_port = 0,
-                    dl_src = <<(-1):6/unit:8>>
+                    dl_src = <<0:6/unit:8>>
                 },
             actions = [#ofp_action_output{port = 6,max_len = 65535}]},
         skip,