aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-09-20Make CSN.1 dissectors more filterable.Michael Mann4-1049/+5351
The intent here is to remove proto_tree_add_text from packet-csn1.c, but the macros setup means A LOT more hf fields needs to be created. Many of those new hf fields were created with a perl script Bug: 11504 Change-Id: If12c7677185f18a7f684fd3746397be92b56b36d Reviewed-on: https://code.wireshark.org/review/10391 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-09-20[Automatic update for 2015-09-20]Gerald Combs18-1103/+1473
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ifcdb1c02406189085bda58bc7db10829e3fae2c0 Reviewed-on: https://code.wireshark.org/review/10580 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-20Call cf_cb_file_rescan_* callbacks in rescan_packets.Gerald Combs1-0/+4
We call cf_cb_file_rescan_{started,finished} in rescan_file. Do the same in rescan_packets. In the Qt UI this ensures that flushVisibleRows gets called so that packet_list_select_row_from_data works as expected. Change-Id: I425b7beb0f97a7d5b84c979fca65b877673b4722 Reviewed-on: https://code.wireshark.org/review/10569 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: 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-09-19Start moving RTP decoding routines to the ui directory.Gerald Combs5-89/+234
Move decode_rtp_packet to ui/rtp_media.[ch]. Change-Id: Ib138781c37ac17b807bf75f9d772351aadf72071 Reviewed-on: https://code.wireshark.org/review/10575 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-09-19TCPROS - Initial implementation for the Robot Operating System TCP protocolGuillaume Autran5-0/+511
TCPROS is a transport layer for ROS Messages and Services. It uses standard TCP/IP sockets for transporting message data. Inbound connections are received via a TCP Server Socket with a header containing message data type and routing information. For more information, see: http://wiki.ros.org/ROS/TCPROS Bug: 11404 Change-Id: If8810dbb2cb6d6522eb035fd0fa1cf49933bad3d Reviewed-on: https://code.wireshark.org/review/9807 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-09-19MIPv6: Added support for RFC 7148Dhananjay Patki1-9/+141
- Added support for Delegated Mobile Network Prefix as defined in RFC 7148. - Corrected the issue where GRE Key option with no key was not displayed properly. - Also added append-text for the HNP option to also display the HNP value. Change-Id: I42a4bc1627e9e764f10d96aa3988c1f430f00ceb Reviewed-on: https://code.wireshark.org/review/10565 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: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-19Fix 'Decode As' when used with IPv6-in-IPv6 packetsPascal Quantin3-20/+47
Add the ability to identify an instance of the dissector table to be modified by 'Decode As' thanks to pinfo->curr_layer_num For now only IPv6 makes use of it but it could be extended to any other protocol Also get rid of ipv6.nxt protocol: it is not required for 'Decode As' functionality and was colliding with ipv6.nxt field Change-Id: I3c7403c77328ad7170e13af028d178f962a2b508 Reviewed-on: https://code.wireshark.org/review/10552 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-09-19Fix more signal+slot mismatches.Gerald Combs5-12/+12
Change-Id: I347509d3a7765387c48e5aaeaab417617320cf13 Reviewed-on: https://code.wireshark.org/review/10576 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-19AMQP 0-9-1: More expert informationPetr Gotthard1-6/+24
A little usability improvement: Warn user on connection and channel errors and when a message is undeliverable. Change-Id: I6106a63472b1fb5cbbabcf82a90af0f489030458 Reviewed-on: https://code.wireshark.org/review/10573 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>
2015-09-19Refactor NCP Python data so that INFO column can be generated on the fly.Michael Mann3-887/+661
The "old" method of populating the INFO column was to dissect all fields of a function/subfunction, then do a search in the tree to find the hf_ values of interest to then format into something for the INFO column. This is very expensive and requires "low level" APIs (for tree manipulation) which really shouldn't be used in a dissector. The "new" method populates the INFO column at the same time a field is parsed, so nothing has to be revisited. There are still expert infos (and possibly column APIs) under if (tree)s, but with the FAKE_TREE_IS_VISIBLE "hacks" removed, there should be less fear in removing the tree checks. Change-Id: I847827395fc28704f468df8bc8b47b297dde8479 Reviewed-on: https://code.wireshark.org/review/10572 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>
2015-09-19Some more ncp2222 improvementsMichael Mann3-924/+884
Including: 1. Using ENC_BIG_ENDIAN and ENC_LITTLE_ENDIAN instead of self made macros 2. Creating an "expert info hook" so that fields can be parsed "in real time" and added as expert info instead of searching by field name and manually getting values. Most of the expert info is still under if (tree)s, but this is another step closer to removing all of the "manual labor" done that requires "special handling" of all tree functionality. Once the "manual labor" is removed, this dissector can behave like every other dissector and the if (tree)s can be removed with more abandon. Change-Id: If2c6a4c723e12e070e68d6df2d492d4b5ac35123 Reviewed-on: https://code.wireshark.org/review/10555 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-19Fix a VoipCallsDialog signal+slot mismatch.Gerald Combs2-3/+3
Change-Id: I9c16cc138b55572aa19b6e02ca059ebde294bdbd Reviewed-on: https://code.wireshark.org/review/10574 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-09-19Qt: set default current protocol in 'Decode As' window to none instead of HTTPPascal Quantin1-2/+2
It makes more sense (not trying to decode UDP/TCP ports as HTTP) and is consistent across dissectors tables (while currently we have an empty field for tables other than UDP/TCP) Change-Id: I794529f0f46b4197437a1d258f808991ae2338ad Reviewed-on: https://code.wireshark.org/review/10571 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: Michael Mann <mmann78@netscape.net>
2015-09-18Fix WLAN statistics header behavior.Gerald Combs1-1/+1
Connect itemSelectionChanged to header label updates instead of currentItemChanged, which seems to be more reliable. Change-Id: I29f8f2144ad6584e0612d43ec3aac5b258f08ebd Reviewed-on: https://code.wireshark.org/review/10570 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-09-18Sync GTK+ and Qt progress timer logic.Gerald Combs1-4/+4
The GTK+ update_progress_dlg() initially forces a UI update. Do so in the Qt version as well. Change-Id: I05d9e61a0d0e4e05af448039bbb81785ac00908c Reviewed-on: https://code.wireshark.org/review/10568 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-09-18Qt: flush visible rows before trying to select onePascal Quantin1-0/+1
Otherwise you end up with a 'End of capture exceeded' popup when calling rescan_packets() with only a few packets in the capture Change-Id: Idb387ce95f1d22b934e735c350ea0c117763d89a Reviewed-on: https://code.wireshark.org/review/10567 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-18spdy: do not overwrite HTTPS registrationPeter Wu1-2/+2
Setting a zero port still allows it for selection in the UAT dialog while not breaking HTTPS dissection. (In theory the UAT setting would work. In practice it would still call ssl_dissector_add and take over the SSL registration for all tcp/443 traffic. On removal with ssl_dissector_remove, the HTTPS port is not added back again until a restart (or until the HTTPS ports list is changed from the default) because the spdy registration overwrites the HTTP one...) Also note that NPN detection for SPDY is not implemented, only ALPN detection is supported. Bug: 10984 Change-Id: I6e84aa6408abf40bb860abee4845731ce55ce254 Reviewed-on: https://code.wireshark.org/review/10517 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-18NAS EPS: do not try to decode Message Elements when the end of the message ↵Pascal Quantin1-4/+6
is reached Change-Id: Iaa05c3b4268c5c618134810c49f65d63995eccfb Reviewed-on: https://code.wireshark.org/review/10564 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-09-18QUIC: Fix Num Timestamp dissectionAlexis La Goutte1-19/+22
Change-Id: I75ba3807daadf95d135bc73083b6ff37528b2068 Reviewed-on: https://code.wireshark.org/review/10561 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-18main_toolbar (GTK): Fix no previous prototype for ↵Alexis La Goutte1-1/+2
‘plugin_if_maintoolbar_goto_frame’ [-Wmissing-prototypes] Change-Id: Ibb58694e730389b1e8ef3790595ed16d8699d37c Reviewed-on: https://code.wireshark.org/review/10563 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-18DHCP (bootp): Fix Dead Store (Dead assignement/Dead increment) warning found ↵Alexis La Goutte1-1/+0
by Clang Change-Id: Ie67b4fd7a3d8655f0b33c3a37b0cf08e7f248a76 Reviewed-on: https://code.wireshark.org/review/10562 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-18RTP: handle payload reassembly for multiple fragmentsHadriel Kaplan1-21/+21
If an RTP payload spans more than two packets, the dissector needs to save the previous fragment info. Bug: 11413 Change-Id: I62558f40136881d70bf2a9597eabd3697966ac4a Reviewed-on: https://code.wireshark.org/review/9875 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-18QUIC: Add Client/Server handshake (CHLO / SHLO / REJ)Alexis La Goutte1-22/+1238
Support decode of tag/value Only try to decode handshake when sequence number = 1 (Working on function to check if the packet is handshake..) There is sometimes issue for decode ACK Special Frame Type... Bug: 11494 Change-Id: If1f4051fc9c11d343acb7f15f94a325d4243a070 Reviewed-on: https://code.wireshark.org/review/8171 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-18Make IPv4/IPv6 DiffServ fields uniformJoão Valverde3-89/+90
Replace DSCP/ECT/CE with DSCP/ECN for IPv6. Introduce short descriptions for DSCP/ECN values. Formating changes: - Make IPv4 and IPv6 as similar as possible. - Display short abbreviations only for "Differentiated Services Field". - Display DiffServ field as hex for IPv4. - Elide leading zeros from hex representation from DiffServ field for IPv6. - Display DSCP/ECN as decimal in subtree (same as "IP DSCP" column format). Change-Id: Ia69d11dc9c1d752eb2e269314287c885506b5353 Reviewed-on: https://code.wireshark.org/review/10360 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>
2015-09-18pkcs1: remove unused RSAPrivateKey definitionPeter Wu4-85/+0
RSA private keys are typically not found in network captures, so let's just remove it. This removal avoids overloading the pkcs1.modulus field with the same meaning from two different contexts (RSAPrivateKey and RSAPublicKey). Change-Id: I65239718e6fc801fc53fa46c467dc86620aa3b29 Reviewed-on: https://code.wireshark.org/review/10546 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-18When we're updating the progress bar, ask that it be updated (redrawn) too.Jeff Morriss1-0/+3
At least on Linux/X11 with Qt5 this appears to be necessary so the progress bar updates more than once every 2 seconds or so (when loading a large file). Change-Id: I7eea9c0d97d24bc14ad75f082a3531dcf1a3b6ae Reviewed-on: https://code.wireshark.org/review/10559 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-18do not clobber user CFLAGSJeroen Roovers1-14/+14
Bug: 10791 Change-Id: I58c35c757039e69111a39100f5ccb306e098d591 Reviewed-on: https://code.wireshark.org/review/10519 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-17Fix some signal → slot mismatches.Gerald Combs4-9/+9
Update some signal definitions to match gb4e972b. Bug: 11524 Change-Id: I0d98a4e83c791221962943c3dec8f0d4296d3027 Reviewed-on: https://code.wireshark.org/review/10557 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-09-17Qt: Add an event processing timer.Gerald Combs4-7/+16
When updating the progress dialog (which happens each time we read a packet) the GTK+ UI processes application events every 100ms. Do the same in the Qt UI. Ping-Bug: 11515 Change-Id: Ic53eade05c0b82bf436c08618f28506c5fcdbc94 Reviewed-on: https://code.wireshark.org/review/10554 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-09-17Packet list speedups.Gerald Combs5-22/+68
beginInsertRows + endInsertRows is expensive. Instead of calling them each time we add a packet to the list, queue up a list of visible packets and flush it during the next UI update. Assume that none of our column data has newlines. Enable uniformRowHeights and only disable it when we need to. Note that this requires further work. Ping-Bug: 11515 Ping-Bug: 10924 Change-Id: Ifbdd2964b174247a4745d4889ebda5bf3b886ba4 Reviewed-on: https://code.wireshark.org/review/10553 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-09-17IAX2: Initialize a variable.Gerald Combs1-1/+1
Change-Id: I0981fd93969e2f0168c83688b691f51407f4119e Reviewed-on: https://code.wireshark.org/review/10556 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-17ncp2222 - Convert process_bitfield -> proto_tree_add_bitmask and other cleanup.Michael Mann2-1034/+499
The dissector is doing a lot of unnecessary "manual" operations. Start the process of simplifying that to encourage use of general APIs and put control of the "field name" in the hands of the hf_ entry it belongs with. Change-Id: I5b048c04858ac4a846a276ba12d61c665deb66f8 Reviewed-on: https://code.wireshark.org/review/10547 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-17[iax2] don't THROW() an exception from a dissectorMartin Kaiser1-12/+18
in this case, it's enough to exit the switch block and try to continue with the next element we might now end up with ie_item==NULL after the switch, so replace the assertion with a check Change-Id: Id54346077eb8aa12b22575f3ab6fa80087f240ce Reviewed-on: https://code.wireshark.org/review/10549 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>
2015-09-17change the representation of an empty byte array in a display filterMartin Kaiser1-6/+14
by default, an empty byte array (FT_BYTES) is represented as an empty string thus, using "Apply as Filter / Selected" on such an item creates an invalid display filter expression, e.g. dvb-ci.mmi.char_tbl== represent an empty byte array as "" if we're compiling a display filter expression Bug: 11526 Change-Id: Ie94507a24a496e0c25bcdadfab72fdf9fb35958a Reviewed-on: https://code.wireshark.org/review/10540 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-09-17[iax2] minor cleanupMartin Kaiser1-11/+6
replace switch-case with if remove an initial value that's overwritten immediately Change-Id: I98487ed08f91416179fcbbbaf80bf1b126a8d1c2 Reviewed-on: https://code.wireshark.org/review/10548 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-16As far as I can tell the name is "Git" and not "GIT".Gerald Combs1-4/+8
Update the Git protocol dissector strings accordingly. Change-Id: If9a8f04dcd31e9ad930d328654b1c6479472e48c Reviewed-on: https://code.wireshark.org/review/10550 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-09-16Don't force Lua support in RPMs (some distros don't ship a compatible LuaJeff Morriss2-13/+27
anymore). Also make the RPM follow configure's qt4-vs-qt5 choice. Change-Id: I832af99e055d42b92f3a7c8e4378c7a9d5d628b9 Reviewed-on: https://code.wireshark.org/review/10532 Reviewed-by: Jeffrey Smith <whydoubt@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-09-16IPv6: Make "ip.version" field hiddenJoão Valverde1-31/+18
Change-Id: Ib9a29205c36b3a50989ffeddb28e349ede16efd3 Reviewed-on: https://code.wireshark.org/review/10474 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-09-16http: preserve desegmentation functionality for http2Peter Wu1-9/+9
When the HTTP dissector passes data to a subdissector, it should also propagate the desegmentation ability. Otherwise subdissectors (such as HTTP2) will not be able to handle large DATA frames. Reported by Alexis, verified with his capture. Change-Id: I831a78e8d1ad08536e3d0d870012e427ce289b1b Reviewed-on: https://code.wireshark.org/review/10544 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> 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-09-16NFS: add a missing return when the IO hints bitmap is too largePascal Quantin1-0/+1
Bug: 11528 Change-Id: I9f92a2b38e9c094609b960eb1e105cc57ea66de3 Reviewed-on: https://code.wireshark.org/review/10543 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-09-16http2: fix dissection when using UpgradePeter Wu1-6/+8
The fix for bug 11331 has as side-effect that the HTTP part of a conversation is not dissected on the second pass. Fix it by calling the HTTP2 dissector only when it was detected via heuristics, and not via Upgrade (since that would be handled by the http loop). While at it, remove the use of tvb_new_subset_remaining since the original tvb is not touched and move the comment about the proxy to the right place. Tested with the capture from Alexis (plain HTTP2 via Upgrade), the one from bug 11331 (plain HTTP2 via heuristics) and a HTTP2 in SSL capture (via heuristics). Change-Id: Iead7682aa8d5114e4edcfd54eabcd0d659056cc1 Reviewed-on: https://code.wireshark.org/review/10541 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-09-16[tcp] Fix case of incorrect "[TCP ACKed unseen segment]"Bill Meier1-3/+8
The invalid message occurred for an ack of a TCP segment which included both retransmitted data and additional new data. Bug: 11506 Change-Id: Id981d04c91b9e69b6ee1e0dea85aed142bf32594 Reviewed-on: https://code.wireshark.org/review/10395 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: Bill Meier <wmeier@newsguy.com>
2015-09-15x509,ber: fix header field of large integersPeter Wu3-5/+12
In the past large integers would be displayed as text, later on this was changed into a "proper" header field. In most cases you do not want to see "ber.64bit_uint_as_bytes" though, but the original field name. This patch allows fields that are marked as FT_BYTES to be displayed with their original header field details (name, description, etc.). Change-Id: I4ab1a4cce649a225c73298fbf4dcf1692c693a03 Reviewed-on: https://code.wireshark.org/review/10539 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>
2015-09-15mate.released_time is added as a float so register it as such.Jeff Morriss1-1/+1
As noted in: https://ask.wireshark.org/questions/45835/wireshark-mate-correlation-multiple-gops Realistically all MATE's times should probably be converted to FT_RELATIVE_TIMEs but that's a project for another day. Change-Id: I11f640be769d16ccfd787ae2d7f3837fa03ad379 Reviewed-on: https://code.wireshark.org/review/10537 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-15asni_tcap: actually regenerate dissector after cleanupPeter Wu1-4/+3
Rane make -C asn1 and found this missing change. Somehow the unnecessary initialization was not included with the dissector regeneration in 3243b6f964c96f0137fc3fffd66a74dd9f7910fd ("asn1: split off cleanup routines"). Change-Id: I26d6f0ca4e7fa0b791108f016c684556da5d06e8 Reviewed-on: https://code.wireshark.org/review/10538 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-09-15MTP3 Summary: fix no previous prototype for ↵Alexis La Goutte1-1/+2
‘register_tap_listener_gtk_mtp3_summary’ [-Wmissing-prototypes] Change-Id: Iee26ba47802f3091f7e7264d2d7ce4b5e22db53c Reviewed-on: https://code.wireshark.org/review/10536 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-15Apply fix-encoding-args.pl "manually" and other cleanup.Michael Mann1-276/+225
I'm guessing fix-encoding-args.pl doesn't work on packet-ncp2222.inc because the hf_ declarations/definitions aren't in the file itself, so it can't figure out endianness or field type. So to bring the file up to modern coding standards, I did it "manually". In general I think this file has escaped critique because of the "generated" nature of the dissector. Also removed tvb_ensure_bytes_exist and tvb_get_ptr use as both were superfluous. Change-Id: I224f0ce15f8eb93c48ecb8eea66d161d98468f23 Reviewed-on: https://code.wireshark.org/review/10502 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>
2015-09-15ncp2222 Updatesgmor1207@gmail.com2-248/+782
Modifications to ncp2222.py Add absolute time values eptime for file/volume info Add support for 64 bit File Transfer NCP's (22/54, 22/55, 22/56, 22/57, 22/58, 87/70, 87/71, 87/72, 87/73, 89/41, 123/35) Fix numerous dissection errors in NWInfo and ExtNWInfo structures Fix some indention (white space) in source Modifications to packet-ncp2222.inc Change seq count rollover value to 16 instead of 255 to make it more robust Add ncp 87,72 reply Add ncp 8x20 request Fix ncp 8x20 reply Change-Id: I80bdcc5854c02edd4ea51c74aa0bbc9c0e062bc1 Reviewed-on: https://code.wireshark.org/review/10017 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-09-15Make fchdr "packet" scoped.Michael Mann1-89/+89
Broken in ge450b9b, when it stopped being static (which fixed other bugs). Conversations still need the fchdr "address" data to remain in scope. Bug:11457 Change-Id: I17a3814bf76d2940124a2700fb6b12c6d7d834c1 Reviewed-on: https://code.wireshark.org/review/10518 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-09-15Eliminate proto_tree_add_text from odds and ends.Michael Mann5-14/+11
A few calls in the epan directory and comments in the ui directory Change-Id: Ia8f8830ac6909ab94d3a03283bfd173456bc9718 Reviewed-on: https://code.wireshark.org/review/10492 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>