Commit Graph

35819 Commits

Author SHA1 Message Date
Balint Reczey 77ea6956a0 Include config.h and define _U_ for dumping ABI.
svn path=/trunk/; revision=37545
2011-06-04 21:30:27 +00:00
Balint Reczey d2dea01900 Use more include dirs for ABI dumping to make preprocessor happier.
svn path=/trunk/; revision=37544
2011-06-04 21:29:13 +00:00
Balint Reczey 311f9acfd5 Fix wiretap headers to allow error-free ABI dumping.
svn path=/trunk/; revision=37543
2011-06-04 21:20:57 +00:00
Anders Broman 7b75e66774 Try to pacify the OSX build bot.
svn path=/trunk/; revision=37542
2011-06-04 20:14:06 +00:00
Anders Broman a8a69c6111 Try to fix part of the build bot errors.
svn path=/trunk/; revision=37541
2011-06-04 19:17:28 +00:00
Balint Reczey 9fe47db306 Reorganize dumpabi targets to keep temporary files
svn path=/trunk/; revision=37540
2011-06-04 16:44:37 +00:00
Anders Broman 3821038f94 From Michael Mann:
I made the following improvements to the Modbus/TCP dissector:

1. Implemented protocol to the latest specification (v1.1b).  See
http://www.modbus.org/specs.php.
2. Upgraded to "tcp_dissect_pdus" instead of having the dissector do it
manually.  This also provides TCP packet reassembly support.
3. Removed support for UDP port 502 because it's not supported by the protocol
specification.  I believe "Decode As..." could be used in its place.
4. Added dissector support for the following function codes:
  a) 8 - Diagnostics
  b) 11 - Event Counter
  c) 12 - Event Log
  d) 43 - Encapsulation Transport (mostly for 43/14)
5. Removed support for function codes not in the protocol specification. None
of them were really being parsed, they just offered a "name" for the function
code.
6. Moved protocol #defines to header file for access from other dissectors.  I
plan to have other dissectors use this, but one patch at a time.
7. Created "modbus" dissector that is accessible to other dissectors.
8. Renamed base "display filter name" to reflect PROTOABBREV.

I removed defines for value_strings, I think it's better to export the vaöue strings if needed.

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

svn path=/trunk/; revision=37539
2011-06-04 15:45:50 +00:00
Balint Reczey 73e0c4b506 Dump ABI using all header files related to libwireshark
svn path=/trunk/; revision=37538
2011-06-04 14:23:49 +00:00
Anders Broman 82d885013c From Michael Mann:
UATification of vcdu.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5989

svn path=/trunk/; revision=37537
2011-06-04 13:50:38 +00:00
Anders Broman b471c4a807 From Michael Mann:
UATification of isakmp dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5989

svn path=/trunk/; revision=37536
2011-06-04 13:47:19 +00:00
Gerald Combs 051ff221fe From Roland Knall via bug 5977:
Handling of SercosIII if the plugin can not be loaded.

Changed the behaviour - if the SercosIII plugin is not available, the
openSAFETY dissector registers itself for ETHERTYPE_SERCOS. SercosIII
packages can not be dissected anyway in such a case and currently no
other dissector will handle those packages.

The following steps will be taken to display the situation to the user:

The message "SercosIII dissector not available, openSAFETY/SercosIII
native dissection." will be added to the tree. Additionally a similar
warning will be presented on the console during startup of wireshark.

All openSAFETY packages will be dissected, displaying the normal
openSAFETY information.

This will be more transparent for the customer.

svn path=/trunk/; revision=37533
2011-06-03 16:56:09 +00:00
Alexis La Goutte 7f2b76ad4c From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5830
Fix a minor typo about bitmask of a reserved field.

svn path=/trunk/; revision=37530
2011-06-03 06:47:23 +00:00
Guy Harris 41738f3aa8 Add some notes about attributes with a special format.
svn path=/trunk/; revision=37529
2011-06-03 01:26:08 +00:00
Guy Harris f9a8adaf71 Update a URL.
svn path=/trunk/; revision=37528
2011-06-03 01:05:22 +00:00
Guy Harris 43b7c8c163 Give some additional information about the format of the Command-Code
value.

svn path=/trunk/; revision=37526
2011-06-02 18:33:14 +00:00
Chris Maynard 657e330103 Add Michael Chen for his contributions to DTLS.
svn path=/trunk/; revision=37525
2011-06-02 17:19:38 +00:00
Chris Maynard 4541cfe5d8 From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5983:
Use offset instead of fragment_offset for boundary check. 

svn path=/trunk/; revision=37524
2011-06-02 17:12:13 +00:00
Bill Meier ce0d6a52b5 Fix Bug #5984: Infinite loop caused by fcn call arg conversion: guint->guint8
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5984

svn path=/trunk/; revision=37521
2011-06-02 14:22:19 +00:00
Anders Broman a9bbcb4a05 Remove extra space at end of IMSI.
svn path=/trunk/; revision=37519
2011-06-02 11:06:26 +00:00
Jörg Mayer 05befd7537 Add Id to info column. Makes detecting duplicates and
matching answers so much easier.

svn path=/trunk/; revision=37518
2011-06-02 07:59:36 +00:00
Jörg Mayer 99e1b372f0 Commit 37516 broke compilation for me in 3 places (with -Werror):
- get_full_XXX functions are unused in the code
- A case statement which handles only 2 of the many enum elements
  creates another warning promoted to error
- The patch removed usage of a variable but not the variable declaration
  itself.

svn path=/trunk/; revision=37517
2011-06-02 07:46:08 +00:00
Anders Broman d5e45b5cce From Michael Mann:
UATification of ESP

UATification of ESP SA keys.  Some notes:
1. Trimmed a lot of fat removing the code that parsed (and reparsed) ESP SA
keys, since UATs can take care of all that. 
2. There was no validation on the src/dest, so that was carried through (ie
there is still no validation of src/dest fields)
3. Formatting of the source was a little off, so I attempted to fix the
functions I needed to deal with.  I know that's frowned upon, but the braces
were such that I couldn't tell if/else blocks to understand the code.  If
somebody wanted to run an indent program on the file, that would be
appreciated.

Added some casts to make it compile on win64.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1123

svn path=/trunk/; revision=37516
2011-06-02 07:11:26 +00:00
Ronnie Sahlberg bf2c1a9dcb From Matthieu Patou <mat@matws.net>
Add extra paths for finding GTK2
This makes wireshark build on 64 bit Natty boxens


svn path=/trunk/; revision=37515
2011-06-02 06:59:23 +00:00
Bill Meier bfa6690f20 Allow filtering on docsis-capability-type field;
Rename docs_cm_... to docsis_cm_cap_....
Do whitespace & indentation cleanup.

svn path=/trunk/; revision=37514
2011-06-02 00:56:41 +00:00
Gerald Combs ad84d4f5d2 Exit if we don't have enough plugins.
svn path=/trunk/; revision=37513
2011-06-01 21:56:11 +00:00
Gerald Combs 0272ec5dd3 Show the plugin paths in Help→About→Plugins. Add a "-G plugins" option
to TShark which dumps a list of plugins.

svn path=/trunk/; revision=37512
2011-06-01 21:48:17 +00:00
Chris Maynard a02b8fb247 From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5863, with some additional enhancements by me: Add dtls heuristics.
svn path=/trunk/; revision=37511
2011-06-01 18:34:41 +00:00
Guy Harris 32726b84d2 If a dissector table doesn't exist, print a more useful message, and
only abort if WIRESHARK_ABORT_ON_DISSECTOR_BUG is set.

svn path=/trunk/; revision=37510
2011-06-01 18:02:16 +00:00
Guy Harris f680be4ca2 Remove the temporary debugging stuff.
svn path=/trunk/; revision=37509
2011-06-01 16:23:51 +00:00
Stig Bjørlykke e96930f38b Yet another cast to uint.
svn path=/trunk/; revision=37508
2011-06-01 13:58:19 +00:00
Stig Bjørlykke 9334eee893 Corrected usage of uint/pointer conversion.
svn path=/trunk/; revision=37507
2011-06-01 13:57:13 +00:00
Stig Bjørlykke d368f9325b Added support for DMP version 2 and some national variants.
svn path=/trunk/; revision=37506
2011-06-01 13:31:48 +00:00
Michael Tüxen 268c5f21b7 Improve handling of command line arg errors (for example "wireshark -f").
From Irene Ruengeler.

svn path=/trunk/; revision=37505
2011-06-01 09:26:33 +00:00
Guy Harris da6a34fce7 Temporary debugging stuff to see in what environment tshark is being
run - the plugins might not be getting loaded, and the goal is to figure
out why.

svn path=/trunk/; revision=37504
2011-06-01 09:12:10 +00:00
Alexis La Goutte 96215c08a9 From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5830
802.11 Tag WME Qos Info field is not decoded

From me :
* Update from Trunk
* Make item fiterable


svn path=/trunk/; revision=37497
2011-05-31 21:41:43 +00:00
Anders Broman 2ef145dfb2 Remove HAVE_AIRPDCAP
svn path=/trunk/; revision=37496
2011-05-31 21:41:00 +00:00
Anders Broman 4f525e3a78 Remove HAVE_AIRPDCAP
svn path=/trunk/; revision=37495
2011-05-31 21:38:39 +00:00
Anders Broman 4c93ff1b8a REmove the check for HAVE_AIRPDCAP
svn path=/trunk/; revision=37494
2011-05-31 21:34:23 +00:00
Gerald Combs ec3f19face Add abi-descriptor.template to the distribution.
svn path=/trunk/; revision=37490
2011-05-31 20:45:28 +00:00
Chris Maynard 91bd619c64 Handle snaplen before choplen for consistency. Also, if chopping more bytes
than present, just chop all by setting caplen to 0.  In all cases, don't touch
len.  In other words, change incl_len but leave orig_len alone.

svn path=/trunk/; revision=37488
2011-05-31 20:24:26 +00:00
Guy Harris c681f0434e From Roland Knall: openSAFETY dissector.
svn path=/trunk/; revision=37487
2011-05-31 19:31:45 +00:00
Alexis La Goutte aa966d3186 Enhance Vendor Specific IE (227)
Specifically WPA/WME sub dissector 
* Rework from scratch VS WPA/WME dissector
* Replace proto_tree_add_text/string (ugly hf_ieee80211_tag_interpretation header field...) by proto_tree_add_item
* Make item filterable
* and other stuff...

Based on WMM_Specification_1-1

svn path=/trunk/; revision=37486
2011-05-31 19:30:53 +00:00
Gerald Combs d927e094eb Try adding the fifo step to Wireshark. Clean up the order of tests.
svn path=/trunk/; revision=37485
2011-05-31 18:34:24 +00:00
Bill Meier bf4844eb99 Fix some gcc 'old-style function definition' warnings.
svn path=/trunk/; revision=37482
2011-05-31 15:49:59 +00:00
Chris Maynard ec494af010 When a snaplen is specified using "-s <snaplen", if it's smaller than the
original capture file's snaplen, save the new snaplen in the capture file
header so wireshark and capinfos can report it.

svn path=/trunk/; revision=37480
2011-05-31 15:31:34 +00:00
Chris Maynard 63b50fe2ee Declare the snapshot_length as unsigned.
svn path=/trunk/; revision=37479
2011-05-31 15:27:48 +00:00
Michael Tüxen 8f8f0e9ad6 Get rid of has_cfilter to simplify the handling of multiple interfaces.
svn path=/trunk/; revision=37478
2011-05-31 14:49:21 +00:00
Michael Tüxen 6516aa9864 Improve handling of command line errors.
svn path=/trunk/; revision=37477
2011-05-31 14:45:55 +00:00
Balint Reczey ad2d4694df Add top-level dumpabi target.
svn path=/trunk/; revision=37476
2011-05-31 14:33:49 +00:00
Balint Reczey 81849d7682 Fixing wrong library names in r37474
svn path=/trunk/; revision=37475
2011-05-31 12:09:47 +00:00