diff options
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | configure.in | 1 | ||||
-rw-r--r-- | epan/Makefile.am | 1 | ||||
-rw-r--r-- | packaging/nsis/Makefile.nmake | 1 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 1 | ||||
-rw-r--r-- | plugins/Makefile.am | 1 | ||||
-rw-r--r-- | plugins/Makefile.nmake | 4 | ||||
-rw-r--r-- | plugins/interlink/AUTHORS | 2 | ||||
-rw-r--r-- | plugins/interlink/CMakeLists.txt | 65 | ||||
-rw-r--r-- | plugins/interlink/COPYING | 340 | ||||
-rw-r--r-- | plugins/interlink/ChangeLog | 0 | ||||
-rw-r--r-- | plugins/interlink/INSTALL | 0 | ||||
-rw-r--r-- | plugins/interlink/Makefile.am | 129 | ||||
-rw-r--r-- | plugins/interlink/Makefile.common | 36 | ||||
-rw-r--r-- | plugins/interlink/Makefile.nmake | 103 | ||||
-rw-r--r-- | plugins/interlink/NEWS | 3 | ||||
-rw-r--r-- | plugins/interlink/README | 7 | ||||
-rw-r--r-- | plugins/interlink/moduleinfo.h | 17 | ||||
-rw-r--r-- | plugins/interlink/moduleinfo.nmake | 28 | ||||
-rw-r--r-- | plugins/interlink/packet-interlink.c | 255 | ||||
-rw-r--r-- | plugins/interlink/plugin.rc.in | 34 |
23 files changed, 1031 insertions, 0 deletions
@@ -254,6 +254,7 @@ Uwe Girlich <Uwe.Girlich[AT]philosys.de> { Quake II dissector Quake 3 Arena dissector DTPT dissector + INTERLINK dissector } Warren Young <tangent[AT]mail.com> { diff --git a/CMakeLists.txt b/CMakeLists.txt index 568dc7b1f6..ee7a405d25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -367,6 +367,7 @@ if(ENABLE_PLUGINS) plugins/ethercat plugins/giop plugins/gryphon + plugins/interlink plugins/irda plugins/m2m plugins/mate diff --git a/Makefile.am b/Makefile.am index fa305790bc..10c1783115 100644 --- a/Makefile.am +++ b/Makefile.am @@ -269,6 +269,7 @@ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \ -dlopen plugins/giop/cosnaming.la \ -dlopen plugins/giop/coseventcomm.la \ -dlopen plugins/gryphon/gryphon.la \ + -dlopen plugins/interlink/interlink.la \ -dlopen plugins/irda/irda.la \ -dlopen plugins/m2m/m2m.la \ -dlopen plugins/mate/mate.la \ diff --git a/configure.in b/configure.in index c5b9fdbd63..dfa7a62283 100644 --- a/configure.in +++ b/configure.in @@ -1832,6 +1832,7 @@ AC_OUTPUT( plugins/ethercat/Makefile plugins/giop/Makefile plugins/gryphon/Makefile + plugins/interlink/Makefile plugins/irda/Makefile plugins/m2m/Makefile plugins/mate/Makefile diff --git a/epan/Makefile.am b/epan/Makefile.am index a81c0d81e4..7d9f8e799b 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -229,6 +229,7 @@ plugin_src = \ ../plugins/giop/packet-cosnaming.c \ ../plugins/giop/packet-coseventcomm.c \ ../plugins/gryphon/packet-gryphon.c \ + ../plugins/interlink/packet-interlink.c \ ../plugins/irda/packet-irda.c \ ../plugins/m2m/packet-m2m.c \ ../plugins/m2m/wimax_tlv.c \ diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 43f2de7355..45fcddaec1 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -54,6 +54,7 @@ PLUGINS= \ ../../plugins/giop/parlay.dll \ ../../plugins/giop/tango.dll \ ../../plugins/gryphon/gryphon.dll \ + ../../plugins/interlink/interlink.dll \ ../../plugins/irda/irda.dll \ ../../plugins/m2m/m2m.dll \ ../../plugins/mate/mate.dll \ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 6e80445ea1..e0b3e74975 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -882,6 +882,7 @@ File "..\..\plugins\giop\cosnaming.dll" File "..\..\plugins\giop\parlay.dll" File "..\..\plugins\giop\tango.dll" File "..\..\plugins\gryphon\gryphon.dll" +File "..\..\plugins\interlink\interlink.dll" File "..\..\plugins\irda\irda.dll" File "..\..\plugins\m2m\m2m.dll" File "..\..\plugins\opcua\opcua.dll" diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 4763c0a869..f7f49cf3e3 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -28,6 +28,7 @@ SUBDIRS = $(_CUSTOM_SUBDIRS_) \ ethercat \ giop \ gryphon \ + interlink \ irda \ m2m \ mate \ diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake index 25ba725df2..28afef9984 100644 --- a/plugins/Makefile.nmake +++ b/plugins/Makefile.nmake @@ -45,6 +45,9 @@ process-plugins: cd gryphon $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET) cd .. + cd interlink + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET) + cd .. cd irda $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET) cd .. @@ -90,6 +93,7 @@ install-plugins: xcopy plugins\ethercat\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d xcopy plugins\giop\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d xcopy plugins\gryphon\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d + xcopy plugins\interlink\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d xcopy plugins\irda\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d xcopy plugins\m2m\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d xcopy plugins\mate\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d diff --git a/plugins/interlink/AUTHORS b/plugins/interlink/AUTHORS new file mode 100644 index 0000000000..f1bbe70660 --- /dev/null +++ b/plugins/interlink/AUTHORS @@ -0,0 +1,2 @@ +Author : +Uwe Girlich <uwe.girlich@philosys.de> diff --git a/plugins/interlink/CMakeLists.txt b/plugins/interlink/CMakeLists.txt new file mode 100644 index 0000000000..a4a9c495fe --- /dev/null +++ b/plugins/interlink/CMakeLists.txt @@ -0,0 +1,65 @@ +# CMakeLists.txt +# +# $Id: CMakeLists.txt 31995 2010-02-24 22:32:10Z jmayer $ +# +# 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. +# + +set(DISSECTOR_SRC + packet-interlink.c +) + +set(PLUGIN_FILES + plugin.c + ${DISSECTOR_SRC} +) + +set(CLEAN_FILES + ${PLUGIN_FILES} +) + +if (WERROR) + set_source_files_properties( + ${CLEAN_FILES} + PROPERTIES + COMPILE_FLAGS -Werror + ) +endif() + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +register_dissector_files(plugin.c + plugin + ${DISSECTOR_SRC} +) + +add_library(interlink ${LINK_MODE_MODULE} + ${PLUGIN_FILES} +) +set_target_properties(interlink PROPERTIES PREFIX "") +#set_target_properties(interlink PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) + +target_link_libraries(interlink epan) + +install(TARGETS interlink + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION} + RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION} +) + diff --git a/plugins/interlink/COPYING b/plugins/interlink/COPYING new file mode 100644 index 0000000000..d60c31a97a --- /dev/null +++ b/plugins/interlink/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/plugins/interlink/ChangeLog b/plugins/interlink/ChangeLog new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/plugins/interlink/ChangeLog diff --git a/plugins/interlink/INSTALL b/plugins/interlink/INSTALL new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/plugins/interlink/INSTALL diff --git a/plugins/interlink/Makefile.am b/plugins/interlink/Makefile.am new file mode 100644 index 0000000000..b10471869c --- /dev/null +++ b/plugins/interlink/Makefile.am @@ -0,0 +1,129 @@ +# Makefile.am +# Automake file for Interlink plugin +# By Uwe Girlich <uwe.girlich@philosys.de> +# Copyright 2010 Uwe Girlich +# +# $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. +# + +INCLUDES = -I$(top_srcdir) -I$(includedir) + +include Makefile.common + +if HAVE_WARNINGS_AS_ERRORS +AM_CFLAGS = -Werror +endif + +plugindir = @plugindir@ + +plugin_LTLIBRARIES = interlink.la +interlink_la_SOURCES = \ + plugin.c \ + moduleinfo.h \ + $(DISSECTOR_SRC) \ + $(DISSECTOR_INCLUDES) +interlink_la_LDFLAGS = -module -avoid-version +interlink_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 = \ + interlink \ + *~ + +MAINTAINERCLEANFILES = \ + Makefile.in \ + plugin.c + +EXTRA_DIST = \ + Makefile.common \ + Makefile.nmake \ + moduleinfo.nmake \ + plugin.rc.in + +checkapi: + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/interlink/Makefile.common b/plugins/interlink/Makefile.common new file mode 100644 index 0000000000..628d85a640 --- /dev/null +++ b/plugins/interlink/Makefile.common @@ -0,0 +1,36 @@ +# Makefile.common for Interlink 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 = interlink + +# the dissector sources (without any helpers) +DISSECTOR_SRC = \ + packet-interlink.c + +# 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 "plugin.c". +DISSECTOR_SUPPORT_SRC = diff --git a/plugins/interlink/Makefile.nmake b/plugins/interlink/Makefile.nmake new file mode 100644 index 0000000000..992c9d4dcd --- /dev/null +++ b/plugins/interlink/Makefile.nmake @@ -0,0 +1,103 @@ +# Makefile.nmake +# nmake file for Wireshark plugin +# +# $Id: Makefile.nmake 29883 2009-09-13 19:48:22Z morriss $ +# + +include ..\..\config.nmake +include moduleinfo.nmake + +include Makefile.common + +CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \ + /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) + +.c.obj:: + $(CC) $(CFLAGS) -Fd.\ -c $< + +LDFLAGS = $(PLUGIN_LDFLAGS) + +!IFDEF ENABLE_LIBWIRESHARK +LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib +CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS) + +DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj) + +DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj) + +OBJECTS = $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) plugin.obj + +RESOURCE=$(PLUGIN_NAME).res + +all: $(PLUGIN_NAME).dll + +$(PLUGIN_NAME).rc : moduleinfo.nmake + sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ + -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ + -e s/@RC_VERSION@/$(RC_VERSION)/ \ + -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ + -e s/@PACKAGE@/$(PACKAGE)/ \ + -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ + < plugin.rc.in > $@ + +$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) + link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ + $(GLIB_LIBS) $(RESOURCE) + +# +# 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. +# +!IFDEF PYTHON +plugin.c: $(DISSECTOR_SRC) moduleinfo.h ../../tools/make-dissector-reg.py + @echo Making plugin.c (using python) + @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(DISSECTOR_SRC) +!ELSE +plugin.c: $(DISSECTOR_SRC) moduleinfo.h ../../tools/make-dissector-reg + @echo Making plugin.c (using sh) + @$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC) +!ENDIF + +!ENDIF + +clean: + rm -f $(OBJECTS) $(RESOURCE) plugin.c *.pdb \ + $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ + $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc + +distclean: clean + +maintainer-clean: distclean + +checkapi: + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/interlink/NEWS b/plugins/interlink/NEWS new file mode 100644 index 0000000000..0a7f7bfd4b --- /dev/null +++ b/plugins/interlink/NEWS @@ -0,0 +1,3 @@ +March 12, 2010 + Start + diff --git a/plugins/interlink/README b/plugins/interlink/README new file mode 100644 index 0000000000..c264d094fe --- /dev/null +++ b/plugins/interlink/README @@ -0,0 +1,7 @@ +Interlink is the basic network format for all kinds of network +communication in BMW cars. + +The plugin decodes the top-level communication protocol, but not any +particular network messages like "left indicator" or the like. + +The author is Uwe Girlich <uwe.girlich@philosys.de> diff --git a/plugins/interlink/moduleinfo.h b/plugins/interlink/moduleinfo.h new file mode 100644 index 0000000000..0f7cd6b58a --- /dev/null +++ b/plugins/interlink/moduleinfo.h @@ -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 "interlink" + + +#ifdef VERSION +#undef VERSION +#endif + +/* Version number of package */ +#define VERSION "0.0.1" + diff --git a/plugins/interlink/moduleinfo.nmake b/plugins/interlink/moduleinfo.nmake new file mode 100644 index 0000000000..29eac1847f --- /dev/null +++ b/plugins/interlink/moduleinfo.nmake @@ -0,0 +1,28 @@ +# +# $Id$ +# + +# The name +PACKAGE=interlink + +# 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/interlink/packet-interlink.c b/plugins/interlink/packet-interlink.c new file mode 100644 index 0000000000..424e6bf5f0 --- /dev/null +++ b/plugins/interlink/packet-interlink.c @@ -0,0 +1,255 @@ +/* packet-interlink.c + * Routines for Interlink protocol packet disassembly + * By Uwe Girlich <uwe.girlich@philosys.de> + * Copyright 2010 Uwe Girlich + * + * $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. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <epan/packet.h> + + +/* + * No public information available. + */ + +static int proto_interlink = -1; + +static int hf_interlink_id = -1; +static int hf_interlink_version = -1; +static int hf_interlink_cmd = -1; +static int hf_interlink_seq = -1; +static int hf_interlink_flags = -1; +static int hf_interlink_flags_req_ack = -1; +static int hf_interlink_flags_inc_ack_port = -1; +static int hf_interlink_block_type = -1; +static int hf_interlink_block_version = -1; +static int hf_interlink_block_length = -1; + +static gint ett_interlink = -1; +static gint ett_interlink_header = -1; +static gint ett_interlink_flags = -1; +static gint ett_interlink_block = -1; + +static dissector_handle_t data_handle; +static dissector_table_t subdissector_table; + + +static const value_string names_cmd[] = { + { 1, "Data" }, + { 2, "Ack" }, + { 0, NULL } +}; + + +static void +dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + int offset = 0; + proto_tree *il_tree = NULL; + proto_tree *ilh_tree = NULL; + proto_tree *ilb_tree = NULL; + guint8 ilb_type; + guint8 ilb_version; + guint16 type_version = 0; + dissector_handle_t handle; + tvbuff_t *next_tvb; + + col_set_str(pinfo->cinfo, COL_PROTOCOL, "INTERLINK"); + col_clear(pinfo->cinfo, COL_INFO); + + if (tree) { + proto_item *il_item = NULL; + il_item = proto_tree_add_item(tree, proto_interlink, + tvb, 0, 16, FALSE); + if (il_item) + il_tree = proto_item_add_subtree(il_item, ett_interlink); + } + + if (il_tree) { + proto_item *ilh_item = NULL; + ilh_item = proto_tree_add_text(il_tree, tvb, 0, 12, "Interlink Header"); + if (ilh_item) + ilh_tree = proto_item_add_subtree(ilh_item, ett_interlink_header); + } + + if (ilh_tree) proto_tree_add_item(ilh_tree, hf_interlink_id, + tvb, offset, 4, FALSE); + offset += 4; + if (ilh_tree) proto_tree_add_item(ilh_tree, hf_interlink_version, + tvb, offset, 2, TRUE); + offset += 2; + if (ilh_tree) proto_tree_add_item(ilh_tree, hf_interlink_cmd, + tvb, offset, 2, TRUE); + offset += 2; + if (ilh_tree) proto_tree_add_item(ilh_tree, hf_interlink_seq, + tvb, offset, 2, TRUE); + offset += 2; + if (ilh_tree) { + proto_item *flags_item = NULL; + proto_tree *flags_tree = NULL; + + flags_item = proto_tree_add_item(ilh_tree, hf_interlink_flags, + tvb, offset, 2, TRUE); + if (flags_item) { + flags_tree = proto_item_add_subtree(flags_item, ett_interlink_flags); + } + if (flags_tree) { + guint16 il_flags; + il_flags = tvb_get_letohs(tvb, offset); + proto_tree_add_boolean(flags_tree, hf_interlink_flags_req_ack, tvb, offset, 2, il_flags); + proto_tree_add_boolean(flags_tree, hf_interlink_flags_inc_ack_port, tvb, offset, 2, il_flags); + } + } + offset += 2; + + if (tree) { + proto_item *ilb_item = NULL; + ilb_item = proto_tree_add_text(il_tree, tvb, offset, 4, "Block Header"); + if (ilb_item) + ilb_tree = proto_item_add_subtree(ilb_item, ett_interlink_block) +; + } + + ilb_type = tvb_get_guint8(tvb, offset); + ilb_version = tvb_get_guint8(tvb, offset + 1); + type_version = ilb_type << 8 | ilb_version; + col_append_fstr(pinfo->cinfo, COL_INFO, "Type: 0x%02x, Version: %d", + ilb_type, ilb_version); + + if (ilb_tree) proto_tree_add_item(ilb_tree, hf_interlink_block_type, + tvb, offset, 1, FALSE); + offset += 1; + if (ilb_tree) proto_tree_add_item(ilb_tree, hf_interlink_block_version, + tvb, offset, 1, FALSE); + offset += 1; + if (ilb_tree) proto_tree_add_item(ilb_tree, hf_interlink_block_length, + tvb, offset, 2, TRUE); + offset += 2; + + /* Generate a new tvb for the rest. */ + next_tvb = tvb_new_subset_remaining(tvb, offset); + + /* Probably a sub-dissector exists for this type/version combination. */ + handle = dissector_get_port_handle(subdissector_table, type_version); + + /* Without a proper sub-dissector, we use "data". */ + if (handle == NULL) handle = data_handle; + + /* Call the sub-dissector. */ + call_dissector(handle, next_tvb, pinfo, tree); +} + + +static gboolean +dissect_interlink_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + if (!tvb_bytes_exist(tvb, 0, 4)) { + return FALSE; + } + if ( + tvb_get_guint8(tvb,0) != 'I' || + tvb_get_guint8(tvb,1) != 'L' || + tvb_get_guint8(tvb,2) != 'N' || + tvb_get_guint8(tvb,3) != 'K' + ) + return FALSE; + + dissect_interlink(tvb, pinfo, tree); + return TRUE; +} + + +void +proto_register_interlink(void) +{ + static hf_register_info hf[] = { + { &hf_interlink_id, { + "Magic ID", "interlink.id", FT_STRING, + BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_interlink_version, { + "Version", "interlink.version", FT_UINT16, + BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_interlink_cmd, { + "Command", "interlink.cmd", FT_UINT16, + BASE_DEC, VALS(names_cmd), 0, NULL, HFILL }}, + { &hf_interlink_seq, { + "Sequence", "interlink.seq", FT_UINT16, + BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_interlink_flags, { + "Flags", "interlink.flags", FT_UINT16, + BASE_HEX, NULL, 0, NULL, HFILL }}, + { &hf_interlink_flags_req_ack, { + "REQ_ACK", "interlink.flags.req_ack", FT_BOOLEAN, + BASE_HEX, TFS(&tfs_set_notset), 0x01, NULL, HFILL }}, + { &hf_interlink_flags_inc_ack_port, { + "INC_ACK_PORT", "interlink.flags.inc_ack_port", FT_BOOLEAN, + BASE_HEX, TFS(&tfs_set_notset), 0x02, NULL, HFILL }}, + { &hf_interlink_block_type, { + "Type", "interlink.type", FT_UINT8, + BASE_HEX, NULL, 0, NULL, HFILL }}, + { &hf_interlink_block_version, { + "Version", "interlink.block_version", FT_UINT8, + BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_interlink_block_length, { + "Length", "interlink.length", FT_UINT16, + BASE_DEC, NULL, 0, NULL, HFILL }}, + }; + + static gint *ett[] = { + &ett_interlink, + &ett_interlink_header, + &ett_interlink_flags, + &ett_interlink_block, + }; + + proto_interlink = proto_register_protocol("Interlink Protocol", + "Interlink", + "interlink"); + proto_register_field_array(proto_interlink, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + register_dissector("interlink", dissect_interlink, proto_interlink); + + /* Probably someone will write sub-dissectors. You can never know. */ + subdissector_table = register_dissector_table("interlink.type_version", + "Interlink type_version", FT_UINT16, BASE_HEX); +} + + +void +proto_reg_handoff_interlink(void) +{ + dissector_handle_t interlink_handle; + interlink_handle = find_dissector("interlink"); + + /* Allow "Decode As" with any UDP packet. */ + dissector_add_handle("udp.port", interlink_handle); + + /* Add our heuristic packet finder. */ + heur_dissector_add("udp", dissect_interlink_heur, proto_interlink); + + data_handle = find_dissector("data"); +} + diff --git a/plugins/interlink/plugin.rc.in b/plugins/interlink/plugin.rc.in new file mode 100644 index 0000000000..568dc07b49 --- /dev/null +++ b/plugins/interlink/plugin.rc.in @@ -0,0 +1,34 @@ +#include "winver.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @RC_MODULE_VERSION@ + PRODUCTVERSION @RC_VERSION@ + FILEFLAGSMASK 0x0L +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0 +#endif + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_DLL +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0" + VALUE "FileDescription", "@PACKAGE@ dissector\0" + VALUE "FileVersion", "@MODULE_VERSION@\0" + VALUE "InternalName", "@PACKAGE@ @MODULE_VERSION@\0" + VALUE "LegalCopyright", "Copyright © 1998 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0" + VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" + VALUE "ProductName", "Wireshark\0" + VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END |