9 years agoRevert r35132 so that a better fix can be implemented that doesn't break
sfisher [Mon, 6 Dec 2010 21:33:19 +0000 (21:33 +0000)]
Revert r35132 so that a better fix can be implemented that doesn't break
non-printable non-UTF8 ASCII characters such as in binary streams.

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

9 years agoRemove unnecessary #include "../isprint.h"
sfisher [Mon, 6 Dec 2010 21:24:25 +0000 (21:24 +0000)]
Remove unnecessary #include "../isprint.h"

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

9 years agoMake some (preference) variables static.
morriss [Mon, 6 Dec 2010 19:48:05 +0000 (19:48 +0000)]
Make some (preference) variables static.

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

9 years agoUpdate the location of make-manuf.
gerald [Mon, 6 Dec 2010 18:34:49 +0000 (18:34 +0000)]
Update the location of make-manuf.

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

9 years agoChange isprint() calls in follow_stream.c (shared code that supports Follow
sfisher [Mon, 6 Dec 2010 18:34:26 +0000 (18:34 +0000)]
Change isprint() calls in follow_stream.c (shared code that supports Follow
TCP, UDP and SSL streams) to g_unichar_isprint() so that UTF-8 characters
are displayed properly.

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

9 years agoChange format_text() and format_text_wsp() to use g_unichar_isprint() for
sfisher [Mon, 6 Dec 2010 18:30:39 +0000 (18:30 +0000)]
Change format_text() and format_text_wsp() to use g_unichar_isprint() for
UTF-8 support instead of isprint().  This allows the middle packet details
pane to display UTF-8 strings instead of escaping them with \xxx notation.

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

9 years agoMove make-manuf to the tools directory.
gerald [Mon, 6 Dec 2010 18:30:14 +0000 (18:30 +0000)]
Move make-manuf to the tools directory.

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

9 years agoRemove an unused include.
gerald [Mon, 6 Dec 2010 18:29:46 +0000 (18:29 +0000)]
Remove an unused include.

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

9 years agoFix bug #5463 (and likely others) so that ep_strbuf_new() no longer
sfisher [Mon, 6 Dec 2010 17:30:08 +0000 (17:30 +0000)]
Fix bug #5463 (and likely others) so that ep_strbuf_new() no longer
truncates newly created and copied strings.  The problem was that
strlen() (which returns a length not counting the NULL terminator) was
being mixed with functions that do malloc() (which need to allocate
memory large enough to inculde the NULL string terminator).

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

9 years agoFrom Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5372 :
morriss [Mon, 6 Dec 2010 15:57:39 +0000 (15:57 +0000)]
From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5372 :

Fix crash in LDAP dissector, in a generic way (for all callers of

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

9 years agoFix various typos and spelling errors.
wmeier [Mon, 6 Dec 2010 01:34:58 +0000 (01:34 +0000)]
Fix various typos and spelling errors.

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

9 years agoAdd more PHY attributes to MAC frames.
martinm [Sun, 5 Dec 2010 23:34:11 +0000 (23:34 +0000)]
Add more PHY attributes to MAC frames.

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

9 years ago[Automatic manuf, services and enterprise-numbers update for 2010-12-05]
gerald [Sun, 5 Dec 2010 17:32:19 +0000 (17:32 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2010-12-05]

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

9 years ago[Automatic manuf, services and enterprise-numbers update for 2010-12-05]
gerald [Sun, 5 Dec 2010 16:03:43 +0000 (16:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2010-12-05]

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

9 years agoFrom Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5429 :
morriss [Sat, 4 Dec 2010 02:54:59 +0000 (02:54 +0000)]
From Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5429 :

Until now the info column only shows the OPC UA transport protocol type (Hello,
Ack, Secure Conversion message).
After connections establishment has finished this column shows only Secure
Conversion message, because every service is sent over the secure channel.

This patch adds the useful support of displaying the service type in the info
column. This makes it easier to find specific service calls in huge capture

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

9 years agoFrom Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5427 :
morriss [Sat, 4 Dec 2010 02:54:25 +0000 (02:54 +0000)]
From Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5427 :

This patch adds support for dissecting all Extension Objects types defined by
the OPC Foundation.

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

9 years agoFrom Allan M. Madsen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5446 :
morriss [Fri, 3 Dec 2010 23:44:35 +0000 (23:44 +0000)]
From Allan M. Madsen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5446 :

Bluetooth ACL packets are not defragmented when the packet boundary flags is set
to 'flushable first fragment'.

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

9 years agoFrom Andrew Feren via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5380 :
morriss [Fri, 3 Dec 2010 23:04:45 +0000 (23:04 +0000)]
From Andrew Feren via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5380 :

Comment in the code asked....

 /*XXX: 2 bytes skipped ?? */

Here is what I have found.

The high byte (1) indicates the Classification Engine ID
The low bytes (3) indicate the application ID

Engine ID of 5 is NBAR Standard.
Engine ID of 6 is NBAR Custom.

Attached patch displays all 4 bytes (type and ID) in a readable way.  Also
allows better filtering.

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

9 years agoFix a problem noticed in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5380...
morriss [Fri, 3 Dec 2010 22:59:16 +0000 (22:59 +0000)]
Fix a problem noticed in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5380#c2 :

Don't attempt to use a BASE_CUSTOM field's 'strings' field as a
value_string: it's not, it's a pointer to a function.

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

9 years agoAfter applying GUI preferences, reset the welcome screen's header message
sfisher [Fri, 3 Dec 2010 22:19:58 +0000 (22:19 +0000)]
After applying GUI preferences, reset the welcome screen's header message
in case the show version in welcome screen option was toggled.

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

9 years agoChange default for "Welcome screen and title bar shows version" to on per
sfisher [Fri, 3 Dec 2010 21:52:05 +0000 (21:52 +0000)]
Change default for "Welcome screen and title bar shows version" to on per
discussion in this thread on the wireshark-dev mailing list:


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

9 years agoFix spelling errors.
wmeier [Fri, 3 Dec 2010 20:37:34 +0000 (20:37 +0000)]
Fix spelling errors.

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

9 years agoFix a typo & do whitespace cleanup.
wmeier [Fri, 3 Dec 2010 20:32:17 +0000 (20:32 +0000)]
Fix a typo & do whitespace cleanup.

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

9 years agoDon't assume everyone knows what Wireshark is.
gerald [Fri, 3 Dec 2010 18:48:05 +0000 (18:48 +0000)]
Don't assume everyone knows what Wireshark is.

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

9 years agoDon't include epan/emem.h twice.
sfisher [Fri, 3 Dec 2010 18:47:10 +0000 (18:47 +0000)]
Don't include epan/emem.h twice.

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

9 years agoChange the Wireshark stock icon description from "Auto Scroll in Live Capture"
sfisher [Fri, 3 Dec 2010 17:31:58 +0000 (17:31 +0000)]
Change the Wireshark stock icon description from "Auto Scroll in Live Capture"
to "Auto Scroll" to save space in the main toolbar.  Leave the rest of the
references (such as in the view menu) as they were.

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

9 years agoSync from samba git:
jmayer [Fri, 3 Dec 2010 16:56:04 +0000 (16:56 +0000)]
Sync from samba git:

======== f99c009..189b4bc =========
commit 135756c8ac34c4cf82992dce8c7218781e67f39b
Author: Andrew Tridgell <tridge@samba.org>
Date:   Fri Nov 5 11:52:20 2010 +1100

    pidl: use a union assignment instead of memmove

    this means we don't lose type checking

    Pair-Programmed-With: Jelmer Vernooij <jelmer@samba.org>

commit 3bff03723d8920faece76dd57bcf5d19b84d7b02
Author: Jelmer Vernooij <jelmer@samba.org>
Date:   Tue Nov 30 23:48:46 2010 +0100

    pidl/python: Allow import of talloc, even though it doesn't live in the
    samba.dcerpc. namespace.

commit ba2110d19060c4d84656917eb6be7b78afc6df6b
Author: Jelmer Vernooij <jelmer@samba.org>
Date:   Tue Nov 30 23:06:32 2010 +0100

    pidl: Allow more flexibility importing modules using convenience function.

commit dd0fbc47c798acfb003e37afbee5f0748e30ad1b
Author: Jelmer Vernooij <jelmer@samba.org>
Date:   Tue Nov 30 22:59:32 2010 +0100

    pidl: Base new objects off of talloc object.

commit a3ed70ff96122531ba000123cdf3992d26663f30
Author: Andrew Tridgell <tridge@samba.org>
Date:   Sun Nov 21 23:05:07 2010 +1100

    pidl: fixed call to cpp with a space in the directory name

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

9 years agoFrom Fred Fierling:
etxrab [Fri, 3 Dec 2010 07:14:04 +0000 (07:14 +0000)]
From Fred Fierling:
Fixes invalid long address mappings in NWK layer.

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

9 years agoFrom Gerhard Gappmeier:
etxrab [Thu, 2 Dec 2010 20:44:18 +0000 (20:44 +0000)]
From Gerhard Gappmeier:
Fix mapping of datatype strings in opcua plugin

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

9 years agoAllow more than one instance of Wireshark to be started. For now, the stuff
cmaynard [Thu, 2 Dec 2010 20:05:19 +0000 (20:05 +0000)]
Allow more than one instance of Wireshark to be started.  For now, the stuff
that disallowed it is just commented out.  Later, we might choose to make use
of AllowMultipleInstances like other portableapps do, such as Firefox, et al.
This change was made as a result of the following query on the -users list:


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

9 years agoFrom Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5460 :
morriss [Thu, 2 Dec 2010 14:35:11 +0000 (14:35 +0000)]
From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5460 :

MongoDB dissector improperly decodes cursorID in OP_KILL_CURSORS command.
The size of the CursorID is 64 bits, while the code assumes they are 4 bits,
though correctly incrementing the pointer.  Fix this typo.

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

9 years agoFrom Slava:
etxrab [Thu, 2 Dec 2010 12:39:24 +0000 (12:39 +0000)]
From Slava:
Incorrectly registered range string in sdp infiniband dissector.

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

9 years agoRemove an incorrect (uninformed) comment recently added my me.
wmeier [Thu, 2 Dec 2010 03:22:45 +0000 (03:22 +0000)]
Remove an incorrect (uninformed) comment recently added my me.

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

9 years agoWindows 'File ! Save_As': Error popup if saving to name of open capture file and...
wmeier [Thu, 2 Dec 2010 01:38:50 +0000 (01:38 +0000)]
Windows 'File ! Save_As': Error popup if saving to name of open capture file and also
error popup if delete of existing file fails.

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

9 years agoFrom Zachary Mark via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5457 :
morriss [Wed, 1 Dec 2010 23:30:06 +0000 (23:30 +0000)]
From Zachary Mark via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5457 :

The scsi_persresv_type_val field in packet-scsi.c contains a mapping of
persistent reservation opcodes to their descriptive types.  The opcode for the
Exclusive Access - Registrants Only field is incorrectly set to 7, when the
correct opcode is 6 (as per SPC-2 onward).  The attached patch corrects this

The attached patch also adds support for dissecting opcodes 7 and 8, the two
all registrants reservation types present in SPC-3 onward.

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

9 years agoFrom Neil Piercy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3301 :
morriss [Wed, 1 Dec 2010 23:26:07 +0000 (23:26 +0000)]
From Neil Piercy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3301 :

The information which is used to determine which sub-dissector to use for the
various Data messages within an SCCP connection is only present within the
initial Connection Request, so even with connection tracking on, unless the
trace contains the Connection Request no sub-dissector is called. It is common
for traces to only contain a single carried protocol anyway - e.g. RANAP.

The supplied patch adds a user preference for a "default payload"
sub-dissector, which is called in preference to the Data dissector if nothing
else has claimed the packet first.

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

9 years agoFrom Neil Piercy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3301 :
morriss [Wed, 1 Dec 2010 23:12:46 +0000 (23:12 +0000)]
From Neil Piercy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3301 :

The packet-sccp.c has a bug in the declared valid ranges of the SSN and DPC
values in the user table used to match to a subdissector. The SSN range is 16
bits rather than 8 (not really an issue) but the DPC range is 16 bits rather
than 24 - so many traces cannot be matched by this table.

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

9 years agoAdd details to the table of Microsoft Visual C++ compilers (Win32 native tool chain...
sfisher [Wed, 1 Dec 2010 21:42:19 +0000 (21:42 +0000)]
Add details to the table of Microsoft Visual C++ compilers (Win32 native tool chain) for Visual C++ 2010 Express and Professional.

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

9 years agoChange underscore to dash to show correct docbook-xml42 package in Cygwin.
sfisher [Wed, 1 Dec 2010 21:21:33 +0000 (21:21 +0000)]
Change underscore to dash to show correct docbook-xml42 package in Cygwin.

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

9 years agoNow the Microsoft Visual C++ 2010 redistributable for x86 (32-bit) brings up a confus...
sfisher [Wed, 1 Dec 2010 20:48:44 +0000 (20:48 +0000)]
Now the Microsoft Visual C++ 2010 redistributable for x86 (32-bit) brings up a confusing dialog asking the user to repair or remove it if it's already installed.  Change it to (re-)install quietly (/q command-line option) like we do with the 64-bit version.

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

9 years agoAdd extern "C" to more header files.
sfisher [Wed, 1 Dec 2010 18:25:18 +0000 (18:25 +0000)]
Add extern "C" to more header files.

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

9 years agoAdd #ifndef __PRIVILEGES_H__ / #define / #endif logic to prevent multiple
sfisher [Wed, 1 Dec 2010 18:16:41 +0000 (18:16 +0000)]
Add #ifndef __PRIVILEGES_H__ / #define / #endif logic to prevent multiple
inclusions of privileges.h.

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

9 years agoDelegated-IPv6-Prefix(123) is shown incorrect as X-Ascend-Call-Attempt-Limit(123)
etxrab [Wed, 1 Dec 2010 17:34:26 +0000 (17:34 +0000)]
Delegated-IPv6-Prefix(123) is shown incorrect as X-Ascend-Call-Attempt-Limit(123)


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

9 years agoFix bug #5453 "Help->About Wireshark mis-reports OS" (again) without the help of...
sfisher [Wed, 1 Dec 2010 16:39:28 +0000 (16:39 +0000)]
Fix bug #5453 "Help->About Wireshark mis-reports OS" (again) without the help of MSDN code fragments.

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

9 years agoAdded Alex Badea for his contribution via bug #4149.
cmaynard [Wed, 1 Dec 2010 15:48:45 +0000 (15:48 +0000)]
Added Alex Badea for his contribution via bug #4149.

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

9 years agoFrom Alex Badea via bug #4149: IPcomp: decompress deflated payloads.
cmaynard [Wed, 1 Dec 2010 15:45:24 +0000 (15:45 +0000)]
From Alex Badea via bug #4149: IPcomp: decompress deflated payloads.

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

9 years agoFix a GCC error.
wmeier [Wed, 1 Dec 2010 02:18:01 +0000 (02:18 +0000)]
Fix a GCC error.

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

9 years agoOn Windows: convert _tzname[] strings from the system charset to UTF8 before use.
wmeier [Wed, 1 Dec 2010 01:31:49 +0000 (01:31 +0000)]
On Windows: convert _tzname[] strings from the system charset to UTF8 before use.

 In the Windows C Runtime the strings in the global array _tzname[]
   are encoded using the "system default ansi code page".
   They must be converted to UTF8 before use by Wireshark/GTK.
   (See comment in the code for details).

   Fixes Bug #5421 (I hope).

Also: Fix bug: when the timezone name is not available from the system
      ?ST was used when ?DT should have been used (and vice-versa).

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

9 years agoBack out r35084 since it contains code fragments from MSDN, which are covered
sfisher [Wed, 1 Dec 2010 00:42:48 +0000 (00:42 +0000)]
Back out r35084 since it contains code fragments from MSDN, which are covered
under the "Microsoft Limited Public License" apparently.

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

9 years agoFix bug #5453: Use GetSystemNativeInfo() function if found on the machine running...
sfisher [Tue, 30 Nov 2010 23:42:47 +0000 (23:42 +0000)]
Fix bug #5453: Use GetSystemNativeInfo() function if found on the  machine running Wireshark instead of GetSystemInfo(), so that we obtain the machine's actual architecture even when running under WOW64 x86 emulation.

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

9 years agoUpdate the manuf file (ahead of this weekend's auto-update) to reflect rev 35082...
morriss [Tue, 30 Nov 2010 22:33:29 +0000 (22:33 +0000)]
Update the manuf file (ahead of this weekend's auto-update) to reflect rev 35082's change to make-manuf.

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

9 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4102 :
morriss [Tue, 30 Nov 2010 22:28:34 +0000 (22:28 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4102 :

Limit the length of manuf names to 8 characters in make-manuf (this matches
the (old) limit in addr_resolv.c).

Dynamically allocate memory to store the manuf name in epan/addr_resolv.c so
that we don't end up corrupting the UTF-8 if/when we need to truncate the

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

9 years agoConvert the .c file names to .obj before putting them in WIRESHARK_GTK_OBJECTS.
morriss [Tue, 30 Nov 2010 21:32:04 +0000 (21:32 +0000)]
Convert the .c file names to .obj before putting them in WIRESHARK_GTK_OBJECTS.

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

9 years agoMove the port audio source into a separate variable which is not run through checkapi.
morriss [Tue, 30 Nov 2010 20:57:43 +0000 (20:57 +0000)]
Move the port audio source into a separate variable which is not run through checkapi.

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

9 years agoWe don't include a comprehensive display filter reference; don't say we
gerald [Tue, 30 Nov 2010 17:46:09 +0000 (17:46 +0000)]
We don't include a comprehensive display filter reference; don't say we

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

9 years agoRename conflicting draft v2 and v8 display filter fields. Fixes bug 4059.
cmaynard [Tue, 30 Nov 2010 17:08:37 +0000 (17:08 +0000)]
Rename conflicting draft v2 and v8 display filter fields.  Fixes bug 4059.

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

9 years agoFrom Toralf Foerster via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5432 :
morriss [Tue, 30 Nov 2010 17:06:13 +0000 (17:06 +0000)]
From Toralf Foerster via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5432 :

The attached patch against that dissector contains :

- counting statistics over encrypted packages (line 610 ff)

- tag sametime message type 0x0025 as known

- better comment
- new line clean ups

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

9 years agoFrom Pascal Quantin:
martinm [Tue, 30 Nov 2010 15:10:17 +0000 (15:10 +0000)]
From Pascal Quantin:

I just found a small bug in LTE PDCP dissector with current top of tree.
If global preference global_pdcp_dissect_user_plane_as_ip is set to true, the dissector will try to decode an IP frame even with signalling plane.
    ...0 0000 = Seq Num: 0
    Signalling Data: 0800183aa808
    MAC: 0x00000000 (0)
[Malformed Packet: IP]
    [Expert Info (Error/Malformed): Malformed Packet (Exception occurred)]

With the attached patch, I get the correct output for both signalling and user plane PDUs.

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

9 years agoOh yeah, there's a reason we don't put targets in Makefile.common: the first target...
morriss [Tue, 30 Nov 2010 02:04:55 +0000 (02:04 +0000)]
Oh yeah, there's a reason we don't put targets in Makefile.common: the first target in a makefile is what you get when you just run make (without a target).  Revert 35073 and 35069.

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

9 years agoFix "colorize with filter" functionality that got broken with the new_packet_list.
sake [Mon, 29 Nov 2010 22:50:21 +0000 (22:50 +0000)]
Fix "colorize with filter" functionality that got broken with the new_packet_list.

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

9 years agoMove some checkapi targets into Makefile.common
morriss [Mon, 29 Nov 2010 22:34:04 +0000 (22:34 +0000)]
Move some checkapi targets into Makefile.common

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

9 years agoRemove a no-longer-used variable.
morriss [Mon, 29 Nov 2010 22:11:39 +0000 (22:11 +0000)]
Remove a no-longer-used variable.

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

9 years agoFix the checkapi target.
morriss [Mon, 29 Nov 2010 21:46:53 +0000 (21:46 +0000)]
Fix the checkapi target.

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

9 years agoChange SIP TCP port preference to a range preference.
etxrab [Mon, 29 Nov 2010 21:40:49 +0000 (21:40 +0000)]
Change SIP TCP port preference to a range preference.

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

9 years agoMove the checkapi targes to Makefile.common. Rename Makefile.nmake's WIRESHARK_GTK_S...
morriss [Mon, 29 Nov 2010 20:53:22 +0000 (20:53 +0000)]
Move the checkapi targes to Makefile.common.  Rename Makefile.nmake's WIRESHARK_GTK_SRC to WIRESHARK_GTK_ALL_SRC to avoid reusing the variable of the same name from Makefile.common; Put DIRTY_GENERATED_C_FILES back in that variable since checkapi is no longer run on it.

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

9 years agoAdd "Length" as a new default column on a trial basis between the protocol
sfisher [Mon, 29 Nov 2010 20:43:24 +0000 (20:43 +0000)]
Add "Length" as a new default column on a trial basis between the protocol
and info columns per discussion on -dev list:


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

9 years agoRemove DIRTY_GENERATED_C_FILES from WIRESHARK_GTK_SRC so we don't run checkapi on...
morriss [Mon, 29 Nov 2010 20:37:24 +0000 (20:37 +0000)]
Remove DIRTY_GENERATED_C_FILES from WIRESHARK_GTK_SRC so we don't run checkapi on it.  Also remove capture_if_details_dlg_win32.c from the checkapi list since it's in WIRESHARK_GTK_SRC (which is in the list of files checkapi is run against).

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

9 years agoRemove file_dlg_win32.c and print_win32.c from the checkapi target.
morriss [Mon, 29 Nov 2010 20:09:09 +0000 (20:09 +0000)]
Remove file_dlg_win32.c and print_win32.c from the checkapi target.

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

9 years agoAdd DIRTY_GENERATED_C_FILES to GENERATED_FILES (so they get cleaned up by distclean).
morriss [Mon, 29 Nov 2010 20:07:43 +0000 (20:07 +0000)]
Add DIRTY_GENERATED_C_FILES to GENERATED_FILES (so they get cleaned up by distclean).

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

9 years agoFrom Andrei Emeltchenko:
etxrab [Mon, 29 Nov 2010 18:15:09 +0000 (18:15 +0000)]
From Andrei Emeltchenko:
Wrong link type in a packet(bluethouth).

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

9 years agoFix typos.
cmaynard [Mon, 29 Nov 2010 17:22:05 +0000 (17:22 +0000)]
Fix typos.

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

9 years agoFrom Vincent Helfre:
etxrab [Mon, 29 Nov 2010 13:27:00 +0000 (13:27 +0000)]
From Vincent Helfre:
Make it possible to dissect NAS EPS messages without security header.

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

9 years agoFrom Vincent Helfre:
etxrab [Mon, 29 Nov 2010 13:12:35 +0000 (13:12 +0000)]
From Vincent Helfre:
I have fixed some issue in the measurement information decoding in packet-gsm_a_rr.c.

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

9 years agoTry to fix Buildbot crash output: fuzz-2010-11-28-11164.pcap
etxrab [Mon, 29 Nov 2010 13:02:31 +0000 (13:02 +0000)]
Try to fix Buildbot crash output: fuzz-2010-11-28-11164.pcap

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

9 years agoAllow DCT error strings containing given subsets to be filtered upon.
martinm [Mon, 29 Nov 2010 12:09:18 +0000 (12:09 +0000)]
Allow DCT error strings containing given subsets to be filtered upon.

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

9 years agoMake the Primary name element filterable in response records.
jmayer [Sun, 28 Nov 2010 21:45:15 +0000 (21:45 +0000)]
Make the Primary name element filterable in response records.
Same for Nameserver names.

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

9 years agou3.c has moved.
jmayer [Sun, 28 Nov 2010 21:44:06 +0000 (21:44 +0000)]
u3.c has moved.

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

9 years agoFrom Slava:
etxrab [Sun, 28 Nov 2010 21:08:03 +0000 (21:08 +0000)]
From Slava:
Bug with RWH parsing in Infiniband dissector.

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

9 years agoFrom Robert Groenenberg:
etxrab [Sun, 28 Nov 2010 21:03:43 +0000 (21:03 +0000)]
From Robert Groenenberg:
Assert when using ASN.1 dissector with loading a 'type table'

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

9 years agoFrom Alex Badea:
etxrab [Sun, 28 Nov 2010 20:58:26 +0000 (20:58 +0000)]
From Alex Badea:
gsm_a_rr: System Information Type 4 / CBCH mobile allocation dissected incorrectly

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

9 years ago[Automatic manuf, services and enterprise-numbers update for 2010-11-28]
gerald [Sun, 28 Nov 2010 16:03:43 +0000 (16:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2010-11-28]

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

9 years agoFix calling of LTE RRC dissector for "rrc_lte_r8" frames.
martinm [Sun, 28 Nov 2010 15:37:40 +0000 (15:37 +0000)]
Fix calling of LTE RRC dissector for "rrc_lte_r8" frames.

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

9 years agoPartially clean up white space.
guy [Sun, 28 Nov 2010 00:53:23 +0000 (00:53 +0000)]
Partially clean up white space.

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

9 years agoClean up white space.
guy [Sun, 28 Nov 2010 00:41:47 +0000 (00:41 +0000)]
Clean up white space.

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

9 years agoClean up white space.
guy [Sun, 28 Nov 2010 00:19:49 +0000 (00:19 +0000)]
Clean up white space.

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

9 years agoMove u3 code to top-level directory since it's not GTK specific
sfisher [Sun, 28 Nov 2010 00:15:21 +0000 (00:15 +0000)]
Move u3 code to top-level directory since it's not GTK specific

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

9 years agoDon't report an error twice.
guy [Sun, 28 Nov 2010 00:13:38 +0000 (00:13 +0000)]
Don't report an error twice.

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

9 years agoAdd GCC-style printf annotation to the routines that now take a format
guy [Sun, 28 Nov 2010 00:02:39 +0000 (00:02 +0000)]
Add GCC-style printf annotation to the routines that now take a format
string and format arguments, and fix issues warned about by that.

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

9 years agoClean up white space.
guy [Sun, 28 Nov 2010 00:00:58 +0000 (00:00 +0000)]
Clean up white space.

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

9 years agoMake some other statusbar routines take a format string and format args,
guy [Sat, 27 Nov 2010 23:06:14 +0000 (23:06 +0000)]
Make some other statusbar routines take a format string and format args,
and get rid of an unnecessary string pointer.

Make the argument to welcome_header_push_msg() a const pointer.

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

9 years agoMove main_statusbar.h to the top-level directory; none of its routines
guy [Sat, 27 Nov 2010 21:50:49 +0000 (21:50 +0000)]
Move main_statusbar.h to the top-level directory; none of its routines
use GTK+ data types, so, at least in theory, it could be implemented
atop another toolkit.

Make statusbar_push_temporary_msg() take a format string and format
arguments.  Use it instead of simple_status(), and change one call to
just take a format string and arguments rather than to take the result
of using that format string and arguments with g_strdup_printf() and
passing the result to statusbar_push_temporary_msg().

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

9 years agoRemove "not tested" note on MSVC 2010's vcredist instructions
sfisher [Sat, 27 Nov 2010 18:52:02 +0000 (18:52 +0000)]
Remove "not tested" note on MSVC 2010's vcredist instructions

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

9 years agoAdd svn:keywords & svn:eol-style properties.
wmeier [Sat, 27 Nov 2010 18:00:21 +0000 (18:00 +0000)]
Add svn:keywords & svn:eol-style properties.

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

9 years agoFrom OKANO Takayoshi via bug #5442: Fix typos in documentation
sfisher [Sat, 27 Nov 2010 16:51:24 +0000 (16:51 +0000)]
From OKANO Takayoshi via bug #5442: Fix typos in documentation

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

9 years agoFix typo in comment
sfisher [Sat, 27 Nov 2010 01:13:25 +0000 (01:13 +0000)]
Fix typo in comment

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

9 years agoDefine HAVE_GTK in config.h when compiling with GTK for the GUI
sfisher [Fri, 26 Nov 2010 23:50:56 +0000 (23:50 +0000)]
Define HAVE_GTK in config.h when compiling with GTK for the GUI

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

9 years agoMention SSHv2 RFCs
sfisher [Fri, 26 Nov 2010 23:33:05 +0000 (23:33 +0000)]
Mention SSHv2 RFCs

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

9 years agoFix the rest of the include paths after the move of native win32 code to win32 and...
sfisher [Fri, 26 Nov 2010 20:57:46 +0000 (20:57 +0000)]
Fix the rest of the include paths after the move of native win32 code to win32 and out of the gtk directory in r35032

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

9 years agoFix the Windows buildbot after r35032
sfisher [Fri, 26 Nov 2010 20:13:00 +0000 (20:13 +0000)]
Fix the Windows buildbot after r35032

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

9 years agoMove native Win32 code to its own directory and out of gtk directory (hopefully witho...
sfisher [Fri, 26 Nov 2010 19:16:06 +0000 (19:16 +0000)]
Move native Win32 code to its own directory and out of gtk directory (hopefully without breaking any builds)

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