Commit Graph

186 Commits

Author SHA1 Message Date
Pascal Quantin bc29b8c9b6 androiddump: fix compilation with ANDROIDDUMP_USE_LIBPCAP define
Change-Id: I6edc4ff9f4db5fab9b80cb0be56639443ab22518
Reviewed-on: https://code.wireshark.org/review/20105
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-02-14 17:23:58 +00:00
Dario Lombardo 7c0c580c4b wiretap: add cleanup routine.
The cleanup routine has been added to exit section of the applications.
Those which required a exit restyle have been patched as well.

Change-Id: I3a8787f0718ac7fef00dc58176869c7510fda7b1
Reviewed-on: https://code.wireshark.org/review/19949
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-14 10:22:20 +00:00
Guy Harris 6a99a2ce43 Cast arguments to socklen_t.
That should squelch some warnings on Windows.

Change-Id: I55b394be12203e14af023fdcc5d46564d0fcfa34
Reviewed-on: https://code.wireshark.org/review/19797
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-26 07:15:54 +00:00
Frank Carpenter 3b6fe2bfb4 Populate logcat year based on localtime
Change-Id: If7c790c25ed24da1b1442ee86e3a2f75bd3f8856
Reviewed-on: https://code.wireshark.org/review/19658
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Tested-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-19 04:40:04 +00:00
Peter Wu 2009dcc98d extcap: fix memleak via data_file_url
Commit v2.1.0rc0-2181-ga4e2263ac4 introduced a helppage parameter, but
all callers were NULL. In a later change, callers would use the
data_file_url() function, but this needs to be freed, so do that.

Fixes: v2.3.0rc0-1825-ge5596b74bd ("extcap: set help page for all extcaps.")
Change-Id: I967c0f8c6b50d9e78ac227575de24a81f97d376a
Reviewed-on: https://code.wireshark.org/review/19570
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-01-07 20:32:43 +00:00
Baruch Siach 3761ef3785 androiddump: add missing sys/time.h header
struct timeval requires sys/time.h. Fixes the following musl libc build error:

androiddump.c: In function 'useSndTimeout':
androiddump.c:262:18: error: variable 'socket_timeout' has initializer but incomplete type
     const struct timeval socket_timeout = {
                  ^

Change-Id: I52e204f32a012aabea2e54877e564576c072fe08
Reviewed-on: https://code.wireshark.org/review/19460
Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-12-30 09:02:47 +00:00
Dario Lombardo e5596b74bd extcap: set help page for all extcaps.
They've been set to the manpage of the local filesystem.

Ping-Bug: 13218
Change-Id: Iacd5d2ba7ae39ee1718b59747c245d1c07785e8f
Reviewed-on: https://code.wireshark.org/review/19179
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-12-20 08:23:11 +00:00
Michal Labedzki a7d404a972 androiddump: Add support for Bluetooth on Android 7.0
Now "ps" command does not support process name as parameter,
use grep instead.

Change-Id: I0c35bc7d560e237e4140000e67af097744cb2c1b
Reviewed-on: https://code.wireshark.org/review/19087
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>
2016-12-05 11:44:00 +00:00
Guy Harris ab07f8e0f8 Have a routine to do all the work of initializing libwiretap.
Have programs that use libwiretap call that routine rather than
separately calling some or all of init_open_routines(),
wtap_register_plugin_types(), and wtap_opttypes_initialize().

Also don't have routines internal to libwiretap call those.  Yes, this
means doing some initialization work when it isn't necessary, but
scattering on-demand calls throughout the code is a great way to forget
to make those calls.

Change-Id: I5828e1c5591c9d94fbb3eb0a0e54591e8fc61710
Reviewed-on: https://code.wireshark.org/review/19069
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04 21:42:44 +00:00
Dario Lombardo 6a91e8aba7 androiddump: check return value in useSndTimeout() (CID 1394378).
Change-Id: I14109ffe1b9930c464ce2c42767f96b8ba4e5b67
Reviewed-on: https://code.wireshark.org/review/18855
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-11-18 09:26:41 +00:00
Michal Labedzki 720927a10e 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@tieto.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-10 12:41:06 +00:00
Michal Labedzki b4f86c9cb8 androiddump: Fix help - interfaces
Fix help output that describes interfaces provided by tool
to reflect reality - add missed DEVICE_ID that is part of interface.

Change-Id: Ib6374db28d8d4696ce27c5358da49d3ebfcf31e1
Reviewed-on: https://code.wireshark.org/review/18267
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Tested-by: Michael Mann <mmann78@netscape.net>
2016-10-19 12:20:05 +00:00
Michal Labedzki b83ea46665 extcap: put missed parameters into the help
"--debug" and "--extcap-version" are part of extcap-base helper,
do not hide them.

Change-Id: I287b68dbed5344c188fede69d112ab007a6ee18b
Reviewed-on: https://code.wireshark.org/review/18279
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-19 06:44:05 +00:00
Guy Harris 686d72fc7d Type and size cleanups.
Use size_t for sizes.  Do checks to make sure we don't overflow ints.

Change-Id: Id0846cc5c6348d67a23064517ad1c432cf1cb61a
Reviewed-on: https://code.wireshark.org/review/17742
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-16 19:45:13 +00:00
Guy Harris 770a8737d7 Add ws_hexstrtou{bits} and use ws_hexstrtou32 in androiddump.
Make the reply length unsigned - there's no reason for it to be signed.

Change-Id: I5f4d1f027eeddee939547c052220efb89800f4b1
Reviewed-on: https://code.wireshark.org/review/17740
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-16 17:42:03 +00:00
Dario Lombardo d67c1db3f2 extcap: make extcap use the ws_strtoi/u functions.
Change-Id: Id75c72eba869c8a0f413ce8b5d6329ce172aed1f
Reviewed-on: https://code.wireshark.org/review/17415
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-09-16 14:21:16 +00:00
Peter Wu 159d4317dc androiddump: fix memleaks
Most of the actions (e.g.  `androiddump --extcap-interfaces`) return
immediately without cleaning up. Fix this by adding a common exit path.

Change-Id: If02b18da49d866fb5525306e52fbf4590d98ecd2
Reviewed-on: https://code.wireshark.org/review/17634
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-12 12:23:20 +00:00
Dario Lombardo 124fb83079 extcap: improve interface print in help.
Change-Id: Ife8e73b6cb1756623e937452fc042d8b31e2554f
Reviewed-on: https://code.wireshark.org/review/17321
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-08-26 21:05:12 +00:00
Dario Lombardo f597234785 extcap: add binary name and version to help message.
Change-Id: I8f8083c817065cf66fd006a1caeb309d26209509
Reviewed-on: https://code.wireshark.org/review/17305
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-25 12:29:49 +00:00
Dario Lombardo f269f56c1a extcap: make extcaps use the version registered in config.
Change-Id: I12d0d0bec06e02af0a9d0877c0f0f1d86261d752
Reviewed-on: https://code.wireshark.org/review/17296
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-24 12:25:56 +00:00
Dario Lombardo b7515b352a androiddump: use socklen_t (32bit) instead of gssize (64bit) (CID 1293384).
Change-Id: Ia5b7bc190eb8af509a880bb23bc0879a2dcfd39c
Reviewed-on: https://code.wireshark.org/review/16972
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-08-11 13:31:32 +00:00
Dario Lombardo b669ca75c4 androiddump: fix bug in socket retry (CID 1293391).
Change-Id: I61914d208e984d202506cdc885493e841e929990
Reviewed-on: https://code.wireshark.org/review/16948
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: Michal Labedzki <michal.labedzki@tieto.com>
2016-08-09 10:19:57 +00:00
Dario Lombardo a671bab337 extcap: restyle the help function.
Change-Id: Ia742dffb1fd4cd5780b8ba44f7064d1874e473da
Reviewed-on: https://code.wireshark.org/review/16842
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-04 14:13:53 +00:00
Dario Lombardo 5adde36520 extcap: restyle the output subsystem.
Change-Id: I3e0674751eb97bf30ae6d70c4e51f347d63b1697
Reviewed-on: https://code.wireshark.org/review/16849
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-04 11:26:26 +00:00
Michael Mann abd0033c7e androiddump.c - Address VS Code Analysis warnings.
1. Take large "packet" byte arrays off of stack and onto heap.
2. Cast away an shift operation that should have been identified as safe anyway.

Change-Id: I159c4a7452744763f667336cf4824d5ac3472343
Reviewed-on: https://code.wireshark.org/review/16500
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-16 19:52:48 +00:00
Michael Mann 9a9c72ccea Have extcap executables mirror the GTK's WinMain signature.
This is for appeasing VS Code Analysis.

Change-Id: Ib7b3d8a3025dd764da283335051d0f77b45f6dee
Reviewed-on: https://code.wireshark.org/review/16499
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-16 19:52:00 +00:00
Michael Mann ed27ad491d androiddump.c: Use preprocessor directive to distinguish E_AGAIN and E_WOULDBLOCK.
VS Code analysis considers them hardcoded values so the if statement is either
always true or always false.

Change-Id: Iad04add9391c515873e2e00d2c6cbd682fbf5b3f
Reviewed-on: https://code.wireshark.org/review/16419
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: Anders Broman <a.broman58@gmail.com>
2016-07-14 07:05:50 +00:00
Dario Lombardo cf508f8960 androiddump: fix leak (CID 1293387).
Change-Id: I27e167368575dfddf78c237723d20c8b790e5f15
Reviewed-on: https://code.wireshark.org/review/16268
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-07-04 06:07:41 +00:00
Peter Wu babb9e32e9 androiddump: fix leak on --extcap-interfaces
extcap_base_register_interface duplicates the memory, so there is no
need to keep it around.

Change-Id: I2bac8be519b659504c512d4eb29be8f7ef6dbd59
Reviewed-on: https://code.wireshark.org/review/15919
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-15 17:31:01 +00:00
Michal Labedzki 3a637f342e androiddump: Add model name to user-friendly interface name
This can speed up searching for interface specified to model of Android
device - in most cases it is its market name.

Change-Id: Ib5a3b96d9a2a8cf325f62614d395508b4ec58199
Reviewed-on: https://code.wireshark.org/review/15454
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-18 03:37:41 +00:00
Michal Labedzki 0c27e92d8e androiddump 1.0.3: Return more specific error codes
There is 68 generic error exit codes + 45 specific error codes.
Total: 113 error codes, so it is possible to have all specific
exit codes in future - max is 254 (UNIX limitation).

Change-Id: I798bf77b03031a701e90272d01e90b04e7e31940
Reviewed-on: https://code.wireshark.org/review/14763
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-19 04:03:26 +00:00
Michal Labedzki 5f4f7bcdc1 androiddump: Change insecure sprint into g_snprintf
This avoid potential overflows.

Bug: 12093
Change-Id: Icbfe4a9f04c5f8d4e0284e4800d4775773246abf
Reviewed-on: https://code.wireshark.org/review/14762
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>
2016-04-06 09:00:02 +00:00
Michal Labedzki 1cf7834b2d androiddump: Fix crash on start capturing
Wiretap require registration right now. Do it.

Change-Id: I7ec4c4a4c6d3fa6625fff970f7f39f1ab74e3ef5
Reviewed-on: https://code.wireshark.org/review/14761
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>
2016-04-04 06:47:39 +00:00
Michal Labedzki 9328eb6234 androiddump: Register interfaces when list interfaces
Trying to find interfaces every androiddump run use
a lot of system resources so Wireshark can hang for a while.
Back to old behaviour and register interfaces only when
list them.

Change-Id: Ib63cad05fb47722d3b9de24abf28a86e614417cd
Reviewed-on: https://code.wireshark.org/review/14764
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-02 18:25:32 +00:00
Michal Labedzki 3c143d2846 androiddump 1.0.2: Fix a lot of usage of recv()
recv() can return negative value or 0 in "error cases".
There is need to check it. This also solved empty interfaces
list if there is unauthenticated device.

Bug: 12080
Change-Id: If6cd0e0933b64e9ac9bbb66b3b8138f7177451d1
Reviewed-on: https://code.wireshark.org/review/14316
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>
2016-03-12 18:26:33 +00:00
Dario Lombardo b4f3255450 androiddump: change first error message into verbose_print()
This error occurs every run of wireshark if adb is not running.
This is a bit noisy, so androiddump is made less verbose.

Bug: 12185

Change-Id: Ia7d0b0aba95e90a7f602c2e340f6344d09205b32
Reviewed-on: https://code.wireshark.org/review/14288
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: Dario Lombardo <lomato@gmail.com>
2016-03-04 10:10:17 +00:00
Roland Knall a4e2263ac4 extcap: Move extcap handling to base
Also add the extcap-version parameter to enable parsing of
version and helppage separately

Change-Id: I35ba5aa992940ffbb0cd9ebea8b7c3a1e8629d74
Reviewed-on: https://code.wireshark.org/review/14094
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-29 12:32:03 +00:00
Dario Lombardo 298012359b extcap: move windows functions into extcap-base
Change-Id: Iec7fed027a24992afd673b09c32470af51739ae5
Reviewed-on: https://code.wireshark.org/review/14075
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-26 10:02:59 +00:00
Dario Lombardo a376915fdd extcap: move includes into extcap-base.
Change-Id: I802cc3a3bb3989411216ed070ecc018345e0d54f
Reviewed-on: https://code.wireshark.org/review/14073
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-25 14:05:51 +00:00
Dario Lombardo c154c75fef extcap: move common code into extcap-base files
Change-Id: Ia4a73c7df39426c8773fce04cac223bda3c6ef1c
Reviewed-on: https://code.wireshark.org/review/14071
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-25 12:54:27 +00:00
Alexis La Goutte 137358a404 androiddump: fix logical ‘or’ of equal expressions [-Werror=logical-op] found by gcc6
EAGAIN and EWOULDBLOCK is the same value (now)
http://www-numi.fnal.gov/offline_software/srt_public_context/WebDocs/Errors/unix_system_errors.html

Change-Id: Ia8101d05194910f306e8439507ae5bde3ccd00ce
Reviewed-on: https://code.wireshark.org/review/13905
Reviewed-by: Alexis La Goutte <alexis.lagoutte@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: Roland Knall <rknall@gmail.com>
2016-02-13 14:46:27 +00:00
Michal Labedzki c09d894f74 Fix some Coverity issue
>>>     CID 1349726:  Incorrect expression  (COPY_PASTE_ERROR)
>>>     "tvb_reported_length_remaining" in "tvb_reported_length_remaining(tvb, offset)" looks like a copy-paste error.
>>>     CID 1349727:  Incorrect expression  (COPY_PASTE_ERROR)
>>>     "tree" in "dissector_try_uint_new(bluetooth_eir_ad_manufacturer_company_id, company_id, new_tvb, pinfo,
>>>     CID 1349728:    (DEADCODE)
>>>     Execution cannot reach this expression "0" inside statement "(0 && ((__s1_len = __builti...".
>>>     CID 1306904:  Logically dead code (DEADCODE)
>>>     Execution cannot reach this statement "tap_hci_summary->interface_...".

Change-Id: I5f99e37e6d5fac39da7082649caa8373d06bb808
Reviewed-on: https://code.wireshark.org/review/13739
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-05 18:57:29 +00:00
Dario Lombardo 5e89f93322 androiddump: fix printf format warning.
Found by clang. Compiler warning:

warning: format specifies type 'void *' but the argument has type 'char *' [-Wformat-pedantic]

Change-Id: I7f370b06f98490cd6e363a9679a449420c8c8021
Reviewed-on: https://code.wireshark.org/review/13602
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-02-01 11:50:38 +00:00
Michal Labedzki 7b2afd5ae6 androiddump: There is no need to make full copy optarg
Copy pointer is enough.

Change-Id: I51188a8434f6e4ba1d9bf3456bd29e027dd40f35
Reviewed-on: https://code.wireshark.org/review/13393
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-18 16:09:18 +00:00
Roland Knall ca512cf47c androiddump: Return extcap version information
Change-Id: I22cdf02286262ae55ea94b4387791d3d28769f31
Reviewed-on: https://code.wireshark.org/review/13286
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-01-15 11:30:48 +00:00
moshekaplan cd7026951b Fix a lot of typos and misspellings
Change-Id: I8512cfa1d424f82a873a0e0e1d22c7b075fdd7f3
Reviewed-on: https://code.wireshark.org/review/13069
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-08 20:04:56 +00:00
Pascal Quantin 97705dfdbd anddroiddump: fix compilation errors with Win64 and OSX 10.5 x86
Change-Id: Ie8aa666cd0b10b4260bf184ff35734589c71a8aa
Reviewed-on: https://code.wireshark.org/review/12705
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-12-17 19:34:52 +00:00
Michal Labedzki 2da59158a0 Try to fix some PVS Studio warnings
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 626
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 661
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 678
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 689
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 700
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 711
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 728
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 739
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 750
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 761
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 810
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 867
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 889
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 949
V814 Decreased performance. The 'strlen' function was called multiple times inside the body of a loop. androiddump.c 971
V804 Decreased performance. The 'strlen' function is called twice in the specified expression to calculate length of the same string. androiddump.c 1876
V512 A call of the 'memcpy' function will lead to underflow of the buffer 'packet + exported_pdu_headers_size'. androiddump.c 1950
V804 Decreased performance. The 'strlen' function is called twice in the specified expression to calculate length of the same string. androiddump.c 2053
V804 Decreased performance. The 'strlen' function is called twice in the specified expression to calculate length of the same string. androiddump.c 2056
V512 A call of the 'memcpy' function will lead to underflow of the buffer 'packet + exported_pdu_headers_size'. androiddump.c 2122
V590 Consider inspecting this expression. The expression is excessive or contains a misprint. androiddump.c 2207
V590 Consider inspecting this expression. The expression is excessive or contains a misprint. androiddump.c 2227
V530 The return value of function 'freopen' is required to be utilized. androiddump.c 2275
V530 The return value of function 'freopen' is required to be utilized. androiddump.c 2279
V808 'name' object of 'QString' type was created but was not utilized. bluetooth_devices_dialog.cpp 201
V807 Decreased performance. Consider creating a pointer to avoid using the 'ui->tableTreeWidget->headerItem()' expression repeatedly. bluetooth_devices_dialog.cpp 337
V807 Decreased performance. Consider creating a pointer to avoid using the 'item->child(i_item)' expression repeatedly. bluetooth_hci_summary_dialog.cpp 648
V807 Decreased performance. Consider creating a pointer to avoid using the 'ui->tableTreeWidget->headerItem()' expression repeatedly. bluetooth_hci_summary_dialog.cpp 669

Change-Id: Ia81b5f867b2b1e0ee58eed0bd297800774bc37f9
Reviewed-on: https://code.wireshark.org/review/12683
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-12-17 14:17:27 +00:00
Michal Labedzki 682cf6d72a androiddump: Remove all mallocs
Removing all malloc improve reliability, simplify code,
reduces memory usage...

Bug: 11608
Change-Id: Ie56312a1afdf298e926bb242825565b52dbd85d3
Reviewed-on: https://code.wireshark.org/review/12682
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-12-17 14:17:06 +00:00
Michal Labedzki 882f5becc2 androiddump: Some Coverity fixes
CID 1295677: (CHECKED_RETURN)
CID 1293385: (NEGATIVE_RETURNS)

Change-Id: I142f1f9629af9339261b74e54a1a40b595ddecb5
Reviewed-on: https://code.wireshark.org/review/12681
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-12-17 14:16:34 +00:00
Pascal Quantin 1a1893ad54 androiddump: fix crash on Windows when running in verbose mode
As explained in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6695#c2
g_frpintf unfortunately crashed on Windows. Let's go back to fprintf instead.
It will create warnings with MSVC2015 but we do not use it officially yet and
at least androiddump will be working correctly again.

Change-Id: Idfdb608576e18af63650af80e01bcda36dd81ac4
Reviewed-on: https://code.wireshark.org/review/12435
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-12-08 16:32:51 +00:00
Michal Labedzki 01cdabb63b androiddump: Add Bluetooth support for Android M
In real it is a fix, because the only change is new name of
process of the same application on Android.

Change-Id: I69d1362e9f11967ec1127ff89c7b45299d291fe8
Reviewed-on: https://code.wireshark.org/review/11984
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-11-20 12:14:33 +00:00
Stig Bjørlykke fe12759b8e androiddump: make nanoseconds int
This fixes a compiler warning on OS X:
  extcap/androiddump.c:312:42: warning: implicit
      conversion loses integer precision: 'long' to '__darwin_suseconds_t' (aka 'int')
      [-Wshorten-64-to-32]
    pcap_header.ts.tv_usec = nanoseconds / 1000;
                           ~ ~~~~~~~~~~~~^~~~~~

Change-Id: I6077130fbe4e1cb4f26d82271cfb85d1bf03e35c
Reviewed-on: https://code.wireshark.org/review/11655
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>
2015-11-09 17:40:09 +00:00
Stig Bjørlykke 9c0d550a4a extcap: Provide capture filter to extcap binary
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-11-05 07:42:35 +00:00
Dario Lombardo d17745bbb8 androiddump: add memset in adb_connect() (CID 1293396)
Change-Id: If9d281cd95cf12351d6da5e75c6de149ec7adc06
Reviewed-on: https://code.wireshark.org/review/10598
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-23 13:49:23 +00:00
Pascal Quantin 2d466c0419 androiddump: fix memory leaks reported by Coverity
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-13 17:50:00 +00:00
Pascal Quantin eca15bf5ae androiddump: fix compilation on Windows and OSX
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-11 19:43:26 +00:00
Aditya Jain 5a3ad8fe06 Support for Wifi packet capture for android devices.
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-09-11 15:15:56 +00:00
Michal Labedzki 4557c17f7a androiddump: Try to make MVS14.0 happy
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-08-07 08:50:55 +00:00
AndersBroman ae5172f991 Try to fix warning C6340: Mismatch on sign: 'short' passed as _Param_(2) 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-02 03:53:59 +00:00
AndersBroman fbf0c34a4d Try to fix some warnings from Visual Studio Code Analysis.
Change-Id: Ibbbb89af23d0e37ea57a1079e311d8205d254ddd
Reviewed-on: https://code.wireshark.org/review/9434
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-01 08:34:46 +00:00
Michal Labedzki 7ec7e43f3b Bluetooth: Coverity fixes
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-19 13:20:57 +00:00
Michal Labedzki 0fb5807f1d androiddump: Fix socket resource leak
Change-Id: I79cadef71d3d6f8e44c6a66045fb150119e0b40e
Reviewed-on: https://code.wireshark.org/review/8896
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-12 08:47:46 +00:00
Michal Labedzki 9813013ac4 androiddump: Fix Bluetooth External Parser
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-06-12 08:47:09 +00:00
Alexis La Goutte abfd44571c Androiddump: fix Null pointer passed as an argument to a 'nonnull' parameter
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-28 15:10:33 +00:00
Michal Labedzki 26980bcb2b androiddump: Case-insensitive for option and add verbose mode
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-18 07:10:55 +00:00
Edwin Groothuis 4c601c833a androiddump: fix compilation under FreeBSD
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-15 12:38:41 +00:00
Roland Knall 222597b1f4 androiddump: Change expected boolean result
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-05-04 14:26:34 +00:00
Michal Labedzki 0e572cbcbf androiddump: Fix warning about unneeded value
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-23 09:02:00 +00:00
Alexis La Goutte 3c110d7bb2 Androiddump: Fix Memory - corruptions (OVERRUN) (CID 1293632)
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-15 20:48:11 +00:00
Michal Labedzki c0d94c2a75 androiddump: Disable automatic starting adb
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-12 20:27:42 +00:00
Pascal Quantin afff4248c9 androiddump: add more compatibility with MSVC connect API
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-12 18:31:44 +00:00
Michal Labedzki 56470cc801 Add missing androiddump stuff
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-12 16:34:46 +00:00
Guy Harris 6c56fdb041 Use HAVE_ARPA_INET_H to control whether to include <arpa/inet.h>.
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-11 21:37:01 +00:00
Guy Harris afec93cb79 More type cleanup to squelch warnings.
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-11 20:41:07 +00:00
Pascal Quantin 08c083a930 androiddump: fix a typo
Change-Id: I4adaace10aefb441e9aee76f9aba6101e805efa9
Reviewed-on: https://code.wireshark.org/review/8020
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-11 20:40:36 +00:00
Guy Harris ffe99c06ec Use G_GUINT64_CONSTANT() to make a guint64_t (or uint64_t) constant.
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-11 20:17:35 +00:00
Guy Harris 3195a20eef Squelch 64-bit-to-32-bit shortening errors.
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-11 20:13:44 +00:00
Guy Harris ee309553eb It's not "Windows vs. (Linux or OS X or Cygwin)", it's "Windows vs. UN*X".
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-11 19:54:20 +00:00
Guy Harris 9fecad775c A temporary variable squelches some warnings.
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-11 19:46:23 +00:00
Alexis La Goutte 806ba8c63a Androiddump: fix Null pointer passed as an argument to a 'nonnull' parameter
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-09 23:14:25 +00:00
Alexis La Goutte 10e20531d3 Androiddump: fix Potential leak of memory pointed to by 'serial_number'
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-09 23:13:47 +00:00
Alexis La Goutte dc4345b4d1 Androiddump: Fix Result of 'malloc' is converted to a pointer of type '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-09 22:27:33 +00:00
Alexis La Goutte d65f8961dc Androiddump: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I245ebb47dfc3d202cba5f63c33fca9c0e30da0ad
Reviewed-on: https://code.wireshark.org/review/7984
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-09 08:05:39 +00:00
Roland Knall 356e9c4564 androiddump: Fix missing headers for Mac OSX
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-08 11:12:50 +00:00
Michal Labedzki b99cf21c25 extcap: Add support for Android - androiddump
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>
2015-04-08 09:57:24 +00:00