summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2013-08-26 14:34:46 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-08-26 15:04:47 +0900
commit0cfe9b4ab487b2137a6abb67256200003deb1b02 (patch)
treec102d14b54467fae04be8f5532e9ab1aeb819b07
parent4457537d26f4fabe32d093159cbf38b4d7f17177 (diff)
rest_router: fix of10 case
looks like a regression in commit db40bc0f98abc84dcdbd3fa4d19aa573d94188d9. (rest_router: follow packet lib api change) Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/app/rest_router.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ryu/app/rest_router.py b/ryu/app/rest_router.py
index 758c7ee7..6bc57171 100644
--- a/ryu/app/rest_router.py
+++ b/ryu/app/rest_router.py
@@ -1628,18 +1628,18 @@ class OfCtl_v1_0(OfCtl):
v = (32 - src_mask) << ofp.OFPFW_NW_SRC_SHIFT | \
~ofp.OFPFW_NW_SRC_MASK
wildcards &= v
+ nw_src = ipv4_text_to_int(nw_src),
if nw_dst:
v = (32 - dst_mask) << ofp.OFPFW_NW_DST_SHIFT | \
~ofp.OFPFW_NW_DST_MASK
wildcards &= v
+ nw_dst = ipv4_text_to_int(nw_dst),
if nw_proto:
wildcards &= ~ofp.OFPFW_NW_PROTO
match = ofp_parser.OFPMatch(wildcards, 0, 0, dl_dst, dl_vlan, 0,
dl_type, 0, nw_proto,
- ipv4_text_to_int(nw_src),
- ipv4_text_to_int(nw_dst),
- 0, 0)
+ nw_src, nw_dst, 0, 0)
actions = actions or []
m = ofp_parser.OFPFlowMod(self.dp, match, cookie, cmd,