trema 0.3.20 → 0.3.21

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.8.7-p371

data/Gemfile

@@ -14,15 +14,16 @@ gemspec
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "aruba", "~> 0.5.3"
-  gem "cucumber", "~> 1.3.2"
-  gem "flay", "~> 2.3.0"
-  gem "flog", "~> 4.1.0"
+  gem "cucumber", "~> 1.3.6"
+  gem "flay", "~> 2.4.0"
+  gem "flog", "~> 4.1.1"
   gem "rcov", "~> 1.0.0"
-  gem "redcarpet", "~> 2.3.0"
-  gem "reek", "~> 1.3.1"
+  gem "redcarpet", "~> 2.3.0" if RUBY_VERSION < "1.9.0"
+  gem "redcarpet", "~> 3.0.0" if RUBY_VERSION >= "1.9.0"
+  gem "reek", "~> 1.3.3"
   gem "relish", "~> 0.7"
-  gem "rspec", "~> 2.13.0"
-  gem "yard", "~> 0.8.6.1"
+  gem "rspec", "~> 2.14.1"
+  gem "yard", "~> 0.8.7"
 end
 
 

data/README.md

@@ -66,7 +66,11 @@ Getting Started
 
     $ sudo gem install trema
 
-3.Follow the guidelines to start developing your OpenFlow controller. You may find the following resources handy:
+3.Optional: Install Wireshark to diagnose internal data-flows.
+
+    $ sudo apt-get install wireshark
+
+4.Follow the guidelines to start developing your OpenFlow controller. You may find the following resources handy:
 
 * The [Getting Started with Trema](https://github.com/trema/trema/wiki/Quick-start).
 * The [Trema in 10 Minutes Tutorial](http://trema-10min.heroku.com/).

data/Rakefile

@@ -37,10 +37,7 @@ task :build_trema => [ Trema.log, Trema.pid, Trema.sock ] do
 end
 
 
-require "paper-house/executable-task"
-require "paper-house/ruby-library-task"
-require "paper-house/shared-library-task"
-require "paper-house/static-library-task"
+require "paper-house"
 require "trema/version"
 
 

data/ruby/trema/match.c

@@ -105,8 +105,8 @@ ofp_match *get_match( VALUE self ) {
 static VALUE
 match_from( int argc, VALUE *argv, VALUE self ) {
   VALUE message, obj, wildcard_id, options;
-  struct ofp_match *match;
-  packet_in *packet;
+  struct ofp_match *match = NULL;
+  packet_in *packet = NULL;
   uint32_t wildcards = 0;
 
   if ( rb_scan_args( argc, argv, "1*", &message, &options ) >= 1 ) {
@@ -153,8 +153,11 @@ match_from( int argc, VALUE *argv, VALUE self ) {
         wildcards |= OFPFW_TP_DST;
       }
     }
+    set_match_from_packet( match, packet->in_port, wildcards, packet->data );
+  }
+  else {
+    rb_raise( rb_eArgError, "Message is a mandatory option" );
   }
-  set_match_from_packet( match, packet->in_port, wildcards, packet->data );
   return obj;
 }
 

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.3.20"
+  VERSION = "0.3.21"
 end
 
 

data/src/switch_manager/switch_manager.c

@@ -341,6 +341,7 @@ parse_argument( struct listener_info *listener_info, int argc, char *argv[] ) {
   const int switch_arg_begin = optind;
 
   // reorder switch daemon arguments
+  opterr = 0; // disable error messages of trema common options
   while ( getopt_long( argc, argv, switch_short_options, switch_long_options, NULL ) != -1 );
 
   // index of first packet_in::..., etc. in argv

data/src/tremashark/tremashark.c

@@ -289,20 +289,20 @@ init_pcap() {
   if ( output_to_pcap_file ) {
     outfile_fd = open( pcap_file_pathname, O_RDWR | O_CREAT | O_TRUNC, mode );
     if ( outfile_fd < 0 ) {
-      critical( "Failed to open a file (%s).", pcap_file_pathname );
+      critical( "Failed to open a file ( pcap file = %s ).", pcap_file_pathname );
       assert( 0 );
     }
   }
   else {
     int ret = mkfifo( fifo_pathname, mode );
     if ( ret < 0 ) {
-      critical( "Failed to create a named pipe." );
+      critical( "Failed to create a named pipe ( named pipe = %s ).", fifo_pathname );
       assert( 0 );
     }
 
     outfile_fd = open( fifo_pathname, O_RDWR | O_APPEND | O_NONBLOCK );
     if ( outfile_fd < 0 ) {
-      critical( "Failed to open a named pipe." );
+      critical( "Failed to open a named pipe ( named pipe = %s ).", fifo_pathname );
       assert( 0 );
     }
   }
@@ -310,7 +310,7 @@ init_pcap() {
   ssize_t ret = write( outfile_fd, &header, sizeof( struct pcap_file_header ) );
 
   if ( ret != sizeof( struct pcap_file_header ) ) {
-    critical( "Failed to write a pcap header." );
+    critical( "Failed to write a pcap header ( pcap file = %s ).", pcap_file_pathname );
     assert( 0 );
   }
 
@@ -383,10 +383,13 @@ start_wireshark() {
   if ( pid == 0 ) {
     if ( launch_wireshark ) {
       execlp( WIRESHARK, "wireshark", "-k", "-i", fifo_pathname, NULL );
+      error( "can't execute wireshark ( errno = %s [%d] ).", strerror( errno ), errno );
     }
     else if ( launch_tshark ) {
       execlp( TSHARK, "tshark", "-V", "-i", fifo_pathname, NULL );
+      error( "can't execute tshark ( errno = %s [%d] ).", strerror( errno ), errno );
     }
+    exit( EXIT_FAILURE );
   }
 }
 

data/trema.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do | gem |
   gem.test_files = `git ls-files -- {spec,features}/*`.split( "\n" )
 
   gem.add_dependency "bundler"
-  gem.add_dependency "gli", "~> 2.6.1"
-  gem.add_dependency "paper-house", "~> 0.1.14"
+  gem.add_dependency "gli", "~> 2.7.0"
+  gem.add_dependency "paper-house", "~> 0.3.1"
   gem.add_dependency "rake", "~> 10.1.0"
   gem.add_dependency "rdoc", "~> 4.0.1"
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  version: 0.3.20
+  hash: 57
+  prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 21
+  version: 0.3.21
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -9,59 +15,86 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2013-06-27 00:00:00 Z
+date: 2013-09-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - &id006 
-      - ">="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
+  name: bundler
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: gli
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.6.1
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
+        version: 2.7.0
+  name: gli
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: paper-house
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.14
+        hash: 17
+        segments: 
+        - 0
+        - 3
+        - 1
+        version: 0.3.1
+  name: paper-house
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 75
+        segments: 
+        - 10
+        - 1
+        - 0
         version: 10.1.0
+  name: rake
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   type: :runtime
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 4
+        - 0
+        - 1
         version: 4.0.1
+  name: rdoc
   prerelease: false
-  version_requirements: *id005
+  type: :runtime
+  requirement: *id005
 description: Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C.
 email: 
 - yasuhito@gmail.com
@@ -75,7 +108,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - .mono.rant
-- .rvmrc
+- .ruby-version
 - .travis.yml
 - .yardopts
 - Doxyfile
@@ -768,27 +801,37 @@ files:
 homepage: http://github.com/trema/trema
 licenses: 
 - GPL2
-metadata: {}
-
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - ruby
 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 
+  none: false
   requirements: 
-  - *id006
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Full-stack OpenFlow framework.
 test_files: []
 

checksums.yaml

@@ -1,7 +0,0 @@
---- 
-SHA1: 
-  metadata.gz: 16d03309cfb3b65ed463dff0c59990db3f87dc26
-  data.tar.gz: 7e9dbad2ecea2ab026bf0ba0ee3cb79cf2885009
-SHA512: 
-  metadata.gz: be99f19cbba01fd9c25eaaee21389ffc4c334adefc5a5f6b681f8bd89938cef58780cb46bde60997c6d414f124465ef08035a22ed830498d7915c68f55256af5
-  data.tar.gz: 4de20550f57a268e26f419d53510222a5294caee7dc5ce31a472aded241ea7e40b000fbb8a0e235164d64dda1e7664f204e670aa71fa75c0cb38bc4e87c7246a

data/.rvmrc

@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use 1.8.7" > .rvmrc
-environment_id="ruby-1.8.7-p371"
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.18.6 (stable)" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
-    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
-  if [[ $- == *i* ]] # check for interactive shells
-  then echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
-  else echo "Using: $GEM_HOME" # don't use colors in non-interactive shells
-  fi
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create use  "$environment_id" || {
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  }
-fi
-
-# If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]] && {
-#   ! builtin command -v bundle >/dev/null ||
-#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
-# }
-# then
-#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
-#   gem install bundler
-# fi
-# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
-# then
-#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
-# fi