This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "wireshark with Osmocom specific dissectors". The branch, laforge/pending has been updated discards 8f902cfe74889fb745f896039dc330a4518678af (commit) discards a3e21523989c6840f2adcb73b0e97ebab47f8f66 (commit) discards 2b4aaaddc5d1a1e1974b13ee9b7e6f4d724349a6 (commit) discards 265398045efdf8d7fadf22c4a19bb043aa55abb9 (commit) discards 3ea3079b152f8b86f12e8c212579f37f6ca57b66 (commit) discards d3d930f1525d1c463d647c0e4c1b219a1e6ecffa (commit) via 778c2119d86e21b10f66692564afb52ec2743ba0 (commit) via 8c0ed7ab260e36516a3883c53973118e2c272a3d (commit) via 1fb98b2fb3df3592afdde68b7ea9f4116b7845ab (commit) via b09ecd9c4e359a0429f63738f856c023eb7ccae2 (commit) via 1632510ac2a335c7ce0890696fc668f32cd2594c (commit) via 9f1334f3095fef684e6bab87a49d19235de10761 (commit) via ad370374f7a88821a34de878800ae83a83b83982 (commit) via 038be63e65c9dbbe56c54cd458d06e95e01e91ef (commit) via 6a4226e2bfb7340e9c824e17c4b39f535ee84abe (commit) via 5592deb6d0659a8f0dba52f8301fc7d19a56575a (commit) via f60ec2581ae825f89e669ca4b4f14917a2aab561 (commit) via 29841933f934533cc63ff218bf0f6423ee51a7eb (commit) via 2d89c34e8cf11d7cb51bd609eb18db3acffc1108 (commit) via 43000acd7429a5870c6b411263c2e4a8342da759 (commit) via 8dca05f188712d26efb0e126a00d4ac167a5c8dc (commit) via 9f56bdbef3b2f20339b16308ec2faf663e7b4f3f (commit) via b7e7796e20d5b194a72658a0e3f88522e7f66ebc (commit) via fb0c288f99518eac830cf29e92c3543a8045878e (commit) via 58f601879a523ecd0ea629bca0da5fb36e1ef416 (commit) via 6b064e0e145053dbaf96fb0e7b90a46979ce2c8c (commit) via d438170c87c429af914dbc66dd989860dd461960 (commit) via a02d8e3c4e8cf7d756141ca45f6b27f5658747fb (commit) via 7a7249cae7765f0acb785c22d2fb3b9210d5c8ac (commit) via 3496051d07683a5ddee435c7dc521a157b142fa3 (commit) via 43706be64c1380d55da1882d093764913401d7e7 (commit) via 98ec464f0cfbf45bfd204725665f527533b82ff3 (commit) via 5e3f8236b9945eac9105b65a14488374aa7a836f (commit) via dde31375270fac9856f6908da30355e77a97758d (commit) via 92a2c184b09ce41a1ab717963750bb5543099742 (commit) via e2c26ff90c6aee381c3af0c33253dcfa5631bb43 (commit) via 37eead0f603e8129702384a0798410d6c0b0884b (commit) via 49fcee3fcb997036f8677af081a5cbecab7c07e0 (commit) via 983334fc1e6f95c88b9e35176feedf66d9dd484d (commit) via 0af0532ccd9e39372f13238c63519fb04977974f (commit) via fa47c368c6ea29c71e7a0d80aa42f8632f335fb8 (commit) via cd4540b260040f08a5e814fab4c60e001501f8cb (commit) via b9a1fd5bd63be58243dd973c8c842f10e9833f00 (commit) via 1dde01cd9fd0b2f69fef5fa95d79a50983e3f4a7 (commit) via f39389e945e11a82905bc5b71ada85f3b90e9bab (commit) via 29768d91ec60023cc68cb38edc492a6d2221f662 (commit) via 0863a2c4659ca1c874f414b0720465f0fae771d9 (commit) via f0dbb28854346970f4329413c9bae8a212d95836 (commit) via 451eac813745170074aa9223ab558263aa8f73f5 (commit) via 4f684a606226bee6381285388e3b28f06975f1f4 (commit) via a1c30fed2a5263314d892c7b183e6d8b43e14d4f (commit) via fc4bb7eb7413affa63049516c4dbc46ca272abea (commit) via 47829b9611b613425aa0a314224863b02b915ea2 (commit) via ae989a5d0642c9de4458a2e8bbfd5f288193a6f5 (commit) via d59653f8d52efbf3ab32f95043cd718965e57406 (commit) via 263fea9723ea3487c0d98b0720ab2d656f780fe1 (commit) via ebe948bf983c5ff5b0805f16647ffa974d7f1bd6 (commit) via 8c748af03dbd3f0484a14cb3a7b9341b1adb68da (commit) via f5e22a14877922aa7b907d2e434958c86efd6875 (commit) via d8cdb550445a1bc86626bd9d45da1ce958d1592b (commit) via c33429765473dc1e7e46a24305bbf921685401e3 (commit) via 7c3ecc6956e456867ac7d216600ea3697b548eff (commit) via e2c812c7674526cf0cb1acbd01ea43d6701f62df (commit) via 1d2f68b60f003c9ef006465330207d3d65af6dd7 (commit) via 104b9fe5afc1f7aac1df263dd8e9af1fd1cb449f (commit) via 89bc07c5d59ead31cad3ab5eea4378b6bb60bce9 (commit) via f96e9d067ba314c947a3caeafc909e9542042a64 (commit) via 38f45e1e222589987d95e79f59430403f40bdd49 (commit) via 2994e63abbfbd3b57ade6d04a8737199537cddd5 (commit) via 8773ea03cbcd72cc6463476e0342d6756d51267a (commit) via a94b82a8e1ca71d130ec5a77f7d71b2d6814aeef (commit) via 677a543e48eed5921d44ceb53ea6101b43a98ad2 (commit) via 149e42f7d5e4bbb988da7e9f7fc70efe87cbca2e (commit) via 74f025d79e37dbbd628144a7b69c8f0f23b50996 (commit) via 548b9febb3c915b3693af0f5e8fe338447ca0f11 (commit) via a275e3fd0aecd98b5118ca08a3622e8cb1468b2d (commit) via 026b2f99293d1eb75f29178fc1ffd86dbe22fe7d (commit) via 7b5e77406d5210489c82a7aa9312053ccb030766 (commit) via 2b51717fe5a7f9c1e389976ae1e55320970d133f (commit) via 4d9eb4caab3be28864dc2b257e5d6f5ffe6c48dc (commit) via 2452367d25e39840f679538cd2e49649c914016e (commit) via d67b557d9423c02a4b35f76ee1d2d1d3712f46fb (commit) via 75a5cf9fa0c2d7eed8fca8b9011c07dd99f5a751 (commit) via 5a0bc5f27bcb918fd78fd690cbd8073b254f15b2 (commit) via a7d404a972bc24020bbfe2d64b99e299f2507bdc (commit) via e0a4f0c79b68830547dab1baad7641a09b4d93f5 (commit) via 26def3ef72b3dc1f936322fb1e96b7d81a19390b (commit) via 037c64aa34d4196da5a39dfb59af16abceb1247b (commit) via faf70602a8e96433ae888278cccaac057091fbca (commit) via 83a1ab23abdb22ae7b84cff99009988f97fb3653 (commit) via fca6bf6a99b08be574ab8679104d19623b4881fc (commit) via bded2b681485fe9a91041688bcb41d371c9099e8 (commit) via ab07f8e0f89eb1bb2c2c61c71e44e3fd0e31cc52 (commit) via 51d23c6959edfbf45033ba26237820fa2914ff77 (commit) via 98efddc6c26313809b6f9326f09f76c390d21676 (commit) via 054455683b2e3697a0e41640a7137781cdc754c8 (commit) via 5721a87330f8afe3fed12d4af250d7a3d219cbe2 (commit) via 40ebfb9a6f180b5b6deb0ed727e38c98e848b6cb (commit) via dd98856afce144eb19104a6f40c1abedc9069558 (commit) via 5aede1bc50b6bb9ae13926e2249d22d95c12814e (commit) via b49e20c10af2fd1d21f8b8399db3fe4ffd6366df (commit) via 39840d70926c76b394a51659e2a9001ec430d131 (commit) via 99ca028ba535f621b7c5bb57148f1242a3875185 (commit) via a63c5682bdcb194f190bd8de9f7f27f709a0c8c9 (commit) via 3309c08cd03a16438e6189bf4547ca172f90330a (commit) via a0d03ce1e70144fe713df9e03b30bc8126d764a5 (commit) via a0b4d4657849811b78a36ac0a6449ea0f4c552a1 (commit) via 77f31c6e7de5baed978298ae599494255fe254da (commit) via 50489fd279637e24b742a1ceaec0282974d07a18 (commit) via db7c6286169015a727024e86eb270722127125bb (commit) via 2462f9e8103b23c2728cc5aa84995e0b2f363f12 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (8f902cfe74889fb745f896039dc330a4518678af) \ N -- N -- N (778c2119d86e21b10f66692564afb52ec2743ba0) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cgit.osmocom.org/wireshark/commit/?id=778c2119d86e21b10f66692564afb52... commit 778c2119d86e21b10f66692564afb52ec2743ba0 Author: Harald Welte <laforge@gnumonks.org> Date: Fri Dec 2 16:44:20 2016 +0100 WIP: RSL Ericsson support Change-Id: I1e9b3c08848f4feb60361e629d7225b6d2e1dcbd http://cgit.osmocom.org/wireshark/commit/?id=8c0ed7ab260e36516a3883c53973118... commit 8c0ed7ab260e36516a3883c53973118e2c272a3d Author: Harald Welte <laforge@gnumonks.org> Date: Wed Oct 26 22:38:20 2016 +0200 HACK: Hand GPRS RLC payload to GPRS LLC dissector this is an ugly hack, as there is no code for packet re-assembly in betwween, i.e. we only get proper dissection if the LLC message was fitting entirely into one RLC block. Nevertheless, sufficient to see things like RAU, ATTACH, IDENTITY procedures. Change-Id: I1fc488aa58353e5f4264b940f9f4c18987148a7d http://cgit.osmocom.org/wireshark/commit/?id=1fb98b2fb3df3592afdde68b7ea9f41... commit 1fb98b2fb3df3592afdde68b7ea9f4116b7845ab Author: Harald Welte <laforge@gnumonks.org> Date: Wed Oct 26 20:09:31 2016 +0200 WIP: Jacob's EGPRS patch ... with add_new_data_source() to visualize the re-aligned bits Change-Id: I1604dceaf3d91228e87712e099c8a209ff812f4a http://cgit.osmocom.org/wireshark/commit/?id=b09ecd9c4e359a0429f63738f856c02... commit b09ecd9c4e359a0429f63738f856c023eb7ccae2 Author: Harald Welte <laforge@gnumonks.org> Date: Sun Jul 17 16:22:19 2016 +0200 l2tp: Introduce preference for default pseudowire In some cases, the establishment of the L2TP session is not captured in the pcap file, and thus wireshark cannot determine the l2tp pseudowire to be used for decode. So rather than using a ocmpile-time hard-coded default of cisco hdlc, let's introduce a prference where the user can select the default pseudowire in such cases. Change-Id: I44a6373d4812c9ab5a919514273a41a2ab57142c http://cgit.osmocom.org/wireshark/commit/?id=1632510ac2a335c7ce0890696fc668f... commit 1632510ac2a335c7ce0890696fc668f32cd2594c Author: Harald Welte <laforge@gnumonks.org> Date: Sat Jul 16 15:39:17 2016 +0200 L2TP: Add preference to select Ericsson HDLC flavor At some point over the wireshark last years, the connection between the L2TP dissector and the Ericsson HDLC dissector (packet-ehdlc.c) got broken. I cannot poinpoint the exact change when it broke. However, traces with Ericsson L2TP that used to display correctly no longer do so. The problem with Ericsson L2TP is that they simply re-use the HDLC pseudowire (0x0006), but then have frames completely different than what's specified in the RFCs for that. To address this, let's add a protocol preference to allow the user to choose. Change-Id: Idce022ef0f233c01ecffc67dca7f428bde31ef6b http://cgit.osmocom.org/wireshark/commit/?id=9f1334f3095fef684e6bab87a49d192... commit 9f1334f3095fef684e6bab87a49d19235de10761 Author: Harald Welte <laforge@gnumonks.org> Date: Fri Dec 2 22:29:36 2016 +0100 Add GSMTAP logging sub-dissector Applications can also use GSMTAP framing to convey log messages which would traditionally be printed on stderr or on log files. This allows the ordered/interspersed display of protocol messages with log lines from the applications that send or received those messages. The osmocom logging framework (part of libosmocore) implements this in libosmocore.git Change-Id I9a7e72b8c9c6f6f2d76d1ea2332dcdee12394625 Change-Id: I0de723445e5b5ce0199a4081808111240a9ed047 http://cgit.osmocom.org/wireshark/commit/?id=ad370374f7a88821a34de878800ae83... commit ad370374f7a88821a34de878800ae83a83b83982 Author: Harald Welte <laforge@gnumonks.org> Date: Sat Dec 10 14:29:09 2016 +0100 Cosmetic fixes to packet-gsmtap.h header file make sure all formatting is consistent and using tabs rather than a mix of tabs and spaces. Change-Id: I48a570a365b8d908a084c82c2f79260c053227ab http://cgit.osmocom.org/wireshark/commit/?id=038be63e65c9dbbe56c54cd458d06e9... commit 038be63e65c9dbbe56c54cd458d06e95e01e91ef Author: Harald Welte <laforge@gnumonks.org> Date: Fri Dec 9 19:21:13 2016 +0100 gsmtap: Introduce a new packet-gsmtap.h header file Move the GSMTAP protocol related #defines to packet-gsmtap.h, as there are other dissectors (like packet-gsm_sim.c and future dissectors) need access to some of those #defines. Change-Id: Ibb3517bd773be63b7e3cd30104a5351427e22ebf http://cgit.osmocom.org/wireshark/commit/?id=6a4226e2bfb7340e9c824e17c4b39f5... commit 6a4226e2bfb7340e9c824e17c4b39f535ee84abe Author: Роман Донченко <dpb@corrigendum.ru> Date: Fri Dec 9 01:04:39 2016 +0300 ssh: organize header field IDs The header field ID variables are listed in a somewhat chaotic order, making the list hard to comprehend and update. Group them according to the part of the protocol the corresponding fields occur in, and order the groups and the IDs within groups to roughly match the protocol flow and message formats. Change-Id: I915f508fd78ff89819c96d246c79d335de6a172e Reviewed-on: https://code.wireshark.org/review/19154 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> http://cgit.osmocom.org/wireshark/commit/?id=5592deb6d0659a8f0dba52f8301fc7d... commit 5592deb6d0659a8f0dba52f8301fc7d19a56575a Author: Guy Harris <guy@alum.mit.edu> Date: Fri Dec 9 19:27:58 2016 -0800 Boost the max CPU time. See if that lets the big file from bug 13226 pass the test under Valgrind. Change-Id: I76eb0c18809289e3b14ff8071402c31f70d93d42 Ping-Bug: 13226 Reviewed-on: https://code.wireshark.org/review/19189 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=f60ec2581ae825f89e669ca4b4f1491... commit f60ec2581ae825f89e669ca4b4f14917a2aab561 Author: Michael Mann <mmann78@netscape.net> Date: Thu Dec 8 21:41:58 2016 -0500 [ICMP] use abs() in detecting timestamp heuristics The code was making the assumption that the ICMP data time will always be greater than or equal to the frame time, but not earlier, but that is not always the case and the heuristics can fail. Bug: 13161 Change-Id: I4bc7bd8d22d717d3b1f08afdd651f8a70cb7aef2 Reviewed-on: https://code.wireshark.org/review/19157 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=29841933f934533cc63ff218bf0f642... commit 29841933f934533cc63ff218bf0f6423ee51a7eb Author: AndersBroman <anders.broman@ericsson.com> Date: Fri Dec 9 15:43:30 2016 +0100 [RTP] Don't call p_get_proto_data() twice Change-Id: Ie13e23232e183818b813e391274d75415b3fee83 Reviewed-on: https://code.wireshark.org/review/19181 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: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=2d89c34e8cf11d7cb51bd609eb18db3... commit 2d89c34e8cf11d7cb51bd609eb18db3acffc1108 Author: Thomas Dreibholz <dreibh@iem.uni-due.de> Date: Fri Dec 9 10:34:42 2016 -0500 packet-windows-common.h: Fix "Warning: this decimal constant is unsigned only in ISO C90" Bug: 12824 Change-Id: I4b857f3cc488867d8ee7487c1f978edf639988f8 Reviewed-on: https://code.wireshark.org/review/19182 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=43000acd7429a5870c6b411263c2e4a... commit 43000acd7429a5870c6b411263c2e4a8342da759 Author: Dario Lombardo <lomato@gmail.com> Date: Fri Dec 9 11:46:20 2016 +0100 ui: move filesystem code to wsutil/filesystem.c This function can be used by code outside ui (eg. extcap). Ping-Bug: 13218 Change-Id: Ic11f7acebefeaf777692df044ebff9b1bc387aa3 Reviewed-on: https://code.wireshark.org/review/19178 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=8dca05f188712d26efb0e126a00d4ac... commit 8dca05f188712d26efb0e126a00d4ac167a5c8dc Author: AndersBroman <anders.broman@ericsson.com> Date: Fri Dec 9 13:04:28 2016 +0100 [RTP]Rearrange the logic in process_rtp_payload() to make it a bit clearer what happens. Change-Id: Ib64c127ef5e2ba3fe57301c7ac7c75fd1d0e0d27 Reviewed-on: https://code.wireshark.org/review/19176 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=9f56bdbef3b2f20339b16308ec2faf6... commit 9f56bdbef3b2f20339b16308ec2faf663e7b4f3f Author: Gerald Combs <gerald@wireshark.org> Date: Thu Dec 8 15:16:00 2016 -0800 Set a Libgcrypt log handler on Windows. Libgcrypt prints all log messages to stderr by default. On Windows the slow_gatherer routine logs NOTE: you should run 'diskperf -y' to enable the disk statistics if DeviceIoControl(..., IOCTL_DISK_PERFORMANCE, ...) fails. We don't depend on cryptographically secure random numbers and the message is needlessly confusing. Add a log handler that ignores less-severe messages. Change-Id: If40a691ea380364457dfdf126b9bf33ac2672d3a Reviewed-on: https://code.wireshark.org/review/19155 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> http://cgit.osmocom.org/wireshark/commit/?id=b7e7796e20d5b194a72658a0e3f8852... commit b7e7796e20d5b194a72658a0e3f88522e7f66ebc Author: Dario Lombardo <lomato@gmail.com> Date: Wed Nov 9 13:56:12 2016 +0100 extcap: add new option type (timestamp). Bug: 12787 Change-Id: I941833c55fb607c8af2ef832082af58d7b94e965 Reviewed-on: https://code.wireshark.org/review/18721 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=fb0c288f99518eac830cf29e92c3543... commit fb0c288f99518eac830cf29e92c3543a8045878e Author: Paul Offord <paul.offord@advance7.com> Date: Mon Oct 3 09:09:18 2016 +0100 transum: plugin code A plugin to calculate response, service and spread time values based on the RTE model. Bug: 12892 Change-Id: I47d7e5354fc269916851a318fef10b826897eaf8 Reviewed-on: https://code.wireshark.org/review/17750 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=58f601879a523ecd0ea629bca0da5fb... commit 58f601879a523ecd0ea629bca0da5fb36e1ef416 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Sun Nov 13 18:47:28 2016 +0100 .mailmap: Update (of november) Change-Id: I643825baa09bf1b6b54515dc109669c0cb1e2cd7 Reviewed-on: https://code.wireshark.org/review/18800 Reviewed-by: Franklin Mathieu <snaipe@diacritic.io> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=6b064e0e145053dbaf96fb0e7b90a46... commit 6b064e0e145053dbaf96fb0e7b90a46979ce2c8c Author: Stig Bjørlykke <stig@bjorlykke.org> Date: Wed Dec 7 19:59:53 2016 +0100 extcap: Whitespace cleanup. Cleanup code to use uniform whitespace to make it more readable. Also added brackets to unbracketed one line conditional statements. This was done using "astyle -A1cHjk3pU". Change-Id: Iebe96c488c843ce1d790ede0016eb9df025e98a5 Reviewed-on: https://code.wireshark.org/review/19133 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=d438170c87c429af914dbc66dd98986... commit d438170c87c429af914dbc66dd989860dd461960 Author: Guy Harris <guy@alum.mit.edu> Date: Thu Dec 8 12:34:59 2016 -0800 Fix a mis-merging. Also, remove the "make sure we're not fetching a bogus structure" tests. Add a comment explaining how a compiler bug where it's overly optimizing a combination of tests could cause the valgrind errors we were seeing, so we're zeroing the entire structure, padding included, to avoid that. Change-Id: I24f94b2cbceec5234c1da82b891f609648075839 Reviewed-on: https://code.wireshark.org/review/19149 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=a02d8e3c4e8cf7d756141ca45f6b27f... commit a02d8e3c4e8cf7d756141ca45f6b27f5658747fb Author: Dario Lombardo <lomato@gmail.com> Date: Thu Dec 8 15:46:59 2016 +0100 tns: reduce variable scope. Change-Id: Ie187692143b5866bb52b7daf1def2e36ce202a86 Reviewed-on: https://code.wireshark.org/review/19146 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=7a7249cae7765f0acb785c22d2fb3b9... commit 7a7249cae7765f0acb785c22d2fb3b9210d5c8ac Author: AndersBroman <anders.broman@ericsson.com> Date: Thu Dec 8 13:50:42 2016 +0100 [GTP] Add dissection of Extended Common Flags II IE while at it extend IE value_strings. Change-Id: Iea592aca088384c381843be7255922db2ade393a Reviewed-on: https://code.wireshark.org/review/19145 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: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=3496051d07683a5ddee435c7dc521a1... commit 3496051d07683a5ddee435c7dc521a157b142fa3 Author: Peter Wu <peter@lekensteyn.nl> Date: Thu Dec 8 00:24:05 2016 +0100 sdp: decode pt for more RTP transport protocols Do not just decode the payload type for RTP/AVP, but also all RTP transport types. Add RTP/AVPF (same as normal RTP/AVP, but with additional RTCP formats). Similarly, add RTP/SAVPF and the two DTLS variants. Add references to the relevant specifications and order per IANA registry. Tested with dtls-srtp-ws-sip.pcapng, now the payload types under the "m=" tree have names and frames that were previously reported as RTP show up as SRTP. Frame 442 now shows "Encrypted RTCP Payload" warning instead of decoding it as garbage. Change-Id: I06893f385ec270391f8891e72a364d08d2354a0a Ping-Bug: 13193 Reviewed-on: https://code.wireshark.org/review/19139 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> http://cgit.osmocom.org/wireshark/commit/?id=43706be64c1380d55da1882d0937649... commit 43706be64c1380d55da1882d093764913401d7e7 Author: Michal Labedzki <michal.labedzki@tieto.com> Date: Thu Dec 8 08:14:14 2016 +0100 Qt: Fix currentOutputDeviceName() without QtMultimedia Fix build error: ui/qt/moc_rtp_player_dialog.cxx:87:76: error: ‘currentOutputDeviceName’ was not declared in this scope case 0: *reinterpret_cast< QString*>(_v) = currentOutputDeviceName(); break; Change-Id: I065862540e775c3e965cb5d3ae4c53bd8d505bdd Reviewed-on: https://code.wireshark.org/review/19142 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=98ec464f0cfbf45bfd204725665f527... commit 98ec464f0cfbf45bfd204725665f527533b82ff3 Author: Guy Harris <guy@alum.mit.edu> Date: Thu Dec 8 09:07:13 2016 +0000 Revert "Revert "Don't use a local variable's address in set_address()."" This reverts commit 92a2c184b09ce41a1ab717963750bb5543099742. Actually, that address *is* attached to a pinfo structure. Change-Id: I183135f9cf10a6714045091d2ae02d2799093bae Reviewed-on: https://code.wireshark.org/review/19143 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=5e3f8236b9945eac9105b65a1448837... commit 5e3f8236b9945eac9105b65a14488374aa7a836f Author: Chuck Lever <chuck.lever@oracle.com> Date: Sat Nov 12 14:40:31 2016 -0500 packet-rpcrdma: Select correct size of transport header Nit: Make it easier to see the transition between the end of the RPC-over-RDMA transport header and the start of the RPC header. Calculate the selection size of the RPC-over-RDMA header properly, including the size of the chunk lists. Change-Id: I84bc7d970a95e8f50a21a45ded386322711b6512 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19034 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> http://cgit.osmocom.org/wireshark/commit/?id=dde31375270fac9856f6908da30355e... commit dde31375270fac9856f6908da30355e77a97758d Author: Chris Brandson <chris.brandson@gmail.com> Date: Wed Dec 7 14:36:17 2016 -0800 Fix ZigBee End Device Timeout enumeration Value 1 incorrect. Remaining enumerations correct Change-Id: I31939fabded6c4eab13c5b61bbdd4f61b962f0e0 Reviewed-on: https://code.wireshark.org/review/19137 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=92a2c184b09ce41a1ab717963750bb5... commit 92a2c184b09ce41a1ab717963750bb5543099742 Author: Guy Harris <guy@alum.mit.edu> Date: Wed Dec 7 22:50:49 2016 +0000 Revert "Don't use a local variable's address in set_address()." This reverts commit e2c26ff90c6aee381c3af0c33253dcfa5631bb43. *That* address isn't attached to a pinfo structure, it's used to create a conversation, and a copy is made of it, using file scope. So that's not the cause of this problem. Change-Id: I07ce091e678c42c30080cd00fd17cd1584f473ad Reviewed-on: https://code.wireshark.org/review/19138 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=e2c26ff90c6aee381c3af0c33253dcf... commit e2c26ff90c6aee381c3af0c33253dcfa5631bb43 Author: Guy Harris <guy@alum.mit.edu> Date: Wed Dec 7 14:21:09 2016 -0800 Don't use a local variable's address in set_address(). The address data is supposed to outlive the current routine's scope, so you can't pass it a pointer to an argument to the routine; you have to allocate pinfo-scoped memory and copy the variable to that. Bug: 13219 Change-Id: Id3fdb52b614036d4d24d0676e798a2524fbe916c Reviewed-on: https://code.wireshark.org/review/19136 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=37eead0f603e8129702384a0798410d... commit 37eead0f603e8129702384a0798410d6c0b0884b Author: Peter Wu <peter@lekensteyn.nl> Date: Tue Dec 6 16:31:32 2016 +0000 Revert "Temporarily break up complicated expression into a bunch of separate ifs." This reverts commit db7c6286169015a727024e86eb270722127125bb. As pointed out in bug 13044, the warning is really coming from checking "cops_call->solicited", no need to expand the whole expression. Ping-Bug: 13044 Change-Id: Ib376ce6d0ec9fcf896e6081adae7664f19d9f759 Reviewed-on: https://code.wireshark.org/review/19115 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=49fcee3fcb997036f8677af081a5cbe... commit 49fcee3fcb997036f8677af081a5cbecab7c07e0 Author: Роман Донченко <dpb@corrigendum.ru> Date: Wed Dec 7 01:14:39 2016 +0300 Qt: don't append a second extension to save file names When checking if the file already has one of the possible extensions, MainWindow::fileAddExtension reuses file_suffix between iterations and appends to it each time, so it ends up checking for the wrong suffix for all extensions except the first one. Scope file_suffix to the for loop to fix that. Change-Id: Idbc5a619a4793d8c477bfd88305cdb44ea844e13 Reviewed-on: https://code.wireshark.org/review/19123 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=983334fc1e6f95c88b9e35176feedf6... commit 983334fc1e6f95c88b9e35176feedf66d9dd484d Author: Guy Harris <guy@alum.mit.edu> Date: Wed Dec 7 11:50:10 2016 -0800 The version lists are sequences of 1-byte integers, not strings. Show each version in the list independently as an item. Perhaps the Set Protocol response version lists seen have only one version, but the presence of a version-0 terminator suggests that it could contain multiple versions, so dissect it as such. For FT_STRINGZ values, let proto_tree_add_item() determine the length - pass a length of -1. If we need the length, use proto_tree_add_item_ret_length(). Change-Id: I5954ccac34f9e462c6d43e9a213974cf818f4d0d Reviewed-on: https://code.wireshark.org/review/19134 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=0af0532ccd9e39372f13238c63519fb... commit 0af0532ccd9e39372f13238c63519fb04977974f Author: Gerald Combs <gerald@wireshark.org> Date: Wed Dec 7 09:58:28 2016 -0800 Qt: Fixup the currentOutputDeviceName Q_PROPERTY. The CONSTANT attribute indicates that the same value will be returned every time. That isn't the case here so remove it. Change-Id: Ie7451e6aabcb4fa1a6960762d96ad190f32b3d7a Reviewed-on: https://code.wireshark.org/review/19130 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> http://cgit.osmocom.org/wireshark/commit/?id=fa47c368c6ea29c71e7a0d80aa42f86... commit fa47c368c6ea29c71e7a0d80aa42f8632f335fb8 Author: Stig Bjørlykke <stig@bjorlykke.org> Date: Wed Dec 7 19:02:06 2016 +0100 extcap: Separate dirname and file with G_DIR_SEPARATOR_S. Change-Id: I9e1e9b1a10a15ca95519392a7a19ba77f460141e Reviewed-on: https://code.wireshark.org/review/19131 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=cd4540b260040f08a5e814fab4c60e0... commit cd4540b260040f08a5e814fab4c60e001501f8cb Author: Alexandr Savca <s.alex08@mail.ru> Date: Sat Dec 3 16:42:23 2016 +0200 packet-tns: add Set Protocol dissection. Set Protocol is a SQLNET (NET8) message of Data packet type. At the moment, request message is fully implemented, response partly. Also, remove unused href entry(s). Change-Id: I1814ce867cf4f03fa70f05552bfe870ed8f7737c Reviewed-on: https://code.wireshark.org/review/19051 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> http://cgit.osmocom.org/wireshark/commit/?id=b9a1fd5bd63be58243dd973c8c842f1... commit b9a1fd5bd63be58243dd973c8c842f10e9833f00 Author: Michal Labedzki <michal.labedzki@tieto.com> Date: Tue Dec 6 09:10:52 2016 +0100 Bluetooth: SMP: Use bitmask fields And try to improve column output readability by using separators. Change-Id: I274f47275519c2a87def483f8f857a98edc341d1 Reviewed-on: https://code.wireshark.org/review/19109 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=1dde01cd9fd0b2f69fef5fa95d79a50... commit 1dde01cd9fd0b2f69fef5fa95d79a50983e3f4a7 Author: bwhitn <brian.m.whitney@outlook.com> Date: Wed Dec 7 07:32:31 2016 -0800 Fix: Allocate new string for export object entry to prevent crash when memory is freed Change-Id: Ied9f267b28144ea6069388d2d739d07955642863 Reviewed-on: https://code.wireshark.org/review/19129 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=f39389e945e11a82905bc5b71ada85f... commit f39389e945e11a82905bc5b71ada85f3b90e9bab Author: Chuck Lever <chuck.lever@oracle.com> Date: Tue Dec 6 11:25:59 2016 -0500 packet-rpcrdma: Fix selection size in chunk list dissectors Use proto_item_set_len instead of walking the packet ahead of time trying to compute the size. Change-Id: I5eb3da1fef45895853cb5b6b198d0310394e4176 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19120 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> http://cgit.osmocom.org/wireshark/commit/?id=29768d91ec60023cc68cb38edc492a6... commit 29768d91ec60023cc68cb38edc492a6d2221f662 Author: Michael Mann <mmann78@netscape.net> Date: Tue Dec 6 21:19:01 2016 -0500 RTCP: Bugfix MS Video Source Request dissection Bug: 13212 Change-Id: I249d38e843f737bbd0773828f24980d148fbaa00 Reviewed-on: https://code.wireshark.org/review/19126 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> http://cgit.osmocom.org/wireshark/commit/?id=0863a2c4659ca1c874f414b0720465f... commit 0863a2c4659ca1c874f414b0720465f0fae771d9 Author: Peter Wu <peter@lekensteyn.nl> Date: Wed Dec 7 00:06:23 2016 +0100 sdp: replace bitmask by enum for transport protocol Previously the bitmask also stored whether the type of media (video) and address type (IPv4/IPv6). Now that these are gone, it makes more sense to use enums. There is no functional change (only debugging output is different). Change-Id: Idc9659cd21e36489a3f5720bbf13640c4beecc02 Reviewed-on: https://code.wireshark.org/review/19124 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: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=f0dbb28854346970f4329413c9bae8a... commit f0dbb28854346970f4329413c9bae8a212d95836 Author: Guy Harris <guy@alum.mit.edu> Date: Tue Dec 6 13:37:45 2016 -0800 Throw in another tweak to check for uninitialized cops_call_t structures. Temporariy add a "magic" field, initialize it when we allocate it, and whenever we fetch a structure from the array, make sure the "magic" field has the right value. (If this all turns out to be a valgrind bug, I'm not going to be very happy.) Change-Id: I29becc715367fdc305504b38d48be05dc516132a Reviewed-on: https://code.wireshark.org/review/19128 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=451eac813745170074aa9223ab55826... commit 451eac813745170074aa9223ab558263aa8f73f5 Author: Chuck Lever <chuck.lever@oracle.com> Date: Fri Nov 11 17:35:58 2016 -0500 packet-rpcrdma: Prepare dissector for RPC-over-RDMA on iWARP or RoCE Remove the Infiniband-centric QP filtering. This filtering attempted to create conversations to allow the heuristic dissector to be bypassed once it was established that a QP was carrying RPC-over-RDMA traffic. However, it was preventing proper identification of RPC-over-RDMA traffic when a CM connection establishment exchange doesn't appear in the capture (which is frequently the case for captures of NFS traffic). Also, without this conversation logic, loading a capture file appears to be significantly faster, at least for capture files I have on hand. Later, some form of conversation management will be needed in order to associate RPC-over-RDMA transport headers with RDMA Read and Write operations that go along with them. But it will need to be agnostic about the underlying link layer. Bug: 13199 Bug: 13202 Change-Id: Ie6b7a4c65979dac036306f7367ce18836713ab4d Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19032 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=4f684a606226bee6381285388e3b28f... commit 4f684a606226bee6381285388e3b28f06975f1f4 Author: Alexandr Savca <s.alex08@mail.ru> Date: Sat Dec 3 15:36:51 2016 +0200 packet-tns: add TNS_TYPE_DATA functions dissection. Those functions also known as NET8 commands or SQLNET layer of TNS protocol. Also added a lot of sub-functions for one NET8 command, also known as OCI (Oracle Call Interface). Do other cleanup while in the neighbor hood including: 1. Use proto_tree_add_bitmask where applicable 2. Remove individual "hidden" command fields. Filtering should use "tns.type" 3. Remove unnecessary if (tree)s Change-Id: Ib7cc5cf307179d5d252c334949a4e77d9d396ba4 Reviewed-on: https://code.wireshark.org/review/19050 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> http://cgit.osmocom.org/wireshark/commit/?id=a1c30fed2a5263314d892c7b183e6d8... commit a1c30fed2a5263314d892c7b183e6d8b43e14d4f Author: bwhitn <brian.m.whitney@outlook.com> Date: Tue Dec 6 10:58:17 2016 -0800 reformatted IMF export objects Change-Id: I3d8da3f481d6808d374c2a906652370a46a4c088 Reviewed-on: https://code.wireshark.org/review/19121 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Moshe Kaplan <me@moshekaplan.com> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=fc4bb7eb7413affa63049516c4dbc46... commit fc4bb7eb7413affa63049516c4dbc46ca272abea Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Tue Dec 6 20:49:12 2016 +0100 Change SpanDSP capitalization Many capitalization can be found for this library (spandsp, Spandsp, SpanDSP), let's use the one found in the library README and in its spec file. Change-Id: Ia66b723e5d582a6218da1b6366b7d4859272f80c Reviewed-on: https://code.wireshark.org/review/19122 Reviewed-by: Peter Wu <peter@lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=47829b9611b613425aa0a314224863b... commit 47829b9611b613425aa0a314224863b02b915ea2 Author: Peter Wu <peter@lekensteyn.nl> Date: Tue Dec 6 17:46:09 2016 +0100 cops: try to avoid uninitialized warning error Valgrind 3.11.0 on the Ubuntu 16.04 buildbot reports that cops_call->solicited is not initialized: pdus_array = (GPtrArray *)wmem_map_lookup(cops_conv_info->pdus_tree, GUINT_TO_POINTER(handle_value)); /* ... */ for (i=0; i < pdus_array->len; i++) { cops_call = (cops_call_t*)g_ptr_array_index(pdus_array, i); if ( /* ... */ ( (cops_call->op_code == COPS_MSG_KA && !(cops_call->solicited)) && ^^^^^^^^^^^^^^^^^^^^ which is clearly bogus since the only place where cops_call could be created is a few lines up: ver_flags = tvb_get_guint8(tvb, offset); is_solicited = (lo_nibble(ver_flags) == 0x01); /* ... */ pdus_array = (GPtrArray *)wmem_map_lookup(cops_conv_info->pdus_tree, GUINT_TO_POINTER(handle_value)); if (pdus_array == NULL) { pdus_array = g_ptr_array_new(); wmem_map_insert(cops_conv_info->pdus_tree, GUINT_TO_POINTER(handle_value), pdus_array); } /* ... */ cops_call = wmem_new(wmem_file_scope(), cops_call_t); cops_call->op_code = op_code; cops_call->solicited = is_solicited; /* ... */ g_ptr_array_add(pdus_array, cops_call); Try to zero the whole structure to avoid this bogus warning. Change-Id: I1ec4d23e99c987849af580a1c8134610c383e55e Ping-Bug: 13044 Ping-Bug: 13203 Reviewed-on: https://code.wireshark.org/review/19119 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=ae989a5d0642c9de4458a2e8bbfd5f2... commit ae989a5d0642c9de4458a2e8bbfd5f288193a6f5 Author: Michal Labedzki <michal.labedzki@tieto.com> Date: Wed Nov 9 16:34:34 2016 +0100 Bluetooth: SMP: Indicate when keys are Debug Debug mode keys are described by Bluetooth Core4 specification. Inform user if any of keys are debug. Debug mode is only if both keys are debug. Change-Id: Id7f58c2445614dc386a67b91cbe6f78ffbeda880 Reviewed-on: https://code.wireshark.org/review/19083 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=d59653f8d52efbf3ab32f95043cd718... commit d59653f8d52efbf3ab32f95043cd718965e57406 Author: Gerald Combs <gerald@wireshark.org> Date: Fri Dec 2 15:52:02 2016 -0800 Qt: Make the RTP player output device selectable. Add a combobox for selecting the output device and populate it with our available devices. Let the user know if our output format isn't supported. Ping-Bug: 13105 Change-Id: I299c7d0f191bb66d93896338036000e2c377781f Reviewed-on: https://code.wireshark.org/review/19046 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> http://cgit.osmocom.org/wireshark/commit/?id=263fea9723ea3487c0d98b0720ab2d6... commit 263fea9723ea3487c0d98b0720ab2d656f780fe1 Author: Michal Labedzki <michal.labedzki@tieto.com> Date: Thu Oct 27 13:51:05 2016 +0200 Bluetooth: SMP: Dissect remaining Key Distribution bits Add "Linkkey" and "Reserved" fields. Change-Id: I21a23824348500bbcf8366c947fe2d6599b015d4 Reviewed-on: https://code.wireshark.org/review/19081 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> http://cgit.osmocom.org/wireshark/commit/?id=ebe948bf983c5ff5b0805f16647ffa9... commit ebe948bf983c5ff5b0805f16647ffa974d7f1bd6 Author: Chuck Lever <chuck.lever@oracle.com> Date: Sun Dec 4 21:47:57 2016 -0500 packet-rpcrdma: Add filter variable for Write chunk segment count Allow the Write segment count field to be selected and filtered on. In many Write chunks there is just one segment. However in some special cases there can be multiple segments in a Write or Reply chunk. Change-Id: Ic4a4104e3a44bf4f2c96e4e5353a10e7547350c9 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19102 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=8c748af03dbd3f0484a14cb3a7b9341... commit 8c748af03dbd3f0484a14cb3a7b9341b1adb68da Author: Gerald Combs <gerald@wireshark.org> Date: Tue Dec 6 08:53:10 2016 -0800 Add udpdump to the macOS package. Change-Id: I9d16a8291efdd564a905b2f8bc1ded4fa1aa718d Reviewed-on: https://code.wireshark.org/review/19118 Reviewed-by: Gerald Combs <gerald@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=f5e22a14877922aa7b907d2e434958c... commit f5e22a14877922aa7b907d2e434958c86efd6875 Author: Peter Wu <peter@lekensteyn.nl> Date: Thu Nov 24 00:27:14 2016 +0100 codecs: Add support for G.722 and G.726 Integrate the Spandsp library for G.722 and G.726 support. Adds support for G.722 and all eight variants of G.726. Note: this also fixes a crash in Qt (buffer overrun, reading too much data) caused by confusion of the larger output buffer (resample_buff) with the smaller input buffer (decode_buff). It was not triggered before because the sample rate was always 8k, but with the addition of the new codecs, a different sample rate became possible (16k). Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled and the VOIP Calls dialog is opened (the begin frame, start_fd, is not yet known and therfore a NULL dereference could occur). Passes testing (plays normally without bad RTP timing errors) with SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled. Bug: 5619 Change-Id: I5661908d193927bba50901079119eeff0c04991f Reviewed-on: https://code.wireshark.org/review/18939 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> Reviewed-by: Peter Wu <peter@lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=d8cdb550445a1bc86626bd9d45da1ce... commit d8cdb550445a1bc86626bd9d45da1ce958d1592b Author: Gerald Combs <gerald@wireshark.org> Date: Fri Dec 2 11:36:45 2016 -0800 Autotools: Disable Qt4 on macOS. Add a check for macOS+Qt4 to configure.ac in order to roughly match the CMake behavior in ge858829. Change-Id: I37de95d5db515d28dd88f13d818531bf6e94d07e Reviewed-on: https://code.wireshark.org/review/19036 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: Peter Wu <peter@lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=c33429765473dc1e7e46a24305bbf92... commit c33429765473dc1e7e46a24305bbf921685401e3 Author: Michael Mann <mmann78@netscape.net> Date: Thu Sep 22 13:36:44 2016 -0400 SDP: Fix compiler warning Change-Id: I5d415ba9ce7ae62eff43d47ceaa96e6282eaad1a Reviewed-on: https://code.wireshark.org/review/19113 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: Peter Wu <peter@lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=7c3ecc6956e456867ac7d216600ea36... commit 7c3ecc6956e456867ac7d216600ea3697b548eff Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Tue Dec 6 14:50:09 2016 +0100 DOF: fix UAT update callbacks - update callback must return a boolean to indicate success / failure - error message must be allcoated in glib memory as GUI will g_free it Bug: 13209 Change-Id: Ibb9690034d66dae85e775d0010aadeb192c76b4a Reviewed-on: https://code.wireshark.org/review/19111 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=e2c812c7674526cf0cb1acbd01ea43d... commit e2c812c7674526cf0cb1acbd01ea43d6701f62df Author: Michal Labedzki <michal.labedzki@tieto.com> Date: Fri Oct 28 08:26:12 2016 +0200 Bluetooth: Sync "Classic" color rules Change-Id: Ic64f9b71eba4ba8c79c28e10fe4eac983ca98f22 Reviewed-on: https://code.wireshark.org/review/19085 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> http://cgit.osmocom.org/wireshark/commit/?id=1d2f68b60f003c9ef006465330207d3... commit 1d2f68b60f003c9ef006465330207d3d65af6dd7 Author: Peter Wu <peter@lekensteyn.nl> Date: Mon Dec 5 00:43:02 2016 +0100 sdp: refactor session/media level handling of attributes The media_count meaning is horrendous. -1 means "none", a count of "0" actually means "1". This led to various bugs in the past, so just rip it out and use a (wmem) array from which the length can be determined. That also means that a hard-coded limit on the media can now easily be lifted without affecting the size of the transport_info_t structure. (This limit, SDP_MAX_RTP_CHANNELS, is unchanged in this patch though.) Refactor the SDP dissector such that: - Media and related attributes are no longer a bunch of fixed array fields, but grouped in one structure. This results in the largest changes all over the place since "transport_info->media[n]" is now transformed into "media_desc->media" where "media_desc" is an element of the "transport_info->media_descriptions" wmem array. - Simplify protocol (in "m=") parsing (lots of ifs -> array + loop). - Remove convert_disposable_media and disposable_media_info_t, parse fields (media protocol from "m=", connection address from "c=", etc.) while parsing the SDP instead of parsing it at the end. - Have two distinct structures for keeping the info for the session and media level. Emphasize that new media descriptions are inherited from session level attributes (via sdp_new_media_description). - Delay creation of dynamic payload type information table until we actually create the media description. Create function clean_unused_media_descriptions to handle the common of freeing unused dynamic pt. - Remove SDP_IPv4/SDP_IPv6, these are replaced by checking the type member of the address structure. Changes to MSRP part: - Move MSRP attributes to the media-level attributes. - Remove msrp_transport_address_set attribute, rely on the AT_NONE address type for detecting bad addresses. - Remove SDP_MSRP_IPv4 check, this never worked as the flag was never set. Now it relies on the address family from the host in a=path:. Tested with these capture files with no change in PDML output nor improvements/regressions with memleaks (as reported by ASAN): capture sip call wireshark 1.8.2.pcap NOringback.pcapng rtp_not_parsed_by_1_10_1.pcap rtsp_interleaved_coreplayer.cap SIP_CALL_RTP_G711.pcapng srtpincorrectlyselected.pcap tdnwifitontwifi_withnatting_clientAbhopati_03082015.pcapng Change-Id: Ia0dbc63f8bd78cc84dad2e18174540e31b78a80d Reviewed-on: https://code.wireshark.org/review/19072 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=104b9fe5afc1f7aac1df263dd8e9af1... commit 104b9fe5afc1f7aac1df263dd8e9af1fd1cb449f Author: Peter Wu <peter@lekensteyn.nl> Date: Mon Dec 5 23:00:33 2016 +0100 rtp: add function to duplicate rtp_dyn_payload_t There is no way to iterate through the contents. For a future patch to the SDP dissector (where the session-level info is copied to the media-level), it would be nice to duplicate the dynamic payload info. Change-Id: I79b8349e5e157298a28fc608e20c2c2e03e76400 Reviewed-on: https://code.wireshark.org/review/19106 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=89bc07c5d59ead31cad3ab5eea4378b... commit 89bc07c5d59ead31cad3ab5eea4378b6bb60bce9 Author: Peter Wu <peter@lekensteyn.nl> Date: Wed Nov 30 21:43:09 2016 +0100 DTLS: add support for use_srtp extension (RFC 5764) Decryption support will be added later. Tested with dtls-srtp-ws-sip.pcapng from the linked bug. Change-Id: Ida1a2da754ef9aef16ad15ff64455b6f8e703ffd Ping-Bug: 13193 Reviewed-on: https://code.wireshark.org/review/18996 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=f96e9d067ba314c947a3caeafc909e9... commit f96e9d067ba314c947a3caeafc909e9542042a64 Author: Роман Донченко <dpb@corrigendum.ru> Date: Mon Dec 5 22:43:21 2016 +0300 ssh: add dissection for ECDSA host keys Change-Id: Ic9851976bfa25fc61c708ee08e5a26ad01769f06 Reviewed-on: https://code.wireshark.org/review/19097 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=38f45e1e222589987d95e79f5943040... commit 38f45e1e222589987d95e79f59430403f40bdd49 Author: Peter Wu <peter@lekensteyn.nl> Date: Sat Dec 3 01:20:10 2016 +0100 SDP: reduce code duplication Observe that some code in setup_sdp_transport is effectively the same code as a part from dissect_sdp with these differences: - Removal of these two conditions (setup_sdp_transport already returns early when a packet is visited): (!pinfo->fd->flags.visited) && (transport_info == &local_transport_info) - "establish_frame" in setup_sdp_transport is replaced by "pinfo->num" in dissect_sdp. dissect_sdp further has two additional blocks that add information to the VoIP calls dialog. This is preserved. Freeing of the RTP payload information has also been simplified. Instead of checking it inside the main loop that adds addresses (now moved to a new function, "apply_sdp_transport"), let the caller do it outside the loop. The transformation in this patch is rather mechanical: 0. Add a comment on what the new function is supposed to do. 1. Move code from setup_sdp_transport into a new function, apply_sdp_transport and reduce indentation level. 2. Copy all variables to the new function and populate the parameter list. 3. Compile result, remove unused variables that the compiler warns for. 4. Move freeing of unused media outside the loop to the caller. 5. Create a new conditional statement before the duplicated loop, which checks whether setup_sdp_transport has been used before. (SIP first calls setup_sdp_transport, then it invokes the media type dissector which calls dissect_sdp to populate the tree.) 6. Remove the duplicated code from the dissect_sdp loop until only the VoIP Calls dialog info remains. There is no functional change intended. Change-Id: I928379466af56ef1729cccbf4a5b60895ddb3227 Reviewed-on: https://code.wireshark.org/review/19047 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> http://cgit.osmocom.org/wireshark/commit/?id=2994e63abbfbd3b57ade6d04a873719... commit 2994e63abbfbd3b57ade6d04a8737199537cddd5 Author: Peter Wu <peter@lekensteyn.nl> Date: Wed Nov 30 21:57:56 2016 +0100 SDP: add basic ICE candidate attribute dissection (RFC 5245) Dissect the first, fixed part of a=candidate. The candidate type is also unabbreviated for easier understanding. Tested with dtls-srtp-ws-sip.pcapng from the linked bug. Change-Id: I9950c8f066becea86f1fe8e9ffab2dc07ae0f425 Ping-Bug: 13193 Reviewed-on: https://code.wireshark.org/review/18997 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=8773ea03cbcd72cc6463476e0342d67... commit 8773ea03cbcd72cc6463476e0342d6756d51267a Author: D. Ulis <daulis0@gmail.com> Date: Mon Dec 5 07:43:03 2016 -0500 CIP: Minor enhancements 1. ENIP: Display the CIP Forward Open Request packet number for connected data 2. CIP: Extended Network: Display expert info when the expected bytes does not match actual bytes 3. CIP: Look up more data fields as CIP service or Device Type 4. CIP: Display data as Dec/Hex, depending on how the spec shows things 5. Minor: Pull out common code into load_cip_request_data() 6. Minor: Text corrections Change-Id: I184ac3899786f650e4d4643a5dfe68bba785d6e0 Reviewed-on: https://code.wireshark.org/review/19092 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> http://cgit.osmocom.org/wireshark/commit/?id=a94b82a8e1ca71d130ec5a77f7d71b2... commit a94b82a8e1ca71d130ec5a77f7d71b2d6814aeef Author: Chuck Lever <chuck.lever@oracle.com> Date: Sun Dec 4 20:16:59 2016 -0500 packet-rpcrdma: Clean up Reply chunk dissection Display the Reply chunk as a tree, using the same code that the Write list dissector now uses. Fix up the selection size of the Reply chunk. Bug: 13197 Change-Id: Ie861b7721b2c2dd9a5839986488ee22f39f81d1e Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19101 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=677a543e48eed5921d44ceb53ea6101... commit 677a543e48eed5921d44ceb53ea6101b43a98ad2 Author: Chuck Lever <chuck.lever@oracle.com> Date: Sun Dec 4 18:39:39 2016 -0500 packet-rpcrdma: Fix Write list dissection The current mechanism of dissecting RPC-over-RDMA chunk lists is not working. It treats the Write list as a list of RDMA segments (it's a list of counted arrays). Bug: 13197 Change-Id: I6f8e788d66eefd17d6c1995e238a9ff9fa1e81f2 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19100 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=149e42f7d5e4bbb988da7e9f7fc70ef... commit 149e42f7d5e4bbb988da7e9f7fc70efe87cbca2e Author: Chuck Lever <chuck.lever@oracle.com> Date: Sun Dec 4 17:36:59 2016 -0500 packet-rpcrdma: Fix Read list dissection The current mechanism of dissecting RPC-over-RDMA chunk lists is not working. It treats the Read list as a counted array (it's a list). Part of this confusion arises because RFC 5666 uses the term "chunk" to mean "chunk", "read segment", and "rdma segment". Re-organize the dissector logic to make this distinction properly. Bug: 13197 Change-Id: Iad517804dbcf8b30de795af03af7a71a6f231231 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19099 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=74f025d79e37dbbd628144a7b69c8f0... commit 74f025d79e37dbbd628144a7b69c8f0f23b50996 Author: Michael Mann <mmann78@netscape.net> Date: Mon Dec 5 15:21:34 2016 -0500 RTPS: Cleanup endian handling 1. Rather than pass a boolean that has to be continually evaluated, just pass the necessary encoding (ENC_LITTLE_ENDIAN or ENC_BIG_ENDIAN) 2. Incorporate more use of proto_tree_add_item_ret_[u]int 3. Remove NEXT_guint16 and NEXT_guint32 because we now have tvb_get_guint16 and tvb_get_guint32 Change-Id: Ib1c3488450b4e727d2c1943ba4e577faf2350dcc Reviewed-on: https://code.wireshark.org/review/19103 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> http://cgit.osmocom.org/wireshark/commit/?id=548b9febb3c915b3693af0f5e8fe338... commit 548b9febb3c915b3693af0f5e8fe338447ca0f11 Author: Dmitry Lazurkin <dilaz03@gmail.com> Date: Fri Nov 25 22:45:02 2016 +0300 kafka: add dissection for rest of api keys - support rest of api keys - dissect kafka.required_acks with constants - dissect kafka.message_timestamp_type - add expert info about missing request Change-Id: I3d18936adac6702a61f545385bdec1b75b564bd9 Reviewed-on: https://code.wireshark.org/review/18954 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> http://cgit.osmocom.org/wireshark/commit/?id=a275e3fd0aecd98b5118ca08a3622e8... commit a275e3fd0aecd98b5118ca08a3622e8cb1468b2d Author: Chuck Lever <chuck.lever@oracle.com> Date: Sun Dec 4 22:11:12 2016 -0500 packet-rpcrdma: Display length fields in decimal Change-Id: I3a3a51de76286800992b1445c332c50059112c54 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19098 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=026b2f99293d1eb75f29178fc1ffd86... commit 026b2f99293d1eb75f29178fc1ffd86dbe22fe7d Author: Chuck Lever <chuck.lever@oracle.com> Date: Sun Dec 4 16:58:37 2016 -0500 packet-rpcrdma: Remove if (tree) preventing dissectors being called. When tshark displays each frame in default mode (without -V): - NFS on TCP is dissected and displayed - NFS on RPC/RDMA is displayed as only an RPC/RDMA frame NFS on RPC/RDMA should be dissected and displayed just like NFS on TCP. Make passing along the RPC payload to the RPC dissector unconditional. Bug: 13198 Change-Id: Ia86f3abcfcbc65a860d4ff7bac19a5f3af44a0b0 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19027 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=7b5e77406d5210489c82a7aa9312053... commit 7b5e77406d5210489c82a7aa9312053ccb030766 Author: Gerald Combs <gerald@wireshark.org> Date: Mon Dec 5 10:53:32 2016 -0800 CMake: Update FindWiX. The WiX Toolset installer sets the WIX environment variable. Search for our WiX executables there first. Change-Id: I5acc9cb369dc2bdbb071d35b5a39498c6db117a3 Reviewed-on: https://code.wireshark.org/review/19096 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=2b51717fe5a7f9c1e389976ae1e5532... commit 2b51717fe5a7f9c1e389976ae1e55320970d133f Author: Juanjo Martin <juanjo@rti.com> Date: Wed Nov 30 17:13:30 2016 +0100 RTPS: Added submessages and fixed minor issues for Secure DDS Bug: 13204 Change-Id: Iaad562aafe3a4f0300398fc45927ac810814ee75 Reviewed-on: https://code.wireshark.org/review/18990 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> http://cgit.osmocom.org/wireshark/commit/?id=4d9eb4caab3be28864dc2b257e5d6f5... commit 4d9eb4caab3be28864dc2b257e5d6f5ffe6c48dc Author: Michal Labedzki <michal.labedzki@tieto.com> Date: Wed Oct 26 14:56:30 2016 +0200 Bluetooth: SMP: Dissect remaining AuthReq bits Dissect SC, Keypress and Reserved bits. Up to Bluetooth Core 4 specification. Change-Id: Id7ac75bd917786abe9aada433a1343887a32234d Reviewed-on: https://code.wireshark.org/review/19079 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> http://cgit.osmocom.org/wireshark/commit/?id=2452367d25e39840f679538cd2e4964... commit 2452367d25e39840f679538cd2e49649c914016e Author: Michal Labedzki <michal.labedzki@tieto.com> Date: Wed Oct 26 15:53:12 2016 +0200 Bluetooth: SMP: Implement 3 more commands 0x0C: /* Pairing Public Key */ 0x0D: /* Pairing DHKey Check" */ 0x0E: /* Pairing Keypress Notification */ Change-Id: I18dc88d2cb7a96412b230a9b414ce053bfde09fa Reviewed-on: https://code.wireshark.org/review/19080 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> http://cgit.osmocom.org/wireshark/commit/?id=d67b557d9423c02a4b35f76ee1d2d1d... commit d67b557d9423c02a4b35f76ee1d2d1d3712f46fb Author: Michal Labedzki <michal.labedzki@tieto.com> Date: Thu Oct 27 15:22:27 2016 +0200 Bluetooth: SMP: Add coloring rule for SMP SMP occurs very rare, because of it nature - it is just pairing procedure. It is better to distinguish it from L2CAP by assigned to it another yellow colour. Change-Id: I71e8641b717581253cd86cc867fa71241e7650b7 Reviewed-on: https://code.wireshark.org/review/19082 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=75a5cf9fa0c2d7eed8fca8b9011c07d... commit 75a5cf9fa0c2d7eed8fca8b9011c07dd99f5a751 Author: Michal Labedzki <michal.labedzki@tieto.com> Date: Wed Nov 9 12:51:15 2016 +0100 Bluetooth: BTLE*: Initialize what initialized was not Fix unexpected Direction flag pass to BTLE dissector what caused reassemble of L2CAP not working correctly (it based on Source/Destination addresses/columns). Change-Id: I10fb17c29b020f6ca746f7bbccb7527e0ba04624 Reviewed-on: https://code.wireshark.org/review/19084 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=5a0bc5f27bcb918fd78fd690cbd8073... commit 5a0bc5f27bcb918fd78fd690cbd8073b254f15b2 Author: Michal Labedzki <michal.labedzki@tieto.com> Date: Fri Oct 28 15:47:01 2016 +0200 Bluetooth: Assigned Numbers: Update Member UUIDs Update manually from time to time based on: https://www.bluetooth.com/specifications/assigned-numbers Change-Id: I506e58c16322862c9fe517b71ab12806818331b5 Reviewed-on: https://code.wireshark.org/review/19086 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=a7d404a972bc24020bbfe2d64b99e29... commit a7d404a972bc24020bbfe2d64b99e299f2507bdc Author: Michal Labedzki <michal.labedzki@tieto.com> Date: Thu Nov 3 10:46:25 2016 +0100 androiddump: Add support for Bluetooth on Android 7.0 Now "ps" command does not support process name as parameter, use grep instead. Change-Id: I0c35bc7d560e237e4140000e67af097744cb2c1b Reviewed-on: https://code.wireshark.org/review/19087 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=e0a4f0c79b68830547dab1baad7641a... commit e0a4f0c79b68830547dab1baad7641a09b4d93f5 Author: Michael Mann <mmann78@netscape.net> Date: Sun Dec 4 20:27:35 2016 -0500 SMB: Limit Export object files to 32 bits. Most of the file offset fields are 32-bit, but the algorithms use gsize variables, which can vary between 32 and 64 bit builds. The 64-bit builds are the ones with the problem with "garbage" data comes from (effectively) invalid 32-bit offsets. Bug: 11133 Change-Id: I20b8cafb75fc021594159ab092c18c24f3e257e3 Reviewed-on: https://code.wireshark.org/review/19073 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> http://cgit.osmocom.org/wireshark/commit/?id=26def3ef72b3dc1f936322fb1e96b7d... commit 26def3ef72b3dc1f936322fb1e96b7d81a19390b Author: Michael Mann <mmann78@netscape.net> Date: Sun Dec 4 22:29:14 2016 -0500 Honor protocols.display_hidden_proto_items preferences when outputting fields in TShark Bug: 13192 Change-Id: Ibb2b3913716d31a3d5f600e1b6400fdf14a69ca4 Reviewed-on: https://code.wireshark.org/review/19075 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> http://cgit.osmocom.org/wireshark/commit/?id=037c64aa34d4196da5a39dfb59af16a... commit 037c64aa34d4196da5a39dfb59af16abceb1247b Author: Guy Harris <guy@alum.mit.edu> Date: Sun Dec 4 20:25:51 2016 -0800 Clean up initialization code for programs. Make the init_progfile_dir() call unconditionally, even if plugins aren't supported, as that doesn't necessarily mean nobody uses the directory containing the executable. Report the error the same way in all programs, and free the error string after we're finished with it. Make the error - and the comment before the code - reflect what init_progfile_dir() is actually doing (the goal is to get the full pathname of the directory *containing* the executable; that's generally done by getting the pathname of the executable and stripping off the name of the executable, but that's won't necessarily always be the case). Also note for TShark that we won't be able to capture traffic, just as we do for Wireshark (if we don't have the pathname of the program file, we don't have a pathname to use to find dumpcap). Have the plugin scanner just fail silently if we weren't able to get the plugin directory path, so we don't have to worry about calling it if init_progfile_dir() fails. Clean up white space while we're at it. Change-Id: I8e580c719aab6fbf74a764bf6629962394fff7c8 Reviewed-on: https://code.wireshark.org/review/19076 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=faf70602a8e96433ae888278cccaac0... commit faf70602a8e96433ae888278cccaac057091fbca Author: Guy Harris <guy@alum.mit.edu> Date: Sun Dec 4 19:21:19 2016 -0800 Update a comment to reflect current reality. Change-Id: Ied84e0363161ebc42c8cf24e7ade4b1b4e536448 Reviewed-on: https://code.wireshark.org/review/19074 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=83a1ab23abdb22ae7b84cff99009988... commit 83a1ab23abdb22ae7b84cff99009988f97fb3653 Author: Peter Wu <peter@lekensteyn.nl> Date: Tue Nov 29 00:44:56 2016 +0100 cmake: Fix building with plugins disabled When Lua is enabled, scripts can still be loaded from the plugin dir (filesystem.c uses PLUGIN_INSTALL_DIR), so be sure to set it or the cmake build fails. Change-Id: I87d2d705434052220f9619438c90905c24b2a3a6 Reviewed-on: https://code.wireshark.org/review/18976 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> http://cgit.osmocom.org/wireshark/commit/?id=fca6bf6a99b08be574ab8679104d196... commit fca6bf6a99b08be574ab8679104d19623b4881fc Author: Guy Harris <guy@alum.mit.edu> Date: Sun Dec 4 14:25:10 2016 -0800 Reflect API changes. Change-Id: I6a8d50cb697bcd4a5232dc01107c7d9618258d87 Reviewed-on: https://code.wireshark.org/review/19071 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=bded2b681485fe9a91041688bcb41d3... commit bded2b681485fe9a91041688bcb41d371c9099e8 Author: Guy Harris <guy@alum.mit.edu> Date: Sun Dec 4 14:20:37 2016 -0800 Rawshark uses libwiretap, so it has to call wtap_init(). Change-Id: I4b87227e4828ebad98b22e5e5d1f3896e636582a Reviewed-on: https://code.wireshark.org/review/19070 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=ab07f8e0f89eb1bb2c2c61c71e44e3f... commit ab07f8e0f89eb1bb2c2c61c71e44e3fd0e31cc52 Author: Guy Harris <guy@alum.mit.edu> Date: Sun Dec 4 13:42:07 2016 -0800 Have a routine to do all the work of initializing libwiretap. Have programs that use libwiretap call that routine rather than separately calling some or all of init_open_routines(), wtap_register_plugin_types(), and wtap_opttypes_initialize(). Also don't have routines internal to libwiretap call those. Yes, this means doing some initialization work when it isn't necessary, but scattering on-demand calls throughout the code is a great way to forget to make those calls. Change-Id: I5828e1c5591c9d94fbb3eb0a0e54591e8fc61710 Reviewed-on: https://code.wireshark.org/review/19069 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=51d23c6959edfbf45033ba26237820f... commit 51d23c6959edfbf45033ba26237820fa2914ff77 Author: Peter Wu <peter@lekensteyn.nl> Date: Tue Nov 29 00:58:40 2016 +0100 Show codec information in About dialog Show codec libraries in About dialog, this should give the user a clue of what codecs are available. SBC is already supported, Spandsp (for G.722/G.726) is work in progress. Change-Id: Iebc4d9c9fae619a442e06c8afc780a420aa3971b Reviewed-on: https://code.wireshark.org/review/18978 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> Reviewed-by: Peter Wu <peter@lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=98efddc6c26313809b6f9326f09f76c... commit 98efddc6c26313809b6f9326f09f76c390d21676 Author: Peter Wu <peter@lekensteyn.nl> Date: Tue Nov 29 00:53:23 2016 +0100 codecs: allow it to be used without plugins Not all codecs require the plugin infrastructure. For example, G.711U/A is a built-in codec. Allow such functionality to be registered even if plugin support is disabled. Change-Id: I2505cc9955e7953268ec0739531278921f70a771 Reviewed-on: https://code.wireshark.org/review/18977 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=054455683b2e3697a0e41640a713778... commit 054455683b2e3697a0e41640a7137781cdc754c8 Author: Gerald Combs <gerald@wireshark.org> Date: Sun Dec 4 08:13:20 2016 -0800 [Automatic update for 2016-12-04] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Icad3ffb6cbd570b0b8a2c650d3c11a3c9bed536f Reviewed-on: https://code.wireshark.org/review/19066 Reviewed-by: Gerald Combs <gerald@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=5721a87330f8afe3fed12d4af250d7a... commit 5721a87330f8afe3fed12d4af250d7a3d219cbe2 Author: Peter Wu <peter@lekensteyn.nl> Date: Sat Dec 3 23:41:08 2016 +0100 Qt: clear Export Objects list on retapping The tap reset callback should not just invoke the reset callback of the dissector, but also clear the previous list of objects in the dialog. Otherwise duplicate entries will be created every time retapping occurs (e.g. on changing the display filter). Bug: 12230 Change-Id: I75f25db0652dcc9c0ac59ab0e536c06874aedb9c Reviewed-on: https://code.wireshark.org/review/19055 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: Peter Wu <peter@lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=40ebfb9a6f180b5b6deb0ed727e38c9... commit 40ebfb9a6f180b5b6deb0ed727e38c98e848b6cb Author: Роман Донченко <dpb@corrigendum.ru> Date: Thu Dec 1 23:25:55 2016 +0300 ssh: fix the heuristic for MAC size determination size_str points to a dash, so the result of calling ws_strtoi32 on it is a negative number, which becomes a huge positive number, because size is a guint32. Parse the number after the dash instead, and use ws_strtou32. Also, check that size is divisible by 8, since otherwise it's unlikely to be a bit length. Change-Id: I531f67d45e9e914574d36a9ffceed9239fd46d64 Reviewed-on: https://code.wireshark.org/review/19006 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: Peter Wu <peter@lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=dd98856afce144eb19104a6f40c1abe... commit dd98856afce144eb19104a6f40c1abedc9069558 Author: Guy Harris <guy@alum.mit.edu> Date: Sat Dec 3 17:57:34 2016 -0800 Have separate merge APIs for regular file/temporary file/standard output. This is similar to what we have for opening a dump file - one API that uses the file name as specified, one that creates a temporary file and provides the file name, and one that uses the standard output. All of those APIs handle closing the output file. Change-Id: I56beea7be347402773460b9148ab31a8f8bc51e1 Reviewed-on: https://code.wireshark.org/review/19059 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=5aede1bc50b6bb9ae13926e2249d22d... commit 5aede1bc50b6bb9ae13926e2249d22d95c12814e Author: Guy Harris <guy@alum.mit.edu> Date: Sat Dec 3 19:02:36 2016 -0800 Squelch a casting-away-constness warning. Change-Id: I77ca8ffd38baf812ef20b9611f59cd70ae37d392 Reviewed-on: https://code.wireshark.org/review/19062 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=b49e20c10af2fd1d21f8b8399db3fe4... commit b49e20c10af2fd1d21f8b8399db3fe4ffd6366df Author: Guy Harris <guy@alum.mit.edu> Date: Sat Dec 3 18:54:15 2016 -0800 Remove unnecessary cast (gchar = char) that removes const. Change-Id: I3924c2b4a525c0ae5ab57b7f9867296586d78509 Reviewed-on: https://code.wireshark.org/review/19061 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=39840d70926c76b394a51659e2a9001... commit 39840d70926c76b394a51659e2a9001ec430d131 Author: Guy Harris <guy@alum.mit.edu> Date: Sat Dec 3 18:47:16 2016 -0800 Update list of symbols. Remove symbols from plugins; they're not part of libwireshark. Put all the get_rtd_ symbols together. Add some new symbols. Change-Id: I724ca7fd19ad083b7e05526a30974c23fa321e0b Reviewed-on: https://code.wireshark.org/review/19060 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=99ca028ba535f621b7c5bb57148f124... commit 99ca028ba535f621b7c5bb57148f1242a3875185 Author: Guy Harris <guy@alum.mit.edu> Date: Sat Dec 3 15:15:39 2016 -0800 Use ws_close(), rather than the UN*X-only close(). Change-Id: Iae29db90273191c10455e172bdd2aac00b12143c Reviewed-on: https://code.wireshark.org/review/19058 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=a63c5682bdcb194f190bd8de9f7f27f... commit a63c5682bdcb194f190bd8de9f7f27f709a0c8c9 Author: Guy Harris <guy@alum.mit.edu> Date: Sat Dec 3 15:14:31 2016 -0800 Get rid of test printout. Change-Id: I0db268b0f7010d23c938ae56674cc5cd6c0bd998 Reviewed-on: https://code.wireshark.org/review/19057 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=3309c08cd03a16438e6189bf4547ca1... commit 3309c08cd03a16438e6189bf4547ca172f90330a Author: Guy Harris <guy@alum.mit.edu> Date: Sat Dec 3 14:17:08 2016 -0800 When opening the standard output for writing, dup it. That way, we can close the resulting wtap_dumper the same way we close any other wtap_dumper, including closing the FD, rather than trying to do everything *except* closing the FD (which is tricky for a FILE *). Change-Id: I8cb66e32784d73e598b2e8720a12f9bdab1c6205 Reviewed-on: https://code.wireshark.org/review/19054 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=a0d03ce1e70144fe713df9e03b30bc8... commit a0d03ce1e70144fe713df9e03b30bc8126d764a5 Author: Роман Донченко <dpb@corrigendum.ru> Date: Sat Dec 3 02:49:37 2016 +0300 ssh: dissect the host key when the connection uses DH group exchange After this, hf_ssh_kexdh_host_key is no longer used, so remove it. Change-Id: Ie56a086481bbe087b7ba3b17aea394c05986f63d Reviewed-on: https://code.wireshark.org/review/19052 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> http://cgit.osmocom.org/wireshark/commit/?id=a0b4d4657849811b78a36ac0a6449ea... commit a0b4d4657849811b78a36ac0a6449ea0f4c552a1 Author: Dario Lombardo <lomato@gmail.com> Date: Sun Nov 27 19:05:32 2016 +0000 install_rpms_for_devel: add optional packages. Install all optional dependencies as reported by cmake. Tested on Centos7, openSUSE Leap 41.1, Fedora 24. Fedora 24 is shipped with lua5.3, that is not compatible with the current master, then it is not enabled. Change-Id: Ie4de7ff2849d66371e94d5d7960aab8146337dea Reviewed-on: https://code.wireshark.org/review/18968 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=77f31c6e7de5baed978298ae5994942... commit 77f31c6e7de5baed978298ae599494255fe254da Author: Parav Pandit <paravpandit@yahoo.com> Date: Mon Nov 28 22:40:55 2016 -0500 packet-infiniband: Fixed duplicate conversation entries 1. Fixed find_conversation for PT_IBQP to not lookup in reverse direction when all searches fail. This is required, because there could be valid different connection in reverse direction which mistakenly gets updated for non template cases. 2. Added support for having MAD data for upper level dissectors to process during RC packet processing. This is required because connection options are negotiated out of band using this CM exchanges (unlike in band TCP options). 3. Moved creating unidirectional connections when actually MAD packets are processed. Previously client-to-server unidirectional conversation was created when CM_RSP stage, where MAD Data of CM_REQ packet is inaccessible. 4. Fixed creating multiple conversations with same address property by eliminating create_conv_and_add_proto_data during RTU stage, which was incorrect. Now they are created during REQ and RSP frame processing. (Instead of RSP and RTU processing). 5. Added support for creating bidirectional connection that ULP can refer. This is required to keep track of oustanding transactions on a connection (requests and responses). Bug: 11363 Change-Id: I32ea084a581a58efbc16dbb7a3e267c82622c50c Tested-by: paravpandit@yahoo.com Reviewed-on: https://code.wireshark.org/review/18982 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=50489fd279637e24b742a1ceaec0282... commit 50489fd279637e24b742a1ceaec0282974d07a18 Author: Jim Young <jyoung@gsu.edu> Date: Fri Dec 2 00:56:22 2016 -0500 tshark: Add -G folders report Add a new tshark feature to generate a folders report. The folders report is essentially the information presented by Wireshark's About / Folders page in a TAB delimited format. Change-Id: Ic4b3d332b4bdaa7e6b7aad1e9cc5dd18413aada6 Reviewed-on: https://code.wireshark.org/review/19002 Petri-Dish: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=db7c6286169015a727024e86eb27072... commit db7c6286169015a727024e86eb270722127125bb Author: Guy Harris <guy@alum.mit.edu> Date: Fri Dec 2 20:08:40 2016 -0800 Temporarily break up complicated expression into a bunch of separate ifs. Maybe this way we can identify which *particular* test is, according to Valgrind, looking at uninitialized data; there's nothing obvious that shows up from inspecting the code, and neither of our static analyzers seem to have found anything. Change-Id: I80f6bb8e6fa92decfe195c01766330b97e980821 Reviewed-on: https://code.wireshark.org/review/19049 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=2462f9e8103b23c2728cc5aa84995e0... commit 2462f9e8103b23c2728cc5aa84995e0b2f363f12 Author: Chuck Lever <chuck.lever@oracle.com> Date: Wed Nov 9 10:06:45 2016 -0500 packet-rpcrdma: Fix protocol frame pre-detection The current mechanism of detecting RPC-over-RDMA is broken because it treats the Read list as a counted array (it's a list); and treats the Write list and Reply chunk identically (one is a list, one is always a single chunk). While we're here, refactor pre-detection helper functions so they can be used during frame dissection as well. Bug: 13196 Change-Id: I76e210c8d2a9464fed00e7199072d37f4ebbebf2 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19025 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net> ----------------------------------------------------------------------- Summary of changes: .mailmap | 4 + AUTHORS | 6 +- CMakeLists.txt | 29 +- CMakeOptions.txt | 1 + capinfos.c | 43 +- captype.c | 44 +- cmake/modules/FindSPANDSP.cmake | 55 + cmake/modules/FindWiX.cmake | 20 +- cmakeconfig.h.in | 3 + codecs/CMakeLists.txt | 9 +- codecs/G722/G722decode.c | 55 +- codecs/G722/G722decode.h | 10 +- codecs/G726/G726decode.c | 86 +- codecs/G726/G726decode.h | 19 +- codecs/Makefile.am | 10 +- codecs/codecs.c | 46 +- codecs/codecs.h | 11 +- configure.ac | 37 +- debian/control | 2 +- debian/libwireshark0.symbols | 61 +- debian/libwiretap0.symbols | 4 +- debian/libwscodecs0.symbols | 1 + dftest.c | 6 +- doc/extcap.pod | 5 + doc/extcap_example.py | 5 + doc/tshark.pod | 7 + docbook/release-notes.asciidoc | 3 + editcap.c | 46 +- epan/conversation.c | 83 +- epan/crypt/airpdcap.c | 4 +- epan/dissectors/.editorconfig | 4 + epan/dissectors/Makefile.am | 1 + epan/dissectors/packet-bluetooth.c | 27 +- epan/dissectors/packet-btle_rf.c | 1 + epan/dissectors/packet-btsmp.c | 238 +- epan/dissectors/packet-cip.c | 105 +- epan/dissectors/packet-cipmotion.c | 14 +- epan/dissectors/packet-cops.c | 24 +- epan/dissectors/packet-dof.c | 141 +- epan/dissectors/packet-dtls.c | 87 +- epan/dissectors/packet-dtls.h | 7 + epan/dissectors/packet-enip.c | 25 +- epan/dissectors/packet-gsm_sim.c | 4 +- epan/dissectors/packet-gsmtap.c | 134 +- epan/dissectors/packet-gsmtap.h | 170 + epan/dissectors/packet-gsmtap_log.c | 18 +- epan/dissectors/packet-gtp.c | 135 +- epan/dissectors/packet-icmp.c | 5 +- epan/dissectors/packet-imf.c | 13 +- epan/dissectors/packet-infiniband.c | 103 +- epan/dissectors/packet-infiniband.h | 4 + epan/dissectors/packet-kafka.c | 2286 +++++++- epan/dissectors/packet-rpcrdma.c | 694 ++- epan/dissectors/packet-rtcp.c | 6 +- epan/dissectors/packet-rtp.c | 96 +- epan/dissectors/packet-rtp.h | 3 + epan/dissectors/packet-rtps.c | 1564 +++--- epan/dissectors/packet-rtps.h | 40 +- epan/dissectors/packet-sdp.c | 1246 +++-- epan/dissectors/packet-smb.c | 8 +- epan/dissectors/packet-ssh.c | 356 +- epan/dissectors/packet-ssl-utils.c | 24 +- epan/dissectors/packet-ssl-utils.h | 3 +- epan/dissectors/packet-ssl.c | 2 +- epan/dissectors/packet-tns.c | 877 +-- epan/dissectors/packet-tns.h | 50 +- epan/dissectors/packet-windows-common.h | 5854 ++++++++++---------- epan/dissectors/packet-zbee-nwk.c | 2 +- epan/enterprise-numbers | 62 +- epan/epan.c | 34 + epan/print.c | 5 +- epan/sminmpec.c | 15 + extcap.c | 565 +- extcap/androiddump.c | 14 +- extcap_parser.c | 183 +- extcap_parser.h | 3 +- extcap_spawn.c | 34 +- file.c | 42 +- file.h | 12 +- manuf | 101 +- mergecap.c | 83 +- packaging/macosx/osx-app.sh | 8 +- packaging/nsis/CMakeLists.txt | 2 +- packaging/rpm/SPECS/wireshark.spec.in | 11 + packaging/wix/CMakeLists.txt | 4 +- plugins/transum/AUTHORS | 2 + plugins/{wimaxmacphy => transum}/COPYING | 0 plugins/transum/NEWS | 2 + plugins/transum/README | 6 + plugins/transum/decoders.c | 303 + .../codec-g722.h => transum/decoders.h} | 30 +- plugins/transum/extractors.c | 120 + .../easy_codec_plugin.c => transum/extractors.h} | 36 +- plugins/{irda => transum}/moduleinfo.h | 5 +- plugins/transum/packet-transum.c | 1408 +++++ plugins/transum/packet-transum.h | 185 + plugins/transum/preferences.h | 55 + profiles/Bluetooth/colorfilters | 39 +- randpkt.c | 48 +- randpkt_core/randpkt_core.c | 2 +- rawshark.c | 5 +- reordercap.c | 54 +- services | 2 + tfshark.c | 9 +- tools/debian-setup.sh | 2 +- tools/install_rpms_for_devel.sh | 22 +- tools/test-common.sh | 2 +- tools/win-setup.ps1 | 7 +- tshark.c | 110 +- ui/gtk/capture_file_dlg.c | 7 +- ui/gtk/drag_and_drop.c | 5 +- ui/gtk/extcap_gtk.c | 34 +- ui/gtk/extcap_gtk.h | 1 + ui/gtk/main.c | 12 +- ui/gtk/rtp_player.c | 8 +- ui/gtk/webbrowser.c | 2 + ui/help_url.c | 27 - ui/help_url.h | 10 - ui/qt/export_object_dialog.cpp | 3 + ui/qt/extcap_argument.cpp | 63 + ui/qt/extcap_argument.h | 21 + ui/qt/extcap_options_dialog.cpp | 9 + ui/qt/main_window.cpp | 10 +- ui/qt/rtp_audio_stream.cpp | 52 +- ui/qt/rtp_audio_stream.h | 3 + ui/qt/rtp_player_dialog.cpp | 35 +- ui/qt/rtp_player_dialog.h | 8 +- ui/qt/rtp_player_dialog.ui | 54 +- ui/qt/wireshark_de.ts | 1077 ++-- ui/qt/wireshark_en.ts | 1085 ++-- ui/qt/wireshark_fr.ts | 1077 ++-- ui/qt/wireshark_it.ts | 1077 ++-- ui/qt/wireshark_ja_JP.ts | 1077 ++-- ui/qt/wireshark_pl.ts | 1077 ++-- ui/qt/wireshark_zh_CN.ts | 1077 ++-- wireshark-qt.cpp | 12 +- wiretap/file_access.c | 74 +- wiretap/file_wrappers.c | 16 +- wiretap/file_wrappers.h | 2 +- wiretap/merge.c | 394 +- wiretap/merge.h | 55 +- wiretap/wtap-int.h | 1 - wiretap/wtap.c | 21 +- wiretap/wtap.h | 6 +- wsutil/filesystem.c | 49 +- wsutil/filesystem.h | 12 + wsutil/plugins.c | 9 +- 147 files changed, 16680 insertions(+), 10600 deletions(-) create mode 100644 cmake/modules/FindSPANDSP.cmake create mode 100644 epan/dissectors/packet-gsmtap.h create mode 100644 plugins/transum/AUTHORS copy plugins/{wimaxmacphy => transum}/COPYING (100%) create mode 100644 plugins/transum/NEWS create mode 100644 plugins/transum/README create mode 100644 plugins/transum/decoders.c copy plugins/{easy_codec/codec-g722.h => transum/decoders.h} (60%) create mode 100644 plugins/transum/extractors.c copy plugins/{easy_codec/easy_codec_plugin.c => transum/extractors.h} (55%) copy plugins/{irda => transum}/moduleinfo.h (95%) create mode 100644 plugins/transum/packet-transum.c create mode 100644 plugins/transum/packet-transum.h create mode 100644 plugins/transum/preferences.h hooks/post-receive -- wireshark with Osmocom specific dissectors