Commit Graph

33625 Commits

Author SHA1 Message Date
Martin Mathieson 7cd3ff263b Add more PHY attributes to MAC frames.
svn path=/trunk/; revision=35125
2010-12-05 23:34:11 +00:00
Gerald Combs b6da2c3ed9 [Automatic manuf, services and enterprise-numbers update for 2010-12-05]
svn path=/trunk/; revision=35122
2010-12-05 17:32:19 +00:00
Gerald Combs 2cc297266e [Automatic manuf, services and enterprise-numbers update for 2010-12-05]
svn path=/trunk/; revision=35120
2010-12-05 16:03:43 +00:00
Jeff Morriss 64a099a652 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
files.

svn path=/trunk/; revision=35119
2010-12-04 02:54:59 +00:00
Jeff Morriss 4f6ea6ef47 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.

svn path=/trunk/; revision=35118
2010-12-04 02:54:25 +00:00
Jeff Morriss 7fb975bb90 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'.

svn path=/trunk/; revision=35117
2010-12-03 23:44:35 +00:00
Jeff Morriss 132f874faa 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.

svn path=/trunk/; revision=35116
2010-12-03 23:04:45 +00:00
Jeff Morriss 39f6874d13 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.

svn path=/trunk/; revision=35115
2010-12-03 22:59:16 +00:00
Stephen Fisher 5a7b4defa3 After applying GUI preferences, reset the welcome screen's header message
in case the show version in welcome screen option was toggled.


svn path=/trunk/; revision=35114
2010-12-03 22:19:58 +00:00
Stephen Fisher fabe85aa2e Change default for "Welcome screen and title bar shows version" to on per
discussion in this thread on the wireshark-dev mailing list:

    http://www.wireshark.org/lists/wireshark-dev/201011/msg00151.html


svn path=/trunk/; revision=35113
2010-12-03 21:52:05 +00:00
Bill Meier 19124f8bb1 Fix spelling errors.
svn path=/trunk/; revision=35112
2010-12-03 20:37:34 +00:00
Bill Meier bfc6eccbe0 Fix a typo & do whitespace cleanup.
svn path=/trunk/; revision=35111
2010-12-03 20:32:17 +00:00
Gerald Combs b029a19159 Don't assume everyone knows what Wireshark is.
svn path=/trunk/; revision=35110
2010-12-03 18:48:05 +00:00
Stephen Fisher a3d313a967 Don't include epan/emem.h twice.
svn path=/trunk/; revision=35109
2010-12-03 18:47:10 +00:00
Stephen Fisher f4b4c45af1 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.


svn path=/trunk/; revision=35108
2010-12-03 17:31:58 +00:00
Jörg Mayer 7c99468ea7 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
=============================

svn path=/trunk/; revision=35107
2010-12-03 16:56:04 +00:00
Anders Broman 740a550120 From Fred Fierling:
Fixes invalid long address mappings in NWK layer.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5456

svn path=/trunk/; revision=35106
2010-12-03 07:14:04 +00:00
Anders Broman a06eef00b8 From Gerhard Gappmeier:
Fix mapping of datatype strings in opcua plugin
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5428

svn path=/trunk/; revision=35105
2010-12-02 20:44:18 +00:00
Chris Maynard 1b38a8f876 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:

    http://www.wireshark.org/lists/wireshark-users/201012/msg00008.html

svn path=/trunk/; revision=35104
2010-12-02 20:05:19 +00:00
Jeff Morriss 5430e70144 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.

svn path=/trunk/; revision=35103
2010-12-02 14:35:11 +00:00
Anders Broman a6b1581480 From Slava:
Incorrectly registered range string in sdp infiniband dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5461

svn path=/trunk/; revision=35102
2010-12-02 12:39:24 +00:00
Bill Meier 6e9fdc3fe2 Remove an incorrect (uninformed) comment recently added my me.
svn path=/trunk/; revision=35101
2010-12-02 03:22:45 +00:00
Bill Meier 41da60a203 Windows 'File ! Save_As': Error popup if saving to name of open capture file and also
error popup if delete of existing file fails.

svn path=/trunk/; revision=35100
2010-12-02 01:38:50 +00:00
Jeff Morriss a098de3e0a 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
discrepancy.

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

svn path=/trunk/; revision=35099
2010-12-01 23:30:06 +00:00
Jeff Morriss 2b77738b11 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.

svn path=/trunk/; revision=35098
2010-12-01 23:26:07 +00:00
Jeff Morriss 7967c282c0 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.

svn path=/trunk/; revision=35097
2010-12-01 23:12:46 +00:00
Stephen Fisher 67421445fc Add details to the table of Microsoft Visual C++ compilers (Win32 native tool chain) for Visual C++ 2010 Express and Professional.
svn path=/trunk/; revision=35096
2010-12-01 21:42:19 +00:00
Stephen Fisher 973abd3e40 Change underscore to dash to show correct docbook-xml42 package in Cygwin.
svn path=/trunk/; revision=35095
2010-12-01 21:21:33 +00:00
Stephen Fisher 68241fa66f 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.
svn path=/trunk/; revision=35094
2010-12-01 20:48:44 +00:00
Stephen Fisher 462245684a Add extern "C" to more header files.
svn path=/trunk/; revision=35093
2010-12-01 18:25:18 +00:00
Stephen Fisher efc64e43f6 Add #ifndef __PRIVILEGES_H__ / #define / #endif logic to prevent multiple
inclusions of privileges.h.


svn path=/trunk/; revision=35092
2010-12-01 18:16:41 +00:00
Anders Broman 100e4ae025 Delegated-IPv6-Prefix(123) is shown incorrect as X-Ascend-Call-Attempt-Limit(123)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5455

svn path=/trunk/; revision=35091
2010-12-01 17:34:26 +00:00
Stephen Fisher 9e5dc7e406 Fix bug #5453 "Help->About Wireshark mis-reports OS" (again) without the help of MSDN code fragments.
svn path=/trunk/; revision=35090
2010-12-01 16:39:28 +00:00
Chris Maynard 9e3a12e9f0 Added Alex Badea for his contribution via bug #4149.
svn path=/trunk/; revision=35089
2010-12-01 15:48:45 +00:00
Chris Maynard 77673564bc From Alex Badea via bug #4149: IPcomp: decompress deflated payloads.
svn path=/trunk/; revision=35088
2010-12-01 15:45:24 +00:00
Bill Meier 7d0c23a125 Fix a GCC error.
svn path=/trunk/; revision=35087
2010-12-01 02:18:01 +00:00
Bill Meier bd793cd800 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).
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5421

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).

svn path=/trunk/; revision=35086
2010-12-01 01:31:49 +00:00
Stephen Fisher 283e7471e2 Back out r35084 since it contains code fragments from MSDN, which are covered
under the "Microsoft Limited Public License" apparently.


svn path=/trunk/; revision=35085
2010-12-01 00:42:48 +00:00
Stephen Fisher 7ba78f6857 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.
svn path=/trunk/; revision=35084
2010-11-30 23:42:47 +00:00
Jeff Morriss 9e7e31e1af Update the manuf file (ahead of this weekend's auto-update) to reflect rev 35082's change to make-manuf.
svn path=/trunk/; revision=35083
2010-11-30 22:33:29 +00:00
Jeff Morriss 7009bfc740 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
string.

svn path=/trunk/; revision=35082
2010-11-30 22:28:34 +00:00
Jeff Morriss ad2730d302 Convert the .c file names to .obj before putting them in WIRESHARK_GTK_OBJECTS.
svn path=/trunk/; revision=35081
2010-11-30 21:32:04 +00:00
Jeff Morriss b8cb5e53ff Move the port audio source into a separate variable which is not run through checkapi.
svn path=/trunk/; revision=35080
2010-11-30 20:57:43 +00:00
Gerald Combs 40af498b36 We don't include a comprehensive display filter reference; don't say we
do.

svn path=/trunk/; revision=35079
2010-11-30 17:46:09 +00:00
Chris Maynard 4255465926 Rename conflicting draft v2 and v8 display filter fields. Fixes bug 4059.
svn path=/trunk/; revision=35078
2010-11-30 17:08:37 +00:00
Jeff Morriss a7ce50ba95 From Toralf Foerster via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5432 :
The attached patch against that dissector contains :

FIX:
- counting statistics over encrypted packages (line 610 ff)

NEW:
- tag sametime message type 0x0025 as known

MISC:
- better comment
- new line clean ups

svn path=/trunk/; revision=35077
2010-11-30 17:06:13 +00:00
Martin Mathieson 77cf0462dc 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.
PDCP-LTE
    ...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.

svn path=/trunk/; revision=35076
2010-11-30 15:10:17 +00:00
Jeff Morriss c755b2fd54 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.
svn path=/trunk/; revision=35075
2010-11-30 02:04:55 +00:00
Sake Blok a857d6d69b Fix "colorize with filter" functionality that got broken with the new_packet_list.
svn path=/trunk/; revision=35074
2010-11-29 22:50:21 +00:00
Jeff Morriss f1c066bbee Move some checkapi targets into Makefile.common
svn path=/trunk/; revision=35073
2010-11-29 22:34:04 +00:00