trema 0.2.5 → 0.2.6

data/src/tremashark/queue.h

@@ -36,7 +36,7 @@ typedef struct queue {
   queue_element *head;
   queue_element *divider;
   queue_element *tail;
-  int length;
+  volatile int length;
 } queue;
 
 

data/src/tremashark/stdin_relay.c

@@ -1,6 +1,6 @@
 /*
  * stdin_relay: An application that relays text string from stdin to tremashark
- * 
+ *
  * Author: Yasunobu Chiba
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -155,10 +155,12 @@ usage( void ) {
   printf(
     "Usage: stdin_relay [OPTION]...\n"
     "\n"
-    "  -s DUMP_SERVICE_NAME        dump service name\n"
-    "  -n, --name=SERVICE_NAME     service name\n"
-    "  -l, --logging_level=LEVEL   set logging level\n"
-    "  -h, --help                  display this help and exit\n"
+    "  -s DUMP_SERVICE_NAME            dump service name\n"
+    "  -n, --name=SERVICE_NAME         service name\n"
+    "  -l, --logging_level=LEVEL       set logging level\n"
+    "  -g, --syslog                    output log messages to syslog\n"
+    "  -f, --logging_facility=FACILITY set syslog facility\n"
+    "  -h, --help                      display this help and exit\n"
   );
 }
 
@@ -174,14 +176,14 @@ static void
 parse_options( int *argc, char **argv[] ) {
   int opt;
 
-  while( 1 ) {
+  while ( 1 ) {
     opt = getopt( *argc, *argv, "s:" );
 
-    if( opt < 0 ){
+    if ( opt < 0 ) {
       break;
     }
 
-    switch ( opt ){
+    switch ( opt ) {
       case 's':
         if ( optarg && dump_service_name == NULL ) {
           dump_service_name = xstrdup( optarg );

data/src/tremashark/syslog_relay.c

@@ -1,6 +1,6 @@
 /*
  * syslog_relay: An application that relays syslog messages to tremashark
- * 
+ *
  * Author: Yasunobu Chiba
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -24,8 +24,8 @@
 #include <getopt.h>
 #include <inttypes.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <unistd.h>
 #include "trema.h"
 
@@ -112,12 +112,14 @@ usage( void ) {
   printf(
     "Usage: syslog_relay [OPTION]...\n"
     "\n"
-    "  -p LISTEN_PORT              listen port for receiving syslog messages\n"
-    "  -s DUMP_SERVICE_NAME        dump service name\n"
-    "  -n, --name=SERVICE_NAME     service name\n"
-    "  -d, --daemonize             run in the background\n"
-    "  -l, --logging_level=LEVEL   set logging level\n"
-    "  -h, --help                  display this help and exit\n"
+    "  -p LISTEN_PORT                  listen port for receiving syslog messages\n"
+    "  -s DUMP_SERVICE_NAME            dump service name\n"
+    "  -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"
+    "  -f, --logging_facility=FACILITY set syslog facility\n"
+    "  -h, --help                      display this help and exit\n"
   );
 }
 
@@ -133,14 +135,14 @@ static void
 parse_options( int *argc, char **argv[] ) {
   int opt;
 
-  while( 1 ) {
+  while ( 1 ) {
     opt = getopt( *argc, *argv, "p:s:" );
 
-    if( opt < 0 ){
+    if ( opt < 0 ) {
       break;
     }
 
-    switch ( opt ){
+    switch ( opt ) {
       case 'p':
         if ( ( optarg != NULL ) && ( atoi( optarg ) <= UINT16_MAX ) && ( atoi ( optarg ) >= 0 ) ) {
           listen_port = ( uint16_t ) atoi( optarg );
@@ -178,7 +180,7 @@ init_syslog_relay( int *argc, char **argv[] ) {
     close( syslog_fd );
     syslog_fd = -1;
   }
-  
+
   syslog_fd = socket( PF_INET, SOCK_DGRAM, 0 );
   if ( syslog_fd < 0 ) {
     error( "Failed to create socket ( errno = %s [%d] ).", strerror( errno ), errno );

data/src/tremashark/tremashark.c

@@ -1,6 +1,6 @@
 /*
  * tremashark: A bridge for printing various events on Wireshark
- * 
+ *
  * Author: Yasunobu Chiba, Yasunori Nakazawa
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -97,7 +97,7 @@ write_to_file( buffer *packet ) {
     if ( err == EAGAIN || err == EWOULDBLOCK ) {
       return WRITE_BUSY;
     }
-    error( "write error ( errno = %s [%d] ).", strerror( err), err );
+    error( "write error ( errno = %s [%d] ).", strerror( err ), err );
     return WRITE_ERROR;
   }
 
@@ -219,7 +219,7 @@ write_pcap_packet( void *user_data ) {
 
   timersub( &now, &buffer_length, &threshold );
 
-  for ( ; ; ) {
+  for ( ;; ) {
     buffer *packet;
     queue_status status = peek_pcap_packet( &packet );
     if ( status == QUEUE_EMPTY ) {
@@ -251,8 +251,6 @@ write_pcap_packet( void *user_data ) {
   }
 
   fsync( outfile_fd );
-
-  return;
 }
 
 
@@ -274,7 +272,6 @@ set_timer_event() {
     critical( "failed in set timer event" );
     abort();
   }
-  return;
 }
 
 
@@ -350,8 +347,6 @@ write_circular_buffer( void ) {
   foreach_pcap_queue( ( void * ) write_to_file );
 
   finalize_pcap();
-
-  return;
 }
 
 
@@ -403,16 +398,18 @@ usage( void ) {
   printf(
     "Usage: tremashark [OPTION]...\n"
     "\n"
-    "  -t                          launch tshark instead of wireshark\n"
-    "  -w FILE_TO_SAVE             save messages to pcap file\n"
-    "  -p                          do not launch wireshark nor tshark\n"
-    "  -r                          do not trust remote clock\n"
-    "  -c NUMBER_OF_MESSAGES       save messages to circular buffer\n"
-    "  -s DUMP_SERVICE_NAME        dump service name\n"
-    "  -n, --name=SERVICE_NAME     service name\n"
-    "  -d, --daemonize             run in the background\n"
-    "  -l, --logging_level=LEVEL   set logging level\n"
-    "  -h, --help                  display this help and exit\n"
+    "  -t                              launch tshark instead of wireshark\n"
+    "  -w FILE_TO_SAVE                 save messages to pcap file\n"
+    "  -p                              do not launch wireshark nor tshark\n"
+    "  -r                              do not trust remote clock\n"
+    "  -c NUMBER_OF_MESSAGES           save messages to circular buffer\n"
+    "  -s DUMP_SERVICE_NAME            dump service name\n"
+    "  -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"
+    "  -f, --logging_facility=FACILITY set syslog facility\n"
+    "  -h, --help                      display this help and exit\n"
   );
 }
 

data/trema

@@ -1,101 +1,7 @@
-#! /usr/bin/env ruby
-#
-# Trema command-line tool.
-#
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
-#
-# Copyright (C) 2008-2012 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.
-#
+#!/usr/bin/env ruby
 
 
-$LOAD_PATH.unshift File.expand_path( File.join File.dirname( __FILE__ ), "ruby" )
-
-
-require "English"
-require "fileutils"
-require "trema/command"
-require "trema/path"
-
-
-def setup_tmp
-  if FileTest.exist?( Trema.tmp ) and not FileTest.writable?( Trema.tmp )
-    # Trema is system widely installed with gem command
-    sh "sudo chmod o+w -R #{ Trema.tmp }"
-  end
-
-  FileUtils.mkdir_p Trema.log
-  FileUtils.mkdir_p Trema.pid
-  FileUtils.mkdir_p Trema.sock
-end
-
-
-def method_for command
-  case command
-    when "version", "-V", "--version"
-      return :show_version
-    when "ruby"
-      return :ruby
-    when "help", "-h", "--help", "/?", "-?"
-      return :usage
-  end
-
-  setup_tmp
-
-  case command
-    when "run", "start"
-      return :run
-    when "up"
-      return :up
-    when "kill", "stop", "off", "down"
-      return :kill
-    when "killall"
-      return :killall
-    when "send_packets", "send_packet"
-      return :send_packets
-    when "show_stats"
-      return :show_stats
-    when "reset_stats"
-      return :reset_stats
-    when "dump_flows", "dump_flow"
-      return :dump_flows
-    when "shell", NilClass
-      return :shell
-    else
-      return nil
-  end
-end
-
-
-command = ARGV.shift
-if method_for( command )
-  begin
-    include Trema::Command
-    __send__ method_for( command )
-  rescue
-    $stderr.puts $ERROR_INFO.message
-    $ERROR_INFO.backtrace.each do | each |
-      $stderr.puts each if $verbose
-    end
-    exit false
-  end
-else
-  $stderr.puts "Unknown command: '#{ command }'"
-  $stderr.puts "Type '#{ $0 } --help' for usage."
-  exit false
-end
+exec File.join( File.dirname( __FILE__ ), "./bin/trema" ), *ARGV
 
 
 ### Local variables:

data/trema-config

@@ -1,57 +1,7 @@
-#! /usr/bin/env ruby
-#
-# Trema compile helper.
-#
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
-#
-# Copyright (C) 2008-2012 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.
-#
+#!/usr/bin/env ruby
 
 
-$LOAD_PATH.unshift( File.expand_path( File.dirname( __FILE__ ) + "/ruby" ) )
-
-
-require "fileutils"
-require "optparse"
-require "trema/path"
-
-
-$opts = OptionParser.new
-
-FileUtils.cd Trema.home do
-  $opts.banner = "Usage: #{ $0 } [OPTIONS ...]"
-
-  $opts.on( "-c", "--cflags" ) do
-    $cflags = true
-  end
-  $opts.on( "-l", "--libs" ) do
-    $libs = true
-  end
-
-  $opts.parse! ARGV
-
-  output = []
-  if $cflags
-    output << "-I#{ Trema.home }/src/lib -I#{ Trema.openflow }"
-  end
-  if $libs
-    output << "-L#{ Trema.objects }/lib -ltrema -lrt -lpthread -lsqlite3 -ldl"
-  end
-  print output.join( " " )
-end
+exec File.join( File.dirname( __FILE__ ), "./bin/trema-config" ), *ARGV
 
 
 ### Local variables:

data/trema.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path( "../ruby", __FILE__ )
 require "trema/version"
 
@@ -23,4 +22,16 @@ Gem::Specification.new do | s |
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "rake"
+  s.add_runtime_dependency "gli", "~> 2.5.2"
+
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rdoc"
+  s.add_development_dependency "aruba"
 end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/unittests/cmockery_trema.h

@@ -55,26 +55,27 @@ void unstub_logger( void );
 #ifdef expect_string_count
 #undef expect_string_count
 #endif
-#define expect_string_count( function, parameter, string, count )	     \
+#define expect_string_count( function, parameter, string, count )            \
   _expect_string( #function, #parameter, __FILE__, __LINE__, string, count )
 
 
 #ifdef expect_assert_failure
 #undef expect_assert_failure
 #endif
-#define expect_assert_failure( function_call )                                    		\
-  {                                                                               		\
+#define expect_assert_failure( function_call )                                                  \
+  {                                                                                             \
     const char *expression = ( const char * ) ( uintptr_t ) setjmp( global_expect_assert_env ); \
-    global_expecting_assert = 1;                                                  		\
-    if ( expression ) {                                                           		\
-      print_message( "Expected assertion %s occurred\n", expression );            		\
-      global_expecting_assert = 0;                                                		\
-    } else {                                                                      		\
-      function_call ;                                                             		\
-      global_expecting_assert = 0;                                                		\
-      print_error( "Expected assert in %s\n", #function_call )    ;               		\
-      _fail( __FILE__, __LINE__ );                                                		\
-    }                                                                             		\
+    global_expecting_assert = 1;                                                                \
+    if ( expression ) {                                                                         \
+      print_message( "Expected assertion %s occurred\n", expression );                          \
+      global_expecting_assert = 0;                                                              \
+    }                                                                                           \
+    else {                                                                                      \
+      function_call;                                                                            \
+      global_expecting_assert = 0;                                                              \
+      print_error( "Expected assert in %s\n", #function_call );                                 \
+      _fail( __FILE__, __LINE__ );                                                              \
+    }                                                                                           \
   }
 
 

data/unittests/lib/buffer_test.c

@@ -267,7 +267,7 @@ test_duplicate_buffer_succeeds() {
   unsigned char *data = append_back_buffer( buf, 1024 );
   int i;
   for ( i = 0; i < 1024; i++ ) {
-    data[ i ] = ( unsigned char ) ( i % 0xff ) ;
+    data[ i ] = ( unsigned char ) ( i % 0xff );
   }
 
   buffer *duplicate = duplicate_buffer( buf );

data/unittests/lib/byteorder_test.c

@@ -184,14 +184,22 @@ create_action_enqueue() {
 
 
 static struct ofp_action_vendor_header *
-create_action_vendor() {
-  struct ofp_action_vendor_header *action = xmalloc( sizeof( struct ofp_action_vendor_header ) );
-  memset( action, 0, sizeof( struct ofp_action_vendor_header ) );
+create_action_vendor( size_t body_length ) {
+  size_t length = sizeof( struct ofp_action_vendor_header ) + body_length;
+  struct ofp_action_vendor_header *action = xmalloc( length );
+  memset( action, 0, length );
 
   action->type = htons( OFPAT_VENDOR );
-  action->len = htons( 8 );
+  action->len = htons( ( uint16_t ) length );
   action->vendor = htonl( 2048 );
 
+  if ( body_length > 0 ) {
+    uint8_t *body = ( uint8_t * ) action + sizeof( struct ofp_action_vendor_header );
+    for ( size_t i = 0; i < body_length; i++ ) {
+      body[ i ] = ( uint8_t ) rand();
+    }
+  }
+
   return action;
 }
 
@@ -469,7 +477,7 @@ test_ntoh_action_enqueue() {
 
   assert_int_equal( htons( dst.type ), src->type );
   assert_int_equal( htons( dst.len ), src->len );
-  assert_int_equal( htons( dst.port) , src->port );
+  assert_int_equal( htons( dst.port ), src->port );
   assert_int_equal( ( int ) htonl( dst.queue_id ), ( int ) src->queue_id );
 
   xfree( src );
@@ -482,19 +490,91 @@ test_ntoh_action_enqueue() {
 
 void
 test_ntoh_action_vendor() {
-  struct ofp_action_vendor_header dst;
+  struct ofp_action_vendor_header *src = create_action_vendor( 0 );
 
-  memset( &dst, 0, sizeof( struct ofp_action_vendor_header ) );
+  size_t length = sizeof( struct ofp_action_vendor_header );
+  struct ofp_action_vendor_header *dst = xmalloc( length );
+  memset( dst, 0, length );
 
-  struct ofp_action_vendor_header *src = create_action_vendor();
+  ntoh_action_vendor( dst, src );
 
-  ntoh_action_vendor( &dst, src );
+  assert_int_equal( htons( dst->type ), src->type );
+  assert_int_equal( htons( dst->len ), src->len );
+  assert_int_equal( ( int ) htonl( dst->vendor ), ( int ) src->vendor );
 
-  assert_int_equal( htons( dst.type ), src->type );
-  assert_int_equal( htons( dst.len ), src->len );
-  assert_int_equal( ( int ) htonl( dst.vendor ), ( int ) src->vendor );
+  xfree( src );
+  xfree( dst );
+}
+
+
+void
+test_ntoh_action_vendor_with_body() {
+  const size_t body_length = 128;
+  struct ofp_action_vendor_header *src = create_action_vendor( body_length );
+
+  size_t length = sizeof( struct ofp_action_vendor_header ) + body_length;
+  struct ofp_action_vendor_header *dst = xmalloc( length );
+  memset( dst, 0, length );
+
+  ntoh_action_vendor( dst, src );
+
+  assert_int_equal( htons( dst->type ), src->type );
+  assert_int_equal( htons( dst->len ), src->len );
+  assert_int_equal( ( int ) htonl( dst->vendor ), ( int ) src->vendor );
+  void *src_body = ( char * ) src + sizeof( struct ofp_action_header );
+  void *dst_body = ( char * ) dst + sizeof( struct ofp_action_header );
+  assert_memory_equal( dst_body, src_body, body_length );
 
   xfree( src );
+  xfree( dst );
+}
+
+
+/********************************************************************************
+ * hton_action_vendor() test.
+ ********************************************************************************/
+
+void
+test_hton_action_vendor() {
+  struct ofp_action_vendor_header *src = create_action_vendor( 0 );
+  hton_action_vendor( src, src );
+
+  size_t length = sizeof( struct ofp_action_vendor_header );
+  struct ofp_action_vendor_header *dst = xmalloc( length );
+  memset( dst, 0, length );
+
+  hton_action_vendor( dst, src );
+
+  assert_int_equal( ntohs( dst->type ), src->type );
+  assert_int_equal( ntohs( dst->len ), src->len );
+  assert_int_equal( ( int ) ntohl( dst->vendor ), ( int ) src->vendor );
+
+  xfree( src );
+  xfree( dst );
+}
+
+
+void
+test_hton_action_vendor_with_body() {
+  const size_t body_length = 128;
+  struct ofp_action_vendor_header *src = create_action_vendor( body_length );
+  hton_action_vendor( src, src );
+
+  size_t length = sizeof( struct ofp_action_vendor_header ) + body_length;
+  struct ofp_action_vendor_header *dst = xmalloc( length );
+  memset( dst, 0, length );
+
+  hton_action_vendor( dst, src );
+
+  assert_int_equal( ntohs( dst->type ), src->type );
+  assert_int_equal( ntohs( dst->len ), src->len );
+  assert_int_equal( ( int ) ntohl( dst->vendor ), ( int ) src->vendor );
+  void *src_body = ( char * ) src + sizeof( struct ofp_action_header );
+  void *dst_body = ( char * ) dst + sizeof( struct ofp_action_header );
+  assert_memory_equal( dst_body, src_body, body_length );
+
+  xfree( src );
+  xfree( dst );
 }
 
 
@@ -643,7 +723,7 @@ test_ntoh_action() {
 
     assert_int_equal( htons( dst.type ), src->type );
     assert_int_equal( htons( dst.len ), src->len );
-    assert_int_equal( htons( dst.port) , src->port );
+    assert_int_equal( htons( dst.port ), src->port );
     assert_int_equal( ( int ) htonl( dst.queue_id ), ( int ) src->queue_id );
 
     xfree( src );
@@ -654,7 +734,7 @@ test_ntoh_action() {
 
     memset( &dst, 0, sizeof( struct ofp_action_vendor_header ) );
 
-    struct ofp_action_vendor_header *src = create_action_vendor();
+    struct ofp_action_vendor_header *src = create_action_vendor( 0 );
 
     ntoh_action( ( struct ofp_action_header * ) &dst, ( struct ofp_action_header * ) src );
 
@@ -676,7 +756,7 @@ test_ntoh_action_with_undefined_action_type() {
   struct ofp_action_output *src = create_action_output();
 
   src->type = htons( OFPAT_ENQUEUE + 1 );
-  
+
   expect_assert_failure( ntoh_action( ( struct ofp_action_header * ) &dst, ( struct ofp_action_header * ) src ) );
 
   xfree( src );
@@ -837,7 +917,7 @@ test_hton_action() {
 
     assert_int_equal( htons( dst.type ), src->type );
     assert_int_equal( htons( dst.len ), src->len );
-    assert_int_equal( htons( dst.port) , src->port );
+    assert_int_equal( htons( dst.port ), src->port );
     assert_int_equal( ( int ) htonl( dst.queue_id ), ( int ) src->queue_id );
 
     xfree( src );
@@ -848,7 +928,7 @@ test_hton_action() {
 
     memset( &dst, 0, sizeof( struct ofp_action_vendor_header ) );
 
-    struct ofp_action_vendor_header *src = create_action_vendor();
+    struct ofp_action_vendor_header *src = create_action_vendor( 0 );
     ntoh_action_vendor( src, src );
 
     hton_action( ( struct ofp_action_header * ) &dst, ( struct ofp_action_header * ) src );
@@ -872,7 +952,7 @@ test_hton_action_with_undefined_action_type() {
   ntoh_action_output( src, src );
 
   src->type = OFPAT_ENQUEUE + 1;
-  
+
   expect_assert_failure( hton_action( ( struct ofp_action_header * ) &dst, ( struct ofp_action_header * ) src ) );
 
   xfree( src );
@@ -903,7 +983,7 @@ test_ntoh_flow_stats_without_action() {
   src->hard_timeout = htons( 300 );
   src->cookie = htonll( COOKIE );
   src->packet_count = htonll( PACKET_COUNT );
-  src->byte_count= htonll( BYTE_COUNT );
+  src->byte_count = htonll( BYTE_COUNT );
 
   ntoh_flow_stats( dst, src );
 
@@ -944,7 +1024,7 @@ test_ntoh_flow_stats_with_single_output_action() {
   src->hard_timeout = htons( 300 );
   src->cookie = htonll( COOKIE );
   src->packet_count = htonll( PACKET_COUNT );
-  src->byte_count= htonll( BYTE_COUNT );
+  src->byte_count = htonll( BYTE_COUNT );
   struct ofp_action_output *act_src = ( struct ofp_action_output * ) src->actions;
   act_src->type = htons( OFPAT_OUTPUT );
   act_src->len = htons( 8 );
@@ -996,7 +1076,7 @@ test_ntoh_flow_stats_with_two_output_actions() {
   src->hard_timeout = htons( 300 );
   src->cookie = htonll( COOKIE );
   src->packet_count = htonll( PACKET_COUNT );
-  src->byte_count= htonll( BYTE_COUNT );
+  src->byte_count = htonll( BYTE_COUNT );
   struct ofp_action_output *act_src[ 2 ];
   act_src[ 0 ] = ( struct ofp_action_output * ) src->actions;
   act_src[ 0 ]->type = htons( OFPAT_OUTPUT );
@@ -1064,7 +1144,7 @@ test_hton_flow_stats_without_action() {
   src->hard_timeout = 300;
   src->cookie = COOKIE;
   src->packet_count = PACKET_COUNT;
-  src->byte_count= BYTE_COUNT;
+  src->byte_count = BYTE_COUNT;
 
   hton_flow_stats( dst, src );
 
@@ -1103,13 +1183,13 @@ test_hton_flow_stats_with_single_output_action() {
   src->table_id = 1;
   src->match = MATCH;
   src->duration_sec = 60;
-  src->duration_nsec = 5000 ;
+  src->duration_nsec = 5000;
   src->priority = UINT16_MAX;
   src->idle_timeout = 60;
   src->hard_timeout = 300;
   src->cookie = COOKIE;
   src->packet_count = PACKET_COUNT;
-  src->byte_count= BYTE_COUNT;
+  src->byte_count = BYTE_COUNT;
   struct ofp_action_output *act_src = ( struct ofp_action_output * ) src->actions;
   act_src->type = OFPAT_OUTPUT;
   act_src->len = 8;
@@ -1165,7 +1245,7 @@ test_hton_flow_stats_with_two_output_actions() {
   src->hard_timeout = 300;
   src->cookie = COOKIE;
   src->packet_count = PACKET_COUNT;
-  src->byte_count= BYTE_COUNT;
+  src->byte_count = BYTE_COUNT;
   struct ofp_action_output *act_src[ 2 ];
   act_src[ 0 ] = ( struct ofp_action_output * ) src->actions;
   act_src[ 0 ]->type = OFPAT_OUTPUT;
@@ -1680,6 +1760,9 @@ main() {
     unit_test( test_ntoh_action_tp_port ),
     unit_test( test_ntoh_action_enqueue ),
     unit_test( test_ntoh_action_vendor ),
+    unit_test( test_ntoh_action_vendor_with_body ),
+    unit_test( test_hton_action_vendor ),
+    unit_test( test_hton_action_vendor_with_body ),
     unit_test( test_ntoh_action ),
     unit_test( test_ntoh_action_with_undefined_action_type ),
     unit_test( test_hton_action ),