obnox/wireshark/wip.git
13 years agoSwitch to GtkUIManager in stead of the deprecated GtkItemFactory.
etxrab [Tue, 10 Aug 2010 15:47:29 +0000 (15:47 +0000)]
Switch to GtkUIManager in stead of the deprecated GtkItemFactory.

In case of problems switch back by removing the line:
#define USE_GUIMANAGER 1

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

13 years agoFixed warning: format not a string literal and no format arguments.
stig [Tue, 10 Aug 2010 13:19:31 +0000 (13:19 +0000)]
Fixed warning: format not a string literal and no format arguments.

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

13 years agoUse g_snprintf isf strncpy.
etxrab [Tue, 10 Aug 2010 12:54:23 +0000 (12:54 +0000)]
Use g_snprintf isf strncpy.

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

13 years agoFrom Cal Turney:
etxrab [Tue, 10 Aug 2010 11:36:18 +0000 (11:36 +0000)]
From Cal Turney:
Remember folder of capture selected from Welcome screen file dialog.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5038

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

13 years ago- Fix a crash when an entry in the popup menue is selected and there
etxrab [Tue, 10 Aug 2010 11:08:18 +0000 (11:08 +0000)]
- Fix a crash when an entry in the popup menue is selected and there
are no epert info entries.
- Updates to GUManager code(still incomplete).

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

13 years agoDeclare error as volatile to avoid warning on opensolaris:
stig [Tue, 10 Aug 2010 07:43:05 +0000 (07:43 +0000)]
Declare error as volatile to avoid warning on opensolaris:
variable 'error' might be clobbered by `longjmp' or `vfork'

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

13 years agoDissect SMB_FILE_ATTRIBUTES, when used as file attributes rather than
guy [Tue, 10 Aug 2010 07:04:20 +0000 (07:04 +0000)]
Dissect SMB_FILE_ATTRIBUTES, when used as file attributes rather than
search attributes, as a 16-bit quantity, with only the bits specified by
section 2.2.1.2.4 of [MS-CIFS].  Use dissect_file_ext_attr() in all
cases where we're dissecting SMB_EXT_FILE_ATTR, as specified by section
2.2.1.2.3 of [MS-CIFS].

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

13 years agoFuture-proof a for loop.
gerald [Mon, 9 Aug 2010 22:54:03 +0000 (22:54 +0000)]
Future-proof a for loop.

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

13 years agoFrom David Aggeler:
jake [Mon, 9 Aug 2010 19:28:09 +0000 (19:28 +0000)]
From David Aggeler:
- Finally, better reassembly using fragment_add_seq_next().
  The previous mode is still supported.
- Fixed sporadic decoding and export issues. Always decode
  association negotiation, since performance check (tree==NULL)
  is now only in dissect_dcm_pdv_fragmented().
- Added one more PDV length check
- Show Association Headers as individual items
- Code cleanup. i.e. moved a few lookup functions to be closer
  to the dissection.

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

13 years agoFix another compile error.
wmeier [Mon, 9 Aug 2010 18:53:18 +0000 (18:53 +0000)]
Fix another compile error.
(Note to self: take the time to read *all* the compiler error output before committing).

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

13 years agoFix another compile error :(
wmeier [Mon, 9 Aug 2010 18:46:23 +0000 (18:46 +0000)]
Fix another compile error :(

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

13 years agoFix a compile error.
wmeier [Mon, 9 Aug 2010 18:40:12 +0000 (18:40 +0000)]
Fix a compile error.

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

13 years agoFrom Herbert Lischka: "corrected the dissection of reassembled UDP packets".
wmeier [Mon, 9 Aug 2010 18:20:07 +0000 (18:20 +0000)]
From Herbert Lischka: "corrected the dissection of reassembled UDP packets".
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5051

From me:
- Move proto_register... and proto_reg_handoff.. to the end of the file;
- Define a function as static;
- Minor reformatting and whitespace cleanup.

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

13 years agoFix typo in my last commit that broke compilation
sfisher [Mon, 9 Aug 2010 16:53:44 +0000 (16:53 +0000)]
Fix typo in my last commit that broke compilation

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

13 years agoUpdate to latest device descriptions
sfisher [Mon, 9 Aug 2010 16:50:08 +0000 (16:50 +0000)]
Update to latest device descriptions

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

13 years agoAdd AVP:s
etxrab [Mon, 9 Aug 2010 16:17:45 +0000 (16:17 +0000)]
Add AVP:s

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

13 years agoUpdate the experimental code to use the UI manager.
etxrab [Mon, 9 Aug 2010 16:16:58 +0000 (16:16 +0000)]
Update the experimental code to use the UI manager.

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

13 years agoMake it compile without HAVE_C_ARES and HAVE_GETHOSTBYNAME2.
stig [Mon, 9 Aug 2010 11:19:15 +0000 (11:19 +0000)]
Make it compile without HAVE_C_ARES and HAVE_GETHOSTBYNAME2.

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

13 years agoAdd a note.
guy [Sun, 8 Aug 2010 23:32:40 +0000 (23:32 +0000)]
Add a note.

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

13 years agoYou can't free a string constant.
guy [Sun, 8 Aug 2010 21:38:36 +0000 (21:38 +0000)]
You can't free a string constant.

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

13 years agoDon't set the icon name:
guy [Sun, 8 Aug 2010 21:26:39 +0000 (21:26 +0000)]
Don't set the icon name:

1) the GTK+ documentation recommends against it;

2) the X11 implementation of gtk_window_set_title() sets the
   icon name to the title, so gdk_window_set_icon_name() doesn't
   do anything interesting, and the Win32 and Quartz
   implementations of gdk_window_set_icon_name() don't do
   anything;

3) gdk_window_set_icon_name() either crashes or complains if
   it's handed a null pointer, which happens at startup.

Clean up indentation.

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

13 years agoDon't speak of XQuartz - at least one person thought we meant that you
guy [Sun, 8 Aug 2010 21:04:42 +0000 (21:04 +0000)]
Don't speak of XQuartz - at least one person thought we meant that you
had to install XQuartz from Mac OS X Forge, rather than just installing
the X11 that comes with OS X.

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

13 years agoProtect tvb_* functions in a TRY-CATCH block.
stig [Sun, 8 Aug 2010 19:04:35 +0000 (19:04 +0000)]
Protect tvb_* functions in a TRY-CATCH block.

This fixes bug 5087.

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

13 years agoFrom Roberto Morro:
etxrab [Sun, 8 Aug 2010 16:42:57 +0000 (16:42 +0000)]
From Roberto Morro:
Added support for Organization Specific Slow Protocol (OSSP)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4966

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

13 years ago[Automatic manuf and enterprise-numbers update for 2010-08-08]
gerald [Sun, 8 Aug 2010 15:03:36 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-08-08]

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

13 years agoFrom Cal Turney:
etxrab [Sat, 7 Aug 2010 14:37:37 +0000 (14:37 +0000)]
From Cal Turney:
Optionally display Wireshark version in the main window's title bar.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5040

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

13 years agoFrom Jon Smirl:
stig [Sat, 7 Aug 2010 09:44:54 +0000 (09:44 +0000)]
From Jon Smirl:
Added "IEEE 802.15.4 Wireless PAN no fcs".

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

13 years agoFrom Jay Crisman:
jake [Fri, 6 Aug 2010 17:52:59 +0000 (17:52 +0000)]
From Jay Crisman:
I have attached a very simple patch to add the 'calv' packet type.

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

13 years agoFrom Tan Kean Siong:
jake [Fri, 6 Aug 2010 17:46:27 +0000 (17:46 +0000)]
From Tan Kean Siong:
Dissect the SMB Tree_Connect_Andx Request and Response properly with
extension request and response which are documented in [MS-SMB] — v20100711

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

13 years agoFrom John Sullivan: Fix for 'Uninitialised pointer in packet-rtsp.c causes crash'
wmeier [Fri, 6 Aug 2010 14:34:14 +0000 (14:34 +0000)]
From John Sullivan: Fix for 'Uninitialised pointer in packet-rtsp.c causes crash'
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5081

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

13 years agoMove proto_item_set_len() outside of an if statement so NPDU length is properly set;
wmeier [Fri, 6 Aug 2010 12:46:56 +0000 (12:46 +0000)]
Move proto_item_set_len() outside of an if statement so NPDU length is properly set;
Also: 'if (check_col())' no longer required;
      Minor revision of some comments;
      Whitespace cleanup;

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

13 years ago(Trivial) Whitespace cleanup.
wmeier [Thu, 5 Aug 2010 22:34:59 +0000 (22:34 +0000)]
(Trivial) Whitespace cleanup.

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

13 years ago(Trivial) Define rpcprogs_packet() as returning gboolean; Whitespace cleanup.
wmeier [Thu, 5 Aug 2010 22:27:17 +0000 (22:27 +0000)]
(Trivial) Define rpcprogs_packet() as returning gboolean; Whitespace cleanup.

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

13 years agoFrom Cal Turney: Need 6 dec places of SRT precision in WS SRT dialogs and the values...
wmeier [Thu, 5 Aug 2010 22:14:16 +0000 (22:14 +0000)]
From Cal Turney: Need 6 dec places of SRT precision in WS SRT dialogs and the values should be rounded to the nearest 1us.

From me:
 -Slight revision of the patch to prevent overflows
   when time_t is 32 bits (eg: on 32 bit Linux);
 -Other minor changes.

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

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

13 years agoFix number of arguments to format
morriss [Thu, 5 Aug 2010 19:33:20 +0000 (19:33 +0000)]
Fix number of arguments to format

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

13 years agoRemove experimental marker from NEW_PACKET_LIST.
jake [Thu, 5 Aug 2010 19:11:35 +0000 (19:11 +0000)]
Remove experimental marker from NEW_PACKET_LIST.

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

13 years agoFrom Christian Durrer:
etxrab [Thu, 5 Aug 2010 19:01:27 +0000 (19:01 +0000)]
From Christian Durrer:
- Added more info for detecting S-Bus telegrams
- Added the display filter sbus.retry for finding re-sent request telegrams
- Added the possibility to jump from the request telegram to the response
telegram
- Added response time to the response telegram
- Added telegram types "Read/Write Block"
- Corrected the "Read System Info" telegram (CRC was not correctly calculated)
- Changed my EMail address
- Small typos corrected

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

13 years agoInitialize tmp_info to avoid warnings from clang:
stig [Thu, 5 Aug 2010 07:12:56 +0000 (07:12 +0000)]
Initialize tmp_info to avoid warnings from clang:
"Assigned value is garbage or undefined".

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

13 years agoInitialize tpcph to avoid warnings from clang:
stig [Thu, 5 Aug 2010 07:09:59 +0000 (07:09 +0000)]
Initialize tpcph to avoid warnings from clang:
"The left operand of '>>' is a garbage value".

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

13 years agoUpdate bit_offset whether calling MAC dissector or not.
martinm [Wed, 4 Aug 2010 14:42:09 +0000 (14:42 +0000)]
Update bit_offset whether calling MAC dissector or not.

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

13 years agoEnsure we don't index into a NULL pointer.
stig [Wed, 4 Aug 2010 13:34:50 +0000 (13:34 +0000)]
Ensure we don't index into a NULL pointer.

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

13 years agoInitialize confounder to ensure it has a known value.
stig [Wed, 4 Aug 2010 13:34:05 +0000 (13:34 +0000)]
Initialize confounder to ensure it has a known value.

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

13 years agoAvoid a possible dereference of null pointer.
stig [Wed, 4 Aug 2010 13:32:44 +0000 (13:32 +0000)]
Avoid a possible dereference of null pointer.

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

13 years agoAvoid a possible dereference of null pointer.
stig [Wed, 4 Aug 2010 13:32:09 +0000 (13:32 +0000)]
Avoid a possible dereference of null pointer.

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

13 years agoFrom Slava:
etxrab [Tue, 3 Aug 2010 17:08:52 +0000 (17:08 +0000)]
From Slava:
The Infiniband dissector currently uses a heuristic where it attempts to parse
IBA payloads as if they contained encapsulated traffic with an Ethertype
header. While a relatively common occurrence and thus a fairly useful feature,
this heuristic in many cases causes false-positives which invoke unneeded
dissectors and generate noise in the form of unjustified "malformed packet"
errors these dissectors cause. This patch adds a checkbox to the Infiniband
preferences menu that allows users to disable this feature if desired. The
option remains on by default.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5062

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

13 years agoFrom Slava:
etxrab [Tue, 3 Aug 2010 16:57:02 +0000 (16:57 +0000)]
From Slava:
 Infiniband RoCE dissection.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5060

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

13 years agoFrom Brandon Skari:
etxrab [Tue, 3 Aug 2010 16:25:13 +0000 (16:25 +0000)]
From Brandon Skari:
 MySQL dissector doesn't dissect query responses.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5058

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

13 years ago(Trivial) Fix a typo.
wmeier [Tue, 3 Aug 2010 16:06:48 +0000 (16:06 +0000)]
(Trivial) Fix a typo.

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

13 years agoRemove question marks in preference titles.
sfisher [Tue, 3 Aug 2010 15:29:51 +0000 (15:29 +0000)]
Remove question marks in preference titles.

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

13 years agoAdd a preference to call MAC for TBs (on by default).
martinm [Tue, 3 Aug 2010 14:26:35 +0000 (14:26 +0000)]
Add a preference to call MAC for TBs (on by default).
Improve info column display for HS-DSCH Capacity Request messages.
Removed calls to check_col().
Removed a few tabs.

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

13 years agoDecode Browse Domain Announcement version and signature if signature
stig [Tue, 3 Aug 2010 11:22:08 +0000 (11:22 +0000)]
Decode Browse Domain Announcement version and signature if signature
matches 0xaa55.

I don't know the historic reason for decoding this as "Mysterious Field",
but newer of Network Monitor (3.4) does show this as version and signature.

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

13 years agoAdded some missing elements from MS Certificate:
stig [Tue, 3 Aug 2010 08:55:07 +0000 (08:55 +0000)]
Added some missing elements from MS Certificate:
- Previous Cert Hash
- Virtual Base
- Next Publisher

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

13 years agoRevert r30979, which removed the window size in SYN packets. People were
gerald [Tue, 3 Aug 2010 00:09:41 +0000 (00:09 +0000)]
Revert r30979, which removed the window size in SYN packets. People were
asking where it went.

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

13 years agoRemove the up/down arrow images. They haven't been used in a very long
gerald [Tue, 3 Aug 2010 00:08:14 +0000 (00:08 +0000)]
Remove the up/down arrow images. They haven't been used in a very long
time.

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

13 years agoFix cases where the type of a for loop variable is smaller than the type of the ...
wmeier [Mon, 2 Aug 2010 13:09:01 +0000 (13:09 +0000)]
Fix cases where the type of a for loop variable is smaller than the type of the "end" variable.
In some cases the usage may have been benign since it can be seen by code inspection that the maximum value of the end variable can't exceed the maximum value of the loop variable.
However, on general principles, all the usages have been fixed.

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

13 years agoMark encryptedData as unused, to avoid warnings when not HAVE_LIBGCRYPT.
stig [Mon, 2 Aug 2010 08:52:39 +0000 (08:52 +0000)]
Mark encryptedData as unused, to avoid warnings when not HAVE_LIBGCRYPT.

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

13 years agoAdded missing include <string.h>.
stig [Mon, 2 Aug 2010 08:46:36 +0000 (08:46 +0000)]
Added missing include <string.h>.

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

13 years agoTry to fix the GTP' header dissection a bit.
etxrab [Sun, 1 Aug 2010 20:55:29 +0000 (20:55 +0000)]
Try to fix the GTP' header dissection a bit.

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

13 years ago[Automatic manuf and enterprise-numbers update for 2010-08-01]
gerald [Sun, 1 Aug 2010 15:03:31 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-08-01]

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

13 years agoFix Windows builds broken by previous commit
rbalint [Sun, 1 Aug 2010 11:14:49 +0000 (11:14 +0000)]
Fix Windows builds broken by previous commit

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

13 years agoUse local copy of Wireshark documentation on UNIX if it's available.
rbalint [Sun, 1 Aug 2010 10:45:42 +0000 (10:45 +0000)]
Use local copy of Wireshark documentation on UNIX if it's available.
Installation has to be done manually to the location specified by --docdir
configure option.

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

13 years ago- Comment: some abbreviations used
jmayer [Fri, 30 Jul 2010 20:11:37 +0000 (20:11 +0000)]
- Comment: some abbreviations used
- Fix dissection of MU_RF_STATS_BLOCK
- Try to dissect embedded 802.11 frames (only works for the
  header, there seems to be a constant value of 0xa8b7 between
  wireless header and wireless data.

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

13 years ago'extern gint popup_menu_handler' ==> 'extern gboolean popup_menu_handler' to match...
wmeier [Fri, 30 Jul 2010 12:56:37 +0000 (12:56 +0000)]
'extern gint popup_menu_handler' ==> 'extern gboolean popup_menu_handler' to match just committed menus.c

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

13 years ago(Minor) Cleanup some "event callback" function declarations/definitions:
wmeier [Fri, 30 Jul 2010 12:41:56 +0000 (12:41 +0000)]
(Minor) Cleanup some "event callback" function declarations/definitions:
- Add missing 'user_data' arg as needed;
- Use gboolean rather than int as the type of the value returned.
Also: Cleanup whitespace & reformat long lines in a few cases.

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

13 years agoDefine WTAP_ENCAP_IEEE802_15_4_NOFCS, for use in file formats that don't
guy [Fri, 30 Jul 2010 02:30:50 +0000 (02:30 +0000)]
Define WTAP_ENCAP_IEEE802_15_4_NOFCS, for use in file formats that don't
include the FCS, and use it for the Daintree SNA file format.  While
we're at it, explicitly check to make sure the purported packet length
gives it at least one byte of packet data, and fix some print formats to
use %u for unsigned values.

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

13 years agoMinor code cleanup:
wmeier [Fri, 30 Jul 2010 00:17:49 +0000 (00:17 +0000)]
Minor code cleanup:
- Define several event callback functions with the correct number of args;
- Remove several unnecessary 'if (!user_data)  exit(10);' code sequences;
- Use 'user_data' arg of event callbacks instead of an object property
  in several cases;
- Reformat some long lines.

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

13 years agoUse ep-allocated strings for our data source names.
gerald [Thu, 29 Jul 2010 22:46:10 +0000 (22:46 +0000)]
Use ep-allocated strings for our data source names.

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

13 years ago(Trivial) Indentation cleanup (mostly: fix "4 space tabs").
wmeier [Thu, 29 Jul 2010 14:23:32 +0000 (14:23 +0000)]
(Trivial) Indentation cleanup (mostly: fix "4 space tabs").

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

13 years agoDon't use sprintf().
martinm [Thu, 29 Jul 2010 09:39:52 +0000 (09:39 +0000)]
Don't use sprintf().

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

13 years agoImprove display of tty lines.
martinm [Thu, 29 Jul 2010 09:30:09 +0000 (09:30 +0000)]
Improve display of tty lines.

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

13 years agoUse a custom sort function for each column of the dissector tables display:
wmeier [Thu, 29 Jul 2010 00:29:06 +0000 (00:29 +0000)]
Use a custom sort function for each column of the dissector tables display:
1. Numeric values in the 'Integer Tables' now sort properly.
   (For some reason just using a fixed width string for numeric values sorted
    OK on Windows but not on *nix).
2. The sort may be even faster since it's reputed that the default sort used
   by Gtk [g_utf8_collate()] is "expensive".

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

13 years agoMinor changes:
wmeier [Wed, 28 Jul 2010 22:47:48 +0000 (22:47 +0000)]
Minor changes:
 Use gtk_tree_store_insert_with_values if GTK >= 2.10;
 Change numeric formatting slightly in integer tables so values will
   sort numerically;
 Misc whitespace changes.

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

13 years agoFrom Pascal Quantin:
etxrab [Wed, 28 Jul 2010 21:13:05 +0000 (21:13 +0000)]
From Pascal Quantin:
The attached patch fixes the dissection of the PDN Disconnect Request message
in case the optional Protocol Configuration Options IE is not present.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5065

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

13 years agoAllow DRB frames to be passed to PDCP (where they may be decoded as IP).
martinm [Wed, 28 Jul 2010 16:58:13 +0000 (16:58 +0000)]
Allow DRB frames to be passed to PDCP (where they may be decoded as IP).

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

13 years agoSplit dissection of GTP and GTP' in ordet to try to fix bug
etxrab [Wed, 28 Jul 2010 16:13:56 +0000 (16:13 +0000)]
Split dissection of GTP and GTP' in ordet to try to fix bug
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5055

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

13 years ago(Trivial) Fix some typos; Also: Use consistent indentation.
wmeier [Wed, 28 Jul 2010 13:34:41 +0000 (13:34 +0000)]
(Trivial) Fix some typos; Also: Use consistent indentation.

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

13 years agoBacking out r33631 for now - it has a number of issues.
guy [Wed, 28 Jul 2010 01:12:41 +0000 (01:12 +0000)]
Backing out r33631 for now - it has a number of issues.

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

13 years ago(Trivial) Fix a typo
wmeier [Tue, 27 Jul 2010 18:59:30 +0000 (18:59 +0000)]
(Trivial) Fix a typo

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

13 years agoFrom Don Newton:
jake [Tue, 27 Jul 2010 06:46:00 +0000 (06:46 +0000)]
From Don Newton:
Fails to decrement msg_len on 3 different message types which causes the
dissector to attempt to decode an addition or misplaced unistim cmd.

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

13 years agoFix grammaro, indent example code.
guy [Tue, 27 Jul 2010 01:19:06 +0000 (01:19 +0000)]
Fix grammaro, indent example code.

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

13 years agoTell people to be careful about loops like
guy [Tue, 27 Jul 2010 01:06:10 +0000 (01:06 +0000)]
Tell people to be careful about loops like

for (guint8 = 0; guint8 < guint; guint8++)

(one of which recently caused an infinite loop with a fuzzed packet in
the buildbot).

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

13 years ago(Trivial) Fix a typo.
wmeier [Mon, 26 Jul 2010 19:24:06 +0000 (19:24 +0000)]
(Trivial) Fix a typo.

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

13 years agoFix potential infinite loop: for (guint8=0; guint8 < int; guint8++);
wmeier [Mon, 26 Jul 2010 19:00:44 +0000 (19:00 +0000)]
Fix potential infinite loop: for (guint8=0; guint8 < int; guint8++);
Fixes bug #5053.

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

13 years ago(Trivial) use gboolean instead of int in a few places; Whitespace cleanup.
wmeier [Mon, 26 Jul 2010 16:22:33 +0000 (16:22 +0000)]
(Trivial) use gboolean instead of int in a few places; Whitespace cleanup.

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

13 years ago(Trivial) Fix references to "clist" in comments;
wmeier [Mon, 26 Jul 2010 16:15:34 +0000 (16:15 +0000)]
(Trivial) Fix references to "clist" in comments;

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

13 years ago(Trivial) Use gboolean instead of int in a few places; Whitespace cleanup.
wmeier [Mon, 26 Jul 2010 16:11:56 +0000 (16:11 +0000)]
(Trivial) Use gboolean instead of int in a few places; Whitespace cleanup.

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

13 years agopacket-mip6.h has been removed....
wmeier [Mon, 26 Jul 2010 14:16:57 +0000 (14:16 +0000)]
packet-mip6.h has been removed....

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

13 years agoMove contents of packet-mip6.h to packet-mip6.c
wmeier [Mon, 26 Jul 2010 13:32:13 +0000 (13:32 +0000)]
Move contents of packet-mip6.h to packet-mip6.c
  - packet-mip6.h is not used elsewhere;
  - packet-mip6.h includes value string definitions.
Rename enum variables to be more distinct: ... ==> MIP6_...
Whitespace cleanup.

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

13 years agoFrom Cal Turney:
etxrab [Mon, 26 Jul 2010 13:23:30 +0000 (13:23 +0000)]
From Cal Turney:
Optionally display Wireshark version in the main window's title bar.
(Modified to include SVN version).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5040

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

13 years agoFrom John Sucaet:
etxrab [Mon, 26 Jul 2010 13:04:10 +0000 (13:04 +0000)]
From John Sucaet:
The committed changes in 33624 did not include all fixes of the previous patch
file - Please add the fix for the field description of the 8-bit Deep Hops Left
field
Attached file contains this fix (+as well as small correction to the field
descriptions of V and F flags, according to the terminology of RFC 4944)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5047

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

13 years agoFrom KATAOKA Toshihiro:
etxrab [Sun, 25 Jul 2010 18:24:43 +0000 (18:24 +0000)]
From KATAOKA Toshihiro:

I've made next updates for MIPv6 Mobility Options.

- Restart Counter
- IPv4 Default Router Address
 I've made some minor change re-using same type of header fields.

- IPv4 Home Address field in several IPv4 related mobility options.
- Status field in several IPv4 related mobility options.
- Prefix Len field in several IPv4 related mobility options.

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

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

13 years ago[Automatic manuf and enterprise-numbers update for 2010-07-25]
gerald [Sun, 25 Jul 2010 15:03:38 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-07-25]

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

13 years agoFrom John Sucaet:
jake [Fri, 23 Jul 2010 20:19:05 +0000 (20:19 +0000)]
From John Sucaet:
packet-6lowpan.c dissects the non-compressed ipv6 fields in an order different
from the one specified in RFC 4944 §10.3.1.
The patch fixes the wrong order and an additional problem with the dissection
of the mesh header: support for the Deep Hops Left field (RFC 4944 §5.2)

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

13 years agoFrom Jan van den Boom:
jake [Fri, 23 Jul 2010 19:40:32 +0000 (19:40 +0000)]
From Jan van den Boom:
Correct the V and F flag interpretation in the Mesh Addressing Type and Header
for correct address interpretation.

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

13 years ago(Trivial) Use enum definitions instead of numbers in a switch statement;
wmeier [Fri, 23 Jul 2010 14:01:47 +0000 (14:01 +0000)]
(Trivial) Use enum definitions instead of numbers in a switch statement;
Whitespace cleanup.

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

13 years agoAt least in some NetMon 3.4 VPN captures, the per-packet link-layer type
guy [Fri, 23 Jul 2010 10:11:44 +0000 (10:11 +0000)]
At least in some NetMon 3.4 VPN captures, the per-packet link-layer type
is 0, but the packets have Ethernet headers.  We handle this by mapping
0 to WTAP_ENCAP_ETHERNET.

(XXX - should we, instead, use the per-file link-layer type?)

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

13 years agoBacking out r33612.
jake [Fri, 23 Jul 2010 05:08:07 +0000 (05:08 +0000)]
Backing out r33612.

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

13 years ago(Trivial): Whitespace cleanup.
wmeier [Thu, 22 Jul 2010 20:53:24 +0000 (20:53 +0000)]
(Trivial): Whitespace cleanup.

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

13 years agoRework code so start-time, end-time, & packets columns sort properly and are right...
wmeier [Thu, 22 Jul 2010 18:44:11 +0000 (18:44 +0000)]
Rework code so start-time, end-time, & packets columns sort properly and are right-justified;
Remove some redundant code;
Widen the VOIP calls window slightly so all columns are displayed initially;
Minor whitespace cleanup.

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

13 years agoSet missing svn:keywords and svn:eol-style.
stig [Thu, 22 Jul 2010 12:18:36 +0000 (12:18 +0000)]
Set missing svn:keywords and svn:eol-style.

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