obnox/wireshark/wip.git
13 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Thu, 21 Apr 2011 13:45:14 +0000 (13:45 +0000)]
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

13 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Thu, 21 Apr 2011 13:43:23 +0000 (13:43 +0000)]
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

13 years agoRemove is_continuation_line variable (Unused for 3 years with add SMTP Command Pipeli...
alagoutte [Thu, 21 Apr 2011 13:42:15 +0000 (13:42 +0000)]
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

13 years agoFix Dead Store (Dead nested assignment) Warning found by Clang
alagoutte [Thu, 21 Apr 2011 13:35:09 +0000 (13:35 +0000)]
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

13 years agoFix Dead Store (Dead nested assignment) Warning found by Clang
alagoutte [Thu, 21 Apr 2011 13:34:43 +0000 (13:34 +0000)]
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

13 years agoFix Dead Store (Dead nested assignment) Warning found by Clang
alagoutte [Thu, 21 Apr 2011 13:34:22 +0000 (13:34 +0000)]
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

13 years agoFix Dead Store (Dead nested assignment) Warning found by Clang
alagoutte [Thu, 21 Apr 2011 13:33:59 +0000 (13:33 +0000)]
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

13 years agoFix Dead Store (Dead nested assignment) Warning found by Clang
alagoutte [Thu, 21 Apr 2011 13:33:43 +0000 (13:33 +0000)]
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

13 years agoFix Dead Store (Dead nested assignment) Warning found by Clang
alagoutte [Thu, 21 Apr 2011 13:33:23 +0000 (13:33 +0000)]
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

13 years agoFix Dead Store (Dead nested assignment) Warning found by Clang
alagoutte [Thu, 21 Apr 2011 13:33:04 +0000 (13:33 +0000)]
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

13 years agoFix Dead Store (Dead nested assignment) Warning found by Clang
alagoutte [Thu, 21 Apr 2011 13:32:34 +0000 (13:32 +0000)]
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

13 years agoFix Dead Store (Dead nested assignment) Warning found by Clang
alagoutte [Thu, 21 Apr 2011 13:32:11 +0000 (13:32 +0000)]
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

13 years agoFix Dead Store (Dead nested assignment) Warning found by Clang
alagoutte [Thu, 21 Apr 2011 13:31:42 +0000 (13:31 +0000)]
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

13 years agoFix Dead Store (Dead nested assignment) Warning found by Clang
alagoutte [Thu, 21 Apr 2011 13:31:04 +0000 (13:31 +0000)]
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

13 years agoInclude config.h only from .c files.
stig [Thu, 21 Apr 2011 13:13:39 +0000 (13:13 +0000)]
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

13 years agoRevert the previous commit, I was confused :-)
etxrab [Thu, 21 Apr 2011 12:04:02 +0000 (12:04 +0000)]
Revert the previous commit, I was confused :-)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36750 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd missing code to handle fields with an extended value_string (BASE_EXT_STRING)
darkjames [Thu, 21 Apr 2011 09:50:12 +0000 (09:50 +0000)]
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

13 years agoAdd a new WTAP_ERR_DECOMPRESS error, and use that for errors discovered
guy [Thu, 21 Apr 2011 09:41:52 +0000 (09:41 +0000)]
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

13 years agoAdd a cast as there seems to be a problem on some sytems
etxrab [Thu, 21 Apr 2011 08:12:55 +0000 (08:12 +0000)]
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

13 years ago"Upgrade" gtk_combo to 'E'.
etxrab [Thu, 21 Apr 2011 06:05:55 +0000 (06:05 +0000)]
"Upgrade" gtk_combo to 'E'.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36746 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix ep_check_canary_integrity to use proper variable.
darkjames [Thu, 21 Apr 2011 05:31:11 +0000 (05:31 +0000)]
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

13 years agoAlways check whether NEXT() failed - and rename it to GZ_GETC(), as it
guy [Wed, 20 Apr 2011 21:36:23 +0000 (21:36 +0000)]
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

13 years agoSimplify the test in a loop.
martinm [Wed, 20 Apr 2011 21:25:38 +0000 (21:25 +0000)]
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

13 years agoAdd code to dissect "original uTP header format"
wmeier [Wed, 20 Apr 2011 20:32:26 +0000 (20:32 +0000)]
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

13 years agoReplace the capture interface deprecated gtk_combo_new() with gtk_combo_box_entry_new...
etxrab [Wed, 20 Apr 2011 20:17:20 +0000 (20:17 +0000)]
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

13 years agoUse [hi|lo]_nibble macros, leave room in str[] for invalid BCD digits to be
cmaynard [Wed, 20 Apr 2011 20:12:40 +0000 (20:12 +0000)]
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

13 years agoSigh. The "data" element of a GArray is, alas, a "gchar *", not a "void
guy [Wed, 20 Apr 2011 18:04:43 +0000 (18:04 +0000)]
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

13 years agopntohll() takes a guint8 * as an argument; there's no need to cast to a
guy [Wed, 20 Apr 2011 17:53:11 +0000 (17:53 +0000)]
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

13 years ago- New-style dissectors need to always return "bytes dissected" (not just when tree...
wmeier [Wed, 20 Apr 2011 17:25:07 +0000 (17:25 +0000)]
- 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

13 years agoAdd Makefile.common to the dependency list for register.c.
gerald [Wed, 20 Apr 2011 17:08:40 +0000 (17:08 +0000)]
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

13 years agoFix a typo in a text string; use consistent indentation.
wmeier [Wed, 20 Apr 2011 16:35:42 +0000 (16:35 +0000)]
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

13 years agoProperly (re)initialise structs used for keeping track of UEs/TTI.
martinm [Wed, 20 Apr 2011 10:23:41 +0000 (10:23 +0000)]
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

13 years agoOh, dear, autoconf thinks clang is GCC, because it defines __GNUC__.
guy [Wed, 20 Apr 2011 09:31:47 +0000 (09:31 +0000)]
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

13 years agoBy default, clang only warns about unknown -W options, it doesn't
guy [Wed, 20 Apr 2011 09:16:44 +0000 (09:16 +0000)]
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

13 years agoInstead of having GCC and CLANG variables, just have
guy [Wed, 20 Apr 2011 08:37:45 +0000 (08:37 +0000)]
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

13 years agoOnly add /SafeSEH to LDFLAGS if WIRESHARK_TARGET_PLATFORM != win64. The
cmaynard [Wed, 20 Apr 2011 05:21:32 +0000 (05:21 +0000)]
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

13 years agoFirst cut at support for clang. We may want to have specific items for
guy [Wed, 20 Apr 2011 03:22:19 +0000 (03:22 +0000)]
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

13 years agoAdded Vladimir Kazansky for his contribution to bug 5849.
cmaynard [Wed, 20 Apr 2011 02:32:19 +0000 (02:32 +0000)]
Added Vladimir Kazansky for his contribution to bug 5849.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36728 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Vladimir Kazansky via bug 5849: Fix msisdn_to_str() so it converts all BCD
cmaynard [Wed, 20 Apr 2011 02:24:16 +0000 (02:24 +0000)]
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

13 years agoFrom Georg Mueller via bug #5851: Add not handled IDs to BitTorrent
sfisher [Tue, 19 Apr 2011 21:31:02 +0000 (21:31 +0000)]
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

13 years agoCID 1161: Not really used variable
jmayer [Tue, 19 Apr 2011 21:20:15 +0000 (21:20 +0000)]
CID 1161: Not really used variable

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36725 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCID 1162: Not really used variable
jmayer [Tue, 19 Apr 2011 21:15:58 +0000 (21:15 +0000)]
CID 1162: Not really used variable

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36724 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Cecco via bug #5605: bug on gtk wireshark telephony->mtp3->msus
sfisher [Tue, 19 Apr 2011 19:52:50 +0000 (19:52 +0000)]
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

13 years agoExplicitly add /GS to CFLAGS and /SafeSEH & /FIXED:no to LDFLAGS.
gerald [Tue, 19 Apr 2011 19:20:03 +0000 (19:20 +0000)]
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

13 years agoAdd Xiao Xiangquan to the AUTHORS file ....
wmeier [Tue, 19 Apr 2011 16:43:01 +0000 (16:43 +0000)]
Add Xiao Xiangquan to the AUTHORS file ....

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36721 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoWhitespace cleanup; Remove an uneeded col_clear().
wmeier [Tue, 19 Apr 2011 16:37:39 +0000 (16:37 +0000)]
Whitespace cleanup; Remove an uneeded col_clear().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36720 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoThis file had an identical copy appended to the end of it. Remove
sfisher [Tue, 19 Apr 2011 16:24:29 +0000 (16:24 +0000)]
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

13 years agoReplace the capture filter deprecated gtk_combo_new() with gtk_combo_box_entry_new_text,
etxrab [Tue, 19 Apr 2011 16:02:07 +0000 (16:02 +0000)]
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

13 years agoSet svn:eol-style & svn:keywords properties
wmeier [Tue, 19 Apr 2011 16:00:20 +0000 (16:00 +0000)]
Set svn:eol-style & svn:keywords properties

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36717 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Xiao Xiangquan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5846
alagoutte [Tue, 19 Apr 2011 15:23:51 +0000 (15:23 +0000)]
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36716 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Xiao Xiangquan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5846
alagoutte [Tue, 19 Apr 2011 15:23:06 +0000 (15:23 +0000)]
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36715 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUnbreak live capture using pcapng.
tuexen [Tue, 19 Apr 2011 13:28:17 +0000 (13:28 +0000)]
Unbreak live capture using pcapng.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36714 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Michael Mann via bug 2794:
stig [Tue, 19 Apr 2011 08:22:58 +0000 (08:22 +0000)]
From Michael Mann via bug 2794:
Fixed display filters with obvious typos.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36713 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoWrap actual_len inside #ifdef DEBUG_K12 to avoid gcc 4.6.0 warning reported by
cmaynard [Mon, 18 Apr 2011 20:03:32 +0000 (20:03 +0000)]
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36710 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoWe don't have any preferences, so remove the prefs.h include. It doesn't
gerald [Mon, 18 Apr 2011 19:34:40 +0000 (19:34 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36709 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 18 Apr 2011 18:36:44 +0000 (18:36 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36708 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 18 Apr 2011 18:36:23 +0000 (18:36 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36707 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 18 Apr 2011 18:06:22 +0000 (18:06 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36705 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix 100(!) Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 18 Apr 2011 17:55:35 +0000 (17:55 +0000)]
Fix 100(!) Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36704 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 18 Apr 2011 17:48:23 +0000 (17:48 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36703 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 18 Apr 2011 17:47:16 +0000 (17:47 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36702 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 18 Apr 2011 17:44:17 +0000 (17:44 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36701 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 18 Apr 2011 17:38:08 +0000 (17:38 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36700 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 18 Apr 2011 17:35:25 +0000 (17:35 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36699 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemoved some unneeded assignments.
stig [Mon, 18 Apr 2011 15:29:25 +0000 (15:29 +0000)]
Removed some unneeded assignments.

Found by clang.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36698 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMake it build.
stig [Mon, 18 Apr 2011 15:27:27 +0000 (15:27 +0000)]
Make it build.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36697 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoStart merging from packet-pdcp-lte.c
etxrab [Mon, 18 Apr 2011 14:38:18 +0000 (14:38 +0000)]
Start merging from packet-pdcp-lte.c

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36696 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUpdate Motonori Shindo's email address at the author's request. Fixes bug 5840.
cmaynard [Mon, 18 Apr 2011 02:16:36 +0000 (02:16 +0000)]
Update Motonori Shindo's email address at the author's request. Fixes bug 5840.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36695 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRetire a preference that can be always on now.
martinm [Sun, 17 Apr 2011 21:43:20 +0000 (21:43 +0000)]
Retire a preference that can be always on now.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36693 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAllow signaling protocol (e.g. RRC) to set number of SN bits
martinm [Sun, 17 Apr 2011 21:34:47 +0000 (21:34 +0000)]
Allow signaling protocol (e.g. RRC) to set number of SN bits
PDCP should use for DRB channels.

Not yet called by RRC.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36692 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDecode the SI value in DATA messages correclty.
tuexen [Sun, 17 Apr 2011 19:37:46 +0000 (19:37 +0000)]
Decode the SI value in DATA messages correclty.
This fixes bug 5834.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36691 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoOne more unused argument.
stig [Sun, 17 Apr 2011 19:17:46 +0000 (19:17 +0000)]
One more unused argument.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36690 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemoved unneeded assignments.
stig [Sun, 17 Apr 2011 19:07:17 +0000 (19:07 +0000)]
Removed unneeded assignments.

Found by clang.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36689 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMark unused arguments with _U_.
stig [Sun, 17 Apr 2011 19:04:54 +0000 (19:04 +0000)]
Mark unused arguments with _U_.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36688 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemoved unneeded assignments to self.
stig [Sun, 17 Apr 2011 19:01:26 +0000 (19:01 +0000)]
Removed unneeded assignments to self.

Found by clang.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36687 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemoved an unneeded assignment, they are both always 0.
stig [Sun, 17 Apr 2011 18:59:17 +0000 (18:59 +0000)]
Removed an unneeded assignment, they are both always 0.

Found by clang.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36686 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCorrected equality check in frag_equal().
stig [Sun, 17 Apr 2011 18:49:58 +0000 (18:49 +0000)]
Corrected equality check in frag_equal().

Found by clang.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36685 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCoverity UNUSED_VALUE
etxrab [Sun, 17 Apr 2011 18:10:08 +0000 (18:10 +0000)]
Coverity UNUSED_VALUE
CID 1141

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36684 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCoverity UNUSED_VALUE
etxrab [Sun, 17 Apr 2011 18:00:14 +0000 (18:00 +0000)]
Coverity UNUSED_VALUE
CID 1142,1143,1147

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36683 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMark err as unused in k12text_dump_open().
stig [Sun, 17 Apr 2011 17:49:02 +0000 (17:49 +0000)]
Mark err as unused in k12text_dump_open().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36682 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCheck for valid docsis_handle, and use data_handle if not.
stig [Sun, 17 Apr 2011 17:47:39 +0000 (17:47 +0000)]
Check for valid docsis_handle, and use data_handle if not.

This fixes bug 5839.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36681 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd QoS Capability element (46) and Extended Supported Rates element (50)
alagoutte [Sun, 17 Apr 2011 17:20:58 +0000 (17:20 +0000)]
Add QoS Capability element (46) and Extended Supported Rates element (50)

Enhance RSN Info (48), Extended Capabilities information element (127)

* Replace proto_tree_add_uint*/boolean/text by proto_tree_add_item
* use ENC_* macro for encoding

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36680 f5534014-38df-0310-8fa8-9805f1628bb7

13 years ago[Automatic manuf, services and enterprise-numbers update for 2011-04-17]
gerald [Sun, 17 Apr 2011 15:03:50 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-04-17]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36677 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd a way for configuration protocol (e.g. RRC) to configure MAC-> RLC mappings,...
martinm [Sun, 17 Apr 2011 11:22:03 +0000 (11:22 +0000)]
Add a way for configuration protocol (e.g. RRC) to configure MAC-> RLC mappings, and add a preference to use this or the static UAT.

API is not yet called by RRC.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36676 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix Unused varaiable warnings.
etxrab [Sun, 17 Apr 2011 09:34:38 +0000 (09:34 +0000)]
Fix Unused varaiable warnings.
CID 1163 - 1166

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36675 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUsing the routing subtree (Miss in my last patch)
alagoutte [Sun, 17 Apr 2011 08:58:15 +0000 (08:58 +0000)]
Using the routing subtree (Miss in my last patch)
Fix a typo error (shoubl => should)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36674 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove another unneeded NULL check. Fixes Coverity CID 605.
gerald [Sat, 16 Apr 2011 22:02:14 +0000 (22:02 +0000)]
Remove another unneeded NULL check. Fixes Coverity CID 605.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36673 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix Coverity CIDs 603 & 604.
gerald [Sat, 16 Apr 2011 21:46:15 +0000 (21:46 +0000)]
Fix Coverity CIDs 603 & 604.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36672 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix the warnings in Coverity CIDs 606-608.
gerald [Sat, 16 Apr 2011 21:38:21 +0000 (21:38 +0000)]
Fix the warnings in Coverity CIDs 606-608.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36671 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd NULL checks. Fixes Coverity CIDs 509 and 510.
gerald [Sat, 16 Apr 2011 21:25:34 +0000 (21:25 +0000)]
Add NULL checks. Fixes Coverity CIDs 509 and 510.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36670 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoTry to make the OSX buildbot happy.
etxrab [Sat, 16 Apr 2011 17:32:30 +0000 (17:32 +0000)]
Try to make the OSX buildbot happy.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36669 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoConvert ICMPv6 dissector to "new-style" dissector
alagoutte [Sat, 16 Apr 2011 17:14:39 +0000 (17:14 +0000)]
Convert ICMPv6 dissector to "new-style" dissector
Fix Dead Store Warning ( warning: Value stored to '*offset*' is never read )

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36668 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Edwin Groothuis via bug 5813:
gerald [Sat, 16 Apr 2011 16:45:38 +0000 (16:45 +0000)]
From Edwin Groothuis via bug 5813:

In the explanation of TCP Option 78 (Riverbed Transparency), the labels
are "CSH IP Addr/Port" and "SSH IP Addr/Port". This should be "Src SH IP
Addr/Port" and "Dst SH IP Addr/Port".
The filter keys for these labels are correct.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36667 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoInitialize feedback_data_len to avoid a compiler warning.
stig [Sat, 16 Apr 2011 16:37:53 +0000 (16:37 +0000)]
Initialize feedback_data_len to avoid a compiler warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36666 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Dirk:
etxrab [Sat, 16 Apr 2011 16:00:02 +0000 (16:00 +0000)]
From Dirk:
The attachted patch cleans up the output of DCE/RPC fragment information in the
dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5772

From me get rid of check_col()

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36665 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix compilation errors.
gerald [Sat, 16 Apr 2011 15:33:24 +0000 (15:33 +0000)]
Fix compilation errors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36664 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix:
etxrab [Sat, 16 Apr 2011 12:28:03 +0000 (12:28 +0000)]
Fix:
packet-rohc.c: In function 'dissect_rohc_ir_rtp_profile_dynamic':
packet-rohc.c:285: warning: 'val_len' may be used uninitialized in this function
packet-rohc.c:186: warning: 'num_bits' may be used uninitialized in this function
packet-rohc.c:186: note: 'num_bits' was declared here

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36663 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Neil Piercy:
etxrab [Sat, 16 Apr 2011 12:22:16 +0000 (12:22 +0000)]
From Neil Piercy:
Adds BMC protocol, including adding support for MAC and RLC CTCH channels to carry it.
From me:
Removed hf blurbs = def and removed check_col added tp CMakeList.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36662 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Motonori Shindo:
etxrab [Sat, 16 Apr 2011 12:03:50 +0000 (12:03 +0000)]
From Motonori Shindo:
Current NetFlow V9/IPFIX dissector treats IN_BYTES (IE=1) and
IN_PERMANENT_BYTES (IE=85) exactly in the same way. The same applies to IN_PKTS
(IE=2) and IN_PERMANENT_PKTS (IE=86). However, IN_BYTES/IN_PKTS and
IN_PERMANENT_BYTES/IN_PERMANENT_PKTS have different semantics so they should be
distinguishable when they are displayed or specified in a filter. Please find
attached the patch
which does that.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5807

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36661 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd rohc
etxrab [Sat, 16 Apr 2011 11:49:51 +0000 (11:49 +0000)]
Add rohc

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36660 f5534014-38df-0310-8fa8-9805f1628bb7