From 100cd5fea4fd02e3f22a1ad9fd30e5d07bf176c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Bolvansk=C3=BD?= Date: Fri, 18 Mar 2022 09:42:01 +0100 Subject: [PATCH] status-json: also print device name --- include/status.h | 1 + include/types.h | 1 + src/hashcat.c | 1 + src/status.c | 9 +++++++++ src/terminal.c | 1 + 5 files changed, 13 insertions(+) diff --git a/include/status.h b/include/status.h index eb6dafe9d..985b530f1 100644 --- a/include/status.h +++ b/include/status.h @@ -87,6 +87,7 @@ int status_get_innerloop_pos_dev (const hashcat_ctx_t *hash int status_get_innerloop_left_dev (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx); int status_get_iteration_pos_dev (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx); int status_get_iteration_left_dev (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx); +char *status_get_device_name (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx); #ifdef WITH_BRAIN int status_get_brain_session (const hashcat_ctx_t *hashcat_ctx); int status_get_brain_attack (const hashcat_ctx_t *hashcat_ctx); diff --git a/include/types.h b/include/types.h index 1f0204172..f7ff4e897 100644 --- a/include/types.h +++ b/include/types.h @@ -2586,6 +2586,7 @@ typedef struct device_info int innerloop_left_dev; int iteration_pos_dev; int iteration_left_dev; + char *device_name; #ifdef WITH_BRAIN int brain_link_client_id_dev; int brain_link_status_dev; diff --git a/src/hashcat.c b/src/hashcat.c index 2fff7f4b5..734d65428 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -2017,6 +2017,7 @@ int hashcat_get_status (hashcat_ctx_t *hashcat_ctx, hashcat_status_t *hashcat_st device_info->innerloop_left_dev = status_get_innerloop_left_dev (hashcat_ctx, device_id); device_info->iteration_pos_dev = status_get_iteration_pos_dev (hashcat_ctx, device_id); device_info->iteration_left_dev = status_get_iteration_left_dev (hashcat_ctx, device_id); + device_info->device_name = status_get_device_name (hashcat_ctx, device_id); #ifdef WITH_BRAIN device_info->brain_link_client_id_dev = status_get_brain_link_client_id_dev (hashcat_ctx, device_id); device_info->brain_link_status_dev = status_get_brain_link_status_dev (hashcat_ctx, device_id); diff --git a/src/status.c b/src/status.c index b22c9846d..87a8a9ec5 100644 --- a/src/status.c +++ b/src/status.c @@ -1829,6 +1829,15 @@ int status_get_iteration_left_dev (const hashcat_ctx_t *hashcat_ctx, const int b return iteration_left; } +char *status_get_device_name (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx) +{ + const backend_ctx_t *backend_ctx = hashcat_ctx->backend_ctx; + + hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx]; + + return device_param->device_name; +} + #ifdef WITH_BRAIN int status_get_brain_link_client_id_dev (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx) { diff --git a/src/terminal.c b/src/terminal.c index 6d21e0b5a..e0fe2fd17 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -1660,6 +1660,7 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx) } printf (" { \"device_id\": %d,", device_id + 1); + printf (" { \"device_name\": \"%s\",", device_info->device_name); printf (" \"speed\": %" PRIu64 ",", (u64) (device_info->hashes_msec_dev * 1000)); if (hwmon_ctx->enabled == true)