aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-01-30Qt: Add the RTP Streams dialog.Gerald Combs31-137/+1257
Add keyboard shortcuts. Note that not all of the buttons made it from GTK+. Add a "Go to setup frame" option. Move rtp_streams.c from ui/gtk to ui. Add a help URL for RTP analysis (which needs to be split into streams + analysis). Fix RTP stream packet marking. Change-Id: Ifb8192ff701a933422509233d76461a46e459f4f Reviewed-on: https://code.wireshark.org/review/6852 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-01-30 CAPWAP: Add support of Cisco Vendor Specific ElementAlexis La Goutte2-1/+151
Change-Id: I62886bda3220d9aa3a5b3aee8b40063a8bb7745d Reviewed-on: https://code.wireshark.org/review/6843 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-01-30HCRT: udp port preference changed into range.Dario Lombardo1-9/+15
Change-Id: I6201bec1c3226181d2e5df8f3bf47471136b0ef5 Reviewed-on: https://code.wireshark.org/review/6839 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: 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-01-30When issued with -v wireshark-qt prints version and exits.Dario Lombardo1-13/+24
Change-Id: I3993c502156d534f17baa409729e2dc763910ac8 Bug: 10789 Reviewed-on: https://code.wireshark.org/review/6840 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-01-29Qt: Add address conversion convenience routinesGerald Combs10-40/+78
Add address_to_qstring and address_to_display_qstring, which wrap address_to_string and address_to_display respectively and return QStrings. Convert most of the instances in ui/qt to the new routines. Fix a some memory leaks in the process. Change-Id: Icda80bbfe0b2df723d54c8da84355255f819af89 Reviewed-on: https://code.wireshark.org/review/6848 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-01-29SDP: check that media format starts with a digit before trying to identify ↵Pascal Quantin1-9/+14
media type Bug: 10899 Change-Id: I92319a668ae795247d4021f32d629f5000ceb395 Reviewed-on: https://code.wireshark.org/review/6841 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-29IS-IS: Add subTLV Bandwidth Constraints (22) used by IS ReachabilityAlexis La Goutte1-0/+155
Change-Id: I7e1d29270aede25268bb75a2b5fc9448dbc1cc9b Reviewed-on: https://code.wireshark.org/review/6585 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-29Disable SSE4.2 _ws_mempbrk_sse42 due to bug 10798Hadriel Kaplan1-0/+3
This is a (possibly) temporary change to master to disable _ws_mempbrk_sse42 to see if that fixes bug 10798. Ping-Bug: 10798 Change-Id: I2e438ff299f55709c66a37634d2a7e799c513ac9 Reviewed-on: https://code.wireshark.org/review/6844 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-01-29addr_resolv: correctly scope returned memoryEvan Huus1-4/+4
*_port_to_display functions take an allocator scope, so the memory they return must be allocated from that scope, which means we must strdup the result of serv_name_lookup. Bug: 10901 Change-Id: I337c8b6f9dfece966964c09023679b3e24648e48 Reviewed-on: https://code.wireshark.org/review/6842 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-28"%l[doux]" doesn't mean "64-bit integer".Guy Harris1-2/+2
Use G_GINT64_MODIFIER as the format modifier to indicate that the value being printed is 64-bit; there is no guarantee that long is 64-bit (it's not 64-bit on ILP32 platforms such as 32-bit Windows and 32-bit UN*X, or even on LLP64 platforms such as 64-bit Windows). Change-Id: I0444f7f396969824f1040c06a67753718c32881b Reviewed-on: https://code.wireshark.org/review/6838 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-28Try dissecting some stuff even if we don't have conversation information.Guy Harris1-40/+71
Fill in a local transaction information structure, so we can pass data from the packet down. Skip stuff that depends on conversation information if we don't have any. Change-Id: I5a8bd21bdf632ada9013e616c5fc4e8bd14c9698 Reviewed-on: https://code.wireshark.org/review/6837 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-28Extended AMQP 0-9 dissector to support AMQP 0-9-1 methods and datatypes. ↵Petr Gotthard1-21/+335
Backward compatibility to AMQP 0-9 is maintained. Change-Id: Ie39cb40dca3d9f778ef2c04cbef24c968a91ec6c Reviewed-on: https://code.wireshark.org/review/6791 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>
2015-01-28Go back to installing 5.2.3 for now.Guy Harris1-1/+5
Change-Id: I1c798cd1a74aee559225fea1e4bc3694466de861 Reviewed-on: https://code.wireshark.org/review/6836 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-28Proto dialog (GTK) : fix indent (use 2 spaces) and add modelinesAlexis La Goutte2-55/+76
Change-Id: I36945843b8d544188a3ffe89f397e669f3944593 Reviewed-on: https://code.wireshark.org/review/6831 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-28Add files missing from the tarball.Anders2-1/+5
Change-Id: I126f40ac122a7b9236e8718a89d35ad12fc89c04 Reviewed-on: https://code.wireshark.org/review/6834 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-28ANSI IS-637-A: prevent an out of bounds accessPascal Quantin1-2/+2
Bug: 10897 Change-Id: I8316ba40ec00b612e4edd490e3cd36e7277912a9 Reviewed-on: https://code.wireshark.org/review/6824 Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-28Make the USB header information an enumerated type.Guy Harris6-56/+122
It's not really a bitset, it's a choice of one of four types of USB pseudo-header. Make it an enum. Change-Id: I4ea994e1606c23e0a0f08b1b61357eea40a2535e Reviewed-on: https://code.wireshark.org/review/6830 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-28win32: fix detection of Windows 10 Technical PreviewPascal Quantin1-2/+20
The version number changed from 6.4 to 10.0 Change-Id: Ie749c97e8335f77d414d80edbd69373bd9a1cdad Reviewed-on: https://code.wireshark.org/review/6820 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-28Move tests out of try_dissect_linux_usb_pseudo_header_ext().Guy Harris1-24/+30
Do the tests in its callers; rename it to just dissect_linux_usb_pseudo_header_ext() and don't bother passing it the header_info flag. We can remove some of those tests as they're already done in the caller. Change-Id: I7c3cfefba833a84c834462307088f5c31612128e Reviewed-on: https://code.wireshark.org/review/6829 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-28Add documentation URLs for the Linux USB and USBPCAP pseudo-headers.Guy Harris1-0/+4
Change-Id: If5cecfeb66b3caca6478206f2fcb2f617ef02b46 Reviewed-on: https://code.wireshark.org/review/6828 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-27Qt: Update packet list freeze/thaw behavior.Gerald Combs1-4/+5
Move the clear() calls in gee320ef a bit earlier in the code to PacketList::freeze. No model means no packets. Bug: 10896 Change-Id: Ie440e3da4c5fb601048f4e94c8712ecf2d864d4f Reviewed-on: https://code.wireshark.org/review/6823 Reviewed-by: Sean Stalley <seanstalley@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-27Added json heuristic to Dropbox LAN sync Discovery Protocol.Dario Lombardo2-0/+23
Change-Id: I0d649ddc0f1539616eca0322ba54a7735338c738 Reviewed-on: https://code.wireshark.org/review/6817 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>
2015-01-27Comment out various 'if(tree)'Bill Meier4-4/+4
col..._() and/or expert...() should not be called under 'if(tree)' Change-Id: I57efe44794977d3f93e4764642b091044a125c0c Reviewed-on: https://code.wireshark.org/review/6826 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-27rtps: Remove various 'if(tree)'Bill Meier1-93/+0
col_...() and expert_...() should not be called under 'if(tree)' Change-Id: I2f1a8345ff18c0174bcd81b37179aa2d5ee74aca Reviewed-on: https://code.wireshark.org/review/6825 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-27NETROM: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: Ie534cbd4fb592d18f27039c654ba08e1beb7edff Reviewed-on: https://code.wireshark.org/review/6819 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27HCrt: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I453c9b068a53292ab63cd3416569eea7d66361ba Reviewed-on: https://code.wireshark.org/review/6818 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27WIMAX: fix no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte11-27/+25
Also comment the unused function wimax_decode_sub_dl_ul_map Part 2... Change-Id: I1836aa2851156e4f756c5697f86a142625d697c9 Reviewed-on: https://code.wireshark.org/review/6810 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27Lua: Expose tcp_dissect_pdus() to LuaHadriel Kaplan157-209/+940
Provide a way for Lua-based dissectors to invoke tcp_dissect_pdus() to make TCP-based dissection easier. Bug: 9851 Change-Id: I91630ebf1f1fc1964118b6750cc34238e18a8ad3 Reviewed-on: https://code.wireshark.org/review/6778 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-01-27Added HPFEEDS stats_tree.Dario Lombardo7-0/+126
Change-Id: I256fd5395b062fa954ebd60598721323ea1d7ff1 Bug: 10875 Reviewed-on: https://code.wireshark.org/review/6713 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: 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-01-27HCrt fix no previous prototype for 'proto_register_hcrt' [-Wmissing-prototypes]Alexis La Goutte1-0/+1
Change-Id: Idca780885263c068ba31bbccb6009e75221b3adf Reviewed-on: https://code.wireshark.org/review/6816 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27Qt: Add checkable for Find Packet iconAlexis La Goutte1-12/+6
Change-Id: Idd3c0b1893a9e0f8bc329e9157baaccd10de7378 Reviewed-on: https://code.wireshark.org/review/6814 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27Packet List (Qt): fix extra ‘;’ [-Wpedantic]Alexis La Goutte1-1/+1
Change-Id: I3ac80a13da91452de4c857abfd6f2661b00e2f5d Reviewed-on: https://code.wireshark.org/review/6815 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-01-27GTK: Fix multispace on main title barAlexis La Goutte1-2/+2
Change-Id: I275a586c16621fdfabede23f6a1d03c8d8556b3f Reviewed-on: https://code.wireshark.org/review/6813 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27CAPWAP: fix double space on AC Software versionAlexis La Goutte1-1/+1
Change-Id: Ibe9715a1c2bf31e31ddda5ad2ad62fc0eda8164c Reviewed-on: https://code.wireshark.org/review/6812 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27GTK: fix no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte3-0/+3
Add by commit g43f09e67b (Remove unneeded includes from ui folder) Change-Id: I66eb113430bde97e18bb3d2b00f6bac46a01797e Reviewed-on: https://code.wireshark.org/review/6809 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27GTK: fix no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte16-1/+17
Add by commit g43f09e67b (Remove unneeded includes from ui folder) Change-Id: I7c9d9e2bbd76d062f96422c74ee8eb8c6ecd328b Reviewed-on: https://code.wireshark.org/review/6808 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27CATTP: fix no previous prototype for 'proto_register_cattp' ↵Alexis La Goutte1-0/+1
[-Wmissing-prototypes] Change-Id: Ifedb45d95d622c6df29f6917918015676f506831 Reviewed-on: https://code.wireshark.org/review/6807 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27epl: Add Manufacturer subdissectorRoland Knall1-43/+75
Allow manufacturer specific plugins, which will only be called for certain service IDs which are manufacturer specific as defined by the POWERLINK specification. As with e.g. udp.port, a plugin or subdissector may register with epl.asnd and a given service ID to implement a plugin for specific ASND Service IDs, which are part of the manufacturer specific object range (0xA0-0xFE). Also, all values for the ID fields have been changed to range_string Change-Id: Ibfb9c035c16bce5322b13c42f30daf14e096712a Reviewed-on: https://code.wireshark.org/review/6793 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27SMC-R: fix incorrect dissection of non-SMCR packet. FailoverJoe Fowler1-2/+10
Validation bit definition is missing dissect_smcr_tcp_heur() passes incorrect length to tvb_memeql(), resulting in incorrectly identifying a packet as SMC-R. Added Failover Validation bit. Bug: 10887 Change-Id: I9f33389bd974b4c410a6b077d0d133221c77ee0d Reviewed-on: https://code.wireshark.org/review/6765 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27qt: clear tree and bytes when no packet selectedEvan Huus1-0/+4
Otherwise trying to interact with them will cause all sorts of funny crashes. There's probably a better way to trigger these (having the widgets register for a signal, and sending that signal, or something something something) but this works and I don't feel like reading 20 pages of Qt documentation right this instant. Change-Id: Ic52806ae5ba8d7776f835695590559b8c705d083 Ping-Bug: 10896 Reviewed-on: https://code.wireshark.org/review/6803 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-26Pcapng: Don't fetch past the end of a GArray.Gerald Combs1-3/+3
Due to an off-by-one error an invalid ISB interface ID could make us fetch past the end of a GArray. Found using American Fuzzy Lop. Bug: 10895 Change-Id: I7d4049ad7a386ae7e8013b8e741d54a31f353f1f Reviewed-on: https://code.wireshark.org/review/6798 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-01-26rtp: Don't call col_...() under 'if (tree)'Bill Meier1-16/+16
Change-Id: I7d75e8d02aeaa67155ec52dd0167d1692286b951 Reviewed-on: https://code.wireshark.org/review/6800 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-26rtmpt: Remove 'if (tree)'Bill Meier1-1/+1
Setting a var under 'if (tree)' and then using it later (not under 'if (tree)') to affect col_...()/expert_...() is not OK. Change-Id: I144b5fa50b4550cd14c604970f5d84dbf13f3e90 Reviewed-on: https://code.wireshark.org/review/6799 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-263GPP: upgrade 2G/3G NAS dissector to v12.8.0 and NAS EPS dissector to v12.7.0Pascal Quantin2-16/+40
Change-Id: I770506762074b50d40b4f4742d8316368f14b4de Reviewed-on: https://code.wireshark.org/review/6794 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: 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-01-26Add Cmakefiles missing from the distribution.Anders1-0/+3
Change-Id: I77333bb1ca4b0fdfa2db095aab2e4e663c029dd3 Reviewed-on: https://code.wireshark.org/review/6797 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-26gsm-rlcmac: use wmem_new0 for a structEvan Huus1-2/+2
Fixes "Conditional jump or move depends on uninitialised value" from Valgrind. I couldn't really figure out how this code was supposed to function, it seems to initialize one member of the union and then expect *all* the others to just magically work (which they apparently do in most cases, oddly). The real bug could be in csnStreamDissector or who knows, but this at least turns "garbage data" into "zeros" which makes valgrind happy and turns a potential vuln into at worst a bad decoding. Bug: 10891 Change-Id: Ia29dd625b46b3b76ff521b4203148fe8b0c59ec3 Reviewed-on: https://code.wireshark.org/review/6769 Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-26Register EtherNet/IP dissector for "external" use (like SSL)Michael Mann1-0/+2
Change-Id: Ic918c27f36569572523a17abb172b94cc32f2e3b Reviewed-on: https://code.wireshark.org/review/6786 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-26Roll functionality of h225-persistentdata module into packet-h225.cMichael Mann6-236/+281
Change-Id: I19b2a1b19e1e77a6456e2310daf64ddff572b0d2 Reviewed-on: https://code.wireshark.org/review/6788 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-01-26Move #defines of epan/greproto.h to packet-gre.hMichael Mann8-71/+39
Change-Id: I5de4c34e2acafbe47a8ca3f07040a774e72d0d3e Reviewed-on: https://code.wireshark.org/review/6787 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-25Update another comment to reflect reality.Guy Harris1-2/+1
Change-Id: I9747b746ed7c38ed3aa78f19ae20b61e142b94cc Reviewed-on: https://code.wireshark.org/review/6785 Reviewed-by: Guy Harris <guy@alum.mit.edu>