aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Collect and use E-DCH data. + one file.Anders Broman2012-05-221-1/+94
| | | | svn path=/trunk/; revision=42780
* Collect and use E-DCH data.Anders Broman2012-05-224-18/+187
| | | | svn path=/trunk/; revision=42779
* Replace the File -> Export menu with separate:Guy Harris2012-05-221-78/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* We're an editor now, as we let you add, delete, and edit frame comments,Guy Harris2012-05-224-40/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Note that, given that ws_rename() is a wrapper around ws_stdio_rename()Guy Harris2012-05-222-2/+16
| | | | | | | | | | | 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
* Update comments to reflect that the GLib version is no longer relevantGuy Harris2012-05-221-6/+16
| | | | | | | | | | | (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
* TCP: Some protocols running ontop of TCP needs the PDUs to be delivered in ↵Ronnie Sahlberg2012-05-221-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* HTTP: RPC/HTTP do a better detection and parsing of RPC over HTTPRonnie Sahlberg2012-05-221-0/+21
| | | | | | From Matthieu Patou <mat@matws.net> svn path=/trunk/; revision=42773
* packet-smb2: dissect the channel sequence in the SMB 2.2 headerRonnie Sahlberg2012-05-221-7/+19
| | | | | | From Stefan Metzmacher <metze@samba.org> svn path=/trunk/; revision=42772
* SMB: Add dissection of TRANS2_REQUEST_TRANSPORT_ENCRYPTION messagesRonnie Sahlberg2012-05-221-0/+73
| | | | | | From Stefan Metzmacher <metze@samba.org> svn path=/trunk/; revision=42771
* SMB: Dissect TRANS2_SET_FS_INFORMATION infolevelRonnie Sahlberg2012-05-221-0/+33
| | | | | | From Stefan Metzmacher <metze@samba.org> svn path=/trunk/; revision=42770
* SMB: Call dissect_nt_quota() via a new dissect_sfsi_request/response()Ronnie Sahlberg2012-05-221-3/+50
| | | | | | | From Stefan Metzmacher <metze@samba.org> svn path=/trunk/; revision=42769
* SMB2: Add dissection of the encrypted SMB2 headersRonnie Sahlberg2012-05-222-136/+251
| | | | | | | From Matthieu Patou <mat@matws.net> svn path=/trunk/; revision=42768
* SMB2: Add support for the "encrypted" flag for sharesRonnie Sahlberg2012-05-221-0/+7
| | | | | | From Michael Adam <obnox@samba.org> svn path=/trunk/; revision=42767
* SMB2: Fix, the flag is called PERSISTENT_HANDLES, not LARGE_MTURonnie Sahlberg2012-05-221-1/+1
| | | | | | | From Michael Adam <obnox@samba.org> svn path=/trunk/; revision=42766
* SMB2: Add support for SMB2_GLOBAL_CAP_ENCRYPTION flagRonnie Sahlberg2012-05-221-0/+13
| | | | | | | From Michael Adam <obnox@samba.org> svn path=/trunk/; revision=42765
* The GUI's state machine requires that, when reloading a capture after aGuy Harris2012-05-225-48/+44
| | | | | | | | | | | | | | | 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
* Note that packet_range_calc() and packet_range_calc_user() can beGuy Harris2012-05-221-2/+22
| | | | | | painfully slow with a large capture. svn path=/trunk/; revision=42763
* Finish fixing https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7270#c4 :Jeff Morriss2012-05-221-9/+12
| | | | | | | | | | 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
* Fix indentationpascal2012-05-211-637/+633
| | | | svn path=/trunk/; revision=42760
* From gyanesh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7267 :pascal2012-05-211-2/+71
| | | | | | Add dissector function for SPB link metric sub tlv (type 29) svn path=/trunk/; revision=42759
* Partial fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7270#c4 :Jeff Morriss2012-05-211-4/+5
| | | | | | | | 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
* Display Element ID in hexadecimal (like in 3GPP specs)pascal2012-05-2112-18/+18
| | | | | | Display EPS bearer ID in decimal svn path=/trunk/; revision=42755
* Fix "Function call argument is an uninitialized value" issue found by ↵Bill Meier2012-05-211-851/+856
| | | | | | | | | | | | | | | | 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
* Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7270 :Jeff Morriss2012-05-211-5/+10
| | | | | | | 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
* Cleanup whitespace;Bill Meier2012-05-211-545/+1913
| | | | | | Reformat hf[] entries. svn path=/trunk/; revision=42748
* Init some variables to prevent scan-build "Function call argument is an ↵Bill Meier2012-05-211-4/+4
| | | | | | | | uninitialized value" messages. (Not actually a bug due to the way the code works ?) svn path=/trunk/; revision=42747
* Init a pointer to prevent a (not actually valid) scan-build "Function call ↵Bill Meier2012-05-211-999/+1209
| | | | | | | | | | | | | | 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
* Additional cleanup:Bill Meier2012-05-211-20/+19
| | | | | | | | - 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
* From Evan Huus: Unused Prefs registration;Bill Meier2012-05-211-11/+6
| | | | | | | | https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7273 From me: whitespace cleanup; svn path=/trunk/; revision=42744
* Fix some indentation.Bill Meier2012-05-211-8/+8
| | | | svn path=/trunk/; revision=42743
* Improve Gadu-Gadu dissector (part III)Jakub Zawadzki2012-05-211-14/+343
| | | | svn path=/trunk/; revision=42742
* From Evan Huus via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7271 :pascal2012-05-211-1/+1
| | | | | | Remove useless null check svn path=/trunk/; revision=42741
* Add packet-sync.c to epan\CMakeLists.txtpascal2012-05-211-0/+1
| | | | svn path=/trunk/; revision=42740
* From David Wei:Anders Broman2012-05-211-19/+45
| | | | | | fix for Higher bitrates than 16 Mbps flag. svn path=/trunk/; revision=42739
* From Evan Huus:Anders Broman2012-05-213-6/+8
| | | | | | | | 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
* Use new_register_dissector.Anders Broman2012-05-211-1/+1
| | | | svn path=/trunk/; revision=42737
* From Michael Mann:Anders Broman2012-05-211-0/+8
| | | | | | | | 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
* From David Wei:Anders Broman2012-05-212-1/+317
| | | | | | New dissector for MBMS synchronisation protocol. svn path=/trunk/; revision=42735
* Whitespace cleanup;Bill Meier2012-05-211-40/+40
| | | | svn path=/trunk/; revision=42734
* General cleanup:Bill Meier2012-05-211-1213/+1206
| | | | | | | | - 4-space tabs, trailing whitespace, etc - use a consistent formatting style - ... svn path=/trunk/; revision=42733
* Prevent (what seems to me to be) a possible null pointer dereference.Bill Meier2012-05-211-1/+1
| | | | svn path=/trunk/; revision=42732
* Two cases where gcc has problems to detect that a specific specificJörg Mayer2012-05-211-2/+2
| | | | | | variable may not be used uninitialized. svn path=/trunk/; revision=42731
* Fix 'unused parameter' warning.Bill Meier2012-05-211-1/+1
| | | | svn path=/trunk/; revision=42730
* Set up conversations for more channel typesAnders Broman2012-05-205-31/+432
| | | | svn path=/trunk/; revision=42729
* Upgrade NAS dissector to Release 10 (v10.6.1)pascal2012-05-204-96/+415
| | | | svn path=/trunk/; revision=42728
* Revert r35131 fix bug #5738Jakub Zawadzki2012-05-201-2/+2
| | | | | | | | | | | | | | | | 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
* [Automatic manuf, services and enterprise-numbers update for 2012-05-20]Gerald Combs2012-05-203-10503/+10700
| | | | svn path=/trunk/; revision=42724
* Make the compiler happy.Michael Tüxen2012-05-201-1/+1
| | | | svn path=/trunk/; revision=42723
* Upgrade NAS EPS dissector to Release 10 (10.6.1)pascal2012-05-204-79/+411
| | | | svn path=/trunk/; revision=42722