trema 0.4.6 → 0.4.7

data/src/examples/learning_switch/learning_switch.c

@@ -86,36 +86,32 @@ learn( hash_table *forwarding_db, struct key new_key, uint16_t port_no ) {
   entry->last_update = now();
 }
 
+static void
+send_packet_out( packet_in packet_in, openflow_actions *actions ) {
+  buffer *frame = duplicate_buffer( packet_in.data );
+  fill_ether_padding( frame );
+
+  buffer *packet_out = create_packet_out(
+    get_transaction_id(),
+    UINT32_MAX,
+    packet_in.in_port,
+    actions,
+    frame
+  );
+
+  free_buffer( frame );
+  send_openflow_message( packet_in.datapath_id, packet_out );
+  free_buffer( packet_out );
+}
+
 
 static void
 do_flooding( packet_in packet_in ) {
   openflow_actions *actions = create_actions();
   append_action_output( actions, OFPP_FLOOD, UINT16_MAX );
 
-  buffer *packet_out;
-  if ( packet_in.buffer_id == UINT32_MAX ) {
-    buffer *frame = duplicate_buffer( packet_in.data );
-    fill_ether_padding( frame );
-    packet_out = create_packet_out(
-      get_transaction_id(),
-      packet_in.buffer_id,
-      packet_in.in_port,
-      actions,
-      frame
-    );
-    free_buffer( frame );
-  }
-  else {
-    packet_out = create_packet_out(
-      get_transaction_id(),
-      packet_in.buffer_id,
-      packet_in.in_port,
-      actions,
-      NULL
-    );
-  }
-  send_openflow_message( packet_in.datapath_id, packet_out );
-  free_buffer( packet_out );
+  send_packet_out( packet_in, actions );
+
   delete_actions( actions );
 }
 
@@ -136,7 +132,7 @@ send_packet( uint16_t destination_port, packet_in packet_in ) {
     60,
     0,
     UINT16_MAX,
-    packet_in.buffer_id,
+    UINT32_MAX,
     OFPP_NONE,
     OFPFF_SEND_FLOW_REM,
     actions
@@ -144,20 +140,7 @@ send_packet( uint16_t destination_port, packet_in packet_in ) {
   send_openflow_message( packet_in.datapath_id, flow_mod );
   free_buffer( flow_mod );
 
-  if ( packet_in.buffer_id == UINT32_MAX ) {
-    buffer *frame = duplicate_buffer( packet_in.data );
-    fill_ether_padding( frame );
-    buffer *packet_out = create_packet_out(
-      get_transaction_id(),
-      packet_in.buffer_id,
-      packet_in.in_port,
-      actions,
-      frame
-    );
-    send_openflow_message( packet_in.datapath_id, packet_out );
-    free_buffer( packet_out );
-    free_buffer( frame );
-  }
+  send_packet_out( packet_in, actions );
 
   delete_actions( actions );
 }

data/src/examples/list_switches/list-switches.rb

@@ -23,14 +23,14 @@ class ListSwitches < Controller
   periodic_timer_event :timeout, 30
 
 
-  def list_switches_reply dpids
-    info "switches = %s" % dpids.collect { | each | sprintf( "0x%x", each ) }.join( ", " )
+  def list_switches_reply(dpids)
+    info 'switches = %s' % dpids.collect { | each | sprintf('0x%x', each) }.join(', ')
     shutdown!
   end
 
 
   def timeout
-    error "List switches request timeout."
+    error 'List switches request timeout.'
     shutdown!
   end
 end

data/src/examples/match_compare/match-compare.rb

@@ -25,16 +25,16 @@ class MatchCompare < Controller
   end
 
 
-  def packet_in datapath_id, message
-    match = ExactMatch.from( message )
-    action, log = lookup_rules( datapath_id, match )
-    info "action=#{ action }, datapath_id=#{ datapath_id.to_hex }, message={#{ match.to_s }}" if log
+  def packet_in(datapath_id, message)
+    match = ExactMatch.from(message)
+    action, log = lookup_rules(datapath_id, match)
+    info "action=#{ action }, datapath_id=#{ datapath_id.to_hex }, message={#{ match }}" if log
     if action == :allow
-      actions = ActionOutput.new( OFPP_FLOOD )
-      send_flow_mod_add( datapath_id, :match => match, :idle_timeout => 60, :actions => actions )
-      send_packet_out( datapath_id, :packet_in => message, :actions => actions )
+      actions = ActionOutput.new(OFPP_FLOOD)
+      send_flow_mod_add(datapath_id, :match => match, :idle_timeout => 60, :actions => actions)
+      send_packet_out(datapath_id, :packet_in => message, :actions => actions)
     else
-      send_flow_mod_add( datapath_id, :match => match, :idle_timeout => 60 )
+      send_flow_mod_add(datapath_id, :match => match, :idle_timeout => 60)
     end
   end
 
@@ -45,7 +45,7 @@ class MatchCompare < Controller
   def add_rules
     dl_type_arp = 0x0806
     dl_type_ipv4 = 0x0800
-    network = "192.168.0.0/16"
+    network = '192.168.0.0/16'
 
     allow :dl_type => dl_type_arp
     allow :dl_type => dl_type_ipv4, :nw_src => network, :log => true
@@ -54,38 +54,38 @@ class MatchCompare < Controller
   end
 
 
-  def allow hash = {}
+  def allow(hash = {})
     add_rule :allow, hash
   end
 
 
-  def block hash = {}
+  def block(hash = {})
     add_rule :block, hash
   end
 
 
-  def add_rule action, hash
-    datapath_id = hash.key?( :datapath_id ) && hash.delete( :datapath_id ) || nil
-    log = hash.key?( :log ) && hash.delete( :log ) || false
-    rule = Struct.new( :action, :datapath_id, :match, :log )
-    @rules << rule.new( action, datapath_id, Match.new( hash ), log )
+  def add_rule(action, hash)
+    datapath_id = hash.key?(:datapath_id) && hash.delete(:datapath_id) || nil
+    log = hash.key?(:log) && hash.delete(:log) || false
+    rule = Struct.new(:action, :datapath_id, :match, :log)
+    @rules << rule.new(action, datapath_id, Match.new(hash), log)
   end
 
 
-  def lookup_rules datapath_id, match
+  def lookup_rules(datapath_id, match)
     action = :block # default action
     log = false
     @rules.each do | each |
-      if !each.datapath_id.nil? && datapath_id != each.datapath_id
+      if each.datapath_id && datapath_id != each.datapath_id
         next
       end
-      if each.match.compare( match )
+      if each.match.compare(match)
         action = each.action
         log = each.log
         break
       end
     end
-    return action, log
+    [action, log]
   end
 end
 

data/src/examples/multi_learning_switch/multi-learning-switch.rb

@@ -18,10 +18,10 @@
 #
 
 
-$LOAD_PATH << File.join( File.dirname( __FILE__ ), "../learning_switch/" )
+$LOAD_PATH << File.join(File.dirname(__FILE__), '../learning_switch/')
 
 
-require "fdb"
+require 'fdb'
 
 
 #
@@ -33,15 +33,15 @@ class MultiLearningSwitch < Controller
 
   def start
     @fdbs = Hash.new do | hash, datapath_id |
-      hash[ datapath_id ] = FDB.new
+      hash[ datapath_id] = FDB.new
     end
   end
 
 
-  def packet_in datapath_id, message
-    fdb = @fdbs[ datapath_id ]
+  def packet_in(datapath_id, message)
+    fdb = @fdbs[ datapath_id]
     fdb.learn message.macsa, message.in_port
-    port_no = fdb.port_no_of( message.macda )
+    port_no = fdb.port_no_of(message.macda)
     if port_no
       flow_mod datapath_id, message, port_no
       packet_out datapath_id, message, port_no
@@ -63,25 +63,25 @@ class MultiLearningSwitch < Controller
   ##############################################################################
 
 
-  def flow_mod datapath_id, message, port_no
+  def flow_mod(datapath_id, message, port_no)
     send_flow_mod_add(
       datapath_id,
-      :match => ExactMatch.from( message ),
-      :actions => ActionOutput.new( :port => port_no )
+      :match => ExactMatch.from(message),
+      :actions => ActionOutput.new(:port => port_no)
     )
   end
 
 
-  def packet_out datapath_id, message, port_no
+  def packet_out(datapath_id, message, port_no)
     send_packet_out(
       datapath_id,
       :packet_in => message,
-      :actions => ActionOutput.new( :port => port_no )
+      :actions => ActionOutput.new(:port => port_no)
     )
   end
 
 
-  def flood datapath_id, message
+  def flood(datapath_id, message)
     packet_out datapath_id, message, OFPP_FLOOD
   end
 end

data/src/examples/openflow_message/echo.rb

@@ -18,7 +18,7 @@
 #
 
 
-require  "example"
+require 'example'
 
 
 class EchoController < Controller
@@ -26,20 +26,20 @@ class EchoController < Controller
 
 
   class << self
-    def run args
+    def run(args)
       usage unless Example.options_parse args
     end
 
 
     def usage
       puts Example.cmd_usage
-      puts "Send count number of echo requests to datapath_id."
+      puts 'Send count number of echo requests to datapath_id.'
       exit false
     end
   end
 
 
-  def switch_ready msg_datapath_id
+  def switch_ready(msg_datapath_id)
     may_raise_error msg_datapath_id
     send_nr_msgs EchoRequest
   end

data/src/examples/openflow_message/example.rb

@@ -23,11 +23,11 @@ module Example
     attr_accessor :count, :datapath_id
 
 
-    def options_parse args
+    def options_parse(args)
       case args.length
       when 2
-        @datapath_id = args[ 0 ] =~ /^0x/ ? args[ 0 ].hex : args[ 0 ].to_i
-        @count = args[ 1 ].to_i
+        @datapath_id = args[ 0] =~ /^0x/ ? args[ 0].hex : args[ 0].to_i
+        @count = args[ 1].to_i
       else
         return false
       end
@@ -40,14 +40,14 @@ module Example
   end
 
 
-  def may_raise_error msg_datapath_id
-    raise ArgumentError, "Given datapath_id does not match configured datapath_id" if msg_datapath_id != Example::datapath_id
+  def may_raise_error(msg_datapath_id)
+    fail ArgumentError, 'Given datapath_id does not match configured datapath_id' if msg_datapath_id != Example::datapath_id
   end
 
 
-  def send_nr_msgs kclass
+  def send_nr_msgs(kclass)
     Example::count.times do
-      self.send_message Example::datapath_id, kclass.new
+      send_message Example::datapath_id, kclass.new
     end
   end
 end

data/src/examples/openflow_message/features-request.rb

@@ -20,12 +20,12 @@
 
 
 class FeaturesRequestController < Controller
-  def switch_ready datapath_id
+  def switch_ready(datapath_id)
     send_message datapath_id, FeaturesRequest.new
   end
 
 
-  def features_reply datapath_id, message
+  def features_reply(datapath_id, message)
     info "datapath_id: #{ datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
     info "n_buffers: #{ message.n_buffers }"
@@ -41,42 +41,42 @@ class FeaturesRequestController < Controller
   ##############################################################################
 
 
-  def print_capabilities capabilities
-    info "capabilities:"
-    info "  OFPC_FLOW_STATS" if capabilities & OFPC_FLOW_STATS != 0
-    info "  OFPC_TABLE_STATS" if capabilities & OFPC_TABLE_STATS != 0
-    info "  OFPC_PORT_STATS" if capabilities & OFPC_PORT_STATS != 0
-    info "  OFPC_STP" if capabilities & OFPC_STP != 0
-    info "  OFPC_RESERVED" if capabilities & OFPC_RESERVED != 0
-    info "  OFPC_IP_REASM" if capabilities & OFPC_IP_REASM != 0
-    info "  OFPC_QUEUE_STATS" if capabilities & OFPC_QUEUE_STATS != 0
-    info "  OFPC_ARP_MATCH_IP" if capabilities & OFPC_ARP_MATCH_IP != 0
+  def print_capabilities(capabilities)
+    info 'capabilities:'
+    info '  OFPC_FLOW_STATS' if capabilities & OFPC_FLOW_STATS != 0
+    info '  OFPC_TABLE_STATS' if capabilities & OFPC_TABLE_STATS != 0
+    info '  OFPC_PORT_STATS' if capabilities & OFPC_PORT_STATS != 0
+    info '  OFPC_STP' if capabilities & OFPC_STP != 0
+    info '  OFPC_RESERVED' if capabilities & OFPC_RESERVED != 0
+    info '  OFPC_IP_REASM' if capabilities & OFPC_IP_REASM != 0
+    info '  OFPC_QUEUE_STATS' if capabilities & OFPC_QUEUE_STATS != 0
+    info '  OFPC_ARP_MATCH_IP' if capabilities & OFPC_ARP_MATCH_IP != 0
   end
 
 
-  def print_actions actions
-    info "actions:"
-    info "  OFPAT_OUTPUT" if actions & ( 1 << OFPAT_OUTPUT ) != 0
-    info "  OFPAT_SET_VLAN_VID" if actions & ( 1 << OFPAT_SET_VLAN_VID ) != 0
-    info "  OFPAT_SET_VLAN_PCP" if actions & ( 1 << OFPAT_SET_VLAN_PCP ) != 0
-    info "  OFPAT_STRIP_VLAN" if actions & ( 1 << OFPAT_STRIP_VLAN ) != 0
-    info "  OFPAT_SET_DL_SRC" if actions & ( 1 << OFPAT_SET_DL_SRC ) != 0
-    info "  OFPAT_SET_DL_DST" if actions & ( 1 << OFPAT_SET_DL_DST ) != 0
-    info "  OFPAT_SET_NW_SRC" if actions & ( 1 << OFPAT_SET_NW_SRC ) != 0
-    info "  OFPAT_SET_NW_DST" if actions & ( 1 << OFPAT_SET_NW_DST ) != 0
-    info "  OFPAT_SET_NW_TOS" if actions & ( 1 << OFPAT_SET_NW_TOS ) != 0
-    info "  OFPAT_SET_TP_SRC" if actions & ( 1 << OFPAT_SET_TP_SRC ) != 0
-    info "  OFPAT_SET_TP_DST" if actions & ( 1 << OFPAT_SET_TP_DST ) != 0
-    info "  OFPAT_ENQUEUE" if actions & ( 1 << OFPAT_ENQUEUE ) != 0
-    info "  OFPAT_VENDOR" if actions & OFPAT_VENDOR != 0
+  def print_actions(actions)
+    info 'actions:'
+    info '  OFPAT_OUTPUT' if actions & ( 1 << OFPAT_OUTPUT) != 0
+    info '  OFPAT_SET_VLAN_VID' if actions & ( 1 << OFPAT_SET_VLAN_VID) != 0
+    info '  OFPAT_SET_VLAN_PCP' if actions & ( 1 << OFPAT_SET_VLAN_PCP) != 0
+    info '  OFPAT_STRIP_VLAN' if actions & ( 1 << OFPAT_STRIP_VLAN) != 0
+    info '  OFPAT_SET_DL_SRC' if actions & ( 1 << OFPAT_SET_DL_SRC) != 0
+    info '  OFPAT_SET_DL_DST' if actions & ( 1 << OFPAT_SET_DL_DST) != 0
+    info '  OFPAT_SET_NW_SRC' if actions & ( 1 << OFPAT_SET_NW_SRC) != 0
+    info '  OFPAT_SET_NW_DST' if actions & ( 1 << OFPAT_SET_NW_DST) != 0
+    info '  OFPAT_SET_NW_TOS' if actions & ( 1 << OFPAT_SET_NW_TOS) != 0
+    info '  OFPAT_SET_TP_SRC' if actions & ( 1 << OFPAT_SET_TP_SRC) != 0
+    info '  OFPAT_SET_TP_DST' if actions & ( 1 << OFPAT_SET_TP_DST) != 0
+    info '  OFPAT_ENQUEUE' if actions & ( 1 << OFPAT_ENQUEUE) != 0
+    info '  OFPAT_VENDOR' if actions & OFPAT_VENDOR != 0
   end
 
 
-  def print_ports ports
-    info "ports:"
+  def print_ports(ports)
+    info 'ports:'
     ports.each do | each |
-      info "  port_no: %u" % each.number
-      info "    hw_addr = #{ each.hw_addr.to_s }"
+      info '  port_no: %u' % each.number
+      info "    hw_addr = #{ each.hw_addr }"
       info "    name = #{ each.name }"
       info "    config = #{ each.config.to_hex }"
       info "    state = #{ each.state.to_hex }"

data/src/examples/openflow_message/hello.rb

@@ -24,11 +24,11 @@ class HelloController < Controller
       STDERR.puts "Usage: #{ File.basename __FILE__ } COUNT"
       shutdown!
     end
-    @count = ARGV[ 0 ].to_i
+    @count = ARGV[ 0].to_i
   end
 
 
-  def switch_ready datapath_id
+  def switch_ready(datapath_id)
     @count.times do
       send_message datapath_id, Hello.new
     end

data/src/examples/openflow_message/set-config.rb

@@ -19,7 +19,7 @@
 #
 
 
-require "example"
+require 'example'
 
 
 class SetConfigController < Controller
@@ -27,20 +27,20 @@ class SetConfigController < Controller
 
 
   class << self
-    def run args
+    def run(args)
       usage unless Example.options_parse args
     end
 
 
     def usage
       puts Example.cmd_usage
-      puts "Send count number of set-config messages to datapath_id."
+      puts 'Send count number of set-config messages to datapath_id.'
       exit false
     end
   end
 
 
-  def switch_ready msg_datapath_id
+  def switch_ready(msg_datapath_id)
     may_raise_error msg_datapath_id
     send_nr_msgs SetConfig
   end