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

[server] minor code cleanup

Browse Source
This commit is contained in:
Michael Rash 2014-11-06 20:24:50 -05:00
parent a8879231c3
commit 7022d79ca7
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/fw_util_pf.c
View File

@ -432,24 +432,19 @@ check_firewall_rules(const fko_srv_options_t * const opts)
} }
if(*tmp_ndx == '\n') if(*tmp_ndx == '\n')
{
tmp_ndx++; tmp_ndx++;
}
/* may sure the rule begins with the string "pass", and make sure /* may sure the rule begins with the string "pass", and make sure
* it ends with a newline. Bail if either test fails. * it ends with a newline. Bail if either test fails.
*/ */
if (strlen(tmp_ndx) <= strlen("pass") if (strlen(tmp_ndx) <= strlen("pass")
|| strncmp(tmp_ndx, "pass", strlen("pass")) != 0) || strncmp(tmp_ndx, "pass", strlen("pass")) != 0)
{
break; break;
}
newline_tmp_ndx = tmp_ndx; newline_tmp_ndx = tmp_ndx;
while (*newline_tmp_ndx != '\n' && *newline_tmp_ndx != '\0') while (*newline_tmp_ndx != '\n' && *newline_tmp_ndx != '\0')
{
newline_tmp_ndx++; newline_tmp_ndx++;
}
if (*newline_tmp_ndx != '\n') if (*newline_tmp_ndx != '\n')
break; break;
@ -477,7 +472,6 @@ check_firewall_rules(const fko_srv_options_t * const opts)
* string so we can continue to the next rule in the list. * string so we can continue to the next rule in the list.
*/ */
ndx = strstr(tmp_mark, EXPIRE_COMMENT_PREFIX); ndx = strstr(tmp_mark, EXPIRE_COMMENT_PREFIX);
} }
if (is_delete) if (is_delete)
@ -486,7 +480,6 @@ check_firewall_rules(const fko_srv_options_t * const opts)
* has the rule(s) deleted. If there isn't at least one "pass" rule, * has the rule(s) deleted. If there isn't at least one "pass" rule,
* then we just flush the anchor. * then we just flush the anchor.
*/ */
if (strlen(anchor_rules_copy) > strlen("pass") if (strlen(anchor_rules_copy) > strlen("pass")
&& strncmp(anchor_rules_copy, "pass", strlen("pass")) == 0) && strncmp(anchor_rules_copy, "pass", strlen("pass")) == 0)
{ {
@ -509,7 +502,6 @@ check_firewall_rules(const fko_srv_options_t * const opts)
{ {
delete_all_anchor_rules(opts); delete_all_anchor_rules(opts);
} }
} }
/* Set the next pending expire time accordingly. 0 if there are no /* Set the next pending expire time accordingly. 0 if there are no