From 3b81fad442d9078bc9131e731ce2034656bcb165 Mon Sep 17 00:00:00 2001
From: Alexander Marx <amarx@ipfire.org>
Date: Mon, 21 Jan 2013 21:47:32 +0100
Subject: [PATCH] Forward Firewall: converter now creates cdir format from
 ip-addresses

---
 config/forwardfw/convert-outgoingfw | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/forwardfw/convert-outgoingfw b/config/forwardfw/convert-outgoingfw
index ada4196e3..03208e62b 100755
--- a/config/forwardfw/convert-outgoingfw
+++ b/config/forwardfw/convert-outgoingfw
@@ -335,8 +335,10 @@ sub process_rules
 			}elsif ($configline[2] eq 'ip') {
 				my $z=&check_ip($configline[5]);
 				if($z){
+					my ($ipa,$subn) = split("/",$z);
+					$subn=&General::iporsubtocidr($subn);
 					$grp1='src_addr';
-					$source=$z;
+					$source="$ipa/$subn";
 				}else{
 					print LOG "-> Rule not converted, missing/invalid source ip \"$configline[5]\"\n";
 					next;
@@ -369,8 +371,10 @@ sub process_rules
 			if($configline[7] ne ''){
 				my $address=&check_ip($configline[7]);
 				 if($address){
+					 my ($dip,$dsub) = split("/",$address);
+					 $dsub=&General::iporsubtocidr($dsub);
 					 $grp2='tgt_addr';
-					 $target=$address;
+					 $target="$dip/$dsub";
 				 }elsif(!$address){
 					my $getwebsiteip=&get_ip_from_domain($configline[7]);
 					if ($getwebsiteip){