From c58f5652757fb05fa03c6bd49f9c4a85447028a3 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 8 Nov 2016 15:52:46 +0100 Subject: [PATCH 1/4] fix spaces on iptables-save --- src/libxt_TS3INIT_SET_COOKIE.c | 4 ++-- src/libxt_ts3init.c | 6 +++--- src/libxt_ts3init_get_cookie.c | 4 ++-- src/libxt_ts3init_get_puzzle.c | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/libxt_TS3INIT_SET_COOKIE.c b/src/libxt_TS3INIT_SET_COOKIE.c index 01f3568..32f314e 100644 --- a/src/libxt_TS3INIT_SET_COOKIE.c +++ b/src/libxt_TS3INIT_SET_COOKIE.c @@ -85,11 +85,11 @@ static void ts3init_set_cookie_tg_save(const void *ip, const struct xt_entry_tar const struct xt_ts3init_set_cookie_tginfo *info = (const void *)target->data; if (info->specific_options & TARGET_SET_COOKIE_ZERO_RANDOM_SEQUENCE) { - printf("--zero-random-sequence "); + printf(" --zero-random-sequence "); } if (info->specific_options & TARGET_SET_COOKIE_RANDOM_SEED_FROM_ARGUMENT) { - printf("--random-seed "); + printf(" --random-seed "); for (i = 0; i < RANDOM_SEED_LEN; i++) { printf("%02X", info->random_seed[i]); diff --git a/src/libxt_ts3init.c b/src/libxt_ts3init.c index 4cdb872..1b1e769 100644 --- a/src/libxt_ts3init.c +++ b/src/libxt_ts3init.c @@ -83,15 +83,15 @@ static void ts3init_save(const void *ip, const struct xt_entry_match *match) const struct xt_ts3init_mtinfo *info = (const void *)match->data; if (info->specific_options & CHK_TS3INIT_CLIENT) { - printf("--client "); + printf(" --client "); } if (info->specific_options & CHK_TS3INIT_SERVER) { - printf("--server "); + printf(" --server "); } if (info->specific_options & CHK_TS3INIT_COMMAND) { - printf("--command %i ", (int)info->command); + printf(" --command %i ", (int)info->command); } } diff --git a/src/libxt_ts3init_get_cookie.c b/src/libxt_ts3init_get_cookie.c index 822e637..a1801b9 100644 --- a/src/libxt_ts3init_get_cookie.c +++ b/src/libxt_ts3init_get_cookie.c @@ -79,11 +79,11 @@ static void ts3init_get_cookie_save(const void *ip, const struct xt_entry_match const struct xt_ts3init_get_cookie_mtinfo *info = (const void *)match->data; if (info->common_options & CHK_COMMON_CLIENT_VERSION) { - printf("--min-client %u ", info->min_client_version + CLIENT_VERSION_OFFSET); + printf(" --min-client %u ", info->min_client_version + CLIENT_VERSION_OFFSET); } if (info->specific_options & CHK_GET_COOKIE_CHECK_TIMESTAMP) { - printf("--check-time %u ", info->max_utc_offset); + printf(" --check-time %u ", info->max_utc_offset); } } diff --git a/src/libxt_ts3init_get_puzzle.c b/src/libxt_ts3init_get_puzzle.c index 2b5758c..70b9a2d 100644 --- a/src/libxt_ts3init_get_puzzle.c +++ b/src/libxt_ts3init_get_puzzle.c @@ -103,15 +103,15 @@ static void ts3init_get_puzzle_save(const void *ip, const struct xt_entry_match const struct xt_ts3init_get_puzzle_mtinfo *info = (const void *)match->data; if (info->common_options & CHK_COMMON_CLIENT_VERSION) { - printf("--min-client %u ", info->min_client_version + CLIENT_VERSION_OFFSET); + printf(" --min-client %u ", info->min_client_version + CLIENT_VERSION_OFFSET); } if (info->specific_options & CHK_GET_PUZZLE_CHECK_COOKIE) { - printf("--check-cookie "); + printf(" --check-cookie "); } if (info->specific_options & CHK_GET_PUZZLE_RANDOM_SEED_FROM_ARGUMENT) { - printf("--random-seed "); + printf(" --random-seed "); for (i = 0; i < RANDOM_SEED_LEN; i++) { printf("%02X", info->random_seed[i]); @@ -120,7 +120,7 @@ static void ts3init_get_puzzle_save(const void *ip, const struct xt_entry_match } if (info->specific_options & CHK_GET_PUZZLE_RANDOM_SEED_FROM_FILE) { - printf("--random-seed-file \"%s\" ", info->random_seed_path); + printf(" --random-seed-file \"%s\" ", info->random_seed_path); } } From 8001b315629dd4c5dfc3f418098912948eeb2a08 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 8 Nov 2016 16:30:32 +0100 Subject: [PATCH 2/4] fix spaces on iptables-save --- src/libxt_TS3INIT_SET_COOKIE.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxt_TS3INIT_SET_COOKIE.c b/src/libxt_TS3INIT_SET_COOKIE.c index 32f314e..5f72e08 100644 --- a/src/libxt_TS3INIT_SET_COOKIE.c +++ b/src/libxt_TS3INIT_SET_COOKIE.c @@ -98,7 +98,7 @@ static void ts3init_set_cookie_tg_save(const void *ip, const struct xt_entry_tar } if (info->specific_options & TARGET_SET_COOKIE_RANDOM_SEED_FROM_FILE) { - printf("--random-seed-file \"%s\" ", info->random_seed_path); + printf(" --random-seed-file \"%s\" ", info->random_seed_path); } } From 8a7b5a5ac159abae037ec406f5fa0eb410474ba5 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Wed, 9 Nov 2016 11:21:00 +0100 Subject: [PATCH 3/4] remove double spaces as requested in #9 --- src/libxt_TS3INIT_SET_COOKIE.c | 7 +++---- src/libxt_ts3init.c | 6 +++--- src/libxt_ts3init_get_cookie.c | 4 ++-- src/libxt_ts3init_get_puzzle.c | 9 ++++----- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/libxt_TS3INIT_SET_COOKIE.c b/src/libxt_TS3INIT_SET_COOKIE.c index 5f72e08..fa05af5 100644 --- a/src/libxt_TS3INIT_SET_COOKIE.c +++ b/src/libxt_TS3INIT_SET_COOKIE.c @@ -85,20 +85,19 @@ static void ts3init_set_cookie_tg_save(const void *ip, const struct xt_entry_tar const struct xt_ts3init_set_cookie_tginfo *info = (const void *)target->data; if (info->specific_options & TARGET_SET_COOKIE_ZERO_RANDOM_SEQUENCE) { - printf(" --zero-random-sequence "); + printf(" --zero-random-sequence"); } if (info->specific_options & TARGET_SET_COOKIE_RANDOM_SEED_FROM_ARGUMENT) { - printf(" --random-seed "); + printf(" --random-seed"); for (i = 0; i < RANDOM_SEED_LEN; i++) { printf("%02X", info->random_seed[i]); } - printf(" "); } if (info->specific_options & TARGET_SET_COOKIE_RANDOM_SEED_FROM_FILE) { - printf(" --random-seed-file \"%s\" ", info->random_seed_path); + printf(" --random-seed-file \"%s\"", info->random_seed_path); } } diff --git a/src/libxt_ts3init.c b/src/libxt_ts3init.c index 1b1e769..2233702 100644 --- a/src/libxt_ts3init.c +++ b/src/libxt_ts3init.c @@ -83,15 +83,15 @@ static void ts3init_save(const void *ip, const struct xt_entry_match *match) const struct xt_ts3init_mtinfo *info = (const void *)match->data; if (info->specific_options & CHK_TS3INIT_CLIENT) { - printf(" --client "); + printf(" --client"); } if (info->specific_options & CHK_TS3INIT_SERVER) { - printf(" --server "); + printf(" --server"); } if (info->specific_options & CHK_TS3INIT_COMMAND) { - printf(" --command %i ", (int)info->command); + printf(" --command %i", (int)info->command); } } diff --git a/src/libxt_ts3init_get_cookie.c b/src/libxt_ts3init_get_cookie.c index a1801b9..9c4f8a3 100644 --- a/src/libxt_ts3init_get_cookie.c +++ b/src/libxt_ts3init_get_cookie.c @@ -79,11 +79,11 @@ static void ts3init_get_cookie_save(const void *ip, const struct xt_entry_match const struct xt_ts3init_get_cookie_mtinfo *info = (const void *)match->data; if (info->common_options & CHK_COMMON_CLIENT_VERSION) { - printf(" --min-client %u ", info->min_client_version + CLIENT_VERSION_OFFSET); + printf(" --min-client %u", info->min_client_version + CLIENT_VERSION_OFFSET); } if (info->specific_options & CHK_GET_COOKIE_CHECK_TIMESTAMP) { - printf(" --check-time %u ", info->max_utc_offset); + printf(" --check-time %u", info->max_utc_offset); } } diff --git a/src/libxt_ts3init_get_puzzle.c b/src/libxt_ts3init_get_puzzle.c index 70b9a2d..339d3cb 100644 --- a/src/libxt_ts3init_get_puzzle.c +++ b/src/libxt_ts3init_get_puzzle.c @@ -103,24 +103,23 @@ static void ts3init_get_puzzle_save(const void *ip, const struct xt_entry_match const struct xt_ts3init_get_puzzle_mtinfo *info = (const void *)match->data; if (info->common_options & CHK_COMMON_CLIENT_VERSION) { - printf(" --min-client %u ", info->min_client_version + CLIENT_VERSION_OFFSET); + printf(" --min-client %u", info->min_client_version + CLIENT_VERSION_OFFSET); } if (info->specific_options & CHK_GET_PUZZLE_CHECK_COOKIE) { - printf(" --check-cookie "); + printf(" --check-cookie"); } if (info->specific_options & CHK_GET_PUZZLE_RANDOM_SEED_FROM_ARGUMENT) { - printf(" --random-seed "); + printf(" --random-seed"); for (i = 0; i < RANDOM_SEED_LEN; i++) { printf("%02X", info->random_seed[i]); } - printf(" "); } if (info->specific_options & CHK_GET_PUZZLE_RANDOM_SEED_FROM_FILE) { - printf(" --random-seed-file \"%s\" ", info->random_seed_path); + printf(" --random-seed-file \"%s\"", info->random_seed_path); } } From 000887ce9db2b6bbba15ecd7cb230c46dac35d84 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Wed, 9 Nov 2016 11:44:04 +0100 Subject: [PATCH 4/4] fixed spaces in print functions and loops for iptables-save --- src/libxt_TS3INIT_SET_COOKIE.c | 4 ++-- src/libxt_ts3init.c | 2 +- src/libxt_ts3init_get_cookie.c | 3 +-- src/libxt_ts3init_get_puzzle.c | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/libxt_TS3INIT_SET_COOKIE.c b/src/libxt_TS3INIT_SET_COOKIE.c index fa05af5..384dccb 100644 --- a/src/libxt_TS3INIT_SET_COOKIE.c +++ b/src/libxt_TS3INIT_SET_COOKIE.c @@ -89,7 +89,7 @@ static void ts3init_set_cookie_tg_save(const void *ip, const struct xt_entry_tar } if (info->specific_options & TARGET_SET_COOKIE_RANDOM_SEED_FROM_ARGUMENT) { - printf(" --random-seed"); + printf(" --random-seed "); for (i = 0; i < RANDOM_SEED_LEN; i++) { printf("%02X", info->random_seed[i]); @@ -104,7 +104,7 @@ static void ts3init_set_cookie_tg_save(const void *ip, const struct xt_entry_tar static void ts3init_set_cookie_tg_print(const void *ip, const struct xt_entry_target *target, int numeric) { - printf(" -j TS3INIT_SET_COOKIE "); + printf(" -j TS3INIT_SET_COOKIE"); ts3init_set_cookie_tg_save(ip, target); } diff --git a/src/libxt_ts3init.c b/src/libxt_ts3init.c index 2233702..92da248 100644 --- a/src/libxt_ts3init.c +++ b/src/libxt_ts3init.c @@ -98,7 +98,7 @@ static void ts3init_save(const void *ip, const struct xt_entry_match *match) static void ts3init_print(const void *ip, const struct xt_entry_match *match, int numeric) { - printf(" -m ts3init "); + printf(" -m ts3init"); ts3init_save(ip, match); } diff --git a/src/libxt_ts3init_get_cookie.c b/src/libxt_ts3init_get_cookie.c index 9c4f8a3..a499d61 100644 --- a/src/libxt_ts3init_get_cookie.c +++ b/src/libxt_ts3init_get_cookie.c @@ -90,7 +90,7 @@ static void ts3init_get_cookie_save(const void *ip, const struct xt_entry_match static void ts3init_get_cookie_print(const void *ip, const struct xt_entry_match *match, int numeric) { - printf(" -m ts3init_get_cookie "); + printf(" -m ts3init_get_cookie"); ts3init_get_cookie_save(ip, match); } @@ -129,4 +129,3 @@ static __attribute__((constructor)) void ts3init_mt_ldr(void) { xtables_register_matches(ts3init_mt_reg, ARRAY_SIZE(ts3init_mt_reg)); } - diff --git a/src/libxt_ts3init_get_puzzle.c b/src/libxt_ts3init_get_puzzle.c index 339d3cb..4c2014c 100644 --- a/src/libxt_ts3init_get_puzzle.c +++ b/src/libxt_ts3init_get_puzzle.c @@ -111,7 +111,7 @@ static void ts3init_get_puzzle_save(const void *ip, const struct xt_entry_match } if (info->specific_options & CHK_GET_PUZZLE_RANDOM_SEED_FROM_ARGUMENT) { - printf(" --random-seed"); + printf(" --random-seed "); for (i = 0; i < RANDOM_SEED_LEN; i++) { printf("%02X", info->random_seed[i]); @@ -126,7 +126,7 @@ static void ts3init_get_puzzle_save(const void *ip, const struct xt_entry_match static void ts3init_get_puzzle_print(const void *ip, const struct xt_entry_match *match, int numeric) { - printf(" -m ts3init_get_puzzle "); + printf(" -m ts3init_get_puzzle"); ts3init_get_puzzle_save(ip, match); }