wireshark.git branch laforge/20160809-osmux created. f8ee1c0f4c5682747b31da1a78c45f309be33f6a
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/20160809-osmux has been created at f8ee1c0f4c5682747b31da1a78c45f309be33f6a (commit) - Log ----------------------------------------------------------------- http://cgit.osmocom.org/wireshark/commit/?id=f8ee1c0f4c5682747b31da1a78c45f3... commit f8ee1c0f4c5682747b31da1a78c45f309be33f6a Author: Harald Welte <laforge@gnumonks.org> Date: Tue Aug 9 01:01:41 2016 +0200 wireshark-gtk: Fix compilation when AMRNB is enabled Change-Id: I0392581e2ce71885d02d51d4f7c3eefd743b9b3e http://cgit.osmocom.org/wireshark/commit/?id=963514fb3db8908b657f110dad380cc... commit 963514fb3db8908b657f110dad380cc04b051f53 Author: Daniel Willmann <dwillmann@sysmocom.de> Date: Wed Jul 13 15:45:56 2016 +0200 osmux: Add stats_tree statistics for Osmux Change-Id: I9510b973e6a7c2a2d46b7631fc46109d9520bee2 http://cgit.osmocom.org/wireshark/commit/?id=48fc4441dfe96b6c1aded9b66d6ff94... commit 48fc4441dfe96b6c1aded9b66d6ff941101a6363 Author: Daniel Willmann <dwillmann@sysmocom.de> Date: Wed Jul 13 15:44:43 2016 +0200 osmux: Add osmuxh info for osmux tap Change-Id: Ic562ab92efe0a44d41f6426315d563ffd187e031 http://cgit.osmocom.org/wireshark/commit/?id=6c143a2920e8e25102cfe4d015e3d56... commit 6c143a2920e8e25102cfe4d015e3d56db5b5b51d Author: Daniel Willmann <dwillmann@sysmocom.de> Date: Wed Jul 13 12:15:59 2016 +0200 osmux: Queue packet to the tap system Change-Id: I434bac2793e485561168b5402a7848b2a1db1d0d http://cgit.osmocom.org/wireshark/commit/?id=b2d89e21f7502e794d782ee65f4057e... commit b2d89e21f7502e794d782ee65f4057efaf9e4f45 Author: Daniel Willmann <dwillmann@sysmocom.de> Date: Tue Jul 12 20:25:35 2016 +0200 Add OSMux dissector Change-Id: I8fb21e54adec8d8bd7ac5ebd2154100a73ab71c9 http://cgit.osmocom.org/wireshark/commit/?id=883edb592fdd543f1a71190165c6b23... commit 883edb592fdd543f1a71190165c6b231069b0e68 Author: Daniel Willmann <dwillmann@sysmocom.de> Date: Tue Jul 12 20:25:34 2016 +0200 packet-rsl: Track rtp pt and codec for rsl Change-Id: I8f07c2807c7fd6d43c3307e01bf7fb1750accebd http://cgit.osmocom.org/wireshark/commit/?id=42d7a97dab0a0aab7ea6fc36dc35a5c... commit 42d7a97dab0a0aab7ea6fc36dc35a5c6caed61cd Author: Daniel Willmann <dwillmann@sysmocom.de> Date: Tue Jul 12 20:25:33 2016 +0200 Add AMR codec support Change-Id: I5ec963b910f8f271aa2e5d680ea33e2170a6f367 http://cgit.osmocom.org/wireshark/commit/?id=5cfb33fd6f68e8d2b8539a3d07a065f... commit 5cfb33fd6f68e8d2b8539a3d07a065fd9d79bf22 Author: Sander Steffann <sander@steffann.nl> Date: Mon Aug 8 15:24:17 2016 +0200 DHCPv6: Update Options Codes From http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.txt (2016-06-16) Change-Id: I03fbcdea0a15e792c51aa514eca73aa68350f8ff Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-on: https://code.wireshark.org/review/16953 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> http://cgit.osmocom.org/wireshark/commit/?id=81f97a963f812213025de51035227f3... commit 81f97a963f812213025de51035227f3937764ca1 Author: Dario Lombardo <lomato@gmail.com> Date: Thu Aug 4 09:51:32 2016 +0200 debian-setup: add customized profiles. libcap-dev has also been added to optional list. Change-Id: I52e034603922b694391a30c20316e1a2011fc3b6 Reviewed-on: https://code.wireshark.org/review/16872 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=568d6f37d669bce76afb8b99e455a68... commit 568d6f37d669bce76afb8b99e455a681c401153d Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Mon Aug 8 15:55:02 2016 +0200 DHCPv6: Update Status codes From http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.txt (2016-06-16) Change-Id: I4f07ff2f3782b72a90a2ca65ff49ca87c0163c41 Reviewed-on: https://code.wireshark.org/review/16954 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> http://cgit.osmocom.org/wireshark/commit/?id=57fb1abaa5e61c09804ebf33046076d... commit 57fb1abaa5e61c09804ebf33046076d091248a1c Author: AndersBroman <anders.broman@ericsson.com> Date: Mon Aug 8 18:23:43 2016 +0200 [BTLE] Dissect LE Information frame. Change-Id: Id4411526eef895fc0130108457866892216d5b03 Reviewed-on: https://code.wireshark.org/review/16958 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=ffbb822b881a51871201c5b295e5fda... commit ffbb822b881a51871201c5b295e5fda9a1893986 Author: Stig Bjørlykke <stig@bjorlykke.org> Date: Mon Aug 8 19:27:38 2016 +0200 nordic-ble: Capitalize header field names. Change-Id: Ib114b2bad01f768eb7eba4115441d58aadc1b34e Reviewed-on: https://code.wireshark.org/review/16959 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> http://cgit.osmocom.org/wireshark/commit/?id=b4ad8c9002299a19686cb4d79b893ec... commit b4ad8c9002299a19686cb4d79b893ec6eb3228cf Author: Dario Lombardo <lomato@gmail.com> Date: Sun Aug 7 18:30:18 2016 +0200 Qt: remove default value from call (CID 1311959). Change-Id: Ibefdf91269081ab11c7dd62b1b72e0e9a41502ff Reviewed-on: https://code.wireshark.org/review/16947 Reviewed-by: Gerald Combs <gerald@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=f2bee8dd57696c5da50f931fee8f8a0... commit f2bee8dd57696c5da50f931fee8f8a03ba1ea756 Author: Dario Lombardo <lomato@gmail.com> Date: Mon Aug 8 14:31:47 2016 +0200 lbmr: restore removed code. Code was removed in 975b02f879ca1407f40fdf5c3b446edcaa5171a2 but is still needed. This fixes CID 1250810. Change-Id: Ic0df5043c4486417e93d431898ff1493eb027b1c Reviewed-on: https://code.wireshark.org/review/16950 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=40e6017d84535aed24b2dad20cbc0f4... commit 40e6017d84535aed24b2dad20cbc0f48b2d1f30d Author: AndersBroman <anders.broman@ericsson.com> Date: Fri Aug 5 16:41:25 2016 +0200 [BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=d62c49793895b728fdba02380c35ace... commit d62c49793895b728fdba02380c35acecb5c263b2 Author: Maka0 <Maka0@yurei.net> Date: Fri Aug 5 06:54:32 2016 -0400 Updated dictionary.ruckus to include additional radius attributes Change-Id: I36e64ba198b251dc68d40609c9fdda86ea811096 Reviewed-on: https://code.wireshark.org/review/16896 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=a683f28b881cce39b8fed165a697fc4... commit a683f28b881cce39b8fed165a697fc4c28c22984 Author: Dario Lombardo <lomato@gmail.com> Date: Sun Aug 7 23:02:44 2016 +0200 corosync-totemnet: remove dead code (CID 1223483). Change-Id: I83aaeca7d000a5e328e0aded38093adc45a9d315 Reviewed-on: https://code.wireshark.org/review/16951 Petri-Dish: Dario Lombardo <lomato@gmail.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=8025b01207d198b20371aa2cdafbc6f... commit 8025b01207d198b20371aa2cdafbc6ff9a91146c Author: Dario Lombardo <lomato@gmail.com> Date: Sun Aug 7 18:17:07 2016 +0200 Qt: remove obsolete members (CID 1159364). Change-Id: Ic5c1e472d130a122333bfb26f1e7cde25db6ac8f Reviewed-on: https://code.wireshark.org/review/16945 Petri-Dish: Dario Lombardo <lomato@gmail.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=1767e088d498e79e0ddec1ae4b1dbb6... commit 1767e088d498e79e0ddec1ae4b1dbb625b650793 Author: Peter Wu <peter@lekensteyn.nl> Date: Sun Aug 7 01:03:17 2016 +0200 netlink-netfilter: add NFQUEUE dissection Update fields to Linux 4.7, add dissection for most important NFQUEUE structures and attributes. The shared Netfilter header is also dissected here (except when the NFLOG subdissector is called). Based on the source code of Linux and libnl, it seems that most (all?) fields are big endian. Tested with netlink.pcap and netlink-nflog.pcap from the SampleCaptures wiki page. Change-Id: I93bb8e528fdd2575acdae31a17b9b62aaa90fdbc Reviewed-on: https://code.wireshark.org/review/16933 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=f3b15abf7f94092e5691122e0215237... commit f3b15abf7f94092e5691122e0215237c5bc93c9c Author: Dario Lombardo <lomato@gmail.com> Date: Sun Aug 7 21:44:51 2016 +0200 gtk: add assert (CID 1159169). Change-Id: I365bdbc49fe50b6442fd01f56cc7ffdda972585c Reviewed-on: https://code.wireshark.org/review/16949 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=ef8098cb3778e2c93c4c235528e15b9... commit ef8098cb3778e2c93c4c235528e15b9fd849fb53 Author: Peter Wu <peter@lekensteyn.nl> Date: Sat Aug 6 16:42:19 2016 +0200 netlink: dissect errors and more flags, improve display and help Print "Protocol-specific" instead of "Unknown (0x0016)" for the type since its interpretation depend on the subprotocol. Dissect struct nlmsgerr (refactor and reuse the header dissection code). Dissect Dump interrupted and Dump filtered flags. Adjust field descriptions and value_string based on the netlink(7) manual and linux/netlink.h. Display Flags as hex instead of decimal. Expanded inline tabs, renamed netlink.hdr_flags.match_all to netlink.hdr_flags.match for consistency. Change-Id: If2b5c8d2b68fd94e70d1d8b98e63171b42b0d65c Reviewed-on: https://code.wireshark.org/review/16932 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=bad783b38ad33b96884ef2c679fde75... commit bad783b38ad33b96884ef2c679fde754fb39cf5d Author: Dario Lombardo <lomato@gmail.com> Date: Sun Aug 7 18:27:40 2016 +0200 Qt: add initializers (CID 1328485). Change-Id: I9135dabc3f656ac17f6269221f795a5dda7552af Reviewed-on: https://code.wireshark.org/review/16946 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=313048830b2a65bafcccd57a67ec4cf... commit 313048830b2a65bafcccd57a67ec4cfe72302c20 Author: Gerald Combs <gerald@wireshark.org> Date: Sun Aug 7 08:08:09 2016 -0700 [Automatic update for 2016-08-07] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I538e387ddbd546f62fd73381fc068b09dad61822 Reviewed-on: https://code.wireshark.org/review/16941 Reviewed-by: Gerald Combs <gerald@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=1ea6b4fe2e4b6e068694301c4ffc731... commit 1ea6b4fe2e4b6e068694301c4ffc731e2309c797 Author: Peter Wu <peter@lekensteyn.nl> Date: Sun Aug 7 12:58:59 2016 +0200 prefs: fix crash with -o column.foo:x The gui.column module is somehow special, it has no name since it is part of the gui module. This causes a crash when trying to invoke `strcmp(module->name /* NULL */, "mgcp")`. Always look up prefs inside gui_column_module when the given prefs module is "column" instead of matching two specific names. Change-Id: I47e354d11b6fd01818b0627a249b506a8f9510cc Reviewed-on: https://code.wireshark.org/review/16937 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=2a80b407ea44741988220931ca1feca... commit 2a80b407ea44741988220931ca1feca46c841522 Author: Peter Wu <peter@lekensteyn.nl> Date: Sat Aug 6 16:08:09 2016 +0200 netlink-route: decode more items (sync with Linux 4.7) Based on inspection of the Linux 4.7 source code. Replaced tabs by spaces in enums and value_strings for consistency. Change-Id: I78b5de53b53dc3f2a7c807a72d8d94880f6406d5 Reviewed-on: https://code.wireshark.org/review/16931 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: Peter Wu <peter@lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=600eca15fe967fc46987e5260b32122... commit 600eca15fe967fc46987e5260b32122608b67fb1 Author: Michael Mann <mmann78@netscape.net> Date: Sat Aug 6 22:45:19 2016 -0400 Allow up to 64-bit values to use BASE_RANGE_STRING. Change-Id: Iea69b5ef533b9b524a624b96bf82e178fd428ce9 Reviewed-on: https://code.wireshark.org/review/16934 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=66711eb2612ddc7f523b7cc5990e167... commit 66711eb2612ddc7f523b7cc5990e1674a755cb00 Author: Guy Harris <guy@alum.mit.edu> Date: Sat Aug 6 20:07:04 2016 -0700 Avoid colliding with the (old) UNIX stime() system call. Rename "stime" to "sys_time", and, for consistency, do the same with "utime". This failed when I tried a build on an Ubuntu 12.04 LTS machine. Change-Id: Ib955b723506346aa742db0de4d26dc157bcd4fc8 Reviewed-on: https://code.wireshark.org/review/16935 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=e32890af11483db4c64bb33133396f8... commit e32890af11483db4c64bb33133396f8bb5a44ed0 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sat Aug 6 20:09:15 2016 +0100 checklicenses.py: Remove some boilerplate from upstream Change-Id: If8a1537fe5ad0c5decaf2facf6fd0c43b32ffe70 Reviewed-on: https://code.wireshark.org/review/16930 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=57be744df5a2e9c43a42544909c5337... commit 57be744df5a2e9c43a42544909c533733565291a Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Fri Aug 5 20:49:33 2016 +0100 Add licensecheck.pl to our /tools directory and use it Source: https://anonscm.debian.org/cgit/collab-maint/devscripts.git/plain/scripts/li... Removed regex to check files without an extension. Change-Id: Icf98d0da2d201731da7134799ead0d2dc5c3fc39 Reviewed-on: https://code.wireshark.org/review/16913 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=77c41eba6f028bbb89bcffb4c549191... commit 77c41eba6f028bbb89bcffb4c54919153850369d Author: Martin Kaiser <wireshark@kaiser.cx> Date: Sat Aug 6 19:52:00 2016 +0200 ios15765: tree is used, remove the _U_ Change-Id: Id7fb231fe820308641c09add22dde131757b9e92 Reviewed-on: https://code.wireshark.org/review/16929 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> http://cgit.osmocom.org/wireshark/commit/?id=6e3ebccf22441c9f226fed77bd0c2d5... commit 6e3ebccf22441c9f226fed77bd0c2d5418c3bbfc Author: Günther Deschner <gd@samba.org> Date: Mon Sep 28 07:28:28 2015 +0200 tools/pidl: support HRESULT as return code in wireshark autogenerated dissectors. Guenther Change-Id: I68b7c579c5a519e429d2f4c2b3f63247e02f24e3 Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-on: https://code.wireshark.org/review/16718 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=29cc1817b9dee92748199f9517815a0... commit 29cc1817b9dee92748199f9517815a0437393023 Author: Günther Deschner <gd@samba.org> Date: Wed May 11 15:41:02 2016 +0200 tools/pidl: Keep case from fieldnames. Change-Id: I5626cfa0487cc88eb65cc349c05ae1762bc953f4 Signed-off-by: Guenther Deschner <gd@samba.org> Reviewed-on: https://code.wireshark.org/review/16720 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=3bbbfd059c2287124c577cf68106687... commit 3bbbfd059c2287124c577cf68106687804195143 Author: Günther Deschner <gd@samba.org> Date: Mon Sep 28 07:30:07 2015 +0200 Add support for Windows HRESULT error codes for DCE/RPC Change-Id: I013549978743740b04b89b5592e63edae5ff3fe4 Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-on: https://code.wireshark.org/review/16717 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=0ceff86a8336b986ddd173d43dfbbe4... commit 0ceff86a8336b986ddd173d43dfbbe48f87d9e98 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Thu Aug 4 19:39:30 2016 +0100 test.sh: Don't abort on failed test This behavior severely limits the usefulness of the test suite. An option to configure it would still be nice. Change-Id: I2bc96a043cc4ec76f334a3bfe48967703ef1be5e Reviewed-on: https://code.wireshark.org/review/16890 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=86bf0357feeb9049b82114b3ef13de7... commit 86bf0357feeb9049b82114b3ef13de7282d774f0 Author: Gerald Combs <gerald@wireshark.org> Date: Thu Aug 4 09:49:45 2016 -0700 Remove old Qt code. Our minimum version has been 4.7 for a while. Remove dead QT_VERSION_CHECK code. Change-Id: Ia003c1aa4275eefdda707975774d886643ff1538 Reviewed-on: https://code.wireshark.org/review/16888 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: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=0eee62affe9e6b935fdc37a0d72d5c2... commit 0eee62affe9e6b935fdc37a0d72d5c27c5c7651a Author: Gerald Combs <gerald@wireshark.org> Date: Fri Aug 5 15:39:26 2016 -0700 CMake: Look for vcredist_x??.exe in more places. Look for the redistributable installer in the project library directory before %VCINSTALLDIR%. This lets us ship a specific version of the redistributable. Change-Id: I70e5aa90ac5addba5355d1964aeb50e277d1a8d4 Ping-Bug: 12712 Reviewed-on: https://code.wireshark.org/review/16922 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: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=b626ad1f853e1e4f2e906acc7477c39... commit b626ad1f853e1e4f2e906acc7477c3924f941556 Author: Dario Lombardo <lomato@gmail.com> Date: Fri Aug 5 22:20:28 2016 +0200 extcap: move defines from sshdump & ciscodump to ssh-base. Change-Id: I51769e2427b0119aefe57ebcc08406434ffbfead Reviewed-on: https://code.wireshark.org/review/16918 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=37649c4d0f0e3c87308687f9000dbe9... commit 37649c4d0f0e3c87308687f9000dbe9f627594de Author: Dario Lombardo <lomato@gmail.com> Date: Fri Aug 5 22:00:05 2016 +0200 doc: fix typos. Change-Id: Id34affcb33c00e224dafbccc347b1d91b9e74c8d Reviewed-on: https://code.wireshark.org/review/16914 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=d1847f0b490302f671133b770efd475... commit d1847f0b490302f671133b770efd475f7b209971 Author: Guy Harris <guy@alum.mit.edu> Date: Fri Aug 5 13:24:26 2016 -0700 Update FSF address. Change-Id: I2a36a833f00f4acda253e5741c96c519588aa046 Reviewed-on: https://code.wireshark.org/review/16919 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=d1f0ffd7e7176597d26e7a3a6087a14... commit d1f0ffd7e7176597d26e7a3a6087a147ba85cd21 Author: Guy Harris <guy@alum.mit.edu> Date: Fri Aug 5 13:16:07 2016 -0700 Fix FSF address. Change-Id: Icf473af9487e60003813435f18551225224c6d58 Reviewed-on: https://code.wireshark.org/review/16915 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=704c12a5724b4c79613da13408d47e4... commit 704c12a5724b4c79613da13408d47e46d442b7c8 Author: Dario Lombardo <lomato@gmail.com> Date: Fri Aug 5 16:11:23 2016 +0200 docbook: fix typos. Change-Id: If94a1427d91a5de2f5f2308be454479e6b4d8d5a Reviewed-on: https://code.wireshark.org/review/16900 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=746e04976ec06952e5698d47b30940f... commit 746e04976ec06952e5698d47b30940fe57e8e6d0 Author: Guy Harris <guy@alum.mit.edu> Date: Fri Aug 5 11:24:01 2016 -0700 Fix copyright. I'd just copied and pasted the copyright notice from test/test.sh; Ulf wrote test/test.sh, but didn't write test/run_and_catch_crashes - I did, but, hey, might as well give the copyright to Gerald. Fix the date as well. Change-Id: Id307f354289ca72931dd83f472d879d733618e3c Reviewed-on: https://code.wireshark.org/review/16910 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=fd00a4a38d94c16974337fe6cbdadad... commit fd00a4a38d94c16974337fe6cbdadad3cb06ae8c Author: Guy Harris <guy@alum.mit.edu> Date: Fri Aug 5 11:20:37 2016 -0700 Add copyright notices. Change-Id: I481968f154008d62c124ca6f71d6cc0114c293c1 Reviewed-on: https://code.wireshark.org/review/16907 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=73c7cc67b6f4e533eae71a1d0a41f2d... commit 73c7cc67b6f4e533eae71a1d0a41f2d9bcde1990 Author: Guy Harris <guy@alum.mit.edu> Date: Fri Aug 5 11:13:55 2016 -0700 Put the usual copyright notice on test/run_and_catch_crashes. Change-Id: I397e5483baa79b5bf043d746aabab6c54499fabc Reviewed-on: https://code.wireshark.org/review/16903 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=78ef23f0d20855acad466abd13a4898... commit 78ef23f0d20855acad466abd13a489828d30eb23 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Fri Aug 5 13:37:39 2016 +0100 checklicenses.py: Whitelist some plaintext files without license requirements Change-Id: I029ef1d52ac6edd44c0bac41adb86361ddd94272 Reviewed-on: https://code.wireshark.org/review/16898 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=917d34c4dee4556df348944d250814b... commit 917d34c4dee4556df348944d250814b7c3ab5db3 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Fri Jul 29 15:00:56 2016 +0100 Add PI_DEPRECATED expert info group Change-Id: Ibc43b1976d5827e8c40252a5200852fbcd00b70c Reviewed-on: https://code.wireshark.org/review/16763 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=be16ff5f12eab61f753e6b9e2463691... commit be16ff5f12eab61f753e6b9e2463691b7c0e97c7 Author: Harald Welte <laforge@gnumonks.org> Date: Mon Aug 1 08:34:01 2016 +0200 gsm_abis_om2000: Dissect "Reason Code" and "Result Code" Change-Id: Ie2495b6333b021de53c674ca8bdad0712228a7c1 Reviewed-on: https://code.wireshark.org/review/16820 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=e6e0a905bbcd95bd33d76aa34740f61... commit e6e0a905bbcd95bd33d76aa34740f611796f015d Author: Harald Welte <laforge@gnumonks.org> Date: Sun Jul 31 17:59:25 2016 +0200 gsm_abis_om2000: Decode "Attribute ID" Information Element The "Attribute ID" IE is used by the RBS to indicate which particular setting has caused it to reject a given request by the BSC. Change-Id: I05621831f70fb53b5b752afceed9337f6cd0edb7 Reviewed-on: https://code.wireshark.org/review/16819 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=c02e3e713cbefca8e765a193a26bc87... commit c02e3e713cbefca8e765a193a26bc8707e27bc5a Author: AndersBroman <anders.broman@ericsson.com> Date: Fri Aug 5 11:16:15 2016 +0200 [Diameter] Dissect RX Feature list. Change-Id: I64fc582bb9330402c18aeeadea52c968032ccb2c Reviewed-on: https://code.wireshark.org/review/16895 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=f5af708026412d1a14e708601f3dd1e... commit f5af708026412d1a14e708601f3dd1e43635df3a Author: Yann Diorcet <yann@diorcet.fr> Date: Sat Jul 16 09:54:23 2016 +0200 Add UDS dissector Change-Id: Icc9b6c6bcaac1f3056fa83a4ae9ef66e1537b1a5 Reviewed-on: https://code.wireshark.org/review/16492 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=333ba807e700f73a74ed42034e99ef2... commit 333ba807e700f73a74ed42034e99ef21c9ab6127 Author: Jaap Keuter <jaap.keuter@xs4all.nl> Date: Thu Aug 4 23:35:01 2016 +0200 pkix1implicit: Make sure distribution takes in all the files. By including ../Makefile.inc (like all other ASN1 based dissectors) assure the symbols are setup correctly for all make related actions, including packaging the files for distribution. Bug: 12703 Change-Id: Ia7279fcc30bb08e749f35b6d893136b053f3544c Reviewed-on: https://code.wireshark.org/review/16893 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.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=90576991275923eef4daa017c9e72df... commit 90576991275923eef4daa017c9e72df2e6930c1e Author: Dario Lombardo <lomato@gmail.com> Date: Thu Aug 4 14:55:59 2016 +0200 logcat-text: add cleanup function. Found by valgrind. ==23399== 209 (40 direct, 169 indirect) bytes in 1 blocks are definitely lost in loss record 2,431 of 2,696 ==23399== at 0x4C2FB55: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==23399== by 0xAAA2780: g_malloc0 (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.1) ==23399== by 0xAAB0760: g_regex_new (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.1) ==23399== by 0x6B03162: proto_register_logcat_text (packet-logcat-text.c:373) ==23399== by 0x71BA16D: register_all_protocols (register.c:2881) ==23399== by 0x7296E67: proto_init (proto.c:529) ==23399== by 0x7272A76: epan_init (epan.c:128) ==23399== by 0x1160F2: main (tshark.c:804) Change-Id: Ia47a4371a62eaadcdc8613d35030792d57e7f9dc Reviewed-on: https://code.wireshark.org/review/16881 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=6b4e9707f03febc20959498de1a8a6f... commit 6b4e9707f03febc20959498de1a8a6f639eeb51c Author: Dario Lombardo <lomato@gmail.com> Date: Thu Aug 4 14:15:35 2016 +0200 kafka: remove unused assignment. Found by valgrind: ==21035== 12 bytes in 1 blocks are definitely lost in loss record 279 of 2,696 ==21035== at 0x4C2DB8F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==21035== by 0xAAA2728: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.1) ==21035== by 0x72A361F: range_convert_str_work.part.0 (range.c:109) ==21035== by 0x6AACBEC: proto_register_kafka (packet-kafka.c:1459) ==21035== by 0x71BA055: register_all_protocols (register.c:2769) ==21035== by 0x7296E67: proto_init (proto.c:529) ==21035== by 0x7272A76: epan_init (epan.c:128) ==21035== by 0x1160F2: main (tshark.c:804) ==21035== Change-Id: I3249925acd3ed26d40be992fd228447d1b381b66 Reviewed-on: https://code.wireshark.org/review/16880 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=5661420d7f5e8247183eb8fa3683a4d... commit 5661420d7f5e8247183eb8fa3683a4d8143874a1 Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Thu Aug 4 17:47:58 2016 +0200 asn2wrs: put back parsetab.py file in ASN.1 source folder Otherwise it breaks multi threaded compilation. Follow-up of gd04be01 Bug: 12621 Change-Id: I2f6b7d6ca85a1cf5a6713c2b36c823a520d3bf3d Reviewed-on: https://code.wireshark.org/review/16886 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=d217ac4410b479b429bebb85d16ce6d... commit d217ac4410b479b429bebb85d16ce6d4c78b3afc Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Thu Aug 4 18:06:28 2016 +0100 Remove missed header Follow up to d21295f9a6da65420254afba0bb8a64cb4155947. Change-Id: I971e2bb44d8d1b2977b6fcf6e4e492e45038b85e Reviewed-on: https://code.wireshark.org/review/16889 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=6168d8bf809edf514f6356c2c35afb4... commit 6168d8bf809edf514f6356c2c35afb41e6eedf36 Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Thu Aug 4 17:01:45 2016 +0200 Qt: fix a NULL pointer dereference in extcap_argument_multiselect.cpp Guard treeView dereference by a cehck on viewModel (as it is done elsewhere in the file, both are allocated at the same time). This can happen for example when USBPcap lists a USB Hub with no devices connected. Change-Id: Iee412b8c95539e9e3d65706c14f62194cafcaffc Reviewed-on: https://code.wireshark.org/review/16885 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=d21295f9a6da65420254afba0bb8a64... commit d21295f9a6da65420254afba0bb8a64cb4155947 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Thu Aug 4 12:11:09 2016 +0100 Bump GLib minimum required version to 2.22.0 Change-Id: I0ab85be8090f234f9ca10914063f97f13c894413 Reviewed-on: https://code.wireshark.org/review/16879 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=47e2849ada67ad9d51845c27d4b1047... commit 47e2849ada67ad9d51845c27d4b10479a6dbccf9 Author: Roland Knall <roland.knall@br-automation.com> Date: Thu Aug 4 16:10:50 2016 +0200 openSAFETY: Remove SCM UDID check This leads to too many false-negatives in certain traces Change-Id: Ia081dc802b6f55926beec2383a864173cae6eb51 Reviewed-on: https://code.wireshark.org/review/16883 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=a671bab3373101ce593c78ee1af4767... commit a671bab3373101ce593c78ee1af476719f357028 Author: Dario Lombardo <lomato@gmail.com> Date: Tue Aug 2 15:13:13 2016 +0200 extcap: restyle the help function. Change-Id: Ia742dffb1fd4cd5780b8ba44f7064d1874e473da Reviewed-on: https://code.wireshark.org/review/16842 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=7e08f158851910954cbd9d038912a6e... commit 7e08f158851910954cbd9d038912a6e46b633cbe Author: AndersBroman <anders.broman@ericsson.com> Date: Thu Aug 4 15:56:19 2016 +0200 [BTLE-Nordic] Set pinfo->p2p_dir as seen from "Master". Change-Id: I12ad3a9b092e35a3418a11ec4d17cce157f320b6 Reviewed-on: https://code.wireshark.org/review/16882 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=41e659d91e432f6336c9e3243b8004b... commit 41e659d91e432f6336c9e3243b8004b3a73a15c4 Author: Dario Lombardo <lomato@gmail.com> Date: Wed Aug 3 16:59:56 2016 +0200 extcap: prevent registration of wrong version. This prevents the user to run extcap_base_set_util_info(extcap, "1", NULL, "0", NULL); that would result in version = 1.0. Change-Id: I67532459c852bdceb16693553e90da88a1043435 Reviewed-on: https://code.wireshark.org/review/16858 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=0bf128860783da20706506f7580927c... commit 0bf128860783da20706506f7580927c7755cb52a Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Thu Aug 4 08:15:08 2016 +0200 extcap: preference name must only contain lower case ASCII, numbers, dots or underscores This chage set restores the normalization that was done before g485bc45. Without it, USBPcap extacp utility triggers a crash. Change-Id: Id960db186888452ec3d04df1ee48dcc3899e8951 Reviewed-on: https://code.wireshark.org/review/16871 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=5adde36520cf71a87c51c3bde490686... commit 5adde36520cf71a87c51c3bde49068623eb4d3d4 Author: Dario Lombardo <lomato@gmail.com> Date: Tue Aug 2 22:39:28 2016 +0200 extcap: restyle the output subsystem. Change-Id: I3e0674751eb97bf30ae6d70c4e51f347d63b1697 Reviewed-on: https://code.wireshark.org/review/16849 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=06464b7db1999b95a9b4166ceb636e4... commit 06464b7db1999b95a9b4166ceb636e4f46fcc7df Author: Yurii Lysyi <yurii.lysyi@ericsson.com> Date: Thu Aug 4 10:09:42 2016 +0200 [GSM A RR] Some updates from rel 13, Change-Id: Ib847ec3d019b3a8ba0f8e5502fcbe80aa47c266b Reviewed-on: https://code.wireshark.org/review/16873 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=d04be0149d1942e691030d20e52e94e... commit d04be0149d1942e691030d20e52e94ed2eabfab6 Author: Balint Reczey <balint@balintreczey.hu> Date: Wed Aug 3 23:28:28 2016 +0200 Ply parser updated to 3.8 from http://www.dabeaz.com/ply/ The Ubuntu packaged Ply 3.7 with Ubuntu 16.04's Python makes ASN.1 based dissector generation fail. Ply's API changed after 3.5 and the small change to asn2wrs.py adapts to that. The commit breaking the API in Ply's repository is the following: commit af651673ba6117a0a5405055a92170fffd028106 Author: David Beazley <dave@dabeaz.com> Date: Tue Apr 21 16:31:32 2015 -0500 Added optional support for defaulted states Change-Id: I1db33fdcccf7c39ecdb0e435a5ea9183362471ad Bug: 12621 Reviewed-on: https://code.wireshark.org/review/16864 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=92eecfd25533147c793e483bd54a32a... commit 92eecfd25533147c793e483bd54a32afc14d2b8a Author: Yann Diorcet <yann@diorcet.fr> Date: Sat Jul 16 09:53:37 2016 +0200 Add ISO15765 dissector Bug: 12657 Change-Id: Ib0d9e18b31c1252f63025b10f7a67de6a5e4462c Reviewed-on: https://code.wireshark.org/review/16491 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=d430ba30140907192509af18d17542b... commit d430ba30140907192509af18d17542ba7ce60025 Author: Guy Harris <guy@alum.mit.edu> Date: Wed Aug 3 18:05:21 2016 -0700 Report the pathname of the color filter file in "Could not compile" messages. This also fixes some cases where we wouldn't report the path in a read error message, as we'd already freed the path up and set the path string pointer to null. Change-Id: Ia0e1ca0bf4880075bfa1957b0778a177de1a824f Reviewed-on: https://code.wireshark.org/review/16868 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=9affd2656c9c2f6e911817f196a524f... commit 9affd2656c9c2f6e911817f196a524f4b5b2c1cd Author: Jaap Keuter <jaap.keuter@xs4all.nl> Date: Thu Aug 4 00:14:56 2016 +0200 SSL utils: Add proper check while getting bag type Implementing proper return value check, as done for other gnutls function calls, catches (unlikely) errors and allows C++ compatible build. Change-Id: Idf5bd3fe6e68d006a469fe72663dea1c7e2d17f7 Reviewed-on: https://code.wireshark.org/review/16865 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=86cf94ffeecfa2f02a4a286f41e00bf... commit 86cf94ffeecfa2f02a4a286f41e00bfcf4f1d84e Author: Graham Bloice <graham.bloice@trihedral.com> Date: Wed Aug 3 17:00:31 2016 +0100 Text2Pcap doc update Minor docs update Change-Id: Iea44e4963aab75db1d875d27af41e4f38ff74e2d Reviewed-on: https://code.wireshark.org/review/16859 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=a723a30ad4cde5aa8d30b4479fd4b32... commit a723a30ad4cde5aa8d30b4479fd4b3280b007ae0 Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Wed Aug 3 22:35:44 2016 +0200 Update USBPcap installer packaged in our Windows installer This new version contains kernel drivers with an EV certificate that is cross-signed by Microsoft as it will become mandatory. See https://blogs.msdn.microsoft.com/windows_hardware_certification/2016/07/26/d... for details. Change-Id: I76bb1005ea540f39dca8874abb88d71a3ad53625 Reviewed-on: https://code.wireshark.org/review/16862 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> http://cgit.osmocom.org/wireshark/commit/?id=4be341b23a976d92bc41f3f03e35bf6... commit 4be341b23a976d92bc41f3f03e35bf6990bf6c73 Author: Yurii Lysyi <yurii.lysyi@ericsson.com> Date: Wed Aug 3 15:28:25 2016 +0200 [BSSGP] Update messages and IEs. Change-Id: Ida8c59b19213f2a2ab3448d1cbeddd98f06ba4b9 Reviewed-on: https://code.wireshark.org/review/16857 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=472f789b73a751c651c82579e1f316a... commit 472f789b73a751c651c82579e1f316a8c4fdfc87 Author: Graham Bloice <graham.bloice@trihedral.com> Date: Wed Aug 3 13:32:05 2016 +0100 Text2Pcap docs update Minor update to docs Change-Id: If9464f00d69bb9a8bb5638f3bb0d0f73a56aad50 Reviewed-on: https://code.wireshark.org/review/16856 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> http://cgit.osmocom.org/wireshark/commit/?id=0d5cf544836b5627e977ab177517317... commit 0d5cf544836b5627e977ab177517317f90f81f75 Author: Irene Ruengeler <ruengeler@wireshark.org> Date: Wed Aug 3 11:40:35 2016 +0200 Set correct length for Req_Seq_Nr field Change-Id: Iec228708423743e0268305da6ed606d464d1e1ea Reviewed-on: https://code.wireshark.org/review/16854 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=e631e1156daa25671f4b61b92f9bee6... commit e631e1156daa25671f4b61b92f9bee646866d0c2 Author: Roland Knall <roland.knall@br-automation.com> Date: Tue Aug 2 17:04:56 2016 +0200 openSAFETY: Add two checks for scm udid validity This is being done, to prevent false-positives which can not be filtered out using the heuristics, but have to be caught using additional check measurements Change-Id: I2ff2c97decf8a93d43f8f5b54e4d147552970b3f Reviewed-on: https://code.wireshark.org/review/16843 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=6d8261994bb928b7e80e3a2478a3d93... commit 6d8261994bb928b7e80e3a2478a3d939ea1ef373 Author: Guy Harris <guy@alum.mit.edu> Date: Tue Aug 2 20:28:41 2016 -0700 Don't snprintf() into a string with one of the arguments being the same string. That doesn't work - you could be writing into the string from which you're reading. Bug: 12700 Change-Id: I70f3ce6048dea582ec5e08c24c99e9a553b352df Reviewed-on: https://code.wireshark.org/review/16850 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=64ec47e8261e3623d464cd69db12dca... commit 64ec47e8261e3623d464cd69db12dcac0fa31332 Author: Dario Lombardo <lomato@gmail.com> Date: Mon Aug 1 23:01:13 2016 +0200 Qt: remove dead code. Fix CID: 1362828, 1362829, 1362889. Change-Id: I15045c32e96896323ae4d788b7891b2608a0c102 Reviewed-on: https://code.wireshark.org/review/16833 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> http://cgit.osmocom.org/wireshark/commit/?id=3c1db69189b18d486176bc0ecd93a54... commit 3c1db69189b18d486176bc0ecd93a5466027a027 Author: AndersBroman <anders.broman@ericsson.com> Date: Tue Aug 2 17:07:14 2016 +0200 [BTLE] Change address from unknown_0x... to master or slave. Change-Id: I571a2f6f96c37e608201092e7ea7f53862b8d2ad Reviewed-on: https://code.wireshark.org/review/16844 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=b6e0335d0f35d9781d2026aead13210... commit b6e0335d0f35d9781d2026aead13210e5077b2da Author: AndersBroman <anders.broman@ericsson.com> Date: Tue Aug 2 13:54:46 2016 +0200 [BLE] Make the Nordic BLE dissector fill in the btle_context_t struct. Change-Id: I14e62126d022dde10dcce2d7e974def0dc664b20 Reviewed-on: https://code.wireshark.org/review/16840 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=18f775af55ddf60aa72b4d2b3d63570... commit 18f775af55ddf60aa72b4d2b3d635701d1ac50b1 Author: Michael Tuexen <tuexen@wireshark.org> Date: Tue Aug 2 14:31:37 2016 +0200 Fix compilation on FreeBSD. Includes are needed for using macros like WIFEXITED. Change-Id: Ia09ca58eeab2d151a756d285b0aeb55141c4d24a Reviewed-on: https://code.wireshark.org/review/16841 Reviewed-by: Michael Tüxen <tuexen@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=6343e1dc67b3c99f2ac900b026ad00e... commit 6343e1dc67b3c99f2ac900b026ad00ee2d04b063 Author: David McKay <mckay.david@gmail.com> Date: Mon Aug 1 22:56:45 2016 -0400 Bugfix endian issues with 802.11 FCS Rather than trying to swap fields to be big-endian, just make everything little-endian. Bug: 12697 Change-Id: I07e7fd651c4a32dba764d111b34acdf32958c195 Reviewed-on: https://code.wireshark.org/review/16836 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=cec29464601400a56cb79b733f45977... commit cec29464601400a56cb79b733f45977e3220cdf5 Author: Adrien Aubry <adraub@gmail.com> Date: Mon Aug 1 11:28:21 2016 +0200 CANopen: Added some improvements to CANopen emergency dissector -Added description to Emergency error code -Added bitmask dissector to Emergency register -Added descriptions to object dictionary SDO related index All these changes were found inside the CiA CANopen norm, and were useful in my work while debugging CANopen frames Change-Id: I76bc1eab9f75fc242eaf3200af81593f65570658 Reviewed-on: https://code.wireshark.org/review/16823 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> 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=d62ad9dd47d368f7545c3cc91f44ecc... commit d62ad9dd47d368f7545c3cc91f44ecc07476d2e1 Author: Roland Knall <roland.knall@br-automation.com> Date: Mon Aug 1 16:57:51 2016 +0200 extcap: Remove g_spawn_check_exit_status This function is not supported in the min GLIB version, therefore the code is to be removed Change-Id: Ie39170bfc0662e5a477cbc45d7eadebcf2c70d4e Reviewed-on: https://code.wireshark.org/review/16827 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=c84af8d8c694d0104816272a7d30e9c... commit c84af8d8c694d0104816272a7d30e9ca54fceea6 Author: Gerald Combs <gerald@wireshark.org> Date: Mon Aug 1 08:46:12 2016 -0700 RPM: Download from https://www.wireshark.org/. Download from https://www.wireshark.org/ instead of https://wireshark.org/. This conforms to README.packaging and avoids a redirect. Change-Id: I0ed63f446bc16cbd501444c8743809672c4a084b Reviewed-on: https://code.wireshark.org/review/16829 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=867d7ca399a3832dec8c22f71744242... commit 867d7ca399a3832dec8c22f717442420a0a44665 Author: Dario Lombardo <lomato@gmail.com> Date: Mon Aug 1 22:01:27 2016 +0200 extcap: add null check (CID 1364683). Change-Id: I1d81d6f043fa695ed507cf733fffa832922a708c Reviewed-on: https://code.wireshark.org/review/16832 Petri-Dish: Dario Lombardo <lomato@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=abe8e51dbfa220c0b77b5269e7237c8... commit abe8e51dbfa220c0b77b5269e7237c8aacc66c56 Author: Dario Lombardo <lomato@gmail.com> Date: Mon Aug 1 21:37:07 2016 +0200 extcap: extend buffer (CID 1364684). Change-Id: I4ed6965fa1173b69d9e325bc814e382b5368d40c Reviewed-on: https://code.wireshark.org/review/16831 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=0dcda99b5018f591dcd70f72a3d7367... commit 0dcda99b5018f591dcd70f72a3d7367bec009d9f Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Mon Aug 1 14:20:08 2016 +0100 autotools: Fix make dist without Qt Change-Id: I62b1d73eede471535b4ccc7ca68c9f94f25b7417 Reviewed-on: https://code.wireshark.org/review/16826 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=573171934fdc1b8134e47db548c3790... commit 573171934fdc1b8134e47db548c3790895a54b8c Author: Michael Mann <mmann78@netscape.net> Date: Mon Aug 1 20:34:18 2016 -0400 Fix checkAPI warning for printf. Another legitimate use, so use ws_debug_printf. Change-Id: I9bebe01e80987caf8e18a59b93a48f9a2d6ee397 Reviewed-on: https://code.wireshark.org/review/16835 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=a52793aec18385ce46fbeb9952919c8... commit a52793aec18385ce46fbeb9952919c86a4b17085 Author: Guy Harris <guy@alum.mit.edu> Date: Mon Aug 1 17:35:19 2016 -0700 Remove trailing "." from OID strings. The previous change removed code that did that. Change-Id: If297018f5902af7a2d9cacb0cc9a5f1ffe1e1d00 Reviewed-on: https://code.wireshark.org/review/16834 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=a98b55f4f842d580c38bde35d37d907... commit a98b55f4f842d580c38bde35d37d907d0d115ccd Author: Dario Lombardo <lomato@gmail.com> Date: Mon Aug 1 17:33:05 2016 +0200 Fix compilation without extcap. Change-Id: I627dd6c514066ba67cd501925ff95e9cf819c0e9 Reviewed-on: https://code.wireshark.org/review/16828 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=edcc2f019e3729293d9410e1bb30dae... commit edcc2f019e3729293d9410e1bb30dae6bc9b790a Author: Michael Mann <mmann78@netscape.net> Date: Sat Jul 23 21:25:05 2016 -0400 Add OSI Layer 4 to exported PDU to handle TCP and UDP payloads. This allows for much easier anonymized captures for protocols running atop TCP/UDP. Added support for "TCP dissector data" tag within export PDU (34) so that the tcpinfo struct that TCP dissector normally passes to its subdissectors can be saved. Change-Id: Icd63c049162332e5bcb2720159e5cf8aac893788 Reviewed-on: https://code.wireshark.org/review/16285 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=c992edc222233f7e49f975763925d1f... commit c992edc222233f7e49f975763925d1ffb3848beb Author: Michael Mann <mmann78@netscape.net> Date: Mon Aug 1 09:11:30 2016 -0400 Reorder ns_dir_vals into numerical order Change-Id: I21a50015dd382c62aa2dc84d90bbb4b86ea8b1dc Reviewed-on: https://code.wireshark.org/review/16825 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=8166ab7c824ed254654b3e9f8d98331... commit 8166ab7c824ed254654b3e9f8d98331edd31bc0a Author: AndersBroman <anders.broman@ericsson.com> Date: Mon Aug 1 11:09:16 2016 +0200 Make dumpcap build without extcap Change-Id: I70c7bc270946d104218afc4d9c8ac888471f6524 Reviewed-on: https://code.wireshark.org/review/16821 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=50b56c8cde22de98801c50cc5f66870... commit 50b56c8cde22de98801c50cc5f668708a1f51a0d Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Mon Aug 1 10:12:59 2016 +0100 IPv6: Display reassembly information under root_tree Change-Id: Ibfa934dba59f96b8820d2616d4d3d3990af00918 Reviewed-on: https://code.wireshark.org/review/16822 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=e302d9fe4d10b8245fe69598076976b... commit e302d9fe4d10b8245fe69598076976b3d4073607 Author: Michael Mann <mmann78@netscape.net> Date: Sun Jul 31 09:37:36 2016 -0400 Remove checkAPI warnings from wmem. printf and g_warning are not allowed in epan or its subdirectories Change-Id: I4c07a7258f4c9566384bef93af35c350b5c88758 Reviewed-on: https://code.wireshark.org/review/16801 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=09efa5fb8bfae9b9dec939cd37f1986... commit 09efa5fb8bfae9b9dec939cd37f198626e7042c6 Author: Michael Mann <mmann78@netscape.net> Date: Sun Jul 31 12:39:58 2016 -0400 Remove proto_help.[ch] The functionality hasn't been used for awhile and was deprecated with GTK 2.4 (while our minimum support is at least 2.14). It's also causing unnecessary checkAPI warnings. Change-Id: Ib8da8300a50e2129a46ad188b4ed4d7b2d44b1ca Reviewed-on: https://code.wireshark.org/review/16813 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=3096063d44f14ab1bed29c0f9683ef8... commit 3096063d44f14ab1bed29c0f9683ef8d2d4fd5fc Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sun Jul 31 19:30:10 2016 +0100 IPv6: Expand blurb for IPv4 embedded addresses Change-Id: I540e80517092ab1e475532d8e20a54be24858c5d Reviewed-on: https://code.wireshark.org/review/16816 Reviewed-by: Binh Trinh <beango@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=7bb2e26532876dc0c093144f59cd556... commit 7bb2e26532876dc0c093144f59cd556e4877c29f Author: Dario Lombardo <lomato@gmail.com> Date: Sun Jul 31 23:01:15 2016 +0200 Qt: remove unused constructors. Fix CID 1356297 and 1356300. Change-Id: I17e882addc2fb4a12630940cc1ae3ad62f0b793c Reviewed-on: https://code.wireshark.org/review/16818 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=dd215f24352a85a7ae17f9d535a1af6... commit dd215f24352a85a7ae17f9d535a1af6a8eba9843 Author: Dario Lombardo <lomato@gmail.com> Date: Sun Jul 31 22:51:01 2016 +0200 Qt: add initializer (CID 1159352). Change-Id: I2603b1873acb82bd9840ea4deddcbbb422c018e8 Reviewed-on: https://code.wireshark.org/review/16817 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=2674c83078c00a145929b97e75f9100... commit 2674c83078c00a145929b97e75f9100d5f980d8a Author: Günther Deschner <gd@samba.org> Date: Tue Sep 29 19:56:14 2015 +0200 wireshark: update WERR definitions from Samba's werror.h. Guenther Change-Id: I457f50dcf86f6e7c74afd9ff773aaf8bfdb52426 Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-on: https://code.wireshark.org/review/16722 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=bf123efe154dfdde06ee3c78cf8af05... commit bf123efe154dfdde06ee3c78cf8af05ed01a691b Author: Vasil Velichckov <vvvelichkov@gmail.com> Date: Sun Jul 31 16:59:01 2016 +0300 BER: Fix segmentation fault when configuring new OIDs Program terminated with signal 11, Segmentation fault. #0 0x00007f573e5bdecf in uat_fld_chk_oid (u1=0x2eb1830, strptr=0x7f573c8431e4 "", len=0, u2=0x0, u3=0x0, err=0x7ffee1668748) at uat.c:494 494 if(strptr[len-1] == '.') { (gdb) (gdb) bt #0 0x00007f573e5bdecf in uat_fld_chk_oid (u1=0x2eb1830, strptr=0x7f573c8431e4 "", len=0, u2=0x0, u3=0x0, err=0x7ffee1668748) at uat.c:494 #1 0x0000000000485dfc in uat_dlg_cb (win=0x3844290, user_data=0x3632bc0) at uat_gui.c:364 #2 0x00007f573b2f19a7 in _g_closure_invoke_va (closure=0x3367130, return_value=0x0, instance=0x3844290, args=0x7ffee1668a78, n_params=0, Change-Id: Ic61480f8c1f2cd833c58de0b2acc24dcb831578f Reviewed-on: https://code.wireshark.org/review/16800 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: Stig Bjørlykke <stig@bjorlykke.org> http://cgit.osmocom.org/wireshark/commit/?id=3c47d9741213ebcb2d0460d795bdfe9... commit 3c47d9741213ebcb2d0460d795bdfe97064ecd03 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sun Jul 31 16:56:01 2016 +0100 IPv6: Remove an unused #define and two macros Change-Id: I0866e4b28b660063ab351022ac943bb5717b5a23 Reviewed-on: https://code.wireshark.org/review/16811 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=289d14b9c198e4f6313b4ed4b584a33... commit 289d14b9c198e4f6313b4ed4b584a3314974d7b6 Author: Dario Lombardo <lomato@gmail.com> Date: Sun Jul 31 16:51:18 2016 +0200 extcap: fix indentation in extcap-base. Change-Id: Ic8e9634c9568d32fdeca8cc84a9c2f5b9757a5ae Reviewed-on: https://code.wireshark.org/review/16806 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=9489c80949dcf027be99b6e493b79ae... commit 9489c80949dcf027be99b6e493b79aeef4e29ab5 Author: Michael Mann <mmann78@netscape.net> Date: Sun Jul 31 12:25:29 2016 -0400 packet-erf.c: Pacify OS X buildbot. Change-Id: I6ec30e77eac91d1b02eaddada75741b2063426f2 Reviewed-on: https://code.wireshark.org/review/16812 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=078ba235aff3cf7d8622c657ee30809... commit 078ba235aff3cf7d8622c657ee308098c81086ac Author: Michael Mann <mmann78@netscape.net> Date: Sun Jul 31 09:54:32 2016 -0400 oids.c: Use wmem_strbuf instead of trying to accommodate snprintf. Change-Id: I5222fbd07b7d1301386f7a206fef688793dd6be7 Reviewed-on: https://code.wireshark.org/review/16802 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=7855160bab3200fcf76413972f7a816... commit 7855160bab3200fcf76413972f7a816a8d92fc3d Author: Michael Mann <mmann78@netscape.net> Date: Sun Jul 31 10:19:05 2016 -0400 lbm_uimflow_dlg.c: Pacify another GTK checkAPIs.pl warning. Add another "Wireshark" macros to old-gtk-compat.h for GTK API that has been deprecated. Change-Id: Icae4ebae365329fad076324c23d5cee4c89893b5 Reviewed-on: https://code.wireshark.org/review/16803 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=9f4a294f22f8452a695a3cb663f1210... commit 9f4a294f22f8452a695a3cb663f12105fd881f82 Author: Michael Mann <mmann78@netscape.net> Date: Sun Jul 31 10:20:50 2016 -0400 Cleanup the final checkAPI g_warning complaints. Change-Id: I7606ee55be4428909e255496c0344fffe5847f02 Reviewed-on: https://code.wireshark.org/review/16804 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=e811e82c4c5a14992e491546ee60e42... commit e811e82c4c5a14992e491546ee60e42d34fa5551 Author: Binh Trinh <beango@gmail.com> Date: Sun Jul 31 10:31:11 2016 -0400 IPv6: Fix typo in comment from gd2cd779 Change-Id: Id1a053c189fdd374da2447123e5e47d80000b802 Reviewed-on: https://code.wireshark.org/review/16805 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=196b8a33ca62391dfdf2711ebf42196... commit 196b8a33ca62391dfdf2711ebf421969c42ffba2 Author: Gerald Combs <gerald@wireshark.org> Date: Sun Jul 31 08:09:38 2016 -0700 [Automatic update for 2016-07-31] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia414edeaf04efafd0b5eb2e899dbc69d5b42f07d Reviewed-on: https://code.wireshark.org/review/16807 Reviewed-by: Gerald Combs <gerald@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=63c5216843e84f07089903e330bb75e... commit 63c5216843e84f07089903e330bb75e67ce114aa Author: Martin Kaiser <wireshark@kaiser.cx> Date: Sun Jul 31 15:03:43 2016 +0200 extcap: fix a compile error with Qt4 declare ExtcapArgument * as a metatype so it can be used by QVariant CXX extcap_argument.moc.o In file included from /usr/include/qt4/QtCore/qvariant.h:48:0, from /usr/include/qt4/QtCore/qabstractitemmodel.h:45, from /usr/include/qt4/QtGui/qabstractitemview.h:46, from /usr/include/qt4/QtGui/qtreeview.h:45, from /usr/include/qt4/QtGui/qtreewidget.h:45, from /usr/include/qt4/QtGui/QTreeWidget:1, from ./interface_tree.h:38, from ./extcap_options_dialog.h:35, from extcap_options_dialog.cpp:26: /usr/include/qt4/QtCore/qmetatype.h: In instantiation of ‘static int QMetaTypeId2<T>::qt_metatype_id() [with T = ExtcapArgument*]’: /usr/include/qt4/QtCore/qmetatype.h:230:44: required from ‘int qMetaTypeId(T*) [with T = ExtcapArgument*]’ /usr/include/qt4/QtCore/qvariant.h:341:47: required from ‘bool QVariant::canConvert() const [with T = ExtcapArgument*]’ extcap_options_dialog.cpp:378:74: required from here /usr/include/qt4/QtCore/qmetatype.h:169:80: error: ‘qt_metatype_id’ is not a member of ‘QMetaTypeId<ExtcapArgument*>’ make[2]: *** [extcap_options_dialog.o] Error 1 Change-Id: Ib7d052a5cb550ab2595b8d9580d35ffeb62093da Reviewed-on: https://code.wireshark.org/review/16799 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=94cb86a0ca62680ceb8565b4f0a716e... commit 94cb86a0ca62680ceb8565b4f0a716e48010d885 Author: Anthony Coddington <anthony.coddington@endace.com> Date: Mon Jul 25 17:55:13 2016 +1200 ERF: Add ERF_TYPE_META clock tags Adds various clock configuration related tags. Uses ptp_v2 value strings exported from packet-ptp. Refactor out common ERF_TYPE_META bitfield code. Also clean up field registration a bit. Add flow_hash_mode enum, other minor wording cleanup. Manually display relative timestamps as nanoseconds for <1ms. Fix ns_host_* tag subtree summary field name duplication. Ping-Bug: 12303 Change-Id: I76264d141f1c4a3590627637daa5dcd4fdfd2e93 Reviewed-on: https://code.wireshark.org/review/16782 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=e03574df2e1e87112e47317d1da5224... commit e03574df2e1e87112e47317d1da522445699a88d Author: Hiroshi Ioka <hirochachacha@gmail.com> Date: Sun Jul 31 19:59:30 2016 +0900 packet-smb2: fix field type of hf_smb2_ea_data_len Change-Id: I85f1ab8777f178dd710564eb0cb15f19383677a7 Reviewed-on: https://code.wireshark.org/review/16798 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=d2cd779d2f0d713d2a7b585561ebd1f... commit d2cd779d2f0d713d2a7b585561ebd1f93a13187d Author: Binh Trinh <beango@gmail.com> Date: Sat Jul 30 00:44:21 2016 -0400 IPv6: Add support for embedded IPv4 addressess (RFC 6052) For Well-Known Prefix 64:ff9b::/96. Change-Id: Ib2d7b42b9c7e6bbe388dca46d6a5eb516242c881 Reviewed-on: https://code.wireshark.org/review/16780 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=63f9ecbdd51c5163d58460d79f2dd85... commit 63f9ecbdd51c5163d58460d79f2dd858960babe8 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sat Jul 30 08:43:23 2016 +0100 Fix indentation Change-Id: I6b0c7cda7130f1912b9a83991b43f234ff9d9cec Reviewed-on: https://code.wireshark.org/review/16797 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=52ff3ae72906fffbfd07b5c0be43ee5... commit 52ff3ae72906fffbfd07b5c0be43ee5f65193b81 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sat Jul 30 17:19:48 2016 +0100 IPv6: Move a declaration Change-Id: I94ace6b1837e1f3398a2784945322cde91d4d232 Reviewed-on: https://code.wireshark.org/review/16796 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=665738d49df059475a95c36837a6a52... commit 665738d49df059475a95c36837a6a52939ca0dc2 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sat Jul 30 17:45:37 2016 +0100 IPv6: Capitalize some field names Change-Id: Ie1d95b521a354df69b4a70b0a8fb209eb97a07fd Reviewed-on: https://code.wireshark.org/review/16795 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=ec66a8cb089a2fa0d9ae699923ab3b9... commit ec66a8cb089a2fa0d9ae699923ab3b98df52b422 Author: Michael Mann <mmann78@netscape.net> Date: Sat Jul 30 19:04:27 2016 -0400 packet-nstrace.c: General cleanup Motivation was to clean up the use of offsetof() as the structure definitions aren't necessary for Wireshark. Change-Id: I6fadce0d4823842270be89bbed6081d37254ff2b Reviewed-on: https://code.wireshark.org/review/16791 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=30dbb85df8ec8a1f2f0788260bafb11... commit 30dbb85df8ec8a1f2f0788260bafb11bc5f3c36f Author: Michael Mann <mmann78@netscape.net> Date: Sat Jul 30 21:39:19 2016 -0400 Properly mask Modbus function code Bug: 12693 Change-Id: Ic0b226d2ba9518f9a1efe85527678daa5302cc3f Reviewed-on: https://code.wireshark.org/review/16792 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=c611eded2272ac79997fb3ce11f2339... commit c611eded2272ac79997fb3ce11f2339dc32b53cb Author: Roland Knall <roland.knall@br-automation.com> Date: Mon Jan 4 18:32:39 2016 +0100 extcap: Use stderr to print error message This patch reads out the stderr messages from an extcap utility and displays it to an user. It was tested on Qt but not on GTK, but should work their as well. On Mac OS/X and Windows the child_watch does not behave as it was intended. Therefore in extcap_cleanup, the callbacks are called manually, if and only if, they have not been called already. The reason why it displays two error messages is, that by the time the first one is being displayed, glib has not returned from the spawned process on Linux yet. So there is no way to add the stderr correctly, and putting a handler to stderr into interface_opts will lead to memory errors, cause then the code tries to access memory outside of its protection. Bug: 11892 Change-Id: I2db60dd480fed3e01428b91a705057e4f088bd15 Reviewed-on: https://code.wireshark.org/review/12954 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=c2ac9c5c0316a27f54830fae0b70cf7... commit c2ac9c5c0316a27f54830fae0b70cf7825c6d99c Author: Guy Harris <guy@alum.mit.edu> Date: Sat Jul 30 13:50:04 2016 -0700 Use correct relative path. The build is done in epan/wmem, so libwsutil.la is in ../../wsutil. Change-Id: I053f6b925829e9c5e9ded014fbc716abc527b46a Reviewed-on: https://code.wireshark.org/review/16790 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=f6322a4977181103431637703f11649... commit f6322a4977181103431637703f11649e5023d6b0 Author: Guy Harris <guy@alum.mit.edu> Date: Sat Jul 30 13:37:03 2016 -0700 ifdef out a variable used only on Windows. Also, fix identation - tab stops are set every 8 spaces, not every 4 spaces, in UN*X, which is why the mode lines specify that. Change-Id: If7cfc2cdae26feb2d5c13e31a32ed950354fb15b Reviewed-on: https://code.wireshark.org/review/16789 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=4c9f7b56639603a3bc6f97ce5d2e945... commit 4c9f7b56639603a3bc6f97ce5d2e9453485ffb28 Author: Uli Heilmeier <uh@heilmeier.eu> Date: Sat Jul 23 22:10:07 2016 +0200 RSVP: Wrong order of Attribute Flags TLV According to RFC 5420 Section 3.1 the MSB is bit zero. Reported by Alexander Okonnikov. Bug: 12652 Change-Id: I9b414464b05ab0724a6560aa441c3f5324130fdb Reviewed-on: https://code.wireshark.org/review/16611 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=765f3b53cfef707272652852639a919... commit 765f3b53cfef707272652852639a9194c81f9c3d Author: Anthony Coddington <anthony.coddington@endace.com> Date: Tue Jun 14 13:27:25 2016 +1200 PTP: Expose ptp_v2 value strings for use by other dissectors Also rename ptp_v2 value strings in packet-ptp for better consistency. TODO: could also be used and combined with definitions in packet-cip. Change-Id: I84a9ae566ae6abdd95910cb5709bb63c2b7c26b8 Reviewed-on: https://code.wireshark.org/review/16781 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=183d7f3b78de30581390244a72c6ab3... commit 183d7f3b78de30581390244a72c6ab328e6338f0 Author: Gerald Combs <gerald@wireshark.org> Date: Thu Apr 7 15:31:21 2016 -0700 Add string function times to wmem_test. The system, GLib, and wmem string functions can perform differently, particularly on Windows. Start adding performance tests to wmem_test so that we can see the differences. With this change applied "wmem_test --verbose" prints out the following on a Windows 7 x64 VM here. wmem_test is linked against GLib 2.4.20. (MINPERF:g_printf_string_upper_bound (via g_snprintf) 1 string: u 327.602 ms s 0 .000 ms) (MINPERF:g_printf_string_upper_bound (via g_snprintf) 5 strings: u 1419.609 ms s 0.000 ms) (MINPERF:g_printf_string_upper_bound (via g_snprintf) mixed args: u 1606.810 ms s 0.000 ms) (MINPERF:_snprintf_s upper bound 1 string: u 124.801 ms s 0.000 ms) (MINPERF:_snprintf_s upper bound 5 strings: u 140.401 ms s 0.000 ms) (MINPERF:_snprintf_s upper bound mixed args: u 124.801 ms s 0.000 ms) (MINPERF:g_strdup_printf 2 strings: u 702.005 ms s 0.156 ms) (MINPERF:g_strconcat 2 strings: u 78.000 ms s 0.000 ms) (MINPERF:g_strdup_printf 5 strings: u 1419.609 ms s 0.156 ms) (MINPERF:g_strconcat 5 strings: u 93.601 ms s 0.156 ms) (MINPERF:wmem_strdup_printf 2 strings: u 343.202 ms s 0.312 ms) (MINPERF:wmem_strconcat 2 strings: u 93.601 ms s 0.468 ms) (MINPERF:wmem_strdup_printf 5 strings: u 327.602 ms s 8.268 ms) (MINPERF:wmem_strconcat 5 strings: u 62.400 ms s 3.432 ms) Change-Id: Id9b23918829db1719d141e7f830b9eba6245a25b Reviewed-on: https://code.wireshark.org/review/14857 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=852a56139e6c0c3ea4b844c6837cb13... commit 852a56139e6c0c3ea4b844c6837cb13db339e1b3 Author: Peter Ross <peter.ross@rmit.edu.au> Date: Sat Jul 30 12:41:57 2016 +1000 packet-simple: also dissect SIMPLE over TCP Change-Id: I9310a6fa0b50e54a9e7febb955cdfdab560c4ba9 Reviewed-on: https://code.wireshark.org/review/16779 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=62ea2370f8c84964249771590357f21... commit 62ea2370f8c84964249771590357f2153044a43a Author: Uli Heilmeier <uh@heilmeier.eu> Date: Sat Jul 30 11:36:15 2016 +0200 README.dissector: Add proto_tree_add_bitmask_with_flags() Extend README with proto_tree_add_bitmask_with_flags() function. Change-Id: Ia984080eda77ab93b063771d625bc45b5b0fc6d2 Reviewed-on: https://code.wireshark.org/review/16785 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=e3d78be0b47537b61fd431e15e7c4ec... commit e3d78be0b47537b61fd431e15e7c4ec2b4b4a5b6 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Fri Jul 29 21:35:03 2016 +0100 Move IPv6 inet definitions to wsutil/inet_ipv6.h Change-Id: I880adf7fc1e131639f318cdecf7d8e59262d89fb Reviewed-on: https://code.wireshark.org/review/16784 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=9e747b9c388df04b49d2794a59285d8... commit 9e747b9c388df04b49d2794a59285d88a583ffc0 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Fri Jul 29 18:29:00 2016 +0100 Add GeoIP database UN*X system path Most distros provide GeoIP database packages that install to /usr/share/GeoIP. Use this as a system default. Change-Id: I2b4ddf7e2467263491b18a97e908a247db0ac9a3 Reviewed-on: https://code.wireshark.org/review/16767 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=fd84add714e8d64c623007adec139f9... commit fd84add714e8d64c623007adec139f98126d33f5 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Fri Jul 29 15:12:01 2016 +0100 IPv6: Add deprecation expert infos Change-Id: I111fd8f74388e9e4b7a9d7fd1b582d2fff86cf59 Reviewed-on: https://code.wireshark.org/review/16764 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=a637026a13c1d45627fd7a48b04e9ca... commit a637026a13c1d45627fd7a48b04e9ca4d1618f21 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sat Jul 30 05:08:45 2016 +0100 IPv6: Add experimental routing header types Change-Id: I22dfa604abd8ade21d240104bf84af815aa2bc24 Reviewed-on: https://code.wireshark.org/review/16783 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=98e8b268e5f5583522a826512cf57c2... commit 98e8b268e5f5583522a826512cf57c2f683cb9ea Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Fri Jul 29 15:11:03 2016 +0200 ieee80211: PMKID is incorrectly decoded under RSN Vendor specific IE in EAPOL packet 1 Issue reported by Padmaja Reddy Bug:12675 Change-Id: I17323a70fdbe6f52c350a875c467c233877f4505 Reviewed-on: https://code.wireshark.org/review/16761 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=3e48148e1e82e2925f46c1ef0a6b70d... commit 3e48148e1e82e2925f46c1ef0a6b70d9f4823c84 Author: Guy Harris <guy@alum.mit.edu> Date: Fri Jul 29 13:21:13 2016 -0700 Upgrade to libtool 2.4.6. As per bug 12689, earlier versions of libtool had a bug wherein they assumed a 1-digit second component of the OS version number, and thought OS X 10.10 was OS X 10.1 and used the wrong linker flags. A build from Git would succeed, but a build from the source tarball wouldn't. Change-Id: I412d1e0b02976f44c573f9ff1b62465f5eeaeb05 Ping-Bug: 12689 Reviewed-on: https://code.wireshark.org/review/16773 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=2df5bf3ec89d672ba927c98062e5aad... commit 2df5bf3ec89d672ba927c98062e5aad3403d09cf Author: Gerald Combs <gerald@wireshark.org> Date: Fri Jul 29 11:01:38 2016 -0700 WiX: Set the "Programs and Features" icon. Use our normal application icon in "Programs and Features". Change-Id: I480fcd16b9de1b58852ee8fb5226062da8ed7419 Reviewed-on: https://code.wireshark.org/review/16768 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=4d4a7a6c848fb48713221c2513da286... commit 4d4a7a6c848fb48713221c2513da286c2de6fe72 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Fri Jul 29 02:38:13 2016 +0100 IPv6: Use some macros to set/allocate addresses Change-Id: I30430841ff6f3b89cb778aed9e109a885b412a01 Reviewed-on: https://code.wireshark.org/review/16766 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=65b9d561cd69839f741e8137934b8a8... commit 65b9d561cd69839f741e8137934b8a8f5a28f6b5 Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Fri Jul 29 21:05:25 2016 +0200 GTPv2: fix test for flags in TWAN Identifier IE (CID 1364616) Change-Id: I7b87624bd60f514f2f5e9aafe19bcebf7799bcd1 Reviewed-on: https://code.wireshark.org/review/16772 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=fe7dd4e76eb9384333fdffc6cb49b63... commit fe7dd4e76eb9384333fdffc6cb49b631e58483c9 Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Fri Jul 29 20:26:19 2016 +0200 GTP: fix dissection of NSAPI Bug: 12686 Change-Id: Icdf1fd0f24a2f667b27bb957fd932bd9c17ef0f4 Reviewed-on: https://code.wireshark.org/review/16769 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=3da56e4771b4d6b74185d44e44b6869... commit 3da56e4771b4d6b74185d44e44b6869864ae2418 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Fri Jul 29 14:54:06 2016 +0100 IPv6: Dissect unknown routing header types as data Change-Id: I1fa840d24d56643515c6fc8d73967307bf1951d6 Reviewed-on: https://code.wireshark.org/review/16762 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=b6d13ef90de224d230300493b38d02b... commit b6d13ef90de224d230300493b38d02b97cf63cde Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Tue Jul 26 00:18:38 2016 +0100 Register IPv6 extension header dissectors to "ip.proto" table We may want to add expert infos for IPv6 extension headers over IPv4 (TODO). Any side-effects that don't make sense (e.g: IPv6 Routing over IPv4) are ignored. The IPv6 Next Header decode as is replaced by IP Proto decode as. It didn't fit a conceptual model well and it also was not working very well in practice (for multiple extension headers). We now support decoding any IP Protocol number as an extension header. Bug: 12673 Change-Id: Icbde019aba8990cc556ef2bd832f64cba76c24b6 Reviewed-on: https://code.wireshark.org/review/16681 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=042b49a24d182e8d5ea1c43569700d6... commit 042b49a24d182e8d5ea1c43569700d6e9ee44ddf Author: Dario Lombardo <lomato@gmail.com> Date: Fri Jul 29 14:07:09 2016 +0200 editcap: fix typos Change-Id: I24c455afc51749a665e452312332d167831f19d2 Reviewed-on: https://code.wireshark.org/review/16760 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=f5dff39232f98db9b9d60bf05a64eab... commit f5dff39232f98db9b9d60bf05a64eab98868aa59 Author: Gerald Combs <gerald@wireshark.org> Date: Wed Jul 27 15:31:06 2016 -0700 Use xz to compress the source tarball. Compress the source tarball using xz instead of bzip2. Other open source projects (including many of our dependencies) have been using xz for a while so hopefully this won't be too much of a shock. Remove the patch-bzip2 Autotools target while we're here. Change-Id: I456d27b6cd56a43aba829bd45938f98568eb7b1d Reviewed-on: https://code.wireshark.org/review/16735 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=e727ecf5e302c9f765d0038b234e677... commit e727ecf5e302c9f765d0038b234e6775fb4ca45b Author: Gerald Combs <gerald@wireshark.org> Date: Mon Jul 25 10:49:30 2016 -0700 Don't discard unknown coloring rules. When processing the colorfilters file, keep and disable unknown coloring rules instead of skipping over and discarding them. This should hopefully keep people from losing the standard "Checksum Errors" rule (and it's less rude in general). Change-Id: I21796c25045d9dbf7612238ce3d27b613f1ec75f Reviewed-on: https://code.wireshark.org/review/16673 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=485bc456c57a16dbe50b76c476e4822... commit 485bc456c57a16dbe50b76c476e48223038bb0e8 Author: Roland Knall <roland.knall@br-automation.com> Date: Tue Dec 29 07:57:36 2015 +0100 extcap: Restore functionality for options Allow stored options to be restored to their default values. This adds a global cleanup method for extcap and globally defined preference values, which fixes the parameter problem with windows Change-Id: I48e0cf846ef81f4732d652c6a2ad0020db5df08e Reviewed-on: https://code.wireshark.org/review/13741 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=191f9bdbc50bd3993259d31dfeeaa95... commit 191f9bdbc50bd3993259d31dfeeaa95187984fed Author: Gerald Combs <gerald@wireshark.org> Date: Thu Jul 28 16:51:36 2016 -0700 Give the WiX installer a full name. Append the platform and version to the WiX installer name similar to our other installers. Change-Id: Idb3e7917dda3a8e831062538d3e7d1b1c8b78d42 Reviewed-on: https://code.wireshark.org/review/16757 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=0b9f2fca533b9330dff9a99c999017c... commit 0b9f2fca533b9330dff9a99c999017c0e6ee8bfa Author: Gerald Combs <gerald@wireshark.org> Date: Thu Jul 28 12:26:19 2016 -0700 Enable airpdcap debugging explicitly. Enable airpdcap debugging with explicitly with AIRPDCAP_DEBUG instead of _DEBUG. _DEBUG might be defined automatically by Visual C++ depending on your build type and the extra output breaks the decryption tests. Change-Id: If6d918beb4d91233b07a3bc7b6f2f7e1849171f0 Reviewed-on: https://code.wireshark.org/review/16755 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=3aedb1e256060e361739c10c9ef919a... commit 3aedb1e256060e361739c10c9ef919a4f4794fe1 Author: Gerald Combs <gerald@wireshark.org> Date: Wed Jul 27 14:48:18 2016 -0700 Add an ESP decryption test. Add an ESP decryption test using the capture+keys from bug 12671. Change-Id: I5f7ce477ec74d59c1043345728a1444842912b96 Ping-Bug: 12671 Reviewed-on: https://code.wireshark.org/review/16733 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=12b859f4538fd84a1f1ae89bc994429... commit 12b859f4538fd84a1f1ae89bc994429ac51611ad Author: Thomas Klausner <tk@giga.or.at> Date: Thu Jul 28 16:31:44 2016 +0200 Fix build on NetBSD. sys/siginfo.h (which is included by this file) defines si_code. Change-Id: I59cfe1ea3ec01345965028db4bba3223752459e3 Reviewed-on: https://code.wireshark.org/review/16750 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=dcb7b71e6155adb37a20c7a6dc3ae8e... commit dcb7b71e6155adb37a20c7a6dc3ae8ea86a910c7 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Thu Jul 28 11:38:45 2016 +0100 IPv6: Fix Decode As to distinguish a null from a hop-by-hop next header. Both display as zero in the UI. We shouldn't have null values for decode as, but we do for IPv6, and the user (also the developer) can't tell them apart from an IPv6 Hop-by-hop Option extension header. NULL values are represented as IP Protocol 255 (Reserved) in the UI, intead of IP Protocol 0 (Hop-By-Hop extension header). Change-Id: I840db99df212a3bee03027b91fdec9c01886004d Reviewed-on: https://code.wireshark.org/review/16746 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=7c2044801e65e5873b7f7a40f4b5f92... commit 7c2044801e65e5873b7f7a40f4b5f92a2e09ef49 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Thu Jul 28 06:12:31 2016 +0100 IPv6: Reduce some expert info PI_PROTOCOL severities Change-Id: I87bcc47eeee05ea22c646f7ecce9374c070b1ea6 Reviewed-on: https://code.wireshark.org/review/16743 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=6ea3dd69aa95239a57e8a1de8521a5d... commit 6ea3dd69aa95239a57e8a1de8521a5d0f1ae4901 Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Thu Jul 28 14:44:11 2016 +0200 CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 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> http://cgit.osmocom.org/wireshark/commit/?id=7ff07618a0f7c030bfd0f00d69687db... commit 7ff07618a0f7c030bfd0f00d69687dbbb8d07499 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Thu Jul 28 12:54:40 2016 +0100 IPv6: Fix an incorrect bitmask Change-Id: I81dfcb4fb4b10a9d951247460783f81f464c50b7 Reviewed-on: https://code.wireshark.org/review/16747 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=19cdb19168212626644c55a2d568971... commit 19cdb19168212626644c55a2d5689716661e765c Author: AndersBroman <anders.broman@ericsson.com> Date: Thu Jul 28 11:13:15 2016 +0200 [BTLE] Add Version 4.2 to ll_version_number_vals Change-Id: I88e988e11e1cae6f2f6f6d190890b62f2beb1e92 Reviewed-on: https://code.wireshark.org/review/16745 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=7a9ab60a6e7808e879c7151330e1840... commit 7a9ab60a6e7808e879c7151330e18405af7fc1b5 Author: Kim Kempf <kim.kempf@apcon.com> Date: Wed Jul 27 19:34:51 2016 -0700 Fixed compile error in packet-ssl-utils.c when HAVE_LIBCRYPT not defined Bug: 12680 Change-Id: I7219e38be48d1115e7e80b41337423be64776e5a Reviewed-on: https://code.wireshark.org/review/16742 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=4d925d3accec1cb3844391f4af5d4b6... commit 4d925d3accec1cb3844391f4af5d4b67caecaa45 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Wed Jul 27 00:04:58 2016 +0100 IPv6: Add expert info for option extension header type mismatch Change-Id: If9c4e609528a1b72e6d5a002292734e21650e1eb Reviewed-on: https://code.wireshark.org/review/16713 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=d8f67efa0ca6c412bed91f7db37ecee... commit d8f67efa0ca6c412bed91f7db37eceed372048e2 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Wed Jul 27 01:51:54 2016 +0100 IPv6: Add support for SMF_DPD option (RFC 6621) Change-Id: I61a1246a3f68aa03e12949e8271dd4cac055b9db Reviewed-on: https://code.wireshark.org/review/16712 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=62eb424d804942592b8ecf8b9212730... commit 62eb424d804942592b8ecf8b9212730e99ce9bae Author: Guy Harris <guy@alum.mit.edu> Date: Wed Jul 27 16:21:46 2016 -0700 Copy over change from Samba repository: commit ed11ce8f12d567a3e0edc1d24aab1784a171ac33 Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Date: Wed May 4 16:51:37 2016 +1200 Python pidl: avoid segfault with "del obj->attr" Deleting an attribute in Python (using the "del" statement) is (at some stages along a winding path, for C objects) converted into setting the attribute to NULL. Not None, actual NULL. The way we handled this NULL was to dereference it. This changes the behaviour to raising an AttributeError, which is more or less what Python does in similar situations with builtin objects. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Shouldn't affect us, but it makes diffing cleaner. Change-Id: I8e681dc79c8f4e62b74e2aa5ac2b4924134735c4 Reviewed-on: https://code.wireshark.org/review/16741 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=f0ed91f79dd0e252296cae608673dcf... commit f0ed91f79dd0e252296cae608673dcf503196d59 Author: Guy Harris <guy@alum.mit.edu> Date: Wed Jul 27 16:19:52 2016 -0700 Copy over change from Samba repository: commit f6c79072ca50e05a68b73a80a0ebd635a9bac068 Author: Andrew Bartlett <abartlet@samba.org> Date: Thu Apr 21 21:44:56 2016 +1200 pidl: Correct string handling to use talloc and be in common The previous string handling assumed the python variables referenced by PyString_AS_STRING had infinite life. When they were re-used the C structure started to point at unexpected things. We now check correctly for Unicode in every case, and we always duplicate the string with talloc_strdup() Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Shouldn't affect us, but it makes diffing cleaner. Change-Id: Ib54b62f5630df46cff6fb0582acd109b263142d2 Reviewed-on: https://code.wireshark.org/review/16740 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=5623b7917ecf67ff4c5772e6e33ff3d... commit 5623b7917ecf67ff4c5772e6e33ff3d9ce248284 Author: Guy Harris <guy@alum.mit.edu> Date: Wed Jul 27 16:17:44 2016 -0700 Copy over change from Samba repository: commit 90bf114f6370ee837d97e36eb25f38f8234dcd39 Author: Andrew Bartlett <abartlet@samba.org> Date: Thu Feb 25 13:57:37 2016 +1300 pidl: Use a tmp_ctx helper variable This is so we free the ndr_push_struct_blob() return value after we make it into a string Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Shouldn't affect us, but it makes diffing cleaner. Change-Id: I52ee911f89813e6f5a90445be4eb52494e3f69d3 Reviewed-on: https://code.wireshark.org/review/16739 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=692f0145f45f93b67be2a2ee4067de8... commit 692f0145f45f93b67be2a2ee4067de84f78cc6f7 Author: Guy Harris <guy@alum.mit.edu> Date: Wed Jul 27 16:15:35 2016 -0700 Copy change from Samba repository: commit dffa2dbfabca14f07af12663fc93c8dc3bc837cf Author: Andrew Bartlett <abartlet@samba.org> Date: Thu Feb 25 13:57:00 2016 +1300 pidl: Use the $mem_ctx helper variable This is already set to pytalloc_get_mem_ctx(py_obj) Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Shouldn't affect us, but it makes diffing cleaner. Change-Id: I60fddc0a1055095ecad51180c9e1fc2223d2c017 Reviewed-on: https://code.wireshark.org/review/16738 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=d47f174f9e518bdb2742e96fb01d045... commit d47f174f9e518bdb2742e96fb01d045764415c7c Author: Guy Harris <guy@alum.mit.edu> Date: Wed Jul 27 16:13:55 2016 -0700 Copy over change from Samba repository: commit 9e07f3a13b41be1f019887581b2a2bd049039a3d Author: Andrew Bartlett <abartlet@samba.org> Date: Tue Feb 16 14:06:28 2016 +1300 pidl: Fix our python reference handling The new talloc.BaseObject allow us to hold a talloc context per python object (there may be many referring to the same C object) and the talloc context that the actual object pointer is under. Another advantage is that talloc.BaseObject(), has less of an ABI surface. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Shouldn't affect us, but it makes diffing cleaner. Change-Id: If4a7d9d3f5eb0acf9f94b10af870a0e01fa52b5c Reviewed-on: https://code.wireshark.org/review/16737 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=bd0280e8d6570b5a1ce785b1518d3d7... commit bd0280e8d6570b5a1ce785b1518d3d7b6b68ec33 Author: Guy Harris <guy@alum.mit.edu> Date: Wed Jul 27 15:53:21 2016 -0700 Pick up changes from the Samba repository: commit 59d530c0b692dae41ea271bfdb473f212615041b Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Date: Tue Mar 1 14:18:52 2016 +1300 ndr: Use ndr_steal to avoid long lists When pulling complex structures like nt-acls, a long list of tokens may be produced. By removing tokens along the way with ndr_token_steal, future calls to retrieve from the token list are not as expensive. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> commit 9af628a488d2b628e6c33917be7030602eeb5fde Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Date: Fri Feb 26 17:01:37 2016 +1300 ndr: avoid unnecessary searches of token list When pulling complex structures like nt-acls, a long list of tokens may be produced. This change means the token list won't be walked in the buffers case if the switch value is not needed. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Change-Id: I0e0ce345e5184e0cd180b0079dd693a7ed3f31ef Reviewed-on: https://code.wireshark.org/review/16736 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=9fa5617b171a3e15d7585370d6f8373... commit 9fa5617b171a3e15d7585370d6f8373d33786dd2 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Wed Jul 27 22:36:23 2016 +0100 Add IPv6 to the randpkt manpage Change-Id: Ie8a46f727861319ec51b8390c53da8a0f36ab9ef Reviewed-on: https://code.wireshark.org/review/16732 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=157c2fc0e13a5b801af1c146eb00049... commit 157c2fc0e13a5b801af1c146eb00049061a6a075 Author: Guy Harris <guy@alum.mit.edu> Date: Wed Jul 27 15:06:23 2016 -0700 Fix from the Samba repository: Author: Aurelien Aptel <aaptel@suse.com> Date: Wed May 18 14:23:56 2016 +0200 pidl/ws: fix failing tests This commit fixes 2 test failures in Pidl test suite. - commit 02cd7808 changed the error the test was expecting => update expected output in the test - commit c76b65e changed whitespaces in the output => revert to the old output in the generator Signed-off-by: Aurelien Aptel <aaptel@suse.com> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: David Disseldorp <ddiss@samba.org> Change-Id: I142d4ae405edfff760c00b95e0475502a1eac2f0 Reviewed-on: https://code.wireshark.org/review/16734 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=93d5df468fc9013debe4a30f6f670ee... commit 93d5df468fc9013debe4a30f6f670eeedc01c911 Author: Guy Harris <guy@alum.mit.edu> Date: Wed Jul 27 14:31:21 2016 -0700 If we don't get any OS information, remove the old OS information. The old information is copied over from one of the input files; if we don't have information about the OS on the machine writing the *output* file, just throw the old information away. (We need a better way to preserve information from the input files; perhaps this: http://www.winpcap.org/pipermail/pcap-ng-format/2016-June/000362.html might work.) Change-Id: Ia25771736d267173f2b6949a91e81e217ee7d16f Reviewed-on: https://code.wireshark.org/review/16730 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=e8f4fea259bbc7e738ba41331177b5c... commit e8f4fea259bbc7e738ba41331177b5cda0fddc7e Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Tue Jul 26 22:21:23 2016 +0100 Make randpkt generate the correct IP version for IPv6 IP version is always 6 and as a consequence of setting the first byte to 0x60 the 4 high-order bits for the traffic class field are set to zero. Otherwise the IPv6 dissector does not look past the first TVB byte, making randpkt useless to exercise the dissector code. Change-Id: I372ab7f71e6c972106f9dd46edec642ca53b9557 Reviewed-on: https://code.wireshark.org/review/16708 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=f66228c9e4bf11a6268c336fcebe06c... commit f66228c9e4bf11a6268c336fcebe06c14b08a830 Author: AndersBroman <anders.broman@ericsson.com> Date: Wed Jul 27 14:48:00 2016 +0200 [BTLE] Add new Link layer Feature flags. Change-Id: Ib646d90c6e44075e7ae67f2022dc633fe6423c20 Reviewed-on: https://code.wireshark.org/review/16724 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=8e60500855a6258388c3041196766a1... commit 8e60500855a6258388c3041196766a10f9051950 Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Wed Jul 27 09:14:43 2016 +0200 IPSec: fix decryption broken in g8cd167a Having no matching in sscanf is a valid use case as the object is already initialized Bug: 12671 Change-Id: Iee7185290ea72968437159c344a376defe464dd4 Reviewed-on: https://code.wireshark.org/review/16711 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> http://cgit.osmocom.org/wireshark/commit/?id=ae0f130582c36978908a965aed32e44... commit ae0f130582c36978908a965aed32e446ba8d40db Author: Peter Wu <peter@lekensteyn.nl> Date: Tue Jul 26 00:14:40 2016 +0200 ssl-utils: ensure that the cipher suite matches decoder When the cipher suite for the current decryption session is changed via a Server Hello, it should not change the cipher suite field of the decoder. Otherwise there is a mismatch between the cipher suite and the capabilities of the decoder. Fix this issue by making the decoder hold a pointer to the (constant) SslCipherSuite structure rather than making a copy (and have the decoder point to that data). I also considered resetting the decoder once the cipher suite changes in the Server Hello, but that breaks renegotiation. Bug: 12665 Change-Id: Ieff38a535cd111d95933ec383378643b6fbab7bf Reviewed-on: https://code.wireshark.org/review/16674 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: Peter Wu <peter@lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=fc6c9e4987dd5aee1e188ecc6ab3860... commit fc6c9e4987dd5aee1e188ecc6ab38600307ef289 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Wed Jul 27 06:14:35 2016 +0100 IPv6: Fix dissection with IPv6 No Next Header Change-Id: I250e1a7ee236ab50b6da1a9b5d846adc9c970e7e Reviewed-on: https://code.wireshark.org/review/16710 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=147cac3af73d76b533819267e5bc155... commit 147cac3af73d76b533819267e5bc1557aee3dad3 Author: William Tu <u9012063@gmail.com> Date: Tue Jul 26 08:16:33 2016 -0700 ERSPAN: support platform specific sub-header. The patch adds support for parsing the 4 types of ERSPAN III platform specific sub-header, if presented. Change-Id: I1719fceb71ed40918e6b16f25a6355d78840f6c6 Signed-off-by: William Tu <u9012063@gmail.com> Reviewed-on: https://code.wireshark.org/review/16702 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=8b0e9c66728f6a39bbe3ada1029e13a... commit 8b0e9c66728f6a39bbe3ada1029e13ad1378013a Author: Michael Mann <mmann78@netscape.net> Date: Thu Jul 21 10:21:25 2016 -0400 Follow up for proto_tree_add_checksum. Fill in the "gaps" so that all dissectors that verify checksums have both a status and expert info field. Also address comments from original proto_tree_add_checksum patch that didn't make it. Ping-Bug: 8859 Change-Id: I2e6640108fd6bb218cb959fe9e4ba98a13e43a2f Reviewed-on: https://code.wireshark.org/review/16590 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=b7f1e99f7f4c75fa4bac1ccba77087f... commit b7f1e99f7f4c75fa4bac1ccba77087fb0e50b8ac Author: AndersBroman <anders.broman@ericsson.com> Date: Tue Jul 26 16:36:58 2016 +0200 [BTLE] Use the correct struct. Change-Id: I5b26e97a6b1a0724f4290084418cdd43661ff8d0 Reviewed-on: https://code.wireshark.org/review/16701 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=18ae0c86726fa3f6742658b6c2edb1c... commit 18ae0c86726fa3f6742658b6c2edb1ca635c4ef8 Author: Gerald Combs <gerald@wireshark.org> Date: Tue Jul 26 16:21:15 2016 -0700 IPv6: Remove an unused function and unused macros. Remove _ipv6_hdr_tcls, IPv6_HDR_VERS, IPv6_HDR_TCLS, and IPv6_HDR_FLOW. Change-Id: Idd18c101db6aa6d523a236e81086ff7ef25e6923 Reviewed-on: https://code.wireshark.org/review/16709 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: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=fed443e7996aae36a3f2dda55ab06e6... commit fed443e7996aae36a3f2dda55ab06e6ebe05e07a Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Tue Jul 26 22:15:25 2016 +0100 randpkt: Add support to generate IPv6 Change-Id: I23e68ef204486f6e3e388172cfa8701a595fcedc Reviewed-on: https://code.wireshark.org/review/16707 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=9a73978ba5bbb78026721500aaf332f... commit 9a73978ba5bbb78026721500aaf332f53e19d0cd Author: Michael Mann <mmann78@netscape.net> Date: Tue Jul 26 09:27:07 2016 -0400 Move airpdcap's print_debug_line() to airpdcap_debug.h It saves a little on file pollution and the g_warning call isn't bothered in the header file. Change-Id: Ia9bdd96d9d93bbba6811769c4e6e1ed9124c2e5a Reviewed-on: https://code.wireshark.org/review/16698 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=407c0d01b6555839b1fbd205f8d7482... commit 407c0d01b6555839b1fbd205f8d748279622b859 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Tue Jul 26 18:52:02 2016 +0100 CLI/GTK: Fix compare_stat checksum to include IPv4 offset again BYTES was not changed to account for the change of ip_len from 16 to 32 bits. Change-Id: I37b472971fe42a05eb612f88bd38c753f5cf0a08 Reviewed-on: https://code.wireshark.org/review/16706 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=a5a7c27d408730806a23c1800587d72... commit a5a7c27d408730806a23c1800587d72297251151 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Mon Jul 25 04:25:05 2016 +0100 IPv6: Add "ipv6_ws" tap providing a ws_ip structure Also remove code dependency on ip6_hdr pointer. It is used solely for the "ipv6" tap now. Change-Id: I07150bfae8bf94bf3c585f20c27b60db78688a7b Reviewed-on: https://code.wireshark.org/review/16655 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=916b26ecfe7351393e6bdac3dd389fa... commit 916b26ecfe7351393e6bdac3dd389faf6e207779 Author: Michael Mann <mmann78@netscape.net> Date: Tue Jul 26 12:06:57 2016 -0400 Cleanup some checkAPI warnings that were missed in previous patches. Some search/replace of printf, g_warning and GTK APIs were changed to use a ws_ prefix Change-Id: I9beb763a975530a4006d1afbcad079a7d8d4ebf9 Reviewed-on: https://code.wireshark.org/review/16704 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=9bfbffa1c8a54053ee73fc3c55330e7... commit 9bfbffa1c8a54053ee73fc3c55330e70c0e79e81 Author: Michael Mann <mmann78@netscape.net> Date: Tue Jul 26 09:54:46 2016 -0400 Use ws_g_warning in wslua. The g_warning calls seem legitimate, so "hide" them from checkAPIs.pl. Change-Id: I6d25b08e22aeeb0244e07836385f2b67d6261546 Reviewed-on: https://code.wireshark.org/review/16703 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=4713ce4476cadb2d4a8869dd2e6f195... commit 4713ce4476cadb2d4a8869dd2e6f19547841aa9a Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Tue Jul 26 13:58:55 2016 +0200 Ensure to have a valid string pointer when writing OS SHB option Change-Id: Ib0b6dcdf1700e88383d30bf43739312fce10e1c7 Reviewed-on: https://code.wireshark.org/review/16696 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> http://cgit.osmocom.org/wireshark/commit/?id=3a3bf8926eaa57bbe3941cbb0fb5d30... commit 3a3bf8926eaa57bbe3941cbb0fb5d30ad92ede11 Author: Dario Lombardo <lomato@gmail.com> Date: Tue Jul 26 11:56:28 2016 +0200 editcap: fix typos Change-Id: Ibdd81d8dbc779a8741a83d1269ccfb5ea156dd5a Reviewed-on: https://code.wireshark.org/review/16691 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=84f4a223d4b833204ea535edcc9297f... commit 84f4a223d4b833204ea535edcc9297fe51aa84ba Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Tue Jul 26 12:07:24 2016 +0200 Update .mailmap Change-Id: Id725f28977282b289a2de26cac2fb92713babe6a Reviewed-on: https://code.wireshark.org/review/16692 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=7b75871bd9faacb948475eae4afbc7e... commit 7b75871bd9faacb948475eae4afbc7e4bd4a4c9a Author: Hiroshi Ioka <hirochachacha@gmail.com> Date: Tue Jul 26 19:38:44 2016 +0900 packet-smb2: fix data type of share_type According to spec, https://msdn.microsoft.com/en-us/library/cc246499.aspx share_type uses 1 byte. But, current implementation allocates 2 bytes for it. Change-Id: Ibf55c49168a417c16bde57aad368a1265040afae Reviewed-on: https://code.wireshark.org/review/16695 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=d860d5a74b91b6d8e67c7735b181d70... commit d860d5a74b91b6d8e67c7735b181d70c25cf4df0 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Tue Jul 26 10:59:30 2016 +0200 BGP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang Change-Id: Iaec85cbe8fbced461a56f55f8813506054356369 Reviewed-on: https://code.wireshark.org/review/16688 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: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=761d555e4f20eaba64f7c064bee693a... commit 761d555e4f20eaba64f7c064bee693a33a74fdcf Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Tue Jul 26 12:08:20 2016 +0200 s1ap: fix indent (use 2 spaces) and modelines info Change-Id: I450f252d22b21438e55285b2af950f6a1c9f6d10 Reviewed-on: https://code.wireshark.org/review/16693 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> http://cgit.osmocom.org/wireshark/commit/?id=4d5cf2179864100d9605e9156fc0f30... commit 4d5cf2179864100d9605e9156fc0f309e8f45efa Author: bartolootrit <bartolootrit@code.wireshark.org> Date: Tue Jul 19 16:38:49 2016 +0000 DNP dissector. Typo in comments Change-Id: Ie77c7bba0e97cca87b443552c8efe9aaed45734d Reviewed-on: https://code.wireshark.org/review/16545 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=03bc58d0727660b92bfe02cde8496f2... commit 03bc58d0727660b92bfe02cde8496f221508869e Author: William Tu <u9012063@gmail.com> Date: Mon Jul 25 17:52:45 2016 -0700 ERSPAN: add link to protocol spec and refactoring. Add link to ERSPAN protocol spec, remove obsolete comments, and remove unnecessary 'if(tree)' check. Change-Id: I1b4950777c84d62301c322afdfc876949db0d4ed Signed-off-by: William Tu <u9012063@gmail.com> Reviewed-on: https://code.wireshark.org/review/16675 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=bcec07895aee4429c9b1e2d2dc14295... commit bcec07895aee4429c9b1e2d2dc142954b5f396ba Author: Marius Paliga <mareko.paliga@gmail.com> Date: Mon Jul 25 09:54:37 2016 +0200 Fix decoding of MS Info Change Reporting Action Bug: 12642 Change-Id: I69b339ff4785a2fe3fb0e2111264616815339c1b Reviewed-on: https://code.wireshark.org/review/16644 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=907d49483d24698013fcdaec15b78a1... commit 907d49483d24698013fcdaec15b78a149751eecb Author: Michael Mann <mmann78@netscape.net> Date: Mon Jul 25 22:58:09 2016 -0400 Fix some of the checkAPIs.pl warnings for g_warning. 1. Create ws_g_warning for legitimate uses of g_warning 2. Use proto_tree_add_debug_text 3. Comment some out Change-Id: Ida044bf40286b955fdd529c4f9907c8e09b3d7c5 Reviewed-on: https://code.wireshark.org/review/16678 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=6fbaf9be34e8745b2781294afdcf282... commit 6fbaf9be34e8745b2781294afdcf2822528a6349 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Thu Jul 21 23:27:05 2016 +0200 GVSP: enforce heuristic (get some false positive with STUN) Change-Id: Ic1da51a71ee4fa60267751d7bb3f46225ad2f084 Reviewed-on: https://code.wireshark.org/review/16573 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> http://cgit.osmocom.org/wireshark/commit/?id=d3ce757de040f32f3cd12eb76b25625... commit d3ce757de040f32f3cd12eb76b256257a1210bcf Author: Matt Texier <matthieu@texier.tv> Date: Fri Jul 22 02:10:54 2016 +0200 MP-BGP dissector: Fix EVPN route type 5 decoding Route type 5 do have optional fields that was not properly decoded (MPLS labels) Bug: 12631 Change-Id: I12d61ef170d4e0f6e6d2c7bf25f149db84c186d7 Reviewed-on: https://code.wireshark.org/review/16576 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=34a0c4db22be468ff4ef673a5976d2b... commit 34a0c4db22be468ff4ef673a5976d2b1099da05c Author: Hiroshi Ioka <hirochachacha@gmail.com> Date: Mon Jul 18 16:59:31 2016 +0900 packet-smb2: add a dissector for STATUS_STOPPED_ON_SYMLINK Bug: 12628 Change-Id: I666416d1a6facdbf8f4fa6230d6b061cad23dc7a Reviewed-on: https://code.wireshark.org/review/16524 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=f587b1b18bf3371b85b5a694c6e1661... commit f587b1b18bf3371b85b5a694c6e16616fcc01d5d Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Mon Jul 25 12:04:25 2016 +0200 SMB2: Always display reserved field Change-Id: I2f4878d7b730d626d75ac5ed57a00acc8ec34990 Reviewed-on: https://code.wireshark.org/review/16658 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=347f071f1b9180563c28b0f3d0627b9... commit 347f071f1b9180563c28b0f3d0627b91eb456c72 Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Mon Jul 25 17:39:10 2016 +0200 WBXML: limit the recursion level Bug: 12663 Change-Id: Ibbab2f20f4eda9f42ea0ea5e88dcf553cce1b55c Reviewed-on: https://code.wireshark.org/review/16670 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: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=2193bea3212d74e2a907152055e27d4... commit 2193bea3212d74e2a907152055e27d409b59485e Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Mon Jul 25 17:08:26 2016 +0200 WAP: check that tvb_get_guintvar does not overflow Bug: 12661 Change-Id: I2ef857d6be6595fd89f3dbb8d41c1c70d550ad93 Reviewed-on: https://code.wireshark.org/review/16665 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=56706427f53cc64793870bf072c2c06... commit 56706427f53cc64793870bf072c2c06248ae88f3 Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Mon Jul 25 11:19:05 2016 +0200 proto.c: add bounds check to proto_tree_add_text(_valist)_internal Bug: 12659 Change-Id: I44cb3ce8e647ae2816d5ffa95435068c435a1e5c Reviewed-on: https://code.wireshark.org/review/16648 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> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=896751e013a63733702ab2c247ea8ff... commit 896751e013a63733702ab2c247ea8ff9db0b0332 Author: Gerald Combs <gerald@wireshark.org> Date: Mon Jul 25 10:15:46 2016 -0700 Use a variable consistently. We test against "field" in ServiceResponseTimeDialog::filterExpression. Make sure we use it within the test as well. Bug: 12627 Change-Id: If11ab9fcdb8394f4366569185808ec1ddfc34dfe Reviewed-on: https://code.wireshark.org/review/16672 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: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=2bec34aedcf2c562db1976c40988726... commit 2bec34aedcf2c562db1976c40988726816a4185a Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Tue Jul 26 00:18:09 2016 +0100 IPv6: Add fragment header size #define Change-Id: I536324da9ec761279cc3d3d5df681a4217d5b5fc Reviewed-on: https://code.wireshark.org/review/16676 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=3ebb2cfe6bfda416ad1ef3c38387959... commit 3ebb2cfe6bfda416ad1ef3c38387959d3c78e6a6 Author: Dario Lombardo <lomato@gmail.com> Date: Mon Jul 25 17:12:30 2016 +0200 editcap: fix typos Change-Id: Ic5eb5daca1ab7463723ee2b299482929f3e8be56 Reviewed-on: https://code.wireshark.org/review/16666 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=e14dde056d373046243677236ad9876... commit e14dde056d373046243677236ad987640dc043be Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Mon Jul 25 16:03:23 2016 +0200 vxlan(.h): fix no newline at end of file [-Wnewline-eof] Change-Id: Ib53a0234eb8b6a24470e1e6beabe26515b6ef421 Reviewed-on: https://code.wireshark.org/review/16664 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> http://cgit.osmocom.org/wireshark/commit/?id=187469e430af0f329fbbb0c0e0780bb... commit 187469e430af0f329fbbb0c0e0780bb78b947592 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Mon Jul 25 12:27:43 2016 +0200 SMB2: (Re)indent hf_register_info hf (use tab) Change-Id: I872baa7bf44cc6c675366206e749c50001cee067 Reviewed-on: https://code.wireshark.org/review/16659 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=e2f36efbdd7cc79f0714e0b8ea7f0f3... commit e2f36efbdd7cc79f0714e0b8ea7f0f3f2d1cd779 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Mon Jul 25 11:51:38 2016 +0200 vsock: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang Change-Id: I266b0542597eec755b7998d9d5abbae8e804b192 Reviewed-on: https://code.wireshark.org/review/16651 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=5a469ddc893f7c1912d0e15cc73bd30... commit 5a469ddc893f7c1912d0e15cc73bd3011e6cc2fb Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Mon Jul 25 13:32:45 2016 +0200 LDSS: check if a conversation already exists before recreating it Bug: 12662 Change-Id: I81d91d54544e5865336dc08ffda9fe109fc643ed Reviewed-on: https://code.wireshark.org/review/16660 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: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=3c93b67dade357ae036bce9eb2df7fb... commit 3c93b67dade357ae036bce9eb2df7fb2382bf8f3 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Mon Jul 25 11:26:08 2016 +0200 SHIM6: rename p variable by offset Change-Id: I3f7e3291e119eb51c85381d1141bd79b2d61ec18 Reviewed-on: https://code.wireshark.org/review/16649 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> http://cgit.osmocom.org/wireshark/commit/?id=10bcfa58f8c1d4f5f10077e0b8dbb34... commit 10bcfa58f8c1d4f5f10077e0b8dbb3410ba7d936 Author: AndersBroman <anders.broman@ericsson.com> Date: Mon Jul 25 11:34:22 2016 +0200 [S1AP] Add dissection of the content of UERadioCapabilityForPaging. Change-Id: I7f6686a9324fdd364653404ed4b3315d6ca36716 Reviewed-on: https://code.wireshark.org/review/16650 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=b814ae2057daade0e5638aae75e2ace... commit b814ae2057daade0e5638aae75e2aceb63b3c1cc Author: AndersBroman <anders.broman@ericsson.com> Date: Fri Jul 22 14:35:56 2016 +0200 [GTPv2] Dissect TWAN Identifier and other minor updates. Bug:12638 Change-Id: I13446727a46b4df4fe3e667723aa43d83efe1159 Reviewed-on: https://code.wireshark.org/review/16585 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=095a3c8954b3ebe9acddcd0fb622ee6... commit 095a3c8954b3ebe9acddcd0fb622ee69f4890758 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Mon Jul 25 04:55:06 2016 +0100 IPv6: Use wmem_packet_scope for ws_ip address allocation Change-Id: I7e386fe0f8cb3a19a91a16c1152ce500367c13fd Reviewed-on: https://code.wireshark.org/review/16654 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=00e74ac6e5a0d07093aa3b39514eb5a... commit 00e74ac6e5a0d07093aa3b39514eb5a048331d5e Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Mon Jul 25 04:21:21 2016 +0100 IPv6: Use pinfo->pool scope for ipv6_pinfo Change-Id: I415103eaba23b1a616667cf7c72af3b391a9e5ab Reviewed-on: https://code.wireshark.org/review/16653 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=80f7d9c2c0a9abf6412067be16d1cce... commit 80f7d9c2c0a9abf6412067be16d1ccebc4ba65f9 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Mon Jul 25 04:07:31 2016 +0100 IPv6: Say "unknown" for unknown ip protocol column info Change-Id: I99424f9382dd602d3f29251cdbf7d32666409d90 Reviewed-on: https://code.wireshark.org/review/16652 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=77915051685fee048571031769bbed0... commit 77915051685fee048571031769bbed05531fd852 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sun Jul 24 19:11:01 2016 +0100 IPv6: Use ipv6_pinfo_t instead of ws_ip to keep some state To perform IPv6 defragmentation we need to compute the IPv6 fragment header payload length by subtracting the length of intermediate extension headers from the IPv6 payload length. Add a new frag_plen field to ipv6_pinfo_t to do that instead of (ab)using struct ws_ip. Note: The RFC 2460 rules for fragment header order are stricter than the code suggests but that shouldn't be a problem here. Change-Id: I76f3cb3a1a29d96b080d3d53c0f493f9d0b2786c Reviewed-on: https://code.wireshark.org/review/16637 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=6cf9616df68a4db7e436bb77392586f... commit 6cf9616df68a4db7e436bb77392586ff9ad84feb Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Mon Jul 25 09:37:25 2016 +0200 RLC: fix a variable overflow in rlc_decode_li function Bug: 12660 Change-Id: I20a423eb9aa72383ac28d176bc60751ed36be9bd Reviewed-on: https://code.wireshark.org/review/16639 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> http://cgit.osmocom.org/wireshark/commit/?id=47a5fa850b388fcf4ea762073806f01... commit 47a5fa850b388fcf4ea762073806f01b459820fe Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Mon Jul 25 09:54:06 2016 +0200 RLC: fix a stack overflow in rlc_decode_li function The test to check whether the array was full or not was off by 1 Bug: 12664 Change-Id: If2057b71d92c7f03e05b0f4676abc62d5a03ae73 Reviewed-on: https://code.wireshark.org/review/16640 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=55069dad4a1f0c61e5f9c349389cecf... commit 55069dad4a1f0c61e5f9c349389cecff0130cf32 Author: Gerard Garcia <ggarcia@deic.uab.cat> Date: Sun Jul 24 21:33:41 2016 -0400 Add vSocket dissector Header definition: https://github.com/GerardGarcia/linux/blob/vsockmon/include/uapi/linux/vsock... Bug: 12623 Change-Id: I9af4b5069f69b847779a8b25abb3939e672dc9c3 Reviewed-on: https://code.wireshark.org/review/16308 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=1da1f945e2988080add4923dc202175... commit 1da1f945e2988080add4923dc2021753e3b2f7c1 Author: Michael Mann <mmann78@netscape.net> Date: Sun Jul 24 08:53:39 2016 -0400 Fix checkAPI.pl warnings about printf Many of the complaints from checkAPI.pl for use of printf are when its embedded in an #ifdef and checkAPI isn't smart enough to figure that out. The other (non-ifdef) use is dumping internal structures (which is a type of debug functionality) Add a "ws_debug_printf" macro for printf to pacify the warnings. Change-Id: I63610e1adbbaf2feffb4ec9d4f817247d833f7fd Reviewed-on: https://code.wireshark.org/review/16623 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=ee7f9c33f63532bc69899a075017775... commit ee7f9c33f63532bc69899a0750177756be53c0c1 Author: Michael Mann <mmann78@netscape.net> Date: Sun Jul 24 14:16:19 2016 -0400 Pacify GTK checkAPIs.pl warnings. Add "Wireshark" macros to old-gtk-compat.h for GTK APIs that have been deprecated. The macros are setup by version number to limit their proliferation (not that I suspect much development will really be done there since GTK is deprecated). Just want to make buildbots happy for the time being. Change-Id: I095f850065166a0bc2e2456fb2e886ab64fdd97d Reviewed-on: https://code.wireshark.org/review/16635 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=688d055acd523e645c1e87267dcf4a0... commit 688d055acd523e645c1e87267dcf4a0a9867adbd Author: Martin Kaiser <wireshark@kaiser.cx> Date: Sun Jul 24 18:43:14 2016 +0200 zvt: use a hash table for the bitmaps table entries contain the length (if known and constant) and a function to dissect the payload this should clean up the code for bitmap dissection and make it easier to add new entries Change-Id: Id0ef5ff9e53c82171789c8a3352e56d3997d82b9 Reviewed-on: https://code.wireshark.org/review/16632 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> http://cgit.osmocom.org/wireshark/commit/?id=363617ffed882d8f8bcf812e1afc114... commit 363617ffed882d8f8bcf812e1afc114c96a63d08 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sun Jul 24 19:10:56 2016 +0100 Use 'nxt' argument in ipv6_dissect_next() Change-Id: I7190aa5301ba54be4c179dc7815c4be82987c949 Reviewed-on: https://code.wireshark.org/review/16636 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=3e6df076c60469ef42b289615590a79... commit 3e6df076c60469ef42b289615590a790538b29b9 Author: Martin Kaiser <wireshark@kaiser.cx> Date: Sun Jul 24 19:23:48 2016 +0200 zvt: rename dissect_zvt_bitmap_apdu() to dissect_zvt_bitmap_seq() the sequence of bitmaps can either be the complete APDU payload or a part of it Change-Id: I3e3d176f29a5c2a0ad2c7fb61102c46255f436da Reviewed-on: https://code.wireshark.org/review/16631 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> http://cgit.osmocom.org/wireshark/commit/?id=20f3a9a632d49c2c1302a435b8db1a2... commit 20f3a9a632d49c2c1302a435b8db1a2e8051449b Author: Martin Kaiser <wireshark@kaiser.cx> Date: Sun Jul 24 18:24:08 2016 +0200 zvt: rename bitmap to bmp It looks like the specs call the first byte BMP and the whole record (BMP + content) is called the bitmap. Change-Id: I60ce75b131b3cddc59f614b8ca156ceacc890cf8 Reviewed-on: https://code.wireshark.org/review/16630 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> http://cgit.osmocom.org/wireshark/commit/?id=d508a9bf4c268f817c9a52b9edc6455... commit d508a9bf4c268f817c9a52b9edc6455cbead35ee Author: Harald Welte <laforge@gnumonks.org> Date: Sat Jul 16 20:36:11 2016 +0200 Add Ericsson A-bis P-GSL dissector Ericsson uses a vendor-specific packetized PCU-CCU interface on their packetized A-bis, which can be encapsulated in their own variant of HDLC on top of L2TP. The new P-GSL dissector is called from packet-ehdlc.c, which in turn integrates with packet-l2tp.c. Change-Id: Ifca190577b1c9691209221d79e3ef034dc3ca650 Reviewed-on: https://code.wireshark.org/review/16510 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=c2ada3dd79374b14da21f67e924fff8... commit c2ada3dd79374b14da21f67e924fff89d3526f15 Author: Michael Mann <mmann78@netscape.net> Date: Sun Jul 24 10:04:52 2016 -0400 Replace strlen with NULL checks to pacify checkAPIs.pl Change-Id: I5db39cbd531c228da73447bf8899599f82e1889d Reviewed-on: https://code.wireshark.org/review/16624 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=8505fb08c1f835fd959872b321de12c... commit 8505fb08c1f835fd959872b321de12c13b182583 Author: Michael Mann <mmann78@netscape.net> Date: Sun Jul 24 10:14:48 2016 -0400 Fix shadow variable warnings. Change-Id: I1e6bd722b3f04f171b462fc680ca080bb7ec03c7 Reviewed-on: https://code.wireshark.org/review/16625 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=a06042d614eea9418bb625fbe38d89e... commit a06042d614eea9418bb625fbe38d89e45defced9 Author: Gerald Combs <gerald@wireshark.org> Date: Sun Jul 24 08:07:54 2016 -0700 [Automatic update for 2016-07-24] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9a88b1d2ac3fd54cd2b7bfbb652ba504db81df65 Reviewed-on: https://code.wireshark.org/review/16626 Reviewed-by: Gerald Combs <gerald@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=e878525f5ff8ab93794a17ba968c75c... commit e878525f5ff8ab93794a17ba968c75c6676b4ad6 Author: Harald Welte <laforge@gnumonks.org> Date: Sat Jul 16 18:34:34 2016 +0200 Add basic dissector for Ericsson Packet A-bis TFP Protocol This dissector currently onl dissects the TFP header, treating the payload (TRAU) as opaque data. Still, it is an improvement to see the header information like timeslot, sequence number, delay and frame type. The new TFP dissector is called from packet-ehdlc.c, which in turn is used inside Ericsson-specific L2TP. Change-Id: I8835c07e259ec9a324ec92aac39abbef2c902af3 Reviewed-on: https://code.wireshark.org/review/16509 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=051f5cb18a28980e3a3ca24d059af52... commit 051f5cb18a28980e3a3ca24d059af52a709cef12 Author: Harald Welte <laforge@gnumonks.org> Date: Mon Jul 18 16:09:56 2016 +0200 L2TP: Add some more Ericsson-specific AVPs Change-Id: I3d0eb7f9b5641c388493c7188c128bfb14dfbf60 Reviewed-on: https://code.wireshark.org/review/16622 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=fff601949ff9c618bd4b8f7f5858204... commit fff601949ff9c618bd4b8f7f5858204ce4868008 Author: Guy Harris <guy@alum.mit.edu> Date: Sun Jul 24 01:47:15 2016 -0700 Fix indentation (no tabs). Change-Id: Ic45c0aa526e90bd51c0c501cdd349255ce0b43f5 Reviewed-on: https://code.wireshark.org/review/16621 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=2101af4b6776a3ede5c231b63a78011... commit 2101af4b6776a3ede5c231b63a78011f284dcea8 Author: Guy Harris <guy@alum.mit.edu> Date: Sun Jul 24 01:44:58 2016 -0700 More null "IP information" pointer checks. Bug: 12645 Change-Id: I356b6570f9a33fd495523a5e1fa6ada56047dc45 Reviewed-on: https://code.wireshark.org/review/16620 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=2a3612f8e17c53ba71cf5fb9978a3a6... commit 2a3612f8e17c53ba71cf5fb9978a3a6e939f60d6 Author: Guy Harris <guy@alum.mit.edu> Date: Sun Jul 24 01:32:34 2016 -0700 Don't even *mention* the TTL/hop limit if we don't have it. That's cleaner than reporting it as 0. Change-Id: I862130c98131ba83f9689201d852e2f1aab34770 Reviewed-on: https://code.wireshark.org/review/16619 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=284aed2c66c63185da6af1a6636fb52... commit 284aed2c66c63185da6af1a6636fb526e047d9ed Author: Guy Harris <guy@alum.mit.edu> Date: Sun Jul 24 01:21:26 2016 -0700 More null "IP information" pointer checks. Bug: 12645 Change-Id: Iac662bec3c23b0b3d228766ad7a094f615770072 Reviewed-on: https://code.wireshark.org/review/16618 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=00961a0df29a4e3b5f0541d48e5888f... commit 00961a0df29a4e3b5f0541d48e5888fb13828e7b Author: Guy Harris <guy@alum.mit.edu> Date: Sun Jul 24 01:05:23 2016 -0700 Pass the next protocol value to ip_try_dissect() as an argument. That way, we don't rely on the ws_ip pointer being non-null. Based on changes from Ib73410fd8575ad6c836311bbda87a0580e5640ac. Change-Id: If8c437572c725481ac4148c8095a1a479b4fb0f8 Reviewed-on: https://code.wireshark.org/review/16617 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=523e8c3cc549beacf99f5dbfb7e52c5... commit 523e8c3cc549beacf99f5dbfb7e52c5e34ee85e2 Author: Guy Harris <guy@alum.mit.edu> Date: Sun Jul 24 00:59:06 2016 -0700 Pass the next header value to ipv6_dissect_next() as an argument. That way, we don't rely on the ws_ip pointer being non-null. Based on changes from Ib73410fd8575ad6c836311bbda87a0580e5640ac. Bug: 12645 Change-Id: I8c74ba57637b6a125593c4711d7c21b9693c2c85 Reviewed-on: https://code.wireshark.org/review/16616 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=d109a8d62c39aa5caa29d9a2d021d81... commit d109a8d62c39aa5caa29d9a2d021d813e82a7a12 Author: Guy Harris <guy@alum.mit.edu> Date: Sun Jul 24 00:48:41 2016 -0700 More null pointer checks. Taken from Ib73410fd8575ad6c836311bbda87a0580e5640ac. Bug: 12645 Change-Id: Ie08c113b6193da40ce0e438faefd78ad36b4d475 Reviewed-on: https://code.wireshark.org/review/16615 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=696011f522f6ced8aa6532bd069626a... commit 696011f522f6ced8aa6532bd069626a636cdaa33 Author: Guy Harris <guy@alum.mit.edu> Date: Sun Jul 24 00:26:45 2016 -0700 Don't assume we've been passed a non-null data pointer. There is no guarantee of that. Bug: 12645 Change-Id: Icb3310e5df37acfd113a9e2b1fee34e59ef28962 Reviewed-on: https://code.wireshark.org/review/16614 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=f930da87a738171f10af56a4acd7979... commit f930da87a738171f10af56a4acd7979c1469211a Author: Guy Harris <guy@alum.mit.edu> Date: Sat Jul 23 19:16:36 2016 -0700 Enable "Save As..." iff cf_can_save_as() returns TRUE. Currently, cf_can_save() really means "*there's something to save* and we can write it out"; "Save As..." should be enabled even if there are no changes to save, in case the user just wants to write the existing file contents out to a new file and have the new file be the current file. That matches the behavior of the GTK+ version. (We might want to enable "Save" even if there are no changes to save; some other programs do that, such as the TextEdit, WordPad, KWrite, and gedit simple text editors. If so, however, we should make "Save" write stuff out even if there are no changes to save. Note, however, that we're a bit different from most "editors", in that we don't read the entire file into memory - we keep the file open and read packet data from it, because we want to be able to read files that won't fit into memory. That *might* change what we ultimately want to do with "Save".) Bug: 12630 Change-Id: I8a2327b5d6ddab7c4f0367f132460b507da38577 Reviewed-on: https://code.wireshark.org/review/16612 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=5488581d183cf245a9ffdeb30732f15... commit 5488581d183cf245a9ffdeb30732f155d9db8b99 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sat Jul 23 02:28:51 2016 +0100 Replace an #ifdef with g_path_is_absolute() Change-Id: I0df8ea363502bb5e313192b6a10f6df032031699 Reviewed-on: https://code.wireshark.org/review/16601 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=0590a4f6d82c9eb54621aba50638ecb... commit 0590a4f6d82c9eb54621aba50638ecbef78dccee Author: Harald Welte <laforge@gnumonks.org> Date: Sat Jul 16 18:33:55 2016 +0200 packet-ehdlc: Update with results from better understanding the protocol The Ericsson HDLC format inside L2TP is not publicly documented, so when I originally wrote the code, I was basically just looking at hex-dumps of protocol traces and trying to ge an initial understanding. By now, that understanding has significantly matured, so let's update the dissector accordingly. The major changes are regarding the understanding that there is not a message type, but in fact a compressed SAPI and compressed TEI field. Based on this, we can discriminate on whether there will be a HDLC/LAPD header to follow, or whether there's actual user data (TRAU frame replacement) following. Change-Id: Ic29d2d295678c4dc5f93cd8404b2e832f4532daf Reviewed-on: https://code.wireshark.org/review/16508 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=baf8f9c7d00a24632f1cac54b9e749e... commit baf8f9c7d00a24632f1cac54b9e749e0a964dc0f Author: Sean O. Stalley <sean.stalley@intel.com> Date: Fri Jul 22 13:30:52 2016 -0700 Add support for USB3-specific Hub Class Feature Selectors Add Hub Class Feature Selectors (defined in USB3.1 spec, table 10-9) to USBHUB dissector. Change-Id: I53f73b5d689b8921907514e0fcd74a152abc2b49 Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> Reviewed-on: https://code.wireshark.org/review/16593 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=c07bf81082f22e102c4aed00d7ecfdf... commit c07bf81082f22e102c4aed00d7ecfdffd1eeb8ed Author: Michael Mann <mmann78@netscape.net> Date: Sat Jul 23 14:03:32 2016 -0400 packet-socketcan.c - Add subdissector name to layer list. This allows GTK Decode As to function properly if CAN subdissector has a dissector table. Change-Id: I5eb3642c34642302939d27e844fe93f626ba039c Reviewed-on: https://code.wireshark.org/review/16606 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=a02e90da41a92baf909865e2361fb67... commit a02e90da41a92baf909865e2361fb6701d0a8432 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sat Jul 23 03:52:10 2016 +0100 filesystem.c: Don't constify mallocated pointer Change-Id: I8991682bda256c5e1c09a303b0243e240b276101 Reviewed-on: https://code.wireshark.org/review/16602 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=c9329ff0ec9c6ade928100564e7c04f... commit c9329ff0ec9c6ade928100564e7c04f1e11125df Author: Guy Harris <guy@alum.mit.edu> Date: Sat Jul 23 01:56:12 2016 -0700 Suggest using a task dialog, so we can label the buttons. Change-Id: I2827ab8b5d4a9c17e6c178d9397fcf897a356c9f Reviewed-on: https://code.wireshark.org/review/16603 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=0aaff397fbd1ac860fbb54873b09adf... commit 0aaff397fbd1ac860fbb54873b09adf7616ee3b5 Author: dsrsupport <eugene.exarevsky@dsr-company.com> Date: Thu Jul 21 17:35:24 2016 +0300 ZigBee: implement dissector for Parent_Annce_rsp; minor fixes Implement dissector for User Descriptor Response. Fix Number OfChild foield or Parent_Annce. Fix name of User Descriptor Response cluster. Change-Id: Ia48277a76bc7742021a407a45ca18e2c51a35046 Reviewed-on: https://code.wireshark.org/review/16570 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=ba0b0b1bc9818611a255b95cd0f1123... commit ba0b0b1bc9818611a255b95cd0f1123155cef9d3 Author: Jeff Morriss <jeff.morriss.ws@gmail.com> Date: Sun Jul 17 22:42:32 2016 -0400 Qt follow stream: don't clear the text widget when doing Save-As. ... Otherwise the user will see an empty stream after the Save-As operation. Change-Id: Ibafcb4e4b670807702a8d8a5756544471f2eccc3 Reviewed-on: https://code.wireshark.org/review/16521 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: 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=904d9fc2c3d919b0acc308228bf8fb9... commit 904d9fc2c3d919b0acc308228bf8fb9388f89f26 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Tue Jul 19 22:06:31 2016 +0100 Update struct ws_ip with flow label and comments Change field ip_v_hl to version. Change-Id: Ic7ce8d6d083f6413284a7b9ba91a2387b11b29fb Reviewed-on: https://code.wireshark.org/review/16555 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=c11cdd6493ef7e852fab7d32a9cb87e... commit c11cdd6493ef7e852fab7d32a9cb87ec2955c2c2 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sat Jul 23 01:10:33 2016 +0100 Use wmem_new0() to allocate struct ws_ip Change-Id: I0e76ffc2dc0c3e3d7bd081ff433c95741b9aa906 Reviewed-on: https://code.wireshark.org/review/16598 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=ea055d558f726748a92fd02d6a13b1f... commit ea055d558f726748a92fd02d6a13b1fc66aa5c6d Author: Michael Mann <mmann78@netscape.net> Date: Fri Jul 22 19:30:34 2016 -0400 packet-diameter_3gpp.c: Convert many fields to use proto_tree_add_bitmask_with_flags Change-Id: I1936ec4ca6003d3268674079b79da0b009a62f10 Reviewed-on: https://code.wireshark.org/review/16597 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=752b5de27cfb17d62d856311879c09e... commit 752b5de27cfb17d62d856311879c09e7bda2d448 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Fri Jul 22 23:24:13 2016 +0100 IPv6: Another get_jumbo_plen cleanup Change-Id: I81e618cd889aa1425e03b7dcb6e0af3d995b1d54 Reviewed-on: https://code.wireshark.org/review/16595 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=4a6089795aa3dfcfa9cc2839190b05a... commit 4a6089795aa3dfcfa9cc2839190b05a10642c63e Author: Roland Knall <roland.knall@br-automation.com> Date: Fri Jul 22 13:31:07 2016 +0200 sshdump: Change ws_close to closesocket ws_close just calls _close(); that doesn't close sockets. closesocket() is the API to close a socket on Windows, and is defined as close() on UN*X, so using closesocket() will close sockets on Windows and UN*X. This way, we close the pipe socket correctly on Windows. Change-Id: I6d50e26bfabac5618c74a180cbe94d444b591bd4 Reviewed-on: https://code.wireshark.org/review/16582 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=cf4fc7baf95565a4725647704190b54... commit cf4fc7baf95565a4725647704190b5455bb65f43 Author: Gerald Combs <gerald@wireshark.org> Date: Fri Jul 22 10:15:07 2016 -0700 Use ws_printf routines everywhere in column-utils.c. Change-Id: I8764b67b5ab320323c96fe21e5ebaa03815905fd Reviewed-on: https://code.wireshark.org/review/16591 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=0482b0b0b1ca227619fe487e15d5214... commit 0482b0b0b1ca227619fe487e15d5214b9362c92e Author: Gerald Combs <gerald@wireshark.org> Date: Fri Jul 22 10:01:03 2016 -0700 Qt: Don't force a repaint in update_progress_dlg. Remove a call to update() in order to force a repaint for large capture files. Doing so incurs a small-but-nonzero delay on Windows and it should no longer be needed since we switched to timer-based updates in gb5a585c. Change-Id: I01ff2eed165d15dd1d3218550baa664f43dd442a Reviewed-on: https://code.wireshark.org/review/16589 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=24aa839f027f8529f174f9e29ec725f... commit 24aa839f027f8529f174f9e29ec725f83a04e648 Author: Guy Harris <guy@alum.mit.edu> Date: Fri Jul 22 12:13:06 2016 -0700 Get rid of all references to new_create_dissector_handle(). It went away a long time ago; use create_dissector_handle(). Change-Id: I28e90821033621bc7a5572243ff5871b4e67d60d Reviewed-on: https://code.wireshark.org/review/16592 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=ba607a15277f6a9475ba19d0cb60f00... commit ba607a15277f6a9475ba19d0cb60f003b3a40019 Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Fri Jul 22 13:48:58 2016 +0200 MPTCP: fix offset used for AddrID field in MP_JOIN and MP_PRIO messages Bug: 12641 Change-Id: I7ba5cbf795eef3e77a7161b8dc8752d9c10610f8 Reviewed-on: https://code.wireshark.org/review/16583 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=52ed7d3b5c25ca5337990f5f1311da9... commit 52ed7d3b5c25ca5337990f5f1311da975784353d Author: Marius Paliga <mareko.paliga@gmail.com> Date: Fri Jul 22 13:26:12 2016 +0200 Add support for new AVPs defined in 29.273 Bug: 12643 Change-Id: Ic9c26dc864b2b016ba722620098caf44a800f0f4 Reviewed-on: https://code.wireshark.org/review/16581 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=12dd01225a0a63ff626b4aa2a2374ed... commit 12dd01225a0a63ff626b4aa2a2374edda7edebdf Author: Marius Paliga <mareko.paliga@gmail.com> Date: Fri Jul 22 09:34:35 2016 +0200 Added decoding of MS Info Change Reporting Action IE Bug: 12642 Change-Id: I845687763a261566036c7d38c310656d38b06fa5 Reviewed-on: https://code.wireshark.org/review/16579 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=2c38a05d0154697ac5438eadf98750a... commit 2c38a05d0154697ac5438eadf98750a600e68cbb Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Thu Jul 21 00:37:15 2016 +0100 Qt: Add hovered byte lock on left-click Allows marking/unmarking a single byte in the bytes view pane. Ping-Bug: 11547 Change-Id: I574ad7c6218eb08018094ea92ba79b69dbe4b45d Reviewed-on: https://code.wireshark.org/review/16563 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=0903568bf3a784da935507851a3088a... commit 0903568bf3a784da935507851a3088a8b17ef91c Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sun Jul 17 05:02:29 2016 +0100 Decouple extension headers from the IPv6 dissector loop Register MIPv6 too in "ipv6.nxt". Fixes bug 10705. Bug: 10705 Change-Id: I297d8983d65ee7585e1201a81d10396001e0d167 Reviewed-on: https://code.wireshark.org/review/16561 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=7844a118cf1cb99fc170f3654e96108... commit 7844a118cf1cb99fc170f3654e96108d2cd49150 Author: AndersBroman <anders.broman@ericsson.com> Date: Thu Jul 21 09:55:03 2016 +0200 Add Nordic semiconductors dissector to read files produced by their BTLE sniffer. Code downloaded from https://www.nordicsemi.com/eng/Products/Bluetooth-low-energy/nRF-Sniffer and cleaned up and modified to comple with current Wireshark version. Bug 12637 Change-Id: Ic73122f35039b4245d6219b825a28c10f22f36ad Reviewed-on: https://code.wireshark.org/review/16569 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=53de2c23783788d92dc17d3dccfdc8b... commit 53de2c23783788d92dc17d3dccfdc8b65ab0bf74 Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Wed Jul 20 23:54:35 2016 +0200 Convert more glib memory to wmem pinfo pool Change-Id: I4cc23bc19a6bd8c6a8e0389eaf939dbb60fe0ca3 Reviewed-on: https://code.wireshark.org/review/16562 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: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=b2e4a7e21ce7ee8fee857ee71d51ad1... commit b2e4a7e21ce7ee8fee857ee71d51ad1ec13feb2e Author: Gerald Combs <gerald@wireshark.org> Date: Thu Jul 21 17:34:56 2016 -0700 Minimize allocations for frame tvbuffs and Buffers. Try to minimize the number of times we allocate memory for Buffers and Buffer data. Change-Id: I738fdc64e571772ef4ba6335d49087277dd7b430 Reviewed-on: https://code.wireshark.org/review/16577 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: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=e3a15cfbb24b79c0225d391dc44362a... commit e3a15cfbb24b79c0225d391dc44362ac9cdcb077 Author: William Tu <u9012063@gmail.com> Date: Wed Jul 20 21:38:47 2016 -0700 Fix ERSPAN type II and type III offset. For ERSPAN type II (version == 1), the offset is shifted by 4 at the end. As a result, the 'offset+=2' at the end of ERSPAN type III should be in its own 'else' scope. Change-Id: I64a55d5722e3f4f5672ca2a4228583b3b51559e1 Reviewed-on: https://code.wireshark.org/review/16568 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=3dbc84414ef3bd04c11a18f5f9ae0b8... commit 3dbc84414ef3bd04c11a18f5f9ae0b8e3c1b2909 Author: Gerald Combs <gerald@wireshark.org> Date: Thu Jul 21 15:53:54 2016 -0700 2.1.2 → 2.3.0. Change-Id: I133af2d3d05ae77c1030cf35812bb1f969f6a68b Reviewed-on: https://code.wireshark.org/review/16575 Reviewed-by: Gerald Combs <gerald@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=913e0f408c48f3baf6933807f9cfe41... commit 913e0f408c48f3baf6933807f9cfe4195fde5c75 Author: Gerald Combs <gerald@wireshark.org> Date: Fri Jul 15 13:59:23 2016 -0700 Use Windows CRT string functions in some places. Copy wsutil/wsprintf.h from change 16537. Update it to use functions appropriate to Visual C++ >= 2015, < 2015, and everything else. Add notes about specific API issues. Update epan/expert.c to use ws_snprintf, since the VS profiler shows it as a minor hot spot. This reduces load time for a large-ish capture from ~14s to ~12s here. Migrate a previous column-utils change. Change-Id: Id4064b7c06c35fd447b63c73f731afee181df4f9 Reviewed-on: https://code.wireshark.org/review/16483 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: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=97d194cd3cb7fa3806a7bb83f83f06e... commit 97d194cd3cb7fa3806a7bb83f83f06ee2eda418b Author: Gerald Combs <gerald@wireshark.org> Date: Thu Jul 21 10:27:45 2016 -0700 Qt: Set the LabelStack CSS only when it changes. We call fillLabel repeatedly while loading a capture. Try to avoid applying a style sheet when we do since it can affect performance. Change-Id: I9ee188cb79f7cad340ba35b12011b82004ed8262 Reviewed-on: https://code.wireshark.org/review/16571 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=ad6fc87d64de30cdcdca18168a117d2... commit ad6fc87d64de30cdcdca18168a117d2ec24591da Author: Michael Mann <mmann78@netscape.net> Date: Sun Jul 10 23:47:28 2016 -0400 Add proto_tree_add_checksum. This is an attempt to standardize display/handling of checksum fields for all dissectors. The main target is for dissectors that do validation, but dissectors that just report the checksum were also included just to make them easier to find in the future. Bug: 10620 Bug: 12058 Ping-Bug: 8859 Change-Id: Ia8abd86e42eaf8ed50de6b173409e914b17993bf Reviewed-on: https://code.wireshark.org/review/16380 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=1e19f55f0c44b850bc6304be28d5b27... commit 1e19f55f0c44b850bc6304be28d5b272a3553204 Author: Balint Reczey <balint@balintreczey.hu> Date: Mon Jun 20 23:18:46 2016 +0200 Constify a few value_strings which were generated at run-time Change-Id: Idc479a89a34fd21b743faee07020be284f828e2c Reviewed-on: https://code.wireshark.org/review/16298 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> http://cgit.osmocom.org/wireshark/commit/?id=d2727ec8a2bc0524e6e1ea5a1992bed... commit d2727ec8a2bc0524e6e1ea5a1992bed153b1488c Author: Guy Harris <guy@alum.mit.edu> Date: Wed Jul 20 19:53:33 2016 -0700 Don't pass NULL to wtap_block_set_string_option_value(). To remove OPT_SHB_HARDWARE, use wtap_block_remove_option(). To get the string value from a GString, use g_string_free(string, FALSE), not g_string_free(string, TRUE) - the latter will free the string value and return NULL. Change-Id: I0c5a9f818543f6752f455f04fb3c024208e23954 Reviewed-on: https://code.wireshark.org/review/16567 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=52323b20f5ca54d62d8fbffa4ddea8c... commit 52323b20f5ca54d62d8fbffa4ddea8cc851c22df Author: Guy Harris <guy@alum.mit.edu> Date: Wed Jul 20 17:45:07 2016 -0700 Remove more string option value null checks. Also, rename routines that write out an option write_wtap_XXb_option() from write_wtap_XXb_block(). Change-Id: I4884a2f5275a5e2e32137b47255fac6995f311ef Reviewed-on: https://code.wireshark.org/review/16566 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=3beab65515ab693806a7b64665bfd28... commit 3beab65515ab693806a7b64665bfd287133e860e Author: Guy Harris <guy@alum.mit.edu> Date: Wed Jul 20 17:27:36 2016 -0700 No need to check for string option values being null. A string option, if present, always has a value; it might be a null *string*, but you won't get a null pointer (if the option isn't present, it simply isn't present). Fix some comments while we're at it. Change-Id: I9c1420f56998a7d04de5c5cc2e92631b181f303a Reviewed-on: https://code.wireshark.org/review/16564 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=be1398c17ca1d5b203a930d9254125d... commit be1398c17ca1d5b203a930d9254125d602830aef Author: Michael Mann <mmann78@netscape.net> Date: Tue Jul 19 22:53:28 2016 -0400 Convert uses of g_alloced data with tvb_new_child_real_data to use pinfo->pool instead. Aldo update documentation to suggest using wmem pinfo->pool instead of glib memory Change-Id: I5d34cc6c1515aa9f0d57784b38da501ffcb95ccc Reviewed-on: https://code.wireshark.org/review/16551 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: Evan Huus <eapache@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=e07b4aa6670f57be7f613eec9d8d477... commit e07b4aa6670f57be7f613eec9d8d47712d1cfa86 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Wed Jul 20 04:11:07 2016 +0100 IPv6: Add option type encodings Change-Id: I9c8811dd30fed59591edb84166d2c854fd5b1885 Reviewed-on: https://code.wireshark.org/review/16553 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=4abf60ff7af594a27fb291fd9fa9443... commit 4abf60ff7af594a27fb291fd9fa944397f46049b Author: AndersBroman <anders.broman@ericsson.com> Date: Wed Jul 20 15:45:14 2016 +0200 [RRC] Update to V13.3.0 (2016-07) Change-Id: Ide2017d2610a55345a4ab1ef631b1da57a06ceb7 Reviewed-on: https://code.wireshark.org/review/16560 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=31f5e81449f0f256b71f2e2471eb7a8... commit 31f5e81449f0f256b71f2e2471eb7a8461aec07f Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Wed Jul 20 13:57:02 2016 +0100 IPv6: Mark ENDI option as deprecated (do not ignore) As requested by Alexis. Change-Id: I33e91aa0234e7c07869d69b5da6d0df8f94254ba Reviewed-on: https://code.wireshark.org/review/16559 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=15a202ea5d8c33e87c0fbe93cf67eab... commit 15a202ea5d8c33e87c0fbe93cf67eab59c6f0b87 Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Wed Jul 20 14:50:09 2016 +0200 PCP: add a missing cast Change-Id: I3fd85defefb5ba3c27ef7c7cc5e83a8193cf1263 Reviewed-on: https://code.wireshark.org/review/16558 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=95fa045d38ac15e21d55be07d0d7e5e... commit 95fa045d38ac15e21d55be07d0d7e5efd890d29b Author: Michael Mann <mmann78@netscape.net> Date: Tue Jul 19 22:49:55 2016 -0400 Convert some g_ APIs to wmem. Change-Id: I7fb0b60fc54004326680f07298fe43e8c48e9b39 Reviewed-on: https://code.wireshark.org/review/16550 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=f7e078cca60489c40c36c43771f2a54... commit f7e078cca60489c40c36c43771f2a54908020a9c Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Wed Jul 20 03:06:09 2016 +0100 IPv6: Fix LIO option dissection It was passing the wrong offset for an FT_UINT_STRING type. Change-Id: I739eb5bbf86768f6bf953662d407270cc8e27f2b Reviewed-on: https://code.wireshark.org/review/16547 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=928f1907c003d49d17a76417069f9a3... commit 928f1907c003d49d17a76417069f9a3003962778 Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Wed Jul 20 09:25:23 2016 +0200 MPTCP: fix mask used to display backup flag Bug: 12635 Change-Id: I077e0a2632c528acf7978123a61d8e0380f3e4e2 Reviewed-on: https://code.wireshark.org/review/16556 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=91ceccb19e7743fc595a91b3a327cd8... commit 91ceccb19e7743fc595a91b3a327cd82656aabe2 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Wed Jul 20 03:40:28 2016 +0100 IPv6: Mark ENDI option as deprecated (ignore) In accordance with the IANA registry. This option was never used. Change-Id: I2fc16579b084a0d537f16b9104b025d97a0afd8d Reviewed-on: https://code.wireshark.org/review/16552 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=60e882c7246f12747b2de5f9708a1cf... commit 60e882c7246f12747b2de5f9708a1cfd3d380190 Author: Michael Mann <mmann78@netscape.net> Date: Tue Jul 19 22:49:32 2016 -0400 packet-ldap.c: Convert some g_ APIs to wmem. Change-Id: I41bd5c66a51088cedeae993c15c520d4075c5620 Reviewed-on: https://code.wireshark.org/review/16549 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=9c9fd67d8b8476176046838c3f36e7d... commit 9c9fd67d8b8476176046838c3f36e7defcbaff33 Author: Michael Mann <mmann78@netscape.net> Date: Tue Jul 19 16:11:55 2016 -0400 packet-nbap.c: Convert some g_ APIs to wmem. Change-Id: I480dd5c533b53cc90e483f42e974c5f3e660e305 Reviewed-on: https://code.wireshark.org/review/16548 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=29a98d1c7f09cba3a1e20ae6bfce76c... commit 29a98d1c7f09cba3a1e20ae6bfce76cf13e134fe Author: Jeff Morriss <jeff.morriss.ws@gmail.com> Date: Sun Jul 17 18:24:45 2016 -0400 Allow BASE_NONE (with strings conversion) for integral values again. This mostly reverts SVN rev 43412 (3fa645481f82e32d5ad01ebce9c482c4edae31ae) with the addition of documenting that FT_*INT*'s with BASE_NONE and a FIELDCONVERT tells the Wireshark core that the field's numeric value is meaningless and should not be shown to the user. Use BASE_NONE again with the expert info group and severity fields. This (finally) resolves the complaint from: https://www.wireshark.org/lists/wireshark-dev/201206/msg00188.html (yes, this mail's been sitting in my "todo" pile since then! <sigh>) Change-Id: I1c6dd2864e7a2e959c97c409f277853af74a8d93 Reviewed-on: https://code.wireshark.org/review/16518 Petri-Dish: Jeff Morriss <jeff.morriss.ws@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=83174a207994c5d30c24e7907fffdc3... commit 83174a207994c5d30c24e7907fffdc3644a52557 Author: Gerald Combs <gerald@wireshark.org> Date: Tue Jul 19 09:26:24 2016 -0700 Qt: Fix Windows taskbar progress behavior. Connect the valueChanged signal each time we show the taskbar progress indicator and disconnect it each time we hide. Fixes stuck behavior seen here when reloading a capture. Change-Id: I11c6205675823e041cda7816237e54fa8a8afb7a Reviewed-on: https://code.wireshark.org/review/16544 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=11387e205f04cbd8dda30d037ec6627... commit 11387e205f04cbd8dda30d037ec6627fd6caf2c0 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Mon Jul 18 23:25:11 2016 +0100 AH: Make some display formats more standard Minor code improvements too. Change-Id: I65992f7733289a553efa3c2bf8ff144de796a985 Reviewed-on: https://code.wireshark.org/review/16540 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=d26e15113246cd9541d99d915098bf6... commit d26e15113246cd9541d99d915098bf60f7424efb Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Mon Jul 18 20:36:51 2016 +0100 AH: Remove ah_header_data and subtree payload preference When combined with the IPv6 preference for extension headers under the IPv6 header tree it's too many hierarchical levels, confusing in code and UX. Change-Id: Ia593da8ef543d1014b9e7575084a72b5b630ea08 Reviewed-on: https://code.wireshark.org/review/16539 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=d75de9f7559f1e0417c06a5b09d0fa3... commit d75de9f7559f1e0417c06a5b09d0fa3cf775d92c Author: Pascal Quantin <pascal.quantin@gmail.com> Date: Tue Jul 19 09:41:33 2016 +0200 VXLAN: use the newly created vxlan.next_proto dissector table everywhere Change-Id: Ib6f44e0f1d3d8c76d2b6e6c778af8c243af4389c Reviewed-on: https://code.wireshark.org/review/16543 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: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=0da99953581b3c044e9dcf080b0374a... commit 0da99953581b3c044e9dcf080b0374ace691189b Author: sjha3 <sjha3@ncsu.edu> Date: Sun Jul 17 16:10:09 2016 -0400 Support for NSH with VXLAN encapsulation Bug: 12271 Change-Id: Ia6d999049d56a4828936c95e272524e47d84bf8f Reviewed-on: https://code.wireshark.org/review/16517 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=f3d91fb58c251439cc4116aa830ec9f... commit f3d91fb58c251439cc4116aa830ec9f0cd48c72d Author: Martin Kaiser <wireshark@kaiser.cx> Date: Mon Jul 18 22:38:36 2016 +0200 asterix: remove unused hf entry Change-Id: I17dc7cfb8144dbfe3e36ff1902ce91241c5629ed Reviewed-on: https://code.wireshark.org/review/16536 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=e5fa40ab31fd127b4ad005448b6676f... commit e5fa40ab31fd127b4ad005448b6676fe9517a755 Author: Guy Harris <guy@alum.mit.edu> Date: Mon Jul 18 16:04:22 2016 -0700 Mark the file as having unsaved data if you change address resolution. That information can, and will, get saved in some file formats, so mark the file as changed so it can and will get saved by "Save". XXX - we need to treat it as a type of data that can be discarded when saving in some file formats, just like comments. Bug: 12629 Change-Id: I1fd69b95f4f7345c339961b4c53c28b98b364e4e Reviewed-on: https://code.wireshark.org/review/16538 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=6df8e83e5754a883e768573a0bae819... commit 6df8e83e5754a883e768573a0bae8199f1c8fb9c Author: Guy Harris <guy@alum.mit.edu> Date: Mon Jul 18 12:58:40 2016 -0700 block->options is never null; don't check for it. A wtap_block_t always has an array of options, even if it's empty. Fixes CID 1364135. Change-Id: Ib1ba791ddcac078ec34def321d63d140c5576037 Reviewed-on: https://code.wireshark.org/review/16535 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=d54f372c999ce1bf1437a7718301265... commit d54f372c999ce1bf1437a7718301265e2c1f15cb Author: Guy Harris <guy@alum.mit.edu> Date: Mon Jul 18 12:46:40 2016 -0700 Remove wtap_block_num_options_of_type(). It's not used; currently, everything that accesses instances of a multiple-instance-allowed option do so in a loop that iterates over option instances by fetching values of the Nth option until the attempt to fetch the option fails, making only one pass over the options. Change-Id: Ife9583a5d246027dbfc133ab58027ef6641d65ef Reviewed-on: https://code.wireshark.org/review/16534 Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=d08e7679fafd236db0fbb61aac7e566... commit d08e7679fafd236db0fbb61aac7e56667fa250dc Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sat Jul 16 00:48:24 2016 +0100 IPv6: Export ipv6_pinfo interface for sub-dissectors Change-Id: If39838f6952356aa3417ea9241d974f4c64f9898 Reviewed-on: https://code.wireshark.org/review/16530 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=994d418a0e6bf02cf1fc4c7cc6f55d2... commit 994d418a0e6bf02cf1fc4c7cc6f55d2d4832325a Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sun Jul 17 01:54:42 2016 +0100 IPv6: Remove unknown extension header dissection It's not being used and makes some things more difficult so kill it. It's not possible in general to distinguish an unknown extension header from an unknown IP protocol and the concept is fuzzy anyway (for example ESP is officially an extension header but meh) so don't bother trying for now. Change-Id: I3bdfcc2b76b47e8c1588e91838225b14808e43a7 Reviewed-on: https://code.wireshark.org/review/16529 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=2b2953fff84d7955b708ad1ae4e2b3b... commit 2b2953fff84d7955b708ad1ae4e2b3b5d03d2761 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Mon Jul 18 21:07:11 2016 +0200 ouch: fix indent (use 4spaces) Change-Id: Ifdfaa87cc1818768ca939ff93015fbb8d77cddc5 Reviewed-on: https://code.wireshark.org/review/16533 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=beedeb2e711c2687b6ae84bb32ebbfb... commit beedeb2e711c2687b6ae84bb32ebbfbe18f3138b Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Mon Jul 18 21:08:12 2016 +0200 SHIM6: fix no previous prototype for 'proto_register_shim6/proto_reg_handoff_shim6' [-Wmissing-prototypes] Change-Id: I148ecae8d2e9926fcfebab75b3b2f0a769813ef5 Reviewed-on: https://code.wireshark.org/review/16532 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=a21102069a6300a236cc807811ee89d... commit a21102069a6300a236cc807811ee89d2bf034169 Author: AndersBroman <anders.broman@ericsson.com> Date: Mon Jul 18 17:58:27 2016 +0200 [GTPv2] Extend MM Context dissection. Change-Id: I24e9f8307ea199d5da0713f26aa075466c59bb1f Reviewed-on: https://code.wireshark.org/review/16528 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=83733a340f8b2a9e05d31ded44c7286... commit 83733a340f8b2a9e05d31ded44c72869f098c1e3 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sat Jul 16 14:07:40 2016 +0100 IPv6: Set (jumbo) length by inspecting hop-by-hop header, if existing Change-Id: I84bade7526ef3f094875eaf207b2650d734ed10f Reviewed-on: https://code.wireshark.org/review/16523 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=de7241c13b9edcc2d0d3fcdeeee4c62... commit de7241c13b9edcc2d0d3fcdeeee4c625dd9e2ce9 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sat Jul 16 18:23:23 2016 +0100 IPv6: Dissect as much as possible in case of errors Don't require 40 bytes upfront, do it by field. Miscellaneous cleanups. Change-Id: Ib40b43eb3cf9aa52aa490cdabc6de26b0e977483 Reviewed-on: https://code.wireshark.org/review/16522 Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=cde7b03f59dd2ebdff3ce4eb8a66248... commit cde7b03f59dd2ebdff3ce4eb8a6624864a75a745 Author: AndersBroman <anders.broman@ericsson.com> Date: Mon Jul 18 14:52:54 2016 +0200 [Diameter] Update with new AVPs Change-Id: I6dfa43320ae3e02afb2b795dd352d492c75a0e60 Reviewed-on: https://code.wireshark.org/review/16526 Reviewed-by: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=d131898723adc8f98be94589caf3558... commit d131898723adc8f98be94589caf3558c63d113c8 Author: Michael Tuexen <tuexen@wireshark.org> Date: Mon Jul 18 12:22:53 2016 +0200 Add support for the U-bit in I-FORWARD-TSN chunks. This adds support for the upcoming Internet Draft draft-ietf-tsvwg-sctp-ndata-07. Change-Id: Icb7c464504c41a743aa9c61d449f54bf400c1cd3 Reviewed-on: https://code.wireshark.org/review/16525 Petri-Dish: Michael Tüxen <tuexen@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Tüxen <tuexen@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=468a5e27255190cc7cfa2e52a2b5457... commit 468a5e27255190cc7cfa2e52a2b54578dcb9e1d8 Author: Jeff Morriss <jeff.morriss.ws@gmail.com> Date: Sun Jul 17 15:24:55 2016 -0400 Use follow_record_t in SSL follow stream. ... rather than a structure (SslDecryptedRecord) which looks (mostly) like a follow_record_t. (The biggest different is the former carries its data in a StringInfo while the latter uses a GByteArray.) With this change following SSL no longer needs its own special code. This also fixes a crash after saving a followed SSL stream (in the Qt UI). Bug: 12616 Change-Id: Ibdb2b85f8a6a30712743a5da420be1e6b78f5b92 Reviewed-on: https://code.wireshark.org/review/16516 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.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=752ba1abad6f549616ab65418522a06... commit 752ba1abad6f549616ab65418522a067c58f0f24 Author: Hiroshi Ioka <hirochachacha@gmail.com> Date: Sun Jul 17 20:32:35 2016 +0900 packet-smb2: add dissectors for FSCTL_GET_REPARSE_POINT/FSCTL_SET_REPARSE_POINT Change-Id: I3b6230aea2a0027d7b85d35d3aea6385cace569b Reviewed-on: https://code.wireshark.org/review/16511 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=4b8cb97ab48d3863bf063ec68e87d83... commit 4b8cb97ab48d3863bf063ec68e87d8373dcc9fae Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sun Jul 17 14:58:03 2016 +0100 Rename iph->ip_p to iph->ip_nxt struct ws_ip is IP version agnostic. "ip_p" is too terse and less appropriate. Change-Id: I06b8740ab420e20781bf7b9efcf5dce19ad22ab2 Reviewed-on: https://code.wireshark.org/review/16519 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: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=1a3fc2e7af060cd41a22ee977450787... commit 1a3fc2e7af060cd41a22ee9774507871d7fcc72f Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Sun Jul 17 15:04:52 2016 +0100 IPv6: Remove union from struct ip6_hdr The field macros are a particularly obnoxious form of namespace pollution. Change-Id: I9010a767625fd1c4b4a48c9d75481c577915fce6 Reviewed-on: https://code.wireshark.org/review/16520 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=5123fa26e9149ee55368b62a960344e... commit 5123fa26e9149ee55368b62a960344ec18232e79 Author: Harald Welte <laforge@gnumonks.org> Date: Sat Jul 16 15:41:02 2016 +0200 L2TP: Add dissectors for Ericsson specific L2TP AVPs Ericsson's L2TP implementation uses some vendor-specific AVPs. Let's add some decoder/dissector support for these. Change-Id: I65d5527087a9c0f4e18ba17c9e7c63793ef6e995 Reviewed-on: https://code.wireshark.org/review/16507 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=f59fa1b8079bd334d767030975a297d... commit f59fa1b8079bd334d767030975a297ded63d81e8 Author: Gerald Combs <gerald@wireshark.org> Date: Sun Jul 17 08:07:44 2016 -0700 [Automatic update for 2016-07-17] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I0ca539cf81e1708a6ea8eafbdf91488086e9ee2d Reviewed-on: https://code.wireshark.org/review/16513 Reviewed-by: Gerald Combs <gerald@wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=6e44ea3f98233f6b88e4f4a7f2c8ffa... commit 6e44ea3f98233f6b88e4f4a7f2c8ffaf1d54f345 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Sat Jul 16 08:34:50 2016 +0200 Add osx/macos build for Travis CI Change-Id: Id6beedfbe909ac3639790cbb7471bd968bed5b82 Reviewed-on: https://code.wireshark.org/review/16496 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=db1e0bcf65e2a1cd4f4e5fedf092475... commit db1e0bcf65e2a1cd4f4e5fedf09247562ac1a607 Author: Michael Mann <mmann78@netscape.net> Date: Sat Jul 16 22:29:35 2016 -0400 Fix printf style parameters complaints from VS Code Analysis Change-Id: I5669e2442582f899643fae4a9f86ab6d505dde07 Reviewed-on: https://code.wireshark.org/review/16505 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=25dfe445a109bbeaf38e6394f81a3bc... commit 25dfe445a109bbeaf38e6394f81a3bc2880850a3 Author: Michael Mann <mmann78@netscape.net> Date: Sat Jul 16 11:54:38 2016 -0400 ciscodump.c - Address VS Code Analysis warnings. 1. Check sscanf return value 2. Take large "packet" byte array off of stack and onto heap. Change-Id: I8ade76359f1b0739ec31d7f3b688d212f21357ba Reviewed-on: https://code.wireshark.org/review/16498 Reviewed-by: Dario Lombardo <lomato@gmail.com> 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=6e7b1b8a9cc701f55feb1a0d4e9f756... commit 6e7b1b8a9cc701f55feb1a0d4e9f756be499b3a3 Author: David Arnold <d@0x1.org> Date: Sun Sep 20 18:54:38 2015 -0400 Update to support OUCH-4.2 as of 2016/02/29 release Bug: 12615 Change-Id: I7122ded30083dd85e7785a842c6dd62b459d9676 Reviewed-on: https://code.wireshark.org/review/16465 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=8cd167a06cdba22f4b1efeb8929228d... commit 8cd167a06cdba22f4b1efeb8929228d387ea5f23 Author: Michael Mann <mmann78@netscape.net> Date: Sat Jul 16 13:06:28 2016 -0400 Fix sscanf VS Code Analysis warnings. Some needed to check return value, others were converted to use strtoul. Change-Id: I55aae216f95362b67e006f6e682abbd5ae2c8dcc Reviewed-on: https://code.wireshark.org/review/16502 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=379c3c6fde8a35648b570e714fc8b2e... commit 379c3c6fde8a35648b570e714fc8b2ea7eead22e Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Thu Jul 14 20:07:14 2016 +0200 ISIS (LSP): Fix Malformed packet Coming from fetch too longer bytes... Rework the display for add some missing field (SubTLV indicator, prefix len) and for prefix IPv4 use the same code like BGP Issue reported by Garri Djavadyan Bug:12617 Change-Id: Ib40f1badf8e03fadacfbb0aff1ebd3eab8ca342b Reviewed-on: https://code.wireshark.org/review/16436 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=abd0033c7ed380750aa59e5979e85dc... commit abd0033c7ed380750aa59e5979e85dc0884ca564 Author: Michael Mann <mmann78@netscape.net> Date: Sat Jul 16 12:26:15 2016 -0400 androiddump.c - Address VS Code Analysis warnings. 1. Take large "packet" byte arrays off of stack and onto heap. 2. Cast away an shift operation that should have been identified as safe anyway. Change-Id: I159c4a7452744763f667336cf4824d5ac3472343 Reviewed-on: https://code.wireshark.org/review/16500 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=9a9c72cceab5d6cdd9bdd7650e038aa... commit 9a9c72cceab5d6cdd9bdd7650e038aac4f697013 Author: Michael Mann <mmann78@netscape.net> Date: Sat Jul 16 12:09:27 2016 -0400 Have extcap executables mirror the GTK's WinMain signature. This is for appeasing VS Code Analysis. Change-Id: Ib7b3d8a3025dd764da283335051d0f77b45f6dee Reviewed-on: https://code.wireshark.org/review/16499 Reviewed-by: Michael Mann <mmann78@netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=6d8ea38773a127fe68d967a3b724738... commit 6d8ea38773a127fe68d967a3b724738e6c725dea Author: Michael Mann <mmann78@netscape.net> Date: Sat Jul 16 12:44:47 2016 -0400 wmem_map.c: Address some VS Code Analysis warnings. size_t can vary on size, so you can't always mix it with guint. Change-Id: I7e2ea3a990dd4df99422f6113aa3ae53dbf2bc4f Reviewed-on: https://code.wireshark.org/review/16501 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=ed307484a74fdd0ef7fb66daa2b48c6... commit ed307484a74fdd0ef7fb66daa2b48c69b2929076 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> Date: Fri Jul 15 01:56:44 2016 +0100 IPv6: Improve offset handling for options sub-dissectors We pass the Option Data offset to sub-dissectors. Change-Id: I4a20514f3f1c31179f93c86e251ba67d671844b3 Reviewed-on: https://code.wireshark.org/review/16484 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> http://cgit.osmocom.org/wireshark/commit/?id=dbcabe87af7f6dac7ba3d332cfc56c9... commit dbcabe87af7f6dac7ba3d332cfc56c9d50c36548 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Sun Jun 19 19:27:38 2016 +0200 Use debian tools script for travis Change-Id: I0e3390048fe2723579cc108f5adf582f570a41e5 Reviewed-on: https://code.wireshark.org/review/16494 Reviewed-by: Dario Lombardo <lomato@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=b5a585c0a024858ac5f9c326f63df38... commit b5a585c0a024858ac5f9c326f63df382872f87e3 Author: Gerald Combs <gerald@wireshark.org> Date: Fri Jul 15 11:09:01 2016 -0700 Use timers instead of packet counts to update our UI. In file.c, update our UI based on the time elapsed since we last finished updating the UI instead of on the number of packets we've processed. Remove the timer code from progress_frame.cpp since it's now redundant. This makes the UI more responsive here for captures with large numbers of packets and it should mean that packets_bar_update spends less time repainting, at least on Windows. Change-Id: I9edfa944c44192350bef75b8c0c3ad63bae9c131 Reviewed-on: https://code.wireshark.org/review/16476 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: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=adec7c424e8117e138b2669f64bc2f5... commit adec7c424e8117e138b2669f64bc2f5ac39bef33 Author: Gerald Combs <gerald@wireshark.org> Date: Thu Jul 14 17:18:24 2016 -0700 Allocate data sources using wmem. Use wmem_strdup + the pinfo pool instead of g_strdup. Change-Id: I11fbb5ce31b7139421c558ee65ca43c8d8e85900 Reviewed-on: https://code.wireshark.org/review/16445 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: Anders Broman <a.broman58@gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=7e5cbf4e2cd18f2244b26470df05a93... commit 7e5cbf4e2cd18f2244b26470df05a93c5a923afe Author: Martin Kaiser <wireshark@kaiser.cx> Date: Wed Jul 13 23:21:35 2016 +0200 always update the status bar at the end of a capture We used to update the status bar when we get a stopCapture signal. This does not work for extcap interfaces like randpktdump which creates 1000 packets and then exits. The status bar message "Live capture in progress" is not deleted. For randpktdump, the only reliable indication to detect the end of the "capture" is when the pipe to dumpcap is destroyed. Update the status bar at this time. Change-Id: I59768e7f518625283b2c27c34c428bb115e27a61 Reviewed-on: https://code.wireshark.org/review/16479 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> 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=5c99fc2b53ca741bc3018cb5218e3ae... commit 5c99fc2b53ca741bc3018cb5218e3ae5b35bca70 Author: Michael Mann <mmann78@netscape.net> Date: Fri Jul 15 22:33:40 2016 -0400 Another attempt to squash warnings from printf use in reassemble_test.c Change-Id: Ieae9466c6785cf931fc96f8e216c0c1383a5b6a2 Reviewed-on: https://code.wireshark.org/review/16489 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=16a01cfb01243041021e440b2d5c698... commit 16a01cfb01243041021e440b2d5c6988fff85599 Author: Guy Harris <guy@alum.mit.edu> Date: Fri Jul 15 17:33:25 2016 -0700 Comment cleanups. Change-Id: I995ba14cbd9bbe2c01b0770c16095084895498db Reviewed-on: https://code.wireshark.org/review/16486 Reviewed-by: Guy Harris <guy@alum.mit.edu> ----------------------------------------------------------------------- hooks/post-receive -- wireshark with Osmocom specific dissectors
participants (1)
-
gitosis＠osmocom.org