Commit Graph

713 Commits

Author SHA1 Message Date
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
Bill Meier 4bf797bcc0 Use '-D_FORTIFY_SOURCE=2' when compiling with GCC or CLang.
For info see: http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html


svn path=/trunk/; revision=38467
2011-08-11 02:14:20 +00:00
Bill Meier a5abe51580 Add -DG_DISABLE_SINGLE_INCLUDES to CFLAGS
Also: Move the addition of -DG_DISABLE_DEPRECATED to CFLAGS
      so that it actually takes effect.

svn path=/trunk/; revision=38466
2011-08-11 02:08:30 +00:00
Jeff Morriss bf95c7b5e4 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5608 :
getopt() can/should normally be found in unistd.h, so:

- When testing for getopt(), define that we HAVE_GETOPT instead of
  HAVE_GETOPT_H (to avoid confusion).
- Don't attempt to include getopt.h: not all OS's have it (for example,
  Solaris 9 does not).
- (All the places which need getopt already include unistd.h (if we have it).)

If this breaks things on some OS, we might need (a real) HAVE_GETOPT_H check.

svn path=/trunk/; revision=38437
2011-08-09 21:02:10 +00:00
Jörg Mayer e22f19f645 MAIN_MENU_USE_UIMANAGER is also used in some includes, not only
in .c files, so the aproach to #undef GTK_DISABLE_DEPRECATED was
wrong.
Only enable GTK_DISABLE_DEPRECATED if MAIN_MENU_USE_UIMANAGER is
defined.

svn path=/trunk/; revision=38420
2011-08-08 20:35:36 +00:00
Jörg Mayer 6ef6042641 GTK3 stuff:
- Update Status file
- configure.in: start GSEALing with 2.20 and not 2.22
- configure.in/config.nmake/CMakeLists.txt: enable GTK_DISABLE_SINGLE_INCLUDE
    and GTK_DISABLE_DEPRECATED
- menus.c: If not building with UI_MANAGER, disable GTK_DISABLE_DEPRECATED

svn path=/trunk/; revision=38404
2011-08-08 13:39:21 +00:00
Jörg Mayer 553c565699 mate_grammar.lemon:
- Fix a bug my previous patch introduced.

mate/:
- Unset G_DISABLE_DEPRECATED for the mate files.

CMakeLists.txt
configure.in:
- Build with -DG_DISABLE_DEPRECATED so further usage of
  deprecated glib functions will be detected.

svn path=/trunk/; revision=38393
2011-08-07 18:35:36 +00:00
Jeff Morriss c330acaa8c As suggested by Anders: only compile with GSEAL_ENABLE if we're using GTK 2.22 or higher (and not GTK3)
svn path=/trunk/; revision=38341
2011-08-04 21:38:31 +00:00
Bill Meier 1293999174 '-Wno-error=unused-but-set-parameter' not req'd since no such warnings in Wireshark compile.
svn path=/trunk/; revision=38318
2011-08-03 15:24:06 +00:00
Bill Meier 6e97a2e143 For now: treat GCC 4.6 'unused-but-set' reports as just warnings (i.e., when -Werror).
GCC 4.6 has added 'unused but set' reports so this change allows builds to proceed without
erroring out for those building from SVN with GCC 4.6.

(AFAIK Wireshark source distributions do not enable -Werror).

This change can be removed (at least globally) once the code as been fixed.



svn path=/trunk/; revision=38311
2011-08-02 16:17:25 +00:00
Jörg Mayer 9283597c75 Configuring with --enable-ui-manager would not work - fix this.
svn path=/trunk/; revision=38287
2011-07-31 13:32:05 +00:00
Stig Bjørlykke 050b61d4cf Print a more correct error message when missing gtk3.
This fixes bug 6181.

svn path=/trunk/; revision=38262
2011-07-29 19:35:16 +00:00
Stig Bjørlykke 3834af4bc0 Try build with GSEAL_ENABLE if not gtk3 again.
svn path=/trunk/; revision=38261
2011-07-29 17:00:59 +00:00
Stig Bjørlykke 4f3bcc86cc Removed building with GSEAL_ENABLE, does not work yet.
svn path=/trunk/; revision=38256
2011-07-29 12:06:24 +00:00
Stig Bjørlykke 693ebda5d8 Build with GSEAL_ENABLE if not gtk3.
svn path=/trunk/; revision=38255
2011-07-29 11:04:58 +00:00
Jörg Mayer e7c7244bfe Back out my last changes to configure.in - they broke too much
svn path=/trunk/; revision=38168
2011-07-22 10:17:58 +00:00
Jörg Mayer cf55ea274e When moving stuff around, move it all.
svn path=/trunk/; revision=38167
2011-07-22 09:50:30 +00:00
Jörg Mayer be8667d7ad Fix the order of tests: the test for wireshark needs to run after
the test for gtk.

svn path=/trunk/; revision=38163
2011-07-22 05:50:45 +00:00
Guy Harris 6eec1f97bb Regularize style a bit in help messages.
Clean up capitalization.

Fix a comment.

svn path=/trunk/; revision=38130
2011-07-20 05:49:24 +00:00