Commit Graph

731 Commits

Author SHA1 Message Date
Gerald Combs f1cf70fc10 1.7.2 → 1.9.0.
svn path=/trunk/; revision=43120
2012-06-05 16:21:47 +00:00
Guy Harris 68a4971594 If the user tries to save a capture file atop a file that has all its
write bits turned off or, on 4.4-Lite-based systems, has its "user
immutable" bit turned on, ask them if they really want to overwrite the
file (as those are both used to say "this file is precious, don't let me
easily accidentally trash it") and, if the "user immutable" bit is set,
turn it off first so that the move in the "safe save" won't fail.

svn path=/trunk/; revision=43006
2012-06-02 18:53:13 +00:00
Guy Harris 84cac10a67 No more GIOP plugins, no more plugins/giop directory.
svn path=/trunk/; revision=42982
2012-06-01 17:26:28 +00:00
Jeff Morriss 06bb167824 The rest of the fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7221
(emem alignment problems on SPARC) :

Have emem use 8-byte alignment when we need it.

Since I can't seem to write code that which reliably (across GCC versions and
optimization levels) determines if 8-byte alignment is needed for doubles,
"when" is defined as "if we're compiling for a CPU other than i386."

Windows doesn't need a check because it's either i386 or 64-bit (x86_64 or
maybe ia64--both of which get 8-byte alignment from G_MEM_ALIGN).

(And, yes, all of this is ignoring the 16-byte alignment requirements of long
doubles.)

svn path=/trunk/; revision=42431
2012-05-04 21:56:32 +00:00
Gerald Combs e5cd6c087e 1.7.1 → 1.7.2.
svn path=/trunk/; revision=41971
2012-04-06 17:27:20 +00:00
Jeff Morriss 989057bb09 Don't enable airpcap if we don't HAVE_LIBPCAP.
svn path=/trunk/; revision=41799
2012-03-27 15:15:52 +00:00
Jeff Morriss fd69e62aac Revert r37423: the intent of r34356 was to enable Airpcap by default, it just
didn't work as intended.

Then make it so we build with Airpcap by default.

This should hopefully be the end of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4879

svn path=/trunk/; revision=41790
2012-03-27 02:37:42 +00:00
Jeff Morriss 26125e7f14 Bug 6448 says Python support doesn't work at all; downgrade its status in the configure help from EXPERIMENTAL to BROKEN/UNSTABLE.
svn path=/trunk/; revision=41746
2012-03-23 02:00:31 +00:00
Gerald Combs 604896658e Don't use GNUTLS 3.0, at least until we determine the impact of their
license change.

svn path=/trunk/; revision=41728
2012-03-21 22:52:03 +00:00
Guy Harris fd72ad5e92 Automake can, at times, be a delicate fragile flower. Apparently,
having something in wireshark_LDADD that's filled in by the configure
script means that the items referred to by that string aren't treated as
dependencies.

svn path=/trunk/; revision=41709
2012-03-21 06:13:53 +00:00
Jeff Morriss 38d8b62758 Add ui/qt/doxygen.cfg.in (copied from ui/gtk, replacing gtk strings with qt). The doxygen stuff doesn't work, but at least we'll be able to build the source tarball.
svn path=/trunk/; revision=41653
2012-03-19 01:15:26 +00:00
Guy Harris 994d2b544e Add automake support for Qt - use --with-qt as a configure script
argument.

svn path=/trunk/; revision=41647
2012-03-18 23:35:53 +00:00
Guy Harris f31c9b8967 Add some more -D flags to CPPFLAGS rather than CFLAGS, and add some
flags that aren't -D or -I flags to CXXFLAGS as well as CFLAGS.

svn path=/trunk/; revision=41595
2012-03-16 08:02:04 +00:00
Guy Harris 04acb74936 Put -D and -I flags into CPPFLAGS rather than into CFLAGS; that should
make them apply to C++ as well as C.  That seems to be what the autoconf
documentation suggests:

- Variable: CFLAGS
  Debugging and optimization options for the C compiler. If it is not set
  in the environment when configure runs, the default value is set when
  you call AC_PROG_CC (or empty if you don't). configure uses this
  variable when compiling or linking programs to test for C features.

  If a compiler option affects only the behavior of the preprocessor
  (e.g., -Dname), it should be put into CPPFLAGS instead. If it affects
  only the linker (e.g., -Ldirectory), it should be put into LDFLAGS
  instead. If it affects only the compiler proper, CFLAGS is the natural
  home for it. If an option affects multiple phases of the compiler,
  though, matters get tricky. One approach to put such options directly
  into CC, e.g., CC='gcc -m64'. Another is to put them into both CPPFLAGS
  and LDFLAGS, but not into CFLAGS.

	...

- Variable: CPPFLAGS
  Preprocessor options for the C, C++, Objective C, and Objective C++
  preprocessors and compilers. If it is not set in the environment when
  configure runs, the default value is empty. configure uses this variable
  when preprocessing or compiling programs to test for C, C++, Objective
  C, and Objective C++ features.

  This variable's contents should contain options like -I, -D, and -U that
  affect only the behavior of the preprocessor. Please see the explanation
  of CFLAGS for what you can do if an option affects other phases of the
  compiler as well.

svn path=/trunk/; revision=41593
2012-03-16 03:27:45 +00:00
Guy Harris b53e379447 Have AC_WIRESHARK_GCC_CFLAGS_CHECK take an optional second flag to
indicate whether the flag is C-only, C++-only, or for both compilers;
pass the appropriate value for C-only flags.  Have the "Checking for..."
message indicate whether we're adding to CFLAGS, CXXFLAGS, or both.

(Yes, the macro should probably be renamed.  "GCC" refers to the GNU
Compiler Collection, which includes a C++ compiler, although that's also
used for compilers that are more-or-less compatible with the ones from
the GNU Compiler Collection, such as the clang compilers.)

We set -Wformat-security whether or not --enable-extra-gcc-checks was
specified, so we don't need to do it again if it was specified.

svn path=/trunk/; revision=41586
2012-03-16 00:49:01 +00:00
Guy Harris 4a20fd003c We need to build libui even if we're only building TShark. Fixes bug
6855.

svn path=/trunk/; revision=41131
2012-02-22 02:15:23 +00:00
Guy Harris 2ae289a62e Build the TShark taps into a static libcliui library in the ui/cli
directory, and link TShark with that; let's see if this fixes the
Windows buildbots.

svn path=/trunk/; revision=41070
2012-02-19 19:01:01 +00:00
Guy Harris 530c8c5390 Create a libui (static) library in the ui directory, which contains the
object files from all the source files in the ui directory (but not in
its subdirectories), and link the programs that need it with them.

This cleans things up a little bit, and may also fix the Windows build.

svn path=/trunk/; revision=41061
2012-02-18 23:55:41 +00:00
Anders Broman 011293e6af Add M3AP to the build.
svn path=/trunk/; revision=40792
2012-02-01 19:36:57 +00:00
Jeff Morriss a2c21a2b53 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6737
As suggested by njtaylor0101 [AT] gmail.com: we (always) check for the gthread
module when checking glib so there's no need to check for it when checking GTK.
This prevents us, when configuring with gtk3, for checking for gthread-2.0
version 3.0.0 or later.

svn path=/trunk/; revision=40684
2012-01-24 03:16:33 +00:00
Jeff Morriss 0a6eca4097 Bug 6448 says the embedded Python stuff does not really work.
And if I run Valgrind with Python enabled, I get pages of errors related to it.

So: disable Python by default.

svn path=/trunk/; revision=40602
2012-01-20 03:20:35 +00:00
Guy Harris d39be3c7c4 Indicate which version of GTK+ is being used to build Wireshark, and
also indicate if we're including the Mac OS X integration library.

svn path=/trunk/; revision=40556
2012-01-17 05:22:56 +00:00
Guy Harris 7da19cf332 Fix typo.
svn path=/trunk/; revision=40555
2012-01-17 04:50:56 +00:00
Guy Harris cfb569f45f Fix test (equality in the test command is =, not ==).
Split lines.

svn path=/trunk/; revision=40554
2012-01-17 04:48:13 +00:00
Guy Harris 8ab3403f94 Rename the GTK_OK variable to have_gtk; make sure it's always set. Test
it, instead of no_gtk, to see whether we should check for the OS X
integration functions; I think no_gtk is an internal detail of the
autoconf macros for GTK+, so let's not depend on it.

Clean up indentation.

svn path=/trunk/; revision=40553
2012-01-17 04:45:12 +00:00
Jörg Mayer be706c6380 Move gtk to ui/gtk.
This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518
2012-01-15 21:59:11 +00:00
Jörg Mayer 6197143d6c Ed Beroset <beroset@mindspring.com> via bug 5531
The ANSI C12.22 protocol is a smart grid protocol for utility meters, including
gas, water and electric.  The dissector implemented in the patch file includes
full support for all EPSEM (Extended Protocol Specification for Electricity
Metering) services and includes a full implementation of the C12.22 security
modes.

[...]

To decrypt the attached sample file, you need to set up the key table in the
preferences to include key 0 with a value of 6624C7E23034E4036FE5CB3A8B5DAB44.

Me: Fixes for:

[ 64%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o            
../../asn1/c1222/packet-c1222-template.c: In function ‘dissect_epsem’:                   
../../asn1/c1222/packet-c1222-template.c:860:15: error: variable ‘ft’ set but not used [-Werror=unused-but-set-variable]

[  5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o
../../asn1/c1222/packet-c1222-template.c:103:19: error: ‘c1222_flags’ defined but not used [-Werror=unused-variable]



svn path=/trunk/; revision=40500
2012-01-14 15:22:10 +00:00
Jörg Mayer bf44748c83 Add another warning (-Warray-bounds) to sync with cmake
svn path=/trunk/; revision=40497
2012-01-14 14:39:30 +00:00
Bill Meier 96151f1910 Define GTK_DISABLE_DEPRECATED only if GTK lt 3.2 since
GTK 3.2 deprecates GtkVBox & GtkHBox which are currently used extensively by Wireshark.

svn path=/trunk/; revision=40326
2011-12-29 16:58:41 +00:00
Balint Reczey f15662eaa6 Unconditionally install idl2wrs
svn path=/trunk/; revision=39985
2011-11-22 13:53:17 +00:00
Balint Reczey f0642db264 hardcode /bin/sh to idl2wrs
svn path=/trunk/; revision=39984
2011-11-22 13:53:06 +00:00
Gerald Combs 2798ad267a 1.7.0 → 1.7.1.
svn path=/trunk/; revision=39769
2011-11-08 22:35:56 +00:00
Anders Broman de5f417b99 Add SBc Application Part (SBc-AP) to build.
svn path=/trunk/; revision=39758
2011-11-08 17:28:55 +00:00
Gerald Combs 7d442f4c22 Change the use of threads from "mostly always, depending on your
configure options and Gtk+ and GLib versions" to "always".

svn path=/trunk/; revision=39751
2011-11-07 23:42:53 +00:00
Anders Broman a18ab9b870 From Pascal Quantin.
The attached patch adds the LPPa (LTE Positioning Protocol A) dissector as
specified in 3GPP 36.455 release 9.4.1.
(Part 2)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6478

svn path=/trunk/; revision=39516
2011-10-23 18:05:07 +00:00
Anders Broman 56c3bd0686 From Pascal Quantin.
LTE Positioning Protocol dissector

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6460

svn path=/trunk/; revision=39436
2011-10-16 16:02:26 +00:00
Stig Bjørlykke 0de5c129a1 Make asn1/lcsap/Makefile
svn path=/trunk/; revision=39373
2011-10-11 19:01:32 +00:00
Graeme Lunt 779206012c Microsoft Credential Security Support Provider (CredSSP) support.
Used by direct approach RDP for NTLMSSP authentication under SSL. 



svn path=/trunk/; revision=39196
2011-09-30 15:21:16 +00:00
Jörg Mayer 576ab168c9 Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGER
as it is the only option left.

svn path=/trunk/; revision=39138
2011-09-25 21:27:19 +00:00
Graeme Lunt 947d3c9fa2 Add asn/t124/Makefile to configure.in and remove it from the repository.
svn path=/trunk/; revision=39069
2011-09-21 08:16:33 +00:00
Stig Bjørlykke 5359494b1f Second try to move crc routines to libwsutil.
This time keep the tvb routines in epan.

Now we can use common crc routines outside epan.

svn path=/trunk/; revision=38810
2011-08-31 09:00:54 +00:00
Stig Bjørlykke 71f903b956 Revert r38800, as the crc routines contains some tvb functions.
svn path=/trunk/; revision=38803
2011-08-30 14:17:40 +00:00
Stig Bjørlykke 4132d40e50 Move all crc routines to libwsutil.
This way we can use the crc routines in wiretap.

svn path=/trunk/; revision=38800
2011-08-30 13:46:42 +00:00
Jörg Mayer 5486a88145 Fix a comment
svn path=/trunk/; revision=38779
2011-08-29 19:10:54 +00:00
Stig Bjørlykke 5603cef9f2 Remove support for libpcre, we use GRegex in GLib.
svn path=/trunk/; revision=38683
2011-08-23 09:25:06 +00:00
Anders Broman 2450d57b38 make MAIN_MENU_USE_UIMANAGER the default.
svn path=/trunk/; revision=38657
2011-08-22 07:44:56 +00:00
Stephen Fisher a6d3e1fa30 Change || in an "if test" statement to "-o"
svn path=/trunk/; revision=38611
2011-08-18 23:48:46 +00:00
Michael Tüxen 1f9f878af8 Get --enable-ui-manager working.
svn path=/trunk/; revision=38609
2011-08-18 22:50:35 +00:00
Jörg Mayer aa22951fa8 When building with GTK3 we *must* use the ui-manager interface,
the ItemFactory stuff doesn't exists any more.

svn path=/trunk/; revision=38607
2011-08-18 20:38:25 +00:00
Jörg Mayer b87f22700e Always build with -DGTK_DISABLE_DEPRECATED. The files that
fail when built in specific configurations will disable this
option when required.

svn path=/trunk/; revision=38588
2011-08-17 17:34:56 +00:00