osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Christian Durrer: 

I hope this is the right place to send a patch for a new dissector
plugin. The telegram it dissects are for the communication between PLCs
(Programmable logic controller) from the company Saia Burgess Controls
Ltd. (http://www.start-controls.com, http://www.saia-burgess.com or
http://www.sbc-support.ch). The protocol is named Ether-S-Bus (the PLCs
are called PCD2, PCD3, PCD4).

svn path=/trunk/; revision=18526
This commit is contained in:
Jaap Keuter 2006-06-21 06:31:06 +00:00
parent 98d7d92661
commit 1205ee2a14
13 changed files with 1892 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -216,6 +216,7 @@ plugin_libs = \
plugins/rlm/rlm.la \
plugins/rtnet/rtnet.la \
plugins/rudp/rudp.la \
plugins/sbus/sbus.la \
plugins/stats_tree/stats_tree.la \
plugins/v5ua/v5ua.la
@ -256,6 +257,7 @@ plugin_ldadd = \
"-dlopen" plugins/rlm/rlm.la \
"-dlopen" plugins/rtnet/rtnet.la \
"-dlopen" plugins/rudp/rudp.la \
"-dlopen" plugins/sbus/sbus.la \
"-dlopen" plugins/stats_tree/stats_tree.la \
"-dlopen" plugins/v5ua/v5ua.la

1
configure.in
View File

@ -1356,6 +1356,7 @@ AC_OUTPUT(
plugins/rlm/Makefile
plugins/rtnet/Makefile
plugins/rudp/Makefile
plugins/sbus/Makefile
plugins/stats_tree/Makefile
plugins/v5ua/Makefile
tools/Makefile

1
packaging/nsis/Makefile.nmake
View File

@ -89,6 +89,7 @@ PLUGINS=../../plugins/acn/acn.dll \
../../plugins/rlm/rlm.dll \
../../plugins/rtnet/rtnet.dll \
../../plugins/rudp/rudp.dll \
../../plugins/sbus/sbus.dll \
../../plugins/stats_tree/stats_tree.dll \
../../plugins/v5ua/v5ua.dll

1
packaging/nsis/wireshark.nsi
View File

@ -707,6 +707,7 @@ File "..\..\plugins\rdm\rdm.dll"
File "..\..\plugins\rlm\rlm.dll"
File "..\..\plugins\rtnet\rtnet.dll"
File "..\..\plugins\rudp\rudp.dll"
File "..\..\plugins\sbus\sbus.dll"
File "..\..\plugins\v5ua\v5ua.dll"
SectionEnd

1
plugins/Makefile.am
View File

@ -52,6 +52,7 @@ SUBDIRS = \
rlm \
rtnet \
rudp \
sbus \
stats_tree \
v5ua

13
plugins/Makefile.nmake
View File

@ -30,6 +30,7 @@ all: \
rlm \
rtnet \
rudp \
sbus \
stats_tree \
v5ua
@ -151,6 +152,11 @@ rudp::
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..
sbus::
cd sbus
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..
stats_tree::
cd stats_tree
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
@ -209,6 +215,8 @@ clean:
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../rudp
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../sbus
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../stats_tree
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../v5ua
@ -262,6 +270,8 @@ distclean: clean
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../rudp
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../sbus
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../stats_tree
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../v5ua
@ -313,6 +323,8 @@ maintainer-clean: distclean
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../rudp
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../sbus
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../stats_tree
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../v5ua
@ -353,6 +365,7 @@ install-plugins:
xcopy rlm\*.dll $(VERSION) /d
xcopy rtnet\*.dll $(VERSION) /d
xcopy rudp\*.dll $(VERSION) /d
xcopy sbus\*.dll $(VERSION) /d
xcopy stats_tree\*.dll $(VERSION) /d
xcopy v5ua\*.dll $(VERSION) /d
!ENDIF

3
plugins/sbus/AUTHORS Normal file
View File

@ -0,0 +1,3 @@
Author :
Christian Durrer <christian.durrer@sensemail.ch>

5
plugins/sbus/ChangeLog Normal file
View File

@ -0,0 +1,5 @@
$Id$
Version 0.0.4:
* First release in Wireshark

117
plugins/sbus/Makefile.am Normal file
View File

@ -0,0 +1,117 @@
# Makefile.am
# Automake file for sbus plugin
#
# $Id$
#
# Wireshark - Network traffic analyzer / Ether-S-Bus dissection
# Copyright 2006, Christian Durrer <christian.durrer@sensemail.ch>
#
# 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.
#
INCLUDES = -I$(top_srcdir) -I$(includedir)
include Makefile.common
plugindir = @plugindir@
plugin_LTLIBRARIES = sbus.la
sbus_la_SOURCES = \
plugin.c \
moduleinfo.h \
$(DISSECTOR_SRC) \
$(DISSECTOR_INCLUDES)
sbus_la_LDFLAGS = -module -avoid-version
sbus_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 = \
sbus \
*~
MAINTAINERCLEANFILES = \
Makefile.in \
plugin.c
EXTRA_DIST = \
Makefile.common \
Makefile.nmake

31
plugins/sbus/Makefile.common Normal file
View File

@ -0,0 +1,31 @@
# Makefile.common for sbus plugin
# 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.
# the name of the plugin
PLUGIN_NAME = sbus
# the dissector sources (without any helpers)
DISSECTOR_SRC = \
packet-sbus.c

79
plugins/sbus/Makefile.nmake Normal file
View File

@ -0,0 +1,79 @@
# Makefile.nmake
# nmake file for sbus plugin
#
# $Id$
#
include ..\..\config.nmake
############### no need to modify below this line #########
include Makefile.common
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
OBJECTS=$(DISSECTOR_OBJECTS) plugin.obj
sbus.dll sbus.exp sbus.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
link -dll /out:sbus.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_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)
!IFDEF PYTHON
@echo Making plugin.c (using python)
@$(PYTHON) ../../tools/make-dissector-reg.py . plugin $(DISSECTOR_SRC)
!ELSE
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC)
!ENDIF
!ENDIF
clean:
rm -f $(OBJECTS) sbus.dll sbus.exp sbus.lib *.pdb
distclean: clean
maintainer-clean: distclean

17
plugins/sbus/moduleinfo.h Normal file
View File

@ -0,0 +1,17 @@
/* Included *after* config.h, in order to re-define these macros */
#ifdef PACKAGE
#undef PACKAGE
#endif
/* Name of package */
#define PACKAGE "sbus"
#ifdef VERSION
#undef VERSION
#endif
/* Version number of package */
#define VERSION "0.0.4"

1621
plugins/sbus/packet-sbus.c Normal file
View File

File diff suppressed because it is too large Load Diff