changes for ipset 6.0

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/Vyatta/IpTables/IpSet.pm b/lib/Vyatta/IpTables/IpSet.pm
index 894bb84..703a3ac 100755
--- a/lib/Vyatta/IpTables/IpSet.pm
+++ b/lib/Vyatta/IpTables/IpSet.pm
@@ -41,9 +41,9 @@ my %fields = (
 );
 
 my %grouptype_hash = (
-    'address' => 'iphash',
-    'network' => 'nethash',
-    'port'    => 'portmap'
+    'address' => 'hash:ip',
+    'network' => 'hash:net',
+    'port'    => 'bitmap:port'
 );
 
 my $logger = 'logger -t IpSet.pm -p local0.warn --';
@@ -95,7 +95,7 @@ sub exists {
 
     return 1 if   defined $self->{_exists};
     return 0 if ! defined $self->{_name};
-    my $cmd = "ipset -n -L $self->{_name} > /dev/null 2>&1";
+    my $cmd = "ipset -L $self->{_name} > /dev/null 2>&1";
     my $rc = $self->run_cmd($cmd);
     if ($rc eq 0) {
 	$self->{_exists} = 1;
@@ -109,10 +109,10 @@ sub get_type {
 
     return $self->{_type} if defined $self->{_type};
     return if ! $self->exists();
-    my @lines = `ipset -n -L $self->{_name}`;
+    my @lines = `ipset -L $self->{_name}`;
     my $type;
     foreach my $line (@lines) {
-	if ($line =~ /^Type:\s+(\w+)$/) {
+	if ($line =~ /^Type:\s+([\w:]+)$/) {
 	    $type = $1;
 	    last;
 	}
@@ -160,7 +160,7 @@ sub get_members {
     my @members = ();
     return @members if ! $self->exists();
 
-    my @lines = `ipset -n -L $self->{_name} -s`;
+    my @lines = `ipset -L $self->{_name} -s`;
     foreach my $line (@lines) {
 	push @members, $line if $line =~ /^\d/;
     }
@@ -194,7 +194,7 @@ sub references {
     my ($self) = @_;
 
     return 0 if ! $self->exists();
-    my @lines = `ipset -n -L $self->{_name}`;
+    my @lines = `ipset -L $self->{_name}`;
     foreach my $line (@lines) {
 	if ($line =~ /^References:\s+(\d+)$/) {
 	    return $1;