On Thu, Dec 06, 2012 at 04:54:42PM +0100, Mohamed wrote:
>
> Signed-off-by: Ahmed ZRIBI <ahmed.zribi@pivasoftware.com>
> Signed-off-by: Mohamed <mohamed.kallel@pivasoftware.com>
NACK, at least for now. Look at the comments in patch 16.
> ---
> ext/openwrt/scripts/functions/lan_device | 98 ++++++++++++++++++++++++++++-
> 1 files changed, 94 insertions(+), 4 deletions(-)
>
> diff --git a/ext/openwrt/scripts/functions/lan_device
> b/ext/openwrt/scripts/functions/lan_device
> index fa9dda4..712b5e8 100644
> --- a/ext/openwrt/scripts/functions/lan_device
> +++ b/ext/openwrt/scripts/functions/lan_device
> @@ -4,7 +4,10 @@
> get_wlan_enable() {
> local num="$1"
> local type="xsd:boolean"
> -local val=`/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} get
> wireless.@wifi-device[$num].disabled 2> /dev/null`
> +local val=""
> +case "$action" in
> + get_value)
> + val=`/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} get
> wireless.@wifi-device[$num].disabled 2> /dev/null`
> let num=$num+1
> if [ "$val" = "1" ]; then
> val="0"
> @@ -12,6 +15,13 @@ else
> val="1"
> fi
> ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration.$num.Enable" "$val"
> "$type"
> + ;;
> + get_name)
> + val="1"
> + let num=$num+1
> + ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration.$num.Enable" "$val"
> + ;;
> +esac
> }
>
> set_wlan_enable() {
> @@ -28,9 +38,20 @@ delay_command "wifi" "wifi" "45"
>
> get_wlan_ssid() {
> local num="$1"
> -local val=`/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} get
> wireless.@wifi-iface[$num].ssid 2> /dev/null`
> -let num=$num+1
> -ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration.$num.SSID" "$val"
> +local val=""
> +case "$action" in
> + get_value)
> + val=`/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} get
> wireless.@wifi-iface[$num].ssid 2> /dev/null`
> + let num=$num+1
> + ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration.$num.SSID" "$val"
> + ;;
> + get_name)
> + val="1"
> + let num=$num+1
> + ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration.$num.SSID" "$val"
> + ;;
> +esac
> +
> }
>
> set_wlan_ssid() {
> @@ -79,6 +100,75 @@ esac
> return $FAULT_CPE_INVALID_PARAMETER_NAME
> }
>
> +get_lan_device_name() {
> +case "$1" in
> + InternetGatewayDevice.)
> + ubus_freecwmp_output "InternetGatewayDevice.LANDevice." "1"
> + if [ "$2" = "0" ]; then
> + ubus_freecwmp_output "InternetGatewayDevice.LANDevice.1." "1"
> + ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration." "1"
> + ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration.1." "1"
> + get_wlan_enable 0
> + get_wlan_ssid 0
> + fi
> + return $FAULT_CPE_NO_FAULT
> + ;;
> + InternetGatewayDevice.LANDevice.)
> + ubus_freecwmp_output "InternetGatewayDevice.LANDevice." "1"
> + ubus_freecwmp_output "InternetGatewayDevice.LANDevice.1." "1"
> + if [ "$2" = "0" ]; then
> + ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration." "1"
> + ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration.1." "1"
> + get_wlan_enable 0
> + get_wlan_ssid 0
> + fi
> + return $FAULT_CPE_NO_FAULT
> + ;;
> + InternetGatewayDevice.LANDevice.1.)
> + ubus_freecwmp_output "InternetGatewayDevice.LANDevice.1." "1"
> + ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration." "1"
> + if [ "$2" = "0" ]; then
> + ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration.1." "1"
> + get_wlan_enable 0
> + get_wlan_ssid 0
> + fi
> + return $FAULT_CPE_NO_FAULT
> + ;;
> + InternetGatewayDevice.LANDevice.1.WLANConfiguration.)
> + ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration." "1"
> + ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration.1." "1"
> + if [ "$2" = "0" ]; then
> + get_wlan_enable 0
> + get_wlan_ssid 0
> + fi
> + return $FAULT_CPE_NO_FAULT
> + ;;
> + InternetGatewayDevice.LANDevice.1.WLANConfiguration.1.)
> + ubus_freecwmp_output
> "InternetGatewayDevice.LANDevice.1.WLANConfiguration.1." "1"
> + if [ "$2" = "0" ]; then
> + get_wlan_enable 0
> + get_wlan_ssid 0
> + fi
> + return $FAULT_CPE_NO_FAULT
> + ;;
> + InternetGatewayDevice.LANDevice.1.WLANConfiguration.1.Enable)
> + if [ "$2" = "1" ]; then
> + return $FAULT_CPE_INVALID_ARGUMENTS
> + fi
> + get_wlan_enable 0
> + return $FAULT_CPE_NO_FAULT
> + ;;
> + InternetGatewayDevice.LANDevice.1.WLANConfiguration.1.SSID)
> + if [ "$2" = "1" ]; then
> + return $FAULT_CPE_INVALID_ARGUMENTS
> + fi
> + get_wlan_ssid 0
> + return $FAULT_CPE_NO_FAULT
> + ;;
> +esac
> +return $FAULT_CPE_INVALID_PARAMETER_NAME
> +}
> +
> set_lan_device() {
> case "$1" in
> InternetGatewayDevice.LANDevice.1.WLANConfiguration.1.Enable)
> --
> 1.7.4.1
Luka
|