From 2b3162f49b06c5d714babdda36cdc0abb9e9c7c7 Mon Sep 17 00:00:00 2001
From: b0lek <95943440+b0lek@users.noreply.github.com>
Date: Fri, 17 Dec 2021 22:07:28 +0100
Subject: [PATCH] adding guess data into --status-json output

---
 src/terminal.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/terminal.c b/src/terminal.c
index 2fcdfe109..db46077b2 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1309,6 +1309,24 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
   target_json_encoded[j] = 0;
 
   printf ("{ \"session\": \"%s\",", hashcat_status->session);
+  printf (" \"guess\": {");
+  if (hashcat_status->guess_base)
+    printf (" \"guess_base\": \"%s\",", hashcat_status->guess_base);
+  else
+    printf (" \"guess_base\": null,");
+  printf (" \"guess_base_count\": \"%d\",", hashcat_status->guess_base_count);
+  printf (" \"guess_base_offset\": \"%d\",", hashcat_status->guess_base_offset);
+  printf (" \"guess_base_percent\": \"%.02f%%\",", hashcat_status->guess_base_percent);
+  printf (" \"guess_mask_length\": \"%d\",", hashcat_status->guess_mask_length);
+  if (hashcat_status->guess_mod)
+    printf (" \"guess_mod\": \"%s\",", hashcat_status->guess_mod);
+  else
+    printf (" \"guess_mod\": null,");
+  printf (" \"guess_mod_count\": \"%d\",", hashcat_status->guess_mod_count);
+  printf (" \"guess_mod_offset\": \"%d\",", hashcat_status->guess_mod_offset);
+  printf (" \"guess_mod_percent\": \"%.02f%%\",", hashcat_status->guess_mod_percent);
+  printf (" \"guess_mode\": \"%d\"", hashcat_status->guess_mode);
+  printf (" }");
   printf (" \"status\": %d,", hashcat_status->status_number);
   printf (" \"target\": \"%s\",", target_json_encoded);
   printf (" \"progress\": [%" PRIu64 ", %" PRIu64 "],", hashcat_status->progress_cur_relative_skip, hashcat_status->progress_end_relative_skip);