aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-10-13cmake: fix kerberos library lookup, support HeimdalPeter Wu3-46/+56
A build with the gold linker broke with: run/libwireshark.so.0.0.0: error: undefined reference to 'krb5_c_decrypt' Fix this my restructuring the FindKERBEROS module to use the libraries found by pkg-config. While at it, check for MIT and Heimdal instead of assuming MIT. Remove HAVE_KEYTYPE_ARCFOUR_56 as this macro is not used. Change-Id: Iab23d79bc3f25e9c0fd7203b6f050f875fb4a2b5 Reviewed-on: https://code.wireshark.org/review/10907 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-13cmake: link against dl, fixes linking with goldPeter Wu1-0/+1
wsutil/filesystem.c uses dladdr (when available), but does not declare a dependency on it. Adding it fixes a CMAKE_C(XX)_FLAGS=-fuse-ld=gold build failure: run/libwsutil.so.0.0.0: error: undefined reference to 'dladdr' This change is somehow not necessary for autotools, just for cmake. Change-Id: I642a7d85f9c33541831262f930e73d1f47c58b60 Reviewed-on: https://code.wireshark.org/review/10906 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-13ssl-utils: fix anchoring matches in keylog filePeter Wu1-2/+3
Somehow "# CLIENT_RANDOM" would also be matched by the regex. It turns out that glib requires two flags to enable anchoring. This issue also causes silent truncation of keylog lines rather than reporting no match. Change-Id: Ib51265b6ec428988c222b4f3bc3cbc99ef0d72bf Reviewed-on: https://code.wireshark.org/review/10933 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-13ssl-utils: Fix parsing pre-master-secrets in keylog-fileGergely Nagy1-5/+11
With "PMS_CLIENT_RANDOM xxxx yyyy" lines, only 32 byte long pre-master secrets could be entered, but they are 48 byte long for RSA and can be of any length for DHE cipher suites. When a line had the "RSA xxxx yyyy" format then yyyy was previously parsed with the <master_secret> regex group but it contains the pre-master secret, so now it is parsed with the <pms> group. This didn't cause a functional issue for RSA, but it couldn't be used where the pre-master secret isn't 48 byte long. After this change the regex will accept everything that was previously working. Change-Id: I71f43f3e9977a5e98758f387ad69893e8be0e27a Reviewed-on: https://code.wireshark.org/review/10923 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-13qt: add missing initializers (CID 1325722)Dario Lombardo1-1/+3
Change-Id: Ie1ed72fe2efe31db1ce5b73ac6e659ba305f4001 Reviewed-on: https://code.wireshark.org/review/10961 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>
2015-10-13Qt: Recent list context menu.Gerald Combs4-0/+103
Add a context menu to the main window recent list. Add items that let the user open each file's containing folder and copy the file path to the clipboard. When opening the folder on Windows and OS X try to highlight the file in Explorer or the Finder. Change-Id: I991e8df8ba9f1f8c6385d1a861eb40223cfdd047 Reviewed-on: https://code.wireshark.org/review/10915 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-10-12btatt: clear variable (CID 1268204)Dario Lombardo1-2/+1
Change-Id: Id4d057d730899fac14146845a530fae2525ba965 Reviewed-on: https://code.wireshark.org/review/10955 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-12inet_v6def : fix warning: redundant redeclaration of 'inet_pton' ↵Alexis La Goutte1-1/+1
[-Wredundant-decls] Change-Id: I937a65378a62be50d3d0d2f4a049b8cd73c8875c Reviewed-on: https://code.wireshark.org/review/10951 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-12Use system highlight+hover colors in the welcome screen.Gerald Combs1-14/+2
Don't override the highlight and hover colors in the recent file list in the main welcome screen. This appears to be a leftover from the pre-g8b24471 layout. Change-Id: Ia5239424340632f53f41f7f3067c798c882c069d Reviewed-on: https://code.wireshark.org/review/10957 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-12Add BASE_PT_ types to proto_registrar_dump_fields()João Valverde2-14/+8
Change-Id: Ic6b3d71c3c9a14688b55d98f402d359f69524394 Reviewed-on: https://code.wireshark.org/review/10939 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-12IPv6: Make extension headers filterableJoão Valverde1-40/+12
Change-Id: I8d36dbbe255a58b3ca1e4059a15e993155ca9ba1 Reviewed-on: https://code.wireshark.org/review/10708 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-12RTP player: Always include QPushButton.Gerald Combs1-3/+1
It looks like QPushButton gets included via ui_rtp_player_dialog.h in Qt 5 but not in Qt 4. Make sure we include it explicitly whether or not QT_MULTIMEDIA_LIB is defined. Change-Id: I8203a1cc6f7b9beef0f749b93836a75885f85edd Reviewed-on: https://code.wireshark.org/review/10962 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-12Try to fix wireless toolbar behavior on Linux.Gerald Combs2-20/+38
Split interface get and set activity into explicit getInterfaceInfo and setInterfaceInfo member functions. Make sure we connect to QComboBox "activated" signals (which are only triggered by user activity) instead of "currentIndexChanged" signals (which are triggered on any change). Hopefully this will make the wireless toolbar read-only until the user selects a combobox item. Bug: 11487 Change-Id: I236ff3f5972b0b7d543f21bb955d7892190a7814 Reviewed-on: https://code.wireshark.org/review/10918 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-12extcap: fix a bug in create_tempfile() return check (CID 1323930)Dario Lombardo1-1/+1
Change-Id: Ifacdfee5c12e676969cfe536dfeda2be93426a46 Reviewed-on: https://code.wireshark.org/review/10929 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-12Fix hfinfo_*_format_display() for BASE_PT_ display typesJoão Valverde1-0/+8
Change-Id: I1a2a988a737c6821db6ac3a2b9ee9ff48add28c2 Reviewed-on: https://code.wireshark.org/review/10935 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-12Try to fix OS X buildbot but using a different QBrush constructor in the ↵Martin Mathieson1-4/+2
cases that were failing (where implicit conversion seems to be failing) Change-Id: Id0393c2403ed953579c7d571e9880849b7dff8b3 Reviewed-on: https://code.wireshark.org/review/10952 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-10-12Include <stdlib.h> to declare exit().Guy Harris1-1/+3
Also, flag the exit() call as a Bad Idea, as is done in some other tap files. Change-Id: I4e077f5923bb36ed9c8b34aff3dda6d44b2b8721 Reviewed-on: https://code.wireshark.org/review/10950 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-12NTP: fix dissection of SHA1 based message authentication codePascal Quantin1-3/+3
The maximum MAC length is 160 bits, not 128. MAX_MAC_LEN can be safely increased as an extension should be > 4 bytes. Bug: 11580 Change-Id: I0ea5a1f85d644e57315f033f09241d7a79dd3a45 Reviewed-on: https://code.wireshark.org/review/10934 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-12Get rid of a void * in frame_data.Gerald Combs1-1/+2
Forward-declare struct _color_filter and use it in struct _frame_data. Change-Id: I4543206bc71ad1e088b60347e6deb6d87a573b35 Reviewed-on: https://code.wireshark.org/review/10914 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-11Remove duplicate transport ports from proto tree summaryJoão Valverde8-141/+152
Don't display duplicate ports if transport name resolution is not enabled (for UDP/TCP/DCCP). Also introduce col_append_port() to handle info column port display with name resolution in a uniform format. Change-Id: Icb8ac45f726b7c539b4534c62061473e9b582753 Reviewed-on: https://code.wireshark.org/review/10804 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-11IPv6: Don't call expert info under if(tree) (for options)João Valverde1-239/+237
Change-Id: I94f096a0ca487311d44a03e4183732db015605b2 Reviewed-on: https://code.wireshark.org/review/10896 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-11Back out the verbose Makefile stuff.Guy Harris1-7/+0
I give up. I don't know whether this all means our build mechanism is too fragile, our code is to fragile, autotools are too fragile, the compilers we're using are too fragile, Qt is too fragile, or C++ is too fragile, but if the build breaks that easily, maybe we should just give up on Leopard. Change-Id: If700d928da95d09ed5173b976261e4ddd236d654 Reviewed-on: https://code.wireshark.org/review/10946 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-11On 10.5, don't set GTK+ etc. versions if we haven't already set them.Guy Harris1-4/+16
When building for 10.5, if the version numbers of GTK+ and its support libraries haven't been set, don't override the settings to get older versions; that way, if you've changed macosx-setup.sh not to bother installing GTK+, this won't force it to be installed. Change-Id: Ia05f45fb6bd469b568a28a8769f3130a99180d7e Reviewed-on: https://code.wireshark.org/review/10945 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-11LTE RLC graphs - initial versionMartin Mathieson17-451/+1631
Change-Id: Ic5f2c353ae1f787ac19cb575a938cb093ff5f6dc Reviewed-on: https://code.wireshark.org/review/10930 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-10-11Handle installing Qt 4.x.Guy Harris1-8/+26
Or, at least, 4.8.6. I guess they had to do an updated build or something, as the actual dmg has "4.8.6-1", so handle that extra versioning. Clean up some white space while we're at it. Change-Id: I62b99dd99e7e5cb84cca68bdc59b02e4bf65411f Reviewed-on: https://code.wireshark.org/review/10943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-11[Automatic update for 2015-10-11]Gerald Combs17-2979/+4657
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ic021a6b14deb368b9b6ee77995291c92de75426d Reviewed-on: https://code.wireshark.org/review/10936 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-11Allow TURN channeldata to be padded on both UDP and TCP.Philipp Hancke1-1/+2
Microsoft's Edge browser does this, UDP padding is a MAY in https://tools.ietf.org/html/rfc5766#section-11.5 Bug: 11584 Change-Id: I513638d8a3eb257576af3cfc8e6b81cc93b22d05 Reviewed-on: https://code.wireshark.org/review/10889 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-10-11Temporarily make cmake builds verbose, for debugging purposes.Guy Harris1-0/+7
Try to figure out why CMake builds work on the 32-bit OS X buildbot but autotools builds don't; either the compiler commands are different in ways that break the autotools build, or the config.h files are different in ways that break the autotools build, or magic pixies affect the builds in different ways that only break the autotools build. Change-Id: Id24bad04ff8ef755e4966e28fd445c2ab05c6913 Reviewed-on: https://code.wireshark.org/review/10931 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-10IPv6: Set destination address for RPL routing headerJoão Valverde1-7/+11
Change-Id: I5d83370424cc0002a0bf965138b7fbdad69557fb Reviewed-on: https://code.wireshark.org/review/10895 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>
2015-10-10Scan into a guint32 using %u.Gerald Combs1-1/+1
Change-Id: Ic0fa25f3ad78e2a1923610a17f764e1b0623eabc Reviewed-on: https://code.wireshark.org/review/10919 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-10Qt: Horizontal- and vertical-only zoom modifier keys for IO and TCP Stream ↵Jim Young6-3/+241
graphs. Use lower case "x" or upper case "X" (Shift-X) to zoom in or out respectively only the horizontal (X) axis. Use lower case "y" or upper case "Y" (Shift-Y) to zoom in or out respectively only the vertical (Y) axis. Change-Id: I2f4de3c81795c289a626cc917d46ec0b1d620f49 Reviewed-on: https://code.wireshark.org/review/10894 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-10Support in 6lowpan for RFC4944 address generationPedro Jose Marron1-5/+81
For the conversion of a 16-bit short address in 6lowpan to an IID, there are several RFCs that produce different results. RFC 4944 section 6 specifies that the conversion uses the given PAN ID and the 16-bit short address. RFC 6282, on the other hand, specifies thta the conversion only uses the 16-bit short address and no longer uses the PAN ID. The current version of the 6lowpan dissector supports only the newer RFC 6282, but there are protocols out there that assume that the address conversion still abides to RFC 4944. In order to support these protocols and following the discussion from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8970 this patch introduces a boolean preference in the 6lowpan dissector that indicates whether or not the older RFC 4944 should be used for address conversion. By default, it is set to FALSE, thus leaving the behavior of the dissector unchanged. Besides the boolean preference, another helper function lowpan_addr16_with_panid_to_ifcid has been written that implements the expected behavior from RFC 4944 using the same hint mechanism already in place in the dissector for the support of RFC 6282. Change-Id: I8d202c69a225d7b1212080a174e0111e5203553c Reviewed-on: https://code.wireshark.org/review/10902 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-09Display of reserved octet in 6lowpan IPHC headerPedro Jose Marron1-2/+14
The 6lowpan standard specifies a reserved octet in the extended header of an IP_PROTO_FRAGMENT packet in the same place used for the header length for other extension headers. The current version of the 6lowpan dissector displays the reserved octet and the rest of the header (6 more bytes) together as data, as opposed to displaying the reserved octet by itself and then the data (using the data dissector). This patch does not change the functionality of the dissector in any way, only how the 7 bytes are displayed. Instead of displaying the header information and then 7 bytes of data, it displays the reserved octet and then the data. This is also consistent with the way the ipv6 dissector displays it (showing the reserved octet and its value). For this purpose, there is a new hf (hf_6lowpan_nhc_ext_reserved) and the corresponding proto_tree calls. Also, depending on the type of extension header, the octets sent to the general data dissector are shifted by one. Change-Id: I4c7fb58a3364307e79517b979808f3e34a2e0b94 Reviewed-on: https://code.wireshark.org/review/10908 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-09nstime: fix -Wshift-negative-valuePeter Wu1-6/+2
Even if the result of the negative shift (in TIME_T_MIN) is not used because the signedness check happens before, it still causes a compile-time warning. Fix this by shifting on an unsigned value, then truncate by casting it. While at it, remove a "fix for broken SCO compiler", it might not apply to us (fingers crossed). Change-Id: Id9603149d8063e9eaaa65cf028323f10e60a6c42 Reviewed-on: https://code.wireshark.org/review/10862 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-09Make sure we can compile without QtMultimedia.Gerald Combs2-19/+24
Change-Id: I8db453a735956435fc6e2e4276961adb1f7ed11a Reviewed-on: https://code.wireshark.org/review/10892 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-09asn1.c: fix printf arguments used with DEBUG flagPascal Quantin1-1/+4
Bug: 11581 Change-Id: If960e45d5ed71abb3cadcb6dd83832b9098e11a7 Reviewed-on: https://code.wireshark.org/review/10904 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-09Add WS_DLL_PUBLIC for Address Type RegistrationPedro Jose Marron1-1/+1
Dissectors developed as plugins in wireshark that create new address types require the use of address_type_dissector_register. Without WS_DLL_PUBLIC, the function is not found when loading the plugin and wireshark refuses to initialize it. This very simple patch fixes this problem. Change-Id: I8594a7be525830dd4ab9e1b3ea633aac0a07938a Reviewed-on: https://code.wireshark.org/review/10899 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-09Now that we're using AC_PROG_CC_STDC, let it handle HP C.Guy Harris1-8/+9
AC_PROG_CC_STDC should be setting whatever flags are needed for ISO C plus extensions, including requesting C99 if available. Don't set -Ae ourselves for HP C. Change-Id: Icd4dfc0c2078586d5773075ee25c40bfc787a482 Reviewed-on: https://code.wireshark.org/review/10910 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-09airpdcap: add free_key_string function, fix memleaksPeter Wu5-10/+28
Do not leak the key and SSID. Note that there are still some leaks in the GTK UI related to get_wireshark_keys(), but I did not track them down. Caught by LeakSanitizer. Change-Id: I639166e6ea457605d6ae0ebd58e56d7594a7b7db Reviewed-on: https://code.wireshark.org/review/10860 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-09WSP: Fix add_addresses()João Valverde1-2/+2
Change-Id: I25d84c725559f5f077dcc03fb425a89d87e90f55 Reviewed-on: https://code.wireshark.org/review/10897 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-09FTP: Fix EPRT IPv6 set addressJoão Valverde1-2/+1
Change-Id: I944b3e6667027b251d0f3d894294bfda331abce2 Reviewed-on: https://code.wireshark.org/review/10898 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>
2015-10-09catapult_dct2000: code restyleDario Lombardo1-17/+7
Remove a clang 3.7 complain. Change-Id: I5237b130dcd0ffd3a4ea61a3c98fa344fddbe633 Reviewed-on: https://code.wireshark.org/review/10834 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-10-08The second argument to AC_PATH_PROGS is a list of program names.Guy Harris1-1/+1
The *third* argument is the value to use if we don't find the program; we shouldn't fall back on "python3" if we can't find "python", we should try both "python" and "python3" and just set $PYTHON to nothing if we don't find either one. Change-Id: I5168455f09bc3165c49db4334f05856dec46bf62 Reviewed-on: https://code.wireshark.org/review/10890 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-08Qt: Add a play button to the RTP Stream Analysis dialog.Gerald Combs6-11/+69
Rename the "Play Call" button to "Play Streams". Move the button creation code to a common routine. Use it to add a "Play Streams" button to the RTP Stream Analysis, similar to the GTK+ UI. Don't restrict RTP to IPv[46] as suggested by Michal. I don't have any RTP-over-Bluetooth captures so I can't test this directly. Change-Id: I4703cac1d5bf5b3ff0255d36da2c5164feb0547d Reviewed-on: https://code.wireshark.org/review/10888 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-08GTPv2: display Sequence Number as BASE_HEX_DECPascal Quantin1-1/+1
As requested on https://ask.wireshark.org/questions/46393/gtpv2-teid-and-sqn-decoded-in-decimal-instead-of-hexa-in-ws-1127 Change-Id: Id0963394959eff979129470c70258323653e3fdf Reviewed-on: https://code.wireshark.org/review/10886 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-08UDP: Fix forgotten column infoJoão Valverde1-0/+3
Change-Id: I620d24c1a1cf7340d651e8840275759de860e5ef Reviewed-on: https://code.wireshark.org/review/10881 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-08DCCP: Fix destination port offsetJoão Valverde1-1/+1
Regression introduced in ga459ac72 Change-Id: Ib69299280599b181f9068b3b81eb9fd74bb1d55d Reviewed-on: https://code.wireshark.org/review/10882 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-10-08Replace or rename "duplicate" UDP protocols shown in Decode AsMichael Mann11-95/+73
Change-Id: I8cfd1c223c70c7e03728af8b2f7cbf9354d7ad86 Ping-Bug: 3949 Reviewed-on: https://code.wireshark.org/review/10865 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-08Blind attempt trying to fix CMake based installerPascal Quantin1-0/+2
Looks like Petri-Dish does not generate it Change-Id: I90823d82ac9d223d840ab20331a856550dffdc87 Reviewed-on: https://code.wireshark.org/review/10872 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-08Add USBPcapPage.ini file to distributionPascal Quantin3-1/+4
Change-Id: I05ed2c561818fd4293543199063551dd65fb5c55 Reviewed-on: https://code.wireshark.org/review/10871 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 13:46:04 +0000