From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 1 Aug 2009 20:40:55 +0000 (+0000)
Subject: [PATCH] make luci.ip.IPvX a bit more forgiving
X-Git-Tag: 0.10.0~1265
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=86cd67ebc31d8777b3e128f72c1133ea7c777439

[PATCH] make luci.ip.IPvX a bit more forgiving
Signed-Off-By: Malte S. Stretz <mss at apache.org>
---

diff --git a/libs/core/luasrc/ip.lua b/libs/core/luasrc/ip.lua
index 8ac017e02..0a66804e8 100644
--- a/libs/core/luasrc/ip.lua
+++ b/libs/core/luasrc/ip.lua
@@ -159,6 +159,7 @@ function IPv4(address, netmask)
 	local data = {}
 	local prefix = address:match("/(.+)")
 	address = address:gsub("/.+","")
+	address = address:gsub("^%[(.*)%]$", "%1"):upper():gsub("^::FFFF:", "")
 
 	if netmask then
 		prefix = obj:prefix(netmask)
@@ -206,6 +207,7 @@ function IPv6(address, netmask)
 	local data = {}
 	local prefix = address:match("/(.+)")
 	address = address:gsub("/.+","")
+	address = address:gsub("^%[(.*)%]$", "%1")
 
 	if netmask then
 		prefix = obj:prefix(netmask)