mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

procd: update to latest git HEAD 

this adds a interafce.update trigger and mdns service registration helpers

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 42324
This commit is contained in:
John Crispin 2014-08-29 18:16:24 +00:00
parent 607f00d273
commit b0d9dcf84d
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/system/procd/Makefile
View File

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=procd
PKG_VERSION:=2014-07-30
PKG_VERSION:=2014-08-29
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/luci2/procd.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=35e01a9601292b2f609e65c2ddb3990cba8f378e
PKG_SOURCE_VERSION:=6a6fa0a6067cb3c522f5dc735e808a68f62b30b2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
CMAKE_INSTALL:=1

44
package/system/procd/files/procd.sh
View File

@ -195,6 +195,24 @@ _procd_add_config_trigger() {
json_close_array
}
_procd_add_raw_trigger() {
json_add_array
_procd_add_array_data "$1"
shift
local timeout=$1
shift
json_add_array
json_add_array
_procd_add_array_data "run_script" "$@"
json_close_array
json_close_array
json_add_int "" "$timeout"
json_close_array
}
_procd_add_reload_trigger() {
local script=$(readlink "$initscript")
local name=$(basename ${script:-$initscript})
@ -287,6 +305,30 @@ _procd_set_config_changed() {
ubus call service event "$(json_dump)"
}
procd_add_mdns_service() {
local service proto port
service=$1; shift
proto=$1; shift
port=$1; shift
json_add_object "${service}_$port"
json_add_string "service" "_$service._$proto.local"
json_add_int port "$port"
[ -n "$1" ] && {
json_add_array txt
for txt in $@; do json_add_string "" $txt; done
json_select ..
}
json_select ..
}
_procd_add_mdns() {
procd_open_data
json_add_object "mdns"
mdns_add_service $@
json_close_object
procd_close_data
}
uci_validate_section()
{
local _package="$1"
@ -306,6 +348,7 @@ _procd_wrapper \
procd_open_service \
procd_close_service \
procd_add_instance \
procd_add_raw_trigger \
procd_add_config_trigger \
procd_add_interface_trigger \
procd_add_reload_trigger \
@ -321,4 +364,5 @@ _procd_wrapper \
procd_append_param \
procd_add_validation \
procd_set_config_changed \
procd_add_mdns \
procd_kill