Commit Graph

47136 Commits

Author SHA1 Message Date
Jakub Zawadzki 3f5665a6b1 Add functions hf_try_val_to_str[_const]
svn path=/trunk/; revision=50190
2013-06-27 17:26:23 +00:00
Jakub Zawadzki 1895c1c5a0 cleanup, use packet_list_iter_nth_child() in another place.
svn path=/trunk/; revision=50189
2013-06-27 17:12:23 +00:00
Luis Ontanon 0bdc0efc46 get main_window_update out of the way... pass an update_cb to the capture_sync stuff
... as per the XXX comment removed from tshark.c this was a mess to keep the linker
happy... I couldn't!

I did this without even understanding whether calling main_window_update was realy
necessary in most cases. I guess nothing or more specific update cbs would be best.


svn path=/trunk/; revision=50188
2013-06-27 17:10:50 +00:00
Guy Harris b450609a55 For now, don't turn on -Wcast-align by default. There are at least some
bugs it points out that probably mean the code won't work on machines
that require alignment (e.g., SPARC machines), but we'll turn it on once
we fix them.  (clang is fussier than GCC about this.)

svn path=/trunk/; revision=50187
2013-06-27 10:35:06 +00:00
Guy Harris f3f156073b Don't assume the system include files are under /usr/include; trick the
compiler into saying where they are, and use that.

Patch a bug in PortAudio pa_stable_v19_20111121 that clang found.

svn path=/trunk/; revision=50186
2013-06-27 10:30:33 +00:00
Pascal Quantin 9334a49cb1 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8857 :
Do not assume that we must have at least 1 character present before \r\n

svn path=/trunk/; revision=50185
2013-06-27 10:17:39 +00:00
Evan Huus 31bd48bce3 *sigh*
From the comment above wmem_tree_insert32_array():
 * If you use ...32_array() calls you MUST make sure that every single node
 * you add to a specific tree always has a key of exactly the same number of
 * keylen words or things will most likely crash. Or at least that every single
 * item that sits behind the same top level node always have exactly the same
 * number of words.

So clearly generating thousands of keys with random lengths while testing is
going to cause problems. Generate a set of random lengths, then use those
lengths consistently (but still generating random keys of those lengths).

Should hopefully fix the intermittent build-bot failures.

(unfortunately this does not manifest nicely, and I cannot see an easy way to
assert it so that we catch other people trying to use different-length key
subtrees)

svn path=/trunk/; revision=50184
2013-06-27 03:44:48 +00:00
Luis Ontanon e48b0084e1 MS: Pong from the dispatcher!
svn path=/trunk/; revision=50183
2013-06-27 03:41:48 +00:00
Evan Huus ffe6d9c4d6 Misc little cleanups to wmem tree (comments, whitespace, assertions)
svn path=/trunk/; revision=50182
2013-06-27 03:01:53 +00:00
Evan Huus 32f4010527 Remove debugging lines from wmem_test, I think I've figured out the problem.
svn path=/trunk/; revision=50181
2013-06-27 03:00:33 +00:00
Michael Mann 11cc4642a3 From Audric Schiltknecht, bug 8521 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8521)
According to ETSI TS 102 771 (GSE implementation guidelines), "mandatory extension headers" - when GSE's protocol type field is (strictly) less than 256 (0x100) - are of 'pre-defined length (and format) that must be known by all GSE receivers'.

svn path=/trunk/; revision=50180
2013-06-27 02:34:57 +00:00
Michael Mann 9672f3d6a4 Bugfix implementation of RFC 4379. Reported through bug 8835 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8835)
svn path=/trunk/; revision=50179
2013-06-27 01:15:24 +00:00
Guy Harris 04cc1e2fb5 Don't assume that compilers not named "clang" will, by default, report
an error, or not issue warnings, by default if you give them an unknown
-f flag.  Instead, test that flag with all compilers, and use -Werror to
force it to error out.

As with C/C++ flags, so with C++-only flags.

svn path=/trunk/; revision=50178
2013-06-27 00:45:39 +00:00
Guy Harris eaf5e3fd1f Don't assume that compilers that need an extra option to report errors,
rather than just warnings, for unknown warning options are named
"clang"; they might not be.

svn path=/trunk/; revision=50177
2013-06-26 22:43:51 +00:00
Jakub Zawadzki 97d59088b0 #gtk #packet-list simplify, use gtk_tree_view_column_add_attribute() for text attribute.
svn path=/trunk/; revision=50176
2013-06-26 22:03:57 +00:00
Guy Harris 53bc39d6ed Another clang issue to work around:
libgcrypt expects gnu89-style semantics for "inline"; GCC defaults to
gnu89, but clang defaults to gnu99.

svn path=/trunk/; revision=50175
2013-06-26 21:29:38 +00:00
Guy Harris c2e995bd6d Suppress -Wformat-nonliteral when building GLib, to avoid a clang bug
where it issues bogus warnings.

svn path=/trunk/; revision=50174
2013-06-26 19:38:47 +00:00
Jeff Morriss ffc5183fd2 (Attempt to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8813 :
Enable INET6 checking on Solaris versions other than 5.8.

(Yes, theoretically this should be checking for Solaris 5.7 or later.  I'm
going to go out on a limb and assume that no one is actually still using 5.7
or, if they are, they aren't trying to compile a modern Wireshark on it...)

svn path=/trunk/; revision=50173
2013-06-26 18:19:43 +00:00
Jakub Zawadzki 0426c05d49 packet-editor: Allow focus for byteview, it should fix problems with field hexeditor not getting key-press-event.
Generally it should be also safe for builds without packet-editor, just in case ifdef it.

svn path=/trunk/; revision=50172
2013-06-26 17:15:25 +00:00
Pascal Quantin faecb6b9a8 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8853 :
Add a missing subtree initialization

svn path=/trunk/; revision=50171
2013-06-26 16:23:54 +00:00
Jeff Morriss 681efb2de3 Don't link wireshark against the Qt libraries and don't like wireshark-qt
against the Gtk+ libraries.

(I didn't notice this before because the resulting programs aren't, on my
system, actually linked against the libraries they don't use--presumably
because of the "-Wl,--as-needed" flag.)

svn path=/trunk/; revision=50170
2013-06-26 15:12:50 +00:00
Michael Mann 8da89ad091 Adjust when name_len offset is used. Part of bug 8776 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776)
From Dario Lombardo

svn path=/trunk/; revision=50169
2013-06-26 14:09:10 +00:00
Jeff Morriss cbe96aeb4d echld is not an optional package, it's an optional Wireshark feature: use
--enable-echld rather than --with-echld to control whether it is built.

svn path=/trunk/; revision=50168
2013-06-26 13:52:52 +00:00
Jeff Morriss 6df12cbcf7 If the user enables gtk3, (silently) disable gtk2 rather than forcing the user
to also specify --without-gtk2 or complaining that they have specified both.

svn path=/trunk/; revision=50167
2013-06-26 13:26:25 +00:00
Michael Mann 6e1f213fca openSAFETY: CRC Maintenance, new CRC, new expert interface implemented. Bug 8847 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8847)
From Roland Knall

svn path=/trunk/; revision=50166
2013-06-26 12:11:08 +00:00
Jeff Morriss 500d399393 Move tap-*-common.{h,c} into ui/ since that's the home for common UI functions.
svn path=/trunk/; revision=50165
2013-06-26 02:12:12 +00:00
Jeff Morriss bbf6a3766e Move tempfile.{h,c} into wsutil.
svn path=/trunk/; revision=50163
2013-06-26 01:14:35 +00:00
Guy Harris 3ab335948b Nothing uses the HAVE_GTK #define, so get rid of it. (Keep the
Makefile.am conditional, however.)

svn path=/trunk/; revision=50162
2013-06-26 00:48:58 +00:00
Jeff Morriss 9ef2507e34 editcap no longer has to link against nstime.o, it's in libwsutil now.
svn path=/trunk/; revision=50161
2013-06-26 00:45:38 +00:00
Jeff Morriss 003ba14660 This file is in the top-level directory. Don't try to include things from ../
svn path=/trunk/; revision=50160
2013-06-26 00:20:56 +00:00
Jeff Morriss 74dc568ef1 As pointed out by Guy: timestats uses packet_info so it belongs in epan
not wsutil.

svn path=/trunk/; revision=50159
2013-06-26 00:18:44 +00:00
Jeff Morriss e101fe1160 Put wsutil/*.h into the wireshark-dev package (in a blind attempt to fix the debian packaging step). Why do we allow/encourage a wirshark-dev package? IMO Wireshark (C language) development should only be done from the source (a tarball or better yet SVN).
svn path=/trunk/; revision=50158
2013-06-25 23:41:06 +00:00
Jeff Morriss 2259c5c47d There's no need to compile timestats.c any more--it's now in libwsutil.
svn path=/trunk/; revision=50157
2013-06-25 23:34:07 +00:00
Evan Huus a69be407ab Arrays seems to be where the failure is, so remove excess verbiage around other
tests, and add more details to that section.

Now we wait for the buildbots to fail again...

svn path=/trunk/; revision=50156
2013-06-25 22:32:53 +00:00
Jeff Morriss c56ea13cdb Link this plugin with libwsutil too (in order to pick up time symbols).
svn path=/trunk/; revision=50155
2013-06-25 22:15:11 +00:00
Jeff Morriss a441793cba Move a couple of time-related modules into wsutil.
A bunch of files didn't really need to include these header files so remove
the include line rather than changing it.

svn path=/trunk/; revision=50154
2013-06-25 22:02:20 +00:00
Guy Harris 847fbeefdb Fix build with packet editor enabled. (Fix a typo while we're at it.)
svn path=/trunk/; revision=50153
2013-06-25 21:45:56 +00:00
Luis Ontanon 0a060270b3 Last changes to autofoo, rename the files as they live now in their own dir...
svn path=/trunk/; revision=50152
2013-06-25 21:09:29 +00:00
Pascal Quantin 9216d338f0 From Reinhard Speyerer via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8851:
ansi_637_tele dissector displays MSB as MBS for Call-Back Number

svn path=/trunk/; revision=50151
2013-06-25 21:05:28 +00:00
Evan Huus 242a37ea3e Look for moc-qt4 before moc and uic-qt4 before uic, because (at least on my
machine, with both qt4 and qt5 development tools installed), moc and uic are the
qt5 versions, but the rest of the configuration process grabs qt4 headers and
link paths, leading to a lot of weird errors.

svn path=/trunk/; revision=50150
2013-06-25 20:49:16 +00:00
Jeff Morriss 9cb2e270d6 Of course I forgot to test the normal/default case (where no --with arguments
are given)...

Actually default --with-gtk2 to "yes".

svn path=/trunk/; revision=50149
2013-06-25 20:06:33 +00:00
Jeff Morriss fd95d841b8 Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).
./configure now accepts:
	--with-gtk2 :  enabled by default; exclusive of --with-gtk3
	--with-gtk3 : disabled by default; exclusive of --with-gtk2
	--with-qt   : disabled by default, can be specified with gtk
	--enable-wireshark : controls whether *any* GUI is built

If Qt is enabled then a new program is created: "wireshark-qt".  "wireshark"
remains the Gtk+ version.

svn path=/trunk/; revision=50147
2013-06-25 19:51:53 +00:00
Bill Meier 8b9135e9b5 Indentation/Whitespace cleanup;
Add editor modelines.

svn path=/trunk/; revision=50146
2013-06-25 19:38:15 +00:00
Michael Mann 1d5f640230 Bugfix iec104 dissector, bug 8849 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8849)
From Jiří Engelthaler

1) Wrong bits definitions for SIQ.BL, SIQ.SB, SIQ.NT, SIQ.IV, QDS.BL, QDS.SB, QDS.NT, QDS.IV
2) Invalid field abbrev for VTI Transient
3) Wrong bit size for SCO.QU, DCO.QU, RCO.QU
4) Changes from BASE_DEC to BASE_HEX
5) Several code style changes

svn path=/trunk/; revision=50145
2013-06-25 19:32:39 +00:00
Jakub Zawadzki f0c9b34b55 Allocate memory for col_text[_len] when really needed
remove columnized bit, now the same can be done with col_text.

svn path=/trunk/; revision=50144
2013-06-25 18:27:31 +00:00
Jakub Zawadzki f56d9b49b3 packet_list_iter_children() simplify, just call packet_list_iter_nth_child(..., 0)
svn path=/trunk/; revision=50143
2013-06-25 18:07:33 +00:00
Luis Ontanon ab6c7a8bce remove the Makefile.nmake target to avoid errors in dist...
svn path=/trunk/; revision=50142
2013-06-25 17:55:47 +00:00
Luis Ontanon e200f6cbf9 This should get cmake to ignore echld...
svn path=/trunk/; revision=50141
2013-06-25 17:43:52 +00:00
Chris Maynard ce088c334d makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
Gerald Combs 03febfc819 From Dirk Jagdmann: Use a guint32 for IPv4 addresses. Fixes compilation
on OS X + Cmake.

svn path=/trunk/; revision=50139
2013-06-25 13:31:19 +00:00