From eb939baaa51c6f48c4fdfe5a993bdc7aa495ba89 Mon Sep 17 00:00:00 2001
From: ringzero <ringzero@0x.cn>
Date: Mon, 5 Dec 2022 20:12:56 +0800
Subject: [PATCH 1/2] rdp: support hydra waittime

---
 hydra-rdp.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hydra-rdp.c b/hydra-rdp.c
index a772086..405ecf3 100644
--- a/hydra-rdp.c
+++ b/hydra-rdp.c
@@ -9,6 +9,7 @@
 
 #include "hydra-mod.h"
 
+extern hydra_option hydra_options;
 extern char *HYDRA_EXIT;
 #ifndef LIBFREERDP
 void dummy_rdp() { printf("\n"); }
@@ -18,6 +19,7 @@ void dummy_rdp() { printf("\n"); }
 freerdp *instance = 0;
 BOOL rdp_connect(char *server, int32_t port, char *domain, char *login, char *password) {
   int32_t err = 0;
+  int32_t waittime = hydra_options.waittime;
 
   instance->settings->Username = login;
   instance->settings->Password = password;
@@ -30,6 +32,11 @@ BOOL rdp_connect(char *server, int32_t port, char *domain, char *login, char *pa
   instance->settings->ServerPort = port;
   instance->settings->Domain = domain;
   instance->settings->MaxTimeInCheckLoop = 100;
+  // hydra_options.waittime default value -> 32
+  if (waittime != 32) {
+    // freerdp timeout format is microseconds -> default:15000
+    instance->settings->TcpConnectTimeout = waittime * 1000;
+  }
   instance->settings->TlsSecLevel = 0;
   freerdp_connect(instance);
   err = freerdp_get_last_error(instance->context);

From d830ac795e65a7b47492d50859eb36bb8d2dd116 Mon Sep 17 00:00:00 2001
From: ringzero <ringzero@0x.cn>
Date: Tue, 6 Dec 2022 09:41:04 +0800
Subject: [PATCH 2/2] rdp implementing-w and -W support

---
 hydra-rdp.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/hydra-rdp.c b/hydra-rdp.c
index 405ecf3..4036591 100644
--- a/hydra-rdp.c
+++ b/hydra-rdp.c
@@ -19,7 +19,6 @@ void dummy_rdp() { printf("\n"); }
 freerdp *instance = 0;
 BOOL rdp_connect(char *server, int32_t port, char *domain, char *login, char *password) {
   int32_t err = 0;
-  int32_t waittime = hydra_options.waittime;
 
   instance->settings->Username = login;
   instance->settings->Password = password;
@@ -32,11 +31,8 @@ BOOL rdp_connect(char *server, int32_t port, char *domain, char *login, char *pa
   instance->settings->ServerPort = port;
   instance->settings->Domain = domain;
   instance->settings->MaxTimeInCheckLoop = 100;
-  // hydra_options.waittime default value -> 32
-  if (waittime != 32) {
-    // freerdp timeout format is microseconds -> default:15000
-    instance->settings->TcpConnectTimeout = waittime * 1000;
-  }
+  // freerdp timeout format is microseconds -> default:15000
+  instance->settings->TcpConnectTimeout = hydra_options.waittime * 1000;
   instance->settings->TlsSecLevel = 0;
   freerdp_connect(instance);
   err = freerdp_get_last_error(instance->context);
@@ -108,6 +104,7 @@ int32_t start_rdp(char *ip, int32_t port, unsigned char options, char *miscptr,
 void service_rdp(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname) {
   int32_t run = 1, next_run = 1;
   int32_t myport = PORT_RDP;
+  int32_t __first_rdp_connect = 1;
 
   if (port != 0)
     myport = port;
@@ -119,6 +116,10 @@ void service_rdp(char *ip, int32_t sp, unsigned char options, char *miscptr, FIL
     next_run = 0;
     switch (run) {
     case 1: /* run the cracking function */
+      if (__first_rdp_connect != 0)
+        __first_rdp_connect = 0;
+      else
+        sleep(hydra_options.conwait);
       next_run = start_rdp(ip, myport, options, miscptr, fp);
       break;
     case 2: /* clean exit */