trema 0.4.0 → 0.4.1

data/ruby/trema/match.c

@@ -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 );

data/ruby/trema/packet-in.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,8 @@ packet_in_udp_checksum( VALUE self ) {
  */
 void
 Init_packet_in() {
-  rb_require( "trema/ip" );
+  rb_require( "rubygems" );
+  rb_require( "pio" );
   rb_require( "trema/mac" );
   mTrema = rb_eval_string( "Trema" );
   cPacketIn = rb_define_class_under( mTrema, "PacketIn", rb_cObject );

data/ruby/trema/stats-reply.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 ) );
       }

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end
 
 

data/spec/trema/flow-removed_spec.rb

@@ -17,6 +17,7 @@
 
 
 require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
+require "pio"
 require "trema"
 
 
@@ -112,8 +113,8 @@ describe Trema::FlowRemoved, ".new( VALID OPTIONS )" do
           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 )

data/spec/trema/packet-in_spec.rb

@@ -86,9 +86,9 @@ describe Trema::PacketIn do
           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

data/trema.gemspec

@@ -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

metadata

@@ -1,97 +1,127 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: trema
-version: !ruby/object:Gem::Version
-  version: 0.4.0
+version: !ruby/object:Gem::Version 
+  hash: 13
+  prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
-authors:
+authors: 
 - Yasuhito Takamiya
 autorequire: 
 bindir: .
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-09-27 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
-- !ruby/object:Gem::Dependency
-  name: paper_house
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
+  name: gli
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.1.0
+  name: paper_house
+  prerelease: false
   type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 2
+        - 4
+        version: 0.2.4
+  name: pio
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  type: :runtime
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 75
+        segments: 
+        - 10
+        - 1
+        - 0
         version: 10.1.0
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.1
-  type: :runtime
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  type: :runtime
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 4
+        - 0
+        - 1
         version: 4.0.1
-description: Trema is a full-stack, easy-to-use framework for developing OpenFlow
-  controllers in Ruby and C.
-email:
+  name: rdoc
+  prerelease: false
+  type: :runtime
+  requirement: *id006
+description: Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C.
+email: 
 - yasuhito@gmail.com
-executables:
+executables: 
 - trema
 - trema-config
-extensions:
+extensions: 
 - Rakefile
-extra_rdoc_files:
+extra_rdoc_files: 
 - README.md
-files:
+files: 
 - .gitignore
 - .ruby-version
 - .travis.yml
@@ -242,7 +272,6 @@ files:
 - ruby/trema/hello.c
 - ruby/trema/hello.h
 - ruby/trema/host.rb
-- ruby/trema/ip.rb
 - ruby/trema/link.rb
 - ruby/trema/list-switches-reply.c
 - ruby/trema/list-switches-reply.h
@@ -376,7 +405,6 @@ files:
 - spec/trema/hardware-switch_spec.rb
 - spec/trema/hello_spec.rb
 - spec/trema/host_spec.rb
-- spec/trema/ip_spec.rb
 - spec/trema/link_spec.rb
 - spec/trema/list-switches-reply_spec.rb
 - spec/trema/mac_spec.rb
@@ -785,28 +813,40 @@ files:
 - ./trema
 - ./trema-config
 homepage: http://github.com/trema/trema
-licenses:
+licenses: 
 - GPL2
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - ruby
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Full-stack OpenFlow framework.
 test_files: []
+
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: ef20c00d0e61a93ddf449432c366f78b620ac54c
-  data.tar.gz: c516614e8c862044a82765a2faee850cbdccb30a
-SHA512:
-  metadata.gz: 1169678d2c9832448bbdab636a8323784873ca7f89ba3354ea8552f905c5e78bc2a77e8fd9a09e5ed3fddfc720166a530df3b47ae1282e54fe2b551196d63c47
-  data.tar.gz: a357cf352ea0004e22575e50e8060925bd9892923e9a8338aed04c5c42b25da402e4cb5cfff65409dc9a9b370b8373422dbd3743ba65d56fe6842a3c7be86a45

data/ruby/trema/ip.rb

@@ -1,111 +0,0 @@
-#
-# Copyright (C) 2008-2013 NEC Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 2, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-
-module Trema
-  #
-  # A wrapper class to IPAddr
-  #
-  class IP
-    require "ipaddr"
-
-
-    #
-    # @return [IPAddr] value object instance of proxied IPAddr.
-    #
-    attr_reader :value
-
-
-    #
-    # Creates a {IP} instance object as a proxy to IPAddr class.
-    #
-    # @overload initialize(addr)
-    #
-    # @param [String, Number] addr
-    #   an IPv4 address specified either as a String or Number.
-    #
-    # @param [Number] prefixlen
-    #   masking IPv4 address with given prefixlen.
-    #
-    # @raise [ArgumentError] invalid address if supplied argument is invalid
-    #   IPv4 address.
-    #
-    # @return [IP] self
-    #   a proxy to IPAddr.
-    #
-    def initialize addr, prefixlen = 32
-      if !addr.kind_of? String
-        @value = IPAddr.new( addr, Socket::AF_INET )
-      else
-        @value = IPAddr.new( addr )
-      end
-      if prefixlen < 32
-        @value = @value.mask( prefixlen )
-      end
-    end
-
-
-    #
-    # @return [ Number ] prefixlen of IPv4 address.
-    #
-    def prefixlen
-      range = @value.to_range
-      mask = range.first.to_i ^ range.last.to_i
-      masklen = 0
-      while mask != 0 do
-        mask = mask >> 1
-        masklen += 1
-      end
-      return 32 - masklen
-    end
-
-
-    #
-    # @return [String] the IPv4 address in its text representation.
-    #
-    def to_s
-      @value.to_s
-    end
-
-
-    #
-    # @return [Number] the IPv4 address in its numeric representation.
-    #
-    def to_i
-      @value.to_i
-    end
-
-
-    #
-    # @return [Array]
-    #    an array of decimal numbers converted from IP address.
-    #
-    def to_a
-      to_s.split( "." ).collect do | each |
-        each.to_i
-      end
-    end
-    alias :to_array :to_a
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/spec/trema/ip_spec.rb

@@ -1,54 +0,0 @@
-#
-# Copyright (C) 2008-2013 NEC Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 2, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema/ip"
-
-
-module Trema
-  describe IP do
-    context "when creating" do
-      subject { IP.new( ip_address, prefixlen ) }
-
-      context %{when "192.168.1.1/32"} do
-        let( :ip_address ) { "192.168.1.1" }
-        let( :prefixlen ) { 32 }
-
-        its( :to_s ) { should == "192.168.1.1" }
-        its( :to_i ) { should == 3232235777 }
-        its( :to_a ) { should == [ 0xc0, 0xa8, 0x01, 0x01 ] }
-      end
-
-      context %{when "10.1.1.1/8"} do
-        let( :ip_address ) { "10.1.1.1" }
-        let( :prefixlen ) { 8 }
-
-        its( :to_s ) { should == "10.0.0.0" }
-        its( :to_i ) { should == 10 * 256 * 256 * 256 }
-        its( :to_a ) { should == [ 0x0a, 0x00, 0x00, 0x00 ] }
-      end
-    end
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End: