Commit graph

40628 commits

Author SHA1 Message Date
Anders Broman
ec5ec34f1f Collect and use E-DCH data.
svn path=/trunk/; revision=42779
2012-05-22 11:53:12 +00:00
Guy Harris
1d41075db1 Replace the File -> Export menu with separate:
File -> Export Packet Dissections

	    (for the "print to file", "export as CSV", "export as C array",
	    "export as PSML", and "export as PDML" items)

	File-> Export Selected Packet Bytes

	File -> Export SSL Session Keys

	File -> Export Objects

	    (for exporting objects transferred over HTTP, DICOM, or SMB)

menu items.

The operations under Export really weren't that related - about all they
had in common was that they wrote to a file stuff other than packets
in a capture file format; the operations in the groups *under* Export
were related, so the groups are now menu items of their own.

This way, the File menu more immediately indicates what options of that
sort are available.

It also means that the Export Packet Dissections item might make it
clearer that what you get from that is *NOT* something that can just be
read back into Wireshark, as at least one user who asked "how do I get
my capture back from this?" on ask.wireshark.com thought.  If that
doesn't suffice, perhaps renaming it to "Export Dissected Packets" would
help; if *that* doesn't suffice, perhaps Kevin Cullimore's suggestion
that it say "Report" rather than "Export" will do the trick:

	From: Kevin Cullimore <kcullimo@runbox.com>
	Subject: [Wireshark-users] Re: Should the "export as text" item be in an "Export Human-readable..." item in the File menu?
	Date: May 19, 2012 8:31:23 PM PDT
	To: wireshark-users <wireshark-users@wireshark.org>

	Would classifying the asymmetric export (ones that lack a
	corresponding "import" action) formats as "reports" help clear
	up the original ambiguity/misunderstanding? It seems that most
	of the gui-based network tools I'm forced to periodically
	interact with rely upon that term with at least some success.

(Or perhaps some other verb would be right in some cases, e.g. "Save SSL
Session Keys".)

This also sets a pattern for another upcoming change - splitting "Save
As" into "Save As", which always saves every packet and makes the new
file the current file, and "{Verb} Specified Packets", which lets you
specify which packets to save and does *not* make the new file the
current file.  That'd simplify the code a bit, and might clear up the
new only-in-the-trunk issue in bug 6640 - having "Save As" default to
saving displayed packets currently means that it acts more like the
latter of those functions.

svn path=/trunk/; revision=42778
2012-05-22 11:44:55 +00:00
Guy Harris
ae7d57d5fa We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.

That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory.  (We'd want to do that anyway, of
course....)

Update some comments.

Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).

Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.

Note that we need to do some a better job of reporting rename failures.

svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
Guy Harris
df7289bb99 Note that, given that ws_rename() is a wrapper around ws_stdio_rename()
on Windows, and that ws_stdio_rename() uses MoveFileEx() with
MOVEFILE_REPLACE_EXISTING and should therefore remove the target if it
exists, the extra "remove the target first" stuff should not be
necessary on Windows - if we remove it, it also keeps the code from
removing the target and then having the rename fail, with the result
that the target no longer exists.

svn path=/trunk/; revision=42776
2012-05-22 10:05:01 +00:00
Guy Harris
03f0e46d6f Update comments to reflect that the GLib version is no longer relevant
(we require GLib 2.14 or later, and always use UTF-8 for pathnames on
Windows), to note that ws_stdio_rename() should have UN*X-style
rename semantics in that it removes the target if necessary, and to give
more details in other ways.

Clean up indetation a bit.

svn path=/trunk/; revision=42775
2012-05-22 09:57:18 +00:00
Ronnie Sahlberg
2a2dc8c5f3 TCP: Some protocols running ontop of TCP needs the PDUs to be delivered in order. for example decryption of DCERPCoverHTTP.
For such protocols, hte state gets out of sync of for example the same PDU is invoked twice in a row, which sometimes can happen if there is tcp retransmission and we see the same PDU twice. First for hte original segment and a second time for the tcp retransmission.
These protocols might lack an easy way to detect that a PDU is seen twice or out of order.

To handle this a little better, offer a TCP option that defaults to being disabled but when enabled skips invoking any subdissector for retransmitted or out of order packets.
(For some virtualization environments it sometimes becomes VERY common to see false tcp retransmissions due to segments being captured twice making this even worse)


We dont want this option to default to ON because for most cases we do want the current behaviour where the subdissector is called twice, or more, for any PDU that is retrasnmitted on the TPC layer.
For example, assume a SMB response packet is retransmitted on the TCP level.
This may result in a capture file that looks like
1 -> SMB request
2 <- SMB response to 1  
... 1 second ...
3 <- SMB response to 1   TCP retransmission

For this case we definitely want packet 3 to be passed to the SMB layer so that 
the request/respons ematching will detect that the response time for this transaction was > 1.0 second
We want smb.time to indicate the delta betwenn packets 1 and 3
as well as the SMB Service Response Time to indicate that this command took very long.





svn path=/trunk/; revision=42774
2012-05-22 07:51:12 +00:00
Ronnie Sahlberg
7e0c167eb0 HTTP: RPC/HTTP do a better detection and parsing of RPC over HTTP
From Matthieu Patou <mat@matws.net>

svn path=/trunk/; revision=42773
2012-05-22 06:23:36 +00:00
Ronnie Sahlberg
b3bfefd03c packet-smb2: dissect the channel sequence in the SMB 2.2 header
From Stefan Metzmacher <metze@samba.org>

svn path=/trunk/; revision=42772
2012-05-22 05:56:39 +00:00
Ronnie Sahlberg
ba54127556 SMB: Add dissection of TRANS2_REQUEST_TRANSPORT_ENCRYPTION messages
From Stefan Metzmacher <metze@samba.org>

svn path=/trunk/; revision=42771
2012-05-22 05:55:05 +00:00
Ronnie Sahlberg
50b992d139 SMB: Dissect TRANS2_SET_FS_INFORMATION infolevel
From Stefan Metzmacher <metze@samba.org>

svn path=/trunk/; revision=42770
2012-05-22 05:53:28 +00:00
Ronnie Sahlberg
920b760f15 SMB: Call dissect_nt_quota() via a new dissect_sfsi_request/response()
From Stefan Metzmacher <metze@samba.org>


svn path=/trunk/; revision=42769
2012-05-22 05:51:16 +00:00
Ronnie Sahlberg
4ded3c7fe0 SMB2: Add dissection of the encrypted SMB2 headers
From Matthieu Patou <mat@matws.net>


svn path=/trunk/; revision=42768
2012-05-22 05:48:55 +00:00
Ronnie Sahlberg
cf0a6d0b96 SMB2: Add support for the "encrypted" flag for shares
From Michael Adam <obnox@samba.org>

svn path=/trunk/; revision=42767
2012-05-22 05:46:47 +00:00
Ronnie Sahlberg
0882a858c4 SMB2: Fix, the flag is called PERSISTENT_HANDLES, not LARGE_MTU
From Michael Adam <obnox@samba.org>


svn path=/trunk/; revision=42766
2012-05-22 05:45:30 +00:00
Ronnie Sahlberg
b5b00d5654 SMB2: Add support for SMB2_GLOBAL_CAP_ENCRYPTION flag
From Michael Adam <obnox@samba.org>


svn path=/trunk/; revision=42765
2012-05-22 05:44:07 +00:00
Guy Harris
90c43120ca The GUI's state machine requires that, when reloading a capture after a
save, we post capture file callback events similar to the ones posted
when reading a capture - otherwise, the reload will leave the welcome
screen up.

Rename cf_cb_file_save_reload_finished to cf_cb_file_reload_finished,
add a cf_cb_file_reload_started callback, have them work similarly to
read_finished and read_started except that the reload uses "Reloading"
in the progress bar and status bar.

Clean up some indentation while we're at it.

svn path=/trunk/; revision=42764
2012-05-22 03:52:12 +00:00
Guy Harris
d231102428 Note that packet_range_calc() and packet_range_calc_user() can be
painfully slow with a large capture.

svn path=/trunk/; revision=42763
2012-05-22 02:37:32 +00:00
Jeff Morriss
7755747797 Finish fixing https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7270#c4 :
Revert r42758 as it only helps in one case; rather, fix it correctly: if
we're redissecting or refiltering, clear any frame dependencies as we go
along.  (Fortunately, frame dependencies are all forward dependencies--
meaning that a given frame can only be depended upon by a later frame--
so we can do this as we rescan the packets/frames.)

svn path=/trunk/; revision=42762
2012-05-22 01:59:34 +00:00
pascal
a65518fe55 Fix indentation
svn path=/trunk/; revision=42760
2012-05-21 21:49:11 +00:00
pascal
6a1470ffc9 From gyanesh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7267 :
Add dissector function for SPB link metric sub tlv (type 29)

svn path=/trunk/; revision=42759
2012-05-21 20:51:22 +00:00
Jeff Morriss
33c9fa1f30 Partial fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7270#c4 :
Clear the dependent_of_displayed flag when there's no dfilter.  This only
helps the case when you clear a display filter before moving on to another
display filter.

svn path=/trunk/; revision=42758
2012-05-21 19:44:24 +00:00
pascal
0ba1ab2909 Display Element ID in hexadecimal (like in 3GPP specs)
Display EPS bearer ID in decimal

svn path=/trunk/; revision=42755
2012-05-21 19:27:38 +00:00
Bill Meier
bc55ee0616 Fix "Function call argument is an uninitialized value" issue found by scan-build.
(It seems to me that this issue would rarely, if ever, actually occur).

Also:
- Use val_to_str_const() as appropriate;
- Localize some variables;
- Remove unneeded initializers;
- Do some parenthesizing;
- Use a consistent formatting style;
- Do whitespace cleanup.

svn path=/trunk/; revision=42754
2012-05-21 18:25:29 +00:00
Jeff Morriss
1828c71743 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7270 :
Don't mark frames as dependent upon a displayed frame unless the (supposedly)
displayed frame is actually displayed.  (Fix to r41214 <sigh>.)

svn path=/trunk/; revision=42752
2012-05-21 17:09:15 +00:00
Bill Meier
78a170a506 Cleanup whitespace;
Reformat hf[] entries.

svn path=/trunk/; revision=42748
2012-05-21 16:12:56 +00:00
Bill Meier
a729320b0a Init some variables to prevent scan-build "Function call argument is an uninitialized value" messages.
(Not actually a bug due to the way the code works ?)

svn path=/trunk/; revision=42747
2012-05-21 15:56:26 +00:00
Bill Meier
b2b8fae93c Init a pointer to prevent a (not actually valid) scan-build "Function call argument is an uninitialized value" msg
Also:
 - #if 0 out some unused hf[] entries;
 - use val_to_str_const() in a few places;
 - remove some unneeded initializers;
 - do col_set_str()/col_clear() before referencing tvb;
 - reformat hf[] entries;
 - Fix whitespace (4-space tabs, etc).

svn path=/trunk/; revision=42746
2012-05-21 15:06:24 +00:00
Bill Meier
78f3be74bf Additional cleanup:
- use #if 0/#endif to comment out code(instead of /* ...*/
- remove unused #define
- replace col_clear()/col_add() by col_set()

svn path=/trunk/; revision=42745
2012-05-21 14:25:27 +00:00
Bill Meier
6718bfd047 From Evan Huus: Unused Prefs registration;
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7273

From me: whitespace cleanup;

svn path=/trunk/; revision=42744
2012-05-21 14:02:40 +00:00
Bill Meier
b4519deb91 Fix some indentation.
svn path=/trunk/; revision=42743
2012-05-21 13:18:57 +00:00
Jakub Zawadzki
1d510f0616 Improve Gadu-Gadu dissector (part III)
svn path=/trunk/; revision=42742
2012-05-21 13:07:33 +00:00
pascal
d6381b4123 From Evan Huus via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7271 :
Remove useless null check

svn path=/trunk/; revision=42741
2012-05-21 09:37:58 +00:00
pascal
f09a30ea93 Add packet-sync.c to epan\CMakeLists.txt
svn path=/trunk/; revision=42740
2012-05-21 09:18:39 +00:00
Anders Broman
26d431148c From David Wei:
fix for Higher bitrates than 16 Mbps flag.

svn path=/trunk/; revision=42739
2012-05-21 08:21:26 +00:00
Anders Broman
fec821f303 From Evan Huus:
Fix Three memory leaks and a bad if-condition, as caught by CppCheck.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7272

svn path=/trunk/; revision=42738
2012-05-21 07:42:09 +00:00
Anders Broman
35dd3b052e Use new_register_dissector.
svn path=/trunk/; revision=42737
2012-05-21 07:34:20 +00:00
Anders Broman
36cd403381 From Michael Mann:
Check for enabled XML dissecto.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6625
xmpp decoder crashes when xml is disabled

svn path=/trunk/; revision=42736
2012-05-21 07:28:13 +00:00
Anders Broman
4684cb30f4 From David Wei:
New dissector for MBMS synchronisation protocol.

svn path=/trunk/; revision=42735
2012-05-21 07:11:36 +00:00
Bill Meier
7d3f69262d Whitespace cleanup;
svn path=/trunk/; revision=42734
2012-05-21 02:20:53 +00:00
Bill Meier
e3ea682270 General cleanup:
- 4-space tabs, trailing whitespace, etc
- use a consistent formatting style
- ...

svn path=/trunk/; revision=42733
2012-05-21 02:13:49 +00:00
Bill Meier
ca4a51873e Prevent (what seems to me to be) a possible null pointer dereference.
svn path=/trunk/; revision=42732
2012-05-21 01:00:12 +00:00
Jörg Mayer
d40cea2e7b Two cases where gcc has problems to detect that a specific specific
variable may not be used uninitialized.

svn path=/trunk/; revision=42731
2012-05-21 00:23:13 +00:00
Bill Meier
0b6c88942b Fix 'unused parameter' warning.
svn path=/trunk/; revision=42730
2012-05-21 00:20:09 +00:00
Anders Broman
c5d3f8c2ba Set up conversations for more channel types
svn path=/trunk/; revision=42729
2012-05-20 21:24:18 +00:00
pascal
254fcdfe19 Upgrade NAS dissector to Release 10 (v10.6.1)
svn path=/trunk/; revision=42728
2012-05-20 20:56:42 +00:00
Jakub Zawadzki
42ec0ca701 Revert r35131 fix bug #5738
g_unichar_isprint() is for *wide characters*.
For UTF-8 multibyte characters we could 
use g_utf8_validate() and g_utf8_next_char(),
but IMHO format_text_* should be ASCII-only.

We rather need to store encoding of FT_STRING[Z]
and in proto_item_fill_label() call appropiate
function.
For ENC_ASCII use format_text(),
for unicode (ENC_UTF*, ENC_UCS*) use format_text_utf(),
etc..

svn path=/trunk/; revision=42727
2012-05-20 18:32:44 +00:00
Gerald Combs
feeed92f95 [Automatic manuf, services and enterprise-numbers update for 2012-05-20]
svn path=/trunk/; revision=42724
2012-05-20 14:03:32 +00:00
Michael Tüxen
2250389193 Make the compiler happy.
svn path=/trunk/; revision=42723
2012-05-20 10:57:12 +00:00
pascal
774748914f Upgrade NAS EPS dissector to Release 10 (10.6.1)
svn path=/trunk/; revision=42722
2012-05-20 09:50:34 +00:00
Guy Harris
4a9b825c49 Change the "user_saved" member of a capture_file structure to
"unsaved_changes", and have it be TRUE iff changes have been made to the
file since it was read - *not* if it's a temporary file from a live
capture.

Check the "is_tempfile" member, and the "unsaved_changes" member, when
appropriate.

Just have a set_toolbar_for_capture_file() routine that updates the
"save", "close", and "reload" toolbar as appropriate, given a
capture_file structure - absorb the function of
set_toolbar_for_unsaved_capture_file() into it.

svn path=/trunk/; revision=42721
2012-05-20 08:56:06 +00:00