update the init script and config for the new wprobe

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16724 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/wprobe/files/wprobe.config b/package/wprobe/files/wprobe.config
index 8494bcc..63518ef 100644 (file)
--- a/package/wprobe/files/wprobe.config
+++ b/package/wprobe/files/wprobe.config
@@ -5,3 +5,6 @@ config export
        option host ipfix-col
        option proto tcp
 
        option host ipfix-col
        option proto tcp
 

+# enable public wprobe protocol access
+config export
+       option type wprobe

diff --git a/package/wprobe/files/wprobe.init b/package/wprobe/files/wprobe.init
index cf0b162..11a5bf6 100755 (executable)
--- a/package/wprobe/files/wprobe.init
+++ b/package/wprobe/files/wprobe.init
@@ -1,24 +1,31 @@
 #!/bin/sh /etc/rc.common
 START=90
 EXPORTER=/usr/sbin/wprobe-ipfix
 #!/bin/sh /etc/rc.common
 START=90
 EXPORTER=/usr/sbin/wprobe-ipfix

+UTIL=/sbin/wprobe-util

 
 wprobe_ssd() {
 
 wprobe_ssd() {

-       local cfg="$1"; shift

        local cmd="$1"; shift
        local cmd="$1"; shift

-       start-stop-daemon "$cmd" -p "/var/run/wprobe-$cfg.pid" -b -x "$EXPORTER" -m -- "$@"
+       local type="$1"; shift
+       local app="$1"; shift
+       start-stop-daemon "$cmd" -p "/var/run/wprobe-$type.pid" -b ${app:+-x "$app"} -m -- "$@"

 }
 
 stop_wprobe() {
 }
 
 stop_wprobe() {

-       local cfg="$1"
-       [ -f "/var/run/wprobe-$cfg.pid" ] && wprobe_ssd "$cfg" -K
-       rm -f "/var/run/wprobe-$cfg.pid"
+       local type="$1"
+       [ -f "/var/run/wprobe-$type.pid" ] && wprobe_ssd -K "$type"
+       rm -f "/var/run/wprobe-$type.pid"

 }
 
 config_wprobe() {
        config_get ifname "$cfg" ifname
        config_get interval "$cfg" interval
        [ -n "$interval" ] || interval=100
 }
 
 config_wprobe() {
        config_get ifname "$cfg" ifname
        config_get interval "$cfg" interval
        [ -n "$interval" ] || interval=100

-       wprobe-info "$ifname" -c -i "$interval"
+       $UTIL "$ifname" -i "$interval" 2>/dev/null >/dev/null
+}
+
+start_proxy() {
+       config_get port "$cfg" port
+       wprobe_ssd -S proxy "$UTIL" -P -p "${port:-19770}"

 }
 
 start_ipfix() {
 }
 
 start_ipfix() {


@@ -38,13 +45,15 @@ start_ipfix() {
                return
        }
        config_wprobe "$cfg"
                return
        }
        config_wprobe "$cfg"

-       wprobe_ssd "$cfg" -S "$proto" -i "$ifname" -c "$host" -p "${port:-4739}"
+       wprobe_ssd -S "export-$cfg" "$EXPORTER" "$proto" -i "$ifname" -c "$host" -p "${port:-4739}"

 }
 
 start_export() {
 }
 
 start_export() {

+       local cfg="$1"

        config_get export_type "$cfg" type
        case "$export_type" in 
        config_get export_type "$cfg" type
        case "$export_type" in 

-               ipfix) start_ipfix "$cfg";;
+               ipfix) [ -x "$EXPORTER" ] && start_ipfix "$cfg";;
+               wprobe) start_proxy "$cfg";;

        esac
 }
 
        esac
 }
 


@@ -59,5 +68,5 @@ stop() {
 start() {
        config_load wprobe
        config_foreach config_wprobe interface
 start() {
        config_load wprobe
        config_foreach config_wprobe interface

-       [ -x "$EXPORTER" ] && config_foreach start_export export
+       config_foreach start_export export

 }
 }