From dfef658cf87ee08f5748612a6a3e0ea2c72f8416 Mon Sep 17 00:00:00 2001
From: Diadlo <polsha3@gmail.com>
Date: Thu, 1 Jun 2017 00:39:33 +0300
Subject: [PATCH 1/4] Create services vector

---
 hydra.c | 196 ++++++++++++++++++++++++++------------------------------
 1 file changed, 91 insertions(+), 105 deletions(-)

diff --git a/hydra.c b/hydra.c
index f54554b..c10f5f5 100644
--- a/hydra.c
+++ b/hydra.c
@@ -1184,132 +1184,118 @@ char *hydra_build_time() {
   return (char *) &datetime;
 }
 
-void hydra_service_init(int target_no) {
-  int x = 99;
+typedef void (*service_t)(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
+typedef int (*service_init_t)(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 
+static const struct {
+  const char* name;
+  service_init_t init;
+  service_t exec;
+} services[] = {
+  { "adam6500", service_adam6500_init, service_adam6500 },
 #ifdef LIBAFP
-  if (strcmp(hydra_options.service, "afp") == 0)
-    x = service_afp_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "afp", service_afp_init, service_afp },
 #endif
-  if (strcmp(hydra_options.service, "asterisk") == 0)
-    x = service_asterisk_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "cisco-enable") == 0)
-    x = service_cisco_enable_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "cvs") == 0)
-    x = service_cvs_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "adam6500") == 0)
-    x = service_adam6500_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "cisco") == 0)
-    x = service_cisco_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "asterisk", service_asterisk_init, service_asterisk },
+  { "cisco", service_cisco_init, service_cisco },
+  { "cisco-enable", service_cisco_enable_init, service_cisco_enable },
+  { "cvs", service_cvs_init, service_cvs },
 #ifdef LIBFIREBIRD
-  if (strcmp(hydra_options.service, "firebird") == 0)
-    x = service_firebird_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "firebird", service_firebird_init, service_firebird },
 #endif
-  if (strcmp(hydra_options.service, "ftp") == 0 || strcmp(hydra_options.service, "ftps") == 0)
-    x = service_ftp_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "redis") == 0 || strcmp(hydra_options.service, "redis") == 0)
-    x = service_redis_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "http-get") == 0 || strcmp(hydra_options.service, "http-head") == 0)
-    x = service_http_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "http-form") == 0 || strcmp(hydra_options.service, "http-get-form") == 0 || strcmp(hydra_options.service, "http-post-form") == 0)
-    x = service_http_form_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "http-proxy") == 0)
-    x = service_http_proxy_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "http-proxy-urlenum") == 0)
-    x = service_http_proxy_urlenum_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "icq") == 0)
-    x = service_icq_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "imap") == 0)
-    x = service_imap_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "irc") == 0)
-    x = service_irc_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strncmp(hydra_options.service, "ldap", 4) == 0)
-    x = service_ldap_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-#ifdef LIBOPENSSL
-  if (strcmp(hydra_options.service, "sip") == 0)
-    x = service_sip_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "smb") == 0 || strcmp(hydra_options.service, "smbnt") == 0)
-    x = service_smb_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "oracle-listener") == 0)
-    x = service_oracle_listener_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "oracle-sid") == 0)
-    x = service_oracle_sid_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "rdp") == 0)
-    x = service_rdp_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-#endif
-  if (strcmp(hydra_options.service, "mssql") == 0)
-    x = service_mssql_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "ftp", service_ftp_init, service_ftp },
+  { "ftps", service_ftp_init, service_ftps },
+  { "http-get", service_http_init, service_http_get },
+  { "http-get-form", service_http_form_init, service_http_get_form },
+  { "http-head", service_http_init, service_http_head },
+  { "http-form", service_http_form_init, NULL },
+  { "http-post", NULL, service_http_post },
+  { "http-post-form", service_http_form_init, service_http_post_form },
+  { "http-proxy", service_http_proxy_init, service_http_proxy },
+  { "http-proxy-urlenum", service_http_proxy_urlenum_init, service_http_proxy_urlenum },
+  { "icq", service_icq_init, service_icq },
+  { "imap", service_imap_init, service_imap },
+  { "irc", service_irc_init, service_irc },
+  { "ldap2", service_ldap_init, service_ldap2 },
+  { "ldap3", service_ldap_init, service_ldap3 },
+  { "ldap3-crammd5", service_ldap_init, service_ldap3_cram_md5 },
+  { "ldap3-digestmd5", service_ldap_init, service_ldap3_digest_md5 },
+  { "mssql", service_mssql_init, service_mssql },
 #ifdef HAVE_MATH_H
-  if (strcmp(hydra_options.service, "mysql") == 0)
-    x = service_mysql_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "mysql", service_mysql_init, service_mysql },
 #endif
 #ifdef LIBNCP
-  if (strcmp(hydra_options.service, "ncp") == 0)
-    x = service_ncp_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "ncp", service_ncp_init, service_ncp },
 #endif
-  if (strcmp(hydra_options.service, "nntp") == 0)
-    x = service_nntp_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "nntp", service_nntp_init, service_nntp },
 #ifdef LIBORACLE
-  if (strcmp(hydra_options.service, "oracle") == 0)
-    x = service_oracle_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "oracle", service_oracle_init, service_oracle },
 #endif
-  if (strcmp(hydra_options.service, "pcanywhere") == 0)
-    x = service_pcanywhere_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "pcnfs") == 0)
-    x = service_pcnfs_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "pop3") == 0)
-    x = service_pop3_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+#ifdef LIBOPENSSL
+  { "oracle-listener", service_oracle_listener_init, service_oracle_listener },
+  { "oracle-sid", service_oracle_sid_init, service_oracle_sid },
+#endif
+  { "pcanywhere", service_pcanywhere_init, service_pcanywhere },
+  { "pcnfs", service_pcnfs_init, service_pcnfs },
+  { "pop3", service_pop3_init, service_pop3 },
 #ifdef LIBPOSTGRES
-  if (strcmp(hydra_options.service, "postgres") == 0)
-    x = service_postgres_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "postgres", service_postgres_init, service_postgres },
 #endif
-  if (strcmp(hydra_options.service, "rexec") == 0)
-    x = service_rexec_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "rlogin") == 0)
-    x = service_rlogin_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "rsh") == 0)
-    x = service_rsh_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "redis", service_redis_init, service_redis },
+  { "rexec", service_rexec_init, service_rexec },
+#ifdef LIBOPENSSL
+  { "rdp", service_rdp_init, service_rdp },
+#endif
+  { "rlogin", service_rlogin_init, service_rlogin },
+  { "rsh", service_rsh_init, service_rsh },
+  { "rtsp", service_rtsp_init, service_rtsp },
+  { "rpcap", service_rpcap_init, service_rpcap },
+  { "s7-300", service_s7_300_init, service_s7_300 },
 #ifdef LIBSAPR3
-  if (strcmp(hydra_options.service, "sapr3") == 0)
-    x = service_sapr3_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "sapr3", service_sapr3_init, service_sapr3 },
 #endif
-  if (strcmp(hydra_options.service, "smtp") == 0)
-    x = service_smtp_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "smtp-enum") == 0)
-    x = service_smtp_enum_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "snmp") == 0)
-    x = service_snmp_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "socks5") == 0)
-    x = service_socks5_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+#ifdef LIBOPENSSL
+  { "sip", service_sip_init, service_sip },
+  { "smbnt", service_smb_init, service_smb },
+  { "smb", service_smb_init, service_smb },
+#endif
+  { "smtp", service_smtp_init, service_smtp },
+  { "smtp-enum", service_smtp_enum_init, service_smtp_enum },
+  { "snmp", service_snmp_init, service_snmp },
+  { "socks5", service_socks5_init, service_socks5 },
 #ifdef LIBSSH
-  // dirty workaround here:
-  if (strcmp(hydra_options.service, "ssh") == 0)
-    x = service_ssh_init(hydra_targets[target_no]->ip, -1, options, login_ptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "sshkey") == 0)
-    x = service_sshkey_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "ssh", NULL, service_ssh },
+  { "sshkey", service_sshkey_init, service_sshkey },
 #endif
 #ifdef LIBSVN
-  if (strcmp(hydra_options.service, "svn") == 0)
-    x = service_svn_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "svn", service_svn_init, service_svn },
 #endif
-  if (strcmp(hydra_options.service, "teamspeak") == 0)
-    x = service_teamspeak_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "telnet") == 0)
-    x = service_telnet_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "vmauthd") == 0)
-    x = service_vmauthd_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "vnc") == 0)
-    x = service_vnc_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "xmpp") == 0)
-    x = service_xmpp_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "s7-300") == 0)
-    x = service_s7_300_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "rtsp") == 0)
-    x = service_rtsp_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
-  if (strcmp(hydra_options.service, "rpcap") == 0)
-    x = service_rpcap_init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+  { "teamspeak", service_teamspeak_init, service_teamspeak },
+  { "telnet", service_telnet_init, service_telnet },
+  { "vmauthd", service_vmauthd_init, service_vmauthd },
+  { "vnc", service_vnc_init, service_vnc },
+  { "xmpp", service_xmpp_init, NULL }
+};
+
+void hydra_service_init(int target_no) {
+  int x = 99;
+  int i = 0;
+
+  for (i = 0; i < sizeof(services) / sizeof(services[0]); i++) {
+      if (strcmp(hydra_options.service, services[i].name) == 0) {
+          if (services[i].init) {
+              x = services[i].init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+              break;
+          }
+      }
+  }
   // ADD NEW SERVICES HERE
 
+  // dirty workaround here:
+#ifdef LIBSSH
+  if (strcmp(hydra_options.service, "ssh") == 0)
+    x = service_ssh_init(hydra_targets[target_no]->ip, -1, options, login_ptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+#endif
 
   if (x != 0 && x != 99) {
     if (x > 0 && x < 4)

From 5dc883fb4beda7cac87ac341edff2ef354fd94db Mon Sep 17 00:00:00 2001
From: Diadlo <polsha3@gmail.com>
Date: Thu, 1 Jun 2017 00:25:41 +0300
Subject: [PATCH 2/4] Refactor service_init

---
 hydra.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/hydra.c b/hydra.c
index c10f5f5..e4561c8 100644
--- a/hydra.c
+++ b/hydra.c
@@ -1280,11 +1280,14 @@ static const struct {
 void hydra_service_init(int target_no) {
   int x = 99;
   int i = 0;
+  hydra_target* t = hydra_targets[target_no];
+  char* miscptr = hydra_options.miscptr;
+  FILE* ofp = hydra_brains.ofp;
 
   for (i = 0; i < sizeof(services) / sizeof(services[0]); i++) {
       if (strcmp(hydra_options.service, services[i].name) == 0) {
           if (services[i].init) {
-              x = services[i].init(hydra_targets[target_no]->ip, -1, options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+              x = services[i].init(t->ip, -1, options, miscptr, ofp, t->port, t->target);
               break;
           }
       }
@@ -1294,18 +1297,20 @@ void hydra_service_init(int target_no) {
   // dirty workaround here:
 #ifdef LIBSSH
   if (strcmp(hydra_options.service, "ssh") == 0)
-    x = service_ssh_init(hydra_targets[target_no]->ip, -1, options, login_ptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[target_no]->target);
+    x = service_ssh_init(t->ip, -1, options, login_ptr, ofp, t->port, t->target);
 #endif
 
-  if (x != 0 && x != 99) {
-    if (x > 0 && x < 4)
-      hydra_targets[target_no]->done = x;
-    else
-      hydra_targets[target_no]->done = 2;
-    hydra_brains.finished++;
-    if (hydra_brains.targets == 1)
-      exit(-1);
+  if (x == 0 || x == 99) {
+      return;
   }
+
+  if (x > 0 && x < 4)
+    hydra_targets[target_no]->done = x;
+  else
+    hydra_targets[target_no]->done = 2;
+  hydra_brains.finished++;
+  if (hydra_brains.targets == 1)
+    exit(-1);
 }
 
 

From 8b6607aec0c36c8c4dbe7884553980c617109bb2 Mon Sep 17 00:00:00 2001
From: Diadlo <polsha3@gmail.com>
Date: Thu, 1 Jun 2017 00:36:53 +0300
Subject: [PATCH 3/4] Add using SERVICE macro

---
 hydra.c | 95 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 49 insertions(+), 46 deletions(-)

diff --git a/hydra.c b/hydra.c
index e4561c8..314cefa 100644
--- a/hydra.c
+++ b/hydra.c
@@ -1187,23 +1187,26 @@ char *hydra_build_time() {
 typedef void (*service_t)(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 typedef int (*service_init_t)(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 
+#define SERVICE2(name, func) { name, service_##func##_init, service_##func }
+#define SERVICE(name) { #name, service_##name##_init, service_##name }
+
 static const struct {
   const char* name;
   service_init_t init;
   service_t exec;
 } services[] = {
-  { "adam6500", service_adam6500_init, service_adam6500 },
+  SERVICE(adam6500),
 #ifdef LIBAFP
-  { "afp", service_afp_init, service_afp },
+  SERVICE(afp),
 #endif
-  { "asterisk", service_asterisk_init, service_asterisk },
-  { "cisco", service_cisco_init, service_cisco },
-  { "cisco-enable", service_cisco_enable_init, service_cisco_enable },
-  { "cvs", service_cvs_init, service_cvs },
+  SERVICE(asterisk),
+  SERVICE(cisco),
+  SERVICE2("cisco-enable", cisco_enable),
+  SERVICE(cvs),
 #ifdef LIBFIREBIRD
-  { "firebird", service_firebird_init, service_firebird },
+  SERVICE(firebird),
 #endif
-  { "ftp", service_ftp_init, service_ftp },
+  SERVICE(ftp),
   { "ftps", service_ftp_init, service_ftps },
   { "http-get", service_http_init, service_http_get },
   { "http-get-form", service_http_form_init, service_http_get_form },
@@ -1211,69 +1214,69 @@ static const struct {
   { "http-form", service_http_form_init, NULL },
   { "http-post", NULL, service_http_post },
   { "http-post-form", service_http_form_init, service_http_post_form },
-  { "http-proxy", service_http_proxy_init, service_http_proxy },
-  { "http-proxy-urlenum", service_http_proxy_urlenum_init, service_http_proxy_urlenum },
-  { "icq", service_icq_init, service_icq },
-  { "imap", service_imap_init, service_imap },
-  { "irc", service_irc_init, service_irc },
+  SERVICE2("http-proxy", http_proxy),
+  SERVICE2("http-proxy-urlenum", http_proxy_urlenum),
+  SERVICE(icq),
+  SERVICE(imap),
+  SERVICE(irc),
   { "ldap2", service_ldap_init, service_ldap2 },
   { "ldap3", service_ldap_init, service_ldap3 },
   { "ldap3-crammd5", service_ldap_init, service_ldap3_cram_md5 },
   { "ldap3-digestmd5", service_ldap_init, service_ldap3_digest_md5 },
-  { "mssql", service_mssql_init, service_mssql },
+  SERVICE(mssql),
 #ifdef HAVE_MATH_H
-  { "mysql", service_mysql_init, service_mysql },
+  SERVICE(mysql),
 #endif
 #ifdef LIBNCP
-  { "ncp", service_ncp_init, service_ncp },
+  SERVICE(ncp),
 #endif
-  { "nntp", service_nntp_init, service_nntp },
+  SERVICE(nntp),
 #ifdef LIBORACLE
-  { "oracle", service_oracle_init, service_oracle },
+  SERVICE(oracle),
 #endif
 #ifdef LIBOPENSSL
-  { "oracle-listener", service_oracle_listener_init, service_oracle_listener },
-  { "oracle-sid", service_oracle_sid_init, service_oracle_sid },
+  SERVICE2("oracle-listener", oracle_listener),
+  SERVICE2("oracle-sid", oracle_sid),
 #endif
-  { "pcanywhere", service_pcanywhere_init, service_pcanywhere },
-  { "pcnfs", service_pcnfs_init, service_pcnfs },
-  { "pop3", service_pop3_init, service_pop3 },
+  SERVICE(pcanywhere),
+  SERVICE(pcnfs),
+  SERVICE(pop3),
 #ifdef LIBPOSTGRES
-  { "postgres", service_postgres_init, service_postgres },
+  SERVICE(postgres),
 #endif
-  { "redis", service_redis_init, service_redis },
-  { "rexec", service_rexec_init, service_rexec },
+  SERVICE(redis),
+  SERVICE(rexec),
 #ifdef LIBOPENSSL
-  { "rdp", service_rdp_init, service_rdp },
+  SERVICE(rdp),
 #endif
-  { "rlogin", service_rlogin_init, service_rlogin },
-  { "rsh", service_rsh_init, service_rsh },
-  { "rtsp", service_rtsp_init, service_rtsp },
-  { "rpcap", service_rpcap_init, service_rpcap },
-  { "s7-300", service_s7_300_init, service_s7_300 },
+  SERVICE(rlogin),
+  SERVICE(rsh),
+  SERVICE(rtsp),
+  SERVICE(rpcap),
+  SERVICE2("s7-300", s7_300),
 #ifdef LIBSAPR3
-  { "sapr3", service_sapr3_init, service_sapr3 },
+  SERVICE(sapr3),
 #endif
 #ifdef LIBOPENSSL
-  { "sip", service_sip_init, service_sip },
-  { "smbnt", service_smb_init, service_smb },
-  { "smb", service_smb_init, service_smb },
+  SERVICE(sip),
+  SERVICE2("smbnt", smb),
+  SERVICE(smb),
 #endif
-  { "smtp", service_smtp_init, service_smtp },
-  { "smtp-enum", service_smtp_enum_init, service_smtp_enum },
-  { "snmp", service_snmp_init, service_snmp },
-  { "socks5", service_socks5_init, service_socks5 },
+  SERVICE(smtp),
+  SERVICE2("smtp-enum", smtp_enum),
+  SERVICE(snmp),
+  SERVICE(socks5),
 #ifdef LIBSSH
   { "ssh", NULL, service_ssh },
-  { "sshkey", service_sshkey_init, service_sshkey },
+  SERVICE(sshkey),
 #endif
 #ifdef LIBSVN
-  { "svn", service_svn_init, service_svn },
+  SERVICE(svn),
 #endif
-  { "teamspeak", service_teamspeak_init, service_teamspeak },
-  { "telnet", service_telnet_init, service_telnet },
-  { "vmauthd", service_vmauthd_init, service_vmauthd },
-  { "vnc", service_vnc_init, service_vnc },
+  SERVICE(teamspeak),
+  SERVICE(telnet),
+  SERVICE(vmauthd),
+  SERVICE(vnc),
   { "xmpp", service_xmpp_init, NULL }
 };
 

From 6edd64e6b68ccbf453c3bb54b79abc6dca922c54 Mon Sep 17 00:00:00 2001
From: Diadlo <polsha3@gmail.com>
Date: Thu, 1 Jun 2017 00:45:41 +0300
Subject: [PATCH 4/4] Refactor spawn_head

---
 hydra.c | 161 ++++++--------------------------------------------------
 1 file changed, 17 insertions(+), 144 deletions(-)

diff --git a/hydra.c b/hydra.c
index 314cefa..09ee76b 100644
--- a/hydra.c
+++ b/hydra.c
@@ -1364,152 +1364,25 @@ int hydra_spawn_head(int head_no, int target_no) {
       if (debug)
         printf("[DEBUG] head_no %d has pid %d\n", head_no, getpid());
 
-      // now call crack module
-      if (strcmp(hydra_options.service, "asterisk") == 0)
-        service_asterisk(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "telnet") == 0)
-        service_telnet(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "ftp") == 0) {
-
-        service_ftp(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-
+      hydra_target* t = hydra_targets[target_no];
+      int sp = hydra_heads[head_no]->sp[1];
+      char* miscptr = hydra_options.miscptr;
+      FILE* ofp = hydra_brains.ofp;
+      hydra_target* head_target = hydra_targets[hydra_heads[head_no]->target_no];
+      for (i = 0; i < sizeof(services) / sizeof(services[0]); i++) {
+          if (strcmp(hydra_options.service, services[i].name) == 0) {
+              if (services[i].exec) {
+                  services[i].exec(t->ip, sp, options, miscptr, ofp, t->port, head_target->target);
+                  // just in case a module returns (which it shouldnt) we let it exit here
+                  exit(-1);
+              }
+          }
       }
-      if (strcmp(hydra_options.service, "ftps") == 0)
-        service_ftps(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "redis") == 0)
-        service_redis(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "pop3") == 0)
-        service_pop3(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "imap") == 0)
-        service_imap(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "vmauthd") == 0)
-        service_vmauthd(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "ldap2") == 0)
-        service_ldap2(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "ldap3") == 0)
-        service_ldap3(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "http-head") == 0)
-        service_http_head(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "ldap3-crammd5") == 0)
-        service_ldap3_cram_md5(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "ldap3-digestmd5") == 0)
-        service_ldap3_digest_md5(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "http-post") == 0)
-        service_http_post(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "http-get") == 0)
-        service_http_get(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "http-get-form") == 0)
-        service_http_get_form(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "http-post-form") == 0)
-        service_http_post_form(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "http-proxy") == 0)
-        service_http_proxy(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "http-proxy-urlenum") == 0)
-        service_http_proxy_urlenum(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "adam6500") == 0)
-        service_adam6500(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "cisco") == 0)
-        service_cisco(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "cisco-enable") == 0)
-        service_cisco_enable(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "socks5") == 0)
-        service_socks5(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "vnc") == 0)
-        service_vnc(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "rexec") == 0)
-        service_rexec(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "rlogin") == 0)
-        service_rlogin(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "rsh") == 0)
-        service_rsh(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "nntp") == 0)
-        service_nntp(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "icq") == 0)
-        service_icq(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "pcnfs") == 0)
-        service_pcnfs(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#ifdef HAVE_MATH_H
-      if (strcmp(hydra_options.service, "mysql") == 0)
-        service_mysql(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#endif
-      if (strcmp(hydra_options.service, "mssql") == 0)
-        service_mssql(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#ifdef LIBOPENSSL
-      if (strcmp(hydra_options.service, "oracle-listener") == 0)
-        service_oracle_listener(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "oracle-sid") == 0)
-        service_oracle_sid(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#endif
-#ifdef LIBORACLE
-      if (strcmp(hydra_options.service, "oracle") == 0)
-        service_oracle(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#endif
-#ifdef LIBPOSTGRES
-      if (strcmp(hydra_options.service, "postgres") == 0)
-        service_postgres(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#endif
-#ifdef LIBFIREBIRD
-      if (strcmp(hydra_options.service, "firebird") == 0)
-        service_firebird(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#endif
-#ifdef LIBAFP
-      if (strcmp(hydra_options.service, "afp") == 0)
-        service_afp(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#endif
-#ifdef LIBNCP
-      if (strcmp(hydra_options.service, "ncp") == 0)
-        service_ncp(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#endif
-      if (strcmp(hydra_options.service, "pcanywhere") == 0)
-        service_pcanywhere(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "cvs") == 0)
-        service_cvs(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#ifdef LIBSVN
-      if (strcmp(hydra_options.service, "svn") == 0)
-        service_svn(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#endif
-      if (strcmp(hydra_options.service, "snmp") == 0)
-        service_snmp(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#ifdef LIBOPENSSL
-      if ((strcmp(hydra_options.service, "smb") == 0) || (strcmp(hydra_options.service, "smbnt") == 0))
-        service_smb(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#endif
-#ifdef LIBSAPR3
-      if (strcmp(hydra_options.service, "sapr3") == 0)
-        service_sapr3(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#endif
-#ifdef LIBSSH
-      if (strcmp(hydra_options.service, "ssh") == 0)
-        service_ssh(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "sshkey") == 0)
-        service_sshkey(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#endif
-      if (strcmp(hydra_options.service, "smtp") == 0)
-        service_smtp(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "smtp-enum") == 0)
-        service_smtp_enum(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "teamspeak") == 0)
-        service_teamspeak(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#ifdef LIBOPENSSL
-      if (strcmp(hydra_options.service, "sip") == 0)
-        service_sip(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#endif
-      if (strcmp(hydra_options.service, "xmpp") == 0)
-        service_xmpp(hydra_targets[target_no]->target, hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "irc") == 0)
-        service_irc(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#ifdef LIBOPENSSL
-      if (strcmp(hydra_options.service, "rdp") == 0)
-        service_rdp(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-#endif
-      if (strcmp(hydra_options.service, "s7-300") == 0)
-        service_s7_300(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "rtsp") == 0)
-        service_rtsp(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      if (strcmp(hydra_options.service, "rpcap") == 0)
-        service_rpcap(hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
-      // ADD NEW SERVICES HERE
 
+      // FIXME: dirty workaround here
+      if (strcmp(hydra_options.service, "xmpp") == 0) {
+          service_xmpp(hydra_targets[target_no]->target, hydra_targets[target_no]->ip, hydra_heads[head_no]->sp[1], options, hydra_options.miscptr, hydra_brains.ofp, hydra_targets[target_no]->port, hydra_targets[hydra_heads[head_no]->target_no]->target);
+      }
 
       // just in case a module returns (which it shouldnt) we let it exit here
       exit(-1);