Commit Graph

56427 Commits

Author SHA1 Message Date
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
Anish Bhatt 124272ec09 [PROFINET] v2: Fix swapped MaintenanceRequired & MaintenanceDemanded bits
Fix the correct code path this time.
Bug: 10753

Change-Id: I7bc2e74c91868986303e8b41b25e43a665be1860
Reviewed-on: https://code.wireshark.org/review/6335
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-06 07:02:21 +00:00
Anish Bhatt eb98b04ac1 Revert "[PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bits"
This reverts commit 0452f763fb. Changes should
have been made in ChannelProperties instead of Submodule state. Current
implementation merely *appears* to be correct as we are reading it as a two bit
value but instead should be addressing it as individual bits, little endian
Bug: 10753

Change-Id: Ia3bd088aeb376b8511d64352f62c4304e4129ba6
Reviewed-on: https://code.wireshark.org/review/6334
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-06 07:02:07 +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
Joerg Mayer 15a238a28d Override optimization and other flags for make based generators.
Before this patch it was not possible to override e.g. the optimization
or debug flags in case the build type was set.

Change-Id: I53bfddd27f87ad5482227f786af8c4728c5774fc
Reviewed-on: https://code.wireshark.org/review/6327
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-05 19:37:17 +00:00
Stephen Fisher 13dbf52ce3 Attempt to fix "make distcheck" on Ubuntu buildbot
Change-Id: I6e7ea1e2aaf839fdb3af8a3a5a47aabbb12056ef
Reviewed-on: https://code.wireshark.org/review/6326
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2015-01-05 18:40:22 +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 9a7318a184 Wimax: fix no previous prototype for ... [-Wmissing-prototypes]
Change-Id: I1dac7d362bab680c313766de19d51132d1ce6dfa
Reviewed-on: https://code.wireshark.org/review/6298
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-05 12:46:26 +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
Alexis La Goutte c411029a3c Update to QCustomPlot 1.3.0
Reapply remove trailing whitespace and some spelling fixes
Fix also a not ASCII caracter in qcustomplot.h

Change-Id: Ibd5433015dd117f4d028c842a4add53041adbd11
Reviewed-on: https://code.wireshark.org/review/6275
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-05 10:28:04 +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
Guy Harris 087723adb0 Suppress the check for ' as a formatting character on Windows.
Change-Id: I006359faeeeb5d01ecdb57878c599c5e8a93a77f
Reviewed-on: https://code.wireshark.org/review/6319
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-05 04:07:37 +00:00
Guy Harris fc39b9b151 In CMake, check for thousands-grouping support in the GLib printf routines.
We do that with the autotools; do it with CMake as well.

We could, in theory, handle thosands-grouping ourselves, on all
platforms supporting ANSI C (for which read "all platforms we care
about") by using localeconv()'s thousands_sep and grouping items, but
that's a bit more work.

Fix autotools' comment for that item while we're at it (it checks the
GLib printf routines, not the system printf routines).

Change-Id: I000f0f3b955d9b192ade15e3fabc46d6b48a052e
Reviewed-on: https://code.wireshark.org/review/6317
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-05 01:44:12 +00:00
Guy Harris 533f85785b Don't check for nl80211 stuff if we don't have libnl.
While we're at it, do the checks in the same order that we do in
autotools.

Change-Id: Ie253cdeb740a5be4a5817ce4f7ed683aeea868c8
Reviewed-on: https://code.wireshark.org/review/6316
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-05 00:32:10 +00:00
Guy Harris 8fe6b04ba7 Note why we only default to enabling libnl on Linux.
(Just as we note why we only check for it on Linux in autotools.)

Change-Id: I58c1f31fdf667ed554a4e911df13e5c864171ac0
Reviewed-on: https://code.wireshark.org/review/6315
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-05 00:27:08 +00:00
Guy Harris 05fd11ee3d Add a check for NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP.
Just as we check for it in autotools, check for it in CMake.

Change-Id: I342a3fcde6a5f8190dac67260f25c070b6f5430f
Reviewed-on: https://code.wireshark.org/review/6314
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-05 00:12:31 +00:00
Guy Harris 2f1ac87700 Clean up handling of INET6.
We wire it on, so we don't need a commented out wiring-it-on on Windows.

Explain *why* we're wiring it on rather than doing checks for IPv6
support.

Change-Id: I205ba2456160f9dad48041f27c63a09cdcdc12d3
Reviewed-on: https://code.wireshark.org/review/6313
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-04 22:11:24 +00:00
Guy Harris 553cdfd4cc No need to #define HAVE_PYTHON.
We don't check it (we don't support Python as an extension language -
the experimental support was dropped).

Change-Id: Iedbe1dc5095614676c7eb3026d02f421bdba0d1d
Reviewed-on: https://code.wireshark.org/review/6312
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-04 21:20:09 +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
Guy Harris 5653fcedca No *pcap should have pcap_open() without the other remote extensions.
WinPcap 3.0 introduced pcap_open(); it also introduced
pcap_findalldevs_ex() and pcap_createsrcstr().  If you're going to put
pcap_open() in libpcap, there's not much point to doing so but not also
putting pcap_findalldevs_ex() and pcap_createsrcstr() there.

(And, in the future, there'll be support for remote capturing with
pcap_create() and pcap_activate(), with no need for pcap_createsrcstr(),
and a replacement for pcap_findalldevs() and pcap_findalldevs_ex(),
which we'll also check for.)

So there's no need to check for pcap_findalldevs_ex() or
pcap_createsrcstr().

Change-Id: I9323aad20136684d05d1e909326792a2f1408887
Reviewed-on: https://code.wireshark.org/review/6311
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-04 20:59:14 +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 ac52f0e6bf SCTP (Graph Dialog Qt): fix Copy-paster error (CID 1158585)
Change-Id: I8939dbc8339284f9a1e515aff533d67ddbb6d469
Reviewed-on: https://code.wireshark.org/review/6274
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-04 18:40:46 +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
Pascal Quantin 4a94374f4e Fix linkage on Windows machine
Change-Id: I24c8670fdf0910c3324fcfa8db8a8dbaad1dfbba
Reviewed-on: https://code.wireshark.org/review/6305
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 17:34:33 +00:00
Peter Wu ff01bc6c4e gtk: fix crash when moving columns
When the columns are moved, the packet list is redrawn from the
columns-changed signal handler. Apparently GTK does not like that the
parent contains got destroyed.

Call packet_list_recreate outside the callback to workaround this issue.
Since the signal handler is blocked, it can never be called twice (and
there will always be at most one packet_list_recreate_delayed
scheduled).

Bug: 10795
Change-Id: Ia97d330c8bef747809fa09a8709a19cb03c7e00a
Reviewed-on: https://code.wireshark.org/review/5881
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04 16:46:52 +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 dbcb0b5ca0 stats tree plugin: fix no previous prototype for 'plugin_register_tap_listener' [-Wmissing-prototypes]
Change-Id: If8ea78b9aceb9dbd7f2103aa141b57715188ff4f
Reviewed-on: https://code.wireshark.org/review/6297
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04 14:00:19 +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
Graham Bloice aad1a81b99 Fix out-of-tree build includes of config.h
If a file in the same directory as config.h, e.g. wireshark-qt.cpp
has a #include "config.h", or another header it includes also has
a #include "config.h", then an out-of-tree build, e.g. CMake will
pick up any in-tree config.h and odd things may happen.  The correct
form is #include <config.h> which will pick up the out-of-tree
version.

To find this, introduce a deliberate error and then make an out-of-tree
build, noting where it fails and fix that file.  If that file includes
other files that still cause the build to fail, set the compiler
to emit the pre-processed version so you can locate the include with
the next errant "config.h".  Repeat ad nauseum.

Possibly all includes of "config.h" should be changed to <config.h>

Revert "CMake: Clobber the top-level config.h before we build."

This reverts commit 1f3849ce61.

Ping-Bug: 10301
Change-Id: Ie567e7cc696fd48f3e730fc27032c5d2a7d8f341
Reviewed-on: https://code.wireshark.org/review/6285
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-04 00:26:13 +00:00