trema 0.2.5 → 0.2.6

data/src/lib/doubly_linked_list.c

@@ -194,13 +194,18 @@ find_element( dlist_element *element, const void *data ) {
   pthread_mutex_lock( ( ( private_dlist_element * ) element )->mutex );
 
   dlist_element *e = NULL;
-
   for ( e = element; e; e = e->next ) {
     if ( e->data == data ) {
       pthread_mutex_unlock( ( ( private_dlist_element * ) element )->mutex );
       return e;
     }
   }
+  for ( e = element->prev; e; e = e->prev ) {
+    if ( e->data == data ) {
+      pthread_mutex_unlock( ( ( private_dlist_element * ) element )->mutex );
+      return e;
+    }
+  }
 
   pthread_mutex_unlock( ( ( private_dlist_element * ) element )->mutex );
 

data/src/lib/ether.c

@@ -32,7 +32,7 @@ fill_ether_padding( buffer *buf ) {
 
   if ( buf->length + ETH_FCS_LENGTH < ETH_MINIMUM_LENGTH ) {
     padding_length = ETH_MINIMUM_LENGTH - buf->length - ETH_FCS_LENGTH;
-    debug( "Adding %u octets padding ( original frame length = %u ).", 
+    debug( "Adding %zu octets padding ( original frame length = %zu ).",
            buf->length, padding_length );
     void *padding = append_back_buffer( buf, padding_length );
     memset( padding, 0, padding_length );

data/src/lib/ether.h

@@ -77,7 +77,7 @@ typedef struct snap_header {
 #define TCI_CREATE( _prio, _cfi, _vid )         \
   ( uint16_t )( ( ( ( _prio ) & 7 ) << 13 ) |   \
                 ( ( ( _cfi ) & 1 ) << 12 ) |    \
-                ( ( _vid ) & 0x0FFF ) ) 
+                ( ( _vid ) & 0x0FFF ) )
 
 uint16_t fill_ether_padding( buffer *buf );
 

data/src/lib/event_handler.c

@@ -116,7 +116,7 @@ void ( *init_event_handler )() = _init_event_handler;
 static void
 _finalize_event_handler() {
   if ( event_last != event_list ) {
-    warn( "Event Handler finalized with %i fd event handlers still active. (%i, ...)",
+    warn( "Event Handler finalized with %ti fd event handlers still active. (%i, ...)",
           ( event_last - event_list ), ( event_last > event_list ? event_list->fd : -1 ) );
     return;
   }
@@ -176,7 +176,7 @@ _run_event_handler_once( int timeout_usec ) {
       event_itr = event_itr + 1;
     }
     else {
-      debug( "run_event_handler_once: event fd is changed ( current = %d, new = %d )", current_event.fd, event_itr->fd ) ;
+      debug( "run_event_handler_once: event fd is changed ( current = %d, new = %d )", current_event.fd, event_itr->fd );
     }
   }
 
@@ -260,7 +260,7 @@ static void
 _delete_fd_handler( int fd ) {
   debug( "Deleting event handler for fd %i.", fd );
 
-  event_fd* event = event_list;
+  event_fd *event = event_list;
 
   while ( event != event_last && event->fd != fd ) {
     event++;

data/src/lib/hash_table.c

@@ -351,7 +351,7 @@ iterate_hash_next( hash_iterator *iterator ) {
     }
 
     dlist_element *e = iterator->element;
-    if ( e == NULL ) { 
+    if ( e == NULL ) {
       if ( iterator->next_bucket_index != NULL ) {
         iterator->bucket_index = iterator->next_bucket_index;
         iterator->next_bucket_index = iterator->next_bucket_index->next;

data/src/lib/linked_list.c

@@ -1,6 +1,4 @@
 /*
- * Author: Yasuhito Takamiya <yasuhito@gmail.com>
- *
  * Copyright (C) 2008-2012 NEC Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -138,6 +136,56 @@ list_length_of( const list_element *head ) {
 }
 
 
+/**
+ * Calls a function for each element of a list.
+ *
+ * @param head the head of the list.
+ * @param function the function to call with each element's data.
+ * @param user_data user-data to pass to the function.
+ */
+void
+iterate_list( list_element *head, void function( void *data, void *user_data ), void *user_data ) {
+  if ( head == NULL ) {
+    die( "head must not be NULL" );
+  }
+  if ( function != NULL ) {
+    for ( list_element *e = head; e != NULL; e = e->next ) {
+      function( e->data, user_data );
+    }
+  }
+}
+
+
+/**
+ * Finds an element in a list, using a supplied function to find the
+ * desired element. It iterates over the list, calling the given
+ * function which should return true when the desired element is found.
+ *
+ * @param head the head of the list.
+ * @param function the function to call for each element. It should return true when the desired element is found.
+ * @param user_data user-data passed to the function.
+ * @return the found list element, or NULL if it is not found.
+ */
+void *
+find_list_custom( list_element *head, bool function( void *data, void *user_data ), void *user_data ) {
+  if ( head == NULL ) {
+    die( "head must not be NULL" );
+  }
+  if ( function == NULL ) {
+    die( "function must not be NULL" );
+  }
+
+  void *data_found = NULL;
+  for ( list_element *e = head; e != NULL; e = e->next ) {
+    if ( function( e->data, user_data ) ) {
+      data_found = e->data;
+      break;
+    }
+  }
+  return data_found;
+}
+
+
 /**
  * Removes an element from a list. If two elements contain the same
  * data, only the first is removed. If none of the elements contain

data/src/lib/linked_list.h

@@ -1,6 +1,4 @@
 /*
- * Author: Yasuhito Takamiya <yasuhito@gmail.com>
- *
  * Copyright (C) 2008-2012 NEC Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -69,6 +67,8 @@ bool insert_in_front( list_element **head, void *data );
 bool insert_before( list_element **head, const void *sibling, void *data );
 bool append_to_tail( list_element **head, void *data );
 unsigned int list_length_of( const list_element *head );
+void iterate_list( list_element *head, void function( void *data, void *user_data ), void *user_data );
+void *find_list_custom( list_element *head, bool function( void *data, void *user_data ), void *user_data );
 bool delete_element( list_element **head, const void *data );
 bool delete_list( list_element *head );
 

data/src/lib/log.c

@@ -1,6 +1,4 @@
 /*
- * Author: Yasuhito Takamiya <yasuhito@gmail.com>
- *
  * Copyright (C) 2008-2012 NEC Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -38,10 +36,13 @@ typedef struct {
   const int value;
 } priority;
 
+typedef priority facility;
+
 
 static bool initialized = false;
 static FILE *fd = NULL;
 static int level = -1;
+static int facility_value = -1;
 static char ident_string[ PATH_MAX ];
 static char log_directory[ PATH_MAX ];
 static logging_type output = LOGGING_TYPE_FILE;
@@ -85,9 +86,40 @@ static priority priorities[][ 3 ] = {
   },
 };
 
+static facility facilities[] = {
+  { .name = "kern", .value = LOG_KERN },
+  { .name = "user", .value = LOG_USER },
+  { .name = "mail", .value = LOG_MAIL },
+  { .name = "daemon", .value = LOG_DAEMON },
+  { .name = "auth", .value = LOG_AUTH },
+  { .name = "syslog", .value = LOG_SYSLOG },
+  { .name = "lpr", .value = LOG_LPR },
+  { .name = "news", .value = LOG_NEWS },
+  { .name = "uucp", .value = LOG_UUCP },
+  { .name = "cron", .value = LOG_CRON },
+  { .name = "authpriv", .value = LOG_AUTHPRIV },
+  { .name = "ftp", .value = LOG_FTP },
+  { .name = "local0", .value = LOG_LOCAL0 },
+  { .name = "local1", .value = LOG_LOCAL1 },
+  { .name = "local2", .value = LOG_LOCAL2 },
+  { .name = "local3", .value = LOG_LOCAL3 },
+  { .name = "local4", .value = LOG_LOCAL4 },
+  { .name = "local5", .value = LOG_LOCAL5 },
+  { .name = "local6", .value = LOG_LOCAL6 },
+  { .name = "local7", .value = LOG_LOCAL7 },
+  { .name = NULL },
+};
+
+
+static bool
+started() {
+  return initialized;
+}
+
 
 static const char *
 priority_name_from( int level ) {
+  assert( level >= LOG_CRIT && level <= LOG_DEBUG );
   const char *name = priorities[ level - LOG_CRIT ][ 0 ].name;
   assert( name != NULL );
   return name;
@@ -109,6 +141,7 @@ log_file( int priority, const char *format, va_list ap ) {
   va_list new_ap;
   va_copy( new_ap, ap );
   vsnprintf( message, max_message_length, format, new_ap );
+  va_end( new_ap );
 
   trema_fprintf( fd, "%s [%s] %s\n", now, priority_name, message );
   fflush( fd );
@@ -122,13 +155,17 @@ log_stdout( const char *format, va_list ap ) {
   va_list new_ap;
   va_copy( new_ap, ap );
   trema_vprintf( format_newline, new_ap );
+  va_end( new_ap );
   fflush( stdout );
 }
 
 
 static void
 log_syslog( int priority, const char *format, va_list ap ) {
-  trema_vsyslog( priority, format, ap );
+  va_list new_ap;
+  va_copy( new_ap, ap );
+  trema_vsyslog( priority, format, new_ap );
+  va_end( new_ap );
 }
 
 
@@ -174,7 +211,7 @@ get_log_directory() {
 }
 
 
-static FILE*
+static FILE *
 open_log_file( bool append ) {
   assert( strlen( get_log_directory() ) > 0 );
   assert( strlen( get_ident_string() ) > 0 );
@@ -197,8 +234,53 @@ open_log_file( bool append ) {
 static void
 open_log_syslog() {
   assert( strlen( get_ident_string() ) > 0 );
+  assert( ( facility_value & ~LOG_FACMASK ) == 0 );
+  trema_openlog( get_ident_string(), LOG_NDELAY, facility_value );
+}
+
+
+static int
+facility_value_from( const char *name ) {
+  assert( name != NULL );
+
+  int value = -1;
+
+  for ( int i = 0; facilities[ i ].name != NULL; i++ ) {
+    if ( strcasecmp( facilities[ i ].name, name ) == 0 ) {
+      value = facilities[ i ].value;
+      break;
+    }
+  }
+
+  return value;
+}
+
+
+/**
+ * Sets syslog facility.
+ *
+ * @param name name of the syslog facility to be set.
+ * @return true on success; false otherwise.
+ */
+bool
+set_syslog_facility( const char *name ) {
+  assert( name != NULL );
+
+  int new_facility_value = facility_value_from( name );
+  if ( new_facility_value == -1 ) {
+    fprintf( stderr, "Invalid syslog facility: %s\n", name );
+    trema_abort();
+  }
+
+  pthread_mutex_lock( &mutex );
+  facility_value = new_facility_value;
+  if ( ( output & LOGGING_TYPE_SYSLOG ) != 0 && started() ) {
+    trema_closelog();
+    open_log_syslog();
+  }
+  pthread_mutex_unlock( &mutex );
 
-  trema_openlog( get_ident_string(), LOG_NDELAY, LOG_USER );
+  return true;
 }
 
 
@@ -228,6 +310,16 @@ init_log( const char *ident, const char *directory, logging_type type ) {
     set_logging_level( level_string );
   }
 
+  // set_syslog_facility() may be called before init_log().
+  // facility_value = -1 indicates that facility value is not set yet.
+  if ( ( facility_value & ~LOG_FACMASK ) != 0 ) {
+    facility_value = LOG_USER;
+  }
+  char *facility_string = getenv( "LOGGING_FACILITY" );
+  if ( facility_string != NULL ) {
+    set_syslog_facility( facility_string );
+  }
+
   set_ident_string( ident );
   set_log_directory( directory );
   output = type;
@@ -273,6 +365,8 @@ void
 rename_log( const char *new_ident ) {
   assert( new_ident != NULL );
 
+  pthread_mutex_lock( &mutex );
+
   if ( output & LOGGING_TYPE_FILE ) {
     char old_path[ PATH_MAX ];
     snprintf( old_path, PATH_MAX, "%s/%s.log", get_log_directory(), get_ident_string() );
@@ -293,6 +387,8 @@ rename_log( const char *new_ident ) {
     set_ident_string( new_ident );
     open_log_syslog();
   }
+
+  pthread_mutex_unlock( &mutex );
 }
 
 
@@ -306,6 +402,7 @@ finalize_log() {
   pthread_mutex_lock( &mutex );
 
   level = -1;
+  facility_value = -1;
 
   if ( output & LOGGING_TYPE_FILE ) {
     if ( fd != NULL ) {
@@ -328,39 +425,41 @@ finalize_log() {
 }
 
 
-static char *
-lower( const char *string ) {
-  char *new_string = xstrdup( string );
-  for ( int i = 0; new_string[ i ] != '\0'; ++i ) {
-    new_string[ i ] = ( char ) tolower( new_string[ i ] );
-  }
-  return new_string;
-}
-
-
 static int
 priority_value_from( const char *name ) {
   assert( name != NULL );
 
   int level_value = -1;
-  char *name_lower = lower( name );
 
+  assert( ( LOG_DEBUG - LOG_CRIT + 1 ) == ( sizeof( priorities )/sizeof( priorities[ 0 ] ) ) );
   for ( int i = 0; i <= ( LOG_DEBUG - LOG_CRIT ); i++ ) {
     for ( priority *p = priorities[ i ]; p->name != NULL; p++ ) {
-      if ( strncmp( p->name, name_lower, 20 ) == 0 ) {
+      if ( strcasecmp( p->name, name ) == 0 ) {
         level_value = p->value;
         break;
       }
     }
   }
-  xfree( name_lower );
   return level_value;
 }
 
 
-static bool
-started() {
-  return initialized;
+/**
+ * Check if a provided logging level is valid or not.
+ *
+ * @param name name of the logging level to be checked.
+ * @return true if valid; false otherwise.
+ */
+bool
+valid_logging_level( const char *name ) {
+  assert( name != NULL );
+
+  int level_value = priority_value_from( name );
+  if ( level_value < 0 ) {
+    return false;
+  }
+
+  return true;
 }
 
 
@@ -422,7 +521,8 @@ do_log( int priority, const char *format, va_list ap ) {
       va_end( _args );                                  \
       pthread_mutex_unlock( &mutex );                   \
     }                                                   \
-  } while ( 0 )
+  }                                                     \
+  while ( 0 )
 
 
 static void

data/src/lib/log.h

@@ -4,8 +4,6 @@
  * Some good logging guidelines can be found here:
  *  http://watchitlater.com/blog/2009/12/logging-guidelines/
  *
- * Author: Yasuhito Takamiya <yasuhito@gmail.com>
- *
  * Copyright (C) 2008-2012 NEC Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -35,8 +33,11 @@
 #define LOG_H
 
 
-#include "bool.h"
 #include <syslog.h>
+#include "bool.h"
+
+
+#define LOGGING_LEVEL_STR_LENGTH 12
 
 
 typedef enum {
@@ -52,14 +53,17 @@ void rename_log( const char *new_ident );
 bool finalize_log( void );
 
 bool set_logging_level( const char *level );
+bool valid_logging_level( const char *level );
+bool set_syslog_facility( const char *facility );
+
 extern int ( *get_logging_level )( void );
 
-extern void ( *critical )( const char *format, ... );
-extern void ( *error )( const char *format, ... );
-extern void ( *warn )( const char *format, ... );
-extern void ( *notice )( const char *format, ... );
-extern void ( *info )( const char *format, ... );
-extern void ( *debug )( const char *format, ... );
+extern void ( *critical )( const char *format, ... ) __attribute__( ( format( printf, 1, 2 ) ) );
+extern void ( *error )( const char *format, ... ) __attribute__( ( format( printf, 1, 2 ) ) );
+extern void ( *warn )( const char *format, ... ) __attribute__( ( format( printf, 1, 2 ) ) );
+extern void ( *notice )( const char *format, ... ) __attribute__( ( format( printf, 1, 2 ) ) );
+extern void ( *info )( const char *format, ... ) __attribute__( ( format( printf, 1, 2 ) ) );
+extern void ( *debug )( const char *format, ... ) __attribute__( ( format( printf, 1, 2 ) ) );
 
 
 #endif // LOG_H