Commit Graph

35093 Commits

Author SHA1 Message Date
Guy Harris 6cbf6ce16c Add a new WTAP_ERR_DECOMPRESS error, and use that for errors discovered
by the gunzipping code.  Have it also supply a err_info string, and
report it.  Have file_error() supply an err_info string.

Put "the file" - or, for WTAP_ERR_DECOMPRESS, "the compressed file", to
suggest a decompression error - into the rawshark and tshark errors,
along the lines of what other programs print.

Fix a case in the Netscaler code where we weren't fetching the error
code on a read failure.

svn path=/trunk/; revision=36748
2011-04-21 09:41:52 +00:00
Anders Broman 0315e063e4 Add a cast as there seems to be a problem on some sytems
conversations_table.c: In function `ct_create_popup_menu':

conversations_table.c:1938: warning: passing arg 2 of `gtk_action_group_add_actions' discards qualifiers from pointer target type

make: *** [libui_a-conversations_table.o] Error 1

svn path=/trunk/; revision=36747
2011-04-21 08:12:55 +00:00
Anders Broman 73c91d6fa0 "Upgrade" gtk_combo to 'E'.
svn path=/trunk/; revision=36746
2011-04-21 06:05:55 +00:00
Jakub Zawadzki 27f92a4c11 Fix ep_check_canary_integrity to use proper variable.
Previously it would sigsegv (accessing (void *) -1), instead of displaying error.


svn path=/trunk/; revision=36745
2011-04-21 05:31:11 +00:00
Guy Harris ff783ad1d5 Always check whether NEXT() failed - and rename it to GZ_GETC(), as it
has semantics similar to getc().

If it fails due to an EOF, set state->err to WTAP_ERR_SHORT_READ to
report a premature EOF; otherwise, raw_read() has already set
state->err, so don't set state->err to something else - that loses the
errno value in favor of a generic "bad data" error.

svn path=/trunk/; revision=36744
2011-04-20 21:36:23 +00:00
Martin Mathieson 04e746250e Simplify the test in a loop.
This was in response to a VS Code Analysis warning.  Not sure if it was confused by lack of parenthesis, or if it detected that we had an && where both sides would always have the same value, but it was confusing.

svn path=/trunk/; revision=36743
2011-04-20 21:25:38 +00:00
Bill Meier 2eced546c1 Add code to dissect "original uTP header format"
as described in the LibuTP utp.cpp source code;
Add a kludgy heuristic to differentiate between
 original and "V1" header formats.
 TBD: validity of the heuristic; is there a better way ?

svn path=/trunk/; revision=36742
2011-04-20 20:32:26 +00:00
Anders Broman c590fd1d73 Replace the capture interface deprecated gtk_combo_new() with gtk_combo_box_entry_new_text.
svn path=/trunk/; revision=36741
2011-04-20 20:17:20 +00:00
Chris Maynard 3848ace06e Use [hi|lo]_nibble macros, leave room in str[] for invalid BCD digits to be
displayed as blanks.  Since imsi_to_str() and ip_to_str() do the same thing,
just have imsi_to_str() call ip_to_str() rather than having two different
implementations of the same thing.  Use a BCD2CHAR macro instead of doing a
table lookup.

svn path=/trunk/; revision=36740
2011-04-20 20:12:40 +00:00
Guy Harris c93f8694e3 Sigh. The "data" element of a GArray is, alas, a "gchar *", not a "void
*", and some compilers complain when you cast that pointer to something
requiring stricter alignment.  Maybe the intent is to nudge you into
thinking about whether the pointer really is properly aligned, but....

svn path=/trunk/; revision=36739
2011-04-20 18:04:43 +00:00
Guy Harris 0aeaa16426 pntohll() takes a guint8 * as an argument; there's no need to cast to a
guint64 *, and it causes clang to complain.

svn path=/trunk/; revision=36738
2011-04-20 17:53:11 +00:00
Bill Meier 42538888ea - New-style dissectors need to always return "bytes dissected" (not just when tree != NULL);
- The dissector probably shouldn't return a value for "bytes dissected" which is larger
   than the tvb length (altho there's actually no harm given the current implementation).
- Don't try to do an 'add_item' with an offset past the end of the tvb (altho again there's
   no actual harm in this case).

ToDo: Handle "original format" uTP headers.

svn path=/trunk/; revision=36737
2011-04-20 17:25:07 +00:00
Gerald Combs 453d491eae Add Makefile.common to the dependency list for register.c.
svn path=/trunk/; revision=36736
2011-04-20 17:08:40 +00:00
Bill Meier ffeff72f02 Fix a typo in a text string; use consistent indentation.
svn path=/trunk/; revision=36735
2011-04-20 16:35:42 +00:00
Martin Mathieson a02a2eed3b Properly (re)initialise structs used for keeping track of UEs/TTI.
svn path=/trunk/; revision=36734
2011-04-20 10:23:41 +00:00
Guy Harris 4bdde629bb Oh, dear, autoconf thinks clang is GCC, because it defines __GNUC__.
svn path=/trunk/; revision=36733
2011-04-20 09:31:47 +00:00
Guy Harris f4ed7e8927 By default, clang only warns about unknown -W options, it doesn't
generate an error for them.  Force them to be treated as errors, so we
correctly test whether an option is supported.

svn path=/trunk/; revision=36732
2011-04-20 09:16:44 +00:00
Guy Harris b9d4c025d1 Instead of having GCC and CLANG variables, just have
ac_supports_gcc_flags and ac_supports_W_linker_passthrough flags, the
first of which, for now, we set for GCC and clang, and the latter of
which we set for GCC, clang, and xlc (probably true for some other
compilers as well).

Rename AC_WIRESHARK_GCC_LDFLAGS_CHECK to AC_WIRESHARK_LDFLAGS_CHECK, as
it's not checking for anything GCC-specific.  (Leave
AC_WIRESHARK_GCC_CFLAGS_CHECK unrenamed for now, as the flags we test
with it are originally GCC flags that clang also supports for GCC
compatibility.)

Fix some string-equality tests to use = rather than ==; the former is
what the test/[ command uses.

Don't turn on "-no-cpp-precomp" for clang - it whines if you do.

svn path=/trunk/; revision=36731
2011-04-20 08:37:45 +00:00
Chris Maynard be832727cd Only add /SafeSEH to LDFLAGS if WIRESHARK_TARGET_PLATFORM != win64. The
Windows-7-x64 buildbot doesn't like it and reports the following:
LINK : fatal error LNK1246: '/SAFESEH' not compatible with 'x64' target machine; link without '/SAFESEH'

svn path=/trunk/; revision=36730
2011-04-20 05:21:32 +00:00
Guy Harris 05e06f7a7a First cut at support for clang. We may want to have specific items for
"supports GCC-style -W flags", etc., and may want to improve the check
for "is this clang", as well as deciding what other stuff should be done
if we have clang as well.  clang should, I think, largely be
gcc-compatible at the command line.

svn path=/trunk/; revision=36729
2011-04-20 03:22:19 +00:00
Chris Maynard 342b03c228 Added Vladimir Kazansky for his contribution to bug 5849.
svn path=/trunk/; revision=36728
2011-04-20 02:32:19 +00:00
Chris Maynard 80889668bc From Vladimir Kazansky via bug 5849: Fix msisdn_to_str() so it converts all BCD
digits and not just 1.

svn path=/trunk/; revision=36727
2011-04-20 02:24:16 +00:00
Stephen Fisher 06c5cfc945 From Georg Mueller via bug #5851: Add not handled IDs to BitTorrent
dissector


svn path=/trunk/; revision=36726
2011-04-19 21:31:02 +00:00
Jörg Mayer 4b87a3d770 CID 1161: Not really used variable
svn path=/trunk/; revision=36725
2011-04-19 21:20:15 +00:00
Jörg Mayer 8efd127f31 CID 1162: Not really used variable
svn path=/trunk/; revision=36724
2011-04-19 21:15:58 +00:00
Stephen Fisher d8a4b783da From Cecco via bug #5605: bug on gtk wireshark telephony->mtp3->msus
[doesn't show contents of window]


svn path=/trunk/; revision=36723
2011-04-19 19:52:50 +00:00
Gerald Combs b971a0ef5d Explicitly add /GS to CFLAGS and /SafeSEH & /FIXED:no to LDFLAGS.
svn path=/trunk/; revision=36722
2011-04-19 19:20:03 +00:00
Bill Meier 7d4d782fb5 Add Xiao Xiangquan to the AUTHORS file ....
svn path=/trunk/; revision=36721
2011-04-19 16:43:01 +00:00
Bill Meier 26a50ccd97 Whitespace cleanup; Remove an uneeded col_clear().
svn path=/trunk/; revision=36720
2011-04-19 16:37:39 +00:00
Stephen Fisher 9dad613f08 This file had an identical copy appended to the end of it. Remove
duplicate.


svn path=/trunk/; revision=36719
2011-04-19 16:24:29 +00:00
Anders Broman f80dcc2109 Replace the capture filter deprecated gtk_combo_new() with gtk_combo_box_entry_new_text,
svn path=/trunk/; revision=36718
2011-04-19 16:02:07 +00:00
Bill Meier f993e772f8 Set svn:eol-style & svn:keywords properties
svn path=/trunk/; revision=36717
2011-04-19 16:00:20 +00:00
Alexis La Goutte 372639e7f8 From Xiao Xiangquan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5846
A new dissector for uTorrent Transport Protocol

From me :
* Add link to spec BEP-0029
* Add note about type/version 
* Rework extensions loop
* Use 2-space indenting


svn path=/trunk/; revision=36716
2011-04-19 15:23:51 +00:00
Alexis La Goutte d059b43226 From Xiao Xiangquan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5846
A new dissector for uTorrent Transport Protocol

From me :
* Add link to spec BEP-0029
* Add note about type/version 
* Rework extensions loop
* Use 2-space indenting


svn path=/trunk/; revision=36715
2011-04-19 15:23:06 +00:00
Michael Tüxen 034373cb86 Unbreak live capture using pcapng.
svn path=/trunk/; revision=36714
2011-04-19 13:28:17 +00:00
Stig Bjørlykke 1c45c1a243 From Michael Mann via bug 2794:
Fixed display filters with obvious typos.

svn path=/trunk/; revision=36713
2011-04-19 08:22:58 +00:00
Chris Maynard 7f06b2e217 Wrap actual_len inside #ifdef DEBUG_K12 to avoid gcc 4.6.0 warning reported by
Kaul: http://www.wireshark.org/lists/wireshark-dev/201104/msg00170.html

svn path=/trunk/; revision=36710
2011-04-18 20:03:32 +00:00
Gerald Combs 0dd99df7ce We don't have any preferences, so remove the prefs.h include. It doesn't
look like we need a reg_handoff routine either so remove it as well.
Fixes Coverity CID 1189.

svn path=/trunk/; revision=36709
2011-04-18 19:34:40 +00:00
Alexis La Goutte 1b5e64fde6 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36708
2011-04-18 18:36:44 +00:00
Alexis La Goutte af85ec17a2 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36707
2011-04-18 18:36:23 +00:00
Alexis La Goutte 45ed74451e Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36705
2011-04-18 18:06:22 +00:00
Alexis La Goutte 3dcbd7c392 Fix 100(!) Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36704
2011-04-18 17:55:35 +00:00
Alexis La Goutte eff30da7a4 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36703
2011-04-18 17:48:23 +00:00
Alexis La Goutte c127eb2d51 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36702
2011-04-18 17:47:16 +00:00
Alexis La Goutte 50cf6ca9c3 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36701
2011-04-18 17:44:17 +00:00
Alexis La Goutte 8b61d83f5e Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36700
2011-04-18 17:38:08 +00:00
Alexis La Goutte e95efe228e Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36699
2011-04-18 17:35:25 +00:00
Stig Bjørlykke 27344a90fe Removed some unneeded assignments.
Found by clang.

svn path=/trunk/; revision=36698
2011-04-18 15:29:25 +00:00
Stig Bjørlykke 9739656c71 Make it build.
svn path=/trunk/; revision=36697
2011-04-18 15:27:27 +00:00
Anders Broman 9f2e70aad5 Start merging from packet-pdcp-lte.c
svn path=/trunk/; revision=36696
2011-04-18 14:38:18 +00:00