From e56387cd4d995657f4200fb06a5cf798e23d9ec4 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 28 Jan 2004 11:30:15 +0000 Subject: simplify code through format callback (thus enabling to centralize translatable strings, thus reducing error risk) --- perl-install/network/modem.pm | 9 +++-- perl-install/network/netconnect.pm | 74 +++++++++++++++++++------------------- 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm index ef916eb6a..dbeefe318 100644 --- a/perl-install/network/modem.pm +++ b/perl-install/network/modem.pm @@ -18,8 +18,7 @@ sub ppp_configure { any::devfssymlinkf($modem, 'modem') if $modem->{device} ne "/dev/modem"; - my %toreplace = map { $_ => $modem->{$_} } qw(auth AutoName connection dns1 dns2 domain IPAddr login passwd phone SubnetMask); - $toreplace{kpppauth} = ${{ N("Script-based") => 0, N("PAP") => 1, N("Terminal-based") => 2, N("CHAP") => 3, N("PAP/CHAP") => 4 }}{$modem->{auth}}; + my %toreplace = map { $_ => $modem->{$_} } qw(Authentication AutoName connection dns1 dns2 domain IPAddr login passwd phone SubnetMask); $toreplace{phone} =~ s/[a-zA-Z]//g; if ($modem->{auto_dns} ne N("Automatic")) { $toreplace{dnsserver} = join ',', map { $modem->{$_} } "dns1", "dns2"; @@ -32,7 +31,7 @@ sub ppp_configure { $toreplace{connection} ||= 'DialupConnection'; $toreplace{domain} ||= 'localdomain'; $toreplace{intf} ||= 'ppp0'; - $toreplace{papname} = ($modem->{auth} eq 'PAP' || $modem->{auth} eq 'CHAP') && $toreplace{login}; + $toreplace{papname} = $toreplace{login} if member($modem->{Authentication}, 1, 3, 4); # handle static/dynamic settings: if ($modem->{auto_ip} eq N("Automatic")) { @@ -92,7 +91,7 @@ END 'OK' 'ATDT$toreplace{phone}' 'CONNECT' '' END - if ($modem->{auth} eq 'Terminal-based' || $modem->{auth} eq 'Script-based') { + if (member($modem->{Authentication}, 0, 2)) { push @chat, < N("PPP over ATM (PPPoA)"), ); - my $encapsulation; my %encapsulations = ( - N("Bridged Ethernet LLC") => 1, - N("Bridged Ethernet VC") => 2, - N("Routed IP LLC") => 3, - N("Routed IP VC") => 4, - N("PPPOA LLC") => 5, - N("PPPOA VC") => 6, + 1 => N("Bridged Ethernet LLC"), + 2 => N("Bridged Ethernet VC"), + 3 => N("Routed IP LLC"), + 4 => N("Routed IP VC"), + 5 => N("PPPOA LLC"), + 6 => N("PPPOA VC"), ); + + my %ppp_auth_methods = ( + 0 => N("Script-based"), + 1 => N("PAP"), + 2 => N("Terminal-based"), + 3 => N("CHAP"), + 4 => N("PAP/CHAP"), + ); # main wizard: my $wiz; @@ -432,8 +439,7 @@ Take a look at http://www.linmodems.org"), if ($old_provider ne $provider) { $modem->{connection} = $l{Name}; $modem->{phone} = $l{Phonenumber}; - $modem->{auth} = $l{Authentication}; - $modem->{$_} = $l{$_} foreach qw(AutoName Domain Gateway IPAddr SubnetMask); + $modem->{$_} = $l{$_} foreach qw(Authentication AutoName Domain Gateway IPAddr SubnetMask); ($modem->{dns1}, $modem->{dns2}) = split(',', $l{DNS}); } return "ppp_account"; @@ -457,8 +463,7 @@ killall pppd $modem->{device} ||= $first_modem->()->{device}; my %l = getVarsFromSh("$::prefix/usr/share/config/kppprc"); $l{Authentication} = 4 if !exists $l{Authentication}; - $modem->{auth} ||= { 0 => N("Script-based"), 1 => N("PAP"), 2 => N("Terminal-based"), 3 => N("CHAP"), 4 => N("PAP/CHAP") }->{$l{Authentication}}; - $modem->{$_} ||= $l{$_} foreach qw(Gateway IPAddr SubnetMask); + $modem->{$_} ||= $l{$_} foreach qw(Authentication Gateway IPAddr SubnetMask); $modem->{connection} ||= $l{Name}; $modem->{domain} ||= $l{Domain}; ($modem->{dns1}, $modem->{dns2}) = split(',', $l{DNS}); @@ -488,8 +493,8 @@ killall pppd { label => N("Phone number"), val => \$modem->{phone} }, { label => N("Login ID"), val => \$modem->{login} }, { label => N("Password"), val => \$modem->{passwd}, hidden => 1 }, - { label => N("Authentication"), val => \$modem->{auth}, - list => [ N("PAP"), N("Terminal-based"), N("Script-based"), N("CHAP"), N("PAP/CHAP") ] }, + { label => N("Authentication"), val => \$modem->{Authentication}, + list => [ sort keys %ppp_auth_methods ], format => sub { $ppp_auth_methods{$_[0]} } }, ], }, next => "ppp_ip", @@ -558,31 +563,29 @@ killall pppd $lan_detect->(); detect($netc->{autodetect}, 'adsl'); # FIXME: we still need to detect bewan modems - @adsl_devices = values %eth_intf; + @adsl_devices = keys %eth_intf; foreach my $modem (keys %adsl_devices) { - push @adsl_devices, $adsl_devices{$modem} if $netc->{autodetect}{adsl}{$modem}; + push @adsl_devices, $modem if $netc->{autodetect}{adsl}{$modem}; } }, name => N("ADSL configuration") . "\n\n" . N("Select the network interface to configure:"), - data => [ { label => N("Net Device"), type => "list", val => \$ntf_device, allow_empty_list => 1, - list => \@adsl_devices, } ], + data => [ { label => N("Net Device"), type => "list", val => \$ntf_name, allow_empty_list => 1, + list => \@adsl_devices, format => sub { $eth_intf{$_[0]} || $adsl_devices{$_[0]} } } ], post => sub { my %packages = ( 'eci' => [ 'eciadsl', 'missing' ], 'sagem' => [ 'eagle', '/usr/sbin/eaglectrl' ], 'speedtouch' => [ 'speedtouch', '/usr/share/speedtouch/speedtouch.sh' ], ); - $ntf_name = { reverse %eth_intf }->{$ntf_device} || $ntf_device; - $adsl_device = { reverse %adsl_devices }->{$ntf_name} || $ntf_name; # ethernet device case - return 'adsl_unsupported_eci' if $adsl_device eq 'eci'; - $netconnect::need_restart_network = member($adsl_device, qw(speedtouch eci)); - $in->do_pkgs->install($packages{$adsl_device}->[0]) if $packages{$adsl_device} && !-e $packages{$adsl_device}->[1]; - if ($adsl_device eq 'speedtouch' && ! -r '$::prefix/usr/share/speedtouch/mgmt.o' && !$::testing) { + return 'adsl_unsupported_eci' if $ntf_name eq 'eci'; + $netconnect::need_restart_network = member($ntf_name, qw(speedtouch eci)); + $in->do_pkgs->install($packages{$ntf_name}->[0]) if $packages{$ntf_name} && !-e $packages{$ntf_name}->[1]; + if ($ntf_name eq 'speedtouch' && ! -r '$::prefix/usr/share/speedtouch/mgmt.o' && !$::testing) { $in->do_pkgs->what_provides("speedtouch_mgmt") and $in->do_pkgs->install('speedtouch_mgmt'); return 'adsl_speedtouch_firmware' if ! -e "$::prefix/usr/share/speedtouch/mgmt.o"; } - return 'adsl_provider' if $adsl_devices{$adsl_device}; + return 'adsl_provider' if $adsl_devices{$ntf_name}; return 'adsl_protocol'; }, }, @@ -606,7 +609,7 @@ killall pppd $netc->{$_} = $adsl_data->{$_} foreach qw(dnsServer2 dnsServer3 DOMAINNAME2 Encapsulation vpi vci); $adsl_protocol = $adsl_types{$adsl_data->{method}}; } - $adsl_protocol = $adsl_types{pppoa} if $adsl_device eq 'speedtouch'; + $adsl_protocol = $adsl_types{pppoa} if $ntf_name eq 'speedtouch'; return 'adsl_protocol'; }, }, @@ -684,7 +687,7 @@ If you don't know, choose 'use pppoe'"), $adsl_type = find { $adsl_types{$_} eq $adsl_protocol } keys %adsl_types; $adsl_type = { reverse %adsl_types }->{$adsl_protocol}; # process static/dhcp ethernet devices: - if (!exists $adsl_devices{$adsl_device} && member($adsl_type, qw(manual dhcp))) { + if (!exists $adsl_devices{$ntf_name} && member($adsl_type, qw(manual dhcp))) { $auto_ip = $adsl_type eq 'dchp'; $ethntf->{DEVICE} = $ntf_name; $find_lan_module->(); @@ -692,7 +695,7 @@ If you don't know, choose 'use pppoe'"), add2hash($ethntf, $intf->{$ntf_name}); return 'lan_intf'; } - network::adsl::adsl_probe_info($netcnx, $netc, $adsl_type, $adsl_device); + network::adsl::adsl_probe_info($netcnx, $netc, $adsl_type, $ntf_name); $netc->{NET_DEVICE} = $ntf_name if $adsl_type eq 'pppoe'; return 'adsl_account'; }, @@ -704,7 +707,6 @@ If you don't know, choose 'use pppoe'"), pre => sub { $netc->{dnsServer2} ||= $adsl_data->{dns1}; $netc->{dnsServer3} ||= $adsl_data->{dns2}; - $encapsulation ||= find { $encapsulations{$_} eq $netc->{Encapsulation} } keys %encapsulations; }, name => N("Connection Configuration") . "\n\n" . N("Please fill or check the field below"), @@ -715,7 +717,9 @@ If you don't know, choose 'use pppoe'"), { label => N("Second DNS Server (optional)"), val => \$netc->{dnsServer3} }, { label => N("Account Login (user name)"), val => \$netcnx->{login} }, { label => N("Account Password"), val => \$netcnx->{passwd}, hidden => 1 }, - { label => N("Encapsulation :"), val => \$encapsulation, list => [ sort keys %encapsulations ], }, + { label => N("Encapsulation :"), val => \$netc->{Encapsulation}, list => [ values %encapsulations ], + format => sub { $encapsulations{$_[0]} }, + }, ], }, post => sub { @@ -727,10 +731,9 @@ If you don't know, choose 'use pppoe'"), N("United Kingdom") => [ 0, 38 ], N("United States") => [ 8, 35 ], ); - $netc->{Encapsulation} = $encapsulations{$encapsulation}; ($netc->{vpi}, $netc->{vci}) = @{$h{$netcnx->{country}}}; } - network::adsl::adsl_conf_backend($netcnx, $netc, $adsl_device, $adsl_type); #FIXMEl + network::adsl::adsl_conf_backend($netcnx, $netc, $ntf_name, $adsl_type); #FIXME $handle_multiple_cnx->(); }, }, @@ -750,11 +753,10 @@ You can find a driver on http://eciadsl.flashtux.org/"), pre => $lan_detect, name => N("Select the network interface to configure:"), data => sub { - [ { label => N("Net Device"), type => "list", val => \$ntf_device, list => [ values %eth_intf ], - allow_empty_list => 1 } ]; + [ { label => N("Net Device"), type => "list", val => \$ntf_name, list => [ values %eth_intf ], + allow_empty_list => 1, format => sub { $eth_intf{$_[0]} } } ]; }, post => sub { - $ntf_name = { reverse %eth_intf }->{$ntf_device} || $ntf_device; delete $ethntf->{$_} foreach keys %$ethntf; add2hash($ethntf, $intf->{$ntf_name}); $::isInstall && $netc->{NET_DEVICE} eq $ethntf->{DEVICE} ? 'lan_alrd_cfg' : 'lan_protocol'; -- cgit v1.2.1