trema 0.4.5 → 0.4.6

data/unittests/lib/messenger_test.c

@@ -31,6 +31,7 @@
 #include "checks.h"
 #include "cmockery_trema.h"
 #include "doubly_linked_list.h"
+#include "external_callback.h"
 #include "hash_table.h"
 #include "event_handler.h"
 #include "messenger.h"
@@ -163,6 +164,27 @@ static uint32_t last_transaction_id;
  * Mocks.
  ********************************************************************************/
 
+void
+mock_init_external_callback() {
+}
+
+
+void
+mock_finalize_external_callback() {
+}
+
+
+void
+mock_push_external_callback( external_callback_t callback ) {
+  check_expected( callback );
+}
+
+
+void
+mock_run_external_callback() {
+}
+
+
 void
 mock_execute_timer_events( int *next_timeout_usec ) {
   UNUSED( next_timeout_usec );

data/unittests/lib/openflow_message_test.c

@@ -3505,7 +3505,7 @@ test_validate_stats_reply_fails_with_unsupported_stats_type() {
 
 static void
 test_validate_queue_stats_request() {
-  buffer *port_stats_request = create_queue_stats_request( MY_TRANSACTION_ID, NO_FLAGS, OFPP_ALL, OFPQ_ALL );
+  buffer *port_stats_request = create_queue_stats_request( MY_TRANSACTION_ID, NO_FLAGS, 1, OFPQ_ALL );
 
   assert_int_equal( validate_queue_stats_request( port_stats_request ), 0 );
 

data/unittests/lib/trema_test.c

@@ -333,7 +333,7 @@ mock_clock_gettime( clockid_t clk_id, struct timespec *tp ) {
 
 
 bool
-mock_set_external_callback( void ( *callback )( void ) ) {
+mock_push_external_callback( void ( *callback )( void ) ) {
   UNUSED( callback );
   return true;
 }

data/unittests/switch_manager/switch_manager_test.c

@@ -167,7 +167,7 @@ mock_get_executable_name( void ) {
 
 
 void
-mock_set_external_callback( void ( *callback )( void ) ) {
+mock_push_external_callback( void ( *callback )( void ) ) {
   check_expected( callback );
 }
 
@@ -309,7 +309,7 @@ static void
 test_handle_sigchld_succeeded() {
   setup();
 
-  expect_value( mock_set_external_callback, callback, wait_child );
+  expect_value( mock_push_external_callback, callback, wait_child );
 
   handle_sigchld( 3 );
 
@@ -625,7 +625,7 @@ test_switch_manager_main_and_port_option_succeeded() {
 
   char *argv[] = {
       ( char * ) ( uintptr_t ) "switch_manager",
-      ( char * ) ( uintptr_t ) "--port=6633",
+      ( char * ) ( uintptr_t ) "--port=6653",
       NULL,
     };
   int argc = ARRAY_SIZE( argv ) - 1;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trema
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +113,7 @@ files:
 - CONTRIBUTING.md
 - Doxyfile
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - bin/quality
@@ -133,6 +134,7 @@ files:
 - features/examples/list_switches.feature
 - features/examples/message.set_config.feature
 - features/examples/message.vendor-action.feature
+- features/examples/message.vendor-stats-request.feature
 - features/examples/multi_learning_switch.feature
 - features/examples/openflow_message.echo.feature
 - features/examples/openflow_message.features_request.feature
@@ -211,6 +213,7 @@ files:
 - ruby/trema/default-logger.c
 - ruby/trema/default-logger.h
 - ruby/trema/default-logger.rb
+- ruby/trema/default_openflow_channel_port.rb
 - ruby/trema/desc-stats-reply.rb
 - ruby/trema/dsl.rb
 - ruby/trema/dsl/configuration.rb
@@ -466,6 +469,7 @@ files:
 - src/examples/openflow_message/set-config.rb
 - src/examples/openflow_message/set_config.c
 - src/examples/openflow_message/vendor-action.rb
+- src/examples/openflow_message/vendor-stats-request.rb
 - src/examples/openflow_message/vendor_action.c
 - src/examples/openflow_switch/echo_switch.c
 - src/examples/openflow_switch/hello_switch.c
@@ -494,7 +498,6 @@ files:
 - src/examples/simple_router/README
 - src/examples/simple_router/arp-table.rb
 - src/examples/simple_router/interface.rb
-- src/examples/simple_router/router-utils.rb
 - src/examples/simple_router/routing-table.rb
 - src/examples/simple_router/simple-router.rb
 - src/examples/simple_router/simple_router.conf
@@ -544,6 +547,8 @@ files:
 - src/lib/event_forward_interface.h
 - src/lib/event_handler.c
 - src/lib/event_handler.h
+- src/lib/external_callback.c
+- src/lib/external_callback.h
 - src/lib/hash_table.c
 - src/lib/hash_table.h
 - src/lib/icmp.h
@@ -664,6 +669,7 @@ files:
 - unittests/lib/doubly_linked_list_test.c
 - unittests/lib/ether_test.c
 - unittests/lib/event_forward_interface_test.c
+- unittests/lib/external_callback_test.c
 - unittests/lib/hash_table_test.c
 - unittests/lib/linked_list_test.c
 - unittests/lib/log_test.c
@@ -814,7 +820,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Full-stack OpenFlow framework.

data/src/examples/simple_router/router-utils.rb

@@ -1,211 +0,0 @@
-#
-# A router implementation in Trema
-#
-# Copyright (C) 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 'ipaddr'
-
-
-def get_checksum csum, val
-  sum = ( ~csum & 0xffff ) + val
-  while sum > 0xffff
-    sum = ( sum & 0xffff ) + ( sum >> 16 )
-  end
-  ~sum & 0xffff
-end
-
-
-class IPAddr
-  def to_a
-    self.to_s.split( "." ).collect do | each |
-      each.to_i
-    end
-  end
-end
-
-
-class EthernetHeader
-  attr_accessor :macda, :macsa, :eth_type
-
-
-  def initialize macda, macsa, eth_type
-    @macda = macda
-    @macsa = macsa
-    @eth_type = eth_type
-  end
-
-
-  def pack
-    ( @macda.to_a + @macsa.to_a + [ eth_type ] ).pack( "C12n" )
-  end
-end
-
-
-class ARPPacket
-  attr_accessor :type, :tha, :sha, :tpa, :spa
-
-
-  def initialize type, tha, sha, tpa, spa
-    @type = type
-    @tha = tha
-    @sha = sha
-    @tpa = tpa
-    @spa = spa
-  end
-
-
-  def pack
-    eth_header = EthernetHeader.new( @tha, @sha, 0x0806 )
-
-    # arp
-    arp = [ 0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, @type ]
-    arp += @sha.to_a + @spa.to_a + @tha.to_a + @tpa.to_a
-
-    while arp.length < 46 do
-      arp += [ 0x00 ]
-    end
-
-    eth_header.pack + arp.pack( "C*" )
-  end
-end
-
-
-class ARPRequest < ARPPacket
-  def initialize sha, tpa, spa
-    tha = [ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff ]
-    super( 1, tha, sha, tpa, spa )
-  end
-end
-
-
-class ARPReply < ARPPacket
-  def initialize tha, sha, tpa, spa
-    super( 2, tha, sha, tpa, spa )
-  end
-end
-
-
-class IPPacket
-  attr_accessor :id, :protocol, :daddr, :saddr, :payload
-
-
-  def initialize options
-    @id = options[ :id ]
-    @protocol = options[ :protocol ]
-    @daddr = options[ :daddr ]
-    @saddr = options[ :saddr ]
-    @payload = options[ :payload ]
-    @tot_len = 20 + payload.length
-  end
-
-
-  def pack
-    csum = get_checksum( 0, 0x4500 )
-    header = [ 0x45, 0x00 ] # Version, IHL, ToS
-
-    csum = get_checksum( csum, @tot_len )
-    header += [ @tot_len >> 8, @tot_len & 0xff ] # len
-
-    csum = get_checksum( csum, @id )
-    header += [ @id >> 8, @id & 0xff ] # ID
-
-    csum = get_checksum( csum, 0x4000 )
-    header += [ 0x40, 0x00 ] # Flags, Frag offset
-
-    csum = get_checksum( csum, 0x40 * 0x100 + @protocol )
-    header += [ 0x40, @protocol ] # ttl, protocol
-
-    csum = get_checksum( csum, @saddr.to_i >> 16 )
-    csum = get_checksum( csum, @saddr.to_i & 0xffff )
-    csum = get_checksum( csum, @daddr.to_i >> 16 )
-    csum = get_checksum( csum, @daddr.to_i & 0xffff )
-    header += [ csum >> 8, csum & 0xff ] # checksum
-    header += @saddr.to_a + @daddr.to_a
-
-    header.pack( "C*" ) + @payload.pack
-  end
-end
-
-
-class ICMPPacket
-  attr_reader :payload, :length
-
-
-  def initialize type, code, payload
-    @type = type
-    @code = code
-    @payload = payload
-    @length = 4 + payload.length
-  end
-
-
-  def pack
-    @checksum = get_checksum( 0, @type * 0x100 + @code )
-
-    words = @payload.pack( "C*" ).unpack( "n*" )
-    words.each do | each |
-      @checksum = get_checksum( @checksum, each )
-    end
-
-    [ @type, @code, @checksum ].pack( "C2n" ) + @payload.pack( "C*" )
-  end
-end
-
-
-class ICMPEchoReply < ICMPPacket
-  def initialize payload
-    super( 0x00, 0x00, payload )
-  end
-end
-
-
-module RouterUtils
-  def create_arp_request_from interface, addr
-    arp = ARPRequest.new( interface.hwaddr, addr, interface.ipaddr )
-    arp.pack
-  end
-
-
-  def create_arp_reply_from message, replyaddr
-    arp = ARPReply.new( message.macsa, replyaddr, message.arp_spa, message.arp_tpa )
-    arp.pack
-  end
-
-
-  def create_icmpv4_reply entry, interface, message
-    offset = 14 + 20 + 4
-    payload = message.data.unpack( "C*" )[ offset .. message.data.length - 1 ]
-    icmp = ICMPEchoReply.new( payload )
-    ip_packet = IPPacket.new( :id => message.ipv4_id,
-                              :protocol => message.ipv4_protocol,
-                              :ttl => message.ipv4_ttl,
-                              :daddr => message.ipv4_saddr,
-                              :saddr => message.ipv4_daddr,
-                              :payload => icmp )
-    eth_header = EthernetHeader.new( entry.hwaddr, interface.hwaddr, 0x0800 )
-
-    eth_header.pack + ip_packet.pack
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8
-### indent-tabs-mode: nil
-### End: