trema 0.2.2.1 → 0.2.3

data/unittests/lib/openflow_message_test.c

@@ -27,6 +27,8 @@
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <netinet/ip.h>
+#include <net/if_arp.h>
 #include "byteorder.h"
 #include "checks.h"
 #include "cmockery_trema.h"
@@ -99,7 +101,7 @@ mock_debug( char *format, ... ) {
 }
 
 
-static logging_level
+static int
 mock_get_logging_level() {
   return LOG_DEBUG;
 }

data/unittests/lib/packet_parser_test.c

@@ -1,8 +1,6 @@
 /*
  * Unit tests for packet_parser functions and macros.
  *
- * Author: Kazuya Suzuki
- *
  * Copyright (C) 2008-2012 NEC Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -46,20 +44,20 @@ store_packet_to_buffer( const char *filename ) {
     // "Can't open a file of test data."
     return NULL;
   }
-  
-  // Skip 
+
+  // Skip
   if ( fseek( fp, sizeof( struct pcap_file_header ) + sizeof( uint32_t ) * 2,
               SEEK_CUR ) != 0 ) {
     fclose( fp );
     return NULL;
-  }  
-  
+  }
+
   uint32_t length[ 2 ];
   size_t size = fread( &length, 1, sizeof( length ), fp );
   if ( size < sizeof( length ) ) {
     fclose( fp );
     return NULL;
-  }  
+  }
 
   buffer *buffer = alloc_buffer();
   if ( buffer == NULL ) {
@@ -71,7 +69,7 @@ store_packet_to_buffer( const char *filename ) {
     free_buffer( buffer );
     fclose( fp );
     return NULL;
-  }  
+  }
 
   fclose( fp );
   return buffer;
@@ -92,7 +90,7 @@ test_parse_packet_snap_succeeds() {
   packet_info *packet_info = buffer->user_data;
 
   assert_int_equal( packet_info->format, ETH_8023_SNAP );
-  
+
   u_char macda[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
   u_char macsa[] = { 0x00, 0x19, 0xdb, 0x17, 0xb9, 0x6f };
   assert_memory_equal( packet_info->eth_macda, macda, ETH_ADDRLEN );
@@ -141,7 +139,37 @@ test_parse_packet_arp_request_succeeds() {
   assert_memory_equal( packet_info->arp_sha, macsa, ETH_ADDRLEN );
   assert_int_equal( packet_info->arp_tpa, 0xc0a8642b );
   u_char maczero[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-  assert_memory_equal( packet_info->arp_tha, maczero, ETH_ADDRLEN );  
+  assert_memory_equal( packet_info->arp_tha, maczero, ETH_ADDRLEN );
+
+  assert_true( packet_type_arp_request( buffer ) );
+  assert_false( packet_type_arp_reply( buffer ) );
+
+  free_buffer( buffer );
+}
+
+
+static void
+test_parse_packet_ipv6_succeeds() {
+  const char filename[] = "./unittests/lib/test_packets/icmp6_echo_req.cap";
+  buffer *buffer = store_packet_to_buffer( filename );
+
+  assert_true( parse_packet( buffer ) );
+
+  packet_info *packet_info = buffer->user_data;
+
+  assert_int_equal( packet_info->ipv6_version, 6 );
+  assert_int_equal( packet_info->ipv6_tc, 0 );
+  assert_int_equal( packet_info->ipv6_flowlabel, 0 );
+  assert_int_equal( packet_info->ipv6_plen, 0x40 );
+  assert_int_equal( packet_info->ipv6_nexthdr, 0x3a );
+  assert_int_equal( packet_info->ipv6_hoplimit, 0x40 );
+
+  u_char saddr[] = { 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                     0x8e, 0x89, 0xa5, 0xff, 0xfe, 0x16, 0x22, 0x09 };
+  u_char daddr[] = { 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                     0x8e, 0x89, 0xa5, 0xff, 0xfe, 0x15, 0x84, 0xcb };
+  assert_memory_equal( packet_info->ipv6_saddr, saddr, IPV6_ADDRLEN );
+  assert_memory_equal( packet_info->ipv6_daddr, daddr, IPV6_ADDRLEN );
 
   free_buffer( buffer );
 }
@@ -163,7 +191,7 @@ test_parse_packet_udp_succeeds() {
   assert_memory_equal( packet_info->eth_macda, macda, ETH_ADDRLEN );
   assert_memory_equal( packet_info->eth_macsa, macsa, ETH_ADDRLEN );
   assert_int_equal( packet_info->eth_type, ETH_ETHTYPE_IPV4 );
-  
+
   assert_int_equal( packet_info->l2_payload_length, 76 );
 
   assert_int_equal( packet_info->ipv4_version, 4 );
@@ -212,7 +240,7 @@ test_parse_packet_udp_fragmented_head_succeeds() {
   assert_int_equal( packet_info->eth_type, ETH_ETHTYPE_IPV4 );
 
   assert_int_equal( packet_info->l2_payload_length, 1500 );
-  
+
   assert_int_equal( packet_info->ipv4_version, 4 );
   assert_int_equal( packet_info->ipv4_ihl, 5 );
   assert_int_equal( packet_info->ipv4_tos, 0 );
@@ -257,7 +285,7 @@ test_parse_packet_udp_fragmented_next_succeeds() {
   assert_memory_equal( packet_info->eth_macda, macda, ETH_ADDRLEN );
   assert_memory_equal( packet_info->eth_macsa, macsa, ETH_ADDRLEN );
   assert_int_equal( packet_info->eth_type, ETH_ETHTYPE_IPV4 );
-  
+
   assert_int_equal( packet_info->l2_payload_length, 1500 );
 
   assert_int_equal( packet_info->ipv4_version, 4 );
@@ -306,7 +334,7 @@ test_parse_packet_tcp_syn_succeeds() {
   assert_memory_equal( packet_info->eth_macda, macda, ETH_ADDRLEN );
   assert_memory_equal( packet_info->eth_macsa, macsa, ETH_ADDRLEN );
   assert_int_equal( packet_info->eth_type, ETH_ETHTYPE_IPV4 );
-  
+
   assert_int_equal( packet_info->l2_payload_length, 60 );
 
   assert_int_equal( packet_info->ipv4_version, 4 );
@@ -356,7 +384,7 @@ test_parse_packet_tcp_succeeds() {
   assert_memory_equal( packet_info->eth_macda, macda, ETH_ADDRLEN );
   assert_memory_equal( packet_info->eth_macsa, macsa, ETH_ADDRLEN );
   assert_int_equal( packet_info->eth_type, ETH_ETHTYPE_IPV4 );
-  
+
   assert_int_equal( packet_info->l2_payload_length, 82 );
 
   assert_int_equal( packet_info->ipv4_version, 4 );
@@ -435,6 +463,11 @@ test_parse_packet_icmpv4_echo_request_succeeds() {
 
   assert_int_equal( packet_info->l4_payload_length, 56 );
 
+  assert_true( packet_type_icmpv4_echo_request( buffer ) );
+  assert_false( packet_type_icmpv4_dst_unreach( buffer ) );
+  assert_false( packet_type_icmpv4_redirect( buffer ) );
+  assert_false( packet_type_icmpv4_echo_reply( buffer ) );
+
   free_buffer( buffer );
 }
 
@@ -488,6 +521,11 @@ test_parse_packet_vtag_icmpv4_echo_request_succeeds() {
   assert_int_equal( sample, 0x6162 );
   assert_int_equal( packet_info->l4_payload_length, 32 );
 
+  assert_true( packet_type_icmpv4_echo_request( buffer ) );
+  assert_false( packet_type_icmpv4_dst_unreach( buffer ) );
+  assert_false( packet_type_icmpv4_redirect( buffer ) );
+  assert_false( packet_type_icmpv4_echo_reply( buffer ) );
+
   free_buffer( buffer );
 }
 
@@ -541,6 +579,11 @@ test_parse_packet_vtag_icmpv4_echo_reply_succeeds() {
   assert_int_equal( sample, 0x6162 );
   assert_int_equal( packet_info->l4_payload_length, 32 );
 
+  assert_false( packet_type_icmpv4_echo_request( buffer ) );
+  assert_false( packet_type_icmpv4_dst_unreach( buffer ) );
+  assert_false( packet_type_icmpv4_redirect( buffer ) );
+  assert_true( packet_type_icmpv4_echo_reply( buffer ) );
+
   free_buffer( buffer );
 }
 
@@ -672,6 +715,8 @@ main() {
 
     unit_test( test_parse_packet_arp_request_succeeds ),
 
+    unit_test( test_parse_packet_ipv6_succeeds ),
+
     unit_test( test_parse_packet_udp_succeeds ),
     unit_test( test_parse_packet_udp_fragmented_head_succeeds ),
     unit_test( test_parse_packet_udp_fragmented_next_succeeds ),

data/unittests/lib/trema_test.c

@@ -719,6 +719,7 @@ test_parse_help_option() {
     "  -n, --name=SERVICE_NAME     service name\n"
     "  -d, --daemonize             run in the background\n"
     "  -l, --logging_level=LEVEL   set logging level\n"
+    "  -g, --syslog                output log messages to syslog\n"
     "  -h, --help                  display this help and exit\n"
   );
   expect_value( mock_exit, status, EXIT_SUCCESS );
@@ -742,6 +743,7 @@ test_parse_h_option() {
     "  -n, --name=SERVICE_NAME     service name\n"
     "  -d, --daemonize             run in the background\n"
     "  -l, --logging_level=LEVEL   set logging level\n"
+    "  -g, --syslog                output log messages to syslog\n"
     "  -h, --help                  display this help and exit\n"
   );
   expect_value( mock_exit, status, EXIT_SUCCESS );

data/unittests/lib/utility_test.c

@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <arpa/inet.h>
 #include "cmockery_trema.h"
 #include "log.h"
 #include "ipv4.h"
@@ -198,10 +199,66 @@ test_string_to_datapath_id() {
 }
 
 
+static void
+test_wildcards_to_string_with_exact_match() {
+  char wildcards_str[ 128 ];
+  char expected_wildcards_str[] = "none";
+  uint32_t wildcards = 0;
+  assert_true( wildcards_to_string( wildcards, wildcards_str, sizeof( wildcards_str ) ) );
+  assert_string_equal( wildcards_str, expected_wildcards_str );
+
+  wildcards = UINT32_MAX & ~( ( uint32_t ) OFPFW_ALL );
+  assert_true( wildcards_to_string( wildcards, wildcards_str, sizeof( wildcards_str ) ) );
+  assert_string_equal( wildcards_str, expected_wildcards_str );
+}
+
+
+static void
+test_wildcards_to_string_with_all_wildcards() {
+  char wildcards_str[ 128 ];
+  char expected_wildcards_str[] = "all";
+  uint32_t wildcards = OFPFW_ALL;
+  assert_true( wildcards_to_string( wildcards, wildcards_str, sizeof( wildcards_str ) ) );
+  assert_string_equal( wildcards_str, expected_wildcards_str );
+
+  wildcards = UINT32_MAX;
+  assert_true( wildcards_to_string( wildcards, wildcards_str, sizeof( wildcards_str ) ) );
+  assert_string_equal( wildcards_str, expected_wildcards_str );
+}
+
+
+static void
+test_wildcards_to_string_with_all_wildcards_except_in_port() {
+  char wildcards_str[ 128 ];
+  char expected_wildcards_str[] = "dl_src|dl_dst|dl_type|dl_vlan|dl_vlan_pcp|nw_proto|nw_tos|nw_src(63)|nw_dst(63)|tp_src|tp_dst";
+  uint32_t wildcards = OFPFW_ALL & ~OFPFW_IN_PORT;
+  assert_true( wildcards_to_string( wildcards, wildcards_str, sizeof( wildcards_str ) ) );
+  assert_string_equal( wildcards_str, expected_wildcards_str );
+}
+
+
+static void
+test_wildcards_to_string_with_all_wildcards_except_dl_addrs() {
+  char wildcards_str[ 128 ];
+  char expected_wildcards_str[] = "in_port|dl_type|dl_vlan|dl_vlan_pcp|nw_proto|nw_tos|nw_src(63)|nw_dst(63)|tp_src|tp_dst";
+  uint32_t wildcards = OFPFW_ALL & ~OFPFW_DL_SRC & ~OFPFW_DL_DST;
+  assert_true( wildcards_to_string( wildcards, wildcards_str, sizeof( wildcards_str ) ) );
+  assert_string_equal( wildcards_str, expected_wildcards_str );
+}
+
+
+static void
+test_wildcards_to_string_fails_with_insufficient_buffer() {
+  char wildcards_str[ 1 ];
+  uint32_t wildcards = 0;
+  assert_false( wildcards_to_string( wildcards, wildcards_str, sizeof( wildcards_str ) ) );
+}
+
+
 static void
 test_match_to_string() {
   char match_str[ 256 ];
-  char expected_match_str[] = "wildcards = 0, in_port = 1, dl_src = 01:02:03:04:05:07, dl_dst = 08:09:0a:0b:0c:0d, dl_vlan = 1, dl_vlan_pcp = 1, dl_type = 0x800, nw_tos = 1, nw_proto = 6, nw_src = 10.9.8.7/32, nw_dst = 6.5.4.3/32, tp_src = 1024, tp_dst = 2048";
+  char expected_match_str[] = "wildcards = 0(none), in_port = 1, dl_src = 01:02:03:04:05:07, dl_dst = 08:09:0a:0b:0c:0d, dl_vlan = 1, dl_vlan_pcp = 1, dl_type = 0x800, nw_tos = 1, nw_proto = 6, nw_src = 10.9.8.7/32, nw_dst = 6.5.4.3/32, tp_src = 1024, tp_dst = 2048";
   struct ofp_match match = { 0, 1,
                              { 0x01, 0x02, 0x03, 0x04, 0x05, 0x07 },
                              { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d },
@@ -225,7 +282,7 @@ test_match_to_string_fails_with_insufficient_buffer() {
 static void
 test_phy_port_to_string() {
   char phy_port_str[ 256 ];
-  char expected_phy_port_str[] = "port_no = 1, hw_addr =  01:02:03:04:05:06, name = GbE 0/1, config = 0x1, state = 0x1, curr = 0x4a0, advertised = 0x6bf, supported = 0x6bf, peer = 0x6bf";
+  char expected_phy_port_str[] = "port_no = 1, hw_addr = 01:02:03:04:05:06, name = GbE 0/1, config = 0x1, state = 0x1, curr = 0x4a0, advertised = 0x6bf, supported = 0x6bf, peer = 0x6bf";
   uint8_t hw_addr[ OFP_ETH_ALEN ] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
   uint32_t port_features = ( OFPPF_10MB_HD | OFPPF_10MB_FD | OFPPF_100MB_HD |
                              OFPPF_100MB_FD | OFPPF_1GB_HD | OFPPF_1GB_FD |
@@ -589,6 +646,12 @@ main() {
 
     unit_test( test_string_to_datapath_id ),
 
+    unit_test( test_wildcards_to_string_with_exact_match ),
+    unit_test( test_wildcards_to_string_with_all_wildcards ),
+    unit_test( test_wildcards_to_string_with_all_wildcards_except_in_port ),
+    unit_test( test_wildcards_to_string_with_all_wildcards_except_dl_addrs ),
+    unit_test( test_wildcards_to_string_fails_with_insufficient_buffer ),
+
     unit_test( test_match_to_string ),
     unit_test( test_match_to_string_fails_with_insufficient_buffer ),
 

data/unittests/lib/wrapper_test.c

@@ -154,6 +154,32 @@ test_xstrdup_fail() {
 }
 
 
+static char *
+test_xvasprintf_helper( const char *fmt, ... ) {
+  va_list ap;
+  va_start(ap, fmt);
+  char *str = xvasprintf( fmt, ap );
+  va_end(ap);
+  return str;
+}
+
+
+static void
+test_xvasprintf() {
+  char hello[] = "Hello";
+  char *printed_hello = test_xvasprintf_helper( "%s", hello );
+  assert_string_equal( hello, printed_hello );
+  xfree( printed_hello );
+}
+
+
+static void
+test_xvasprintf_fail() {
+  expect_string( mock_die, output, "Out of memory, xvasprintf failed" );
+  expect_assert_failure( test_xvasprintf_helper( "FAIL" ) );
+}
+
+
 static void
 test_xasprintf() {
   char hello[] = "Hello";
@@ -186,6 +212,9 @@ main() {
     unit_test_setup_teardown( test_xstrdup, setup, teardown ),
     unit_test_setup_teardown( test_xstrdup_fail, setup_fail_allocators, teardown ),
 
+    unit_test_setup_teardown( test_xvasprintf, setup, teardown ),
+    unit_test_setup_teardown( test_xvasprintf_fail, setup_fail_allocators, teardown ),
+
     unit_test_setup_teardown( test_xasprintf, setup, teardown ),
     unit_test_setup_teardown( test_xasprintf_fail, setup_fail_allocators, teardown ),
   };

data/vendor/{README → README.md}

@@ -1,21 +1,12 @@
 Notes on Third Party Software Packages
-**************************************
-
-  Copyright (C) 2008-2011 NEC Corporation
-
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
-
-Notice
-======
+======================================
 
 Software packages found in this directory are not part of Trema. Each software
 packages is distributed under the terms and conditions described in the package.
 
 
 Notes on oflops (vendor/oflops)
-===============================
+-------------------------------
 
 oflops is a set of tools for measuring the performance of OpenFlow switches and
 controllers. You can find detailed information about oflops on:
@@ -27,4 +18,3 @@ of this OpenFlow controller platform, we disabled the functions. In addition,
 because there are some issues on OpenFlow messages that cbench (a performance
 measurement tool for OpenFlow controllers) sends, we fixed them. Any changes
 from the repository of oflops can be found in oflops_no_snmp+1.0.0.patch.
-

data/vendor/packet-openflow.diff

@@ -0,0 +1,13 @@
+diff --git a/utilities/wireshark_dissectors/openflow/packet-openflow.c b/utilities/wireshark_dissectors/openflow/packet-openflow.c
+index aea00f8..8d98335 100644
+--- a/utilities/wireshark_dissectors/openflow/packet-openflow.c
++++ b/utilities/wireshark_dissectors/openflow/packet-openflow.c
+@@ -766,7 +766,7 @@ static gint ett_ofp_error_msg_data = -1;
+ void proto_reg_handoff_openflow()
+ {
+     openflow_handle = create_dissector_handle(dissect_openflow, proto_openflow);
+-    dissector_add(TCP_PORT_FILTER, global_openflow_proto, openflow_handle);
++    dissector_add_uint(TCP_PORT_FILTER, global_openflow_proto, openflow_handle);
+ }
+ 
+ #define NO_STRINGS NULL

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 85
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  - 1
-  version: 0.2.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -16,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2012-03-09 00:00:00 Z
+date: 2012-07-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -44,9 +43,11 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- .gitmodules
 - .mono.rant
+- .travis.yml
+- .yardopts
 - Doxyfile
-- GPL2
 - Gemfile
 - README.md
 - Rakefile
@@ -67,13 +68,14 @@ files:
 - features/example.switch_monitor.feature
 - features/packetin_filter.feature
 - features/step_definitions/kill_steps.rb
+- features/step_definitions/killall_steps.rb
 - features/step_definitions/log_steps.rb
 - features/step_definitions/misc_steps.rb
-- features/step_definitions/off_steps.rb
 - features/step_definitions/run_steps.rb
 - features/step_definitions/send_packets_steps.rb
 - features/step_definitions/show_stats_steps.rb
 - features/step_definitions/stats_steps.rb
+- features/step_definitions/up_steps.rb
 - features/support/env.rb
 - features/support/hooks.rb
 - features/switch_manager.feature
@@ -89,38 +91,16 @@ files:
 - features/tutorial.hello_trema.feature
 - features/tutorial.packet_in.feature
 - features/tutorial.switch_info.feature
+- locale/README.ja.md
+- locale/ja/yard.po
+- locale/yard.pot
 - ruby/.gitignore
 - ruby/blocker.rb
 - ruby/extconf.rb
 - ruby/sub-process.rb
 - ruby/trema/action-common.c
 - ruby/trema/action-common.h
-- ruby/trema/action-enqueue.c
-- ruby/trema/action-enqueue.h
-- ruby/trema/action-output.c
-- ruby/trema/action-output.h
-- ruby/trema/action-set-dl-dst.c
-- ruby/trema/action-set-dl-dst.h
-- ruby/trema/action-set-dl-src.c
-- ruby/trema/action-set-dl-src.h
-- ruby/trema/action-set-nw-dst.c
-- ruby/trema/action-set-nw-dst.h
-- ruby/trema/action-set-nw-src.c
-- ruby/trema/action-set-nw-src.h
-- ruby/trema/action-set-nw-tos.c
-- ruby/trema/action-set-nw-tos.h
-- ruby/trema/action-set-tp-dst.c
-- ruby/trema/action-set-tp-dst.h
-- ruby/trema/action-set-tp-src.c
-- ruby/trema/action-set-tp-src.h
-- ruby/trema/action-set-vlan-pcp.c
-- ruby/trema/action-set-vlan-pcp.h
-- ruby/trema/action-set-vlan-vid.c
-- ruby/trema/action-set-vlan-vid.h
-- ruby/trema/action-strip-vlan.c
-- ruby/trema/action-strip-vlan.h
-- ruby/trema/action-vendor.c
-- ruby/trema/action-vendor.h
+- ruby/trema/action.rb
 - ruby/trema/aggregate-stats-reply.rb
 - ruby/trema/app.rb
 - ruby/trema/barrier-reply.c
@@ -145,11 +125,13 @@ files:
 - ruby/trema/controller.h
 - ruby/trema/controller.rb
 - ruby/trema/daemon.rb
+- ruby/trema/desc-stats-reply.rb
 - ruby/trema/dsl.rb
 - ruby/trema/dsl/configuration.rb
 - ruby/trema/dsl/context.rb
 - ruby/trema/dsl/link.rb
 - ruby/trema/dsl/parser.rb
+- ruby/trema/dsl/rswitch.rb
 - ruby/trema/dsl/run.rb
 - ruby/trema/dsl/runner.rb
 - ruby/trema/dsl/stanza.rb
@@ -162,6 +144,9 @@ files:
 - ruby/trema/echo-reply.h
 - ruby/trema/echo-request.c
 - ruby/trema/echo-request.h
+- ruby/trema/echo.c
+- ruby/trema/echo.h
+- ruby/trema/enqueue.rb
 - ruby/trema/error.c
 - ruby/trema/error.h
 - ruby/trema/exact-match.rb
@@ -170,6 +155,8 @@ files:
 - ruby/trema/features-reply.h
 - ruby/trema/features-request.c
 - ruby/trema/features-request.h
+- ruby/trema/flow-mod.c
+- ruby/trema/flow-mod.h
 - ruby/trema/flow-removed.c
 - ruby/trema/flow-removed.h
 - ruby/trema/flow-stats-reply.rb
@@ -178,6 +165,7 @@ files:
 - ruby/trema/get-config-reply.h
 - ruby/trema/get-config-request.c
 - ruby/trema/get-config-request.h
+- ruby/trema/hardware-switch.rb
 - ruby/trema/hello.c
 - ruby/trema/hello.h
 - ruby/trema/host.rb
@@ -187,6 +175,7 @@ files:
 - ruby/trema/list-switches-reply.h
 - ruby/trema/logger.c
 - ruby/trema/logger.h
+- ruby/trema/logger.rb
 - ruby/trema/mac.rb
 - ruby/trema/match.c
 - ruby/trema/match.h
@@ -205,15 +194,18 @@ files:
 - ruby/trema/openflow-error.h
 - ruby/trema/openflow-switch.rb
 - ruby/trema/ordered-hash.rb
+- ruby/trema/packet-in.c
+- ruby/trema/packet-in.h
 - ruby/trema/packet-queue.rb
-- ruby/trema/packet_in.c
-- ruby/trema/packet_in.h
 - ruby/trema/packetin-filter.rb
 - ruby/trema/path.rb
 - ruby/trema/phost.rb
 - ruby/trema/port-mod.c
 - ruby/trema/port-mod.h
 - ruby/trema/port-stats-reply.rb
+- ruby/trema/port-status-add.rb
+- ruby/trema/port-status-delete.rb
+- ruby/trema/port-status-modify.rb
 - ruby/trema/port-status.c
 - ruby/trema/port-status.h
 - ruby/trema/port.c
@@ -224,8 +216,22 @@ files:
 - ruby/trema/queue-get-config-request.c
 - ruby/trema/queue-get-config-request.h
 - ruby/trema/queue-stats-reply.rb
+- ruby/trema/ruby-switch.rb
+- ruby/trema/send-out-port.rb
 - ruby/trema/set-config.c
 - ruby/trema/set-config.h
+- ruby/trema/set-eth-addr.rb
+- ruby/trema/set-eth-dst-addr.rb
+- ruby/trema/set-eth-src-addr.rb
+- ruby/trema/set-ip-addr.rb
+- ruby/trema/set-ip-dst-addr.rb
+- ruby/trema/set-ip-src-addr.rb
+- ruby/trema/set-ip-tos.rb
+- ruby/trema/set-transport-dst-port.rb
+- ruby/trema/set-transport-port.rb
+- ruby/trema/set-transport-src-port.rb
+- ruby/trema/set-vlan-priority.rb
+- ruby/trema/set-vlan-vid.rb
 - ruby/trema/shell.rb
 - ruby/trema/shell/down.rb
 - ruby/trema/shell/killall.rb
@@ -242,37 +248,31 @@ files:
 - ruby/trema/stats-reply.h
 - ruby/trema/stats-request.c
 - ruby/trema/stats-request.h
+- ruby/trema/strip-vlan-header.rb
 - ruby/trema/switch-daemon.rb
 - ruby/trema/switch-disconnected.c
 - ruby/trema/switch-disconnected.h
 - ruby/trema/switch-manager.rb
+- ruby/trema/switch.c
+- ruby/trema/switch.h
 - ruby/trema/switch.rb
 - ruby/trema/table-stats-reply.rb
 - ruby/trema/timers.rb
+- ruby/trema/trema-ruby-utils.c
+- ruby/trema/trema-ruby-utils.h
 - ruby/trema/trema.c
 - ruby/trema/tremashark.rb
 - ruby/trema/util.rb
-- ruby/trema/vendor-request.c
-- ruby/trema/vendor-request.h
+- ruby/trema/vendor-action.rb
 - ruby/trema/vendor-stats-reply.rb
 - ruby/trema/vendor.c
 - ruby/trema/vendor.h
 - ruby/trema/version.rb
 - spec/spec_helper.rb
+- spec/support/action.rb
+- spec/support/mandatory-option.rb
 - spec/support/openflow-message.rb
-- spec/trema/action-enqueue_spec.rb
-- spec/trema/action-output_spec.rb
-- spec/trema/action-set-dl-dst_spec.rb
-- spec/trema/action-set-dl-src_spec.rb
-- spec/trema/action-set-nw-dst_spec.rb
-- spec/trema/action-set-nw-src_spec.rb
-- spec/trema/action-set-nw-tos_spec.rb
-- spec/trema/action-set-tp-dst_spec.rb
-- spec/trema/action-set-tp-src_spec.rb
-- spec/trema/action-set-vlan-pcp_spec.rb
-- spec/trema/action-set-vlan-vid_spec.rb
-- spec/trema/action-strip-vlan_spec.rb
-- spec/trema/action-vendor_spec.rb
+- spec/support/port-status.rb
 - spec/trema/app_spec.rb
 - spec/trema/barrier-reply_spec.rb
 - spec/trema/barrier-request_spec.rb
@@ -288,15 +288,19 @@ files:
 - spec/trema/dsl/vswitch_spec.rb
 - spec/trema/echo-reply_spec.rb
 - spec/trema/echo-request_spec.rb
+- spec/trema/enqueue_spec.rb
 - spec/trema/error_spec.rb
 - spec/trema/executables_spec.rb
 - spec/trema/features-reply_spec.rb
 - spec/trema/features-request_spec.rb
+- spec/trema/flow-mod_spec.rb
 - spec/trema/flow-removed_spec.rb
 - spec/trema/get-config-reply_spec.rb
 - spec/trema/get-config-request_spec.rb
+- spec/trema/hardware-switch_spec.rb
 - spec/trema/hello_spec.rb
 - spec/trema/host_spec.rb
+- spec/trema/ip_spec.rb
 - spec/trema/link_spec.rb
 - spec/trema/list-switches-reply_spec.rb
 - spec/trema/logger_spec.rb
@@ -304,26 +308,42 @@ files:
 - spec/trema/match_spec.rb
 - spec/trema/open-vswitch_spec.rb
 - spec/trema/openflow-error_spec.rb
-- spec/trema/openflow-switch_spec.rb
 - spec/trema/packet-in_spec.rb
 - spec/trema/packet-out_spec.rb
 - spec/trema/packetin-filter_spec.rb
 - spec/trema/port-mod_spec.rb
+- spec/trema/port-status-add_spec.rb
+- spec/trema/port-status-delete_spec.rb
+- spec/trema/port-status-modify_spec.rb
 - spec/trema/port-status_spec.rb
 - spec/trema/port_spec.rb
 - spec/trema/process_spec.rb
 - spec/trema/queue-get-config-reply_spec.rb
 - spec/trema/queue-get-config-request_spec.rb
+- spec/trema/send-out-port_spec.rb
 - spec/trema/set-config_spec.rb
+- spec/trema/set-eth-dst-addr_spec.rb
+- spec/trema/set-eth-src-addr_spec.rb
+- spec/trema/set-ip-dst-addr_spec.rb
+- spec/trema/set-ip-src-addr_spec.rb
+- spec/trema/set-ip-tos_spec.rb
+- spec/trema/set-transport-dst-port_spec.rb
+- spec/trema/set-transport-src-port_spec.rb
+- spec/trema/set-vlan-priority_spec.rb
+- spec/trema/set-vlan-vid_spec.rb
 - spec/trema/shell/vhost_spec.rb
 - spec/trema/shell/vswitch_spec.rb
 - spec/trema/stats-reply_spec.rb
 - spec/trema/stats-request_spec.rb
+- spec/trema/strip-vlan-header_spec.rb
+- spec/trema/switch-daemon_spec.rb
 - spec/trema/switch-disconnected_spec.rb
 - spec/trema/switch-manager_spec.rb
 - spec/trema/tremashark_spec.rb
 - spec/trema/util_spec.rb
-- spec/trema/vendor-request_spec.rb
+- spec/trema/vendor-action_spec.rb
+- spec/trema/vendor_spec.rb
+- spec/trema_spec.rb
 - src/examples/cbench_switch/README
 - src/examples/cbench_switch/cbench-switch.rb
 - src/examples/cbench_switch/cbench_switch.c
@@ -403,6 +423,10 @@ files:
 - src/lib/byteorder.c
 - src/lib/byteorder.h
 - src/lib/checks.h
+- src/lib/chibach.c
+- src/lib/chibach.h
+- src/lib/chibach_private.c
+- src/lib/chibach_private.h
 - src/lib/daemon.c
 - src/lib/daemon.h
 - src/lib/doubly_linked_list.c
@@ -417,6 +441,7 @@ files:
 - src/lib/icmp.h
 - src/lib/igmp.h
 - src/lib/ipv4.h
+- src/lib/ipv6.h
 - src/lib/linked_list.c
 - src/lib/linked_list.h
 - src/lib/log.c
@@ -433,6 +458,8 @@ files:
 - src/lib/openflow_message.c
 - src/lib/openflow_message.h
 - src/lib/openflow_service_interface.h
+- src/lib/openflow_switch_interface.c
+- src/lib/openflow_switch_interface.h
 - src/lib/packet_info.c
 - src/lib/packet_info.h
 - src/lib/packet_parser.c
@@ -440,6 +467,8 @@ files:
 - src/lib/packetin_filter_interface.h
 - src/lib/persistent_storage.c
 - src/lib/persistent_storage.h
+- src/lib/secure_channel.c
+- src/lib/secure_channel.h
 - src/lib/stat.c
 - src/lib/stat.h
 - src/lib/tcp.h
@@ -447,6 +476,7 @@ files:
 - src/lib/timer.h
 - src/lib/trema.c
 - src/lib/trema.h
+- src/lib/trema.hpp
 - src/lib/trema_private.c
 - src/lib/trema_private.h
 - src/lib/trema_wrapper.c
@@ -528,6 +558,8 @@ files:
 - unittests/lib/stat_test.c
 - unittests/lib/test_packets/arp_rep.cap
 - unittests/lib/test_packets/arp_req.cap
+- unittests/lib/test_packets/icmp6_echo_rep.cap
+- unittests/lib/test_packets/icmp6_echo_req.cap
 - unittests/lib/test_packets/icmp_echo_rep.cap
 - unittests/lib/test_packets/icmp_echo_req.cap
 - unittests/lib/test_packets/igmp_query_v2.cap
@@ -550,13 +582,14 @@ files:
 - unittests/switch_manager/switch_manager_test.c
 - unittests/wrapper_stubs.c
 - vendor/.gitignore
-- vendor/README
+- vendor/README.md
 - vendor/cmockery-20110428.tar.gz
 - vendor/oflops-0.03.tar.gz
 - vendor/oflops_no_snmp+1.0.0.patch
 - vendor/openflow-1.0.0.tar.gz
 - vendor/openflow.git.tar.gz
 - vendor/openvswitch-1.2.2.tar.gz
+- vendor/packet-openflow.diff
 - vendor/phost/doc/COPYING
 - vendor/phost/doc/README
 - vendor/phost/src/.gitignore