trema 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 281c9abb37b075014c1ffa114fe1e690c6fd0746
-  data.tar.gz: a26c7d9a54f2f6227908f274201378dab82e8116
+  metadata.gz: 7a766e638ef31efd626005c5459901d9e0e5c7df
+  data.tar.gz: 5f136d6cacc764e8b55ed06727b08e100bca3baf
 SHA512:
-  metadata.gz: dc0908793e0d3d726737149c733b184c5e1f5e3505b26e66ef56d2044fd62c693719e973c18618da8d3531109dffca63aa24ef07df46755e820349be29edf6a1
-  data.tar.gz: 5d8f2e991f868011274e0735400e86be8be3b3eeda0820a9090ccbdef2edae4a2e30b045839e4eb5e9c6d154a173fec9cee9b11be1bf6c3562e9f2bc389d7e7f
+  metadata.gz: c905422655133ca3a741a6d71f45561b94c7997466f9a5fa066b1db7b063ea307b25c0aed00620f071f14fad772c84d8771e0c3dcc987d5f94954b1ac62198e9
+  data.tar.gz: 337f159d2325e2115003391322e1986c79a58ca13f8046ec1620607fa78c7baf550380a884e886f1d99ea6944e43b7d76f494ad37a38b425149512acf3665167

data/README.md

@@ -31,7 +31,7 @@ Trema supports GNU/Linux only. And it has been tested on the following environme
 * RubyGems 1.3.6 or higher
 * Ubuntu 13.04, 12.10, 12.04, 11.10, and 10.04 (i386/amd64, Desktop Edition)
 * Debian GNU/Linux 7.0 and 6.0 (i386/amd64)
-* Fedora 16 (i386/x86_64)
+* Fedora 16-19 (i386/x86_64)
 
 It may also run on other GNU/Linux distributions but is not tested and
 NOT SUPPORTED at this moment.
@@ -53,10 +53,10 @@ Getting Started
 
     (In Ubuntu 10.04)
     $ sudo apt-get install gcc make ruby rubygems ruby-dev libopenssl-ruby libpcap-dev libsqlite3-dev libglib2.0-dev
-    $ sudo gem install rubygems-update --version 2.0.8
+    $ sudo gem install rubygems-update
     $ sudo /var/lib/gems/1.8/bin/update_rubygems
 
-    (In Fedora 16)
+    (In Fedora 16-19)
     $ sudo yum install gcc make ruby rubygems ruby-devel libpcap-devel libsqlite3x-devel glib2-devel
 
 2.Install Trema at the command prompt:
@@ -94,12 +94,12 @@ class MyController < Controller
   def packet_in datapath_id, message
     # ...
   end
-  
+
   # handle Flow-Removed messages here.
   def flow_removed datapath_id, message
     # ...
   end
-  
+
   # ...
 end
 ```
@@ -131,7 +131,7 @@ class MyController < Controller
     send_flow_mod_add( datapath_id, ... )
     send_packet_out( datapath_id, ... )
   end
-  
+
   # ...
 end
 ```
@@ -152,11 +152,11 @@ class MyController < Controller
     # send a FeaturesRequest message
     send_message datapath_id, FeaturesRequest.new
   end
-  
+
   def features_reply datapath_id, message
     # ...
   end
-  
+
   # ...
 end
 ```
@@ -194,7 +194,7 @@ def packet_in datapath_id, message
     :match => Match.new( :in_port => message.in_port, ...)
     # ...
   )
-  
+
   # ...
 end
 ```
@@ -212,7 +212,7 @@ def packet_in datapath_id, message
     :match => ExactMatch.from( message )
     # ...
   )
-  
+
   # ...
 end
 ```

data/ruby/trema/packet-queue.rb

@@ -16,7 +16,7 @@
 #
 
 module Trema
-  class Queue
+  class PacketQueues
     class << self
       #
       # The {PacketQueue} to append to the list.
@@ -161,7 +161,7 @@ module Trema
       super property, len
       @rate = rate
       packet_queue.append self
-      Trema::Queue.append packet_queue
+      Trema::PacketQueues.append packet_queue
     end
 
 

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end
 
 

data/spec/spec_helper.rb

@@ -24,6 +24,7 @@ require "rubygems"
 
 require "rspec"
 require "rspec/autorun"
+require "pio"
 require "trema"
 require "trema/dsl/configuration"
 require "trema/dsl/context"

data/spec/trema/queue-get-config-reply_spec.rb

@@ -29,7 +29,7 @@ describe QueueGetConfigReply, ".new( VALID OPTIONS )" do
     QueueGetConfigReply.new( :datapath_id => 0xabc,
       :transaction_id => 123,
       :port => 1,
-      :queues => Trema::Queue.queues
+      :queues => Trema::PacketQueues.queues
     )
   end
   its( "queues.length" ) { should ==  2  }

data/src/lib/openflow_message.c

@@ -2268,7 +2268,7 @@ validate_port_mod( const buffer *message ) {
   if ( ( ntohl( port_mod->mask ) & ( uint32_t ) ~PORT_CONFIG ) != 0 ) {
     return ERROR_INVALID_PORT_MASK;
   }
-  if ( ( ntohl( port_mod->advertise ) & ( uint32_t ) ~PORT_CONFIG ) != 0 ) {
+  if ( ( ntohl( port_mod->advertise ) & ( uint32_t ) ~PORT_FEATURES ) != 0 ) {
     return ERROR_INVALID_PORT_FEATURES;
   }
 

data/trema.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do | gem |
   gem.email = [ "yasuhito@gmail.com" ]
   gem.homepage = "http://github.com/trema/trema"
 
-  gem.bindir = "."
   gem.executables = [ "trema", "trema-config" ]
   gem.files = `git ls-files`.split( "\n" )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trema
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
-bindir: .
+bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -794,8 +794,6 @@ files:
 - vendor/ruby-ifconfig-1.2/test/unit/tc_netbsd.rb
 - vendor/ruby-ifconfig-1.2/test/unit/tc_openbsd.rb
 - vendor/ruby-ifconfig-1.2/test/unit/tc_sunos.rb
-- ./trema
-- ./trema-config
 homepage: http://github.com/trema/trema
 licenses:
 - GPL2