DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Fix the build on Linux (iptables)

Browse Source
This commit is contained in:
Pierre Pronchery 2018-07-27 14:15:23 +02:00
parent 08e805da53
commit 15dfc94e9c
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/fko_util.c
View File

@ -1145,15 +1145,15 @@ DECLARE_UTEST(test_hostname_validator, "test the is_valid_hostname function")
strcpy(test_hostname, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.b"); strcpy(test_hostname, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.b");
CU_ASSERT(is_valid_hostname(test_hostname, strlen(test_hostname)) == 0); CU_ASSERT(is_valid_hostname(test_hostname, strlen(test_hostname)) == 0);
} }
DECLARE_UTEST(test_ipv4_validator, "test the is_valid_ipv4_addr function") DECLARE_UTEST(test_ipv4_validator, "test the is_valid_ip_addr function")
{ {
char test_str[32]; char test_str[32];
strcpy(test_str, "1.2.3.4"); strcpy(test_str, "1.2.3.4");
CU_ASSERT(is_valid_ipv4_addr(test_str, strlen(test_str))); CU_ASSERT(is_valid_ip_addr(test_str, strlen(test_str), AF_INET));
strcpy(test_str, "127.0.0.2"); strcpy(test_str, "127.0.0.2");
CU_ASSERT(is_valid_ipv4_addr(test_str, 9)); CU_ASSERT(is_valid_ip_addr(test_str, 9, AF_INET));
strcpy(test_str, "1.2.3.400"); strcpy(test_str, "1.2.3.400");
CU_ASSERT(is_valid_ipv4_addr(test_str, strlen(test_str)) == 0); CU_ASSERT(is_valid_ip_addr(test_str, strlen(test_str), AF_INET) == 0);
} }
DECLARE_UTEST(test_count_characters, "test the count_characters function") DECLARE_UTEST(test_count_characters, "test the count_characters function")

4
server/access.c
View File

@ -297,7 +297,7 @@ add_acc_force_nat(fko_srv_options_t *opts, acc_stanza_t *curr_acc,
clean_exit(opts, NO_FW_CLEANUP, EXIT_FAILURE); clean_exit(opts, NO_FW_CLEANUP, EXIT_FAILURE);
} }
if(! is_valid_ipv4_addr(ip_str, strlen(ip_str))) if(! is_valid_ip_addr(ip_str, strlen(ip_str), AF_INET))
{ {
log_msg(LOG_ERR, log_msg(LOG_ERR,
"[*] Fatal: invalid FORCE_NAT IP '%s'", ip_str); "[*] Fatal: invalid FORCE_NAT IP '%s'", ip_str);
@ -327,7 +327,7 @@ add_acc_force_snat(fko_srv_options_t *opts, acc_stanza_t *curr_acc,
clean_exit(opts, NO_FW_CLEANUP, EXIT_FAILURE); clean_exit(opts, NO_FW_CLEANUP, EXIT_FAILURE);
} }
if(! is_valid_ipv4_addr(ip_str, strlen(ip_str))) if(! is_valid_ip_addr(ip_str, strlen(ip_str), AF_INET))
{ {
log_msg(LOG_ERR, log_msg(LOG_ERR,
"[*] Fatal: invalid FORCE_SNAT IP '%s'", ip_str); "[*] Fatal: invalid FORCE_SNAT IP '%s'", ip_str);

4
server/config_init.c
View File

@ -554,7 +554,7 @@ validate_options(fko_srv_options_t *opts)
*/ */
if(opts->config[CONF_SNAT_TRANSLATE_IP] != NULL) if(opts->config[CONF_SNAT_TRANSLATE_IP] != NULL)
{ {
if(! is_valid_ipv4_addr(opts->config[CONF_SNAT_TRANSLATE_IP], strlen(opts->config[CONF_SNAT_TRANSLATE_IP]))) if(! is_valid_ip_addr(opts->config[CONF_SNAT_TRANSLATE_IP], strlen(opts->config[CONF_SNAT_TRANSLATE_IP]), AF_INET))
{ {
log_msg(LOG_ERR, log_msg(LOG_ERR,
"Invalid IPv4 addr for SNAT_TRANSLATE_IP" "Invalid IPv4 addr for SNAT_TRANSLATE_IP"
@ -697,7 +697,7 @@ validate_options(fko_srv_options_t *opts)
*/ */
if(opts->config[CONF_SNAT_TRANSLATE_IP] != NULL) if(opts->config[CONF_SNAT_TRANSLATE_IP] != NULL)
{ {
if(! is_valid_ipv4_addr(opts->config[CONF_SNAT_TRANSLATE_IP], strlen(opts->config[CONF_SNAT_TRANSLATE_IP]))) if(! is_valid_ip_addr(opts->config[CONF_SNAT_TRANSLATE_IP], strlen(opts->config[CONF_SNAT_TRANSLATE_IP]), AF_INET))
{ {
log_msg(LOG_ERR, log_msg(LOG_ERR,
"Invalid IPv4 addr for SNAT_TRANSLATE_IP" "Invalid IPv4 addr for SNAT_TRANSLATE_IP"

10
server/fw_util_iptables.c
View File

@ -1385,7 +1385,7 @@ static void snat_rule(const fko_srv_options_t * const opts,
/* Add SNAT or MASQUERADE rules. /* Add SNAT or MASQUERADE rules.
*/ */
if(acc->force_snat && acc->force_snat_ip != NULL && is_valid_ipv4_addr(acc->force_snat_ip, strlen(acc->force_snat_ip))) if(acc->force_snat && acc->force_snat_ip != NULL && is_valid_ip_addr(acc->force_snat_ip, strlen(acc->force_snat_ip), AF_INET))
{ {
/* Using static SNAT */ /* Using static SNAT */
snat_chain = &(opts->fw_config->chain[IPT_SNAT_ACCESS]); snat_chain = &(opts->fw_config->chain[IPT_SNAT_ACCESS]);
@ -1393,7 +1393,7 @@ static void snat_rule(const fko_srv_options_t * const opts,
"--to-source %s", acc->force_snat_ip); "--to-source %s", acc->force_snat_ip);
} }
else if((opts->config[CONF_SNAT_TRANSLATE_IP] != NULL) else if((opts->config[CONF_SNAT_TRANSLATE_IP] != NULL)
&& is_valid_ipv4_addr(opts->config[CONF_SNAT_TRANSLATE_IP], strlen(opts->config[CONF_SNAT_TRANSLATE_IP]))) && is_valid_ip_addr(opts->config[CONF_SNAT_TRANSLATE_IP], strlen(opts->config[CONF_SNAT_TRANSLATE_IP]), AF_INET))
{ {
/* Using static SNAT */ /* Using static SNAT */
snat_chain = &(opts->fw_config->chain[IPT_SNAT_ACCESS]); snat_chain = &(opts->fw_config->chain[IPT_SNAT_ACCESS]);
@ -1419,7 +1419,7 @@ static void snat_rule(const fko_srv_options_t * const opts,
{ {
/* Add SNAT or MASQUERADE rules. /* Add SNAT or MASQUERADE rules.
*/ */
if(acc->force_snat && acc->force_snat_ip != NULL && is_valid_ipv4_addr(acc->force_snat_ip, strlen(acc->force_snat_ip))) if(acc->force_snat && acc->force_snat_ip != NULL && is_valid_ip_addr(acc->force_snat_ip, strlen(acc->force_snat_ip), AF_INET))
{ {
/* Using static SNAT */ /* Using static SNAT */
snat_chain = &(opts->fw_config->chain[IPT_SNAT_ACCESS]); snat_chain = &(opts->fw_config->chain[IPT_SNAT_ACCESS]);
@ -1434,7 +1434,7 @@ static void snat_rule(const fko_srv_options_t * const opts,
"--to-ports %i", fst_port); "--to-ports %i", fst_port);
} }
else if((opts->config[CONF_SNAT_TRANSLATE_IP] != NULL) else if((opts->config[CONF_SNAT_TRANSLATE_IP] != NULL)
&& is_valid_ipv4_addr(opts->config[CONF_SNAT_TRANSLATE_IP], strlen(opts->config[CONF_SNAT_TRANSLATE_IP]))) && is_valid_ip_addr(opts->config[CONF_SNAT_TRANSLATE_IP], strlen(opts->config[CONF_SNAT_TRANSLATE_IP]), AF_INET))
{ {
/* Using static SNAT */ /* Using static SNAT */
snat_chain = &(opts->fw_config->chain[IPT_SNAT_ACCESS]); snat_chain = &(opts->fw_config->chain[IPT_SNAT_ACCESS]);
@ -1545,7 +1545,7 @@ process_spa_request(const fko_srv_options_t * const opts,
if((ndx != NULL) && (str_len <= MAX_HOSTNAME_LEN)) if((ndx != NULL) && (str_len <= MAX_HOSTNAME_LEN))
{ {
strlcpy(nat_dst, spadat->nat_access, str_len+1); strlcpy(nat_dst, spadat->nat_access, str_len+1);
if(! is_valid_ipv4_addr(nat_dst, str_len)) if(! is_valid_ip_addr(nat_dst, str_len, AF_INET))
{ {
if(strncasecmp(opts->config[CONF_ENABLE_NAT_DNS], "Y", 1) == 0) if(strncasecmp(opts->config[CONF_ENABLE_NAT_DNS], "Y", 1) == 0)
{ {