obnox/wireshark/wip.git
12 years agoFix crash caused by trying to apply a field of type BASE_CUSTOM as a column. Fixes...
cmaynard [Thu, 17 Nov 2011 15:57:44 +0000 (15:57 +0000)]
Fix crash caused by trying to apply a field of type BASE_CUSTOM as a column.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6503.

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

12 years agoShow meaning of special length indication values in the LI root.
martinm [Thu, 17 Nov 2011 12:08:50 +0000 (12:08 +0000)]
Show meaning of special length indication values in the LI root.

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

12 years agoRename pletonll() to reflect what it actually does, namely convert a
guy [Thu, 17 Nov 2011 09:24:15 +0000 (09:24 +0000)]
Rename pletonll() to reflect what it actually does, namely convert a
host-byte-order 64-bit integral quantity to little-endian byte order.

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

12 years agoA new macro needed by the WTAP_ENCAP_PER_PACKET support for writing
guy [Thu, 17 Nov 2011 09:04:54 +0000 (09:04 +0000)]
A new macro needed by the WTAP_ENCAP_PER_PACKET support for writing
NetMon files.

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

12 years agoAdd support for writing WTAP_ENCAP_PER_PACKET files; they are written
guy [Thu, 17 Nov 2011 09:03:09 +0000 (09:03 +0000)]
Add support for writing WTAP_ENCAP_PER_PACKET files; they are written
out in version 2.1 of the file format (the minimum version to support
that).

Change some data types to avoid having file offsets that are before the
beginning of the file.

Clean up some other data types and some comments.

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

12 years agoAdd a missing IE number.
etxrab [Thu, 17 Nov 2011 06:46:34 +0000 (06:46 +0000)]
Add a missing IE number.

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

12 years agoReturn *some* error if we end up trying to seek before the beginning of
guy [Thu, 17 Nov 2011 06:36:32 +0000 (06:36 +0000)]
Return *some* error if we end up trying to seek before the beginning of
the file, so you don't get weird random errors.  EINVAL is as good as
anything.

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

12 years agoPut back the check for dates that can be represented in DOS format the
guy [Thu, 17 Nov 2011 02:29:26 +0000 (02:29 +0000)]
Put back the check for dates that can be represented in DOS format the
way it was *supposed* to be done, rather than backwards.

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

12 years agoRevert part of r39883 to avoid dereferencing a NULL pointer. Thanks Clang.
cmaynard [Thu, 17 Nov 2011 02:17:57 +0000 (02:17 +0000)]
Revert part of r39883 to avoid dereferencing a NULL pointer.  Thanks Clang.

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

12 years agoDon't clobber release information for now.
gerald [Thu, 17 Nov 2011 01:37:14 +0000 (01:37 +0000)]
Don't clobber release information for now.

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

12 years agoCreate/update svnversion.h unless we're only running with --get-*.
gerald [Thu, 17 Nov 2011 00:48:21 +0000 (00:48 +0000)]
Create/update svnversion.h unless we're only running with --get-*.

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

12 years agoAdd an SVN_REVISION variable to config.nmake. This can be used to
gerald [Thu, 17 Nov 2011 00:19:03 +0000 (00:19 +0000)]
Add an SVN_REVISION variable to config.nmake. This can be used to
retrieve our SVN revision in releases.

Use make-version.pl to set all version information. Be more explicit
about the tasks it performs:

  - Fetching the SVN revision which corresponds to our code. The
    revision can be fetched via "svn info", "git svn info", SubWCRev",
    config.nmake, or by prodding .svn.

  - Setting the version numbers (the "major.minor.micro" triplet).

  - Setting the release information (revision/build number, local build
    identifier)

Remove the "is_release" configuration option and dist-hook target.

When run with a "--set-*" option or no options make sure we leave a
valid svnversion.h behind.

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

12 years agoAvoid using "POINT" as it causes compiler errors on some systems. Add modelines...
cmaynard [Wed, 16 Nov 2011 21:27:30 +0000 (21:27 +0000)]
Avoid using "POINT" as it causes compiler errors on some systems.  Add modelines that match the current file's format.  This dissector is now ready to be spiceistributed.

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

12 years agoDon't assign the return value of proto_tree_add_item to a variable if it isn't going...
cmaynard [Wed, 16 Nov 2011 20:18:51 +0000 (20:18 +0000)]
Don't assign the return value of proto_tree_add_item to a variable if it isn't going to be used.  Fixes Coverity CID 1327.

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

12 years agoMove FI_RESET_FLAG and PROTO_ITEM_SET_VISIBLE macros to proto.h and fix the FI_RESET_...
cmaynard [Wed, 16 Nov 2011 20:09:49 +0000 (20:09 +0000)]
Move FI_RESET_FLAG and PROTO_ITEM_SET_VISIBLE macros to proto.h and fix the FI_RESET_FLAG macro, being sure to use the 1's complement operator, '~', instead of the logical negation operator, '!'. (Fixes Coverity CID 1326).

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

12 years agoDissect national Opcode.
etxrab [Wed, 16 Nov 2011 19:52:00 +0000 (19:52 +0000)]
Dissect national Opcode.

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

12 years agoSupport nanosecond-resolution time for NetMon 2.x format (it's only
guy [Wed, 16 Nov 2011 17:54:44 +0000 (17:54 +0000)]
Support nanosecond-resolution time for NetMon 2.x format (it's only
100-nanosecond resolution, but that's still better than microsecond
resolution).

For NetMon 1.x format, only claim to support millisecond resolution, as
that's all you get.

Fix handling of negative time deltas in NetMon 2.x format.

When writing a NetMon file, trim the time of the first packet to
millisecond precision to get the capture start time, so that the start
time written to the file (which has millisecond precision) is the same
as the start time used to calculate the deltas written to the packet
headers.

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

12 years agoOK, this should do it.
guy [Wed, 16 Nov 2011 17:13:37 +0000 (17:13 +0000)]
OK, this should do it.

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

12 years agoFix build on Windows.
guy [Wed, 16 Nov 2011 17:12:47 +0000 (17:12 +0000)]
Fix build on Windows.

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

12 years agoAnother place where we have to protect against MSVC's time-conversion
guy [Wed, 16 Nov 2011 17:08:00 +0000 (17:08 +0000)]
Another place where we have to protect against MSVC's time-conversion
routines blowing up if handed a too-large time_t.

While we're at it, also check for dates that can't be represented in DOS
format (pre-1980 dates).

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

12 years agoAnother place where we have to protect against MSVC's time-conversion
guy [Wed, 16 Nov 2011 16:48:02 +0000 (16:48 +0000)]
Another place where we have to protect against MSVC's time-conversion
routines blowing up if handed a too-large time_t.

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

12 years agoShow more sequence numbers in info column, and in root nodes.
martinm [Wed, 16 Nov 2011 16:32:40 +0000 (16:32 +0000)]
Show more sequence numbers in info column, and in root nodes.

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

12 years agoFix handling of empty OpenType at the end of PDU
kukosa [Wed, 16 Nov 2011 08:55:02 +0000 (08:55 +0000)]
Fix handling of empty OpenType at the end of PDU

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

12 years ago- Resorted the IEs in numerical order for easier comparison with the list of constants.
etxrab [Wed, 16 Nov 2011 05:54:44 +0000 (05:54 +0000)]
- Resorted the IEs in numerical order for easier comparison with the list of constants.
- Added two missing IEs

Solves LPPa embedded payloads not shown within LCS-AP
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6478

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

12 years agoHandle ctime() and localtime() returning NULL and localtime() on Windows
guy [Wed, 16 Nov 2011 03:13:02 +0000 (03:13 +0000)]
Handle ctime() and localtime() returning NULL and localtime() on Windows
blowing up when handed a bad value.

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

12 years agoGet rid of unnecessary assignment (the code below it always assigns a
guy [Wed, 16 Nov 2011 02:43:58 +0000 (02:43 +0000)]
Get rid of unnecessary assignment (the code below it always assigns a
value to the variable).  Praise be to Clang Cat.

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

12 years agoDon't set variables if we don't look at them later. All praise Clang
guy [Wed, 16 Nov 2011 02:18:30 +0000 (02:18 +0000)]
Don't set variables if we don't look at them later.  All praise Clang
Cat.

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

12 years agoAdd Jakob Hirsch; Fix bad formatting which screwed up AUTHORS display.
wmeier [Wed, 16 Nov 2011 02:13:56 +0000 (02:13 +0000)]
Add Jakob Hirsch; Fix bad formatting which screwed up AUTHORS display.

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

12 years agoCleanup & reformatting: whitespace & long-lines.
wmeier [Wed, 16 Nov 2011 01:59:15 +0000 (01:59 +0000)]
Cleanup & reformatting: whitespace & long-lines.

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

12 years agoThou shalt not use proto_tree_add_string() with an FT_BYTES field.
guy [Wed, 16 Nov 2011 01:56:58 +0000 (01:56 +0000)]
Thou shalt not use proto_tree_add_string() with an FT_BYTES field.

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

12 years agoDelete pointless orig_offset variable, initialize speech_data_len[], use tvb_reported...
cmaynard [Wed, 16 Nov 2011 01:37:32 +0000 (01:37 +0000)]
Delete pointless orig_offset variable, initialize speech_data_len[], use tvb_reported_length() instead of tvb_length(), and protect against a possible buffer overflow.  This should fix the Clang warning, "packet-evrc.c:364:41: warning: The right operand of '>=' is a garbage value", among other things.

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

12 years agoFix indentation.
guy [Wed, 16 Nov 2011 01:25:49 +0000 (01:25 +0000)]
Fix indentation.

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

12 years agotvb_[reported_]length_remaining can return -1
wmeier [Tue, 15 Nov 2011 21:22:01 +0000 (21:22 +0000)]
tvb_[reported_]length_remaining can return -1

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

12 years agoRemove unneeded #include
wmeier [Tue, 15 Nov 2011 21:07:37 +0000 (21:07 +0000)]
Remove unneeded #include

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

12 years ago(Trivial) Reformat some long lines & do some whitespace cleanup.
wmeier [Tue, 15 Nov 2011 20:49:40 +0000 (20:49 +0000)]
(Trivial) Reformat some long lines & do some whitespace cleanup.

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

12 years agoCheck the return value of dissect_sip_name_addr_or_addr_spec()
etxrab [Tue, 15 Nov 2011 20:14:51 +0000 (20:14 +0000)]
Check the return value of dissect_sip_name_addr_or_addr_spec()
Should fix the recent fuzz failures.
Thanks Chris for isolating the offending packet.

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

12 years agoSquelch a warning. (This code probably needs a review; we really need a
guy [Tue, 15 Nov 2011 19:44:24 +0000 (19:44 +0000)]
Squelch a warning.  (This code probably needs a review; we really need a
better general framework for parsing text-based protocols.)

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

12 years agoRename channel_type enums to avoid possible naming conflicts.
cmaynard [Tue, 15 Nov 2011 19:37:16 +0000 (19:37 +0000)]
Rename channel_type enums to avoid possible naming conflicts.

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

12 years agoMore indentation cleanup.
guy [Tue, 15 Nov 2011 19:35:13 +0000 (19:35 +0000)]
More indentation cleanup.

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

12 years agoClean up indentation.
guy [Tue, 15 Nov 2011 19:33:14 +0000 (19:33 +0000)]
Clean up indentation.

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

12 years agopacket-sip.c:1469: warning: unused variable 'contact_param_end_offset'
etxrab [Tue, 15 Nov 2011 19:25:17 +0000 (19:25 +0000)]
packet-sip.c:1469: warning: unused variable 'contact_param_end_offset'

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

12 years agoRestore dissection of contact parameters.
etxrab [Tue, 15 Nov 2011 19:03:39 +0000 (19:03 +0000)]
Restore dissection of contact parameters.

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

12 years agoRemove unneeded #includes;
wmeier [Tue, 15 Nov 2011 19:00:08 +0000 (19:00 +0000)]
Remove unneeded #includes;
Move proto_reg_handoff...() to the end of the file as per convention.

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

12 years agoMove proto_reg_handoff...() to the end of the file as per convention;
wmeier [Tue, 15 Nov 2011 18:31:11 +0000 (18:31 +0000)]
Move proto_reg_handoff...() to the end of the file as per convention;
Do other minor reformatting and cleanup.

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

12 years agoAdd svn:executable to props
wmeier [Tue, 15 Nov 2011 17:44:14 +0000 (17:44 +0000)]
Add svn:executable to props

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

12 years agoSet svn:mime-type to image/png
wmeier [Tue, 15 Nov 2011 17:41:41 +0000 (17:41 +0000)]
Set svn:mime-type to image/png

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

12 years agoSet svn:mime-type to image/png
wmeier [Tue, 15 Nov 2011 17:33:59 +0000 (17:33 +0000)]
Set svn:mime-type to image/png

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

12 years agoSet svn:mime-type to image/png
wmeier [Tue, 15 Nov 2011 17:29:27 +0000 (17:29 +0000)]
Set svn:mime-type to image/png

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

12 years agoSet svn:mime-type to image/png
wmeier [Tue, 15 Nov 2011 17:26:04 +0000 (17:26 +0000)]
Set svn:mime-type to image/png

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

12 years agoSet svn:mime-type to image/png
wmeier [Tue, 15 Nov 2011 17:18:21 +0000 (17:18 +0000)]
Set svn:mime-type to image/png

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

12 years agoAppend important details from LI and SURI trees to root item.
martinm [Tue, 15 Nov 2011 15:36:39 +0000 (15:36 +0000)]
Append important details from LI and SURI trees to root item.
Show some SNs in the info column.

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

12 years agoFix some props
wmeier [Tue, 15 Nov 2011 15:28:20 +0000 (15:28 +0000)]
Fix some props

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

12 years agoFix some svn properties
wmeier [Tue, 15 Nov 2011 15:16:37 +0000 (15:16 +0000)]
Fix some svn properties

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

12 years agoFix svn:keywords prop: 'svn:eol-style'->'Id'
wmeier [Tue, 15 Nov 2011 15:11:35 +0000 (15:11 +0000)]
Fix svn:keywords prop: 'svn:eol-style'->'Id'

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

12 years agoFix svn:keywords prop: 'svn:eol-style'->'Id'
wmeier [Tue, 15 Nov 2011 15:08:43 +0000 (15:08 +0000)]
Fix svn:keywords prop: 'svn:eol-style'->'Id'

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

12 years agoFix props: svn:keyword->svn:keywords; remove svn:executable
wmeier [Tue, 15 Nov 2011 15:02:01 +0000 (15:02 +0000)]
Fix props: svn:keyword->svn:keywords; remove svn:executable

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

12 years agoUMTS RLC:
martinm [Tue, 15 Nov 2011 12:03:52 +0000 (12:03 +0000)]
UMTS RLC:
- add lookup for "unknown" channel type dissector (mode is known)
- set length extent for SUFI root item
- show data frames in the info column (at least for AM...)

DCT:
- call RLCDCH with "unknown" channel type (as don't know whether IP or RRC)
- support R9

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

12 years ago Add svn:keywords and svn:eol-style properties
alagoutte [Tue, 15 Nov 2011 08:05:42 +0000 (08:05 +0000)]
 Add svn:keywords and svn:eol-style properties

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

12 years agoEnhance CPHA dissector
alagoutte [Tue, 15 Nov 2011 07:56:06 +0000 (07:56 +0000)]
Enhance CPHA dissector
* Remove struct and sizeof
* Replace proto_tree_add_* by proto_tree_add_item
* Replace CPHA function (report2str, opcode2str...) by standard Wireshark functions
* and minor bug fix

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

12 years agoFrom Michael Mann:
etxrab [Tue, 15 Nov 2011 07:18:39 +0000 (07:18 +0000)]
From Michael Mann:
Bugfixes for both Buildbot issues:
1. seg-fault with multiple_service_packet
2. infinite loop

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6519

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

12 years agoFrom Michael Mann:
etxrab [Tue, 15 Nov 2011 07:12:19 +0000 (07:12 +0000)]
From Michael Mann:
Make it possible to use TortoiseSVN's SubWCRev.exe to update svnversion.h

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5441

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

12 years agoOK, *that's* what Clang Cat was going on about:
guy [Tue, 15 Nov 2011 05:37:56 +0000 (05:37 +0000)]
OK, *that's* what Clang Cat was going on about:

packet-dcerpc-pn-io.c:8438:17: warning: Although the value
stored to 'prm_flag2' is used in the enclosing expression, the
value is never actually read from 'prm_flag2'

OK, thanks for telling me that, technically,

prm_flag1 = prm_flag2 = 0;

can be implemented by storing the 0 into prm_flag1 directly rather than
storing 0 into prm_flag2 and copying it to prm_flag1.  Yes, you can haz
cheeseburger.

I guess it would matter if we were actually depending on some
side-effect of fetching prm_flag2, but we're not.  Rewrite this one to
squelch the complaint.

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

12 years agoRewrite some odd code. Clang Cat does not want:
guy [Tue, 15 Nov 2011 05:25:17 +0000 (05:25 +0000)]
Rewrite some odd code.  Clang Cat does not want:

packet-reload.c:2875:13: warning: Although the value stored to
'local_offset' is used in the enclosing expression, the value is
never actually read from 'local_offset'

although as I read the C90 spec the code is doing pretty much what it
should be doing and the rewritten code does the same thing.  However,
it's also a bit more complicated and harder to read than the rewritten
code.

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

12 years agoAt least as I read the code, there can be up to 3 receive channels (the
guy [Tue, 15 Nov 2011 05:10:56 +0000 (05:10 +0000)]
At least as I read the code, there can be up to 3 receive channels (the
number of channels is XXX & 0x03, hence in the range 0-3.

Thanks and a tip of the hat to Clang Cat for catching this.

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

12 years agoGet rid of the depth argument to dfilter_macro_apply(); have an internal
guy [Tue, 15 Nov 2011 04:26:38 +0000 (04:26 +0000)]
Get rid of the depth argument to dfilter_macro_apply(); have an internal
routine that does all the work and that takes a depth argumen, and an
external routine that calls that internal routine with a depth argument
of 0.  The depth is only of use internally, to avoid infinite recursion.

When recursing with that routine, pass depth+1 as the depth value,
rather than passing depth and incrementing it afterwards; the latter
doesn't prevent infinite recursion.  (Thanks and a tip of the hat to
Clang Cat for catching this.)

Squelch some other (harmless) warnings from Clang Cat.

Clean up indentation.

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

12 years agoAppend each op name to the operations sub-tree so you don't necessarily have to expan...
cmaynard [Mon, 14 Nov 2011 20:38:05 +0000 (20:38 +0000)]
Append each op name to the operations sub-tree so you don't necessarily have to expand the tree to see which ops are present.  I think it makes more sense to append the names here rather than at the top level which was done to resolve bug 6078, but for now, I leave them appended in both places.

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

12 years agoRemove uneeded #includes, forward refs & check_col();
wmeier [Mon, 14 Nov 2011 20:04:04 +0000 (20:04 +0000)]
Remove uneeded #includes, forward refs & check_col();
tvb_reported_length_remaining() can return -1;
Localize a variable.

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

12 years ago'guint8=tvb_get_guint8() + 2' can wrap. Use 'gint=...' instead. ditto for 'gint16...
wmeier [Mon, 14 Nov 2011 19:58:12 +0000 (19:58 +0000)]
'guint8=tvb_get_guint8() + 2' can wrap. Use 'gint=...' instead. ditto for 'gint16=...'
Also:
 - remove unneeded #include;
 - Remove unneeded check_col();
 - use val_to_str_const() in several cases.

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

12 years agoThe Originator protocol identifier is not present in the "provisioning actions operat...
cmaynard [Mon, 14 Nov 2011 19:57:45 +0000 (19:57 +0000)]
The Originator protocol identifier is not present in the "provisioning actions operation -61", only the "session management operatin -60".  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6570.

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

12 years agoAdd svn:keywords and svn:eol-style properties
wmeier [Mon, 14 Nov 2011 19:18:18 +0000 (19:18 +0000)]
Add svn:keywords and svn:eol-style properties

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

12 years agoFrom Martin Kaiser:
etxrab [Mon, 14 Nov 2011 19:16:47 +0000 (19:16 +0000)]
From Martin Kaiser:
DVB-CI / CI+ dissect X.509 certificates.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6575

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

12 years agoDo some more length checking to avoid a dissector bug error. Should fix
guy [Mon, 14 Nov 2011 18:42:11 +0000 (18:42 +0000)]
Do some more length checking to avoid a dissector bug error.  Should fix
bug 6564.

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

12 years agoVery minor cleanup: remove some unneeded #includes & some trailing whitespace
wmeier [Mon, 14 Nov 2011 18:19:14 +0000 (18:19 +0000)]
Very minor cleanup: remove some unneeded #includes & some trailing whitespace

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

12 years ago[-Wunused-but-set-variable]
etxrab [Mon, 14 Nov 2011 17:35:04 +0000 (17:35 +0000)]
[-Wunused-but-set-variable]

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

12 years agopacket-sip.c:1412: warning: 'uri_param_end_offset' may be used uninitialized in this...
etxrab [Mon, 14 Nov 2011 17:27:18 +0000 (17:27 +0000)]
packet-sip.c:1412: warning: 'uri_param_end_offset' may be used uninitialized in this function

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

12 years agoFrom Johan Wåhl:
etxrab [Mon, 14 Nov 2011 17:10:49 +0000 (17:10 +0000)]
From Johan Wåhl:
- dissect Route and Via header.
- Dissect URI parameters.

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

12 years agoAdd remaining UMTS RLC primitive parameters preceding RLC payload.
martinm [Mon, 14 Nov 2011 12:22:54 +0000 (12:22 +0000)]
Add remaining UMTS RLC primitive parameters preceding RLC payload.

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

12 years agoMake exit_status volatile to avoid warning.
martinm [Mon, 14 Nov 2011 11:36:53 +0000 (11:36 +0000)]
Make exit_status volatile to avoid warning.

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

12 years agoFix Id tag.
etxrab [Mon, 14 Nov 2011 08:24:47 +0000 (08:24 +0000)]
Fix Id tag.

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

12 years agoDon't use generic shared function/typedef/struct names;
wmeier [Sun, 13 Nov 2011 23:33:47 +0000 (23:33 +0000)]
Don't use generic shared function/typedef/struct names;
Remove unneeded #includes;
Cleanup trailing whitespace.

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

12 years agoIf we set "column.hidden" on the command line but don't set
guy [Sun, 13 Nov 2011 22:51:49 +0000 (22:51 +0000)]
If we set "column.hidden" on the command line but don't set
"column.format" in a later argument, make sure we mark the appropriate
existing columns as hidden.

As part of cleaning up the infrastructure for doing this, store the COL_
code for a column in a fmt_data structure rather than a pointer to the
raw column format string; this simplifies some code.

Have a routine to return whether a column is visible, not hidden, as
it's used to set a "visible" flag.

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

12 years agoAs we're no longer checking whether we're constructing the Info column,
guy [Sun, 13 Nov 2011 22:44:51 +0000 (22:44 +0000)]
As we're no longer checking whether we're constructing the Info column,
we can't bail out early on dissection merely because we're not
constructing the protocol tree, as that would mean we wouldn't construct
the Info column unless we're constructing a protocol tree.

Clean up indentation.

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

12 years ago[Automatic manuf, services and enterprise-numbers update for 2011-11-13]
gerald [Sun, 13 Nov 2011 15:03:25 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-11-13]

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

12 years agoThe sum of a guint16 and 2 does not necessarily fit in a guint16. Put
guy [Sun, 13 Nov 2011 01:38:46 +0000 (01:38 +0000)]
The sum of a guint16 and 2 does not necessarily fit in a guint16.  Put
it into a gint, instead.  This should fix bug 6572, by preventing an
infinite loop if the sum in question is 0 modulo 2^16.

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

12 years agoClean up white space.
guy [Sun, 13 Nov 2011 00:04:49 +0000 (00:04 +0000)]
Clean up white space.

Note that we don't need to set the FCS length, but might as well do so
anyway.

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

12 years agoVarious additional fixes ....
wmeier [Sat, 12 Nov 2011 23:25:29 +0000 (23:25 +0000)]
Various additional fixes ....

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

12 years agoFix a formatting error.
wmeier [Sat, 12 Nov 2011 23:03:30 +0000 (23:03 +0000)]
Fix a formatting error.

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

12 years agoFix some compile errors and rework some code.
wmeier [Sat, 12 Nov 2011 22:26:06 +0000 (22:26 +0000)]
Fix some compile errors and rework some code.

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

12 years agoFix compilation if HAVE_LIBGCRYPT is not defined.
tuexen [Sat, 12 Nov 2011 22:03:55 +0000 (22:03 +0000)]
Fix compilation if HAVE_LIBGCRYPT is not defined.

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

12 years agoUpdate URL.
guy [Sat, 12 Nov 2011 21:16:43 +0000 (21:16 +0000)]
Update URL.

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

12 years agoAdd entries for WTAP_ENCAP_NETANALYZER... to encap_table_base[]
wmeier [Sat, 12 Nov 2011 20:27:32 +0000 (20:27 +0000)]
Add entries for WTAP_ENCAP_NETANALYZER... to encap_table_base[]

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

12 years agoRemove some unneeded 'if(pinfo)' tests;
wmeier [Sat, 12 Nov 2011 20:17:43 +0000 (20:17 +0000)]
Remove some unneeded 'if(pinfo)' tests;
Remove some unneeded forward refs.

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

12 years agoFix 2 typos.
wmeier [Sat, 12 Nov 2011 20:14:26 +0000 (20:14 +0000)]
Fix 2 typos.

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

12 years agoRemove unneeded code.
wmeier [Sat, 12 Nov 2011 19:45:21 +0000 (19:45 +0000)]
Remove unneeded code.

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

12 years agoFix 2 typos
wmeier [Sat, 12 Nov 2011 19:27:07 +0000 (19:27 +0000)]
Fix 2 typos

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

12 years agoFix some additional [-Wunused-but-set-variable]
wmeier [Sat, 12 Nov 2011 19:17:21 +0000 (19:17 +0000)]
Fix some additional [-Wunused-but-set-variable]
Fix some spelling typos

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

12 years agoFrom Holger Pfrommer:
etxrab [Sat, 12 Nov 2011 18:01:38 +0000 (18:01 +0000)]
From Holger Pfrommer:
Enhancement of Hilscher Analyzer Dissector.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6082

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

12 years agofix [-Wunused-but-set-variable]
etxrab [Sat, 12 Nov 2011 12:37:38 +0000 (12:37 +0000)]
fix [-Wunused-but-set-variable]

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

12 years agofix [-Wunused-but-set-variable]
etxrab [Sat, 12 Nov 2011 11:49:37 +0000 (11:49 +0000)]
fix [-Wunused-but-set-variable]

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

12 years agoAdd a cast.
etxrab [Sat, 12 Nov 2011 11:27:41 +0000 (11:27 +0000)]
Add a cast.

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