diff --git a/README.md b/README.md index defdbfa..e6303c1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -09-MAY-2017 Matthew J. Wolf Email: matthew.wolf.hpsdr at speciosus.net +20-MAY-2017 Matthew J. Wolf Email: matthew.wolf.hpsdr at speciosus.net The openHPSDR Plug-in for Wireshark is written to disassemble the openHPSDR Ethernet protocol. The protocol is also is referred to as "Protocol 2". @@ -8,6 +8,10 @@ The protocol is still under development. The current public released protocol documentation list located at: https://github.com/TAPR/OpenHPSDR-Firmware/tree/master/Protocol%202/Documentation +Version 0.0.7.1 + - Due to issue with the Microsoft Windows build. The "-" + in the source file system names has been replaced with "_". + Version 0.0.7: - Wireshark version 3.0.1 - Changed source file names from openhpsdr to openhpsdr-e. diff --git a/source/openhpsdr-e/CMakeLists.txt b/source/openhpsdr-e/CMakeLists.txt deleted file mode 100644 index 9a158e7..0000000 --- a/source/openhpsdr-e/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -# CMakeLists.txt -# -# Wireshark - Network traffic analyzer -# By Gerald Combs -# Copyright 1998 Gerald Combs -# -# SPDX-License-Identifier: GPL-2.0-or-later -# - -cmake_minimum_required(VERSION 3.1) -cmake_policy(SET CMP0048 NEW) - -project(openhpsr-e VERSION 0.0.7 DESCRIPTION "Wireshark OpenHPSDR-ETH Plugin" LANGUAGES C) - -find_package(Wireshark CONFIG REQUIRED) - -if(NOT Wireshark_PLUGINS_ENABLED) - message(FATAL_ERROR "Wireshark was compiled without support for plugins") -endif() - -set(CMAKE_C_VISIBILITY_PRESET hidden) -if (CMAKE_COMPILER_IS_GNUCC) - set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}") -endif() - -add_definitions(-DVERSION=\"${PROJECT_VERSION}\") - -add_library(openhpsdr-e MODULE packet-openhpsdr-e.c) -set_target_properties(openhpsdr-e PROPERTIES PREFIX "" DEFINE_SYMBOL "") -target_link_libraries(openhpsdr-e epan) - -install(TARGETS openhpsdr-e - LIBRARY DESTINATION "${Wireshark_PLUGIN_INSTALL_DIR}/epan" NAMELINK_SKIP -) diff --git a/source/openhpsdr-e/AUTHORS b/source/openhpsdr_e/AUTHORS similarity index 100% rename from source/openhpsdr-e/AUTHORS rename to source/openhpsdr_e/AUTHORS diff --git a/source/openhpsdr_e/CMakeLists.txt b/source/openhpsdr_e/CMakeLists.txt new file mode 100644 index 0000000..b5bdf7f --- /dev/null +++ b/source/openhpsdr_e/CMakeLists.txt @@ -0,0 +1,70 @@ +# CMakeLists.txt +# +# This file is part of the OpenHPSDR-Ethernet (Protocol 2) +# Plug-in for Wireshark. +# By Matthew J. Wolf +# Copyright 2019 Matthew J. Wolf +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# Copyright 1998 Gerald Combs +# +# SPDX-License-Identifier: GPL-2.0-or-later +# + +include(WiresharkPlugin) + +# Plugin name and version info (major minor micro extra) +set_module_info(openhpsdr_e 0 0 7 1) + +set(DISSECTOR_SRC + packet_openhpsdr_e.c +) + +set(PLUGIN_FILES + plugin.c + ${DISSECTOR_SRC} +) + +set_source_files_properties( + ${PLUGIN_FILES} + PROPERTIES + COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" +) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +register_plugin_files(plugin.c + plugin + ${DISSECTOR_SRC} +) + +add_plugin_library(openhpsdr_e epan) + +target_link_libraries(openhpsdr_e epan) + +install_plugin(openhpsdr_e epan) + +file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") +CHECKAPI( + NAME + openhpsdr_e + SWITCHES + -g abort -g termoutput -build + SOURCES + ${DISSECTOR_SRC} + ${DISSECTOR_HEADERS} +) + +# +# Editor modelines - http://www.wireshark.org/tools/modelines.html +# +# Local variables: +# c-basic-offset: 8 +# tab-width: 8 +# indent-tabs-mode: t +# End: +# +# vi: set shiftwidth=8 tabstop=8 noexpandtab: +# :indentSize=8:tabSize=8:noTabs=false: +# diff --git a/source/openhpsdr-e/COPYING b/source/openhpsdr_e/COPYING similarity index 100% rename from source/openhpsdr-e/COPYING rename to source/openhpsdr_e/COPYING diff --git a/source/openhpsdr-e/ChangeLog b/source/openhpsdr_e/ChangeLog similarity index 95% rename from source/openhpsdr-e/ChangeLog rename to source/openhpsdr_e/ChangeLog index bab9b29..51d6d4c 100644 --- a/source/openhpsdr-e/ChangeLog +++ b/source/openhpsdr_e/ChangeLog @@ -1,4 +1,8 @@ -09-May-2019 Matthew J. Wolf +20-May-2019 Matthew J. Wolf + +Version 0.0.7.1: + - Due to issue with the Microsoft Windows build. The "-" + in the source file system names has been replaced with "_". Version 0.0.7: - Wireshark version 3.0.1 diff --git a/source/openhpsdr-e/INSTALL b/source/openhpsdr_e/INSTALL similarity index 63% rename from source/openhpsdr-e/INSTALL rename to source/openhpsdr_e/INSTALL index a246ca5..ebea2f9 100644 --- a/source/openhpsdr-e/INSTALL +++ b/source/openhpsdr_e/INSTALL @@ -1,4 +1,4 @@ -10-MAY-2019 Matthew J. Wolf +20-MAY-2019 Matthew J. Wolf 1. Remove old Plug-in Library File ---------------------------------- @@ -31,52 +31,14 @@ the new plug-in. 1. Compile the Plug-in ---------------------- -Version 0.3.0 was developed with Wireshark 3.0.1. +Version 0.3.0.1 was developed with Wireshark 3.0.1. I assuming that that build environment for Wireshark has all ready been created. -There are two ways to compile the plug-in. Outside or inside the -Wireshark source tree. +I have only been able to compile the plug-in in the Wireshark Source Tree. - - A. Build the Plug-in Out Side of the Wireshark Source Tree - ---------------------------------------------------------- - - !!! THIS DOES NOT WORK !!! - - There is an issue with the plug-in source file name that causes the - plug-in version not to be set in the library file. - - You will need to have the Wireshark development libraries installed. - - 1. Unpack the plug-in source file somewhere. - - 2. Enter the plug-in source directory. - - cd openhpsdr-e - - 3. Create the build directory. - - cd - mkdir build - - 4. Enter the Build directory and run cmake. - - cd build - cmake .. - - 6. Run make to build the plug-in. - - cd /build - make - - 7. Install the plug-in. - - sudo make install - - I used the /doc/plugins.example/README as reference. - - B. Build the Plug-in in the Wireshark Source Tree + Build the Plug-in in the Wireshark Source Tree ---------------------------------------------- You need the Wireshark sources to compile the plug-in in the @@ -86,9 +48,9 @@ Wireshark source tree. 1. Unpack the plug-in source file somewhere. - 2. Copy and or move the "openhpsdr-e" directory from the plug-in source + 2. Copy and or move the "openhpsdr_e" directory from the plug-in source into the Wireshark source tree. - A. Copy or move the "openhpsdr-e" into + A. Copy or move the "openhpsdr_e" into /plugins/epan 3. Add the plug-in to root CMakeLists.txt file. @@ -102,11 +64,11 @@ Wireshark source tree. plugins/wimax plugins/wimaxasncp plugins/wimaxmacphy - plugins/openhpsdr-e + plugins/openhpsdr_e ${CUSTOM_PLUGIN_SRC_DIR} ) - Add "plugins/openhpsdr-e" to the end of the list. An example is above. + Add "plugins/openhpsdr_e" to the end of the list. An example is above. 4.Create the build directory. diff --git a/source/openhpsdr-e/README b/source/openhpsdr_e/README similarity index 96% rename from source/openhpsdr-e/README rename to source/openhpsdr_e/README index defdbfa..e6303c1 100644 --- a/source/openhpsdr-e/README +++ b/source/openhpsdr_e/README @@ -1,4 +1,4 @@ -09-MAY-2017 Matthew J. Wolf Email: matthew.wolf.hpsdr at speciosus.net +20-MAY-2017 Matthew J. Wolf Email: matthew.wolf.hpsdr at speciosus.net The openHPSDR Plug-in for Wireshark is written to disassemble the openHPSDR Ethernet protocol. The protocol is also is referred to as "Protocol 2". @@ -8,6 +8,10 @@ The protocol is still under development. The current public released protocol documentation list located at: https://github.com/TAPR/OpenHPSDR-Firmware/tree/master/Protocol%202/Documentation +Version 0.0.7.1 + - Due to issue with the Microsoft Windows build. The "-" + in the source file system names has been replaced with "_". + Version 0.0.7: - Wireshark version 3.0.1 - Changed source file names from openhpsdr to openhpsdr-e. diff --git a/source/openhpsdr-e/packet-openhpsdr-e.c b/source/openhpsdr_e/packet_openhpsdr_e.c similarity index 99% rename from source/openhpsdr-e/packet-openhpsdr-e.c rename to source/openhpsdr_e/packet_openhpsdr_e.c index f18d1c8..fee45bb 100644 --- a/source/openhpsdr-e/packet-openhpsdr-e.c +++ b/source/openhpsdr_e/packet_openhpsdr_e.c @@ -1,9 +1,9 @@ -/* packet-openhpsdr-e.c +/* packet_openhpsdr_e.c * Routines for the OpenHPSDR Ethernet protocol packet disassembly * - * Version: 0.0.7 + * Version: 0.0.7.1 * Author: Matthew J Wolf, N4MTT - * Date: 03-MAY-2019 + * Date: 20-MAY-2019 * * This file is part of the OpenHPSDR-Ethernet (Protocol 2) Plug-in * for Wireshark. @@ -29,8 +29,8 @@ * If not, see . * * - * The OpenHPSDR Ethernet Plug-in for Wireshark is written to disassemble the protocol - * that is defined in the documents listed below. + * The OpenHPSDR Ethernet Plug-in for Wireshark is written to disassemble the + * protocol that is defined in the documents listed below. * * The protocol is still under development. * @@ -61,10 +61,10 @@ #include //#include //#include -#include "packet-openhpsdr-e.h" +#include "packet_openhpsdr_e.h" -//Port definitions in packet-openhpsdr.h header +//Port definitions in packet_openhpsd_er.h header //nameing: "From-Host From-Hardware" diff --git a/source/openhpsdr-e/packet-openhpsdr-e.h b/source/openhpsdr_e/packet_openhpsdr_e.h similarity index 98% rename from source/openhpsdr-e/packet-openhpsdr-e.h rename to source/openhpsdr_e/packet_openhpsdr_e.h index a740ad0..8370448 100644 --- a/source/openhpsdr-e/packet-openhpsdr-e.h +++ b/source/openhpsdr_e/packet_openhpsdr_e.h @@ -1,9 +1,9 @@ -/* packet-openhpsdr-e.h +/* packet_openhpsdr_e.h * Header file for the OpenHPSDR Ethernet protocol packet disassembly * - * Version: 0.0.7 + * Version: 0.0.7.1 * Author: Matthew J Wolf, N4MTT - * Date: 03-MAY-2019 + * Date: 20-MAY-2019 * * This file is part of the OpenHPSDR Plug-in for Wireshark. * By Matthew J. Wolf diff --git a/source/openhpsdr-e/plugin.rc.in b/source/openhpsdr_e/plugin.rc.in similarity index 100% rename from source/openhpsdr-e/plugin.rc.in rename to source/openhpsdr_e/plugin.rc.in