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

- Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying 

pcap probably is different from the WinPcap version.
- Set WINPCAP_VERSION for cmake builds to "unknown"
- Oh, the NEWS file changed again.

svn path=/trunk/; revision=53690
This commit is contained in:
Jörg Mayer 2013-12-01 10:05:16 +00:00
parent 6cd4ad721f
commit 244000000d
9 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -164,10 +164,10 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
## 4295: array is too small to include a terminating null character
set(WARNINGS_CFLAGS "/w34295")
# FIXME: WINPCAP_VERSION cannot be determined from source or executable.
set(WINPCAP_VERSION "unknown")
set(WIRESHARK_C_FLAGS
# FIXME: This doen't work as PCAP_VERSION cannot be determined from
# source or executable.
"/DPCAP_VERSION=${PCAP_VERSION}"
"/DWINPCAP_VERSION=${WINPCAP_VERSION}"
${LOCAL_CFLAGS}
${WARNINGS_CFLAGS}
)

2
Makefile.nmake
View File

@ -913,7 +913,7 @@ install_qt:
process_libs:
@if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)"
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
. WinPcap_$(PCAP_VERSION).exe
. WinPcap_$(WINPCAP_VERSION).exe
!IFNDEF QT5_BASE_DIR
!MESSAGE Can't find Qt. This will become a problem at some point.
!ENDIF

8
NEWS
View File

@ -77,8 +77,8 @@ What's New
PN532 HCI, OpenFlow, Picture Transfer Protocol Over IP, QUIC (Quick UDP
Internet Connections), SEL RTAC (Real Time Automation Controller)
EIA-232 Serial-Line Dissection, Sippy RTPproxy, STANAG 4607, STANAG
5066 SIS, Tinkerforge, UDT, URL Encoded Form Data, WHOIS, and Wi-Fi
Display
5066 DTS, STANAG 5066 SIS, Tinkerforge, UDT, URL Encoded Form Data,
WHOIS, and Wi-Fi Display
Updated Protocol Support
@ -86,7 +86,7 @@ What's New
New and Updated Capture File Support
Netscaler 2.6, and STANAG 4607
Netscaler 2.6, STANAG 4607, and STANAG 5066 Data Transfer Sublayer
__________________________________________________________________
Getting Wireshark
@ -158,7 +158,7 @@ Frequently Asked Questions
A complete FAQ is available on the [21]Wireshark web site.
__________________________________________________________________
Last updated 2013-11-21 18:44:12 CET
Last updated 2013-11-30 09:30:04 CET
References

2
capture-wpcap.c
View File

@ -903,7 +903,7 @@ cant_get_if_list_error_message(const char *err_str)
void
get_compiled_pcap_version(GString *str)
{
g_string_append(str, "with WinPcap (" G_STRINGIFY(PCAP_VERSION) ")");
g_string_append(str, "with WinPcap (" G_STRINGIFY(WINPCAP_VERSION) ")");
}
/*

6
config.nmake
View File

@ -339,7 +339,7 @@ QT5_BASE_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010
#
PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack
# This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
PCAP_VERSION=4_1_3
WINPCAP_VERSION=4_1_3
WPD_VERSION=4_1_2
#
@ -584,7 +584,7 @@ QT5_BASE_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010
#
PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack
# This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
PCAP_VERSION=4_1_3
WINPCAP_VERSION=4_1_3
WPD_VERSION=4_1_2
#
@ -995,7 +995,7 @@ LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze:WX-
!ENDIF
#STANDARD_CFLAGS are flags used for *Wireshark* compiles (not stuff like lemon, etc)
STANDARD_CFLAGS=/DPCAP_VERSION=$(PCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
STANDARD_CFLAGS=/DWINPCAP_VERSION=$(WINPCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
# Optional: Define WIRESHARK_GENERATE_BSC_FILE to generate .sbr files for input to bscmake
!IFDEF WIRESHARK_GENERATE_BSC_FILE

16
packaging/nsis/Makefile.nmake
View File

@ -18,15 +18,15 @@ EXE=../../tshark.exe ../../editcap.exe \
!IFDEF GTK_DIR
../../wireshark.exe \
!ENDIF
../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe $(WIRESHARK_LIB_DIR)\WinPcap_$(PCAP_VERSION).exe
../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe $(WIRESHARK_LIB_DIR)\WinPcap_$(WINPCAP_VERSION).exe
DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll
DOC=../../doc/ws.css \
../../doc/capinfos.html \
../../doc/capinfos.html \
../../doc/dumpcap.html \
../../doc/editcap.html \
../../doc/mergecap.html \
../../doc/rawshark.html \
../../doc/text2pcap.html \
../../doc/editcap.html \
../../doc/mergecap.html \
../../doc/rawshark.html \
../../doc/text2pcap.html \
../../doc/tshark.html \
../../doc/wireshark-filter.html \
../../doc/wireshark.html \
@ -97,8 +97,8 @@ NSIS_FLAGS=\
/DMSVC_VARIANT=$(MSVC_VARIANT) \
/DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) \
/DWIRESHARK_LIB_DIR=$(WIRESHARK_LIB_DIR) \
/DPCAP_VERSION=$(PCAP_VERSION) \
/DPCAP_DISPLAY_VERSION=$(PCAP_VERSION:_=.) \
/DWINPCAP_VERSION=$(WINPCAP_VERSION) \
/DPCAP_DISPLAY_VERSION=$(WINPCAP_VERSION:_=.) \
!IFDEF MSVCR_DLL
/DMSVCR_DLL="$(MSVCR_DLL)" \
!ENDIF

12
packaging/nsis/wireshark.nsi
View File

@ -731,8 +731,8 @@ IfErrors lbl_winpcap_notinstalled ;if RegKey is unavailable, WinPcap is not inst
;DetailPrint "WinPcap uninstaller returned $0"
lbl_winpcap_notinstalled:
SetOutPath $INSTDIR
File "${WIRESHARK_LIB_DIR}\WinPcap_${PCAP_VERSION}.exe"
ExecWait '"$INSTDIR\WinPcap_${PCAP_VERSION}.exe"' $0
File "${WIRESHARK_LIB_DIR}\WinPcap_${WINPCAP_VERSION}.exe"
ExecWait '"$INSTDIR\WinPcap_${WINPCAP_VERSION}.exe"' $0
DetailPrint "WinPcap installer returned $0"
SecRequired_skip_Winpcap:
@ -1051,7 +1051,7 @@ FunctionEnd
!include "VersionCompare.nsh"
Var WINPCAP_NAME ; DisplayName from WinPcap installation
Var WINPCAP_VERSION ; DisplayVersion from WinPcap installation
Var WINWINPCAP_VERSION ; DisplayVersion from WinPcap installation
Function myShowCallback
@ -1097,9 +1097,9 @@ lbl_winversion_supported:
lbl_winpcap_installed:
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "$WINPCAP_NAME"
; Compare the installed build against the one we have.
ReadRegStr $WINPCAP_VERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayVersion"
StrCmp $WINPCAP_VERSION "" lbl_winpcap_do_install ; WinPcap is really old(?) or installed improperly.
${VersionCompare} $WINPCAP_VERSION "4.1.0.2980" $1 ; WinPcap 4.1.3
ReadRegStr $WINWINPCAP_VERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayVersion"
StrCmp $WINWINPCAP_VERSION "" lbl_winpcap_do_install ; WinPcap is really old(?) or installed improperly.
${VersionCompare} $WINWINPCAP_VERSION "4.1.0.2980" $1 ; WinPcap 4.1.3
StrCmp $1 "2" lbl_winpcap_do_install
;lbl_winpcap_dont_install:

4
packaging/portableapps/win32/Makefile.nmake
View File

@ -89,7 +89,7 @@ appinfo.ini: appinfo.tmpl $(TOPDIR)\config.nmake
< appinfo.tmpl > appinfo.ini
WiresharkPortable.ini: WiresharkPortable.tmpl $(TOPDIR)\config.nmake
sed -e 's/$$(PCAP_VERSION)/$(PCAP_VERSION)/g' \
sed -e 's/$$(WINPCAP_VERSION)/$(WINPCAP_VERSION)/g' \
-e 's/$$(TARGET_MACHINE)/$(TARGET_MACHINE)/g' \
< WiresharkPortable.tmpl > WiresharkPortable.ini
@ -127,7 +127,7 @@ Files/WiresharkPortable.exe : WiresharkPortable.nsi findprocdll
/DVERSION=$(PAPPS_VERSION) \
/DWSVERSION=$(VERSION) \
/DEXTRA_PLUGINS="$(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)" \
/DDEFAULTWINPCAP=WinPcap_$(PCAP_VERSION).exe \
/DDEFAULTWINPCAP=WinPcap_$(WINPCAP_VERSION).exe \
/DDEFAULTMSVCREDIST=vcredist_$(TARGET_MACHINE).exe \
WiresharkPortable.nsi

2
packaging/portableapps/win32/WiresharkPortable.tmpl
View File

@ -10,7 +10,7 @@ WiresharkExecutable=wireshark.exe
AdditionalParameters=
DisableWinPcapInstall=false
WinPcapInstaller=WinPcap_$(PCAP_VERSION).exe
WinPcapInstaller=WinPcap_$(WINPCAP_VERSION).exe
MSVCRedist=vcredist_$(TARGET_MACHINE).exe