metze/wireshark/wip.git
10 years ago- Include config.h
jmayer [Wed, 4 Dec 2013 07:39:37 +0000 (07:39 +0000)]
- Include config.h
- Merge two ifdef _WIN32 sections

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

10 years agoAvoid including <epan/epan.h> in dissectors.
darkjames [Tue, 3 Dec 2013 23:49:51 +0000 (23:49 +0000)]
Avoid including <epan/epan.h> in dissectors.

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

10 years agoDissect comprehension-tlv address object
pascal [Tue, 3 Dec 2013 23:08:50 +0000 (23:08 +0000)]
Dissect comprehension-tlv address object

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

10 years agoInclude <epan/dfilter/dfilter.h> in files that use display filter
guy [Tue, 3 Dec 2013 23:08:46 +0000 (23:08 +0000)]
Include <epan/dfilter/dfilter.h> in files that use display filter
routines.

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

10 years agomissing stdlib.h include for wslua.
darkjames [Tue, 3 Dec 2013 22:59:29 +0000 (22:59 +0000)]
missing stdlib.h include for wslua.

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

10 years agoRename struct _epan_dissect_t to epan_dissect.
darkjames [Tue, 3 Dec 2013 22:26:07 +0000 (22:26 +0000)]
Rename struct _epan_dissect_t to epan_dissect.

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

10 years agoWhen including <epan/prefs.h> don't force inclusion of <epan/uat.h>
darkjames [Tue, 3 Dec 2013 22:16:49 +0000 (22:16 +0000)]
When including <epan/prefs.h> don't force inclusion of <epan/uat.h>

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

10 years ago- Fix lots of "C:\wireshark\trunk\ui\qt\qcustomplot.cpp(16589) :
jmayer [Tue, 3 Dec 2013 21:49:28 +0000 (21:49 +0000)]
- Fix lots of "C:\wireshark\trunk\ui\qt\qcustomplot.cpp(16589) :
  warning C4305: 'argument' : truncation from 'double' to 'float'"
- Remove trailing whitespace

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

10 years agoRename struct _uat_t to epan_uat
darkjames [Tue, 3 Dec 2013 21:35:36 +0000 (21:35 +0000)]
Rename struct _uat_t to epan_uat

Leave typedef (uat_t) unchanged.

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

10 years agoDissectors should not use dfilter.h, don't include it.
darkjames [Tue, 3 Dec 2013 21:31:04 +0000 (21:31 +0000)]
Dissectors should not use dfilter.h, don't include it.

XXX ncp2222 dissector is using dfilter_compile(), why?

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

10 years agostruct _dfilter_t: rename to epan_dfilter.
darkjames [Tue, 3 Dec 2013 20:59:25 +0000 (20:59 +0000)]
struct _dfilter_t: rename to epan_dfilter.

typedef (dfilter_t) not renamed.

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

10 years agowiretap: start using <wsutil/pint.h>
darkjames [Tue, 3 Dec 2013 20:35:50 +0000 (20:35 +0000)]
wiretap: start using <wsutil/pint.h>

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

10 years agoDon't forget to test even the simplest fixes.
cmaynard [Tue, 3 Dec 2013 19:45:10 +0000 (19:45 +0000)]
Don't forget to test even the simplest fixes.

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

10 years agoAdd request / response tracking to MBIM_FUNCTION_ERROR_MSG messages
pascal [Tue, 3 Dec 2013 19:44:32 +0000 (19:44 +0000)]
Add request / response tracking to MBIM_FUNCTION_ERROR_MSG messages

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

10 years agoWrap usage text at column 80.
cmaynard [Tue, 3 Dec 2013 19:40:23 +0000 (19:40 +0000)]
Wrap usage text at column 80.

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

10 years agoAdd Qualcomm proprietary UUID
pascal [Tue, 3 Dec 2013 19:32:10 +0000 (19:32 +0000)]
Add Qualcomm proprietary UUID

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

10 years agoThe ip.proto table isn't limited to the IPv4 dissector.
gerald [Tue, 3 Dec 2013 18:16:38 +0000 (18:16 +0000)]
The ip.proto table isn't limited to the IPv4 dissector.

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

10 years agoFix encoding arg Remove tab and trailing whitespace Add modelines info
alagoutte [Tue, 3 Dec 2013 13:48:08 +0000 (13:48 +0000)]
Fix encoding arg Remove tab and trailing whitespace Add modelines info

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

10 years agoManual fix of Dead Store (Dead assignement/Dead increment) warning found by Clang...
alagoutte [Tue, 3 Dec 2013 13:39:10 +0000 (13:39 +0000)]
Manual fix of Dead Store (Dead assignement/Dead increment) warning found by Clang No found how to fix the generator...

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

10 years agoRegenerate idl dissector after last change in generator !
alagoutte [Tue, 3 Dec 2013 13:38:56 +0000 (13:38 +0000)]
Regenerate idl dissector after last change in generator !

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

10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
alagoutte [Tue, 3 Dec 2013 13:38:46 +0000 (13:38 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

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

10 years agoAdd modelines info to idl generate file
alagoutte [Tue, 3 Dec 2013 13:38:38 +0000 (13:38 +0000)]
Add modelines info to idl generate file

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

10 years agoFix indent for generated file (Use 4 space)
alagoutte [Tue, 3 Dec 2013 13:38:30 +0000 (13:38 +0000)]
Fix indent for generated file (Use 4 space)

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

10 years agoFix generator don't generate trailing whitespace
alagoutte [Tue, 3 Dec 2013 13:38:23 +0000 (13:38 +0000)]
Fix generator don't generate trailing whitespace

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

10 years agoRemove trailing whitespace and add modelines info
alagoutte [Tue, 3 Dec 2013 13:38:15 +0000 (13:38 +0000)]
Remove trailing whitespace and add modelines info

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

10 years agoRemove whitespace and add modelines info
alagoutte [Tue, 3 Dec 2013 13:38:07 +0000 (13:38 +0000)]
Remove whitespace and add modelines info

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

10 years agoFix
alagoutte [Tue, 3 Dec 2013 13:37:58 +0000 (13:37 +0000)]
Fix

warning: argument 'data' of command @param is not found in the argument list of dissector_all_tables_foreach_changed(DATFunc func, gpointer user_data)

warning: The following parameters of dissector_all_tables_foreach_changed(DATFunc func, gpointer user_data) are not documented: parameter 'user_data'

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

10 years agoFix warning: The following parameters of proto_tree_add_expert_format(proto_tree...
alagoutte [Tue, 3 Dec 2013 13:37:49 +0000 (13:37 +0000)]
Fix warning: The following parameters of proto_tree_add_expert_format(proto_tree *tree, packet_info *pinfo, expert_field *eiindex, tvbuff_t *tvb, gint start, gint length, const char *format,...) are not documented: parameter 'format'

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

10 years agoFix warning: argument 'out/in' of command @param is not found in the argument list...
alagoutte [Tue, 3 Dec 2013 13:37:40 +0000 (13:37 +0000)]
Fix warning: argument 'out/in' of command @param is not found in the argument list of SE_COPY_ADDRESS(to, from)

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

10 years agoAdd #pragma to idl generator...
alagoutte [Tue, 3 Dec 2013 13:37:31 +0000 (13:37 +0000)]
Add #pragma to idl generator...

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

10 years agoMove stats_tree_stat.c back to clean files.
jmayer [Tue, 3 Dec 2013 13:18:37 +0000 (13:18 +0000)]
Move stats_tree_stat.c back to clean files.

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

10 years agoDon't allow conversation_data to be NULL. Bug 9493 (https://bugs.wireshark.org/bugzi...
mmann [Tue, 3 Dec 2013 12:53:09 +0000 (12:53 +0000)]
Don't allow conversation_data to be NULL.  Bug 9493 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9493)

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

10 years agoRemove some no-longer-necessary null pointer checks, as pointed out by
guy [Tue, 3 Dec 2013 11:02:00 +0000 (11:02 +0000)]
Remove some no-longer-necessary null pointer checks, as pointed out by
Coverity; dissect_btl2cap() now returns immediately if handed a null
private-data pointer.

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

10 years agoClean up indentation.
guy [Tue, 3 Dec 2013 10:54:10 +0000 (10:54 +0000)]
Clean up indentation.

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

10 years agoTry to fix [-Wmissing-prototypes]
etxrab [Tue, 3 Dec 2013 06:20:18 +0000 (06:20 +0000)]
Try to fix [-Wmissing-prototypes]

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

10 years ago- copy paste error in parlay
etxrab [Tue, 3 Dec 2013 05:22:47 +0000 (05:22 +0000)]
- copy paste error in parlay
- Add pragmas to remove warnings, this should go into the generation script.

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

10 years agoSpace between STANAG and the standard number.
guy [Mon, 2 Dec 2013 23:09:08 +0000 (23:09 +0000)]
Space between STANAG and the standard number.

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

10 years agoFix encap_table_base[] array.
darkjames [Mon, 2 Dec 2013 22:38:00 +0000 (22:38 +0000)]
Fix encap_table_base[] array.

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

10 years agoReject the packet if data is NULL without doing anything else.
cmaynard [Mon, 2 Dec 2013 21:52:46 +0000 (21:52 +0000)]
Reject the packet if data is NULL without doing anything else.

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

10 years agoLink with -lcodecs on UN*X as well. Link with -lwsutil after
guy [Mon, 2 Dec 2013 21:46:06 +0000 (21:46 +0000)]
Link with -lcodecs on UN*X as well.  Link with -lwsutil after
-lwireshark, -lwiretap, and -lcodecs, just in case the linker requires
that, if library A uses something from library B, library B be read
after library A.

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

10 years agoReject the packet if data is NULL without doing anything else.
cmaynard [Mon, 2 Dec 2013 21:34:23 +0000 (21:34 +0000)]
Reject the packet if data is NULL without doing anything else.

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

10 years agoNo C++/C99 comments, as not all compilers handle them. Use #if 0/#endif
guy [Mon, 2 Dec 2013 21:18:25 +0000 (21:18 +0000)]
No C++/C99 comments, as not all compilers handle them.  Use #if 0/#endif
instead.

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

10 years agoeject the packet if data is NULL without doing anything else.
cmaynard [Mon, 2 Dec 2013 21:13:29 +0000 (21:13 +0000)]
eject the packet if data is NULL without doing anything else.

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

10 years agoReject the packet if data is NULL without doing anything else.
cmaynard [Mon, 2 Dec 2013 21:05:11 +0000 (21:05 +0000)]
Reject the packet if data is NULL without doing anything else.

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

10 years agoCharacter conversion error.
etxrab [Mon, 2 Dec 2013 20:31:42 +0000 (20:31 +0000)]
Character conversion error.

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

10 years agoAdd pragmas to remove warnings, this should go into the generation script.
etxrab [Mon, 2 Dec 2013 20:18:48 +0000 (20:18 +0000)]
Add pragmas to remove warnings, this should go into the generation script.

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

10 years agoExplicitly convert an int to an enum.
guy [Mon, 2 Dec 2013 19:20:35 +0000 (19:20 +0000)]
Explicitly convert an int to an enum.

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

10 years agoSpecify SI units for the max filesize autostop condition. For now, keep the capture...
cmaynard [Mon, 2 Dec 2013 19:17:12 +0000 (19:17 +0000)]
Specify SI units for the max filesize autostop condition.  For now, keep the capture buffer size in IEC units, but document it as such.
#BACKPORT(1.10, 1.8(?))

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

10 years agoMake the declaration of stats_tree_format_node_as_str() match the
guy [Mon, 2 Dec 2013 19:15:14 +0000 (19:15 +0000)]
Make the declaration of stats_tree_format_node_as_str() match the
definition.

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

10 years agoUse g_strlcpy() and g_strlcat() to squelch API checker warnings.
guy [Mon, 2 Dec 2013 19:12:59 +0000 (19:12 +0000)]
Use g_strlcpy() and g_strlcat() to squelch API checker warnings.

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

10 years agoUse ws_fopen() so we properly handle UTF-8 file names on Windows.
guy [Mon, 2 Dec 2013 18:58:40 +0000 (18:58 +0000)]
Use ws_fopen() so we properly handle UTF-8 file names on Windows.

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

10 years agostats_tree_stat.c currently procudes warnings - move to dirty
jmayer [Mon, 2 Dec 2013 15:55:36 +0000 (15:55 +0000)]
stats_tree_stat.c currently procudes warnings - move to dirty

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

10 years agoFix (-W)documentation error found by Clang
alagoutte [Mon, 2 Dec 2013 13:46:39 +0000 (13:46 +0000)]
Fix (-W)documentation error found by Clang

parameter 'sai' not found in the function declaration [-Werror,-Wdocumentation]

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

10 years agoFix (-W)documentation error found by Clang
alagoutte [Mon, 2 Dec 2013 13:46:30 +0000 (13:46 +0000)]
Fix (-W)documentation error found by Clang

error: parameter '...' not found in the function declaration [-Werror,-Wdocumentation]

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

10 years agoFix (-W)documentation error found by Clang
alagoutte [Mon, 2 Dec 2013 13:46:20 +0000 (13:46 +0000)]
Fix (-W)documentation error found by Clang

../../epan/strutil.h:95:11: error: parameter 'line' not found in the function declaration [-Werror,-Wdocumentation]
 * @param line A pointer to the input string
          ^~~~
../../epan/strutil.h:95:11: note: did you mean 'string'?
 * @param line A pointer to the input string
          ^~~~
          string

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

10 years agoFix (-W)documentation error found by Clang
alagoutte [Mon, 2 Dec 2013 13:46:10 +0000 (13:46 +0000)]
Fix (-W)documentation error found by Clang

error: parameter 'addr*[in]' not found in the function declaration [-Werror,-Wdocumentation]

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

10 years agoFix (-W)documentation error found by Clang
alagoutte [Mon, 2 Dec 2013 13:45:59 +0000 (13:45 +0000)]
Fix (-W)documentation error found by Clang

error: parameter '...' not found in the function declaration [-Werror,-Wdocumentation]

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

10 years agonmake: Allow setting the wireshark base dir via env variable
jmayer [Mon, 2 Dec 2013 13:00:06 +0000 (13:00 +0000)]
nmake: Allow setting the wireshark base dir via env variable

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

10 years agoRemove /msvc2010 after ${QT5_BASE_DIR}, it should be part of
jmayer [Mon, 2 Dec 2013 09:50:30 +0000 (09:50 +0000)]
Remove /msvc2010 after ${QT5_BASE_DIR}, it should be part of
the QT5_BASE_DIR value.

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

10 years agoGet rid of a stray semicolon, as it upsets Sun^WOracle Studio's C
guy [Mon, 2 Dec 2013 09:30:31 +0000 (09:30 +0000)]
Get rid of a stray semicolon, as it upsets Sun^WOracle Studio's C
compiler.

Clean up escape_xml_chars() a bit, so that there's no extra unreached
"return s;", and so that it's clearer that it runs until it hits a NUL.
(XXX - are there GLib routines that will do this?)

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

10 years agoDon't include wslua headers if we don't have Lua.
guy [Mon, 2 Dec 2013 09:10:29 +0000 (09:10 +0000)]
Don't include wslua headers if we don't have Lua.

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

10 years agoDon't assume we have Lua just because we have plugin support.
guy [Mon, 2 Dec 2013 09:10:13 +0000 (09:10 +0000)]
Don't assume we have Lua just because we have plugin support.

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

10 years agoWe need to link with the codecs library.
guy [Mon, 2 Dec 2013 09:06:00 +0000 (09:06 +0000)]
We need to link with the codecs library.

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

10 years agoMake the declaration of stats_tree_format_as_str() match the definition.
guy [Mon, 2 Dec 2013 08:55:38 +0000 (08:55 +0000)]
Make the declaration of stats_tree_format_as_str() match the definition.

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

10 years agoDo something less catastrophic than crashing if the same name is used in
guy [Mon, 2 Dec 2013 08:51:46 +0000 (08:51 +0000)]
Do something less catastrophic than crashing if the same name is used in
two codec registrations.

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

10 years agoMove most of the plugin code from epan to wsutil and remove all
guy [Mon, 2 Dec 2013 08:30:29 +0000 (08:30 +0000)]
Move most of the plugin code from epan to wsutil and remove all
knowledge of particular types of plugins.  Instead, let particular types
of plugins register with the common plugin code, giving a name and a
routine to recognize that type of plugin.

In particular applications, only process the relevant plugin types.

Add a Makefile.common to the codecs directory.

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

10 years agoReject the packet if data is NULL.
cmaynard [Mon, 2 Dec 2013 02:31:33 +0000 (02:31 +0000)]
Reject the packet if data is NULL.

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

10 years agoReject the packet if data is NULL without doing anything else.
cmaynard [Mon, 2 Dec 2013 02:31:04 +0000 (02:31 +0000)]
Reject the packet if data is NULL without doing anything else.

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

10 years agoReject the packet if data is NULL.
cmaynard [Mon, 2 Dec 2013 02:18:21 +0000 (02:18 +0000)]
Reject the packet if data is NULL.

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

10 years agoIf data is NULL, the bug, if any, is not with *this* dissector, but with whichever...
cmaynard [Mon, 2 Dec 2013 02:07:42 +0000 (02:07 +0000)]
If data is NULL, the bug, if any, is not with *this* dissector, but with whichever one failed to pass the data properly.

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

10 years agoFix Coverity CID 1134045: Printf format string issue. (As documented in the printf...
cmaynard [Mon, 2 Dec 2013 01:53:13 +0000 (01:53 +0000)]
Fix Coverity CID 1134045: Printf format string issue.  (As documented in the printf man page for the ' option, "Note that many versions of gcc(1) cannot parse this option and will issue a warning."  (r47940 reverted a similar change, so this keeps things consistent.)

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

10 years agoFix Coverity CID 1134046: Structurally dead code.
cmaynard [Mon, 2 Dec 2013 00:45:44 +0000 (00:45 +0000)]
Fix Coverity CID 1134046: Structurally dead code.

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

10 years agoThe changes to work around the msbuild deficiencies broke
jmayer [Sun, 1 Dec 2013 22:24:59 +0000 (22:24 +0000)]
The changes to work around the msbuild deficiencies broke
dependeny tracking (replaced the list of dissectors by the file
containing the dissectors). Fix that.

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

10 years agoCopy over rev 53700 to cmake
jmayer [Sun, 1 Dec 2013 21:56:40 +0000 (21:56 +0000)]
Copy over rev 53700 to cmake

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

10 years agoSmall style changes.
jmayer [Sun, 1 Dec 2013 21:55:21 +0000 (21:55 +0000)]
Small style changes.

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

10 years agoUpdate to V11.7.1 (2013-09)
etxrab [Sun, 1 Dec 2013 20:34:21 +0000 (20:34 +0000)]
Update to V11.7.1 (2013-09)

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

10 years agoIf we're including "config.h" when compiling a codec, then /I.. must be part of...
wmeier [Sun, 1 Dec 2013 16:50:05 +0000 (16:50 +0000)]
If  we're including "config.h" when compiling a codec, then /I.. must be part of CFLAGS.

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

10 years agoPatch to include YAML export. Bug 9452 (https://bugs.wireshark.org/bugzilla/show_bug...
mmann [Sun, 1 Dec 2013 15:44:22 +0000 (15:44 +0000)]
Patch to include YAML export. Bug 9452 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452)

From Deon van der Westhuysen
From me: use switch statements instead of if-else

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

10 years ago[Automatic manuf, services and enterprise-numbers update for 2013-12-01]
gerald [Sun, 1 Dec 2013 15:03:49 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-12-01]

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

10 years agoAdd MPLS dissector to "ppp.protocol" table. Bug 9492 (https://bugs.wireshark.org...
mmann [Sun, 1 Dec 2013 13:47:11 +0000 (13:47 +0000)]
Add MPLS dissector to "ppp.protocol" table.  Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492)

From Peter Paluch

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

10 years agoToo litte modify in copy - modify - paste cycle
jmayer [Sun, 1 Dec 2013 10:58:17 +0000 (10:58 +0000)]
Too litte modify in copy - modify - paste cycle

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

10 years agoGraham Bloice
jmayer [Sun, 1 Dec 2013 10:34:01 +0000 (10:34 +0000)]
Graham Bloice
- Using gtk[23] is a hack. Implement a clean solution.

Me
- In the current setup, building Qt ONLY is not supported as
  lots of required support libraries are only found in gtk2 and
  gtk3. Print an error in that case.
- Small style changes (lowercasing, whitespace)

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

10 years agoLooks like the problem with redefined symbols is not new, it
jmayer [Sun, 1 Dec 2013 10:10:24 +0000 (10:10 +0000)]
Looks like the problem with redefined symbols is not new, it
just got a few new ones.
Add HAVE_STRING_H and HAVE_STDLIB_H to the list.

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

10 years ago- Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying
jmayer [Sun, 1 Dec 2013 10:05:16 +0000 (10:05 +0000)]
- Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying
  pcap probably is different from the WinPcap version.
- Set WINPCAP_VERSION for cmake builds to "unknown"
- Oh, the NEWS file changed again.

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

10 years agoSBC -> sbc
jmayer [Sun, 1 Dec 2013 09:18:19 +0000 (09:18 +0000)]
SBC -> sbc
On Unix case is relevant, so fix it.
Please try to avoid filenames starting with Upper case, it
makes completion so much easier as I only need to remember the
name and not the case.

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

10 years agoStart teid_data field from the correct offset
martinm [Sun, 1 Dec 2013 08:52:06 +0000 (08:52 +0000)]
Start teid_data field from the correct offset

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

10 years agoAlso add filter and expert info for ICMPv6 requests with no responses.
martinm [Sun, 1 Dec 2013 08:51:07 +0000 (08:51 +0000)]
Also add filter and expert info for ICMPv6 requests with no responses.

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

10 years agoMove codecs.[ch] out of epan and into codecs directory.
mmann [Sun, 1 Dec 2013 03:53:57 +0000 (03:53 +0000)]
Move codecs.[ch] out of epan and into codecs directory.

This may break easy_codec plugins, but it appears a better/more consistent way is needed to register codecs.  See Guy's comments in bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893)

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

10 years agoUse 4-space (PEP 8) indentation. Add modelines.
gerald [Sun, 1 Dec 2013 01:53:26 +0000 (01:53 +0000)]
Use 4-space (PEP 8) indentation. Add modelines.

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

10 years agoUse indentation recommended by PEP 8.
gerald [Sun, 1 Dec 2013 01:46:45 +0000 (01:46 +0000)]
Use indentation recommended by PEP 8.

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

10 years agoFix compatibility with Python 2.5. Tested with 2.5, 2.6, 2.7, and 3.3.
gerald [Sun, 1 Dec 2013 01:35:13 +0000 (01:35 +0000)]
Fix compatibility with Python 2.5. Tested with 2.5, 2.6, 2.7, and 3.3.

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

10 years agoLooks like the WinPcap version can only be determined from the
jmayer [Sat, 30 Nov 2013 23:40:25 +0000 (23:40 +0000)]
Looks like the WinPcap version can only be determined from the
name of the compressed archive - which currently means "only by
manual developer intervention".

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

10 years agoThe HAVE_xxx definitions come from config.h; include it.
guy [Sat, 30 Nov 2013 22:17:15 +0000 (22:17 +0000)]
The HAVE_xxx definitions come from config.h; include it.

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

10 years agoTag arguments to decodeXXX routines as unused iff we don't support the
guy [Sat, 30 Nov 2013 22:16:09 +0000 (22:16 +0000)]
Tag arguments to decodeXXX routines as unused iff we don't support the
codec.

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

10 years agoBetter fix for uninitialized variable warning. Part of bug 9452 (https://bugs.wiresh...
mmann [Sat, 30 Nov 2013 21:00:21 +0000 (21:00 +0000)]
Better fix for uninitialized variable warning.  Part of bug 9452 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452)

From Peter Wu.
From me: Leave the "result" variable initialized because I'm not sure code analyzers will consider g_assert_not_reached() enough prevention from using uninitialized "result"

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

10 years agoUpdate documentation for tcp_dissect_pdus. Bug 9491 (https://bugs.wireshark.org...
mmann [Sat, 30 Nov 2013 20:48:46 +0000 (20:48 +0000)]
Update documentation for tcp_dissect_pdus.  Bug 9491 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9491)

From Peter Wu: update to README.dissector
From me: update to WSDG_chapter_dissection.xml

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

10 years agoReplace "btsdp" tap with function to query service_infos tree, since that's all disse...
mmann [Sat, 30 Nov 2013 19:26:18 +0000 (19:26 +0000)]
Replace "btsdp" tap with function to query service_infos tree, since that's all dissectors were doing with it.  Not used outside of dissectors and cuts down on a few redundant global variables.

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

10 years agoAdd G.722, G.726 and SBC codecs. G.722 and G.726 are from bug 5619 (https://bugs...
mmann [Sat, 30 Nov 2013 15:42:14 +0000 (15:42 +0000)]
Add G.722, G.726 and SBC codecs.  G.722 and G.726 are from bug 5619 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5619) and SBC is from bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893).

Codecs are added, but (intentionally) not hooked to the RTP player as a "more generic architecture" is desired.  There are some discussions in bug 7893 on how to do this.  One thing to add would be how to handle codecs that may not be supported on all platforms.  Should the codec not be "registered" at all (with a #define over the whole module) or should it's register functions be stubbed (with a #define in each function that requires a non-supported library)

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

10 years agoTry to please GCC 4.3.2
pascal [Sat, 30 Nov 2013 12:31:36 +0000 (12:31 +0000)]
Try to please GCC 4.3.2

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

10 years agoMake the code testing the Rx MCS Bitmask subfield of the Supported MCS
guy [Sat, 30 Nov 2013 10:17:30 +0000 (10:17 +0000)]
Make the code testing the Rx MCS Bitmask subfield of the Supported MCS
Set field of the HT Capabilities element a bit clearer, and add
comments.

Fix it so it doesn't assign a variable to itself, as clang warns about
that.

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