From 3793244fcbd6a989e1eee183727b13b554c0f21c Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 26 Nov 2008 22:59:11 +0000 Subject: [PATCH 1/1] libs/sys: whitespaces fixes --- libs/sys/luasrc/sys.lua | 73 ++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua index b4b6f6805..4cd012bcc 100644 --- a/libs/sys/luasrc/sys.lua +++ b/libs/sys/luasrc/sys.lua @@ -367,43 +367,42 @@ end -- { "src_ip", "src_prefix", "dst_ip", "dst_prefix", "nexthop_ip", -- "metric", "refcount", "usecount", "flags", "device" } function net.routes6() - local routes = { } - - for line in io.lines("/proc/net/ipv6_route") do - - local dst_ip, dst_prefix, src_ip, src_prefix, nexthop, - metric, refcnt, usecnt, flags, dev = line:match( - "([a-f0-9]+) ([a-f0-9]+) " .. - "([a-f0-9]+) ([a-f0-9]+) " .. - "([a-f0-9]+) ([a-f0-9]+) " .. - "(%d+) (%d+) ([^%s]+) +([^%s]+)" - ) - - src_ip = luci.ip.Hex( - src_ip, tonumber(src_prefix, 16), - luci.ip.FAMILY_INET6, false - ) - - dst_ip = luci.ip.Hex( - dst_ip, tonumber(dst_prefix, 16), - luci.ip.FAMILY_INET6, false - ) - - nexthop = luci.ip.Hex( nexthop, 128, luci.ip.FAMILY_INET6, false ) - - routes[#routes+1] = { - src_ip = src_ip:host():string(), - src_prefix = src_ip:prefix(), - dst_ip = dst_ip:host():string(), - dst_prefix = dst_ip:prefix(), - nexthop_ip = nexthop:string(), - metric = tonumber(metric, 16), - refcount = tonumber(refcnt), - usecount = tonumber(usecnt), - flags = tonumber(flags), -- hex? - device = dev - } - end + local routes = { } + + for line in io.lines("/proc/net/ipv6_route") do + + local dst_ip, dst_prefix, src_ip, src_prefix, nexthop, + metric, refcnt, usecnt, flags, dev = line:match( + "([a-f0-9]+) ([a-f0-9]+) " .. + "([a-f0-9]+) ([a-f0-9]+) " .. + "([a-f0-9]+) ([a-f0-9]+) " .. + "(%d+) (%d+) ([^%s]+) +([^%s]+)" + ) + src_ip = luci.ip.Hex( + src_ip, tonumber(src_prefix, 16), + luci.ip.FAMILY_INET6, false + ) + + dst_ip = luci.ip.Hex( + dst_ip, tonumber(dst_prefix, 16), + luci.ip.FAMILY_INET6, false + ) + + nexthop = luci.ip.Hex( nexthop, 128, luci.ip.FAMILY_INET6, false ) + + routes[#routes+1] = { + src_ip = src_ip:host():string(), + src_prefix = src_ip:prefix(), + dst_ip = dst_ip:host():string(), + dst_prefix = dst_ip:prefix(), + nexthop_ip = nexthop:string(), + metric = tonumber(metric, 16), + refcount = tonumber(refcnt), + usecount = tonumber(usecnt), + flags = tonumber(flags), -- hex? + device = dev + } + end return routes end -- 2.11.0