Commit Graph

53970 Commits

Author SHA1 Message Date
Guy Harris 4261109e1e Don't return an error string for NO_INTERFACES_FOUND.
Most callers of capture_interface_list() don't expect an error string
for NO_INTERFACES_FOUND, because that's not really an error, it's just a
statement of face (and perhaps an error of 0 should be returned), so
they don't bother freeing the error string, causing a leak.

Instead, have the one place that *did* expect it to return an error
string just put "No interfaces found" itself.

Also, have that place not check for an error string if interfaces *were*
found, as no error code or string is returned in that case.

Change-Id: I9cb8ed7ad22810b23e2251d2833d9b7ab02eec03
Reviewed-on: https://code.wireshark.org/review/3165
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-22 18:51:47 +00:00
Joerg Mayer 7bc24eda07 Add back a 'dummy' comment I removed with commit e91121e143
Change-Id: Ia21dc80c8b942fbc1a85a8990354bdaaf9dc8210
Reviewed-on: https://code.wireshark.org/review/3161
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-22 16:20:20 +00:00
Graham Bloice 2029c41f51 Fixed C++ style comment
Change-Id: Ife56bb2849b4384c8ea6af3b3913b1a0fbe9ff9e
Reviewed-on: https://code.wireshark.org/review/3160
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-22 13:55:59 +00:00
Patrice Fournier faf3261c3a Makes the RTP Player graphs work with GTK3
Change-Id: I91c689eb3a35f02f8fa4de64fb6e3337d42c9190
Partial-bug: 9891
Reviewed-on: https://code.wireshark.org/review/3090
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-07-22 11:04:07 +00:00
Daniel van Eeden 7dcb1d7e86 Update MySQL Capability flags
Change-Id: I62d0a26ec1c81efa2ee8dbefcbdb308155f64ad5
Reviewed-on: https://code.wireshark.org/review/3136
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-22 02:05:00 +00:00
Marcel Essig dacb1f652e better visibility for vx11
Change-Id: I18d51e15eb38f28cc7333f0adb17fbfd22ba09a5
Reviewed-on: https://code.wireshark.org/review/3150
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-22 02:03:32 +00:00
Gerald Combs f229aeddd2 Our users are not particpants in a comedy sketch.
In way too many places in the GTK+ code we wait for the user to do
something wrong, leap out from behind the bushes, yell "AHA!", and hit
them in the face with a herring^W error dialog.

We really need to not do that. We also shouldn't carry that behavior
over to the Qt UI.

If the user shouldn't press a button it should be disabled. Do so for
the "Compile BPF" and "Start" buttons.

Change-Id: Iad9c15951d5ae640ea82ca74d5f0c26e88bd2554
Reviewed-on: https://code.wireshark.org/review/3156
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-22 00:43:42 +00:00
Guy Harris fdff1b3b18 Don't connect to non-existent slots.
(Run-time warning, not compile-time error, alas.)

Change-Id: I002ca132d2c7cbc2cfd802438edb4509ff76bcbc
Reviewed-on: https://code.wireshark.org/review/3155
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-22 00:15:56 +00:00
Guy Harris c7a2c89e40 Rename ifListChanged to localInterfaceListChanged.
That better indicates that it reflects changes to the list of local
interfaces on the system, as supplied by libpcap/WinPcap, not to any
other interface list we maintain, such as lists of remote interfaces, or
the list of non-hidden interfaces.

Change-Id: Idf79b365e07f2e3eaa83c105ae9cd7ace54c435e
Reviewed-on: https://code.wireshark.org/review/3154
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-21 23:30:58 +00:00
Gerald Combs 59ef97dd65 [WIP] Add a conversation dialog.
Items are sorted by value.

Move common conversation code to ui/conversation_hash.[ch]. Add a
conversation_type_e enum along with convenience functions for fetching
titles, tap names, etc.

We have a single main dialog instead of a main dialog + individual
protocol dialogs. It de-clutters the statistics menu and results in
simpler code. Conversation type tabs can be added and removed within the
dialog itself. The tab list is sticky and saved with the current profile
when the dialog closes. Data can be copied as CSV or YAML.

Add a FilterAction class and a corresponding filterAction slot to
MainWindow. Use it for the Conversations context menu.

Add an addressResolutionChanged signal and related plumbing.

Get rid of the iterator members in the conversation item struct. Update
the GTK+ code accordingly.

Excercise for the reader:
- Update TShark to use the common hash code.

Ping-Bug: 9231
Ping-Bug: 8703
Ping-Bug: 6727
Change-Id: I8728d771fc5b1a85937bed9d898e53c3ecc3a544
Reviewed-on: https://code.wireshark.org/review/2987
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-21 23:19:09 +00:00
Guy Harris d81a34cc24 Have the interface "tree" directly connect to ifListChanged.
Then have the capture interfaces dialog connect only *its* code to
update *its* list of interfaces to ifListChanged, rather than connecting
a routine that then emits interfaceListChanged.

This makes it the responsibility of each widget that displays local
interfaces to connect to the ifListChanged signal.

Change-Id: Iff8e8ca4202c8784eed58c8f05175d986a16baea
Reviewed-on: https://code.wireshark.org/review/3153
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-21 23:15:49 +00:00
Guy Harris 48986f4fb9 Make the Qt version update displays when interfaces appear or disappear.
Change-Id: If1218baaae9dcd93ddb1cea81ac5457f90a57c6c
Reviewed-on: https://code.wireshark.org/review/3152
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-21 19:07:28 +00:00
Joerg Mayer 16daf0c783 Add a warning that not all command line options are implemented
Change-Id: If1b12fed6d04623a4265131a2ff666d4a937d382
Reviewed-on: https://code.wireshark.org/review/3151
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-21 18:33:54 +00:00
Gerald Combs 700a474d3b Start converting the User's Guide to AsciiDoc.
Convert the preface and introduction. Update various makefiles.

Change-Id: Id998cabadb6de458f04b7a43bdba4f98e4edb052
Reviewed-on: https://code.wireshark.org/review/3139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
2014-07-21 15:31:16 +00:00
Martin Kaiser d52f4d5e00 simplify the tree handling a bit
Change-Id: I887000ac2bb273a0cc0c41709e346e1cf52140d9
Reviewed-on: https://code.wireshark.org/review/3149
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-21 09:59:15 +00:00
Martin Kaiser bcf0ea3b21 display unused bytes as raw bytes not as ASCII string
Change-Id: I50c1ef94aff4d1067b6561c5a06a397216e49ee2
Reviewed-on: https://code.wireshark.org/review/3148
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-21 09:59:00 +00:00
Daniël van Eeden 13288b05e1 Add auth plugin to server greeting info
Change-Id: I862203c9be0cd10c72599609631629bf976a7a22
Reviewed-on: https://code.wireshark.org/review/3137
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: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-21 09:39:46 +00:00
Joerg Mayer 56a241137a Remove tools/win32-setup.sh and tools/win64-setup.sh
Change-Id: Ifdc57304a0109f60260dc73d95b0598ddca81805
Reviewed-on: https://code.wireshark.org/review/3146
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-21 01:13:21 +00:00
Joerg Mayer 494092a418 One more place with win32-setup.sh -> win-setup.sh
Change-Id: Id6738d06470da81dd18d0e80e474c9ca64169d03
Reviewed-on: https://code.wireshark.org/review/3145
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-21 01:10:25 +00:00
Joerg Mayer 075ac2e7f5 Obsolete tools/winXX-setup.sh:
- Move DOWNLOAD_TAG into config.nmake
- Call win-setup.sh directly instead of winXX-setup.sh
- TODO: Remove tools/winXX-setup.sh files

Change-Id: Ie02b6b468b4f3007f5e2b6a8282e2e6cdf7d1a70
Reviewed-on: https://code.wireshark.org/review/3144
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-21 01:04:03 +00:00
Joerg Mayer c90b642fef Pass the download tag as an argument to win-setup.sh instead as an enviroment variable
Change-Id: Id2369cec93b82f182bab9046469796f51115accb
Reviewed-on: https://code.wireshark.org/review/3143
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-21 00:22:26 +00:00
Joerg Mayer 622f06b2c2 WIRESHARK_TARGET_PLATFORM is only used inside --download code path:
Use it only there.
Update comments wrt DOWNLOAD_PREFIX
Remove trailing / at end of DOWNLOAD_PREFIX

Change-Id: Ia161d4226ff3d463bceaaf4e01de70b2db98bf3c
Reviewed-on: https://code.wireshark.org/review/3142
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-20 23:40:08 +00:00
Joerg Mayer e91121e143 Change a comment to be slightly easier to read
Reorder code to have all toplevel code in 'main'

Change-Id: Ia99830ce2ee6af46249f533d64a328d2da2ed9b8
Reviewed-on: https://code.wireshark.org/review/3141
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-20 22:33:08 +00:00
Guy Harris a3f7d1951d Get rid of #if 0'ed out includes of capture-pcap-util.h.
Change-Id: Ie3678a08ed9b3d46b22e7c59eef74e6e9636ae59
Reviewed-on: https://code.wireshark.org/review/3140
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-20 22:14:26 +00:00
Guy Harris 3a451a8724 Add qtshark_ja_JP.qm to the list of .qm files we distribute.
Change-Id: I95a724c196bd5730af96439f8854169166c59e7a
Reviewed-on: https://code.wireshark.org/review/3135
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-20 19:18:52 +00:00
Martin Kaiser b1532b21be start support for the Japanese language in the Qt version
just the framework and some simple translations

Change-Id: I7653a9c6ab26b391bfe2942d088d233996030576
Reviewed-on: https://code.wireshark.org/review/3134
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-20 18:02:33 +00:00
Gerald Combs bb53fba952 [Automatic manuf, services and enterprise-numbers update for 2014-07-20]
Change-Id: Idba0c6dc0329be1ad41e3c38139c9ed69b4e45e5
Reviewed-on: https://code.wireshark.org/review/3131
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-20 15:05:39 +00:00
Роман Донченко 696cb6c17b Use forward slashes in paths to runlex.sh
This gets rid of "MS-DOS style path detected" warnings from Cygwin.

Change-Id: Id10429669704aa371dbf56a9398947c8002260ad
Reviewed-on: https://code.wireshark.org/review/3024
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Wireshark Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-20 13:15:59 +00:00
Steev Klimaszewski 320c4f0d70 va_list can't be NULL on ARM.
Bug: 10209
Change-Id: Ibd63a530450b7d2d4ec244e91c77caa731ba63aa
Signed-off-by: Steev Klimaszewski <threeway@gmail.com>
Signed-off-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-on: https://code.wireshark.org/review/2464
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-20 00:20:31 +00:00
Martin Kaiser 450f491652 use proto_tree_add_item()
Change-Id: I7642295721e886eef4682c602ad96b61bc85b3b6
Reviewed-on: https://code.wireshark.org/review/3128
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19 14:22:38 +00:00
Martin Kaiser ab2922b7e5 simplify APPEND_OUI_NAME
Change-Id: I83aef5ebc92a7218f59bd77338058d98ffa2ed6b
Reviewed-on: https://code.wireshark.org/review/3127
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19 14:22:22 +00:00
Martin Kaiser 18dfb13c12 remove the NULL check in APPEND_BOOLEAN_FLAG
Change-Id: I15742ce73d3445ec47369d35dd0da6715b7079cf
Reviewed-on: https://code.wireshark.org/review/3126
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19 14:22:08 +00:00
Martin Kaiser 65873a921f add editor modelines
reformat

Change-Id: Idce9d34c41ce2bcbc4d5efa4699decd7f3068199
Reviewed-on: https://code.wireshark.org/review/3125
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19 14:21:53 +00:00
Martin Kaiser 8e4ae89524 simplify the tree handling a bit
Change-Id: Ie6a9c033d2de3231f810a33b032ab06fee3f68a0
Reviewed-on: https://code.wireshark.org/review/3124
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19 14:21:38 +00:00
Martin Kaiser 30239117ac fix bug 9100
object and package containers may have multiple entries

Change-Id: I032e78057aadbbe67925d07881da9f1182a24058
Reviewed-on: https://code.wireshark.org/review/3121
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19 12:55:57 +00:00
Martin Kaiser c21a8a7624 remove some more unnecessary initializations
Change-Id: I74b082b7644f36efc3dc220ff92f1bfff524c408
Reviewed-on: https://code.wireshark.org/review/3119
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19 12:21:41 +00:00
Martin Kaiser 7d0ad3f9d2 no need to initialize these pointers
Change-Id: I0791ca2fc9a7a87dafbdf15f51d9f1a9d12aa89e
Reviewed-on: https://code.wireshark.org/review/3118
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19 12:20:24 +00:00
Martin Kaiser 6885cc71d3 use gboolean for detected_drop
Change-Id: Ice0c68541604c5566cc807c17faf534cd6628262
Reviewed-on: https://code.wireshark.org/review/3117
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19 12:20:04 +00:00
Martin Kaiser 831c1f2fe1 add H.265 stream type
Change-Id: Ic8e17f949f245ad6fe26fb8078e0545fe5b35daa
Reviewed-on: https://code.wireshark.org/review/3116
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19 12:19:43 +00:00
Guy Harris f724cae763 Only ABI-check strncasecmp.h if strncasecmp() is part of the API/ABI.
Some routines Wireshark uses are present in some, but not all,
platforms; for routines that would be used on all platforms, libwsutil
provides its own implementations on platforms that lack them.

On platforms that provide a routine, that routine will not be part of
the API and ABI, and, if we do an API or ABI check using the header
libwsutil provides to declare the function on platforms that lack it, we
may have a collision between the declaration in our header and the
declaration in a system header.

There's no guarantee that we can make them match, as the declaration
might differ from platform to platform and from platform version to
platform version, so we simply leave the header file out of the check if
we have the function on the platform on which we're checking the API or
ABI.

Change-Id: I8a23e63d9e17e5c1f5a83304dbe14d1e7df22e7e
Reviewed-on: https://code.wireshark.org/review/3115
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-19 07:24:01 +00:00
Guy Harris bf514a5b3d Add casts to squelch compiler warnings.
Change-Id: I100ec30e1e9ac204e3c9225278adc8a26992542a
Reviewed-on: https://code.wireshark.org/review/3114
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-19 06:38:56 +00:00
Evan Huus 4a182d48b1 Revert part of 5cc2ab74af
nghttp2ver.h is a local header, so use "" not <>

Change-Id: I62d1aebdc7c4b66035fccbba71ec9ca2edf1f07f
Reviewed-on: https://code.wireshark.org/review/3112
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-19 01:17:35 +00:00
Guy Harris 644c1d5350 Add extern "C", to let this be used from C++.
Change-Id: I3c7d89b7aef301b49f3358ffb9b637acb00f720b
Reviewed-on: https://code.wireshark.org/review/3111
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-19 00:55:51 +00:00
Alexis La Goutte 5cc2ab74af HTTP2: Update to nghttp2 lib 0.5.0
Change-Id: Ia63c066e482f633ef5096f2341d74de749422102
Reviewed-on: https://code.wireshark.org/review/3104
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-19 00:55:08 +00:00
Fabian Raetz 4b720691c4 Fix install_desktop_files non-portability and add out-of-tree support.
Prepend $(srcdir)/ to the sources in install commands, and get rid of
the -T flag, as it's GNU coreutils install-specific; some versions of
install don't support -T at all, and FreeBSD's install has a -T flag
that takes an argument and has a completely different meaning.

Fixes bug 10292; fix came from

    http://marc.info/?l=openbsd-ports&m=140571104528980&w=2

Change-Id: I8e80d475a728a17848736be043f97d2b90a0be82
Reviewed-on: https://code.wireshark.org/review/3107
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-18 20:50:44 +00:00
Michael Mann e28a8ff5af Add some expert info to the MAC Control dissector
Partial-bug: 6121
Change-Id: If7a367671cf55793799e0d72f8846bd6fe2a2222
Reviewed-on: https://code.wireshark.org/review/3038
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-18 20:13:23 +00:00
Pascal Quantin deb1d8d07f WebSocket: increase max unmask payload size to 256K and indicate that packet is truncated is going above the new limit
Bug: 10283
Change-Id: Iea5401d02bcf50a3427dce5f2b817c3b73a7dc11
Reviewed-on: https://code.wireshark.org/review/3098
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-18 20:11:40 +00:00
Alexis La Goutte 23f25714e9 DNS: Add new opcode EDNS EXPIRE (9) for EDNS options (RFC7314)
Change-Id: I2db7bf6a80a34540aa90a3362566ac399b1c3644
Reviewed-on: https://code.wireshark.org/review/3101
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-18 20:10:20 +00:00
Kevin Cox 01359be9e4 Add better assertions for comparing integers.
Adds DISSECTOR_ASSERT_CMPINT() family of assertions which show the value
of each side of the comparison upon failure.

Change-Id: Ie6f2ba46d62fc864c08eb432c403fab8f1932d91
Reviewed-on: https://code.wireshark.org/review/3103
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-18 20:05:27 +00:00
AndersBroman 4a8b6882c3 Add casts to make the buildbot happy.
Change-Id: Ia77b86c83a6458210f913a691b707b7aa1b911d7
Reviewed-on: https://code.wireshark.org/review/3100
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-18 08:55:02 +00:00