Commit Graph

204 Commits

Author SHA1 Message Date
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
Dario Lombardo c119296504 randpkt: restyle the list generation to get rid of the const compiler warning.
Change-Id: Id7c62ef18f919ba8a476898bc88c02fd3b6bf5a1
Reviewed-on: https://code.wireshark.org/review/14730
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-01 00:33:09 +00:00
Dario Lombardo f4bdaf9d15 extcap: fix const warnings
Change-Id: Iac94349069485207d24ac1b8c1c5c09778c12e03
Reviewed-on: https://code.wireshark.org/review/14729
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-01 00:26:50 +00:00
Peter Wu 130ecc3ab3 Fix modeline definitions
Fix mismatching emacs and vi modelines.

Change-Id: I5cab8c5b7692746a5fa731c977cef903ad19a6f6
Reviewed-on: https://code.wireshark.org/review/14688
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-03-29 09:45:27 +00:00
Peter Wu 0aa0fb25e0 Another round of extcap memleak fixes
Fix a bunch of memory leaks, mainly because extcap_base_cleanup is not
called on most execution paths and because memory allocated for options
were not freed.

Additionally, randpkt will now fail if no option is given (it previously
returned 0 if --capture was missing). Logic using "goto" is introduced
with the idea that a program should fail (ret = EXIT_FAILURE) unless
proven otherwise.

Now none of the extcap programs are leaking:

    for what in ssh cisco; do
    for arg in '' --help --extcap-interfaces --extcap-interface=$what; do
        extcap/${what}dump $arg; done; done
    ./tshark -D

Change-Id: I6df1027ed0c32bd53fe87e6c54d355bc8ddd01f5
Reviewed-on: https://code.wireshark.org/review/14671
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-29 06:01:31 +00:00
Michael Mann 2b8f409324 Fix nmake build for new extcap and writecap binaries.
Change-Id: Ic7f370cfe5e2a3aad81c77baab066e95a249238f
Reviewed-on: https://code.wireshark.org/review/14631
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-26 00:51:04 +00:00
João Valverde a1ed731413 Add ax_lib_socket_nsl.m4 macro
Add SOCKET_LIBS and NSL_LIBS to global LIBS variables on platforms
where it is required.

Make configure checks for getaddrinfo/gethostname unconditional,
that is handled with #ifdefs if necessary.

Change-Id: Ia874038454fb9cf3bdbf8e6fd829f319e331837e
Reviewed-on: https://code.wireshark.org/review/14560
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25 00:16:19 +00:00
Guy Harris b0db6a01a8 First convert the string to a number, then convert it to network byte order.
That should squelch some warnings from the compiler on the OS X
buildbot.

Change-Id: I0da16469fb48e26677c5366d6fe290db2bf52a10
Reviewed-on: https://code.wireshark.org/review/14619
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24 21:20:00 +00:00
Guy Harris a4aa8930bb Put pcapio.c into a writecap library, and use it.
Change-Id: Ib89f345c072a38bc01f0513366a4bdae3bf6f08e
Reviewed-on: https://code.wireshark.org/review/14615
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24 20:49:37 +00:00
Dario Lombardo 5861c12d1b sshdump: use arg define.
Change-Id: I49ccfc3f616d2d6660c46d6a47d2409e25ad842a
Reviewed-on: https://code.wireshark.org/review/14512
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-03-24 20:15:26 +00:00
Dario Lombardo cb08496418 ciscodump: fix OSX compilation error.
Change-Id: I65d0c5bc6178ef3c2a7e9d5cf8e81d985f9d555a
Reviewed-on: https://code.wireshark.org/review/14613
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-24 20:10:18 +00:00
Dario Lombardo a6921c79ab extcap: add ciscodump.
Ciscodump is a new extcap that allows packet capture
on Cisco routers (IOS 12.4 and later) through SSH.

Change-Id: Ic9c5be01d3bd0112116f7fc9fa10e26c1552b007
Reviewed-on: https://code.wireshark.org/review/13886
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-24 12:07:28 +00:00
João Valverde c57b3777f8 Add pkg.m4 and remove aclocal-flags script
Add pkg-config 0.29.1 macros to our distribution. This makes the
aclocal-flags script obsolete, since we are already not using GLib
autoconf macros.

ACLOCAL_AMFLAGS need only be defined on the top-level Makefile.am.

Change-Id: Idd868dcfeb8f279517970d0f96d9d53e3a7e4d5c
Reviewed-on: https://code.wireshark.org/review/14568
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 02:33:43 +00:00
João Valverde b8ab3afc4a Move extcap EditorConfig settings to source dir
To comply with the procedure in README.developer.

Change-Id: If68da7b5ff27c3b250200cd17c80a005d51c631d
Reviewed-on: https://code.wireshark.org/review/14573
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 00:24:52 +00:00
João Valverde 7a1d3f67ac Remove ADNS support
Relevant mailing list message:

  https://www.wireshark.org/lists/wireshark-dev/201503/msg00007.html

Change-Id: I0cff6d4d64fb52a651bcf6b28c183e43653b1cc2
Reviewed-on: https://code.wireshark.org/review/14519
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21 19:32:00 +00:00
Dario Lombardo 8def5c40de extcap-base: remove print of version if no interfaces present.
When no interfaces are available (as with androiddump when adb
is not running) version is not printed anymore, for a cleaner
output.

Change-Id: Ia150a58ff1c04e412ff29a540f18e1fe9612f633
Reviewed-on: https://code.wireshark.org/review/14289
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-03-17 07:28:52 +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 ef21d66edc sshdump: minor changes
Change-Id: I07bd2a95622187c6bacb3013998f93bfa07af87c
Reviewed-on: https://code.wireshark.org/review/14338
Petri-Dish: Dario Lombardo <lomato@gmail.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-03-07 05:10:15 +00:00
Jeff Morriss ab5614ae10 Clean up modelines and indentation.
To quote Icf0831717de10fc615971fa1cf75af2f1ea2d03d:

HT tab stops are set every 8 spaces on UN*X; UN*X tools that treat an HT
character as tabbing to 4-space tab stops, or that even are configurable
but *default* to 4-space tab stops (I'm looking at *you*, Xcode!) are
broken. tab-width: 4, tabstop=4, and tabSize=4 are errors if you ever
expect anybody to look at your file with a UN*X tool, and every text
file will probably be looked at by a UN*X tool at some point, so Don't
Do That.

Adjust indentation to reflect the mode lines.

Change-Id: Ic829541c696e0ddbc45cc109009319859c799066
Reviewed-on: https://code.wireshark.org/review/14340
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-03-04 15:30:44 +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
Dario Lombardo d8f541c89b extcap: move ssh common functions to ssh-base.
Change-Id: Ic06882a4f914b4f89d936d5d942b50552ae4abb3
Reviewed-on: https://code.wireshark.org/review/14264
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-03-04 07:14:09 +00:00
Dario Lombardo 68d4ba212c extcap: add local_interfaces_to_list() to wsutil.
This new function abstracts the creation of a list of the local
interfaces that will be used by future extcaps to generate specific
filters. Sshdump now uses it to create a pcap filter.

Change-Id: I5b75a266f81104b3c9bcb3e51de246b7cc8785ce
Reviewed-on: https://code.wireshark.org/review/14092
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: Roland Knall <rknall@gmail.com>
2016-03-04 05:53:56 +00:00
Dario Lombardo 9b3c5202e9 nmake: add extcap-base to sshdump.
Change-Id: I3544c8e3937c3918b26da71430937a7eaa47990c
Reviewed-on: https://code.wireshark.org/review/14287
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-02 15:48:55 +00:00
Michael Mann 3771a790b7 Fix randpktdump build in Windows.
Change-Id: If749635d771443542285a74f05f37156123b2991
Reviewed-on: https://code.wireshark.org/review/14238
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-29 13:15:07 +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
Michael Mann d08f65770a Fix nmake build for extcap apps.
Change-Id: I09c4ae9a6b05f82b0fdc2271559d715148611e18
Reviewed-on: https://code.wireshark.org/review/14177
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-26 22:45:40 +00:00
Roland Knall 6ac22e74f4 extcap: Fix noinst header
Change-Id: I2b4c6eda29a6a8198993f577c42741729ed39538
Reviewed-on: https://code.wireshark.org/review/14160
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-26 12:26:19 +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
João Valverde 2eee433a33 extcap: Fix make distcheck
Change-Id: I46ba924e4231ae0e59d9cd7870cde516df8f3c28
Reviewed-on: https://code.wireshark.org/review/14152
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>
2016-02-26 03:04:06 +00:00
Guy Harris e9b2859c45 Clean up modelines and indentation.
HT tab stops are set every 8 spaces on UN*X; UN*X tools that treat an HT
character as tabbing to 4-space tab stops, or that even are configurable
but *default* to 4-space tab stops (I'm looking at *you*, Xcode!) are
broken.  tab-width: 4, tabstop=4, and tabSize=4 are errors if you ever
expect anybody to look at your file with a UN*X tool, and every text
file will probably be looked at by a UN*X tool at some point, so Don't
Do That.

Adjust indentation to reflect the mode lines.

Change-Id: Icf0831717de10fc615971fa1cf75af2f1ea2d03d
Reviewed-on: https://code.wireshark.org/review/14150
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-25 21:34:36 +00:00
Guy Harris 703553aa6e Put extcap-base.h into the release tarball.
Change-Id: I17213b20c26acfb9e5b3de251b3f90a8e23ce0a7
Reviewed-on: https://code.wireshark.org/review/14146
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-25 19:36:07 +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
Guy Harris 00bd175f1a Have "make maintainer-clean" remove extcap/Makefile.in.
(Is there some reason why automake doesn't make this happen by default?)

Change-Id: I1a4fff32696012d0fd83faf86a2f40df4ea5fa80
Reviewed-on: https://code.wireshark.org/review/14085
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-23 03:06:42 +00:00
João Valverde f0fb79d534 autotools: Use pkg-config autoconf macros for GLib/GTK
Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset
of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add
dependency flags explicitly instead of using WS_CPPFLAGS.

Some minor improvements and fixes for missing/unnecessary variables (no impact
on our test builds).

Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671
Reviewed-on: https://code.wireshark.org/review/14005
Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21 07:51:55 +00:00
Guy Harris b32a5ee98c Don't add the wiretap directory to the list of include directories.
If you include something from the wiretap directory, always precede it
with wiretap/.

Fix some includes of files in the top-level directory to use a path
relative to the current directory, not relative to the wiretap
directory.

This makes it a bit clearer what's being included.

Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54
Reviewed-on: https://code.wireshark.org/review/13990
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>
2016-02-18 12:55:26 +00:00
Pascal Quantin 20fcb6c2e1 Fix compilation of extcap programs with NMake
Change-Id: I80e17aeeab5bf747c6ba06168245d38d6d78efa9
Reviewed-on: https://code.wireshark.org/review/13986
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-18 00:01:00 +00:00
Guy Harris 58d00bad1a Build the extcap programs in the extcap directory.
That lets the version of Wireshark built with autotools find the extcap
programs.

Don't install the extcap programs under ${datadir} - that puts it under
a share directory, and share directories are for platform-independent
files, which executable images aren't (they're instruction-set
dependent, hence platform-dependent).

Change-Id: I992eeb984bdbe6b3476777f7114628c83df6080f
Reviewed-on: https://code.wireshark.org/review/13943
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-15 08:31:06 +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
Dario Lombardo 6fde7da633 randpktdump: change error messages.
Change-Id: Icf020d92cb2bef22afac2c74d3a719e54d36f95d
Reviewed-on: https://code.wireshark.org/review/13887
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>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-02-11 11:37:59 +00:00
Dario Lombardo 23c6241e52 sshdump: fix default value for capture filter.
Change-Id: I21c4d6fa6726165882ed104262b1e2b22557d8cd
Reviewed-on: https://code.wireshark.org/review/13522
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-08 14:36:12 +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
Dario Lombardo 1326cbcc42 sshdump: fix error in extcap sentence.
Change-Id: Ibbabd4d160661985d9a7d8caeb577845f45b847e
Reviewed-on: https://code.wireshark.org/review/13561
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-27 18:54:00 +00:00
Dario Lombardo 19d43a03b6 sshdump: fix leak in ssh_open_remote_connection() (CID 1349731)
Change-Id: I55656d4600edb800fd93532345f7ea2c7fc16f7d
Reviewed-on: https://code.wireshark.org/review/13466
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-22 18:21:21 +00:00
Dario Lombardo 69b8f6ca55 sshdump: fix typo in extcap-config.
Change-Id: Ie6e60244e9ec6f80d37db9e46342c363825bc9ce
Reviewed-on: https://code.wireshark.org/review/13415
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-01-19 15:01:23 +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
Dario Lombardo ff033c6a2f extcap: add masked to options.
This allows an option to be masked (like a password), by using
the argument-type password.

Change-Id: I2eae1be2e6672bff28ba5f749d7a3f687ebd4631
Reviewed-on: https://code.wireshark.org/review/13385
Reviewed-by: Dario Lombardo <lomato@gmail.com>
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-18 15:04:33 +00:00
Alexis La Goutte d326eb98f6 fix spelling-error-in-binary found by lintian
Change-Id: I2bdb40d287b2c19d40679fb73a8bae5f1debdd98
Reviewed-on: https://code.wireshark.org/review/13330
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-01-16 14:06:10 +00:00
Dario Lombardo ea257be384 sshdump: change message to error.
Change-Id: I6f3df909b2cb20a869dd1b812cdf6cdf8946e83c
Reviewed-on: https://code.wireshark.org/review/13313
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-01-15 22:42:58 +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
Roland Knall 5d4a71a1a2 ssh/randpktdump: Add version to extcap utility
Add a version to each utility, displayed in the about dialog of Wireshark

Change-Id: I64936072b13116b3e173c50411e9fff45d5fbf4c
Reviewed-on: https://code.wireshark.org/review/13290
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-14 18:46:56 +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
Dario Lombardo 4429ab775e sshdump: print error message to stderr instead of stdout.
Change-Id: I9e83373802b9cac5707cc30f0cc94314b39baf5b
Reviewed-on: https://code.wireshark.org/review/13056
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>
2016-01-06 17:24:20 +00:00
Thomas Wiens 3866df04dd Moved variable declaration top, to be C89 compliant
Change-Id: I83b96f8cdabbb3ae67172659492f5992c95fbe73
Reviewed-on: https://code.wireshark.org/review/13004
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>
2016-01-02 14:27:10 +00:00
Roland Knall 0921c8214e extcap: Add Required and cleanup
An option may now use the "required=true" argument (see sshdump.c)
 which will ensure, that the capture can only be started via the
 dialog, if the option has been provided. To ensure, that this is
 working properly, multiselect has been moved to a separate source
 file.

 Renamed one method so it may not interfere with a future save
 functionality, and cleaned up the interface to use only default
 buttons and roles

 ONLY the Qt interface is being supported.

Change-Id: Ie1c9a63c1bba2e557d55b1de6f4775d8b9fce515
Reviewed-on: https://code.wireshark.org/review/12912
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-30 08:10:54 +00:00
Dario Lombardo ac0eb6043b extcap: add randpktdump, a random packet generator.
This new extcap is for testing and educational purpose.
It relies on rankpkt-core functions to generate random packets.

Change-Id: If6890f0673545682995a2079458108edc0913b30
Reviewed-on: https://code.wireshark.org/review/11764
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>
2015-12-22 12:24:16 +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
Dario Lombardo 4df75d7eae sshdump: add default filter even when interfaces are not listed.
Change-Id: I7fc6157a4ef0fff9b94f2ee222379f8d6d2962a9
Reviewed-on: https://code.wireshark.org/review/12090
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-24 13:06:20 +00:00
Dario Lombardo 81330b148a sshdump: fix int issue
Change-Id: Ic4367c90e79f6d3ee0d3e55f9f3ab0ebf74190f7
Reviewed-on: https://code.wireshark.org/review/12065
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-23 20:30:10 +00:00
Dario Lombardo 8762e7e738 sshdump: add define for default capture bin
Change-Id: I52a5d12bb885f5bedffa030906d15f9d67bfe2e8
Reviewed-on: https://code.wireshark.org/review/11988
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 08:04:14 +00:00
Dario Lombardo 706cff85ed sshdump: add packets count
Change-Id: Ia430200a08ada4caaa780589a2fe4b90c797d94d
Reviewed-on: https://code.wireshark.org/review/11989
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-11-20 15:46:59 +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
Dario Lombardo d6da95231e extcap: add sshdump.
sshdump is an extcap module that allows dumping from a remote host using an ssh connection.
It goes with the existing extcap plugin interface.

Change-Id: I8987614fdd817b8173a50130812bc643a4833bca
Reviewed-on: https://code.wireshark.org/review/11402
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>
2015-11-19 15:29:18 +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