trema 0.3.21 → 0.4.0

data/src/lib/openflow_message.c

@@ -1658,6 +1658,13 @@ append_action_vendor( openflow_actions *actions, const uint32_t vendor, const bu
   return ret;
 }
 
+// A valid remote version is one of the defined wire protocol numbers for a
+// HELLO message and strictly OpenFlow 1.0 for any other message.
+bool
+valid_message_version( const uint8_t type, const uint8_t version ) {
+  return type != OFPT_HELLO ? version == OFP_VERSION :
+    version >= OFP_VERSION && version <= 0x04; // 1.0~1.3
+}
 
 static int
 validate_header( const buffer *message, const uint8_t type,
@@ -1670,7 +1677,7 @@ validate_header( const buffer *message, const uint8_t type,
   }
 
   header = ( struct ofp_header * ) message->data;
-  if ( header->version != OFP_VERSION ) {
+  if ( ! valid_message_version( type, header->version ) ) {
     return ERROR_UNSUPPORTED_VERSION;
   }
   if ( header->type > OFPT_QUEUE_GET_CONFIG_REPLY ) {

data/src/lib/openflow_message.h

@@ -268,6 +268,7 @@ int validate_action_enqueue( const struct ofp_action_enqueue *action );
 int validate_action_vendor( const struct ofp_action_vendor_header *action );
 int validate_openflow_message( const buffer *message );
 bool valid_openflow_message( const buffer *message );
+bool valid_message_version( const uint8_t type, const uint8_t version );
 
 // Utility functions
 bool get_error_type_and_code( const uint8_t type, const int error_no,

data/src/lib/openflow_switch_interface.c

@@ -146,7 +146,7 @@ static void
 init_context() {
   assert( contexts == NULL );
 
-  contexts = create_hash_with_size( compare_context, hash_context, 16 );
+  contexts = create_hash_with_size( compare_context, hash_context, 128 );
 }
 
 

data/src/switch_manager/secure_channel_listener.c

@@ -279,7 +279,7 @@ secure_channel_accept( int fd, void *data ) {
 
     free_switch_daemon_args( argv );
 
-    UNREACHABLE();
+    UNREACHABLE_CODE();
   }
   else {
     /* parent */

data/src/switch_manager/secure_channel_receiver.c

@@ -65,7 +65,7 @@ recv_from_secure_channel( struct switch_info *sw_info ) {
   size_t read_total = 0;
   while ( sw_info->fragment_buf->length >= sizeof( struct ofp_header ) ) {
     struct ofp_header *header = sw_info->fragment_buf->data;
-    if ( header->version != OFP_VERSION ) {
+    if ( ! valid_message_version( header->type, header->version ) ) {
       error( "Receive error: invalid version (version %d)", header->version );
       ofpmsg_send_error_msg( sw_info,
                              OFPET_BAD_REQUEST, OFPBRC_BAD_VERSION, sw_info->fragment_buf );

data/trema.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do | gem |
   gem.summary = "Full-stack OpenFlow framework."
   gem.description = "Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C."
 
-  gem.required_ruby_version = "~> 1.8.7"
+  gem.required_ruby_version = ">= 1.8.7"
 
   gem.license = "GPL2"
 
@@ -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.7.0"
-  gem.add_dependency "paper-house", "~> 0.3.1"
+  gem.add_dependency "gli", "~> 2.8.0"
+  gem.add_dependency "paper_house", "~> 0.4.0"
   gem.add_dependency "rake", "~> 10.1.0"
   gem.add_dependency "rdoc", "~> 4.0.1"
 end

data/unittests/lib/daemon_test.c

@@ -44,7 +44,7 @@ mock_die( char *format, ... ) {
   va_end( args );
 
   check_expected( message );
-  mock_assert( false, "UNREACHABLE", __FILE__, __LINE__ ); } // This hoaxes gcov.
+  mock_assert( false, "UNREACHABLE_CODE", __FILE__, __LINE__ ); } // This hoaxes gcov.
 
 
 int

data/unittests/lib/hash_table_test.c

@@ -240,7 +240,7 @@ test_iterate_empty_hash() {
   init_hash_iterator( table, &iter );
 
   while ( iterate_hash_next( &iter ) != NULL ) {
-    UNREACHABLE();
+    UNREACHABLE_CODE();
   }
 
   delete_hash( table );

metadata

@@ -1,113 +1,98 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: trema
-version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 21
-  version: 0.3.21
+version: !ruby/object:Gem::Version
+  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: .
 cert_chain: []
-
-date: 2013-09-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2013-09-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
-        version: 2.7.0
-  name: gli
   prerelease: false
-  type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
-        version: 0.3.1
-  name: paper-house
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: paper_house
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 75
-        segments: 
-        - 10
-        - 1
-        - 0
-        version: 10.1.0
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.1.0
   type: :runtime
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 4
-        - 0
-        - 1
-        version: 4.0.1
+      - !ruby/object:Gem::Version
+        version: 10.1.0
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
   type: :runtime
-  requirement: *id005
-description: Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+description: Trema is a full-stack, easy-to-use framework for developing OpenFlow
+  controllers in Ruby and C.
+email:
 - yasuhito@gmail.com
-executables: 
+executables:
 - trema
 - trema-config
-extensions: 
+extensions:
 - Rakefile
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - .gitignore
-- .mono.rant
 - .ruby-version
 - .travis.yml
 - .yardopts
@@ -115,7 +100,6 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- Rantfile
 - bin/quality
 - bin/trema
 - bin/trema-config
@@ -203,6 +187,7 @@ files:
 - ruby/trema/command/show_stats.rb
 - ruby/trema/command/up.rb
 - ruby/trema/command/version.rb
+- ruby/trema/compat.h
 - ruby/trema/controller.c
 - ruby/trema/controller.h
 - ruby/trema/controller.rb
@@ -360,6 +345,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/action.rb
 - spec/support/mandatory-option.rb
+- spec/support/matchers/constant.rb
 - spec/support/openflow-message.rb
 - spec/support/port-status.rb
 - spec/trema/app_spec.rb
@@ -799,40 +785,28 @@ files:
 - ./trema
 - ./trema-config
 homepage: http://github.com/trema/trema
-licenses: 
+licenses:
 - GPL2
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - ruby
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ~>
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Full-stack OpenFlow framework.
 test_files: []
-
 has_rdoc: