aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-09-03Fix the PortableApps package name.Gerald Combs3-207/+4
Remove Installer.nsi while we're here. Change-Id: I739d5d825fd76eac9b50d26fab2d44e853dc83f9 Reviewed-on: https://code.wireshark.org/review/3965 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03PortableApps: Remove invalid makefile commands.Gerald Combs1-2/+0
Change-Id: I6ed0f72a6915cd12d7866c978dce0d25c328dffd Reviewed-on: https://code.wireshark.org/review/3964 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03Added name to AUTHORSSean O. Stalley1-0/+4
Change-Id: I7f65d22d4dd96908033c764461196a75716b298a Reviewed-on: https://code.wireshark.org/review/3961 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-02OS X packaging fix: wireshark-qt → wireshark.Gerald Combs1-2/+2
Change-Id: Ie95c28ca47baf453335abab23eb7baba63d52f47 Reviewed-on: https://code.wireshark.org/review/3963 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02Fix PortableApps packaging.Gerald Combs13-365/+213
Our Windows portable packaging environment has a lot of cruft which is no longer relevant. We removed support for U3 packages and the method we use to generate PortableApps packages has been deprecated for a while. Create PortableApps packages using current file formats (AppInfo v3.0) and tools. Generate the PA launcher using the PortableApps.com Launcher generator. Copy files and directories from the top level instead of using a manifest derived from the NSIS installer. The manifest is a good idea, but we should create a central manifest and use that to generate the NSIS and PortableApps packages instead of trying to parse wireshark.nsi. The new package still needs a bit of work but it installs and runs in the current version of the PA Platform. Remove the define for MAKENSIS_UNICODE. It doesn't look like we were using it. Start tearing down makefiles and scripts that we no longer use. Ping-Bug: 4191 Change-Id: Ib7173eec887d0abf69bb176a1e3f943a5a63bee4 Reviewed-on: https://code.wireshark.org/review/3962 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02packet-netflow.c: netflow v9: Allow options template with zero-length scope ↵Bill Meier1-7/+10
section Fixes Bug #10432 Also: rework several comments. Change-Id: I292829f6dffaf5f500cb089cc8a45e1203a2e731 Reviewed-on: https://code.wireshark.org/review/3959 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-02Simplify ./configure logic for telling rpmbuild which GUI(s) we're building.Jeff Morriss2-40/+32
Rather than checking for all the "--with" arguments just use the "$have_xxx" variables. Don't allow rpmbuild's ./configure to decide to build a GUI just because it's available: make it build only what was ./configure'd. Change-Id: I68582b4c13da7b52d56591dce68ac426e9f607f1 Reviewed-on: https://code.wireshark.org/review/3958 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs39-211/+229
Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02RTPS: added new PIDs and included minor improvementsJuanjo2-281/+1665
- (Updated) Fixed code review issues - (Updated) Fixed whitespaces and code review issues - Representing now some NTP times as duration (not as date) - Added some vendor specific PIDs (RTI) - Added dissect_APP_ACK_CONF, dissect_APP_ACK and dissect_HEARTBEAT_VIRTUAL - Added is_discovery to dissect_serialize_data to avoid malformed packets when using mutable types (Wireshark assumes serialized data with CDR-PL encapsulation is always discovery data, what is not true when using Mutable types) Change-Id: I491750d95b12f386c41d7de4ae7e280781efa375 Reviewed-on: https://code.wireshark.org/review/3836 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-01openSAFETY: Adapt CRC for false-positivesRoland Knall1-53/+76
- There are rare false-positives, where the entire frame consists of 0 except the addr and id field, which will lead to a correct crc#1 calculation, but still to a false-positive detection. This patch fixes that - Two undefinite-loop errors are corrected as well Change-Id: Ibe5e56e0172ad3a3046bdc024da3711987116e8e Reviewed-on: https://code.wireshark.org/review/3918 Reviewed-by: Roland Knall <rknall@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>
2014-09-01NDMP: Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-1/+1
Change-Id: I314e7e00633f93dead6a092e059336a304e4a946 Reviewed-on: https://code.wireshark.org/review/3940 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-01NDMP: Fix indent (use tab)Alexis La Goutte1-122/+122
Change-Id: I00f4d206e9c27801f8557414b8cd1b5c52752b44 Reviewed-on: https://code.wireshark.org/review/3941 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-01Removed unnecessary chmod commandsGraham Bloice1-3/+0
Change-Id: Ia6e3f8c567159fc2cf19a8d427a29c5c6dcdf038 Reviewed-on: https://code.wireshark.org/review/3942 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-01Escape double quotes when printing ABSOLUTE_TIME fieldMichael Mann1-9/+13
This regression was introduced by the commit e5353bf1198d6abf748de78084ff64f597f13663 done for bug 10081 Bug: 10213 Change-Id: I3925a47ef13055f10f49fa9fefd022731746fbb8 Reviewed-on: https://code.wireshark.org/review/2572 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-01TLS: fix dissection of status_request_v2 hello extensionJamil Nimeh1-4/+7
Bug: 10416 Change-Id: I58a3faef227f7eafd61942cafa6e38a17557ee61 Reviewed-on: https://code.wireshark.org/review/3865 Reviewed-by: Evan Huus <eapache@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>
2014-09-01WSUG: Convert ``Telephony'' to AsciiDoc.Gerald Combs4-125/+104
Leave most of the content intact for now. Change-Id: I21aad681194d1bb1841e29f4ac41be4677fcb909 Reviewed-on: https://code.wireshark.org/review/3939 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-01Add CMake stuff for custom plugins.AndersBroman2-0/+29
Change-Id: I1eff6b902d9bd9fb8f3073ab0f4fc3dd143d0fc4 Reviewed-on: https://code.wireshark.org/review/3946 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-01Add abillity to add custom crypto files.AndersBroman2-0/+5
Change-Id: I6c5b1cdb0a90f7604bdde088332c171332b43dcc Reviewed-on: https://code.wireshark.org/review/3945 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-01Make it possible to build builtin custom dissectors and GUI files with cmake ↵AndersBroman4-0/+67
too. Change-Id: I28eee44f7c3a7e44da89f8b71cdacbe78115c7e3 Reviewed-on: https://code.wireshark.org/review/3943 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>
2014-09-01WSUG: Convert ``Advanced Topics'' to AsciiDoc.Gerald Combs5-1018/+798
Leave most of the content intact for now. Change-Id: Ie91fda8a3fe6ea2eb4c47acf7c41d7e6979235b0 Reviewed-on: https://code.wireshark.org/review/3938 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-01Use a common hf for international E164 numbers (MSISDN).AndersBroman4-25/+67
Change-Id: Ie0103c04033d7bf69c92947b789ba4f5a300a74b Reviewed-on: https://code.wireshark.org/review/3863 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-01WSUG: Convert ``Working with captured packets'' to AsciiDoc.Gerald Combs4-1819/+803
Leave most of the content intact for now. Change-Id: Ic264814aa8e442df100ae8533098843ef6a2e6c9 Reviewed-on: https://code.wireshark.org/review/3937 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-01WSUG: Convert the ``File I/O'' chapter to AsciiDoc.Gerald Combs9-1493/+935
Leave most of the content intact for now. Remove images for no-longer-supported versions of GTK+. Add an example for building the Guides to README.cmake. Change-Id: Id9e6a308c91b594d1fb7f107d7b9b28074a92a8b Reviewed-on: https://code.wireshark.org/review/3931 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-31Don't show the echo/python command lines when making plugin.cРоман Донченко13-39/+52
For consistency with epan/dissectors/Makefile.am. Also, remove the "with python" parts, since that's the only option now. Change-Id: I761e1bf7995c1cc1ebd790013181fd6116b289a1 Reviewed-on: https://code.wireshark.org/review/3925 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-31Remove make-tapreg-dotc and its uses, since Python is now mandatoryРоман Донченко6-75/+10
Change-Id: I13fd57a288be68d18819826bf566ed7b5688ebaa Reviewed-on: https://code.wireshark.org/review/3926 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-31Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-3/+1
Change-Id: I0593b659dcd28929cf51a8b1147392f070574c9e Reviewed-on: https://code.wireshark.org/review/3934 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-31Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-3/+0
Change-Id: I32ca31b879ccc458f12f37375c32bc089978b114 Reviewed-on: https://code.wireshark.org/review/3933 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-31conv is always used, remove _U_ (unused) flagAlexis La Goutte3-3/+3
Change-Id: I648b365b662bd902e26e0c61f6d3499e8543e504 Reviewed-on: https://code.wireshark.org/review/3935 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-31WSUG: Fix URLsGerald Combs2-87/+87
Fix broken download URLs in the introduction. Update some macros to use https:// URLs. Change-Id: I145e74e14ec04ce5fcf94a65cd5623059875c6e1 Reviewed-on: https://code.wireshark.org/review/3932 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-31DNS: Add OpenPGP KEY (61) RRtype (draft-ietf-dane-openpgpkey-00)Alexis La Goutte1-2/+16
Not yet tested on real dns traffic Update also last updated DNS parameters (2014-08-12) Change-Id: I6109d585584e5fca11c606a2230d8ef89cdbf7b6 Reviewed-on: https://code.wireshark.org/review/3870 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-31Fix error: parameter 'XX' not found in the function declaration ↵Alexis La Goutte1-5/+2
(-Wdocumentation) Change-Id: I0a56fb79d2ac3d874a48695ad0499bda96b4b655 Reviewed-on: https://code.wireshark.org/review/3892 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-31Fix parameter 'key' not found in the function declaration (-Wdocumentation)Alexis La Goutte1-1/+1
Change-Id: Ie7f3e192d8980968da15921a8497153506df1fde Reviewed-on: https://code.wireshark.org/review/3903 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-31[Automatic manuf, services and enterprise-numbers update for 2014-08-31]Gerald Combs5-18/+238
Change-Id: I35507fe1b4ac8ff3ec9391679769764656b9ff27 Reviewed-on: https://code.wireshark.org/review/3928 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-30Check whether the hop-count exceeds the HOP_COUNT_LIMIT or not.Jérôme LAFORGE1-2/+12
Change-Id: If1c089e069b93a7b90cb525cd642ac26c5efa2d0 Reviewed-on: https://code.wireshark.org/review/3924 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: Evan Huus <eapache@gmail.com>
2014-08-30Remove some unnecessary definitions.Guy Harris1-20/+0
text2pcap.c uses pcapio.c to write pcap files, so it doesn't itself need to know what those files look like. Change-Id: I013d0c094c27515af91f352b565bc9a8bad3e842 Reviewed-on: https://code.wireshark.org/review/3927 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-30Fix char signess issue.Michael Tüxen1-1/+1
This bug was found by compiling wireshark on a Wandboard Quad using FreeBSD. Change-Id: I34ac8a04612a918782160947599245539d6e9427 Reviewed-on: https://code.wireshark.org/review/3923 Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-08-306LoWPAN: fix dissection when using multicast address compressionPascal Quantin1-5/+38
Also update the value_string arrays with the various SAM/DAM combinations Bug: 10426 Change-Id: I87f13c29f42770ec655d85e2247b847bfe28e3ba Reviewed-on: https://code.wireshark.org/review/3915 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-30Mark Trap-PDU as obsolete for SNMP versions > 1Stig Bjørlykke3-17/+31
Change-Id: I967a1547eb97619042b620bb3d803a29cce9ebe1 Reviewed-on: https://code.wireshark.org/review/3920 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-30Qt Follow Stream Dialog : Add some missing text to translateAlexis La Goutte1-10/+10
Fix also indent Change-Id: I864cd785f3b17e6360be63922ca63e349ae13f25 Reviewed-on: https://code.wireshark.org/review/3913 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-30PROTOABBREV: minor fixAlexis La Goutte1-2/+3
Fix typo PROTO_ABBREV -> PROTOABBREV Uncomment FIELDCONVERT Change-Id: I7b64c09ecf0c22a38042156d958e1c6c850c839a Reviewed-on: https://code.wireshark.org/review/3914 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-29Skinny:Diederik de Groot3-61/+80
Fix: ensure that string created in dissect_skinny_displayLabel is always NULL terminated (Fixing Bug: 10429 (Pascal)) Fix: MiscCommandType should use videoFastUpdateGOB Union when command enum is videoFastUpdatePicture Manual Merge PatchSet 4 (Me) and Patchset 7 (Pascal) Fix Merged PatchSet 8 (Pascal) Bug: 10429 Change-Id: I87bc7c6eaff976d7a70856f5fbe8c0ded6257064 Reviewed-on: https://code.wireshark.org/review/3893 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-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: Evan Huus <eapache@gmail.com>
2014-08-29802.11: rename Control Frame Extension field to match the specPascal Quantin1-2/+2
As reported by Richard Sharpe on -dev: https://www.wireshark.org/lists/wireshark-dev/201408/msg00236.html Change-Id: I16638982e14e566bb7e584a2d030c546d2223ebe Reviewed-on: https://code.wireshark.org/review/3916 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-29Consolidate several 3GPP Diameter xml files into one.Jeff Morriss10-1260/+1195
Change-Id: If6ef48fbcceaf0b3a3591086015b021c6a80956b Reviewed-on: https://code.wireshark.org/review/3911 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-29Remove AVPs that aren't really 3GPP2 (they are 3GPP).Jeff Morriss1-231/+1
(The 3GPP2 Ty trace in the menagerie wrongly marks several of these AVPs as being 3GPP2.) Change-Id: I27963fbf8e1da51e430c609784e0c8bb4575549d Reviewed-on: https://code.wireshark.org/review/3912 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-29Qt: Rework the "Manage Interfaces" dialog.Gerald Combs12-818/+753
Convert QTableWidget to QTreeWidget. It looks like the GTK+ version has a separate set of apply/save buttons for each tab which *only* operates on that tab. This can result unexpected behavior which throws away changes if the user updates more than one tab. Use a single "OK" button that applies all of our changes instead. Reorder the tabs. Put Local Interfaces first and select it by default. Always show Remote Interfaces. Disable it on platforms that don't have PCAP_REMOTE. Automatically start editing when we add a new pipe. Don't immediately update pipe interface settings. Wait until we hit "OK" instead. Rename NewFileDelegate to PathChooserDelegate. Note that we might want to move it use it elsewhere in the application. Try switching the user-facing terminology from "Hide" to the more positive "Show". Tell the user that we don't save pipe or remote interface settings. Add a help URL for the "Manage Interfaces" dialog box. Use the GLib and Qt string functions and classes to split and join comma-separated preferences. This makes sure capture_dev_user_descr_find doesn't skip over the first interface. It also keeps the Qt code from adding a leading comma to our capture preferences. Add a note about strings to README.qt. Summary: Use QStrings. For another day: - If we *do* save remote settings we need to store credentials securely, e.g. with CryptProtectData. - Get rid of the remote settings dialogs. Their controls should fit in the remote settings tab. - Add an extcap tab. - We need getter/setter functions for global_capture_opts.all_ifaces. We iterate over it *way* too much. Change-Id: Ib7b61972f3ece4325e0230f725e7f2678acbb24b Reviewed-on: https://code.wireshark.org/review/3873 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-28set usb_dissector_table for control messages to "other" and "reserved"Martin Kaiser1-7/+6
add a comment to explain this Change-Id: I7aa04ab1653cd8e6ae82c230d93c4c8ead677ace Reviewed-on: https://code.wireshark.org/review/3910 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-28remove offset parameter from try_dissect_next_protocol()Martin Kaiser1-13/+10
Change-Id: I7452e6c5a9a24d44f83338aeb1dae389b87c8701 Reviewed-on: https://code.wireshark.org/review/3909 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-28Add 3GPP2 Tx AVPs. Move all the 3GPP2 stuff into its own XML file.Jeff Morriss4-245/+382
Change-Id: I7197f84472139c99bafa5b68f724abaab0453faa Reviewed-on: https://code.wireshark.org/review/3908 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-28handle standard and non-standard setup requests in the same functionMartin Kaiser1-40/+22
Change-Id: I5204a2fc1082e8a6b8082ad58fb252d4ba6c8bcb Reviewed-on: https://code.wireshark.org/review/3901 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-28simplify dissect_nonstandard_usb_setup_request()Martin Kaiser1-26/+19
create setup_tvb in the calling function Change-Id: Id34635afbd25817b09535fc52d1ba396b2597e5a Reviewed-on: https://code.wireshark.org/review/3900 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>