obnox/wireshark/wip.git
7 years agoConvert "4 space tabs" to spaces; Minor reformatting.
wmeier [Tue, 13 Dec 2011 23:02:29 +0000 (23:02 +0000)]
Convert "4 space tabs" to spaces; Minor reformatting.

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

7 years agoFix tvb memory leak; Fix hex byte display for Unicode XML.
wmeier [Tue, 13 Dec 2011 22:49:59 +0000 (22:49 +0000)]
Fix tvb memory leak; Fix hex byte display for Unicode XML.

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

7 years agoFix tvbuff memory leak.
wmeier [Tue, 13 Dec 2011 21:51:33 +0000 (21:51 +0000)]
Fix tvbuff memory leak.

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

7 years agoUse consistent indentation.
wmeier [Tue, 13 Dec 2011 21:03:57 +0000 (21:03 +0000)]
Use consistent indentation.

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

7 years agoDon't close the field tag here; it's now closed with </field>.
cmaynard [Tue, 13 Dec 2011 20:07:21 +0000 (20:07 +0000)]
Don't close the field tag here; it's now closed with </field>.

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

7 years agoMove proto_reg_handoff...(0 to the end of the file as per Wireshark convention.
wmeier [Tue, 13 Dec 2011 19:58:47 +0000 (19:58 +0000)]
Move proto_reg_handoff...(0 to the end of the file as per Wireshark convention.
Minor whitespace cleanup.

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

7 years agoFix: Execution Tracing High-Detail field selection highlighting seemingly wrong bytes...
wmeier [Tue, 13 Dec 2011 19:54:19 +0000 (19:54 +0000)]
Fix: Execution Tracing High-Detail field selection highlighting seemingly wrong bytes in hex view pane.

Actual problem:
  A REAL_DATA tvbuff wasn't being added to the "data_sources"
  for a frame. When displaying the frame, when a field referencing the tvb was selected
  for display there was no 'hex bytes' tab for the field and so bytes ended up being
  highlighted in the currently displayed hex bytes tab (thus highlighting bytes in a pane
  not related to the field).

  Consider: Add some code in field creation (proto_tree_add...) to at least warn if
            a field is being created using a tvb whose data_source is not in the
            data_sources list for the frame ?

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

7 years agoInitialise 'sub_tree' to NULL, to avoid warnings about possibly using
martinm [Tue, 13 Dec 2011 19:46:24 +0000 (19:46 +0000)]
Initialise 'sub_tree' to NULL, to avoid warnings about possibly using
uninitialised.  The warnings are bogus, but could have been avoided, as the test
to see if we're using a compression profile is redundant/will always be TRUE
in those functions...

Also removed some unnecessary braces from switch cases (no local variables were defined).

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

7 years agoThe last element of an h248_pkg_param_t should be a pointer.
guy [Tue, 13 Dec 2011 18:56:01 +0000 (18:56 +0000)]
The last element of an h248_pkg_param_t should be a pointer.

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

7 years agoh248_e_implicit = FALSE;
etxrab [Tue, 13 Dec 2011 17:59:27 +0000 (17:59 +0000)]
h248_e_implicit = FALSE;

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

7 years agoFix typo
martinm [Tue, 13 Dec 2011 17:35:45 +0000 (17:35 +0000)]
Fix typo

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

7 years agoFrom Per Liedberg:
etxrab [Tue, 13 Dec 2011 17:13:50 +0000 (17:13 +0000)]
From Per Liedberg:
RoHC dissection improvment.

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

7 years agoProtect against NULL pointers as input. Based on the stacktrace provided, this shoul...
cmaynard [Tue, 13 Dec 2011 16:50:34 +0000 (16:50 +0000)]
Protect against NULL pointers as input.  Based on the stacktrace provided, this should avoid crashes reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6634

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

7 years agoRename WTAP_ERR_BAD_RECORD to WTAP_ERR_BAD_FILE; it really reports any
guy [Tue, 13 Dec 2011 09:53:50 +0000 (09:53 +0000)]
Rename WTAP_ERR_BAD_RECORD to WTAP_ERR_BAD_FILE; it really reports any
form of corruption/bogosity in a file, including in a file header as
well as in records in the file.  Change the error message
wtap_strerror() returns for it to reflect that.

Use it for some file header problems for which it wasn't already being
used - WTAP_ERR_UNSUPPORTED shouldn't be used for that, it should only
be used for files that we have no reason to believe are invalid but that
have a version number we don't know about or some other
non-link-layer-encapsulation-type value we don't know about.

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

7 years agoCrank up the maximum frame table size to 512*2^20 packets, that being a
guy [Tue, 13 Dec 2011 06:45:16 +0000 (06:45 +0000)]
Crank up the maximum frame table size to 512*2^20 packets, that being a
small amount bigger than the maximum possible number of packets in a
NetMon file.

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

7 years agoUse tvb_new_child_real_data() instead of tvb_new_real_data() + tvb_set_child_real_dat...
wmeier [Tue, 13 Dec 2011 04:01:33 +0000 (04:01 +0000)]
Use tvb_new_child_real_data() instead of tvb_new_real_data() + tvb_set_child_real_data_tvbuff().

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

7 years agoAdd the -H and -W options to the "tshark -h" output. Ref: http://www.wireshark.org...
cmaynard [Tue, 13 Dec 2011 03:17:49 +0000 (03:17 +0000)]
Add the -H and -W options to the "tshark -h" output.  Ref: wireshark.org/lists/wireshark-users/201112/msg00044.html

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

7 years agoPrevent memory leakage of uncompress tvb and associated data buffer (step 1).
wmeier [Tue, 13 Dec 2011 02:56:44 +0000 (02:56 +0000)]
Prevent memory leakage of uncompress tvb and associated data buffer (step 1).
(tvb memory leak will actually remain until a bug in tvbuff.c is also fixed).

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

7 years agoAdd missing checks for a too-large packet, so we don't blow up trying to
guy [Tue, 13 Dec 2011 02:42:42 +0000 (02:42 +0000)]
Add missing checks for a too-large packet, so we don't blow up trying to
allocate a huge buffer.

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

7 years agoCheck for a bogus record size. Fixes bug 6670.
guy [Tue, 13 Dec 2011 02:00:41 +0000 (02:00 +0000)]
Check for a bogus record size.  Fixes bug 6670.

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

7 years agoAdd an arbitrary limit on the maximum size of the frame table, so that
guy [Tue, 13 Dec 2011 01:49:27 +0000 (01:49 +0000)]
Add an arbitrary limit on the maximum size of the frame table, so that
we don't crash.  Fixes bug 6669.

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

7 years agoAdd missing checks for a too-large packet, so we don't blow up trying to
guy [Tue, 13 Dec 2011 01:24:12 +0000 (01:24 +0000)]
Add missing checks for a too-large packet, so we don't blow up trying to
allocate a huge buffer; fixes bug 6668.

Also add some other checks for invalid records.

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

7 years agoAdd missing check for a too-large packet, so we don't blow up trying to
guy [Tue, 13 Dec 2011 01:05:52 +0000 (01:05 +0000)]
Add missing check for a too-large packet, so we don't blow up trying to
allocate a huge buffer; fixes bug 6667.

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

7 years agoAdd missing check for a too-large packet, so we don't blow up trying to
guy [Tue, 13 Dec 2011 00:57:09 +0000 (00:57 +0000)]
Add missing check for a too-large packet, so we don't blow up trying to
allocate a huge buffer; fixes bug 6666.

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

7 years agoClamp the reported length of a packet at G_MAXINT for now, to avoid
guy [Tue, 13 Dec 2011 00:44:22 +0000 (00:44 +0000)]
Clamp the reported length of a packet at G_MAXINT for now, to avoid
crashes due to having no tvbuffs for an epan_dissect_t.

Fixes bug 6663 and its soon-to-be-duplicates.

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

7 years agoFix a memory leak of a tvb.
wmeier [Tue, 13 Dec 2011 00:02:30 +0000 (00:02 +0000)]
Fix a memory leak of a tvb.

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

7 years agoAdd missing </field> for data tree. Fixes https://bugs.wireshark.org/bugzilla/show_b...
cmaynard [Mon, 12 Dec 2011 19:24:49 +0000 (19:24 +0000)]
Add missing </field> for data tree.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3809

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

7 years agoFix incorrect "pos=0" pdml values. Resolves the issue reported in comment 4 of https...
cmaynard [Mon, 12 Dec 2011 18:35:49 +0000 (18:35 +0000)]
Fix incorrect "pos=0" pdml values.  Resolves the issue reported in comment 4 of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2432 and closes the bug.

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

7 years agoFrom Asmita:
etxrab [Mon, 12 Dec 2011 17:42:24 +0000 (17:42 +0000)]
From Asmita:
Update to csg2 r7

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

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

7 years agoFrom Roy Marples:
jake [Mon, 12 Dec 2011 08:18:18 +0000 (08:18 +0000)]
From Roy Marples:
ICMPv6 DNSSL option can contain padding, which does not represent a malformed option.

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

7 years agoAllow for true error reporing.
jake [Mon, 12 Dec 2011 07:56:45 +0000 (07:56 +0000)]
Allow for true error reporing.
Move the comment to where it's intended.

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

7 years agoFrom Mike Morrin:
etxrab [Mon, 12 Dec 2011 07:24:57 +0000 (07:24 +0000)]
From Mike Morrin:
eliminates the global variable for tracking which nibble is
to be decoded by taking advantage of the fact that half octet IEs always occur
in pairs, and thus a pair can be grouped together for decoding.

There was probably also some confusion caused by the macros UPPER_NIBBLE and
LOWER_NIBBLE because the GSM bit numbering is opposite to Wireshark internal
numbering, so I have changed these to be LEFT_NIBBLE and RIGHT_NIBBLE, which
corresponds to the display format in Wireshark.

The dissection order of half octet IEs has been adjusted where necessary to
align with the ordering shown in the GSM specifications.

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

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

7 years ago- Change the tree layout to mimic packet-pdcp-lte.c
etxrab [Mon, 12 Dec 2011 06:58:37 +0000 (06:58 +0000)]
- Change the tree layout to mimic packet-pdcp-lte.c
- Add IPv6 static chain dissectoin
- Part of IPv6 dynamic chain dissectoin

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

7 years agoWell, until someone has the time to write ct2ext(), just return the content type...
cmaynard [Mon, 12 Dec 2011 00:35:51 +0000 (00:35 +0000)]
Well, until someone has the time to write ct2ext(), just return the content type, which is better than nothing.

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

7 years agoIf no filename, include the packet number in the generic name. TODO: Implement the...
cmaynard [Mon, 12 Dec 2011 00:27:32 +0000 (00:27 +0000)]
If no filename, include the packet number in the generic name.  TODO: Implement the ct2ext() function.

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

7 years agoIf the object to export doesn't have a filename, use a generic "object" name instead...
cmaynard [Sun, 11 Dec 2011 23:43:03 +0000 (23:43 +0000)]
If the object to export doesn't have a filename, use a generic "object" name instead.  This fixes the crash reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6250

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

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

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

7 years agoFix a couple of warnings.
etxrab [Sat, 10 Dec 2011 13:18:45 +0000 (13:18 +0000)]
Fix a couple of warnings.

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

7 years ago607: warning: unused variable 'd'
etxrab [Sat, 10 Dec 2011 13:09:17 +0000 (13:09 +0000)]
607: warning: unused variable 'd'

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

7 years agoDissect the whole IR dyn packet in packet-rohc.c
etxrab [Sat, 10 Dec 2011 12:50:05 +0000 (12:50 +0000)]
Dissect the whole IR dyn packet in packet-rohc.c

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

7 years agoIf we know there is a FCS present, don't hand it to the ethernet trailer dissectors...
sake [Sat, 10 Dec 2011 12:28:28 +0000 (12:28 +0000)]
If we know there is a FCS present, don't hand it to the ethernet trailer dissectors, but dissect it on return

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

7 years agoUpdate some support libs to newer version.
tuexen [Sat, 10 Dec 2011 09:48:59 +0000 (09:48 +0000)]
Update some support libs to newer version.

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

7 years agoIgnore macosx-support-libs.
tuexen [Sat, 10 Dec 2011 09:46:17 +0000 (09:46 +0000)]
Ignore macosx-support-libs.

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

7 years agoClarify some stuff in a comment.
guy [Sat, 10 Dec 2011 05:33:48 +0000 (05:33 +0000)]
Clarify some stuff in a comment.

Don't call any of the heuristic trailer dissectors if there's no trailer
to dissect.

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

7 years agoClean up indentation.
guy [Sat, 10 Dec 2011 05:29:09 +0000 (05:29 +0000)]
Clean up indentation.

Do more length checks, so we reject trailers that have nothing to
dissect.

Test for the trailer length being >= 8, rather than for having the 0x08
bit set (they amount to the same thing, as the trailer length is <= 14,
and >= 8 is what we really want if we're checking whether there's a
timestamp).

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

7 years agoFrom Tilghman Lesher:
jake [Fri, 9 Dec 2011 23:14:14 +0000 (23:14 +0000)]
From Tilghman Lesher:
Some commands and IEs from the current release of Asterisk are missing from the
IAX protocol dissector.  This patch provides them.

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

7 years agoFrom Thomas Dreibholz:
jake [Fri, 9 Dec 2011 22:56:25 +0000 (22:56 +0000)]
From Thomas Dreibholz:
ASCONF and ASCONF_ACK chunks have a "Sequence Number" field (RFC 5061, 4.1.1
and 4.1.2). The dissector wrongly calls it "Serial number". The attached patch
fixes this issue.

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

7 years agoFrom Nikitha Malgi:
jake [Fri, 9 Dec 2011 22:05:04 +0000 (22:05 +0000)]
From Nikitha Malgi:
Implementing extensions to Wireshark to support TRILL payloads.

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

7 years agoReferring to pcap_version[] doesn't do what you want on at least some
guy [Fri, 9 Dec 2011 21:15:48 +0000 (21:15 +0000)]
Referring to pcap_version[] doesn't do what you want on at least some
UN*Xes (Fedora 16 and probably other Linux distributions, probably at
least some if not all other ELF-based systems, and perhaps also Mac OS
X), and causes problems if pcap_version[] has a different length in the
libpcap with which the executable was built and the libpcap with which
it's run, so we avoid using it for now.

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

7 years agoGet rid of unused variable.
guy [Fri, 9 Dec 2011 20:28:12 +0000 (20:28 +0000)]
Get rid of unused variable.

Fix a comparison.

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

7 years agoExport all data sources of a frame to a C array. Fixes https://bugs.wireshark.org...
cmaynard [Fri, 9 Dec 2011 19:44:28 +0000 (19:44 +0000)]
Export all data sources of a frame to a C array.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4988

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

7 years agoDissect the whole IR packet in packet-rohc.c
etxrab [Fri, 9 Dec 2011 18:58:26 +0000 (18:58 +0000)]
Dissect the whole IR packet in packet-rohc.c

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

7 years agoUpdate to 3GPP TS 36.413 V10.3.0 (2011-09)
etxrab [Fri, 9 Dec 2011 18:55:45 +0000 (18:55 +0000)]
Update to 3GPP TS 36.413 V10.3.0 (2011-09)

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

7 years agoFrom report of Arasch Honarbacht via https://bugs.wireshark.org/bugzilla/show_bug...
alagoutte [Fri, 9 Dec 2011 17:00:28 +0000 (17:00 +0000)]
From report of Arasch Honarbacht via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6649
ZigBee ZCL Dissector reports invalid status

The status code 0x8d contained in an attriute status record in a configure reporting response frame is incorrectly displayed as "Write only" (where WRITE_ONLY = 0x8f). According to the ZigBee Cluster Library Specification, Document 075123r03ZB, April 26, 2010 a status of 0x8d should display as "INVALID_DATA_TYPE"

From me :
Fix this issue (Wrong value define) based on Specs available in ZigBee.org

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

7 years agoFrom beelzebutt via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6597
alagoutte [Fri, 9 Dec 2011 16:49:06 +0000 (16:49 +0000)]
From beelzebutt via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6597
Mesh Peering Management reason code field interpreted as status code

The Mesh Peering Management tag displays a status code instead of a reason code

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

7 years agoFrom Juha Takala via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6654
alagoutte [Fri, 9 Dec 2011 16:39:18 +0000 (16:39 +0000)]
From Juha Takala via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6654
ELCOM dissector needs small fixes for some protocol sub-field texts

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

7 years agoFrom astramax57:
jake [Fri, 9 Dec 2011 16:34:02 +0000 (16:34 +0000)]
From astramax57:
After r38723, some BGP AS_PATH packets were no longer dissected.

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

7 years agoFixed wrong registration call causing compilation warnings.
grahamb [Fri, 9 Dec 2011 13:31:19 +0000 (13:31 +0000)]
Fixed wrong registration call causing compilation warnings.

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

7 years agoAdded dissector registration for udp messages to permit use with a USER_DLT as per...
grahamb [Fri, 9 Dec 2011 13:08:50 +0000 (13:08 +0000)]
Added dissector registration for udp messages to permit use with a USER_DLT as per request from Chris Bontje

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

7 years agoAdded definition and handling for IIN Function Code Not Implemented bit.
grahamb [Fri, 9 Dec 2011 12:42:31 +0000 (12:42 +0000)]
Added definition and handling for IIN Function Code Not Implemented bit.

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

7 years agoFrom Johannes Berg
jake [Fri, 9 Dec 2011 08:41:38 +0000 (08:41 +0000)]
From Johannes Berg
It's tedious to parse the blockack bitmap by hand, showing it in wireshark
directly is much nicer. Attached patch does so, only for compressed BA for now.

From me: made it filterable.

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

7 years agoUse correct offset.
etxrab [Fri, 9 Dec 2011 06:16:07 +0000 (06:16 +0000)]
Use correct offset.

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

7 years agoGet rid of declarations of undefined routines and definitins of unused
guy [Fri, 9 Dec 2011 03:00:56 +0000 (03:00 +0000)]
Get rid of declarations of undefined routines and definitins of unused
routines.

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

7 years agoMove the definition of enum rohc_mode into packet-rohc.h.
guy [Fri, 9 Dec 2011 02:34:53 +0000 (02:34 +0000)]
Move the definition of enum rohc_mode into packet-rohc.h.

Have packet-pdcp-lte.h include packet-rohc.h to pick up that definition.

Get rid of now-no-longer-necessary includes.

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

7 years agopacket-pdcp-lte.h defines "enum rohc_mode", and packet-rohc.h uses it,
guy [Fri, 9 Dec 2011 00:59:47 +0000 (00:59 +0000)]
packet-pdcp-lte.h defines "enum rohc_mode", and packet-rohc.h uses it,
so include packet-pdcp-lte.h first.

Get rid of extra definition of "enum rohc_mode".

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

7 years agopacket-pdcp-lte.h defines "enum rohc_mode", and packet-rohc.h uses it,
guy [Fri, 9 Dec 2011 00:56:48 +0000 (00:56 +0000)]
packet-pdcp-lte.h defines "enum rohc_mode", and packet-rohc.h uses it,
so include packet-pdcp-lte.h first.

No extra tokens after #endif, please.

Fix indentation.

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

7 years agoStart using functions from packet-rohc.c
etxrab [Thu, 8 Dec 2011 21:45:35 +0000 (21:45 +0000)]
Start using functions from packet-rohc.c

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

7 years agoTry to get the container stuff right...
etxrab [Thu, 8 Dec 2011 21:17:03 +0000 (21:17 +0000)]
Try to get the container stuff right...

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

7 years agoUse to display ESP SPI BASE_HEX_DEC as it is in decimal in SIP.
etxrab [Thu, 8 Dec 2011 19:34:04 +0000 (19:34 +0000)]
Use to display ESP SPI BASE_HEX_DEC as it is in decimal in SIP.

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

7 years agoProperly dissect Source-ToTarget-TransparentContainer.
etxrab [Thu, 8 Dec 2011 19:32:51 +0000 (19:32 +0000)]
Properly dissect Source-ToTarget-TransparentContainer.

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

7 years agoStore expert group value, fix output of each record.
martinm [Thu, 8 Dec 2011 15:19:11 +0000 (15:19 +0000)]
Store expert group value, fix output of each record.

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

7 years agoSkip correct number of bytes.
martinm [Thu, 8 Dec 2011 11:15:31 +0000 (11:15 +0000)]
Skip correct number of bytes.

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

7 years agoAdd a dissector table for private extensions.
etxrab [Wed, 7 Dec 2011 19:04:13 +0000 (19:04 +0000)]
Add a dissector table for private extensions.

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

7 years agoFix [-Wunused-but-set-variable] GCC warnings;
wmeier [Wed, 7 Dec 2011 14:47:27 +0000 (14:47 +0000)]
Fix [-Wunused-but-set-variable] GCC warnings;
Remove some trailing blanks;
#include <stdio.h> not needed.

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

7 years agoDon't keep out the cmake folks ;-)
sake [Wed, 7 Dec 2011 13:53:14 +0000 (13:53 +0000)]
Don't keep out the cmake folks ;-)

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

7 years agoFix for bug 6650: IP-ID is 2 bytes.
martinm [Wed, 7 Dec 2011 12:19:59 +0000 (12:19 +0000)]
Fix for bug 6650: IP-ID is 2 bytes.
Note that I'm still aiming to change PDCP to use packet-rohc rather than its own, separate implementation...

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

7 years agoRatingGroup -> RatingGroupId
etxrab [Wed, 7 Dec 2011 06:29:31 +0000 (06:29 +0000)]
RatingGroup -> RatingGroupId

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

7 years agoMake windows buildbots happy...
sake [Tue, 6 Dec 2011 23:52:01 +0000 (23:52 +0000)]
Make windows buildbots happy...

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

7 years ago- Make a distinction between ethernet padding and an ethernet trailer
sake [Tue, 6 Dec 2011 23:07:55 +0000 (23:07 +0000)]
- Make a distinction between ethernet padding and an ethernet trailer
- ... and make that distinction configurable for capture files that do not have padding in small frames, but do have trailers
- Add VSS-Monitoring dissector to show by the TAP inserted time- and portstamps

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

7 years agoRegister giop by name (TCP).
etxrab [Tue, 6 Dec 2011 19:33:55 +0000 (19:33 +0000)]
Register giop by name (TCP).

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

7 years agoEnabling crosshairs on TCP stream graph paints the screen.
etxrab [Tue, 6 Dec 2011 19:28:28 +0000 (19:28 +0000)]
Enabling crosshairs on TCP stream graph paints the screen.
Move the problem to GTK3+

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

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

7 years agoUpdate to 3GPP TS 32.298 V6.4.1 (2006-06)
etxrab [Tue, 6 Dec 2011 19:16:10 +0000 (19:16 +0000)]
Update to 3GPP TS 32.298 V6.4.1 (2006-06)

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

7 years agoAccpet lover case Topology descriptor (tp) as we accept other tokens in lowercase.
etxrab [Tue, 6 Dec 2011 19:10:13 +0000 (19:10 +0000)]
Accpet lover case Topology descriptor (tp) as we accept other tokens in lowercase.

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

7 years agoFix length of Error parameter.
etxrab [Tue, 6 Dec 2011 19:08:01 +0000 (19:08 +0000)]
Fix length of Error parameter.

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

7 years ago#if 0 unused stuff ...
wmeier [Tue, 6 Dec 2011 16:15:24 +0000 (16:15 +0000)]
#if 0 unused stuff ...

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

7 years agoIn capture_prep_monitor_changed_cb(), don't update the monitor mode
guy [Tue, 6 Dec 2011 07:13:40 +0000 (07:13 +0000)]
In capture_prep_monitor_changed_cb(), don't update the monitor mode
checkbox unless we're actually forcing it off.

Small indentation fix.

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

7 years agoOne more contributor...
etxrab [Tue, 6 Dec 2011 07:07:19 +0000 (07:07 +0000)]
One more contributor...

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

7 years agoIf capture_get_if_capabilities() fails, pop up a message, just as we
guy [Tue, 6 Dec 2011 04:00:39 +0000 (04:00 +0000)]
If capture_get_if_capabilities() fails, pop up a message, just as we
print a message in tshark.  That doesn't fix the problem seen on Linux
distributions, such as recent versions of Debian and derivatives, that
have libpcap 1.1.0 or later built without libnl, where the monitor mode
checkbox doesn't work - that's a libpcap bug, fixed in the 1.2 branch
and trunk, so a future 1.2.1 or 1.3.0 release should fix it, and perhaps
a future Debian release will build libpcap with libnl - but at least it
means you get a dialog box rather than just getting mysterious behavior
when you try to check the "monitor mode" checkbox.

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

7 years agoPretify TimeStamp and TimeZone
etxrab [Mon, 5 Dec 2011 21:53:00 +0000 (21:53 +0000)]
Pretify TimeStamp and TimeZone

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

7 years agoExplicitly display "Source or Destination Address/Host" like IPv4.
cmaynard [Mon, 5 Dec 2011 19:12:24 +0000 (19:12 +0000)]
Explicitly display "Source or Destination Address/Host" like IPv4.

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 4 Dec 2011 18:43:18 +0000 (18:43 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 4 Dec 2011 18:43:05 +0000 (18:43 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoEnhance Elcom dissector
alagoutte [Sun, 4 Dec 2011 18:40:19 +0000 (18:40 +0000)]
Enhance Elcom dissector
Fix indent and update modelines

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

7 years agoEnhance Elcom dissector
alagoutte [Sun, 4 Dec 2011 18:19:18 +0000 (18:19 +0000)]
Enhance Elcom dissector
Replace proto_tree_add_* by proto_tree_add_item
Replace switch/case by value_string

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

7 years agoFrom Vincent Helfre.
etxrab [Sun, 4 Dec 2011 15:21:22 +0000 (15:21 +0000)]
From Vincent Helfre.
The offset in "Cell Selection Indicator after Release of all TCH and SDCCH" was not correct because the length was element was decoded twice.  So I removed the second decoding of the length.

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

7 years ago[Automatic manuf, services and enterprise-numbers update for 2011-12-04]
gerald [Sun, 4 Dec 2011 15:03:28 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-12-04]

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

7 years agoFix 2 newly reported Coverity CID's 1331 & 1332: UNUSED_VALUE.
cmaynard [Sat, 3 Dec 2011 22:53:55 +0000 (22:53 +0000)]
Fix 2 newly reported Coverity CID's 1331 & 1332: UNUSED_VALUE.

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

7 years ago"Expert Info Composite" is now "Expert Info" (with the old "Expert Info" having been...
wmeier [Sat, 3 Dec 2011 22:08:28 +0000 (22:08 +0000)]
"Expert Info Composite" is now "Expert Info" (with the old "Expert Info" having been removed).

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

7 years agoDo 'md wsluarm_src' only if dir doesn't alreay exist.
wmeier [Sat, 3 Dec 2011 19:59:48 +0000 (19:59 +0000)]
Do 'md wsluarm_src' only if dir doesn't alreay exist.

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

7 years agoCall tap_queue_packet() after pinfo data is updated. Also, like IPv4, display next...
cmaynard [Sat, 3 Dec 2011 17:03:06 +0000 (17:03 +0000)]
Call tap_queue_packet() after pinfo data is updated.  Also, like IPv4, display next header field in decimal instead of hexadecimal (REF: iana.org/assignments/protocol-numbers/protocol-numbers.xml)

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