Commit graph

12051 commits

Author SHA1 Message Date
Guy Harris
0f41b64142 The routines declared in packet-smb.h are defined in packet-smb.c;
include packet-smb.h in packet-smb.c so that we check the declarations
against the definitions.

In query ops, info level 2 is Query EA Size, not Query EAs From List. 
In set ops, info level 2 is Set EAs, not Query EA Size.

Expand the constants for the Trans2 subcodes to 16 bits.

The tvb argument to dissect_find_file_unix_info2() is used.

svn path=/trunk/; revision=37286
2011-05-19 09:47:03 +00:00
Bill Meier
d07dcf9256 For old times' sake: Fix bad dissection of Ethernet Router Hello Messages: Coverity 876 & 877 [UNUSED]
svn path=/trunk/; revision=37275
2011-05-19 01:42:49 +00:00
Martin Mathieson
002b0e16ed Improve AM sequence analysis, check ACK looks sensible compared with latest SN received in opposite direction.
svn path=/trunk/; revision=37272
2011-05-19 01:05:26 +00:00
Martin Mathieson
bfb7f0cf94 Set subheader root length to 1, so if contentsinvalid will already be correctl length.
svn path=/trunk/; revision=37271
2011-05-19 01:03:56 +00:00
Bill Meier
9a8d5de2b5 Don't create 2 unneeded subtrees; Fixes Coverity 879 & 880 [UNUSED];
#include <stdio.h> & <time.h> not needed.

svn path=/trunk/; revision=37269
2011-05-18 23:24:50 +00:00
Bill Meier
248e49432b Don't assign to an unused 'proto_item *': Fixes Coverity 883 [UNUSED];
Use correct 'tree' arg in a dissect(...) fcn call: Fixes Coverity 884 [UNUSED];
#include <stdlib.h> not req'd.

svn path=/trunk/; revision=37268
2011-05-18 23:09:18 +00:00
Bill Meier
8b796faaf0 Create 2 subtrees using the correct 'proto_item *'; Fixes Coverity 900 & 901 [UNUSED];
#inclide <stdlib.h> not req'd.

svn path=/trunk/; revision=37267
2011-05-18 23:01:05 +00:00
Bill Meier
637303e6c4 #include <stdlib.h> not req'd;
Reformat hf[] definition;
Misc whitespace cleanup;

svn path=/trunk/; revision=37266
2011-05-18 22:49:33 +00:00
Bill Meier
ff3c5ed4da Add a missing creation of a subtree: Fixes Coverity 907 [UNUSED];
Don't create an unused subtree: Fixes Coverity 908 [UNUSED];

svn path=/trunk/; revision=37265
2011-05-18 22:01:29 +00:00
Bill Meier
11af835982 (Trivial) Fix a typo; Add spme punctuation in a coment.
svn path=/trunk/; revision=37263
2011-05-18 21:20:22 +00:00
Jeff Morriss
278caa12d9 Fix some (value) mistakes in value_strings. Found by Martin's patch on the -dev list.
svn path=/trunk/; revision=37262
2011-05-18 21:07:59 +00:00
Jeff Morriss
6de964fe57 Fix a couple (value) mistakes in a value_string, taking the values from the IDL
file.  Found by Martin's patch on the -dev list.

Add a comment to answer the question of whether this file is autogenerated by
pointing to the IDL file.

svn path=/trunk/; revision=37261
2011-05-18 20:56:03 +00:00
Jeff Morriss
d78afa8723 Fix a (value) mistake in a value_string. Found by Martin's patch on the -dev list.
svn path=/trunk/; revision=37260
2011-05-18 20:26:55 +00:00
Jeff Morriss
80c1ef3811 Fix a couple (value) mistakes in value_strings. Found by Martin's patch on the -dev list.
svn path=/trunk/; revision=37259
2011-05-18 20:06:17 +00:00
Jeff Morriss
4380cad67d Finish removing tabs and fix up some indentation.
Add a break after decoding CSData Codec Type.

svn path=/trunk/; revision=37247
2011-05-18 17:31:48 +00:00
Bill Meier
82ffa86cd3 Mark a function arg as _U_
svn path=/trunk/; revision=37246
2011-05-18 17:19:42 +00:00
Bill Meier
b9a1e3fb2a Do PROTO_ITEM_SET_GENERATED for two 'proto_item *': Fixes Coverity 914 & 915 [UNUSED]
svn path=/trunk/; revision=37245
2011-05-18 17:17:08 +00:00
Jeff Morriss
7b3bd3e8a9 Add a default (else) case in the default case for cause values to avoid passing
a NULL string pointer to format routines.

While we're there, update the cause list from 48.008 v10.1.0.

svn path=/trunk/; revision=37244
2011-05-18 17:09:55 +00:00
Bill Meier
5a243ce86f Don't assign to an unused 'proto_item *': Coverity 939 [UNUSED];
Don't create a subtree which is never used: Coverity 940 [UNUSED].

svn path=/trunk/; revision=37243
2011-05-18 16:52:45 +00:00
Bill Meier
6725cd673c Use subtree rather than parent tree to add items; Fixes Coverity 973 & 974;
#include <stdlib.h> not needed;
Minor whitespace cleanup.

svn path=/trunk/; revision=37242
2011-05-18 16:19:15 +00:00
Chris Maynard
50af6e0ab2 Per destination flags is a 1-byte field. Grab it with tvb_get_guint8(), not
with tvb_get_letohs().  (Bug surfaced while trying out MESH_OVERRIDES.)

svn path=/trunk/; revision=37241
2011-05-18 15:56:46 +00:00
Alexis La Goutte
416ed742d5 From discussion in dev mailing ( http://www.wireshark.org/lists/wireshark-dev/201105/msg00235.html )
* Fix a duplicate value_string in cp_version table
* Fix a typo error (Cersion => Version)
Also fix some whitespaces/4tab-spaces (Need more work...)



svn path=/trunk/; revision=37240
2011-05-18 15:34:34 +00:00
Bill Meier
93f7ac2c39 Convert tabs to "4 spaces" since it appears that tabs are "4 space tabs";
svn path=/trunk/; revision=37234
2011-05-18 01:37:06 +00:00
Bill Meier
ae5eed6937 Remove code to generate an unuse sub-tree: Coverity: 976;
Don't assign to an unused variable: Coverity 977;
#include <stdlib.h> & <string.h> not req'd.

svn path=/trunk/; revision=37233
2011-05-18 01:29:25 +00:00
Bill Meier
e357bbd68c Don't assign to unused proto_item * variables: Coverity 1015 & 1016.
svn path=/trunk/; revision=37232
2011-05-18 00:59:24 +00:00
Bill Meier
c628346c1f Remove altogether code '#if 0'd in SVN #37229.
Further research shows that registering the dissector
to "tcp.port" and "udp.port" was explicitly removed in SVN #34969
and thus the code to create tcp and udp handles and the associated
dissect_reload_tcp() and dissect_reload_udp() code is no longer
needed.

svn path=/trunk/; revision=37231
2011-05-18 00:37:35 +00:00
Bill Meier
c46c260191 #if 0 some unused code & vars: Coverity 1018 & 1019;
Add a comment the unused code.

svn path=/trunk/; revision=37229
2011-05-18 00:07:32 +00:00
Guy Harris
ff389e5a18 Squelch a narrowing warning.
svn path=/trunk/; revision=37228
2011-05-17 23:39:06 +00:00
Bill Meier
094e38ff21 Add items to subtree rather than tree: Coverity 1026;
Don't assign to an unused variable: Coverity 1027;
#include <stdlib.h> not req'd.

svn path=/trunk/; revision=37225
2011-05-17 23:36:12 +00:00
Jeff Morriss
747a964aef Always add the parameter length field to the tree; only make it visible
if the preference is set.

Add %d to the "not found" string in val_to_str() calls.

Upgrade the "ITU address format seen in ANSI" expert info from NOTE to WARN.

svn path=/trunk/; revision=37218
2011-05-17 22:21:25 +00:00
Jeff Morriss
82a8d6b153 Add a filterable item for the length of the GT digits in a subtree under the
digits.

Since we now have a subtree from which to hang things, make the generic (called
or calling) digits fields visible under this new subtree (one less hidden item).

Don't use add_string_format() to add the GT digits, let epan format it for us.
Use more descriptive field descriptions for these entries.

svn path=/trunk/; revision=37214
2011-05-17 21:59:58 +00:00
Guy Harris
092b0120ae Don't leave the truncation flag unset in any of the info level
dissectors.

svn path=/trunk/; revision=37209
2011-05-17 20:04:22 +00:00
Jeff Morriss
cdedb31e94 As suggested by Chris: use val_to_str_const() instead of match_strval() plus a
NULL-return check.

Use val_to_str_const instead of val_to_str() in a couple places where the string
is constant.

Use val_to_str() instead of blindly passing the return value from match_strval()
into a format routine (to ensure a non-NULL string pointer).  A couple of these
were cases where it could not actually return NULL, but I changed it for
consistency.

Store the return value of match_strval() rather than calling it repeatedly.

svn path=/trunk/; revision=37204
2011-05-17 18:58:40 +00:00
Jeff Morriss
c204df4719 Use val_to_str() instead of blindly passing the return value from match_strval()
into a format routine (to ensure a non-NULL string pointer).

svn path=/trunk/; revision=37203
2011-05-17 18:53:35 +00:00
Jeff Morriss
ec460c3e99 As suggested by Chris: use val_to_str_const() instead of match_strval() plus a
NULL-return check.

Use val_to_str_const instead of val_to_str() in a couple places where the string
is constant.

Use val_to_str() instead of blindly passing the return value from match_strval()
into a format routine (to ensure a non-NULL string pointer).

svn path=/trunk/; revision=37202
2011-05-17 17:40:26 +00:00
Jeff Morriss
7a93fdab12 Avoid passing a NULL string pointer to format routines: some libc's (e.g.,
Solaris') will seg-fault on that.

svn path=/trunk/; revision=37201
2011-05-17 16:07:24 +00:00
Chris Maynard
568fdf18a7 All ELEM_MAND_* macros ensure curr_len > 0; no need to check again afterwards.
Resolves Coverity CIDs 381-382.

svn path=/trunk/; revision=37200
2011-05-17 14:41:01 +00:00
Anders Broman
5a0acb469e Use the correct value string and bitmasks.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5928

svn path=/trunk/; revision=37199
2011-05-17 08:23:30 +00:00
Guy Harris
96e2a4ffea According to MS-NLMP, the "version" field in the NTLMSSP blobs is
present only if the NTLMSSP_NEGOTIATE_VERSION flag is set in the flags
field, and that appears to be true in at least one capture I've seen.

svn path=/trunk/; revision=37197
2011-05-17 02:29:43 +00:00
Guy Harris
0f1503ef8a Fix cut-and-pasteo.
svn path=/trunk/; revision=37196
2011-05-17 01:38:28 +00:00
Bill Meier
bf271ce2d0 From beth.tridium [At] gmail.com: 6LoWPAN dissector selects wrong byte for HC_UDP Encoding subtree
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5926

svn path=/trunk/; revision=37194
2011-05-16 23:15:08 +00:00
Guy Harris
9927d1ff31 Give the UNIX-extension routines used for info levels that appear both
in set and get names beginning with dissect_qspi_.

svn path=/trunk/; revision=37192
2011-05-16 22:55:22 +00:00
Chris Maynard
332d669f74 Fix endian issues, especially w/endian arg to proto_tree_add_item().
Should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5464.

svn path=/trunk/; revision=37188
2011-05-16 20:02:14 +00:00
Guy Harris
88fe523c48 Fix some comments.
Get rid of null-pointer tests for t2i in the "not null" branch of an
earlier test whether it's null, as those tests are redundant.

Use a switch statement to check the subcommand for Trans2.

If t2i->info_level is -1, it means we don't know the info level, for
whatever reason (e.g., the request was cut short by the snapshot length
before the info level).  Report it as such.

svn path=/trunk/; revision=37183
2011-05-16 18:32:35 +00:00
Jeff Morriss
e96cd69468 Avoid passing a NULL string pointer to format routines: some libc's (e.g.,
Solaris') will seg-fault on that.

svn path=/trunk/; revision=37181
2011-05-16 17:02:22 +00:00
Anders Broman
313dbdb114 Remove extra ;
svn path=/trunk/; revision=37177
2011-05-16 14:42:34 +00:00
Alexis La Goutte
d4a80250c0 Add EUI64 display type for Source/Target Link-layer Address (RFC4861)
svn path=/trunk/; revision=37165
2011-05-15 18:48:39 +00:00
Alexis La Goutte
d05788974e From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5921
Fix for RPL DAO-ACK Processing when DODAG ID present

Reported and fixed by Jakob Ruhe

svn path=/trunk/; revision=37162
2011-05-15 17:47:56 +00:00
Martin Mathieson
6c57efee2a Add missing trailing 0 to an hf mask value.
svn path=/trunk/; revision=37160
2011-05-15 16:52:05 +00:00
Jeff Morriss
4a6e62ff5c Rebuild the X11 dissector with the latest versions of xcbproto and mesa.
svn path=/trunk/; revision=37145
2011-05-14 18:39:16 +00:00
Chris Maynard
01d1a4c99c From Tyson Key via bug 5922: Add another AT magic array.
(I changed the array names to be more generic.)

svn path=/trunk/; revision=37144
2011-05-14 14:57:58 +00:00
Jeff Morriss
a8b851ceab From Sven Eckelmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5658 :
Add support for v12 fragmented unicast.

svn path=/trunk/; revision=37143
2011-05-14 14:31:51 +00:00
Jeff Morriss
393f2467e4 From Sven Eckelmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5658 :
Read unchanged packets of v12 as v10 packets
Read unchanged packets of v13 as v11 packets
Use version in packet type definitions

svn path=/trunk/; revision=37142
2011-05-14 14:05:30 +00:00
Guy Harris
2a1e380545 Remove the qpi_ from info level dissectors used for set info calls as
well.

svn path=/trunk/; revision=37139
2011-05-14 02:52:04 +00:00
Guy Harris
03cd4f2cfd For Find File Unix and Unix Info2, spell it "Unix", to match Query File
and Set File.

Add Query and Set File Unix Info2; use common code to dissect the Unix
Info2 structure.  Use common code for Unix Basic, while we're at it.

svn path=/trunk/; revision=37138
2011-05-14 01:28:49 +00:00
Guy Harris
587f850bfd Make the tree items for strings look a little less ugly.
Note that the string value should be put into the protocol tree.

svn path=/trunk/; revision=37137
2011-05-14 00:50:22 +00:00
Bill Meier
acd01c89d9 Fix a compiler warning
svn path=/trunk/; revision=37136
2011-05-13 22:10:42 +00:00
Bill Meier
4f7a9174fe Fix Bug 5920: "DNP3 dissector incorrect constants AL_OBJ_FCTR_16NF _FDCTR_32NF _FDCTR_16NF"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5920

svn path=/trunk/; revision=37135
2011-05-13 22:01:22 +00:00
Bill Meier
716132e53a Fix Bug 5919: "IE 89 Forwarding Status - Incorrect Decoding"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5919

svn path=/trunk/; revision=37133
2011-05-13 21:47:09 +00:00
Chris Maynard
dac93d45dd Delete 2 assignments to 'i' as neither were used. Fixes Coverity CID 875.
svn path=/trunk/; revision=37132
2011-05-13 19:29:15 +00:00
Chris Maynard
0ea2cd66e7 Delete assignment of item as it's not used. Fixes Coverity CID 869.
svn path=/trunk/; revision=37131
2011-05-13 19:15:21 +00:00
Chris Maynard
dece07c8f3 Eliminate deadcode. Fixes Coverity CID 415.
svn path=/trunk/; revision=37127
2011-05-13 17:05:05 +00:00
Stig Bjørlykke
a7c5d642d5 Regenerate ASN.1 dissectors to update the #line directive.
svn path=/trunk/; revision=37118
2011-05-13 08:12:27 +00:00
Jeff Morriss
8058ba646a From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5863 :
1. Reload framing protocol no longer encapsulates the Reload message, instead
the latter is in its own tree following Reload framing, much like IP, UDP, etc.

2. Similarly, DTLS no longer encapsulates its data payload if the payload can
be dissected. The recognized payload is in its own tree following the DTLS,
much like IP, UDP, etc.

4. DTLS now has its own heuristic table for dissecting its payload, and
reload-framing is added to this DTLS heuristic table.

6. DTLS will try to dissect its payload if the agreed upon cipher is
RSA-NULL-MD5 (0x0001) or RSA-NULL-SHA (0x0002), even when DTLS is not
configured with the client/server private keys.


Still to do: make DTLS a heuristic dissector on top of UDP (item 3 in the bug).

svn path=/trunk/; revision=37110
2011-05-13 02:48:08 +00:00
Jeff Morriss
cf485a2ea1 From Johannes Jochen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5900 :
I have created a dissector for the Multiple MAC Registration Protocol based on
the exiting dissector of the Multiple Stream Reservation Protocol (bugzilla id:
4757 ) You can found the documentation of the Protocol here:
http://standards.ieee.org/getieee802/download/802.1ak-2007.pdf It's also
includes the corrections of the protocol you will found here:
http://standards.ieee.org/getieee802/download/802.1Q-2005_Cor1-2008.pdf

svn path=/trunk/; revision=37104
2011-05-12 21:37:55 +00:00
Jeff Morriss
4a90e977e0 From Richard Brodie via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5800 :
Fix compilation if we HAVE_LIBGNUTLS but we do not HAVE_LIBGCRYPT.  (The
former can be built using libnettle instead of the latter.)

svn path=/trunk/; revision=37102
2011-05-12 20:51:53 +00:00
Chris Maynard
8e99ec73a2 From Yaniv Kaul via bug 5858: Fix some "set but not used" warnings. I
committed a variation of his patch that deleted unused variables rather than
#if 0'ing them out, and I also kept dissect_dnp3_al()'s return values, even if
it's not currently being checked, just in case the commented code is ever
uncommented and the return value ends up being checked later on.  Lastly, I
also added what appeared to be some missing DNP3_AL_UNS's.

svn path=/trunk/; revision=37100
2011-05-12 20:32:28 +00:00
Chris Maynard
9dacc3d6a1 Use rcode instead of repeated uses of "flags & F_RCODE". One change submitted
from Yaniv Kaul via bug 5858; the other 2 from me.

svn path=/trunk/; revision=37097
2011-05-12 19:24:55 +00:00
Chris Maynard
29ec75d29e Add snai, mpf and efi to bf_tree, not tree. Fixes Coverity CID 1045.
svn path=/trunk/; revision=37090
2011-05-12 17:26:54 +00:00
Chris Maynard
dbc48efbe8 Wrap assoc_tree within #if 0 ... #endif. Fixes Coverity CID 1049.
svn path=/trunk/; revision=37089
2011-05-12 17:25:43 +00:00
Chris Maynard
a847fd391f Add token to query_tree instead of to tree. Fixes Coverity CID 1057.
svn path=/trunk/; revision=37088
2011-05-12 17:23:38 +00:00
Chris Maynard
ea41f9a9d9 Delete eth_addr; it was assigned a value but never used. Fixes Coverity 1070.
svn path=/trunk/; revision=37087
2011-05-12 17:21:49 +00:00
Chris Maynard
1f1789fa41 Use nonce_2_item instead of incorrect nonce_1_item. Fixes Coverity CID 1071.
svn path=/trunk/; revision=37086
2011-05-12 17:19:10 +00:00
Chris Maynard
a01a527166 Delete acm as it is assigned but never used. Fixes Coverity 1072.
svn path=/trunk/; revision=37085
2011-05-12 17:16:45 +00:00
Chris Maynard
21363344ec Add text to fac_subtree instead of fac_tree. Fixes Coverity CID 1129.
svn path=/trunk/; revision=37083
2011-05-12 17:14:36 +00:00
Anders Broman
d9c5fa2537 Remove check_col, use ENC_BIG_ENDIAN.
svn path=/trunk/; revision=37080
2011-05-12 15:48:51 +00:00
Stig Bjørlykke
624a041e6f Indicate Signed Receipt in info column.
svn path=/trunk/; revision=37074
2011-05-12 11:06:42 +00:00
Stig Bjørlykke
516442af8f Prefix "fragments" with IPv6, as is done with IPv4.
svn path=/trunk/; revision=37071
2011-05-12 10:27:30 +00:00
Stig Bjørlykke
1becef31f0 Use IPv4 as protocol name, to align with IPv6.
svn path=/trunk/; revision=37070
2011-05-12 10:27:02 +00:00
Jeff Morriss
009156289f Fix the test.sh failures based on Guy's suggestion in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5445#c15 :
Add a new tap flag to indicate that a tap listener is just a "dissector helper",
that is, a tap which is used by a dissector to help it do its dissection but
does not, itself, require dissection.

Use this new flag in the dissectors which register taps.

Remove the (now-unused) have_tap_listeners() function.

svn path=/trunk/; revision=37069
2011-05-12 03:18:34 +00:00
Chris Maynard
d264cd5658 When performing heuristics, use tvb_length() instead of tvb_reported_length().
svn path=/trunk/; revision=37067
2011-05-11 20:40:14 +00:00
Gerald Combs
16938e6470 Remove some unused variable assignments. Fixes Coverity CID 1202.
svn path=/trunk/; revision=37065
2011-05-11 20:35:57 +00:00
Bill Meier
6d6da5af53 #include <string.h> not req'd;
Move proto_reg_handoff...() to the end of the file as per the usual convention.

svn path=/trunk/; revision=37063
2011-05-11 13:36:17 +00:00
Martin Mathieson
9a4b6db704 Support multiple Scheduling Requests in one PDU.
svn path=/trunk/; revision=37060
2011-05-11 11:10:30 +00:00
Jeff Morriss
02835bc4c5 From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5863 :
5. A guaranteed null pointer access violation is fixed in packet-ssl-utils.c
when DTLS succeeded in dissecting its payload.

svn path=/trunk/; revision=37058
2011-05-11 02:06:22 +00:00
Jeff Morriss
1c515d2af2 Use consistent casing in hf_ descriptions and expert infos.
svn path=/trunk/; revision=37057
2011-05-11 01:39:10 +00:00
Jeff Morriss
eb0bbf105a From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5893 :
- Put back the hf_ variables removed from the last patch

- Change the verbose protocol name to the (now) official spelling "VLAN
Trunking Protocol" instead of "Virtual Trunk Protocol"

- Made the "Info" column more informative by placing the message type and
selected key information into it, instead of just the verbose protocol name

- Corrected an error in the handling of the Advert-Request message where the
Management Domain Name field was not parsed properly, resulting in wrong
parsing of the remainder of the entire Advert-Request message


svn path=/trunk/; revision=37056
2011-05-11 01:11:50 +00:00
Jeff Morriss
9d03ce44f4 Eliminate redundant blurbs
svn path=/trunk/; revision=37055
2011-05-11 01:06:37 +00:00
Chris Maynard
025f9ee4db From Olivier Crete via bug 5761: Compute the FCI size correctly for RTCP RTPFB.
svn path=/trunk/; revision=37052
2011-05-10 18:52:37 +00:00
Bill Meier
7050847bc9 Add missing line of code: Fixes Coverity 1042 (UNUSED);
Remove unneeded lines of code: Coverity 1043 (UNUSED).

svn path=/trunk/; revision=37051
2011-05-10 18:43:40 +00:00
Bill Meier
adfbe89aaa Remove some unneeded lines of code: Coverity 1063;
Also: remonve someunneeded #includes.

svn path=/trunk/; revision=37050
2011-05-10 17:44:36 +00:00
Chris Maynard
e5adfc8e18 Add support for USB CDC Ethernet. Resolves bug 4819.
svn path=/trunk/; revision=37049
2011-05-10 17:40:29 +00:00
Bill Meier
4edfe4961f Don't assign to unused variable: Coverity 1068 & 1069.
Remove some related no longer needed code and variables;
Also: Fix a typo and reword a comment.

svn path=/trunk/; revision=37048
2011-05-10 17:28:46 +00:00
Michael Tüxen
6898a1f0ad Remove unused variable to avoid a warning which breaks the build.
svn path=/trunk/; revision=37047
2011-05-10 17:25:45 +00:00
Chris Maynard
79940000f2 Add subversion Id and Wireshark copyright.
svn path=/trunk/; revision=37046
2011-05-10 17:06:20 +00:00
Chris Maynard
df79077cdd Add USB/AT dissector, submitted by Tyson Key via bug 5868 with some
modifications by me as described/documented in the bug report.

svn path=/trunk/; revision=37045
2011-05-10 17:04:05 +00:00
Gerald Combs
a79777beaf Make sure we set a variable.
svn path=/trunk/; revision=37044
2011-05-10 16:05:14 +00:00
Chris Maynard
71643693c4 Fix two cases of dead code reported by Coverity as CID 376.
svn path=/trunk/; revision=37043
2011-05-10 16:02:54 +00:00
Chris Maynard
24644ea58a Fix two cases of comparisons begin made against incorrect values following a
mask operation.  Also, initialize g_rohc_info if pinfo->packet_data is !NULL.
Fixes Coverity ID's 1187, 1188 and 1190.

svn path=/trunk/; revision=37042
2011-05-10 15:37:06 +00:00
Anders Broman
d88c7ff3f9 On behalf of Ericsson update the A11 dissector.
svn path=/trunk/; revision=37041
2011-05-10 15:20:09 +00:00
Chris Maynard
261875b924 Allow both PPP and ISO/IEC 13818-1 over USB to be dissected using heuristics.
Resolves bug 4814.

svn path=/trunk/; revision=37039
2011-05-10 14:22:17 +00:00
Anders Broman
d33f1c24cc From Sijin N K:
Missing hf declaration for cn_id.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5901

svn path=/trunk/; revision=37038
2011-05-10 07:58:33 +00:00
Guy Harris
37adc5c880 Support SMB_FIND_FILE_UNIX_INFO2.
Don't use "link destination" for file names in SMB_FIND_FILE_UNIX.

Link to the page for Microsoft's public protocol specifications and to
the Samba Wiki page for the UNIX extensions.

Fix a typo in a variable name.

svn path=/trunk/; revision=37023
2011-05-09 02:55:31 +00:00
Guy Harris
f5b20ecc33 Count padding bytes against the transaction data byte count.
svn path=/trunk/; revision=37022
2011-05-09 02:42:58 +00:00
Guy Harris
7d6d129231 There is no guarantee that, just because there's a UAT item for a given
LINKTYPE_USERn encapsulation with a protocol name - even if the protocol
name was valid at the time the entry was made, it might not be valid now
(e.g., if you no longer have a plugin), *and* the protocol lookup done
in the UI is case-insensitive but the lookup done later is
case-sensitive (this needs to be cleaned up somehow).

For now, just handle the case where encap->payload_proto is NULL.

svn path=/trunk/; revision=37020
2011-05-08 20:22:18 +00:00
Alexis La Goutte
7d317e553b Add FT_EUI64 Field Type
* Remove proto_tree_add_eui64 function from 802.15.4 Dissector 
* Replace print_eui64/print_eui64 by eui64_to_str/get_eui64_name
* Update Documentation (README.dev)
* Add new function in libwireshark.def
* Support of encoding for tvb_eui64_to_str
* Use FT_EUI64 for ICMPv6, CAPWAP, Zbee ... dissector

svn path=/trunk/; revision=37015
2011-05-08 10:23:53 +00:00
Jaap Keuter
8428b08b1a From Jens Osterkamp:
The following patch adds some code to decode the EVB TLV being standardized in
the upcoming IEEE 802.1Qbg draft 0.

svn path=/trunk/; revision=37014
2011-05-07 14:50:36 +00:00
Jakub Zawadzki
fa82fe17a9 Move fpinf dereference after NULL check.
svn path=/trunk/; revision=37012
2011-05-06 20:45:34 +00:00
Anders Broman
2ad1c8df66 VALS(& -> VALS(
svn path=/trunk/; revision=37009
2011-05-06 12:28:11 +00:00
Jeff Morriss
bb9f347294 Prefix the message class names with RELOAD_ to prevent collisions.
svn path=/trunk/; revision=37006
2011-05-06 01:54:07 +00:00
Jeff Morriss
a80a391b0e 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.

svn path=/trunk/; revision=37005
2011-05-06 01:47:16 +00:00
Jeff Morriss
0b1629a058 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.

svn path=/trunk/; revision=37004
2011-05-06 01:27:54 +00:00
Jeff Morriss
c666536162 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.

svn path=/trunk/; revision=37003
2011-05-06 01:09:04 +00:00
Chris Maynard
df3cd034b8 Fix decoding of CP56Time2a timestamp. Resolves bug 5889.
svn path=/trunk/; revision=36997
2011-05-05 14:20:22 +00:00
Jakub Zawadzki
ed59c450f4 Cleanup: replace se_alloc+memcpy combo with single se_memdup().
svn path=/trunk/; revision=36996
2011-05-05 06:55:12 +00:00
Bill Meier
1d00bb4da1 packet-xtp.h used only in packet-xtp.c; Move packet-xtp.h contents to packet-xtp.c
svn path=/trunk/; revision=36994
2011-05-05 01:08:17 +00:00
Bill Meier
9a6bd42cf4 Don't assign to unused variable: Coverity 1132 [UNUSED].
svn path=/trunk/; revision=36993
2011-05-05 00:48:54 +00:00
Jakub Zawadzki
d621e6acbe Cleanup: g_malloc can't return NULL, remove checks for them.
XXX, should this code use g_try_malloc instead?

svn path=/trunk/; revision=36988
2011-05-04 21:19:04 +00:00
Stephen Fisher
669162b440 From Nick Glass via bug #5887: DACP (apple remote) enhancement to DAAP
dissector.

Me: Add Nick to AUTHORS file. 


svn path=/trunk/; revision=36987
2011-05-04 19:42:51 +00:00
Jakub Zawadzki
38c2f2a151 Cleanup: replace sizeof(arr)/sizeof(arr[0]) with shorter array_length(arr)
svn path=/trunk/; revision=36986
2011-05-04 19:32:35 +00:00
Anders Broman
16c0bcbdee 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.

svn path=/trunk/; revision=36984
2011-05-04 17:24:48 +00:00
Guy Harris
59dc3f3141 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.

svn path=/trunk/; revision=36973
2011-05-03 08:22:25 +00:00
Stephen Fisher
5c5e9a377a From Peter Paluch via bug #5877: EIGRP dissector enhancement for RS/EOT
flags

Me: Add Peter to AUTHORS file.


svn path=/trunk/; revision=36965
2011-05-02 16:40:19 +00:00
Jeff Morriss
60cefeae89 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.

svn path=/trunk/; revision=36964
2011-05-02 14:27:48 +00:00
Stig Bjørlykke
c92938bbc0 Support content-type x-gzip and x-deflate, as described in RFC2616 as
equivalent to gzip and deflate.

This fixes bug 5882.

svn path=/trunk/; revision=36963
2011-05-02 14:06:33 +00:00
Gerald Combs
b97275395f Check our PDU length. Fixes the infinite loop found in bug 5876.
svn path=/trunk/; revision=36958
2011-04-30 17:43:05 +00:00
Bill Meier
5505ef78ee Add "Wireshark ... Copyright ...".
svn path=/trunk/; revision=36953
2011-04-29 14:56:40 +00:00
Bill Meier
23dbbb64e0 #include <epan/prefs.h> not req'd since there are no prefs.
svn path=/trunk/; revision=36952
2011-04-29 14:50:13 +00:00
Bill Meier
b8455a821b Remove two unneeded forward declarations.
svn path=/trunk/; revision=36951
2011-04-29 14:05:55 +00:00
Bill Meier
5776679ddd 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.

svn path=/trunk/; revision=36950
2011-04-29 14:02:55 +00:00
Jeff Morriss
664c69dbaa 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().

svn path=/trunk/; revision=36946
2011-04-29 02:16:13 +00:00
Jeff Morriss
6b13963a63 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.

svn path=/trunk/; revision=36945
2011-04-29 01:45:34 +00:00
Anders Broman
e0c80c4138 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

svn path=/trunk/; revision=36943
2011-04-28 19:59:14 +00:00
Guy Harris
94afa45fbf 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.)

svn path=/trunk/; revision=36942
2011-04-28 19:00:28 +00:00
Bill Meier
597f4b28bb Remove an XXX comment;
svn path=/trunk/; revision=36941
2011-04-28 18:18:30 +00:00
Bill Meier
c22cde8de5 External subdissectors should be called regardless of 'if(tree)'.
svn path=/trunk/; revision=36940
2011-04-28 18:01:38 +00:00
Bill Meier
3fe0a82016 Remove an unneeded forward declaration (fixes compiler error);
Move a global variable to be local to proto_reg-handoff...

svn path=/trunk/; revision=36938
2011-04-28 15:18:54 +00:00
Bill Meier
18e5081475 Add missing "Wireshark .... Copyright ..".
svn path=/trunk/; revision=36937
2011-04-28 14:59:31 +00:00
Bill Meier
a1b99c7218 Convert what appears to be the use of "4 space tabs" to spaces.
svn path=/trunk/; revision=36936
2011-04-28 14:48:39 +00:00
Bill Meier
8f0f8a5435 #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)...'

svn path=/trunk/; revision=36935
2011-04-28 14:38:29 +00:00
Jeff Morriss
e84589d205 Add SVN Id tag. Don't use deprecated dissector_add().
svn path=/trunk/; revision=36932
2011-04-28 13:14:36 +00:00
Stig Bjørlykke
42f8e1fa5a Removed unused variables and functions.
Terminate strings by setting the first char to 0.

svn path=/trunk/; revision=36928
2011-04-28 06:39:56 +00:00
Anders Broman
a663d91ca6 From Hans-Christoph Schemmel:
A variant of 3GPP TS 27.010 multiplexing protocol dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5829

svn path=/trunk/; revision=36927
2011-04-28 05:36:26 +00:00
Anders Broman
c752fb8b87 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'

svn path=/trunk/; revision=36926
2011-04-28 05:11:53 +00:00
Jeff Morriss
1722bec6e7 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.

svn path=/trunk/; revision=36925
2011-04-28 03:01:54 +00:00
Gerald Combs
3af2a4c81f 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.

svn path=/trunk/; revision=36920
2011-04-27 23:20:15 +00:00
Guy Harris
d7b8350c7c Picky, picky....
While we're at it, catch invalid MCS/channel width/GI combinations.

svn path=/trunk/; revision=36919
2011-04-27 23:06:23 +00:00
Anders Broman
7dce5861cc 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

svn path=/trunk/; revision=36918
2011-04-27 22:18:00 +00:00
Guy Harris
49b410ffbe 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.

svn path=/trunk/; revision=36916
2011-04-27 21:59:47 +00:00
Bill Meier
89f055b5fd Comment out some unused code;
Use #if 0/#endif to comment out some code instead of using /* */;
Use consistent indentation & do some whitespace cleanup.

svn path=/trunk/; revision=36914
2011-04-27 19:40:20 +00:00