aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2016-04-22Do not mix wmem and glib allocatorsPascal Quantin20-50/+37
Change-Id: I0e845668a1b9dbec93ea920a8585ecfe60f001d1 Reviewed-on: https://code.wireshark.org/review/15044 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-04-21If you allocate with wmem, free with wmem.Martin Kaiser1-1/+1
This g_free() causes a crash on my system for every capture file where names are resolved. Program received signal SIGABRT, Aborted. 0x00007ffff0347125 in *__GI_raise (sig=<optimized out>) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64 64 ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory. (gdb) bt #0 0x00007ffff0347125 in *__GI_raise (sig=<optimized out>) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64 #1 0x00007ffff034a3a0 in *__GI_abort () at abort.c:92 #2 0x00007ffff038135b in __libc_message (do_abort=<optimized out>, fmt=<optimized out>) at ../sysdeps/unix/sysv/linux/libc_fatal.c:189 #3 0x00007ffff038abb6 in malloc_printerr (action=3, str=0x7ffff0464532 "free(): invalid pointer", ptr=<optimized out>) at malloc.c:6312 #4 0x00007ffff038f95c in *__GI___libc_free (mem=<optimized out>) at malloc.c:3738 #5 0x00007fffef8cca41 in ?? () from /usr/lib/x86_64-linux-gnu/libcares.so.2 #6 0x00007fffef8ccad2 in ?? () from /usr/lib/x86_64-linux-gnu/libcares.so.2 #7 0x00007fffef8cceea in ?? () from /usr/lib/x86_64-linux-gnu/libcares.so.2 #8 0x00007fffef8d501b in ?? () from /usr/lib/x86_64-linux-gnu/libcares.so.2 #9 0x00007fffef8d3a4a in ?? () from /usr/lib/x86_64-linux-gnu/libcares.so.2 #10 0x00007fffef8d4792 in ?? () from /usr/lib/x86_64-linux-gnu/libcares.so.2 #11 0x00007fffef8d49de in ?? () from /usr/lib/x86_64-linux-gnu/libcares.so.2 #12 0x00007fffef8d4cc7 in ?? () from /usr/lib/x86_64-linux-gnu/libcares.so.2 #13 0x00007ffff4329713 in host_name_lookup_process () at addr_resolv.c:2485 #14 0x000000000053fda9 in WiresharkApplication::refreshAddressResolution (this=0x7fffffffe2f0) at wireshark_application.cpp:217 #15 0x000000000059c42d in WiresharkApplication::qt_static_metacall (_o=0x7fffffffe2f0, _c=<optimized out>, _id=<optimized out>, _a=0x7fffffffd7b0) at wireshark_application.moc.cpp:142 #16 0x00007ffff140654f in QMetaObject::activate(QObject*, QMetaObject const*, int, void**) () from /usr/lib/x86_64-linux-gnu/libQtCore.so.4 Change-Id: I20586929463259f71f325225975eec241166f123 Reviewed-on: https://code.wireshark.org/review/15047 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-04-21Link version code statically againJoão Valverde4-5/+12
This allows keeping the code-sharing with the static linking. This "fixes" a hypothetical ABI mismatch with wsutil and avoids pulling more external dependencies to wsutil than strictly necessary. A nice side-effect is that libwsutil no longer depends on version.h. Follow up to f95976eefcbeb5d24df383c29d29ef888b503945. Change-Id: I8f0d6a557ab3f7ce6f0e2c269124c89f29d6ad23 Reviewed-on: https://code.wireshark.org/review/15002 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-04-21Do not mix wmem and glib allocatorsPascal Quantin6-63/+23
Change-Id: I4bf861ed9e6b767341f2cbd4e926606d4919f2ef Reviewed-on: https://code.wireshark.org/review/15041 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>
2016-04-21DOF: Fix stack corruption due to incorrect pointer useMike Morrin1-16/+16
Bug: 12351 Change-Id: Ibf01223046697aacefd2646d98ad9d863c46fdd3 Reviewed-on: https://code.wireshark.org/review/15018 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-04-21packet-nfs: update GETDEVICEINFO op for pNFS SCSIBenjamin Coddington2-0/+184
The pNFS SCSI layout type defines additional structures to be returned for GETDEVICEINFO to refer to SCSI volumes. Update packet-nfs.c to decode these structures. Only BASE volume types have been tested. Change-Id: I8c6e283d6f98763ee505c7880dbc5ceac0e86675 Reviewed-on: https://code.wireshark.org/review/15016 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-04-21If you allocate with wmem, free with wmem (more of same).Guy Harris1-1/+1
Change-Id: I10991dcb717a38936e2b7cf2f15885b5753378d0 Reviewed-on: https://code.wireshark.org/review/15034 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-21If you allocate with wmem, free with wmem.Guy Harris1-1/+1
Change-Id: I91476c825448cbeb8b96242236aae44d92244161 Reviewed-on: https://code.wireshark.org/review/15033 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-21addr_resolv: change g_malloc to wmem_alloc.Dario Lombardo1-56/+56
Change-Id: I25d4e82d6161c26d4f560bd495293c77671e00eb Reviewed-on: https://code.wireshark.org/review/15021 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: 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-04-20packet-nfs: fix offset calculation for fs_layout_typeBenjamin Coddington1-2/+2
Change-Id: I4d0176938f977caffc09a96c44e081dbe7a0154c Reviewed-on: https://code.wireshark.org/review/15014 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-04-20packet-nfs: fix layout_blksize labelBenjamin Coddington1-1/+1
Change-Id: I81c61b9e04bc787ce2afb90db2c83a37d4f5fd44 Reviewed-on: https://code.wireshark.org/review/15015 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-04-20wmem: add foreach function to wmem_list.Dario Lombardo3-0/+29
Makes wmem_list more similar to glib lists. Change-Id: Ifadf0627791a72c4118a14f205aa1a7189894d27 Reviewed-on: https://code.wireshark.org/review/15019 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-20Kafka: several minor improvementsMartin Mathieson1-87/+233
Use a range preference for TCP ports rather than single value. Show interesting values in tree roots and/or the Info column. Use common functions to dissect some protocol fields. Change-Id: I9f5ca2565f47fc84d9c82a31511fae813542482e Reviewed-on: https://code.wireshark.org/review/14949 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2016-04-19TCP: fix was marked unused but was used [-Werror,-Wused-but-marked-unused]Alexis La Goutte1-7/+6
Change-Id: I8b78f1731ce01c3aec7fe7db310fed14984a5d53 Reviewed-on: https://code.wireshark.org/review/15001 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-19INAP: fix indent (using 2 spaces)Alexis La Goutte1-3/+3
Change-Id: I0cd96bcabf27ca93f0a84f880bfa1909e560f2da Reviewed-on: https://code.wireshark.org/review/15006 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-19gprscdr: fix indent (use 2 spaces) and modelinesAlexis La Goutte5-111/+170
Change-Id: Ic4ad431c86304aaeb931291c83debbd90ab9ce2a Reviewed-on: https://code.wireshark.org/review/15007 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-19iWARP MPA: properly handle MPA PDU length with paddingPascal Quantin1-4/+3
Bug: 12348 Change-Id: I2ed5fcce34bbdb13329ca72012f92adb641f56c6 Reviewed-on: https://code.wireshark.org/review/15005 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-04-19Support for Oracle Solaris ECP/VDP dissection based on IEEE 802.1Qbg Draft 2.1.Petr Sumbera6-0/+584
Bug: 12272 Change-Id: I9e58187695ceef089b452657d2fe60400114f522 Reviewed-on: https://code.wireshark.org/review/14866 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-04-19HTTP2: Add final RFC(7838) of HTTP Alternative Services (ALTSVC)Alexis La Goutte1-62/+21
Change-Id: I66e24f5a28ed44dc466614b09e33b85c6a957df5 Reviewed-on: https://code.wireshark.org/review/14987 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>
2016-04-19Use proper operator to find odd number (CID-1355647)Jaap Keuter1-1/+1
Use binary AND instead of modulus operator to find odd number. Change-Id: I8eb819593ead66381cbe46997aab9d31955bad0c Reviewed-on: https://code.wireshark.org/review/14993 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-18btatt: Add count of rr intervals to head of subtreemichal.orynicz1-0/+5
The root of rr intervals subtree provided no information about it's content. Add count of contained rr intervals to it. Change-Id: Ia9cb0a1dd8968643e6c6907cebe2f0336c09059d Reviewed-on: https://code.wireshark.org/review/14988 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-04-18RTP: fix decoding of padding in RFC 585 header extensionCarlos Velasco1-13/+13
Bug: 12339 Change-Id: I465e8daf2529f34ab23a614e5fdf85d48232321f Reviewed-on: https://code.wireshark.org/review/14989 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>
2016-04-18edonkey: fix 'pinfo' was marked unused but was used ↵Alexis La Goutte1-40/+40
[-Werror,-Wused-but-marked-unused] Change-Id: I136358d0fc0481da005a4e483d5b4102084a9c91 Reviewed-on: https://code.wireshark.org/review/14985 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-04-18spoolss (DCERPC): fix 'drep' was marked unused but was used ↵Alexis La Goutte1-45/+45
[-Werror,-Wused-but-marked-unused] Change-Id: I0d52992f9b35fb0bceb41800d70719c282442177 Reviewed-on: https://code.wireshark.org/review/14972 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18netlogon (DCERPC): fix 'tvb/offset...' was marked unused but was used ↵Alexis La Goutte1-12/+12
[-Werror,-Wused-but-marked-unused] Change-Id: Ibf4921fe15938fe763dd0023f09ee48c8527bd26 Reviewed-on: https://code.wireshark.org/review/14971 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18ndr (DCERPC): fix 'param' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: Ieb2b3bf6243477939b7494d95195a236dbcf3f49 Reviewed-on: https://code.wireshark.org/review/14970 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18mgmt (DCERPC): fix 'tvb/offset...' was marked unused but was used ↵Alexis La Goutte1-2/+2
[-Werror,-Wused-but-marked-unused] Change-Id: I78d030190c420559f70214da2fb34af2f10234ed Reviewed-on: https://code.wireshark.org/review/14969 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18tapi (DCERPC): fix 'offset' was marked unused but was used ↵Alexis La Goutte1-2/+2
[-Werror,-Wused-but-marked-unused] Change-Id: I1841b26d03c1d8f9ab34fa45493f8a12ea291df3 Reviewed-on: https://code.wireshark.org/review/14973 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18dcom sysact: fix 'offset' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I42b54bd9071aff2192da94bba23be59cdd7eeaa1 Reviewed-on: https://code.wireshark.org/review/14974 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18dcom: fix 'pinfo' was marked unused but was used ↵Alexis La Goutte1-2/+2
[-Werror,-Wused-but-marked-unused] Change-Id: Iabe002120dd25382be1c59cdf7d544a8c3629847 Reviewed-on: https://code.wireshark.org/review/14975 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18dcp etsi: fix 'data' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: Iba8f032678d1b26d5cf088a81a294b9a4b0c8818 Reviewed-on: https://code.wireshark.org/review/14976 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18dis: fix 'pinfo' was marked unused but was used ↵Alexis La Goutte1-2/+2
[-Werror,-Wused-but-marked-unused] Change-Id: I30e5384dff0d97ea32ea24c82a91d30c26e6023c Reviewed-on: https://code.wireshark.org/review/14979 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18distcc: fix 'pinfo' was marked unused but was used ↵Alexis La Goutte1-4/+4
[-Werror,-Wused-but-marked-unused] Change-Id: I2c469ed7eb6b6377e1c9dcfe062a3d86864316ed Reviewed-on: https://code.wireshark.org/review/14980 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18dji-uav: fix 'data' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: Ia8b0c2e68edc0c67a3370245cd344582f7dc0989 Reviewed-on: https://code.wireshark.org/review/14981 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18messenger (DCERPC): fix 'di' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I5e7ba7bfb06ecd695e120a876ebb351494e2b679 Reviewed-on: https://code.wireshark.org/review/14968 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18diameter: fix 'pinfo/vs' was marked unused but was used ↵Alexis La Goutte1-2/+2
[-Werror,-Wused-but-marked-unused] Change-Id: Ib7f1682a3cdeb8571a410db07261ff68bac03432 Reviewed-on: https://code.wireshark.org/review/14977 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18diameter (3GPP): fix 'data/pinfo' was marked unused but was used ↵Alexis La Goutte1-8/+8
[-Werror,-Wused-but-marked-unused] Change-Id: I181da3ac28f9550cff575d33992d7beceb10f025 Reviewed-on: https://code.wireshark.org/review/14978 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18dof: fix 'pi/pinfo' was marked unused but was used ↵Alexis La Goutte1-6/+6
[-Werror,-Wused-but-marked-unused] Change-Id: Iadb8e906b1581398fe8acbc40f055f71753d3359 Reviewed-on: https://code.wireshark.org/review/14982 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18dtls: fix 'data' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I919192b14159fd70bb7bf182507f1e42c3167721 Reviewed-on: https://code.wireshark.org/review/14983 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-18ecp oui: fix 'pinfo' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I434da2eef73a84f91be3adb9120006908b0c7a4f Reviewed-on: https://code.wireshark.org/review/14984 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-17wslua: fix crash on Lua errors in dissect_tcp_pdus get_len_funcPeter Wu1-3/+4
A similar problem was addressed in v1.99.10rc0-339-g82b2258, but that patch missed the get_pdu_len function. A crash could occur when get_pdu_len does not return a number or when it raises a Lua error. Change-Id: I1a42a95d88708ae3bf6e015ba8d7af4db5071a00 Reviewed-on: https://code.wireshark.org/review/14954 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-04-17[Automatic update for 2016-04-17]Gerald Combs2-14/+224
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I3e8de1dcb6cc8fbbe04a68a6488bc8c11d353972 Reviewed-on: https://code.wireshark.org/review/14951 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-17RTPS: Added an analysis field to the ACKNACK dissectionJuanjo Martin1-37/+57
A lot of people fail when interpreting ACKNACKs. I added a new field that interprets the numeric values and shows a brief sentence with the analysis. Bug: 12312 Change-Id: I89a33f04c52ebd5ca486d2e23bddb7a6646945e7 Reviewed-on: https://code.wireshark.org/review/14724 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-04-17Improve the message for duplicate dissectors for a protocol.Guy Harris1-1/+5
Report the names for the dissectors as well as the protocol and dissector table name. Change-Id: I901b396a1310f0d98b68c9499038fe2f38498ee1 Reviewed-on: https://code.wireshark.org/review/14948 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-17Get rid of trailing white space.Guy Harris1-1/+1
Change-Id: I48754b57693276cffd3a89d70c019878014623fe Reviewed-on: https://code.wireshark.org/review/14945 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-17Don't assume the HTTP dissector is being called from the TCP dissector.Guy Harris6-62/+140
It's not - it could be called from the SSL dissector or the SCTP dissector. Create separate dissectors for all of them; they can, if passed appropriate metadata in the "data" argument, process it appropriately for the type of metadata the calling tissector supplies. Bug: 12344 Change-Id: I8d9a2f3173e6de42b31993bbb6c81d161f68bf8c Reviewed-on: https://code.wireshark.org/review/14944 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-17More test-programs autotoolizingJoão Valverde2-11/+9
Change-Id: I3e16dc8c591352f19bba190d84a6ed3fe431e21f Reviewed-on: https://code.wireshark.org/review/14926 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-17make-taps.pl: Remove perl >= 5.14 requirementJoão Valverde1-1/+4
Follow up to 2226802826c4ba802696d5df274094cec3818af1. Change-Id: Icd199a692f13bf30a68f655e30d7353987b22a6c Reviewed-on: https://code.wireshark.org/review/14942 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-04-16ZigBee support for NWK unknown command status and enhanced status message in R22Chris Brandson2-0/+15
Added support for the a new Network UNKNOWN_COMMAND status value for and the added payload to the Network Status frame to hold the Command Id that is not known. Change-Id: Ia0ff890ea17c18c98eb47c15f1074df30cb9d568 Reviewed-on: https://code.wireshark.org/review/14934 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-04-16giop: change g_malloc to wmem_alloc.Dario Lombardo1-5/+5
Change-Id: I351f6c9a6d81ca8c1122d8400ea8f6a388c48450 Reviewed-on: https://code.wireshark.org/review/14929 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: Michael Mann <mmann78@netscape.net>