trema 0.1.3.2 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.3.2
+0.2.0

data/cruise.rb

@@ -366,9 +366,9 @@ def init_cruise
   $start_time = Time.now
   sh "./build.rb distclean"
   sh "bundle install"
-  mkdir_p Trema.log_directory
-  mkdir_p Trema.pid_directory
-  mkdir_p Trema.sock_directory
+  mkdir_p Trema.log
+  mkdir_p Trema.pid
+  mkdir_p Trema.sock
 end
 
 

data/features/step_definitions/misc_steps.rb

@@ -25,10 +25,10 @@ end
 
 When /^wait until "([^"]*)" is up$/ do | process |
   nloop = 0
-  pid_file = File.join( Trema.pid_directory, "#{ process }.pid" )
+  pid_file = File.join( Trema.pid, "#{ process }.pid" )
   loop do
     nloop += 1
-    raise "Timeout" if nloop > 30
+    raise "Timeout" if nloop > 50 # FIXME
     break if FileTest.exists?( pid_file ) and not ps_entry_of( process ).nil?
     sleep 0.1
   end

data/features/support/env.rb

@@ -48,13 +48,13 @@ end
 
 
 def cucumber_log name
-  File.join Trema.log_directory, name
+  File.join Trema.log, name
 end
 
 
 def new_tmp_log
-  system "rm #{ Trema.log_directory }/tmp.*" # cleanup
-  `mktemp --tmpdir=#{ Trema.log_directory }`.chomp  
+  system "rm #{ Trema.log }/tmp.*" # cleanup
+  `mktemp --tmpdir=#{ Trema.log }`.chomp  
 end
 
 

data/ruby/trema/command/kill.rb

@@ -47,7 +47,7 @@ module Trema
       context = Trema::DSL::Context.load_current
 
       # [FIXME] Trema apps does not appear in context.apps. why?
-      pid_file = File.join( Trema.pid_directory, "#{ ARGV[ 0 ] }.pid" )
+      pid_file = File.join( Trema.pid, "#{ ARGV[ 0 ] }.pid" )
       if FileTest.exist?( pid_file )
         Trema::Process.read( pid_file ).kill!
       end

data/ruby/trema/daemon.rb

@@ -111,9 +111,9 @@ module Trema
     def pid_file
       prefix = self.class.name.demodulize.underscore
       if self.class.class_eval { class_variable_get :@@singleton_daemon }
-        File.join Trema.pid_directory, "#{ prefix }.pid"
+        File.join Trema.pid, "#{ prefix }.pid"
       else
-        File.join Trema.pid_directory, "#{ prefix }.#{ daemon_id }.pid"
+        File.join Trema.pid, "#{ prefix }.#{ daemon_id }.pid"
       end
     end
 
@@ -134,7 +134,7 @@ module Trema
       end
       return nil if log_file_block.nil?
       name = log_file_block.call( self )
-      File.join Trema.log_directory, name
+      File.join Trema.log, name
     end
 
 

data/ruby/trema/executables.rb

@@ -1,6 +1,4 @@
 #
-# Trema executables.
-#
 # Author: Yasuhito Takamiya <yasuhito@gmail.com>
 #
 # Copyright (C) 2008-2012 NEC Corporation
@@ -20,71 +18,55 @@
 #
 
 
+require "trema/monkey-patch/module"
+require "trema/monkey-patch/string"
 require "trema/path"
 
 
+#
+# Holds the list of executalbes found in {Trema.objects} directory.
+#
 class Trema::Executables
-  def self.tremashark
-    File.join Trema.objects, "tremashark/tremashark"
-  end
-
-
-  def self.packet_capture
-    File.join Trema.objects, "tremashark/packet_capture"
-  end
-
-
-  def self.syslog_relay
-    File.join Trema.objects, "tremashark/syslog_relay"
-  end
-
-
-  def self.stdin_relay
-    File.join Trema.objects, "tremashark/stdin_relay"
-  end
-
-
-  def self.switch_manager
-    File.join Trema.objects, "switch_manager/switch_manager"
-  end
-
-
-  def self.switch
-    File.join Trema.objects, "switch_manager/switch"
-  end
-
-
-  def self.packetin_filter
-    File.join Trema.objects, "packetin_filter/packetin_filter"
-  end
-
-
-  def self.phost
-    File.join Trema.objects, "phost/phost"
-  end
+  class << self
+    def compiled?
+      @list.each do | each |
+        return false if not FileTest.executable?( __send__ each )
+      end
+    end
 
 
-  def self.cli
-    File.join Trema.objects, "phost/cli"
-  end
+    ############################################################################
+    private
+    ############################################################################
 
 
-  def self.ovs_openflowd
-    File.join Trema.objects, "openvswitch/bin/ovs-openflowd"
-  end
+    def add name
+      @list ||= []
+      @list << name
+    end
 
 
-  def self.ovs_ofctl
-    File.join Trema.objects, "openvswitch/bin/ovs-ofctl"
+    def path path
+      name = File.basename( path ).underscore
+      define_class_method( name ) do
+        File.join Trema.objects, path
+      end
+      add name
+    end
   end
 
 
-  def self.compiled?
-    m = singleton_methods - [ "const_missing", "to_yaml", "yaml_tag_subclasses?", "compiled?" ]
-    m.inject( true ) do | result, each |
-      result &&= FileTest.executable?( eval each )
-    end
-  end
+  path "openvswitch/bin/ovs-ofctl"
+  path "openvswitch/bin/ovs-openflowd"
+  path "packetin_filter/packetin_filter"
+  path "phost/cli"
+  path "phost/phost"
+  path "switch_manager/switch"
+  path "switch_manager/switch_manager"
+  path "tremashark/packet_capture"
+  path "tremashark/stdin_relay"
+  path "tremashark/syslog_relay"
+  path "tremashark/tremashark"
 end
 
 

data/ruby/trema/link.rb

@@ -18,8 +18,11 @@
 #
 
 
-require "ifconfig"
 require "trema/network-component"
+require "trema/path"
+
+$LOAD_PATH.unshift File.join( Trema.vendor_ruby_ifconfig, "lib" )
+require "ifconfig"
 
 
 module Trema

data/ruby/trema/monkey-patch/module.rb

@@ -18,10 +18,12 @@
 #
 
 
+require "trema/monkey-patch/module/class-method"
 require "trema/monkey-patch/module/deprecation"
 
 
 class Module
+  include MonkeyPatch::Module::ClassMethod
   include MonkeyPatch::Module::Deprecation
 end
 

data/ruby/trema/monkey-patch/module/class-method.rb

@@ -0,0 +1,40 @@
+#
+# Author: Yasuhito Takamiya <yasuhito@gmail.com>
+#
+# Copyright (C) 2008-2012 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 MonkeyPatch
+  module Module
+    module ClassMethod
+      def define_class_method name, &block
+        self.extend ::Module.new {
+          define_method name.to_s do
+            block.call
+          end
+        }
+      end
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/ruby/trema/open-vswitch.rb

@@ -141,7 +141,7 @@ module Trema
 
 
     def unixctl
-      File.join Trema.sock_directory, "ovs-openflowd.#{ name }.ctl"
+      File.join Trema.sock, "ovs-openflowd.#{ name }.ctl"
     end
   end
 end

data/ruby/trema/packet_in.c

@@ -26,6 +26,7 @@
 
 extern VALUE mTrema;
 VALUE cPacketIn;
+VALUE mPacketInVTAG;
 VALUE mPacketInARP;
 VALUE mPacketInIPv4;
 VALUE mPacketInICMPv4;
@@ -213,6 +214,77 @@ packet_in_eth_type( VALUE self ) {
 }
 
 
+/*
+ * Is a packet with VLAN tag?
+ *
+ * @return [bool] vtag? Is a packet with VLAN tag?
+ */
+static VALUE
+packet_in_is_vtag( VALUE self ) {
+  if ( ( get_packet_in_info( self )->format & ETH_8021Q ) ) {
+    return Qtrue;
+  }
+  else {
+    return Qfalse;
+  }
+}
+
+
+/*
+ * The vlan tpid.
+ *
+ * @return [integer] vlan_tpid The vlan tpid
+ */
+static VALUE
+packet_in_vlan_tpid( VALUE self ) {
+  return UINT2NUM( get_packet_in_info( self )->vlan_tpid );
+}
+
+
+/*
+ * The vlan tci.
+ *
+ * @return [integer] vlan_tci The vlan tci
+ */
+static VALUE
+packet_in_vlan_tci( VALUE self ) {
+  return UINT2NUM( get_packet_in_info( self )->vlan_tci );
+}
+
+
+/*
+ * The vlan prio.
+ *
+ * @return [integer] vlan_prio The vlan prio
+ */
+static VALUE
+packet_in_vlan_prio( VALUE self ) {
+  return UINT2NUM( ( unsigned int ) get_packet_in_info( self )->vlan_prio );
+}
+
+
+/*
+ * The vlan cfi.
+ *
+ * @return [integer] vlan_cfi The vlan cfi
+ */
+static VALUE
+packet_in_vlan_cfi( VALUE self ) {
+  return UINT2NUM( ( unsigned int ) get_packet_in_info( self )->vlan_cfi );
+}
+
+
+/*
+ * The vlan vid.
+ *
+ * @return [integer] vlan_vid The vlan vid
+ */
+static VALUE
+packet_in_vlan_vid( VALUE self ) {
+  return UINT2NUM( get_packet_in_info( self )->vlan_vid );
+}
+
+
 /*
  * Is an ARP packet?
  *
@@ -621,6 +693,17 @@ packet_in_igmp_group( VALUE self ) {
 }
 
 
+/*
+ * The IGMP checksum.
+ *
+ * @return [Integer] igmp_checksum a IGMP checksum.
+ */
+static VALUE
+packet_in_igmp_checksum( VALUE self ) {
+  return UINT2NUM( get_packet_in_info( self )->igmp_checksum );
+}
+
+
 /*
  * Is a TCP packet?
  *
@@ -835,6 +918,7 @@ Init_packet_in() {
   rb_define_method( cPacketIn, "macda", packet_in_macda, 0 );
   rb_define_method( cPacketIn, "eth_type", packet_in_eth_type, 0 );
 
+  rb_define_method( cPacketIn, "vtag?", packet_in_is_vtag, 0 );
   rb_define_method( cPacketIn, "arp?", packet_in_is_arp, 0 );
   rb_define_method( cPacketIn, "ipv4?", packet_in_is_ipv4, 0 );
   rb_define_method( cPacketIn, "icmpv4?", packet_in_is_icmpv4, 0 );
@@ -842,6 +926,13 @@ Init_packet_in() {
   rb_define_method( cPacketIn, "tcp?", packet_in_is_tcp, 0 );
   rb_define_method( cPacketIn, "udp?", packet_in_is_udp, 0 );
 
+  mPacketInVTAG = rb_define_module_under( mTrema, "PacketInVTAG" );
+  rb_define_method( mPacketInVTAG, "vlan_tpid", packet_in_vlan_tpid, 0 );
+  rb_define_method( mPacketInVTAG, "vlan_tci", packet_in_vlan_tci, 0 );
+  rb_define_method( mPacketInVTAG, "vlan_prio", packet_in_vlan_prio, 0 );
+  rb_define_method( mPacketInVTAG, "vlan_cfi", packet_in_vlan_cfi, 0 );
+  rb_define_method( mPacketInVTAG, "vlan_vid", packet_in_vlan_vid, 0 );
+
   mPacketInARP = rb_define_module_under( mTrema, "PacketInARP" );
   rb_define_method( mPacketInARP, "arp_oper", packet_in_arp_oper, 0 );
   rb_define_method( mPacketInARP, "arp_sha", packet_in_arp_sha, 0 );
@@ -873,6 +964,7 @@ Init_packet_in() {
   mPacketInIGMP = rb_define_module_under( mTrema, "PacketInIGMP" );
   rb_define_method( mPacketInIGMP, "igmp_type", packet_in_igmp_type, 0 );
   rb_define_method( mPacketInIGMP, "igmp_group", packet_in_igmp_group, 0 );
+  rb_define_method( mPacketInIGMP, "igmp_checksum", packet_in_igmp_checksum, 0 );
   rb_define_method( mPacketInIGMP, "igmp_membership_query?", packet_in_is_igmp_membership_query, 0 );
   rb_define_method( mPacketInIGMP, "igmp_v1_membership_report?", packet_in_is_igmp_v1_membership_report, 0 );
   rb_define_method( mPacketInIGMP, "igmp_v2_membership_report?", packet_in_is_igmp_v2_membership_report, 0 );
@@ -916,6 +1008,10 @@ handle_packet_in( uint64_t datapath_id, packet_in message ) {
 
   packet_info* info = ( packet_info * ) tmp->data->user_data;
 
+  if ( ( info->format & ETH_8021Q ) ) {
+    rb_funcall( cPacketIn, rb_intern( "include" ), 1, mPacketInVTAG );
+  }
+
   if ( ( info->format & NW_ARP ) ) {
     rb_funcall( cPacketIn, rb_intern( "include" ), 1, mPacketInARP );
   }

data/ruby/trema/path.rb

@@ -1,6 +1,4 @@
 #
-# Trema paths.
-#
 # Author: Yasuhito Takamiya <yasuhito@gmail.com>
 #
 # Copyright (C) 2008-2012 NEC Corporation
@@ -20,111 +18,63 @@
 #
 
 
-module Trema
-  def self.home
-    File.expand_path File.join( File.dirname( __FILE__ ), "..", ".." )
-  end
+require "trema/monkey-patch/module"
 
 
-  def self.objects
-    File.join home, "objects"
-  end
-
-
-  def self.cmockery
-    File.join objects, "cmockery"
-  end
-
-
-  def self.openvswitch
-    File.join objects, "openvswitch"
-  end
-
-
-  def self.cmockery_h
-    File.join cmockery, "include/google/cmockery.h"
-  end
-
-
-  def self.libcmockery_a
-    File.join cmockery, "lib/libcmockery.a"
-  end
-
-
-  def self.openflow
-    File.join objects, "openflow"
-  end
-
-
-  def self.openflow_h
-    File.join openflow, "openflow.h"
-  end
-
-
-  def self.oflops
-    File.join objects, "oflops"
-  end
-
-
-  def self.tmp
-    if ENV.key?( "TREMA_TMP" )
-      File.expand_path ENV[ "TREMA_TMP" ]
-    else
-      File.join home, "tmp"
-    end
-  end
-
-
-  def self.log_directory
-    File.join tmp, "log"
-  end
-
-
-  def self.pid_directory
-    File.join tmp, "pid"
-  end
-
-
-  def self.sock_directory
-    File.join tmp, "sock"
-  end
-
-
-  module Vendor
-    def self.path
-      File.join Trema.home, "vendor"
-    end
-
-
-    def self.cmockery
-      File.join path, "cmockery-20110428"
-    end
+module Trema
+  HOME = File.expand_path( File.join( File.dirname( __FILE__ ), "..", ".." ) )
 
 
-    def self.openflow
-      File.join path, "openflow-1.0.0"
+  class << self
+    def home
+      HOME
     end
 
 
-    def self.openflow_wireshark_plugin
-      File.join path, "openflow.git"
+    def tmp
+      if ENV.key?( "TREMA_TMP" )
+        File.expand_path ENV[ "TREMA_TMP" ]
+      else
+        File.join home, "tmp"
+      end
     end
 
 
-    def self.openvswitch
-      File.join path, "openvswitch-1.2.2"
-    end
+    ############################################################################
+    private
+    ############################################################################
 
 
-    def self.phost
-      File.join path, "phost"
+    def file base, path, name = nil
+      define_class_method( name || File.basename( path ).gsub( ".", "_" ) ) do
+        File.join __send__( base ), path
+      end
     end
+    alias :dir :file
+  end
 
 
-    def self.oflops
-      File.join path, "oflops-0.03"
-    end
-  end
+  dir :home, "objects"
+  dir :home, "src/lib", :include
+  dir :home, "vendor"
+  dir :objects, "cmockery"
+  dir :objects, "lib"
+  dir :objects, "oflops"
+  dir :objects, "openflow"
+  dir :objects, "openvswitch"
+  dir :tmp, "log"
+  dir :tmp, "pid"
+  dir :tmp, "sock"
+  dir :vendor, "cmockery-20110428", :vendor_cmockery
+  dir :vendor, "oflops-0.03", :vendor_oflops
+  dir :vendor, "openflow-1.0.0", :vendor_openflow
+  dir :vendor, "openflow.git", :vendor_openflow_git
+  dir :vendor, "openvswitch-1.2.2", :vendor_openvswitch
+  dir :vendor, "phost", :vendor_phost
+  dir :vendor, "ruby-ifconfig-1.2", :vendor_ruby_ifconfig
+  file :cmockery, "include/google/cmockery.h"
+  file :cmockery, "lib/libcmockery.a"
+  file :openflow, "openflow.h"
 end