* add default value of 1 for 'limit burst' in its node.def

* add comp_help for 'limit rate'
* make sure 'limit rate' is not less than 1/time unit

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/Vyatta/IpTables/Rule.pm b/lib/Vyatta/IpTables/Rule.pm
index be13cf0..8c78613 100644
--- a/lib/Vyatta/IpTables/Rule.pm
+++ b/lib/Vyatta/IpTables/Rule.pm
@@ -496,15 +496,15 @@ first character capitalized eg. Mon,Thu,Sat For negation, add ! in front eg. !Mo
   }
 
   my $limit = undef;
-  if (defined($self->{_limit}->{_burst})) {
-    return ("Limit rate not defined", ) if (!defined($self->{_limit}->{_rate}));
+  if (defined $self->{_limit}->{_rate}) {
+    my $rate_integer = $self->{_limit}->{_rate};
+    $rate_integer =~ s/\/(second|minute|hour|day)//;
+    if ($rate_integer < 1) {
+      return ("integer value in rate cannot be less than 1", );
+    }
     $limit = "--limit $self->{_limit}->{_rate} --limit-burst $self->{_limit}->{_burst}";
-  } elsif (defined($self->{_limit}->{_rate})) {
-     $limit = "--limit $self->{_limit}->{_rate} --limit-burst 1";
-  }
-  if (defined($limit)) {
-    $rule .= " -m limit $limit ";
   }
+  $rule .= " -m limit $limit " if defined $limit;
 
   my $chain = $self->{_name};
   my $rule_num = $self->{_rule_number};