aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-03-29sharkd: support exporting ssl secretsJakub Zawadzki1-0/+21
Change-Id: Ie7db733d8aa7189b1ade6ef85d911653ed8c490f Reviewed-on: https://code.wireshark.org/review/20703 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-29Add ENC_TIME_MSEC_NTP and use it in packet-gtpv2.cAndersBroman4-7/+30
While at it fix expert info a typo and an calculation. Change-Id: I071a36edb7eed5f58708b98aebcb24bc6c34f2a8 Reviewed-on: https://code.wireshark.org/review/20766 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-29Print signed values with %d, not %u.Guy Harris1-1/+1
Change-Id: I1ad46df006976c052ff42baf6415e18b488b215f Reviewed-on: https://code.wireshark.org/review/20780 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-29Fix "warning C6246: Local declaration hides declaration of the same name in ↵Michael Mann3-7/+4
outer scope" warnings Change-Id: I98edc076fdab40ef1fd05313168011f58e13a4d6 Reviewed-on: https://code.wireshark.org/review/20773 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-29Fix problem found by Coverity.Guy Harris1-1/+5
The loop was using bytes_read, but wasn't setting it. Go back to something similar to the previous loop condition, but don't lose the error tests. Fixes Coverity CID 1403388. Change-Id: I557cbfa6e9ad81491af4fc90e85ce87c71fec8aa Reviewed-on: https://code.wireshark.org/review/20776 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-29Check for localtime() failing.Guy Harris1-2/+12
It "shouldn't happen", but at least this squelches a Coverity complaint, CID 1394503. Change-Id: I40af10d47c1d1b026f6b40ef68b139e6bf246109 Reviewed-on: https://code.wireshark.org/review/20774 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-28Add bounds checks for references to outhdr_values.Guy Harris1-37/+81
Don't run past the end of the outhdr_values array. While we're at it, don't make it a global array - it doesn't need to be global, as its values don't persist from invocation to invocation, and this would allow use of this routine in multiple threads in parallel. (Yes, we have other global variables that don't maintain state, but we should get rid of that, too.) Change-Id: I7ceed3c9ba6356eddb7d52472e9d53dd08f90029 Reviewed-on: https://code.wireshark.org/review/20770 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-28packet-nstrace.c: Ensure value_strings end with {0, NULL}Michael Mann1-2/+2
Change-Id: I548c51dd7333b0dc26a84f77b1e848530b79dde3 Reviewed-on: https://code.wireshark.org/review/20772 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-28Reflect new default value of snaplen in man pages.Martin Sehnoutka9-12/+12
Default value for snaplen is defined in wiretap/wtap.h: #define WTAP_MAX_PACKET_SIZE 262144 and used in capture_opts.c: capture_opts->default_options.snaplen = WTAP_MAX_PACKET_SIZE; but help and man pages don't reflect this change. Change-Id: I35ddf1e8b7ffd657f4e01b3fe6b4c44c9acece2b Reviewed-on: https://code.wireshark.org/review/20738 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-28voip_calls_infO_model(.h): fix extra ‘;’ [-Wpedantic]Alexis La Goutte1-1/+1
Change-Id: I2f131999cd0337d0d65d52f303c8ab9ca6bda39a Reviewed-on: https://code.wireshark.org/review/20757 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-28Qt: update endpoint statistics column labels to match GTK onesPascal Quantin2-12/+7
Bug: 13526 Change-Id: I40485c6f9b54ff0bf07f955c1dde8cd5ac05ef9b Reviewed-on: https://code.wireshark.org/review/20762 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-28randpkt_core: Fix a handful of warningsMichael Mann1-8/+6
1. randpkt_core.c(559): warning C6262: Function uses '65596' bytes of stack: exceeds /analyze:stacksize '16384'. Consider moving some data to heap. 2. randpkt_core.c(615): warning C6386: Buffer overrun while writing to 'buffer': the writable size is '65536' bytes, but '-1' bytes might be written. Change-Id: I0f3bcd19b49d6c8cde0d2ad9f745b14f5462a708 Reviewed-on: https://code.wireshark.org/review/20763 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-28Don't wire in 262144, use WTAP_MAX_PACKET_SIZE.Guy Harris1-2/+5
That way, if we ever increase WTAP_MAX_PACKET_SIZE, this code won't need to be changed. Change-Id: I68d21e10810b7b8a4732d9ecf7e145668b0fe1cb Reviewed-on: https://code.wireshark.org/review/20761 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-28text2pcap: define max packet size to WTAP_MAX_PACKET_SIZEPascal Quantin2-6/+7
Change-Id: I73ab87032e4a0c0259227622412be36aaf66a9d6 Reviewed-on: https://code.wireshark.org/review/20758 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-28Get rid of blanks at the ends of lines.Guy Harris1-12/+12
Change-Id: I10a756a4a42d4f27f59e12c11f12d71947191c92 Reviewed-on: https://code.wireshark.org/review/20760 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-28Fix up time encodings.Guy Harris12-126/+367
Add some new encodings for absolute time stamps, and use them as appropriate; this fixes some cases where the time stamps in question were being dissected incorrectly. For the encodings with seconds and 1/2^32s of a second, don't arbitrarily give only microsecond resolution; 2^32 is greater than 1 million, and, in fact, at least some NTP RFCs explicitly talk about time resolution greater than 1 microsecond. Update references in the RELOAD dissector to reflect the documents in question having been updated and published as RFCs. Change-Id: Icbe0b696d65eb622978eb71e99ddf699b84e4fca Reviewed-on: https://code.wireshark.org/review/20759 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-28Qt: fix closing editor in capture interfaces dialogPeter Wu1-0/+25
Whenever (every second) the points list is updated, a dataChanged signal is emitted and Qt decides to close all editors. Workaround this issue by disabling the dataChanged signal. (Alternatively, we could change the list into a pointer-to-list again.) Change-Id: Ie06d118d011a72f5be5608c2324ca2715a3f97c7 Fixes: v2.3.0rc0-2014-gf8dc2346df ("Qt: fix memleak of PointList in interface statistics") Reviewed-on: https://code.wireshark.org/review/20530 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-28text_import: the maximum frame length should be WTAP_MAX_PACKET_SIZEPascal Quantin1-1/+1
Change-Id: I41989e8b5fd273c518f786ca74683b9284d9403e Reviewed-on: https://code.wireshark.org/review/20747 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-28wsutil: fix a NULL pointer dereference when there is a single plugin registeredPascal Quantin1-16/+6
Rework loop to avoid dereferencing a NULL pointer. Bug introduced in g6d79055 Change-Id: I88a9f2d045b633cc2365ff6ce939f3315e7d42cc Reviewed-on: https://code.wireshark.org/review/20751 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-28GTK: the maximum packet size is WTAP_MAX_PACKET_SIZE, not 65535Pascal Quantin3-6/+8
Change-Id: I4b78a3bff7ed158eef2008e52ec8abc9f7a8d1d3 Reviewed-on: https://code.wireshark.org/review/20748 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-28artnet : fix conflicting entry in its value_stringAlexis La Goutte1-1/+1
Field 'ESTA Code' (artnet.poll_reply.esta_man) has a conflicting entry in its value_string: 19546 is at indices 386 (LightMinded Industries, Inc.) and 387 (Sumolight GmbH)) Matches http://tsp.esta.org/tsp/working_groups/CP/mfctrIDs.php Change-Id: I61044a3b9d7f7e3255fb9da1eceef79afa084003 Reviewed-on: https://code.wireshark.org/review/20742 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-28Qt: the maximum packet size is WTAP_MAX_PACKET_SIZE, not 65535Pascal Quantin1-3/+7
Also ensure that the update of sparkline does not lose focus of the spinbox currently edited. Change-Id: Icf7dd180fe3cb1d8bfab9017f923bf38e6210554 Reviewed-on: https://code.wireshark.org/review/20749 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-28reordercap: use the snaplen from the source filePascal Quantin1-2/+2
Change-Id: I61871fa10142e2e2fab5e0e579df7530b9e52eef Reviewed-on: https://code.wireshark.org/review/20746 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-28rawshark: Move large data (WTAP_MAX_PACKET_SIZE) to the heap.Michael Mann1-2/+3
Change-Id: Ib525d35b6a0fa58602d30fda701b0cce5f05b322 Reviewed-on: https://code.wireshark.org/review/20756 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-28dumpcap: Move large data (WTAP_MAX_PACKET_SIZE) to the heap.Michael Mann1-1/+3
Change-Id: Id365b533812bd972a5e7732ad43b6b6e3221029b Reviewed-on: https://code.wireshark.org/review/20755 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-28k12text.l: Move large data (WTAP_MAX_PACKET_SIZE) to the heap.Michael Mann1-5/+21
Change-Id: Ic291dbd5930978bbd0adc8b58d09b423de83b65b Reviewed-on: https://code.wireshark.org/review/20754 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-28logcat_text.c: Move large data (WTAP_MAX_PACKET_SIZE) to the heap.Michael Mann1-5/+16
Change-Id: I3a391079a28aae7e41d926268f9f60152871bfa5 Reviewed-on: https://code.wireshark.org/review/20753 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-27Don't waste time trying to run non-plain file and non-executable files.Guy Harris1-11/+17
Directories, and non-executable files, aren't going to be extcap executables. This may not make much of a difference for an installed version of Wireshark, but it makes a difference if you're running from the build directory. Change-Id: Ib9953fa04392dc7a8420ddf28bab9726e6050c12 Reviewed-on: https://code.wireshark.org/review/20752 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-27Qt: fix capture statistics display in status barPascal Quantin1-1/+1
Broken in g414c132 Bug: 13524 Change-Id: I4d579170f925749aa9e7a6015ff17dee08d6e445 Reviewed-on: https://code.wireshark.org/review/20750 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-03-27btatt: fix conflicting entry in its value_stringAlexis La Goutte1-1/+1
Field 'Response Value' (btatt.user_control_point.response_value) has a conflicting entry in its value_string: 4 is at indices 3 (Operation Failed) and 4 (User not Authorized)) Change-Id: Idb1f023c3dde00f7dcfc8b16e91d0a15a24072dd Reviewed-on: https://code.wireshark.org/review/20740 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-27BGP: fix conflicting entry in its value_stringAlexis La Goutte1-1/+1
Field 'Type Code' (bgp.update.path_attribute.type_code) has a conflicting entry in its value_string: 29 is at indices 19 (LINK_STATE) and 20 (Deprecated)) Change-Id: Ifd0c7a2a095d2b216115b94ca0b71e0dca2213ee Reviewed-on: https://code.wireshark.org/review/20741 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-27bctp: fix conflicting entry in its value_stringAlexis La Goutte1-1/+1
Field 'BVEI' (bctp.bvei) has a conflicting entry in its value_string: 0 is at indices 0 (No indication) and 1 (Version Error Indication, BCTP version not supported)) Change-Id: I9071d3ab7aff6b2c3767f0a5596dad23f1ee4b42 Reviewed-on: https://code.wireshark.org/review/20743 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-27Fix "warning C6246: Local declaration hides declaration of the same name in ↵Michael Mann5-19/+15
outer scope" warnings Change-Id: I0dbf8d0236b163da568a173ccedc3072bd039caa Reviewed-on: https://code.wireshark.org/review/20739 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-27wslua: update a commentPascal Quantin1-1/+1
Change-Id: I8ccb3f00ab3ed2eea770acb7541b64ec07749d6b Reviewed-on: https://code.wireshark.org/review/20745 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-03-27ISUP: use proto_append_item_textAlexis La Goutte1-181/+103
Change-Id: Ie17717cbc7d175c3515a155517225a9babb9b5bd Reviewed-on: https://code.wireshark.org/review/17515 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-27Added Heuristic dissectors for the following UMTS FP channels:S. Shapira1-0/+295
HS-DSCH Type 1, HS-DSCH Type 2 Change-Id: Id4177d6ce6978b405aa213122f4629467cb249d8 Reviewed-on: https://code.wireshark.org/review/20701 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-27sharkd_session.c: warning C6031: Return value ignored: 'sscanf'Michael Mann1-1/+2
Change-Id: I32f56b7b351d7096b4e97f7c61db1af8d0b3b6f0 Reviewed-on: https://code.wireshark.org/review/20729 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-27netflow: Add Classification Engines typesAlexis La Goutte1-2/+18
Change-Id: I880044c0a91e471c8eb6f98c9ee9aede6877bed2 Ping-Bug: 13497 Reviewed-on: https://code.wireshark.org/review/20734 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-27netflow fix conflict for hf fieldAlexis La Goutte1-4/+4
'cflow.transport_rtt' exists multiple times with NOT compatible types: FT_RELATIVE_TIME and FT_UINT32 'cflow.transport_jitter_mean' exists multiple times with NOT compatible types: FT_UINT32 and FT_RELATIVE_TIME 'cflow.transport_jitter_min' exists multiple times with NOT compatible types: FT_UINT32 and FT_RELATIVE_TIME 'cflow.transport_jitter_max' exists multiple times with NOT compatible types: FT_UINT32 and FT_RELATIVE_TIME Change-Id: I3ee220646412235eb3bce58ce3a7bc0547a5a90d Reviewed-on: https://code.wireshark.org/review/20735 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Uli Heilmeier <openid@heilmeier.eu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-27udpdump: fix indent (use tab)Alexis La Goutte1-1/+1
Change-Id: Ibfe9ad19d12a84794f5e84ebaf3b9de5d4e419e8 Reviewed-on: https://code.wireshark.org/review/20733 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-03-27[UMTS RRC] Added dissection of "Cell Identity"S. Shapira3-34/+85
According to TS 25.401 / 6.1.5 Cell Identifier Change-Id: I74996e76328f536dec0d34aa8229a1074ed47187 Reviewed-on: https://code.wireshark.org/review/20709 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-27packet-nvme: Corrected typo in keep alive string.Parav Pandit1-1/+1
This patch fixes typo in keep alive admin queue command string from "kepp" to "keep". Change-Id: If4b01d9d78628978b8db2c39d203cf1e153bfdf2 Tested-by: paravpandit@yahoo.com Reviewed-on: https://code.wireshark.org/review/20731 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-27netscreen.c: Suppress compiler warnings on WindowsMichael Mann1-0/+3
Change-Id: I6920b7ab5862db46c56a85198f97dced842f14d5 Reviewed-on: https://code.wireshark.org/review/20723 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-27netscaler.c: use dynamic memory for temporary buffer in nstrace_read_v30.Michael Mann1-1/+9
Makes Windows vscodeanalysis a little happier. Change-Id: Ie744e91ab3f2a9744ae21c932ab6ea25467ad2fa Reviewed-on: https://code.wireshark.org/review/20724 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-27Check for return value of WSAStartup on all executables.Michael Mann6-6/+43
Windows vscodeanalysis complains even though the event is probably very unlikely. Change-Id: Iafe158eea5586908209d6bfe1e45540117558673 Reviewed-on: https://code.wireshark.org/review/20727 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-27bluetooth_device_dialog.cpp: warning C6246: Local declaration of 'item' ↵Michael Mann1-1/+0
hides declaration of the same name in outer scope Change-Id: If6d2cf5d193b45d972534a3064fea7d290eac7f4 Reviewed-on: https://code.wireshark.org/review/20726 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-27packet-ieee80211.c: Use dynamic memory for AIRPDCAP_KEYS_COLLECTIONMichael Mann1-11/+11
Makes Windows vscodeanalysis a little happier. Change-Id: I4e49615bc8b1623f826e0f2b9319d71016454310 Reviewed-on: https://code.wireshark.org/review/20725 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-27sharkd_session.c: Match printf argument with datatypeMichael Mann1-9/+9
Address complaints from vscodeanalysis. Change-Id: I0943a635eb0904a5ee392f772aa21cc3b56bc3de Reviewed-on: https://code.wireshark.org/review/20728 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-27udpdump.c: warning C6262: Function uses '65608' bytes of stack: exceeds ↵Michael Mann1-1/+3
/analyze:stacksize '16384' Change-Id: I1d82c62dd30497db6a88ba3d3c973799ba7631ab Reviewed-on: https://code.wireshark.org/review/20730 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-26LLRP: Remove PARAM_TREE_ADD* macrosAlexis La Goutte1-319/+562
and make checkhf happy (no need to rewrite some wireshark function...) Change-Id: I0214e809229ac14d5ecf136f61db232c5dd50cdb Reviewed-on: https://code.wireshark.org/review/20704 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 09:50:42 +0000