summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-07-03Add option to use wall-clock intervalsHEADmasterSake Blok13-87/+249
Add the "interval" option to "-b". Each new capture starts at the exact start of a time interval. For instance, using -b interval:3600 will start a new capture file at each whole hour. Changed the duration option in the GUI interfaces to use the new interval option. Change-Id: I0180c43843f5d2f0c2f50153c9ce42ac7fa5aeae Reviewed-on: https://code.wireshark.org/review/22428 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Sake Blok <sake.blok@SYN-bit.nl>
2017-07-03ieee802154: fix a bug preventing Payload Terminate IE dissectionYasuyuki Tanaka1-1/+1
Bug: 13867 Change-Id: Ib251b8646ddf428f0aa053dd91b613c027145d20 Reviewed-on: https://code.wireshark.org/review/22499 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>
2017-07-01ZigBee: Add attribute and command names from Price used with GBCSKenneth Soerensen2-0/+399
The Great Britain Companion Specification specifies how energy meters will communicate in the UK. This patch adds names for attributes and commands from the Smart Energy Price cluster that are used within that specification. Change-Id: Ibbbf2ac52f61887004f03bbb1aa7f4d57b63268e Reviewed-on: https://code.wireshark.org/review/22473 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>
2017-07-01ospf: workaround Opaque Information with bad TLVPeter Wu1-5/+13
The linked pcap seems to contain a TLV (type=255 (Unknown)) followed by four bytes (00 00 00 14, interpreted as TLV (type=0, length=20)). That is bogus, so stop dissecting if no more data is available. While at it, implement alignment at four octets. Bug: 13823 Change-Id: Iacf863c0c6605db40e87f63a950d61c1db6debaa Reviewed-on: https://code.wireshark.org/review/22488 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-07-01androiddump: Close socket on failure pathMikael Kanstrup1-0/+3
Fix a few cases where socket is not closed on failure path. Change-Id: Id116a8e5f14979f962fdf725c62999758b79109e Reviewed-on: https://code.wireshark.org/review/22481 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-07-01androiddump: Fix null dereference if linktype not foundMikael Kanstrup1-0/+2
If linktype cannot be determined from tcpdump output the lookup function is handed a NULL which is then strcmp:ed. Handle NULL parameter by explicit check. Fixes Coverity CID 1413923 Change-Id: I290c116991d15cef0a1e954a9f8b76722a5f450c Reviewed-on: https://code.wireshark.org/review/22483 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-30androiddump: Fix leaked linktype stringMikael Kanstrup1-0/+1
The regex matching for linktype might be performed multiple times. Make sure string is freed before fetched again. Change-Id: Ice7812ff4a3a8e6a1497ab2ef5aa94976502c16f Reviewed-on: https://code.wireshark.org/review/22482 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-30iface_lists: select interfaces via command line (option -i)Peter Wu1-4/+6
The "wireshark -i lo" option somehow did not mark interfaces as selected. It turns out that the "-i" option populates the "ifaces" array during option parsing, but we must also set the "selected" property in the "all_ifaces" array in function "scan_local_interfaces". Bug: 13865 Fixes: v2.3.0rc0-2812-g40a5fb567a ("Restore interface selection after interface refresh") Change-Id: Iacfeaf14efe2696f37f0e021259c59fb677de435 Reviewed-on: https://code.wireshark.org/review/22478 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-30ospf: update LSA Option TypesPeter Wu1-9/+18
Add missing entries from IANA registry, remove dummy OSPF_LSA_UNKNOWN which does not exist and has become unused in the code. Change-Id: I55e28e67da744e358e0629906ef5ebd3c4c82b5d Reviewed-on: https://code.wireshark.org/review/22487 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-30ZigBee: Add remaining command names from Metering clusterKenneth Soerensen1-2/+22
Change-Id: If0dc66fa24f154561d45c373325218d71610e41c Reviewed-on: https://code.wireshark.org/review/22475 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-30ZigBee: Add attribute and command names from Calendar clusterKenneth Soerensen2-1/+280
Change-Id: I2e543a39a21d3fc71c0da80ce1cd9ca9e50a3bfc Reviewed-on: https://code.wireshark.org/review/22472 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-30ZigBee: Add remaining command names from Prepayment clusterKenneth Soerensen1-1/+9
Change-Id: I4dab9878f290564700e58ac191924f6574d67bce Reviewed-on: https://code.wireshark.org/review/22474 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-30btle: Improve reassembly when missing packetsStig Bjørlykke1-18/+32
Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-30btle: Support reassembly in both directionsStig Bjørlykke1-6/+40
Create one connection_info_tree for each direction to support reassembly in both directions simultaneously. Change-Id: If83e8705412062b07f3fa47a73f42db8c7895e78 Reviewed-on: https://code.wireshark.org/review/22476 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-30extcap: another round of memory leak fixesPeter Wu1-4/+14
Fix assorted memory leaks. Note that _tool_for_ifname is cleaned up at exit by extcap_cleanup, but lacked key/value destructors, so add them. After this, ASAN reports no more extcap memleaks. Change-Id: Ie5f4b1e2453a0beb52d617670202973839ca1416 Reviewed-on: https://code.wireshark.org/review/22466 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-30dumpcap: fix minor memory leak at begin of capturePeter Wu1-0/+2
While "os_info_str" is freed after the loop, "cpu_info_str" was leaked. Change-Id: Ia4069403c0a5dd5cc6bd7ed61726c1bfa9736b19 Reviewed-on: https://code.wireshark.org/review/22465 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-30dumpcap: fix buffer overflow on packets larger than 2048 bytesPeter Wu1-6/+20
When the current capture buffer is too small, it must be increased before attempting to read the next data packet. Fix developed by Mikael Kanstrup (and Guy), I added comments such that the next reader does not have to guess whether "incl_len" is accidentally used for reading from the buffer (it is not). Change-Id: I980bd21ac79601a34d57ffc99a34bfb54c297ac0 Fixes: v2.5.0rc0-28-gd0865fd619 ("Allow bigger snapshot lengths for D-Bus captures.") Bug: 13852 Reviewed-on: https://code.wireshark.org/review/22464 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-29NAS EPS: upgrade dissector to v13.10.0Pascal Quantin2-1/+44
Change-Id: I038ee9270a3118f3b2642c445cb2ab4b705fe57d Reviewed-on: https://code.wireshark.org/review/22463 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-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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-26 17:18:15 +0000