2004-12-21 Carlos Garnacho Parro <carlosg@gnome.org>please-break-my-network

        * network.pl.in: handled properly wvdial dependent distros with the
        new XML format

2 files changed, 359 insertions, 216 deletions

diff --git a/ChangeLog b/ChangeLog
index f001982..5797ff9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-21  Carlos Garnacho Parro  <carlosg@gnome.org>
+
+	* network.pl.in: handled properly wvdial dependent distros with the
+	new XML format
+
 2004-12-20  Carlos Garnacho Parro  <carlosg@gnome.org>
 
 	* network-conf.in: added the "save_profiles" directive
diff --git a/network.pl.in b/network.pl.in
index e3428c6..1093e06 100644
--- a/network.pl.in
+++ b/network.pl.in
@@ -4237,45 +4237,54 @@ sub gst_network_get_interface_parse_table
         IFACE => "#iface#",
         PAP   => "/etc/ppp/pap-secrets",
         CHAP  => "/etc/ppp/chap-secrets",
-        PUMP  => "/etc/pump.conf"
+        PUMP  => "/etc/pump.conf",
+        WVDIAL => "/etc/wvdial.conf"
       },
 	    table =>
           [
            [ "bootproto",          \&gst_network_rh62_parse_bootproto, IFCFG, BOOTPROTO ],
            [ "auto",               \&gst_parse_sh_bool, IFCFG, ONBOOT ],
-           [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
-           [ "name",               \&gst_parse_sh,      IFCFG, NAME ],
+#           [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
            [ "dev",                \&gst_parse_sh,      IFCFG, DEVICE ],
            [ "address",            \&gst_parse_sh,      IFCFG, IPADDR ],
            [ "netmask",            \&gst_parse_sh,      IFCFG, NETMASK ],
            [ "broadcast",          \&gst_parse_sh,      IFCFG, BROADCAST ],
            [ "network",            \&gst_parse_sh,      IFCFG, NETWORK ],
            [ "gateway",            \&gst_parse_sh,      IFCFG, GATEWAY ],
-           [ "update_dns",         \&gst_network_pump_get_nodns, PUMP, "%dev%", "%bootproto%" ],
-           [ "update_dns",         \&gst_parse_sh_bool, IFCFG, PEERDNS ],
-           [ "dns1",               \&gst_parse_sh,      IFCFG, DNS1 ],
-           [ "dns2",               \&gst_parse_sh,      IFCFG, DNS2 ],
-           [ "mtu",                \&gst_parse_sh,      IFCFG, MTU ],
-           [ "mru",                \&gst_parse_sh,      IFCFG, MRU ],
            [ "remote_address",     \&gst_parse_sh,      IFCFG, REMIP ],
-           [ "login",              \&gst_parse_sh,      IFCFG, PAPNAME ],
-           [ "password",           \&gst_network_get_pap_passwd, PAP,  "%login%" ],
-           [ "password",           \&gst_network_get_pap_passwd, CHAP, "%login%" ],
-           [ "serial_port",        \&gst_parse_sh,      IFCFG, MODEMPORT ],
-           [ "serial_speed",       \&gst_parse_sh,      IFCFG, LINESPEED ],
-           [ "ppp_options",        \&gst_parse_sh,      IFCFG, PPPOPTIONS ],
-           [ "section",            \&gst_parse_sh,      IFCFG, WVDIALSECT ],
-           [ "set_default_gw",     \&gst_parse_sh_bool, IFCFG, DEFROUTE ],
-           [ "debug",              \&gst_parse_sh_bool, IFCFG, DEBUG ],
-           [ "persist",            \&gst_parse_sh_bool, IFCFG, PERSIST ],
-           [ "serial_escapechars", \&gst_parse_sh_bool, IFCFG, ESCAPECHARS ],
-           [ "serial_hwctl",       \&gst_parse_sh_bool, IFCFG, HARDFLOWCTL ],
-           [ "phone_number",       \&gst_parse_chat,    CHAT, "^atd[^0-9]*([0-9, -]+)" ],
-           [ "enabled",            \&gst_network_interface_active, IFACE,
-                                                                   \&gst_network_active_interfaces_get ],
-           [ "enabled",            \&gst_parse_trivial, 0 ]
+#           [ "update_dns",         \&gst_network_pump_get_nodns, PUMP, "%dev%", "%bootproto%" ],
+#           [ "dns1",               \&gst_parse_sh,      IFCFG, DNS1 ],
+#           [ "dns2",               \&gst_parse_sh,      IFCFG, DNS2 ],
+#           [ "ppp_options",        \&gst_parse_sh,      IFCFG, PPPOPTIONS ],
+           [ "section",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, WVDIALSECT ]],
+           [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, PEERDNS ]],
+           [ "mtu",                \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MTU ]],
+           [ "mru",                \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MRU ]],
+           [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, PAPNAME ]],
+           [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_network_get_pap_passwd, PAP,  "%login%" ]],
+           [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_network_get_pap_passwd, CHAP, "%login%" ]],
+           [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MODEMPORT ]],
+           [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, LINESPEED ]],
+           [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, DEFROUTE ]],
+           [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, PERSIST ]],
+           [ "serial_escapechars", \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, ESCAPECHARS ]],
+           [ "serial_hwctl",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, HARDFLOWCTL ]],
+           [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_chat,    CHAT, "^atd[^0-9]*([0-9, -]+)" ]],
+           [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Phone" ]],
+           [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Auto DNS" ]],
+           [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Username" ]],
+           [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Password" ]],
+           [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Modem" ]],
+           [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Baud" ]],
+           [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Check Def Route" ]],
+           [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Auto Reconnect" ]],
+           [ "dial_command",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Dial Command" ]],
+           [ "external_line",      \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Dial Prefix" ]],
+#           [ "enabled",            \&gst_network_interface_active, IFACE,
+#                                                                   \&gst_network_active_interfaces_get ],
+#           [ "enabled",            \&gst_parse_trivial, 0 ]
            ]
-             },
+    },
 
 	  "redhat-7.2" =>
 	  {
@@ -4289,15 +4298,16 @@ sub gst_network_get_interface_parse_table
         IFACE => "#iface#",
         PAP   => "/etc/ppp/pap-secrets",
         CHAP  => "/etc/ppp/chap-secrets",
-        PUMP  => "/etc/pump.conf"
+        PUMP  => "/etc/pump.conf",
+        WVDIAL => "/etc/wvdial.conf"
       },
 	    table =>
           [
            [ "bootproto",          \&gst_network_rh62_parse_bootproto, IFCFG, BOOTPROTO ],
            [ "auto",               \&gst_parse_sh_bool, IFCFG, ONBOOT ],
-           [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
-           [ "name",               \&gst_parse_sh,      IFCFG, NAME ],
-           [ "name",               \&gst_parse_trivial, IFACE ],
+#           [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
+#           [ "name",               \&gst_parse_sh,      IFCFG, NAME ],
+#           [ "name",               \&gst_parse_trivial, IFACE ],
            [ "dev",                \&gst_parse_sh,      IFCFG, DEVICE ],
            [ "address",            \&gst_parse_sh,      IFCFG, IPADDR ],
            [ "netmask",            \&gst_parse_sh,      IFCFG, NETMASK ],
@@ -4306,33 +4316,44 @@ sub gst_network_get_interface_parse_table
            [ "gateway",            \&gst_parse_sh,      IFCFG, GATEWAY ],
            [ "essid",              \&gst_parse_sh,      IFCFG, ESSID ],
            [ "key",                \&gst_parse_sh,      IFCFG, KEY   ],
-           [ "update_dns",         \&gst_network_pump_get_nodns, PUMP, "%dev%", "%bootproto%" ],
-           [ "update_dns",         \&gst_parse_sh_bool, IFCFG, PEERDNS ],
-           [ "dns1",               \&gst_parse_sh,      IFCFG, DNS1 ],
-           [ "dns2",               \&gst_parse_sh,      IFCFG, DNS2 ],
-           [ "mtu",                \&gst_parse_sh,      IFCFG, MTU ],
-           [ "mru",                \&gst_parse_sh,      IFCFG, MRU ],
            [ "remote_address",     \&gst_parse_sh,      IFCFG, REMIP ],
-           [ "login",              \&gst_parse_sh,      IFCFG, PAPNAME ],
-           [ "password",           \&gst_network_get_pap_passwd, PAP,  "%login%" ],
-           [ "password",           \&gst_network_get_pap_passwd, CHAP, "%login%" ],
-           [ "serial_port",        \&gst_parse_sh,      IFCFG, MODEMPORT ],
-           [ "serial_speed",       \&gst_parse_sh,      IFCFG, LINESPEED ],
-           [ "ppp_options",        \&gst_parse_sh,      IFCFG, PPPOPTIONS ],
-           [ "section",            \&gst_parse_sh,      IFCFG, WVDIALSECT ],
-           [ "set_default_gw",     \&gst_parse_sh_bool, IFCFG, DEFROUTE ],
-           [ "debug",              \&gst_parse_sh_bool, IFCFG, DEBUG ],
-           [ "persist",            \&gst_parse_sh_bool, IFCFG, PERSIST ],
-           [ "serial_escapechars", \&gst_parse_sh_bool, IFCFG, ESCAPECHARS ],
-           [ "serial_hwctl",       \&gst_parse_sh_bool, IFCFG, HARDFLOWCTL ],
-           [ "phone_number",       \&gst_parse_chat,    CHAT, "^atd[^0-9]*([0-9, -]+)" ],
-           [ "enabled",            \&gst_network_interface_active, "%dev%",
-                                                                   \&gst_network_active_interfaces_get ],
-           [ "enabled",            \&gst_network_interface_active, IFACE,
-                                                                   \&gst_network_active_interfaces_get ],
-           [ "enabled",            \&gst_parse_trivial, 0 ]
-           ]
-             },
+#           [ "update_dns",         \&gst_network_pump_get_nodns, PUMP, "%dev%", "%bootproto%" ],
+#           [ "dns1",               \&gst_parse_sh,      IFCFG, DNS1 ],
+#           [ "dns2",               \&gst_parse_sh,      IFCFG, DNS2 ],
+           [ "section",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, WVDIALSECT ]],
+           [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, PEERDNS ]],
+           [ "mtu",                \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MTU ]],
+           [ "mru",                \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MRU ]],
+           [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, PAPNAME ]],
+           [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_network_get_pap_passwd, PAP,  "%login%" ]],
+           [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_network_get_pap_passwd, CHAP, "%login%" ]],
+           [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MODEMPORT ]],
+           [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, LINESPEED ]],
+#           [ "ppp_options",        \&gst_parse_sh,      IFCFG, PPPOPTIONS ],
+           [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, DEFROUTE ]],
+#           [ "debug",              \&gst_parse_sh_bool, IFCFG, DEBUG ],
+           [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, PERSIST ]],
+           [ "serial_escapechars", \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, ESCAPECHARS ]],
+           [ "serial_hwctl",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, HARDFLOWCTL ]],
+           [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_chat,    CHAT, "^atd[^0-9]*([0-9, -]+)" ]],
+#           [ "enabled",            \&gst_network_interface_active, "%dev%",
+#                                                                   \&gst_network_active_interfaces_get ],
+#           [ "enabled",            \&gst_network_interface_active, IFACE,
+#                                                                   \&gst_network_active_interfaces_get ],
+#           [ "enabled",            \&gst_parse_trivial, 0 ]
+           # wvdial settings
+           [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Phone" ]],
+           [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Auto DNS" ]],
+           [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Username" ]],
+           [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Password" ]],
+           [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Modem" ]],
+           [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Baud" ]],
+           [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Check Def Route" ]],
+           [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Auto Reconnect" ]],
+           [ "dial_command",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Dial Command" ]],
+           [ "external_line",      \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Dial Prefix" ]],
+          ]
+    },
 
 	  "redhat-8.0" =>
 	  {
@@ -4346,15 +4367,16 @@ sub gst_network_get_interface_parse_table
         IFACE => "#iface#",
         PAP   => "/etc/ppp/pap-secrets",
         CHAP  => "/etc/ppp/chap-secrets",
-        PUMP  => "/etc/pump.conf"
+        PUMP  => "/etc/pump.conf",
+        WVDIAL => "/etc/wvdial.conf"
       },
 	    table =>
           [
            [ "bootproto",          \&gst_network_rh62_parse_bootproto, IFCFG, BOOTPROTO ],
            [ "auto",               \&gst_parse_sh_bool, IFCFG, ONBOOT ],
-           [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
-           [ "name",               \&gst_parse_sh,      IFCFG, NAME ],
-           [ "name",               \&gst_parse_trivial, IFACE ],
+#           [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
+#           [ "name",               \&gst_parse_sh,      IFCFG, NAME ],
+#           [ "name",               \&gst_parse_trivial, IFACE ],
            [ "dev",                \&gst_parse_sh,      IFCFG, DEVICE ],
            [ "address",            \&gst_parse_sh,      IFCFG, IPADDR ],
            [ "netmask",            \&gst_parse_sh,      IFCFG, NETMASK ],
@@ -4363,32 +4385,43 @@ sub gst_network_get_interface_parse_table
            [ "gateway",            \&gst_parse_sh,      IFCFG, GATEWAY ],
            [ "essid",              \&gst_parse_sh,      IFCFG, WIRELESS_ESSID ],
            [ "key",                \&gst_parse_sh,      IFCFG, WIRELESS_KEY ],
-           [ "update_dns",         \&gst_network_pump_get_nodns, PUMP, "%dev%", "%bootproto%" ],
-           [ "update_dns",         \&gst_parse_sh_bool, IFCFG, PEERDNS ],
-           [ "dns1",               \&gst_parse_sh,      IFCFG, DNS1 ],
-           [ "dns2",               \&gst_parse_sh,      IFCFG, DNS2 ],
-           [ "mtu",                \&gst_parse_sh,      IFCFG, MTU ],
-           [ "mru",                \&gst_parse_sh,      IFCFG, MRU ],
            [ "remote_address",     \&gst_parse_sh,      IFCFG, REMIP ],
-           [ "login",              \&gst_parse_sh,      IFCFG, PAPNAME ],
-           [ "password",           \&gst_network_get_pap_passwd, PAP,  "%login%" ],
-           [ "password",           \&gst_network_get_pap_passwd, CHAP, "%login%" ],
-           [ "serial_port",        \&gst_parse_sh,      IFCFG, MODEMPORT ],
-           [ "serial_speed",       \&gst_parse_sh,      IFCFG, LINESPEED ],
-           [ "ppp_options",        \&gst_parse_sh,      IFCFG, PPPOPTIONS ],
-           [ "section",            \&gst_parse_sh,      IFCFG, WVDIALSECT ],
-           [ "set_default_gw",     \&gst_parse_sh_bool, IFCFG, DEFROUTE ],
-           [ "debug",              \&gst_parse_sh_bool, IFCFG, DEBUG ],
-           [ "persist",            \&gst_parse_sh_bool, IFCFG, PERSIST ],
-           [ "serial_escapechars", \&gst_parse_sh_bool, IFCFG, ESCAPECHARS ],
-           [ "serial_hwctl",       \&gst_parse_sh_bool, IFCFG, HARDFLOWCTL ],
-           [ "phone_number",       \&gst_parse_chat,    CHAT, "^atd[^0-9]*([0-9, -]+)" ],
-           [ "enabled",            \&gst_network_interface_active, "%dev%",
-                                                                   \&gst_network_active_interfaces_get ],
-           [ "enabled",            \&gst_network_interface_active, IFACE,
-                                                                   \&gst_network_active_interfaces_get ],
-           [ "enabled",            \&gst_parse_trivial, 0 ]
-           ]
+#           [ "update_dns",         \&gst_network_pump_get_nodns, PUMP, "%dev%", "%bootproto%" ],
+#           [ "dns1",               \&gst_parse_sh,      IFCFG, DNS1 ],
+#           [ "dns2",               \&gst_parse_sh,      IFCFG, DNS2 ],
+           [ "section",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, WVDIALSECT ]],
+           [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, PEERDNS ]],
+           [ "mtu",                \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MTU ]],
+           [ "mru",                \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MRU ]],
+           [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, PAPNAME ]],
+           [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_network_get_pap_passwd, PAP,  "%login%" ]],
+           [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_network_get_pap_passwd, CHAP, "%login%" ]],
+           [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MODEMPORT ]],
+           [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, LINESPEED ]],
+#           [ "ppp_options",        \&gst_parse_sh,      IFCFG, PPPOPTIONS ],
+           [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, DEFROUTE ]],
+#           [ "debug",              \&gst_parse_sh_bool, IFCFG, DEBUG ],
+           [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, PERSIST ]],
+           [ "serial_escapechars", \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, ESCAPECHARS ]],
+           [ "serial_hwctl",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, HARDFLOWCTL ]],
+           [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_chat,    CHAT, "^atd[^0-9]*([0-9, -]+)" ]],
+#           [ "enabled",            \&gst_network_interface_active, "%dev%",
+#                                                                   \&gst_network_active_interfaces_get ],
+#           [ "enabled",            \&gst_network_interface_active, IFACE,
+#                                                                   \&gst_network_active_interfaces_get ],
+#           [ "enabled",            \&gst_parse_trivial, 0 ]
+           # wvdial settings
+           [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Phone" ]],
+           [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Auto DNS" ]],
+           [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Username" ]],
+           [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Password" ]],
+           [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Modem" ]],
+           [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Baud" ]],
+           [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Check Def Route" ]],
+           [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Auto Reconnect" ]],
+           [ "dial_command",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Dial Command" ]],
+           [ "external_line",      \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Dial Prefix" ]],
+          ]
     },
 
     "vine-3.0" =>
@@ -4401,14 +4434,15 @@ sub gst_network_get_interface_parse_table
         IFACE => "#iface#",
         PAP   => "/etc/ppp/pap-secrets",
         CHAP  => "/etc/ppp/chap-secrets",
-        PUMP  => "/etc/pump.conf"
+        PUMP  => "/etc/pump.conf",
+        WVDIAL => "/etc/wvdial.conf"
       },
 	    table =>
       [
        [ "bootproto",          \&gst_network_rh62_parse_bootproto, IFCFG, BOOTPROTO ],
        [ "auto",               \&gst_parse_sh_bool, IFCFG, ONBOOT ],
-       [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
-       [ "name",               \&gst_parse_sh,      IFCFG, NAME ],
+#       [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
+#       [ "name",               \&gst_parse_sh,      IFCFG, NAME ],
        [ "dev",                \&gst_parse_sh,      IFCFG, DEVICE ],
        [ "address",            \&gst_parse_sh,      IFCFG, IPADDR ],
        [ "netmask",            \&gst_parse_sh,      IFCFG, NETMASK ],
@@ -4417,28 +4451,39 @@ sub gst_network_get_interface_parse_table
        [ "gateway",            \&gst_parse_sh,      IFCFG, GATEWAY ],
        [ "essid",              \&gst_parse_sh,      IFCFG, ESSID ],
        [ "key",                \&gst_parse_sh,      IFCFG, KEY   ],
-       [ "update_dns",         \&gst_network_pump_get_nodns, PUMP, "%dev%", "%bootproto%" ],
-       [ "update_dns",         \&gst_parse_sh_bool, IFCFG, PEERDNS ],
-       [ "dns1",               \&gst_parse_sh,      IFCFG, DNS1 ],
-       [ "dns2",               \&gst_parse_sh,      IFCFG, DNS2 ],
-       [ "mtu",                \&gst_parse_sh,      IFCFG, MTU ],
-       [ "mru",                \&gst_parse_sh,      IFCFG, MRU ],
        [ "remote_address",     \&gst_parse_sh,      IFCFG, REMIP ],
-       [ "login",              \&gst_parse_sh,      IFCFG, PAPNAME ],
-       [ "password",           \&gst_network_get_pap_passwd, PAP,  "%login%" ],
-       [ "password",           \&gst_network_get_pap_passwd, CHAP, "%login%" ],
-       [ "serial_port",        \&gst_parse_sh,      IFCFG, MODEMPORT ],
-       [ "serial_speed",       \&gst_parse_sh,      IFCFG, LINESPEED ],
-       [ "ppp_options",        \&gst_parse_sh,      IFCFG, PPPOPTIONS ],
-       [ "section",            \&gst_parse_sh,      IFCFG, WVDIALSECT ],
-       [ "set_default_gw",     \&gst_parse_sh_bool, IFCFG, DEFROUTE ],
-       [ "debug",              \&gst_parse_sh_bool, IFCFG, DEBUG ],
-       [ "persist",            \&gst_parse_sh_bool, IFCFG, PERSIST ],
-       [ "serial_escapechars", \&gst_parse_sh_bool, IFCFG, ESCAPECHARS ],
-       [ "serial_hwctl",       \&gst_parse_sh_bool, IFCFG, HARDFLOWCTL ],
-       [ "phone_number",       \&gst_parse_chat,    CHAT, "^atd[^0-9]*([0-9, -]+)" ],
-       [ "enabled",            \&gst_network_interface_active, IFACE, \&gst_network_active_interfaces_get ],
-       [ "enabled",            \&gst_parse_trivial, 0 ]
+#       [ "update_dns",         \&gst_network_pump_get_nodns, PUMP, "%dev%", "%bootproto%" ],
+#       [ "dns1",               \&gst_parse_sh,      IFCFG, DNS1 ],
+#       [ "dns2",               \&gst_parse_sh,      IFCFG, DNS2 ],
+       [ "section",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, WVDIALSECT ]],
+       [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, PEERDNS ]],
+       [ "mtu",                \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MTU ]],
+       [ "mru",                \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MRU ]],
+       [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, PAPNAME ]],
+       [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_network_get_pap_passwd, PAP,  "%login%" ]],
+       [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_network_get_pap_passwd, CHAP, "%login%" ]],
+       [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MODEMPORT ]],
+       [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, LINESPEED ]],
+#       [ "ppp_options",        \&gst_parse_sh,      IFCFG, PPPOPTIONS ],
+       [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, DEFROUTE ]],
+#       [ "debug",              \&gst_parse_sh_bool, IFCFG, DEBUG ],
+       [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, PERSIST ]],
+       [ "serial_escapechars", \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, ESCAPECHARS ]],
+       [ "serial_hwctl",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, HARDFLOWCTL ]],
+       [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_chat,    CHAT, "^atd[^0-9]*([0-9, -]+)" ]],
+#       [ "enabled",            \&gst_network_interface_active, IFACE, \&gst_network_active_interfaces_get ],
+#       [ "enabled",            \&gst_parse_trivial, 0 ]
+       # wvdial settings
+       [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Phone" ]],
+       [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Auto DNS" ]],
+       [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Username" ]],
+       [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Password" ]],
+       [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Modem" ]],
+       [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Baud" ]],
+       [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Check Def Route" ]],
+       [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Auto Reconnect" ]],
+       [ "dial_command",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Dial Command" ]],
+       [ "external_line",      \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Dial Prefix" ]],
       ]
     },
 
@@ -4452,14 +4497,15 @@ sub gst_network_get_interface_parse_table
         IFACE => "#iface#",
         PAP   => "/etc/ppp/pap-secrets",
         CHAP  => "/etc/ppp/chap-secrets",
-        PUMP  => "/etc/pump.conf"
+        PUMP  => "/etc/pump.conf",
+        WVDIAL => "/etc/wvdial.conf"
       },
 	    table =>
           [
            [ "bootproto",          \&gst_network_rh62_parse_bootproto, IFCFG, BOOTPROTO ],
            [ "auto",               \&gst_parse_sh_bool, IFCFG, ONBOOT ],
-           [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
-           [ "name",               \&gst_parse_sh,      IFCFG, NAME ],
+#           [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
+#           [ "name",               \&gst_parse_sh,      IFCFG, NAME ],
            [ "dev",                \&gst_parse_sh,      IFCFG, DEVICE ],
            [ "address",            \&gst_parse_sh,      IFCFG, IPADDR ],
            [ "netmask",            \&gst_parse_sh,      IFCFG, NETMASK ],
@@ -4468,30 +4514,41 @@ sub gst_network_get_interface_parse_table
            [ "gateway",            \&gst_parse_sh,      IFCFG, GATEWAY ],
            [ "essid",              \&gst_parse_sh,      IFCFG, WIRELESS_ESSID ],
            [ "key",                \&gst_parse_sh,      IFCFG, WIRELESS_KEY ],
-           [ "update_dns",         \&gst_network_pump_get_nodns, PUMP, "%dev%", "%bootproto%" ],
-           [ "update_dns",         \&gst_parse_sh_bool, IFCFG, PEERDNS ],
-           [ "dns1",               \&gst_parse_sh,      IFCFG, DNS1 ],
-           [ "dns2",               \&gst_parse_sh,      IFCFG, DNS2 ],
-           [ "mtu",                \&gst_parse_sh,      IFCFG, MTU ],
-           [ "mru",                \&gst_parse_sh,      IFCFG, MRU ],
            [ "remote_address",     \&gst_parse_sh,      IFCFG, REMIP ],
-           [ "login",              \&gst_parse_sh,      IFCFG, PAPNAME ],
-           [ "password",           \&gst_network_get_pap_passwd, PAP,  "%login%" ],
-           [ "password",           \&gst_network_get_pap_passwd, CHAP, "%login%" ],
-           [ "serial_port",        \&gst_parse_sh,      IFCFG, MODEMPORT ],
-           [ "serial_speed",       \&gst_parse_sh,      IFCFG, LINESPEED ],
-           [ "ppp_options",        \&gst_parse_sh,      IFCFG, PPPOPTIONS ],
-           [ "section",            \&gst_parse_sh,      IFCFG, WVDIALSECT ],
-           [ "set_default_gw",     \&gst_parse_sh_bool, IFCFG, DEFROUTE ],
-           [ "debug",              \&gst_parse_sh_bool, IFCFG, DEBUG ],
-           [ "persist",            \&gst_parse_sh_bool, IFCFG, PERSIST ],
-           [ "serial_escapechars", \&gst_parse_sh_bool, IFCFG, ESCAPECHARS ],
-           [ "serial_hwctl",       \&gst_parse_sh_bool, IFCFG, HARDFLOWCTL ],
-           [ "phone_number",       \&gst_parse_chat,    CHAT, "^atd[^0-9]*([0-9, -]+)" ],
-           [ "enabled",            \&gst_network_interface_active, IFACE,
-                                                                   \&gst_network_active_interfaces_get ],
-           [ "enabled",            \&gst_parse_trivial, 0 ]
-           ]
+#           [ "update_dns",         \&gst_network_pump_get_nodns, PUMP, "%dev%", "%bootproto%" ],
+#           [ "dns1",               \&gst_parse_sh,      IFCFG, DNS1 ],
+#           [ "dns2",               \&gst_parse_sh,      IFCFG, DNS2 ],
+           [ "section",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, WVDIALSECT ]],
+           [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, PEERDNS ]],
+           [ "mtu",                \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MTU ]],
+           [ "mru",                \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MRU ]],
+           [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, PAPNAME ]],
+           [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_network_get_pap_passwd, PAP,  "%login%" ]],
+           [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_network_get_pap_passwd, CHAP, "%login%" ]],
+           [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MODEMPORT ]],
+           [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, LINESPEED ]],
+#           [ "ppp_options",        \&gst_parse_sh,      IFCFG, PPPOPTIONS ],
+           [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, DEFROUTE ]],
+#           [ "debug",              \&gst_parse_sh_bool, IFCFG, DEBUG ],
+           [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, PERSIST ]],
+           [ "serial_escapechars", \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, ESCAPECHARS ]],
+           [ "serial_hwctl",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, HARDFLOWCTL ]],
+           [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_chat,    CHAT, "^atd[^0-9]*([0-9, -]+)" ]],
+#           [ "enabled",            \&gst_network_interface_active, IFACE,
+#                                                                   \&gst_network_active_interfaces_get ],
+#           [ "enabled",            \&gst_parse_trivial, 0 ]
+           # wvdial settings
+           [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Phone" ]],
+           [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Auto DNS" ]],
+           [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Username" ]],
+           [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Password" ]],
+           [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Modem" ]],
+           [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Baud" ]],
+           [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Check Def Route" ]],
+           [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Auto Reconnect" ]],
+           [ "dial_command",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Dial Command" ]],
+           [ "external_line",      \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Dial Prefix" ]],
+          ]
     },
 
     "conectiva-9" =>
@@ -4504,14 +4561,15 @@ sub gst_network_get_interface_parse_table
         IFACE => "#iface#",
         PAP   => "/etc/ppp/pap-secrets",
         CHAP  => "/etc/ppp/chap-secrets",
-        PUMP  => "/etc/pump.conf"
+        PUMP  => "/etc/pump.conf",
+        WVDIAL => "/etc/wvdial.conf"
       },
       table =>
       [
        [ "bootproto",          \&gst_network_rh62_parse_bootproto, IFCFG, BOOTPROTO ],
        [ "auto",               \&gst_parse_sh_bool, IFCFG, ONBOOT ],
-       [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
-       [ "name",               \&gst_parse_sh,      IFCFG, NAME ],
+#       [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
+#       [ "name",               \&gst_parse_sh,      IFCFG, NAME ],
        [ "dev",                \&gst_parse_sh,      IFCFG, DEVICE ],
        [ "address",            \&gst_parse_sh,      IFCFG, IPADDR ],
        [ "netmask",            \&gst_parse_sh,      IFCFG, NETMASK ],
@@ -4520,29 +4578,40 @@ sub gst_network_get_interface_parse_table
        [ "gateway",            \&gst_parse_sh,      IFCFG, GATEWAY ],
        [ "essid",              \&gst_parse_sh,      IFCFG, WIRELESS_ESSID ],
        [ "key",                \&gst_parse_sh,      IFCFG, WIRELESS_KEY ],
-       [ "update_dns",         \&gst_network_pump_get_nodns, PUMP, "%dev%", "%bootproto%" ],
-       [ "update_dns",         \&gst_parse_sh_bool, IFCFG, PEERDNS ],
-       [ "dns1",               \&gst_parse_sh,      IFCFG, DNS1 ],
-       [ "dns2",               \&gst_parse_sh,      IFCFG, DNS2 ],
-       [ "mtu",                \&gst_parse_sh,      IFCFG, MTU ],
-       [ "mru",                \&gst_parse_sh,      IFCFG, MRU ],
        [ "remote_address",     \&gst_parse_sh,      IFCFG, REMIP ],
-       [ "login",              \&gst_parse_sh,      IFCFG, PAPNAME ],
-       [ "password",           \&gst_network_get_pap_passwd, PAP,  "%login%" ],
-       [ "password",           \&gst_network_get_pap_passwd, CHAP, "%login%" ],
-       [ "serial_port",        \&gst_parse_sh,      IFCFG, MODEMPORT ],
-       [ "serial_speed",       \&gst_parse_sh,      IFCFG, LINESPEED ],
-       [ "ppp_options",        \&gst_parse_sh,      IFCFG, PPPOPTIONS ],
-       [ "section",            \&gst_parse_sh,      IFCFG, WVDIALSECT ],
-       [ "set_default_gw",     \&gst_parse_sh_bool, IFCFG, DEFROUTE ],
-       [ "debug",              \&gst_parse_sh_bool, IFCFG, DEBUG ],
-       [ "persist",            \&gst_parse_sh_bool, IFCFG, PERSIST ],
-       [ "serial_escapechars", \&gst_parse_sh_bool, IFCFG, ESCAPECHARS ],
-       [ "serial_hwctl",       \&gst_parse_sh_bool, IFCFG, HARDFLOWCTL ],
-       [ "phone_number",       \&gst_parse_chat,    CHAT, "^atd[^0-9]*([0-9, -]+)" ],
-       [ "enabled",            \&gst_network_interface_active, IFACE,
-                                                               \&gst_network_active_interfaces_get ],
-       [ "enabled",            \&gst_parse_trivial, 0 ]
+#       [ "update_dns",         \&gst_network_pump_get_nodns, PUMP, "%dev%", "%bootproto%" ],
+#       [ "dns1",               \&gst_parse_sh,      IFCFG, DNS1 ],
+#       [ "dns2",               \&gst_parse_sh,      IFCFG, DNS2 ],
+       [ "section",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, WVDIALSECT ]],
+       [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, PEERDNS ]],
+       [ "mtu",                \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MTU ]],
+       [ "mru",                \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MRU ]],
+       [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, PAPNAME ]],
+       [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_network_get_pap_passwd, PAP,  "%login%" ]],
+       [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_network_get_pap_passwd, CHAP, "%login%" ]],
+       [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, MODEMPORT ]],
+       [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, LINESPEED ]],
+       [ "ppp_options",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh,      IFCFG, PPPOPTIONS ]],
+       [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, DEFROUTE ]],
+#       [ "debug",              \&gst_parse_sh_bool, IFCFG, DEBUG ],
+       [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, PERSIST ]],
+       [ "serial_escapechars", \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, ESCAPECHARS ]],
+       [ "serial_hwctl",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_sh_bool, IFCFG, HARDFLOWCTL ]],
+       [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_chat,    CHAT, "^atd[^0-9]*([0-9, -]+)" ]],
+#       [ "enabled",            \&gst_network_interface_active, IFACE,
+#                                                               \&gst_network_active_interfaces_get ],
+#       [ "enabled",            \&gst_parse_trivial, 0 ]
+       # wvdial settings
+       [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Phone" ]],
+       [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Auto DNS" ]],
+       [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Username" ]],
+       [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Password" ]],
+       [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Modem" ]],
+       [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Baud" ]],
+       [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Check Def Route" ]],
+       [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Auto Reconnect" ]],
+       [ "dial_command",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Dial Command" ]],
+       [ "external_line",      \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_parse_ini,     WVDIAL, "Dialer %section%", "Dial Prefix" ]],
       ]
     },
 
@@ -4557,46 +4626,49 @@ sub gst_network_get_interface_parse_table
         PPP_OPTIONS => "/etc/ppp/peers/%section%",
         PAP         => "/etc/ppp/pap-secrets",
         CHAP        => "/etc/ppp/chap-secrets",
-        PUMP        => "/etc/pump.conf"
+        PUMP        => "/etc/pump.conf",
+        WVDIAL      => "/etc/wvdial.conf"
       },
 	    table =>
           [
-           [ "user",               \&gst_parse_trivial,                  0 ], # not supported.
+#           [ "user",               \&gst_parse_trivial,                  0 ], # not supported.
            [ "dev",                \&gst_parse_trivial,                  IFACE ],
            [ "bootproto",          \&gst_network_deb22_parse_bootproto,  [INTERFACES, IFACE]],
            [ "auto",               \&gst_parse_interfaces_option_kw_not, [INTERFACES, IFACE], "noauto" ],
-           [ "name",               \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "name" ],
+#           [ "name",               \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "name" ],
            [ "address",            \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "address" ],
            [ "netmask",            \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "netmask" ],
            [ "broadcast",          \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "broadcast" ],
            [ "network",            \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "network" ],
            [ "gateway",            \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "gateway" ],
-           [ "section",            \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "provider" ],
-           [ "update_dns",         \&gst_network_pump_get_nodns,         PUMP, "%dev%", "%bootproto%" ],
-           [ "update_dns",         \&gst_parse_kw,                       PPP_OPTIONS, "usepeerdns" ],
-#           [ "dns1",               \&gst_parse_trivial,                  "" ], # not supported.
-#           [ "dns2",               \&gst_parse_trivial,                  "" ], # not supported.
-           [ "noauth",             \&gst_parse_kw,                       PPP_OPTIONS, "noauth" ],
-           [ "mtu",                \&gst_parse_split_first_str,          PPP_OPTIONS, "mtu", "[ \t]+" ],
-           [ "mru",                \&gst_parse_split_first_str,          PPP_OPTIONS, "mru", "[ \t]+" ],
+           [ "essid",              \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "wireless_essid" ],
+           [ "key",                \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "wireless_key" ],
            [ "remote_address",     \&gst_network_debian_parse_remote_address, [INTERFACES, IFACE]],
-           [ "login",              \&gst_parse_split_first_str,          PPP_OPTIONS, "user", "[ \t]+" ],
-           [ "password",           \&gst_network_get_pap_passwd,         PAP, "%login%" ],
-           [ "password",           \&gst_network_get_pap_passwd,         CHAP, "%login%" ],
-           [ "serial_port",        \&gst_network_get_ppp_options_re,     PPP_OPTIONS, "^(/dev/[^ \t]+)" ],
-           [ "serial_speed",       \&gst_network_get_ppp_options_re,     PPP_OPTIONS, "^([0-9]+)" ],
-           [ "ppp_options",        \&gst_network_get_ppp_options_unsup,  PPP_OPTIONS ],
-           [ "set_default_gw",     \&gst_parse_kw,                       PPP_OPTIONS, "defaultroute" ],
-           [ "debug",              \&gst_parse_kw,                       PPP_OPTIONS, "debug" ],
-           [ "persist",            \&gst_parse_kw,                       PPP_OPTIONS, "persist" ],
-           [ "serial_escapechars", \&gst_parse_split_first_str,          PPP_OPTIONS, "escape", "[ \t]+" ],
-           [ "serial_hwctl",       \&gst_parse_kw,                       PPP_OPTIONS, "crtscts" ],
-           [ "phone_number",       \&gst_parse_chat,                     CHAT, "^atd[^0-9]*([0-9, -]+)" ],
-           [ "enabled",            \&gst_network_interface_active,       IFACE,
-                                                                       \&gst_network_active_interfaces_get ],
-           [ "enabled",            \&gst_parse_trivial,                  0 ]
+           [ "section",            \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "provider" ],
+           [ "update_dns",         \&gst_network_check_iface,            [IFACE, "ppp", \&gst_parse_kw, PPP_OPTIONS, "usepeerdns" ]],
+           [ "noauth",             \&gst_network_check_iface,            [IFACE, "ppp", \&gst_parse_kw, PPP_OPTIONS, "noauth" ]],
+           [ "mtu",                \&gst_network_check_iface,            [IFACE, "ppp", \&gst_parse_split_first_str, PPP_OPTIONS, "mtu", "[ \t]+" ]],
+           [ "mru",                \&gst_network_check_iface,            [IFACE, "ppp", \&gst_parse_split_first_str, PPP_OPTIONS, "mru", "[ \t]+" ]],
+           [ "serial_port",        \&gst_network_check_iface,            [IFACE, "ppp", \&gst_network_get_ppp_options_re, PPP_OPTIONS, "^(/dev/[^ \t]+)" ]],
+           [ "serial_speed",       \&gst_network_check_iface,            [IFACE, "ppp", \&gst_network_get_ppp_options_re, PPP_OPTIONS, "^([0-9]+)" ]],
+           [ "login",              \&gst_network_check_iface,            [IFACE, "ppp", \&gst_network_get_ppp_options_re, PPP_OPTIONS, "^user \"(.*)\"" ]],
+           [ "password",           \&gst_network_check_iface,            [IFACE, "ppp", \&gst_network_get_pap_passwd, PAP, "%login%" ]],
+           [ "password",           \&gst_network_check_iface,            [IFACE, "ppp", \&gst_network_get_pap_passwd, CHAP, "%login%" ]],
+           [ "ppp_options",        \&gst_network_check_iface,            [IFACE, "ppp", \&gst_network_get_ppp_options_unsup, PPP_OPTIONS ]],
+           [ "set_default_gw",     \&gst_network_check_iface,            [IFACE, "ppp", \&gst_parse_kw, PPP_OPTIONS, "defaultroute" ]],
+           [ "debug",              \&gst_network_check_iface,            [IFACE, "ppp", \&gst_parse_kw, PPP_OPTIONS, "debug" ]],
+           [ "persist",            \&gst_network_check_iface,            [IFACE, "ppp", \&gst_parse_kw, PPP_OPTIONS, "persist" ]],
+           [ "serial_escapechars", \&gst_network_check_iface,            [IFACE, "ppp", \&gst_parse_split_first_str, PPP_OPTIONS, "escape", "[ \t]+" ]],
+           [ "serial_hwctl",       \&gst_network_check_iface,            [IFACE, "ppp", \&gst_parse_kw, PPP_OPTIONS, "crtscts" ]],
+           [ "external_line",      \&gst_network_check_iface,            [IFACE, "ppp", \&gst_parse_chat, CHAT, "atd[^0-9]([0-9*#]*)[wW]" ]],
+           [ "phone_number",       \&gst_network_check_iface,            [IFACE, "ppp", \&gst_parse_chat, CHAT, "atd.*[ptwW]([0-9, -]+)" ]],
+           [ "dial_command",       \&gst_network_check_iface,            [IFACE, "ppp", \&gst_parse_chat, CHAT, "(atd[tp])[0-9, -w]+" ]],
+           [ "volume",             \&gst_network_check_iface,            [IFACE, "ppp", \&gst_network_get_modem_volume, CHAT ]],
+#           [ "enabled",            \&gst_network_interface_active,       IFACE,
+#                                                                       \&gst_network_active_interfaces_get ],
+#           [ "enabled",            \&gst_parse_trivial,                  0 ]
            ]
-             },
+    },
 
     # Basicly the same as debian-2.2, but the "auto" option changes.
 	  "debian-3.0" =>
@@ -4691,7 +4763,7 @@ sub gst_network_get_interface_parse_table
       table =>
       [
        [ "dev",                \&gst_network_suse9_get_dev_name,      IFACE ],
-       [ "enabled",            \&gst_network_interface_active,        "%dev%", \&gst_network_active_interfaces_get ],
+#       [ "enabled",            \&gst_network_interface_active,        "%dev%", \&gst_network_active_interfaces_get ],
        [ "auto",               \&gst_network_suse90_get_auto,         IFCFG,   STARTMODE      ],
        [ "bootproto",          \&gst_network_parse_bootproto,         IFCFG,   BOOTPROTO      ],
        [ "address",            \&gst_parse_sh,                        IFCFG,   IPADDR         ],
@@ -4706,20 +4778,20 @@ sub gst_network_get_interface_parse_table
        [ "serial_speed",       \&gst_parse_sh,                        IFCFG,   SPEED          ],
        [ "mtu",                \&gst_parse_sh,                        IFCFG,   MTU            ],
        [ "mru",                \&gst_parse_sh,                        IFCFG,   MRU            ],
-       [ "ppp_options",        \&gst_parse_sh,                        IFCFG,   PPPD_OPTIONS   ],
+#       [ "ppp_options",        \&gst_parse_sh,                        IFCFG,   PPPD_OPTIONS   ],
        [ "dial_command",       \&gst_parse_sh,                        IFCFG,   DIALCOMMAND    ],
        [ "external_line",      \&gst_parse_sh,                        IFCFG,   DIALPREFIX     ],
-       [ "provider",           \&gst_parse_sh,                        IFCFG,   PROVIDER       ],
+       [ "section",            \&gst_parse_sh,                        IFCFG,   PROVIDER       ],
        [ "volume",             \&gst_parse_sh_re,                     IFCFG,   INIT8, "AT.*[ml]([0-3])" ],
-       [ "login",              \&gst_network_suse90_parse_provider_file,       "%provider%", USERNAME     ],
-       [ "password",           \&gst_network_suse90_parse_provider_file,       "%provider%", PASSWORD     ],
-       [ "phone_number",       \&gst_network_suse90_parse_provider_file,       "%provider%", PHONE        ],
-       [ "dns1",               \&gst_network_suse90_parse_provider_file,       "%provider%", DNS1         ],
-       [ "dns2",               \&gst_network_suse90_parse_provider_file,       "%provider%", DNS2         ],
-       [ "update_dns",         \&gst_network_suse90_parse_provider_file_bool,  "%provider%", MODIFYDNS    ],
-       [ "persist",            \&gst_network_suse90_parse_provider_file_bool,  "%provider%", PERSIST      ],
-       [ "stupid",             \&gst_network_suse90_parse_provider_file_bool,  "%provider%", STUPIDMODE   ],
-       [ "set_default_gw",     \&gst_network_suse90_parse_provider_file_bool,  "%provider%", DEFAULTROUTE ],
+       [ "login",              \&gst_network_suse90_parse_provider_file,       "%section%", USERNAME     ],
+       [ "password",           \&gst_network_suse90_parse_provider_file,       "%section%", PASSWORD     ],
+       [ "phone_number",       \&gst_network_suse90_parse_provider_file,       "%section%", PHONE        ],
+       [ "dns1",               \&gst_network_suse90_parse_provider_file,       "%section%", DNS1         ],
+       [ "dns2",               \&gst_network_suse90_parse_provider_file,       "%section%", DNS2         ],
+       [ "update_dns",         \&gst_network_suse90_parse_provider_file_bool,  "%section%", MODIFYDNS    ],
+       [ "persist",            \&gst_network_suse90_parse_provider_file_bool,  "%section%", PERSIST      ],
+       [ "stupid",             \&gst_network_suse90_parse_provider_file_bool,  "%section%", STUPIDMODE   ],
+       [ "set_default_gw",     \&gst_network_suse90_parse_provider_file_bool,  "%section%", DEFAULTROUTE ],
       ]
     },
 
@@ -4739,38 +4811,38 @@ sub gst_network_get_interface_parse_table
           [
            [ "bootproto",          \&gst_network_pld10_parse_bootproto, IFCFG, BOOTPROTO ],
            [ "auto",               \&gst_parse_sh_bool, IFCFG, ONBOOT ],
-           [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
-           [ "name",               \&gst_parse_sh,      IFCFG, DEVICE ],
+#           [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
+#           [ "name",               \&gst_parse_sh,      IFCFG, DEVICE ],
            [ "dev",                \&gst_parse_sh,      IFCFG, DEVICE ],
            [ "address",            \&gst_network_pld10_get_ipaddr, IFCFG, IPADDR, "address" ],
            [ "netmask",            \&gst_network_pld10_get_ipaddr, IFCFG, IPADDR, "netmask" ],
 #           [ "broadcast",          \&gst_parse_sh,      IFCFG, BROADCAST ],
 #           [ "network",            \&gst_parse_sh,      IFCFG, NETWORK ],
            [ "gateway",            \&gst_parse_sh,      IFCFG, GATEWAY ],
+           [ "remote_address",     \&gst_parse_sh,      IFCFG, REMIP ],
 #           [ "update_dns",         \&gst_network_pump_get_nodns, PUMP, "%dev%", "%bootproto%" ],
-           [ "update_dns",         \&gst_parse_sh_bool, IFCFG, PEERDNS ],
 #           [ "dns1",               \&gst_parse_sh,      IFCFG, DNS1 ],
 #           [ "dns2",               \&gst_parse_sh,      IFCFG, DNS2 ],
+           [ "update_dns",         \&gst_parse_sh_bool, IFCFG, PEERDNS ],
            [ "mtu",                \&gst_parse_sh,      IFCFG, MTU ],
            [ "mru",                \&gst_parse_sh,      IFCFG, MRU ],
-           [ "remote_address",     \&gst_parse_sh,      IFCFG, REMIP ],
            [ "login",              \&gst_parse_sh,      IFCFG, PAPNAME ],
            [ "password",           \&gst_network_get_pap_passwd, PAP,  "%login%" ],
            [ "password",           \&gst_network_get_pap_passwd, CHAP, "%login%" ],
            [ "serial_port",        \&gst_parse_sh,      IFCFG, MODEMPORT ],
            [ "serial_speed",       \&gst_parse_sh,      IFCFG, LINESPEED ],
-           [ "ppp_options",        \&gst_parse_sh,      IFCFG, PPPOPTIONS ],
+#           [ "ppp_options",        \&gst_parse_sh,      IFCFG, PPPOPTIONS ],
 #           [ "section",            \&gst_parse_sh,      IFCFG, WVDIALSECT ],
            [ "set_default_gw",     \&gst_parse_sh_bool, IFCFG, DEFROUTE ],
-           [ "debug",              \&gst_parse_sh_bool, IFCFG, DEBUG ],
+#           [ "debug",              \&gst_parse_sh_bool, IFCFG, DEBUG ],
            [ "persist",            \&gst_parse_sh_bool, IFCFG, PERSIST ],
            [ "serial_escapechars", \&gst_parse_sh_bool, IFCFG, ESCAPECHARS ],
            [ "serial_hwctl",       \&gst_parse_sh_bool, IFCFG, HARDFLOWCTL ],
            [ "phone_number",       \&gst_parse_chat,    CHAT, "^atd[^0-9]*([0-9, -]+)" ],
-           [ "enabled",            \&gst_network_interface_active, IFACE, \&gst_network_active_interfaces_get ],
-           [ "enabled",            \&gst_parse_trivial, 0 ]
-           ]
-             },
+#           [ "enabled",            \&gst_network_interface_active, IFACE, \&gst_network_active_interfaces_get ],
+#           [ "enabled",            \&gst_parse_trivial, 0 ]
+          ]
+    },
     "slackware-9.1.0" =>
 	  {
       ifaces_get => \&gst_network_slackware91_ifaces_get_existing,
@@ -5384,7 +5456,7 @@ sub gst_network_get_interface_replace_table
         [ "bootproto",          \&gst_network_rh62_replace_bootproto, IFCFG, BOOTPROTO ],
         [ "auto",               \&gst_replace_sh_bool, IFCFG, ONBOOT ],
         [ "user",               \&gst_replace_sh_bool, IFCFG, USERCTL ],
-        [ "name",               \&gst_replace_sh,      IFCFG, NAME ],
+        [ "dev",                \&gst_replace_sh,      IFCFG, NAME ],
         [ "dev",                \&gst_replace_sh,      IFCFG, DEVICE ],
         [ "address",            \&gst_replace_sh,      IFCFG, IPADDR ],
         [ "netmask",            \&gst_replace_sh,      IFCFG, NETMASK ],
@@ -5408,7 +5480,18 @@ sub gst_network_get_interface_replace_table
         [ "persist",            \&gst_replace_sh_bool, IFCFG, PERSIST ],
         [ "serial_escapechars", \&gst_replace_sh_bool, IFCFG, ESCAPECHARS ],
         [ "serial_hwctl",       \&gst_replace_sh_bool, IFCFG, HARDFLOWCTL ],
-        [ "phone_number",       \&gst_replace_chat,    CHAT,  "^atd[^0-9]*([0-9, -]+)" ]
+        [ "phone_number",       \&gst_replace_chat,    CHAT,  "^atd[^0-9]*([0-9, -]+)" ],
+        # wvdial settings
+        [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Phone" ]],
+        [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Auto DNS" ]],
+        [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Username" ]],
+        [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Password" ]],
+        [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Modem" ]],
+        [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Baud" ]],
+        [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Check Def Route" ]],
+        [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Auto Reconnect" ]],
+        [ "dial_command",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Dial Command" ]],
+        [ "external_line",      \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Dial Prefix" ]],
       ]
     },
 
@@ -5458,7 +5541,18 @@ sub gst_network_get_interface_replace_table
         [ "persist",            \&gst_replace_sh_bool, IFCFG, PERSIST ],
         [ "serial_escapechars", \&gst_replace_sh_bool, IFCFG, ESCAPECHARS ],
         [ "serial_hwctl",       \&gst_replace_sh_bool, IFCFG, HARDFLOWCTL ],
-        [ "phone_number",       \&gst_replace_chat,    CHAT,  "^atd[^0-9]*([0-9, -]+)" ]
+        [ "phone_number",       \&gst_replace_chat,    CHAT,  "^atd[^0-9]*([0-9, -]+)" ],
+        # wvdial settings
+        [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Phone" ]],
+        [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Auto DNS" ]],
+        [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Username" ]],
+        [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Password" ]],
+        [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Modem" ]],
+        [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Baud" ]],
+        [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Check Def Route" ]],
+        [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Auto Reconnect" ]],
+        [ "dial_command",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Dial Command" ]],
+        [ "external_line",      \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Dial Prefix" ]],
       ]
     },
    
@@ -5508,7 +5602,18 @@ sub gst_network_get_interface_replace_table
         [ "persist",            \&gst_replace_sh_bool, IFCFG, PERSIST ],
         [ "serial_escapechars", \&gst_replace_sh_bool, IFCFG, ESCAPECHARS ],
         [ "serial_hwctl",       \&gst_replace_sh_bool, IFCFG, HARDFLOWCTL ],
-        [ "phone_number",       \&gst_replace_chat,    CHAT,  "^atd[^0-9]*([0-9, -]+)" ]
+        [ "phone_number",       \&gst_replace_chat,    CHAT,  "^atd[^0-9]*([0-9, -]+)" ],
+        # wvdial settings
+        [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Phone" ]],
+        [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Auto DNS" ]],
+        [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Username" ]],
+        [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Password" ]],
+        [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Modem" ]],
+        [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Baud" ]],
+        [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Check Def Route" ]],
+        [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Auto Reconnect" ]],
+        [ "dial_command",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Dial Command" ]],
+        [ "external_line",      \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Dial Prefix" ]],
       ]
     },
    
@@ -5556,7 +5661,18 @@ sub gst_network_get_interface_replace_table
         [ "persist",            \&gst_replace_sh_bool, IFCFG, PERSIST ],
         [ "serial_escapechars", \&gst_replace_sh_bool, IFCFG, ESCAPECHARS ],
         [ "serial_hwctl",       \&gst_replace_sh_bool, IFCFG, HARDFLOWCTL ],
-        [ "phone_number",       \&gst_replace_chat,    CHAT,  "^atd[^0-9]*([0-9, -]+)" ]
+        [ "phone_number",       \&gst_replace_chat,    CHAT,  "^atd[^0-9]*([0-9, -]+)" ],
+        # wvdial settings
+        [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Phone" ]],
+        [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Auto DNS" ]],
+        [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Username" ]],
+        [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Password" ]],
+        [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Modem" ]],
+        [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Baud" ]],
+        [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Check Def Route" ]],
+        [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Auto Reconnect" ]],
+        [ "dial_command",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Dial Command" ]],
+        [ "external_line",      \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Dial Prefix" ]],
       ]
     },
 
@@ -5604,7 +5720,18 @@ sub gst_network_get_interface_replace_table
         [ "persist",            \&gst_replace_sh_bool, IFCFG, PERSIST ],
         [ "serial_escapechars", \&gst_replace_sh_bool, IFCFG, ESCAPECHARS ],
         [ "serial_hwctl",       \&gst_replace_sh_bool, IFCFG, HARDFLOWCTL ],
-        [ "phone_number",       \&gst_replace_chat,    CHAT,  "^atd[^0-9]*([0-9, -]+)" ]
+        [ "phone_number",       \&gst_replace_chat,    CHAT,  "^atd[^0-9]*([0-9, -]+)" ],
+        # wvdial settings
+        [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Phone" ]],
+        [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Auto DNS" ]],
+        [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Username" ]],
+        [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Password" ]],
+        [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Modem" ]],
+        [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Baud" ]],
+        [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Check Def Route" ]],
+        [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Auto Reconnect" ]],
+        [ "dial_command",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Dial Command" ]],
+        [ "external_line",      \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Dial Prefix" ]],
       ]
     },
 
@@ -5652,7 +5779,18 @@ sub gst_network_get_interface_replace_table
       [ "persist",            \&gst_replace_sh_bool, IFCFG, PERSIST ],
       [ "serial_escapechars", \&gst_replace_sh_bool, IFCFG, ESCAPECHARS ],
       [ "serial_hwctl",       \&gst_replace_sh_bool, IFCFG, HARDFLOWCTL ],
-      [ "phone_number",       \&gst_replace_chat,    CHAT,  "^atd[^0-9]*([0-9, -]+)" ]
+      [ "phone_number",       \&gst_replace_chat,    CHAT,  "^atd[^0-9]*([0-9, -]+)" ],
+      # wvdial settings
+      [ "phone_number",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Phone" ]],
+      [ "update_dns",         \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Auto DNS" ]],
+      [ "login",              \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Username" ]],
+      [ "password",           \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Password" ]],
+      [ "serial_port",        \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Modem" ]],
+      [ "serial_speed",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Baud" ]],
+      [ "set_default_gw",     \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Check Def Route" ]],
+      [ "persist",            \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Auto Reconnect" ]],
+      [ "dial_command",       \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Dial Command" ]],
+      [ "external_line",      \&gst_network_check_iface,  ["%dev%", "ppp", \&gst_replace_ini, WVDIAL, "Dialer %section%", "Dial Prefix" ]],
      ]
    },