ofproto_v1_0_parser: allows 0 as dl_{src, dst} for OFPMatch

When 0 is passed for dl_{src, dst}, it is converted to '\x00' * 6
So when creating OFPMatch with wildcarded dl_{src, dst},
the argument can be simplified to 0 instead of '\x00' * 6.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

1 files changed, 13 insertions, 0 deletions

diff --git a/ryu/ofproto/ofproto_v1_0_parser.py b/ryu/ofproto/ofproto_v1_0_parser.py
index cb1983a3..d8664947 100644
--- a/ryu/ofproto/ofproto_v1_0_parser.py
+++ b/ryu/ofproto/ofproto_v1_0_parser.py
@@ -17,6 +17,7 @@ import collections
 import struct
 
 from ofproto_parser import MsgBase
+from ryu.lib import mac
 from . import ofproto_parser
 from . import ofproto_v1_0
 
@@ -91,6 +92,18 @@ class OFPMatch(collections.namedtuple('OFPMatchBase', (
             'dl_vlan_pcp', 'dl_type', 'nw_tos', 'nw_proto',
             'nw_src', 'nw_dst', 'tp_src', 'tp_dst'))):
 
+    def __new__(cls, *args):
+        # for convenience when dl_src/dl_dst are wildcard
+        if args[2] != 0 and args[3] != 0:
+            return super(cls, OFPMatch).__new__(cls, *args)
+
+        tmp = list(args)
+        if tmp[2] == 0:
+            tmp[2] = mac.DONTCARE
+        if tmp[3] == 0:
+            tmp[3] = mac.DONTCARE
+        return super(cls, OFPMatch).__new__(cls, *tmp)
+
     def serialize(self, buf, offset):
         _pack_into(ofproto_v1_0.OFP_MATCH_PACK_STR, buf, offset, *self)