trema 0.2.5 → 0.2.6

data/src/management/trema_manager

@@ -0,0 +1,184 @@
+#! /usr/bin/env bash
+#
+# Copyright (C) 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.
+#
+
+EXECUTABLES_DIR="$TREMA_HOME/objects/management"
+ECHO="$EXECUTABLES_DIR/echo"
+SET_LOGGING_LEVEL="$EXECUTABLES_DIR/set_logging_level"
+SHOW_STATS="$EXECUTABLES_DIR/show_stats"
+APPLICATION="$EXECUTABLES_DIR/application"
+SOCK_DIR="$TREMA_HOME/tmp/sock"
+BASENAME="/usr/bin/basename"
+SED="/bin/sed"
+SCRIPT_NAME=`$BASENAME $0`
+
+
+list_services() {
+    shopt -s nullglob
+    for file in $SOCK_DIR/*.m.sock
+    do echo `$BASENAME $file .m.sock | $SED 's/^trema\.//'`
+    done
+}
+
+
+ping() {
+    local service_name="$1"
+
+    if [ -z "$service_name" ]; then
+        echo "Service name must be specified."
+        print_ping_usage
+        exit 1
+    fi
+
+    $ECHO $service_name
+}
+
+
+set_logging_level() {
+    local service_name="$1"
+    local logging_level="$2"
+
+    if [ -z "$service_name" ]; then
+        echo "Service name must be specified."
+        print_set_logging_level_usage
+        exit 1
+    fi
+    if [ -z "$logging_level" ]; then
+        echo "Logging level must be specified."
+        print_set_logging_level_usage
+        exit 1
+    fi
+
+    $SET_LOGGING_LEVEL $service_name $logging_level
+}
+
+
+show_stats() {
+    local service_name="$1"
+
+    if [ -z "$service_name" ]; then
+        echo "Service name must be specified."
+        print_show_stats_usage
+        exit 1
+    fi
+
+    $SHOW_STATS $service_name
+}
+
+
+application() {
+    local service_name="$1"
+    local application_id="$2"
+    local data="$3"
+
+    if [ -z "$service_name" ]; then
+        echo "Service name must be specified."
+        print_application_usage
+        exit 1
+    fi
+    if [ -z "$application_id" ]; then
+        echo "Application specific identifier must be specified."
+        print_application_usage
+        exit 1
+    fi
+
+    $APPLICATION $service_name $application_id $data
+}
+
+
+check_variables() {
+    if [ -z "$TREMA_HOME" ]; then
+        echo "TREMA_HOME environment variable must be set."
+        exit 1
+    fi
+
+    if [ ! -d "$TREMA_HOME" ]; then
+        echo "$TREMA_HOME does not exist."
+        exit 1
+    fi
+
+    if [ ! -d "$SOCK_DIR" ]; then
+        echo "$SOCK_DIR does not exist."
+        exit 1
+    fi
+
+    if [ ! -d "$EXECUTABLES_DIR" ]; then
+        echo "$EXECUTABLES_DIR does not exist."
+        exit 1
+    fi
+}
+
+
+print_list_services_usage() {
+    echo "Usage: $SCRIPT_NAME services"
+}
+
+
+print_usage() {
+    echo "Usage: $SCRIPT_NAME {services|ping|set_logging_level|show_stats|application} [OPTIONS...]"
+}
+
+
+print_ping_usage() {
+    echo "Usage: $SCRIPT_NAME ping SERVICE_NAME"
+}
+
+
+print_set_logging_level_usage() {
+    echo "Usage: $SCRIPT_NAME set_logging_level SERVICE_NAME LOGGING_LEVEL"
+}
+
+
+print_show_stats_usage() {
+    echo "Usage: $SCRIPT_NAME show_stats SERVICE_NAME"
+}
+
+
+print_application_usage() {
+    echo "Usage: $SCRIPT_NAME application SERVICE_NAME APPLICATION_ID DATA_IN_HEX"
+}
+
+
+check_variables
+
+case "$1" in
+    services)
+        list_services
+        ;;
+
+    ping)
+        ping $2
+        ;;
+
+    set_logging_level)
+        set_logging_level $2 $3
+        ;;
+
+    show_stats)
+        show_stats $2
+        ;;
+
+    application)
+        application $2 $3 $4
+        ;;
+
+    *)
+        print_usage
+        exit 1
+esac
+
+exit 0

data/src/packetin_filter/packetin_filter.c

@@ -39,7 +39,7 @@
 #undef printf
 #endif
 #define printf( fmt, args... )  mock_printf2( fmt, ##args )
-int mock_printf2(const char *format, ...);
+int mock_printf2( const char *format, ... );
 
 #ifdef error
 #undef error
@@ -112,24 +112,26 @@ const char *mock_get_executable_name( void );
 void
 usage() {
   printf(
-	 "OpenFlow Packet in Filter.\n"
-	 "Usage: %s [OPTION]... [PACKETIN-FILTER-RULE]...\n"
-	 "\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"
-	 "\n"
-	 "PACKETIN-FILTER-RULE:\n"
-	 "  match-type::destination-service-name\n"
-	 "\n"
-	 "match-type:\n"
-	 "  lldp                        LLDP ethernet frame type and priority is 0x8000\n"
-	 "  packet_in                   any packet and priority is zero\n"
-	 "\n"
-	 "destination-service-name      destination service name\n"
-	 , get_executable_name()
-	 );
+    "OpenFlow Packet in Filter.\n"
+    "Usage: %s [OPTION]... [PACKETIN-FILTER-RULE]...\n"
+    "\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"
+    "\n"
+    "PACKETIN-FILTER-RULE:\n"
+    "  match-type::destination-service-name\n"
+    "\n"
+    "match-type:\n"
+    "  lldp                            LLDP ethernet frame type and priority is 0x8000\n"
+    "  packet_in                       any packet and priority is zero\n"
+    "\n"
+    "destination-service-name          destination service name\n"
+    , get_executable_name()
+  );
 }
 
 
@@ -210,7 +212,7 @@ handle_packet_in( uint64_t datapath_id, uint32_t transaction_id,
       free_buffer( buf );
       return;
     }
-  
+
     debug( "Sending a message to %s ( match = %s ).", service_name, match_str );
   }
 
@@ -248,7 +250,7 @@ finalize_packetin_match_table( void ) {
 
 static bool
 add_packetin_match_entry( struct ofp_match match, uint16_t priority, const char *service_name ) {
-  bool ( *insert_or_update_match_entry ) ( struct ofp_match, uint16_t, void * ) = update_match_entry;
+  bool ( *insert_or_update_match_entry )( struct ofp_match, uint16_t, void * ) = update_match_entry;
   list_element *services = lookup_match_strict_entry( match, priority );
   if ( services == NULL ) {
     insert_or_update_match_entry = insert_match_entry;
@@ -367,7 +369,7 @@ set_match_type( int argc, char *argv[] ) {
 static void
 handle_add_filter_request( const messenger_context_handle *handle, add_packetin_filter_request *request ) {
   assert( handle != NULL );
-  assert( request != NULL ) ;
+  assert( request != NULL );
 
   request->entry.service_name[ MESSENGER_SERVICE_NAME_LENGTH - 1 ] = '\0';
   if ( strlen( request->entry.service_name ) == 0 ) {
@@ -392,7 +394,7 @@ handle_add_filter_request( const messenger_context_handle *handle, add_packetin_
 static void
 delete_filter_walker( struct ofp_match match, uint16_t priority, void *data, void *user_data ) {
   UNUSED( data );
-  buffer *reply_buffer = user_data; 
+  buffer *reply_buffer = user_data;
   assert( reply_buffer != NULL );
 
   delete_packetin_filter_reply *reply = reply_buffer->data;
@@ -410,7 +412,7 @@ delete_filter_walker( struct ofp_match match, uint16_t priority, void *data, voi
 static void
 handle_delete_filter_request( const messenger_context_handle *handle, delete_packetin_filter_request *request ) {
   assert( handle != NULL );
-  assert( request != NULL ) ;
+  assert( request != NULL );
 
   buffer *buf = alloc_buffer_with_length( sizeof( delete_packetin_filter_reply ) );
   delete_packetin_filter_reply *reply = append_back_buffer( buf, sizeof( delete_packetin_filter_reply ) );
@@ -459,7 +461,7 @@ dump_filter_walker( struct ofp_match match, uint16_t priority, void *data, void
 static void
 handle_dump_filter_request( const messenger_context_handle *handle, dump_packetin_filter_request *request ) {
   assert( handle != NULL );
-  assert( request != NULL ) ;
+  assert( request != NULL );
 
   buffer *buf = alloc_buffer_with_length( 2048 );
   dump_packetin_filter_reply *reply = append_back_buffer( buf, offsetof( dump_packetin_filter_reply, entries ) );
@@ -500,14 +502,14 @@ static void
 handle_request( const messenger_context_handle *handle, uint16_t tag, void *data, size_t length ) {
   assert( handle != NULL );
 
-  debug( "Handling a request ( handle = %p, tag = %#x, data = %p, length = %u ).",
+  debug( "Handling a request ( handle = %p, tag = %#x, data = %p, length = %zu ).",
          handle, tag, data, length );
 
   switch ( tag ) {
     case MESSENGER_ADD_PACKETIN_FILTER_REQUEST:
     {
       if ( length != sizeof( add_packetin_filter_request ) ) {
-        error( "Invalid add packetin filter request ( length = %u ).", length );
+        error( "Invalid add packetin filter request ( length = %zu ).", length );
         return;
       }
 
@@ -517,7 +519,7 @@ handle_request( const messenger_context_handle *handle, uint16_t tag, void *data
     case MESSENGER_DELETE_PACKETIN_FILTER_REQUEST:
     {
       if ( length != sizeof( delete_packetin_filter_request ) ) {
-        error( "Invalid delete packetin filter request ( length = %u ).", length );
+        error( "Invalid delete packetin filter request ( length = %zu ).", length );
         return;
       }
 
@@ -527,7 +529,7 @@ handle_request( const messenger_context_handle *handle, uint16_t tag, void *data
     case MESSENGER_DUMP_PACKETIN_FILTER_REQUEST:
     {
       if ( length != sizeof( dump_packetin_filter_request ) ) {
-        error( "Invalid dump packetin filter request ( length = %u ).", length );
+        error( "Invalid dump packetin filter request ( length = %zu ).", length );
         return;
       }
 

data/src/switch_manager/cookie_table.c

@@ -92,7 +92,7 @@ static cookie_entry_t *
 allocate_cookie_entry( uint64_t *original_cookie, char *service_name, uint16_t flags ) {
   cookie_entry_t *new_entry;
 
-  new_entry = xmalloc( sizeof ( cookie_entry_t ) );
+  new_entry = xmalloc( sizeof( cookie_entry_t ) );
   memset( new_entry, 0, sizeof( cookie_entry_t ) );
 
   new_entry->cookie = generate_cookie();
@@ -178,9 +178,9 @@ insert_cookie_entry( uint64_t *original_cookie, char *service_name, uint16_t fla
 void
 delete_cookie_entry( cookie_entry_t *entry ) {
   debug( "Deleting cookie entry ( cookie = %#" PRIx64 ", application = [ cookie = %#" PRIx64 ", service_name = %s, "
-         "flags = %#x ], reference_count = %d, expire_at = %u ).",
+         "flags = %#x ], reference_count = %d, expire_at = %" PRIu64 " ).",
          entry->cookie, entry->application.cookie, entry->application.service_name,
-         entry->application.flags, entry->reference_count, entry->expire_at );
+         entry->application.flags, entry->reference_count, ( int64_t ) entry->expire_at );
 
   if ( entry->reference_count > 1 ) {
     debug( "Decrementing reference counter ( reference_count = %d ).", entry->reference_count );
@@ -229,9 +229,9 @@ age_cookie_entry( cookie_entry_t *entry ) {
   if ( entry->expire_at < time( NULL ) ) {
     // TODO: check if the target flow is still alive or not
     warn( "Aging out cookie entry ( cookie = %#" PRIx64 ", application = [ cookie = %#" PRIx64 ", service_name = %s, "
-          "flags = %#x ], reference_count = %d, expire_at = %u ).",
+          "flags = %#x ], reference_count = %d, expire_at = %" PRIu64 " ).",
           entry->cookie, entry->application.cookie, entry->application.service_name,
-          entry->application.flags, entry->reference_count, entry->expire_at );
+          entry->application.flags, entry->reference_count, ( int64_t ) entry->expire_at );
 
     delete_hash_entry( cookie_table.global, &entry->cookie );
     delete_hash_entry( cookie_table.application, &entry->application );
@@ -257,9 +257,9 @@ age_cookie_table( void *user_data ) {
 static void
 dump_cookie_entry( cookie_entry_t *entry ) {
   info( "cookie = %#" PRIx64 ", application = [ cookie = %#" PRIx64 ", service_name = %s, "
-        "flags = %#x ], reference_count = %d, expire_at = %u",
+        "flags = %#x ], reference_count = %d, expire_at = %" PRIu64 "",
         entry->cookie, entry->application.cookie, entry->application.service_name,
-        entry->application.flags, entry->reference_count, entry->expire_at );
+        entry->application.flags, entry->reference_count, ( int64_t ) entry->expire_at );
 }
 
 

data/src/switch_manager/dpid_table.c

@@ -19,8 +19,8 @@
 
 
 #include <assert.h>
-#include <string.h>
 #include <inttypes.h>
+#include <string.h>
 #include "trema.h"
 #include "dpid_table.h"
 
@@ -63,7 +63,7 @@ insert_dpid_entry( uint64_t *dpid ) {
     return;
   }
 
-  uint64_t *new_entry = xmalloc( sizeof ( uint64_t ) );
+  uint64_t *new_entry = xmalloc( sizeof( uint64_t ) );
   *new_entry = *dpid;
   insert_hash_entry( dpid_table, new_entry, new_entry );
 }
@@ -95,7 +95,7 @@ get_switches( void ) {
   init_hash_iterator( dpid_table, &iter );
   while ( ( entry = iterate_hash_next( &iter ) ) != NULL ) {
     uint64_t *dpid = append_back_buffer( buf, sizeof( uint64_t ) );
-    *dpid = htonll( *( uint64_t * )( entry->value ) );
+    *dpid = htonll( *( uint64_t * ) ( entry->value ) );
   }
 
   return buf;

data/src/switch_manager/dpid_table.h

@@ -43,4 +43,3 @@ buffer *get_switches( void );
  * indent-tabs-mode: nil
  * End:
  */
-

data/src/switch_manager/management_interface.h

@@ -41,4 +41,3 @@ enum {
  * indent-tabs-mode: nil
  * End:
  */
-

data/src/switch_manager/ofpmsg_recv.c

@@ -295,9 +295,9 @@ ofpmsg_recv_flowremoved( struct switch_info *sw_info, buffer *buf ) {
   }
 
   debug( "Cookie found ( cookie = %#" PRIx64 ", application = [ cookie = %#" PRIx64
-         ", service name = %s, flags = %#x ], reference_count = %d, expire_at = %u ).",
+         ", service name = %s, flags = %#x ], reference_count = %d, expire_at = %" PRIu64 " ).",
          cookie, entry->application.cookie, entry->application.service_name, entry->application.flags,
-         entry->reference_count, entry->expire_at );
+         entry->reference_count, ( int64_t ) entry->expire_at );
 
   if ( entry->application.flags & OFPFF_SEND_FLOW_REM ) {
     flow_removed->cookie = htonll( entry->application.cookie );
@@ -358,7 +358,7 @@ ofpmsg_recv_statsreply( struct switch_info *sw_info, buffer *buf ) {
   uint32_t xid = ntohl( stats_reply->header.xid );
   xid_entry_t *xid_entry = lookup_xid_entry( xid );
   if ( xid_entry == NULL ) {
-    error( "No transaction id entry found ( transaction_id = %#lx ).", xid );
+    error( "No transaction id entry found ( transaction_id = %#" PRIx32 " ).", xid );
     free_buffer( buf );
     return -1;
   }

data/src/switch_manager/ofpmsg_recv.h

@@ -39,4 +39,3 @@ int ofpmsg_recv( struct switch_info *sw_info, buffer *buf );
  * indent-tabs-mode: nil
  * End:
  */
-

data/src/switch_manager/ofpmsg_send.c

@@ -18,8 +18,8 @@
  */
 
 
-#include <openflow.h>
 #include <inttypes.h>
+#include <openflow.h>
 #include <stdio.h>
 #include <string.h>
 #include "cookie_table.h"
@@ -118,7 +118,7 @@ ofpmsg_send_error_msg( struct switch_info *sw_info, uint16_t type, uint16_t code
   int ret;
   buffer *buf;
 
-  if (data->length > OFP_ERROR_MSG_MAX_DATA ) {
+  if ( data->length > OFP_ERROR_MSG_MAX_DATA ) {
     // FIXME
     data->length = OFP_ERROR_MSG_MAX_DATA;
   }