Michael Tüxen [Sat, 27 Jun 2009 11:39:47 +0000 (11:39 -0000)]
This commit
* adds an encap argument to pcap_process_pseudo_header.
* adds support for reading pseudo headers.
It fixes Bug 3560.
Thanks to Tyson Key for reporting the bug and providing
trace files. This fix will be scheduled for inclusion in
Wireshark 1.2.1 and higher.
svn path=/trunk/; revision=28857
Anders Broman [Sat, 27 Jun 2009 10:31:42 +0000 (10:31 -0000)]
From Kovarththanan Rajaratnam:
- Fix ncp2222.py and all the epan/dissectors/dcerpc dissectors. The
latter required changes to idl2wrs which used variadic macros (not supported in MSVC 6.0).
- Cleanup PIDL conformance files
svn path=/trunk/; revision=28856
Balint Reczey [Sat, 27 Jun 2009 08:13:39 +0000 (08:13 -0000)]
Revert commit 28854.
svn path=/trunk/; revision=28855
Balint Reczey [Sat, 27 Jun 2009 06:32:52 +0000 (06:32 -0000)]
Strictly require flex instead of allowing lex, too.
svn path=/trunk/; revision=28854
Gerald Combs [Fri, 26 Jun 2009 23:05:04 +0000 (23:05 -0000)]
Add a tooltip in case it's not obvious how to rearrange the columns.
svn path=/trunk/; revision=28853
Gerald Combs [Fri, 26 Jun 2009 21:25:09 +0000 (21:25 -0000)]
Unfortunately, r28452 seems to cause more problems than it fixes. Back
out the change for now.
svn path=/trunk/; revision=28852
Michael Tüxen [Fri, 26 Jun 2009 15:25:22 +0000 (15:25 -0000)]
Disable debug output.
svn path=/trunk/; revision=28851
Michael Tüxen [Fri, 26 Jun 2009 15:08:04 +0000 (15:08 -0000)]
* Allocate enough memory for reading a packet.
* Initialize pseudoheader.
* Add some input validation / protection code.
* Fix some return values.
* Clean up some whitespaces.
This fixes Bug 3565. Thanks to Tyson Key how reported
the issue and provided capture files for debugging.
This fix is scheduled for inclusion in Wireshark 1.2.1
and higher.
svn path=/trunk/; revision=28850
Anders Broman [Fri, 26 Jun 2009 05:48:03 +0000 (05:48 -0000)]
From Sebastien Decugis:
Add Missing Diameter EAP support.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3600
svn path=/trunk/; revision=28849
Stig Bjørlykke [Fri, 26 Jun 2009 03:59:01 +0000 (03:59 -0000)]
Re-generate asn1 dissectors after hf_register_info cleanup.
svn path=/trunk/; revision=28848
Stig Bjørlykke [Fri, 26 Jun 2009 03:37:30 +0000 (03:37 -0000)]
Small whitespace cleanup.
svn path=/trunk/; revision=28847
Stig Bjørlykke [Fri, 26 Jun 2009 03:24:08 +0000 (03:24 -0000)]
Use NULL for empty blurb.
svn path=/trunk/; revision=28846
Stig Bjørlykke [Fri, 26 Jun 2009 03:20:12 +0000 (03:20 -0000)]
tvb_child_new_real_data() -> tvb_new_child_real_data()
svn path=/trunk/; revision=28845
Stig Bjørlykke [Fri, 26 Jun 2009 02:38:23 +0000 (02:38 -0000)]
From Joakim Wiberg via bug 3103:
Various improvements to the CIP and ENIP dissectors.
From me:
Updated to latest trunk changes.
svn path=/trunk/; revision=28844
Anders Broman [Thu, 25 Jun 2009 05:59:04 +0000 (05:59 -0000)]
tvb_new_real_data()->tvb_child_new_real_data()
svn path=/trunk/; revision=28843
Stig Bjørlykke [Thu, 25 Jun 2009 02:13:35 +0000 (02:13 -0000)]
Unsigned does not have msign.
svn path=/trunk/; revision=28842
Stig Bjørlykke [Thu, 25 Jun 2009 02:08:06 +0000 (02:08 -0000)]
From Nathan Hartwell via bug 2733:
Use time_secs_to_str_unsigned().
svn path=/trunk/; revision=28841
Stig Bjørlykke [Thu, 25 Jun 2009 02:07:17 +0000 (02:07 -0000)]
From Nathan Hartwell via bug 2733:
Added time_secs_to_str_unsigned().
svn path=/trunk/; revision=28840
Stig Bjørlykke [Thu, 25 Jun 2009 01:50:56 +0000 (01:50 -0000)]
Remove a tvb_free() call.
svn path=/trunk/; revision=28839
Jaap Keuter [Wed, 24 Jun 2009 20:27:58 +0000 (20:27 -0000)]
From Duncan Salerno:
Ensure dct3trac packets never longer than 23 bytes.
svn path=/trunk/; revision=28838
Stig Bjørlykke [Wed, 24 Jun 2009 19:10:50 +0000 (19:10 -0000)]
From Kovarththanan Rajaratnam via bug 3555:
Cancel hostname lookup timers if c-ares is not initialized.
svn path=/trunk/; revision=28837
Jaap Keuter [Wed, 24 Jun 2009 06:21:45 +0000 (06:21 -0000)]
From Artem Tamazov:
Added: ESMC support as per G.8264 (Slow Protocol Subtype 0x0a).
* QL codes are dissected according to G.781 5.5.1.1 "Option I SDH".
Added: support for Timestamp entities in ESMC PDU as per WD56 proposal.
svn path=/trunk/; revision=28836
Stig Bjørlykke [Wed, 24 Jun 2009 05:54:19 +0000 (05:54 -0000)]
Fixed field types for some reserved fields.
svn path=/trunk/; revision=28835
Stig Bjørlykke [Wed, 24 Jun 2009 03:03:25 +0000 (03:03 -0000)]
More hf_register_info related cleanup.
svn path=/trunk/; revision=28834
Bill Meier [Wed, 24 Jun 2009 02:42:43 +0000 (02:42 -0000)]
Remove superflous code; #include <stdio.h> not needed.
svn path=/trunk/; revision=28833
Stig Bjørlykke [Wed, 24 Jun 2009 02:17:12 +0000 (02:17 -0000)]
From Kovarththanan Rajaratnam:
More hf_register_info related cleanup.
svn path=/trunk/; revision=28832
Stig Bjørlykke [Wed, 24 Jun 2009 02:12:13 +0000 (02:12 -0000)]
From Kovarththanan Rajaratnam:
Move hf_register_info declarations in packet-m2m.c to function scope
svn path=/trunk/; revision=28831
Stig Bjørlykke [Wed, 24 Jun 2009 02:11:11 +0000 (02:11 -0000)]
From Kovarththanan Rajaratnam:
Cleanup hf_register_info declaration passed to llc_add_oui(). While there,
change the declaration to an array in order to be consistent with the rest
of packet-*.c files.
svn path=/trunk/; revision=28830
Stig Bjørlykke [Wed, 24 Jun 2009 02:08:14 +0000 (02:08 -0000)]
Change hf_nisplus_dummy to use "dummy" as name instead of " "
(this is the only place where " " was used)
svn path=/trunk/; revision=28829
Stig Bjørlykke [Wed, 24 Jun 2009 02:07:16 +0000 (02:07 -0000)]
From Kovarththanan Rajaratnam:
More hf_register_info related cleanup
* Fix process-x11-fields.pl (packet-x11.c)
svn path=/trunk/; revision=28828
Stig Bjørlykke [Wed, 24 Jun 2009 02:05:51 +0000 (02:05 -0000)]
More hf_register_info related cleanup.
svn path=/trunk/; revision=28827
Stig Bjørlykke [Wed, 24 Jun 2009 01:40:54 +0000 (01:40 -0000)]
From Kovarththanan Rajaratnam:
More asn1/* header field info cleanup
svn path=/trunk/; revision=28826
Bill Meier [Wed, 24 Jun 2009 00:49:54 +0000 (00:49 -0000)]
Remove two unused includes
svn path=/trunk/; revision=28825
Bill Meier [Wed, 24 Jun 2009 00:29:54 +0000 (00:29 -0000)]
if (!initialized) ... not req'd + other addt'l minor revisions;
Also: add packet-hpteam.c to Makefile.common so it gets built as part oif Wireshark.
svn path=/trunk/; revision=28824
Jaap Keuter [Tue, 23 Jun 2009 21:05:47 +0000 (21:05 -0000)]
From Nathan Hartwell:
This patch attempt should more closely align with the Wireshark "layout" of using
a dissector rather than a "hack" to the packet-llc dissector.
svn path=/trunk/; revision=28823
Anders Broman [Tue, 23 Jun 2009 16:01:55 +0000 (16:01 -0000)]
Update 3GPP AVP:s
svn path=/trunk/; revision=28822
Anders Broman [Tue, 23 Jun 2009 14:16:28 +0000 (14:16 -0000)]
Revert(Try to fix indentation a bit.)
svn path=/trunk/; revision=28821
Anders Broman [Tue, 23 Jun 2009 13:49:46 +0000 (13:49 -0000)]
Try to fix indentation a bit.
svn path=/trunk/; revision=28820
Jaap Keuter [Tue, 23 Jun 2009 06:49:38 +0000 (06:49 -0000)]
From Kovarththanan Rajaratnam:
The Bluetooth AMP Manager protocol was recently adopted by the Bluetooth SIG.
This protocol sits on top of L2CAP and requires a few changes in order to
accommodate the new move/create channel request.
This patch includes:
* a new Bluetooth AMP Manager Protocol dissector
* changes to L2CAP to handle the new move/create channel signals
* introduce a dissector table for fixed channel, allowing btamp dissector to
handle the BT AMP Manager Protocol channel
* Preliminary changes in L2CAP to support the new enhanced L2CAP modes
(enhanced retransmission/streaming mode)
svn path=/trunk/; revision=28819
Jaap Keuter [Tue, 23 Jun 2009 06:45:59 +0000 (06:45 -0000)]
From Shinsuke SUZUKI:
Due to an incorrect offset setting in packet-icmpv6.c Wireshark cannot parse RA router-lifetime and RA flags properly.
svn path=/trunk/; revision=28818
Stig Bjørlykke [Tue, 23 Jun 2009 06:02:12 +0000 (06:02 -0000)]
From Kovarththanan Rajaratnam:
Clean up header field info in asn1/*-template.c files.
From me:
Fixed a few typos in the patch.
svn path=/trunk/; revision=28817
Jeff Morriss [Mon, 22 Jun 2009 22:48:35 +0000 (22:48 -0000)]
Copy AUTHORS-SHORT to the top-level directory so Help->About can find it when run from the build directory.
svn path=/trunk/; revision=28816
Gerald Combs [Mon, 22 Jun 2009 22:38:29 +0000 (22:38 -0000)]
Instead of tvb_get_ptr + ep_alloc + proto_tree_add_string to fetch a string and
add it to the tree, just call proto_tree_add_item. Fixes bug 3564.
Replace another tvb_get_ptr call with tvb_format_text.
svn path=/trunk/; revision=28815
Stig Bjørlykke [Mon, 22 Jun 2009 18:23:58 +0000 (18:23 -0000)]
From Kovarththanan Rajaratnam:
More header field info cleanup in plugins/* and epan/dissectors/*
svn path=/trunk/; revision=28811
Anders Broman [Mon, 22 Jun 2009 15:22:37 +0000 (15:22 -0000)]
Change window_new() to dlg_window_new() and destroy the window with the top level window.
svn path=/trunk/; revision=28810
Michael Tüxen [Mon, 22 Jun 2009 12:13:12 +0000 (12:13 -0000)]
Improve heuristic for packetlogger file format detection.
svn path=/trunk/; revision=28809
Michael Tüxen [Mon, 22 Jun 2009 11:45:28 +0000 (11:45 -0000)]
Add protection code to avoid crashed when .erf files
are wrongly identified as packetlogger ones.
Will be scheduled for 1.2.1.
svn path=/trunk/; revision=28808
Jörg Mayer [Mon, 22 Jun 2009 07:27:14 +0000 (07:27 -0000)]
Fix my 'fix': guint8 > 0 is always true
svn path=/trunk/; revision=28807
Jörg Mayer [Mon, 22 Jun 2009 06:31:11 +0000 (06:31 -0000)]
Add -Wextra (ok, it was already there as -W) and -Wlogical-op
svn path=/trunk/; revision=28806
Jörg Mayer [Mon, 22 Jun 2009 06:29:32 +0000 (06:29 -0000)]
Fix warning: always evaluates to true/false
svn path=/trunk/; revision=28805
Jörg Mayer [Mon, 22 Jun 2009 06:28:10 +0000 (06:28 -0000)]
Lots of additional decoding, still quite a few things missing.
svn path=/trunk/; revision=28804
Stig Bjørlykke [Mon, 22 Jun 2009 06:16:39 +0000 (06:16 -0000)]
Default to BASE_NONE for FT_BOOLEAN with zero value for display.
svn path=/trunk/; revision=28803
Stig Bjørlykke [Mon, 22 Jun 2009 06:02:36 +0000 (06:02 -0000)]
More header_field_info cleanup.
svn path=/trunk/; revision=28802
Jaap Keuter [Mon, 22 Jun 2009 05:57:44 +0000 (05:57 -0000)]
Fix for bug 3559:
Don't let the index run over the size of the array.
svn path=/trunk/; revision=28801
Stig Bjørlykke [Mon, 22 Jun 2009 05:45:00 +0000 (05:45 -0000)]
More header_field_info cleanup.
svn path=/trunk/; revision=28800
Stig Bjørlykke [Mon, 22 Jun 2009 05:35:47 +0000 (05:35 -0000)]
More header_field_info cleanup.
svn path=/trunk/; revision=28799
Stig Bjørlykke [Mon, 22 Jun 2009 05:18:37 +0000 (05:18 -0000)]
More header_field_info cleanup.
svn path=/trunk/; revision=28798
Stig Bjørlykke [Mon, 22 Jun 2009 04:58:08 +0000 (04:58 -0000)]
From Kovarththanan Rajaratnam:
Move header field info declarations into function scope.
This is the first step. Another patch will be submitted which actually scrubs
the header field info declarations (remove empty blurbs, etc.)
svn path=/trunk/; revision=28797
Anders Broman [Sun, 21 Jun 2009 20:42:07 +0000 (20:42 -0000)]
Change window_new() to dlg_window_new() and destroy the window with the top level window.
svn path=/trunk/; revision=28796
Guy Harris [Sun, 21 Jun 2009 19:30:19 +0000 (19:30 -0000)]
Update for main_menu.[ch] -> menus.[ch] change.
svn path=/trunk/; revision=28795
Guy Harris [Sun, 21 Jun 2009 19:16:37 +0000 (19:16 -0000)]
"main_menu.[ch]" -> "menus.[ch]"; it handles not only the main menu, but
context menus.
Note why we have an empty hex dump pane context menu.
svn path=/trunk/; revision=28794
Guy Harris [Sun, 21 Jun 2009 18:55:32 +0000 (18:55 -0000)]
Clean up the "available XXX type" messages a bit.
svn path=/trunk/; revision=28793
Stig Bjørlykke [Sun, 21 Jun 2009 18:45:56 +0000 (18:45 -0000)]
From Kovarththanan Rajaratnam via bug 3548:
More header_field_info cleanup.
From me:
Don't fix the empty name for hf_nisplus_dummy.
svn path=/trunk/; revision=28792
Anders Broman [Sun, 21 Jun 2009 18:27:34 +0000 (18:27 -0000)]
Add duration to the tap info.
svn path=/trunk/; revision=28791
Anders Broman [Sun, 21 Jun 2009 18:24:03 +0000 (18:24 -0000)]
White space changes.
svn path=/trunk/; revision=28790
Anders Broman [Sun, 21 Jun 2009 16:28:09 +0000 (16:28 -0000)]
Update to Jun spec. version.
(Dissector will be generated when we fix some "empty blurb issues".)
svn path=/trunk/; revision=28789
Jeff Morriss [Sun, 21 Jun 2009 15:47:40 +0000 (15:47 -0000)]
AUTHORS-SHORT is now in the doc subdirectory
svn path=/trunk/; revision=28788
Gerald Combs [Sun, 21 Jun 2009 15:03:37 +0000 (15:03 -0000)]
[Automatic manuf and enterprise-numbers update for 2009-06-21]
svn path=/trunk/; revision=28785
Jeff Morriss [Sun, 21 Jun 2009 12:47:48 +0000 (12:47 -0000)]
Move the generated documentation (man pages, AUTHORS-SHORT-FORMAT, and
AUTHORS-SHORT) into doc/. This cleans up the top-level Makefile.am (no more
need to have rules for each man page in both files) and solves the
parallel-build problem described in:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3494
svn path=/trunk/; revision=28784
Graeme Lunt [Sun, 21 Jun 2009 09:13:11 +0000 (09:13 -0000)]
LDAP control support for Password policy for LDAP directories.
svn path=/trunk/; revision=28783
Stig Bjørlykke [Sat, 20 Jun 2009 18:33:33 +0000 (18:33 -0000)]
From Kovarththanan Rajaratnam via bug 3548:
More header_field_info cleanup in the asn1 cnf files.
Dissectors will be regenerated later.
svn path=/trunk/; revision=28782
Jörg Mayer [Sat, 20 Jun 2009 16:07:01 +0000 (16:07 -0000)]
Lots of improvements to GLPB dissector - still lot of stuff missing.
svn path=/trunk/; revision=28781
Stig Bjørlykke [Fri, 19 Jun 2009 06:16:29 +0000 (06:16 -0000)]
And delete the added file...
svn path=/trunk/; revision=28780
Stig Bjørlykke [Fri, 19 Jun 2009 06:15:52 +0000 (06:15 -0000)]
Revert changes committed by an accident.
Will be committed again later.
svn path=/trunk/; revision=28779
Jörg Mayer [Fri, 19 Jun 2009 06:14:29 +0000 (06:14 -0000)]
The previous patch fixed only part of the problem,
as offset was only increased inside the if statement.
Get rid of offset and put in the numeric value.
svn path=/trunk/; revision=28778
Stig Bjørlykke [Fri, 19 Jun 2009 05:45:40 +0000 (05:45 -0000)]
Moved setting of length2 to make it always set.
svn path=/trunk/; revision=28777
Jörg Mayer [Fri, 19 Jun 2009 05:29:20 +0000 (05:29 -0000)]
Add beginnings of Cisco's GLBP protocol. It's based
on the trace referred to by bug 3544 and the documentation
URL given in the dissector.
svn path=/trunk/; revision=28776
Jörg Mayer [Fri, 19 Jun 2009 05:27:15 +0000 (05:27 -0000)]
Replace my email address by a reference to AUTHORS
svn path=/trunk/; revision=28775
Stig Bjørlykke [Fri, 19 Jun 2009 03:47:40 +0000 (03:47 -0000)]
From Anders: Fix wrong tag numbers.
Dissector will be generated when we fix some "empty blurb issues".
svn path=/trunk/; revision=28774
Stig Bjørlykke [Fri, 19 Jun 2009 03:37:52 +0000 (03:37 -0000)]
Write NULL for empty blurb.
svn path=/trunk/; revision=28773
Stig Bjørlykke [Fri, 19 Jun 2009 02:09:52 +0000 (02:09 -0000)]
From Kovarththanan Rajaratnam via bug 3548:
More header_field_info cleanup.
svn path=/trunk/; revision=28772
Stig Bjørlykke [Thu, 18 Jun 2009 23:22:10 +0000 (23:22 -0000)]
From Kovarththanan Rajaratnam via bug 3548:
Cleanup header_field_info in plugins.
svn path=/trunk/; revision=28771
Stig Bjørlykke [Thu, 18 Jun 2009 21:30:42 +0000 (21:30 -0000)]
From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero
svn path=/trunk/; revision=28770
Stig Bjørlykke [Thu, 18 Jun 2009 21:26:13 +0000 (21:26 -0000)]
Use BASE_NONE for FT_BYTES.
svn path=/trunk/; revision=28769
Michael Tüxen [Thu, 18 Jun 2009 18:43:36 +0000 (18:43 -0000)]
Fix for bug 3539: Address as signess issue for fcs_len.
Bugfix scheduled for 1.2.1.
svn path=/trunk/; revision=28768
Stig Bjørlykke [Wed, 17 Jun 2009 15:02:12 +0000 (15:02 -0000)]
From Anders:
Update to June specification.
svn path=/trunk/; revision=28767
Martin Mathieson [Wed, 17 Jun 2009 12:13:29 +0000 (12:13 -0000)]
Call RRC dissector inside TRY/CATCH block, in order to:
- finish dissecton of other bodies
- make sure stats are updated in the face of RRC exceptions
svn path=/trunk/; revision=28766
Martin Mathieson [Wed, 17 Jun 2009 09:43:56 +0000 (09:43 -0000)]
Trivial prettifications
svn path=/trunk/; revision=28765
Stig Bjørlykke [Wed, 17 Jun 2009 01:16:13 +0000 (01:16 -0000)]
Added missing lua_bitop.obj.
svn path=/trunk/; revision=28764
Michael Tüxen [Wed, 17 Jun 2009 00:46:38 +0000 (00:46 -0000)]
Clean up a comment.
svn path=/trunk/; revision=28763
Stig Bjørlykke [Tue, 16 Jun 2009 21:04:43 +0000 (21:04 -0000)]
Let create_preference_option_menu() and create_preference_entry()
set the tooltips.
svn path=/trunk/; revision=28762
Michael Tüxen [Tue, 16 Jun 2009 20:32:17 +0000 (20:32 -0000)]
Suggested by Anders...
svn path=/trunk/; revision=28761
Jörg Mayer [Tue, 16 Jun 2009 05:52:16 +0000 (05:52 -0000)]
- Properly detect and use the perl command.
- Rename EDITCAP_... to editcap_... and the like.
This should make it easier to later loop around some
of the entries instead of processing each individually.
svn path=/trunk/; revision=28760
Jörg Mayer [Tue, 16 Jun 2009 05:37:46 +0000 (05:37 -0000)]
Build the other tools that don't depend on libwireshark
(editcap, capinfo, text2pcap, mergecap).
svn path=/trunk/; revision=28759
Stig Bjørlykke [Tue, 16 Jun 2009 05:26:46 +0000 (05:26 -0000)]
Added Lua BitOp, made by Mike Pall.
svn path=/trunk/; revision=28758
Michael Tüxen [Tue, 16 Jun 2009 05:03:33 +0000 (05:03 -0000)]
Whitespace cleanups.
svn path=/trunk/; revision=28757
Stig Bjørlykke [Tue, 16 Jun 2009 04:54:59 +0000 (04:54 -0000)]
Resize the list in the autocompletion popup when narrowing down the elements
to remove a possible horizontal scrollbar when not needed, also when using
backspace.
svn path=/trunk/; revision=28756
Jörg Mayer [Tue, 16 Jun 2009 04:12:30 +0000 (04:12 -0000)]
OK, so my last commit message was too optimistic - I was using
an installed version of wsutil. dumpcap now really builds on
Linux via cmake.
svn path=/trunk/; revision=28754
Stig Bjørlykke [Tue, 16 Jun 2009 03:16:55 +0000 (03:16 -0000)]
Support per packet dumping in wtap_encap_string() and wtap_encap_short_string().
svn path=/trunk/; revision=28752
Stig Bjørlykke [Mon, 15 Jun 2009 23:39:57 +0000 (23:39 -0000)]
Let create_preference_option_menu() and create_preference_entry()
set the tooltips.
svn path=/trunk/; revision=28751