From 27d542ae3c6ff507509c502fc96b8e1245040de1 Mon Sep 17 00:00:00 2001
From: slioch <slioch@eng-140.vyatta.com>
Date: Wed, 9 Sep 2009 09:27:45 -0700
Subject: fix for bug 4697. Added range value check that start must be less
 than or equal to stop address

---
 lib/Vyatta/TypeChecker.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Vyatta/TypeChecker.pm b/lib/Vyatta/TypeChecker.pm
index 27d9e03..c13ef4b 100755
--- a/lib/Vyatta/TypeChecker.pm
+++ b/lib/Vyatta/TypeChecker.pm
@@ -91,6 +91,12 @@ sub validate_ipv4range {
   return 0 if (!/^([^-]+)-([^-]+)$/);
   my ($a1, $a2) = ($1, $2);
   return 0 if (!validate_ipv4($a1) || !validate_ipv4($a2));
+  #need to check that range is in ascending order
+  $a1 =~ m/^(\d\d?\d?)\.(\d\d?\d?)\.(\d\d?\d?)\.(\d\d?\d?)/;
+  my $v1 = $1*256*256*256+$2*256*256+$3*256+$4;
+  $a2 =~ m/^(\d\d?\d?)\.(\d\d?\d?)\.(\d\d?\d?)\.(\d\d?\d?)/;
+  my $v2 = $1*256*256*256+$2*256*256+$3*256+$4;
+  return 0 if ($v1 > $v2);
   return 1;
 }
 
-- 
cgit v1.2.3