Convert gluon-announce Lua code to C modules, rename to gluon-respondd

gluon-announced and gluon-announce are merged to gluon-respondd.

modules

@@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=f8a70fc188673d0ae8739b0a3095f7f61335fc10
 PACKAGES_OPENWRT_BRANCH=for-15.05
 
 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=bdb56bba02168a7fdd7c8bbf380ae59a4febac7c
+PACKAGES_GLUON_COMMIT=fd06c7d67da69713f0361dadab16393c26cb609b
 
 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
 PACKAGES_ROUTING_COMMIT=ae65d4fe027592652376f8dbd3ff2ef37f5a84bc

package/gluon-alfred/Makefile

@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/gluon-alfred
   SECTION:=gluon
   CATEGORY:=Gluon
-  DEPENDS:=+gluon-core +gluon-announced +gluon-neighbour-info +micrond +alfred
+  DEPENDS:=+gluon-core +gluon-respondd +gluon-neighbour-info +micrond +alfred
   TITLE:=Configure alfred
 endef
 

package/gluon-announce/Makefile

-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gluon-announce
-PKG_VERSION:=1
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/gluon-announce
-  SECTION:=gluon
-  CATEGORY:=Gluon
-  DEPENDS:=+gluon-core +luci-lib-jsonc +lua-ethtool-stats
-  TITLE:=Lua scripts announcing various information
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/gluon-announce/install
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,gluon-announce))

package/gluon-announce/files/lib/gluon/announce/neighbours.cache

-10

package/gluon-announce/files/lib/gluon/announce/neighbours.d/node_id

-return require('gluon.util').node_id()

package/gluon-announce/files/lib/gluon/announce/nodeinfo.cache

-300

package/gluon-announce/files/lib/gluon/announce/nodeinfo.d/hardware/model

-return require('platform_info').get_model()

package/gluon-announce/files/lib/gluon/announce/nodeinfo.d/hardware/nproc

-local n = 0
-
-local cpus = util.readline(io.open('/sys/devices/system/cpu/online'))
-
-for entry in cpus:gmatch('([^,]+)') do
-  local x, y = entry:match('(%d+)-(%d+)')
-  if x then
-    n = n + tonumber(y) - tonumber(x) + 1
-  else
-    n = n + 1
-  end
-end
-
-return n

package/gluon-announce/files/lib/gluon/announce/nodeinfo.d/hostname

-return uci:get_first('system', 'system', 'hostname')

package/gluon-announce/files/lib/gluon/announce/nodeinfo.d/network/mac

-return require('gluon.sysconfig').primary_mac

package/gluon-announce/files/lib/gluon/announce/nodeinfo.d/node_id

-return require('gluon.util').node_id()

package/gluon-announce/files/lib/gluon/announce/nodeinfo.d/software/firmware

-return {
-	base = 'gluon-' .. util.readline(io.open('/lib/gluon/gluon-version')),
-	release = util.readline(io.open('/lib/gluon/release')),
-}

package/gluon-announce/files/lib/gluon/announce/nodeinfo.d/system/site_code

-return require('gluon.site_config').site_code

package/gluon-announce/files/lib/gluon/announce/statistics.cache

-5

package/gluon-announce/files/lib/gluon/announce/statistics.d/idletime

-return tonumber(util.readline(io.open('/proc/uptime')):match('^[^ ]+ ([^ ]+)'))

package/gluon-announce/files/lib/gluon/announce/statistics.d/loadavg

-return tonumber(util.readline(io.open('/proc/loadavg')):match('^([^ ]+) '))

package/gluon-announce/files/lib/gluon/announce/statistics.d/memory

-local data = io.open('/proc/meminfo'):read('*a')
-
-local fields = {}
-for k, v in data:gmatch('([^\n:]+):%s*(%d+) kB') do
-	fields[k] = tonumber(v)
-end
-
-return {
-	total = fields.MemTotal,
-	free = fields.MemFree,
-	buffers = fields.Buffers,
-	cached = fields.Cached,
-}

package/gluon-announce/files/lib/gluon/announce/statistics.d/node_id

-return require('gluon.util').node_id()

package/gluon-announce/files/lib/gluon/announce/statistics.d/processes

-local running, total = util.readline(io.open('/proc/loadavg')):match('^[^ ]+ [^ ]+ [^ ]+ (%d+)/(%d+)')
-
-return { running = tonumber(running), total = tonumber(total) }

package/gluon-announce/files/lib/gluon/announce/statistics.d/rootfs_usage

-local fs = require "nixio.fs"
-
-local st = fs.statvfs("/")
-return 1 - st.bfree / st.blocks