From 59241d6b8f862242abc4f90894bfc94d6d0c1fc9 Mon Sep 17 00:00:00 2001 From: Roman Maksimov Date: Sat, 11 May 2019 15:14:57 +0300 Subject: [PATCH 1/2] change the order of the parameters as in the socket manual --- hydra-mod.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hydra-mod.c b/hydra-mod.c index f3d0015..5d07e27 100644 --- a/hydra-mod.c +++ b/hydra-mod.c @@ -85,7 +85,7 @@ void interrupt() { /* ----------------- internal functions ----------------- */ -int32_t internal__hydra_connect(char *host, int32_t port, int32_t protocol, int32_t type) { +int32_t internal__hydra_connect(char *host, int32_t port, int32_t type, int32_t protocol) { int32_t s, ret = -1, ipv6 = 0, reset_selected = 0; #ifdef AF_INET6 @@ -111,10 +111,10 @@ int32_t internal__hydra_connect(char *host, int32_t port, int32_t protocol, int3 #ifdef AF_INET6 if (ipv6) - s = socket(AF_INET6, protocol, type); + s = socket(AF_INET6, type, protocol); else #endif - s = socket(PF_INET, protocol, type); + s = socket(PF_INET, type, protocol); if (s >= 0) { if (src_port != 0) { int32_t bind_ok = 0; @@ -580,10 +580,10 @@ int32_t internal__hydra_connect_to_ssl(int32_t socket, char *hostname) { return socket; } -int32_t internal__hydra_connect_ssl(char *host, int32_t port, int32_t protocol, int32_t type, char *hostname) { +int32_t internal__hydra_connect_ssl(char *host, int32_t port, int32_t type, int32_t protocol, char *hostname) { int32_t socket; - if ((socket = internal__hydra_connect(host, port, protocol, type)) < 0) + if ((socket = internal__hydra_connect(host, port, type, protocol)) < 0) return -1; return internal__hydra_connect_to_ssl(socket, hostname); From f7f3aa1686cde9046399a424d22cba4cbf485485 Mon Sep 17 00:00:00 2001 From: Roman Maksimov Date: Sat, 11 May 2019 15:19:52 +0300 Subject: [PATCH 2/2] change the order of the comparison operands --- hydra.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hydra.c b/hydra.c index 92c053e..41ee8fc 100644 --- a/hydra.c +++ b/hydra.c @@ -2296,11 +2296,11 @@ int main(int argc, char *argv[]) { break; case 'b': outfile_format_tmp = optarg; - if (0==strcasecmp(outfile_format_tmp,"text")) + if (strcasecmp(outfile_format_tmp,"text") == 0) hydra_options.outfile_format = FORMAT_PLAIN_TEXT; - else if (0==strcasecmp(outfile_format_tmp,"json")) // latest json formatting. + else if (strcasecmp(outfile_format_tmp,"json") == 0) // latest json formatting. hydra_options.outfile_format = FORMAT_JSONV1; - else if (0==strcasecmp(outfile_format_tmp,"jsonv1")) + else if (strcasecmp(outfile_format_tmp,"jsonv1") == 0) hydra_options.outfile_format = FORMAT_JSONV1; else { fprintf(stderr, "[ERROR] Output file format must be (text, json, jsonv1)\n");