aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2016-03-02Add missing break.Guy Harris1-0/+1
Don't fall through and re-dissect the control byte of an S frame as if it were a UI frame. Change-Id: I17cf12f920bf066f87f70be5efe78dc531beb3f9 Reviewed-on: https://code.wireshark.org/review/14284 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-02Universally use tvb_new_subset_length() rather than tvb_new_subset().Guy Harris1-3/+3
Leave the job of computing the captured length up to the tvbuff code. Change-Id: If88e813ba7dee3516baf958b9fead26374d915ad Reviewed-on: https://code.wireshark.org/review/14276 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-02Rename some variables to make the relationship between lengths clearer.Guy Harris1-28/+28
"llc_data_length" is what's left of "length" after the CRC is removed; 'llc_data_captured_length" is what's left of "captured_length" after the CRC is removed. Change-Id: I9371a5d3004632d684093b2650fa0bf8fc1f9bde Reviewed-on: https://code.wireshark.org/review/14275 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-01eap-sim: add identity in response only.Dario Lombardo1-1/+1
Change-Id: I352600ac8895358816ebb561e5ac841a3498892b Reviewed-on: https://code.wireshark.org/review/14267 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-03-01RTITCP: Fixed header length when using the CRCJuanjo Martin1-5/+6
Before, the function get_rtitcp_pdu_len didn't take into account the case where the CRC is sent (header_length is increased by 8). This has been fixed. Change-Id: I3eb22ec2aadc7406ccdcfcc8a5beaa98b48ed143 Reviewed-on: https://code.wireshark.org/review/14265 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-03-01CMake: Add more structure to libwireshark buildJoão Valverde15-1607/+1958
Smaller epan/CMakeLists.txt is easier to work with and this structure is well suited to CMake. It should make it easier to manage and configure each epan module differently if necessary. Change-Id: Ia649db3b7dcd405aa43dbdba3288699d5e375229 Reviewed-on: https://code.wireshark.org/review/14068 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-01ieee802154: fix Uninitialized argument value found by Clang AnalyzerAlexis La Goutte1-1/+1
Change-Id: I71282d6ef15802700f6e58308f1d8e89fe9bd24c Reviewed-on: https://code.wireshark.org/review/14262 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-01L2TP: Added AVPs from RFC 5515Uli Heilmeier2-0/+282
Basic dissection of AVPs from RFC 5515. Ping-Bug: 12208 Change-Id: Ie16073378a66a81f8378eab7a83988ef9e8a5c88 Reviewed-on: https://code.wireshark.org/review/14246 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-03-01FC: Forget about MDS when dealing with ETHERTYPE_BRDWALK (CID 280012)Jaap Keuter1-3/+1
Since the MDS trailer is smaller anyway, no need to copy that code. Change-Id: Ie3931cda3ef2386526cd81daee535d106e522875 Reviewed-on: https://code.wireshark.org/review/14253 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-29802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IEChris Brandson2-30/+423
Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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-29Support dissecting the TLV data format specified for Lwm2mChristoph Burger-Scheidlin4-0/+433
Lightweight M2M is a protocol on top of CoAP that is used for device management. The specification contains a custom payload format - a simple type, length, value binary encoding. This patch adds support for dissecting this payload format. While not yet officially registered, the main open source implementation of the lwm2m protocol - eclipse's leshan - uses this content type 1542 for its messages. Bug: 12110 Change-Id: Ib022d1f485c706f1d69ceec7200790448d080965 Reviewed-on: https://code.wireshark.org/review/13835 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-29PIDL: regen pidl-generated dissectorsAurelien Aptel17-618/+210
mapi&nspi dissectors skipped on purpose since they the output is malformed. This was already the case before the samba sync. Change-Id: Ib3b78459e3506c755aaa219433ac6b5865482f01 Signed-off-by: Aurelien Aptel <aaptel@suse.com> Reviewed-on: https://code.wireshark.org/review/13968 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-29Only say we have a new resolved MAC address if it's actually *new*.Guy Harris1-3/+5
If we aren't changing the resolved name, it's not new. This prevents us from perpetually "resolving" the address. If we have ARP packets that cause us to map a MAC address to a host name, based on the ARP packet saying the MAC address corresponds to a given resolved IP address, then each time we dissect the packet, the address will be "resolved" - and each time we have new resolved addresses as a result of that, we'll redissect the displayed packets so that they show the resolved address, and we'll forever be redissecting. Change-Id: I445e92f407d52a4ed5986721ffcc472f86e99431 Reviewed-on: https://code.wireshark.org/review/14236 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-29DISv7: parse PDU Status fieldalpartis1-2/+218
Section 6.2.67 in IEEE 1278.1-2012 defines PDU Status bit field in the PDU Header. The bit meaning varies with the PDU type. This change provides full parsing and presentation for all fields and PDU types. Bug: 12043 Change-Id: I8f4ef6606ff59a1ef0ed97630c4832b2b6a4dff7 Reviewed-on: https://code.wireshark.org/review/14232 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-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-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-28[Automatic update for 2016-02-28]Gerald Combs2-3/+78
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-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-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-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-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 Valverde39-290/+332
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-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-26snmp: Decode msgSecurityParameters ASN.1 headerStig Bjørlykke1-3/+5
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-25Clean up modelines and indentation.Guy Harris11-64/+63
HT tab stops are set every 8 spaces on UN*X; UN*X tools that treat an HT character as tabbing to 4-space tab stops, or that even are configurable but *default* to 4-space tab stops (I'm looking at *you*, Xcode!) are broken. tab-width: 4, tabstop=4, and tabSize=4 are errors if you ever expect anybody to look at your file with a UN*X tool, and every text file will probably be looked at by a UN*X tool at some point, so Don't Do That. Adjust indentation to reflect the mode lines. Change-Id: Icf0831717de10fc615971fa1cf75af2f1ea2d03d Reviewed-on: https://code.wireshark.org/review/14150 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-25GRE: call ID not always decodedAlexis La Goutte1-1/+1
Always decode Call ID (and payload length) when Version is Enhanced GRE (and no ACK flag) Issue reported by Duncan Salerno Bug:12149 Change-Id: I2f61dd6851e26cc93174f96e05c0055fc45be4e2 Reviewed-on: https://code.wireshark.org/review/14088 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-25Sort the pixel formats.Guy Harris1-340/+340
(qsort() is your friend.) Change-Id: I71ab5fea0c8c0f548d737f5d5d1b7523b8a668ea Reviewed-on: https://code.wireshark.org/review/14137 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-25Fix build with CFLAGS="-g -Og" [-Werror=maybe-uninitialized]João Valverde1-1/+2
packet-flexray.c: In function ‘dissect_flexray’: packet-flexray.c:245:6: error: ‘flexray_frame_tree’ may be used uninitialized in this function [-Werror=maybe-uninitialized] expert_add_info(pinfo, flexray_frame_tree, &ei_flexray_frame_payload); ^ cc1: all warnings being treated as errors Change-Id: Iadcae49e7d958823ae7066906892f6c1ae85169b Reviewed-on: https://code.wireshark.org/review/14124 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>
2016-02-25Cleanup CMakeLists.txt indentation and use lower case function namesJoão Valverde2-62/+60
Change-Id: Ie94d2e9b6b4975d7caec10c3ce472cafe1eefd62 Reviewed-on: https://code.wireshark.org/review/14120 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: Anders Broman <a.broman58@gmail.com>
2016-02-25u3v: dissector for the USB3 Vision protocolThies Moeller3-0/+2757
Dissector for the USB3 Vision machine vision camera protocol. * Descriptors * Bootstrap registers * Control (GenCP) * Stream data A sample capture (usb_u3v_sample.pcapng) has been uploaded to https://wiki.wireshark.org/SampleCapture USB3 Vision a standard developed under the sponsorship of the AIA for the benefit of the machine vision industry. U3V stands for USB3 Vision (TM) Protocol Change-Id: If1206df7974c6a91cf18f59ddecf9d38b9827934 Reviewed-on: https://code.wireshark.org/review/14008 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: Anders Broman <a.broman58@gmail.com>
2016-02-25CIP: Improve error checkingD. Ulis1-156/+84
1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-25diameter: change GArray into wmem_array.Dario Lombardo1-14/+26
This change fixes a leak in packet-diameter that loads a dictionary but doesn't free all the data. Found by valgrind. ==30481== 36,656 (960 direct, 35,696 indirect) bytes in 24 blocks are definitely lost in loss record 3,417 of 3,421 ==30481== at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==30481== by 0xA7FE610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==30481== by 0xA81422D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==30481== by 0xA7CDC44: g_array_sized_new (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==30481== by 0x6863743: dictionary_load (packet-diameter.c:1980) ==30481== by 0x6863743: proto_register_diameter (packet-diameter.c:2344) ==30481== by 0x71C4BA4: register_all_protocols (register.c:323) ==30481== by 0x65EEFA7: proto_init (proto.c:521) ==30481== by 0x65CD621: epan_init (epan.c:126) ==30481== by 0x115330: main (tshark.c:1220) Change-Id: I3c0d19e1accab415355aa0f50c598f0c83356985 Reviewed-on: https://code.wireshark.org/review/13821 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-25sFlow: Add lag_port_stats (format 7)Alexis La Goutte1-0/+163
Bug:10501 Change-Id: I8d77c41537f1bfed9b5fbc585119496ec73c06eb Reviewed-on: https://code.wireshark.org/review/14123 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.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-24Improve epan/Makefile.am readabilityJoão Valverde1-16/+37
Change-Id: I317f788a6301df1db63ba6b82806849c61af9a05 Reviewed-on: https://code.wireshark.org/review/14118 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-24packet-nfs: do not call g_hash_table_remove before g_hash_table_insertTigran Mkrtchyan1-8/+1
The g_hash_table_insert will remove and deallocate existing entry, so we don't need to do it at all. Change-Id: I661cadd8beea9585885e48c03a8b52561d1df778 Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> Reviewed-on: https://code.wireshark.org/review/14113 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-24packet-nfs: fix double-freeTigran Mkrtchyan1-19/+2
fixes regression introduced by f5340b2 g_hash_table_remove will call free on object, thus there is no need for explicit g_free, as is causes a double-free: *** Error in `/usr/sbin/wireshark-gtk': double free or corruption (fasttop): 0x0000555556e6bf50 *** ======= Backtrace: ========= /lib64/libc.so.6(+0x77da5)[0x7fffef80ada5] /lib64/libc.so.6(+0x804fa)[0x7fffef8134fa] /lib64/libc.so.6(cfree+0x4c)[0x7fffef816cac] /lib64/libglib-2.0.so.0(g_free+0xe)[0x7ffff09665ee] /lib64/libglib-2.0.so.0(+0x388ba)[0x7ffff094f8ba] /lib64/libwireshark.so.6(+0x1cfb46b)[0x7ffff49d646b] /lib64/libwireshark.so.6(+0x1d03d99)[0x7ffff49ded99] /lib64/libwireshark.so.6(+0x173b11f)[0x7ffff441611f] /lib64/libwireshark.so.6(+0x173bba5)[0x7ffff4416ba5] /lib64/libwireshark.so.6(call_dissector_with_data+0x26)[0x7ffff4419ad6] ..... The g_hash_table_insert will remove and deallocate existing entry, so we don't need to do it at all. Change-Id: Ide47d1f9deb3e1b0d8adefd31fc6f3bf5cbaa010 Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> Reviewed-on: https://code.wireshark.org/review/14096 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 20:37:37 +0000