Trema::IP -> Pio::IPv4Address.

Author: yasuhito

ruby/trema/ip.rb

@@ -321,7 +321,8 @@ match_nw( VALUE self, uint8_t which ) {
     masklen = ( match->wildcards & OFPFW_NW_DST_MASK ) >> OFPFW_NW_DST_SHIFT;
   }
   uint32_t prefixlen = masklen > 32 ? 0 : 32 - masklen;
-  return rb_funcall( rb_eval_string( "Trema::IP" ), rb_intern( "new" ), 2, UINT2NUM( nw_addr ), UINT2NUM( prefixlen ) );
+  VALUE ipv4_addr = rb_funcall( rb_eval_string( "Pio::IPv4Address" ), rb_intern( "new" ), 1, UINT2NUM( nw_addr ) );
+  return rb_funcall( ipv4_addr, rb_intern( "mask" ), 1, UINT2NUM( prefixlen ) );;
 }
 
 
@@ -526,7 +527,7 @@ match_init( int argc, VALUE *argv, VALUE self ) {
 
       VALUE nw_src = rb_hash_aref( options, ID2SYM( rb_intern( "nw_src" ) ) );
       if ( nw_src != Qnil ) {
-        VALUE nw_addr = rb_funcall( rb_eval_string( "Trema::IP" ), rb_intern( "new" ), 1, nw_src );
+        VALUE nw_addr = rb_funcall( rb_eval_string( "Pio::IPv4Address" ), rb_intern( "new" ), 1, nw_src );
         uint32_t prefixlen = ( uint32_t ) NUM2UINT( rb_funcall( nw_addr, rb_intern( "prefixlen" ), 0 ) );
         if ( prefixlen > 0 ) {
           match->nw_src = nw_addr_to_i( nw_addr );
@@ -537,7 +538,7 @@ match_init( int argc, VALUE *argv, VALUE self ) {
 
       VALUE nw_dst = rb_hash_aref( options, ID2SYM( rb_intern( "nw_dst" ) ) );
       if ( nw_dst != Qnil ) {
-        VALUE nw_addr = rb_funcall( rb_eval_string( "Trema::IP" ), rb_intern( "new" ), 1, nw_dst );
+        VALUE nw_addr = rb_funcall( rb_eval_string( "Pio::IPv4Address" ), rb_intern( "new" ), 1, nw_dst );
         uint32_t prefixlen = ( uint32_t ) NUM2UINT( rb_funcall( nw_addr, rb_intern( "prefixlen" ), 0 ) );
         if ( prefixlen > 0 ) {
           match->nw_dst = nw_addr_to_i( nw_addr );

ruby/trema/match.c

@@ -35,7 +35,7 @@ VALUE cPacketIn;
 #define PACKET_IN_RETURN_IP( packet_member )                                        \
   {                                                                                 \
     VALUE ret = ULONG2NUM( get_packet_in_info( self )->packet_member );             \
-    return rb_funcall( rb_eval_string( "Trema::IP" ), rb_intern( "new" ), 1, ret ); \
+    return rb_funcall( rb_eval_string( "Pio::IPv4Address" ), rb_intern( "new" ), 1, ret ); \
   }
 
 #define PACKET_IN_RETURN_NUM( flag, func, packet_member )               \
@@ -391,8 +391,8 @@ packet_in_arp_sha( VALUE self ) {
 /*
  * The ARP source protocol address of a packet.
  *
- * @return [Trema::IP, nil]
- *   the value of ARP source protocol address as a Trema::IP object or nil if
+ * @return [Pio::IPv4Address, nil]
+ *   the value of ARP source protocol address as a Pio::IPv4Address object or nil if
  *   packet is not an ARP.
  */
 static VALUE
@@ -427,8 +427,8 @@ packet_in_arp_tha( VALUE self ) {
 /*
  * The ARP target protocol address of a packet.
  *
- * @return [Trema::IP]
- *   the value of ARP target protocol address as a Trema::IP object or nil if
+ * @return [Pio::IPv4Address]
+ *   the value of ARP target protocol address as a Pio::IPv4Address object or nil if
  *   packet is not an ARP.
  */
 static VALUE
@@ -522,8 +522,8 @@ packet_in_rarp_sha( VALUE self ) {
 /*
  * The RARP source protocol address of a packet.
  *
- * @return [Trema::IP, nil]
- *   the value of RARP source protocol address as a Trema::IP object or nil if
+ * @return [Pio::IPv4Address, nil]
+ *   the value of RARP source protocol address as a Pio::IPv4Address object or nil if
  *   packet is not an RARP.
  */
 static VALUE
@@ -558,8 +558,8 @@ packet_in_rarp_tha( VALUE self ) {
 /*
  * The ARP target protocol address of a packet.
  *
- * @return [Trema::IP]
- *   the value of RARP target protocol address as a Trema::IP object or nil if
+ * @return [Pio::IPv4Address]
+ *   the value of RARP target protocol address as a Pio::IPv4Address object or nil if
  *   packet is not an RARP.
  */
 static VALUE
@@ -691,8 +691,8 @@ packet_in_ipv4_checksum( VALUE self ) {
 /*
  * The IPv4 source IP address of a packet.
  *
- * @return [Trema::IP,nil]
- *   the value of IPv4 source IP address as a Trema::IP object or nil if
+ * @return [Pio::IPv4Address,nil]
+ *   the value of IPv4 source IP address as a Pio::IPv4Address object or nil if
  *   packet is not an IPv4.
  */
 static VALUE
@@ -709,8 +709,8 @@ packet_in_ipv4_saddr( VALUE self ) {
 /*
  * The IPV4 destination IP address of a packet.
  *
- * @return [Trema::IP, nil]
- *   the value of IPv4 destination IP address as a Trema::IP object or nil if
+ * @return [Pio::IPv4Address, nil]
+ *   the value of IPv4 destination IP address as a Pio::IPv4Address object or nil if
  *   packet is not an IPv4.
  */
 static VALUE
@@ -814,8 +814,8 @@ packet_in_icmpv4_seq( VALUE self ) {
 /*
  * The ICMPv4 redirect message gateway IP address.
  *
- * @return [Trema::IP, nil]
- *   the value of ICMPv4 redirect message IP gateway address as a Trema::IP
+ * @return [Pio::IPv4Address, nil]
+ *   the value of ICMPv4 redirect message IP gateway address as a Pio::IPv4Address
  *   object or nil if packet is not ICMPv4.
  */
 static VALUE
@@ -1009,8 +1009,8 @@ packet_in_igmp_type( VALUE self ) {
 /*
  * The IGMP group address.
  *
- * @return [Trema::IP, nil]
- *   the value of IGMP IP group address as a Trema::IP object
+ * @return [Pio::IPv4Address, nil]
+ *   the value of IGMP IP group address as a Pio::IPv4Address object
  *   or nil if packet is not IGMP.
  */
 static VALUE
@@ -1228,7 +1228,7 @@ packet_in_udp_checksum( VALUE self ) {
  */
 void
 Init_packet_in() {
-  rb_require( "trema/ip" );
+  rb_require( "pio" );
   rb_require( "trema/mac" );
   mTrema = rb_eval_string( "Trema" );
   cPacketIn = rb_define_class_under( mTrema, "PacketIn", rb_cObject );

ruby/trema/packet-in.c

@@ -225,7 +225,7 @@ get_action( const struct ofp_action_header *ah ) {
     {
       const struct ofp_action_nw_addr *action_nw_addr = ( const struct ofp_action_nw_addr * ) ah;
 
-      VALUE ip_address = rb_funcall( rb_eval_string( "Trema::IP " ), rb_intern( "new" ), 1, UINT2NUM( action_nw_addr->nw_addr ) );
+      VALUE ip_address = rb_funcall( rb_eval_string( "Pio::IPv4Address " ), rb_intern( "new" ), 1, UINT2NUM( action_nw_addr->nw_addr ) );
       if ( ah->type == OFPAT_SET_NW_SRC ) {
         action = rb_funcall( rb_eval_string( "Trema::SetIpSrcAddr" ), rb_intern( "new" ), 1, rb_funcall( ip_address, rb_intern( "to_s" ), 0 ) );
       }

ruby/trema/stats-reply.c

@@ -17,6 +17,7 @@
 
 
 require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
+require "pio"
 require "trema"
 
 
@@ -112,8 +113,8 @@ class FlowRemovedController < Controller; end
           expect( message.match.dl_vlan_pcp ).to eq( 0 )
           expect( message.match.nw_tos ).to eq( 0 )
           expect( message.match.nw_proto ).to eq( 17 )
-          expect( Trema::IP.new( message.match.nw_src ).to_s ).to eq( "192.168.0.1" )
-          expect( Trema::IP.new( message.match.nw_dst ).to_s ).to eq( "192.168.0.2" )
+          expect( Pio::IPv4Address.new( message.match.nw_src ).to_s ).to eq( "192.168.0.1" )
+          expect( Pio::IPv4Address.new( message.match.nw_dst ).to_s ).to eq( "192.168.0.2" )
           expect( message.match.tp_src ).to eq( 1 )
           expect( message.match.tp_dst ).to eq( 1 )
           expect( message.cookie ).to eq( 123456789 )

spec/trema/flow-removed_spec.rb

@@ -86,9 +86,9 @@ def packet_in datapath_id, message
           expect( message.eth_type ).to eq( 0x0800 )
           expect( message.ipv4? ).to be_true
           expect( message.ipv4_version ).to eq( 4 )
-          expect( message.ipv4_saddr ).to be_instance_of( Trema::IP )
+          expect( message.ipv4_saddr ).to be_instance_of( Pio::IPv4Address )
           expect( message.ipv4_saddr.to_s ).to eq( "192.168.1.1" )
-          expect( message.ipv4_daddr ).to be_instance_of( Trema::IP )
+          expect( message.ipv4_daddr ).to be_instance_of( Pio::IPv4Address )
           expect( message.ipv4_daddr.to_s ).to eq( "192.168.1.2" )
         end
         send_and_wait

spec/trema/ip_spec.rb

@@ -29,6 +29,7 @@ Gem::Specification.new do | gem |
   gem.add_dependency "bundler"
   gem.add_dependency "gli", "~> 2.8.0"
   gem.add_dependency "paper_house", "~> 0.4.0"
+  gem.add_dependency "pio", "~> 0.2.4"
   gem.add_dependency "rake", "~> 10.1.0"
   gem.add_dependency "rdoc", "~> 4.0.1"
 end