aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-12-17Create capture dissector "info" structure (capture_packet_info_t)Michael Mann61-181/+181
While it currently only contains packet_counts, it will hopefully stabilize the capture function signature if more fields are added. Change-Id: I003552c58043c7c2d67aec458187b12b233057e2 Reviewed-on: https://code.wireshark.org/review/12690 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-17Capture dissectors must be registered only once at startupPascal Quantin2-4/+4
So ensure that register_capture_dissector() is not called again when changing a preference Bug: 11884 Change-Id: I18ce05e89b19f106470a8ec843062c115dae60db Reviewed-on: https://code.wireshark.org/review/12689 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-16ldap: Add inetOrgPerson from RFC2798.Stig Bjørlykke2-1/+7
Change-Id: I3e2e3143f66db62c416fd7031d290e2a5b21fa93 Reviewed-on: https://code.wireshark.org/review/12677 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-16Make zlib API constness-aware, take 2.Guy Harris4-5/+25
ZLIB_CONST must be defined before including zlib.h to expose z_const, *AND* z_const shouldn't be used unless it's defined, because older versions of zlib don't define it even if you define ZLIB_CONST. While we're at it, throw in some DIAG_OFF(cast-qual)/DIAG_ON(cast-qual) pairs to suppress unavoidable "cast throws away const qualification" warnings. The original "make zlib constness-aware" change also removed an unnecessary include of <zlib.h> from wiretap/wtap.c, so we do that as well. Change-Id: I3c5269a8fbc54bbbb4d316544cc7b8fa30614c19 Reviewed-on: https://code.wireshark.org/review/12675 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>
2015-12-16Revert "Make zlib API constness-aware"Guy Harris4-6/+11
This reverts commit fb0246c6fd7cd34b820558f75eb48bba6326b768. That commit assumes that if you define Z_CONST, z_const will be defined; that is *not* the case with older versions of zlib, which don't define z_const under any circumstances. Change-Id: I6f9b7ea18922799b1aaf94dc2c63120128f2550a Reviewed-on: https://code.wireshark.org/review/12671 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-16Qt: save custom colors in recent_common filePascal Quantin5-15/+48
This allows to save colors across sessions for systems other than OSX that do not provide a system wide color picker While we are at it, let's stop reading the recent file twice at startup Bug: 11888 Change-Id: I69ff14d699d8111fe6a8bdac0157fcd115a60c2b Reviewed-on: https://code.wireshark.org/review/12659 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-16packet/gluster: Add GF_CBK_CACHE_INVALADATION dissector bitsSoumya Koduri3-2/+91
As part of Gluster UPCALL infrastructure support, a new rpc CBK procedure has been added to gluster_cbk_actors program in order to send CACHE-INVALIDATION callback requests from the GlusterFS server to its client. This change is to include that procedure to the wireshark dissector. Files containing definitions related to this new RPC procedure added - https://github.com/gluster/glusterfs/blob/master/rpc/rpc-lib/src/protocol-common.h#L129 https://github.com/gluster/glusterfs/blob/master/rpc/xdr/src/glusterfs3-xdr.x#L47 https://github.com/gluster/glusterfs/blob/master/libglusterfs/src/upcall-utils.h bug:11880 Change-Id: I18616b00616c6a612417913373c1b9c900f4972c Signed-off-by: Soumya Koduri <skoduri@redhat.com> Reviewed-on: https://code.wireshark.org/review/12565 Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-16telnet: full START_TLS supportPeter Wu1-0/+34
Assumes that the source and destination ports are different (or else some packets may be wrongly dissected as TLS instead of telnet). SSL does something similar. Bug: 11874 Change-Id: Ibf6d3ce2950cb5745c33716db21005cd28bf603b Reviewed-on: https://code.wireshark.org/review/12652 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-16Qt: fix memleaks related to interface dialogPeter Wu3-20/+15
Also fix a not-so-problematic recent files "leak" when quitting Wireshark. Change-Id: I8556b07c197f0934f93d6da8c573c47fbd3fc060 Reviewed-on: https://code.wireshark.org/review/12529 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>
2015-12-16Make zlib API constness-awareJoão Valverde4-11/+6
ZLIB_CONST must be defined before including zlib.h to expose 'z_const'. Change-Id: Ic0dbd59ed3c760dd84ef4546f6ff4d5d3db91519 Reviewed-on: https://code.wireshark.org/review/12547 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-16RADIUS: Enhance display of Egress-VLANIDAlexis La Goutte1-0/+38
bug: 11894 Change-Id: I4170c85b55bb39aef37bb029bcf5df020a400fc9 Reviewed-on: https://code.wireshark.org/review/12656 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-16RADIUS: fix indentAlexis La Goutte1-2/+2
Change-Id: Id49f707ae869e5e8e4b31622167638b9168069fa Reviewed-on: https://code.wireshark.org/review/12655 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-16RADIUS: fix typo on URLAlexis La Goutte4-4/+4
Missing rfc on url... Change-Id: I6eb0af95c7b0ba44e43fe30010f784323b9fee4f Reviewed-on: https://code.wireshark.org/review/12654 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-16debian: Sync patches with DebianBalint Reczey7-14/+42
Change-Id: Iec369a7c5ecd559310198efca2cadb56a449de49 Reviewed-on: https://code.wireshark.org/review/12662 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-16Add files missing from make dists's tarballBalint Reczey1-7/+11
Bug: 11893 Change-Id: I11e6a40856f224e65401b01fafb3e561950ec086 Reviewed-on: https://code.wireshark.org/review/12663 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-16Report an error if the IP total length is bigger than the containing length.Guy Harris1-9/+17
Change-Id: Ib5990fce89304808a585a99164c0176899acbbb7 Reviewed-on: https://code.wireshark.org/review/12667 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-16Don't report an error for a non-multiple-of-4 chunk length.Guy Harris1-2/+0
To quote RFC 4960: Chunk Length: 16 bits (unsigned integer) This value represents the size of the chunk in bytes, including the Chunk Type, Chunk Flags, Chunk Length, and Chunk Value fields. Therefore, if the Chunk Value field is zero-length, the Length field will be set to 4. *The Chunk Length field does not count any chunk padding.* Chunks (including Type, Length, and Value fields) are padded out by the sender with all zero bytes to be a multiple of 4 bytes long. This padding MUST NOT be more than 3 bytes in total. The Chunk Length value does not include terminating padding of the chunk. However, it does include padding of any variable-length parameter except the last parameter in the chunk. The receiver MUST ignore the padding. Note: A robust implementation should accept the chunk whether or not the final padding has been included in the Chunk Length. so the the chunk is *not* required to include the length of the final padding in the chunk, although any padding *between* variable-length parameters in the chunk must be included in the length (obviously, as it's part of the chunk data). Change-Id: I99d64fdd907c41229aa9ad10a230fff4bcdfa5f4 Reviewed-on: https://code.wireshark.org/review/12664 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-15[GTPv2] Add dissection of Source to Target Transparent ContainerAndersBroman1-3/+13
in SRVCC PS to CS Request Change-Id: I663d31f5e35d8264241f73fc4e33bce18fa31333 Reviewed-on: https://code.wireshark.org/review/12646 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-15Qt: apply '-Y' display filter unconditionally and not only when opening a ↵Pascal Quantin1-2/+2
capture file Bug: 11891 Change-Id: I20c4497bdf255627c845f5d6fba2ad7797815b08 Reviewed-on: https://code.wireshark.org/review/12645 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-15Qt: resize Follow Stream conversation QComboBox to its contentPascal Quantin1-1/+5
Bug: 11887 Change-Id: Ibc3bd6ed8c0615f8bcf417ca1ba4d872f81ade92 Reviewed-on: https://code.wireshark.org/review/12644 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-15disabled_protos.c: Fix heur_compare() constness [-Wcast-qual]João Valverde1-2/+2
Change-Id: Ibe2df9dbad432d5480f1f64f11968b645e9cf967 Reviewed-on: https://code.wireshark.org/review/12641 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-15qt: add init values to make clang happy.Dario Lombardo1-8/+8
Found by clang analyzer. Change-Id: I04598e8e9fcb716b373d4b2f707de8f263ff36b0 Reviewed-on: https://code.wireshark.org/review/11029 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-15Qt: TCP/UDP streams are off by one in follow stream windowPascal Quantin1-4/+4
Bug: 11889 Change-Id: I6a274c8b1df8b78f4063534d534002848bd0f199 Reviewed-on: https://code.wireshark.org/review/12642 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-12-15cmake: Fix Unix introspection for floorl() [-Wredundant-decls]João Valverde1-0/+7
Change-Id: I76a909c6f14b50b1a71205f9da2cb44a2e67969f Reviewed-on: https://code.wireshark.org/review/12561 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-15ConfigureChecks (cmake): Fix indent (use tabs) and modelinesAlexis La Goutte1-5/+18
Change-Id: I905c10583baf71b105c65c25f43fb09dd2279b8e Reviewed-on: https://code.wireshark.org/review/12609 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-15T.38: don't register for TCP and UDP ports 6004.Jeff Morriss2-93/+49
T.38 normally picks up its port number dynamically from signalling, port 6004 isn't registered to T.38, and anyway port 6004 is now (correctly) registered to X11. (For the cases where the signaling is missing there's still Decode-As.) Change-Id: I53d8aa27ed1b042dd60bbdb0df2bd89254f1f001 Reviewed-on: https://code.wireshark.org/review/12640 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-14Make init_progfile_dir() take a function pointer [-Wpedantic]João Valverde12-13/+17
Change-Id: I45f8ea5ee6ccc5a484c60ad6e686aaf30f6b0c98 Reviewed-on: https://code.wireshark.org/review/12557 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-14Create some more capture dissector tables.Michael Mann28-236/+199
These were created from capture dissector functions that had switch statements determine "next" protocol/dissector. The registration decreases the need for function declarations in header files. Added new capture dissection tables for IP, IPv6, TCP and UDP as that seems like the next logical place to expand Change-Id: I1ec0cd54eecda4f400669ee5b026bf6e2b46545a Reviewed-on: https://code.wireshark.org/review/12634 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-14Note why we do -Wno-variadic-macros.Guy Harris1-0/+4
Change-Id: Id57a6985eb37d9bf5246cf0f57cc24bb0ca153b9 Reviewed-on: https://code.wireshark.org/review/12639 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-14Note why we do -Wno-variadic-macros.Guy Harris1-0/+4
Change-Id: Icaa5c1e927d0984bd76d9d157166de359891d381 Reviewed-on: https://code.wireshark.org/review/12638 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-14Lua: Fix switch-case braces.Stig Bjørlykke1-2/+2
+ fixed a comment. Change-Id: Ib1a8449054afde3b4df7ad57f0c3da07016281c2 Reviewed-on: https://code.wireshark.org/review/12635 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-14Lua: Free Pref enum valuesStig Bjørlykke1-7/+24
Free the Pref enum values in Pref__gc(). Change-Id: I4d66dbe7ee4879f3b14094135887d78cba876ea3 Reviewed-on: https://code.wireshark.org/review/12628 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-14Add comments to explain what we're doing with strings.Guy Harris1-9/+47
Change-Id: I043d02092464ec8cbbec08d11b29dfee248116bf Reviewed-on: https://code.wireshark.org/review/12629 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-14Lua: Free Pref default stringStig Bjørlykke2-5/+8
Store the Pref default string value and ensure this is freed both when registering the pref and when not. Use g_malloc0 to allocate Pref and avoid several init's. Change-Id: I5f97a15d06068d7805f02f7c7feea61f9b2030f5 Reviewed-on: https://code.wireshark.org/review/12626 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-1464-bit constants need to be wrapped in G_GUINT64_CONSTANT().Guy Harris1-2/+2
When building for ILP32 platforms, they need to be appropriately marked so the compiler treats them as 64-bit. Change-Id: I7a463f88540c446f08a9137953276ed5a735c644 Reviewed-on: https://code.wireshark.org/review/12625 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-14wslua: Change macro to avoid nuisance warning [-Wredundant-decls]João Valverde1-4/+4
Change-Id: I358735b5ff69e414a227ce8c69e75ff3e04ad3b3 Reviewed-on: https://code.wireshark.org/review/12624 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-14[PPP] Dissect BCP NCP Options data.AndersBroman1-28/+80
Change-Id: Ic8bf173d3fded75da93c9c956827a7e250db351d Reviewed-on: https://code.wireshark.org/review/12623 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-14Create capture dissector tables.Michael Mann61-757/+530
They are modeled after dissection dissector tables, but for the moment, don't have/need the flexibility. They are intended to be much simpler/faster than full dissection. The two most used/needed are "wtap_encap" and "ethertype", so they were the basis of starting to use and test capture dissector table API. Others may be added in the future. The "capture dissector" function signature needed a bit of tweeking to handling "claiming" of a packet. The current application of this is capture functions returning TRUE if they affected a "type" of packet count. Returning FALSE ends up considering the packet an "other" type. Change-Id: I81d06a6ccb2c03665f087258a46b9d78d513d6cd Reviewed-on: https://code.wireshark.org/review/12607 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-14PPP: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-8/+8
Change-Id: I85757acbc920288f7554e29a784ddf60b0446d88 Reviewed-on: https://code.wireshark.org/review/12499 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-14GTPv2 conversation adaptationGloria Pozuelo1-2/+196
Change-Id: I55356532619d4dbeb225fc8a1684c22630bd00bd Reviewed-on: https://code.wireshark.org/review/12501 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>
2015-12-14Lua: Cleanup ProtoField_timeStig Bjørlykke1-15/+10
Reverted some unneeded changes from 7f074364 because it's currently only used for FT_ABSOLUTE_TIME. Also fixed some small indent issues. Change-Id: I923e35bf8ad4e991518bee973b87d4be06137463 Reviewed-on: https://code.wireshark.org/review/12539 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-14No need to free the value of a string preference in the garbage collector.Guy Harris1-3/+10
The preference has already been deregistered at that point, so the value of the preference has been freed and the pointer to it has been set to null, so it's already been freed and its pointer no longer points to it and the free from Lua will do nothing. Change-Id: I11bf74932303151483cd3699659f67d64b466759 Reviewed-on: https://code.wireshark.org/review/12606 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-13recent.c: fix declaration of ‘value_string’ shadows a global declarationPascal Quantin1-2/+2
Change-Id: I7dff01e534094c27839476f322f88c2774bd9e62 Reviewed-on: https://code.wireshark.org/review/12605 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-12-13ULP: prettify dissectionPascal Quantin3-284/+2514
Bug: 11039 Change-Id: I1d39367818a0039bc3100cd464baa6268c8863dd Reviewed-on: https://code.wireshark.org/review/12603 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-12-13Use common code for Boolean and enumerated recent values.Guy Harris1-157/+109
Cleans up the code a bit, and means the comment written out for enumerated values will contain the write list of value strings. Change-Id: Iad484e5da9349ab48e3c55e69f671b0a68b5cc6d Reviewed-on: https://code.wireshark.org/review/12604 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-13Fix crash at startupPascal Quantin1-4/+4
Change-Id: I6d21fb06ace6186991f4e481bfc7452364e6c4f7 Reviewed-on: https://code.wireshark.org/review/12602 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-12-13ui: Read and write correct recent timestamp formatStig Bjørlykke1-34/+40
Rewrite to use value_string to ensure correct value strings used, to add backward compatibility and to avoid global-buffer-overflow in possible future inconsistencies. This bug was introduced in 2a088c1d when adding new timestamp formats. Change-Id: I1bf4ac8427db92bfb56b4e5b90809fe08eebed20 Reviewed-on: https://code.wireshark.org/review/12584 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-13Qt: Removed applyRecentColumnWidths from recentFilesReadStig Bjørlykke4-10/+13
Adjusting column widths from recent settings is only needed when columns has changed. Don't recreate the columns when changing timestamp options or name resolution, only reset columns. Change-Id: I4c9a9f63c34542935dd282188d98b2b5b013c5f3 Reviewed-on: https://code.wireshark.org/review/12579 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-13[ppi] initialize phdr to 0Martin Kaiser1-0/+1
to make sure that it's not used without prior initialisation Bug: 11876 Change-Id: Ic19279b01dfd7ac4be596b3aeb537e31604e4147 Reviewed-on: https://code.wireshark.org/review/12573 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-12-13Explicitly specify the template for the mktemp command.Guy Harris1-1/+1
Not all versions of mktemp support omitting the template; in particular, the one provided by some BSD-flavored OSes don't. Change-Id: I657e002559dce165c677a473aa10bb17cc506037 Reviewed-on: https://code.wireshark.org/review/12592 Reviewed-by: Guy Harris <guy@alum.mit.edu>