Commit Graph

35102 Commits

Author SHA1 Message Date
etxrab c7cc2a69cf Include time.h as compilation might fail with old gilb (2.4)
Thanks Jeff.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36767 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:56:06 +00:00
alagoutte 405306e6a6 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36766 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:45:37 +00:00
alagoutte 89cf00d700 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36765 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:45:14 +00:00
alagoutte 0c4f1c936f Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36764 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:43:23 +00:00
alagoutte e05789fbfd Remove is_continuation_line variable (Unused for 3 years with add SMTP Command Pipelining (RFC2920) Rev24989)
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang 




git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36763 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:42:15 +00:00
alagoutte d0040cd971 Fix Dead Store (Dead nested assignment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36762 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:35:09 +00:00
alagoutte 561a169243 Fix Dead Store (Dead nested assignment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36761 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:34:43 +00:00
alagoutte 57729387af Fix Dead Store (Dead nested assignment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36760 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:34:22 +00:00
alagoutte 269d0f9a71 Fix Dead Store (Dead nested assignment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36759 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:33:59 +00:00
alagoutte 783ae8cae3 Fix Dead Store (Dead nested assignment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36758 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:33:43 +00:00
alagoutte 87b1ef21c8 Fix Dead Store (Dead nested assignment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36757 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:33:23 +00:00
alagoutte 279420e6c1 Fix Dead Store (Dead nested assignment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36756 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:33:04 +00:00
alagoutte 1e8e8488be Fix Dead Store (Dead nested assignment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36755 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:32:34 +00:00
alagoutte fac2537dc7 Fix Dead Store (Dead nested assignment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36754 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:32:11 +00:00
alagoutte 0472fe62f0 Fix Dead Store (Dead nested assignment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36753 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:31:42 +00:00
alagoutte 0c9dfdf29f Fix Dead Store (Dead nested assignment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36752 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:31:04 +00:00
stig 9214e9dc97 Include config.h only from .c files.
This avoids a warning building epan.c which includes both config.h and wslua.h
(duplicate defines from config.h)


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36751 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 13:13:39 +00:00
etxrab 2f94b3d532 Revert the previous commit, I was confused :-)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36750 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 12:04:02 +00:00
darkjames 43d81ff849 Add missing code to handle fields with an extended value_string (BASE_EXT_STRING)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36749 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 09:50:12 +00:00
guy bf5d8d18e3 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36748 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 09:41:52 +00:00
etxrab bf80a1d2d0 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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36747 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 08:12:55 +00:00
etxrab cd8f7ee43f "Upgrade" gtk_combo to 'E'.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36746 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 06:05:55 +00:00
darkjames de118d2f79 Fix ep_check_canary_integrity to use proper variable.
Previously it would sigsegv (accessing (void *) -1), instead of displaying error.



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36745 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-21 05:31:11 +00:00
guy 7cab4d461e 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36744 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 21:36:23 +00:00
martinm f325852763 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36743 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 21:25:38 +00:00
wmeier 4cae091b67 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 ?


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36742 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 20:32:26 +00:00
etxrab 3986c60cdf Replace the capture interface deprecated gtk_combo_new() with gtk_combo_box_entry_new_text.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36741 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 20:17:20 +00:00
cmaynard 8a51d27824 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36740 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 20:12:40 +00:00
guy cb037f756a 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....


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36739 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 18:04:43 +00:00
guy 2cec680a91 pntohll() takes a guint8 * as an argument; there's no need to cast to a
guint64 *, and it causes clang to complain.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36738 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 17:53:11 +00:00
wmeier 90edb5ffbb - 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36737 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 17:25:07 +00:00
gerald fa3f0e091b Add Makefile.common to the dependency list for register.c.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36736 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 17:08:40 +00:00
wmeier 2424925b45 Fix a typo in a text string; use consistent indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36735 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 16:35:42 +00:00
martinm e75b495492 Properly (re)initialise structs used for keeping track of UEs/TTI.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36734 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 10:23:41 +00:00
guy 0bb91d64fb Oh, dear, autoconf thinks clang is GCC, because it defines __GNUC__.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36733 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 09:31:47 +00:00
guy ec6ad6f311 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36732 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 09:16:44 +00:00
guy aaa2afdae2 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36731 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 08:37:45 +00:00
cmaynard cf98e35581 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'


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36730 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 05:21:32 +00:00
guy 7184e0dcd9 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36729 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 03:22:19 +00:00
cmaynard 9f0c8d70a2 Added Vladimir Kazansky for his contribution to bug 5849.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36728 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 02:32:19 +00:00
cmaynard 93715c5e3d From Vladimir Kazansky via bug 5849: Fix msisdn_to_str() so it converts all BCD
digits and not just 1.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36727 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20 02:24:16 +00:00
sfisher 89bddc98f5 From Georg Mueller via bug #5851: Add not handled IDs to BitTorrent
dissector



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36726 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-19 21:31:02 +00:00
jmayer 1035ed827b CID 1161: Not really used variable
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36725 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-19 21:20:15 +00:00
jmayer 0ae16226cf CID 1162: Not really used variable
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36724 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-19 21:15:58 +00:00
sfisher 7df463a3ca From Cecco via bug #5605: bug on gtk wireshark telephony->mtp3->msus
[doesn't show contents of window]



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36723 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-19 19:52:50 +00:00
gerald 34b9d5666b Explicitly add /GS to CFLAGS and /SafeSEH & /FIXED:no to LDFLAGS.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36722 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-19 19:20:03 +00:00
wmeier 08bc614010 Add Xiao Xiangquan to the AUTHORS file ....
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36721 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-19 16:43:01 +00:00
wmeier 3b42b1939f Whitespace cleanup; Remove an uneeded col_clear().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36720 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-19 16:37:39 +00:00
sfisher 1619c9b957 This file had an identical copy appended to the end of it. Remove
duplicate.



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36719 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-19 16:24:29 +00:00
etxrab 08ac0e5c8b Replace the capture filter deprecated gtk_combo_new() with gtk_combo_box_entry_new_text,
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36718 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-19 16:02:07 +00:00