Trema::Match*_mask does not work

[sugyo]

Trema::Match*_mask does not work

[yasuhito]

すみません、具体的にどういう問題が出るか、もしあればペーストしてもらえますか? trema-dev か Twitter で同じ問題を見たような。。?

[sugyo]

下記のtwitterです。trema-edgeには、定義はあるけど、未実装？

trema-edge(ruby)のMatch.newでipv6_dst_maskに何を書いても反映されてない風味。。どう書くのが正解なのだろう。

— Kenji Ohira (@torus77) June 4, 2013

<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>

[sugyo]

修正した。issues #12 で見直してください

[rakshasa]

"#<TypeError: can't convert IPAddr into Integer>"
"/opt/.../trema-abb78667c386/ruby/trema/message.rb:39:in `pack_flow_mod_msg'"
...

The change broke ipv4_dst/src, likely since they used 'nw_addr_to_i' not 'NUM2UINT'.

[sugyo]

thanks.
If you're hurry, Please try the following patches:

--- a/ruby/trema/conversion-util.c
+++ b/ruby/trema/conversion-util.c
@@ -177,6 +177,19 @@ ofp_match_to_r_match( const struct ofp_match *match ) {
   } \
 }

+#define APPEND_OXM_MATCH_IPV4_ADDR_MASK( r_match, at_value, append_oxm_match_f, match ) \
+{ \
+  VALUE r_value = rb_iv_get( r_match, at_value ); \
+  if ( !NIL_P( r_value ) ) { \
+    uint32_t mask = 0; \
+    VALUE r_mask = rb_iv_get( r_match, at_value "_mask" ); \
+    if ( !NIL_P( r_mask ) ) { \
+      mask = nw_addr_to_i( r_mask ); \
+    } \
+    append_oxm_match_f( match, nw_addr_to_i( r_value ), mask ); \
+  } \
+}
+
 #define APPEND_OXM_MATCH_IPV6_ADDR( r_match, at_value, append_oxm_match_f, match ) \
 { \
   VALUE r_value = rb_iv_get( r_match, at_value ); \
@@ -218,8 +231,8 @@ r_match_to_oxm_match( VALUE r_match, oxm_matches *match ) {
   APPEND_OXM_MATCH_UINT8( r_match, "@ip_ecn", append_oxm_match_ip_ecn, match );
   APPEND_OXM_MATCH_UINT8( r_match, "@ip_proto", append_oxm_match_ip_proto, match );

-  APPEND_OXM_MATCH_UINT32_MASK( r_match, "@ipv4_src", append_oxm_match_ipv4_src, match );
-  APPEND_OXM_MATCH_UINT32_MASK( r_match, "@ipv4_dst", append_oxm_match_ipv4_dst, match );
+  APPEND_OXM_MATCH_IPV4_ADDR_MASK( r_match, "@ipv4_src", append_oxm_match_ipv4_src, match );
+  APPEND_OXM_MATCH_IPV4_ADDR_MASK( r_match, "@ipv4_dst", append_oxm_match_ipv4_dst, match );

   APPEND_OXM_MATCH_UINT16( r_match, "@tcp_src", append_oxm_match_tcp_src, match );
   APPEND_OXM_MATCH_UINT16( r_match, "@tcp_dst", append_oxm_match_tcp_dst, match );

[rakshasa]

#50

This fixes it for both ipv4_* and arp_*.