mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-11 15:26:11 +02:00
Code Issues Projects Releases Wiki Activity

ofctl_v1_2/3: fix tcp_dst/src match fields

Browse Source 
when enclosed the value of "ip_proto" in double quotes,
following match fields is not set at mod_flow_stats command:

  * tcp_dst, tcp_src

this patch fixes this problem.

Reported-by: jalee <jalee@inno-tech.com.tw>
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Minoru TAKAHASHI 2014-07-28 16:21:38 +09:00 committed by FUJITA Tomonori
parent 44fc2f9b62
commit 883a2aacf9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ryu/lib/ofctl_v1_2.py
View File

@ -349,7 +349,7 @@ def to_match_tpsrc(value, match, rest):
match_append = {inet.IPPROTO_TCP: match.set_tcp_src,
inet.IPPROTO_UDP: match.set_udp_src}
nw_proto = rest.get('nw_proto', rest.get('ip_proto', 0))
nw_proto = int(rest.get('nw_proto', rest.get('ip_proto', 0)))
if nw_proto in match_append:
match_append[nw_proto](value)
@ -360,7 +360,7 @@ def to_match_tpdst(value, match, rest):
match_append = {inet.IPPROTO_TCP: match.set_tcp_dst,
inet.IPPROTO_UDP: match.set_udp_dst}
nw_proto = rest.get('nw_proto', rest.get('ip_proto', 0))
nw_proto = int(rest.get('nw_proto', rest.get('ip_proto', 0)))
if nw_proto in match_append:
match_append[nw_proto](value)

4
ryu/lib/ofctl_v1_3.py
View File

@ -373,7 +373,7 @@ def to_match_tpsrc(value, match, rest):
match_append = {inet.IPPROTO_TCP: match.set_tcp_src,
inet.IPPROTO_UDP: match.set_udp_src}
nw_proto = rest.get('nw_proto', rest.get('ip_proto', 0))
nw_proto = int(rest.get('nw_proto', rest.get('ip_proto', 0)))
if nw_proto in match_append:
match_append[nw_proto](value)
@ -384,7 +384,7 @@ def to_match_tpdst(value, match, rest):
match_append = {inet.IPPROTO_TCP: match.set_tcp_dst,
inet.IPPROTO_UDP: match.set_udp_dst}
nw_proto = rest.get('nw_proto', rest.get('ip_proto', 0))
nw_proto = int(rest.get('nw_proto', rest.get('ip_proto', 0)))
if nw_proto in match_append:
match_append[nw_proto](value)