diff options
| -rwxr-xr-x | scripts/firewall/vyatta-fw-global-state-policy.pl | 8 | ||||
| -rwxr-xr-x | scripts/firewall/vyatta-ipset.pl | 36 |
2 files changed, 23 insertions, 21 deletions
diff --git a/scripts/firewall/vyatta-fw-global-state-policy.pl b/scripts/firewall/vyatta-fw-global-state-policy.pl index e11d919..859b810 100755 --- a/scripts/firewall/vyatta-fw-global-state-policy.pl +++ b/scripts/firewall/vyatta-fw-global-state-policy.pl @@ -280,13 +280,13 @@ die "undefined action" if ! defined $action; my ($error, $warning); -($error, $warning) = setup_state_policy() if $action eq 'setup-state-policy'; +($error, $warning) = setup_state_policy() if $action eq 'setup-state-policy'; -($error, $warning) = teardown_state_policy() if $action eq 'teardown-state-policy'; +($error, $warning) = teardown_state_policy() if $action eq 'teardown-state-policy'; -($error, $warning) = set_state_actions() if $action eq 'set-state-actions'; +($error, $warning) = set_state_actions() if $action eq 'set-state-actions'; -($error, $warning) = enable_disable_conntrack($state) if $action eq 'enable-disable-conntrack'; +($error, $warning) = enable_disable_conntrack($state) if $action eq 'enable-disable-conntrack'; ($error, $warning) = state_policy_validity_checks($state) if $action eq 'state-policy-validity-checks'; diff --git a/scripts/firewall/vyatta-ipset.pl b/scripts/firewall/vyatta-ipset.pl index 22c37ed..e206902 100755 --- a/scripts/firewall/vyatta-ipset.pl +++ b/scripts/firewall/vyatta-ipset.pl @@ -442,41 +442,43 @@ GetOptions("action=s" => \$action, die "undefined action" if ! defined $action; my $rc; -show_port_groups() if $action eq 'show-port-groups'; +show_port_groups() if $action eq 'show-port-groups'; show_address_groups() if $action eq 'show-address-groups'; show_network_groups() if $action eq 'show-network-groups'; -$rc = ipset_reset($set_name, $set_type) if $action eq 'reset-set'; +$rc = ipset_reset($set_name, $set_type) if $action eq 'reset-set'; -$rc = ipset_create($set_name, $set_type, $set_family) if $action eq 'create-set'; +$rc = ipset_create($set_name, $set_type, $set_family) if $action eq 'create-set'; -$rc = ipset_delete($set_name) if $action eq 'delete-set'; +$rc = ipset_delete($set_name) if $action eq 'delete-set'; -$rc = ipset_check_member($set_name, $set_type, $member) if $action eq 'check-member'; +$rc = ipset_check_member($set_name, $set_type, $member) if $action eq 'check-member'; -$rc = ipset_add_member($set_name, $member, $alias, $set_type) if $action eq 'add-member'; +$rc = ipset_add_member($set_name, $member, $alias, $set_type) if $action eq 'add-member'; -$rc = ipset_delete_member($set_name, $member) if $action eq 'delete-member'; +$rc = ipset_delete_member($set_name, $member) if $action eq 'delete-member'; -$rc = ipset_check_set_type($set_name, $set_type) if $action eq 'check-set-type'; +$rc = ipset_check_set_type($set_name, $set_type) if $action eq 'check-set-type'; -$rc = ipset_show_members($set_name) if $action eq 'show-set-members'; +$rc = ipset_show_members($set_name) if $action eq 'show-set-members'; -$rc = ipset_show_sets() if $action eq 'show-sets'; +$rc = ipset_show_sets() if $action eq 'show-sets'; -$rc = ipset_is_set_empty($set_name) if $action eq 'is-set-empty'; +$rc = ipset_is_set_empty($set_name) if $action eq 'is-set-empty'; -$rc = ipset_copy_set($set_name, $set_type, $set_copy) if $action eq 'copy-set'; +$rc = ipset_copy_set($set_name, $set_type, $set_copy) if $action eq 'copy-set'; -$rc = ipset_is_group_deleted($set_name, $set_type) if $action eq 'is-group-deleted'; +$rc = ipset_is_group_deleted($set_name, $set_type) if $action eq 'is-group-deleted'; + +$rc = ipset_is_group_used($set_name, $set_type) if $action eq 'is-group-used'; -$rc = ipset_is_group_used($set_name, $set_type) if $action eq 'is-group-used'; $rc = ipset_is_group_defined($set_name, $set_type, $set_family) if $action eq 'is-group-defined'; -$rc = update_set($set_name, $set_type, $set_family) if $action eq 'update-set'; -$rc = prune_deleted_sets() if $action eq 'prune-deleted-sets'; +$rc = update_set($set_name, $set_type, $set_family) if $action eq 'update-set'; + +$rc = prune_deleted_sets() if $action eq 'prune-deleted-sets'; -$rc = check_duplicates($set_name, $set_type, $set_family) if $action eq 'check-duplicates'; +$rc = check_duplicates($set_name, $set_type, $set_family) if $action eq 'check-duplicates'; if (defined $rc) { print $rc; |