diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-11-28 17:08:27 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-11-30 06:12:23 +0000 |
| commit | 2bcc8dbf267bb33aae5c62d93653b0e1d3105a1b (patch) | |
| tree | 485d43691dfa705e990476c0139a5fb63f76f29f /caputils | |
| parent | 1bab83de53995d87c6032cc4872dbc7be2c04cca (diff) | |
NSIS: Install NPcap instead of WinPcap.
Install NPcap 0.99-r7 instead of WinPcap in the NSIS installer. Update
and/or remove installer text, variables, and variable names accordingly.
Change-Id: Ied36f00c2516127969894f55698e70401dfffb4f
Reviewed-on: https://code.wireshark.org/review/30829
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'caputils')
| -rw-r--r-- | caputils/capture-wpcap.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/caputils/capture-wpcap.c b/caputils/capture-wpcap.c index 0b28494cc4..5ed8c749db 100644 --- a/caputils/capture-wpcap.c +++ b/caputils/capture-wpcap.c @@ -1012,16 +1012,22 @@ open_capture_device_local(capture_options *capture_opts, } /* - * Append the version of WinPcap with which we were compiled to a GString. + * Neither WpdPack nor the Npcap SDK as of version 1.01 defines a version + * string anywhere. Hard-code one for now. + */ +#define WINPCAP_SDK_VERSION "4.1.2" + +/* + * Append the WinPcap or Npcap SDK version with which we were compiled to a GString. */ void get_compiled_caplibs_version(GString *str) { - g_string_append(str, "with WinPcap (" G_STRINGIFY(WINPCAP_VERSION) ")"); + g_string_append(str, "with WinPcap SDK (WpdPack) " WINPCAP_SDK_VERSION); } /* - * Append the version of WinPcap with which we we're running to a GString. + * Append the version of Npcap with which we we're running to a GString. */ void get_runtime_caplibs_version(GString *str) |