trema 0.1.3.2 → 0.2.0

data/spec/trema/packet-out_spec.rb

@@ -112,12 +112,13 @@ describe "packet-out" do
           0xabc,
           :data => data,
           :actions => Trema::ActionOutput.new( :port => 1 )
-	)
+        )
         sleep 2
         vhost( "host2" ).rx_stats.n_pkts.should == 1
       }
     end
   end
+
 end
 
 

data/spec/trema/queue-get-config-request_spec.rb

@@ -38,7 +38,7 @@ describe QueueGetConfigRequest, ".new( VALID OPTIONS )" do
 
   context "when #queue_get_config_request is sent" do
     it "should #queue_get_config_reply" do
-      pending "#queue_get_config_reply is not implemented in #{Trema::Vendor::openvswitch}"
+      pending "#queue_get_config_reply is not implemented in #{Trema.vendor_openvswitch}"
       class QueueGetConfigController < Controller; end
       network {
         vswitch { datapath_id 0xabc }

data/src/lib/ipv4.h

@@ -28,7 +28,24 @@
 #include "buffer.h"
 
 
-typedef struct iphdr ipv4_header_t;
+typedef struct  {
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+  unsigned int ihl:4;
+  unsigned int version:4;
+#elif __BYTE_ORDER == __BIG_ENDIAN
+  unsigned int version:4;
+  unsigned int ihl:4;
+#endif
+  u_int8_t tos;
+  u_int16_t tot_len;
+  u_int16_t id;
+  u_int16_t frag_off;
+  u_int8_t ttl;
+  u_int8_t protocol;
+  u_int16_t csum;
+  u_int32_t saddr;
+  u_int32_t daddr;
+} ipv4_header_t;
 
 
 #define IPV4_ADDRLEN 4

data/src/lib/packet_info.h

@@ -137,7 +137,7 @@ typedef struct {
 
   uint8_t igmp_type;
   uint8_t igmp_code;
-  uint16_t igmp_cksum;
+  uint16_t igmp_checksum;
   uint32_t igmp_group;
 
   uint16_t tcp_src_port;

data/src/lib/packet_parser.c

@@ -185,7 +185,7 @@ parse_ipv4( buffer *buf ) {
   packet_info->ipv4_frag_off = ntohs( ipv4_header->frag_off );
   packet_info->ipv4_ttl = ipv4_header->ttl;
   packet_info->ipv4_protocol = ipv4_header->protocol;
-  packet_info->ipv4_checksum = ntohs( ipv4_header->check );
+  packet_info->ipv4_checksum = ntohs( ipv4_header->csum );
   packet_info->ipv4_saddr = ntohl( ipv4_header->saddr );
   packet_info->ipv4_daddr = ntohl( ipv4_header->daddr );
 
@@ -369,7 +369,7 @@ parse_igmp( buffer *buf ) {
   igmp_header_t *igmp = ptr;
   packet_info->igmp_type = igmp->type;
   packet_info->igmp_code = igmp->code;
-  packet_info->igmp_cksum = ntohs( igmp->csum );
+  packet_info->igmp_checksum = ntohs( igmp->csum );
   packet_info->igmp_group = ntohl( igmp->group );
 
   packet_info->format |= NW_IGMP;

data/trema

@@ -22,7 +22,6 @@
 
 
 $LOAD_PATH.unshift File.expand_path( File.join File.dirname( __FILE__ ), "ruby" )
-$LOAD_PATH.unshift File.expand_path( File.join File.dirname( __FILE__ ), "vendor", "ruby-ifconfig-1.2", "lib" )
 
 
 require "English"
@@ -61,9 +60,9 @@ def method_for command
 end
 
 
-FileUtils.mkdir_p Trema.log_directory
-FileUtils.mkdir_p Trema.pid_directory
-FileUtils.mkdir_p Trema.sock_directory
+FileUtils.mkdir_p Trema.log
+FileUtils.mkdir_p Trema.pid
+FileUtils.mkdir_p Trema.sock
 
 command = ARGV.shift
 if method_for( command )

data/trema.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "trema"
-  s.version = "0.1.3.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yasuhito Takamiya"]
   s.bindir = ["."]
-  s.date = "2012-02-23"
+  s.date = "2012-02-29"
   s.description = "Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby/C"
   s.email = "yasuhito@gmail.com"
   s.executables = ["trema", "trema-config"]
@@ -172,6 +172,7 @@ Gem::Specification.new do |s|
     "ruby/trema/monkey-patch/integer/base-conversions.rb",
     "ruby/trema/monkey-patch/integer/ranges.rb",
     "ruby/trema/monkey-patch/module.rb",
+    "ruby/trema/monkey-patch/module/class-method.rb",
     "ruby/trema/monkey-patch/module/deprecation.rb",
     "ruby/trema/monkey-patch/string.rb",
     "ruby/trema/monkey-patch/string/inflectors.rb",

data/unittests/lib/openflow_message_test.c

@@ -5072,7 +5072,7 @@ setup_ipv4_packet( size_t length, uint16_t type ) {
   ipv4->tos = 0;
   ipv4->tot_len = htons( sizeof( ipv4_header_t ) );
   ipv4->ttl = 0;
-  ipv4->check = 0;
+  ipv4->csum = 0;
   ipv4->saddr = htonl( 0xC0A80067 );
   ipv4->daddr = htonl( 0xC0A80036 );
   ipv4->frag_off = htons( 0 );

data/unittests/lib/packet_parser_test.c

@@ -565,7 +565,7 @@ test_parse_packet_igmp_query_v2_succeeds() {
 
   assert_int_equal( packet_info->igmp_type, IGMP_MEMBERSHIP_QUERY );
   assert_int_equal( packet_info->igmp_code, 100 );
-  assert_int_equal( packet_info->igmp_cksum, 0xee9b );
+  assert_int_equal( packet_info->igmp_checksum, 0xee9b );
   assert_int_equal( packet_info->igmp_group, 0 );
 
   assert_true( packet_type_igmp_membership_query( buffer ) );

data/unittests/lib/utility_test.c

@@ -529,7 +529,7 @@ test_get_checksum_udp_packet() {
   ipv4_header.frag_off = htons( 0 );
   ipv4_header.ttl = 0x80;
   ipv4_header.protocol = 0x11;
-  ipv4_header.check = 0;
+  ipv4_header.csum = 0;
   ipv4_header.saddr = htonl( 0x0a3835af );
   ipv4_header.daddr = htonl( 0x0a3837ff );
 
@@ -553,7 +553,7 @@ test_get_checksum_icmp_packet() {
   ipv4_header.frag_off = htons( 0 );
   ipv4_header.ttl = 0x40;
   ipv4_header.protocol = 0x01;
-  ipv4_header.check = 0;
+  ipv4_header.csum = 0;
   ipv4_header.saddr = htonl( 0xc0a8642b );
   ipv4_header.daddr = htonl( 0xc0a8642c );
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
   - 2
-  version: 0.1.3.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -17,7 +16,7 @@ bindir:
 - .
 cert_chain: []
 
-date: 2012-02-23 00:00:00 Z
+date: 2012-02-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -389,6 +388,7 @@ files:
 - ruby/trema/monkey-patch/integer/base-conversions.rb
 - ruby/trema/monkey-patch/integer/ranges.rb
 - ruby/trema/monkey-patch/module.rb
+- ruby/trema/monkey-patch/module/class-method.rb
 - ruby/trema/monkey-patch/module/deprecation.rb
 - ruby/trema/monkey-patch/string.rb
 - ruby/trema/monkey-patch/string/inflectors.rb