Rename Logwolf to Logray

Switch to the name "Logray" for the log analyzer. Rays are biological
cousins of sharks and more people like the name "Logray" in a completely
unscientific survey here. Apologies for any inconvenience this might
cause.
This commit is contained in:
Gerald Combs 2022-06-30 09:45:49 -07:00
parent 78ebafd708
commit 75efbb1ac4
42 changed files with 690 additions and 690 deletions

View File

@ -30,10 +30,10 @@ endif()
if(WIN32) if(WIN32)
set(_project_name Wireshark) set(_project_name Wireshark)
set(_log_project_name Logwolf) set(_log_project_name Logray)
else() else()
set(_project_name wireshark) set(_project_name wireshark)
set(_log_project_name logwolf) set(_log_project_name logray)
endif() endif()
project(${_project_name} C CXX) project(${_project_name} C CXX)
@ -1181,7 +1181,7 @@ ws_find_package(AIRPCAP ENABLE_AIRPCAP HAVE_AIRPCAP)
ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD) ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD)
# Build one of the Qt GUIs? # Build one of the Qt GUIs?
if(BUILD_wireshark OR BUILD_logwolf) if(BUILD_wireshark OR BUILD_logray)
if(USE_qt6) if(USE_qt6)
set(qtver "6") set(qtver "6")
if(DEFINED ENV{WIRESHARK_QT6_PREFIX_PATH}) if(DEFINED ENV{WIRESHARK_QT6_PREFIX_PATH})
@ -1305,7 +1305,7 @@ ws_find_package(ILBC ENABLE_ILBC HAVE_ILBC)
ws_find_package(OPUS ENABLE_OPUS HAVE_OPUS) ws_find_package(OPUS ENABLE_OPUS HAVE_OPUS)
if (BUILD_logwolf) if (BUILD_logray)
# libsinsp+libscap, required for falco-bridge # libsinsp+libscap, required for falco-bridge
ws_find_package(Sinsp ENABLE_SINSP HAVE_SINSP) ws_find_package(Sinsp ENABLE_SINSP HAVE_SINSP)
endif() endif()
@ -1342,7 +1342,7 @@ find_package( Asciidoctor 1.5 )
find_package(DOXYGEN) find_package(DOXYGEN)
# The SpeexDSP resampler is required iff building wireshark or sharkd. # The SpeexDSP resampler is required iff building wireshark or sharkd.
if(BUILD_wireshark OR BUILD_logwolf OR BUILD_sharkd) if(BUILD_wireshark OR BUILD_logray OR BUILD_sharkd)
# We don't provide a binary package for SpeexDSP in our repository. # We don't provide a binary package for SpeexDSP in our repository.
# If using the repository don't bother searching for a system SpeexDSP # If using the repository don't bother searching for a system SpeexDSP
# installation and just use the bundled resampler code instead. # installation and just use the bundled resampler code instead.
@ -1578,8 +1578,8 @@ if(BUILD_wireshark AND QT_FOUND)
add_subdirectory( ui/qt ) add_subdirectory( ui/qt )
endif() endif()
if(BUILD_logwolf AND QT_FOUND) if(BUILD_logray AND QT_FOUND)
add_subdirectory( ui/logwolf ) add_subdirectory( ui/logray )
endif() endif()
# Location of our plugins. PLUGIN_DIR should allow running # Location of our plugins. PLUGIN_DIR should allow running
@ -1611,9 +1611,9 @@ if(ENABLE_PLUGINS)
plugins/codecs/l16_mono plugins/codecs/l16_mono
${CUSTOM_PLUGIN_SRC_DIR} ${CUSTOM_PLUGIN_SRC_DIR}
) )
set(LOGWOLF_PLUGIN_SRC_DIRS) set(LOGRAY_PLUGIN_SRC_DIRS)
if(SINSP_FOUND) if(SINSP_FOUND)
list(APPEND LOGWOLF_PLUGIN_SRC_DIRS list(APPEND LOGRAY_PLUGIN_SRC_DIRS
plugins/epan/falco_bridge plugins/epan/falco_bridge
) )
endif() endif()
@ -1654,7 +1654,7 @@ if(ENABLE_PLUGINS)
else() else()
set(PLUGIN_SRC_DIRS ) set(PLUGIN_SRC_DIRS )
set(LOGWOLF_PLUGIN_SRC_DIRS ) set(LOGRAY_PLUGIN_SRC_DIRS )
endif() endif()
if(ENABLE_APPLICATION_BUNDLE) if(ENABLE_APPLICATION_BUNDLE)
@ -1665,22 +1665,22 @@ if(ENABLE_APPLICATION_BUNDLE)
set(_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/Wireshark.app/Contents/PlugIns/wireshark/${PLUGIN_PATH_ID}") set(_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/Wireshark.app/Contents/PlugIns/wireshark/${PLUGIN_PATH_ID}")
endif() endif()
if(CMAKE_CFG_INTDIR STREQUAL ".") if(CMAKE_CFG_INTDIR STREQUAL ".")
set(_logwolf_plugin_dir "${CMAKE_BINARY_DIR}/run/Logwolf.app/Contents/PlugIns/logwolf/${PLUGIN_PATH_ID}") set(_logray_plugin_dir "${CMAKE_BINARY_DIR}/run/Logray.app/Contents/PlugIns/logray/${PLUGIN_PATH_ID}")
else() else()
# Xcode # Xcode
set(_logwolf_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/Logwolf.app/Contents/PlugIns/logwolf/${PLUGIN_PATH_ID}") set(_logray_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/Logray.app/Contents/PlugIns/logray/${PLUGIN_PATH_ID}")
endif() endif()
elseif(WIN32 AND NOT CMAKE_CFG_INTDIR STREQUAL ".") elseif(WIN32 AND NOT CMAKE_CFG_INTDIR STREQUAL ".")
set(_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/${PLUGIN_VERSION_DIR}") set(_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/${PLUGIN_VERSION_DIR}")
set(_logwolf_plugin_dir ${_plugin_dir}) set(_logray_plugin_dir ${_plugin_dir})
else() else()
set(_plugin_dir "${DATAFILE_DIR}/${PLUGIN_VERSION_DIR}") set(_plugin_dir "${DATAFILE_DIR}/${PLUGIN_VERSION_DIR}")
set(_logwolf_plugin_dir ${_plugin_dir}) set(_logray_plugin_dir ${_plugin_dir})
endif() endif()
set (PLUGIN_DIR ${_plugin_dir} CACHE INTERNAL "Build time plugin location.") set (PLUGIN_DIR ${_plugin_dir} CACHE INTERNAL "Build time plugin location.")
set (LOGWOLF_PLUGIN_DIR ${_logwolf_plugin_dir} CACHE INTERNAL "Build time Logwolf plugin location.") set (LOGRAY_PLUGIN_DIR ${_logray_plugin_dir} CACHE INTERNAL "Build time Logray plugin location.")
foreach(_plugin_src_dir ${PLUGIN_SRC_DIRS} ${LOGWOLF_PLUGIN_SRC_DIRS}) foreach(_plugin_src_dir ${PLUGIN_SRC_DIRS} ${LOGRAY_PLUGIN_SRC_DIRS})
add_subdirectory( ${_plugin_src_dir} ) add_subdirectory( ${_plugin_src_dir} )
endforeach() endforeach()
@ -1734,12 +1734,12 @@ set(CFG_OUT_FILES
wireshark.pc wireshark.pc
) )
if(BUILD_logwolf) if(BUILD_logray)
list(APPEND CFG_OUT_FILES list(APPEND CFG_OUT_FILES
packaging/macosx/LogwolfInfo.plist packaging/macosx/LograyInfo.plist
packaging/macosx/logwolf-app.dmgbuild packaging/macosx/logray-app.dmgbuild
packaging/macosx/logwolf-dsym.dmgbuild packaging/macosx/logray-dsym.dmgbuild
resources/logwolf.exe.manifest resources/logray.exe.manifest
) )
endif() endif()
@ -2428,20 +2428,20 @@ if(BUILD_wireshark AND QT_FOUND)
set_executable_resources(wireshark "Wireshark" UNIQUE_RC) set_executable_resources(wireshark "Wireshark" UNIQUE_RC)
endif() endif()
if(BUILD_logwolf AND QT_FOUND) if(BUILD_logray AND QT_FOUND)
set(LOGWOLF_SRC set(LOGRAY_SRC
file.c file.c
fileset.c fileset.c
${PLATFORM_UI_SRC} ${PLATFORM_UI_SRC}
) )
set(logwolf_FILES set(logray_FILES
$<TARGET_OBJECTS:capture_opts> $<TARGET_OBJECTS:capture_opts>
$<TARGET_OBJECTS:ui_logwolf> $<TARGET_OBJECTS:ui_logray>
$<TARGET_OBJECTS:shark_common> $<TARGET_OBJECTS:shark_common>
${LOGWOLF_SRC} ${LOGRAY_SRC}
${PLATFORM_UI_RC_FILES} ${PLATFORM_UI_RC_FILES}
) )
set_executable_resources(logwolf "Logwolf" UNIQUE_RC) set_executable_resources(logray "Logray" UNIQUE_RC)
endif() endif()
if(ENABLE_APPLICATION_BUNDLE) if(ENABLE_APPLICATION_BUNDLE)
@ -2615,8 +2615,8 @@ if(BUILD_wireshark AND QT_FOUND)
endif(QT_WINDEPLOYQT_EXECUTABLE) endif(QT_WINDEPLOYQT_EXECUTABLE)
endif() endif()
if(BUILD_logwolf AND QT_FOUND) if(BUILD_logray AND QT_FOUND)
set(logwolf_LIBS set(logray_LIBS
ui ui
capchild capchild
caputils caputils
@ -2637,12 +2637,12 @@ if(BUILD_logwolf AND QT_FOUND)
${MINIZIP_LIBRARIES} ${MINIZIP_LIBRARIES}
) )
add_executable(logwolf WIN32 MACOSX_BUNDLE ${logwolf_FILES} ${EXTRA_BUNDLE_FILES}) add_executable(logray WIN32 MACOSX_BUNDLE ${logray_FILES} ${EXTRA_BUNDLE_FILES})
if(WIN32 AND NOT BUILD_wireshark) if(WIN32 AND NOT BUILD_wireshark)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT logwolf) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT logray)
endif() endif()
set(PROGLIST ${PROGLIST} logwolf) set(PROGLIST ${PROGLIST} logray)
set_target_properties(logwolf PROPERTIES set_target_properties(logray PROPERTIES
LINK_FLAGS "${WS_LINK_FLAGS}" LINK_FLAGS "${WS_LINK_FLAGS}"
FOLDER "Executables" FOLDER "Executables"
INSTALL_RPATH "${EXECUTABLE_INSTALL_RPATH}" INSTALL_RPATH "${EXECUTABLE_INSTALL_RPATH}"
@ -2651,44 +2651,44 @@ if(BUILD_logwolf AND QT_FOUND)
AUTORCC ON AUTORCC ON
) )
if(MSVC) if(MSVC)
set_target_properties(logwolf PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}") set_target_properties(logray PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}")
endif() endif()
if(ENABLE_APPLICATION_BUNDLE OR WIN32) if(ENABLE_APPLICATION_BUNDLE OR WIN32)
set_target_properties(logwolf PROPERTIES OUTPUT_NAME Logwolf) set_target_properties(logray PROPERTIES OUTPUT_NAME Logray)
endif() endif()
if(ENABLE_APPLICATION_BUNDLE) if(ENABLE_APPLICATION_BUNDLE)
if(ASCIIDOCTOR_FOUND) if(ASCIIDOCTOR_FOUND)
# Make sure to generate files referenced by # Make sure to generate files referenced by
# BUNDLE_RESOURCE_SHARE_MAN1_FILES # BUNDLE_RESOURCE_SHARE_MAN1_FILES
add_dependencies(logwolf manpages) add_dependencies(logray manpages)
endif() endif()
set_target_properties( set_target_properties(
logwolf PROPERTIES logray PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_BINARY_DIR}/packaging/macosx/LogwolfInfo.plist MACOSX_BUNDLE_INFO_PLIST ${CMAKE_BINARY_DIR}/packaging/macosx/LograyInfo.plist
) )
if(CMAKE_CFG_INTDIR STREQUAL ".") if(CMAKE_CFG_INTDIR STREQUAL ".")
# Add a wrapper script which opens the bundle. This adds # Add a wrapper script which opens the bundle. This adds
# convenience but makes debugging more difficult. # convenience but makes debugging more difficult.
# It is not created if using Xcode # It is not created if using Xcode
# XXX Running run/Logwolf.app/Contents/MacOS/Logwolf works # XXX Running run/Logray.app/Contents/MacOS/Logray works
# fine for me (Gerald) here on Mojave. Can we just make this a # fine for me (Gerald) here on Mojave. Can we just make this a
# symlink? # symlink?
file(REMOVE ${CMAKE_BINARY_DIR}/run/logwolf) file(REMOVE ${CMAKE_BINARY_DIR}/run/logray)
file(WRITE ${CMAKE_BINARY_DIR}/run/logwolf "#!/bin/sh\n") file(WRITE ${CMAKE_BINARY_DIR}/run/logray "#!/bin/sh\n")
file(APPEND ${CMAKE_BINARY_DIR}/run/logwolf "# Generated by ${CMAKE_CURRENT_LIST_FILE}\n") file(APPEND ${CMAKE_BINARY_DIR}/run/logray "# Generated by ${CMAKE_CURRENT_LIST_FILE}\n")
file(APPEND ${CMAKE_BINARY_DIR}/run/logwolf "# Wrapper script which should work around the issue described at\n") file(APPEND ${CMAKE_BINARY_DIR}/run/logray "# Wrapper script which should work around the issue described at\n")
file(APPEND ${CMAKE_BINARY_DIR}/run/logwolf "# https://stackoverflow.com/questions/25318524/what-exactly-should-i-pass-to-nsapp-activateignoringotherapps-to-get-my-appl\n") file(APPEND ${CMAKE_BINARY_DIR}/run/logray "# https://stackoverflow.com/questions/25318524/what-exactly-should-i-pass-to-nsapp-activateignoringotherapps-to-get-my-appl\n")
file(APPEND ${CMAKE_BINARY_DIR}/run/logwolf "exec ${CMAKE_BINARY_DIR}/run/Logwolf.app/Contents/MacOS/Logwolf \"\$\@\"\n") file(APPEND ${CMAKE_BINARY_DIR}/run/logray "exec ${CMAKE_BINARY_DIR}/run/Logray.app/Contents/MacOS/Logray \"\$\@\"\n")
execute_process(COMMAND chmod a+x ${CMAKE_BINARY_DIR}/run/logwolf) execute_process(COMMAND chmod a+x ${CMAKE_BINARY_DIR}/run/logray)
endif() endif()
endif() endif()
target_link_libraries(logwolf ${logwolf_LIBS}) target_link_libraries(logray ${logray_LIBS})
target_include_directories(logwolf SYSTEM PRIVATE ${SPARKLE_INCLUDE_DIRS}) target_include_directories(logray SYSTEM PRIVATE ${SPARKLE_INCLUDE_DIRS})
install( install(
TARGETS logwolf TARGETS logray
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
) )
@ -2705,26 +2705,26 @@ if(BUILD_logwolf AND QT_FOUND)
--no-compiler-runtime --no-compiler-runtime
--verbose 0 --verbose 0
$<$<BOOL:${MSVC}>:--pdb> $<$<BOOL:${MSVC}>:--pdb>
"$<TARGET_FILE:logwolf>" "$<TARGET_FILE:logray>"
) )
add_dependencies(copy_ls_qt_dlls logwolf) add_dependencies(copy_ls_qt_dlls logray)
install(CODE "execute_process(COMMAND install(CODE "execute_process(COMMAND
\"${QT_WINDEPLOYQT_EXECUTABLE}\" \"${QT_WINDEPLOYQT_EXECUTABLE}\"
--no-compiler-runtime --no-compiler-runtime
\"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/Logwolf.exe\")" \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/Logray.exe\")"
) )
endif(QT_WINDEPLOYQT_EXECUTABLE) endif(QT_WINDEPLOYQT_EXECUTABLE)
endif() endif()
if (BUILD_logwolf AND SINSP_FOUND) if (BUILD_logray AND SINSP_FOUND)
add_custom_target(copy_falco_plugins) add_custom_target(copy_falco_plugins)
add_custom_command(TARGET copy_falco_plugins add_custom_command(TARGET copy_falco_plugins
COMMAND ${CMAKE_COMMAND} -E make_directory ${LOGWOLF_PLUGIN_DIR}/falco COMMAND ${CMAKE_COMMAND} -E make_directory ${LOGRAY_PLUGIN_DIR}/falco
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SINSP_PLUGINS} ${LOGWOLF_PLUGIN_DIR}/falco COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SINSP_PLUGINS} ${LOGRAY_PLUGIN_DIR}/falco
) )
add_dependencies(logwolf copy_falco_plugins) add_dependencies(logray copy_falco_plugins)
endif() endif()
# Common properties for CLI executables # Common properties for CLI executables
@ -3105,10 +3105,10 @@ if(BUILD_dumpcap AND PCAP_FOUND)
endif()" endif()"
) )
endif() endif()
if(BUILD_logwolf AND ENABLE_APPLICATION_BUNDLE) if(BUILD_logray AND ENABLE_APPLICATION_BUNDLE)
add_custom_command(TARGET dumpcap POST_BUILD add_custom_command(TARGET dumpcap POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
$<TARGET_FILE:dumpcap> run/Logwolf.app/Contents/MacOS/dumpcap $<TARGET_FILE:dumpcap> run/Logray.app/Contents/MacOS/dumpcap
) )
endif() endif()
elseif(BUILD_dumpcap AND ENABLE_PCAP) elseif(BUILD_dumpcap AND ENABLE_PCAP)
@ -3358,54 +3358,54 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark)
endif() endif()
if(ENABLE_APPLICATION_BUNDLE AND BUILD_logwolf) if(ENABLE_APPLICATION_BUNDLE AND BUILD_logray)
add_custom_target(logwolf_app_bundle) add_custom_target(logray_app_bundle)
set_target_properties(logwolf_app_bundle PROPERTIES FOLDER "Copy Tasks") set_target_properties(logray_app_bundle PROPERTIES FOLDER "Copy Tasks")
add_custom_command(TARGET logwolf_app_bundle add_custom_command(TARGET logray_app_bundle
POST_BUILD POST_BUILD
COMMAND "${CMAKE_BINARY_DIR}/packaging/macosx/osx-app.sh" --bundle Logwolf.app COMMAND "${CMAKE_BINARY_DIR}/packaging/macosx/osx-app.sh" --bundle Logray.app
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/run" WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/run"
) )
add_custom_target(logwolf_dmg_prep DEPENDS logwolf_app_bundle) add_custom_target(logray_dmg_prep DEPENDS logray_app_bundle)
FILE(MAKE_DIRECTORY packaging/macosx/logwolf) FILE(MAKE_DIRECTORY packaging/macosx/logray)
set(_logwolf_read_me_first "packaging/macosx/logwolf/Read me first.html") set(_logray_read_me_first "packaging/macosx/logray/Read me first.html")
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT OUTPUT
${_logwolf_read_me_first} ${_logray_read_me_first}
COMMAND ${ASCIIDOCTOR_EXECUTABLE} COMMAND ${ASCIIDOCTOR_EXECUTABLE}
--backend html --backend html
--out-file ${_logwolf_read_me_first} --out-file ${_logray_read_me_first}
--attribute include-dir=${CMAKE_SOURCE_DIR}/docbook --attribute include-dir=${CMAKE_SOURCE_DIR}/docbook
--attribute min-macos-version=${MIN_MACOS_VERSION} --attribute min-macos-version=${MIN_MACOS_VERSION}
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logwolf_read_me_first.adoc ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_read_me_first.adoc
DEPENDS DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logwolf_read_me_first.adoc ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_read_me_first.adoc
) )
set(_logwolf_dsym_installation "packaging/macosx/logwolf/Debugging symbols installation.html") set(_logray_dsym_installation "packaging/macosx/logray/Debugging symbols installation.html")
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT OUTPUT
${_logwolf_dsym_installation} ${_logray_dsym_installation}
COMMAND ${ASCIIDOCTOR_EXECUTABLE} COMMAND ${ASCIIDOCTOR_EXECUTABLE}
--backend html --backend html
--out-file ${_logwolf_dsym_installation} --out-file ${_logray_dsym_installation}
--attribute include-dir=${CMAKE_SOURCE_DIR}/docbook --attribute include-dir=${CMAKE_SOURCE_DIR}/docbook
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logwolf_dsym_installation.adoc ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_dsym_installation.adoc
DEPENDS DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logwolf_dsym_installation.adoc ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_dsym_installation.adoc
) )
add_custom_target(logwolf_dmg_readmes DEPENDS ${_logwolf_read_me_first} ${_logwolf_dsym_installation} ) add_custom_target(logray_dmg_readmes DEPENDS ${_logray_read_me_first} ${_logray_dsym_installation} )
add_dependencies(logwolf_dmg_prep logwolf_dmg_readmes) add_dependencies(logray_dmg_prep logray_dmg_readmes)
ADD_CUSTOM_TARGET( logwolf_dmg ADD_CUSTOM_TARGET( logray_dmg
COMMAND bash -x ${CMAKE_BINARY_DIR}/packaging/macosx/osx-dmg.sh --app-name Logwolf COMMAND bash -x ${CMAKE_BINARY_DIR}/packaging/macosx/osx-dmg.sh --app-name Logray
# Unlike wireshark_nsis_prep + wireshark_nsis, we can add a direct # Unlike wireshark_nsis_prep + wireshark_nsis, we can add a direct
# dependency here. # dependency here.
DEPENDS logwolf_dmg_prep DEPENDS logray_dmg_prep
# We create Wireshark.app in "run". Do our work there. # We create Wireshark.app in "run". Do our work there.
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/run WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/run
) )

View File

@ -1,8 +1,8 @@
# Build options for use by CMake # Build options for use by CMake
option(BUILD_wireshark "Build Wireshark" ON) option(BUILD_wireshark "Build Wireshark" ON)
option(BUILD_logwolf "Build Logwolf" OFF) option(BUILD_logray "Build Logray" OFF)
if(BUILD_wireshark OR BUILD_logwolf) if(BUILD_wireshark OR BUILD_logray)
if(DEFINED ENV{WIRESHARK_QT6_PREFIX_PATH}) if(DEFINED ENV{WIRESHARK_QT6_PREFIX_PATH})
option(USE_qt6 "Use Qt6 instead of Qt5" ON) option(USE_qt6 "Use Qt6 instead of Qt5" ON)
else() else()

View File

@ -58,11 +58,11 @@ macro(ADD_PLUGIN_LIBRARY _plugin _subfolder)
ADD_WIRESHARK_PLUGIN_LIBRARY(${_plugin} ${_subfolder}) ADD_WIRESHARK_PLUGIN_LIBRARY(${_plugin} ${_subfolder})
endmacro() endmacro()
macro(ADD_LOGWOLF_PLUGIN_LIBRARY _plugin _subfolder) macro(ADD_LOGRAY_PLUGIN_LIBRARY _plugin _subfolder)
ADD_WIRESHARK_PLUGIN_LIBRARY(${_plugin} ${_subfolder}) ADD_WIRESHARK_PLUGIN_LIBRARY(${_plugin} ${_subfolder})
set_target_properties(${_plugin} PROPERTIES set_target_properties(${_plugin} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${LOGWOLF_PLUGIN_DIR}/${_subfolder} LIBRARY_OUTPUT_DIRECTORY ${LOGRAY_PLUGIN_DIR}/${_subfolder}
) )
endmacro() endmacro()

View File

@ -16,7 +16,7 @@
#define VERSION_MINOR ${PROJECT_MINOR_VERSION} #define VERSION_MINOR ${PROJECT_MINOR_VERSION}
#define VERSION_MICRO ${PROJECT_PATCH_VERSION} #define VERSION_MICRO ${PROJECT_PATCH_VERSION}
/* Version number of Logwolf and associated utilities */ /* Version number of Logray and associated utilities */
#define LOG_VERSION "${LOG_PROJECT_VERSION}${VERSION_EXTRA}" #define LOG_VERSION "${LOG_PROJECT_VERSION}${VERSION_EXTRA}"
#define PLUGIN_PATH_ID "${PLUGIN_PATH_ID}" #define PLUGIN_PATH_ID "${PLUGIN_PATH_ID}"

View File

@ -1,7 +1,7 @@
// Common attributes // Common attributes
:wireshark-version: 3.7.2 :wireshark-version: 3.7.2
:logwolf-version: 0.9.0 :logray-version: 0.9.0
// Required for btn, kbd:, and menu: macros. // Required for btn, kbd:, and menu: macros.
:experimental: :experimental:

View File

@ -1,18 +1,18 @@
= Logwolf Quick Start = Logray Quick Start
Logwolf is a sibling application for Wireshark which focuses on log messages. Logray is a sibling application for Wireshark which focuses on log messages.
It helps people understand, troubleshoot, and secure their systems via log messages similar to the way Wireshark helps people understand, troubleshoot, and secure their networks via packets. It helps people understand, troubleshoot, and secure their systems via log messages similar to the way Wireshark helps people understand, troubleshoot, and secure their networks via packets.
This document provides brief instructions for building Logwolf until more complete documentation comparable to the Wireshark Developers and Users Guides can be written. This document provides brief instructions for building Logray until more complete documentation comparable to the Wireshark Developers and Users Guides can be written.
== Building Logwolf == Building Logray
Logwolf requires the same build environment as Wireshark. Logray requires the same build environment as Wireshark.
See the https://www.wireshark.org/docs/wsdg_html_chunked/[Wireshark Developers Guide] for instructions on setting that up. See the https://www.wireshark.org/docs/wsdg_html_chunked/[Wireshark Developers Guide] for instructions on setting that up.
It additionally requires libsinsp and libscap from https://github.com/falcosecurity/libs/[falcosecurity/libs] and any desired plugins from https://github.com/falcosecurity/plugins/[falcosecurity/plugins]. It additionally requires libsinsp and libscap from https://github.com/falcosecurity/libs/[falcosecurity/libs] and any desired plugins from https://github.com/falcosecurity/plugins/[falcosecurity/plugins].
In order to build Logwolf, do the following: In order to build Logray, do the following:
1. https://falco.org/docs/getting-started/source/[Build falcosecurity/libs]. 1. https://falco.org/docs/getting-started/source/[Build falcosecurity/libs].
@ -22,31 +22,31 @@ In order to build Logwolf, do the following:
+ +
-- --
[horizontal] [horizontal]
BUILD_logwolf:: Must be enabled, e.g. set to ON BUILD_logray:: Must be enabled, e.g. set to ON
SINSP_INCLUDEDIR:: The path to your local falcosecurity/libs directory SINSP_INCLUDEDIR:: The path to your local falcosecurity/libs directory
SINSP_LIBDIR:: The path to your falcosecurity/libs build directory SINSP_LIBDIR:: The path to your falcosecurity/libs build directory
-- --
4. Create a directory named `falco` in your Logwolf plugins directory, and either copy in or symlink any desired Falco plugins. 4. Create a directory named `falco` in your Logray plugins directory, and either copy in or symlink any desired Falco plugins.
.Example 1: Building on macOS using Ninja .Example 1: Building on macOS using Ninja
[sh] [sh]
---- ----
cmake -G Ninja \ cmake -G Ninja \
-DBUILD_logwolf=ON \ -DBUILD_logray=ON \
-DSINSP_INCLUDEDIR=/path/to/falcosecurity/libs \ -DSINSP_INCLUDEDIR=/path/to/falcosecurity/libs \
-DSINSP_LIBDIR=/path/to/falcosecurity/libs/build \ -DSINSP_LIBDIR=/path/to/falcosecurity/libs/build \
.. ..
ninja ninja
mkdir run/Logwolf.app/Contents/PlugIns/logwolf/3-7/falco mkdir run/Logray.app/Contents/PlugIns/logray/3-7/falco
(cd run/Logwolf.app/Contents/PlugIns/logwolf/3-7/falco ; ln -sn /path/to/falcosecurity-plugins/plugins/cloudtrail/libcloudtrail.so ) (cd run/Logray.app/Contents/PlugIns/logray/3-7/falco ; ln -sn /path/to/falcosecurity-plugins/plugins/cloudtrail/libcloudtrail.so )
---- ----
.Example 2: Building on Linux using Make .Example 2: Building on Linux using Make
[sh] [sh]
---- ----
cmake \ cmake \
-DBUILD_logwolf=ON \ -DBUILD_logray=ON \
-DSINSP_INCLUDEDIR=/path/to/falcosecurity/libs \ -DSINSP_INCLUDEDIR=/path/to/falcosecurity/libs \
-DSINSP_LIBDIR=/path/to/falcosecurity/libs/build \ -DSINSP_LIBDIR=/path/to/falcosecurity/libs/build \
.. ..

View File

@ -171,7 +171,7 @@ https://appimage.org[AppImage] package::
Build the `wireshark_appimage` target. Build the `wireshark_appimage` target.
macOS .dmg package containing an application bundle:: macOS .dmg package containing an application bundle::
Build the `wireshark_dmg` or `logwolf_dmg` targets. Build the `wireshark_dmg` or `logray_dmg` targets.
Installable packages typically require building Wireshark first. Installable packages typically require building Wireshark first.

View File

@ -1011,9 +1011,9 @@ In your build directory, type:
[source,sh] [source,sh]
---- ----
ninja wireshark_dmg logwolf_dmg # (Modify as needed) ninja wireshark_dmg logray_dmg # (Modify as needed)
# ...or, if you're using GNU make... # ...or, if you're using GNU make...
make wireshark_dmg logwolf_dmg # (Modify as needed) make wireshark_dmg logray_dmg # (Modify as needed)
---- ----
to build the macOS Packages. to build the macOS Packages.

View File

@ -88,7 +88,7 @@ WSLUA_FUNCTION wslua_register_menu(lua_State* L) { /* Register a menu item in o
* MENU_ANALYZE_CONVERSATION: menu:Analyze[Conversation Filter] * MENU_ANALYZE_CONVERSATION: menu:Analyze[Conversation Filter]
* MENU_TOOLS_UNSORTED: menu:Tools[] * MENU_TOOLS_UNSORTED: menu:Tools[]
Valid log (Logwolf) items are: Valid log (Logray) items are:
* MENU_LOG_ANALYZE_UNSORTED: menu:Analyze[] * MENU_LOG_ANALYZE_UNSORTED: menu:Analyze[]
* MENU_LOG_STAT_UNSORTED = 16 * MENU_LOG_STAT_UNSORTED = 16

View File

@ -5,13 +5,13 @@
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Logwolf</string> <string>Logray</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>@LOG_PROJECT_VERSION@, Copyright 1998-2022 Wireshark Development Team</string> <string>@LOG_PROJECT_VERSION@, Copyright 1998-2022 Wireshark Development Team</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>Wireshark.icns</string> <string>Wireshark.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.wireshark.Logwolf</string> <string>org.wireshark.Logray</string>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>
<array> <array>
<dict> <dict>
@ -53,7 +53,7 @@
<!-- Sparkle settings https://sparkle-project.org/documentation/customization/ --> <!-- Sparkle settings https://sparkle-project.org/documentation/customization/ -->
<key>SUFeedURL</key> <key>SUFeedURL</key>
<string>https://www.wireshark.org/update/0/Logwolf/@LOG_PROJECT_MAJOR_VERSION@.@LOG_PROJECT_MINOR_VERSION@.@PROJECT_PATCH_VERSION@/macOS/x86-64/en-US/stable.xml</string> <string>https://www.wireshark.org/update/0/Logray/@LOG_PROJECT_MAJOR_VERSION@.@LOG_PROJECT_MINOR_VERSION@.@PROJECT_PATCH_VERSION@/macOS/x86-64/en-US/stable.xml</string>
<key>SUEnableAutomaticChecks</key> <key>SUEnableAutomaticChecks</key>
<false/> <false/>
<key>SUPublicEDKey</key> <key>SUPublicEDKey</key>

View File

@ -0,0 +1,17 @@
// Required attributes:
// include-dir
include::{include-dir}/attributes.adoc[]
:stylesheet: {include-dir}/ws.css
== Debugging Symbols for Logray
This archive contains the debugging symbols for Logray {logray-version}.
The debugging symbols are only necessary if Logray is crashing and you need to report an issue to the Logray development team.
WARNING: This won't work properly with any version other than Logray {logray-version}.
To install the symbols, drag _Logray.dSYM_ to the same location as _Logray_.
This is usually your _Applications_ folder.
To uninstall, drag _Logray.dSYM_ to the trash.

View File

@ -7,28 +7,28 @@ include::{include-dir}/attributes.adoc[]
== Before You Begin == Before You Begin
This release of Logwolf requires macOS {min-macos-version} or later. This release of Logray requires macOS {min-macos-version} or later.
If you are running an earlier version of macOS you can install using another packaging system such as Homebrew or MacPorts. If you are running an earlier version of macOS you can install using another packaging system such as Homebrew or MacPorts.
== Quick Setup == Quick Setup
To install Logwolf, drag the _Logwolf_ application bundle to the _Applications_ folder. To install Logray, drag the _Logray_ application bundle to the _Applications_ folder.
//// ////
If you would like to add the path to If you would like to add the path to
https://www.wireshark.org/docs/man-pages/wireshark.html[Logwolf], https://www.wireshark.org/docs/man-pages/wireshark.html[Logray],
https://www.wireshark.org/docs/man-pages/tshark.html[TShark], https://www.wireshark.org/docs/man-pages/tshark.html[TShark],
https://www.wireshark.org/docs/man-pages/capinfos.html[capinfos], https://www.wireshark.org/docs/man-pages/capinfos.html[capinfos],
https://www.wireshark.org/docs/man-pages/editcap.html[editcap], https://www.wireshark.org/docs/man-pages/editcap.html[editcap],
and and
https://www.wireshark.org/docs/man-pages/[other command line utilities] https://www.wireshark.org/docs/man-pages/[other command line utilities]
to the system PATH, install the to the system PATH, install the
link:Logwolf.app/Contents/Resources/Extras/Add%20Wireshark%20to%20the%20system%20path.pkg[Add Logwolf to the system path] link:Logray.app/Contents/Resources/Extras/Add%20Wireshark%20to%20the%20system%20path.pkg[Add Logray to the system path]
package. package.
//// ////
== Uninstalling == Uninstalling
To uninstall Logwolf, do the following: To uninstall Logray, do the following:
. Remove _/Applications/Logwolf.app_ . Remove _/Applications/Logray.app_

View File

@ -1,17 +0,0 @@
// Required attributes:
// include-dir
include::{include-dir}/attributes.adoc[]
:stylesheet: {include-dir}/ws.css
== Debugging Symbols for Logwolf
This archive contains the debugging symbols for Logwolf {logwolf-version}.
The debugging symbols are only necessary if Logwolf is crashing and you need to report an issue to the Logwolf development team.
WARNING: This won't work properly with any version other than Logwolf {logwolf-version}.
To install the symbols, drag _Logwolf.dSYM_ to the same location as _Logwolf_.
This is usually your _Applications_ folder.
To uninstall, drag _Logwolf.dSYM_ to the trash.

View File

@ -19,15 +19,15 @@ import os.path
# .. Useful stuff .............................................................. # .. Useful stuff ..............................................................
lw_version = '@LOG_PROJECT_VERSION@' lw_version = '@LOG_PROJECT_VERSION@'
lw_volname = 'Logwolf ' + lw_version lw_volname = 'Logray ' + lw_version
lw_srcdir = '@CMAKE_SOURCE_DIR@' lw_srcdir = '@CMAKE_SOURCE_DIR@'
lw_bindir = '@CMAKE_BINARY_DIR@' lw_bindir = '@CMAKE_BINARY_DIR@'
lw_app = 'Logwolf.app' lw_app = 'Logray.app'
lw_readme = 'Read me first.html' lw_readme = 'Read me first.html'
lw_install_chmodbpf = 'Install ChmodBPF.pkg' lw_install_chmodbpf = 'Install ChmodBPF.pkg'
lw_uninstall_chmodbpf = 'Uninstall ChmodBPF.pkg' lw_uninstall_chmodbpf = 'Uninstall ChmodBPF.pkg'
lw_install_path_helper = 'Add Logwolf to the system path.pkg' lw_install_path_helper = 'Add Logray to the system path.pkg'
lw_uninstall_path_helper = 'Remove Logwolf from the system path.pkg' lw_uninstall_path_helper = 'Remove Logray from the system path.pkg'
# .. Basics .................................................................... # .. Basics ....................................................................
@ -35,7 +35,7 @@ lw_uninstall_path_helper = 'Remove Logwolf from the system path.pkg'
# filename = lw_volname + ' Intel 64.dmg' # filename = lw_volname + ' Intel 64.dmg'
# Uncomment to override the output volume name # Uncomment to override the output volume name
# volume_name = 'Logwolf ' + lw_version # volume_name = 'Logray ' + lw_version
# From the hdiutil man page: # From the hdiutil man page:
# UDZO - UDIF zlib-compressed image # UDZO - UDIF zlib-compressed image
@ -55,7 +55,7 @@ size = None
# Files to include # Files to include
files = [ files = [
os.path.join(lw_bindir, 'run', lw_app), os.path.join(lw_bindir, 'run', lw_app),
os.path.join(lw_bindir, 'packaging', 'macosx', 'logwolf', lw_readme), os.path.join(lw_bindir, 'packaging', 'macosx', 'logray', lw_readme),
] ]
# Symlinks to create # Symlinks to create

View File

@ -19,10 +19,10 @@ import os.path
# .. Useful stuff .............................................................. # .. Useful stuff ..............................................................
lw_version = '@LOG_PROJECT_VERSION@' lw_version = '@LOG_PROJECT_VERSION@'
lw_volname = 'Logwolf Debugging Symbols' + lw_version lw_volname = 'Logray Debugging Symbols' + lw_version
lw_srcdir = '@CMAKE_SOURCE_DIR@' lw_srcdir = '@CMAKE_SOURCE_DIR@'
lw_bindir = '@CMAKE_BINARY_DIR@' lw_bindir = '@CMAKE_BINARY_DIR@'
lw_app_dsym = 'Logwolf.dSYM' lw_app_dsym = 'Logray.dSYM'
lw_readme_dsym = 'Debugging symbols installation.html' lw_readme_dsym = 'Debugging symbols installation.html'
# .. Basics .................................................................... # .. Basics ....................................................................
@ -31,7 +31,7 @@ lw_readme_dsym = 'Debugging symbols installation.html'
# filename = lw_volname + ' Intel 64.dmg' # filename = lw_volname + ' Intel 64.dmg'
# Uncomment to override the output volume name # Uncomment to override the output volume name
# volume_name = 'Logwolf ' + lw_version # volume_name = 'Logray ' + lw_version
# From the hdiutil man page: # From the hdiutil man page:
# UDZO - UDIF zlib-compressed image # UDZO - UDIF zlib-compressed image
@ -50,7 +50,7 @@ size = None
# Files to include # Files to include
files = [ files = [
os.path.join(lw_bindir, 'run', lw_app_dsym), os.path.join(lw_bindir, 'run', lw_app_dsym),
os.path.join(lw_bindir, 'packaging', 'macosx', 'logwolf', lw_readme_dsym), os.path.join(lw_bindir, 'packaging', 'macosx', 'logray', lw_readme_dsym),
] ]
# Symlinks to create # Symlinks to create

View File

@ -72,7 +72,7 @@ OPTIONS
/usr/local. /usr/local.
EXAMPLE EXAMPLE
$0 -b Logwolf.app -s -l /opt/local $0 -b Logray.app -s -l /opt/local
" "
} }
@ -257,7 +257,7 @@ fi
"@QT_MACDEPLOYQT_EXECUTABLE@" "$bundle" -no-strip -verbose=2 || exit 1 "@QT_MACDEPLOYQT_EXECUTABLE@" "$bundle" -no-strip -verbose=2 || exit 1
# #
# The build process added to the Wireshark/Logwolf binary an rpath # The build process added to the Wireshark/Logray binary an rpath
# entry pointing to the directory containing the Qt frameworks; remove # entry pointing to the directory containing the Qt frameworks; remove
# that entry from the binary in the package. # that entry from the binary in the package.
# #

View File

@ -67,8 +67,8 @@ fi
if [[ $app_name = Log* ]] ; then if [[ $app_name = Log* ]] ; then
version=$log_version version=$log_version
app_settings_file="@CMAKE_BINARY_DIR@/packaging/macosx/logwolf-app.dmgbuild" app_settings_file="@CMAKE_BINARY_DIR@/packaging/macosx/logray-app.dmgbuild"
dsym_settings_file="@CMAKE_BINARY_DIR@/packaging/macosx/logwolf-dsym.dmgbuild" dsym_settings_file="@CMAKE_BINARY_DIR@/packaging/macosx/logray-dsym.dmgbuild"
fi fi
app_vol_name="$app_name ${version}" app_vol_name="$app_name ${version}"

View File

@ -30,23 +30,23 @@ set(WIRESHARK_NSIS_FILES
PARENT_SCOPE PARENT_SCOPE
) )
set(LOGWOLF_NSIS_GENERATED_FILES set(LOGRAY_NSIS_GENERATED_FILES
${CMAKE_CURRENT_BINARY_DIR}/logwolf-manifest.nsh ${CMAKE_CURRENT_BINARY_DIR}/logray-manifest.nsh
${CMAKE_CURRENT_BINARY_DIR}/logwolf-config.nsh ${CMAKE_CURRENT_BINARY_DIR}/logray-config.nsh
${CMAKE_CURRENT_BINARY_DIR}/logwolf-qt-manifest.nsh ${CMAKE_CURRENT_BINARY_DIR}/logray-qt-manifest.nsh
) )
set(LOGWOLF_NSIS_GENERATED_FILES ${LOGWOLF_NSIS_GENERATED_FILES} PARENT_SCOPE) set(LOGRAY_NSIS_GENERATED_FILES ${LOGRAY_NSIS_GENERATED_FILES} PARENT_SCOPE)
set(LOGWOLF_NSIS_FILES set(LOGRAY_NSIS_FILES
logwolf.nsi logray.nsi
uninstall-logwolf.nsi uninstall-logray.nsi
logwolf-common.nsh logray-common.nsh
GetWindowsVersion.nsh GetWindowsVersion.nsh
servicelib.nsh servicelib.nsh
AdditionalTasksPage.ini AdditionalTasksPage.ini
NpcapPage.ini NpcapPage.ini
USBPcapPage.ini USBPcapPage.ini
${LOGWOLF_NSIS_GENERATED_FILES} ${LOGRAY_NSIS_GENERATED_FILES}
PARENT_SCOPE PARENT_SCOPE
) )
@ -83,7 +83,7 @@ set (LOG_PRODUCT_VERSION ${LOG_PROJECT_MAJOR_VERSION}.${LOG_PROJECT_MINOR_VERSIO
# wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe # wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe
#) #)
if((BUILD_wireshark OR BUILD_logwolf) AND QT_FOUND) if((BUILD_wireshark OR BUILD_logray) AND QT_FOUND)
set (QT_DIR "\${STAGING_DIR}") set (QT_DIR "\${STAGING_DIR}")
endif() endif()
@ -188,18 +188,18 @@ if (BUILD_wireshark)
file(WRITE "${_all_manifest}" "${_all_manifest_contents}") file(WRITE "${_all_manifest}" "${_all_manifest_contents}")
endif() endif()
if (BUILD_logwolf) if (BUILD_logray)
# Ideally we would generate this at compile time using a separate cmake # Ideally we would generate this at compile time using a separate cmake
# module, e.g. cmake/modules/configure_nsis_file.cmake. However we would # module, e.g. cmake/modules/configure_nsis_file.cmake. However we would
# have to figure out a clean way to pass in the variables above. # have to figure out a clean way to pass in the variables above.
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/logwolf-config.nsh.in" _config_nsh_contents) file(READ "${CMAKE_CURRENT_SOURCE_DIR}/logray-config.nsh.in" _config_nsh_contents)
string(CONFIGURE "${_config_nsh_contents}" _config_nsh_contents) string(CONFIGURE "${_config_nsh_contents}" _config_nsh_contents)
string(REPLACE "#define" "!define" _config_nsh_contents "${_config_nsh_contents}") string(REPLACE "#define" "!define" _config_nsh_contents "${_config_nsh_contents}")
string(REPLACE "#undef" "!undef" _config_nsh_contents "${_config_nsh_contents}") string(REPLACE "#undef" "!undef" _config_nsh_contents "${_config_nsh_contents}")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/logwolf-config.nsh" "${_config_nsh_contents}") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/logray-config.nsh" "${_config_nsh_contents}")
# logwolf-manifest.nsh. Can be created at configure time. # logray-manifest.nsh. Can be created at configure time.
set(_all_manifest "${CMAKE_CURRENT_BINARY_DIR}/logwolf-manifest.nsh") set(_all_manifest "${CMAKE_CURRENT_BINARY_DIR}/logray-manifest.nsh")
set(_all_manifest_contents "# Files required for all sections. Generated by CMake.\n") set(_all_manifest_contents "# Files required for all sections. Generated by CMake.\n")
set(_all_manifest_contents "${_all_manifest_contents}!ifdef BUNDLE_DEBUG_DLLS\n") set(_all_manifest_contents "${_all_manifest_contents}!ifdef BUNDLE_DEBUG_DLLS\n")
foreach(_dll ${GLIB2_DLLS_DEBUG}) foreach(_dll ${GLIB2_DLLS_DEBUG})
@ -265,14 +265,14 @@ macro( ADD_NSIS_UNINSTALLER_TARGETS )
message(WARNING "The NSIS installer cannot be built if the Wireshark program isn't built.") message(WARNING "The NSIS installer cannot be built if the Wireshark program isn't built.")
endif() endif()
if(BUILD_logwolf) if(BUILD_logray)
add_custom_command(OUTPUT ${DATAFILE_DIR}/uninstall-logwolf.exe add_custom_command(OUTPUT ${DATAFILE_DIR}/uninstall-logray.exe
DEPENDS ${_nsis_source_dir}/uninstall-logwolf.nsi DEPENDS ${_nsis_source_dir}/uninstall-logray.nsi
${_nsis_source_dir}/logwolf-common.nsh ${_nsis_source_dir}/logray-common.nsh
COMMAND ${MAKENSIS_EXECUTABLE} ${NSIS_OPTIONS} COMMAND ${MAKENSIS_EXECUTABLE} ${NSIS_OPTIONS}
uninstall-logwolf.nsi uninstall-logray.nsi
COMMAND ${POWERSHELL_COMMAND} "${_nsis_source_dir}/makeUninstall.ps1" ${DATAFILE_DIR}/uninstall_logwolf_installer.exe COMMAND ${POWERSHELL_COMMAND} "${_nsis_source_dir}/makeUninstall.ps1" ${DATAFILE_DIR}/uninstall_logray_installer.exe
COMMAND ${CMAKE_COMMAND} -E remove ${DATAFILE_DIR}/uninstall_logwolf_installer.exe COMMAND ${CMAKE_COMMAND} -E remove ${DATAFILE_DIR}/uninstall_logray_installer.exe
WORKING_DIRECTORY ${_nsis_source_dir} WORKING_DIRECTORY ${_nsis_source_dir}
) )
endif() endif()
@ -331,31 +331,31 @@ macro( ADD_NSIS_PACKAGE_TARGETS )
) )
endif() endif()
if(BUILD_logwolf) if(BUILD_logray)
#set (_nsis_package ${CMAKE_BINARY_DIR}/packaging/nsis/Wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe) #set (_nsis_package ${CMAKE_BINARY_DIR}/packaging/nsis/Wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe)
# logwolf-qt-manifest.nsh. Created using Wireshark.exe. # logray-qt-manifest.nsh. Created using Wireshark.exe.
add_custom_command(OUTPUT ${_nsis_binary_dir}/logwolf-qt-manifest.nsh add_custom_command(OUTPUT ${_nsis_binary_dir}/logray-qt-manifest.nsh
COMMAND set "PATH=${QT_BIN_PATH};%PATH%" COMMAND set "PATH=${QT_BIN_PATH};%PATH%"
COMMAND ${POWERSHELL_COMMAND} "${_nsis_source_dir}/windeployqt-to-nsis.ps1" COMMAND ${POWERSHELL_COMMAND} "${_nsis_source_dir}/windeployqt-to-nsis.ps1"
-Executable $<TARGET_FILE:logwolf> -Executable $<TARGET_FILE:logray>
-FilePath ${_nsis_binary_dir}/logwolf-qt-manifest.nsh -FilePath ${_nsis_binary_dir}/logray-qt-manifest.nsh
$<$<CONFIG:Debug>:-DebugConfig> $<$<CONFIG:Debug>:-DebugConfig>
DEPENDS "${_nsis_source_dir}/windeployqt-to-nsis.ps1" DEPENDS "${_nsis_source_dir}/windeployqt-to-nsis.ps1"
) )
# Build NSIS package dependencies. We build the package in # Build NSIS package dependencies. We build the package in
# two stages so that logwolf_nsis below doesn't trigger # two stages so that logray_nsis below doesn't trigger
# any dependencies that might clobber any signed executables. # any dependencies that might clobber any signed executables.
add_custom_target(logwolf_nsis_prep add_custom_target(logray_nsis_prep
DEPENDS DEPENDS
${LOGWOLF_NSIS_FILES} ${LOGRAY_NSIS_FILES}
copy_data_files copy_data_files
user_guide_html user_guide_html
faq_html faq_html
${DATAFILE_DIR}/uninstall-logwolf.exe ${DATAFILE_DIR}/uninstall-logray.exe
) )
set_target_properties(logwolf_nsis_prep PROPERTIES set_target_properties(logray_nsis_prep PROPERTIES
FOLDER "Packaging" FOLDER "Packaging"
EXCLUDE_FROM_DEFAULT_BUILD True EXCLUDE_FROM_DEFAULT_BUILD True
) )
@ -363,13 +363,13 @@ macro( ADD_NSIS_PACKAGE_TARGETS )
# Dump the installer into # Dump the installer into
# ${CMAKE_CURRENT_SOURCE_DIR}/packaging/nsis # ${CMAKE_CURRENT_SOURCE_DIR}/packaging/nsis
# Note that executables and DLLs *must* be built separately # Note that executables and DLLs *must* be built separately
add_custom_target(logwolf_nsis add_custom_target(logray_nsis
COMMAND ${MAKENSIS_EXECUTABLE} ${NSIS_OPTIONS} COMMAND ${MAKENSIS_EXECUTABLE} ${NSIS_OPTIONS}
$<$<CONFIG:Debug>:/DBUNDLE_DEBUG_DLLS> $<$<CONFIG:Debug>:/DBUNDLE_DEBUG_DLLS>
logwolf.nsi logray.nsi
WORKING_DIRECTORY ${_nsis_source_dir} WORKING_DIRECTORY ${_nsis_source_dir}
) )
set_target_properties(logwolf_nsis PROPERTIES set_target_properties(logray_nsis PROPERTIES
FOLDER "Packaging" FOLDER "Packaging"
EXCLUDE_FROM_DEFAULT_BUILD True EXCLUDE_FROM_DEFAULT_BUILD True
) )
@ -384,9 +384,9 @@ set(CLEAN_FILES
wireshark-config.nsh wireshark-config.nsh
wireshark-manifest.nsh wireshark-manifest.nsh
wireshark-qt-manifest.nsh wireshark-qt-manifest.nsh
${DATAFILE_DIR}/uninstall-logwolf.exe ${DATAFILE_DIR}/uninstall-logray.exe
logwolf-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe logray-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe
logwolf-config.nsh logray-config.nsh
logwolf-manifest.nsh logray-manifest.nsh
logwolf-qt-manifest.nsh logray-qt-manifest.nsh
) )

View File

@ -5,13 +5,13 @@ https://coolsoft.altervista.org/nsisdialogdesigner
Do not edit manually! Do not edit manually!
--> -->
<Dialog Name="AdditionalTasksPage" Title="Additional Tasks" Subtitle="Create shortcuts and associate file extensions."> <Dialog Name="AdditionalTasksPage" Title="Additional Tasks" Subtitle="Create shortcuts and associate file extensions.">
<CreateFunctionCustomScript>; Defined in logwolf.nsi <CreateFunctionCustomScript>; Defined in logray.nsi
Call InitAdditionalTasksPage</CreateFunctionCustomScript> Call InitAdditionalTasksPage</CreateFunctionCustomScript>
<Label Name="ExtensionsLabel" Location="22, 151" Size="372, 52" Text="Extensions include 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, ipfix, lcap, mplog, ntar, out, pcap, pcapng, pklg, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, and wpz." TabIndex="0" /> <Label Name="ExtensionsLabel" Location="22, 151" Size="372, 52" Text="Extensions include 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, ipfix, lcap, mplog, ntar, out, pcap, pcapng, pklg, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, and wpz." TabIndex="0" />
<CheckBox Name="AssociateExtensionsCheckBox" Location="22, 126" Size="406, 14" Text="Associate trace file extensions with Logwolf" TabIndex="1" /> <CheckBox Name="AssociateExtensionsCheckBox" Location="22, 126" Size="406, 14" Text="Associate trace file extensions with Logray" TabIndex="1" />
<CheckBox Name="QuickLaunchCheckBox" Location="22, 74" Size="406, 14" Text="Logwolf Quick Launch Icon" TabIndex="2" /> <CheckBox Name="QuickLaunchCheckBox" Location="22, 74" Size="406, 14" Text="Logray Quick Launch Icon" TabIndex="2" />
<CheckBox Name="DesktopIconCheckBox" Location="22, 54" Size="406, 14" Text="Logwolf Desktop Icon" TabIndex="3" /> <CheckBox Name="DesktopIconCheckBox" Location="22, 54" Size="406, 14" Text="Logray Desktop Icon" TabIndex="3" />
<CheckBox Name="StartMenuCheckBox" Location="22, 34" Size="406, 14" Text="Logwolf Start Menu Item" TabIndex="4" /> <CheckBox Name="StartMenuCheckBox" Location="22, 34" Size="406, 14" Text="Logray Start Menu Item" TabIndex="4" />
<Label Name="FileExtensionsLabel" Location="12, 101" Size="426, 14" Text="Associate File Extensions" Font="Microsoft Sans Serif, 8.25pt, style=Bold" TabIndex="5" /> <Label Name="FileExtensionsLabel" Location="12, 101" Size="426, 14" Text="Associate File Extensions" Font="Microsoft Sans Serif, 8.25pt, style=Bold" TabIndex="5" />
<Label Name="CreateShortcutsLabel" Location="12, 9" Size="426, 14" Text="Create Shortcuts" Font="Microsoft Sans Serif, 8.25pt, style=Bold" TabIndex="6" /> <Label Name="CreateShortcutsLabel" Location="12, 9" Size="426, 14" Text="Create Shortcuts" Font="Microsoft Sans Serif, 8.25pt, style=Bold" TabIndex="6" />
</Dialog> </Dialog>

View File

@ -36,19 +36,19 @@ Function fnc_AdditionalTasksPage_Create
Pop $hCtl_AdditionalTasksPage_ExtensionsLabel Pop $hCtl_AdditionalTasksPage_ExtensionsLabel
; === AssociateExtensionsCheckBox (type: Checkbox) === ; === AssociateExtensionsCheckBox (type: Checkbox) ===
${NSD_CreateCheckbox} 14u 78u 267u 9u "Associate log file extensions with Logwolf" ${NSD_CreateCheckbox} 14u 78u 267u 9u "Associate log file extensions with Logray"
Pop $hCtl_AdditionalTasksPage_AssociateExtensionsCheckBox Pop $hCtl_AdditionalTasksPage_AssociateExtensionsCheckBox
; === QuickLaunchCheckBox (type: Checkbox) === ; === QuickLaunchCheckBox (type: Checkbox) ===
${NSD_CreateCheckbox} 14u 46u 267u 9u "Logwolf Quick Launch Icon" ${NSD_CreateCheckbox} 14u 46u 267u 9u "Logray Quick Launch Icon"
Pop $hCtl_AdditionalTasksPage_QuickLaunchCheckBox Pop $hCtl_AdditionalTasksPage_QuickLaunchCheckBox
; === DesktopIconCheckBox (type: Checkbox) === ; === DesktopIconCheckBox (type: Checkbox) ===
${NSD_CreateCheckbox} 14u 33u 267u 9u "Logwolf Desktop Icon" ${NSD_CreateCheckbox} 14u 33u 267u 9u "Logray Desktop Icon"
Pop $hCtl_AdditionalTasksPage_DesktopIconCheckBox Pop $hCtl_AdditionalTasksPage_DesktopIconCheckBox
; === StartMenuCheckBox (type: Checkbox) === ; === StartMenuCheckBox (type: Checkbox) ===
${NSD_CreateCheckbox} 14u 21u 267u 9u "Logwolf Start Menu Item" ${NSD_CreateCheckbox} 14u 21u 267u 9u "Logray Start Menu Item"
Pop $hCtl_AdditionalTasksPage_StartMenuCheckBox Pop $hCtl_AdditionalTasksPage_StartMenuCheckBox
; === FileExtensionsLabel (type: Label) === ; === FileExtensionsLabel (type: Label) ===
@ -62,7 +62,7 @@ Function fnc_AdditionalTasksPage_Create
SendMessage $hCtl_AdditionalTasksPage_CreateShortcutsLabel ${WM_SETFONT} $hCtl_AdditionalTasksPage_Font1 0 SendMessage $hCtl_AdditionalTasksPage_CreateShortcutsLabel ${WM_SETFONT} $hCtl_AdditionalTasksPage_Font1 0
; CreateFunctionCustomScript ; CreateFunctionCustomScript
; Defined in logwolf.nsi ; Defined in logray.nsi
Call InitAdditionalTasksPage Call InitAdditionalTasksPage

View File

@ -18,7 +18,7 @@ ManifestDPIAware true
!addincludedir ${NSIS_INCLUDE_DIR} !addincludedir ${NSIS_INCLUDE_DIR}
!endif !endif
!include "logwolf-config.nsh" !include "logray-config.nsh"
!define BITS 64 !define BITS 64
@ -28,14 +28,14 @@ Name "${DISPLAY_NAME}"
!define PROGRAM_FULL_NAME "The ${PROGRAM_NAME} Log Analyzer" !define PROGRAM_FULL_NAME "The ${PROGRAM_NAME} Log Analyzer"
!define PROGRAM_NAME_PATH "${PROGRAM_NAME}.exe" !define PROGRAM_NAME_PATH "${PROGRAM_NAME}.exe"
!define UNINSTALLER_NAME "uninstall-logwolf.exe" !define UNINSTALLER_NAME "uninstall-logray.exe"
VIAddVersionKey "ProductName" "${PROGRAM_NAME}" VIAddVersionKey "ProductName" "${PROGRAM_NAME}"
VIAddVersionKey "Comments" "It's a great product with a great story to tell. I'm pumped!" VIAddVersionKey "Comments" "It's a great product with a great story to tell. I'm pumped!"
VIAddVersionKey "CompanyName" "${PROGRAM_NAME} development team" VIAddVersionKey "CompanyName" "${PROGRAM_NAME} development team"
; NSIS handles U+00a9 but not a UTF-8 encoded copyright symbol. ; NSIS handles U+00a9 but not a UTF-8 encoded copyright symbol.
VIAddVersionKey "LegalCopyright" "${U+00a9} Gerald Combs and many others" VIAddVersionKey "LegalCopyright" "${U+00a9} Gerald Combs and many others"
VIAddVersionKey "LegalTrademarks" "Logwolf and the 'wolf' logo are registered trademarks" VIAddVersionKey "LegalTrademarks" "Logray and the 'ray' logo are registered trademarks"
VIAddVersionKey "FileDescription" "${PROGRAM_NAME} installer for ${BITS}-bit Windows" VIAddVersionKey "FileDescription" "${PROGRAM_NAME} installer for ${BITS}-bit Windows"
VIAddVersionKey "Language" "English" VIAddVersionKey "Language" "English"
VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}"
@ -90,8 +90,8 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache'
; probably don't want to grab JPEG or MP3 files. ; probably don't want to grab JPEG or MP3 files.
; ============================================================================ ; ============================================================================
; Used to add associations between file extensions and Logwolf ; Used to add associations between file extensions and Logray
!define LOGWOLF_ASSOC "logwolf-log-file" !define LOGRAY_ASSOC "logray-log-file"
!define FILE_EXTENSION_MARKER "FILE_EXTENSION_MARKER" !define FILE_EXTENSION_MARKER "FILE_EXTENSION_MARKER"
@ -100,8 +100,8 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache'
Push ".scap" Push ".scap"
!macroend !macroend
!macro IsLogwolfRunning !macro IsLograyRunning
; See if Logwolf is running ; See if Logray is running
; https://nsis.sourceforge.io/Check_whether_your_application_is_running ; https://nsis.sourceforge.io/Check_whether_your_application_is_running
${Do} ${Do}

View File

@ -1,5 +1,5 @@
; ;
; logwolf.nsi ; logray.nsi
; ;
; Set the compression mechanism first. ; Set the compression mechanism first.
@ -10,7 +10,7 @@
SetCompressor /SOLID lzma SetCompressor /SOLID lzma
SetCompressorDictSize 64 ; MB SetCompressorDictSize 64 ; MB
!include "logwolf-common.nsh" !include "logray-common.nsh"
!include 'LogicLib.nsh' !include 'LogicLib.nsh'
!include "StrFunc.nsh" !include "StrFunc.nsh"
!include "WordFunc.nsh" !include "WordFunc.nsh"
@ -54,7 +54,7 @@ Icon "${TOP_SRC_DIR}\resources\icons\wiresharkinst.ico"
;!addplugindir ".\Plugins" ;!addplugindir ".\Plugins"
!define MUI_ICON "${TOP_SRC_DIR}\resources\icons\wiresharkinst.ico" !define MUI_ICON "${TOP_SRC_DIR}\resources\icons\wiresharkinst.ico"
BrandingText "Logwolf${U+00ae} Installer" BrandingText "Logray${U+00ae} Installer"
!define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_COMPONENTSPAGE_SMALLDESC
!define MUI_FINISHPAGE_NOAUTOCLOSE !define MUI_FINISHPAGE_NOAUTOCLOSE
@ -69,7 +69,7 @@ BrandingText "Logwolf${U+00ae} Installer"
!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt" !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt"
!define MUI_FINISHPAGE_SHOWREADME_TEXT "Show News" !define MUI_FINISHPAGE_SHOWREADME_TEXT "Show News"
!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
; NSIS runs as Administrator and will run Logwolf as Administrator ; NSIS runs as Administrator and will run Logray as Administrator
; if these are enabled. ; if these are enabled.
;!define MUI_FINISHPAGE_RUN "$INSTDIR\${PROGRAM_NAME_PATH}" ;!define MUI_FINISHPAGE_RUN "$INSTDIR\${PROGRAM_NAME_PATH}"
;!define MUI_FINISHPAGE_RUN_NOTCHECKED ;!define MUI_FINISHPAGE_RUN_NOTCHECKED
@ -80,7 +80,7 @@ BrandingText "Logwolf${U+00ae} Installer"
!insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_WELCOME
!define MUI_LICENSEPAGE_TEXT_TOP "Logwolf is distributed under the GNU General Public License." !define MUI_LICENSEPAGE_TEXT_TOP "Logray is distributed under the GNU General Public License."
!define MUI_LICENSEPAGE_TEXT_BOTTOM "This is not an end user license agreement (EULA). It is provided here for informational purposes only." !define MUI_LICENSEPAGE_TEXT_BOTTOM "This is not an end user license agreement (EULA). It is provided here for informational purposes only."
!define MUI_LICENSEPAGE_BUTTON "Noted" !define MUI_LICENSEPAGE_BUTTON "Noted"
!insertmacro MUI_PAGE_LICENSE "${STAGING_DIR}\COPYING.txt" !insertmacro MUI_PAGE_LICENSE "${STAGING_DIR}\COPYING.txt"
@ -115,7 +115,7 @@ Page custom DisplayAdditionalTasksPage LeaveAdditionalTasksPage
; https://nsis.sourceforge.io/Docs/Modern%20UI%202/Readme.html ; https://nsis.sourceforge.io/Docs/Modern%20UI%202/Readme.html
; https://nsis.sourceforge.io/Docs/nsDialogs/Readme.html ; https://nsis.sourceforge.io/Docs/nsDialogs/Readme.html
!ifdef QT_DIR !ifdef QT_DIR
!include "logwolf-additional-tasks.nsdinc" !include "logray-additional-tasks.nsdinc"
!endif !endif
; ============================================================================ ; ============================================================================
@ -225,7 +225,7 @@ Function Associate
Associate.doRegister: Associate.doRegister:
;The extension is not associated to any program, we can do the link ;The extension is not associated to any program, we can do the link
WriteRegStr HKCR $EXTENSION "" ${LOGWOLF_ASSOC} WriteRegStr HKCR $EXTENSION "" ${LOGRAY_ASSOC}
DetailPrint "Registered file type: $EXTENSION" DetailPrint "Registered file type: $EXTENSION"
Associate.end: Associate.end:
@ -266,7 +266,7 @@ Function .onInit
!if ${WIRESHARK_TARGET_PLATFORM} == "win64" !if ${WIRESHARK_TARGET_PLATFORM} == "win64"
; http://forums.winamp.com/printthread.php?s=16ffcdd04a8c8d52bee90c0cae273ac5&threadid=262873 ; http://forums.winamp.com/printthread.php?s=16ffcdd04a8c8d52bee90c0cae273ac5&threadid=262873
${IfNot} ${RunningX64} ${IfNot} ${RunningX64}
MessageBox MB_OK "Logwolf only runs on 64-bit machines." /SD IDOK MessageBox MB_OK "Logray only runs on 64-bit machines." /SD IDOK
Abort Abort
${EndIf} ${EndIf}
!endif !endif
@ -301,7 +301,7 @@ lbl_winversion_unsupported:
Quit Quit
lbl_winversion_supported: lbl_winversion_supported:
!insertmacro IsLogwolfRunning !insertmacro IsLograyRunning
; Default control values. ; Default control values.
StrCpy $START_MENU_STATE ${BST_CHECKED} StrCpy $START_MENU_STATE ${BST_CHECKED}
@ -382,7 +382,7 @@ check_wix:
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$TMP_PRODUCT_GUID" \ "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$TMP_PRODUCT_GUID" \
"DisplayName" "DisplayName"
; MessageBox MB_OK|MB_ICONINFORMATION "Reading HKLM SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$1 DisplayName = $2" ; MessageBox MB_OK|MB_ICONINFORMATION "Reading HKLM SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$1 DisplayName = $2"
; Look for "Logwolf". ; Look for "Logray".
StrCmp $WIX_DISPLAYNAME "${PROGRAM_NAME}" wix_found wix_reg_enum_loop StrCmp $WIX_DISPLAYNAME "${PROGRAM_NAME}" wix_found wix_reg_enum_loop
wix_found: wix_found:
@ -462,7 +462,7 @@ File "${STAGING_DIR}\libwiretap.dll"
File "${STAGING_DIR}\libwireshark.dll" File "${STAGING_DIR}\libwireshark.dll"
File "${STAGING_DIR}\libwsutil.dll" File "${STAGING_DIR}\libwsutil.dll"
!include logwolf-manifest.nsh !include logray-manifest.nsh
File "${STAGING_DIR}\COPYING.txt" File "${STAGING_DIR}\COPYING.txt"
File "${STAGING_DIR}\NEWS.txt" File "${STAGING_DIR}\NEWS.txt"
@ -474,7 +474,7 @@ File "${STAGING_DIR}\wka"
File "${STAGING_DIR}\services" File "${STAGING_DIR}\services"
File "${STAGING_DIR}\pdml2html.xsl" File "${STAGING_DIR}\pdml2html.xsl"
File "${STAGING_DIR}\ws.css" File "${STAGING_DIR}\ws.css"
;File "${STAGING_DIR}\logwolf.html" ;File "${STAGING_DIR}\logray.html"
File "${STAGING_DIR}\wireshark-filter.html" File "${STAGING_DIR}\wireshark-filter.html"
File "${STAGING_DIR}\dumpcap.exe" File "${STAGING_DIR}\dumpcap.exe"
File "${STAGING_DIR}\dumpcap.html" File "${STAGING_DIR}\dumpcap.html"
@ -835,7 +835,7 @@ WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "DisplayName" "${DISPLAY_NAME
WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}" WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}"
WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "HelpLink" "https://ask.wireshark.org/" WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "HelpLink" "https://ask.wireshark.org/"
WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "InstallLocation" "$INSTDIR" WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "InstallLocation" "$INSTDIR"
WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "Publisher" "The Logwolf developer community, https://www.wireshark.org" WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "Publisher" "The Logray developer community, https://www.wireshark.org"
WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "URLInfoAbout" "https://www.wireshark.org" WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "URLInfoAbout" "https://www.wireshark.org"
WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "URLUpdateInfo" "https://www.wireshark.org/download.html" WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "URLUpdateInfo" "https://www.wireshark.org/download.html"
@ -854,9 +854,9 @@ Delete "$SMPROGRAMS\${PROGRAM_NAME}\Wireshark Web Site.lnk"
; Create file extensions if the Associated Tasks page check box ; Create file extensions if the Associated Tasks page check box
; is checked. ; is checked.
${If} $FILE_ASSOCIATE_STATE == ${BST_CHECKED} ${If} $FILE_ASSOCIATE_STATE == ${BST_CHECKED}
WriteRegStr HKCR ${LOGWOLF_ASSOC} "" "Logwolf log file" WriteRegStr HKCR ${LOGRAY_ASSOC} "" "Logray log file"
WriteRegStr HKCR "${LOGWOLF_ASSOC}\Shell\open\command" "" '"$INSTDIR\${PROGRAM_NAME_PATH}" "%1"' WriteRegStr HKCR "${LOGRAY_ASSOC}\Shell\open\command" "" '"$INSTDIR\${PROGRAM_NAME_PATH}" "%1"'
WriteRegStr HKCR "${LOGWOLF_ASSOC}\DefaultIcon" "" '"$INSTDIR\${PROGRAM_NAME_PATH}",1' WriteRegStr HKCR "${LOGRAY_ASSOC}\DefaultIcon" "" '"$INSTDIR\${PROGRAM_NAME_PATH}",1'
; We refresh the icon cache down in -Finally. ; We refresh the icon cache down in -Finally.
Call Associate Call Associate
; If you add something here be sure to sync it with the uninstall section and the ; If you add something here be sure to sync it with the uninstall section and the
@ -866,15 +866,15 @@ ${Endif}
SectionEnd ; "Required" SectionEnd ; "Required"
!ifdef QT_DIR !ifdef QT_DIR
Section "${PROGRAM_NAME}" SecLogwolfQt Section "${PROGRAM_NAME}" SecLograyQt
;------------------------------------------- ;-------------------------------------------
; by default, Logwolf.exe is installed ; by default, Logray.exe is installed
SetOutPath $INSTDIR SetOutPath $INSTDIR
File "${QT_DIR}\${PROGRAM_NAME_PATH}" File "${QT_DIR}\${PROGRAM_NAME_PATH}"
; Write an entry for ShellExecute ; Write an entry for ShellExecute
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${PROGRAM_NAME_PATH}" "" '$INSTDIR\${PROGRAM_NAME_PATH}' WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${PROGRAM_NAME_PATH}" "" '$INSTDIR\${PROGRAM_NAME_PATH}'
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${PROGRAM_NAME_PATH}" "Path" '$INSTDIR' WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${PROGRAM_NAME_PATH}" "Path" '$INSTDIR'
!include logwolf-qt-manifest.nsh !include logray-qt-manifest.nsh
${!defineifexist} TRANSLATIONS_FOLDER "${QT_DIR}\translations" ${!defineifexist} TRANSLATIONS_FOLDER "${QT_DIR}\translations"
SetOutPath $INSTDIR SetOutPath $INSTDIR
@ -898,7 +898,7 @@ ${If} $QUICK_LAUNCH_STATE == ${BST_CHECKED}
CreateShortCut "$QUICKLAUNCH\${PROGRAM_NAME}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH}" "" "$INSTDIR\${PROGRAM_NAME_PATH}" 0 "" "" "${PROGRAM_FULL_NAME}" CreateShortCut "$QUICKLAUNCH\${PROGRAM_NAME}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH}" "" "$INSTDIR\${PROGRAM_NAME_PATH}" 0 "" "" "${PROGRAM_FULL_NAME}"
${Endif} ${Endif}
SectionEnd ; "SecLogwolfQt" SectionEnd ; "SecLograyQt"
!endif !endif
@ -1064,7 +1064,7 @@ SectionEnd
; ============================================================================ ; ============================================================================
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!ifdef QT_DIR !ifdef QT_DIR
!insertmacro MUI_DESCRIPTION_TEXT ${SecLogwolfQt} "The main network protocol analyzer application." !insertmacro MUI_DESCRIPTION_TEXT ${SecLograyQt} "The main network protocol analyzer application."
!endif !endif
!insertmacro MUI_DESCRIPTION_TEXT ${SecTShark} "Text based network protocol analyzer." !insertmacro MUI_DESCRIPTION_TEXT ${SecTShark} "Text based network protocol analyzer."
@ -1113,7 +1113,7 @@ Function InitAdditionalTasksPage
${NSD_SetState} $hCtl_AdditionalTasksPage_AssociateExtensionsCheckBox $FILE_ASSOCIATE_STATE ${NSD_SetState} $hCtl_AdditionalTasksPage_AssociateExtensionsCheckBox $FILE_ASSOCIATE_STATE
StrCpy $QT_SELECTED 0 StrCpy $QT_SELECTED 0
${If} ${SectionIsSelected} ${SecLogwolfQt} ${If} ${SectionIsSelected} ${SecLograyQt}
StrCpy $QT_SELECTED 1 StrCpy $QT_SELECTED 1
${Endif} ${Endif}
EnableWindow $hCtl_AdditionalTasksPage_CreateShortcutsLabel $QT_SELECTED EnableWindow $hCtl_AdditionalTasksPage_CreateShortcutsLabel $QT_SELECTED

View File

@ -1,17 +1,17 @@
; ;
; uninstall-logwolf.nsi ; uninstall-logray.nsi
; ;
; Create an installer that only writes an uninstaller. ; Create an installer that only writes an uninstaller.
; https://nsis.sourceforge.io/Signing_an_Uninstaller ; https://nsis.sourceforge.io/Signing_an_Uninstaller
!include "logwolf-common.nsh" !include "logray-common.nsh"
!include 'LogicLib.nsh' !include 'LogicLib.nsh'
!include x64.nsh !include x64.nsh
!include "StrFunc.nsh" !include "StrFunc.nsh"
SetCompress off SetCompress off
OutFile "${STAGING_DIR}\uninstall_logwolf_installer.exe" OutFile "${STAGING_DIR}\uninstall_logray_installer.exe"
; InstType "un.Default (keep Personal Settings and Npcap)" ; InstType "un.Default (keep Personal Settings and Npcap)"
InstType "un.All (remove all)" InstType "un.All (remove all)"
@ -69,10 +69,10 @@ Function un.Disassociate
Pop $EXTENSION Pop $EXTENSION
${DoUntil} $EXTENSION == ${FILE_EXTENSION_MARKER} ${DoUntil} $EXTENSION == ${FILE_EXTENSION_MARKER}
ReadRegStr $R0 HKCR $EXTENSION "" ReadRegStr $R0 HKCR $EXTENSION ""
StrCmp $R0 ${LOGWOLF_ASSOC} un.Disassociate.doDeregister StrCmp $R0 ${LOGRAY_ASSOC} un.Disassociate.doDeregister
Goto un.Disassociate.end Goto un.Disassociate.end
un.Disassociate.doDeregister: un.Disassociate.doDeregister:
; The extension is associated with Logwolf so, we must destroy this! ; The extension is associated with Logray so, we must destroy this!
DeleteRegKey HKCR $EXTENSION DeleteRegKey HKCR $EXTENSION
DetailPrint "Deregistered file type: $EXTENSION" DetailPrint "Deregistered file type: $EXTENSION"
un.Disassociate.end: un.Disassociate.end:
@ -96,7 +96,7 @@ Section "Uninstall" un.SecUinstall
SectionIn 1 2 SectionIn 1 2
SetShellVarContext all SetShellVarContext all
!insertmacro IsLogwolfRunning !insertmacro IsLograyRunning
Push "${EXECUTABLE_MARKER}" Push "${EXECUTABLE_MARKER}"
Push "${PROGRAM_NAME}" Push "${PROGRAM_NAME}"
@ -116,7 +116,7 @@ Push "mmdbresolve"
Pop $EXECUTABLE Pop $EXECUTABLE
${DoUntil} $EXECUTABLE == ${EXECUTABLE_MARKER} ${DoUntil} $EXECUTABLE == ${EXECUTABLE_MARKER}
; IsLogwolfRunning should make sure everything is closed down so we *shouldn't* run ; IsLograyRunning should make sure everything is closed down so we *shouldn't* run
; into any problems here. ; into any problems here.
Delete "$INSTDIR\$EXECUTABLE.exe" Delete "$INSTDIR\$EXECUTABLE.exe"
IfErrors 0 deletionSuccess IfErrors 0 deletionSuccess
@ -135,9 +135,9 @@ DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App P
Call un.Disassociate Call un.Disassociate
DeleteRegKey HKCR ${LOGWOLF_ASSOC} DeleteRegKey HKCR ${LOGRAY_ASSOC}
DeleteRegKey HKCR "${LOGWOLF_ASSOC}\Shell\open\command" DeleteRegKey HKCR "${LOGRAY_ASSOC}\Shell\open\command"
DeleteRegKey HKCR "${LOGWOLF_ASSOC}\DefaultIcon" DeleteRegKey HKCR "${LOGRAY_ASSOC}\DefaultIcon"
Delete "$INSTDIR\*.dll" Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\*.exe" Delete "$INSTDIR\*.exe"

View File

@ -38,7 +38,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SRC} ${DISSECTOR_SRC}
) )
add_logwolf_plugin_library(falco-bridge epan) add_logray_plugin_library(falco-bridge epan)
# XXX Hacks; need to fix in falcosecurity-libs. # XXX Hacks; need to fix in falcosecurity-libs.
target_compile_definitions(falco-bridge PRIVATE target_compile_definitions(falco-bridge PRIVATE

View File

@ -3,7 +3,7 @@
<assemblyIdentity <assemblyIdentity
version="@LOG_PROJECT_VERSION_MAJOR@.@LOG_PROJECT_VERSION_MINOR@.@LOG_PROJECT_VERSION_MICRO@.0" version="@LOG_PROJECT_VERSION_MAJOR@.@LOG_PROJECT_VERSION_MINOR@.@LOG_PROJECT_VERSION_MICRO@.0"
processorArchitecture="@WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE@" processorArchitecture="@WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE@"
name="WiresharkDevelopmentTeam.Logwolf" name="WiresharkDevelopmentTeam.Logray"
type="win32" type="win32"
/> />
<description>A wonderful log analyzer</description> <description>A wonderful log analyzer</description>

View File

@ -1,8 +1,8 @@
#include "winver.h" #include "winver.h"
#pragma code_page(65001) #pragma code_page(65001)
LOGWOLF_ICON1 ICON "@ICON_PATH@wireshark.ico" LOGRAY_ICON1 ICON "@ICON_PATH@wireshark.ico"
LOGWOLF_ICON2 ICON "@ICON_PATH@wiresharkdoc.ico" LOGRAY_ICON2 ICON "@ICON_PATH@wiresharkdoc.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION @LOG_RC_VERSION@ FILEVERSION @LOG_RC_VERSION@
@ -22,12 +22,12 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "The Wireshark developer community, https://www.wireshark.org/\0" VALUE "CompanyName", "The Wireshark developer community, https://www.wireshark.org/\0"
VALUE "FileDescription", "Logwolf\0" VALUE "FileDescription", "Logray\0"
VALUE "FileVersion", "@LOG_PROJECT_VERSION@\0" VALUE "FileVersion", "@LOG_PROJECT_VERSION@\0"
VALUE "InternalName", "Logwolf @LOG_PROJECT_VERSION@\0" VALUE "InternalName", "Logray @LOG_PROJECT_VERSION@\0"
VALUE "LegalCopyright", "Copyright © 2022 Loris Degioanni <loris@sysdig.com>, Gerald Combs <gerald@wireshark.org> and others\0" VALUE "LegalCopyright", "Copyright © 2022 Loris Degioanni <loris@sysdig.com>, Gerald Combs <gerald@wireshark.org> and others\0"
VALUE "OriginalFilename", "Logwolf.exe\0" VALUE "OriginalFilename", "Logray.exe\0"
VALUE "ProductName", "Logwolf\0" VALUE "ProductName", "Logray\0"
VALUE "ProductVersion", "@LOG_PROJECT_VERSION@\0" VALUE "ProductVersion", "@LOG_PROJECT_VERSION@\0"
END END
END END
@ -40,4 +40,4 @@ END
#define MANIFEST_RESOURCE_ID 1 #define MANIFEST_RESOURCE_ID 1
#define RT_MANIFEST 24 #define RT_MANIFEST 24
MANIFEST_RESOURCE_ID RT_MANIFEST "logwolf.exe.manifest" MANIFEST_RESOURCE_ID RT_MANIFEST "logray.exe.manifest"

View File

@ -1,4 +1,4 @@
# This file was created by Logwolf. Edit with care. # This file was created by Logray. Edit with care.
@Errors@ct.error@[4626,10023,11822][63479,34695,34695] @Errors@ct.error@[4626,10023,11822][63479,34695,34695]
@State Modifying Event@ct.readonly == "false"@[61423,50372,39578][0,0,0] @State Modifying Event@ct.readonly == "false"@[61423,50372,39578][0,0,0]
@Administrative Activity@cloudtrail and not (ct.name ~ "^Describe.*" or ct.name ~ "^List.*" or ct.name ~ "^(Batch|)Get.*")@[61423,50372,39578][0,0,0] @Administrative Activity@cloudtrail and not (ct.name ~ "^Describe.*" or ct.name ~ "^List.*" or ct.name ~ "^(Batch|)Get.*")@[61423,50372,39578][0,0,0]

View File

@ -3563,11 +3563,11 @@ echo
echo "mkdir build; cd build" echo "mkdir build; cd build"
if [ ! -z "$NINJA_VERSION" ]; then if [ ! -z "$NINJA_VERSION" ]; then
echo "cmake -G Ninja .." echo "cmake -G Ninja .."
echo "ninja wireshark_app_bundle logwolf_app_bundle # (Modify as needed)" echo "ninja wireshark_app_bundle logray_app_bundle # (Modify as needed)"
echo "ninja install/strip" echo "ninja install/strip"
else else
echo "cmake .." echo "cmake .."
echo "make $MAKE_BUILD_OPTS wireshark_app_bundle logwolf_app_bundle # (Modify as needed)" echo "make $MAKE_BUILD_OPTS wireshark_app_bundle logray_app_bundle # (Modify as needed)"
echo "make install/strip" echo "make install/strip"
fi fi
echo echo

View File

@ -56,20 +56,20 @@ set(WIRESHARK_WIDGET_HEADERS
../qt/widgets/wireshark_file_dialog.h ../qt/widgets/wireshark_file_dialog.h
) )
set (LOGWOLF_WIDGET_HEADERS ${WIRESHARK_WIDGET_HEADERS}) set (LOGRAY_WIDGET_HEADERS ${WIRESHARK_WIDGET_HEADERS})
set(WIRESHARK_3RD_PARTY_WIDGET_HEADERS set(WIRESHARK_3RD_PARTY_WIDGET_HEADERS
../qt/widgets/qcustomplot.h ../qt/widgets/qcustomplot.h
) )
set (LOGWOLF_3RD_PARTY_WIDGET_HEADERS ${WIRESHARK_3RD_PARTY_WIDGET_HEADERS}) set (LOGRAY_3RD_PARTY_WIDGET_HEADERS ${WIRESHARK_3RD_PARTY_WIDGET_HEADERS})
set(WIRESHARK_MANAGER_HEADERS set(WIRESHARK_MANAGER_HEADERS
../qt/manager/preference_manager.h ../qt/manager/preference_manager.h
../qt/manager/wireshark_preference.h ../qt/manager/wireshark_preference.h
) )
set (LOGWOLF_MANAGER_HEADERS ${WIRESHARK_MANAGER_HEADERS}) set (LOGRAY_MANAGER_HEADERS ${WIRESHARK_MANAGER_HEADERS})
set(WIRESHARK_UTILS_HEADERS set(WIRESHARK_UTILS_HEADERS
../qt/utils/color_utils.h ../qt/utils/color_utils.h
@ -86,7 +86,7 @@ set(WIRESHARK_UTILS_HEADERS
../qt/utils/wireshark_zip_helper.h ../qt/utils/wireshark_zip_helper.h
) )
set (LOGWOLF_UTILS_HEADERS ${WIRESHARK_UTILS_HEADERS}) set (LOGRAY_UTILS_HEADERS ${WIRESHARK_UTILS_HEADERS})
set(WIRESHARK_MODEL_HEADERS set(WIRESHARK_MODEL_HEADERS
../qt/models/astringlist_list_model.h ../qt/models/astringlist_list_model.h
@ -128,7 +128,7 @@ set(WIRESHARK_MODEL_HEADERS
../qt/models/url_link_delegate.h ../qt/models/url_link_delegate.h
) )
set (LOGWOLF_MODEL_HEADERS ${WIRESHARK_MODEL_HEADERS}) set (LOGRAY_MODEL_HEADERS ${WIRESHARK_MODEL_HEADERS})
# All .h files which inherit from QObject aka which use the Q_OBJECT macro # All .h files which inherit from QObject aka which use the Q_OBJECT macro
# need to go here. # need to go here.
@ -237,9 +237,9 @@ if(ENABLE_PCAP)
endif() endif()
endif() endif()
set (LOGWOLF_QT_HEADERS set (LOGRAY_QT_HEADERS
logwolf_application.h logray_application.h
logwolf_main_window.h logray_main_window.h
${WIRESHARK_QT_HEADERS} ${WIRESHARK_QT_HEADERS}
) )
@ -284,20 +284,20 @@ set(WIRESHARK_WIDGET_SRCS
../qt/widgets/wireshark_file_dialog.cpp ../qt/widgets/wireshark_file_dialog.cpp
) )
set (LOGWOLF_WIDGET_SRCS ${WIRESHARK_WIDGET_SRCS}) set (LOGRAY_WIDGET_SRCS ${WIRESHARK_WIDGET_SRCS})
set(WIRESHARK_3RD_PARTY_WIDGET_SRCS set(WIRESHARK_3RD_PARTY_WIDGET_SRCS
../qt/widgets/qcustomplot.cpp ../qt/widgets/qcustomplot.cpp
) )
set (LOGWOLF_3RD_PARTY_WIDGET_SRCS ${WIRESHARK_3RD_PARTY_WIDGET_SRCS}) set (LOGRAY_3RD_PARTY_WIDGET_SRCS ${WIRESHARK_3RD_PARTY_WIDGET_SRCS})
set(WIRESHARK_MANAGER_SRCS set(WIRESHARK_MANAGER_SRCS
../qt/manager/preference_manager.cpp ../qt/manager/preference_manager.cpp
../qt/manager/wireshark_preference.cpp ../qt/manager/wireshark_preference.cpp
) )
set (LOGWOLF_MANAGER_SRCS ${WIRESHARK_MANAGER_SRCS}) set (LOGRAY_MANAGER_SRCS ${WIRESHARK_MANAGER_SRCS})
set(WIRESHARK_UTILS_SRCS set(WIRESHARK_UTILS_SRCS
../qt/utils/color_utils.cpp ../qt/utils/color_utils.cpp
@ -311,7 +311,7 @@ set(WIRESHARK_UTILS_SRCS
../qt/utils/wireshark_zip_helper.cpp ../qt/utils/wireshark_zip_helper.cpp
) )
set (LOGWOLF_UTILS_SRCS ${WIRESHARK_UTILS_SRCS}) set (LOGRAY_UTILS_SRCS ${WIRESHARK_UTILS_SRCS})
set(WIRESHARK_MODEL_SRCS set(WIRESHARK_MODEL_SRCS
../qt/models/astringlist_list_model.cpp ../qt/models/astringlist_list_model.cpp
@ -352,7 +352,7 @@ set(WIRESHARK_MODEL_SRCS
../qt/models/url_link_delegate.cpp ../qt/models/url_link_delegate.cpp
) )
set (LOGWOLF_MODEL_SRCS ${WIRESHARK_MODEL_SRCS}) set (LOGRAY_MODEL_SRCS ${WIRESHARK_MODEL_SRCS})
set(WIRESHARK_QT_SRC set(WIRESHARK_QT_SRC
../qt/about_dialog.cpp ../qt/about_dialog.cpp
@ -456,11 +456,11 @@ if(ENABLE_PCAP)
endif() endif()
endif() endif()
set (LOGWOLF_QT_SRC set (LOGRAY_QT_SRC
logwolf_application.cpp logray_application.cpp
logwolf_main.cpp logray_main.cpp
logwolf_main_window.cpp logray_main_window.cpp
logwolf_main_window_slots.cpp logray_main_window_slots.cpp
${WIRESHARK_QT_SRC}) ${WIRESHARK_QT_SRC})
set(WIRESHARK_QT_TAP_SRC set(WIRESHARK_QT_TAP_SRC
@ -471,14 +471,14 @@ set(WIRESHARK_QT_TAP_SRC
${WIRESHARK_CUSTOM_TAP_SRC} ${WIRESHARK_CUSTOM_TAP_SRC}
) )
set (LOGWOLF_QT_TAP_SRC ${WIRESHARK_QT_TAP_SRC}) set (LOGRAY_QT_TAP_SRC ${WIRESHARK_QT_TAP_SRC})
set(WIRESHARK_QT_FILES set(WIRESHARK_QT_FILES
${WIRESHARK_QT_SRC} ${WIRESHARK_QT_SRC}
${WIRESHARK_QT_TAP_SRC} ${WIRESHARK_QT_TAP_SRC}
) )
set (LOGWOLF_QT_FILES ${WIRESHARK_QT_FILES}) set (LOGRAY_QT_FILES ${WIRESHARK_QT_FILES})
set(WIRESHARK_QT_UI set(WIRESHARK_QT_UI
../qt/about_dialog.ui ../qt/about_dialog.ui
@ -549,8 +549,8 @@ if(HAVE_PCAP_REMOTE)
) )
endif() endif()
set (LOGWOLF_QT_UI set (LOGRAY_QT_UI
logwolf_main_window.ui logray_main_window.ui
${WIRESHARK_QT_UI} ${WIRESHARK_QT_UI}
) )
@ -569,19 +569,19 @@ set(WIRESHARK_QT_TS
../qt/wireshark_zh_CN.ts ../qt/wireshark_zh_CN.ts
) )
set(LOGWOLF_QT_TS set(LOGRAY_QT_TS
logwolf_en.ts logray_en.ts
${WIRESHARK_QT_TS} ${WIRESHARK_QT_TS}
) )
foreach(_file ${LOGWOLF_QT_TS}) foreach(_file ${LOGRAY_QT_TS})
get_filename_component(_qresource ${_file} NAME_WE) get_filename_component(_qresource ${_file} NAME_WE)
set(_qresource_qm "${_qresource}.qm") set(_qresource_qm "${_qresource}.qm")
set(i18n_qresource "${i18n_qresource}\n <file>${_qresource_qm}</file>") set(i18n_qresource "${i18n_qresource}\n <file>${_qresource_qm}</file>")
endforeach() endforeach()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/i18n.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/i18n.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc)
set(LOGWOLF_QT_QRC set(LOGRAY_QT_QRC
../../resources/about.qrc ../../resources/about.qrc
../../resources/languages/languages.qrc ../../resources/languages/languages.qrc
../../resources/layout.qrc ../../resources/layout.qrc
@ -600,75 +600,75 @@ if(NOT Qt${qtver}Widgets_VERSION VERSION_LESS "5.9")
endif() endif()
if (USE_qt6) if (USE_qt6)
QT6_ADD_TRANSLATION(LOGWOLF_QT_QM ${LOGWOLF_QT_TS} OPTIONS -silent) QT6_ADD_TRANSLATION(LOGRAY_QT_QM ${LOGRAY_QT_TS} OPTIONS -silent)
elseif(NOT Qt${qtver}Widgets_VERSION VERSION_LESS "5.11") elseif(NOT Qt${qtver}Widgets_VERSION VERSION_LESS "5.11")
QT5_ADD_TRANSLATION(LOGWOLF_QT_QM ${LOGWOLF_QT_TS} OPTIONS -silent) QT5_ADD_TRANSLATION(LOGRAY_QT_QM ${LOGRAY_QT_TS} OPTIONS -silent)
else() else()
QT5_ADD_TRANSLATION(LOGWOLF_QT_QM ${LOGWOLF_QT_TS}) QT5_ADD_TRANSLATION(LOGRAY_QT_QM ${LOGRAY_QT_TS})
endif() endif()
add_custom_target( add_custom_target(
logwolf_translations logray_translations
DEPENDS DEPENDS
${LOGWOLF_QT_QM} ${LOGRAY_QT_QM}
) )
set_target_properties(logwolf_translations PROPERTIES FOLDER "UI") set_target_properties(logray_translations PROPERTIES FOLDER "UI")
set_source_files_properties( set_source_files_properties(
${LOGWOLF_QT_FILES} ${LOGRAY_QT_FILES}
PROPERTIES PROPERTIES
COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
) )
set_source_files_properties( set_source_files_properties(
logwolf-tap-register.c logray-tap-register.c
PROPERTIES PROPERTIES
SKIP_AUTOGEN ON SKIP_AUTOGEN ON
) )
add_definitions(${QT_DEFINITIONS}) add_definitions(${QT_DEFINITIONS})
register_tap_files(logwolf-tap-register.c register_tap_files(logray-tap-register.c
${LOGWOLF_QT_TAP_SRC} ${LOGRAY_QT_TAP_SRC}
) )
source_group("ui\\UIC Files" FILES ${LOGWOLF_QT_UI}) source_group("ui\\UIC Files" FILES ${LOGRAY_QT_UI})
source_group("ui\\qrc" FILES ${LOGWOLF_QT_QRC}) source_group("ui\\qrc" FILES ${LOGRAY_QT_QRC})
source_group("ui\\Header" FILES ${LOGWOLF_QT_HEADERS}) source_group("ui\\Header" FILES ${LOGRAY_QT_HEADERS})
source_group("ui\\Widget Header" FILES ${LOGWOLF_WIDGET_HEADERS}) source_group("ui\\Widget Header" FILES ${LOGRAY_WIDGET_HEADERS})
source_group("ui\\Widget Source" FILES ${LOGWOLF_WIDGET_SRCS}) source_group("ui\\Widget Source" FILES ${LOGRAY_WIDGET_SRCS})
source_group("ui\\Utils Headers Files" FILES ${LOGWOLF_UTILS_HEADERS}) source_group("ui\\Utils Headers Files" FILES ${LOGRAY_UTILS_HEADERS})
source_group("ui\\Utils Source" FILES ${LOGWOLF_UTILS_SRCS}) source_group("ui\\Utils Source" FILES ${LOGRAY_UTILS_SRCS})
source_group("ui\\Models Headers" FILES ${LOGWOLF_MODEL_HEADERS}) source_group("ui\\Models Headers" FILES ${LOGRAY_MODEL_HEADERS})
source_group("ui\\Models Source" FILES ${LOGWOLF_MODEL_SRCS}) source_group("ui\\Models Source" FILES ${LOGRAY_MODEL_SRCS})
source_group("ui\\Manager Headers" FILES ${LOGWOLF_MANAGER_HEADERS}) source_group("ui\\Manager Headers" FILES ${LOGRAY_MANAGER_HEADERS})
source_group("ui\\Manager Source" FILES ${LOGWOLF_MANAGER_SRCS}) source_group("ui\\Manager Source" FILES ${LOGRAY_MANAGER_SRCS})
add_library(ui_logwolf OBJECT add_library(ui_logray OBJECT
#Included so that Visual Studio can properly put header files in solution #Included so that Visual Studio can properly put header files in solution
${LOGWOLF_QT_HEADERS} ${LOGRAY_QT_HEADERS}
${LOGWOLF_WIDGET_HEADERS} ${LOGRAY_WIDGET_HEADERS}
${LOGWOLF_3RD_PARTY_WIDGET_HEADERS} ${LOGRAY_3RD_PARTY_WIDGET_HEADERS}
${LOGWOLF_MANAGER_HEADERS} ${LOGRAY_MANAGER_HEADERS}
${LOGWOLF_UTILS_HEADERS} ${LOGRAY_UTILS_HEADERS}
${LOGWOLF_MODEL_HEADERS} ${LOGRAY_MODEL_HEADERS}
${LOGWOLF_QT_SRC} ${LOGRAY_QT_SRC}
${LOGWOLF_WIDGET_SRCS} ${LOGRAY_WIDGET_SRCS}
${LOGWOLF_3RD_PARTY_WIDGET_SRCS} ${LOGRAY_3RD_PARTY_WIDGET_SRCS}
${LOGWOLF_MANAGER_SRCS} ${LOGRAY_MANAGER_SRCS}
${LOGWOLF_UTILS_SRCS} ${LOGRAY_UTILS_SRCS}
${LOGWOLF_MODEL_SRCS} ${LOGRAY_MODEL_SRCS}
# For AUTOUIC and AUTORCC. # For AUTOUIC and AUTORCC.
${LOGWOLF_QT_UI} ${LOGRAY_QT_UI}
${LOGWOLF_QT_QRC} ${LOGRAY_QT_QRC}
${LOGWOLF_QT_TAP_SRC} ${LOGRAY_QT_TAP_SRC}
logwolf-tap-register.c logray-tap-register.c
) )
target_include_directories(ui_logwolf target_include_directories(ui_logray
SYSTEM PRIVATE SYSTEM PRIVATE
# Include Qt before anything else, see the comment about # Include Qt before anything else, see the comment about
# QT_INCLUDE_DIRS in the top-level CMakeLists.txt # QT_INCLUDE_DIRS in the top-level CMakeLists.txt
@ -686,45 +686,45 @@ target_include_directories(ui_logwolf
${CMAKE_CURRENT_SOURCE_DIR}/../qt ${CMAKE_CURRENT_SOURCE_DIR}/../qt
) )
target_compile_definitions(ui_logwolf target_compile_definitions(ui_logray
PUBLIC PUBLIC
${QT_COMPILE_DEFINITIONS} ${QT_COMPILE_DEFINITIONS}
) )
set_target_properties(ui_logwolf PROPERTIES set_target_properties(ui_logray PROPERTIES
LINK_FLAGS "${WS_LINK_FLAGS}" LINK_FLAGS "${WS_LINK_FLAGS}"
FOLDER "UI" FOLDER "UI"
AUTOMOC ON AUTOMOC ON
AUTOUIC ON AUTOUIC ON
AUTORCC ON AUTORCC ON
# Ensure .qm files are generated before autogenerating i18n.qrc # Ensure .qm files are generated before autogenerating i18n.qrc
AUTOGEN_TARGET_DEPENDS "${LOGWOLF_QT_QM}" AUTOGEN_TARGET_DEPENDS "${LOGRAY_QT_QM}"
) )
if(MSVC) if(MSVC)
set_target_properties(ui_logwolf PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}") set_target_properties(ui_logray PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}")
endif() endif()
CHECKAPI( CHECKAPI(
NAME NAME
ui-qt-logwolf ui-qt-logray
SWITCHES SWITCHES
--nocheck-shadow --nocheck-shadow
SOURCES SOURCES
# QCustomPlot (LOGWOLF_3RD_PARTY_WIDGET_{HEADERS,SRCS}) uses # QCustomPlot (LOGRAY_3RD_PARTY_WIDGET_{HEADERS,SRCS}) uses
# prohibited APIs. # prohibited APIs.
${LOGWOLF_QT_HEADERS} ${LOGRAY_QT_HEADERS}
${LOGWOLF_WIDGET_HEADERS} ${LOGRAY_WIDGET_HEADERS}
${LOGWOLF_MANAGER_HEADERS} ${LOGRAY_MANAGER_HEADERS}
${LOGWOLF_UTILS_HEADERS} ${LOGRAY_UTILS_HEADERS}
${LOGWOLF_MODEL_HEADERS} ${LOGRAY_MODEL_HEADERS}
${LOGWOLF_QT_SRC} ${LOGRAY_QT_SRC}
${LOGWOLF_WIDGET_SRCS} ${LOGRAY_WIDGET_SRCS}
${LOGWOLF_MANAGER_SRCS} ${LOGRAY_MANAGER_SRCS}
${LOGWOLF_UTILS_SRCS} ${LOGRAY_UTILS_SRCS}
${LOGWOLF_MODEL_SRCS} ${LOGRAY_MODEL_SRCS}
${LOGWOLF_QT_TAP_SRC} ${LOGRAY_QT_TAP_SRC}
) )
# #

View File

@ -1,34 +1,34 @@
/* logwolf_application.cpp /* logray_application.cpp
* *
* Logwolf - Event log analyzer * Logray - Event log analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
* *
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#include "logwolf_application.h" #include "logray_application.h"
#include "extcap.h" #include "extcap.h"
#include "ui/iface_lists.h" #include "ui/iface_lists.h"
#include "ui/ws_ui_util.h" #include "ui/ws_ui_util.h"
LogwolfApplication *lwApp = NULL; LograyApplication *lwApp = NULL;
LogwolfApplication::LogwolfApplication(int &argc, char **argv) : LograyApplication::LograyApplication(int &argc, char **argv) :
MainApplication(argc, argv) MainApplication(argc, argv)
{ {
lwApp = this; lwApp = this;
setApplicationName("Logwolf"); setApplicationName("Logray");
setDesktopFileName(QStringLiteral("org.wireshark.Logwolf")); setDesktopFileName(QStringLiteral("org.wireshark.Logray"));
} }
LogwolfApplication::~LogwolfApplication() LograyApplication::~LograyApplication()
{ {
lwApp = NULL; lwApp = NULL;
} }
void LogwolfApplication::refreshLocalInterfaces() void LograyApplication::refreshLocalInterfaces()
{ {
extcap_clear_interfaces(); extcap_clear_interfaces();

View File

@ -1,14 +1,14 @@
/** @file /** @file
* *
* Logwolf - Event log analyzer * Logray - Event log analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
* *
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef LOGWOLF_APPLICATION_H #ifndef LOGRAY_APPLICATION_H
#define LOGWOLF_APPLICATION_H #define LOGRAY_APPLICATION_H
#include <main_application.h> #include <main_application.h>
@ -16,15 +16,15 @@
// - Remove SequenceDiagram dependency on RTPStreamDialog // - Remove SequenceDiagram dependency on RTPStreamDialog
// - Remove PacketListModel dependency on WirelessTimeline // - Remove PacketListModel dependency on WirelessTimeline
class LogwolfApplication : public MainApplication class LograyApplication : public MainApplication
{ {
public: public:
explicit LogwolfApplication(int &argc, char **argv); explicit LograyApplication(int &argc, char **argv);
~LogwolfApplication(); ~LograyApplication();
void refreshLocalInterfaces() override; void refreshLocalInterfaces() override;
}; };
extern LogwolfApplication *lwApp; extern LograyApplication *lwApp;
#endif // LOGWOLF_APPLICATION_H #endif // LOGRAY_APPLICATION_H

View File

@ -1,6 +1,6 @@
/* logwolf_main.cpp /* logray_main.cpp
* *
* Logwolf - Event log analyzer * Logray - Event log analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
* *
@ -81,11 +81,11 @@
#include "ui/qt/utils/color_utils.h" #include "ui/qt/utils/color_utils.h"
#include "ui/qt/coloring_rules_dialog.h" #include "ui/qt/coloring_rules_dialog.h"
#include "ui/qt/endpoint_dialog.h" #include "ui/qt/endpoint_dialog.h"
#include "ui/logwolf/logwolf_main_window.h" #include "ui/logray/logray_main_window.h"
#include "ui/qt/simple_dialog.h" #include "ui/qt/simple_dialog.h"
#include "ui/qt/simple_statistics_dialog.h" #include "ui/qt/simple_statistics_dialog.h"
#include <ui/qt/widgets/splash_overlay.h> #include <ui/qt/widgets/splash_overlay.h>
#include "ui/logwolf/logwolf_application.h" #include "ui/logray/logray_application.h"
#include "capture/capture-pcap-util.h" #include "capture/capture-pcap-util.h"
@ -118,7 +118,7 @@
/* update the main window */ /* update the main window */
void main_window_update(void) void main_window_update(void)
{ {
LogwolfApplication::processEvents(); LograyApplication::processEvents();
} }
void exit_application(int status) { void exit_application(int status) {
@ -170,12 +170,12 @@ void exit_application(int status) {
*/ */
// xxx copied from ../gtk/main.c // xxx copied from ../gtk/main.c
static void static void
logwolf_cmdarg_err(const char *fmt, va_list ap) logray_cmdarg_err(const char *fmt, va_list ap)
{ {
#ifdef _WIN32 #ifdef _WIN32
create_console(); create_console();
#endif #endif
fprintf(stderr, "logwolf: "); fprintf(stderr, "logray: ");
vfprintf(stderr, fmt, ap); vfprintf(stderr, fmt, ap);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
@ -186,7 +186,7 @@ logwolf_cmdarg_err(const char *fmt, va_list ap)
*/ */
// xxx copied from ../gtk/main.c // xxx copied from ../gtk/main.c
static void static void
logwolf_cmdarg_err_cont(const char *fmt, va_list ap) logray_cmdarg_err_cont(const char *fmt, va_list ap)
{ {
#ifdef _WIN32 #ifdef _WIN32
create_console(); create_console();
@ -406,7 +406,7 @@ macos_enable_layer_backing(void)
/* And now our feature presentation... [ fade to music ] */ /* And now our feature presentation... [ fade to music ] */
int main(int argc, char *qt_argv[]) int main(int argc, char *qt_argv[])
{ {
LogwolfMainWindow *main_w; LograyMainWindow *main_w;
#ifdef _WIN32 #ifdef _WIN32
LPWSTR *wc_argv; LPWSTR *wc_argv;
@ -479,10 +479,10 @@ int main(int argc, char *qt_argv[])
macos_enable_layer_backing(); macos_enable_layer_backing();
#endif #endif
cmdarg_err_init(logwolf_cmdarg_err, logwolf_cmdarg_err_cont); cmdarg_err_init(logray_cmdarg_err, logray_cmdarg_err_cont);
/* Initialize log handler early so we can have proper logging during startup. */ /* Initialize log handler early so we can have proper logging during startup. */
ws_log_init_with_writer("logwolf", console_log_writer, vcmdarg_err); ws_log_init_with_writer("logray", console_log_writer, vcmdarg_err);
/* For backward compatibility with GLib logging and Wireshark 3.4. */ /* For backward compatibility with GLib logging and Wireshark 3.4. */
ws_log_console_writer_set_use_stdout(TRUE); ws_log_console_writer_set_use_stdout(TRUE);
@ -548,7 +548,7 @@ int main(int argc, char *qt_argv[])
* Attempt to get the pathname of the directory containing the * Attempt to get the pathname of the directory containing the
* executable file. * executable file.
*/ */
/* configuration_init_error = */ configuration_init(argv[0], "Logwolf"); /* configuration_init_error = */ configuration_init(argv[0], "Logray");
/* ws_log(NULL, LOG_LEVEL_DEBUG, "progfile_dir: %s", get_progfile_dir()); */ /* ws_log(NULL, LOG_LEVEL_DEBUG, "progfile_dir: %s", get_progfile_dir()); */
#ifdef _WIN32 #ifdef _WIN32
@ -601,7 +601,7 @@ int main(int argc, char *qt_argv[])
#endif /* _WIN32 */ #endif /* _WIN32 */
/* Get the compile-time version information string */ /* Get the compile-time version information string */
ws_init_version_info("Logwolf", gather_wireshark_qt_compiled_info, ws_init_version_info("Logray", gather_wireshark_qt_compiled_info,
gather_wireshark_runtime_info); gather_wireshark_runtime_info);
/* Create the user profiles directory */ /* Create the user profiles directory */
@ -645,7 +645,7 @@ int main(int argc, char *qt_argv[])
#endif #endif
/* Create The Wireshark app */ /* Create The Wireshark app */
LogwolfApplication ls_app(argc, qt_argv); LograyApplication ls_app(argc, qt_argv);
/* initialize the funnel mini-api */ /* initialize the funnel mini-api */
// xxx qtshark // xxx qtshark
@ -685,7 +685,7 @@ int main(int argc, char *qt_argv[])
/* ws_log(LOG_DOMAIN_MAIN, LOG_LEVEL_DEBUG, "Translator %s", language); */ /* ws_log(LOG_DOMAIN_MAIN, LOG_LEVEL_DEBUG, "Translator %s", language); */
// Init the main window (and splash) // Init the main window (and splash)
main_w = new(LogwolfMainWindow); main_w = new(LograyMainWindow);
main_w->show(); main_w->show();
// We may not need a queued connection here but it would seem to make sense // We may not need a queued connection here but it would seem to make sense
// to force the issue. // to force the issue.
@ -713,7 +713,7 @@ int main(int argc, char *qt_argv[])
capture_opts_init(&global_capture_opts); capture_opts_init(&global_capture_opts);
#endif #endif
init_report_message("Logwolf", &wireshark_report_routines); init_report_message("Logray", &wireshark_report_routines);
/* /*
* Libwiretap must be initialized before libwireshark is, so that * Libwiretap must be initialized before libwireshark is, so that
@ -889,7 +889,7 @@ int main(int argc, char *qt_argv[])
#endif #endif
prefs_apply_all(); prefs_apply_all();
prefs_to_capture_opts(); prefs_to_capture_opts();
lwApp->emitAppSignal(LogwolfApplication::PreferencesChanged); lwApp->emitAppSignal(LograyApplication::PreferencesChanged);
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
if ((global_capture_opts.num_selected == 0) && if ((global_capture_opts.num_selected == 0) &&
@ -917,8 +917,8 @@ int main(int argc, char *qt_argv[])
} }
build_column_format_array(&CaptureFile::globalCapFile()->cinfo, global_commandline_info.prefs_p->num_cols, TRUE); build_column_format_array(&CaptureFile::globalCapFile()->cinfo, global_commandline_info.prefs_p->num_cols, TRUE);
lwApp->emitAppSignal(LogwolfApplication::ColumnsChanged); // We read "recent" widths above. lwApp->emitAppSignal(LograyApplication::ColumnsChanged); // We read "recent" widths above.
lwApp->emitAppSignal(LogwolfApplication::RecentPreferencesRead); // Must be emitted after PreferencesChanged. lwApp->emitAppSignal(LograyApplication::RecentPreferencesRead); // Must be emitted after PreferencesChanged.
lwApp->setMonospaceFont(prefs.gui_qt_font_name); lwApp->setMonospaceFont(prefs.gui_qt_font_name);
@ -931,7 +931,7 @@ int main(int argc, char *qt_argv[])
} }
lwApp->allSystemsGo(); lwApp->allSystemsGo();
ws_log(LOG_DOMAIN_MAIN, LOG_LEVEL_INFO, "Logwolf is up and ready to go, elapsed time %.3fs", (float) (g_get_monotonic_time() - start_time) / 1000000); ws_log(LOG_DOMAIN_MAIN, LOG_LEVEL_INFO, "Logray is up and ready to go, elapsed time %.3fs", (float) (g_get_monotonic_time() - start_time) / 1000000);
SimpleDialog::displayQueuedMessages(main_w); SimpleDialog::displayQueuedMessages(main_w);
/* User could specify filename, or display filter, or both */ /* User could specify filename, or display filter, or both */
@ -1019,7 +1019,7 @@ int main(int argc, char *qt_argv[])
profile_store_persconffiles(FALSE); profile_store_persconffiles(FALSE);
// If the lwApp->exec() event loop exits cleanly, we call // If the lwApp->exec() event loop exits cleanly, we call
// LogwolfApplication::cleanup(). // LograyApplication::cleanup().
ret_val = lwApp->exec(); ret_val = lwApp->exec();
lwApp = NULL; lwApp = NULL;

View File

@ -1,6 +1,6 @@
/* logwolf_main_window.cpp /* logray_main_window.cpp
* *
* Logwolf - Event log analyzer * Logray - Event log analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
* *
@ -8,14 +8,14 @@
*/ */
#include "main_application.h" #include "main_application.h"
#include "logwolf_main_window.h" #include "logray_main_window.h"
/* /*
* The generated Ui_LogwolfMainWindow::setupUi() can grow larger than our configured limit, * The generated Ui_LograyMainWindow::setupUi() can grow larger than our configured limit,
* so turn off -Wframe-larger-than= for ui_main_window.h. * so turn off -Wframe-larger-than= for ui_main_window.h.
*/ */
DIAG_OFF(frame-larger-than=) DIAG_OFF(frame-larger-than=)
#include <ui_logwolf_main_window.h> #include <ui_logray_main_window.h>
DIAG_ON(frame-larger-than=) DIAG_ON(frame-larger-than=)
#include <epan/addr_resolv.h> #include <epan/addr_resolv.h>
@ -93,7 +93,7 @@ DIAG_ON(frame-larger-than=)
//menu_recent_file_write_all //menu_recent_file_write_all
// If we ever add support for multiple windows this will need to be replaced. // If we ever add support for multiple windows this will need to be replaced.
static LogwolfMainWindow *gbl_cur_main_window_ = NULL; static LograyMainWindow *gbl_cur_main_window_ = NULL;
void pipe_input_set_handler(gint source, gpointer user_data, ws_process_id *child_process, pipe_input_cb_t input_cb) void pipe_input_set_handler(gint source, gpointer user_data, ws_process_id *child_process, pipe_input_cb_t input_cb)
{ {
@ -303,7 +303,7 @@ static void mainwindow_remove_toolbar(const gchar *menu_title)
} }
} }
QMenu* LogwolfMainWindow::findOrAddMenu(QMenu *parent_menu, QString& menu_text) { QMenu* LograyMainWindow::findOrAddMenu(QMenu *parent_menu, QString& menu_text) {
QList<QAction *> actions = parent_menu->actions(); QList<QAction *> actions = parent_menu->actions();
QList<QAction *>::const_iterator i; QList<QAction *>::const_iterator i;
for (i = actions.constBegin(); i != actions.constEnd(); ++i) { for (i = actions.constBegin(); i != actions.constEnd(); ++i) {
@ -315,9 +315,9 @@ QMenu* LogwolfMainWindow::findOrAddMenu(QMenu *parent_menu, QString& menu_text)
return parent_menu->addMenu(menu_text); return parent_menu->addMenu(menu_text);
} }
LogwolfMainWindow::LogwolfMainWindow(QWidget *parent) : LograyMainWindow::LograyMainWindow(QWidget *parent) :
MainWindow(parent), MainWindow(parent),
main_ui_(new Ui::LogwolfMainWindow), main_ui_(new Ui::LograyMainWindow),
previous_focus_(NULL), previous_focus_(NULL),
file_set_dialog_(NULL), file_set_dialog_(NULL),
show_hide_actions_(NULL), show_hide_actions_(NULL),
@ -419,7 +419,7 @@ LogwolfMainWindow::LogwolfMainWindow(QWidget *parent) :
funnel_statistics_ = new FunnelStatistics(this, capture_file_); funnel_statistics_ = new FunnelStatistics(this, capture_file_);
connect(df_combo_box_, &QComboBox::editTextChanged, funnel_statistics_, &FunnelStatistics::displayFilterTextChanged); connect(df_combo_box_, &QComboBox::editTextChanged, funnel_statistics_, &FunnelStatistics::displayFilterTextChanged);
connect(funnel_statistics_, &FunnelStatistics::setDisplayFilter, this, &LogwolfMainWindow::setDisplayFilter); connect(funnel_statistics_, &FunnelStatistics::setDisplayFilter, this, &LograyMainWindow::setDisplayFilter);
connect(funnel_statistics_, SIGNAL(openCaptureFile(QString, QString)), connect(funnel_statistics_, SIGNAL(openCaptureFile(QString, QString)),
this, SLOT(openCaptureFile(QString, QString))); this, SLOT(openCaptureFile(QString, QString)));
@ -435,9 +435,9 @@ LogwolfMainWindow::LogwolfMainWindow(QWidget *parent) :
// larger toolbar. We do this by adding them to a child toolbar. // larger toolbar. We do this by adding them to a child toolbar.
// https://bugreports.qt.io/browse/QTBUG-2472 // https://bugreports.qt.io/browse/QTBUG-2472
FilterExpressionToolBar *filter_expression_toolbar_ = new FilterExpressionToolBar(this); FilterExpressionToolBar *filter_expression_toolbar_ = new FilterExpressionToolBar(this);
connect(filter_expression_toolbar_, &FilterExpressionToolBar::filterPreferences, this, &LogwolfMainWindow::onFilterPreferences); connect(filter_expression_toolbar_, &FilterExpressionToolBar::filterPreferences, this, &LograyMainWindow::onFilterPreferences);
connect(filter_expression_toolbar_, &FilterExpressionToolBar::filterSelected, this, &LogwolfMainWindow::onFilterSelected); connect(filter_expression_toolbar_, &FilterExpressionToolBar::filterSelected, this, &LograyMainWindow::onFilterSelected);
connect(filter_expression_toolbar_, &FilterExpressionToolBar::filterEdit, this, &LogwolfMainWindow::onFilterEdit); connect(filter_expression_toolbar_, &FilterExpressionToolBar::filterEdit, this, &LograyMainWindow::onFilterEdit);
main_ui_->displayFilterToolBar->addWidget(filter_expression_toolbar_); main_ui_->displayFilterToolBar->addWidget(filter_expression_toolbar_);
@ -519,18 +519,18 @@ main_ui_->goToLineEdit->setValidator(goToLineQiv);
main_status_bar_ = main_ui_->statusBar; main_status_bar_ = main_ui_->statusBar;
connect(proto_tree_, &ProtoTree::fieldSelected, connect(proto_tree_, &ProtoTree::fieldSelected,
this, &LogwolfMainWindow::fieldSelected); this, &LograyMainWindow::fieldSelected);
connect(packet_list_, &PacketList::fieldSelected, connect(packet_list_, &PacketList::fieldSelected,
this, &LogwolfMainWindow::fieldSelected); this, &LograyMainWindow::fieldSelected);
connect(this, &LogwolfMainWindow::fieldSelected, connect(this, &LograyMainWindow::fieldSelected,
this, &LogwolfMainWindow::setMenusForSelectedTreeRow); this, &LograyMainWindow::setMenusForSelectedTreeRow);
connect(this, &LogwolfMainWindow::fieldSelected, connect(this, &LograyMainWindow::fieldSelected,
main_ui_->statusBar, &MainStatusBar::selectedFieldChanged); main_ui_->statusBar, &MainStatusBar::selectedFieldChanged);
connect(this, &LogwolfMainWindow::fieldHighlight, connect(this, &LograyMainWindow::fieldHighlight,
main_ui_->statusBar, &MainStatusBar::highlightedFieldChanged); main_ui_->statusBar, &MainStatusBar::highlightedFieldChanged);
connect(mainApp, &WiresharkApplication::captureActive, connect(mainApp, &WiresharkApplication::captureActive,
this, &LogwolfMainWindow::captureActive); this, &LograyMainWindow::captureActive);
byte_view_tab_ = new ByteViewTab(&master_split_); byte_view_tab_ = new ByteViewTab(&master_split_);
@ -583,24 +583,24 @@ main_ui_->goToLineEdit->setValidator(goToLineQiv);
this, SLOT(openCaptureFile(QString))); this, SLOT(openCaptureFile(QString)));
connect(main_ui_->addressEditorFrame, &AddressEditorFrame::redissectPackets, connect(main_ui_->addressEditorFrame, &AddressEditorFrame::redissectPackets,
this, &LogwolfMainWindow::redissectPackets); this, &LograyMainWindow::redissectPackets);
connect(main_ui_->addressEditorFrame, &AddressEditorFrame::showNameResolutionPreferences, connect(main_ui_->addressEditorFrame, &AddressEditorFrame::showNameResolutionPreferences,
this, &LogwolfMainWindow::showPreferencesDialog); this, &LograyMainWindow::showPreferencesDialog);
connect(main_ui_->preferenceEditorFrame, &PreferenceEditorFrame::showProtocolPreferences, connect(main_ui_->preferenceEditorFrame, &PreferenceEditorFrame::showProtocolPreferences,
this, &LogwolfMainWindow::showPreferencesDialog); this, &LograyMainWindow::showPreferencesDialog);
connect(main_ui_->filterExpressionFrame, &FilterExpressionFrame::showPreferencesDialog, connect(main_ui_->filterExpressionFrame, &FilterExpressionFrame::showPreferencesDialog,
this, &LogwolfMainWindow::showPreferencesDialog); this, &LograyMainWindow::showPreferencesDialog);
connect(main_ui_->filterExpressionFrame, &FilterExpressionFrame::filterExpressionsChanged, connect(main_ui_->filterExpressionFrame, &FilterExpressionFrame::filterExpressionsChanged,
filter_expression_toolbar_, &FilterExpressionToolBar::filterExpressionsChanged); filter_expression_toolbar_, &FilterExpressionToolBar::filterExpressionsChanged);
/* Connect change of capture file */ /* Connect change of capture file */
connect(this, &LogwolfMainWindow::setCaptureFile, connect(this, &LograyMainWindow::setCaptureFile,
main_ui_->searchFrame, &SearchFrame::setCaptureFile); main_ui_->searchFrame, &SearchFrame::setCaptureFile);
connect(this, &LogwolfMainWindow::setCaptureFile, connect(this, &LograyMainWindow::setCaptureFile,
main_ui_->statusBar, &MainStatusBar::setCaptureFile); main_ui_->statusBar, &MainStatusBar::setCaptureFile);
connect(this, &LogwolfMainWindow::setCaptureFile, connect(this, &LograyMainWindow::setCaptureFile,
packet_list_, &PacketList::setCaptureFile); packet_list_, &PacketList::setCaptureFile);
connect(this, &LogwolfMainWindow::setCaptureFile, connect(this, &LograyMainWindow::setCaptureFile,
proto_tree_, &ProtoTree::setCaptureFile); proto_tree_, &ProtoTree::setCaptureFile);
connect(mainApp, SIGNAL(zoomMonospaceFont(QFont)), connect(mainApp, SIGNAL(zoomMonospaceFont(QFont)),
@ -663,9 +663,9 @@ main_ui_->goToLineEdit->setValidator(goToLineQiv);
this, SLOT(on_actionStatisticsCaptureFileProperties_triggered())); this, SLOT(on_actionStatisticsCaptureFileProperties_triggered()));
connect(main_ui_->menuApplyAsFilter, &QMenu::aboutToShow, connect(main_ui_->menuApplyAsFilter, &QMenu::aboutToShow,
this, &LogwolfMainWindow::filterMenuAboutToShow); this, &LograyMainWindow::filterMenuAboutToShow);
connect(main_ui_->menuPrepareAFilter, &QMenu::aboutToShow, connect(main_ui_->menuPrepareAFilter, &QMenu::aboutToShow,
this, &LogwolfMainWindow::filterMenuAboutToShow); this, &LograyMainWindow::filterMenuAboutToShow);
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
QTreeWidget *iface_tree = findChild<QTreeWidget *>("interfaceTree"); QTreeWidget *iface_tree = findChild<QTreeWidget *>("interfaceTree");
@ -721,7 +721,7 @@ main_ui_->goToLineEdit->setValidator(goToLineQiv);
showWelcome(); showWelcome();
} }
LogwolfMainWindow::~LogwolfMainWindow() LograyMainWindow::~LograyMainWindow()
{ {
disconnect(main_ui_->mainStack, 0, 0, 0); disconnect(main_ui_->mainStack, 0, 0, 0);
@ -742,7 +742,7 @@ LogwolfMainWindow::~LogwolfMainWindow()
delete main_ui_; delete main_ui_;
} }
QMenu *LogwolfMainWindow::createPopupMenu() QMenu *LograyMainWindow::createPopupMenu()
{ {
QMenu *menu = new QMenu(); QMenu *menu = new QMenu();
menu->addAction(main_ui_->actionViewMainToolbar); menu->addAction(main_ui_->actionViewMainToolbar);
@ -772,7 +772,7 @@ QMenu *LogwolfMainWindow::createPopupMenu()
return menu; return menu;
} }
void LogwolfMainWindow::addInterfaceToolbar(const iface_toolbar *toolbar_entry) void LograyMainWindow::addInterfaceToolbar(const iface_toolbar *toolbar_entry)
{ {
QMenu *menu = main_ui_->menuInterfaceToolbars; QMenu *menu = main_ui_->menuInterfaceToolbars;
bool visible = g_list_find_custom(recent.interface_toolbars, toolbar_entry->menu_title, (GCompareFunc)strcmp) ? true : false; bool visible = g_list_find_custom(recent.interface_toolbars, toolbar_entry->menu_title, (GCompareFunc)strcmp) ? true : false;
@ -815,7 +815,7 @@ void LogwolfMainWindow::addInterfaceToolbar(const iface_toolbar *toolbar_entry)
menu->menuAction()->setVisible(true); menu->menuAction()->setVisible(true);
} }
void LogwolfMainWindow::removeInterfaceToolbar(const gchar *menu_title) void LograyMainWindow::removeInterfaceToolbar(const gchar *menu_title)
{ {
QMenu *menu = main_ui_->menuInterfaceToolbars; QMenu *menu = main_ui_->menuInterfaceToolbars;
QAction *action = NULL; QAction *action = NULL;
@ -844,7 +844,7 @@ void LogwolfMainWindow::removeInterfaceToolbar(const gchar *menu_title)
menu->menuAction()->setVisible(!menu->actions().isEmpty()); menu->menuAction()->setVisible(!menu->actions().isEmpty());
} }
void LogwolfMainWindow::setPipeInputHandler(gint source, gpointer user_data, ws_process_id *child_process, pipe_input_cb_t input_cb) void LograyMainWindow::setPipeInputHandler(gint source, gpointer user_data, ws_process_id *child_process, pipe_input_cb_t input_cb)
{ {
pipe_source_ = source; pipe_source_ = source;
pipe_child_process_ = child_process; pipe_child_process_ = child_process;
@ -881,7 +881,7 @@ void LogwolfMainWindow::setPipeInputHandler(gint source, gpointer user_data, ws_
#endif #endif
} }
bool LogwolfMainWindow::eventFilter(QObject *obj, QEvent *event) { bool LograyMainWindow::eventFilter(QObject *obj, QEvent *event) {
// The user typed some text. Start filling in a filter. // The user typed some text. Start filling in a filter.
// We may need to be more choosy here. We just need to catch events for the packet list, // We may need to be more choosy here. We just need to catch events for the packet list,
@ -899,7 +899,7 @@ bool LogwolfMainWindow::eventFilter(QObject *obj, QEvent *event) {
return QMainWindow::eventFilter(obj, event); return QMainWindow::eventFilter(obj, event);
} }
bool LogwolfMainWindow::event(QEvent *event) bool LograyMainWindow::event(QEvent *event)
{ {
switch (event->type()) { switch (event->type()) {
case QEvent::ApplicationPaletteChange: case QEvent::ApplicationPaletteChange:
@ -912,7 +912,7 @@ bool LogwolfMainWindow::event(QEvent *event)
return QMainWindow::event(event); return QMainWindow::event(event);
} }
void LogwolfMainWindow::keyPressEvent(QKeyEvent *event) { void LograyMainWindow::keyPressEvent(QKeyEvent *event) {
// Explicitly focus on the display filter combo. // Explicitly focus on the display filter combo.
if (event->modifiers() & Qt::ControlModifier && event->key() == Qt::Key_Slash) { if (event->modifiers() & Qt::ControlModifier && event->key() == Qt::Key_Slash) {
@ -942,7 +942,7 @@ void LogwolfMainWindow::keyPressEvent(QKeyEvent *event) {
QMainWindow::keyPressEvent(event); QMainWindow::keyPressEvent(event);
} }
void LogwolfMainWindow::closeEvent(QCloseEvent *event) { void LograyMainWindow::closeEvent(QCloseEvent *event) {
saveWindowGeometry(); saveWindowGeometry();
/* If we're in the middle of stopping a capture, don't do anything; /* If we're in the middle of stopping a capture, don't do anything;
@ -983,7 +983,7 @@ void LogwolfMainWindow::closeEvent(QCloseEvent *event) {
// XXX On windows the drag description is "Copy". It should be "Open" or // XXX On windows the drag description is "Copy". It should be "Open" or
// "Merge" as appropriate. It looks like we need access to IDataObject in // "Merge" as appropriate. It looks like we need access to IDataObject in
// order to set DROPDESCRIPTION. // order to set DROPDESCRIPTION.
void LogwolfMainWindow::dragEnterEvent(QDragEnterEvent *event) void LograyMainWindow::dragEnterEvent(QDragEnterEvent *event)
{ {
if (!event->mimeData()->hasUrls()) if (!event->mimeData()->hasUrls())
{ {
@ -1014,7 +1014,7 @@ void LogwolfMainWindow::dragEnterEvent(QDragEnterEvent *event)
} }
} }
void LogwolfMainWindow::dropEvent(QDropEvent *event) void LograyMainWindow::dropEvent(QDropEvent *event)
{ {
if (!event->mimeData()->hasUrls()) if (!event->mimeData()->hasUrls())
{ {
@ -1076,7 +1076,7 @@ void LogwolfMainWindow::dropEvent(QDropEvent *event)
// Note we might end up with unexpected screen geometries if the user // Note we might end up with unexpected screen geometries if the user
// unplugs or plugs in a monitor: // unplugs or plugs in a monitor:
// https://bugreports.qt.io/browse/QTBUG-44213 // https://bugreports.qt.io/browse/QTBUG-44213
void LogwolfMainWindow::loadWindowGeometry() void LograyMainWindow::loadWindowGeometry()
{ {
int min_sensible_dimension = 200; int min_sensible_dimension = 200;
@ -1111,7 +1111,7 @@ void LogwolfMainWindow::loadWindowGeometry()
} }
} }
void LogwolfMainWindow::saveWindowGeometry() void LograyMainWindow::saveWindowGeometry()
{ {
if (prefs.gui_geometry_save_position) { if (prefs.gui_geometry_save_position) {
recent.gui_geometry_main_x = pos().x(); recent.gui_geometry_main_x = pos().x();
@ -1147,7 +1147,7 @@ void LogwolfMainWindow::saveWindowGeometry()
// //
// We might want to do this any time the main status bar progress frame is // We might want to do this any time the main status bar progress frame is
// shown and hidden. // shown and hidden.
void LogwolfMainWindow::freeze() void LograyMainWindow::freeze()
{ {
freeze_focus_ = mainApp->focusWidget(); freeze_focus_ = mainApp->focusWidget();
@ -1160,7 +1160,7 @@ void LogwolfMainWindow::freeze()
main_ui_->centralWidget->setEnabled(false); main_ui_->centralWidget->setEnabled(false);
} }
void LogwolfMainWindow::thaw() void LograyMainWindow::thaw()
{ {
main_ui_->centralWidget->setEnabled(true); main_ui_->centralWidget->setEnabled(true);
for (int i = 0; i < freeze_actions_.size(); i++) { for (int i = 0; i < freeze_actions_.size(); i++) {
@ -1171,7 +1171,7 @@ void LogwolfMainWindow::thaw()
freeze_focus_ = NULL; freeze_focus_ = NULL;
} }
void LogwolfMainWindow::mergeCaptureFile() void LograyMainWindow::mergeCaptureFile()
{ {
QString file_name = ""; QString file_name = "";
QString read_filter = ""; QString read_filter = "";
@ -1320,7 +1320,7 @@ void LogwolfMainWindow::mergeCaptureFile()
} }
void LogwolfMainWindow::importCaptureFile() { void LograyMainWindow::importCaptureFile() {
ImportTextDialog import_dlg; ImportTextDialog import_dlg;
QString before_what(tr(" before importing a capture")); QString before_what(tr(" before importing a capture"));
@ -1337,7 +1337,7 @@ void LogwolfMainWindow::importCaptureFile() {
openCaptureFile(import_dlg.capfileName()); openCaptureFile(import_dlg.capfileName());
} }
bool LogwolfMainWindow::saveCaptureFile(capture_file *cf, bool dont_reopen) { bool LograyMainWindow::saveCaptureFile(capture_file *cf, bool dont_reopen) {
QString file_name; QString file_name;
gboolean discard_comments; gboolean discard_comments;
@ -1435,7 +1435,7 @@ bool LogwolfMainWindow::saveCaptureFile(capture_file *cf, bool dont_reopen) {
return true; return true;
} }
bool LogwolfMainWindow::saveAsCaptureFile(capture_file *cf, bool must_support_comments, bool dont_reopen) { bool LograyMainWindow::saveAsCaptureFile(capture_file *cf, bool must_support_comments, bool dont_reopen) {
QString file_name = ""; QString file_name = "";
int file_type; int file_type;
wtap_compression_type compression_type; wtap_compression_type compression_type;
@ -1545,7 +1545,7 @@ bool LogwolfMainWindow::saveAsCaptureFile(capture_file *cf, bool must_support_co
return true; return true;
} }
void LogwolfMainWindow::exportSelectedPackets() { void LograyMainWindow::exportSelectedPackets() {
QString file_name = ""; QString file_name = "";
int file_type; int file_type;
wtap_compression_type compression_type; wtap_compression_type compression_type;
@ -1686,7 +1686,7 @@ cleanup:
packet_range_cleanup(&range); packet_range_cleanup(&range);
} }
void LogwolfMainWindow::exportDissections(export_type_e export_type) { void LograyMainWindow::exportDissections(export_type_e export_type) {
capture_file *cf = capture_file_.capFile(); capture_file *cf = capture_file_.capFile();
g_return_if_fail(cf); g_return_if_fail(cf);
@ -1721,7 +1721,7 @@ void LogwolfMainWindow::exportDissections(export_type_e export_type) {
* if there is a set of extensions used by the file type to be used, * if there is a set of extensions used by the file type to be used,
* the file name has one of those extensions. * the file name has one of those extensions.
*/ */
void LogwolfMainWindow::fileAddExtension(QString &file_name, int file_type, wtap_compression_type compression_type) { void LograyMainWindow::fileAddExtension(QString &file_name, int file_type, wtap_compression_type compression_type) {
QString file_name_lower; QString file_name_lower;
GSList *extensions_list; GSList *extensions_list;
const char *compressed_file_extension; const char *compressed_file_extension;
@ -1807,7 +1807,7 @@ void LogwolfMainWindow::fileAddExtension(QString &file_name, int file_type, wtap
} }
#endif // Q_OS_WIN #endif // Q_OS_WIN
bool LogwolfMainWindow::testCaptureFileClose(QString before_what, FileCloseContext context) { bool LograyMainWindow::testCaptureFileClose(QString before_what, FileCloseContext context) {
bool capture_in_progress = false; bool capture_in_progress = false;
bool do_close_file = false; bool do_close_file = false;
@ -2020,7 +2020,7 @@ bool LogwolfMainWindow::testCaptureFileClose(QString before_what, FileCloseConte
return true; /* File closed */ return true; /* File closed */
} }
void LogwolfMainWindow::captureStop() { void LograyMainWindow::captureStop() {
stopCapture(); stopCapture();
while (capture_file_.capFile() && capture_file_.capFile()->state == FILE_READ_IN_PROGRESS) { while (capture_file_.capFile() && capture_file_.capFile()->state == FILE_READ_IN_PROGRESS) {
@ -2028,7 +2028,7 @@ void LogwolfMainWindow::captureStop() {
} }
} }
void LogwolfMainWindow::findTextCodecs() { void LograyMainWindow::findTextCodecs() {
const QList<int> mibs = QTextCodec::availableMibs(); const QList<int> mibs = QTextCodec::availableMibs();
QRegularExpression ibmRegExp("^IBM([0-9]+).*$"); QRegularExpression ibmRegExp("^IBM([0-9]+).*$");
QRegularExpression iso8859RegExp("^ISO-8859-([0-9]+).*$"); QRegularExpression iso8859RegExp("^ISO-8859-([0-9]+).*$");
@ -2078,7 +2078,7 @@ void LogwolfMainWindow::findTextCodecs() {
} }
} }
void LogwolfMainWindow::initMainToolbarIcons() void LograyMainWindow::initMainToolbarIcons()
{ {
// Normally 16 px. Reflects current GTK+ behavior and other Windows apps. // Normally 16 px. Reflects current GTK+ behavior and other Windows apps.
int icon_size = style()->pixelMetric(QStyle::PM_SmallIconSize); int icon_size = style()->pixelMetric(QStyle::PM_SmallIconSize);
@ -2133,7 +2133,7 @@ void LogwolfMainWindow::initMainToolbarIcons()
main_ui_->actionNewDisplayFilterExpression->setIcon(StockIcon("list-add")); main_ui_->actionNewDisplayFilterExpression->setIcon(StockIcon("list-add"));
} }
void LogwolfMainWindow::initShowHideMainWidgets() void LograyMainWindow::initShowHideMainWidgets()
{ {
if (show_hide_actions_) { if (show_hide_actions_) {
return; return;
@ -2165,7 +2165,7 @@ void LogwolfMainWindow::initShowHideMainWidgets()
connect(show_hide_actions_, SIGNAL(triggered(QAction*)), this, SLOT(showHideMainWidgets(QAction*))); connect(show_hide_actions_, SIGNAL(triggered(QAction*)), this, SLOT(showHideMainWidgets(QAction*)));
} }
void LogwolfMainWindow::initTimeDisplayFormatMenu() void LograyMainWindow::initTimeDisplayFormatMenu()
{ {
if (time_display_actions_) { if (time_display_actions_) {
return; return;
@ -2192,7 +2192,7 @@ void LogwolfMainWindow::initTimeDisplayFormatMenu()
connect(time_display_actions_, SIGNAL(triggered(QAction*)), this, SLOT(setTimestampFormat(QAction*))); connect(time_display_actions_, SIGNAL(triggered(QAction*)), this, SLOT(setTimestampFormat(QAction*)));
} }
void LogwolfMainWindow::initTimePrecisionFormatMenu() void LograyMainWindow::initTimePrecisionFormatMenu()
{ {
if (time_precision_actions_) { if (time_precision_actions_) {
return; return;
@ -2218,7 +2218,7 @@ void LogwolfMainWindow::initTimePrecisionFormatMenu()
// Menu items which will be disabled when we freeze() and whose state will // Menu items which will be disabled when we freeze() and whose state will
// be restored when we thaw(). Add to the list as needed. // be restored when we thaw(). Add to the list as needed.
void LogwolfMainWindow::initFreezeActions() void LograyMainWindow::initFreezeActions()
{ {
QList<QAction *> freeze_actions = QList<QAction *>() QList<QAction *> freeze_actions = QList<QAction *>()
<< main_ui_->actionFileClose << main_ui_->actionFileClose
@ -2237,7 +2237,7 @@ void LogwolfMainWindow::initFreezeActions()
} }
} }
void LogwolfMainWindow::initConversationMenus() void LograyMainWindow::initConversationMenus()
{ {
int i; int i;
@ -2303,10 +2303,10 @@ void LogwolfMainWindow::initConversationMenus()
connect(colorize_action, SIGNAL(triggered()), this, SLOT(colorizeActionTriggered())); connect(colorize_action, SIGNAL(triggered()), this, SLOT(colorizeActionTriggered()));
} }
gboolean LogwolfMainWindow::addExportObjectsMenuItem(const void *, void *value, void *userdata) gboolean LograyMainWindow::addExportObjectsMenuItem(const void *, void *value, void *userdata)
{ {
register_eo_t *eo = (register_eo_t*)value; register_eo_t *eo = (register_eo_t*)value;
LogwolfMainWindow *window = (LogwolfMainWindow*)userdata; LograyMainWindow *window = (LograyMainWindow*)userdata;
ExportObjectAction *export_action = new ExportObjectAction(window->main_ui_->menuFileExportObjects, eo); ExportObjectAction *export_action = new ExportObjectAction(window->main_ui_->menuFileExportObjects, eo);
window->main_ui_->menuFileExportObjects->addAction(export_action); window->main_ui_->menuFileExportObjects->addAction(export_action);
@ -2319,13 +2319,13 @@ gboolean LogwolfMainWindow::addExportObjectsMenuItem(const void *, void *value,
return FALSE; return FALSE;
} }
void LogwolfMainWindow::initExportObjectsMenus() void LograyMainWindow::initExportObjectsMenus()
{ {
eo_iterate_tables(addExportObjectsMenuItem, this); eo_iterate_tables(addExportObjectsMenuItem, this);
} }
// Titlebar // Titlebar
void LogwolfMainWindow::setTitlebarForCaptureFile() void LograyMainWindow::setTitlebarForCaptureFile()
{ {
if (capture_file_.capFile() && capture_file_.capFile()->filename) { if (capture_file_.capFile() && capture_file_.capFile()->filename) {
setWSWindowTitle(QString("[*]%1").arg(capture_file_.fileDisplayName())); setWSWindowTitle(QString("[*]%1").arg(capture_file_.fileDisplayName()));
@ -2347,7 +2347,7 @@ void LogwolfMainWindow::setTitlebarForCaptureFile()
} }
} }
QString LogwolfMainWindow::replaceWindowTitleVariables(QString title) QString LograyMainWindow::replaceWindowTitleVariables(QString title)
{ {
title.replace("%P", get_profile_name()); title.replace("%P", get_profile_name());
title.replace("%V", get_ws_vcs_version_info()); title.replace("%V", get_ws_vcs_version_info());
@ -2390,10 +2390,10 @@ QString LogwolfMainWindow::replaceWindowTitleVariables(QString title)
return title; return title;
} }
void LogwolfMainWindow::setWSWindowTitle(QString title) void LograyMainWindow::setWSWindowTitle(QString title)
{ {
if (title.isEmpty()) { if (title.isEmpty()) {
title = tr("The Logwolf System Log Analyzer"); title = tr("The Logray System Log Analyzer");
} }
if (prefs.gui_prepend_window_title && prefs.gui_prepend_window_title[0]) { if (prefs.gui_prepend_window_title && prefs.gui_prepend_window_title[0]) {
@ -2419,7 +2419,7 @@ void LogwolfMainWindow::setWSWindowTitle(QString title)
setWindowFilePath(NULL); setWindowFilePath(NULL);
} }
void LogwolfMainWindow::setTitlebarForCaptureInProgress() void LograyMainWindow::setTitlebarForCaptureInProgress()
{ {
if (capture_file_.capFile()) { if (capture_file_.capFile()) {
setWSWindowTitle(tr("Capturing from %1").arg(cf_get_tempfile_source(capture_file_.capFile()))); setWSWindowTitle(tr("Capturing from %1").arg(cf_get_tempfile_source(capture_file_.capFile())));
@ -2434,7 +2434,7 @@ void LogwolfMainWindow::setTitlebarForCaptureInProgress()
/* Enable or disable menu items based on whether you have a capture file /* Enable or disable menu items based on whether you have a capture file
you've finished reading and, if you have one, whether it's been saved you've finished reading and, if you have one, whether it's been saved
and whether it could be saved except by copying the raw packet data. */ and whether it could be saved except by copying the raw packet data. */
void LogwolfMainWindow::setMenusForCaptureFile(bool force_disable) void LograyMainWindow::setMenusForCaptureFile(bool force_disable)
{ {
bool enable = true; bool enable = true;
bool can_write = false; bool can_write = false;
@ -2484,7 +2484,7 @@ void LogwolfMainWindow::setMenusForCaptureFile(bool force_disable)
#endif #endif
} }
void LogwolfMainWindow::setMenusForCaptureInProgress(bool capture_in_progress) { void LograyMainWindow::setMenusForCaptureInProgress(bool capture_in_progress) {
/* Either a capture was started or stopped; in either case, it's not /* Either a capture was started or stopped; in either case, it's not
in the process of stopping, so allow quitting. */ in the process of stopping, so allow quitting. */
@ -2532,7 +2532,7 @@ void LogwolfMainWindow::setMenusForCaptureInProgress(bool capture_in_progress) {
} }
void LogwolfMainWindow::setMenusForCaptureStopping() { void LograyMainWindow::setMenusForCaptureStopping() {
main_ui_->actionFileQuit->setEnabled(false); main_ui_->actionFileQuit->setEnabled(false);
#ifdef HAVE_SOFTWARE_UPDATE #ifdef HAVE_SOFTWARE_UPDATE
update_action_->setEnabled(false); update_action_->setEnabled(false);
@ -2545,7 +2545,7 @@ void LogwolfMainWindow::setMenusForCaptureStopping() {
#endif /* HAVE_LIBPCAP */ #endif /* HAVE_LIBPCAP */
} }
void LogwolfMainWindow::setForCapturedPackets(bool have_captured_packets) void LograyMainWindow::setForCapturedPackets(bool have_captured_packets)
{ {
main_ui_->actionFilePrint->setEnabled(have_captured_packets); main_ui_->actionFilePrint->setEnabled(have_captured_packets);
@ -2574,7 +2574,7 @@ void LogwolfMainWindow::setForCapturedPackets(bool have_captured_packets)
main_ui_->actionStatisticsIOGraph->setEnabled(have_captured_packets); main_ui_->actionStatisticsIOGraph->setEnabled(have_captured_packets);
} }
void LogwolfMainWindow::setMenusForFileSet(bool enable_list_files) { void LograyMainWindow::setMenusForFileSet(bool enable_list_files) {
bool enable_next = fileset_get_next() != NULL && enable_list_files; bool enable_next = fileset_get_next() != NULL && enable_list_files;
bool enable_prev = fileset_get_previous() != NULL && enable_list_files; bool enable_prev = fileset_get_previous() != NULL && enable_list_files;
@ -2583,17 +2583,17 @@ void LogwolfMainWindow::setMenusForFileSet(bool enable_list_files) {
main_ui_->actionFileSetPreviousFile->setEnabled(enable_prev); main_ui_->actionFileSetPreviousFile->setEnabled(enable_prev);
} }
void LogwolfMainWindow::setWindowIcon(const QIcon &icon) { void LograyMainWindow::setWindowIcon(const QIcon &icon) {
mainApp->setWindowIcon(icon); mainApp->setWindowIcon(icon);
QMainWindow::setWindowIcon(icon); QMainWindow::setWindowIcon(icon);
} }
void LogwolfMainWindow::updateForUnsavedChanges() { void LograyMainWindow::updateForUnsavedChanges() {
setTitlebarForCaptureFile(); setTitlebarForCaptureFile();
setMenusForCaptureFile(); setMenusForCaptureFile();
} }
void LogwolfMainWindow::changeEvent(QEvent* event) void LograyMainWindow::changeEvent(QEvent* event)
{ {
if (0 != event) if (0 != event)
{ {
@ -2621,7 +2621,7 @@ void LogwolfMainWindow::changeEvent(QEvent* event)
} }
/* Update main window items based on whether there's a capture in progress. */ /* Update main window items based on whether there's a capture in progress. */
void LogwolfMainWindow::setForCaptureInProgress(bool capture_in_progress, bool handle_toolbars, GArray *ifaces) void LograyMainWindow::setForCaptureInProgress(bool capture_in_progress, bool handle_toolbars, GArray *ifaces)
{ {
setMenusForCaptureInProgress(capture_in_progress); setMenusForCaptureInProgress(capture_in_progress);
@ -2644,7 +2644,7 @@ void LogwolfMainWindow::setForCaptureInProgress(bool capture_in_progress, bool h
} }
} }
void LogwolfMainWindow::addMenuActions(QList<QAction *> &actions, int menu_group) void LograyMainWindow::addMenuActions(QList<QAction *> &actions, int menu_group)
{ {
foreach(QAction *action, actions) { foreach(QAction *action, actions) {
switch (menu_group) { switch (menu_group) {
@ -2692,7 +2692,7 @@ void LogwolfMainWindow::addMenuActions(QList<QAction *> &actions, int menu_group
} }
} }
void LogwolfMainWindow::removeMenuActions(QList<QAction *> &actions, int menu_group) void LograyMainWindow::removeMenuActions(QList<QAction *> &actions, int menu_group)
{ {
foreach(QAction *action, actions) { foreach(QAction *action, actions) {
switch (menu_group) { switch (menu_group) {
@ -2721,7 +2721,7 @@ void LogwolfMainWindow::removeMenuActions(QList<QAction *> &actions, int menu_gr
} }
} }
void LogwolfMainWindow::addDynamicMenus() void LograyMainWindow::addDynamicMenus()
{ {
// Fill in each menu // Fill in each menu
foreach(register_stat_group_t menu_group, menu_groups_) { foreach(register_stat_group_t menu_group, menu_groups_) {
@ -2730,7 +2730,7 @@ void LogwolfMainWindow::addDynamicMenus()
} }
} }
void LogwolfMainWindow::reloadDynamicMenus() void LograyMainWindow::reloadDynamicMenus()
{ {
foreach(register_stat_group_t menu_group, menu_groups_) { foreach(register_stat_group_t menu_group, menu_groups_) {
QList<QAction *>actions = mainApp->removedMenuGroupItems(menu_group); QList<QAction *>actions = mainApp->removedMenuGroupItems(menu_group);
@ -2744,7 +2744,7 @@ void LogwolfMainWindow::reloadDynamicMenus()
mainApp->clearRemovedMenuGroupItems(); mainApp->clearRemovedMenuGroupItems();
} }
void LogwolfMainWindow::externalMenuHelper(ext_menu_t * menu, QMenu * subMenu, gint depth) void LograyMainWindow::externalMenuHelper(ext_menu_t * menu, QMenu * subMenu, gint depth)
{ {
QAction * itemAction = Q_NULLPTR; QAction * itemAction = Q_NULLPTR;
ext_menubar_t * item = Q_NULLPTR; ext_menubar_t * item = Q_NULLPTR;
@ -2779,7 +2779,7 @@ void LogwolfMainWindow::externalMenuHelper(ext_menu_t * menu, QMenu * subMenu,
} }
} }
QMenu * LogwolfMainWindow::searchSubMenu(QString objectName) QMenu * LograyMainWindow::searchSubMenu(QString objectName)
{ {
QList<QMenu*> lst; QList<QMenu*> lst;
@ -2796,7 +2796,7 @@ QMenu * LogwolfMainWindow::searchSubMenu(QString objectName)
return 0; return 0;
} }
void LogwolfMainWindow::addPluginIFStructures() void LograyMainWindow::addPluginIFStructures()
{ {
GList *user_menu = ext_menubar_get_entries(); GList *user_menu = ext_menubar_get_entries();
@ -2884,7 +2884,7 @@ void LogwolfMainWindow::addPluginIFStructures()
tbMenu->menuAction()->setVisible(true); tbMenu->menuAction()->setVisible(true);
} }
void LogwolfMainWindow::removeAdditionalToolbar(QString toolbarName) void LograyMainWindow::removeAdditionalToolbar(QString toolbarName)
{ {
if (toolbarName.length() == 0) if (toolbarName.length() == 0)
return; return;
@ -2913,18 +2913,18 @@ void LogwolfMainWindow::removeAdditionalToolbar(QString toolbarName)
} }
QString LogwolfMainWindow::getMwFileName() QString LograyMainWindow::getMwFileName()
{ {
return mwFileName_; return mwFileName_;
} }
void LogwolfMainWindow::setMwFileName(QString fileName) void LograyMainWindow::setMwFileName(QString fileName)
{ {
mwFileName_ = fileName; mwFileName_ = fileName;
return; return;
} }
frame_data * LogwolfMainWindow::frameDataForRow(int row) const frame_data * LograyMainWindow::frameDataForRow(int row) const
{ {
if (packet_list_) if (packet_list_)
return packet_list_->getFDataForRow(row); return packet_list_->getFDataForRow(row);

View File

@ -1,14 +1,14 @@
/** @file /** @file
* *
* Logwolf - Event log analyzer * Logray - Event log analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
* *
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef LOGWOLF_MAIN_WINDOW_H #ifndef LOGRAY_MAIN_WINDOW_H
#define LOGWOLF_MAIN_WINDOW_H #define LOGRAY_MAIN_WINDOW_H
/** @defgroup main_window_group Main window /** @defgroup main_window_group Main window
* The main window has the following submodules: * The main window has the following submodules:
@ -31,7 +31,7 @@
*/ */
/** @file /** @file
* The Logwolf main window * The Logray main window
* @ingroup main_window_group * @ingroup main_window_group
* @ingroup windows_group * @ingroup windows_group
*/ */
@ -93,19 +93,19 @@ class QAction;
class QActionGroup; class QActionGroup;
namespace Ui { namespace Ui {
class LogwolfMainWindow; class LograyMainWindow;
} }
Q_DECLARE_METATYPE(ts_type) Q_DECLARE_METATYPE(ts_type)
Q_DECLARE_METATYPE(ts_precision) Q_DECLARE_METATYPE(ts_precision)
class LogwolfMainWindow : public MainWindow class LograyMainWindow : public MainWindow
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit LogwolfMainWindow(QWidget *parent = nullptr); explicit LograyMainWindow(QWidget *parent = nullptr);
~LogwolfMainWindow(); ~LograyMainWindow();
void setPipeInputHandler(gint source, gpointer user_data, ws_process_id *child_process, pipe_input_cb_t input_cb); void setPipeInputHandler(gint source, gpointer user_data, ws_process_id *child_process, pipe_input_cb_t input_cb);
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
@ -165,7 +165,7 @@ private:
Reload Reload
}; };
Ui::LogwolfMainWindow *main_ui_; Ui::LograyMainWindow *main_ui_;
CaptureFile capture_file_; CaptureFile capture_file_;
QFont mono_font_; QFont mono_font_;
QMap<QString, QTextCodec *> text_codec_map_; QMap<QString, QTextCodec *> text_codec_map_;
@ -435,7 +435,7 @@ private slots:
void on_actionFileExportPDU_triggered(); void on_actionFileExportPDU_triggered();
void actionEditCopyTriggered(LogwolfMainWindow::CopySelected selection_type); void actionEditCopyTriggered(LograyMainWindow::CopySelected selection_type);
void on_actionCopyAllVisibleItems_triggered(); void on_actionCopyAllVisibleItems_triggered();
void on_actionCopyAllVisibleSelectedTreeItems_triggered(); void on_actionCopyAllVisibleSelectedTreeItems_triggered();
void on_actionCopyListAsText_triggered(); void on_actionCopyListAsText_triggered();
@ -591,4 +591,4 @@ private slots:
friend class MainApplication; friend class MainApplication;
}; };
#endif // LOGWOLF_MAIN_WINDOW_H #endif // LOGRAY_MAIN_WINDOW_H

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>LogwolfMainWindow</class> <class>LograyMainWindow</class>
<widget class="QMainWindow" name="LogwolfMainWindow"> <widget class="QMainWindow" name="LograyMainWindow">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -2266,7 +2266,7 @@
<connection> <connection>
<sender>actionFileQuit</sender> <sender>actionFileQuit</sender>
<signal>triggered()</signal> <signal>triggered()</signal>
<receiver>LogwolfMainWindow</receiver> <receiver>LograyMainWindow</receiver>
<slot>close()</slot> <slot>close()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">

View File

@ -19,7 +19,7 @@
* Version 0 of the update URI path has the following elements: * Version 0 of the update URI path has the following elements:
* - The update path prefix (fixed, "update") * - The update path prefix (fixed, "update")
* - The schema version (fixed, 0) * - The schema version (fixed, 0)
* - The application name (variable, "Wireshark" or "Logwolf") * - The application name (variable, "Wireshark" or "Logray")
* - The application version ("<major>.<minor>.<micro>") * - The application version ("<major>.<minor>.<micro>")
* - The operating system (variable, one of "Windows" or "macOS") * - The operating system (variable, one of "Windows" or "macOS")
* - The architecture name (variable, one of "x86", "x86-64", or "arm64") * - The architecture name (variable, one of "x86", "x86-64", or "arm64")

View File

@ -60,13 +60,13 @@
enum configuration_namespace_e { enum configuration_namespace_e {
CONFIGURATION_NAMESPACE_UNINITIALIZED, CONFIGURATION_NAMESPACE_UNINITIALIZED,
CONFIGURATION_NAMESPACE_WIRESHARK, CONFIGURATION_NAMESPACE_WIRESHARK,
CONFIGURATION_NAMESPACE_LOGWOLF CONFIGURATION_NAMESPACE_LOGRAY
}; };
enum configuration_namespace_e configuration_namespace = CONFIGURATION_NAMESPACE_UNINITIALIZED; enum configuration_namespace_e configuration_namespace = CONFIGURATION_NAMESPACE_UNINITIALIZED;
#define CONFIGURATION_NAMESPACE_PROPER (configuration_namespace == CONFIGURATION_NAMESPACE_WIRESHARK ? "Wireshark" : "Logwolf") #define CONFIGURATION_NAMESPACE_PROPER (configuration_namespace == CONFIGURATION_NAMESPACE_WIRESHARK ? "Wireshark" : "Logray")
#define CONFIGURATION_NAMESPACE_LOWER (configuration_namespace == CONFIGURATION_NAMESPACE_WIRESHARK ? "wireshark" : "logwolf") #define CONFIGURATION_NAMESPACE_LOWER (configuration_namespace == CONFIGURATION_NAMESPACE_WIRESHARK ? "wireshark" : "logray")
#define CONFIGURATION_ENVIRONMENT_VARIABLE(suffix) (configuration_namespace == CONFIGURATION_NAMESPACE_WIRESHARK ? "WIRESHARK_" suffix : "LOGWOLF_" suffix) #define CONFIGURATION_ENVIRONMENT_VARIABLE(suffix) (configuration_namespace == CONFIGURATION_NAMESPACE_WIRESHARK ? "WIRESHARK_" suffix : "LOGRAY_" suffix)
char *persconffile_dir = NULL; char *persconffile_dir = NULL;
char *datafile_dir = NULL; char *datafile_dir = NULL;
@ -291,9 +291,9 @@ set_configuration_namespace(const char *namespace_name)
{ {
configuration_namespace = CONFIGURATION_NAMESPACE_WIRESHARK; configuration_namespace = CONFIGURATION_NAMESPACE_WIRESHARK;
} }
else if (g_ascii_strcasecmp(namespace_name, "logwolf") == 0) else if (g_ascii_strcasecmp(namespace_name, "logray") == 0)
{ {
configuration_namespace = CONFIGURATION_NAMESPACE_LOGWOLF; configuration_namespace = CONFIGURATION_NAMESPACE_LOGRAY;
} }
else else
{ {
@ -1341,7 +1341,7 @@ get_persconffile_dir_no_profile(void)
const char *persconf_namespace = CONFIGURATION_NAMESPACE_PROPER; const char *persconf_namespace = CONFIGURATION_NAMESPACE_PROPER;
if (env != NULL) { if (env != NULL) {
/* /*
* Concatenate %APPDATA% with "\Wireshark" or "\Logwolf". * Concatenate %APPDATA% with "\Wireshark" or "\Logray".
*/ */
persconffile_dir = g_build_filename(env, persconf_namespace, NULL); persconffile_dir = g_build_filename(env, persconf_namespace, NULL);
return persconffile_dir; return persconffile_dir;
@ -1402,7 +1402,7 @@ get_persconffile_dir_no_profile(void)
} }
} }
path = g_build_filename(homedir, path = g_build_filename(homedir,
configuration_namespace == CONFIGURATION_NAMESPACE_WIRESHARK ? ".wireshark" : ".logwolf", configuration_namespace == CONFIGURATION_NAMESPACE_WIRESHARK ? ".wireshark" : ".logray",
NULL); NULL);
if (g_file_test(path, G_FILE_TEST_IS_DIR)) { if (g_file_test(path, G_FILE_TEST_IS_DIR)) {
g_free(xdg_path); g_free(xdg_path);

View File

@ -34,14 +34,14 @@ extern "C" {
* *
* @param arg0 Executable name hint. Should be argv[0]. * @param arg0 Executable name hint. Should be argv[0].
* @param namespace_name The namespace to use. "Wireshark" or NULL uses * @param namespace_name The namespace to use. "Wireshark" or NULL uses
* the Wireshark namespace. "Logwolf" uses the Logwolf namespace. * the Wireshark namespace. "Logray" uses the Logray namespace.
* @return NULL on success, and a g_mallocated string containing an error on failure. * @return NULL on success, and a g_mallocated string containing an error on failure.
*/ */
WS_DLL_PUBLIC char *configuration_init(const char *arg0, const char *namespace_name); WS_DLL_PUBLIC char *configuration_init(const char *arg0, const char *namespace_name);
/** /**
* Get the configuration namespace name. * Get the configuration namespace name.
* @return The namespace name. One of "Wireshark" or "Logwolf". * @return The namespace name. One of "Wireshark" or "Logray".
*/ */
WS_DLL_PUBLIC const char *get_configuration_namespace(void); WS_DLL_PUBLIC const char *get_configuration_namespace(void);