Commit Graph

27783 Commits

Author SHA1 Message Date
Michael Mann 4088a8286d SET_ADDRESS -> TVB_SET_ADDRESS to "hide" some of the tvb_get_ptr use.
Not all changes were able to remove their corresponding tvb_get_ptr, because there are other API dependent on the (tvb_get)pointer, but future iterations optimizing those other APIs will then be able to remove it.

Change-Id: Id7cefd440b81834de1d1aace7cd0789b1c871a22
Reviewed-on: https://code.wireshark.org/review/6358
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-01-07 12:37:52 +00:00
Pascal Quantin 6252074a24 DJIUAV: small cleanups
- fix some typos
- remove a useless include
- change an obsolete API
- comment unused hf entries for now

Change-Id: I5939bc2fe9ddc6c422f35423aa22e884f20f088d
Reviewed-on: https://code.wireshark.org/review/6349
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: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07 10:19:51 +00:00
Martin Kaiser 9696eb66db SMB: the "encryption key" in the negotiate response is not really a key
but the data for the Challenge/Response authentication

(at least, that's my understanding of
 http://msdn.microsoft.com/en-us/library/ee441946.aspx)

rename the items and filter strings accordingly

Bug: 10777
Change-Id: I38378f0b31252d7bc8ec5e8ad7cee81a1a48cb4d
Reviewed-on: https://code.wireshark.org/review/6137
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-07 06:00:01 +00:00
Guy Harris a76559e4f0 Cast away an insignificant warning.
Change-Id: Ifd74719ced4d1ff99a2a913ad6a6797d3e80b311
Reviewed-on: https://code.wireshark.org/review/6359
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-07 04:55:02 +00:00
Michael Mann 3bb887fb62 Fix compiler error because I didn't completely amend last patch.
Change-Id: I7b8ffc4a63e69b5f50666dc1cf3482ae20124c0f
Reviewed-on: https://code.wireshark.org/review/6356
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 04:28:13 +00:00
Michael Mann 47d670d3d7 Add tvb_address_to_str.
This is intended to handle ALL address types retrieved from a tvbuff.

One of the (good) side effects of this function is that it can replace a lot of the "hidden" ep_alloc calls used to allocate memory for the address string.

A few existing "popular" helper tvb_ functions were turned into pure macros calling tvb_address_to_str.  Some of the "less used" helper tvb_ functions were just directly replaced with tvb_address_to_str.

Change-Id: I361d991c4ad90142173e63eae02a94d68af3ec43
Reviewed-on: https://code.wireshark.org/review/6333
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 04:25:07 +00:00
Joseph Huffman 0f426d6f01 Improved handling of ARDP fragmented packets.
With the AllJoyn Reliable Datagram Protocol large packets are fragmented in
a way that Wireshark doesn't desegment. The AllJoyn dissector now detects
this situation and reports things to the user in a manner which indicates
things are behaving normally rather than an error condition.

Change-Id: I1f2aa722b6e0d1ed3572ff332b4dd8c0e5c5a765
Signed-off-by: Joseph Huffman <jhuffman@codeaurora.org>
Reviewed-on: https://code.wireshark.org/review/6344
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-01-07 02:50:36 +00:00
Gerald Combs 85e69d4fca Fix GCC pragma.
Fix "error: #pragma GCC diagnostic not allowed inside functions".

Change-Id: Iaa7e39ac46975f00bc337b97875ba8b77295064a
Reviewed-on: https://code.wireshark.org/review/6355
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:45:37 +00:00
Gerald Combs 6e03daf77f Try to suppress clang warnings in exntest.
Nested TRYs result in:

    warning: declaration shadows a local variable

Change-Id: Ifaa7baebde0ea4c18be5a53ab7e7964e84716496
Reviewed-on: https://code.wireshark.org/review/6347
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:11:06 +00:00
Pascal Quantin 119f564e0d MBIM: call dissector_(add|delete)_uint only when necessary
Change-Id: I12bbe9e1d81560f1874d4e575b19db1842fa0c72
Reviewed-on: https://code.wireshark.org/review/6352
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-06 21:04:19 +00:00
Martin Mathieson f39366bb12 NetFlow: Add Ixia 'IxFlow' fields and make some general usability improvements
- Sequence number analysis using flow sequence within an observation domain.
- Link back from data set to template frame, if have seen
- Show more information (observation domain ID, set ID, etc) in Info column and protocol roots
- Look up protocol field from ip_proto

Change-Id: I3147387a3cd0d1fc33b879b3ba226753ed2cd8dd
Reviewed-on: https://code.wireshark.org/review/6331
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-06 20:17:23 +00:00
Alexis La Goutte 087fea319a DJI UAV: Add dissector to autotools and add modelines info
Change-Id: I2a312af906ddf01ff05083a657f474a921ab95a3
Reviewed-on: https://code.wireshark.org/review/6337
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-01-06 16:01:44 +00:00
Alexis La Goutte 1d7da82938 DNS: fix no previous prototype for 'qname_labels_count' [-Wmissing-prototypes]
Change-Id: I2c5b662f6b46d60a97a491ca8ec01b3f0e41fa56
Reviewed-on: https://code.wireshark.org/review/6338
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-06 15:42:54 +00:00
Stig Bjørlykke cbca7eeb71 p_mul: Indicate if fletcher algorithm is used.
The first version of ACP 142 uses the fletcher algorithm for checksum.
Indicate if this (now old variant) checksum is used.

Change-Id: Id6f3e7ecfcde022b339bdb956cd6f642a917076a
Reviewed-on: https://code.wireshark.org/review/6342
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-01-06 13:01:31 +00:00
Stig Bjørlykke 0910b551a9 s5066ses: Fixed some missing sapid mappings.
The previous s5066ses commit added sapid value strings but missed
updating PDU type 21 and 25.

Change-Id: I5cd4dba14eacdf2f590490a95b0cc62b04193b9e
Reviewed-on: https://code.wireshark.org/review/6341
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-01-06 12:55:11 +00:00
Ricardo Cristian Ramirez e8568c83f4 s5066sis: Consume transport layer data in S5066sis
S5066 spec describes a transport layer for some
clients like Acp 142 and DMP but not for all of
them. Since RCOP/UDOP header definition are given
in S'5066 specification, consuming these header
bytes in S'5066 SIS dissector may be appropriate

Bug: 10827
Change-Id: Iffdf5d567e1a417ccbafdac919f5a5200159d31b
Reviewed-on: https://code.wireshark.org/review/6292
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-01-06 11:51:00 +00:00
Michael Mann 55de46f317 Replace ep_address_to_str with address_to_str.
Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b
Reviewed-on: https://code.wireshark.org/review/6323
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>
2015-01-06 07:38:18 +00:00
Graham Bloice a7a17047eb Minor CMake updates to better group build artefacts
Move capchild, caputils, codecs and wsutil into a Libs group
Move gtkui into UI group
Move update-sminmpec into tools group

Change-Id: Iaf2bfe4697265af2c3ed9c9d7de2d5d1ef3cafee
Reviewed-on: https://code.wireshark.org/review/6332
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-05 23:48:46 +00:00
Guy Harris 1176db2ffe Squelch harmless compiler warnings.
(Yes, we know, we're casting 16-bit integers to pointers.  That's
because various generic maps need to be able to take arbitrary values as
keys, and sometimes the arbitrary values aren't structures to which we
point, but just integral values, and that's why GUINT_TO_POINTER()
exists, but it doesn't do enough casting to suppress harmless warnings.)

Change-Id: I1a9c68b4b1007f0a38017ba3570b94efb0b6845a
Reviewed-on: https://code.wireshark.org/review/6329
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-05 21:18:56 +00:00
Joerg Mayer 318b8f81ae Beginnings of dissection of the dji drones control protocol.
Change-Id: Ifda0b97df7e25b535a5010f25c8e8e1af83cb532
Reviewed-on: https://code.wireshark.org/review/6328
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-05 19:42:45 +00:00
Stephen Fisher cbc5faa06c Get rid of some GNU make extensions so users can build with
the make that comes with *BSD and other systems now.

Change-Id: Ib2eee8d37e7029202675bac35839b1c0d5fc5131
Reviewed-on: https://code.wireshark.org/review/6320
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2015-01-05 17:47:56 +00:00
Michael Mann 22b4ec91c0 Replace ep_display_to_address with wmem equivalent display_to_address.
Almost all instances require using "manual" memory management, but it gets some ep_ calls out of the GUI.

Change-Id: Ifa7303766b08d09442ccf3d7063cbe061578ecd9
Reviewed-on: https://code.wireshark.org/review/6318
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-05 13:55:04 +00:00
Alexis La Goutte 42706734a3 OSITP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ied8e931541e8e570ef32376eec61779a32bbd493
Reviewed-on: https://code.wireshark.org/review/6322
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-05 10:39:35 +00:00
Alexis La Goutte b03a21a1e6 SMTP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I234b9dad79e3327637f8cdcd406a49f9e7435f33
Reviewed-on: https://code.wireshark.org/review/6321
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-05 10:37:08 +00:00
Dario Lombardo 696fcdba21 Added DNS statistics support
This affects both the dissector (that has been added with a tap interface and a stats generator) and the UI (to recall the stats menu).

Change-Id: I90658f7aa6707aa39bdd787a51b20fed4dbddc53
Reviewed-on: https://code.wireshark.org/review/6236
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-05 09:06:32 +00:00
Hadriel Kaplan fac8356610 Make all Lua code use wmem not emem
Changed all remaining code in wslua that was using emem, to use wmem or
simpler methods.

Bug: 9927
Change-Id: I3d19a770e0fd77d996bdb6b61a76a722cc2bcd55
Reviewed-on: https://code.wireshark.org/review/6109
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04 21:02:38 +00:00
Pascal Quantin 9aeb249943 ACSE: get rid of an evil global variable
Bug: 10787
Change-Id: I225dab439e195bbd308bcafd4658e77ef9023c0f
Reviewed-on: https://code.wireshark.org/review/6263
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 20:14:11 +00:00
Pascal Quantin d9b480dd58 PKIX1Explicit: get rid of an evil global variable
Bug: 10744
Change-Id: I9fbd7c881ab6b17fa9febb55a4f33dbb229c900b
Reviewed-on: https://code.wireshark.org/review/6264
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 19:34:44 +00:00
Michael Mann d16f114ec2 Convert "FC Member Identifier" fields from all strings to their "native" formats.
Change-Id: I7ea32170b1cdcbc16c1d62b1069c4ed71ea6e9bb
Reviewed-on: https://code.wireshark.org/review/6099
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04 18:46:28 +00:00
Gerald Combs d3581aecda Make sure we don't underrun a buffer when decrypting SSL.
Discovered by Noam Rathaus.

Change-Id: Ia0275601b2a825ba616656064d9a6eca109e34fa
Reviewed-on: https://code.wireshark.org/review/6256
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-04 18:43:41 +00:00
Alexis La Goutte c2f6ce7571 TCP: Update Multipath TCP (MPTCP) to final RFC (RFC 6824)
* Add Fast Close subtype
* Sender MAC => Sender HMAC
* Display some reserved field
* Add new flag (Checksum, Extensibility, HMAC-SHA1...) from MP Capability subtype
* Use also proto_tree_add_bitmask for flag

Change-Id: I2e4dfd75623d3218c574e3a112e799666adcc377
Reviewed-on: https://code.wireshark.org/review/6034
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: Evan Huus <eapache@gmail.com>
2015-01-04 18:39:05 +00:00
Pascal Quantin f648247f34 Get rid of warning: comma at end of enumerator list [-Wpedantic]
Change-Id: I8faca065e1afff6d4d29b9b96c1b0f0b135163a7
Reviewed-on: https://code.wireshark.org/review/6306
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 18:00:02 +00:00
Michael Mann 553da37446 Create BASE_DOT, BASE_DASH, and BASE_SEMICOLON types for the FT_BYTES field type.
These "bases" will put a ".", "-", or ":" respectively between hexidecimal bytes in the field in packet view and display filter.  FT_BYTES with BASE_NONE will have no separator in the packet view, but continue to have the ':' as a separator in the display filter.

Converted the "string" hf_ entries that used tvb_fc_to_str as a string to use proto_tree_add_item with FT_BYTES/BASE_DOT type.

Converted applicable tvb_bytes_to_ep_str_punct() calls to use the new BASE values.

Change-Id: I2442185bb314d04a3ff2ba57883652ecd738b5f9
Reviewed-on: https://code.wireshark.org/review/6098
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04 16:32:03 +00:00
Sylvain Munaut 2085bbec9d gmr1_rach: Update dual-values fields to use true_false_string
Change-Id: I87f2be4b28f6409e525afc36e8ed834fae3befbb
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Reviewed-on: https://code.wireshark.org/review/6300
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 16:29:55 +00:00
Sylvain Munaut 84e43d9cb3 gmr1_rach: Add support for GmPRS/GMR-1 3G Channel Request Type 1 & 2
Those are related to the Packet Data service.

Change-Id: Ia8e9732901609e1cdad38558aac4a2f3475a0a9d
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Reviewed-on: https://code.wireshark.org/review/6291
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 16:29:43 +00:00
Gerald Combs 1cd9d023ba [Automatic manuf, services and enterprise-numbers update for 2015-01-04]
Change-Id: Id1c008d9bbce7d9fdf8b1d2ec7d382e9d205db17
Reviewed-on: https://code.wireshark.org/review/6301
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-04 16:05:09 +00:00
Alexis La Goutte b0b51ddad0 GTPv2: fix Logically dead code (CID 1250813)
Change-Id: I1761af90bd85b14e6021a5d7b07686a37593a152
Reviewed-on: https://code.wireshark.org/review/6279
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-04 13:59:13 +00:00
Alexis La Goutte fa0ebfcae0 BACAPP: fix empty paragraph passed to '@param' command [-Wdocumentation]
Change-Id: Ibef3cee6930dea08fc7a87635c48de609d3d4015
Reviewed-on: https://code.wireshark.org/review/6299
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04 13:54:07 +00:00
Alexis La Goutte 83ac5b752a GTPv2: fix Logically dead code (CID 1255924)
Change-Id: Ia21d8f68b5d898b4493da8cf948ad421f94234fc
Reviewed-on: https://code.wireshark.org/review/6278
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-04 12:06:38 +00:00
Sylvain Munaut 98ba63005c gmr1_rach: Fixup the MOC Dialled Number decoding
Turns out the special values 1023/1022/1021 can happen in any group
and not just the last one.

The last one is still special though with codes [1100->1209] being
exclusive to it.

Change-Id: If86d0260aaa2cc1215560b89d7fc57d7ef21f082
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Reviewed-on: https://code.wireshark.org/review/6290
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 10:51:49 +00:00
Sylvain Munaut a22ea3dc52 gmr1_rach: Update NULL GPS position decoding with reality
The spec doesn't always match 100% reality. In this case it seems some
manufacturer implemented NULL GPS position with longitude.

Change-Id: I0c09627d64814a9467ecbecdc18e43974e4bab4a
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Reviewed-on: https://code.wireshark.org/review/6289
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 10:17:47 +00:00
Sylvain Munaut a16ac8f306 gmr1_rach: Use FT_INT24 instead of FT_UINT24 for latitude/longitude
No need to do sign extension manually, the core code now supports
signed integers with bitmask and it will do the sign extension.
Not sure if that was always the code, but it works now.

This also have the advantage that the real value 'seen' by wireshark
when applying filters is the real signed value.

Change-Id: I47e2357e5556160a00110ad63e3342879769a0b9
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Reviewed-on: https://code.wireshark.org/review/6288
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 10:14:39 +00:00
Hadriel Kaplan 7c9d6ff73a Lua: replace proto_tree_add_text calls
Replace proto_tree_add_text() calls in Lua API code, to use Lua-specific hfinfo items.

Bug: 10828
Change-Id: I9b5899106502a9bdbc748b5ec0f27b787d374562
Reviewed-on: https://code.wireshark.org/review/6296
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-04 09:07:02 +00:00
Alexis La Goutte 2ef85f5cda WiFi Display: fix no previous prototype for ... [-Wmissing-prototypes]
It is the revert of adb81f335d

Change-Id: I7a19ff175ca1ab59d0d0d9e89b3b3e6e12de3b96
Reviewed-on: https://code.wireshark.org/review/6273
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04 04:12:25 +00:00
Pascal Quantin 17dcd95f2b IPv6: do not allocate tap data on stack
Bug: 10780
Change-Id: I2526fb9a5a2dfd61b19dff5ba1b7902f77927f4a
Reviewed-on: https://code.wireshark.org/review/6276
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-03 19:50:16 +00:00
Hadriel Kaplan d7c3edd39c Lua: replace deprecated functions
Remove deprecated functions from Lua API code: tvb_length and
tvb_length_remaining. The calls to proto_tree_add_text() are
left in, as I have no idea what to replace them with. The calls
to ep_* are being left in, as they're removed by change-id
I3d19a770e0fd77d996bdb6b61a76a722cc2bcd55.

Bug: 10822
Change-Id: Ib0686f90be1edc892d3ecf401b91eb7484540b3e
Reviewed-on: https://code.wireshark.org/review/6247
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-03 13:18:17 +00:00
Guy Harris 61c6fb8281 Remove the probes from packet-kerberos.c.
None of HAVE_KERBEROS, HAVE_MIT_KERBEROS or HAVE_HEIMDAL_KERBEROS or
HAVE_LIBNETTLE defined when it's compiled.  So how is HAVE_KERBEROS
getting defined when wireshark-qt.cpp is compiled?

Change-Id: If238ff54aa4f0cda662c7a52d76e33363a77240d
Reviewed-on: https://code.wireshark.org/review/6262
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-03 11:07:26 +00:00
Guy Harris 544ed8adcf Stick some #define probes in on Windows.
Let's try to figure out why, on the 64-bit Windows build,
wireshark-qt.cpp is being compiled to call read_keytab_file() but
packet-kerberos.c is not being compiled to define it.

Change-Id: I782406e2189819d9400b84b6632fe0fb62c5996d
Reviewed-on: https://code.wireshark.org/review/6261
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-03 07:42:17 +00:00
Michael Mann d1d5bf121e Replace proto_tree_add_text in dissector header files where it was used in a macro that should be expert info.
Change-Id: I045368a0a91586231fc4b1e2700c2275088b76af
Reviewed-on: https://code.wireshark.org/review/6244
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-02 22:11:34 +00:00
Guy Harris 5eecf81b0c Don't define a stub read_keytab_file() on Windows if we don't have Kerberos.
We don't declare it, so all the DLL export stuff won't work, and we
shouldn't need it, as we shouldn't be calling it if we don't have
Kerberos (we shouldn't support the -K option if we don't have Kerberos,
for example).

Change-Id: I7e7b12aa93c4f31953300ef513fc09a1f55f8aef
Reviewed-on: https://code.wireshark.org/review/6255
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-02 21:17:55 +00:00