X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-wol%2Fluasrc%2Fmodel%2Fcbi%2Fwol.lua;fp=applications%2Fluci-app-wol%2Fluasrc%2Fmodel%2Fcbi%2Fwol.lua;h=d40dde0178ff6c7bad66b25ee7bdb886cdbae963;hp=ec6a1be2a8a4b0a0e50f305a12afaa59c6006353;hb=28e3b328545529c19429ce88c7d1769e64e2de0f;hpb=dfba318140e1a84359e221b7a9154337595dbded

diff --git a/applications/luci-app-wol/luasrc/model/cbi/wol.lua b/applications/luci-app-wol/luasrc/model/cbi/wol.lua
index ec6a1be2a..d40dde017 100644
--- a/applications/luci-app-wol/luasrc/model/cbi/wol.lua
+++ b/applications/luci-app-wol/luasrc/model/cbi/wol.lua
@@ -2,6 +2,7 @@
 -- Licensed to the public under the Apache License 2.0.
 
 local sys = require "luci.sys"
+local ipc = require "luci.ip"
 local fs  = require "nixio.fs"
 
 m = SimpleForm("wol", translate("Wake on LAN"),
@@ -58,7 +59,8 @@ end
 
 function host.write(self, s, val)
 	local host = luci.http.formvalue("cbid.wol.1.mac")
-	if host and #host > 0 and host:match("^[a-fA-F0-9:]+$") then
+	local mac = ipc.checkmac(host)
+	if mac then
 		local cmd
 		local util = luci.http.formvalue("cbid.wol.1.binary") or (
 			has_ewk and "/usr/bin/etherwake" or "/usr/bin/wol"
@@ -69,10 +71,10 @@ function host.write(self, s, val)
 			local broadcast = luci.http.formvalue("cbid.wol.1.broadcast")
 			cmd = "%s -D%s %s %q" %{
 				util, (iface ~= "" and " -i %q" % iface or ""),
-				(broadcast == "1" and " -b" or ""), host
+				(broadcast == "1" and " -b" or ""), mac
 			}
 		else
-			cmd = "%s -v %q" %{ util, host }
+			cmd = "%s -v %q" %{ util, mac }
 		end
 
 		local msg = "<p><strong>%s</strong><br /><br /><code>%s<br /><br />" %{