From: Marc Schink Date: Sat, 2 Sep 2017 08:16:41 +0000 (+0200) Subject: jlink: Disable TCP/IP discovery X-Git-Tag: v0.11.0-rc1~1347 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=b0dcff5e345cf255d0ccdc5b473dff408af4b5ed jlink: Disable TCP/IP discovery If no serial number is specified, disable TCP/IP device discovery to ensure that a user does not unintentionally operate on a remote device. Change-Id: I6a7e913b8b679fae003825468cd86d2014849b29 Signed-off-by: Marc Schink Reviewed-on: http://openocd.zylin.com/4214 Tested-by: jenkins Reviewed-by: Spencer Oliver --- diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c index ac6e997efe..132ef06e98 100644 --- a/src/jtag/drivers/jlink.c +++ b/src/jtag/drivers/jlink.c @@ -547,6 +547,7 @@ static int jlink_init(void) enum jaylink_usb_address address; size_t length; size_t num_devices; + uint32_t host_interfaces; LOG_DEBUG("Using libjaylink %s (compiled with %s).", jaylink_version_package_get_string(), JAYLINK_VERSION_PACKAGE_STRING); @@ -572,7 +573,12 @@ static int jlink_init(void) return ERROR_JTAG_INIT_FAILED; } - ret = jaylink_discovery_scan(jayctx, 0); + host_interfaces = JAYLINK_HIF_USB; + + if (use_serial_number) + host_interfaces |= JAYLINK_HIF_TCP; + + ret = jaylink_discovery_scan(jayctx, host_interfaces); if (ret != JAYLINK_OK) { LOG_ERROR("jaylink_discovery_scan() failed: %s.",