summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-11-14PER: add support for fragmented open typePascal Quantin1-14/+44
Change-Id: Ie4282cc859518977686da13f017ad79dfffa359b Reviewed-on: https://code.wireshark.org/review/18807 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-14DICOM: Reassemble only when "More Fragments" is set.Uli Heilmeier1-1/+1
When a TCP frame contains more DICOM segments, make sure that only segments with "More fragments" bit set gets reassembled. Bug: 13110 Change-Id: Ie19c71285a00240a035ff92ce3183de4d9048cbd Reviewed-on: https://code.wireshark.org/review/18805 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-11-14OSPF: fix indent (use 4 spaces)Alexis La Goutte1-15/+15
Change-Id: I3ba3fa626398718fefcc3430fffeaed2f4ea47b9 Reviewed-on: https://code.wireshark.org/review/18799 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-11-13packet-dtn.c break loop if evaluate_sdnv doesn't succeed.Michael Mann1-2/+4
Bug: 13097 Change-Id: If6128f5a3c940b4713c396e1a4a8f002a6bd03b8 Reviewed-on: https://code.wireshark.org/review/18764 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-11-13tvbuff_composite.c: fix composite_get_ptr when length is over 2 segmentsPascal Quantin1-2/+2
When storing a copy of the composite tvb in tvb->real_data, ensure to copy the full data and not only the length currently requested by the call to tvb_get_ptr() Change-Id: I6b42f3d46c4fba83fadf4d06f465c8d2486f4853 Reviewed-on: https://code.wireshark.org/review/18806 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-11-13PER: fixes for fragmented bitstringPascal Quantin1-4/+4
Follow-up of g54c3df8: - fix byte highlighting - return correct offset - return correct length Change-Id: Ib689ea72706c2e1d697c0e8f619b1b846c088001 Reviewed-on: https://code.wireshark.org/review/18803 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-11-13lua: Allow proto:register_heuristic to be used on multiple list namesFranklin "Snaipe" Mathieu1-2/+11
In the C API, one can register a heuristic for the same protocol on different lists by specifying another unique short_name. This is impossible in the lua API, as the protocol name is used as the short name itself. This change fixes that by creating an unique shortname composed of the protocol name and the target list name. Change-Id: I2c30ce6e4f7a3b38879180c64cf8564f779163b4 Signed-off-by: Franklin "Snaipe" Mathieu <snaipe@diacritic.io> Reviewed-on: https://code.wireshark.org/review/18711 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-13[Automatic update for 2016-11-13]Gerald Combs13-3819/+4129
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I83298430701c25aaba15cc5db02603bacd6d196a Reviewed-on: https://code.wireshark.org/review/18798 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-13PROFINET: Add Asset Management Record DissectionBirol Capa1-2/+608
Identification and Maintenance (I&M) and AssetManagement (AM) functions are to collect information about the assets of an automation plant to cover the use cases such as identification, configuration, commissioning, diagnosis etc.. PROFINET plugin should support the Asset Management Record (AMR). Bug: 13112 Change-Id: I9c557b5f7f4f633fdd475c2c9e8900a8e6c2ba47 Reviewed-on: https://code.wireshark.org/review/18719 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-11-13Allocate transport_info->encoding_name from correct memory poolnovakji1-2/+4
Bug: 13127 Change-Id: I09893fadc6f64316a373ddb8ac72e07a6743e149 Reviewed-on: https://code.wireshark.org/review/18758 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Michael Mann <mmann78@netscape.net>
2016-11-13Qt: populate Bookmarks menu in capture options dialogPeter Wu1-0/+1
The bookmarks menu is populated for the main window when the appInitialized signal is emitted, this ensures that any preferences are applied. For the Capture Options dialog however, the appInitialized signal is never triggered since the GUI has already started. Just invoke it from the constructor such the menu is populated at least once. Bug: 12986 Change-Id: I04457fd25e52a25714ac471131b90e3a128515d8 Reviewed-on: https://code.wireshark.org/review/18734 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-13DOCSIS: Added dissector for type51 UCDBruno Verstuyft3-0/+1649
Change-Id: Ifb46b2bd0a6eeae3e641ebcb3ecc89fc4f74b3f9 Reviewed-on: https://code.wireshark.org/review/18673 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-13QUIC: Update error codeAlexis La Goutte1-1/+18
Change-Id: I797da3c55ecb1a8a61166d8fbf503c4bdeffc213 Reviewed-on: https://code.wireshark.org/review/18755 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-11-12fix no previous prototype for ‘capture_*’ [-Wmissing-prototypes]Alexis La Goutte13-16/+16
Change-Id: Ie5bfe4d366a679ebcb561716f23d174e7b9bf487 Reviewed-on: https://code.wireshark.org/review/18754 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-11-12iso14443: dissect the TA(1) byte in the ATSMartin Kaiser1-2/+51
Change-Id: I17785d32ca1f5ef69731c5dfba04892aa09648a0 Reviewed-on: https://code.wireshark.org/review/18756 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-11-12Really return manufacturer name if it's known.Jaap Keuter1-2/+2
Bug: 13126 Change-Id: I56e935cea7aa323941ac612d4954875a01910684 Reviewed-on: https://code.wireshark.org/review/18752 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-12gsm_abis_om2000: Expand bit-width of CON CCP and CI fieldsHarald Welte1-2/+2
It seems more recent RBS2000 models have extended the range of the CON Connection Point (CCP) by one bit, as I'm seeing CCP 1896 in protocol traces. Similarly, the Contiguity Index can at least reach 96. Using the full 8bit value to make sure IS and CON dissectors use the same ranges for connection points and contiguity index. Change-Id: Iece34106fc97a11dc8a01cf2578b5e4245a4c9e8 Reviewed-on: https://code.wireshark.org/review/18753 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-12PER: add support for bit strings >= 16KPascal Quantin6-34/+118
Bug: 13123 Change-Id: Ie20ef75393ea601d2702a024e0ade94b85adf9f2 Reviewed-on: https://code.wireshark.org/review/18748 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-11-11Dissect the checksum field as a string, as that's what it is.Guy Harris1-5/+4
Bug: 13125 Change-Id: Ib5d02e8841eb7e4d04e6a1df44a5eba5b925ce6c Reviewed-on: https://code.wireshark.org/review/18749 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-11-11[SIP]Parse out the individual feature cap(s).AndersBroman1-1/+73
Change-Id: Ie834da60a2d389d33e1a5b6cc897e13ae1522fb9 Reviewed-on: https://code.wireshark.org/review/18742 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-11ssl: fix next_protocol_negotiation idPeter Wu2-2/+2
NPN is a legacy extension (superseded by ALPN), but there was still a capture with this value. However, the decimal number is wrong. Adjust it to the one in the draft -03 (the hex number is still correct). Change-Id: I80ce468bcb653bc8ec87432d76d478cb0423b46f Reviewed-on: https://code.wireshark.org/review/18744 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: Michael Mann <mmann78@netscape.net>
2016-11-11OSPF: Add LSA Type Flag (See RFC 5340 A.4.2.1)Alexis La Goutte1-16/+41
* Display in dec the LSA Type (like IANA) Bug: 13118 Change-Id: I78001b2066f186dcf2175153e539216437b1754e Reviewed-on: https://code.wireshark.org/review/18740 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-11-11Qt: Fix a "No such slot" warning.Gerald Combs2-2/+4
Make sure on_actionCaptureOptions_triggered always exists so that we don't get a "No such slot" warning when building without libpcap. Change-Id: Ib7c82df6c72bf080ff080e0a650216b345a97e9c Reviewed-on: https://code.wireshark.org/review/18747 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-11Qt: fix build without libpcapPeter Wu1-5/+7
Change-Id: I89a2f9a21a17a318529c7f0785ab60385fe08dcf Fixes: v2.3.0rc0-1445-g414c132 ("Qt: Handle retranslation events in the main window") Reviewed-on: https://code.wireshark.org/review/18746 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-11AsciiDoc: Create an include file for attributes.Gerald Combs27-311/+355
Move the replacement definitions in asciidoc.conf to attributes.asciidoc. This makes the markup a bit cleaner and is more compatible with AsciiDoctor. Use a standard naming scheme for URLs. Change-Id: Ica73aaadb013be2a4e6a3963fb54e6db6e02e98f Reviewed-on: https://code.wireshark.org/review/18655 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-11ftype-guid.c: fix FT_GUID filteringPascal Quantin1-6/+3
g_strlcpy copies at most n-1 bytes to ensure that the string is NULL terminated. Bug: 13121 Change-Id: I4f1677c518e65eb58b79d72052520ecce8c51722 Reviewed-on: https://code.wireshark.org/review/18743 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-11[tvbuff] Fix tvb_find_guint16() searched_bytes is fromAndersBroman1-2/+2
start_offset(offset) and the while loop should be on searched_bytes. Change-Id: I62343f7cb04f9110f773ba1ada8dbcbfbd262861 Reviewed-on: https://code.wireshark.org/review/18741 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>
2016-11-11diameter_3gpp: decode AVP 1518Jan Spevak1-0/+39
Change-Id: I95618ebeeb2a5ebe0dfc97bdfdd6c0bb91cb4381 Reviewed-on: https://code.wireshark.org/review/18739 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>
2016-11-11packet-asterix.c doesn't need a preference callback function.Michael Mann1-1/+1
Just causes preference to be added twice. Bug: 13113 Change-Id: Iebbe296a8b35cbe58c163c4f1f5fac9d27c76ead Reviewed-on: https://code.wireshark.org/review/18737 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-11-10Bluetooth: BTLE: Add SC bit paring in AuthReqJakub Pawlowski1-2/+11
Change-Id: I91db50aadd572a81559bb8d22af19fffefea592f Reviewed-on: https://code.wireshark.org/review/18735 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-11-10[XML] default_media_types should be in lower case.AndersBroman1-1/+1
Change-Id: Ibd55b76a0ccbfcf511afb4e99144a0d1115e5af2 Reviewed-on: https://code.wireshark.org/review/18732 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-11-10tcp: Fix Follow TCP tap data and when its tapped.Michael Mann7-50/+309
Use the model from the 2.0 branch and earlier that only "tapped" the follow data in a single location. This fixes duplicate data for reassembled data and handles out-of-order packets. Bug: 12855 Change-Id: I5268f13e3c08e9271acf026b859de693ad794c94 Reviewed-on: https://code.wireshark.org/review/18368 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-11-10lsd: fix unaligned readPeter Wu1-1/+2
Fixes UBsan complaint: epan/dissectors/packet-lsd.c:141:7: runtime error: load of misaligned address 0x61d00017029e for type 'const guint32', which requires 4 byte alignment Change-Id: I74034f3e0bc198b4b86ca6cd7559d8df7283377f Reviewed-on: https://code.wireshark.org/review/18733 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-11-10Enable exporting IMF traffic as an EML fileMoshe Kaplan11-3/+146
Change-Id: Ia56b38a770a148dd8bf030699615189601944cc2 Reviewed-on: https://code.wireshark.org/review/18656 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-11-10PROFINET: Update MRP dissection according to IEC62439-2 Ed.2.Birol Capa2-55/+190
The MRP PDU dissection is updated with respect to MRP standard IEC62439-2 Ed.2. 0x88e3 is added for MRP Ether Type String definions of MRP block and sub block types are updated. dissect_pn_ManuData function is removed since it is not used anymore. Change-Id: Iec6666abc75bcba4189f2c38851407abc23267f9 Reviewed-on: https://code.wireshark.org/review/18730 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>
2016-11-10Qt: Handle retranslation events in the main window.Gerald Combs11-84/+126
Update most (but not all) of the main status bar text when the user changes the language setting. Try to distinguish between recent preferences and recent captures more clearly. Change-Id: I5278a503178fe3620a25b185742688f957dc30f4 Ping-Bug: 11307 Reviewed-on: https://code.wireshark.org/review/9575 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-10bt-dht: add data to COL_INFO.Dario Lombardo1-0/+1
Change-Id: I69e8b012156020f79cf22604bc709fc70f215155 Reviewed-on: https://code.wireshark.org/review/18710 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-11-10androiddump: Set socket connect() timeout to 500msMichal Labedzki1-1/+24
This should avoid neverending or long time to obtain timeout in some cases like firewall's drop rules, etc. Bump version to 1.0.4 Bug: 13104 Ping-Bug: 13114 Change-Id: I9bef714b6d92b3516a2a95ebdbe1ba594fa60e34 Reviewed-on: https://code.wireshark.org/review/18728 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-10GVSP: Disable the heuristic by defaultAlexis La Goutte1-1/+1
Already try to enhance but get always some false positive with STUN/RTP Change-Id: I187959ed526a0d538a2c6db76af07ae3dbf06c6e Reviewed-on: https://code.wireshark.org/review/18702 Reviewed-by: thies.moeller <thies.moeller@baslerweb.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-09debian-setup: allow libssh-dev to be installed for trustyPeter Wu1-12/+24
Ubuntu 14.04 Trusty has libssh-dev 0.6.1 (using OpenSSL) which should be usable. The debian/control file is not updated due to OpenSSL licensing concerns, if you need to build on trusty, you need dpkg-buildpackage -d (--no-check-builddeps). Remove distro-detection in favor of feature detection. Note that the minimum Ubuntu versions could be lower, but unsupported versions are not listed on packages.ubuntu.com so I did not bother. Change-Id: Ia04d960f3d4957918c925bf9cd351537e233fd3e Reviewed-on: https://code.wireshark.org/review/18725 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-11-09CMake: Use xz generator with cpackJoão Valverde1-2/+8
We already do so with autotools. Change-Id: I0d7ea052ee19a42d16e82134f2f7188b3a19ee1e Reviewed-on: https://code.wireshark.org/review/18727 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com>
2016-11-09CMake: fix cpack archive name to include versionDario Lombardo1-20/+26
CPACK_PACKAGE_VERSION is used before setting its value. Remove spurious CPACK_SYSTEM_NAME usage. Before: CPack: - package: wireshark/build-test/wireshark--.tar.bz2 generated. After CPack: - package: wireshark/build-test/wireshark-2.3.0.tar.bz2 generated. Change-Id: I6f12017113f64b9c759a3fbd930cb3ee0807811d Reviewed-on: https://code.wireshark.org/review/18669 Reviewed-by: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt> 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>
2016-11-09Add DHCPv6 options for Softwire provisioningNiels Widger1-0/+247
Bug: 12719 Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Signed-off-by: Sander Steffann <sander@steffann.nl> Change-Id: I2792ef4a5851cd2fba75fc253aa3d635cb7f1fa6 Reviewed-on: https://code.wireshark.org/review/16860
2016-11-09CMake: Enable ccache for gcc and clang.Gerald Combs2-0/+11
Add an option to check for and use ccache. Disable it by default. Change-Id: Ifc928d22715b7e06e53115455b31dbeaf2ee8332 Reviewed-on: https://code.wireshark.org/review/18715 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-09CMake: Use find_program to find a program.Gerald Combs1-3/+3
Use find_program to find glib-compile-resources instead of find_file. Change-Id: I565c3a596923ff4761bc38988ee396aa24bd63a6 Reviewed-on: https://code.wireshark.org/review/18714 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-09[SIP] Use call_dissector_only() to call the diagnostics dissector.AndersBroman1-2/+2
While there correct a typo. Change-Id: I58f9f4353e1fb4155d4f4f77f0f93325940d291f Reviewed-on: https://code.wireshark.org/review/18722 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>
2016-11-09diameter_3gpp: update gx_feature_list_1 3GPP TS 29.212, v14.0.0Jan Spevak1-1/+22
Change-Id: I9995f718ab323b48408951a7df792b7b72ce3c8f Reviewed-on: https://code.wireshark.org/review/18720 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-11-08Qt: Restore the default "About" box tab.Gerald Combs1-1/+1
Set the default about box tab back to "Wireshark". (Presumably this changed due to Qt Creator's annoying last-tab-selected-wins behavior.) Change-Id: I85f64b623758a14e9588f6b3929bad26a6a60ad5 Reviewed-on: https://code.wireshark.org/review/18716 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-08cmake: install missing profiles directoryPeter Wu1-0/+1
Spotted when comparing an autotools "make install" tree with the cmake one. Change-Id: I68eed5f518a72a6476c3e464a6997f0b3855144e Reviewed-on: https://code.wireshark.org/review/18713 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-11-08cmake: fix the linker flags test for Visual StudioMartin Kaiser1-2/+2
ddd1c87d43781533c3ec10279857e3870d12437e modified the order of linker command line options. This broke the tests and made invalid linker flags seem valid. (Link target) -> LINK : warning LNK4044: unrecognized option '/Wl,--as-needed'; ignored [C:\wireshark\build3\wsutil\wsutil.vcxproj] LINK : warning LNK4044: unrecognized option '/pie'; ignored [C:\wireshark\build3\wsutil\wsutil.vcxproj] The simple fix is to add specific options for Visual Studio and clang at the beginning of the linker's command line options rather than at the end. Change-Id: I6492ea1271e18be0d190e7579f47baecf6ac4d61 Reviewed-on: https://code.wireshark.org/review/18709 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-05 00:28:11 +0000