Merge pull request #464 from mariux64/mxrouter-add-ipash

mxrouterctl: Implement hash:net ipset

mxrouter/mxrouterctl

@@ -342,13 +342,22 @@ sub reload_ipsets {
 		my $tmp="$name-TMP";
 		warn "read ipset $name from $filename\n";
 		system('ipset','create',$tmp,$type,@options) and exit 1;
-		$type eq 'hash:ip' or die "read ipset type $type from file not implemented\n";
 		open my $in,'<',$filename or die "$filename: $!\n";
-		while (<$in>) {
-			s/#.*//;
-			/^\s*(\d+\.\d+\.\d+\.\d+)\s*$/ or next;
-			system('ipset','add',$tmp,$1) and exit 1;
-		}
+        if ($type eq 'hash:ip') {
+            while (<$in>) {
+                s/#.*//;
+                /^\s*(\d+\.\d+\.\d+\.\d+)\s*$/ or next;
+                system('ipset','add',$tmp,$1) and exit 1;
+            }
+        } elsif ($type eq 'hash:net') {
+            while (<$in>) {
+             s/#.*//;
+                /^\s*(\d+\.\d+\.\d+\.\d+\/\d+)\s*$/ or next;
+                system('ipset', 'add', $tmp, $1) and exit 1;
+            }
+        } else {
+            die "read ipset type $type from file not implemented\n";
+        }
 		system('ipset','swap',$name,$tmp) and exit 1;
 		system('ipset','destroy',$tmp) and exit 1;
 	}