diff --git a/owmp.sh b/owmp.sh
index 92e65b1..bd008d6 100755
--- a/owmp.sh
+++ b/owmp.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-set -e
+
 . /lib/functions/network.sh
 . /usr/share/libubox/jshn.sh
 
@@ -16,6 +16,7 @@ rand() {
     echo $num
 }
 tmp=`rand`
+echo '---------------------'
 echo 'sleep '$tmp
 sleep $tmp
 
@@ -23,141 +24,265 @@ network_get_mac() {
     local iface="$1"
     network_get_device ifname $iface
     local cmd="ifconfig "$ifname" | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}'"
-    local tmp=$(eval $cmd)
+    local tmp=`eval $cmd`
     echo ${tmp//:/}
     return $?
 }
-lan_mac=$(network_get_mac lan)
+lan_mac=`network_get_mac lan`
 echo $lan_mac
+oui=${lan_mac:0:6}
+
 r=`curl -sH 'Accept: application/json; version='$api_version -A 'HiAC/0.1.0 (Linux; OpenWrt 14.07; Hiwifi_J1S/HC6361)' $server_http_api'devices/'$lan_mac'/config/wireless'`
 echo $r
 json_load "$r"
+if [ $? -ne 0 ]; then
+    echo 'error: json_load error'
+    exit 1
+fi
 json_select device
+if [ $? -ne 0 ]; then
+    echo 'error: json_select error'
+    exit 1
+fi
 json_get_var channel channel
 json_get_var txpower txpower
 echo "$channel"
 echo "$txpower"
 
+# todo: read define from make menuconfig
+wifi_txpower='txpower'
+case $oui in
+    # youku
+    '54369B')
+        wifi_device='mt7620'
+        wifi_iface='@wifi-iface[1]'
+    ;;
+    # gee ralink
+    # todo: j1 ar71xx
+    'D4EE07')
+        wifi_device='radio0'
+        wifi_iface='master'
+        wifi_txpower='txpwr'
+    ;;
+esac
+
 wifi_need_restart=0
-old_channel=`uci get wireless.radio0.channel`
+cmd="uci get wireless.$wifi_device.channel"
+old_channel=`eval $cmd`
 if [ $old_channel != $channel ]; then
-    uci set wireless.radio0.channel=$channel
+    uci set wireless.$wifi_device.channel=$channel
     wifi_need_restart=1
 fi
-old_txpower=`uci get wireless.radio0.txpwr`
-if [ $old_txpower != $txpower ]; then
-    uci set wireless.radio0.txpwr=$txpower
+cmd="uci get wireless.$wifi_device.$wifi_txpower"
+old_txpower=`eval $cmd`
+if [ "$old_txpower" != "$txpower" ]; then
+    uci set wireless.$wifi_device.$wifi_txpower=$txpower
     wifi_need_restart=1
 fi
 
 json_select ..
 json_select iface
+if [ $? -ne 0 ]; then
+    echo 'error: json_select error'
+    exit 1
+fi
 json_get_var ssid ssid
 json_get_var encryption encryption
 
-old_ssid=`uci get wireless.master.ssid`
-if [ $old_ssid != $ssid ]; then
-    uci set wireless.master.ssid=$ssid
+cmd="uci get wireless.$wifi_iface.ssid"
+old_ssid=`eval $cmd`
+if [ "$old_ssid" != "$ssid" ]; then
+    uci set wireless.$wifi_iface.ssid=$ssid
     wifi_need_restart=1
 fi
-old_encryption=`uci get wireless.master.encryption`
-if [ $old_encryption != $encryption ]; then
-    uci set wireless.master.encryption=$encryption
+cmd="uci get wireless.$wifi_iface.encryption"
+old_encryption=`eval $cmd`
+if [ "$old_encryption" != "$encryption" ]; then
+    uci set wireless.$wifi_iface.encryption=$encryption
     wifi_need_restart=1
 fi
 
 if [ $wifi_need_restart -eq 1 ]; then
     uci commit wireless
+    echo '---------------------'
     echo 'wifi restarting'
     wifi
 fi
 
-r=`curl -sH 'Accept: application/json; version='$api_version -A 'HiAC/0.1.0 (Linux; OpenWrt 14.07; Hiwifi_J1S/HC6361)' $server_http_api'devices/'$lan_mac'/config/shadow'`
-echo $r
-json_load "$r"
-json_get_var password password
-echo "$password"
-
-echo 'password changing'
-echo -e "$password\n$password" | (passwd root)
-
 r=`curl -sH 'Accept: application/json; version='$api_version -A 'HiAC/0.1.0 (Linux; OpenWrt 14.07; Hiwifi_J1S/HC6361)' $server_http_api'devices/'$lan_mac'/config/wifidog'`
 echo $r
 json_load "$r"
+if [ $? -ne 0 ]; then
+    echo 'error: json_load error'
+    exit 1
+fi
 json_select auth_server
+if [ $? -ne 0 ]; then
+    echo 'error: json_select error'
+    exit 1
+fi
 json_get_var hostname hostname
 json_get_var path path
 echo "$hostname"
 echo "$path"
 
 wifidog_need_restart=0
-old_hostname=`uci get wifidog.authserver.Hostname`
-if [ $old_hostname != $hostname ]; then
-    uci set wifidog.authserver.Hostname=$hostname
-    wifidog_need_restart=1
-fi
+if [ -f /etc/config/wifidog ]; then
+    old_hostname=`uci get wifidog.authserver.Hostname`
+    if [ $old_hostname != $hostname ]; then
+        uci set wifidog.authserver.Hostname=$hostname
+        wifidog_need_restart=1
+    fi
+
+    old_path=`uci get wifidog.authserver.Path`
+    if [ $old_path != $path ]; then
+        uci set wifidog.authserver.Path=$path
+        wifidog_need_restart=1
+    fi
+else
+    old_gatewayid=`grep "^GatewayID " /etc/wifidog.conf | awk '{print $2}'`
+    if [ "$old_gatewayid" != "$lan_mac" ]; then
+        echo 'GatewayID '$lan_mac >> /etc/wifidog.conf
+        wifidog_need_restart=1
+    fi
+    old_hostname=`grep "^    Hostname" /etc/wifidog.conf | awk '{print $2}'`
+    if [ "$old_hostname" == "" ]; then
+        echo 'AuthServer {' >> /etc/wifidog.conf
+        echo '    Hostname '$hostname >> /etc/wifidog.conf
+        echo '    Path '$path >> /etc/wifidog.conf
+        echo '}' >> /etc/wifidog.conf
+    else
+        if [ $old_hostname != $hostname ]; then
+            sed -i "|Hostname $old_hostname|Hostname $hostname|g" /etc/wifidog.conf
+            wifidog_need_restart=1
+        fi
 
-old_path=`uci get wifidog.authserver.Path`
-if [ $old_path != $path ]; then
-    uci set wifidog.authserver.Path=$path
-    wifidog_need_restart=1
+        old_path=`grep "^    Path" /etc/wifidog.conf | awk '{print $2}'`
+        if [ $old_path != $path ]; then
+            sed -i "|Path $old_hostname|Hostname $hostname|g" /etc/wifidog.conf
+            wifidog_need_restart=1
+        fi
+    fi
 fi
 
 json_select ..
 json_select domain_whitelist
+if [ $? -ne 0 ]; then
+    echo 'error: json_select error'
+    exit 1
+fi
 local i=1
 domain_whitelist=''
 while json_get_type type $i && [ "$type" = string ]; do
     json_get_var tmp "$((i++))"
-    echo $tmp
     domain_whitelist=`echo $domain_whitelist $tmp`
 done
+echo 'domain_whitelist: '
 echo "$domain_whitelist"
-old_domain_whitelist=`uci get wifidog.hostlist.host`
-if [ "$old_domain_whitelist" != "$domain_whitelist" ]; then
-    uci delete wifidog.hostlist.host
-    i=1
-    while json_get_type type $i && [ "$type" = string ]; do
-        json_get_var tmp "$((i++))"
-        echo $tmp
-        uci add_list wifidog.hostlist.host=$tmp
-    done
-    wifidog_need_restart=1
-fi
 
 json_select ..
 json_select ip_whitelist
+if [ $? -ne 0 ]; then
+    echo 'error: json_select error'
+    exit 1
+fi
 i=1
 ip_whitelist=''
 while json_get_type type $i && [ "$type" = string ]; do
     json_get_var tmp "$((i++))"
-    echo $tmp
     ip_whitelist=`echo $ip_whitelist $tmp`
 done
+echo 'ip_whitelist: '
 echo "$ip_whitelist"
-old_ip_whitelist=`uci get wifidog.iplist.ip`
-if [ "$old_ip_whitelist" != "$ip_whitelist" ]; then
-    uci delete wifidog.iplist.ip
-    i=1
-    while json_get_type type $i && [ "$type" = string ]; do
-        json_get_var tmp "$((i++))"
-        echo $tmp
-        uci add_list wifidog.iplist.ip=$tmp
-    done
-    wifidog_need_restart=1
+
+if [ -f /etc/config/wifidog ]; then
+    old_domain_whitelist=`uci get wifidog.hostlist.host`
+    if [ "$old_domain_whitelist" != "$domain_whitelist" ]; then
+        echo "domain_whitelist is diff"
+        uci delete wifidog.hostlist.host
+        i=1
+        for domain in $domain_whitelist; do
+            uci add_list wifidog.hostlist.host=$domain
+        done
+        uci commit wifidog
+        wifidog_need_restart=1
+    fi
+    old_ip_whitelist=`uci get wifidog.iplist.ip`
+    if [ "$old_ip_whitelist" != "$ip_whitelist" ]; then
+        echo "ip_whitelist is diff"
+        uci delete wifidog.iplist.ip
+        for ip in $ip_whitelist; do
+            uci add_list wifidog.iplist.ip=$ip
+        done
+        uci commit wifidog
+        wifidog_need_restart=1
+    fi
+else
+    whitelist=`echo $domain_whitelist" "$ip_whitelist`
+    echo 'whitelist: '
+    echo "$whitelist"
+    conf=`cat /etc/wifidog.conf`
+    tmp=${conf#*'FirewallRuleSet global {'}
+    tmp2=${tmp%%'}'*}
+    tmp3=`echo "$tmp2" | grep "^    FirewallRule" | awk '{print $4}'`
+    old_whitelist=`echo $tmp3`
+    echo 'old_whitelist: '
+    echo "$old_whitelist"
+    if [ "$old_whitelist" != "$whitelist" ]; then
+        start_line=`grep -n 'FirewallRuleSet global {' /etc/wifidog.conf | awk -F: '{print $1}'`
+        echo $start_line
+        for num in `grep -n '}' /etc/wifidog.conf  | awk -F: '{print $1}'`; do
+            if [ $num -gt $start_line ]; then
+                end_line=$num
+                break
+            fi
+        done
+        echo $end_line
+        sed -i "$start_line,$end_line"d /etc/wifidog.conf
+        echo 'FirewallRuleSet global {' >> /etc/wifidog.conf
+        for domain in $domain_whitelist; do
+            echo '    FirewallRule allow to '"$domain" >> /etc/wifidog.conf                       
+        done             
+        for ip in $ip_whitelist; do
+            echo '    FirewallRule allow to '"$ip" >> /etc/wifidog.conf
+        done
+        echo '}' >> /etc/wifidog.conf
+    fi
 fi
 
 if [ $wifidog_need_restart -eq 1 ]; then
-    uci commit wifidog
+    echo '---------------------'
     echo 'wifidog restarting'
     /etc/init.d/wifidog restart
 fi
 
+r=`curl -sH 'Accept: application/json; version='$api_version -A 'HiAC/0.1.0 (Linux; OpenWrt 14.07; Hiwifi_J1S/HC6361)' $server_http_api'devices/'$lan_mac'/config/shadow'`
+echo $r
+json_load "$r"
+if [ $? -ne 0 ]; then
+    echo 'error: json_load error'
+    exit 1
+fi
+json_get_var password password
+echo "$password"
+
+echo '---------------------'
+echo 'password changing'
+echo -e "$password\n$password" | (passwd root)
+
 # because network maybe restart, so we should change network at the end 
 r=`curl -sH 'Accept: application/json; version='$api_version -A 'HiAC/0.1.0 (Linux; OpenWrt 14.07; Hiwifi_J1S/HC6361)' $server_http_api'devices/'$lan_mac'/config/network'`
 echo $r
 json_load "$r"
+if [ $? -ne 0 ]; then
+    echo 'error: json_load error'
+    exit 1
+fi
 json_select wan
+if [ $? -ne 0 ]; then
+    echo 'error: json_select error'
+    exit 1
+fi
 json_get_var proto proto
 json_get_var username username
 json_get_var password password
@@ -188,6 +313,7 @@ fi
 
 if [ $network_need_restart -eq 1 ]; then
     uci commit network
+    echo '---------------------'
     echo 'network restarting'
     /etc/init.d/network restart
 fi