trema 0.2.2.1 → 0.2.3

data/{ruby/trema/vendor-request.h → src/lib/secure_channel.h}

@@ -1,7 +1,7 @@
 /*
- * Ruby wrapper class for OFPT_VENDOR message.
+ * OpenFlow Switch Listener
  *
- * Author: Nick Karanatsios <nickkaranatsios@gmail.com>
+ * Author: Yasunobu Chiba
  *
  * Copyright (C) 2008-2012 NEC Corporation
  *
@@ -20,20 +20,21 @@
  */
 
 
-#ifndef VENDOR_REQUEST_H
-#define VENDOR_REQUEST_H
+#ifndef SECURE_CANNEL_H
+#define SECURE_CANNEL_H
 
 
-#include "ruby.h"
+typedef void ( *connected_handler )( void );
+typedef void ( *disconnected_handler ) ( void );
 
 
-extern VALUE cVendorRequest;
+bool init_secure_channel( uint32_t ip, uint16_t port,
+                          connected_handler connected_callback, disconnected_handler disconnected_callback );
+bool finalize_secure_channel();
+bool send_message_to_secure_channel( buffer *message );
 
 
-void Init_vendor_request( void );
-
-
-#endif // VENDOR_REQUEST_H
+#endif // SECURE_CANNEL_H
 
 
 /*

data/src/lib/tcp.h

@@ -24,9 +24,6 @@
 #define TCP_H
 
 
-#include <endian.h>
-
-
 typedef struct tcp_header {
   uint16_t src_port;
   uint16_t dst_port;

data/src/lib/trema.c

@@ -50,7 +50,7 @@
 #undef init_log
 #endif
 #define init_log mock_init_log
-bool mock_init_log( const char *ident, const char *log_directory, bool run_as_daemon );
+bool mock_init_log( const char *ident, const char *log_directory, logging_type type );
 
 #ifdef error
 #undef error
@@ -275,6 +275,7 @@ static char *executable_name = NULL;
 static char *trema_log = NULL;
 static char *trema_pid = NULL;
 static char *trema_sock = NULL;
+static logging_type log_output_type = LOGGING_TYPE_FILE;
 static pthread_mutex_t mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
 
 
@@ -282,10 +283,11 @@ static struct option long_options[] = {
   { "name", 1, NULL, 'n' },
   { "daemonize", 0, NULL, 'd' },
   { "logging_level", 1, NULL, 'l' },
+  { "syslog", 0, NULL, 'g' },
   { "help", 0, NULL, 'h' },
   { NULL, 0, NULL, 0 },
 };
-static char short_options[] = "n:dl:h";
+static char short_options[] = "n:dl:gh";
 
 
 /**
@@ -302,6 +304,7 @@ usage() {
     "  -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",
     executable_name
   );
@@ -437,6 +440,9 @@ parse_argv( int *argc, char ***argv ) {
       case 'l':
         set_logging_level( optarg );
         break;
+      case 'g':
+        log_output_type = LOGGING_TYPE_SYSLOG;
+        break;
       case 'h':
         usage();
         xfree( trema_name );
@@ -494,6 +500,28 @@ set_exit_handler() {
 }
 
 
+static void
+do_restart_log() {
+  restart_log( NULL );
+}
+
+
+static void
+set_do_restart_log_as_external_callback() {
+  set_external_callback( do_restart_log );
+}
+
+
+static void
+set_hup_handler() {
+  struct sigaction signal_hup;
+
+  memset( &signal_hup, 0, sizeof( struct sigaction ) );
+  signal_hup.sa_handler = ( void * ) set_do_restart_log_as_external_callback;
+  sigaction( SIGHUP, &signal_hup, NULL );
+}
+
+
 static void
 set_dump_stats_as_external_callback() {
   set_external_callback( dump_stats );
@@ -561,14 +589,19 @@ init_trema( int *argc, char ***argv ) {
   initialized = false;
   trema_started = false;
   run_as_daemon = false;
+  log_output_type = LOGGING_TYPE_FILE;
 
   parse_argv( argc, argv );
   set_trema_home();
   set_trema_tmp();
   check_trema_tmp();
-  init_log( get_trema_name(), get_trema_log(), run_as_daemon );
+  if ( !run_as_daemon ) {
+    log_output_type |= LOGGING_TYPE_STDOUT;
+  }
+  init_log( get_trema_name(), get_trema_log(), log_output_type );
   ignore_sigpipe();
   set_exit_handler();
+  set_hup_handler();
   set_usr1_handler();
   set_usr2_handler();
   init_messenger( get_trema_sock() );
@@ -638,14 +671,14 @@ set_trema_name( const char *name ) {
   if ( trema_name != NULL ) {
     if ( trema_started ) {
       rename_pid( get_trema_pid(), trema_name, name );
-      rename_log( trema_name, name, get_trema_log() );
+      rename_log( name );
     }
     xfree( trema_name );
   }
   trema_name = xstrdup( name );
 
   if ( initialized ) {
-    restart_log( trema_name, get_trema_log() );
+    restart_log( trema_name );
   }
 }
 

data/{ruby/trema/action-set-nw-dst.h → src/lib/trema.hpp}

@@ -1,7 +1,9 @@
 /*
- * Author: Nick Karanatsios <nickkaranatsios@gmail.com>
+ * Trema C++ wrapper.
  *
- * Copyright (C) 2008-2012 NEC Corporation
+ * Author: Vladimir Olteanu <vladimir.olteanu@cs.pub.ro>
+ *
+ * Copyright (C) 2012 Vladimir Olteanu
  *
  * 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
@@ -18,20 +20,27 @@
  */
 
 
-#ifndef ACTION_SET_NW_DST_H
-#define ACTION_SET_NW_DST_H
+#ifndef TREMA_HPP
+#define TREMA_HPP
 
 
-#include "ruby.h"
+template <typename type1, typename type2> struct _types_compatible_p {
+  static const bool result = false;
+};
 
+template <typename type1> struct _types_compatible_p<type1, type1> {
+  static const bool result = true;
+};
 
-extern VALUE cActionSetNwDst;
+#define __builtin_types_compatible_p( type1, type2 ) _types_compatible_p< type1, type2 >::result
 
 
-void Init_action_set_nw_dst( void );
+extern "C" {
+#include "trema.h"
+}
 
 
-#endif // ACTION_SET_NW_DST_H
+#endif // TREMA_HPP
 
 
 /*

data/src/lib/trema_wrapper.c

@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
+#include <syslog.h>
 #include <unistd.h>
 
 
@@ -40,6 +41,10 @@ int ( *trema_unlink )( const char *pathname ) = unlink;
 
 pid_t ( *trema_getpid )( void ) = getpid;
 
+void ( *trema_openlog ) ( const char *ident, int option, int facility ) = openlog;
+void ( *trema_closelog ) ( void ) = closelog;
+void ( *trema_vsyslog ) ( int priority, const char *format, va_list ap ) = vsyslog;
+
 int ( *trema_sqlite3_open )( const char *filename, sqlite3 **ppDb ) = sqlite3_open;
 int ( *trema_sqlite3_close )( sqlite3 * ) = sqlite3_close;
 int ( *trema_sqlite3_exec )( sqlite3 *, const char *sql, int ( *callback ) ( void *, int, char **, char ** ), void *, char **errmsg ) = sqlite3_exec;

data/src/lib/trema_wrapper.h

@@ -45,6 +45,10 @@ extern int ( *trema_unlink ) ( const char *pathname );
 
 extern pid_t ( *trema_getpid )( void );
 
+extern void ( *trema_openlog ) ( const char *ident, int option, int facility );
+extern void ( *trema_closelog ) ( void );
+extern void ( *trema_vsyslog ) ( int priority, const char *format, va_list ap );
+
 extern int ( *trema_sqlite3_open) ( const char *filename, sqlite3 **ppDb );
 extern int ( *trema_sqlite3_close ) ( sqlite3 * );
 extern int ( *trema_sqlite3_exec ) ( sqlite3 *, const char *sql, int ( *callback ) ( void *, int, char **, char ** ), void *, char **errmsg );

data/src/lib/utility.c

@@ -143,11 +143,99 @@ string_to_datapath_id( const char *str, uint64_t *datapath_id ) {
 }
 
 
+static bool
+append_string( char *buf, size_t length, const char *string ) {
+  assert( buf != NULL );
+  assert( length > 0 );
+  assert( string != NULL );
+
+  size_t current_length = strlen( buf );
+  size_t length_to_append = strlen( string );
+  if ( ( current_length + length_to_append + 1 ) > length ) {
+    return false;
+  }
+  strncpy( buf + current_length, string, length_to_append + 1 );
+
+  return true;
+}
+
+
+bool
+wildcards_to_string( uint32_t wildcards, char *str, size_t size ) {
+  assert( str != NULL );
+  assert( size > 0 );
+
+  memset( str, '\0', size );
+
+  bool ret = true;
+  if ( ( wildcards & OFPFW_ALL ) == 0 ) {
+    ret &= append_string( str, size, "none" );
+    return ret;
+  }
+
+  uint32_t nw_src_mask = ( wildcards & OFPFW_NW_SRC_MASK ) >> OFPFW_NW_SRC_SHIFT;
+  uint32_t nw_dst_mask = ( wildcards & OFPFW_NW_DST_MASK ) >> OFPFW_NW_DST_SHIFT;
+  uint32_t mask = OFPFW_ALL & ~OFPFW_NW_SRC_MASK & ~OFPFW_NW_DST_MASK;
+  if ( ( wildcards & mask ) == mask && nw_src_mask >=32 && nw_dst_mask >= 32 ) {
+    ret &= append_string( str, size, "all" );
+    return ret;
+  }
+
+  if ( wildcards & OFPFW_IN_PORT ) {
+    ret &= append_string( str, size, "in_port|" );
+  }
+  if ( wildcards & OFPFW_DL_SRC ) {
+    ret &= append_string( str, size, "dl_src|" );
+  }
+  if ( wildcards & OFPFW_DL_DST ) {
+    ret &= append_string( str, size, "dl_dst|" );
+  }
+  if ( wildcards & OFPFW_DL_TYPE ) {
+    ret &= append_string( str, size, "dl_type|" );
+  }
+  if ( wildcards & OFPFW_DL_VLAN ) {
+    ret &= append_string( str, size, "dl_vlan|" );
+  } 
+  if ( wildcards & OFPFW_DL_VLAN_PCP ) {
+    ret &= append_string( str, size, "dl_vlan_pcp|" );
+  }
+  if ( wildcards & OFPFW_NW_PROTO ) {
+    ret &= append_string( str, size, "nw_proto|" );
+  }
+  if ( wildcards & OFPFW_NW_TOS ) {
+    ret &= append_string( str, size, "nw_tos|" );
+  }
+
+  char mask_str[ 16 ];
+  if ( nw_src_mask > 0 ) {
+    snprintf( mask_str, sizeof( mask_str ), "nw_src(%u)|", nw_src_mask );
+    ret &= append_string( str, size, mask_str );
+  }
+  if ( nw_dst_mask > 0 ) {
+    snprintf( mask_str, sizeof( mask_str ), "nw_dst(%u)|", nw_dst_mask );
+    ret &= append_string( str, size, mask_str );
+  }
+  if ( wildcards & OFPFW_TP_SRC ) {
+    ret &= append_string( str, size, "tp_src|" );
+  }
+  if ( wildcards & OFPFW_TP_DST ) {
+    ret &= append_string( str, size, "tp_dst|" );
+  }
+
+  if ( strlen( str ) > 0 ) {
+    str[ strlen( str ) - 1 ] = '\0';
+  }
+
+  return ret;
+}
+
+
 bool
 match_to_string( const struct ofp_match *match, char *str, size_t size ) {
   assert( match != NULL );
   assert( str != NULL );
 
+  char wildcards_str[ 256 ];
   char nw_src[ 16 ];
   char nw_dst[ 16 ];
   struct in_addr addr;
@@ -155,6 +243,7 @@ match_to_string( const struct ofp_match *match, char *str, size_t size ) {
   unsigned int nw_src_prefixlen;
   unsigned int nw_dst_prefixlen;
 
+  wildcards_to_string( match->wildcards, wildcards_str, sizeof( wildcards_str ) );
   addr.s_addr = htonl( match->nw_src );
   memset( nw_src, '\0', sizeof( nw_src ) );
   inet_ntop( AF_INET, &addr, nw_src, sizeof( nw_src ) );
@@ -171,20 +260,20 @@ match_to_string( const struct ofp_match *match, char *str, size_t size ) {
   int ret = snprintf(
               str,
               size,
-              "wildcards = %#x, in_port = %u, "
+              "wildcards = %#x(%s), in_port = %u, "
               "dl_src = %02x:%02x:%02x:%02x:%02x:%02x, "
               "dl_dst = %02x:%02x:%02x:%02x:%02x:%02x, "
               "dl_vlan = %u, dl_vlan_pcp = %u, dl_type = %#x, "
               "nw_tos = %u, nw_proto = %u, nw_src = %s/%u, nw_dst = %s/%u, "
               "tp_src = %u, tp_dst = %u",
-              match->wildcards, match->in_port,
+              match->wildcards, wildcards_str, match->in_port,
               match->dl_src[ 0 ], match->dl_src[ 1 ], match->dl_src[ 2 ],
               match->dl_src[ 3 ], match->dl_src[ 4 ], match->dl_src[ 5 ],
               match->dl_dst[ 0 ], match->dl_dst[ 1 ], match->dl_dst[ 2 ],
               match->dl_dst[ 3 ], match->dl_dst[ 4 ], match->dl_dst[ 5 ],
               match->dl_vlan, match->dl_vlan_pcp, match->dl_type,
               match->nw_tos, match->nw_proto, nw_src, nw_src_prefixlen,
-	      nw_dst, nw_dst_prefixlen, match->tp_src, match->tp_dst
+              nw_dst, nw_dst_prefixlen, match->tp_src, match->tp_dst
             );
 
   if ( ( ret >= ( int ) size ) || ( ret < 0 ) ) {
@@ -205,7 +294,7 @@ phy_port_to_string( const struct ofp_phy_port *phy_port, char *str, size_t size
   int ret = snprintf(
               str,
               size,
-              "port_no = %u, hw_addr =  %02x:%02x:%02x:%02x:%02x:%02x, "
+              "port_no = %u, hw_addr = %02x:%02x:%02x:%02x:%02x:%02x, "
               "name = %s, config = %#x, state = %#x, "
               "curr = %#x, advertised = %#x, supported = %#x, peer = %#x",
               phy_port->port_no,

data/src/lib/utility.h

@@ -50,6 +50,7 @@ unsigned int hash_datapath_id( const void *key );
 bool string_to_datapath_id( const char *str, uint64_t *datapath_id );
 
 bool match_to_string( const struct ofp_match *match, char *str, size_t size );
+bool wildcards_to_string( uint32_t wildcards, char *str, size_t size );
 bool phy_port_to_string( const struct ofp_phy_port *phy_port, char *str, size_t size );
 bool actions_to_string( const struct ofp_action_header *actions, uint16_t actions_length, char *str, size_t str_length );
 

data/src/lib/wrapper.c

@@ -76,19 +76,42 @@ xstrdup( const char *s ) {
 }
 
 
+static char *
+_xvasprintf( const char *format, va_list args, const char *error_message ) {
+  va_list args_copy;
+  va_copy( args_copy, args );
+  int n = vsnprintf( NULL, 0, format, args_copy );
+  va_end( args_copy );
+  if ( n <= 0 ) {
+    return NULL;
+  }
+  size_t size = ( size_t ) ( n + 1 );
+  char *str = _trema_malloc( size, error_message );
+  va_copy( args_copy, args );
+  n = vsnprintf( str, size, format, args_copy );
+  va_end( args_copy );
+  if ( n <= 0 || ( size_t ) n > size ) {
+    xfree( str );
+    return NULL;
+  }
+  return str;
+}
+
+
+char *
+xvasprintf( const char *format, va_list args ) {
+  return _xvasprintf( format, args, "Out of memory, xvasprintf failed" );
+}
+
+
 char *
 xasprintf( const char *format, ... ) {
   const char error[] = "Out of memory, xasprintf failed";
   va_list args;
   va_start( args, format );
-  char *str;
-  if ( trema_vasprintf( &str, format, args ) < 0 ) {
-    die( error );
-  }
-  char *result = _xstrdup( str, error );
-  free( str );
+  char *str = _xvasprintf( format, args, error );
   va_end( args );
-  return result;
+  return str;
 }
 
 

data/src/lib/wrapper.h

@@ -24,6 +24,7 @@
 #define WRAPPER_H
 
 
+#include <stdarg.h>
 #include <stddef.h>
 #include <string.h>
 #include "utility.h"
@@ -62,6 +63,7 @@ void *xcalloc( size_t nmemb, size_t size );
 void xfree( void *ptr );
 
 char *xstrdup( const char *s );
+char *xvasprintf( const char *format, va_list args );
 char *xasprintf( const char *format, ... );