diff options
| author | Roland Knall <roland.knall@br-automation.com> | 2016-01-14 12:44:14 +0100 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2016-01-15 11:30:48 +0000 |
| commit | ca512cf47c17a4b83accb3efbb443dfd5106bed0 (patch) | |
| tree | d925cfc504a48bb71387b8e5871fb225593e0ee3 /extcap | |
| parent | 75ff25f2858709ba75aa22046e43ec7e6c3cd9aa (diff) | |
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>
Diffstat (limited to 'extcap')
| -rw-r--r-- | extcap/androiddump.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index ba31567936..febd3ffeb6 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -598,6 +598,9 @@ static int list_interfaces(const char *adb_server_ip, unsigned short *adb_server int api_level; int disable_interface; + /* This is done here, so that androiddump get's listed in the about dialog */ + printf ( "extcap {version=%u.%u.%u}\n", ANDROIDDUMP_VERSION_MAJOR, ANDROIDDUMP_VERSION_MINOR, ANDROIDDUMP_VERSION_RELEASE ); + /* NOTE: It seems that "adb devices" and "adb shell" closed connection so cannot send next command after them, there is need to reconnect */ @@ -2532,7 +2535,10 @@ int main(int argc, char **argv) { #endif /* _WIN32 */ if (do_list_interfaces) - return list_interfaces(adb_server_ip, adb_server_tcp_port); + { + list_interfaces(adb_server_ip, adb_server_tcp_port); + return 0; + } if (fifo == NULL) { printf("ERROR: No FIFO or file specified\n"); |