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

ubox: add log_trailer_null option to uci 

this allow us to use syslog tcp with \0 trailer
instead of \n trailer (logread -0 option)

Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45329 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2015-04-09 10:32:18 +00:00
parent fb8ec60377
commit 91e85d4ec4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ validate_log_section()
'log_remote:bool:1' \ 'log_remote:bool:1' \
'log_port:port:514' \ 'log_port:port:514' \
'log_proto:or("tcp", "udp"):udp' \ 'log_proto:or("tcp", "udp"):udp' \
'log_trailer_null:bool:0' \
'log_prefix:string' 'log_prefix:string'
} }
@ -63,7 +64,7 @@ start_service_remote()
{ {
PIDCOUNT="$(( ${PIDCOUNT} + 1))" PIDCOUNT="$(( ${PIDCOUNT} + 1))"
local pid_file="/var/run/logread.${PIDCOUNT}.pid" local pid_file="/var/run/logread.${PIDCOUNT}.pid"
local log_ip log_port log_proto log_prefix log_remote local log_ip log_port log_proto log_prefix log_remote log_trailer_null
validate_log_section "${1}" || { validate_log_section "${1}" || {
echo "validation failed" echo "validation failed"
@ -74,7 +75,10 @@ start_service_remote()
procd_open_instance procd_open_instance
procd_set_param command "$PROG" -f -r "$log_ip" "${log_port}" -p "$pid_file" procd_set_param command "$PROG" -f -r "$log_ip" "${log_port}" -p "$pid_file"
[ "${log_proto}" != "udp" ] || procd_append_param command -u case "${log_proto}" in
"udp") procd_append_param command -u;;
"tcp") [ "${log_trailer_null}" -eq 1 ] && procd_append_param command -0;;
esac
[ -z "${log_prefix}" ] || procd_append_param command -P "${log_prefix}" [ -z "${log_prefix}" ] || procd_append_param command -P "${log_prefix}"
procd_close_instance procd_close_instance
} }