trema 0.4.7 → 0.4.8

data/src/tremashark/pcap_queue.c

@@ -1,195 +0,0 @@
-/*
- * Copyright (C) 2008-2013 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.
- */
-
-
-#include <assert.h>
-#include <pcap.h>
-#include "pcap_private.h"
-#include "pcap_queue.h"
-#include "queue.h"
-#include "trema.h"
-
-
-static int QUEUE_LIMIT = 65536;
-static queue *packet_queue = NULL;
-
-
-bool
-create_pcap_queue( void ) {
-  assert( packet_queue == NULL );
-
-  packet_queue = create_queue();
-  if ( packet_queue == NULL ) {
-    return false;
-  }
-
-  return true;
-}
-
-
-bool
-delete_pcap_queue( void ) {
-  assert( packet_queue != NULL );
-
-  bool ret = delete_queue( packet_queue );
-  if ( !ret ) {
-    return false;
-  }
-
-  return true;
-}
-
-
-buffer *
-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 );
-
-  buffer *buf = alloc_buffer_with_length( length );
-  assert( buf != NULL );
-
-  if ( pcap_header != NULL && pcap_len > 0 ) {
-    void *d = append_back_buffer( buf, pcap_len );
-    assert( d != NULL );
-    memcpy( d, pcap_header, pcap_len );
-  }
-
-  if ( dump_header != NULL && dump_len > 0 ) {
-    void *d = append_back_buffer( buf, dump_len );
-    assert( d != NULL );
-    memcpy( d, dump_header, dump_len );
-  }
-
-  if ( data != NULL && data_len > 0 ) {
-    void *d = append_back_buffer( buf, data_len );
-    assert( d != NULL );
-    memcpy( d, data, data_len );
-  }
-
-  return buf;
-}
-
-
-bool
-delete_pcap_packet( buffer *packet ) {
-  assert( packet != NULL );
-
-  free_buffer( packet );
-
-  return true;
-}
-
-
-queue_status
-enqueue_pcap_packet( buffer *packet ) {
-  if ( packet_queue->length >= QUEUE_LIMIT ) {
-    return QUEUE_FULL;
-  }
-
-  enqueue( packet_queue, packet );
-
-  return QUEUE_SUCCESS;
-}
-
-
-queue_status
-peek_pcap_packet( buffer **packet ) {
-  assert( packet != NULL );
-
-  if ( packet_queue == NULL ) {
-    return QUEUE_EMPTY;
-  }
-
-  *packet = peek( packet_queue );
-  if ( *packet == NULL ) {
-    return QUEUE_EMPTY;
-  }
-
-  return QUEUE_SUCCESS;
-}
-
-
-queue_status
-dequeue_pcap_packet( buffer **packet ) {
-  assert( packet != NULL );
-
-  if ( packet_queue == NULL ) {
-    return QUEUE_EMPTY;
-  }
-
-  *packet = dequeue( packet_queue );
-  if ( *packet == NULL ) {
-    return QUEUE_EMPTY;
-  }
-
-  return QUEUE_SUCCESS;
-}
-
-
-static bool
-compare_timestamp( const buffer *x, const buffer *y ) {
-  struct pcap_pkthdr_private *px = x->data;
-  struct pcap_pkthdr_private *py = y->data;
-
-  if ( ( px->ts.tv_sec > py->ts.tv_sec ) ||
-       ( px->ts.tv_sec == py->ts.tv_sec && px->ts.tv_usec > py->ts.tv_usec ) ) {
-    return true;
-  }
-
-  return false;
-}
-
-
-bool
-sort_pcap_queue( void ) {
-  assert( packet_queue != NULL );
-
-  return sort_queue( packet_queue, compare_timestamp );
-}
-
-
-void
-set_max_pcap_queue_length( int length ) {
-  assert( length >= 0 );
-
-  QUEUE_LIMIT = length;
-}
-
-
-int
-get_pcap_queue_length( void ) {
-  assert( packet_queue != NULL );
-
-  return packet_queue->length;
-}
-
-
-void
-foreach_pcap_queue( void function( buffer *data ) ) {
-  assert( packet_queue != NULL );
-
-  foreach_queue( packet_queue, function );
-}
-
-
-/*
- * Local variables:
- * c-basic-offset: 2
- * indent-tabs-mode: nil
- * End:
- */

data/src/tremashark/pcap_queue.h

@@ -1,56 +0,0 @@
-/*
- * Queue implementation for keeping pcap formatted packets.
- *
- * Copyright (C) 2008-2013 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.
- */
-
-
-#ifndef PCAP_QUEUE_H
-#define PCAP_QUEUE_H
-
-
-#include "trema.h"
-
-
-typedef enum {
-  QUEUE_SUCCESS,
-  QUEUE_FULL,
-  QUEUE_EMPTY
-} queue_status;
-
-
-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 );
-bool delete_pcap_packet( buffer *packet );
-queue_status enqueue_pcap_packet( buffer *packet );
-queue_status peek_pcap_packet( buffer **packet );
-queue_status dequeue_pcap_packet( buffer **packet );
-bool sort_pcap_queue( void );
-void set_max_pcap_queue_length( int length );
-int get_pcap_queue_length( void );
-void foreach_pcap_queue( void function( buffer *data ) );
-
-
-#endif // PCAP_QUEUE_H
-
-
-/*
- * Local variables:
- * c-basic-offset: 2
- * indent-tabs-mode: nil
- * End:
- */

data/src/tremashark/plugin/.gitignore

@@ -1,6 +0,0 @@
-/.deps
-/*.a
-/*.so
-/TAGS
-/tmp
-wireshark*

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

@@ -1,5 +0,0 @@
-/.deps
-/*.a
-/*.so
-/TAGS
-/tmp

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

@@ -1,77 +0,0 @@
-WIRESHARK_SRC_DIR = ../wireshark
-
-SRCS   = packet-trema.c plugin.c
-CC     = gcc
-OBJS   = $(foreach src, $(SRCS), $(src:.c=.o))
-
-PLUGIN_NAME = packet-trema
-
-# local installation path
-LOCAL_PLUGIN_DIR  = /home/$(shell whoami)/.wireshark/plugins
-
-# determine global installation path (use latest plugin version path)
-ifneq ($(wildcard /usr/local/lib/wireshark/plugins),)
-	GLOBAL_PLUGIN_DIR_PARTIAL=/usr/local/lib/wireshark/plugins
-else ifneq ($(wildcard /usr/lib/wireshark/plugins),)
-	GLOBAL_PLUGIN_DIR_PARTIAL=/usr/lib/wireshark/plugins
-endif
-
-# Work out if there are version-specific subdirectories
-GLOBAL_PLUGIN_DIR_FILES := $(wildcard $(GLOBAL_PLUGIN_DIR_PARTIAL)/*)
-GLOBAL_PLUGIN_DIR_SUBDIRS := $(foreach file,$(GLOBAL_PLUGIN_DIR_FILES),$(dir $(wildcard $(file)/.)))
-GLOBAL_PLUGIN_DIR_SUBDIRS := $(subst $(GLOBAL_PLUGIN_DIR_PARTIAL)/,,$(GLOBAL_PLUGIN_DIR_SUBDIRS))
-GLOBAL_PLUGIN_DIR_SUBDIRS := $(subst /,,$(GLOBAL_PLUGIN_DIR_SUBDIRS))
-
-# Assume that the "last" directory is the one we ant to use if it exists
-GLOBAL_PLUGIN_VER := $(lastword $(sort $(GLOBAL_PLUGIN_DIR_SUBDIRS)))
-
-# Create the actual global plugin dir to use
-ifneq ($(GLOBAL_PLUGIN_VER),)
-	GLOBAL_PLUGIN_DIR=$(GLOBAL_PLUGIN_DIR_PARTIAL)/$(GLOBAL_PLUGIN_VER)
-else
-	GLOBAL_PLUGIN_DIR=$(GLOBAL_PLUGIN_DIR_PARTIAL)
-endif
-
-OSTYPE = $(shell uname)
-ifeq ($(OSTYPE),Linux)
-ENDIAN=-D_LITTLE_ENDIAN_
-endif
-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 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
-INC_OPENFLOW = -I../../../../objects/openflow
-INC_TREMA = -I../../../lib
-
-INC_DIRS = -I. $(INC_GLIB) $(INC_OPENFLOW) $(INC_TREMA)
-CFLAGS = -std=gnu99 -D_GNU_SOURCE $(INC_DIRS) -DHAVE_CONFIG_H -I$(WIRESHARK_SRC_DIR) -I/usr/local/include -I/usr/local/include -DINET6 -D_U_=__attribute__\(\(unused\)\) -Wall -Wpointer-arith -g -I/usr/local/include -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/freetype2/config -fPIC -DPIC $(ENDIAN) $(DISSECT_PORT)
-
-LDFLAGS = -Wl,--rpath -Wl,/usr/local/lib -Wl,--rpath -Wl,/usr/local/lib -L/usr/local/lib -L$(WIRESHARK_SRC_DIR)/epan -L. -lgmodule-2.0 -ldl -lglib-2.0 -pthread -Wl,--export-dynamic -Wl,-soname -Wl,$(PLUGIN_NAME).so
-
-.PHONY: clean install
-
-$(PLUGIN_NAME).so : $(OBJS) $(SRCS)
-	$(CC) -shared $(OBJS) $(LDFLAGS) -o $@
-
-install: $(PLUGIN_NAME).so
-	@if [ `id -u` -eq 0 ]; then \
-	  if [ -d "$(GLOBAL_PLUGIN_DIR)" ]; then \
-	    target="$(GLOBAL_PLUGIN_DIR)/$<"; \
-	    res="*** Installed plugin for ALL users ($$target)"; \
-	  else \
-	    echo "*** Error: global plugin directory $(GLOBAL_PLUGIN_DIR) does not exist"; \
-	    exit 1; \
-	  fi; \
-	else \
-	  mkdir -p "$(LOCAL_PLUGIN_DIR)/"; \
-	  target="$(LOCAL_PLUGIN_DIR)/$<"; \
-	  res="*** Installed plugin for user "`id | cut -d\( -f2 | cut -d\) -f1`" ($$target)"; \
-	fi; \
-	install --mode=644 $< "$$target" && echo "" && echo "" && echo "$$res" && echo "" && echo ""
-
-plugin.c: moduleinfo.h Makefile.am Makefile.common
-	$(MAKE) -f Makefile.am
-
-clean:
-	rm -f $(PLUGIN) $(OBJS) $(PLUGIN_NAME).so

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

@@ -1,110 +0,0 @@
-# Makefile.am
-# Automake file for H.223 plugin
-#
-# $Id: Makefile.am 21961 2007-05-27 18:35:55Z guy $
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-
-srcdir = .
-top_srcdir = ../wireshark
-includedir = ../wireshark
-INCLUDES = -I$(top_srcdir) -I$(includedir)
-
-include Makefile.common
-
-#if HAVE_WARNINGS_AS_ERRORS
-#AM_CFLAGS = -Werror
-#endif
-
-plugindir = ~/.wireshark/plugins
-
-plugin_LTLIBRARIES = hsapi.la
-hsapi_la_SOURCES = \
-	plugin.c \
-	moduleinfo.h \
-	$(DISSECTOR_SRC) \
-	$(DISSECTOR_SUPPORT_SRC) \
-	$(DISSECTOR_INCLUDES)
-trema_la_LDFLAGS = -module -avoid-version
-trema_la_LIBADD = @PLUGIN_LIBS@
-
-# Libs must be cleared, or else libtool won't create a shared module.
-# If your module needs to be linked against any particular libraries,
-# add them here.
-LIBS =
-
-#
-# Build plugin.c, which contains the plugin version[] string, a
-# function plugin_register() that calls the register routines for all
-# protocols, and a function plugin_reg_handoff() that calls the handoff
-# registration routines for all protocols.
-#
-# We do this by scanning sources.  If that turns out to be too slow,
-# maybe we could just require every .o file to have an register routine
-# of a given name (packet-aarp.o -> proto_register_aarp, etc.).
-#
-# Formatting conventions:  The name of the proto_register_* routines an
-# proto_reg_handoff_* routines must start in column zero, or must be
-# preceded only by "void " starting in column zero, and must not be
-# inside #if.
-#
-# DISSECTOR_SRC is assumed to have all the files that need to be scanned.
-#
-# For some unknown reason, having a big "for" loop in the Makefile
-# to scan all the files doesn't work with some "make"s; they seem to
-# pass only the first few names in the list to the shell, for some
-# reason.
-#
-# Therefore, we have a script to generate the plugin.c file.
-# The shell script runs slowly, as multiple greps and seds are run
-# for each input file; this is especially slow on Windows.  Therefore,
-# if Python is present (as indicated by PYTHON being defined), we run
-# a faster Python script to do that work instead.
-#
-# The first argument is the directory in which the source files live.
-# The second argument is "plugin", to indicate that we should build
-# a plugin.c file for a plugin.
-# All subsequent arguments are the files to scan.
-#
-plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n $(PYTHON); then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(DISSECTOR_SRC) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
-	fi
-
-#
-# Currently plugin.c can be included in the distribution because
-# we always build all protocol dissectors. We used to have to check
-# whether or not to build the snmp dissector. If we again need to
-# variably build something, making plugin.c non-portable, uncomment
-# the dist-hook line below.
-#
-# Oh, yuk.  We don't want to include "plugin.c" in the distribution, as
-# its contents depend on the configuration, and therefore we want it
-# to be built when the first "make" is done; however, Automake insists
-# on putting *all* source into the distribution.
-#
-# We work around this by having a "dist-hook" rule that deletes
-# "plugin.c", so that "dist" won't pick it up.
-#
-#dist-hook:
-#	@rm -f $(distdir)/plugin.c
-
-CLEANFILES = \
-	*.so \
-	*~
-
-MAINTAINERCLEANFILES = \
-	Makefile.in	\
-	plugin.c
-
-EXTRA_DIST = \
-	Makefile.common