trema 0.2.5 → 0.2.6

data/src/switch_manager/xid_table.h

@@ -53,4 +53,3 @@ void dump_xid_table( void );
  * indent-tabs-mode: nil
  * End:
  */
-

data/src/tremashark/README

@@ -26,9 +26,10 @@ Pre-requirements
 ----------------
 
 You need to download the source code of wireshark before you start to build
-tremashark. We have tested with wireshark 1.4.4. Note that the package
-"wireshark-dev" included in Ubuntu or Debian will not work for building the
-wireshark plugin. You can get the source code from the following site:
+tremashark. We have tested with wireshark 1.6.10 and 1.8.2. Note that the
+package "wireshark-dev" included in Ubuntu or Debian will not work for
+building the wireshark plugin. You can get the source code from the following
+site:
 
   http://www.wireshark.org/download.html
 

data/src/tremashark/packet_capture.c

@@ -1,6 +1,6 @@
 /*
  * packet_capture: An application that captures packets from a network interface
- * 
+ *
  * Author: Yasunobu Chiba
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -179,7 +179,7 @@ flush_packet_buffer( void *user_data ) {
   debug( "Flushing packet queue ( length = %u ).", packet_queue->length );
 
   buffer *packet = peek( packet_queue );
-  while( packet != NULL ) {
+  while ( packet != NULL ) {
     bool ret = send_message( dump_service_name, MESSENGER_DUMP_PCAP, packet->data, packet->length );
     if ( ret ) {
       packet = dequeue( packet_queue );
@@ -214,12 +214,14 @@ usage( void ) {
   printf(
     "Usage: packet_capture -i NETWORK_INTERFACE [OPTION]...\n"
     "\n"
-    "  -i NETWORK_INTERFACE        network interface for packet capturing\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"
+    "  -i NETWORK_INTERFACE            network interface for packet capturing\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"
   );
 }
 
@@ -235,7 +237,7 @@ static void
 parse_options( int *argc, char **argv[] ) {
   int opt;
 
-  while( 1 ) {
+  while ( 1 ) {
     opt = getopt( *argc, *argv, "i:s:" );
 
     if ( opt < 0 ) {

data/src/tremashark/pcap_queue.c

@@ -57,7 +57,7 @@ delete_pcap_queue( void ) {
 
 
 buffer *
-create_pcap_packet( void* pcap_header, size_t pcap_len, void* dump_header, size_t dump_len, void* data, size_t data_len ) {
+create_pcap_packet( void *pcap_header, size_t pcap_len, void *dump_header, size_t dump_len, void *data, size_t data_len ) {
   size_t length = pcap_len + dump_len + data_len;
   assert( length != 0 );
   assert( pcap_header != NULL && dump_header != NULL );
@@ -90,7 +90,7 @@ create_pcap_packet( void* pcap_header, size_t pcap_len, void* dump_header, size_
 bool
 delete_pcap_packet( buffer *packet ) {
   assert( packet != NULL );
-  
+
   free_buffer( packet );
 
   return true;

data/src/tremashark/pcap_queue.h

@@ -1,6 +1,6 @@
 /*
  * Queue implementation for keeping pcap formatted packets.
- * 
+ *
  * Author: Yasunori Nakazawa, Yasunobu Chiba
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -36,7 +36,7 @@ typedef enum {
 
 bool create_pcap_queue( void );
 bool delete_pcap_queue( void );
-buffer* create_pcap_packet( void* pcap_header, size_t pcap_len, void* dump_header, size_t dump_len, void* data, size_t data_len );
+buffer *create_pcap_packet( void *pcap_header, size_t pcap_len, void *dump_header, size_t dump_len, void *data, size_t data_len );
 bool delete_pcap_packet( buffer *packet );
 queue_status enqueue_pcap_packet( buffer *packet );
 queue_status peek_pcap_packet( buffer **packet );

data/src/tremashark/plugin/packet-trema/Makefile

@@ -40,7 +40,7 @@ ifeq ($(OSTYPE),SunOS)
 ENDIAN=-D_BIG_ENDIAN_
 endif
 
-INC_GLIB = -I/usr/include/glib-2.0 -I/usr/local/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include 
+INC_GLIB = -I/usr/include/glib-2.0 -I/usr/local/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
 INC_OPENFLOW = -I../../../../objects/openflow
 INC_TREMA = -I../../../lib
 

data/src/tremashark/plugin/packet-trema/Makefile.common

@@ -28,4 +28,4 @@ DISSECTOR_INCLUDES =
 # Dissector helpers.  They're included in the source files in this
 # directory, but they're not dissectors themselves, i.e. they're not
 # used to generate "register.c").
-DISSECTOR_SUPPORT_SRC =	
+DISSECTOR_SUPPORT_SRC =

data/src/tremashark/plugin/packet-trema/packet-trema.c

@@ -22,20 +22,20 @@
 #include "config.h"
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib.h>
+#include <arpa/inet.h>
+#include <epan/addr_resolv.h>
+#include <epan/dissectors/packet-tcp.h>
 #include <epan/emem.h>
+#include <epan/etypes.h>
+#include <epan/ipproto.h>
 #include <epan/packet.h>
-#include <epan/dissectors/packet-tcp.h>
 #include <epan/prefs.h>
-#include <epan/ipproto.h>
-#include <epan/etypes.h>
-#include <epan/addr_resolv.h>
 #include <epan/reassemble.h>
+#include <glib.h>
 #include <pcap/pcap.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <arpa/inet.h>
 #include "messenger.h"
 #include "openflow_service_interface.h"
 
@@ -47,7 +47,6 @@
 
 #define UDP_PORT_SYSLOG 514
 
-
 // Macro for debug use
 //#define PRINTF( ... ) printf( __VA_ARGS__ )
 #define PRINTF( ... )
@@ -69,7 +68,7 @@ typedef struct message_pcap_dump_header {
   uint16_t app_name_len;
   uint16_t service_name_len;
   uint32_t data_len;
-}  __attribute__( ( packed ) ) message_pcap_dump_header;
+} __attribute__( ( packed ) ) message_pcap_dump_header;
 
 typedef struct stream_id {
   gchar *app_name;
@@ -180,6 +179,9 @@ static int hf_trema_fragment_overlap_conflict = -1;
 static int hf_trema_fragment_multiple_tails = -1;
 static int hf_trema_fragment_too_long_fragment = -1;
 static int hf_trema_fragment_error = -1;
+#ifndef WIRESHARK_VERSION_OLDER_THAN_160
+static int hf_trema_fragment_count = -1;
+#endif
 
 // Reassembled in field
 static int hf_trema_reassembled_in = -1;
@@ -250,6 +252,9 @@ static const fragment_items trema_fragment_items = {
   &hf_trema_fragment_multiple_tails,
   &hf_trema_fragment_too_long_fragment,
   &hf_trema_fragment_error,
+#ifndef WIRESHARK_VERSION_OLDER_THAN_160
+  &hf_trema_fragment_count,
+#endif
   // Reassembled in field
   &hf_trema_reassembled_in,
   // Reassembled length field
@@ -268,7 +273,7 @@ check_packet_status( guint32 packet_number ) {
   if ( packet_number == 0 || packet_number > packets_status_size ) {
     return FALSE;
   }
-  
+
   if ( packets_status[ packet_number - 1 ] ) {
     return TRUE;
   }
@@ -283,7 +288,7 @@ check_packet_status( guint32 packet_number ) {
 static void
 update_packet_status( guint32 packet_number, guint32 reassemble_id ) {
   const guint32 PACKET_STATUS_CHUNK_SIZE = 1000;
-  
+
   guint32 current_size = packets_status_size;
   packet_status_info *p = NULL;
 
@@ -297,7 +302,7 @@ update_packet_status( guint32 packet_number, guint32 reassemble_id ) {
     packet_status_info **new_table_buffer = g_malloc( packets_status_size * sizeof( packet_status_info * ) );
     memset( new_table_buffer, 0, packets_status_size * sizeof( packet_status_info * ) );
     if ( packets_status != NULL ) {
-      memcpy( ( void * )new_table_buffer, ( void * )packets_status, current_size * sizeof( packet_status_info * ) );
+      memcpy( ( void * ) new_table_buffer, ( void * ) packets_status, current_size * sizeof( packet_status_info * ) );
       g_free( packets_status );
     }
     packets_status = new_table_buffer;
@@ -317,7 +322,7 @@ update_packet_status( guint32 packet_number, guint32 reassemble_id ) {
 static packet_status_info *
 get_packet_status( guint32 packet_number ) {
   packet_status_info *p = NULL;
-  
+
   if ( check_packet_status( packet_number ) ) {
     p = packets_status[ packet_number - 1 ];
   }
@@ -332,7 +337,7 @@ static void
 clear_packet_status() {
   if ( packets_status != NULL ) {
     guint count;
-    
+
     for ( count = 0; count < packets_status_size; count++ ) {
       if ( packets_status[ count ] ) {
         g_free( packets_status[ count ] );
@@ -391,7 +396,7 @@ generate_reassemble_id() {
  *  FALSE means the stream has enough fragments, it can be reassembled.
  */
 static gboolean
-is_last_fragment( fragmented_stream_info* fragment_info ) {
+is_last_fragment( fragmented_stream_info *fragment_info ) {
   assert( fragment_info != NULL );
 
   if ( fragment_info->unreceived_length <= 0 ) {
@@ -470,11 +475,11 @@ add_fragmented_stream_info( tvbuff_t *tvb, gint offset, stream_id *stream_name )
   guint32 received_message_length = tvb_length_remaining( tvb, offset );
   fragment_info = g_malloc( sizeof( fragmented_stream_info ) );
   fragment_info->stream_name.app_name = g_malloc( stream_name->app_name_length );
-  memset( fragment_info->stream_name.app_name, ( int )NULL, stream_name->app_name_length );
+  memset( fragment_info->stream_name.app_name, 0, stream_name->app_name_length );
   strncpy( fragment_info->stream_name.app_name, stream_name->app_name, stream_name->app_name_length - 1 );
   fragment_info->stream_name.app_name_length = stream_name->app_name_length;
   fragment_info->stream_name.service_name = g_malloc( stream_name->service_name_length );
-  memset( fragment_info->stream_name.service_name, ( int )NULL, stream_name->service_name_length );
+  memset( fragment_info->stream_name.service_name, 0, stream_name->service_name_length );
   strncpy( fragment_info->stream_name.service_name, stream_name->service_name, stream_name->service_name_length - 1 );
   fragment_info->stream_name.service_name_length = stream_name->service_name_length;
   if ( received_message_length < sizeof( message_header ) ) {
@@ -489,7 +494,7 @@ add_fragmented_stream_info( tvbuff_t *tvb, gint offset, stream_id *stream_name )
     fragment_info->message_length = tvb_get_ntohl( tvb, offset + offsetof( message_header, message_length ) );
     fragment_info->temporary_length = FALSE;
   }
-  
+
   fragment_info->unreceived_length = fragment_info->message_length - received_message_length;
   fragment_info->reassemble_id = generate_reassemble_id();
   fragment_info->number = 0;
@@ -577,7 +582,7 @@ delete_fragmented_stream_info( fragmented_stream_info *fragment_info ) {
 static gboolean
 remove_fragmented_stream_info( fragmented_stream_info *fragment_info ) {
   GList *element;
-  
+
   assert( fragment_info != NULL );
 
   PRINTF( "  ** remove_fragmented_stream_info  reassemble_id %d\n", fragment_info->reassemble_id );
@@ -590,7 +595,7 @@ remove_fragmented_stream_info( fragmented_stream_info *fragment_info ) {
     return FALSE;
   }
   delete_fragmented_stream_info( element->data );
- 
+
   return TRUE;
 }
 
@@ -645,7 +650,7 @@ reassemble_message( tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *
 
   pinfo->fragmented = TRUE;
   fragment_message = fragment_add_seq_next( tvb, offset, pinfo, packet_status->reassemble_id,
-                                            trema_fragment_table, trema_reassembled_table, 
+                                            trema_fragment_table, trema_reassembled_table,
                                             tvb_length_remaining( tvb, offset ), more_fragment );
 
   new_tvb = process_reassembled_data( tvb, offset, pinfo, "Reassembled Trema",
@@ -686,7 +691,7 @@ get_reassembled_message( tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_t
 
   packet_status = get_packet_status( pinfo->fd->num );
   assert( packet_status != NULL );
-  
+
   more_fragment = FALSE;
   fragment_info = get_fragmented_stream_info( stream_name );
   if ( fragment_info != NULL ) {
@@ -699,7 +704,7 @@ get_reassembled_message( tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_t
   pinfo->fd->flags.visited = 1;
   save_fragmented = pinfo->fragmented;
   pinfo->fragmented = TRUE;
-  
+
   fragment_message = fragment_add_seq_next( tvb, offset, pinfo, packet_status->reassemble_id,
                                             trema_fragment_table, trema_reassembled_table,
                                             tvb_length_remaining( tvb, offset ), more_fragment );
@@ -792,7 +797,7 @@ dissect_message_pcap_dump_header( tvbuff_t *tvb, packet_info *pinfo, proto_tree
       uint16_t app_name_len;
       uint16_t service_name_len;
       uint32_t data_len;
-    }  __attribute__( ( packed ) ) message_pcap_dump_header;
+    } __attribute__( ( packed ) ) message_pcap_dump_header;
   */
 
   gchar *src, *dst;
@@ -825,7 +830,7 @@ dissect_message_pcap_dump_header( tvbuff_t *tvb, packet_info *pinfo, proto_tree
       case MESSENGER_DUMP_SEND_OVERFLOW:
       case MESSENGER_DUMP_SEND_CLOSED:
       {
-        if ( g_strcasecmp( src, dst ) == 0 ) {
+        if ( g_ascii_strcasecmp( src, dst ) == 0 ) {
           col_add_fstr( pinfo->cinfo, COL_INFO, "%s (%s)",
                         src, names_dump_type[ *dump_type ].strptr );
         }
@@ -918,7 +923,7 @@ dissect_openflow_service_header( tvbuff_t *tvb, gint offset, proto_tree *trema_t
     }
   }
 
-  return ( offset - head );  
+  return ( offset - head );
 }
 
 
@@ -929,7 +934,7 @@ dissect_openflow( tvbuff_t *tvb, packet_info *pinfo, proto_tree *trema_tree ) {
       col_append_str( pinfo->cinfo, COL_PROTOCOL, "+" );
     }
 
-    if( check_col( pinfo->cinfo, COL_INFO ) ) {
+    if ( check_col( pinfo->cinfo, COL_INFO ) ) {
         col_append_str( pinfo->cinfo, COL_INFO, " => " );
     }
 
@@ -969,7 +974,7 @@ dissect_context_handle( tvbuff_t *tvb, gint offset, proto_tree *trema_tree ) {
     }
   }
 
-  return ( offset - head );  
+  return ( offset - head );
 }
 
 
@@ -1083,12 +1088,12 @@ dissect_trema_ipc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tr
 
   if ( visited ) {
     packet_status_info *packet_status = NULL;
-    
+
     PRINTF( " Known packet\n" );
     // We have seen this packet
     packet_status = get_packet_status( pinfo->fd->num );
     assert( packet_status != NULL );
-    
+
     if ( packet_status->reassemble_id != 0 ) {
       // This is a part of fragment.
       messages_tvb = get_reassembled_message( tvb, offset, pinfo, tree, stream_name );
@@ -1166,7 +1171,7 @@ dissect_trema_ipc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tr
       }
       else {
         guint32 message_length = tvb_get_ntohl( messages_tvb, offset + offsetof( message_header, message_length ) );
-        
+
         if ( remaining_length < message_length ) {
           // new fragment
           dissect_message_dump( messages_tvb, offset, trema_tree );
@@ -1259,7 +1264,7 @@ dissect_ethernet( tvbuff_t *tvb, packet_info *pinfo, proto_tree *trema_tree ) {
       col_append_str( pinfo->cinfo, COL_PROTOCOL, "+" );
     }
 
-    if( check_col( pinfo->cinfo, COL_INFO ) ) {
+    if ( check_col( pinfo->cinfo, COL_INFO ) ) {
         col_append_str( pinfo->cinfo, COL_INFO, " => " );
     }
 
@@ -1330,14 +1335,17 @@ dissect_syslog( tvbuff_t *tvb, packet_info *pinfo, proto_tree *trema_tree ) {
       col_append_str( pinfo->cinfo, COL_PROTOCOL, "+" );
     }
 
-    if( check_col( pinfo->cinfo, COL_INFO ) ) {
+    if ( check_col( pinfo->cinfo, COL_INFO ) ) {
         col_append_str( pinfo->cinfo, COL_INFO, " => " );
     }
 
     col_set_fence( pinfo->cinfo, COL_PROTOCOL );
     col_set_fence( pinfo->cinfo, COL_INFO );
-
+#ifndef WIRESHARK_VERSION_OLDER_THAN_160
+    dissector_try_uint( udp_dissector_table, UDP_PORT_SYSLOG, tvb, pinfo, trema_tree );
+#else
     dissector_try_port( udp_dissector_table, UDP_PORT_SYSLOG, tvb, pinfo, trema_tree );
+#endif
   }
   else {
     gint length = tvb_length_remaining( tvb, 0 );
@@ -1406,7 +1414,7 @@ dissect_text_dump( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tr
       col_append_str( pinfo->cinfo, COL_PROTOCOL, "+TEXT" );
     }
 
-    if( check_col( pinfo->cinfo, COL_INFO ) && string != NULL ) {
+    if ( check_col( pinfo->cinfo, COL_INFO ) && string != NULL ) {
       col_append_str( pinfo->cinfo, COL_INFO, " => " );
       col_append_str( pinfo->cinfo, COL_INFO, string );
     }
@@ -1427,7 +1435,7 @@ dissect_trema( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) {
   stream_id stream_name;
 
   PRINTF( "----- start %u\n", pinfo->fd->num );
-  
+
   if ( tree == NULL ) {   // FIXME: is it okay to return here?
     PRINTF( "----- end %u  (tree is NULL)\n", pinfo->fd->num );
     return;
@@ -1610,6 +1618,11 @@ proto_register_trema() {
     { &hf_trema_fragment_error,
       { "Trema defragmentation error", "trema.fragment.error",
         FT_FRAMENUM, BASE_NONE, NO_STRINGS, NO_MASK, NULL, HFILL }},
+#ifndef WIRESHARK_VERSION_OLDER_THAN_160
+    { &hf_trema_fragment_count,
+      { "Trema defragmentation count", "trema.fragment.count",
+        FT_UINT32, BASE_DEC, NO_STRINGS, NO_MASK, NULL, HFILL }},
+#endif
     { &hf_trema_reassembled_in,
       { "Reassembled in", "trema.reassembled.in",
         FT_FRAMENUM, BASE_NONE, NO_STRINGS, NO_MASK, NULL, HFILL }},

data/src/tremashark/queue.c

@@ -39,7 +39,7 @@ bool
 delete_queue( queue *queue ) {
   assert( queue != NULL );
 
-  while( queue->head != NULL ) {
+  while ( queue->head != NULL ) {
     queue_element *e = queue->head;
     if ( queue->head->data != NULL ) {
       free_buffer( queue->head->data );
@@ -75,7 +75,7 @@ enqueue( queue *queue, buffer *data ) {
 
   queue->tail->next = new_tail;
   queue->tail = new_tail;
-  queue->length++;
+  __sync_add_and_fetch( &queue->length, 1 ); // this must be an atomic operation for thread safety
 
   collect_garbage( queue );
 
@@ -92,7 +92,7 @@ dequeue( queue *queue ) {
     buffer *data = next->data;
     next->data = NULL; // data must be freed by caller
     queue->divider = next;
-    queue->length--;
+    __sync_sub_and_fetch( &queue->length, 1 ); // this must be an atomic operation for thread safety
 
     return data;
   }
@@ -139,7 +139,8 @@ sort_queue( queue *queue, bool compare( const buffer *x, const buffer *y ) ) {
       do {
         elements[ j ]->data = elements[ j - 1 ]->data;
         j--;
-      } while ( j > 0 && compare( elements[ j - 1 ]->data, data ) );
+      }
+      while ( j > 0 && compare( elements[ j - 1 ]->data, data ) );
       elements[ j ]->data = data;
     }
   }