From 539d59730b31c9f00b6190b34f34af7ddf07c392 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Wed, 2 Mar 2011 00:25:42 +0000
Subject: Remove custom code for checking ip_addr and use the pfsense provided
 one.

---
 usr/local/pkg/miniupnpd.inc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'usr/local/pkg')

diff --git a/usr/local/pkg/miniupnpd.inc b/usr/local/pkg/miniupnpd.inc
index cfa6267..f52214b 100644
--- a/usr/local/pkg/miniupnpd.inc
+++ b/usr/local/pkg/miniupnpd.inc
@@ -43,7 +43,8 @@
 	}
 
 	function upnp_validate_ip($ip, $check_cdir) {
-		/* validate cdir */	
+		/* validate cidr */	
+		$ip_array = array();
 		if($check_cdir)	{
 			$ip_array = explode('/', $ip);
 			if(count($ip_array) == 2) {
@@ -56,11 +57,8 @@
 			$ip_array[] = $ip;
 
 		/* validate ip */
-		if(!eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$', $ip_array[0]))
+		if (!is_ipaddr($ip_array[0]))
 			return false;
-		foreach(explode('.', $ip_array[0]) as $sub)
-			if($sub < 0 || $sub > 256)
-				return false;
 		return true;
 	}
 
-- 
cgit v1.1