Changeset 64

Timestamp:

09/08/07 19:18:49 (3 years ago)

Author:

evdowizard

Message:

polished support for international networks, added ifup.3g errors to 3g
status page log0

Files:

• trunk/imagebuilder/files/usr/lib/webif/3g-networks.csv (modified) (1 diff)
• trunk/imagebuilder/files/www/cgi-bin/webif/network-wan-lan.sh (modified) (5 diffs)
• trunk/imagebuilder/files/www/cgi-bin/webif/status-wwaninfo.sh (modified) (1 diff)

trunk/imagebuilder/files/usr/lib/webif/3g-networks.csv

@@ -25 +25 @@
-NZ_Vodafone:NZ Vodafone:::www.vodafone.net.nz:*99***1#:gsm
-PT_Vodafone:PT Vodafone:vodafone:vodafone:internet.vodafone.pt:*99***1#:gsm
+SA_Mobily:SA Mobily:::web2:*99#:gsm
-SE_Vodafone:SE Vodafone:::internet.vodafone.net:*99***1#:gsm
-SI_SiMobil:SI SiMobil:simobil:internet:internet.simobil.si:*99***1#:gsm

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

@@ -188 +188 @@
-                                empty "$FORM_wwan_redial" || save_setting network wwan_redial "$FORM_wwan_redial"
-                                empty "$FORM_wwan_idletime" || save_setting network wwan_idletime "$FORM_wwan_idletime"
-
-
-# if blank, set idle time to 10 mins
-empty "$FORM_wwan_idletime" && save_setting network wwan_idletime "10"
-
-# if demand mode is set, disable keepalive
-if equal "$FORM_wwan_redial" "demand"; then
-save_setting network wwan_keepalive "0"
-else
-save_setting network wwan_keepalive "$FORM_wwan_keepalive"
-fi
+
+
+case "$FORM_wwan_redial" in
+       demand)
+
+               empty "$FORM_wwan_idletime" && save_setting network wwan_idletime "10"
+       ;;
+*)
+               save_setting network wwan_keepalive "$FORM_wwan_keepalive"
+;;
+esac
-
-                                # These can be blank
@@ -204 +204 @@
-                                save_setting network wwan_passwd "$FORM_wwan_passwd"
-                                save_setting network wwan_username "$FORM_wwan_username"
-
-
+
-                                        save_setting network wwan_service "$FORM_wwan_service"
+                                        save_setting network wwan_apn "$FORM_wwan_apn"
+                                        save_setting network wwan_pincode "$FORM_wwan_pincode"
-                                fi
-                                save_setting network wwan_ifname "ppp0"
@@ -318 +319 @@
-
-        v = isset('wwan_type', 'gsm');
+        set_visible('field_wwan_apn', v);
-        set_visible('field_wwan_service', v);
-        set_visible('field_wwan_pincode', v);
@@ -354 +356 @@
-helptext|Helptext Idle Time#The number of minutes without internet traffic that the router should wait before disconnecting from the Internet (Connect on Demand only)
-field|@TR<<Utilize Keepalive>>|field_wwan_keepalive|hidden
-
-
+wwan_
+wwan_
-helpitem|Keepalive
-helptext|Helptext Keepalive#The keepalive daemon insures that the internet is always connected and responding. Keepalive cannot be used with Connect on Demand mode.
@@ -366 +368 @@
-helpitem|Network
-helptext|Helptext Network#Select a mobile network preset from the list. Some fields may be blank depending on the provider. If your network is not listed, you may be able enter in the mobile network settings manually.
+onchange|modechange
+field|@TR<<Network Type>>|field_wwan_type
+select|wwan_type|$FORM_wwan_type
+option|cdma|@TR<<CDMA Based>>
+option|gsm|@TR<<GSM Based>>
-field|@TR<<Username>>|field_wwan_username
-text|wwan_username|$FORM_wwan_username
-field|@TR<<Password>>|field_wwan_passwd
-text|wwan_passwd|$FORM_wwan_passwd
-field|@TR<<APN Name>>|field_wwan_apn
-text|wwan_apn|$FORM_wwan_apn
-field|@TR<<Dialup Number>>|field_wwan_num
-text|wwan_num|$FORM_wwan_num
-
-
-
-
-
-
-
-
-
+
+
-field|@TR<<PIN Code>>|field_wwan_pincode|hidden
-password|wwan_pincode|$FORM_wwan_pincode
+field|@TR<<Preferred Service>>|field_wwan_service|hidden
+select|wwan_service|$FORM_wwan_service
+option|umts_first|@TR<<Automatic>>
+option|umts_only|@TR<<3G Only>>
+option|gprs_only|@TR<<2G Only>>
-end_form
-

trunk/imagebuilder/files/www/cgi-bin/webif/status-wwaninfo.sh

@@ -115 +115 @@
-string|<div style="width: 100%; height: 150px; overflow: auto; padding: 4px; font-size: 0.8em"><pre>
-EOF
-
+|ifup.3g
-echo
-display_form <<EOF