Commit graph

33410 commits

Author SHA1 Message Date
Jeff Morriss
710a96470f If we get a syntax error reading the preferences file, tell which preference we were reading when we got the error.
svn path=/trunk/; revision=34655
2010-10-27 01:43:24 +00:00
Jeff Morriss
945d917122 From Thomas Boehne via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5324 :
As mentioned before, the heuristics used by packet-adwin-config were weak for
UDP packets. This patch creates a stronger heuristic by checking if one of the
MAC addresses in the UDP packets is in the range assigned to the manufacturer
of the devices that use this protocol (or if it is a broadcast).

That should be relatively safe to do because the protocol is rarely used in
routed networks.

svn path=/trunk/; revision=34654
2010-10-27 00:42:02 +00:00
Anders Broman
758ee054ab Follow up on:
You may not use g_int64_hash() or g_int64_equal(), as they are not  present in the minimum version of GLib that we support.  Create a  ieee802154_long_addr structure for long addresses, create hash  routines for those addresses, and use them.

Export and use those routines.

svn path=/trunk/; revision=34653
2010-10-26 12:43:40 +00:00
Anders Broman
fbb65b97b6 - Get rid of check_col and sizeof
svn path=/trunk/; revision=34652
2010-10-26 11:26:28 +00:00
Guy Harris
0f96301a3e You may not use g_int64_hash() or g_int64_equal(), as they are not
present in the minimum version of GLib that we support.  Create a
ieee802154_long_addr structure for long addresses, create hash
routines for those addresses, and use them.

svn path=/trunk/; revision=34651
2010-10-26 08:31:16 +00:00
Anders Broman
a3eff92edc g_int64_hash is first available in Glib 2.22 (This needs a proper fixr) This is just to get the build going again.
svn path=/trunk/; revision=34650
2010-10-26 07:38:22 +00:00
Anders Broman
30d27cfb05 g_int64_hash is first available in Glib 2.22
(This needs a proper fixr)
This is just to get the build going again.

svn path=/trunk/; revision=34649
2010-10-26 06:48:09 +00:00
Anders Broman
809984a493 Try to fix the build
svn path=/trunk/; revision=34648
2010-10-26 06:13:42 +00:00
Anders Broman
26f0f7bc7a 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=34647
2010-10-26 05:42:24 +00:00
Anders Broman
161076b23b Minor cleanup, use proto_add_item().
svn path=/trunk/; revision=34646
2010-10-25 20:13:00 +00:00
Jeff Morriss
4d6eb55e8c Set svn:keywords and svn:eol-style
svn path=/trunk/; revision=34645
2010-10-25 18:24:59 +00:00
Jeff Morriss
f7b3c16320 From Pascal Quantin: don't accept packets unless they're over TCP or UDP.
svn path=/trunk/; revision=34644
2010-10-25 17:17:52 +00:00
Bill Meier
1b01709034 Change "4 space tabs" to spaces.
svn path=/trunk/; revision=34643
2010-10-25 16:43:48 +00:00
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
Anders Broman
aaa7068302 #if 0 "Work in progress" code
svn path=/trunk/; revision=34638
2010-10-24 18:08:07 +00:00
Anders Broman
a1e0507a63 Fix "More unused warnings in new menu code" based on code from Jörg Mayer.
svn path=/trunk/; revision=34636
2010-10-24 16:14:01 +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
Gerald Combs
fb932b68bf [Automatic manuf, services and enterprise-numbers update for 2010-10-24]
svn path=/trunk/; revision=34631
2010-10-24 15:03:37 +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
dbd143d68a (Trivial) Fix a typo in a comment.
svn path=/trunk/; revision=34626
2010-10-23 15:45:12 +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
6683e22b44 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 

svn path=/trunk/; revision=34623
2010-10-22 17:54:08 +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
Bill Meier
2041f87240 Add some info about extended value string to section 1.7.1
svn path=/trunk/; revision=34621
2010-10-22 15:00:37 +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
61d99fff9a 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.

svn path=/trunk/; revision=34618
2010-10-22 06:47:00 +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
0761f82755 If the html dir exist remove it and its subdirectories.
svn path=/trunk/; revision=34614
2010-10-22 05:43:12 +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