aboutsummaryrefslogtreecommitdiffstats
path: root/extcap
AgeCommit message (Collapse)AuthorFilesLines
2015-11-05extcap: Provide capture filter to extcap binaryStig Bjørlykke1-0/+5
Added the option --extcap-capture-filter to extcap to send the capture filter from the main screen to the extcap binary. Change-Id: I75f0d7dbec810551225377f9221053298488cdd5 Reviewed-on: https://code.wireshark.org/review/11423 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-09-23androiddump: add memset in adb_connect() (CID 1293396)Dario Lombardo1-0/+2
Change-Id: If9d281cd95cf12351d6da5e75c6de149ec7adc06 Reviewed-on: https://code.wireshark.org/review/10598 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-13androiddump: fix memory leaks reported by CoverityPascal Quantin1-0/+3
Change-Id: I55951d29c85f3e461b4028cfcadbc83745b1ebe7 Reviewed-on: https://code.wireshark.org/review/10506 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: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-11androiddump: fix compilation on Windows and OSXPascal Quantin1-4/+4
Change-Id: Ie724367b7dacb2a237c02451e14c70442e5be773 Reviewed-on: https://code.wireshark.org/review/10486 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>
2015-09-11Support for Wifi packet capture for android devices.Aditya Jain1-6/+265
Added the wifi capturing feature in the Androiddump. Wifi packet capturing is done by making use of tcpdump in android devices. Android wifi will appear as a capture interface in the interface window. This will be an added support for android devices for device network bandwidth analysis. Change-Id: I71d24ae5d1764d3ee7e50f09cd0b530ee9654844 Reviewed-on: https://code.wireshark.org/review/10414 Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-08-07androiddump: Try to make MVS14.0 happyMichal Labedzki1-186/+188
I guess using glib's gssize instead of ssize_t should be enough for: extcap/androiddump.c(736): error C2220: warning treated as error - no 'object' f ile generated extcap/androiddump.c(736): warning C4477: 'fprintf' : format string '%I64i' requ ires an argument of type '__int64', but variadic argument 3 has type 'ssize_t' extcap/androiddump.c(736): note: to simplify migration, consider the temporary use of /Wv:18 flag with the version of the compiler with which you used to build without warnings extcap/androiddump.c(736): note: consider using '%i' in the format string extcap/androiddump.c(736): note: consider using '%I32i' in the format string Change-Id: I1030694aed61d413be1aad54531f99db45e99c9d Reviewed-on: https://code.wireshark.org/review/9876 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>
2015-07-02Try to fix warning C6340: Mismatch on sign: 'short' passed as _Param_(2) ↵AndersBroman1-1/+1
when some unsigned type is required in call to 'printf'. Change-Id: I3076454502e1c98ac225d33d520be5bbe5172c2a Reviewed-on: https://code.wireshark.org/review/9451 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-01Try to fix some warnings from Visual Studio Code Analysis.AndersBroman1-5/+5
Change-Id: Ibbbb89af23d0e37ea57a1079e311d8205d254ddd Reviewed-on: https://code.wireshark.org/review/9434 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-19Bluetooth: Coverity fixesMichal Labedzki1-1/+11
Try to fix Coverity issues in Bluetooth HCI and androiddump. Change-Id: Id2ed35130eb4dbb0698b7a54afccdba56af62bfd Reviewed-on: https://code.wireshark.org/review/8983 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-12androiddump: Fix socket resource leakMichal Labedzki1-2/+67
Change-Id: I79cadef71d3d6f8e44c6a66045fb150119e0b40e Reviewed-on: https://code.wireshark.org/review/8896 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-12androiddump: Fix Bluetooth External ParserMichal Labedzki1-1/+12
Be careful when use char buffer [aka signed char] with arithmetic and thinking in unsigned logic. Also add missing rules for SCO. Change-Id: I3fbb0407c74215719103e08344be8f673a7deedf Reviewed-on: https://code.wireshark.org/review/8895 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-28Androiddump: fix Null pointer passed as an argument to a 'nonnull' parameterAlexis La Goutte1-0/+12
Change-Id: I8fbcac112d0b60e0129ce0fc17a5e0ffab02710f Reviewed-on: https://code.wireshark.org/review/8589 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-18androiddump: Case-insensitive for option and add verbose modeMichal Labedzki1-104/+204
If verbose mode is off, then androiddump is quite. Change-Id: Ib0b2d10acf05487a971e2bf7cbc27fd2666ec262 Reviewed-on: https://code.wireshark.org/review/8516 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-15androiddump: fix compilation under FreeBSDEdwin Groothuis1-0/+4
Bug: 11200 Change-Id: Ic46b235c84488bb8537ec3c2605e6770eb843795 Reviewed-on: https://code.wireshark.org/review/8469 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-04androiddump: Change expected boolean resultRoland Knall1-2/+2
Change boolean options to accept lower- and uppercase TRUE as positive result Change-Id: I858918f7591bb7daf94444fb6c82f9aa37168d01 Reviewed-on: https://code.wireshark.org/review/8283 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-23androiddump: Fix warning about unneeded valueMichal Labedzki1-6/+26
Value from strtol is not needed in this case, but compiler complains about it, so check if value range is valid and other possible error that can be detected. Change-Id: I6a8eeb6d2cb62c155772201000eca4c16bc8a555 Reviewed-on: https://code.wireshark.org/review/8172 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: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-15Androiddump: Fix Memory - corruptions (OVERRUN) (CID 1293632)Alexis La Goutte1-1/+1
Change-Id: Ifd0d5026d207f763e1726963049acfb5a77f4b39 Reviewed-on: https://code.wireshark.org/review/8075 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: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-12androiddump: Disable automatic starting adbMichal Labedzki1-0/+13
It does not work as expected. Change-Id: Ibbfce9fdbb3e1aae747101a576fbe32c979b42c9 Reviewed-on: https://code.wireshark.org/review/8033 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-12androiddump: add more compatibility with MSVC connect APIPascal Quantin1-4/+5
Change-Id: I11d84d3904e11a085381b30cca7fc678c18797e6 Reviewed-on: https://code.wireshark.org/review/8034 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-12Add missing androiddump stuffMichal Labedzki1-41/+104
Add missing androiddump stuff like: - release notes - documentation - Windows nmake support - running androiddump as a windows application instead of console on Windows - addition of androiddump to the Windows installer Change-Id: I3bc6cc70e4dc96c0cd776f3d965dd2aa0309995d Reviewed-on: https://code.wireshark.org/review/7981 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-11Use HAVE_ARPA_INET_H to control whether to include <arpa/inet.h>.Guy Harris1-2/+4
That's how we do it elsewhere. Change-Id: Icd44d8bdec2425b58a4479cd60f08788c85c4d71 Reviewed-on: https://code.wireshark.org/review/8023 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-11More type cleanup to squelch warnings.Guy Harris1-3/+3
Make exported_pdu_headers_size a size_t to make it big enough. Make used_buffer_length a size_t as it doesn't go negative and gets compared with unsigned values. Cast length to size_t when comparing it with used_buffer_length - by that time, we've ensured that it's not negative. Change-Id: Ie192eee55914ebe548865d46575768964353ea2d Reviewed-on: https://code.wireshark.org/review/8021 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-11androiddump: fix a typoPascal Quantin1-1/+1
Change-Id: I4adaace10aefb441e9aee76f9aba6101e805efa9 Reviewed-on: https://code.wireshark.org/review/8020 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-11Use G_GUINT64_CONSTANT() to make a guint64_t (or uint64_t) constant.Guy Harris1-2/+2
Don't assume "UL" is good enough; long is 32 bits on ILP32 platforms. Change-Id: If235e2e49afcbfff7d5289cafe24cf5cc01358e4 Reviewed-on: https://code.wireshark.org/review/8019 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-11Squelch 64-bit-to-32-bit shortening errors.Guy Harris1-7/+7
Cast some sizeofs, make a variable size_t. Change-Id: I439a9f2a584535597e6ac92ccdf243ae07e870b3 Reviewed-on: https://code.wireshark.org/review/8018 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-11It's not "Windows vs. (Linux or OS X or Cygwin)", it's "Windows vs. UN*X".Guy Harris1-3/+5
Either it's Windows and not Cygwin (__WIN32 suffices for both 32-bit and 64-bit Windows, and this code is unlikely to work on 16-bit Windows, not that much of anybody cares about it any more), or it's UN*X or Windows- pretending-to-be-UN*X-with-Cygwin. That way we don't have to pile on new defined(XXX)'s for every UN*X out there. Change-Id: Ia1df3378a88f2cf8bd1cc8f1a74b51adfe668370 Reviewed-on: https://code.wireshark.org/review/8016 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-11A temporary variable squelches some warnings.Guy Harris1-1/+4
GINT32_FROM_BE() and GINT32_TO_BE() both declare local variables, and they collide, so warnings are issued if you use them both in the same statement. Change-Id: I87df6cf7f180316692ab5164e25263ff28d5d760 Reviewed-on: https://code.wireshark.org/review/8015 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-09Androiddump: fix Null pointer passed as an argument to a 'nonnull' parameterAlexis La Goutte1-13/+0
By remove duplicate code... Change-Id: I247c64864c112b08e912d4738478a22e65470eb4 Reviewed-on: https://code.wireshark.org/review/7988 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-09Androiddump: fix Potential leak of memory pointed to by 'serial_number'Alexis La Goutte1-3/+6
Change-Id: Ib244ec9a94d99a3589d411a4e3bcb1b03212b82e Reviewed-on: https://code.wireshark.org/review/7987 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-09Androiddump: Fix Result of 'malloc' is converted to a pointer of type ↵Alexis La Goutte1-3/+6
'unsigned short', which is incompatible with sizeof operand type 'unsigned short *' Remove malloc Change-Id: I12a7f76026336853a50bc5277404c44aa715b8d2 Reviewed-on: https://code.wireshark.org/review/7986 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-09Androiddump: Fix Dead Store (Dead assignement/Dead increment) warning found ↵Alexis La Goutte1-8/+6
by Clang Change-Id: I245ebb47dfc3d202cba5f63c33fca9c0e30da0ad Reviewed-on: https://code.wireshark.org/review/7984 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-08androiddump: Fix missing headers for Mac OSXRoland Knall1-1/+5
Add sys/socket.h as well as arpa/inet.h and the definition of closesocket. Change-Id: I3986a1cd019c40e7c27cecb3752fd8b7374de6da Reviewed-on: https://code.wireshark.org/review/7980 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-08extcap: Add support for Android - androiddumpMichal Labedzki1-0/+2131
androiddump is extcap program that can be used with Android devices (need Android SDK in system PATH). Supported is Logcat/Logger logs and Bluetooth interfaces for all Android to this day (Lollipop). Please note that it will work also for FirefoxOS. Interfaces: 1. Logcat Main (binary or text) 2. Logcat System (binary or text) 3. Logcat Events (binary or text) 4. Logcat Radio (binary or text) 5. Logcat Crash (text; Lollipop) 6. Bluetooth Hcidump (<Kitkat) 7. Bluetooth Bluedroid External Parser (Kitkat) 8. Bluetooth BtsnoopNet (Lollipop) Change-Id: I26e4cd1a37a6af805f8b932399b4aa44ee7b5a80 Reviewed-on: https://code.wireshark.org/review/7475 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>