diff options
| -rw-r--r-- | plugins/ethercat/Makefile.am | 12 | ||||
| -rw-r--r-- | plugins/ethercat/Makefile.common | 251 | ||||
| -rw-r--r-- | plugins/ethercat/moduleinfo.h | 52 | ||||
| -rw-r--r-- | plugins/ethercat/moduleinfo.nmake | 29 | ||||
| -rw-r--r-- | plugins/ethercat/packet-ams.h | 7 | ||||
| -rw-r--r-- | plugins/ethercat/packet-ecatmb.h | 6 | ||||
| -rw-r--r-- | plugins/ethercat/packet-ethercat-datagram.h | 6 | ||||
| -rw-r--r-- | plugins/ethercat/packet-ethercat-frame.h | 6 | ||||
| -rw-r--r-- | plugins/ethercat/packet-ioraw.h | 6 | ||||
| -rw-r--r-- | plugins/ethercat/packet-nv.h | 6 |
10 files changed, 46 insertions, 335 deletions
diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am index dbcf5785f9..e771f3884c 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/ethercat/Makefile.am @@ -26,6 +26,10 @@ INCLUDES = -I$(top_srcdir) -I$(includedir) include Makefile.common +if HAVE_WARNINGS_AS_ERRORS +AM_CFLAGS = -Werror +endif + plugindir = @plugindir@ plugin_LTLIBRARIES = ethercat.la @@ -46,7 +50,7 @@ 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 protocolsagentx_la. +# 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 @@ -114,5 +118,7 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ - Makefile.nmake + Makefile.common \ + Makefile.nmake \ + moduleinfo.nmake \ + plugin.rc.in diff --git a/plugins/ethercat/Makefile.common b/plugins/ethercat/Makefile.common index 555fe2b557..bbcc02ffb7 100644 --- a/plugins/ethercat/Makefile.common +++ b/plugins/ethercat/Makefile.common @@ -43,254 +43,3 @@ DISSECTOR_INCLUDES = \ packet-ethercat-datagram.h \ packet-ioraw.h \ packet-nv.h -# Makefile.common -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# -# $Id$ -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# "BUILT_SOURCES" are built before any "make all" or "make check" targets. -BUILT_HEADER_FILES = \ - svnversion.h - -BUILT_C_FILES = \ - ps.c - -BUILT_SOURCES = $(BUILT_C_FILES) $(BUILT_HEADER_FILES) - -# Header files generated from source files. -GENERATED_HEADER_FILES = \ - $(BUILT_HEADER_FILES) - -# C source files generated from source files. -GENERATED_C_FILES = \ - $(BUILT_C_FILES) \ - tshark-tap-register.c - -# All the generated files. -GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES) - -# sources common for wireshark and tshark -WIRESHARK_COMMON_SRC = \ - $(PLATFORM_SRC) \ - capture_errs.c \ - capture-pcap-util.c \ - capture_ui_utils.c \ - cfile.c \ - clopts_common.c \ - disabled_protos.c \ - packet-range.c \ - print.c \ - ps.c \ - sync_pipe_write.c \ - timestats.c \ - util.c \ - version_info.c - -# corresponding headers -WIRESHARK_COMMON_INCLUDES = \ - svnversion.h \ - capture_errs.h \ - capture-pcap-util.h \ - capture-pcap-util-int.h \ - capture_ui_utils.h \ - cfile.h \ - clopts_common.h \ - cmdarg_err.h \ - color.h \ - disabled_protos.h \ - file.h \ - fileset.h \ - isprint.h \ - packet-range.h \ - print.h \ - ps.h \ - register.h \ - tempfile.h \ - timestats.h \ - util.h \ - version_info.h - -# sources for TShark taps -TSHARK_TAP_SRC = \ - tap-afpstat.c \ - tap-ansi_astat.c \ - tap-bootpstat.c \ - tap-camelcounter.c \ - tap-camelsrt.c \ - tap-dcerpcstat.c \ - tap-funnel.c \ - tap-gsm_astat.c \ - tap-h225counter.c \ - tap-h225rassrt.c \ - tap-httpstat.c \ - tap-iostat.c \ - tap-iousers.c \ - tap-mgcpstat.c \ - tap-protocolinfo.c \ - tap-protohierstat.c \ - tap-radiusstat.c \ - tap-rpcstat.c \ - tap-rpcprogs.c \ - tap-sctpchunkstat.c \ - tap-sipstat.c \ - tap-smbsids.c \ - tap-smbstat.c \ - tap-stats_tree.c \ - tap-wspstat.c - -# helpers already available on some platforms (and on others not) -EXTRA_wireshark_SOURCES = \ - getopt.c \ - inet_ntop.c \ - inet_pton.c \ - mkstemp.c \ - strerror.c \ - strcasecmp.c \ - strncasecmp.c \ - strptime.c - -# corresponding headers -EXTRA_wireshark_INCLUDES = \ - getopt.h \ - inet_v6defs.h \ - mkstemp.h \ - strerror.h \ - strptime.h - -# wireshark specifics -wireshark_SOURCES = \ - $(WIRESHARK_COMMON_SRC) \ - airpcap_loader.c \ - alert_box.c \ - capture.c \ - capture_info.c \ - capture_opts.c \ - capture_sync.c \ - color_filters.c \ - file.c \ - fileset.c \ - filters.c \ - g711.c \ - merge.c \ - proto_hier_stats.c \ - summary.c \ - tempfile.c - -# corresponding headers -wireshark_INCLUDES = \ - airpcap.h \ - airpcap_loader.h \ - alert_box.h \ - capture.h \ - capture_info.h \ - capture_opts.h \ - capture_sync.h \ - color_filters.h \ - filters.h \ - g711.h \ - globals.h \ - log.h \ - main_window.h \ - menu.h \ - merge.h \ - progress_dlg.h \ - proto_hier_stats.h \ - simple_dialog.h \ - stat_menu.h \ - statusbar.h \ - summary.h \ - sync_pipe.h \ - tap_dfilter_dlg.h \ - ui_util.h - -# tshark specifics -tshark_SOURCES = \ - $(WIRESHARK_COMMON_SRC) \ - $(TSHARK_TAP_SRC) \ - capture_opts.c \ - capture_sync.c \ - tempfile.c \ - tshark-tap-register.c \ - tshark.c - -# text2pcap specifics -text2pcap_SOURCES = \ - text2pcap.c \ - text2pcap-scanner.l - -# mergecap specifics -mergecap_SOURCES = \ - mergecap.c \ - merge.c \ - svnversion.h - -# editcap specifics -editcap_SOURCES = \ - editcap.c \ - epan/crypt/crypt-md5.c \ - $(WTAP_PLUGIN_SOURCES) - -capinfos_SOURCES = \ - capinfos.c \ - $(WTAP_PLUGIN_SOURCES) - -# dftest specifics -dftest_SOURCES = \ - dftest.c \ - util.c - -# randpkt specifics -randpkt_SOURCES = \ - randpkt.c - -# dumpcap specifics -dumpcap_SOURCES = \ - $(PLATFORM_SRC) \ - capture_opts.c \ - capture_loop.c \ - capture-pcap-util.c \ - capture_stop_conditions.c \ - clopts_common.c \ - conditions.c \ - dumpcap.c \ - pcapio.c \ - ringbuffer.c \ - sync_pipe_write.c \ - tempfile.c \ - version_info.c \ - epan/unicode-utils.c - -# corresponding headers -dumpcap_INCLUDES = \ - capture_loop.h \ - capture_stop_conditions.h \ - conditions.h \ - pcapio.h \ - ringbuffer.h - -# this target needed for distribution only -noinst_HEADERS = \ - $(WIRESHARK_COMMON_INCLUDES) \ - $(wireshark_INCLUDES) \ - $(EXTRA_wireshark_INCLUDES) \ - $(dumpcap_INCLUDES) diff --git a/plugins/ethercat/moduleinfo.h b/plugins/ethercat/moduleinfo.h index 407867b2ff..2a9a0ff1cc 100644 --- a/plugins/ethercat/moduleinfo.h +++ b/plugins/ethercat/moduleinfo.h @@ -1,23 +1,3 @@ -/* Copyright (c) 2007 by Beckhoff Automation GmbH - * - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * Copyright 1998 Gerald Combs - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ /* Included *after* config.h, in order to re-define these macros */ #ifdef PACKAGE @@ -25,35 +5,17 @@ #endif /* Name of package */ -#define PACKAGE "EtherCAT" +#define PACKAGE "ethercat" #ifdef VERSION #undef VERSION #endif /* Version number of package */ -/*#define VERSION "0.0.6" /* firstversion */ -/*#define VERSION "0.0.7" /* new dissector for mailbox inserted*/ -/*#define VERSION "0.0.9" /* nv-protocol inserted*/ -/*#define VERSION "0.0.10" -/*#define VERSION "0.0.11" /* support of AoE protocol */ -/*#define VERSION "0.0.12" /* port to Wireshark */ +/*#define VERSION "0.0.6" * first version */ +/*#define VERSION "0.0.7" * new dissector for mailbox inserted */ +/*#define VERSION "0.0.9" * nv-protocol inserted */ +/*#define VERSION "0.0.10" */ +/*#define VERSION "0.0.11" * support of AoE protocol */ +/*#define VERSION "0.0.12" * port to Wireshark */ #define VERSION "0.1.0" /* First version integrated into the Wireshark sources*/ -/* Included *after* config.h, in order to re-define these macros */ - -#ifdef PACKAGE -#undef PACKAGE -#endif - -/* Name of package */ -#define PACKAGE "mikey" - - -#ifdef VERSION -#undef VERSION -#endif - -/* Version number of package */ -#define VERSION "0.0.1" - - diff --git a/plugins/ethercat/moduleinfo.nmake b/plugins/ethercat/moduleinfo.nmake index d11d9b8738..51fcc8217d 100644 --- a/plugins/ethercat/moduleinfo.nmake +++ b/plugins/ethercat/moduleinfo.nmake @@ -25,32 +25,3 @@ MODULE_VERSION_EXTRA=0 MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - -# -# $Id$ -# - -# The name -PACKAGE=mikey - -# The version -MODULE_VERSION_MAJOR=0 -MODULE_VERSION_MINOR=0 -MODULE_VERSION_MICRO=1 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/plugins/ethercat/packet-ams.h b/plugins/ethercat/packet-ams.h index 77bc184e7d..77ef980125 100644 --- a/plugins/ethercat/packet-ams.h +++ b/plugins/ethercat/packet-ams.h @@ -1,4 +1,8 @@ -/* Copyright (c) 2007 by Beckhoff Automation GmbH +/* packet-ams.h + * + * $Id$ + * + * Copyright (c) 2007 by Beckhoff Automation GmbH * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -18,7 +22,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Ams.h*/ #ifndef __PACKET_AMS_H__ #define __PACKET_AMS_H__ diff --git a/plugins/ethercat/packet-ecatmb.h b/plugins/ethercat/packet-ecatmb.h index 29ba4d3b9c..4b163c12c9 100644 --- a/plugins/ethercat/packet-ecatmb.h +++ b/plugins/ethercat/packet-ecatmb.h @@ -1,4 +1,8 @@ -/* Copyright (c) 2007 by Beckhoff Automation GmbH +/* packet-ecatmb.h + * + * $Id$ + * + * Copyright (c) 2007 by Beckhoff Automation GmbH * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/plugins/ethercat/packet-ethercat-datagram.h b/plugins/ethercat/packet-ethercat-datagram.h index d1dccfc78a..6a29eeb59f 100644 --- a/plugins/ethercat/packet-ethercat-datagram.h +++ b/plugins/ethercat/packet-ethercat-datagram.h @@ -1,4 +1,8 @@ -/* Copyright (c) 2007 by Beckhoff Automation GmbH +/* packet-ethercat-datagram.h + * + * $Id$ + * + * Copyright (c) 2007 by Beckhoff Automation GmbH * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/plugins/ethercat/packet-ethercat-frame.h b/plugins/ethercat/packet-ethercat-frame.h index a9534880b7..b43bc66329 100644 --- a/plugins/ethercat/packet-ethercat-frame.h +++ b/plugins/ethercat/packet-ethercat-frame.h @@ -1,4 +1,8 @@ -/* Copyright (c) 2007 by Beckhoff Automation GmbH +/* paket-ethercat-frame.h + * + * $Id$ + * + * Copyright (c) 2007 by Beckhoff Automation GmbH * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/plugins/ethercat/packet-ioraw.h b/plugins/ethercat/packet-ioraw.h index 169f889eb9..a689430d7e 100644 --- a/plugins/ethercat/packet-ioraw.h +++ b/plugins/ethercat/packet-ioraw.h @@ -1,4 +1,8 @@ -/* Copyright (c) 2007 by Beckhoff Automation GmbH +/* packet-ioraw.h + * + * $Id$ + * + * Copyright (c) 2007 by Beckhoff Automation GmbH * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/plugins/ethercat/packet-nv.h b/plugins/ethercat/packet-nv.h index a25b79e566..2fb959fc02 100644 --- a/plugins/ethercat/packet-nv.h +++ b/plugins/ethercat/packet-nv.h @@ -1,4 +1,8 @@ -/* Copyright (c) 2007 by Beckhoff Automation GmbH +/* packet-nv.h + * + * $Id$ + * + * Copyright (c) 2007 by Beckhoff Automation GmbH * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> |