summaryrefslogtreecommitdiff
path: root/wsutil
AgeCommit message (Collapse)AuthorFilesLines
2016-07-21Use Windows CRT string functions in some places.Gerald Combs2-1/+102
Copy wsutil/wsprintf.h from change 16537. Update it to use functions appropriate to Visual C++ >= 2015, < 2015, and everything else. Add notes about specific API issues. Update epan/expert.c to use ws_snprintf, since the VS profiler shows it as a minor hot spot. This reduces load time for a large-ish capture from ~14s to ~12s here. Migrate a previous column-utils change. Change-Id: Id4064b7c06c35fd447b63c73f731afee181df4f9 Reviewed-on: https://code.wireshark.org/review/16483 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-12Add resource usage logging.Gerald Combs2-0/+78
Add log_resource_usage, which prints the current and elapsed user and system times. Add a usage example in packet_list_model.cpp. Change-Id: I747161c754a3731e540821715cc9bb10b3dc821d Reviewed-on: https://code.wireshark.org/review/16383 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-30Remove Makefile.common filesJoão Valverde2-187/+135
Now that nmake build system has been removed they are not needed anymore. Change-Id: I88075f955bb4349185859c1af4be22e53de5850f Reviewed-on: https://code.wireshark.org/review/16050 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-25wsutil: Move Win32 helper routines from capchildRoland Knall4-0/+257
Move error handling and argument quoting routines from capchild to wsutil, as those methods will be used by extcap_spawn as well. Change-Id: I2c4515fefd5aecad317fcdaefa721734288f792c Reviewed-on: https://code.wireshark.org/review/16123 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-06-22Handle ENAMETOOLONG.Gerald Combs1-0/+8
g_strerror doesn't appear to handle ENAMETOOLONG. Check for it ourselves. Change-Id: Icd113a81e8d95bb3c84c91bb420a1a6a19bf5d40 Reviewed-on: https://code.wireshark.org/review/16041 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-21libcodecs and libwsutil are DLLs, not static librariesPascal Quantin1-1/+1
Change-Id: I4486f35e07c72d4ca35d5649de25d0c9abd2a964 Reviewed-on: https://code.wireshark.org/review/16057 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-21pcap: Add support to "new" Npcap native mode without setting PATHYang Luo1-0/+9
Npcap decided not to add "C:\Windows\System32\Npcap" to system PATH in the installation any more (starting from Npcap 0.07 r14). So this patch needs to be applied, otherwise Wireshark will not find Packet.dll (the error message will only say wpcap.dll is missing, but actually is Packet.dll missing). Change-Id: Ifd8b6e6d8ecf9866cd37c3368b604de210ff8c7b Reviewed-on: https://code.wireshark.org/review/15959 Reviewed-by: Yang Luo <hsluoyz@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-16filesystem: Fix build dir detection when using cmakePeter Wu1-3/+17
Fixes loading of plugins by detecting the build output directory of cmake. This requires a "CMakeCache.txt" file to be present in the parent directory (above run/). Change-Id: I297432cdcd0981646058410f3eadf5f73b5248c8 Reviewed-on: https://code.wireshark.org/review/7453 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16file_util.c: do not search in Npcap installation folder when calling ↵Pascal Quantin1-13/+0
ws_load_library() ws_load_library() is not used to load packet.dll or wpcap.dll (we use ws_module_open() for this). Let's not lose time checking the folder content. Change-Id: Ibd4a71b8b0c5ffc0c4c146eca51ad9f20964515b Reviewed-on: https://code.wireshark.org/review/15938 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-15Remove Nmake build systemPascal Quantin2-87/+0
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-13Add missing const to inet_ipv6.hJoão Valverde1-17/+9
Make it simpler too. Change-Id: I97dc79d7ac536089c1fa6ec2c20f19754d47a9d4 Reviewed-on: https://code.wireshark.org/review/15866 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-13Use getc_unlocked in a few places.Gerald Combs1-0/+2
Use getc_unlocked or _fgetc_nolock instead of getc in a few places. This reduces startup time by about 100ms here. Change-Id: I59ceb09678457c871cce79fcc3ce71998fe4f5af Reviewed-on: https://code.wireshark.org/review/14518 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-13Finish moving the parenthesis.Guy Harris1-1/+1
Change-Id: I02f099ef198e360663b03857bdf9538bb63a7de8 Reviewed-on: https://code.wireshark.org/review/15864 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-13Fix a compile error.Guy Harris1-1/+1
(Perhaps the Petri dish buildbots should, if a build fails, immediately mark the change as failing the Petri dish build, without waiting for the other build(s), so that you don't have to, for example, wait for the Ubuntu buildbot to finish doing a test build for a change that doesn't affect code built on UN*X.) Change-Id: I89ee1616d35c186fcabc0ec989936fa94116df70 Reviewed-on: https://code.wireshark.org/review/15863 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-13Don't assume we can get a module handle for kernel32.dll.Guy Harris1-1/+10
A failure "shouldn't happen", but check anyway; if nothing else, that squelches some complaining from the VS Code Analysis tool. Change-Id: I9b06db399741176d0e9f859eb650bed8a2f96d9c Reviewed-on: https://code.wireshark.org/review/15860 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-06Move ip6_to_str_buf() to to_str.c and make it take the buffer length.João Valverde1-0/+3
Also make it use ws_inet_ntop6() (rather than implementing the string conversion ourselves). Remove ip6_to_str_buf_len(). Change-Id: I1eff3a8941e00987c2ff0c4dcfda13476af86191 Reviewed-on: https://code.wireshark.org/review/15692 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-03Move npf_sys_is_running() from wsutil to caputils.Guy Harris2-38/+0
It has nothing to do with controlling privileges; it only tests whether the NPF or Npcap service (driver) is running, so it belongs in caputils. While we're at it, fix its signature (in C, a function with no arguments must have "void" as the argument list, for backwards compatibility with pre-function-prototype C), and close the handles it opens, so we don't have open handles leaked. Change-Id: Ia99e99d81617ed2e8cda2c44e53061b4502a2b58 Reviewed-on: https://code.wireshark.org/review/15714 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-03Add support for Npcap native mode:Yang Luo2-4/+38
1) Start Npcap service for capturing packets on Windows if WinPcap service is unavailable. 2) Search Npcap DLLs (wpcap.dll, Packet.dll) also in "system32\Npcap" folder after "system32" is searched. Change-Id: I6810382db431a4e7fe309edd08757db60d8ade38 Reviewed-on: https://code.wireshark.org/review/15707 Reviewed-by: Yang Luo <hsluoyz@gmail.com> Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-01Fix compile error:Joerg Mayer1-1/+1
[ 0%] Building C object wsutil/CMakeFiles/wsutil.dir/tempfile.c.o /Users/jmayer/worktmp/wireshark/git/wsutil/tempfile.c:228:37: error: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Werror,-Wshorten-64-to-32] fd = mkstemps(tf[idx].path, sfx ? strlen(sfx) : 0); ~~~~~~~~ ^~~~~~~~~~~ 1 error generated. No idea whether this is the correct fix. Change-Id: I80202d7eaad11fc3dcb5f9847f6e162caccb7e6e Reviewed-on: https://code.wireshark.org/review/15672 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-01Allow create_tempfile to support a suffix.Michael Mann2-18/+23
Ping-Bug: 10203 Change-Id: Ifa24870d711449b87e9839dd46af614e4aa28fde Reviewed-on: https://code.wireshark.org/review/15608 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2016-05-23Include <sys/socket.h>, too.Guy Harris1-4/+12
The Single UNIX Spec says AF_INET and AF_INET6 are defined by <sys/socket.h>, which means you *should* include it if you want those defines, and it doesn't look as if DragonFly BSD's <netinet/in.h> includes it. Do the includes in the order in whcih dumpcap does them. Change-Id: I2ee611fc08a5487d5b8ed48396aa2a49447c881a Reviewed-on: https://code.wireshark.org/review/15542 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-23Explicitly include <netinet/in.h>.Guy Harris1-0/+4
We use structures from it, and must not depend on <arpa/inet.h> or <ifaddrs.h> to include it for us, as that doesn't necessarily happen on all platforms (it doesn't happen on DragonFly BSD, for example). Change-Id: Id0e6cc406b774efb076bb8e04827fdb7d502be16 Reviewed-on: https://code.wireshark.org/review/15541 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-11TShark: Add a "-E bom=" option.Gerald Combs1-0/+3
Add an option to print the UTF-8 BOM. Change-Id: I3d30c67852b9b89d1548b0f957d97fd8e8741049 Reviewed-on: https://code.wireshark.org/review/15318 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-09Fix up the compare chain in nstime_delta().Guy Harris1-1/+1
The first case handles the two time stamps having the same seconds value, so, in the subsequent cases, they're guaranteed not to have the same seconds value; check for b->secs < a->secs, not for b->secs <= a->secs (the two tests will always get the same value, as b->secs != a->secs), to make it clearer what's being done. Change-Id: I6d3806237dae0ea12af92ea0344a31a2c5322b12 Reviewed-on: https://code.wireshark.org/review/15325 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-09TShark: Convert TTY output.Gerald Combs1-0/+7
If we detect that we're writing to a TTY and that it doesn't support UTF-8, convert our output to the current code page on UNIX/Linux or to UTF-16LE on Windows. This helps to ensure that we don't fill users' screens with mojibake, along with scrubbing invalid output. Add a note about our output behavior to the TShark man page. Add a note about the glyphs we should and shouldn't be using to utf8_entities.h. Bug: 12393 Change-Id: I52b6dd240173b80ffb6d35b5950a46a565c97ce8 Reviewed-on: https://code.wireshark.org/review/15277 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-02Add checkAPI calls to CMake.Graham Bloice1-16/+26
This generates a top level target, checkAPI, that is excluded from the ALL build target, so must be run separately. On Windows using a Visual Studio generator, call msbuild /p:Configuration=RelWithDebInfo checkAPI.vcxproj Change-Id: I44a57c564dcfc75499463b942436f4b920a82478 Reviewed-on: https://code.wireshark.org/review/14873 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-05-01Fix wsutil/Makefile.nmake rule for ws_version_info.objJoão Valverde1-1/+2
Change-Id: I397da333b467d140613947fe49cd98338ab1d8f6 Reviewed-on: https://code.wireshark.org/review/15218 Tested-by: João Valverde <j@v6e.pt> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-28Win32: Pass a mutable string to CreateProcess.Gerald Combs2-2/+2
CreateProcess can modify its second (lpCommandLine) argument. Don't pass it the output of utf_8to16. Constify the return value of utf_8to16. Change-Id: I0d4361396e90c88a4ab2a3f2f0e058230e897fdf Reviewed-on: https://code.wireshark.org/review/15155 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-25Fix nmake build after statically linking version codeMichael Mann1-1/+1
Change-Id: I86a01bdd778f2242aa534a687275a85a2f329c02 Reviewed-on: https://code.wireshark.org/review/15071 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-21Link version code statically againJoão Valverde6-503/+5
This allows keeping the code-sharing with the static linking. This "fixes" a hypothetical ABI mismatch with wsutil and avoids pulling more external dependencies to wsutil than strictly necessary. A nice side-effect is that libwsutil no longer depends on version.h. Follow up to f95976eefcbeb5d24df383c29d29ef888b503945. Change-Id: I8f0d6a557ab3f7ce6f0e2c269124c89f29d6ad23 Reviewed-on: https://code.wireshark.org/review/15002 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-13Windows: Remove the need for _CRT_NONSTDC_NO_DEPRECATE.Gerald Combs2-4/+19
Replace some function calls with their non-deprecated equivalents so that we can remove _CRT_NONSTDC_NO_DEPRECATE from CMakeLists.txt and config.nmake. Leave _CRT_SECURE_NO_DEPRECATE in place. Removing it failed with 145 warnings and 72 errors. Note that we could probably improve startup performance by using wmem in diam_dict.*. Change-Id: I6e130003de838aebedbdd1aa78c50de8a339ddcb Reviewed-on: https://code.wireshark.org/review/14883 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-12sshdump,ciscodump: fix local addresses discoveryPeter Wu1-2/+0
Fixes a NULL-deref when no interface addresses are discovered. Remove NULL interface from list (an empty GSList is represented by NULL while g_slist_alloc returns a list with a single NULL data). Change-Id: I2eded40bb697e051445a526d1f34d8a50ef9ccd4 Reviewed-on: https://code.wireshark.org/review/14888 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-04-10Make sure inet_ipv6.h is in the distribution tarball.Guy Harris1-0/+1
Change-Id: Icff2711f4b2a8fe679f10331e0749e3274e3c02e Reviewed-on: https://code.wireshark.org/review/14874 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-09Move IPv6 address utility functions to wsutilJoão Valverde1-0/+30
Change-Id: Ica8babbf4760b02e4840557fc61241152b2763c5 Reviewed-on: https://code.wireshark.org/review/13025 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-09Move a declaration to wsutilJoão Valverde2-1/+30
This fixes the wsutil dependency on libwireshark. Change-Id: Ic82e769ce39ad0a8c800d371cfa6bd300849fee1 Reviewed-on: https://code.wireshark.org/review/14859 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-07Fix nmake buildMichael Mann1-1/+1
Change-Id: Ieadfe3f4a23b721e32709a45660756d264bc4ec2 Reviewed-on: https://code.wireshark.org/review/14856 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-05Add more stuff to the release tarball.Guy Harris2-12/+19
Sort some lists in Makefile.common while we're at it. Change-Id: I888078f30f7bbe6e5b20e2142c43211e3eb11e31 Reviewed-on: https://code.wireshark.org/review/14815 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-05More distcheck fixesJoão Valverde1-9/+9
Fixes 7f873d92cb7038247ab578d14d7e4794dcd6d98b. Replacement function header files are not automatically added to the distribution tarball. Move libwsutil_la_SOURCES for better readability. Change-Id: I75699a0aa8681d94701931467c9290d9c7c140ac Reviewed-on: https://code.wireshark.org/review/14814 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-05Put popcount.c and popcount.h into the release tarball.Guy Harris1-0/+2
Change-Id: I77fcd9e6f38d0cc3d4a018c540b8faa98db0da7b Reviewed-on: https://code.wireshark.org/review/14813 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-04Use AC_REPLACE_FUNCS and LTLIBOBJSJoão Valverde6-23/+10
Change-Id: I0f46167fe900c39d678560809cd5391c2a9bc4d2 Reviewed-on: https://code.wireshark.org/review/14809 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-04Avoid unnecessary replacement source file floorl.cJoão Valverde3-78/+0
Change-Id: If282cb22dcf099559cbe8acd5b1affd07155af8c Reviewed-on: https://code.wireshark.org/review/14808 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-04Fix 'make dist' ws_diag_control.h dependencyJoão Valverde1-1/+0
Change-Id: Ice9e40700631aed3ec0246232e287735ead22146 Reviewed-on: https://code.wireshark.org/review/14810 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-04Include ws_diag_control.h in config.hJoão Valverde6-118/+5
Change-Id: Ia394071710ecda3b0e6686a51fbca45a8ff20317 Reviewed-on: https://code.wireshark.org/review/14749 Petri-Dish: João Valverde <j@v6e.pt> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-04autotools: Clean up libm testsJoão Valverde1-3/+4
Change-Id: I01bef4d6c2cf2280935d573166652d905948028d Reviewed-on: https://code.wireshark.org/review/14806 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-04Rename "libz" to "zlib"João Valverde1-8/+8
Change-Id: I12f92c983d587c2a4751428cdf299635090c9f0b Reviewed-on: https://code.wireshark.org/review/14748 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-04After the move of zlib test we need to add ZLIB_CFLAGSAndersBroman1-1/+1
Change-Id: Idee028bb6962a7a50d13ec45b41b71410fb92c6e Reviewed-on: https://code.wireshark.org/review/14799 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-03wsutil: Remove getenv_utf8(), replaced with g_getenv()João Valverde3-59/+20
Replace getenv() calls in filesystem.c too for consistency. Change-Id: I31425179290e556e6696953531989d93777adf92 Reviewed-on: https://code.wireshark.org/review/14752 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-03Fix cmake libwsutil zlib missing linkageJoão Valverde1-0/+1
Change-Id: I803f5fee26d2f10d56cad774a71c71d3dcbbcc20 Reviewed-on: https://code.wireshark.org/review/14787 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-03Move zlib version check to wsutilJoão Valverde1-0/+25
Change-Id: I0950f61e90af5bb21c0017204de0c0b509616e5c Reviewed-on: https://code.wireshark.org/review/14747 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-30ws_load_library() is called with constant char reflect that.MSVC15 build.AndersBroman2-2/+2
Change-Id: I7d103c7316ee372b5cdb3aa9033a62eb75cd38b2 Reviewed-on: https://code.wireshark.org/review/14702 Reviewed-by: Anders Broman <a.broman58@gmail.com>