wireshark.git branch laforge/om2000-201610 updated. 8040f6ba8e441a2d8368e77ee581f775e8e84ed4

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/om2000-201610 has been updated discards 648eb6e9eb6248212221fee7af97f51a45e24595 (commit) discards d1437d29debab9d84a9a6147fa5d79df6d3af4c5 (commit) discards be0712c3346c0e29cbcbba8412fb128c030a4637 (commit) discards 7c4e27a7705b3cfbcfd77c95fd6fda2f055992ad (commit) discards e82a8fc040306a8eb6ce9309c077fe2015d94bf7 (commit) via 8040f6ba8e441a2d8368e77ee581f775e8e84ed4 (commit) via 61fc1936e3a495748104775ce934f7f5365825e3 (commit) via 749c0035817ad8bc91b1eb72247f9b4ac13b150e (commit) via c723550537eb7fa7701d82ee955a7c05771989e6 (commit) via a3ea0363e2f1b9a6f7649ef2a1eeca881860e0fa (commit) via 54c3df86f31e05fa8444daddce332d4ad7802173 (commit) via 134f5ad96c55806c3410555a52a4b5407f472e48 (commit) via 0decc3fb57416ef003afd9cbe2810aba98a74f89 (commit) via b8f99e3b71593fcc12a11d2106bdacaaa50b5263 (commit) via e407dd44d6489dd271c8d88fbfa48651a0f5ecff (commit) via 94344cd49158b67ea21ce8e1578cf21c7107adba (commit) via 55fbb6387ad478363e524f35d3ce06a6c670553e (commit) via 65ab2a97018877ec3a8664d7422c3ee4662e97ca (commit) via aba4d3a3a7d8c7f97290621085a8fb7a33942847 (commit) via e723a899c009a6167d8e6eaab83cd76adfa2d246 (commit) via 20adb7a564cf29a027d59f9dc92f4a81eaf4108d (commit) via 792569834045da2e14e9e12dfba40a3a4503491c (commit) via 1d56b0a48c6e023a0d24739029722b773fe3282a (commit) via 73145b4d7c2b6928dfe4b62f5f837aaac866a5ec (commit) via 66fa31415ff8d520c71dc66718599e941ed05c29 (commit) via b489b7ff7d4ba9f000f29c608515eb43059855ab (commit) via ce98b6c90dcbd8e9468bbac0adf10a7d537afdcb (commit) via faa5ba2e20516be8e8ca934c3f06244706e961b5 (commit) via 414c13245831085b7362d0573b317597fb76ac76 (commit) via d1a2c4c312f8f0e3e8d6800a51c2d59a4a7a03d4 (commit) via 720927a10ea9fe5a82155080114d85b8638f3b8c (commit) via 51bdba4c1f1a94b5b14f4a4894d67b99de6b02f6 (commit) via 1be79dd3a841fd89db1e2b43cedfc5330c56f23d (commit) via cbccf05f8be8b3c5dc2f03f31974512c84be5a0c (commit) via cb0697c99e4e09feac58bfe24f82b9cc034d7b64 (commit) via f1486a9f93de20be6741631fb1522208a00a77f3 (commit) via 8e5e6ddc5e526abc84d162f24decfa7be78887b1 (commit) via 857b80e41489f9064e8f5cbdd8c05b3a9ce8adb3 (commit) via b688175834c8ab302abb108df19c63f7a075c458 (commit) via d6e35b1a4728676efc4030182492e8376bdcc3e4 (commit) via 7d2dc97c43021cbef5e561c050cb36760ed81a43 (commit) via a77e8a325212518419df890570f8b03a3afdb67f (commit) via 4e95d5fa8e2f7fec72f0d7350a0b07ca8cdfa12b (commit) via 7531318e054153fbd5e33624ef30314acd52b6bc (commit) via 1ae0c1ebfaed748378395a0c690b10f8e7eb3265 (commit) via c12280f804d419cbcd386a6d662f150a66012d71 (commit) via fc99bca3cfa0af0e908b4e25156a87f6c7f5d3d9 (commit) via ddd1c87d43781533c3ec10279857e3870d12437e (commit) via 1b91475e0da15e58a9df7cd0cee6a463a8e0c97e (commit) via 3814eee112070b43eaf9dc39e7b19b2349ac6957 (commit) via fb5d024a0bf5e91f4f7399f386975e87449f2607 (commit) via 12e030cd5bb369c8e90fe0682b43ea28e07a9a9e (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (648eb6e9eb6248212221fee7af97f51a45e24595) \ N -- N -- N (8040f6ba8e441a2d8368e77ee581f775e8e84ed4) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cgit.osmocom.org/wireshark/commit/?id=8040f6ba8e441a2d8368e77ee581f7… commit 8040f6ba8e441a2d8368e77ee581f775e8e84ed4 Author: Harald Welte <laforge(a)gnumonks.org> Date: Wed Oct 26 22:38:20 2016 +0200 HACK: Hand GPRS RLC payload to GPRS LLC dissector this is an ugly hack, as there is no code for packet re-assembly in betwween, i.e. we only get proper dissection if the LLC message was fitting entirely into one RLC block. Nevertheless, sufficient to see things like RAU, ATTACH, IDENTITY procedures. Change-Id: I1fc488aa58353e5f4264b940f9f4c18987148a7d http://cgit.osmocom.org/wireshark/commit/?id=61fc1936e3a495748104775ce934f7… commit 61fc1936e3a495748104775ce934f7f5365825e3 Author: Harald Welte <laforge(a)gnumonks.org> Date: Wed Oct 26 20:09:31 2016 +0200 WIP: Jacob's EGPRS patch ... with add_new_data_source() to visualize the re-aligned bits Change-Id: I1604dceaf3d91228e87712e099c8a209ff812f4a http://cgit.osmocom.org/wireshark/commit/?id=749c0035817ad8bc91b1eb72247f9b… commit 749c0035817ad8bc91b1eb72247f9b4ac13b150e Author: Harald Welte <laforge(a)gnumonks.org> Date: Sun Jul 17 16:22:19 2016 +0200 l2tp: Introduce preference for default pseudowire In some cases, the establishment of the L2TP session is not captured in the pcap file, and thus wireshark cannot determine the l2tp pseudowire to be used for decode. So rather than using a ocmpile-time hard-coded default of cisco hdlc, let's introduce a prference where the user can select the default pseudowire in such cases. Change-Id: I44a6373d4812c9ab5a919514273a41a2ab57142c http://cgit.osmocom.org/wireshark/commit/?id=c723550537eb7fa7701d82ee955a7c… commit c723550537eb7fa7701d82ee955a7c05771989e6 Author: Harald Welte <laforge(a)gnumonks.org> Date: Sat Jul 16 15:39:17 2016 +0200 L2TP: Add preference to select Ericsson HDLC flavor At some point over the wireshark last years, the connection between the L2TP dissector and the Ericsson HDLC dissector (packet-ehdlc.c) got broken. I cannot poinpoint the exact change when it broke. However, traces with Ericsson L2TP that used to display correctly no longer do so. The problem with Ericsson L2TP is that they simply re-use the HDLC pseudowire (0x0006), but then have frames completely different than what's specified in the RFCs for that. To address this, let's add a protocol preference to allow the user to choose. Change-Id: Idce022ef0f233c01ecffc67dca7f428bde31ef6b http://cgit.osmocom.org/wireshark/commit/?id=a3ea0363e2f1b9a6f7649ef2a1eeca… commit a3ea0363e2f1b9a6f7649ef2a1eeca881860e0fa Author: Harald Welte <laforge(a)gnumonks.org> Date: Sat Nov 12 13:31:10 2016 +0100 gsm_abis_om2000: Expand bit-width of CON CCP and CI fields It seems more recent RBS2000 models have extended the range of the CON Connection Point (CCP) by one bit, as I'm seeing CCP 1896 in protocol traces. Similarly, the Contiguity Index can at least reach 96. Using the full 8bit value to make sure IS and CON dissectors use the same ranges for connection points and contiguity index. Change-Id: Iece34106fc97a11dc8a01cf2578b5e4245a4c9e8 http://cgit.osmocom.org/wireshark/commit/?id=54c3df86f31e05fa8444daddce332d… commit 54c3df86f31e05fa8444daddce332d4ad7802173 Author: Pascal Quantin <pascal.quantin(a)gmail.com> Date: Fri Nov 11 22:20:07 2016 +0100 PER: add support for bit strings >= 16K Bug: 13123 Change-Id: Ie20ef75393ea601d2702a024e0ade94b85adf9f2 Reviewed-on: https://code.wireshark.org/review/18748 Petri-Dish: Pascal Quantin <pascal.quantin(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=134f5ad96c55806c3410555a52a4b5… commit 134f5ad96c55806c3410555a52a4b5407f472e48 Author: Guy Harris <guy(a)alum.mit.edu> Date: Fri Nov 11 14:37:06 2016 -0800 Dissect the checksum field as a string, as that's what it is. Bug: 13125 Change-Id: Ib5d02e8841eb7e4d04e6a1df44a5eba5b925ce6c Reviewed-on: https://code.wireshark.org/review/18749 Reviewed-by: Guy Harris <guy(a)alum.mit.edu> http://cgit.osmocom.org/wireshark/commit/?id=0decc3fb57416ef003afd9cbe2810a… commit 0decc3fb57416ef003afd9cbe2810aba98a74f89 Author: AndersBroman <anders.broman(a)ericsson.com> Date: Fri Nov 11 14:44:02 2016 +0100 [SIP]Parse out the individual feature cap(s). Change-Id: Ie834da60a2d389d33e1a5b6cc897e13ae1522fb9 Reviewed-on: https://code.wireshark.org/review/18742 Petri-Dish: Anders Broman <a.broman58(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Michael Mann <mmann78(a)netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=b8f99e3b71593fcc12a11d2106bdac… commit b8f99e3b71593fcc12a11d2106bdacaaa50b5263 Author: Peter Wu <peter(a)lekensteyn.nl> Date: Fri Nov 11 16:49:35 2016 +0100 ssl: fix next_protocol_negotiation id NPN is a legacy extension (superseded by ALPN), but there was still a capture with this value. However, the decimal number is wrong. Adjust it to the one in the draft -03 (the hex number is still correct). Change-Id: I80ce468bcb653bc8ec87432d76d478cb0423b46f Reviewed-on: https://code.wireshark.org/review/18744 Reviewed-by: Peter Wu <peter(a)lekensteyn.nl> Petri-Dish: Peter Wu <peter(a)lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Michael Mann <mmann78(a)netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=e407dd44d6489dd271c8d88fbfa486… commit e407dd44d6489dd271c8d88fbfa48651a0f5ecff Author: Alexis La Goutte <alexis.lagoutte(a)gmail.com> Date: Fri Nov 11 10:30:57 2016 +0100 OSPF: Add LSA Type Flag (See RFC 5340 A.4.2.1) * Display in dec the LSA Type (like IANA) Bug: 13118 Change-Id: I78001b2066f186dcf2175153e539216437b1754e Reviewed-on: https://code.wireshark.org/review/18740 Petri-Dish: Michael Mann <mmann78(a)netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Michael Mann <mmann78(a)netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=94344cd49158b67ea21ce8e1578cf2… commit 94344cd49158b67ea21ce8e1578cf21c7107adba Author: Gerald Combs <gerald(a)wireshark.org> Date: Fri Nov 11 08:48:33 2016 -0800 Qt: Fix a "No such slot" warning. Make sure on_actionCaptureOptions_triggered always exists so that we don't get a "No such slot" warning when building without libpcap. Change-Id: Ib7c82df6c72bf080ff080e0a650216b345a97e9c Reviewed-on: https://code.wireshark.org/review/18747 Petri-Dish: Gerald Combs <gerald(a)wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Gerald Combs <gerald(a)wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=55fbb6387ad478363e524f35d3ce06… commit 55fbb6387ad478363e524f35d3ce06a6c670553e Author: Peter Wu <peter(a)lekensteyn.nl> Date: Fri Nov 11 17:46:10 2016 +0100 Qt: fix build without libpcap Change-Id: I89a2f9a21a17a318529c7f0785ab60385fe08dcf Fixes: v2.3.0rc0-1445-g414c132 ("Qt: Handle retranslation events in the main window") Reviewed-on: https://code.wireshark.org/review/18746 Reviewed-by: Peter Wu <peter(a)lekensteyn.nl> Tested-by: Peter Wu <peter(a)lekensteyn.nl> Reviewed-by: Gerald Combs <gerald(a)wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=65ab2a97018877ec3a8664d7422c3e… commit 65ab2a97018877ec3a8664d7422c3ee4662e97ca Author: Gerald Combs <gerald(a)wireshark.org> Date: Tue Nov 1 14:35:29 2016 -0700 AsciiDoc: Create an include file for attributes. Move the replacement definitions in asciidoc.conf to attributes.asciidoc. This makes the markup a bit cleaner and is more compatible with AsciiDoctor. Use a standard naming scheme for URLs. Change-Id: Ica73aaadb013be2a4e6a3963fb54e6db6e02e98f Reviewed-on: https://code.wireshark.org/review/18655 Reviewed-by: Peter Wu <peter(a)lekensteyn.nl> Reviewed-by: Gerald Combs <gerald(a)wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=aba4d3a3a7d8c7f97290621085a8fb… commit aba4d3a3a7d8c7f97290621085a8fb7a33942847 Author: Pascal Quantin <pascal.quantin(a)gmail.com> Date: Fri Nov 11 14:48:21 2016 +0100 ftype-guid.c: fix FT_GUID filtering g_strlcpy copies at most n-1 bytes to ensure that the string is NULL terminated. Bug: 13121 Change-Id: I4f1677c518e65eb58b79d72052520ecce8c51722 Reviewed-on: https://code.wireshark.org/review/18743 Reviewed-by: Pascal Quantin <pascal.quantin(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=e723a899c009a6167d8e6eaab83cd7… commit e723a899c009a6167d8e6eaab83cd76adfa2d246 Author: AndersBroman <anders.broman(a)ericsson.com> Date: Fri Nov 11 14:33:08 2016 +0100 [tvbuff] Fix tvb_find_guint16() searched_bytes is from start_offset(offset) and the while loop should be on searched_bytes. Change-Id: I62343f7cb04f9110f773ba1ada8dbcbfbd262861 Reviewed-on: https://code.wireshark.org/review/18741 Petri-Dish: Anders Broman <a.broman58(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Anders Broman <a.broman58(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=20adb7a564cf29a027d59f9dc92f4a… commit 20adb7a564cf29a027d59f9dc92f4a81eaf4108d Author: Jan Spevak <jan.spevak(a)nokia.com> Date: Fri Nov 11 10:25:28 2016 +0100 diameter_3gpp: decode AVP 1518 Change-Id: I95618ebeeb2a5ebe0dfc97bdfdd6c0bb91cb4381 Reviewed-on: https://code.wireshark.org/review/18739 Petri-Dish: Anders Broman <a.broman58(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Anders Broman <a.broman58(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=792569834045da2e14e9e12dfba40a… commit 792569834045da2e14e9e12dfba40a3a4503491c Author: Michael Mann <mmann78(a)netscape.net> Date: Thu Nov 10 23:38:39 2016 -0500 packet-asterix.c doesn't need a preference callback function. Just causes preference to be added twice. Bug: 13113 Change-Id: Iebbe296a8b35cbe58c163c4f1f5fac9d27c76ead Reviewed-on: https://code.wireshark.org/review/18737 Reviewed-by: Michael Mann <mmann78(a)netscape.net> Petri-Dish: Michael Mann <mmann78(a)netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Anders Broman <a.broman58(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=1d56b0a48c6e023a0d24739029722b… commit 1d56b0a48c6e023a0d24739029722b773fe3282a Author: Jakub Pawlowski <jpawlowski(a)google.com> Date: Thu Nov 10 11:31:59 2016 -0800 Bluetooth: BTLE: Add SC bit paring in AuthReq Change-Id: I91db50aadd572a81559bb8d22af19fffefea592f Reviewed-on: https://code.wireshark.org/review/18735 Petri-Dish: Stig Bjørlykke <stig(a)bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=73145b4d7c2b6928dfe4b62f5f837a… commit 73145b4d7c2b6928dfe4b62f5f837aaac866a5ec Author: AndersBroman <anders.broman(a)ericsson.com> Date: Thu Nov 10 14:14:49 2016 +0100 [XML] default_media_types should be in lower case. Change-Id: Ibd55b76a0ccbfcf511afb4e99144a0d1115e5af2 Reviewed-on: https://code.wireshark.org/review/18732 Reviewed-by: Anders Broman <a.broman58(a)gmail.com> Petri-Dish: Anders Broman <a.broman58(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=66fa31415ff8d520c71dc66718599e… commit 66fa31415ff8d520c71dc66718599e941ed05c29 Author: Michael Mann <mmann78(a)netscape.net> Date: Tue Oct 18 20:34:37 2016 -0400 tcp: Fix Follow TCP tap data and when its tapped. Use the model from the 2.0 branch and earlier that only "tapped" the follow data in a single location. This fixes duplicate data for reassembled data and handles out-of-order packets. Bug: 12855 Change-Id: I5268f13e3c08e9271acf026b859de693ad794c94 Reviewed-on: https://code.wireshark.org/review/18368 Petri-Dish: Pascal Quantin <pascal.quantin(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=b489b7ff7d4ba9f000f29c608515eb… commit b489b7ff7d4ba9f000f29c608515eb43059855ab Author: Peter Wu <peter(a)lekensteyn.nl> Date: Thu Nov 10 16:04:25 2016 +0100 lsd: fix unaligned read Fixes UBsan complaint: epan/dissectors/packet-lsd.c:141:7: runtime error: load of misaligned address 0x61d00017029e for type 'const guint32', which requires 4 byte alignment Change-Id: I74034f3e0bc198b4b86ca6cd7559d8df7283377f Reviewed-on: https://code.wireshark.org/review/18733 Petri-Dish: Alexis La Goutte <alexis.lagoutte(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Michael Mann <mmann78(a)netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=ce98b6c90dcbd8e9468bbac0adf10a… commit ce98b6c90dcbd8e9468bbac0adf10a7d537afdcb Author: Moshe Kaplan <me(a)moshekaplan.com> Date: Thu Nov 3 09:33:48 2016 -0700 Enable exporting IMF traffic as an EML file Change-Id: Ia56b38a770a148dd8bf030699615189601944cc2 Reviewed-on: https://code.wireshark.org/review/18656 Petri-Dish: Peter Wu <peter(a)lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Peter Wu <peter(a)lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=faa5ba2e20516be8e8ca934c3f0624… commit faa5ba2e20516be8e8ca934c3f06244706e961b5 Author: Birol Capa <birol.capa(a)siemens.com> Date: Thu Nov 10 12:48:05 2016 +0300 PROFINET: Update MRP dissection according to IEC62439-2 Ed.2. The MRP PDU dissection is updated with respect to MRP standard IEC62439-2 Ed.2. 0x88e3 is added for MRP Ether Type String definions of MRP block and sub block types are updated. dissect_pn_ManuData function is removed since it is not used anymore. Change-Id: Iec6666abc75bcba4189f2c38851407abc23267f9 Reviewed-on: https://code.wireshark.org/review/18730 Petri-Dish: Alexis La Goutte <alexis.lagoutte(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte(a)gmail.com> Reviewed-by: Michael Mann <mmann78(a)netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=414c13245831085b7362d0573b3175… commit 414c13245831085b7362d0573b317597fb76ac76 Author: Gerald Combs <gerald(a)wireshark.org> Date: Wed Jul 8 16:48:58 2015 -0700 Qt: Handle retranslation events in the main window. Update most (but not all) of the main status bar text when the user changes the language setting. Try to distinguish between recent preferences and recent captures more clearly. Change-Id: I5278a503178fe3620a25b185742688f957dc30f4 Ping-Bug: 11307 Reviewed-on: https://code.wireshark.org/review/9575 Reviewed-by: Gerald Combs <gerald(a)wireshark.org> Petri-Dish: Gerald Combs <gerald(a)wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Michael Mann <mmann78(a)netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=d1a2c4c312f8f0e3e8d6800a51c2d5… commit d1a2c4c312f8f0e3e8d6800a51c2d59a4a7a03d4 Author: Dario Lombardo <lomato(a)gmail.com> Date: Tue Nov 8 16:31:01 2016 +0100 bt-dht: add data to COL_INFO. Change-Id: I69e8b012156020f79cf22604bc709fc70f215155 Reviewed-on: https://code.wireshark.org/review/18710 Petri-Dish: Dario Lombardo <lomato(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=720927a10ea9fe5a82155080114d85… commit 720927a10ea9fe5a82155080114d85b8638f3b8c Author: Michal Labedzki <michal.labedzki(a)tieto.com> Date: Thu Nov 10 09:10:44 2016 +0100 androiddump: Set socket connect() timeout to 500ms This should avoid neverending or long time to obtain timeout in some cases like firewall's drop rules, etc. Bump version to 1.0.4 Bug: 13104 Ping-Bug: 13114 Change-Id: I9bef714b6d92b3516a2a95ebdbe1ba594fa60e34 Reviewed-on: https://code.wireshark.org/review/18728 Petri-Dish: Michal Labedzki <michal.labedzki(a)tieto.com> Reviewed-by: Dario Lombardo <lomato(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Peter Wu <peter(a)lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=51bdba4c1f1a94b5b14f4a4894d67b… commit 51bdba4c1f1a94b5b14f4a4894d67b99de6b02f6 Author: Alexis La Goutte <alexis.lagoutte(a)gmail.com> Date: Mon Nov 7 19:34:04 2016 +0100 GVSP: Disable the heuristic by default Already try to enhance but get always some false positive with STUN/RTP Change-Id: I187959ed526a0d538a2c6db76af07ae3dbf06c6e Reviewed-on: https://code.wireshark.org/review/18702 Reviewed-by: thies.moeller <thies.moeller(a)baslerweb.com> Reviewed-by: Anders Broman <a.broman58(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=1be79dd3a841fd89db1e2b43cedfc5… commit 1be79dd3a841fd89db1e2b43cedfc5330c56f23d Author: Peter Wu <peter(a)lekensteyn.nl> Date: Wed Nov 9 01:55:30 2016 +0100 debian-setup: allow libssh-dev to be installed for trusty Ubuntu 14.04 Trusty has libssh-dev 0.6.1 (using OpenSSL) which should be usable. The debian/control file is not updated due to OpenSSL licensing concerns, if you need to build on trusty, you need dpkg-buildpackage -d (--no-check-builddeps). Remove distro-detection in favor of feature detection. Note that the minimum Ubuntu versions could be lower, but unsupported versions are not listed on packages.ubuntu.com so I did not bother. Change-Id: Ia04d960f3d4957918c925bf9cd351537e233fd3e Reviewed-on: https://code.wireshark.org/review/18725 Reviewed-by: Dario Lombardo <lomato(a)gmail.com> Reviewed-by: Balint Reczey <balint(a)balintreczey.hu> http://cgit.osmocom.org/wireshark/commit/?id=cbccf05f8be8b3c5dc2f03f3197451… commit cbccf05f8be8b3c5dc2f03f31974512c84be5a0c Author: João Valverde <joao.valverde(a)tecnico.ulisboa.pt> Date: Wed Nov 9 19:02:01 2016 +0000 CMake: Use xz generator with cpack We already do so with autotools. Change-Id: I0d7ea052ee19a42d16e82134f2f7188b3a19ee1e Reviewed-on: https://code.wireshark.org/review/18727 Reviewed-by: Peter Wu <peter(a)lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato(a)gmail.com> Tested-by: Dario Lombardo <lomato(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=cb0697c99e4e09feac58bfe24f82b9… commit cb0697c99e4e09feac58bfe24f82b9cc034d7b64 Author: Dario Lombardo <lomato(a)gmail.com> Date: Fri Nov 4 11:55:33 2016 +0100 CMake: fix cpack archive name to include version CPACK_PACKAGE_VERSION is used before setting its value. Remove spurious CPACK_SYSTEM_NAME usage. Before: CPack: - package: wireshark/build-test/wireshark--.tar.bz2 generated. After CPack: - package: wireshark/build-test/wireshark-2.3.0.tar.bz2 generated. Change-Id: I6f12017113f64b9c759a3fbd930cb3ee0807811d Reviewed-on: https://code.wireshark.org/review/18669 Reviewed-by: João Valverde <j(a)v6e.pt> Tested-by: João Valverde <j(a)v6e.pt> Petri-Dish: João Valverde <j(a)v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Peter Wu <peter(a)lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=f1486a9f93de20be6741631fb15222… commit f1486a9f93de20be6741631fb1522208a00a77f3 Author: Niels Widger <niels(a)qacafe.com> Date: Tue Nov 8 11:41:41 2016 -0500 Add DHCPv6 options for Softwire provisioning Bug: 12719 Signed-off-by: Alexis La Goutte <alexis.lagoutte(a)gmail.com> Signed-off-by: Sander Steffann <sander(a)steffann.nl> Change-Id: I2792ef4a5851cd2fba75fc253aa3d635cb7f1fa6 Reviewed-on: https://code.wireshark.org/review/16860 http://cgit.osmocom.org/wireshark/commit/?id=8e5e6ddc5e526abc84d162f24decfa… commit 8e5e6ddc5e526abc84d162f24decfa7be78887b1 Author: Gerald Combs <gerald(a)wireshark.org> Date: Tue Nov 8 11:11:14 2016 -0800 CMake: Enable ccache for gcc and clang. Add an option to check for and use ccache. Disable it by default. Change-Id: Ifc928d22715b7e06e53115455b31dbeaf2ee8332 Reviewed-on: https://code.wireshark.org/review/18715 Petri-Dish: Gerald Combs <gerald(a)wireshark.org> Reviewed-by: Peter Wu <peter(a)lekensteyn.nl> Reviewed-by: João Valverde <j(a)v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Gerald Combs <gerald(a)wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=857b80e41489f9064e8f5cbdd8c05b… commit 857b80e41489f9064e8f5cbdd8c05b3a9ce8adb3 Author: Gerald Combs <gerald(a)wireshark.org> Date: Tue Nov 8 11:44:31 2016 -0800 CMake: Use find_program to find a program. Use find_program to find glib-compile-resources instead of find_file. Change-Id: I565c3a596923ff4761bc38988ee396aa24bd63a6 Reviewed-on: https://code.wireshark.org/review/18714 Petri-Dish: Gerald Combs <gerald(a)wireshark.org> Reviewed-by: Peter Wu <peter(a)lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Gerald Combs <gerald(a)wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=b688175834c8ab302abb108df19c63… commit b688175834c8ab302abb108df19c63f7a075c458 Author: AndersBroman <anders.broman(a)ericsson.com> Date: Wed Nov 9 15:47:59 2016 +0100 [SIP] Use call_dissector_only() to call the diagnostics dissector. While there correct a typo. Change-Id: I58f9f4353e1fb4155d4f4f77f0f93325940d291f Reviewed-on: https://code.wireshark.org/review/18722 Petri-Dish: Anders Broman <a.broman58(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Anders Broman <a.broman58(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=d6e35b1a4728676efc4030182492e8… commit d6e35b1a4728676efc4030182492e8376bdcc3e4 Author: Jan Spevak <jan.spevak(a)nokia.com> Date: Wed Nov 9 10:21:03 2016 +0100 diameter_3gpp: update gx_feature_list_1 3GPP TS 29.212, v14.0.0 Change-Id: I9995f718ab323b48408951a7df792b7b72ce3c8f Reviewed-on: https://code.wireshark.org/review/18720 Petri-Dish: Pascal Quantin <pascal.quantin(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=7d2dc97c43021cbef5e561c050cb36… commit 7d2dc97c43021cbef5e561c050cb36760ed81a43 Author: Gerald Combs <gerald(a)wireshark.org> Date: Tue Nov 8 11:00:51 2016 -0800 Qt: Restore the default "About" box tab. Set the default about box tab back to "Wireshark". (Presumably this changed due to Qt Creator's annoying last-tab-selected-wins behavior.) Change-Id: I85f64b623758a14e9588f6b3929bad26a6a60ad5 Reviewed-on: https://code.wireshark.org/review/18716 Reviewed-by: Gerald Combs <gerald(a)wireshark.org> http://cgit.osmocom.org/wireshark/commit/?id=a77e8a325212518419df890570f8b0… commit a77e8a325212518419df890570f8b03a3afdb67f Author: Peter Wu <peter(a)lekensteyn.nl> Date: Tue Nov 8 18:04:59 2016 +0100 cmake: install missing profiles directory Spotted when comparing an autotools "make install" tree with the cmake one. Change-Id: I68eed5f518a72a6476c3e464a6997f0b3855144e Reviewed-on: https://code.wireshark.org/review/18713 Petri-Dish: Peter Wu <peter(a)lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Peter Wu <peter(a)lekensteyn.nl> http://cgit.osmocom.org/wireshark/commit/?id=4e95d5fa8e2f7fec72f0d7350a0b07… commit 4e95d5fa8e2f7fec72f0d7350a0b07ca8cdfa12b Author: Martin Kaiser <wireshark(a)kaiser.cx> Date: Tue Nov 8 15:30:45 2016 +0100 cmake: fix the linker flags test for Visual Studio ddd1c87d43781533c3ec10279857e3870d12437e modified the order of linker command line options. This broke the tests and made invalid linker flags seem valid. (Link target) -> LINK : warning LNK4044: unrecognized option '/Wl,--as-needed'; ignored [C:\wireshark\build3\wsutil\wsutil.vcxproj] LINK : warning LNK4044: unrecognized option '/pie'; ignored [C:\wireshark\build3\wsutil\wsutil.vcxproj] The simple fix is to add specific options for Visual Studio and clang at the beginning of the linker's command line options rather than at the end. Change-Id: I6492ea1271e18be0d190e7579f47baecf6ac4d61 Reviewed-on: https://code.wireshark.org/review/18709 Petri-Dish: Martin Kaiser <wireshark(a)kaiser.cx> Reviewed-by: Peter Wu <peter(a)lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Graham Bloice <graham.bloice(a)trihedral.com> Reviewed-by: Martin Kaiser <wireshark(a)kaiser.cx> http://cgit.osmocom.org/wireshark/commit/?id=7531318e054153fbd5e33624ef3031… commit 7531318e054153fbd5e33624ef30314acd52b6bc Author: Anthony Coddington <anthony.coddington(a)endace.com> Date: Fri Oct 14 12:46:29 2016 +1300 ERF: Fix issues with Host ID mapping packet-erf: Fix Host ID/Source ID showing for all extension header types. Only show generated Host ID/Source ID when there is a Host ID extension header or there was not one on the record. Assumes there is only one Source ID if multiple Flow ID extension headers (unlikely) and that it matches the one in the Host ID header. This is consistent with other tools. Does support multiple Host ID extension headers though. Fix dag_version tag short name. Was clashing with another tag due to typo. ERF wiretap: Don't conflate Host ID 0 with implicit Host ID. While the implicit Host ID defaults to 0, it is not the same thing as seeing a packet with Host ID explicitly 0 in the extension header which means explicitly unknown source. Store the initial (unknown) implicit Host ID interface mapping in it's own special mapping table entry rather than 0. Noticed we can currently get duplicate interfaces in the unusual event of mixed implicit and explicit Host ID packet extension headers for the same ID before we discover that mapping. Consistently abandon the implicit version for consistency with the dissector linking behaviour and mark the interface as unmatched in the description. In 2 pass mode (including normal Wireshark file open) the abandoned interface ends up with no packets. In the common cases (all Host ID or no Host ID on packet records) this duplicate interface will not be created in the first place. Change-Id: Ic5d0b2ce9aae973f1693a247cf240ef1324ff70a Ping-Bug: 12303 Reviewed-on: https://code.wireshark.org/review/18704 Reviewed-by: Stephen Donnelly Petri-Dish: Anders Broman <a.broman58(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Anders Broman <a.broman58(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=1ae0c1ebfaed748378395a0c690b10… commit 1ae0c1ebfaed748378395a0c690b10f8e7eb3265 Author: Pascal Quantin <pascal.quantin(a)gmail.com> Date: Tue Nov 8 11:52:17 2016 +0100 GSM A: allow a length of 3 bytes when using the 'no identity' type As stated in 3GPP 24.008 §10.5.1.4, for GMM and EMM procedures the length should be set to 3 when using the 'no identity' type. Change-Id: Ib2d5930416b0d26853f4cc430df0ce2f29488877 Reviewed-on: https://code.wireshark.org/review/18707 Reviewed-by: Pascal Quantin <pascal.quantin(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=c12280f804d419cbcd386a6d662f15… commit c12280f804d419cbcd386a6d662f150a66012d71 Author: Pascal Quantin <pascal.quantin(a)gmail.com> Date: Tue Nov 8 09:37:12 2016 +0100 print.c: fix ek output follow-up of g1b91475 Bug: 13086 Change-Id: I7171c50a0b113e3036860941b586e96a068fea9e Reviewed-on: https://code.wireshark.org/review/18705 Reviewed-by: Pascal Quantin <pascal.quantin(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=fc99bca3cfa0af0e908b4e25156a87… commit fc99bca3cfa0af0e908b4e25156a87f6c7f5d3d9 Author: Alexis La Goutte <alexis.lagoutte(a)gmail.com> Date: Mon Nov 7 14:57:56 2016 +0100 L2TP: Fix dissection when unknown vendor AVP Bug: 13103 Change-Id: I531aeb941bb80a1ac403d5e0ffcb6ba549ea9370 Reviewed-on: https://code.wireshark.org/review/18699 Reviewed-by: Michael Mann <mmann78(a)netscape.net> Petri-Dish: Michael Mann <mmann78(a)netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Anders Broman <a.broman58(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=ddd1c87d43781533c3ec10279857e3… commit ddd1c87d43781533c3ec10279857e3870d12437e Author: Martin Kaiser <wireshark(a)kaiser.cx> Date: Sun Oct 30 19:46:56 2016 +0100 cmake: avoid leading space in linker options This causes problems with cmake 2.8.9, which ships with Debian Wheezy. Reorder the linker options to avoid a leading space. According to GNU ld's manual, the order of linker options on the command line does not matter. This should be the same for Visual Studio's cl.exe and for clang's linker. See https://www.wireshark.org/lists/wireshark-dev/201604/msg00141.html for more details about the problem. Change-Id: Ieaf7425600d394f365b01747747665233693fea2 Reviewed-on: https://code.wireshark.org/review/18581 Petri-Dish: Martin Kaiser <wireshark(a)kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Martin Kaiser <wireshark(a)kaiser.cx> http://cgit.osmocom.org/wireshark/commit/?id=1b91475e0da15e58a9df7cd0cee6a4… commit 1b91475e0da15e58a9df7cd0cee6a463a8e0c97e Author: Pascal Quantin <pascal.quantin(a)gmail.com> Date: Fri Nov 4 07:45:09 2016 +0100 JSON: print field value for an item containing a subtree For fields that contain both a value and a subtree, print the value and then create a new item with a _tree suffix for the subtree content Bug: 13086 Change-Id: I5a3c96bf9895d87faff3925d439bb54b73769a3e Reviewed-on: https://code.wireshark.org/review/18663 Petri-Dish: Pascal Quantin <pascal.quantin(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Martin Kacer <kacer.martin(a)gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=3814eee112070b43eaf9dc39e7b19b… commit 3814eee112070b43eaf9dc39e7b19b2349ac6957 Author: Alexis La Goutte <alexis.lagoutte(a)gmail.com> Date: Mon Nov 7 14:59:36 2016 +0100 L2TP: Fix typo on ERICSSON define value Change-Id: I59b667d7415d340eddc48f648da594d2fac3ad93 Reviewed-on: https://code.wireshark.org/review/18700 Petri-Dish: Alexis La Goutte <alexis.lagoutte(a)gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Michael Mann <mmann78(a)netscape.net> http://cgit.osmocom.org/wireshark/commit/?id=fb5d024a0bf5e91f4f7399f386975e… commit fb5d024a0bf5e91f4f7399f386975e87449f2607 Author: Harald Welte <laforge(a)gnumonks.org> Date: Fri Nov 4 17:42:43 2016 +0100 AUTHORS: Update record for Harald Welte The record has become quite a bit out-of-date over the years. Change-Id: Id60e3e0839f27643227ddf79559769d228f17b0f Reviewed-on: https://code.wireshark.org/review/18687 Reviewed-by: Alexis La Goutte <alexis.lagoutte(a)gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin(a)gmail.com> http://cgit.osmocom.org/wireshark/commit/?id=12e030cd5bb369c8e90fe0682b43ea… commit 12e030cd5bb369c8e90fe0682b43ea28e07a9a9e Author: Birol Capa <birol.capa(a)siemens.com> Date: Fri Nov 4 09:27:41 2016 +0300 PROFINET: Update preliminary version of the Reporting System (RS) dissection. Timestamp decoding is added. Name of "Stop Observer" is changed as "Observer Status Observer". TimeStatusObserver padding bytes location is changed. Text of RS_ReasonCode for value "0" is changed from "Reserved" to "No Detail". Change-Id: I2c231d75001a89a1e41f2518f5c6ca1fdf49a2f0 Reviewed-on: https://code.wireshark.org/review/18662 Reviewed-by: Michael Mann <mmann78(a)netscape.net> Petri-Dish: Michael Mann <mmann78(a)netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply(a)wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 11 + CMakeOptions.txt | 1 + CPackConfig.txt | 52 ++-- cmake/modules/CheckCLinkerFlag.cmake | 7 +- debian/libwireshark0.symbols | 1 + docbook/CMakeLists.txt | 6 +- docbook/Makefile.am | 3 + docbook/README.txt | 20 +- docbook/asciidoc.conf | 60 +---- docbook/attributes.asciidoc | 71 ++++++ docbook/developer-guide.asciidoc | 1 + docbook/release-notes.asciidoc | 2 + docbook/user-guide.asciidoc | 1 + docbook/wsdg_src/WSDG_chapter_dissection.asciidoc | 2 +- docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc | 68 +++--- docbook/wsdg_src/WSDG_chapter_libraries.asciidoc | 2 +- docbook/wsdg_src/WSDG_chapter_sources.asciidoc | 55 +++-- .../wsdg_src/WSDG_chapter_userinterface.asciidoc | 14 +- docbook/wsdg_src/WSDG_preface.asciidoc | 44 ++-- docbook/wsug_src/WSUG_app_protocols.asciidoc | 2 +- docbook/wsug_src/WSUG_app_tools.asciidoc | 11 +- docbook/wsug_src/WSUG_chapter_advanced.asciidoc | 15 +- .../wsug_src/WSUG_chapter_build_install.asciidoc | 46 ++-- docbook/wsug_src/WSUG_chapter_capture.asciidoc | 49 ++-- docbook/wsug_src/WSUG_chapter_customize.asciidoc | 23 +- .../wsug_src/WSUG_chapter_introduction.asciidoc | 106 ++++----- docbook/wsug_src/WSUG_chapter_statistics.asciidoc | 4 +- docbook/wsug_src/WSUG_chapter_telephony.asciidoc | 7 +- docbook/wsug_src/WSUG_chapter_use.asciidoc | 10 +- docbook/wsug_src/WSUG_chapter_work.asciidoc | 2 +- docbook/wsug_src/WSUG_preface.asciidoc | 24 +- epan/dissectors/asn1/ranap/packet-ranap-template.c | 2 +- epan/dissectors/asn1/sabp/packet-sabp-template.c | 2 +- epan/dissectors/packet-asterix.c | 2 +- epan/dissectors/packet-bt-dht.c | 1 + epan/dissectors/packet-btsmp.c | 13 +- epan/dissectors/packet-dhcpv6.c | 247 +++++++++++++++++++ epan/dissectors/packet-diameter_3gpp.c | 62 ++++- epan/dissectors/packet-erf.c | 82 +++---- epan/dissectors/packet-ethertype.c | 1 + epan/dissectors/packet-gdb.c | 9 +- epan/dissectors/packet-gsm_a_common.c | 2 +- epan/dissectors/packet-gsm_abis_om2000.c | 4 +- epan/dissectors/packet-gvsp.c | 2 +- epan/dissectors/packet-imf.c | 35 ++- epan/dissectors/packet-imf.h | 16 +- epan/dissectors/packet-l2tp.c | 12 +- epan/dissectors/packet-lsd.c | 3 +- epan/dissectors/packet-ospf.c | 57 +++-- epan/dissectors/packet-per.c | 142 ++++++++--- epan/dissectors/packet-per.h | 2 +- epan/dissectors/packet-ranap.c | 2 +- epan/dissectors/packet-sabp.c | 2 +- epan/dissectors/packet-sip.c | 78 +++++- epan/dissectors/packet-ssl-utils.c | 2 +- epan/dissectors/packet-ssl-utils.h | 2 +- epan/dissectors/packet-tcp.c | 263 ++++++++++++++++++--- epan/dissectors/packet-xml.c | 2 +- epan/follow.c | 41 ++++ epan/follow.h | 10 + epan/ftypes/ftype-guid.c | 9 +- epan/print.c | 36 +-- epan/tvbuff.c | 4 +- extcap/androiddump.c | 25 +- make-version.pl | 18 +- plugins/profinet/packet-dcerpc-pn-io.c | 89 +++++-- plugins/profinet/packet-pn-mrp.c | 244 ++++++++++++++----- tools/debian-setup.sh | 36 ++- ui/CMakeLists.txt | 1 + ui/Makefile.am | 1 + ui/cli/tap-follow.c | 3 +- ui/export_object.h | 2 + ui/{export_object_http.c => export_object_imf.c} | 18 +- ui/gtk/CMakeLists.txt | 6 +- ui/gtk/follow_stream.c | 17 +- ui/qt/about_dialog.ui | 2 +- ui/qt/export_object_dialog.cpp | 5 + ui/qt/export_object_dialog.h | 2 +- ui/qt/follow_stream_dialog.cpp | 24 +- ui/qt/main_status_bar.cpp | 76 ++++-- ui/qt/main_status_bar.h | 10 + ui/qt/main_welcome.cpp | 24 +- ui/qt/main_welcome.h | 8 +- ui/qt/main_window.cpp | 10 +- ui/qt/main_window.h | 21 +- ui/qt/main_window.ui | 6 + ui/qt/main_window_slots.cpp | 13 +- ui/qt/search_frame.h | 2 +- ui/qt/wireshark_application.cpp | 45 ++-- ui/qt/wireshark_application.h | 15 +- wireshark-qt.cpp | 2 +- wiretap/erf.c | 97 ++++++-- wiretap/erf.h | 1 + 93 files changed, 1953 insertions(+), 737 deletions(-) create mode 100644 docbook/attributes.asciidoc copy ui/{export_object_http.c => export_object_imf.c} (79%) hooks/post-receive -- wireshark with Osmocom specific dissectors