ruby/trema/match.c in trema-0.4.3 vs ruby/trema/match.c in trema-0.4.4

- old
+ new

@@ -236,11 +236,11 @@ dl_addr = match->dl_src; } else { dl_addr = match->dl_dst; } - return rb_funcall( rb_eval_string( "Trema::Mac" ), rb_intern( "new" ), 1, ULL2NUM( mac_to_uint64( dl_addr ) ) ); + return rb_funcall( rb_eval_string( "Pio::Mac" ), rb_intern( "new" ), 1, ULL2NUM( mac_to_uint64( dl_addr ) ) ); } /* * @return [Mac] the value of dl_src. @@ -393,20 +393,20 @@ * @param [Hash] options the options hash. * * @option options [Number] :in_port * the physical port number to match. * - * @option options [String,Number,Trema::Mac] :dl_src + * @option options [String,Number,Mac] :dl_src * the source ethernet address to match specified either as 6 * pairs of hexadecimal digits delimited by colon or as a - * hexadecimal number or as a Trema::Mac object. + * hexadecimal number or as a Mac object. * (eg. "00:11:22:33:44:55" or 0x001122334455 or Mac.new("00:11:22:33:44:55")). * * @option options [String,Number] :dl_dst * the destination ethernet address to match specified either as a * 6 pairs of hexadecimal digits delimited by colon or as a - * hexadecimal number or as a Trema::Mac object. + * hexadecimal number or as a Mac object. * (eg. "00:11:22:33:44:55" or 0x001122334455 or Mac.new("00:11:22:33:44:55")). * * @option options [Number] :dl_type * the Ethernet protocol type to match. Can be specified either as a decimal * or hexadecimal number. (eg 0x0800 to match IP packets, 0x08006 to match @@ -470,27 +470,27 @@ } VALUE dl_src = rb_hash_aref( options, ID2SYM( rb_intern( "dl_src" ) ) ); if ( dl_src != Qnil ) { VALUE dl_addr; - if ( rb_obj_is_kind_of( dl_src, rb_eval_string( "Trema::Mac" ) ) ) { + if ( rb_obj_is_kind_of( dl_src, rb_eval_string( "Pio::Mac" ) ) ) { dl_addr = dl_src; } else { - dl_addr = rb_funcall( rb_eval_string( "Trema::Mac" ), rb_intern( "new" ), 1, dl_src ); + dl_addr = rb_funcall( rb_eval_string( "Pio::Mac" ), rb_intern( "new" ), 1, dl_src ); } dl_addr_to_a( dl_addr, match->dl_src ); match->wildcards &= ( uint32_t ) ~OFPFW_DL_SRC; } VALUE dl_dst = rb_hash_aref( options, ID2SYM( rb_intern( "dl_dst" ) ) ); if ( dl_dst != Qnil ) { VALUE dl_addr; - if ( rb_obj_is_kind_of( dl_dst, rb_eval_string( "Trema::Mac" ) ) ) { + if ( rb_obj_is_kind_of( dl_dst, rb_eval_string( "Pio::Mac" ) ) ) { dl_addr = dl_dst; } else { - dl_addr = rb_funcall( rb_eval_string( "Trema::Mac" ), rb_intern( "new" ), 1, dl_dst ); + dl_addr = rb_funcall( rb_eval_string( "Pio::Mac" ), rb_intern( "new" ), 1, dl_dst ); } dl_addr_to_a( dl_addr, match->dl_dst ); match->wildcards &= ( uint32_t ) ~OFPFW_DL_DST; }