morriss [Fri, 6 May 2011 01:54:07 +0000 (01:54 +0000)]
Prefix the message class names with RELOAD_ to prevent collisions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37006
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 6 May 2011 01:47:16 +0000 (01:47 +0000)]
From Ed Day via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5890 :
ASN.1 files in trunk/asn1/qsig contain syntax errors that prevent them from
being compiled by a standard ASN.1 compiler. A patch of modified files is
attached along with General-Error-List.asn which was missing completely.
From me: add the new asn file to the list of source files. Add SVN Id tag to
the new file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37005
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 6 May 2011 01:27:54 +0000 (01:27 +0000)]
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5893 :
Add support for VTP Join messages.
From me: rather than add the first and last VLANs with separate hf_ variables
and the masked ones with proto_tree_add_text(), use one hf_ variable for all the
VLAN IDs.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37004
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 6 May 2011 01:09:04 +0000 (01:09 +0000)]
From Marc Petit-Huguenin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5894 :
- Use "RELOAD" everywhere.
- Fix invalid variable name "reload_framing.probe_information.type".
- Fix various names to match the spec.
- Dissect the X.509 certificate embedded in RELOAD messages.
- Use tls_signature_algorithm and tls_hash_algorithm tables in
packet-ssl-utils.
From me: take out the tabs. Keep the long dissector name when registering the
protocols.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37003
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 5 May 2011 21:41:51 +0000 (21:41 +0000)]
Forgot to remove my editor's tabs before committing...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37002
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 5 May 2011 21:15:33 +0000 (21:15 +0000)]
Fix false positive compiler warnings:
address_to_str.c:157: warning: 'cur.len' may be used uninitialized in this function
address_to_str.c:157: warning: 'best.len' may be used uninitialized in this function
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37001
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 5 May 2011 20:48:21 +0000 (20:48 +0000)]
Introduce ip6_to_str_buf_len (little cleaner version of inet_ntop6 from wsutil/inet_ntop.c)
and use it instead of inet_ntop(AF_INET6, ...)
- Add MAX_IP6_STR_LEN define.
- use MAX_IP6_STR_LEN as a buffer size when ip6_to_str_buf() is used.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37000
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 5 May 2011 20:46:02 +0000 (20:46 +0000)]
Apply rev 14059 to non-Windows: update the display with new packets every 500
msec (instead of every 1000msec).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36999
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 5 May 2011 16:41:52 +0000 (16:41 +0000)]
Subtract (not add!) preamble length from remaining buffer length.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36998
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Thu, 5 May 2011 14:20:22 +0000 (14:20 +0000)]
Fix decoding of CP56Time2a timestamp. Resolves bug 5889.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36997
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 5 May 2011 06:55:12 +0000 (06:55 +0000)]
Cleanup: replace se_alloc+memcpy combo with single se_memdup().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36996
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 5 May 2011 05:23:05 +0000 (05:23 +0000)]
More GUIManager stuff.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36995
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 5 May 2011 01:08:17 +0000 (01:08 +0000)]
packet-xtp.h used only in packet-xtp.c; Move packet-xtp.h contents to packet-xtp.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36994
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 5 May 2011 00:48:54 +0000 (00:48 +0000)]
Don't assign to unused variable: Coverity 1132 [UNUSED].
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36993
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 5 May 2011 00:31:54 +0000 (00:31 +0000)]
Fix two cases of assignment to unused variables: Coverity 1030 & 1031 [UNUSED];
Also: #include <stdio.h> not req'd.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36992
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 5 May 2011 00:15:59 +0000 (00:15 +0000)]
Fix two unused variable assignments: Coverity 1140.
Also: fix some indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36991
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 4 May 2011 23:56:29 +0000 (23:56 +0000)]
Fix 3 memory leaks: unused g_malloc(): Coverity 1148-1150 [UNUSED];
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36990
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 4 May 2011 22:48:51 +0000 (22:48 +0000)]
Fix Coverity 1191: DEADCODE;
Use consistent indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36989
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Wed, 4 May 2011 21:19:04 +0000 (21:19 +0000)]
Cleanup: g_malloc can't return NULL, remove checks for them.
XXX, should this code use g_try_malloc instead?
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36988
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Wed, 4 May 2011 19:42:51 +0000 (19:42 +0000)]
From Nick Glass via bug #5887: DACP (apple remote) enhancement to DAAP
dissector.
Me: Add Nick to AUTHORS file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36987
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Wed, 4 May 2011 19:32:35 +0000 (19:32 +0000)]
Cleanup: replace sizeof(arr)/sizeof(arr[0]) with shorter array_length(arr)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36986
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 4 May 2011 19:02:42 +0000 (19:02 +0000)]
More GUIManager stuff.
Note Use GUI manager needs to be set in gui_stet_menu.h too,
to use it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36985
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 4 May 2011 17:24:48 +0000 (17:24 +0000)]
From Pascal Quantin:
Add an expert check for the MS Classmark 2 decoding in UE EUTRA Capability message and a few missing message type display in the column text.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36984
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 4 May 2011 15:24:14 +0000 (15:24 +0000)]
Once we start printing an "opened up" (tshark -O) tree, print the entire
subtree. Otherwise subitems whose abbreviation doesn't match the protocol name
(such as text items) won't get printed.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36983
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 3 May 2011 22:09:18 +0000 (22:09 +0000)]
More GUIManager stuff.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36982
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 3 May 2011 20:23:57 +0000 (20:23 +0000)]
More GUIManager stuff.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36981
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Tue, 3 May 2011 18:27:08 +0000 (18:27 +0000)]
Packet editor:
- support for FT_IPv4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36980
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Tue, 3 May 2011 17:38:26 +0000 (17:38 +0000)]
From Jose Pico via bug #5884: Corrected export_object smb segmentation
fault
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36979
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 3 May 2011 16:51:08 +0000 (16:51 +0000)]
Do some prep work on GUIManager code, if you enable it it will break as the menus.c changes are not commited.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36978
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 3 May 2011 16:45:37 +0000 (16:45 +0000)]
Do some prep work on GUIManager code, if you enable it it will break as the menus.c changes are not commited.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36977
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 3 May 2011 15:38:22 +0000 (15:38 +0000)]
Wrap text of description for -O.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36976
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 09:14:56 +0000 (09:14 +0000)]
Note what NetMon 3 actually uses various types for.
For the ones that are used for raw IP, use WTAP_ENCAP_RAW_IP. (Yes,
NetMon checks for v4 vs. v6 for all of them.)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36975
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 08:49:41 +0000 (08:49 +0000)]
Set the pseudo-header regardless of whether we have a trailer or not.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36974
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 08:22:25 +0000 (08:22 +0000)]
It appears that, in NetMon 802.11 captures, management frames have an
FCS and data frames don't have an FCS; I don't know about control
frames.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36973
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 05:50:30 +0000 (05:50 +0000)]
Squelch a compiler warning - but note, in a comment, a real problem the
warning points out.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36972
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 05:28:39 +0000 (05:28 +0000)]
Fix indentation (tab stops are not guaranteed to be every 4 spaces).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36971
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 05:26:10 +0000 (05:26 +0000)]
From Tom Brezinski - fix for bug 5869:
This patch incorporates the following fixes from the patch attached to
bug 5671 with changes as noted below:
1.) Files where the packet header and packet data are noncontiguous are
handled improperly, resulting in read misalignment and ultimately the
error message, "Observer: bad record: Invalid magic number 0xXXXXXXXX."
This bug is caused by not obeying the packet_entry_header.offset_to_frame
field.
2.) Daylight savings time is not properly accounted for in files using
local time encoding.
3.) As of Observer/GigaStor v13.10 (bug 5671 incorrectly stated v14),
timestamps in the file format changed from local time encoding to GMT
encoding. Wiretap has been changed to support reading both formats.
Patch submitted with bug 5671 added a separate file type to allow
writing local format. This patch does not add the separate file type
and always writes GMT.
4.) The wtap_dumper.bytes_dumped field is not being properly incremented
as data is written to files.
This patch also incorporates the following additional enhancements /
fixes not in bug 5671:
1.) Support for reading BFR files which contain Fibre Channel captures.
Test file Fibre_Channel_Capture.bfr attached.
2.) Support for modified file header used in upcoming v15. New header
file format takes an unused byte from the version string to allow for a
larger offset to the first packet to be specified. Test file
V15_Lrg_Hdr_Test.bfr is attached, it is also a fuzz test as the number
of TLV items given in the header is less then the actual.
3.) It was found that if the number of TLV items given in the header was
larger then present it would fail to open the file. Test file
V9_Num_TLVs_Too_Big.bfr is attached.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36970
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 04:48:02 +0000 (04:48 +0000)]
Don't bother checking for gzgets(), as we don't use it, and don't even
need to use its presence in zlib as a proxy for "not the crufty old zlib
that comes with some versions of X11".
Do, however, check for inflatePrime() there, instead, just in case the
crufty old zlib that comes with some versions of X11 lack it; this is to
prevent the configure script from assuming a shiny new zlib by testing
with a non-X11 program, causing the build to fail when you build
Wireshark.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36969
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 02:03:25 +0000 (02:03 +0000)]
One bit suffices for the "columnized" and "colorized" flags in the
packet list store, and there's one PacketListRecord for every packet, so
that can save some space...
...especially if we move them after all the pointers, rather than before
the pointers, so they don't collectively take up 8 bytes on an LP64 or
LLP64 platform due to pointers having to be 8-byte aligned.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36968
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 01:19:55 +0000 (01:19 +0000)]
TShark doesn't need column text attached to each frame; move col_text
and col_text_len from the frame_data structure to the PacketRecord
structure.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36967
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 00:22:35 +0000 (00:22 +0000)]
Fix a comment.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36966
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Mon, 2 May 2011 16:40:19 +0000 (16:40 +0000)]
From Peter Paluch via bug #5877: EIGRP dissector enhancement for RS/EOT
flags
Me: Add Peter to AUTHORS file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36965
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 2 May 2011 14:27:48 +0000 (14:27 +0000)]
Fix the (fuzzed) memory allocation failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5880 :
Don't attempt to reassemble a message if the length of the fragment is negative.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36964
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 2 May 2011 14:06:33 +0000 (14:06 +0000)]
Support content-type x-gzip and x-deflate, as described in RFC2616 as
equivalent to gzip and deflate.
This fixes bug 5882.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36963
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 2 May 2011 02:06:52 +0000 (02:06 +0000)]
For "per packet" file encapsulation, display a list of the encapsulations seen ("long form" report).
Example:
File type: Microsoft NetMon 2.x
File encapsulation: Per packet
IEEE 802.11 plus Network Monitor radio header
ToDo: For the tabular form report display the list of per-packet encapsulations seen.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36962
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 1 May 2011 15:03:48 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-05-01]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36959
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sat, 30 Apr 2011 17:43:05 +0000 (17:43 +0000)]
Check our PDU length. Fixes the infinite loop found in bug 5876.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36958
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 30 Apr 2011 08:36:00 +0000 (08:36 +0000)]
Use correct signature on callbacks.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36957
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 29 Apr 2011 18:30:16 +0000 (18:30 +0000)]
Oops, the Windows HAVE_GZCLEARERR stuff did work; take out the rest.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36956
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 29 Apr 2011 18:29:26 +0000 (18:29 +0000)]
Don't check for the existence of gzclearerr() any more.
Check for inflatePrime().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36955
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 29 Apr 2011 17:30:23 +0000 (17:30 +0000)]
On Windows: don't (try but fail--the code did not work) to define
HAVE_GZLCEARERR. Define HAVE_INFLATEPRIME if we HAVE_LIBZ.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36954
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 29 Apr 2011 14:56:40 +0000 (14:56 +0000)]
Add "Wireshark ... Copyright ...".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36953
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 29 Apr 2011 14:50:13 +0000 (14:50 +0000)]
#include <epan/prefs.h> not req'd since there are no prefs.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36952
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 29 Apr 2011 14:05:55 +0000 (14:05 +0000)]
Remove two unneeded forward declarations.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36951
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 29 Apr 2011 14:02:55 +0000 (14:02 +0000)]
Reformat long lines in hf[] definition for readability;
Replace hf[] "blurbs" by NULLs since the text of the blurb more or less matches the label text.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36950
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Fri, 29 Apr 2011 07:49:55 +0000 (07:49 +0000)]
configure: remove test for gzclearerr (not used anymore), add test for inflatePrime.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36949
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 29 Apr 2011 06:55:49 +0000 (06:55 +0000)]
Untabify
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36948
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 29 Apr 2011 06:53:29 +0000 (06:53 +0000)]
From Edwin Groothuis via bug 5870:
The supplied patch adds a new option -O, which specifies a list of protocols
(names can be found with the "-G protocols" option) to be fully decoded while
the others only show the layer header.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36947
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 29 Apr 2011 02:16:13 +0000 (02:16 +0000)]
Use proto_tree_add_item() when it saves us from having to retrieve the value
and without causing us to potentially run into bug 3834.
Add a couple hf entries for things that had been added with add_text().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36946
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 29 Apr 2011 01:45:34 +0000 (01:45 +0000)]
If we're in a message return (UDTS or XUDTS), set pinfo->in_error_pkt to help
make it obvious to the user that this is an error message.
Fix up some indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36945
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 29 Apr 2011 01:28:28 +0000 (01:28 +0000)]
Add default color filters for SCTP abort messages and checksum errors.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36944
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 28 Apr 2011 19:59:14 +0000 (19:59 +0000)]
From Pascal Quantin:
the dissection of the UE capabilities when the RAT
type is set to geran-cs (the value part of Classmark 2 starts at the third byte).
Moreover it adds a subtree to enhance the display of Mobile Station Classmark 2 and 3 and MS Radio Access Capability IEs.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5867
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36943
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 28 Apr 2011 19:00:28 +0000 (19:00 +0000)]
Array indices are integers, not Booleans. (The code is the same, given
that TRUE is #defined as 1 and FALSE is #defined as 0, but let's not
depend on that.)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36942
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 28 Apr 2011 18:18:30 +0000 (18:18 +0000)]
Remove an XXX comment;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36941
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 28 Apr 2011 18:01:38 +0000 (18:01 +0000)]
External subdissectors should be called regardless of 'if(tree)'.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36940
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 28 Apr 2011 15:52:32 +0000 (15:52 +0000)]
Add missing $Id$ and "Wireshark ... Copyright ..."
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36939
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 28 Apr 2011 15:18:54 +0000 (15:18 +0000)]
Remove an unneeded forward declaration (fixes compiler error);
Move a global variable to be local to proto_reg-handoff...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36938
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 28 Apr 2011 14:59:31 +0000 (14:59 +0000)]
Add missing "Wireshark .... Copyright ..".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36937
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 28 Apr 2011 14:48:39 +0000 (14:48 +0000)]
Convert what appears to be the use of "4 space tabs" to spaces.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36936
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 28 Apr 2011 14:38:29 +0000 (14:38 +0000)]
#include <stdio.h> not req'd;
Define all internal fcns as static;
fragment_table_init() & reassembled_table_init() need to be
called form a registered_init fcn;
proto_register... and proto_reg_handoff should be at the end of the file as
per Wireshark convention;
proto_reg_handoff .... doesn't need 'if (initialized)...';
proto_register... doesn't need 'if (proto_mux27010 == -1)...'
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36935
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 28 Apr 2011 14:22:18 +0000 (14:22 +0000)]
Minor updates.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36934
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 28 Apr 2011 13:43:23 +0000 (13:43 +0000)]
Add grouped AVP:s
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36933
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 28 Apr 2011 13:14:36 +0000 (13:14 +0000)]
Add SVN Id tag. Don't use deprecated dissector_add().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36932
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 28 Apr 2011 11:53:29 +0000 (11:53 +0000)]
Try to fix:
value_string.c(175) : warning C4244: '=' : conversion from '__int64' to 'gint', possible loss of data
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36931
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 28 Apr 2011 11:15:46 +0000 (11:15 +0000)]
Change value_string_ext->_vs_match to return value_string struct (instead of strptr),
Now index can be easily calculated so remove idx pointer from all match functions.
Just in case change names if someone is using wireshark internals.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36930
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Thu, 28 Apr 2011 08:48:35 +0000 (08:48 +0000)]
Initialize if_device to NULL at start and when g_free.
This fixes a bug introduced in revision 36741.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36929
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Thu, 28 Apr 2011 06:39:56 +0000 (06:39 +0000)]
Removed unused variables and functions.
Terminate strings by setting the first char to 0.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36928
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 28 Apr 2011 05:36:26 +0000 (05:36 +0000)]
From Hans-Christoph Schemmel:
A variant of 3GPP TS 27.010 multiplexing protocol dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5829
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36927
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 28 Apr 2011 05:11:53 +0000 (05:11 +0000)]
Fix warnings:
packet-radiotap.c(240) : error C2220: warning treated as error - no 'object' file generated
packet-radiotap.c(240) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
packet-radiotap.c(310) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
packet-radiotap.c(315) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
packet-radiotap.c(370) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
packet-radiotap.c(380) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36926
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 28 Apr 2011 03:01:54 +0000 (03:01 +0000)]
From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5786 :
This patch registers a dissector table to allow other dissectors to register as
subdissectors for modbus/tcp data.
Additionally it registers the dissector, so it can be invoked by another
dissector by name.
Additionally this version of the patch adds the Data field not as a text field,
but rather as a field which can be selected and tested for by name.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36925
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 28 Apr 2011 02:24:46 +0000 (02:24 +0000)]
After testing for the presence of python-config, fix typo so that we actually
test whether we found it or not.
If the user asked for Python support, error out if we find we can't use it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36924
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 28 Apr 2011 01:53:40 +0000 (01:53 +0000)]
Fix one of the complaints in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5818 :
Create the wspy_dissectors data directory (by installing the one example
dissector). This dissector won't be loaded (its name doesn't match the regexp)
but it forces the presence of the directory (so people will know where to put
their dissectors).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36923
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 28 Apr 2011 01:45:23 +0000 (01:45 +0000)]
Don't dump core if Python was not able to load the dissector registration file
(e.g., due to a syntax error).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36922
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 28 Apr 2011 01:07:43 +0000 (01:07 +0000)]
#include <stdlib.h> not needed;
use consistent indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36921
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 27 Apr 2011 23:20:15 +0000 (23:20 +0000)]
From Juliusz Chroboczek via bug 5812:
This should not trigger with any Babel packets generated by the current
version of babeld, but could potentially do so with a future version
that performs more aggressive compression for IPv4 addresses.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36920
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 27 Apr 2011 23:06:23 +0000 (23:06 +0000)]
Picky, picky....
While we're at it, catch invalid MCS/channel width/GI combinations.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36919
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 27 Apr 2011 22:18:00 +0000 (22:18 +0000)]
From Pascal Quantin:
Enhance the dissection of MM, GMM, SM, EPS EMM and EPS ESM
protocols according to 3GPP 24.008 V9.6.0 and 24.301 V9.6.0.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5866
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36918
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 27 Apr 2011 22:15:42 +0000 (22:15 +0000)]
My version of Python (2.5.2) core dumps if PySequence_Check is called with a
NULL pointer (because no dissectors were registered). Don't call that function
with a NULL pointer.
Also update the output when no dissectors are registered. Not sure if we
should be printing *anything* in this situation, but for now make the output
interesting.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36917
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 27 Apr 2011 21:59:47 +0000 (21:59 +0000)]
Put the rate in for the MCS field, if all the information needed to
calculate the rate is present.
Don't put the rate in for MCS indices in the Rate field - we need not
only the MCS index but the bandwidth (20 MHz vs. 40 MHz) and the length
of the guard interval. Note in a comment that those other items *might*
be available from some other radiotap fields.
Expand a comment on the hack to try to figure out whether a Rate field
with the 0x80 bit set is a FreeBSD MCS index or a high data rate.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36916
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 27 Apr 2011 21:26:38 +0000 (21:26 +0000)]
Fix part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4878 :
Put our one python example in the source distribution.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36915
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 19:40:20 +0000 (19:40 +0000)]
Comment out some unused code;
Use #if 0/#endif to comment out some code instead of using /* */;
Use consistent indentation & do some whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36914
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 19:24:32 +0000 (19:24 +0000)]
Remove unneeded #include <stdlib.h>;
Use consistent indentation;
Add editor modelines;
Use #if 0/#endif to comment out code instead of /* */.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36913
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 18:13:31 +0000 (18:13 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36912
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 18:09:39 +0000 (18:09 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36911
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 17:58:22 +0000 (17:58 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36910
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 17:39:25 +0000 (17:39 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
Do some (minor) indentation cleanup..
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36909
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 17:30:39 +0000 (17:30 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
Do some (minor) whitespace cleanup and re-formatting.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36908
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 17:22:20 +0000 (17:22 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
#include <string.h> not req'd.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36907
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 17:15:57 +0000 (17:15 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
#include <stdlib.h> not req'd;
Do some whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36906
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 17:06:54 +0000 (17:06 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
#include <stdlib.h> not req'd.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36905
f5534014-38df-0310-8fa8-
9805f1628bb7