trema 0.4.3 → 0.4.4

data/src/switch_manager/switchinfo.h

@@ -28,8 +28,10 @@
 #define SWITCH_STATE_CONNECTED           0
 #define SWITCH_STATE_WAIT_HELLO          1
 #define SWITCH_STATE_WAIT_FEATURES_REPLY 2
-#define SWITCH_STATE_COMPLETED           3
-#define SWITCH_STATE_DISCONNECTED        4
+#define SWITCH_STATE_WAIT_REGISTRATION   3
+#define SWITCH_STATE_COMPLETED           4
+#define SWITCH_STATE_DISCONNECTED        5
+#define SWITCH_STATE_CONNECTION_FAILED   6
 
 
 struct switch_info {
@@ -63,6 +65,8 @@ struct switch_info {
   bool running_timer;
 
   uint32_t echo_request_xid;
+
+  int retry_count;
 };
 
 

data/trema.gemspec

@@ -26,9 +26,9 @@ Gem::Specification.new do | gem |
   gem.test_files = `git ls-files -- {spec,features}/*`.split( "\n" )
 
   gem.add_dependency "bundler"
-  gem.add_dependency "gli", "~> 2.8.0"
-  gem.add_dependency "paper_house", "~> 0.4.0"
-  gem.add_dependency "pio", "~> 0.2.4"
+  gem.add_dependency "gli", "~> 2.8.1"
+  gem.add_dependency "paper_house", "~> 0.5.0"
+  gem.add_dependency "pio", "~> 0.2.6"
   gem.add_dependency "rake", "~> 10.1.0"
   gem.add_dependency "rdoc", "~> 4.0.1"
 end

data/unittests/lib/daemon_test.c

@@ -179,14 +179,6 @@ mock_basename( char *path ) {
 }
 
 
-int
-mock_rename( char *oldpath, char *newpath ) {
-  check_expected( oldpath );
-  check_expected( newpath );
-  return ( int ) mock();
-}
-
-
 void
 mock_warn( const char *format, ... ) {
   UNUSED( format );
@@ -256,6 +248,9 @@ test_daemonize_fail_if_setsid_fail() {
 
 static void
 test_write_pid_succeed() {
+  extern int locked_fd;
+
+  locked_fd = -1;
   will_return( mock_open, 1111 );
   will_return( mock_lockf, 0 );
 
@@ -282,6 +277,9 @@ test_write_pid_succeed() {
 
 static void
 test_write_pid_fail_if_open_fail() {
+  extern int locked_fd;
+
+  locked_fd = -1;
   will_return( mock_open, -1 );
 
   // Test if correctly opened.
@@ -298,6 +296,9 @@ test_write_pid_fail_if_open_fail() {
 
 static void
 test_write_pid_fail_if_lockf_fail() {
+  extern int locked_fd;
+
+  locked_fd = -1;
   will_return( mock_open, 1111 );
   will_return( mock_lockf, -1 );
 
@@ -660,39 +661,39 @@ test_read_pid_fail_if_readlink_fail() {
 
 static void
 test_rename_pid_successed() {
-  // Test if correctly unlink.
-  expect_string( mock_unlink, pathname, "/home/yasuhito/trema/tmp/hello.pid" );
-  errno = ENOENT;
-  will_return( mock_unlink, -1 );
-  // Test if correctly rename.
-  expect_string( mock_rename, oldpath, "/home/yasuhito/trema/tmp/bye.pid" );
-  expect_string( mock_rename, newpath, "/home/yasuhito/trema/tmp/hello.pid" );
-  will_return( mock_rename, 0 );
+  extern int locked_fd;
 
-  // Go
-  rename_pid( "/home/yasuhito/trema/tmp", "bye", "hello" );
-}
+  locked_fd = 2222;
+  will_return( mock_open, 1111 );
+  will_return( mock_lockf, 0 );
+
+  // Test if correctly opened.
+  char new_path[] = "/home/yasuhito/trema/tmp/hello.pid";
+  char buffer[] = "1234\n";
+  expect_string( mock_open, pathname, new_path );
+  expect_value( mock_open, flags, ( O_RDWR | O_CREAT ) );
+  expect_value( mock_open, mode, 0600 );
 
+  // Test if correctly locked.
+  expect_value( mock_lockf, fd, 1111 );
+  expect_value( mock_lockf, cmd, F_TLOCK );
+  expect_value( mock_lockf, len, 0 );
 
-static void
-test_rename_pid_fail_if_rename_fail() {
-  // Test if correctly unlink.
-  expect_string( mock_unlink, pathname, "/home/yasuhito/trema/tmp/hello.pid" );
-  errno = ENOENT;
-  will_return( mock_unlink, -1 );
-  // Test if correctly rename.
-  expect_string( mock_rename, oldpath, "/home/yasuhito/trema/tmp/bye.pid" );
-  expect_string( mock_rename, newpath, "/home/yasuhito/trema/tmp/hello.pid" );
-  errno = ENOENT;
-  will_return( mock_rename, -1 );
+  // Test if correctly written.
+  expect_value( mock_write, fd, 1111 );
+  expect_string( mock_write, buf, buffer );
+  expect_value( mock_write, count, strlen( buffer ) );
 
-  expect_string( mock_die, message, "Could not rename a PID file from "
-                                    "/home/yasuhito/trema/tmp/bye.pid"
-                                    " to "
-                                    "/home/yasuhito/trema/tmp/hello.pid." );
+  expect_value( mock_close, fd, 2222 );
+
+  will_return( mock_unlink, 0 );
+
+  // Test if correctly unlinked.
+  char old_path[] = "/home/yasuhito/trema/tmp/bye.pid";
+  expect_string( mock_unlink, pathname, old_path );
 
   // Go
-  expect_assert_failure( rename_pid( "/home/yasuhito/trema/tmp", "bye", "hello" ) );
+  rename_pid( "/home/yasuhito/trema/tmp", "bye", "hello" );
 }
 
 
@@ -731,7 +732,6 @@ main() {
 
     // rename_pid() tests.
     unit_test( test_rename_pid_successed ),
-    unit_test( test_rename_pid_fail_if_rename_fail ),
 
   };
   return run_tests( tests );

data/unittests/lib/trema_test.c

@@ -146,8 +146,13 @@ mock_kill( pid_t pid, int sig ) {
 
 
 unsigned int
-mock_sleep( unsigned int seconds ) {
-  check_expected( seconds );
+mock_clock_nanosleep( clockid_t clock_id, int flags, struct timespec *request, struct timespec *remain) {
+  check_expected( clock_id );
+  check_expected( flags );
+  assert_true( request != NULL );
+  check_expected( request->tv_sec );
+  check_expected( request->tv_nsec );
+  check_expected( remain );
   return ( unsigned int ) mock();
 }
 
@@ -906,8 +911,12 @@ test_terminate_trema_process_when_retry_count_1() {
   expect_value_count( mock_kill, sig, 0, 2 );
   will_return_count( mock_kill, 0, 2 );
   will_return_count( mock_kill, -1, 1 );
-  expect_value_count( mock_sleep, seconds, 1, 1 );
-  will_return_count( mock_sleep, 0, 1 );
+  expect_value_count( mock_clock_nanosleep, clock_id, CLOCK_MONOTONIC, 1 );
+  expect_value_count( mock_clock_nanosleep, flags, 0, 1 );
+  expect_value_count( mock_clock_nanosleep, request->tv_sec, 0, 1 );
+  expect_value_count( mock_clock_nanosleep, request->tv_nsec, 500000000, 1 );
+  expect_value_count( mock_clock_nanosleep, remain, NULL, 1 );
+  will_return_count( mock_clock_nanosleep, 0, 1 );
 
   // Go
   assert_true( terminate_trema_process( PID ) );
@@ -922,8 +931,12 @@ test_terminate_trema_process_when_retry_count_10() {
   expect_value_count( mock_kill, sig, 0, 11 );
   will_return_count( mock_kill, 0, 11 );
   will_return_count( mock_kill, -1, 1 );
-  expect_value_count( mock_sleep, seconds, 1, 10 );
-  will_return_count( mock_sleep, 0, 10 );
+  expect_value_count( mock_clock_nanosleep, clock_id, CLOCK_MONOTONIC, 10 );
+  expect_value_count( mock_clock_nanosleep, flags, 0, 10 );
+  expect_value_count( mock_clock_nanosleep, request->tv_sec, 0, 10 );
+  expect_value_count( mock_clock_nanosleep, request->tv_nsec, 500000000, 10 );
+  expect_value_count( mock_clock_nanosleep, remain, NULL, 10 );
+  will_return_count( mock_clock_nanosleep, 0, 10 );
 
   // Go
   assert_true( terminate_trema_process( PID ) );
@@ -937,8 +950,12 @@ test_terminate_trema_process_when_over_max_retry_count() {
   expect_value_count( mock_kill, sig, SIGTERM, 1 );
   expect_value_count( mock_kill, sig, 0, 11 );
   will_return_count( mock_kill, 0, 12 );
-  expect_value_count( mock_sleep, seconds, 1, 10 );
-  will_return_count( mock_sleep, 0, 10 );
+  expect_value_count( mock_clock_nanosleep, clock_id, CLOCK_MONOTONIC, 10 );
+  expect_value_count( mock_clock_nanosleep, flags, 0, 10 );
+  expect_value_count( mock_clock_nanosleep, request->tv_sec, 0, 10 );
+  expect_value_count( mock_clock_nanosleep, request->tv_nsec, 500000000, 10 );
+  expect_value_count( mock_clock_nanosleep, remain, NULL, 10 );
+  will_return_count( mock_clock_nanosleep, 0, 10 );
 
   // Go
   assert_true( !terminate_trema_process( PID ) );

metadata

@@ -1,115 +1,132 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: trema
-version: !ruby/object:Gem::Version
-  version: 0.4.3
+version: !ruby/object:Gem::Version 
+  hash: 7
+  prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 4
+  version: 0.4.4
 platform: ruby
-authors:
+authors: 
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-10-28 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"
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  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
-        version: 2.8.0
   type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 45
+        segments: 
+        - 2
+        - 8
+        - 1
+        version: 2.8.1
+  name: gli
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
   name: paper_house
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 2
+        - 6
+        version: 0.2.6
   name: pio
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 75
+        segments: 
+        - 10
+        - 1
+        - 0
         version: 10.1.0
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.1
-  type: :runtime
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  type: :runtime
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 4
+        - 0
+        - 1
         version: 4.0.1
-description: Trema is a full-stack, easy-to-use framework for developing OpenFlow
-  controllers in Ruby and C.
-email:
+  name: rdoc
+  prerelease: false
+  type: :runtime
+  requirement: *id006
+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
 - .ruby-version
 - .travis.yml
 - .yardopts
+- CONTRIBUTING.md
 - Doxyfile
 - Gemfile
 - README.md
@@ -391,7 +408,6 @@ files:
 - spec/trema/host_spec.rb
 - spec/trema/link_spec.rb
 - spec/trema/list-switches-reply_spec.rb
-- spec/trema/mac_spec.rb
 - spec/trema/match_spec.rb
 - spec/trema/open-vswitch_spec.rb
 - spec/trema/openflow-error_spec.rb
@@ -795,28 +811,40 @@ files:
 - vendor/ruby-ifconfig-1.2/test/unit/tc_openbsd.rb
 - vendor/ruby-ifconfig-1.2/test/unit/tc_sunos.rb
 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
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
+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
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Full-stack OpenFlow framework.
 test_files: []
+
 has_rdoc: