Changeset 61

Timestamp:

09/06/07 22:41:08 (1 year ago)

Author:

evdowizard

Message:

revised wan-lan settings page, added keepalive enable/disable

Files:

• trunk/imagebuilder/files/etc/hotplug.d/iface/05-3g (modified) (1 diff)
• trunk/imagebuilder/files/www/cgi-bin/webif/network-wan-lan.sh (modified) (7 diffs)

trunk/imagebuilder/files/etc/hotplug.d/iface/05-3g

@@ -14 +14 @@
-
-                        # startup keepalive if enabled
-redial)" != "demand
+keepalive)" = "1
-                ;;
-                ifdown)

trunk/imagebuilder/files/www/cgi-bin/webif/network-wan-lan.sh

@@ -81 +81 @@
-        FORM_pptp_server_ip=${pptp_server_ip:-$(nvram get pptp_server_ip)}
-        
-
-        # get opendns setting (uci_load webif above)
-        FORM_opendns=${CONFIG_misc_opendns:-"0"}
-
-        # get local lan
-        FORM_lan_ipaddr=${lan_ipaddr:-$(nvram get lan_ipaddr)}
-        FORM_lan_netmask=${lan_netmask:-$(nvram get lan_netmask)}
-        FORM_lan_gateway=${lan_gateway:-$(nvram get lan_gateway)}
-
-        # wwan common
-        FORM_wwan_network=${wwan_network:-$(nvram get wwan_network)}
@@ -98 +89 @@
-        FORM_wwan_type=${wwan_type:-$(nvram get wwan_type)}
-        FORM_wwan_redial=${wwan_redial:-$(nvram get wwan_redial)}
-_ip=${wwan_keepalive_ip:-$(nvram get wwan_keepalive_ip
+=${wwan_keepalive:-$(nvram get wwan_keepalive
-        FORM_wwan_idletime=${wwan_idletime:-$(nvram get wwan_idletime)}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-else
-        SAVED=1
@@ -201 +181 @@
-
-                        3g)
-if these forms are empty, don't bother saving them to nvram
+dont save these settings if they are blank
-                                empty "$FORM_wwan_num" || save_setting network wwan_num "$FORM_wwan_num"
-                                empty "$FORM_wwan_type" || save_setting network wwan_type "$FORM_wwan_type"
@@ -210 +190 @@
-                                empty "$FORM_wwan_idletime" && save_setting network wwan_idletime "10"
-
+                                # if demand mode is set, disable keepalive
+                                if [ "$FORM_wwan_redial" = "demand" ]; then
+                                        save_setting network wwan_keepalive "0"
+                                else
+                                        save_setting network wwan_keepalive "$FORM_wwan_keepalive"
+                                fi
+
-                                # These can be blank
-                                save_setting network wwan_keepalive_ip "$FORM_wwan_keepalive_ip"
-                                save_setting network wwan_mtu "$FORM_wwan_mtu"
-                                save_setting network wwan_network "$FORM_wwan_network"
-                                save_setting network wwan_passwd "$FORM_wwan_passwd"
@@ -244 +229 @@
-}
-
+# detect 3g package and compile option
+[ -x "/sbin/ifup.3g" ] && {
+                WWAN_CONFIG_FORM="
+                start_form|@TR<<WWAN Configuration>>|wwan_configuration
+                field|@TR<<Connection Type>>
+                select|wwan_proto|$FORM_wwan_proto
+                option|none|@TR<<No WWAN#None>>
+                option|3g|@TR<<3G Data Card>>
+                end_form"
+
+                #creates wwan network list from 3g-networks.csv
+                WWAN_NETWORK_LIST=$(
+                        awk '   BEGIN{FS=":"}
+                                        $1 ~ /[ \t]*#/ {next}
+                        {print "option|" $1 "|@TR<<" $2 ">>"}' < /usr/lib/webif/3g-networks.csv
+                )
+
+                #creates javascript array of wwan network settings from 3g-networks.csv
+                WWAN_NETWORK_SETTINGS=$(
+                        awk '   BEGIN{FS=":"}
+                                $1 ~ /[ \t]*#/ {next}
+                                {print "        network." $1 " = new Object;"
+                                 print "        network." $1 ".user = \"" $3 "\";"
+                                 print "        network." $1 ".pass = \"" $4 "\";"
+                                 print "        network." $1 ".apn = \"" $5 "\";"
+                                 print "        network." $1 ".num = \"" $6 "\";"
+                                 print "        network." $1 ".type = \"" $7 "\";\n"}' < /usr/lib/webif/3g-networks.csv
+                )
+}
-header "Network" "WAN-LAN" "@TR<<WAN-LAN Configuration>>" ' onload="modechange()" ' "$SCRIPT_NAME"
-
@@ -294 +308 @@
-        set_visible('opendns_form', v);
-        set_visible('wwan_network_settings', v);
-
-
-
+
-        set_visible('field_wwan_idletime', v && isset('wwan_redial', 'demand'));
-
@@ -319 +331 @@
-end_form
-
-
-
-
-
-
-
+
+
+
+
-select|wwan_redial|$FORM_wwan_redial
-option|demand|@TR<<Connect On Demand>>
-option|persist|@TR<<Always Connected>>
-option|manual|@TR<<Connect Manually>>
-Auto Disconnect (Min.)
+Maximum Idle Time
-text|wwan_idletime|$FORM_wwan_idletime
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-onchange|wwanchange
-Select 
+
-select|wwan_network|$FORM_wwan_network
-$WWAN_NETWORK_LIST
-Mobile 
-Mobile Network#Select your mobile network
+
+Network#Select a mobile network preset
-field|@TR<<Username>>|field_wwan_username
-text|wwan_username|$FORM_wwan_username