9 years agoFrom Lori Tribble: Add vendor identifier dissector access to BACnet Private Transfer...
wmeier [Fri, 22 Oct 2010 18:13:42 +0000 (18:13 +0000)]
From Lori Tribble: Add vendor identifier dissector access to BACnet Private Transfer Msgs

 BACnet has a private transfer service which is vendor specific.  The start of
 each request and response contains the vendor identifier.  I've added a way for
 vendors to provide their own dissectors by registering their vendor identifier.
 The packet-bacapp.c method fConfirmedPrivateTransfer has been modified to look
 for a vendor specified dissector.  If found it will be run.  If not found we
 default to running the standard dissection included in packet-bacapp.c.

 I modified the summary column display for private transfer messages so that the
 summary now displays the Vendor Identifier (V=xx) and the Service Number (SN=xx).


From me: Rename sub-dissector tablle to "bacapp.vendor_identifier"
         Change subdissector ui_name to "BACapp Vendor Identifier"

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

9 years agoFrom Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5329 :
morriss [Fri, 22 Oct 2010 18:05:50 +0000 (18:05 +0000)]
From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5329 :

Find a patch who clean up PPP dissector
* Remove check_col (from my previous patch #5325)
* Remove the #define ppp_min (unused)
* Remove some unused ett_*
* Cleanup NO ARRAY entry (it is a false positive of checkhf tool, it is need {
(in the same line) before a hf_... in hf_register_info struct
* Cleanup Unused entry in VSNP Dissector ( it's really strange, there is no
check when the code was added #4434 ;) )
* minor bug fix...

From me: put one of the check_col()'s (that also protects a val_to_str() call)
back in.

Note: the checkhf tool bug was fixed in rev 34623.

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

9 years agoFix detection of hf entries being used in the hf array where the opening brace
morriss [Fri, 22 Oct 2010 17:54:08 +0000 (17:54 +0000)]
Fix detection of hf entries being used in the hf array where the opening brace
is on the preceding line.  There was code here to do it but it needed to be
moved inside the preceding 'else' (in particular, before the 'next' sent us
around the loop again).

The bug was noticed by Alexis La Goutte in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5329

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

9 years agoFrom Tobias Klauservia https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5327 :
morriss [Fri, 22 Oct 2010 15:08:32 +0000 (15:08 +0000)]
From Tobias Klauservia https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5327 :

The current PRP dissector in packet-prp.c does not correctly identify VLAN
tags. It uses the hard coded value 0x8000 to check the ethertype.

The attached patch (against current SVN trunk) changes this to use the
ETHERTYPE_VLAN define from epan/etypes.h and also fixes two misspellings in the
respective comments.

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

9 years agoAdd some info about extended value string to section 1.7.1
wmeier [Fri, 22 Oct 2010 15:00:37 +0000 (15:00 +0000)]
Add some info about extended value string to section 1.7.1

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

9 years agoFrom Vincent Helfre:
etxrab [Fri, 22 Oct 2010 13:35:03 +0000 (13:35 +0000)]
From Vincent Helfre:
Some improvements for the presentations.

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

9 years agoCorrected check for end of well_known_sids.
stig [Fri, 22 Oct 2010 10:48:14 +0000 (10:48 +0000)]
Corrected check for end of well_known_sids.

This fixes bug 5328.

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

9 years agoFrom Regis Cridlig via bug 5326:
stig [Fri, 22 Oct 2010 06:47:00 +0000 (06:47 +0000)]
From Regis Cridlig via bug 5326:
The Lua text string passed to column:set(text) by a dissector will eventually
be reclaimed. This causes the column to display incorrect characters.

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

9 years agoFixed printing guint64 variables.
stig [Fri, 22 Oct 2010 06:42:55 +0000 (06:42 +0000)]
Fixed printing guint64 variables.
Removed unused variables.

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

9 years agoC++ style comments in packet-windows-common.c
etxrab [Fri, 22 Oct 2010 06:26:42 +0000 (06:26 +0000)]
C++ style comments in packet-windows-common.c

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

9 years agopacket-smb.c:890: warning: data definition has no type or storage class
etxrab [Fri, 22 Oct 2010 05:47:01 +0000 (05:47 +0000)]
packet-smb.c:890: warning: data definition has no type or storage class

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

9 years agoIf the html dir exist remove it and its subdirectories.
etxrab [Fri, 22 Oct 2010 05:43:12 +0000 (05:43 +0000)]
If the html dir exist remove it and its subdirectories.

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

9 years agoFrom CaL Turney:
etxrab [Fri, 22 Oct 2010 05:15:25 +0000 (05:15 +0000)]
From CaL Turney:
Add support for well-known SIDs/RIDs and option to display in hex.

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

9 years agoReplace blurb that matches the field name with NULL
morriss [Fri, 22 Oct 2010 01:37:06 +0000 (01:37 +0000)]
Replace blurb that matches the field name with NULL

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

9 years agoFrom Shoichi Sakane via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5270 :
morriss [Thu, 21 Oct 2010 22:41:39 +0000 (22:41 +0000)]
From Shoichi Sakane via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5270 :

Update to use add the time as a filterable field and other cosmetic changes.

From me: exp2() seems to be C99 so #if the use of it out.

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

9 years agoCleanup:
wmeier [Thu, 21 Oct 2010 21:21:26 +0000 (21:21 +0000)]
- Reindent source; cleanup whitespace;
- Remove many unneeded 'if(tree)' & similar (Tnx to Jeff Morriss for the suggestion);
- remove unneeded initializers;
- Reformat some long lines;
- Fix up some comments showing message layout;
- Localize two static global variables.

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

9 years agoFrom Sven Schnelle:
jake [Thu, 21 Oct 2010 21:02:10 +0000 (21:02 +0000)]
From Sven Schnelle:
Add dissector for Tektronix Teklink Protocol, used by their Logic Analyzers.
May be useful for reverse engineering their Protocol.

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

9 years agoAdd some casts to get the Windows builds going.
morriss [Thu, 21 Oct 2010 21:02:07 +0000 (21:02 +0000)]
Add some casts to get the Windows builds going.

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

9 years agoAfter calling a subdissector, set a fence on COL_INFO so whatever the
morriss [Thu, 21 Oct 2010 20:51:06 +0000 (20:51 +0000)]
After calling a subdissector, set a fence on COL_INFO so whatever the
subdissector put in the Info column stays there.

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

9 years agoFrom Srinivasa Pradeep: LDP dissector: Add/update PseudoWire TLV suport.
wmeier [Thu, 21 Oct 2010 19:13:57 +0000 (19:13 +0000)]
From Srinivasa Pradeep: LDP dissector: Add/update PseudoWire TLV suport.

 RFC 4447 describes new TLV called Generalised PWid FEC in LDP messages with the
 id 0x81. This is related to PsuedoWire setup and maintenance.
 Related to this, following are the TLVs which are defined in RFC 4447 and RFC 4446.
 1. PW Status TLV
 2. PW Interface parameters
 3. PW Group TLV

From me: remove some unused variables; Mark fcn arg as unused.

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

9 years agoFrom Robert Wynn:
jake [Thu, 21 Oct 2010 19:01:35 +0000 (19:01 +0000)]
From Robert Wynn:
CableLabs has added additional TLV's to DHCP Option 60 Modem capabilities
reporting for their Docsis 2.0 devices.  Additionally, in Docsis 3.0, they have
moved the capabilities portion of Option 60 (sub-option 5) to now reside in the
vendor specific Option 125 using their Enterprise number (4491).

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

9 years agoFrom Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5325 :
morriss [Thu, 21 Oct 2010 16:08:29 +0000 (16:08 +0000)]
From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5325 :

It is a rework of PAP PPP dissector
- Replace proto_tree_add_text by proto_tree_add_item
- add col_append_fstr to show information (Peer-ID, Password...)

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

9 years agoFix a cut-n-pasteo in a comment.
morriss [Thu, 21 Oct 2010 14:23:22 +0000 (14:23 +0000)]
Fix a cut-n-pasteo in a comment.

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

9 years agoAw, man, I knew this code was parsed, but I missed the docbook part. Revert 34598...
morriss [Thu, 21 Oct 2010 12:41:15 +0000 (12:41 +0000)]
Aw, man, I knew this code was parsed, but I missed the docbook part.  Revert 34598 and 34599.

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

9 years agoFixed "Compiled with" information in the About box.
stig [Thu, 21 Oct 2010 07:13:43 +0000 (07:13 +0000)]
Fixed "Compiled with" information in the About box.

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

9 years agoFrom Shoichi Sakane via bug 5270: minor changes and remove an unused hf variable.
morriss [Thu, 21 Oct 2010 03:04:15 +0000 (03:04 +0000)]
From Shoichi Sakane via bug 5270: minor changes and remove an unused hf variable.

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

9 years agoMake the indentation consistent.
morriss [Thu, 21 Oct 2010 02:50:27 +0000 (02:50 +0000)]
Make the indentation consistent.
Pull function names to column 0 - except when necessary for autoregistration.
Put function comments before the function.
For readability, put the macros for functions before the function too.
Put class functions before the class.

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

9 years agoFix up indentation to get it consistent and other minor cleanup issues.
morriss [Thu, 21 Oct 2010 00:54:58 +0000 (00:54 +0000)]
Fix up indentation to get it consistent and other minor cleanup issues.

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

9 years agoFrom Holger Freyther via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5320 :
morriss [Thu, 21 Oct 2010 00:37:40 +0000 (00:37 +0000)]
From Holger Freyther via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5320 :

Doing a Dumper:close() and then forcing the dumper to be garbage collected will
cause a segfault.

The code attempts to handle the GC that could follow but fails to do it
properly. Assigning Dumper dp = NULL will only have an affect within the scope
of this method... Assumingly this should be a *dp = NULL.

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

9 years agoFrom Fred Fierling:
etxrab [Wed, 20 Oct 2010 20:50:39 +0000 (20:50 +0000)]
From Fred Fierling:
Cleanup of unnecessary tree == NULL checks in ZCL dissector


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

9 years agoTarget system changed by mistake.
etxrab [Wed, 20 Oct 2010 20:49:30 +0000 (20:49 +0000)]
Target system changed by mistake.

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

9 years agoPrepartaions to use GTK 2.22
etxrab [Wed, 20 Oct 2010 20:41:39 +0000 (20:41 +0000)]
Prepartaions to use GTK 2.22

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

9 years agoFrom Shoichi Sakane via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5270 :
morriss [Wed, 20 Oct 2010 20:40:53 +0000 (20:40 +0000)]
From Shoichi Sakane via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5270 :

I made a patch to support more COAP options.
some options includes variable length field.

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

9 years ago(Minor): pretfs callback not req'd;
wmeier [Wed, 20 Oct 2010 18:14:49 +0000 (18:14 +0000)]
(Minor): pretfs callback not req'd;
         Move call to data dissector undet 'if(tree)' so same value of
          offset used whether or not 'tree == NULL'.

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

9 years agoAdd IPFIX_RECORDS_TO_CHECK to the environment variable section.
morriss [Wed, 20 Oct 2010 18:00:25 +0000 (18:00 +0000)]
Add IPFIX_RECORDS_TO_CHECK to the environment variable section.

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

9 years agoFrom Jeff Morriss: Fix crash: WTAP_ERR_BAD_RECORD error return needs to fill in ...
wmeier [Wed, 20 Oct 2010 17:20:56 +0000 (17:20 +0000)]
From Jeff Morriss: Fix crash: WTAP_ERR_BAD_RECORD error return needs to fill in *err_info.
From me: For ipfix_open() don't actually return with *err=WTAP_ERR_BAD_RECORD.
Also: Move #define RECORDS_FOR_IPFIX_CHECK to ipfix.c from ipfix.h since
      the definition is only used in ipfix.c.

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

9 years agoFix bug which caused ascend_open() to return "I/O error" (instead of "not me").
wmeier [Wed, 20 Oct 2010 17:07:55 +0000 (17:07 +0000)]
Fix bug which caused ascend_open() to return "I/O error" (instead of "not me").
(This happened if ascend_open was called with *err != 0).

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

9 years agoFrom Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5270 :
morriss [Wed, 20 Oct 2010 16:49:21 +0000 (16:49 +0000)]
From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5270 :

Add dissector for PAPI (Aruba AP Control Protocol), used by Aruba WLAN
There is no documentation on this protocol, the dissector is based on my
analysis ...

There is also an experimental "debug dissector" (not enable by default) for
dissecting the rest of data.

Changes by me:
- make it a new-style dissector
- change the name of the "debug" preference
- other minor changes

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

9 years agoFix a typo in a comment
wmeier [Wed, 20 Oct 2010 15:14:56 +0000 (15:14 +0000)]
Fix a typo in a comment

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

9 years agoFrom Vincent Helfre:
etxrab [Wed, 20 Oct 2010 12:40:13 +0000 (12:40 +0000)]
From Vincent Helfre:
various bug fix and enhancement for Release 8 additionnal parameters.

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

9 years agoAdd longer desriptions of SOStart and SOEnd fields.
martinm [Wed, 20 Oct 2010 12:08:22 +0000 (12:08 +0000)]
Add longer desriptions of SOStart and SOEnd fields.

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

9 years agoCopy GDK pixbuf loaders libs to the Wireshark.app.
stig [Wed, 20 Oct 2010 10:37:11 +0000 (10:37 +0000)]
Copy GDK pixbuf loaders libs to the Wireshark.app.

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

9 years agoIn heuristic dissector, don't check/allocate struct until/unless signature pattern...
martinm [Wed, 20 Oct 2010 09:58:40 +0000 (09:58 +0000)]
In heuristic dissector, don't check/allocate struct until/unless signature pattern matches.

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

9 years agoFix SE memory corruption reported in https://bugs.wireshark.org/bugzilla/show_bug...
morriss [Wed, 20 Oct 2010 01:49:32 +0000 (01:49 +0000)]
Fix SE memory corruption reported in  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5318 :

Ensure the digest is smaller than our buffer before copying it.

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

9 years agoUse while loops instead of goto's.
morriss [Wed, 20 Oct 2010 01:37:03 +0000 (01:37 +0000)]
Use while loops instead of goto's.

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

9 years agoFrom Colin O'Flynn and Owen Kirby via https://bugs.wireshark.org/bugzilla/show_bug...
morriss [Wed, 20 Oct 2010 01:23:32 +0000 (01:23 +0000)]
From Colin O'Flynn and Owen Kirby via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5266 :

The attached patch begins to add support for RPL to the ICMPv6 file. All
locations that RPL code have been added are marked with a comment allowing this
patch to be reverted at a future time if it is decided to e.g. move all the RPL
code to it's own dissector.

A few values await IANA assignment and are also clearly marked (in

Only the 'metric' option is left unsupported, as it is primarily defined in
another I-D.

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

9 years agoFrom Hadriel Kaplan: Update wiretap/README.developer
wmeier [Wed, 20 Oct 2010 01:15:12 +0000 (01:15 +0000)]
From Hadriel Kaplan: Update wiretap/README.developer

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

9 years agoUse DISSECTOR_ASSERT (not g_assert) in dissectors...
wmeier [Wed, 20 Oct 2010 00:47:23 +0000 (00:47 +0000)]
Use DISSECTOR_ASSERT (not g_assert) in dissectors...

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

9 years agoFrom Hadriel Kaplan: IPFIX file format support.
wmeier [Wed, 20 Oct 2010 00:36:53 +0000 (00:36 +0000)]
From Hadriel Kaplan: IPFIX file format support.

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

9 years agoFrom Fred Fierling:
etxrab [Tue, 19 Oct 2010 19:19:42 +0000 (19:19 +0000)]
From Fred Fierling:
Infinite loop in ZCL Discover Attributes dissection


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

9 years agoFrom Alexis La Goutte:
etxrab [Tue, 19 Oct 2010 18:28:29 +0000 (18:28 +0000)]
From Alexis La Goutte:
GRE Enhancements


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

9 years agoFrom Alexis La Goutte:
etxrab [Tue, 19 Oct 2010 18:28:00 +0000 (18:28 +0000)]
From Alexis La Goutte:
GRE Enhancements


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

9 years agoRemove some #if 0'd code I left in by mistake a while back....
wmeier [Tue, 19 Oct 2010 17:43:52 +0000 (17:43 +0000)]
Remove some #if 0'd code I left in by mistake a while back....

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

9 years agoChange dummy MAC addresses so we don't get Wireshark expert message:
wmeier [Tue, 19 Oct 2010 16:13:48 +0000 (16:13 +0000)]
Change dummy MAC addresses so we don't get Wireshark expert message:
"[...] Source MAC must not be a group address: IEEE 802.3-2002, Section 3.2.3(b)"
Specifically: use 0a:01:01:01:01:01 and 0a:02:02:02;02:02 (and dummy IP addresses and

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

9 years agoFrom Tamás Regõs:
etxrab [Tue, 19 Oct 2010 15:21:05 +0000 (15:21 +0000)]
From Tamás Regõs:
Make application ID readable from sub dissectors.

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

9 years agoUse dynamically created value_string_ext to store hash/symbol value_strings;
wmeier [Tue, 19 Oct 2010 14:31:05 +0000 (14:31 +0000)]
Use dynamically created value_string_ext to store hash/symbol value_strings;
Also: minor code reformatting and re-arrangement.

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

9 years agoFrom Shoichi Sakane via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5270 :
morriss [Tue, 19 Oct 2010 13:30:40 +0000 (13:30 +0000)]
From Shoichi Sakane via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5270 :

Remove some unused hf variables.

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

9 years agoFix problem with creating filter expressions (where stats window is limited by existi...
martinm [Tue, 19 Oct 2010 09:19:53 +0000 (09:19 +0000)]
Fix problem with creating filter expressions (where stats window is limited by existing filter).

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

9 years agoInit ett_coap_noop, another fix for bug 5305.
stig [Tue, 19 Oct 2010 06:58:08 +0000 (06:58 +0000)]
Init ett_coap_noop, another fix for bug 5305.

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

9 years agoDon't use g_strcmp0(): it only exists in glib > 2.16.
morriss [Mon, 18 Oct 2010 21:55:56 +0000 (21:55 +0000)]
Don't use g_strcmp0(): it only exists in glib > 2.16.

Make read_length() static.

Start function names at column 0.

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

9 years agoFix the win64 build
morriss [Mon, 18 Oct 2010 21:36:41 +0000 (21:36 +0000)]
Fix the win64 build

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

9 years agoFix progress bar when loading compressed files.
morriss [Mon, 18 Oct 2010 20:52:54 +0000 (20:52 +0000)]
Fix progress bar when loading compressed files.

Continue to use the data offset ((uncompressed) bytes read) as our progress
indicator, at least until we get a progress value greater than 1.0.  Then,
in addition to checking if the size of the file changed, check our position in
the file and use that as our progress indicator.

This optimizes uncompressed file accesses (avoiding an lseek()) at the "expense"
of switching progress measures (from data read to position in the file) while
loading a file.  Tests have shown that the progress bar never shows the data
offset number when loading a compressed file, so this should be okay.

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

9 years ago(GUIManager) Make opening a recent file work from the recent files menu.
etxrab [Mon, 18 Oct 2010 19:19:27 +0000 (19:19 +0000)]
(GUIManager) Make opening a recent file work from the recent files menu.

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

9 years agoTry to fix compile errors on 64 bit systems.
wmeier [Mon, 18 Oct 2010 18:37:07 +0000 (18:37 +0000)]
Try to fix compile errors on 64 bit systems.

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

9 years agoRemove some unneeded #includes ...
wmeier [Mon, 18 Oct 2010 17:46:12 +0000 (17:46 +0000)]
Remove some unneeded #includes ...

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

9 years agoDon't clear info column when showing MAC or RLC-level info.
martinm [Mon, 18 Oct 2010 17:02:19 +0000 (17:02 +0000)]
Don't clear info column when showing MAC or RLC-level info.

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

9 years agoFrom Holger Grandy: ETCH dissector
wmeier [Mon, 18 Oct 2010 16:15:12 +0000 (16:15 +0000)]
From Holger Grandy: ETCH dissector
  See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5095

From me: Fix a bug in add_symbol which caused occasional Wireshark crashes;
         Add additional checking during parse of symbol hash file;
         Improve "directory not found" error message;
         Do misc code cleanup and simplification.

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

9 years agoUse port range for SCTP too.
morriss [Mon, 18 Oct 2010 15:56:06 +0000 (15:56 +0000)]
Use port range for SCTP too.

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

9 years ago(GTKUImanger)
etxrab [Mon, 18 Oct 2010 15:40:51 +0000 (15:40 +0000)]
- Make Open file from the welocme screen work again.

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

9 years agoAdd SVN:Id tag. Copy copyright notice to the header file.
morriss [Mon, 18 Oct 2010 13:26:35 +0000 (13:26 +0000)]
Add SVN:Id tag. Copy copyright notice to the header file.

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

9 years agoAdd SVN:Id tag.
morriss [Mon, 18 Oct 2010 13:24:10 +0000 (13:24 +0000)]
Add SVN:Id tag.

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

9 years agoAdd fuzz-test option (-C) to specify a configuration profile.
wmeier [Mon, 18 Oct 2010 13:21:04 +0000 (13:21 +0000)]
Add fuzz-test option (-C) to specify a configuration profile.

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

9 years agoRemove "Obsolete" as it may be confusing in erarlier applications.
etxrab [Mon, 18 Oct 2010 08:56:51 +0000 (08:56 +0000)]
Remove "Obsolete" as it may be confusing in erarlier applications.

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

9 years agoRemove blurbs equal to name.
stig [Mon, 18 Oct 2010 07:41:47 +0000 (07:41 +0000)]
Remove blurbs equal to name.

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

9 years agoAdded some length checks for integers.
stig [Mon, 18 Oct 2010 07:13:45 +0000 (07:13 +0000)]
Added some length checks for integers.

This fixes bug 5305.

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

9 years agoRemove some unused hf entries.
stig [Sun, 17 Oct 2010 20:57:11 +0000 (20:57 +0000)]
Remove some unused hf entries.

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

9 years agoAdd expert info if the eth src mac has the I/G bit set
jmayer [Sun, 17 Oct 2010 20:28:20 +0000 (20:28 +0000)]
Add expert info if the eth src mac has the I/G bit set

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

9 years agoUse correct abbrev for fragment entries.
stig [Sun, 17 Oct 2010 18:33:50 +0000 (18:33 +0000)]
Use correct abbrev for fragment entries.

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

9 years agoRemoved unused entries.
stig [Sun, 17 Oct 2010 18:16:44 +0000 (18:16 +0000)]
Removed unused entries.

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

9 years agoRemoved unused hf_pn_dcp and hf_pn_ptcp.
stig [Sun, 17 Oct 2010 16:49:10 +0000 (16:49 +0000)]
Removed unused hf_pn_dcp and hf_pn_ptcp.

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

9 years agoRemoved unused hf_ecat_mailbox.
stig [Sun, 17 Oct 2010 16:43:07 +0000 (16:43 +0000)]
Removed unused hf_ecat_mailbox.

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

9 years agoRemoved unused hf_xcsl.
stig [Sun, 17 Oct 2010 16:38:15 +0000 (16:38 +0000)]
Removed unused hf_xcsl.

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

9 years agoRemoved unused hf_sasp.
stig [Sun, 17 Oct 2010 16:36:32 +0000 (16:36 +0000)]
Removed unused hf_sasp.

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

9 years agoFixed typo in "Reason" abbrev.
stig [Sun, 17 Oct 2010 16:33:28 +0000 (16:33 +0000)]
Fixed typo in "Reason" abbrev.

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

9 years ago[Automatic manuf, services and enterprise-numbers update for 2010-10-17]
gerald [Sun, 17 Oct 2010 15:03:47 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2010-10-17]

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

9 years agoFixed typo in "SSI Noise (dBm)" abbrev.
stig [Sun, 17 Oct 2010 14:30:11 +0000 (14:30 +0000)]
Fixed typo in "SSI Noise (dBm)" abbrev.

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

9 years agoFrom Pascal Quantin via bug 5301:
stig [Sun, 17 Oct 2010 14:07:05 +0000 (14:07 +0000)]
From Pascal Quantin via bug 5301:
Make the PER constaints check like in the BER dissector.

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

9 years agoFrom Pascal Quantin:
etxrab [Sun, 17 Oct 2010 14:04:59 +0000 (14:04 +0000)]
From Pascal Quantin:
[NAS EPS] Enhance dissection of APN-AMBR IE


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

9 years agoFrom Benjamin Roch via bug 3418:
stig [Sun, 17 Oct 2010 14:02:06 +0000 (14:02 +0000)]
From Benjamin Roch via bug 3418:
Use eth.src, eth.dst and eth.type from the ethernet dissector.

From me:
Removed unused code inside #if 0.

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

9 years agoFrom Benjamin Roch via bug 3418:
stig [Sun, 17 Oct 2010 13:59:46 +0000 (13:59 +0000)]
From Benjamin Roch via bug 3418:
Added string values to tte.pcf.type.

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

9 years agocoap_handle is only used in proto_reg_handoff_coap.
stig [Sun, 17 Oct 2010 12:20:25 +0000 (12:20 +0000)]
coap_handle is only used in proto_reg_handoff_coap.

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

9 years agoFrom Pascal Quantin via bug 5301:
stig [Sun, 17 Oct 2010 11:59:10 +0000 (11:59 +0000)]
From Pascal Quantin via bug 5301:
Add expert info when ASN.1 PER constrained integer does not match range.

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

9 years agoFrom Shoichi Sakane via bug 5270:
stig [Sun, 17 Oct 2010 11:48:40 +0000 (11:48 +0000)]
From Shoichi Sakane via bug 5270:
Added COAP protocol support.

From me:
Made the port number configurable.

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

9 years agoImprove info column when showing PHY info for MAC frames.
martinm [Fri, 15 Oct 2010 21:32:35 +0000 (21:32 +0000)]
Improve info column when showing PHY info for MAC frames.

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

9 years agoTrack and give link back to frame containing previous NACK.
martinm [Fri, 15 Oct 2010 21:07:45 +0000 (21:07 +0000)]
Track and give link back to frame containing previous NACK.

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

9 years agoMake the telnet data lines filterable elements.
jmayer [Fri, 15 Oct 2010 21:02:30 +0000 (21:02 +0000)]
Make the telnet data lines filterable elements.

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

9 years agoAdd volatile in several places to gcc warnings.
martinm [Fri, 15 Oct 2010 18:41:12 +0000 (18:41 +0000)]
Add volatile in several places to gcc warnings.

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

9 years agoFrom Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5295 :
morriss [Fri, 15 Oct 2010 17:48:35 +0000 (17:48 +0000)]
From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5295 :

Use macros for message type values and add an expert info for an incorrect
Magic Cookie.

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

9 years agoFrom ToddS via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5300 :
morriss [Fri, 15 Oct 2010 17:17:04 +0000 (17:17 +0000)]
From ToddS via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5300 :

In the profinet plugin, the decoding of the MRP LinkUp and MRP LinkDown
messages is missing the MRP_SA field which garbles the decode of the rest of
the packet.

This fix adds the decoding of the MRP_SA field to the MRP LinkUp and MRP
LinkDown dissectors.

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

9 years agoFrom ToddS via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5299 :
morriss [Fri, 15 Oct 2010 17:10:29 +0000 (17:10 +0000)]
From ToddS via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5299 :

In profinet plugin, there is a dissection based on whether the read data
returned is expected to contain a single or multiple blocks. Currently, the
I&M0FilterData case assumes only a single block is returned. Profinet specifies
two optional additional blocks.

This change moves I&M0FilterData to expect multiple blocks to correct decode
the optional information.

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