Changeset 5197

Timestamp:

08/05/09 02:38:44 (4 years ago)

Author:

jow

Message:

luci-0.9: merge r5193-r5194

Location:

luci/branches/luci-0.9

Files:

• contrib/package/olsrd-luci/files/etc/init.d/olsrd (modified) (1 diff)
• libs/core/luasrc/ip.lua (modified) (2 diffs)

luci/branches/luci-0.9/contrib/package/olsrd-luci/files/etc/init.d/olsrd

@@ -31 +31 @@
 validate_olsrd_option() {
     local str=$1
-    [ -z "$str" -o "$str" != "${str%%[!     0-9A-Za-z./:_-]*}" ] && return 1
+    [ -z "$str" -o "$str" != "${str%%[!     0-9A-Za-z./|:_-]*}" ] && return 1
     return 0
 }

luci/branches/luci-0.9/libs/core/luasrc/ip.lua

@@ -18 +18 @@
 module( "luci.ip", package.seeall )
 
-require("bit")
-require("luci.util")
+require "nixio"
+local bit  = nixio.bit
+local util = require "luci.util"
 
 --- Boolean; true if system is little endian
-LITTLE_ENDIAN = not luci.util.bigendian()
+LITTLE_ENDIAN = not util.bigendian()
 
 --- Boolean; true if system is big endian
@@ -325 +326 @@
 -- @cstyle  instance
 -- @name    luci.ip.cidr
-cidr = luci.util.class()
+cidr = util.class()
 
 --- Test whether the instance is a IPv4 address.