From 97a33dc4efb4818d665cadfd016bceca06f63dea Mon Sep 17 00:00:00 2001 From: jsteube Date: Tue, 25 Oct 2016 12:03:20 +0200 Subject: [PATCH] Sort events --- include/types.h | 92 ++++++++++++++++++++++++------------------------- src/main.c | 68 ++++++++++++++++++------------------ 2 files changed, 80 insertions(+), 80 deletions(-) diff --git a/include/types.h b/include/types.h index 5e6bd6214..56694920c 100644 --- a/include/types.h +++ b/include/types.h @@ -85,52 +85,52 @@ typedef enum loglevel typedef enum event_identifier { - EVENT_LOG_INFO = 0x00000001, - EVENT_LOG_WARNING = 0x00000002, - EVENT_LOG_ERROR = 0x00000003, - EVENT_OUTERLOOP_STARTING = 0x00000031, - EVENT_OUTERLOOP_MAINSCREEN = 0x00000032, - EVENT_OUTERLOOP_FINISHED = 0x00000033, - EVENT_INNERLOOP1_STARTING = 0x00000041, - EVENT_INNERLOOP1_FINISHED = 0x00000042, - EVENT_INNERLOOP2_STARTING = 0x00000051, - EVENT_INNERLOOP2_FINISHED = 0x00000052, - EVENT_CALCULATED_WORDS_BASE = 0x00000059, - EVENT_AUTOTUNE_STARTING = 0x00000053, - EVENT_AUTOTUNE_FINISHED = 0x00000054, - EVENT_CRACKER_STARTING = 0x00000055, - EVENT_CRACKER_FINISHED = 0x00000056, - EVENT_CRACKER_HASH_CRACKED = 0x00000058, - EVENT_POTFILE_REMOVE_PARSE_PRE = 0x00000061, - EVENT_POTFILE_REMOVE_PARSE_POST = 0x00000062, - EVENT_POTFILE_NUM_CRACKED = 0x00000063, - EVENT_POTFILE_ALL_CRACKED = 0x00000064, - EVENT_POTFILE_HASH_SHOW = 0x00000065, - EVENT_POTFILE_HASH_LEFT = 0x00000066, - EVENT_OPENCL_SESSION_PRE = 0x00000071, - EVENT_OPENCL_SESSION_POST = 0x00000072, - EVENT_BITMAP_INIT_PRE = 0x00000081, - EVENT_BITMAP_INIT_POST = 0x00000082, - EVENT_WEAK_HASH_PRE = 0x00000091, - EVENT_WEAK_HASH_POST = 0x00000092, - EVENT_SET_KERNEL_POWER_FINAL = 0x000000a1, - EVENT_MONITOR_THROTTLE1 = 0x000000b1, - EVENT_MONITOR_THROTTLE2 = 0x000000b2, - EVENT_MONITOR_THROTTLE3 = 0x000000b3, - EVENT_MONITOR_TEMP_ABORT = 0x000000c1, - EVENT_MONITOR_RUNTIME_LIMIT = 0x000000d1, - EVENT_MONITOR_STATUS_REFRESH = 0x000000e1, - EVENT_WORDLIST_CACHE_HIT = 0x000000f1, - EVENT_WORDLIST_CACHE_GENERATE = 0x000000f2, - EVENT_HASHLIST_COUNT_LINES_PRE = 0x00000101, - EVENT_HASHLIST_COUNT_LINES_POST = 0x00000102, - EVENT_HASHLIST_PARSE_HASH = 0x00000103, - EVENT_HASHLIST_SORT_HASH_PRE = 0x00000104, - EVENT_HASHLIST_SORT_HASH_POST = 0x00000105, - EVENT_HASHLIST_UNIQUE_HASH_PRE = 0x00000106, - EVENT_HASHLIST_UNIQUE_HASH_POST = 0x00000107, - EVENT_HASHLIST_SORT_SALT_PRE = 0x00000108, - EVENT_HASHLIST_SORT_SALT_POST = 0x00000109, + EVENT_AUTOTUNE_FINISHED = 0x00000000, + EVENT_AUTOTUNE_STARTING = 0x00000001, + EVENT_BITMAP_INIT_POST = 0x00000010, + EVENT_BITMAP_INIT_PRE = 0x00000011, + EVENT_CALCULATED_WORDS_BASE = 0x00000020, + EVENT_CRACKER_FINISHED = 0x00000030, + EVENT_CRACKER_HASH_CRACKED = 0x00000031, + EVENT_CRACKER_STARTING = 0x00000032, + EVENT_HASHLIST_COUNT_LINES_POST = 0x00000040, + EVENT_HASHLIST_COUNT_LINES_PRE = 0x00000041, + EVENT_HASHLIST_PARSE_HASH = 0x00000042, + EVENT_HASHLIST_SORT_HASH_POST = 0x00000043, + EVENT_HASHLIST_SORT_HASH_PRE = 0x00000044, + EVENT_HASHLIST_SORT_SALT_POST = 0x00000045, + EVENT_HASHLIST_SORT_SALT_PRE = 0x00000046, + EVENT_HASHLIST_UNIQUE_HASH_POST = 0x00000047, + EVENT_HASHLIST_UNIQUE_HASH_PRE = 0x00000048, + EVENT_INNERLOOP1_FINISHED = 0x00000050, + EVENT_INNERLOOP1_STARTING = 0x00000051, + EVENT_INNERLOOP2_FINISHED = 0x00000060, + EVENT_INNERLOOP2_STARTING = 0x00000061, + EVENT_LOG_ERROR = 0x00000070, + EVENT_LOG_INFO = 0x00000071, + EVENT_LOG_WARNING = 0x00000072, + EVENT_MONITOR_RUNTIME_LIMIT = 0x00000080, + EVENT_MONITOR_STATUS_REFRESH = 0x00000081, + EVENT_MONITOR_TEMP_ABORT = 0x00000082, + EVENT_MONITOR_THROTTLE1 = 0x00000083, + EVENT_MONITOR_THROTTLE2 = 0x00000084, + EVENT_MONITOR_THROTTLE3 = 0x00000085, + EVENT_OPENCL_SESSION_POST = 0x00000090, + EVENT_OPENCL_SESSION_PRE = 0x00000091, + EVENT_OUTERLOOP_FINISHED = 0x000000a0, + EVENT_OUTERLOOP_MAINSCREEN = 0x000000a1, + EVENT_OUTERLOOP_STARTING = 0x000000a2, + EVENT_POTFILE_ALL_CRACKED = 0x000000b0, + EVENT_POTFILE_HASH_LEFT = 0x000000b1, + EVENT_POTFILE_HASH_SHOW = 0x000000b2, + EVENT_POTFILE_NUM_CRACKED = 0x000000b3, + EVENT_POTFILE_REMOVE_PARSE_POST = 0x000000b4, + EVENT_POTFILE_REMOVE_PARSE_PRE = 0x000000b5, + EVENT_SET_KERNEL_POWER_FINAL = 0x000000c0, + EVENT_WEAK_HASH_POST = 0x000000d0, + EVENT_WEAK_HASH_PRE = 0x000000d1, + EVENT_WORDLIST_CACHE_GENERATE = 0x000000e0, + EVENT_WORDLIST_CACHE_HIT = 0x000000e1, // there will be much more event types soon diff --git a/src/main.c b/src/main.c index ef3f37ef4..6b8ca96f5 100644 --- a/src/main.c +++ b/src/main.c @@ -785,46 +785,46 @@ void event (const u32 id, hashcat_ctx_t *hashcat_ctx, const void *buf, const siz { switch (id) { - case EVENT_LOG_INFO: main_log_info (hashcat_ctx, buf, len); break; - case EVENT_LOG_WARNING: main_log_warning (hashcat_ctx, buf, len); break; - case EVENT_LOG_ERROR: main_log_error (hashcat_ctx, buf, len); break; - case EVENT_OUTERLOOP_STARTING: main_outerloop_starting (hashcat_ctx, buf, len); break; - case EVENT_OUTERLOOP_FINISHED: main_outerloop_finished (hashcat_ctx, buf, len); break; - case EVENT_OUTERLOOP_MAINSCREEN: main_outerloop_mainscreen (hashcat_ctx, buf, len); break; - case EVENT_CRACKER_STARTING: main_cracker_starting (hashcat_ctx, buf, len); break; + case EVENT_BITMAP_INIT_POST: main_bitmap_init_post (hashcat_ctx, buf, len); break; + case EVENT_BITMAP_INIT_PRE: main_bitmap_init_pre (hashcat_ctx, buf, len); break; + case EVENT_CALCULATED_WORDS_BASE: main_calculated_words_base (hashcat_ctx, buf, len); break; case EVENT_CRACKER_FINISHED: main_cracker_finished (hashcat_ctx, buf, len); break; case EVENT_CRACKER_HASH_CRACKED: main_cracker_hash_cracked (hashcat_ctx, buf, len); break; - case EVENT_CALCULATED_WORDS_BASE: main_calculated_words_base (hashcat_ctx, buf, len); break; - case EVENT_POTFILE_REMOVE_PARSE_PRE: main_potfile_remove_parse_pre (hashcat_ctx, buf, len); break; - case EVENT_POTFILE_REMOVE_PARSE_POST: main_potfile_remove_parse_post (hashcat_ctx, buf, len); break; - case EVENT_POTFILE_HASH_SHOW: main_potfile_hash_show (hashcat_ctx, buf, len); break; - case EVENT_POTFILE_HASH_LEFT: main_potfile_hash_left (hashcat_ctx, buf, len); break; - case EVENT_POTFILE_NUM_CRACKED: main_potfile_num_cracked (hashcat_ctx, buf, len); break; - case EVENT_POTFILE_ALL_CRACKED: main_potfile_all_cracked (hashcat_ctx, buf, len); break; - case EVENT_OPENCL_SESSION_PRE: main_opencl_session_pre (hashcat_ctx, buf, len); break; - case EVENT_OPENCL_SESSION_POST: main_opencl_session_post (hashcat_ctx, buf, len); break; - case EVENT_BITMAP_INIT_PRE: main_bitmap_init_pre (hashcat_ctx, buf, len); break; - case EVENT_BITMAP_INIT_POST: main_bitmap_init_post (hashcat_ctx, buf, len); break; - case EVENT_WEAK_HASH_PRE: main_weak_hash_pre (hashcat_ctx, buf, len); break; - case EVENT_WEAK_HASH_POST: main_weak_hash_post (hashcat_ctx, buf, len); break; - case EVENT_SET_KERNEL_POWER_FINAL: main_set_kernel_power_final (hashcat_ctx, buf, len); break; + case EVENT_CRACKER_STARTING: main_cracker_starting (hashcat_ctx, buf, len); break; + case EVENT_HASHLIST_COUNT_LINES_POST: main_hashlist_count_lines_post (hashcat_ctx, buf, len); break; + case EVENT_HASHLIST_COUNT_LINES_PRE: main_hashlist_count_lines_pre (hashcat_ctx, buf, len); break; + case EVENT_HASHLIST_PARSE_HASH: main_hashlist_parse_hash (hashcat_ctx, buf, len); break; + case EVENT_HASHLIST_SORT_HASH_POST: main_hashlist_sort_hash_post (hashcat_ctx, buf, len); break; + case EVENT_HASHLIST_SORT_HASH_PRE: main_hashlist_sort_hash_pre (hashcat_ctx, buf, len); break; + case EVENT_HASHLIST_SORT_SALT_POST: main_hashlist_sort_salt_post (hashcat_ctx, buf, len); break; + case EVENT_HASHLIST_SORT_SALT_PRE: main_hashlist_sort_salt_pre (hashcat_ctx, buf, len); break; + case EVENT_HASHLIST_UNIQUE_HASH_POST: main_hashlist_unique_hash_post (hashcat_ctx, buf, len); break; + case EVENT_HASHLIST_UNIQUE_HASH_PRE: main_hashlist_unique_hash_pre (hashcat_ctx, buf, len); break; + case EVENT_LOG_ERROR: main_log_error (hashcat_ctx, buf, len); break; + case EVENT_LOG_INFO: main_log_info (hashcat_ctx, buf, len); break; + case EVENT_LOG_WARNING: main_log_warning (hashcat_ctx, buf, len); break; + case EVENT_MONITOR_RUNTIME_LIMIT: main_monitor_runtime_limit (hashcat_ctx, buf, len); break; + case EVENT_MONITOR_STATUS_REFRESH: main_monitor_status_refresh (hashcat_ctx, buf, len); break; + case EVENT_MONITOR_TEMP_ABORT: main_monitor_temp_abort (hashcat_ctx, buf, len); break; case EVENT_MONITOR_THROTTLE1: main_monitor_throttle1 (hashcat_ctx, buf, len); break; case EVENT_MONITOR_THROTTLE2: main_monitor_throttle2 (hashcat_ctx, buf, len); break; case EVENT_MONITOR_THROTTLE3: main_monitor_throttle3 (hashcat_ctx, buf, len); break; - case EVENT_MONITOR_TEMP_ABORT: main_monitor_temp_abort (hashcat_ctx, buf, len); break; - case EVENT_MONITOR_RUNTIME_LIMIT: main_monitor_runtime_limit (hashcat_ctx, buf, len); break; - case EVENT_MONITOR_STATUS_REFRESH: main_monitor_status_refresh (hashcat_ctx, buf, len); break; - case EVENT_WORDLIST_CACHE_HIT: main_wordlist_cache_hit (hashcat_ctx, buf, len); break; + case EVENT_OPENCL_SESSION_POST: main_opencl_session_post (hashcat_ctx, buf, len); break; + case EVENT_OPENCL_SESSION_PRE: main_opencl_session_pre (hashcat_ctx, buf, len); break; + case EVENT_OUTERLOOP_FINISHED: main_outerloop_finished (hashcat_ctx, buf, len); break; + case EVENT_OUTERLOOP_MAINSCREEN: main_outerloop_mainscreen (hashcat_ctx, buf, len); break; + case EVENT_OUTERLOOP_STARTING: main_outerloop_starting (hashcat_ctx, buf, len); break; + case EVENT_POTFILE_ALL_CRACKED: main_potfile_all_cracked (hashcat_ctx, buf, len); break; + case EVENT_POTFILE_HASH_LEFT: main_potfile_hash_left (hashcat_ctx, buf, len); break; + case EVENT_POTFILE_HASH_SHOW: main_potfile_hash_show (hashcat_ctx, buf, len); break; + case EVENT_POTFILE_NUM_CRACKED: main_potfile_num_cracked (hashcat_ctx, buf, len); break; + case EVENT_POTFILE_REMOVE_PARSE_POST: main_potfile_remove_parse_post (hashcat_ctx, buf, len); break; + case EVENT_POTFILE_REMOVE_PARSE_PRE: main_potfile_remove_parse_pre (hashcat_ctx, buf, len); break; + case EVENT_SET_KERNEL_POWER_FINAL: main_set_kernel_power_final (hashcat_ctx, buf, len); break; + case EVENT_WEAK_HASH_POST: main_weak_hash_post (hashcat_ctx, buf, len); break; + case EVENT_WEAK_HASH_PRE: main_weak_hash_pre (hashcat_ctx, buf, len); break; case EVENT_WORDLIST_CACHE_GENERATE: main_wordlist_cache_generate (hashcat_ctx, buf, len); break; - case EVENT_HASHLIST_COUNT_LINES_PRE: main_hashlist_count_lines_pre (hashcat_ctx, buf, len); break; - case EVENT_HASHLIST_COUNT_LINES_POST: main_hashlist_count_lines_post (hashcat_ctx, buf, len); break; - case EVENT_HASHLIST_PARSE_HASH: main_hashlist_parse_hash (hashcat_ctx, buf, len); break; - case EVENT_HASHLIST_SORT_HASH_PRE: main_hashlist_sort_hash_pre (hashcat_ctx, buf, len); break; - case EVENT_HASHLIST_SORT_HASH_POST: main_hashlist_sort_hash_post (hashcat_ctx, buf, len); break; - case EVENT_HASHLIST_UNIQUE_HASH_PRE: main_hashlist_unique_hash_pre (hashcat_ctx, buf, len); break; - case EVENT_HASHLIST_UNIQUE_HASH_POST: main_hashlist_unique_hash_post (hashcat_ctx, buf, len); break; - case EVENT_HASHLIST_SORT_SALT_PRE: main_hashlist_sort_salt_pre (hashcat_ctx, buf, len); break; - case EVENT_HASHLIST_SORT_SALT_POST: main_hashlist_sort_salt_post (hashcat_ctx, buf, len); break; + case EVENT_WORDLIST_CACHE_HIT: main_wordlist_cache_hit (hashcat_ctx, buf, len); break; } }