DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Style changes, and avoid returning undefined value in fw_util functions

Browse Source
This commit is contained in:
Jonathan Bennett
2016-05-07 22:36:39 -05:00
parent 7b11166260
commit ddc422125f
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/fw_util_firewalld.c
+2 -5
View File
@@ -1549,9 +1549,9 @@ process_spa_request(const fko_srv_options_t * const opts,
if((ndx != NULL) && (str_len <= MAX_HOSTNAME_LEN))
{
strlcpy(nat_dst, spadat->nat_access, str_len+1);
if((! is_valid_ipv4_addr(nat_dst, strlen(nat_dst))))
if(! is_valid_ipv4_addr(nat_dst, strlen(nat_dst)))
{
if(strncasecmp(opts->config[CONF_ENABLE_NAT_DNS], "Y", 1)==0)
if(strncasecmp(opts->config[CONF_ENABLE_NAT_DNS], "Y", 1) == 0)
{
if (ipv4_resolve(nat_dst, nat_ip) == 0)
{
@@ -1561,7 +1561,6 @@ process_spa_request(const fko_srv_options_t * const opts,
{
log_msg(LOG_INFO, "Unable to resolve Hostname in NAT SPA message");
free_acc_port_list(port_list);
res = is_err;
return res;
}
}
@@ -1569,7 +1568,6 @@ process_spa_request(const fko_srv_options_t * const opts,
{
log_msg(LOG_INFO, "Received Hostname in NAT SPA message, but hostname is disabled.");
free_acc_port_list(port_list);
res = is_err;
return res;
}
@@ -1593,7 +1591,6 @@ process_spa_request(const fko_srv_options_t * const opts,
{
log_msg(LOG_INFO, "Invalid NAT IP in SPA message");
free_acc_port_list(port_list);
res = is_err;
return res;
}
}
server/fw_util_iptables.c
+2 -5
View File
@@ -1535,12 +1535,12 @@ process_spa_request(const fko_srv_options_t * const opts,
{
ndx = strchr(spadat->nat_access, ',');
str_len = strcspn(spadat->nat_access, ",");
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);
if(! is_valid_ipv4_addr(nat_dst, strlen(nat_dst)))
{
if(strncasecmp(opts->config[CONF_ENABLE_NAT_DNS], "Y", 1)==0)
if(strncasecmp(opts->config[CONF_ENABLE_NAT_DNS], "Y", 1) == 0)
{
if (ipv4_resolve(nat_dst, nat_ip) == 0)
{
@@ -1550,7 +1550,6 @@ process_spa_request(const fko_srv_options_t * const opts,
{
log_msg(LOG_INFO, "Unable to resolve Hostname in NAT SPA message");
free_acc_port_list(port_list);
res = is_err;
return res;
}
}
@@ -1558,7 +1557,6 @@ process_spa_request(const fko_srv_options_t * const opts,
{
log_msg(LOG_INFO, "Received Hostname in NAT SPA message, but hostname is disabled.");
free_acc_port_list(port_list);
res = is_err;
return res;
}
@@ -1582,7 +1580,6 @@ process_spa_request(const fko_srv_options_t * const opts,
{
log_msg(LOG_INFO, "Invalid NAT IP in SPA message");
free_acc_port_list(port_list);
res = is_err;
return res;
}
}