aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-09-03Updated translations (add Comment fields) for desktop integration.AlexL1-0/+33
Patch submitted via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10442 Bug: 10442 Change-Id: Idf73b058cff5db520cde951e58e85e5f71c680e2 Reviewed-on: https://code.wireshark.org/review/3975 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-03Don't override the PA package naming convention. Use our full version inGerald Combs3-20/+11
the package name. Set a minimum OS version (Vista). Update some comments. Change-Id: I28096276d2588993136b008a307dbcc7983496b0 Reviewed-on: https://code.wireshark.org/review/3974 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03Check whether the hop-count of most inner message is equal to 0Jérôme LAFORGE1-20/+37
Extract RFC3315 about relay message and hop-count : 20.1.1. Relaying a Message from a Client If the relay agent received the message to be relayed from a client, the relay agent places a global or site-scoped address with a prefix assigned to the link on which the client should be assigned an address in the link-address field. This address will be used by the server to determine the link from which the client should be assigned an address and other configuration information. The hop-count in the Relay-forward message is set to 0. 20.3. Construction of Relay-reply Messages A server uses a Relay-reply message to return a response to a client if the original message from the client was relayed to the server in a Relay-forward message or to send a Reconfigure message to a client if the server does not have an address it can use to send the message directly to the client. A response to the client MUST be relayed through the same relay agents as the original client message. The server causes this to happen by creating a Relay-reply message that includes a Relay Message option containing the message for the next relay agent in the return path to the client. The contained Relay-reply message contains another Relay Message option to be sent to the next relay agent, and so on. The server must record the contents of the peer-address fields in the received message so it can construct the appropriate Relay-reply message carrying the response from the server. For example, if client C sent a message that was relayed by relay agent A to relay agent B and then to the server, the server would send the following Relay-Reply message to relay agent B: msg-type: RELAY-REPLY hop-count: 1 link-address: 0 peer-address: A Relay Message option, containing: msg-type: RELAY-REPLY hop-count: 0 link-address: address from link to which C is attached peer-address: C Relay Message option: <response from server> Change-Id: I774cc22c9c090af1a5d3732115c7cd3478343288 Bug:10437 Reviewed-on: https://code.wireshark.org/review/3936 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-03Actually use the define of custom plugins...AndersBroman1-0/+1
Change-Id: Id831e3bff943d9000969f951c3a2b9ead173e033 Reviewed-on: https://code.wireshark.org/review/3969 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03ieee802.11: Add VHT Action (802.11ac)Alexis La Goutte1-0/+250
Add VHT MIMO Control (Part of VHT Compressed Beamforming) No yet supported : * VHT Compressed Beamforming Report, MU Exclusive Beamforming Report (8.5.23.2) * Membership Status Array, User Position Array (8.5.23.3: Group ID Management) * Operation Mode (8.5.23.4: Operation Mode Notification) Bug:10169 Change-Id: I182a487687d44f0ef77a045a99f82c92fba8ff2c Reviewed-on: https://code.wireshark.org/review/2146 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> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03CAPWAP: fix some message type with wrong length (don't use optlen for "fixed ↵Alexis La Goutte1-4/+4
type length") Change-Id: Id666086abdd55e38bcb470f8015363585d40728f Reviewed-on: https://code.wireshark.org/review/3957 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03CAPWAP: Add some news expert infoAlexis La Goutte1-11/+178
When it is the mininum wrong length for Message Element Type or when the Message Element Type is not yet decoded by Wireshark Change-Id: I49aca0df5ba5ec70d8fb764fef39c17c46ee22a0 Reviewed-on: https://code.wireshark.org/review/3956 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03CAPWAP: Add new ett variableAlexis La Goutte1-23/+61
Avoid to have all subtree has expended Only 2 ett actually and there is > 20 subtree... Change-Id: Ia4af85345a6f1963d24d1fd589ff8ee09a8ef412 Reviewed-on: https://code.wireshark.org/review/3955 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03CAPWAP: Split CAPWAP Control and Data in 2 different protocolAlexis La Goutte1-11/+13
Avoid to have 2 CAPWAP in Decode as (and more easy to use too...) Change-Id: I3a332e9b4b069b9215c38b5c08872bd07ac4c2c3 Reviewed-on: https://code.wireshark.org/review/3954 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03CAPWAP: Use standard boilerplate (see doc/packet-PROTOABBREV.c)Alexis La Goutte1-526/+723
For hf field, reindent code Use 0x0 by default for bitmask Remove also some "boilerplate" comment.. Change-Id: I552ccca2e444f3686ee9ecdad456f2ecfbaa5cba Reviewed-on: https://code.wireshark.org/review/3953 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03CAPWAP: Wrong usage of FT_BOOLEAN for Reserved field...Alexis La Goutte1-6/+6
Change-Id: Ie1c472f4db105a1a8db9dba265039282872dffb2 Reviewed-on: https://code.wireshark.org/review/3952 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03Fix dist. Remove unused files.Gerald Combs4-151/+3
Change-Id: I44b2dbfa3859841c67e933d8e7c510834b7cc2ee Reviewed-on: https://code.wireshark.org/review/3967 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03OS X packaging fix.Gerald Combs1-1/+1
Change-Id: I82936bb1dcfa3a7ca1aea8a3ded388015aa37531 Reviewed-on: https://code.wireshark.org/review/3966 Reviewed-by: Gerald Combs <gerald@wireshark.org>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 03:26:57 +0000