Age | Commit message (Collapse) | Author | Files | Lines |
|
Change-Id: I94c3ec81c2b88c987bc07352c6b1909d2226ee54
Reviewed-on: https://code.wireshark.org/review/14828
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Reported by Uli https://www.wireshark.org/lists/wireshark-dev/201604/msg00172.html and Benjamin https://code.wireshark.org/review/#/c/14971/
Use fix proposed by Guy https://www.wireshark.org/lists/wireshark-dev/201604/msg00176.html
Change-Id: I4ca4fc3b9a9b52217f2675cb968125d97d94ed2e
Reviewed-on: https://code.wireshark.org/review/15036
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
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: Anders Broman <a.broman58@gmail.com>
|
|
abs_length is already computed by the caller of composite_get_ptr (ensure_contiguous_no_exception).
No need to do the work another time
Change-Id: I93edd6d405b2d5afe99dc7c781ecea4b395ef7bd
Reviewed-on: https://code.wireshark.org/review/15053
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>
|
|
Change-Id: Ifde09174e50bc2a9d695ac0a823e63f645284a10
Reviewed-on: https://code.wireshark.org/review/15050
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
|
|
Change-Id: I4abee8bbf160771f88693dadd7f4658e7229c4dd
Reviewed-on: https://code.wireshark.org/review/15052
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
By putting it in this list the File->Open dialog will include an option for
*.mplog files.
Change-Id: Icf6480f7be1023650262fc1f3996a390e137cb88
Reviewed-on: https://code.wireshark.org/review/15048
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: I1ba044feb581cd00c928269c02555d31970e9a42
Reviewed-on: https://code.wireshark.org/review/14891
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: I3d099047be2a4ef0e104f5f54b6b458387e7a1f0
Reviewed-on: https://code.wireshark.org/review/14928
Reviewed-by: Christoph Schlosser <christoph@schlosser.xyz>
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Only support Type 1 and 2
Change-Id: I0d2f5b9bc59063cb77d81667fe68c37133985568
Ping-Bug:11858
Reviewed-on: https://code.wireshark.org/review/15039
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Descriptor
Ping-Bug: 11858
Change-Id: I9779ab089862c62f4f248e9b6694888368934214
Reviewed-on: https://code.wireshark.org/review/15040
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: I3acca7939466a4436e23bcf828ef94f927ce8b76
Reviewed-on: https://code.wireshark.org/review/15042
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Makes wmem_map more similar to g_hash.
Change-Id: Ia17a19ab0be8e07fbb64801d54db2ba8217a7fea
Reviewed-on: https://code.wireshark.org/review/15020
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>
|
|
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>
|
|
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>
|
|
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>
|
|
Add a static "-git" extra version tag for VCS snapshot builds, to be
replaced when running 'make-version -r'.
Change-Id: If29fca04029ed3129aa2332492dc536091049955
Reviewed-on: https://code.wireshark.org/review/15032
Reviewed-by: João Valverde <j@v6e.pt>
|
|
If the file '.git/wireshark-disable-versioning' exists then version.h
will be commented out.
Change-Id: If481b673463408a69c2ecf7c2e66d08c5855537f
Reviewed-on: https://code.wireshark.org/review/14932
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: João Valverde <j@v6e.pt>
|
|
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>
|
|
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>
|
|
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>
|
|
Change-Id: I10991dcb717a38936e2b7cf2f15885b5753378d0
Reviewed-on: https://code.wireshark.org/review/15034
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: I91476c825448cbeb8b96242236aae44d92244161
Reviewed-on: https://code.wireshark.org/review/15033
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
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>
|
|
The conversation dialog does this, and we must do so to, in order to
fetch the initial setting of the name resolution flag.
Bug: 12353
Change-Id: I7ee97960216ff89a612c076edcfaad8e547a27d9
Reviewed-on: https://code.wireshark.org/review/15029
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
Change-Id: I98d333f2898d224d4e69e4ad87ae574d68dda048
Reviewed-on: https://code.wireshark.org/review/15022
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
does not exist.
Change-Id: Ic6bc15d282f016965ef0da4e7574ef3a6080a6f8
Reviewed-on: https://code.wireshark.org/review/15013
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Found by valgrind:
==14298== at 0x4C2CE8E: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==14298== by 0xA66C6AE: g_realloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
==14298== by 0xA63BB32: ??? (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
==14298== by 0xA63BEB7: g_array_append_vals (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
==14298== by 0xA193252: wtap_optionblock_add_option (wtap_opttypes.c:352)
==14298== by 0xA19361C: shb_create (wtap_opttypes.c:607)
==14298== by 0xA192F96: wtap_optionblock_create (wtap_opttypes.c:126)
==14298== by 0xA168784: wtap_open_offline (file_access.c:824)
==14298== by 0x11D47C: cf_open (tshark.c:4194)
==14298== by 0x117852: main (tshark.c:2183)
et al.
Change-Id: Ic16595ed3c12b9ed6c2813852ceb594c29ece929
Reviewed-on: https://code.wireshark.org/review/15004
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: Michael Mann <mmann78@netscape.net>
|
|
Change-Id: I8b78f1731ce01c3aec7fe7db310fed14984a5d53
Reviewed-on: https://code.wireshark.org/review/15001
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: I0cd96bcabf27ca93f0a84f880bfa1909e560f2da
Reviewed-on: https://code.wireshark.org/review/15006
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: Ic4ad431c86304aaeb931291c83debbd90ab9ce2a
Reviewed-on: https://code.wireshark.org/review/15007
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
be provided by Npcap as well
Change-Id: Ib7baca247a407101f44c5b610903f4a1293f9119
Reviewed-on: https://code.wireshark.org/review/15003
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
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>
|
|
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>
|
|
QT ships with a base set of translated terms (qt_xx.qm). Therefore
we don't need to add these terms (like "Ctrl" or "Down") used in
shortcuts to the wireshark_xx.ts files.
The ts files are generated by running lupdate.
To get the new ts files (without the shortcut terms) it is necessary
to run lupdate with option "-no-obsolete".
Change-Id: I6346a866ae9a1b58fa23ea089c43c90ec0dc0225
Reviewed-on: https://code.wireshark.org/review/14848
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>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
|
|
There is 68 generic error exit codes + 45 specific error codes.
Total: 113 error codes, so it is possible to have all specific
exit codes in future - max is 254 (UNIX limitation).
Change-Id: I798bf77b03031a701e90272d01e90b04e7e31940
Reviewed-on: https://code.wireshark.org/review/14763
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
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>
|
|
Change-Id: I849b16597829212b195bd75a2aab8e1db49f1ccf
Reviewed-on: https://code.wireshark.org/review/14827
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
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>
|
|
It's not guaranteed to be a C string, so don't call it "str".
Change-Id: I614ccf4f87b9f6f58d9b72596827224006f1de30
Reviewed-on: https://code.wireshark.org/review/14998
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Use wtap_read_bytes() which will return WTAP_ERR_SHORT_READ if we don't
get the specified number of bytes. Treat all errors *other* than
WTAP_ERR_SHORT_READ as an I/O error.
Change-Id: If38b5ad1b142441f2f2dd356be196bf381058da4
Reviewed-on: https://code.wireshark.org/review/14997
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
There's no need for an open routine to seek back to the beginning of the
file - the file open code has done that already.
Change-Id: I4053474e60e7c8e8f59a89503d4bb08499d9399e
Reviewed-on: https://code.wireshark.org/review/14996
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
And *any* EOFs in the seek-read routine.
Change-Id: I5742c7bbd782e59e9c64e4821f22c706ddbc5382
Reviewed-on: https://code.wireshark.org/review/14995
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
We just care whether the first 6 bytes of the file are "MPCSII";
memcmp() will do that, and we don't have to worry about NULs.
Change-Id: I03872c30e76eedce67577657270e36f0795e74bd
Reviewed-on: https://code.wireshark.org/review/14994
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: I41f8b0b27390788b76919791ba03bf97d699a623
Reviewed-on: https://code.wireshark.org/review/14992
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
|
|
Make it easier to link the hex with ascii bytes. The background color
will become yellow for bytes with the mouse focus.
Bug: 11547
Change-Id: Iab87e598a302ecf7bb7b37cd6ad55ea291c02b82
Reviewed-on: https://code.wireshark.org/review/14716
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>
|
|
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>
|