Commit graph

10608 commits

Author SHA1 Message Date
Bill Meier
a8de0b1f76 From Jouni Malinen: preliminary version of Wi-Fi P2P (Wi-Fi Direct) dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5196

From me: Add packet-wifi-p2p.h to Makefile.common DISSECTOR_INCLUDES
         Add dissectors/packet-wifi-p2p.c to epan/CMakelists.txt

svn path=/trunk/; revision=34642
2010-10-25 16:40:45 +00:00
Jeff Morriss
36390c306f From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5336 :
Attached patch:
1. Adds port 5985 as a HTTP traffic port (used by MS Powershell remoting over
HTTP)
2. Adds dissection of Kerberos authentication to HTTP.


svn path=/trunk/; revision=34641
2010-10-25 02:17:41 +00:00
Jeff Morriss
0f93035b15 From Thomas Boehne via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5324 :
The company I work for uses two proprietary protocols, for which I initially
developed  wireshark plugins. Now we would like to integrate them into the
public wireshark repository. 

I followed the READMEs and converted the plugins into a static dissectors. I
cleaned up the code until checkAPI.pl was silent, translated all terms to
english and ran randpkt and fuzz-testing for a long time. All that I found was
a bug in a different dissector.

From me:
- Fold the header files into the dissectors
- Clean up some memory leaks
- Strengthen the heuristics of adwin-config (the TCP heuristics are still pretty
  weak)
- Make packet-adwin.c a "new style" dissector 
- Use find_or_create_conversation()
- Remove most of the check_col()'s

svn path=/trunk/; revision=34640
2010-10-25 01:43:54 +00:00
Jeff Morriss
8c7c46d0fc Remove trailing space in field name.
svn path=/trunk/; revision=34639
2010-10-25 00:57:41 +00:00
Bill Meier
af4db6059a (Minor) Some whitespace cleanup.
svn path=/trunk/; revision=34634
2010-10-24 15:39:36 +00:00
Anders Broman
b1e852cf70 Back out 34627 and friends again.
svn path=/trunk/; revision=34633
2010-10-24 15:22:44 +00:00
Bill Meier
2ccfd848fe From Jouni Malinen: Add support for new WSC 2.0 attributes and values
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5196

svn path=/trunk/; revision=34632
2010-10-24 15:18:43 +00:00
Anders Broman
525f7e0552 Clean up a few proto_add_bytes calls.
svn path=/trunk/; revision=34630
2010-10-24 14:15:04 +00:00
Anders Broman
bfcc79bd23 error: ‘ieee802154_short_addr_invalidate’ declared ‘static’ but never defined
error: ‘ieee802154_long_addr_invalidate’ declared ‘static’ but never defined

svn path=/trunk/; revision=34629
2010-10-24 14:02:31 +00:00
Anders Broman
252ade740a Try to fix:
packet-zbee-nwk.c:260: error: static declaration of ‘zbee_table_link_keyring’ follows non-static declaration

svn path=/trunk/; revision=34628
2010-10-24 11:53:15 +00:00
Anders Broman
43cb273d08 From Fred Fierling:
Multi-key Support and Extended Address Mapping for ZigBee Dissectors
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331

svn path=/trunk/; revision=34627
2010-10-24 10:04:29 +00:00
Bill Meier
6d8ea4abd5 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).

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

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

svn path=/trunk/; revision=34625
2010-10-22 18:13:42 +00:00
Jeff Morriss
a25ece78e5 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.

svn path=/trunk/; revision=34624
2010-10-22 18:05:50 +00:00
Jeff Morriss
052ba7eb46 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.

svn path=/trunk/; revision=34622
2010-10-22 15:08:32 +00:00
Anders Broman
5bf4fc3116 From Vincent Helfre:
Some improvements for the presentations.

svn path=/trunk/; revision=34620
2010-10-22 13:35:03 +00:00
Stig Bjørlykke
14d908de38 Corrected check for end of well_known_sids.
This fixes bug 5328.

svn path=/trunk/; revision=34619
2010-10-22 10:48:14 +00:00
Stig Bjørlykke
efd9c3e0c9 Fixed printing guint64 variables.
Removed unused variables.

svn path=/trunk/; revision=34617
2010-10-22 06:42:55 +00:00
Anders Broman
e64d2d99c0 C++ style comments in packet-windows-common.c
svn path=/trunk/; revision=34616
2010-10-22 06:26:42 +00:00
Anders Broman
58be4653b4 packet-smb.c:890: warning: data definition has no type or storage class
svn path=/trunk/; revision=34615
2010-10-22 05:47:01 +00:00
Anders Broman
9c9db7d4d4 From CaL Turney:
Add support for well-known SIDs/RIDs and option to display in hex.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5286

svn path=/trunk/; revision=34613
2010-10-22 05:15:25 +00:00
Jeff Morriss
9e14fa17fb Replace blurb that matches the field name with NULL
svn path=/trunk/; revision=34612
2010-10-22 01:37:06 +00:00
Jeff Morriss
450be02fc2 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.

svn path=/trunk/; revision=34611
2010-10-21 22:41:39 +00:00
Bill Meier
8d8190c43f Cleanup:
- 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.

svn path=/trunk/; revision=34610
2010-10-21 21:21:26 +00:00
Jaap Keuter
8f0cec63d7 From Sven Schnelle:
Add dissector for Tektronix Teklink Protocol, used by their Logic Analyzers.
May be useful for reverse engineering their Protocol.

svn path=/trunk/; revision=34609
2010-10-21 21:02:10 +00:00
Jeff Morriss
bcfa8de44a Add some casts to get the Windows builds going.
svn path=/trunk/; revision=34608
2010-10-21 21:02:07 +00:00
Jeff Morriss
8187894200 After calling a subdissector, set a fence on COL_INFO so whatever the
subdissector put in the Info column stays there.

svn path=/trunk/; revision=34607
2010-10-21 20:51:06 +00:00
Bill Meier
6ebe1f252f 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.


svn path=/trunk/; revision=34606
2010-10-21 19:13:57 +00:00
Jaap Keuter
81f60271c6 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).

svn path=/trunk/; revision=34605
2010-10-21 19:01:35 +00:00
Jeff Morriss
01177b103e 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...)

svn path=/trunk/; revision=34604
2010-10-21 16:08:29 +00:00
Jeff Morriss
5c18160006 From Shoichi Sakane via bug 5270: minor changes and remove an unused hf variable.
svn path=/trunk/; revision=34600
2010-10-21 03:04:15 +00:00
Anders Broman
773a7f4c59 From Fred Fierling:
Cleanup of unnecessary tree == NULL checks in ZCL dissector

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

svn path=/trunk/; revision=34595
2010-10-20 20:50:39 +00:00
Jeff Morriss
f6a88f2be5 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.

svn path=/trunk/; revision=34592
2010-10-20 20:40:53 +00:00
Bill Meier
06325a1bd6 (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'.

svn path=/trunk/; revision=34591
2010-10-20 18:14:49 +00:00
Jeff Morriss
185d387f62 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
Controller).
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

svn path=/trunk/; revision=34587
2010-10-20 16:49:21 +00:00
Anders Broman
64d4b08a82 From Vincent Helfre:
various bug fix and enhancement for Release 8 additionnal parameters.

svn path=/trunk/; revision=34585
2010-10-20 12:40:13 +00:00
Martin Mathieson
d086e935e1 Add longer desriptions of SOStart and SOEnd fields.
svn path=/trunk/; revision=34584
2010-10-20 12:08:22 +00:00
Martin Mathieson
81a49eec81 In heuristic dissector, don't check/allocate struct until/unless signature pattern matches.
svn path=/trunk/; revision=34582
2010-10-20 09:58:40 +00:00
Jeff Morriss
dfa6aa82a7 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.

svn path=/trunk/; revision=34581
2010-10-20 01:49:32 +00:00
Jeff Morriss
df0692a8e6 Use while loops instead of goto's.
svn path=/trunk/; revision=34580
2010-10-20 01:37:03 +00:00
Jeff Morriss
8a7125f063 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
packet-ipv6.h). 

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

svn path=/trunk/; revision=34579
2010-10-20 01:23:32 +00:00
Bill Meier
6c08c2c43a Use DISSECTOR_ASSERT (not g_assert) in dissectors...
svn path=/trunk/; revision=34577
2010-10-20 00:47:23 +00:00
Bill Meier
9787a5734a From Hadriel Kaplan: IPFIX file format support.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5242

svn path=/trunk/; revision=34576
2010-10-20 00:36:53 +00:00
Anders Broman
a75d7209f5 From Fred Fierling:
Infinite loop in ZCL Discover Attributes dissection

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

svn path=/trunk/; revision=34575
2010-10-19 19:19:42 +00:00
Anders Broman
c94d711d8e From Alexis La Goutte:
GRE Enhancements

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

svn path=/trunk/; revision=34573
2010-10-19 18:28:00 +00:00
Bill Meier
a88357dbf4 Remove some #if 0'd code I left in by mistake a while back....
svn path=/trunk/; revision=34572
2010-10-19 17:43:52 +00:00
Anders Broman
88622252b1 From Tamás Regõs:
Make application ID readable from sub dissectors.

svn path=/trunk/; revision=34570
2010-10-19 15:21:05 +00:00
Bill Meier
7ae3e56828 Use dynamically created value_string_ext to store hash/symbol value_strings;
Also: minor code reformatting and re-arrangement.

svn path=/trunk/; revision=34569
2010-10-19 14:31:05 +00:00
Jeff Morriss
a3bf744a0f From Shoichi Sakane via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5270 :
Remove some unused hf variables.

svn path=/trunk/; revision=34568
2010-10-19 13:30:40 +00:00
Stig Bjørlykke
1f2b9eca16 Init ett_coap_noop, another fix for bug 5305.
svn path=/trunk/; revision=34566
2010-10-19 06:58:08 +00:00
Jeff Morriss
8ad4c4efdd Don't use g_strcmp0(): it only exists in glib > 2.16.
Make read_length() static.

Start function names at column 0.

svn path=/trunk/; revision=34565
2010-10-18 21:55:56 +00:00