Guy Harris
9e22269a58
Get rid of some warnings on Win64.
...
svn path=/trunk/; revision=37447
2011-05-28 20:55:21 +00:00
Sake Blok
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
Michael Tüxen
31c756a6d1
Initialize pcap using an empty array instead of NULL. So no special
...
check is needed.
svn path=/trunk/; revision=37445
2011-05-28 12:48:21 +00:00
Chris Maynard
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
Chris Maynard
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
Bill Meier
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
Chris Maynard
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
Bill Meier
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
Anders Broman
51d8ad3a45
Remove some stuff again.
...
svn path=/trunk/; revision=37437
2011-05-27 13:16:28 +00:00
Stig Bjørlykke
0b154761fa
One more still dirty.
...
svn path=/trunk/; revision=37436
2011-05-27 12:46:35 +00:00
Anders Broman
df7717126d
Include missing files in distribution.
...
svn path=/trunk/; revision=37435
2011-05-27 12:22:20 +00:00
Stig Bjørlykke
8a8ff7f03d
Moved nbap and pcap back as dirty dissectors.
...
svn path=/trunk/; revision=37434
2011-05-27 11:58:47 +00:00
Stig Bjørlykke
51864807b3
Corrected "old-style function definition".
...
svn path=/trunk/; revision=37433
2011-05-27 11:03:04 +00:00
Stig Bjørlykke
21432aa5b0
Try building some ASN.1 dissectors as clean.
...
svn path=/trunk/; revision=37432
2011-05-27 10:52:25 +00:00
Anders Broman
1f1e8d29a3
Include text_import_scanner.l in the distribution.
...
svn path=/trunk/; revision=37431
2011-05-27 10:49:34 +00:00
Anders Broman
320dcc9fe0
Remove no longer used files.
...
svn path=/trunk/; revision=37430
2011-05-27 10:24:36 +00:00
Stig Bjørlykke
7b5896a179
Corrected "old-style function definition".
...
svn path=/trunk/; revision=37429
2011-05-27 10:18:17 +00:00
Stig Bjørlykke
445bbfb6cd
Added some row space to "Create New Profile".
...
svn path=/trunk/; revision=37428
2011-05-27 07:39:13 +00:00
Stig Bjørlykke
f1e5a5892d
Added some row space to "Edit Column Details".
...
svn path=/trunk/; revision=37427
2011-05-27 07:38:08 +00:00
Jaap Keuter
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
Stig Bjørlykke
54356d4ccb
Initialize global_ld.pcaps before we setup signal handlers, which
...
uses this list to cleanup.
svn path=/trunk/; revision=37425
2011-05-27 06:52:32 +00:00
Jeff Morriss
3691dd33f4
Add tvbuff-int.h to the list of include files.
...
svn path=/trunk/; revision=37424
2011-05-27 03:27:12 +00:00
Jeff Morriss
e7974bf250
AirPcap is disabled by default; fix the help text to reflect that fact.
...
svn path=/trunk/; revision=37423
2011-05-27 03:22:48 +00:00
Jeff Morriss
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
Bill Meier
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
Jeff Morriss
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
Bill Meier
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
Gerald Combs
ebc0c3e33f
Don't call g_log(); as the comment indicates it can cause problems.
...
svn path=/trunk/; revision=37418
2011-05-26 23:20:35 +00:00
Gerald Combs
093fce7576
Don't call pcap_breakloop() if we're not capturing anything. Fixes a
...
crash found by Stig.
Add debugging output to capture_cleanup_handler() on non-Windows
systems.
svn path=/trunk/; revision=37417
2011-05-26 22:12:27 +00:00
Gerald Combs
c1b210c23c
Add a "capture from stdin" test.
...
svn path=/trunk/; revision=37416
2011-05-26 20:23:38 +00:00
Chris Maynard
a4f53c991c
Append received percentage after received/dropped counts.
...
svn path=/trunk/; revision=37415
2011-05-26 20:05:11 +00:00
Michael Tüxen
1e70d66184
Provide consistent counters for received and dropped packets.
...
svn path=/trunk/; revision=37414
2011-05-26 19:22:16 +00:00
Michael Tüxen
90ddc2f3b1
Fix the handling of pipes on Windows platforms.
...
This should fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5939
svn path=/trunk/; revision=37413
2011-05-26 18:12:41 +00:00
Chris Maynard
87e588c336
Add SVN Id and GPL. Minor whitespace cleanup.
...
svn path=/trunk/; revision=37412
2011-05-26 16:03:29 +00:00
Anders Broman
39adb6e303
Add the possibillity of adding custom extra dist files.
...
svn path=/trunk/; revision=37411
2011-05-26 14:44:12 +00:00
Chris Maynard
77c9577a29
Change "captured/dropped" terminology to "received/dropped". Also, unless
...
we're a capture child, always report the final caputure count regardless of the
'quiet' setting. This ensures that each interface prints its statistics on a
new line, rather than the first one being printed on the same line as the
packet count in the case when we're not 'quiet'.
svn path=/trunk/; revision=37410
2011-05-26 14:33:55 +00:00
Anders Broman
16a6cdcd76
Add FindGMODULE2.cmake and FindGTHREAD2.cmake to the dist.
...
svn path=/trunk/; revision=37409
2011-05-26 14:23:40 +00:00
Jeff Morriss
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
Jeff Morriss
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
Anders Broman
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
Bill Meier
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
Jeff Morriss
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
Jeff Morriss
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
Sake Blok
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
Jeff Morriss
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
Gerald Combs
962b23f8d5
Filter out arg_list_utf_16to8.
...
svn path=/trunk/; revision=37396
2011-05-25 18:38:39 +00:00
Gerald Combs
d16058dd8c
Remove a backslash.
...
svn path=/trunk/; revision=37395
2011-05-25 18:09:04 +00:00
Anders Broman
2756b787d3
Copy-paste error.
...
svn path=/trunk/; revision=37394
2011-05-25 15:01:07 +00:00
Anders Broman
84a22ed17e
Make it easier to add custom asn1 dissectors.
...
svn path=/trunk/; revision=37393
2011-05-25 14:21:42 +00:00
Anders Broman
07cd05fa52
Use PI_UNDECODED instead.
...
svn path=/trunk/; revision=37392
2011-05-25 13:17:51 +00:00