hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ubox: update to latest git head 

use the fd handover api of ubus to transfer log data
the uci option log_buffer_size can be used to override the default size of 16k

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39898 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2014-03-12 19:33:18 +00:00
parent bd37e9e0ae
commit 9ed8fd2348
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/system/ubox/Makefile
View File

@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ubox
PKG_VERSION:=2014-01-29
PKG_VERSION:=2014-03-12
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/luci2/ubox.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=71ea854364833c5dcb0800e092b45fed2c45910e
PKG_SOURCE_VERSION:=c8d14b9b5d0fa3a3f99df386b67670e083c82095
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
CMAKE_INSTALL:=1

26
package/system/ubox/files/log.init
View File

@ -21,6 +21,24 @@ validate_log_section()
return $?
}
validate_log_daemon()
{
uci_validate_section system system "${1}" \
'log_buffer_size:uinteger:16'
return $?
}
start_service_daemon()
{
local log_buffer_size
validate_log_daemon "${1}"
procd_open_instance
procd_set_param command "/sbin/logd"
procd_append_param command -S "${log_buffer_size}"
procd_set_param respawn
procd_close_instance
}
start_service_file()
{
PIDCOUNT="$(( ${PIDCOUNT} + 1))"
@ -54,7 +72,7 @@ start_service_remote()
procd_open_instance
procd_set_param command "$PROG" -f -r "$log_ip" "${log_port}" -p "$pid_file"
[ "${log_proto}" != "udp" ] || procd_append_param command -u
[ -z "${log_prefix}" ] || procd_append_param command -P ${log_prefix}
[ -z "${log_prefix}" ] || procd_append_param command -P "${log_prefix}"
procd_close_instance
}
@ -66,12 +84,8 @@ service_triggers()
start_service()
{
procd_open_instance
procd_set_param command "/sbin/logd"
procd_set_param respawn
procd_close_instance
config_load system
config_foreach start_service_daemon system
config_foreach start_service_file system
config_foreach start_service_remote system
}