aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-02-28u3v: use interface class and subclass in heuristic checksMartin Kaiser3-10/+7
don't access the class-specific conversation structure before we know that the packet is a U3V packet the USB dissector should fill interfaceClass and interfaceSubclass with correct values - if it doesn't that's another bug to be fixed Bug:12194 Change-Id: Ic9e73e7cb05c8887fee794e4735936caad1b7f49 Reviewed-on: https://code.wireshark.org/review/14224 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-28TCP: Added bytes sent since last PSH flagkaryrogers2-0/+48
Added tcp.analysis.push_bytes_sent to see how many bytes sent since the last PSH flag. Can be useful when analyzing application behavior and performance and bytes_in_flight gets altered by ACKs Change-Id: I8c6348de43cdb1545169d3a04773885d2411eb00 Reviewed-on: https://code.wireshark.org/review/9822 Reviewed-by: Jasper Bongertz <jasper@packet-foo.com> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-28Qt: Added geometry_state_dialog to Wireshark.proStig Bjørlykke1-0/+2
Change-Id: I8844469a1cef7e37d4ec0f7ad2aff10bac521af2 Reviewed-on: https://code.wireshark.org/review/14230 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-28Qt: Improve Show Packet BytesStig Bjørlykke4-27/+74
- Add ShowAsASCIIandControl to keep ShowAsASCII only ASCII printable. - Enable show selected when ShowAsRAW. - Use QString::fromLatin1() when ShowAs8859_1. - Don't replace null with symbol for null when ShowAsUTF8. Change-Id: I25750247160e33d342fde12e6a998e3198270acf Reviewed-on: https://code.wireshark.org/review/14220 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-28wslua: don't crash if disable_lua = true in init.luaMartin Kaiser1-0/+1
in wslua_init(), our lua instance L is set to NULL if disable_lua is true in init.lua make sure that we leave wslua_init() in this case if we don't, we crash in lua_pop(L,1); with L==NULL Program received signal SIGSEGV, Segmentation fault. 0x00007fffefb41a73 in lua_settop () from /usr/lib/x86_64-linux-gnu/liblua5.1.so.0 (gdb) bt #0 0x00007fffefb41a73 in lua_settop () from /usr/lib/x86_64-linux-gnu/liblua5.1.so.0 #1 0x00007ffff4fb50e4 in wslua_init (cb=cb@entry=0x516f40 <splash_update(register_action_e, char const*, void*)>, client_data=client_data@entry=0x0) at init_wslua.c:900 [...] Bug:12196 Change-Id: Ic338c4edcb897c0eaa9b6755bbb6c9991ec6ed02 Reviewed-on: https://code.wireshark.org/review/14228 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-28Qt: Add dialog geometry restoreStig Bjørlykke69-145/+279
Add GeometryStateDialog class to handle load and save dialog geometry. The QDialog class name will be used as window name. For shared classes the UAT name or the statistics title or abbr will be used. Change-Id: I5a019598307fb3861518f41e733de834788184d8 Reviewed-on: https://code.wireshark.org/review/14139 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-28Add .png files for Debian packaging.Thomas Dreibholz1-0/+9
Bug: 12160 Change-Id: I00771df346893c1112599f8affb9a47f9d793a87 Reviewed-on: https://code.wireshark.org/review/14199 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-28[Automatic update for 2016-02-28]Gerald Combs16-1239/+1570
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I01e2b802cce29c9390a85b2d12fe4fefef2357c2 Reviewed-on: https://code.wireshark.org/review/14225 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-28usb: fix a typoMartin Kaiser1-2/+2
... and the copy of it that I just made :-( bInterfaceProtocol should be bInterfaceSubClass Change-Id: Ic25f28cad7305986cb79ddea5110b1e739e57101 Reviewed-on: https://code.wireshark.org/review/14223 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-02-28usb: resolve some subclasse codes of interface class miscMartin Kaiser1-0/+19
Change-Id: I597fa87248caf77b3622065bc4dbdaa66cee809a Reviewed-on: https://code.wireshark.org/review/14222 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-02-28u3v: clean up the heuristic checkMartin Kaiser1-9/+10
check for the minimum lenght before dereferencing data add a NULL check for usb_conv_info Change-Id: I91014d5929f57cc9eed2bfc7adef9f89541ece45 Reviewed-on: https://code.wireshark.org/review/14221 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-02-28U3V: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-2/+2
Change-Id: Ie86aba59e95ed739b07fcb9f596fa206bf9793f5 Reviewed-on: https://code.wireshark.org/review/14217 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-02-28Typo in packet-gsm_a_dtap.cRustam S1-1/+1
Bug: 12186 Change-Id: Ib73ee78ba732f5ed88f596a72146a75efa47cebd Reviewed-on: https://code.wireshark.org/review/14198 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-02-28packet-amqp.c: Fix multiple fields with incompatible typesMichael Mann1-15/+15
Change-Id: I68b7fa0b5d7fae86289807d7ef01a2141dcb8ff6 Reviewed-on: https://code.wireshark.org/review/14059 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-28gryphon: fix 'gryphon.reserved' exists multiple times with NOT compatible ↵Alexis La Goutte1-44/+28
types: FT_BYTES and FT_UINT32 Change-Id: Ia2ef8c4211ca717d6e99f596cd7f2de92d5aa7ca Reviewed-on: https://code.wireshark.org/review/14202 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-28LLDP: Add 802.3 TLV Energy Efficient Ethernet (Subtype 5)Alexis La Goutte1-0/+49
Bug:12165 Change-Id: I341d4387227a41af826a2867b48a53eff7e1e62a Reviewed-on: https://code.wireshark.org/review/14200 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27SPRT: fix 'sprt.payload' exists multiple times with NOT compatible types: ↵Alexis La Goutte1-4/+4
FT_NONE and FT_UINT32 Change-Id: Ie6c6f71e413463f93924c1a47b908a1c97d94407 Reviewed-on: https://code.wireshark.org/review/14209 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27Zbee (nwk): fix 'zbee_nwk.multicast' exists multiple times with NOT ↵Alexis La Goutte1-1/+1
compatible types: FT_UINT8 and FT_BOOLEAN Change-Id: I5947b0543e0b6270cbef69184360c19e2d25c8e0 Reviewed-on: https://code.wireshark.org/review/14205 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27irda: fix 'irlmp.xid.name' exists multiple times with NOT compatible types: ↵Alexis La Goutte1-1/+1
FT_BYTES and FT_STRING Change-Id: I93215bd126dab1e7b6207f8510c7ce9b116637a3 Reviewed-on: https://code.wireshark.org/review/14203 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27ZEP: fix 'zep.seqno' exists multiple times with NOT compatible types: ↵Alexis La Goutte1-1/+1
FT_STRING and FT_UINT8 Change-Id: I8d39436efaa5b561a95b08b5849b200a51e3c981 Reviewed-on: https://code.wireshark.org/review/14204 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27Zbee (zcl se): fix 'zbee_zcl_se.ke.cert.type' exists multiple times with NOT ↵Alexis La Goutte1-1/+1
compatible types: FT_UINT64 and FT_UINT Change-Id: I493491f4e93556ccff95abe69cc2ecce1f9f28b2 Reviewed-on: https://code.wireshark.org/review/14207 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>
2016-02-27BOOTP: Add preference to determine endianness of UUID.Michael Mann1-4/+18
Spec doesn't appear to explicitly state endian format. Bug: 11544 Change-Id: I601d94523199bc3f9ce4f573d9976e328d9c816a Reviewed-on: https://code.wireshark.org/review/14201 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-27Zbee (Security): fix 'zbee.sec.key' exists multiple times with NOT ↵Alexis La Goutte1-1/+1
compatible types: FT_BYTES and FT_UINT8 Change-Id: If6f61c973baf02abda640553febab91b8f4f5fe6 Reviewed-on: https://code.wireshark.org/review/14206 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27sFlow v5: Add original packet header length to protocol tree.Pavel Odintsov1-2/+8
Change-Id: I05af7d55fac139b462895d3a219c94ea2e8359c4 Reviewed-on: https://code.wireshark.org/review/13982 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-27Fix names of SSLv2 RC2 cipher suitesBertrand Bonnefoy-Claudet1-2/+2
The previous naming for suite 0x040080 was wrong according to [1] and [2]. It is an export suite but its name did not reflect that. This also removes the extra "CBC_" in both RC2 cipher suites as it seems more consistent with other names, the specification and OpenSSL. [1] https://github.com/openssl/openssl/blob/OpenSSL_1_0_2-stable/ssl/ssl2.h#L95 [2] http://www-archive.mozilla.org/projects/security/pki/nss/ssl/draft02.html Change-Id: I4a62463fdd7b0733a9652f8ab601848b26977c28 Reviewed-on: https://code.wireshark.org/review/14197 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27GTK: make dist fixupsJoão Valverde2-16/+31
Change-Id: I6e83335cd3c6c77a77f5d77c2e1edc36afd0fbed Reviewed-on: https://code.wireshark.org/review/14153 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-27Lua configure.ac improvementsJoão Valverde1-1/+12
Use PKG_WIRESHARK_CHECK_SYSTEM_MODULES for consistency with other system dependencies. Give slightly more informative configure messages other than multiple 'checking for LUA'. Check for headers using pkg-config to avoid undefined symbols in config.h. Change-Id: I8d3df9ccf6f718d7d055da4f713af60d46d89e33 Reviewed-on: https://code.wireshark.org/review/14173 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-27wtap (opttypes.h): fix no newline at end of file [-Wnewline-eof]Alexis La Goutte1-1/+2
Change-Id: I5bdd42bce983cd874597f4675afe4c8b2790e0f6 Reviewed-on: https://code.wireshark.org/review/14196 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-27TCP: Use MIDDLE DOT for the flag placeholder.Gerald Combs1-6/+8
If you apply tcp.flags.str as a column you end up with a Wall Of Asterisks. Use Unicode MIDDLE DOT as a placeholder instead. Change-Id: I3e2bebd2a951cc516399e965ace6bf87501adc9e Reviewed-on: https://code.wireshark.org/review/13855 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27Have the interface list unsorted by default.Guy Harris1-1/+3
That way, they initially show up in pcap's order, putting the preferred interface at the top. If the user wants to sort them by some column, the user can click on the column in question. Change-Id: I30ac38519c42ae5317d99fdd0a079b030e6af308 Reviewed-on: https://code.wireshark.org/review/14194 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-27Fix appending the list of remote interfaces.Guy Harris1-2/+3
Don't assume if_list is non-null when append_remote_list() is called; it won't be, if we didn't find any local interfaces. Have append_remote_list() return the final if_list value, and assign it to if_list. Change-Id: I05586d5b034f3d61aa38a20f6c6d2c69117b367e Reviewed-on: https://code.wireshark.org/review/14191 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-27Replace extcap_interface_list() with append_extcap_interface_list().Guy Harris3-38/+43
Pull the "rebuild the list of extcap interfaces and, optionally, return a list of if_infos for them" into a separate extcap_reload_interface_list() routine, call it in the cases where we don't want the if_infos list, and have append_extcap_interface_list() call it, asking it for the if_infos list, and then append the interfaces to that list. Change-Id: I07478ab133859484b3e0916144971639f961224b Reviewed-on: https://code.wireshark.org/review/14189 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-27Put the extcap interfaces at the *end* of the interface list.Guy Harris3-19/+37
The list should start with the native local interfaces, as returned by pcap, so that we default to the interface pcap gives first, rather than to whatever extcap interface happens to be at the beginning. This also means that, if we're only calling extcap_interface_list() to regenerate our internal data structures, we don't bother allocating - and leaking! - a list of if_info structures. Change-Id: Ida651b5b081883f118a300b9f57403f2dc5c4363 Ping-Bug: 12183 Reviewed-on: https://code.wireshark.org/review/14187 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-26Ensure we have a name resolution block when parsing its block type.Michael Mann1-1/+6
Bug: 12174 Change-Id: I82eb0ac75f2e03f15c2f016e9b7ff72fdc7044f5 Reviewed-on: https://code.wireshark.org/review/14179 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-26Clean up setting *err_str to NULL.Guy Harris1-5/+1
Just do it upfront. Change-Id: I5305882b8efd080fcb3e8ea626e09f4682729702 Reviewed-on: https://code.wireshark.org/review/14185 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-26packet-nsh.c - Look for correct ethernet dissector name.Michael Mann1-1/+1
Bug: 12180 Change-Id: If089ad49a27de2a681490ef75aaa9a7b7e5ad922 Reviewed-on: https://code.wireshark.org/review/14184 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-26Add free_address_wmem(), fix warnings [-Wcast-qual]João Valverde56-396/+397
Try to improve address API and also fix some constness warnings by not overloading the 'data' pointer to store malloc'ed buffers (use private pointer for that instead). Second try, now passing test suite. Change-Id: Idc101cd866b6d4f13500c9d59da5c7a38847fb7f Reviewed-on: https://code.wireshark.org/review/13946 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-26Fix indentation.Guy Harris1-1/+1
Change-Id: I201c35e1f6dfdb67a68dbc0ee684e0231842f00b Reviewed-on: https://code.wireshark.org/review/14182 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-26Fix nmake build for extcap apps.Michael Mann1-4/+4
Change-Id: I09c4ae9a6b05f82b0fdc2271559d715148611e18 Reviewed-on: https://code.wireshark.org/review/14177 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-26cmake: fix parallel docbook buildPeter Wu3-6/+7
Let targets depend on the generate_developer-guide.xml target instead of the developer-guide.xml output file. Change-Id: I66106ad69c9baedbd58a008b4dbbbf93b787c2c2 Reviewed-on: https://code.wireshark.org/review/14156 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-26Empty out InterfaceTree::updateGlobalDeviceSelections() if no pcap.Guy Harris1-5/+4
It doesn't even need to bother checking the argument. Change-Id: I2cdc9d7da24392ff3fae84e31442530c2e854734 Reviewed-on: https://code.wireshark.org/review/14174 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-26Mark a variable unused when we're not using it.Gerald Combs1-1/+4
Change-Id: I020447859114551e71810bf17ba05dc353a1ff08 Reviewed-on: https://code.wireshark.org/review/14171 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-26tcp_stream_dialog: Integer overflow in Average Throughputkkoizumi1-1/+1
Overflow occurs in the TCP Stream Graphs window when Average Throughput exceeds 20-30 Gbps. * Screenshot examples https://raw.githubusercontent.com/koizumi-k/pub/master/misc/stream1-current-win64.png https://raw.githubusercontent.com/koizumi-k/pub/master/misc/stream2-current-win64.png Change-Id: I4e557fdeae659ef27b986fca18c74cc8983fe4d3 Reviewed-on: https://code.wireshark.org/review/14163 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-02-26Qt: Update selected interface filter behavior.Gerald Combs11-160/+278
Change the selected interface behavior in the main window and the capture interfaces dialog to better handle multiple selections. Attempt to document this at the top of interface_tree.cpp. Move the default capture filter code from CaptureFilterEdit to MainWelcome. Add a "conflicting filter" check to CaptureEdit which updates the placeholder text. Handle conflicting filters in the main welcome screen and the capture interfaces dialog. Propagate interface selections and filter updates in the capture interfaces dialog to the main welcome screen. Consolidate some of the interface handling code in InterfaceTree and CaptureInterfacesDialog. Make sure CaptureInterfacesDialog manages the global capture options by device name instead numeric index. Start deprecating prefs.capture_devices_filter and capture_dev_user_cfilter_find. Change some member function names so that they're hopefully more clear and consistent. Ping-Bug: 11886 Change-Id: I63b06dbae29c2c45ee9252092ad54bdcbacae6e6 Reviewed-on: https://code.wireshark.org/review/14129 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-26HTTP: Fix full_uri when using a ProxyUli Heilmeier1-3/+10
When the HTTP request is transmitted to a Proxy the URI is already a "full URI". Bug was reported by Thomas Baudelet. Bug: 12176 Change-Id: I83f6bdef6fa96233792c6bbe54caad38df0f5fb6 Reviewed-on: https://code.wireshark.org/review/14142 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-26Update README.plugins to remove deprecated nmake referencesGraham Bloice1-57/+16
Change-Id: I259fe24e6dca7679f22492161b0c4cd97c7521de Reviewed-on: https://code.wireshark.org/review/14145 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-02-26extcap: Fix noinst headerRoland Knall1-1/+1
Change-Id: I2b4c6eda29a6a8198993f577c42741729ed39538 Reviewed-on: https://code.wireshark.org/review/14160 Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-26snmp: Decode msgSecurityParameters ASN.1 headerStig Bjørlykke2-4/+8
Decode ASN.1 identifier and length to get correct offset to msgSecurityParameters. Bug: 12181 Change-Id: Icf83616ac0a63e1d48652738942fe339dd165cab Reviewed-on: https://code.wireshark.org/review/14158 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-26extcap: move windows functions into extcap-baseDario Lombardo7-137/+103
Change-Id: Iec7fed027a24992afd673b09c32470af51739ae5 Reviewed-on: https://code.wireshark.org/review/14075 Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-26debian: Override some lintian warningsBalint Reczey3-0/+8
Change-Id: Id262cfa7577fe45b360399d5e4a9de0ea002bf67 Reviewed-on: https://code.wireshark.org/review/14155 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 23:04:12 +0000