Age | Commit message (Collapse) | Author | Files | Lines |
|
…otherwise you can't compile from the tarball on Windows.
Change-Id: I99c73b09d9468f0da753c05451fa54348680963f
Reviewed-on: https://code.wireshark.org/review/17543
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Flexible array members are supported by gcc, clang and even MSVC2013.
Note, so far it was only used in the Windows-specific airpcap.h.
Trailing commas in enum declaration are already in use since for
these dissectors (commit ID is the first occurrence):
epan/dissectors/packet-gluster.h v2.1.0rc0-1070-g3b706ba
epan/dissectors/packet-ipv6.c v2.1.2rc0-81-ge07b4aa
epan/dissectors/packet-netlink.h v2.3.0rc0-389-gc0ab12b
epan/dissectors/packet-netlink-netfilter.c v2.3.0rc0-239-g1767e08
epan/dissectors/packet-netlink-route.c v2.3.0rc0-233-g2a80b40
epan/dissectors/packet-quic.c v2.3.0rc0-457-gfa320f8
Inline functions using the "inline" keyword are supported via all glib
versions we support (if it is missing, glib will define a suitable
inline macro).
Other c99 functions listed in the README.developer document were found
to be compatible with GCC 4.4.7, Clang 3.4.2 and MSVC 2013.
Change-Id: If5bab03bfd8577b15a24bedf08c03bdfbf34317a
Reviewed-on: https://code.wireshark.org/review/17421
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: I1a5d4390e91c5a758e52feba6059407d873adf7a
Reviewed-on: https://code.wireshark.org/review/17472
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>
|
|
FreeBSD requires socket.h to be included when testing if struct
sockaddr contains sa_len.
Change-Id: Ibe18a88ce19a4e8487bb00d7fa822a380ec8c98d
Reviewed-on: https://code.wireshark.org/review/17008
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
|
|
Change-Id: I0ab85be8090f234f9ca10914063f97f13c894413
Reviewed-on: https://code.wireshark.org/review/16879
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Compress the source tarball using xz instead of bzip2. Other open source
projects (including many of our dependencies) have been using xz for a
while so hopefully this won't be too much of a shock.
Remove the patch-bzip2 Autotools target while we're here.
Change-Id: I456d27b6cd56a43aba829bd45938f98568eb7b1d
Reviewed-on: https://code.wireshark.org/review/16735
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Change-Id: I133af2d3d05ae77c1030cf35812bb1f969f6a68b
Reviewed-on: https://code.wireshark.org/review/16575
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: If1a7f1232bbb23b27063d4ef618c2059293ff0c4
Reviewed-on: https://code.wireshark.org/review/16441
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
|
|
The buildbots that create packages run `perl make-version.pl
--set-release` at the beginning of each build. This in turn sets the
extra version information for our generated packages to "-g<abbreviated
hash>" for development builds, or "" (an empty string) for release
builds.
Hardcoding the extra version information to "-git" in CMakeLists.txt and
configure.ac means we end up with wireshark-2.1.0-git.tar.bz2,
Wireshark-win64-2.1.0-git.exe, etc. for release builds. Set them back to
empty strings.
Change-Id: Icdfb248d25ad4adbc9abe0bd938e410590e42828
Reviewed-on: https://code.wireshark.org/review/16439
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
The qtchooser package in many (all?) distros installs executable symlinks to
qtchooser that can mislead AC_PROG_PATH if the corresponding Qt linguist
tools package is missing.
Bug: 12570
Change-Id: I98795a3a7b8a05214c56a0c7b50829ea3b2976fa
Reviewed-on: https://code.wireshark.org/review/16316
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Adrian Simionov <daniel.simionov@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Change-Id: Ia2ee723227e1b331eeec0f0463654f35a4c9f37b
Reviewed-on: https://code.wireshark.org/review/14508
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
|
|
Change-Id: Icad622a052a84862ace98a7000f10ccf677f54a5
Reviewed-on: https://code.wireshark.org/review/16138
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>
|
|
See with CMake (ga9070e1a90)
Change-Id: If768b663f9ed032503fc121785b078c0107cdadc
Reviewed-on: https://code.wireshark.org/review/15909
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
|
|
sshdump and ciscodump require libssh >= 0.6.0. Check for this version and
only build them if a sufficient version is present. (The other checks
stay; in particular, ssh_userauth_agent doesn't exist on Windows and
must be checked separately.)
Bug: 12507
Change-Id: Ibe42b0cbb597cd9c4aab51f44d48185940ad954b
Reviewed-on: https://code.wireshark.org/review/15882
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Change-Id: Ib8aab341be406d3c6e9139ae670489bd9e3edcc5
Reviewed-on: https://code.wireshark.org/review/15785
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Remove the "-git" version extra default in CMakeLists.txt and
configure.ac, otherwise we end up with wireshark-2.1.0-git.tar.bz2,
Wireshark-win64-2.1.0-git.exe, etc.
Change-Id: I89b9beaa87ac475950e24a3111cf09e878a33ff7
Reviewed-on: https://code.wireshark.org/review/15784
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
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>
|
|
Change-Id: If93de2c371f36fa0447fb8215337f0c115d74bbb
Reviewed-on: https://code.wireshark.org/review/15524
Reviewed-by: João Valverde <j@v6e.pt>
|
|
PACKAGE_TARNAME is still "wireshark" (generated by autoconf).
Change-Id: I93b69c5b29241a78fbabf35e80e6d2dee53ea3ae
Reviewed-on: https://code.wireshark.org/review/15516
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Minor cleanup, remove old comment and make both tests identical.
Change-Id: I21aaf2bb7e74878013153534f758879879d23f6e
Reviewed-on: https://code.wireshark.org/review/15509
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>
|
|
We need it when we don't have the flex-generated files (i.e., we're
building from git rather than a ("make dist") source tarball).
Change-Id: I824ce4b7f2a8f767e096de050cb3cd0b0449ed62
Reviewed-on: https://code.wireshark.org/review/15423
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Change-Id: I5e639d867c95eb6f476d5be72e52457a9cc89437
Reviewed-on: https://code.wireshark.org/review/15247
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>
|
|
Change-Id: Ie07f49ec5a563f3b43a2442e05646c6a0b51ca41
Reviewed-on: https://code.wireshark.org/review/15349
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>
|
|
Change-Id: Icde077957810a0eb2a99cdfd6ec57dfd04b4ad47
Reviewed-on: https://code.wireshark.org/review/15354
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Change-Id: Iecf697c718cb2ca522060c64b4ca136458b38127
Reviewed-on: https://code.wireshark.org/review/15355
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Not needed anymore.
Change-Id: I4743554fc488767516b5c21b36eec19a4a08c818
Reviewed-on: https://code.wireshark.org/review/15352
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>
|
|
Change-Id: I94468dd971db7cb196be1e62ce529a70789256c5
Reviewed-on: https://code.wireshark.org/review/15255
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Let the make recipe fail if a dependency is missing. That is more user-friendly
(a2x: command not found) than an empty target and having to re-run configure.
Test for both w3m and lynx when generating text files. If neither is available
skip it.
Add an explicit target to build pdf documentation.
Change-Id: I760475acd7278f5ab5a782c1828a134c58cf7b42
Reviewed-on: https://code.wireshark.org/review/15229
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>
|
|
Since Ie5e670b769eb0674950f3679ef511047641c2873 we no longer support
synchronous name resolution.
Change-Id: Icc65bd665bd610d89f894549e77608cfb5ef4c53
Reviewed-on: https://code.wireshark.org/review/15165
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>
|
|
Some versions of rpmbuild fail this test. Use rpm instead.
Fixup for bbea6a1c9f58d7f87424e0df6f9821d8ef1d3b00.
Change-Id: I6068541d5944b08140ea7fc5efd13ad488dda1f3
Reviewed-on: https://code.wireshark.org/review/15131
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Change-Id: Ia97966e28cf7d061694336fb00b9a0790f0d57bb
Reviewed-on: https://code.wireshark.org/review/15067
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
|
|
Change-Id: I6012199370a17d534ba7633509cd95c8a81aaebd
Reviewed-on: https://code.wireshark.org/review/15062
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
|
|
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>
|
|
Add a static "-git" extra version tag for VCS snapshot builds, to be
replaced when running 'make-version -r'.
Change-Id: If29fca04029ed3129aa2332492dc536091049955
Reviewed-on: https://code.wireshark.org/review/15032
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Change-Id: I98d333f2898d224d4e69e4ad87ae574d68dda048
Reviewed-on: https://code.wireshark.org/review/15022
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Remove obsolete comment and unused variable.
Change-Id: I510feb8f14ceb3c74a2bde484f191bcbb64908d0
Reviewed-on: https://code.wireshark.org/review/14925
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Do not use default ACTION_IF_NOT_FOUND.
Fixes bug in d77029d55dc5e3b5daa6c161deb098e786184afa.
Change-Id: Ia6d27015ef51add19e5457bdf035e08a6c444a43
Reviewed-on: https://code.wireshark.org/review/14906
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Change-Id: I0a6cd56f92b0f7dc8f06aa93f36622887d506fb5
Reviewed-on: https://code.wireshark.org/review/14846
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>
|
|
Change-Id: I6889151878a2f83d295a7c749675a6c44575d608
Reviewed-on: https://code.wireshark.org/review/14886
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Remove HTML_VIEWER compile-time setting.
If xdg-open doesn't exist use user web browser preference as fallback.
Change-Id: I3b4a4a1a36b0192d75f2c97595f37d0d88a0941e
Reviewed-on: https://code.wireshark.org/review/14805
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Having to define two macros for marking a function as never returning
seems a bit redundant. Merge the MSVC and GCC-like attributes into a
single WS_NORETURN.
Tested with Clang 3.7.1, GCC 4.4.7 and even GCC 4.1.2 using this small
program (-Wall -Wextra, the first two generate warnings for
uninitialized variables, the last one compiles without warnings):
#include <stdlib.h>
__attribute__((noreturn)) void foo() { exit(1); }
__attribute__((noreturn)) void bar();
void bar() { exit(1); }
int main() {
int j, i;
if (i) { bar(); return j; }
foo();
return j;
}
Change-Id: I7d19c15e61b8f8fa4936864407199c4109f8cc82
Reviewed-on: https://code.wireshark.org/review/14822
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
|
|
Change-Id: If2041c66ccdf8a975d660524c793d45aa9f80623
Reviewed-on: https://code.wireshark.org/review/14852
Reviewed-by: João Valverde <j@v6e.pt>
|
|
This reverts commit ec075789e31942008eb8ad7faf35b7012778dac8.
Change-Id: I6f84f01f2027f32d3727dd9d7d097d6d90e063c2
Reviewed-on: https://code.wireshark.org/review/14851
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Change-Id: I34a90155ab613ca97bf58b72f56ec08eff87d3ab
Reviewed-on: https://code.wireshark.org/review/14849
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Change-Id: Icf9bd86583df43ab8b7748c9f6828d187ebbc0a4
Reviewed-on: https://code.wireshark.org/review/14847
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Change-Id: I9b079caae968dbccf5015da91d97f5a8881d2a1a
Reviewed-on: https://code.wireshark.org/review/14833
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
|
|
Obviate the need for libtool bug work around.
Requires libtool 2.2.2 as the first fully working release of the
2.0 branch.
Change-Id: I925f44f06b4c8e3bb06d356308afe1bde1b149f3
Reviewed-on: https://code.wireshark.org/review/14811
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>
|
|
AC_OUTPUT with arguments is obsolescent.
Change-Id: Ibd53f5db1137ec34c70e22ac73385f379aa5d6e5
Reviewed-on: https://code.wireshark.org/review/14816
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>
|
|
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>
|
|
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>
|