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>

1 files changed, 3 insertions, 3 deletions

diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index aaef88bbdd..24db47e68d 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -2383,9 +2383,6 @@ int main(int argc, char **argv) {
         }
     }
 
-    /* For extcap, no other ports can be configured anyway */
-    register_interfaces(extcap_conf, default_adb_server_ip, &default_adb_server_tcp_port);
-
     if (!adb_server_ip)
         adb_server_ip = default_adb_server_ip;
 
@@ -2409,6 +2406,9 @@ int main(int argc, char **argv) {
     }
 #endif  /* _WIN32 */
 
+    if (extcap_conf->do_list_interfaces)
+        register_interfaces(extcap_conf, adb_server_ip, adb_server_tcp_port);
+
     if (extcap_base_handle_interface(extcap_conf))
         return 0;