Add service initializer in header files

hydra.c

@@ -290,99 +290,95 @@ typedef void (*service_t)(char *ip, int sp, unsigned char options, char *miscptr
 typedef int (*service_init_t)(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 typedef void (*service_usage_t)(const char* service);
 
-#define SERVICE2(name, func) { name, service_##func##_init, service_##func, NULL }
-#define SERVICE(name) { #name, service_##name##_init, service_##name, NULL }
-#define SERVICE3(name, func) { name, service_##func##_init, service_##func, usage_##func }
-
 static const struct {
   const char* name;
   service_init_t init;
   service_t exec;
   service_usage_t usage;
 } services[] = {
-  SERVICE(adam6500),
+  SERVICE_ADAM6500,
 #ifdef LIBAFP
-  SERVICE(afp),
+  SERVICE_AFP,
 #endif
-  SERVICE(asterisk),
-  SERVICE3("cisco", cisco),
-  SERVICE3("cisco-enable", cisco_enable),
-  SERVICE3("cvs", cvs),
+  SERVICE_ASTERISK,
+  SERVICE_CISCO_ENABLE,
+  SERVICE_CISCO,
+  SERVICE_CVS,
 #ifdef LIBFIREBIRD
-  SERVICE3("firebird", firebird),
+  SERVICE_FIREBIRD,
 #endif
-  SERVICE(ftp),
-  { "ftps", service_ftp_init, service_ftps },
-  { "http-get", service_http_init, service_http_get, usage_http },
-  { "http-get-form", service_http_form_init, service_http_get_form, usage_http_form },
-  { "http-head", service_http_init, service_http_head, NULL },
-  { "http-form", service_http_form_init, NULL, usage_http_form },
-  { "http-post", NULL, service_http_post, usage_http },
-  { "http-post-form", service_http_form_init, service_http_post_form, usage_http_form },
-  SERVICE3("http-proxy", http_proxy),
-  SERVICE3("http-proxy-urlenum", http_proxy_urlenum),
-  SERVICE(icq),
-  SERVICE3("imap", imap),
-  SERVICE3("irc", irc),
-  { "ldap2", service_ldap_init, service_ldap2, usage_ldap },
-  { "ldap3", service_ldap_init, service_ldap3, usage_ldap },
-  { "ldap3-crammd5", service_ldap_init, service_ldap3_cram_md5, usage_ldap },
-  { "ldap3-digestmd5", service_ldap_init, service_ldap3_digest_md5, usage_ldap },
-  SERVICE(mssql),
+  SERVICE_FTP,
+  SERVICE_FTPS,
+  SERVICE_HTTP_FORM,
+  SERVICE_HTTP_GET,
+  SERVICE_HTTP_GET_FORM,
+  SERVICE_HTTP_HEAD,
+  SERVICE_HTTP_POST,
+  SERVICE_HTTP_POST_FORM,
+  SERVICE_HTTP_PROXY_URLENUM,
+  SERVICE_HTTP_PROXY,
+  SERVICE_ICQ,
+  SERVICE_IMAP,
+  SERVICE_IRC,
+  SERVICE_LDAP2,
+  SERVICE_LDAP3,
+  SERVICE_LDAP3_CRAM_MD5,
+  SERVICE_LDAP3_DIGEST_MD5,
+  SERVICE_MSSQL,
 #ifdef HAVE_MATH_H
-  SERVICE3("mysql", mysql),
+  SERVICE_MYSQL,
 #endif
 #ifdef LIBNCP
-  SERVICE3("ncp", ncp),
+  SERVICE_NCP,
 #endif
-  SERVICE3("nntp", nntp),
+  SERVICE_NNTP,
 #ifdef LIBORACLE
-  SERVICE3("oracle", oracle),
+  SERVICE_ORACLE,
 #endif
 #ifdef LIBOPENSSL
-  SERVICE3("oracle-listener", oracle_listener),
-  SERVICE2("oracle-sid", oracle_sid),
+  SERVICE_ORACLE_LISTENER,
+  SERVICE_ORACLE_SID,
 #endif
-  SERVICE(pcanywhere),
-  SERVICE(pcnfs),
-  SERVICE3("pop3", pop3),
+  SERVICE_PCANYWHERE,
+  SERVICE_PCNFS,
+  SERVICE_POP3,
 #ifdef LIBPOSTGRES
-  SERVICE3("postgres", postgres),
+  SERVICE_POSTGRES,
 #endif
-  SERVICE(redis),
-  SERVICE(rexec),
 #ifdef LIBOPENSSL
-  SERVICE3("rdp", rdp),
+  SERVICE_RDP,
 #endif
-  SERVICE(rlogin),
-  SERVICE(rsh),
-  SERVICE(rtsp),
-  SERVICE(rpcap),
-  SERVICE3("s7-300", s7_300),
+  SERVICE_REDIS,
+  SERVICE_REXEC,
+  SERVICE_RLOGIN,
+  SERVICE_RPCAP,
+  SERVICE_RSH,
+  SERVICE_RTSP,
+  SERVICE_S7_300,
 #ifdef LIBSAPR3
-  SERVICE3("sarp3", sapr3),
+  SERVICE_SAPR3,
 #endif
 #ifdef LIBOPENSSL
-  SERVICE(sip),
-  SERVICE3("smbnt", smb),
-  SERVICE3("smb", smb),
+  SERVICE_SIP,
+  SERVICE_SMB,
+  SERVICE_SMBNT,
 #endif
-  SERVICE3("smtp", smtp),
-  SERVICE3("smtp-enum", smtp_enum),
-  SERVICE3("snmp", snmp),
-  SERVICE(socks5),
+  SERVICE_SMTP,
+  SERVICE_SMTP_ENUM,
+  SERVICE_SNMP,
+  SERVICE_SOCKS5,
 #ifdef LIBSSH
-  { "ssh", NULL, service_ssh },
-  SERVICE3("sshkey", sshkey),
+  SERVICE_SSH,
+  SERVICE_SSHKEY,
 #endif
 #ifdef LIBSVN
-  SERVICE3("svn", svn),
+  SERVICE_SVN,
 #endif
-  SERVICE(teamspeak),
-  SERVICE3("telnet", telnet),
-  SERVICE(vmauthd),
-  SERVICE(vnc),
-  { "xmpp", service_xmpp_init, NULL, usage_xmpp }
+  SERVICE_TEAMSPEAK,
+  SERVICE_TELNET,
+  SERVICE_VMAUTHD,
+  SERVICE_VNC,
+  SERVICE_XMPP
 };
 
 

services/hydra-adam6500.h

@@ -3,6 +3,7 @@
 
 void service_adam6500(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_adam6500_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_adam6500(const char* service);
+
+#define SERVICE_ADAM6500 { "adam6500", service_adam6500_init, service_adam6500, NULL }
 
 #endif /* _HYDRA_SERVICE_ADAM6500_H_ */

services/hydra-afp.h

@@ -3,6 +3,7 @@
 
 void service_afp(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_afp_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_afp(const char* service);
+
+#define SERVICE_AFP { "afp", service_afp_init, service_afp, NULL }
 
 #endif /* _HYDRA_SERVICE_AFP_H_ */

services/hydra-asterisk.h

@@ -3,6 +3,7 @@
 
 void service_asterisk(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_asterisk_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_asterisk(const char* service);
+
+#define SERVICE_ASTERISK { "asterisk", service_asterisk_init, service_asterisk, NULL }
 
 #endif /* _HYDRA_SERVICE_ASTERISK_H_ */

services/hydra-cisco-enable.h

@@ -5,4 +5,6 @@ void service_cisco_enable(char *ip, int sp, unsigned char options, char *miscptr
 int service_cisco_enable_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_cisco_enable(const char* service);
 
+#define SERVICE_CISCO_ENABLE { "cisco-enable", service_cisco_enable_init, service_cisco_enable, usage_cisco_enable }
+
 #endif /* _HYDRA_SERVICE_CISCO_ENABLE_H_ */

services/hydra-cisco.h

@@ -5,4 +5,6 @@ void service_cisco(char *ip, int sp, unsigned char options, char *miscptr, FILE
 int service_cisco_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_cisco(const char* service);
 
+#define SERVICE_CISCO { "cisco", service_cisco_init, service_cisco, usage_cisco }
+
 #endif /* _HYDRA_SERVICE_CISCO_H_ */

services/hydra-cvs.h

@@ -5,4 +5,6 @@ void service_cvs(char *ip, int sp, unsigned char options, char *miscptr, FILE *
 int service_cvs_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_cvs(const char* service);
 
+#define SERVICE_CVS { "cvs", service_cvs_init, service_cvs, usage_cvs }
+
 #endif /* _HYDRA_SERVICE_CVS_H_ */

services/hydra-firebird.h

@@ -5,4 +5,6 @@ void service_firebird(char *ip, int sp, unsigned char options, char *miscptr, FI
 int service_firebird_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_firebird(const char* service);
 
+#define SERVICE_FIREBIRD { "firebird", service_firebird_init, service_firebird, usage_firebird }
+
 #endif /* _HYDRA_SERVICE_FIREBIRD_H_ */

services/hydra-ftp.h

@@ -4,6 +4,8 @@
 void service_ftp(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void service_ftps(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_ftp_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_ftp(const char* service);
+
+#define SERVICE_FTP { "ftp", service_ftp_init, service_ftp, NULL }
+#define SERVICE_FTPS { "ftps", service_ftp_init, service_ftps, NULL }
 
 #endif /* _HYDRA_SERVICE_FTP_H_ */

services/hydra-http-form.h

@@ -6,4 +6,25 @@ void service_http_get_form(char *ip, int sp, unsigned char options, char *miscpt
 int service_http_form_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_http_form(const char* service);
 
+#define SERVICE_HTTP_GET_FORM { \
+    "http-get-form", \
+    service_http_form_init, \
+    service_http_get_form, \
+    usage_http_form \
+}
+
+#define SERVICE_HTTP_POST_FORM { \
+    "http-post-form", \
+    service_http_form_init, \
+    service_http_post_form, \
+    usage_http_form \
+}
+
+#define SERVICE_HTTP_FORM { \
+    "http-post-form", \
+    service_http_form_init, \
+    NULL, \
+    usage_http_form \
+}
+
 #endif /* _HYDRA_SERVICE_HTTP_FORM_H_ */

services/hydra-http-proxy-urlenum.h

@@ -5,4 +5,11 @@ void service_http_proxy_urlenum(char *ip, int sp, unsigned char options, char *m
 int service_http_proxy_urlenum_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_http_proxy_urlenum(const char* service);
 
+#define SERVICE_HTTP_PROXY_URLENUM { \
+    "http-proxy-urlenum", \
+    service_http_proxy_urlenum_init, \
+    service_http_proxy_urlenum, \
+    usage_http_proxy_urlenum \
+}
+
 #endif /* _HYDRA_SERVICE_HTTP_PROXY_URLENUM_H_ */

services/hydra-http-proxy.h

@@ -5,4 +5,11 @@ void service_http_proxy(char *ip, int sp, unsigned char options, char *miscptr,
 int service_http_proxy_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_http_proxy(const char* service);
 
+#define SERVICE_HTTP_PROXY { \
+    "http-proxy", \
+    service_http_proxy_init, \
+    service_http_proxy, \
+    usage_http_proxy \
+}
+
 #endif /* _HYDRA_SERVICE_HTTP_PROXY_H_ */

services/hydra-http.h

@@ -7,4 +7,25 @@ void service_http_post(char *ip, int sp, unsigned char options, char *miscptr, F
 int service_http_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_http(const char* service);
 
+#define SERVICE_HTTP_GET { \
+    "http-get", \
+    service_http_init, \
+    service_http_get, \
+    usage_http \
+}
+
+#define SERVICE_HTTP_HEAD { \
+    "http-head", \
+    service_http_init, \
+    service_http_head, \
+    NULL \
+}
+
+#define SERVICE_HTTP_POST { \
+    "http-post", \
+    NULL, \
+    service_http_post, \
+    usage_http \
+}
+
 #endif /* _HYDRA_SERVICE_HTTP_H_ */

services/hydra-icq.h

@@ -3,6 +3,12 @@
 
 void service_icq(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_icq_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_icq(const char* service);
+
+#define SERVICE_ICQ { \
+    "icq", \
+    service_icq_init, \
+    service_icq, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_ICQ_H_ */

services/hydra-imap.h

@@ -5,4 +5,11 @@ void service_imap(char *ip, int sp, unsigned char options, char *miscptr, FILE *
 int service_imap_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_imap(const char* service);
 
+#define SERVICE_IMAP { \
+    "imap", \
+    service_imap_init, \
+    service_imap, \
+    usage_imap \
+}
+
 #endif /* _HYDRA_SERVICE_IMAP_H_ */

services/hydra-irc.h

@@ -5,4 +5,11 @@ void service_irc(char *ip, int sp, unsigned char options, char *miscptr, FILE *
 int service_irc_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_irc(const char* service);
 
+#define SERVICE_IRC { \
+    "irc", \
+    service_irc_init, \
+    service_irc, \
+    usage_irc \
+}
+
 #endif /* _HYDRA_SERVICE_IRC_H_ */

services/hydra-ldap.h

@@ -8,4 +8,32 @@ void service_ldap3_digest_md5(char *ip, int sp, unsigned char options, char *mis
 int service_ldap_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_ldap(const char* service);
 
+#define SERVICE_LDAP2 { \
+    "ldap2", \
+    service_ldap_init, \
+    service_ldap2, \
+    usage_ldap \
+}
+
+#define SERVICE_LDAP3 { \
+    "ldap3", \
+    service_ldap_init, \
+    service_ldap3, \
+    usage_ldap \
+}
+
+#define SERVICE_LDAP3_CRAM_MD5 { \
+    "ldap3-crammd5", \
+    service_ldap_init, \
+    service_ldap3_cram_md5, \
+    usage_ldap \
+}
+
+#define SERVICE_LDAP3_DIGEST_MD5 { \
+    "ldap3-digestmd5", \
+    service_ldap_init, \
+    service_ldap3_digest_md5, \
+    usage_ldap \
+}
+
 #endif /* _HYDRA_SERVICE_LDAP_H_ */

services/hydra-mssql.h

@@ -3,6 +3,12 @@
 
 void service_mssql(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_mssql_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_mssql(const char* service);
+
+#define SERVICE_MSSQL { \
+    "mssql", \
+    service_mssql_init, \
+    service_mssql, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_MSSQL_H_ */

services/hydra-mysql.h

@@ -5,4 +5,11 @@ void service_mysql(char *ip, int sp, unsigned char options, char *miscptr, FILE
 int service_mysql_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_mysql(const char* service);
 
+#define SERVICE_MYSQL { \
+    "mysql", \
+    service_mysql_init, \
+    service_mysql, \
+    usage_mysql \
+}
+
 #endif /* _HYDRA_SERVICE_MYSQL_H_ */

services/hydra-ncp.h

@@ -5,4 +5,11 @@ void service_ncp(char *ip, int sp, unsigned char options, char *miscptr, FILE *
 int service_ncp_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_ncp(const char* service);
 
+#define SERVICE_NCP { \
+    "ncp", \
+    service_ncp_init, \
+    service_ncp, \
+    usage_ncp \
+}
+
 #endif /* _HYDRA_SERVICE_NCP_H_ */

services/hydra-nntp.h

@@ -5,4 +5,11 @@ void service_nntp(char *ip, int sp, unsigned char options, char *miscptr, FILE *
 int service_nntp_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_nntp(const char* service);
 
+#define SERVICE_NNTP { \
+    "nntp", \
+    service_nntp_init, \
+    service_nntp, \
+    usage_nntp \
+}
+
 #endif /* _HYDRA_SERVICE_NNTP_H_ */

services/hydra-oracle-listener.h

@@ -5,4 +5,11 @@ void service_oracle_listener(char *ip, int sp, unsigned char options, char *misc
 int service_oracle_listener_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_oracle_listener(const char* service);
 
+#define SERVICE_ORACLE_LISTENER { \
+    "oracle-listener", \
+    service_oracle_listener_init, \
+    service_oracle_listener, \
+    usage_oracle_listener \
+}
+
 #endif /* _HYDRA_SERVICE_ORACLE_LISTENER_H_ */

services/hydra-oracle-sid.h

@@ -3,6 +3,12 @@
 
 void service_oracle_sid(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_oracle_sid_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_oracle_sid(const char* service);
+
+#define SERVICE_ORACLE_SID { \
+    "oracle-sid", \
+    service_oracle_sid_init, \
+    service_oracle_sid, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_ORACLE_SID_H_ */

services/hydra-oracle.h

@@ -5,4 +5,11 @@ void service_oracle(char *ip, int sp, unsigned char options, char *miscptr, FILE
 int service_oracle_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_oracle(const char* service);
 
+#define SERVICE_ORACLE { \
+    "oracle", \
+    service_oracle_init, \
+    service_oracle, \
+    usage_oracle \
+}
+
 #endif /* _HYDRA_SERVICE_ORACLE_H_ */

services/hydra-pcanywhere.h

@@ -3,6 +3,12 @@
 
 void service_pcanywhere(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_pcanywhere_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_pcanywhere(const char* service);
+
+#define SERVICE_PCANYWHERE { \
+    "pcanywhere", \
+    service_pcanywhere_init, \
+    service_pcanywhere, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_PCANYWHERE_H_ */

services/hydra-pcnfs.h

@@ -3,6 +3,12 @@
 
 void service_pcnfs(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_pcnfs_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_pcnfs(const char* service);
+
+#define SERVICE_PCNFS { \
+    "pcnfs", \
+    service_pcnfs_init, \
+    service_pcnfs, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_PCNFS_H_ */

services/hydra-pop3.h

@@ -5,4 +5,11 @@ void service_pop3(char *ip, int sp, unsigned char options, char *miscptr, FILE *
 int service_pop3_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_pop3(const char* service);
 
+#define SERVICE_POP3 { \
+    "pop3", \
+    service_pop3_init, \
+    service_pop3, \
+    usage_pop3 \
+}
+
 #endif /* _HYDRA_SERVICE_POP3_H_ */

services/hydra-postgres.h

@@ -5,4 +5,11 @@ void service_postgres(char *ip, int sp, unsigned char options, char *miscptr, FI
 int service_postgres_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_postgres(const char* service);
 
+#define SERVICE_POSTGRES { \
+    "postgres", \
+    service_postgres_init, \
+    service_postgres, \
+    usage_postgres \
+}
+
 #endif /* _HYDRA_SERVICE_POSTGRES_H_ */

services/hydra-rdp.h

@@ -5,4 +5,11 @@ void service_rdp(char *ip, int sp, unsigned char options, char *miscptr, FILE *
 int service_rdp_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_rdp(const char* service);
 
+#define SERVICE_RDP { \
+    "rdp", \
+    service_rdp_init, \
+    service_rdp, \
+    usage_rdp \
+}
+
 #endif /* _HYDRA_SERVICE_RDP_H_ */

services/hydra-redis.h

@@ -3,6 +3,12 @@
 
 void service_redis(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_redis_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_redis(const char* service);
+
+#define SERVICE_REDIS { \
+    "redis", \
+    service_redis_init, \
+    service_redis, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_REDIS_H_ */

services/hydra-rexec.h

@@ -3,6 +3,12 @@
 
 void service_rexec(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_rexec_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_rexec(const char* service);
+
+#define SERVICE_REXEC { \
+    "rexec", \
+    service_rexec_init, \
+    service_rexec, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_REXEC_H_ */

services/hydra-rlogin.h

@@ -3,6 +3,12 @@
 
 void service_rlogin(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_rlogin_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_rlogin(const char* service);
+
+#define SERVICE_RLOGIN { \
+    "rlogin", \
+    service_rlogin_init, \
+    service_rlogin, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_RLOGIN_H_ */

services/hydra-rpcap.h

@@ -3,6 +3,12 @@
 
 void service_rpcap(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_rpcap_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_rpcap(const char* service);
+
+#define SERVICE_RPCAP { \
+    "rpcap", \
+    service_rpcap_init, \
+    service_rpcap, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_RPCAP_H_ */

services/hydra-rsh.h

@@ -3,6 +3,12 @@
 
 void service_rsh(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_rsh_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_rsh(const char* service);
+
+#define SERVICE_RSH { \
+    "rsh", \
+    service_rsh_init, \
+    service_rsh, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_RSH_H_ */

services/hydra-rtsp.h

@@ -3,6 +3,12 @@
 
 void service_rtsp(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_rtsp_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_rtsp(const char* service);
+
+#define SERVICE_RTSP { \
+    "rtsp", \
+    service_rtsp_init, \
+    service_rtsp, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_RTSP_H_ */

services/hydra-s7-300.h

@@ -5,4 +5,11 @@ void service_s7_300(char *ip, int sp, unsigned char options, char *miscptr, FILE
 int service_s7_300_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_s7_300(const char* service);
 
+#define SERVICE_S7_300 { \
+    "s7-300", \
+    service_s7_300_init, \
+    service_s7_300, \
+    usage_s7_300 \
+}
+
 #endif /* _HYDRA_SERVICE_S7_300_H_ */

services/hydra-sapr3.h

@@ -5,4 +5,11 @@ void service_sapr3(char *ip, int sp, unsigned char options, char *miscptr, FILE
 int service_sapr3_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_sapr3(const char* service);
 
+#define SERVICE_SAPR3 { \
+    "sapr3", \
+    service_sapr3_init, \
+    service_sapr3, \
+    usage_sapr3 \
+}
+
 #endif /* _HYDRA_SERVICE_SAPR3_H_ */

services/hydra-sip.h

@@ -3,6 +3,12 @@
 
 void service_sip(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_sip_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_sip(const char* service);
+
+#define SERVICE_SIP { \
+    "sip", \
+    service_sip_init, \
+    service_sip, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_SIP_H_ */

services/hydra-smb.h

@@ -5,4 +5,18 @@ void service_smb(char *ip, int sp, unsigned char options, char *miscptr, FILE *
 int service_smb_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_smb(const char* service);
 
+#define SERVICE_SMB { \
+    "smb", \
+    service_smb_init, \
+    service_smb, \
+    usage_smb \
+}
+
+#define SERVICE_SMBNT { \
+    "smbnt", \
+    service_smb_init, \
+    service_smb, \
+    usage_smb \
+}
+
 #endif /* _HYDRA_SERVICE_SMB_H_ */

services/hydra-smtp-enum.h

@@ -5,4 +5,11 @@ void service_smtp_enum(char *ip, int sp, unsigned char options, char *miscptr, F
 int service_smtp_enum_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_smtp_enum(const char* service);
 
+#define SERVICE_SMTP_ENUM { \
+    "smtp-enum", \
+    service_smtp_enum_init, \
+    service_smtp_enum, \
+    usage_smtp_enum \
+}
+
 #endif /* _HYDRA_SERVICE_SMTP_ENUM_H_ */

services/hydra-smtp.h

@@ -5,4 +5,11 @@ void service_smtp(char *ip, int sp, unsigned char options, char *miscptr, FILE *
 int service_smtp_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_smtp(const char* service);
 
+#define SERVICE_SMTP { \
+    "smtp", \
+    service_smtp_init, \
+    service_smtp, \
+    usage_smtp \
+}
+
 #endif /* _HYDRA_SERVICE_SMTP_H_ */

services/hydra-snmp.h

@@ -5,4 +5,11 @@ void service_snmp(char *ip, int sp, unsigned char options, char *miscptr, FILE *
 int service_snmp_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_snmp(const char* service);
 
+#define SERVICE_SNMP { \
+    "snmp", \
+    service_snmp_init, \
+    service_snmp, \
+    usage_snmp \
+}
+
 #endif /* _HYDRA_SERVICE_SNMP_H_ */

services/hydra-socks5.h

@@ -3,6 +3,12 @@
 
 void service_socks5(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_socks5_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_socks5(const char* service);
+
+#define SERVICE_SOCKS5 { \
+    "socks5", \
+    service_socks5_init, \
+    service_socks5, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_SOCKS5_H_ */

services/hydra-ssh.h

@@ -3,6 +3,12 @@
 
 void service_ssh(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_ssh_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_ssh(const char* service);
+
+#define SERVICE_SSH { \
+    "ssh", \
+    service_ssh_init, \
+    NULL, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_SSH_H_ */

services/hydra-sshkey.h

@@ -5,4 +5,11 @@ void service_sshkey(char *ip, int sp, unsigned char options, char *miscptr, FILE
 int service_sshkey_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_sshkey(const char* service);
 
+#define SERVICE_SSHKEY { \
+    "sshkey", \
+    service_sshkey_init, \
+    service_sshkey, \
+    usage_sshkey \
+}
+
 #endif /* _HYDRA_SERVICE_SSHKEY_H_ */

services/hydra-svn.h

@@ -5,4 +5,11 @@ void service_svn(char *ip, int sp, unsigned char options, char *miscptr, FILE *
 int service_svn_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_svn(const char* service);
 
+#define SERVICE_SVN { \
+    "svn", \
+    service_svn_init, \
+    service_svn, \
+    usage_svn \
+}
+
 #endif /* _HYDRA_SERVICE_SVN_H_ */

services/hydra-teamspeak.h

@@ -3,6 +3,12 @@
 
 void service_teamspeak(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_teamspeak_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_teamspeak(const char* service);
+
+#define SERVICE_TEAMSPEAK { \
+    "teamspeak", \
+    service_teamspeak_init, \
+    service_teamspeak, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_TEAMSPEAK_H_ */

services/hydra-telnet.h

@@ -5,4 +5,11 @@ void service_telnet(char *ip, int sp, unsigned char options, char *miscptr, FILE
 int service_telnet_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_telnet(const char* service);
 
+#define SERVICE_TELNET { \
+    "telnet", \
+    service_telnet_init, \
+    service_telnet, \
+    usage_telnet \
+}
+
 #endif /* _HYDRA_SERVICE_TELNET_H_ */

services/hydra-vmauthd.h

@@ -3,6 +3,12 @@
 
 void service_vmauthd(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_vmauthd_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_vmauthd(const char* service);
+
+#define SERVICE_VMAUTHD { \
+    "vmauthd", \
+    service_vmauthd_init, \
+    service_vmauthd, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_VMAUTHD_H_ */

services/hydra-vnc.h

@@ -3,6 +3,12 @@
 
 void service_vnc(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 int service_vnc_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
-void usage_vnc(const char* service);
+
+#define SERVICE_VNC { \
+    "vnc", \
+    service_vnc_init, \
+    service_vnc, \
+    NULL \
+}
 
 #endif /* _HYDRA_SERVICE_VNC_H_ */

services/hydra-xmpp.h

@@ -5,4 +5,11 @@ void service_xmpp(char *target, char *ip, int sp, unsigned char options, char *m
 int service_xmpp_init(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port, char *hostname);
 void usage_xmpp(const char* service);
 
+#define SERVICE_XMPP { \
+    "xmpp", \
+    service_xmpp_init, \
+    NULL, \
+    usage_xmpp \
+}
+
 #endif /* _HYDRA_SERVICE_XMPP_H_ */