ed1bfad981
From Pascal Quantin:
...
Update 3GPP NAS MS Radio Access Capability dissection to Release 9.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5970
From me change all enc type to ENC_BIG_ENDIAN.
svn path=/trunk/; revision=37451
2011-05-29 06:06:22 +00:00
ba086053c7
Add "File -> Export -> SSL Session Keys..." to be able to save the keyring info for each session in the trace file. This makes it possible to give someone the trace and the exported keys so that they can decrypt the traffic in the trace, but not new sessions to the same server.
...
(See also: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3444 )
svn path=/trunk/; revision=37446
2011-05-28 18:17:50 +00:00
521b65f257
From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5959
...
Use _U_ for unused function parameter.
svn path=/trunk/; revision=37442
2011-05-27 18:18:28 +00:00
0a3319cbc6
Use a non-volatile temporary variable as a parameter to DISSECTOR_ASSERT().
...
This avoids an "assert with side effects" warning and resolves Coverity CID322.
svn path=/trunk/; revision=37441
2011-05-27 18:08:46 +00:00
e3dff872d0
Put proto_reg_handoff_...() at the end of the file as per the usual Wireshark convention.
...
svn path=/trunk/; revision=37440
2011-05-27 15:51:21 +00:00
955008c4b0
When parsing OPTION_REMOTE_ID, don't modify optlen or we'll return the wrong
...
number of bytes consumed.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5962
svn path=/trunk/; revision=37439
2011-05-27 14:38:42 +00:00
8ad97b46ca
Fix a gcc 4.6 error: "variable might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]"
...
svn path=/trunk/; revision=37438
2011-05-27 13:23:54 +00:00
0b154761fa
One more still dirty.
...
svn path=/trunk/; revision=37436
2011-05-27 12:46:35 +00:00
8a8ff7f03d
Moved nbap and pcap back as dirty dissectors.
...
svn path=/trunk/; revision=37434
2011-05-27 11:58:47 +00:00
51864807b3
Corrected "old-style function definition".
...
svn path=/trunk/; revision=37433
2011-05-27 11:03:04 +00:00
21432aa5b0
Try building some ASN.1 dissectors as clean.
...
svn path=/trunk/; revision=37432
2011-05-27 10:52:25 +00:00
7b5896a179
Corrected "old-style function definition".
...
svn path=/trunk/; revision=37429
2011-05-27 10:18:17 +00:00
8e30d1990e
From Colin O'Flynn:
...
Avoid processing tvb when fragment dissection didn't create one.
svn path=/trunk/; revision=37426
2011-05-27 07:02:26 +00:00
3691dd33f4
Add tvbuff-int.h to the list of include files.
...
svn path=/trunk/; revision=37424
2011-05-27 03:27:12 +00:00
f3f9f2697f
Make TVBs opaque for most users.
...
Convert TVB_RAW_OFFSET() and TVB_GET_DS_TVB() into functions.
svn path=/trunk/; revision=37422
2011-05-27 03:06:50 +00:00
024d0e2ac7
SVN #37419 fixed an OSX compile issue and reverted SVN #37408 .
...
The actual cause of an OSX compile problem: The text [^[:blank:]] in a comment.
SVN #37408 was reverted because a period (or most other characters)
in a RE character class don't need to be escaped.
This patch adds some replacement text in the spot in the comment
originally occupied by the text [^[:blank:]]
svn path=/trunk/; revision=37421
2011-05-27 02:25:20 +00:00
7ad71a2d78
Treat TVBs as opaque: use the accessor functions instead of accessing the fields
...
directly.
svn path=/trunk/; revision=37420
2011-05-27 01:57:33 +00:00
afbbb55212
Try a stab-in-the-dark to see if we can fix the OSX compile issue.
...
svn path=/trunk/; revision=37419
2011-05-27 01:33:24 +00:00
d8bdc80709
Escape the '.' in radius dictionary ATTRIBUTE names. This may fix the OSX-10.5 builds too.
...
svn path=/trunk/; revision=37408
2011-05-26 14:15:51 +00:00
8ce306faa0
Inspired by one of the changes from r37406 and bug 2794: detect hf abbreviations
...
with two or more periods in a row. Fix one case of that.
svn path=/trunk/; revision=37407
2011-05-26 13:32:04 +00:00
6a4ed4f4c3
From Michael Mann.
...
Part of "display filters with redundancies of PROTABBREV in them."
The ones left outs should be fixed differently I think.
Rename som ndps hf variables while at it.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2794
svn path=/trunk/; revision=37406
2011-05-26 06:32:51 +00:00
224206b1a3
Allow the character '.' in radius dictionary ATTRIBUTE names;
...
Fixes issue caused by dictionary.foundry having ATTRIBUTE names containing
a '.' (e.g., Foundry-MAC-Authent-needs-802.1x).
So: Revert SVN #37386 which temporarily changed the '.' to '-'.
svn path=/trunk/; revision=37405
2011-05-26 02:59:25 +00:00
b2120849b1
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 :
...
Added support for the following services of the Connection Manager object:
LargeForwardOpen
GetConnectionOwner
Added support for the following services of the Connection Configuration
Object:
GetAttributeAll
SetAttributeAll
From me:
Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3.
svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
28bae657ae
From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5943 :
...
The two patches attached allow the dissection of the Homeplug AV Ethernet MAC
management frames between a controlling device and a Homeplug AV Ethernet to
PLC adapter. This protocol is pretty similar to the previous generation
Homeplug protocol (dissected by packet-homeplug.c) but a couple of noticeable
differences make it require its own dissector handler.
This dissector is based on the work done by Nicolas Thill, Xavier Carcelle and
myself in the Faifa project (https://dev.open-plc.org ).
The dissector handles the standard Homeplug AV Ethernet MAC management frames
(called public) as well as the Intellon specific management frames (vendor).
From me:
Remove unnecessary global variables.
Add to COL_INFO even when !tree.
Remove gotos.
Remove unnecessary includes.
svn path=/trunk/; revision=37403
2011-05-26 01:55:04 +00:00
8f5742c5ad
Extended the SSL key log import routine to be able to read the following format:
...
RSA Session-ID:xxxx Master-Key:xxxx
This makes it easy to use the "openssl s_client" output for decryption
(see: http://ask.wireshark.org/questions/4229/follow-ssl-stream-using-master-key-and-session-id )
It also paves the way for exporting SSL keyring material. See also the enhancement request in:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3444
svn path=/trunk/; revision=37401
2011-05-25 21:49:29 +00:00
db372d0ad2
Add some expert infos for unusual messages:
...
- routing on SSN but the SSN is not present or is unspecified (zero)
- message handling has an unexpected value
- message class is incorrect for the message type
Also clean up some indentation and other white space.
svn path=/trunk/; revision=37400
2011-05-25 21:47:35 +00:00
07cd05fa52
Use PI_UNDECODED instead.
...
svn path=/trunk/; revision=37392
2011-05-25 13:17:51 +00:00
ccecf5b98b
Add a convinience function to add expert warnings for not dissected items.
...
svn path=/trunk/; revision=37391
2011-05-25 11:05:23 +00:00
0524b9f8d6
From tschardt via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5949
...
802.11 IE tag number 61/62 still decoded to "Unknown"/Reserved tag Number
Remove inadvertently by me in rev36120
svn path=/trunk/; revision=37389
2011-05-25 07:15:05 +00:00
570ffe5f7d
From Florian Fainelli:
...
Patch adding the Homeplug AV ethertype.
Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5943
svn path=/trunk/; revision=37388
2011-05-25 05:33:00 +00:00
058fc19f45
Fix various benign cases of Coverity [UNUSED]: 996,995,956,936,899,1133,1000
...
svn path=/trunk/; revision=37371
2011-05-23 18:04:45 +00:00
d6fb7f50df
From Romain Fliedel via bug 5947: Fix the mask for extracting FMID.
...
svn path=/trunk/; revision=37370
2011-05-23 17:53:51 +00:00
dbf57a4dea
Use the 'proto_tree *' (not the 'proto_item *') for a proto_tree_add_item(): Coverity 963 {UNUSED]
...
svn path=/trunk/; revision=37369
2011-05-23 17:51:33 +00:00
cb78939ede
Pass tap info into sequence analysis function.
...
svn path=/trunk/; revision=37368
2011-05-23 17:15:00 +00:00
9c0ba9fc85
Detect when padding non-final padding comes after other control subheaders.
...
svn path=/trunk/; revision=37367
2011-05-23 16:11:32 +00:00
9a661e4967
Fix compilation.
...
svn path=/trunk/; revision=37365
2011-05-23 14:41:04 +00:00
1396fd4783
Remove an unneeded redundant line of code: Fixes Coverity 1001.
...
Also:
Use a separate ett variable for a subtree;
Convert what appears to be '4 space tabs' to '4 spaces'.
svn path=/trunk/; revision=37364
2011-05-23 14:34:59 +00:00
0c08ae45c2
Use correct subtree in two cases: Fixes Coverity 920;
...
Also:
Remove a number of unneeded #include statements;
Do some whitespace cleanup.
svn path=/trunk/; revision=37363
2011-05-23 14:30:00 +00:00
b6111d3c9f
Fix compilation.
...
svn path=/trunk/; revision=37362
2011-05-23 14:28:02 +00:00
8889f829c0
Use correct subtree in a few cases: Fixes Coverity 921,894,878 & 1136;
...
svn path=/trunk/; revision=37361
2011-05-23 14:26:43 +00:00
33fe1d803a
Use correct subtree in several 'proto_tree_add_text(...)' statements: Fixes Coverity 938 [UNUSED].
...
svn path=/trunk/; revision=37360
2011-05-23 14:17:30 +00:00
0d03e86f6b
Use correct subtree in 'call dissector(...)': Fixes Coverity 962 [UNUSED].
...
svn path=/trunk/; revision=37359
2011-05-23 14:14:43 +00:00
14b997e8b5
Add a missing line of code: Fixes Coverity 967 [UNUSED].
...
svn path=/trunk/; revision=37358
2011-05-23 14:13:03 +00:00
a9652ea66e
Use correct subtree for proto_tree_add_item in several places: Coverity 1130 [UNUSED];
...
Also: Reformat a few lines and do some whitespace cleanup.
svn path=/trunk/; revision=37357
2011-05-23 14:11:14 +00:00
c13f268e8b
Add missing braces.
...
svn path=/trunk/; revision=37356
2011-05-23 10:09:08 +00:00
5f28f55229
7.3.2.25 or 802.11-2007 gives an example of length 20, so it is unclear where the 24 came from (unintentionally fixes bug 5942)
...
svn path=/trunk/; revision=37355
2011-05-23 08:54:47 +00:00
f6a11de61f
Delete unused header field entries found by running checkhf.pl.
...
svn path=/trunk/; revision=37353
2011-05-23 00:32:40 +00:00
609c3dd0d4
From Micheal Mann via bug 2794: Fix some display filter field names.
...
svn path=/trunk/; revision=37351
2011-05-23 00:00:53 +00:00
9851df836c
From Yaniv Kaul: Some 'set but not used' compilation fixes;
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5858
From me: 2 corrections to the patch and sevral other minor changes.
svn path=/trunk/; revision=37350
2011-05-22 22:04:24 +00:00
6705660d04
[Automatic manuf, services and enterprise-numbers update for 2011-05-22]
...
svn path=/trunk/; revision=37346
2011-05-22 15:04:14 +00:00
c0922b93b6
Don't assign to a variable which is then not referenced: Coverity 998 [UNUSED].
...
svn path=/trunk/; revision=37340
2011-05-20 20:41:23 +00:00
d99149b1d6
Don't assign to an unused variable: Fixes Coverity 874 [UNUSED].
...
svn path=/trunk/; revision=37339
2011-05-20 20:29:19 +00:00
fa332472f5
Fix a typo ...
...
svn path=/trunk/; revision=37338
2011-05-20 20:22:59 +00:00
046726f454
Remove unneeded code: Fixes Coverity 890 [UNUSED].
...
svn path=/trunk/; revision=37337
2011-05-20 20:21:14 +00:00
8504d231c7
Use (what appears to be) the correct tvb for a function call: Fixes Coverity 919 [UNUSED];
...
#include <stdlib.h> not req'd.
svn path=/trunk/; revision=37336
2011-05-20 20:10:41 +00:00
fd64c4ae5e
Remove unused code: Fixes Coverity 972 [UNUSED].
...
svn path=/trunk/; revision=37335
2011-05-20 20:00:16 +00:00
a2b58f051d
Add #include <stdlib.h> to files which reference fcns declared in stdlib.h;
...
(In many cases I previously incorrectly removed the #include <stdlib.h>).
svn path=/trunk/; revision=37334
2011-05-20 19:00:09 +00:00
f3432a973c
Don't assign to a proto_item* if the value won't be used:
...
Fixes Coverity 903,935,968,985,997,999,1024,1025,1134;
Remove unneeded #includes;
Do whitespace cleanup.
svn path=/trunk/; revision=37331
2011-05-20 15:44:25 +00:00
4910bc142f
Add to comment about using a heuristic; Fix a typo.
...
svn path=/trunk/; revision=37330
2011-05-20 15:34:29 +00:00
befd2a6f74
Use correct parent tree when creating a subtree: Fixes Coverity 902 [UNUSED];
...
Remove unneeded #includes;
Do some whitespace cleanup.
svn path=/trunk/; revision=37329
2011-05-20 15:22:58 +00:00
57b17b8794
'#if 0' code related to already commented out code: Fixes Coverity 881.
...
svn path=/trunk/; revision=37328
2011-05-20 15:19:26 +00:00
d2989164bd
Don't assign to a proto_item* if the value won't be used: Coverity 975 [UNUSED]
...
Remove unneeded prefs callback in prefs registration;
Remove 'if (!initialized)' test from proto_reg_handoff...();
Remove unneeded #include;
Do some whitespace cleanup.
svn path=/trunk/; revision=37327
2011-05-20 14:21:02 +00:00
b0997749ea
Prettify som 3GPP AVP:s
...
svn path=/trunk/; revision=37326
2011-05-20 13:55:21 +00:00
bcd55c173b
Copy data from the TVB into ep_alloc'd memory, rather than saving a pointer into the TVB.
...
svn path=/trunk/; revision=37323
2011-05-20 03:22:27 +00:00
11ac49f225
Use tvb_get_ephemeral_string() instead of tvb_get_ptr().
...
svn path=/trunk/; revision=37322
2011-05-20 03:20:20 +00:00
947e2c78c8
Use tvb_bytes_to_str() instead of a homegrown version.
...
svn path=/trunk/; revision=37321
2011-05-20 03:17:01 +00:00
2a86281027
Use TVB accessor functions instead of tvb_get_ptr()
...
svn path=/trunk/; revision=37320
2011-05-20 03:15:18 +00:00
d545900d36
Use tvb_ether_to_str()
...
svn path=/trunk/; revision=37319
2011-05-20 03:12:56 +00:00
da8ec2c2d6
Use proto_tree_add_item() instead of proto_tree_add_xxx() with a pointer into
...
the TVB.
Introduce and start using tvb_get_manuf_name() and tvb_get_manuf_name_if_known()
which do the same as the non-tvb versions but take a tvb and an offset instead
of (commonly) a pointer into a TVB.
svn path=/trunk/; revision=37317
2011-05-20 02:42:14 +00:00
01a13cc082
Don't assign to an unused 'proto item *': Coverity 1033 & 906
...
svn path=/trunk/; revision=37308
2011-05-19 20:21:08 +00:00
d868d6385b
Create subtree under the correct parent tree: Coverity 1138.
...
svn path=/trunk/; revision=37306
2011-05-19 20:16:10 +00:00
d03ad5ad6b
Don't assign a value which is never used to a 'proto item *': Covertiy 1135;
...
Remove some unneeded #includes.
svn path=/trunk/; revision=37305
2011-05-19 20:13:54 +00:00
b3f528560b
#if 0 some not currently used code: Fixes Coverity 966 [UNUSED]
...
Convert apparent "4 space tabs" to "4 spaces".
svn path=/trunk/; revision=37302
2011-05-19 19:48:39 +00:00
375b1bf4b4
Give some routines used for info levels that appear both in set and get
...
names beginning with dissect_qspi_, and give some of them names with the
info level structure in them rather than the SNIA CIFS specification
section number.
Have separate routines for SMB_INFO_STANDARD and SMB_INFO_QUERY_EA_SIZE;
SMB_INFO_STANDARD is specified differently in the SNIA CIFS
specification and the MS-CIFS specification, and some captures have the
SNIA CIFS version, with the EA length and some have the MS-CIFS version
without it. The dissector for SMB_INFO_STANDARD will dissect it if it's
there and not say "this structure is truncated" if it's not there.
Rename dissect_qfi_SMB_FILE_ALTERNATE_NAME_INFO() to
dissect_qfi_SMB_FILE_NAME_INFO(), as it also dissects
SMB_QUERY_FILE_NAME_INFO.
Merge the dissectors for SMB_FILE_ALLOCATION_INFO and
SMB_SET_FILE_ALLOCATION_INFO, and for SMB_FILE_END_OF_FILE_INFO and
SMB_SET_FILE_END_OF_FILE_INFO, as the structures are the same.
Dissect some presumed "passthrough info levels" the same way the
corresponding official SMB infos are dissected.
Expand some comments for info level dissectors to give the MS-CIFS
section number and to give some other details.
If an info level is truncated, put in an expert info error.
If we don't know about a given info level, just dissect the body as
"Information level unknown", rather than having it dissected as an
"unknown information" trailer.
svn path=/trunk/; revision=37297
2011-05-19 16:22:21 +00:00
d7457be727
Fix a typo.
...
svn path=/trunk/; revision=37294
2011-05-19 15:23:19 +00:00
48060f2587
Subdissect 2 3GPP AVP:s that are actually text.
...
svn path=/trunk/; revision=37292
2011-05-19 14:41:58 +00:00
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
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
af896ce356
Add a check that (plain) value_strings that are used in hf items don't have
...
any conflicting entries. i.e. lots of value_strings have repeated items, but
for now only warn for cases where the same numeric value appears with a
different string.
Because this will slow down startup and output distracting warnings, it has been
#if 0'd out for now. As discussed on the dev mailing list, it'd be good to
create a #define for developer/non-release builds so that tests such as this
can regularly be run.
svn path=/trunk/; revision=37274
2011-05-19 01:21:48 +00:00
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
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
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
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
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
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
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
7e3bbb2784
Fix tvb_get_bits_buf for LSB.
...
svn path=/trunk/; revision=37264
2011-05-18 21:33:05 +00:00
11af835982
(Trivial) Fix a typo; Add spme punctuation in a coment.
...
svn path=/trunk/; revision=37263
2011-05-18 21:20:22 +00:00
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
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
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
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
3bb5e937d4
- Optimize tvb_get_bits_buf
...
- Add lsb0 (read: least significant bit is 0) parameter to tvb_get_bits_buf()
(not tested, might be buggy...)
svn path=/trunk/; revision=37254
2011-05-18 18:49:33 +00:00
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
82ffa86cd3
Mark a function arg as _U_
...
svn path=/trunk/; revision=37246
2011-05-18 17:19:42 +00:00
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
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
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
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
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
Anders Broman