summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-06-29Added General Notification Message opcode to CFMGabor Vaszkun1-0/+105
Change-Id: Ieeb3f9ae6b9b261bb68917005d15822197e37b4e Reviewed-on: https://code.wireshark.org/review/22462 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>
2017-06-29sccp: build the "association tree" earlierIvan Nardi1-25/+48
Remove a double lookup in RLSD message dissection, too Ping-Bug:13861 Change-Id: Ie971c0779baad76fb22f8a59d045e38c072e8f06 Reviewed-on: https://code.wireshark.org/review/22448 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>
2017-06-29sccp: build associations on IT messages, tooIvan Nardi1-0/+2
Useful when you have long sessions, without the start (i.e. CC/CR) and the end (i.e. RLSD/RLC). Similar to 10d2e652289c0179763928dd43998783752e49d3 Change-Id: Ifb97bd9fe88ee59f3816fce1111132b247bf46c8 Reviewed-on: https://code.wireshark.org/review/22446 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>
2017-06-29Support AECP vendor unique command and response messages.Daniel McLean1-3/+27
Added support for registering custom dissectors for AECP vendor unique command and response message dissection. Fixed a minor typo Change-Id: I7ae363f126d4db513be0529fc6dd7fd189d4f3d8 Reviewed-on: https://code.wireshark.org/review/22438 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>
2017-06-29btle: Reorder elements in Packet Header and Data HeaderStig Bjørlykke1-10/+10
This shows the elements in a little-endian fashion and aligns with other element trees using bitmask. Change-Id: I8e16eaee9944c2b56bc9fe18f31a983047aca121 Reviewed-on: https://code.wireshark.org/review/22453 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-29btl2cap: Cleanup indent and spacingStig Bjørlykke1-69/+87
Fix indent and spacing in if-statements to improve readability. Change-Id: I3bd295d5d397e6e4b211c2d6fed25ab93e14142c Reviewed-on: https://code.wireshark.org/review/22452 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-29S1AP: upgrade dissector to v13.6.0Pascal Quantin9-19/+24
Change-Id: Ic75bd30ae77053241bebeb47e9b3e10529a8d0f7 Reviewed-on: https://code.wireshark.org/review/22451 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>
2017-06-29X2AP: upgrade dissector to v13.7.0Pascal Quantin9-9/+30
Change-Id: I1580bf4da1a31a6e0f77080e0835eb0dd5b3936c Reviewed-on: https://code.wireshark.org/review/22450 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>
2017-06-29LTE RRC: upgrade dissector to v13.6.0Pascal Quantin11-607/+1247
Change-Id: I0a4288b5044849fa0abe4b58c3c5795e16cee25a Reviewed-on: https://code.wireshark.org/review/22454 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>
2017-06-28e212: report an expert info on malformed imsiIvan Nardi1-1/+26
Change-Id: I344b061f6fbbfc41f7578005709b9b8033379609 Reviewed-on: https://code.wireshark.org/review/22447 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-28 FP: Combining heuristic dissectorsDarien Spencer3-145/+240
Combining all seperate heuristic dissector into one 'fp over udp' dissector. Also refactored the 'unknown format' dissector (formarly heur_dissect_fp) so it could work 'chained' to the others. Change-Id: I396c362a400f51171ee091317b6735dfd8bd19df Reviewed-on: https://code.wireshark.org/review/22368 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>
2017-06-28x11: Make a tmp variable volatileStig Bjørlykke1-1/+1
This fixes a warning: [...]/epan/dissectors/packet-x11.c:5019:26: error: variable ‘tmp’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered] gint64 tmp = (gint64)plen * 4; Change-Id: I9462d3a71081e53a5567716e660a8306c4e028bf Reviewed-on: https://code.wireshark.org/review/22443 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-28androiddump: Fix printf format for size_tStig Bjørlykke1-1/+1
Change-Id: Ia4646b649881316350ee1aed7d8cc9626036dd30 Reviewed-on: https://code.wireshark.org/review/22442 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-28Qt: Drag/Drop Filter buttons to orderRoland Knall9-4/+342
Allow the ordering of the filter buttons via drag/drop in the toolbar Change-Id: Id8793d6514bae36066a7a23d6890985665e753bd Reviewed-on: https://code.wireshark.org/review/22422 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-28Qt: Change wording of filter button context menuRoland Knall1-4/+4
Change the wording to make it more like the other option menus Change-Id: I0d071aecd80131e5304737a1746f3a41f546c8e4 Reviewed-on: https://code.wireshark.org/review/22441 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-28Windows: update c-ares to v1.13.0 and zlib to v1.2.11Pascal Quantin2-9/+9
Change-Id: I17f92dd76dc53732d5d764c2a129acb7b69bbe08 Reviewed-on: https://code.wireshark.org/review/22440 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>
2017-06-28IEEE 802.15.4: Whitespace and small comment cleanupsRobert Sauter1-268/+271
No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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>
2017-06-28Don't worry about initializing auto aggregates with non-constant values.Guy Harris1-9/+16
On UN*X, you can get C99-or-later compilers, and we request that in the autoconf script, so it's really a requirement. At least as I read https://msdn.microsoft.com/en-us/library/34h23df8%28v=vs.100%29.aspx Visual Studio 2010 (and earlier, going back to VS .NET 2003) supports the "Use of block-scope variables initialized with nonconstant expressions", with an example of an aggregate (array) initialization involving function calls, so it sounds as if it's available on Windows with any version of VS that we support. (If I've missed something, it'll presumably show up when something is built with MSVC, and we can update this at that point.) So the only thing to avoid is initializing global or static variables with a value that has to be evaluated at run time (the ability to do that is probably present in most environments, as I think C++ constructors for variables with static storage duration might have to be evaluated before main() is called, but I guess few C compilers bother to use it). Expand the example in the hopes of avoiding confusion between "static storage duration" (which something declared "static" has, but which anything declared with file scope, whether declared "static" or not, also has) and "static storage duration and internal linkage", which is what the "static" keyword specifies. Change-Id: I338eb0892e656c2ab59519e4bf76e1dfbec2fa7d Reviewed-on: https://code.wireshark.org/review/22434 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-27Fix the "don't initialize with non-constant variables" item.Guy Harris1-4/+20
It only applies to variables with static storage duration, i.e. global and static variables. Expand the example of how to do it, to make it a bit clearer. Change-Id: Ie0c473a35a77351dd10d6c9df2c34a39f077fca4 Reviewed-on: https://code.wireshark.org/review/22430 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-27Qt: fix alloc-dealloc-mismatch while adding named pipePeter Wu3-34/+30
ManageInterfacesDialog::on_addPipe_clicked uses g_new0 to create an "interface_t" instance, but InterfaceTreeCacheModel uses qDeleteAll which results in ASAN reporting "alloc-dealloc-mismatch (malloc vs operator delete)". To fix this, remove the dynamic allocation and make InterfaceTreeCacheModel store the instance internally. Change-Id: I9426dfc88d0a54a889bbbc9cf336c0a6af76920e Reviewed-on: https://code.wireshark.org/review/22410 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-27IEEE 802.15.4: Support for CSL Header IERobert Sauter1-1/+35
Change-Id: Ibda1f0757401566170459570e1138ac3dc3e5101 Reviewed-on: https://code.wireshark.org/review/22421 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-06-27WiX: More merge module fixups.Gerald Combs1-7/+13
Look for our merge module using find_path. This should be more reliable and doesn't assume our build and target platforms are the same. Change-Id: I95a4454a063af2f978550b8cf1f1624c4aeb5ebc Reviewed-on: https://code.wireshark.org/review/22426 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-27CMake: Fix the WiX search path.Gerald Combs1-3/+9
Look for WiX executables in $WIX/bin instead of $WIX. Change-Id: Id55eb8e73403d2beed55d64e9bdc6812308c359f Reviewed-on: https://code.wireshark.org/review/22423 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-27Qt: Context menu for toolbar filter buttonsRoland Knall7-9/+180
Adds a context menu for the toolbar filter buttons, which allows for opening the preference for the filter buttons, as well as direct edit, removal and disable functionality Change-Id: I5f2d132737c77804cf22834574dfe3c02f85fbdf Reviewed-on: https://code.wireshark.org/review/22327 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-27dcerpc: improve greatly the speed of processing of DCERPC packetsMatthieu Patou1-42/+140
Instead of using one big linked list, we use a stack of list once all the pointers of one level have been handled the list is removed from the stack and we go to the level before. Because of this the lists are much smaller and far less CPU is spent iterating on the objects or inserting objects in the list Bug: 10544 Change-Id: I432aaf5b4b781411c92da92abe9c5503034b65dc Reviewed-on: https://code.wireshark.org/review/4598 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>
2017-06-27androiddump: Support packet capture on any interface that is upMikael Kanstrup1-32/+101
androiddump used to start tcpdump without specifying the interface to capture packets on. This works when only one interface is up but when multiple interfaces are up the output might be empty. This change let tcpdump list all available network interfaces and adds a unique extcap interface for each interface that is 'up' on the device. Change-Id: Icf0d7fa8f38320092579d4163dcdbcf2b687d8cc Reviewed-on: https://code.wireshark.org/review/22402 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-27androiddump: Use Android tcpdump reported data link typeMikael Kanstrup1-1/+54
Instead of treating all output from Android tcpdump as Ethernet data link type parse what tcpdump acually tells it to be. This is needed as there are cases when the output is not Ethernet. For example when starting packet capture on a device with multiple interfaces up. NOTE: As translation between tcpdump reported DLT and androiddump's internal type was needed for now support is only added for types used by network interfaces of tested devices (i.e. ETHERNET and LINUX_SSL). Change-Id: Ie3f9167176c336cb31f6e681f1daac6135a78883 Reviewed-on: https://code.wireshark.org/review/22401 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>
2017-06-27IEEE 802.15.4: Overhaul Header IE dissectionRobert Sauter2-228/+273
Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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>
2017-06-27The 3rd argument to recv() is an int on Windows.Guy Harris1-2/+2
Make the variable used for it an int; that's large enough, and, on Windows, not so large that it provokes warnings. Change-Id: I00600d816f69d79f7a42eb09b1290ff7708b0bfc Reviewed-on: https://code.wireshark.org/review/22420 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-27On UN*X, make sure we can find inflate() in libz.Guy Harris2-1/+37
For example, on at least some versions of Fedora, if you have a 64-bit machine, have both the 32-bit and 64-bit versions of the run-time zlib package installed, and have only the *32-bit* version of the zlib development package installed, it'll find the header, and think it can use zlib, and will use it in subsequent tests, but it'll try and link 64-bit test programs with the 32-bit library, causing those tests to falsely fail. Hilarity ensues. Change-Id: Ic2536e8a652ef96e2a3923c1faa61f6c8c06bf58 Reviewed-on: https://code.wireshark.org/review/22417 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>
2017-06-27androiddump: Let adb_send funcs generate string length prefixMikael Kanstrup1-37/+55
All strings sent to adb are prefixed with the length as a 4 byte hex string. The length info prefix was manually hard coded into strings. To avoid mistakes when updating code and to simplify reading the source code instead let the various adb_send functions calculate string lengths and generate the 4 byte hex string prefixes. Change-Id: I4178e9df5930a1c7904053e5a7750c943efddc84 Reviewed-on: https://code.wireshark.org/review/22399 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: Anders Broman <a.broman58@gmail.com>
2017-06-27Don't check for inflatePrime() on Windows.Guy Harris1-5/+19
On Windows, we build libz as part of the Wireshark build process, so we don't necessarily *have* a libz library to search or inflatePrime() at this point; the search fails on the buildbots, for example. So, on Windows, we just assume we have a new enough version of libz, so that it has inflatePrime(). Bug: 13850 Change-Id: Ied0909f4a591ff3312d83a2a2ed41e3cd12218e8 Reviewed-on: https://code.wireshark.org/review/22413 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-26Fix make-dist targetJoão Valverde1-1/+0
Change-Id: Idc56d93ce3f8d9b5cc78b1380eec5b7c2bca6213 Reviewed-on: https://code.wireshark.org/review/22412 Reviewed-by: João Valverde <j@v6e.pt>
2017-06-26Parse enterprise-numbers at run timeJoão Valverde35-250900/+50297
"enterprise-numbers" is converted to tab-separated values and renamed "enterprises". Unused fields are stripped. PENs are stored in a hash table loaded at run-time. User "enterprises" file is loaded from the personal config dir. Misc make-sminmpec.pl improvements and fixes. Note: names of type "Entity (formerly ...)" have the formerly part commented out for a cleaner output. Change-Id: I60c533afbe3e399077fbf432088064471ad3e1e2 Reviewed-on: https://code.wireshark.org/review/22246 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2017-06-26lz4 doesn't support "make distclean", so don't use it.Guy Harris1-1/+4
Change-Id: Ie63c58752d93be9e4027a55074b6a8fbf81986b3 Reviewed-on: https://code.wireshark.org/review/22411 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-26PDCP LTE: fix dissection of Polling bit for User plane Data PDU with 18 bits SNPascal Quantin1-4/+14
Change-Id: Id1167d2c6fa84fd5145d5f0313e39f53591a9add Reviewed-on: https://code.wireshark.org/review/22406 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-26Fix Filter Tooltip button and frameRoland Knall5-133/+162
Make the frame into a two-row frame to better accomodate the comments field, and reinstate the correct action for the buttons Change-Id: I171e4bc3c7f195b7179cd6b1c2ab4ab42ede9c04 Reviewed-on: https://code.wireshark.org/review/22405 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-26androiddump: Add helper functions for data link type conversionsMikael Kanstrup1-21/+26
Change-Id: I406f5cd6d979442014fdda01deacbcec2052ec18 Reviewed-on: https://code.wireshark.org/review/22400 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-26androiddump: Introduce adb_connect_transport helper functionMikael Kanstrup1-359/+96
Same code pattern is used over and over when connecting to an adb server. Introduce a helper function that perform the function of connecting to specified adb server and transport. Change-Id: Id2f72f1eb976fa0d742a6db1ef6d592264990ba1 Reviewed-on: https://code.wireshark.org/review/22398 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-26[RFC]androiddump: Only filter CR/LFs on WindowsMikael Kanstrup1-0/+2
Comments in code claim: "The data we are getting from the tcpdump stdoutput stream as the stdout is the text stream it is convertinng the 0A=0D0A; So we need to remove these extra character." This is not true on non-Windows systems at least so avoid the filter when not built for Windows. NOTE: A problem with the filter is that it operates on all bytes received on the socket, including packet data(!). Capturing data with CR/LFs (for example an HTTP request) will fail. Ideally the filter should be replaced with some other mechanism but as I don't have a Windows system to verify that the comment claims are valid, this change will at least make androiddump work on non-Windows systems. Bug: 13510 Change-Id: Ic00f44fa7516c0db7fc015ed8685deb365a347db Reviewed-on: https://code.wireshark.org/review/22397 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-26Change display filter button tooltip formatting.Michael Mann2-2/+2
Go from <expression>,<comment> to <comment>\n<expression> Bug: 13814 Change-Id: I842e38798eba7ff87751733ce0b2befdc9c8c27f Reviewed-on: https://code.wireshark.org/review/22395 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>
2017-06-26cmake: fix SET_FEATURE_INFO deprecation warningPeter Wu1-10/+42
Fix deprecation warnings that occur with cmake 3.8, replacing it by some other function that is supported since at least cmake 2.8.8. This also updates URLs and splits the description in a package description and the purpose for the package (shown on the next line). Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f Reviewed-on: https://code.wireshark.org/review/22393 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-26Fix Packet Lengths statistics countSilvio Gissi1-1/+6
Packet statistics were not showing the packets above 5120 due to the last entry being reformatted and not parsed correctly. Since the last entry is "reformatted" for better user string, also "reformat" the last entry as it goes through "range processing". Bug: 13844 Change-Id: Id49b41c08111dcad1590e034159b81ead8636c4e Reviewed-on: https://code.wireshark.org/review/22382 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>
2017-06-26Add support for comments for a display filter buttonMichael Mann7-8/+57
Add a field to the display filter button UAT to allow comments to be displayed as part of the tooltip to the diplay filter button Bug: 13814 Change-Id: I74459e4102856258d31d6429e2fd924a9f798cd5 Reviewed-on: https://code.wireshark.org/review/22390 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-26Convert filter expressions preference data to a UAT.Michael Mann19-783/+601
The filter expressions data was shoved into the preference file in a very loose, non-arrayed form. It's much easier to manage in code (and for users in a separate file) as a UAT. The GTK GUI was hacked to use the existing UAT dialog rather than rewrite the pref_filter_expressions.c to support a UAT. Should be okay since it's deprecated. Change-Id: I688cebb4b7b6594878c1398365e79a205f1902d9 Ping-Bug: 13814 Reviewed-on: https://code.wireshark.org/review/22354 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-25Sample deprecated filter -> Sample warning filterMichael Mann2-2/+2
"Warning" is a more appropriate name because filter may not be as deterministic as user desires Bug: 13834 Change-Id: Ie34e37db8866dc409f25df227a4d34e7c11d0058 Reviewed-on: https://code.wireshark.org/review/22392 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-25Fix Y.1711 endiannessSilvio Gissi1-3/+3
ITU Y.1711 at https://www.itu.int/rec/T-REC-Y.1711-200402-I/en states that OAM payloads are big endian (section 5.3) as reported on bug. Bug: 8292 Change-Id: Id30e340eee5f5a5c96020cdd1770fa48adb5d169 Reviewed-on: https://code.wireshark.org/review/22383 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-06-25[Automatic update for 2017-06-25]Gerald Combs13-1833/+2295
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I6febcb360b1b3e5e761086d422050e6ec95d5c45 Reviewed-on: https://code.wireshark.org/review/22384 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-25USB CCID: use register_decode_as_next_proto()Martin Kaiser1-19/+4
Change-Id: Ib583470ba612ef24da4d9360f7bbc0e33fb19bd9 Reviewed-on: https://code.wireshark.org/review/22377 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>
2017-06-24decode_as: replace DISSECTOR_ASSERT() with g_assert()Martin Kaiser1-4/+4
Don't use DISSECTOR_ASSERT() unless we're in wmem packet scope, see commit 341b06ce0795ae957627c9174b57e75c7827f028 Change-Id: I509f9197155fe6ea6f46c23c93eb188220b9dd8d Reviewed-on: https://code.wireshark.org/review/22379 Reviewed-by: Michael Mann <mmann78@netscape.net>