summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-04-15 19:23:48 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-04-15 19:23:48 +0000
commit0bbae62b3c85873d9653a20f07158579fe8102d5 (patch)
tree9eb57a1cf207e29398af4000414d9aa25cb89695
parentcfaae9807d15e6aa22801f443792f5a16afbf0be (diff)
downloaddrakx-net-0bbae62b3c85873d9653a20f07158579fe8102d5.tar
drakx-net-0bbae62b3c85873d9653a20f07158579fe8102d5.tar.gz
drakx-net-0bbae62b3c85873d9653a20f07158579fe8102d5.tar.bz2
drakx-net-0bbae62b3c85873d9653a20f07158579fe8102d5.tar.xz
drakx-net-0bbae62b3c85873d9653a20f07158579fe8102d5.zip
Support default CRDA domain (required for #49982, #49983 and #49171).
-rw-r--r--lib/network/connection/wireless.pm10
-rwxr-xr-xlib/network/netcenter.pm7
-rw-r--r--lib/network/network.pm27
3 files changed, 32 insertions, 12 deletions
diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index 4e284d1..32a28f7 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -5,9 +5,7 @@ use base qw(network::connection::ethernet);
use strict;
use common;
use log;
-
-# list of CRDA domains
-our @crda_domains = qw(AE AL AM AN AR AT AU AZ BA BE BG BH BL BN BO BR BY BZ CA CH CL CN CO CR CS CY CZ DE DK DO DZ EC EE EG ES FI FR GB GE GR GT HK HN HR HU ID IE IL IN IR IS IT JM JO JP KP KR KW KZ LB LI LK LT LU LV MA MC MK MO MT MX MY NL NO NP NZ OM PA PE PG PH PK PL PR PT QA RO RU SA SE SG SI SK SV SY TH TN TR TT TW UA US UY UZ VE VN YE ZA ZW);
+use network::network;
#- class attributes:
#- network: ID of the selected network
@@ -363,8 +361,8 @@ sub check_device {
sub load_interface_settings {
my ($self) = @_;
$self->SUPER::load_interface_settings;
- # by default, use US regulatory domain for wireless networks
- $self->{ifcfg}{CRDA_DOMAIN} ||= "US";
+ require network::network;
+ $self->{ifcfg}{CRDA_DOMAIN} ||= network::network::detect_crda_domain();
}
sub get_networks {
@@ -491,7 +489,7 @@ only used for EAP certificate based authentication. It could be
considered as the alternative to username/password combo.
Note: other related settings are shown on the Advanced page.") },
{ label => N("Wireless regulatory domain"), val => \$self->{ifcfg}{CRDA_DOMAIN},
- list => \@crda_domains, sort => 1, advanced => 1, },
+ list => \@network::network::crda_domains, sort => 1, advanced => 1, },
{ label => N("Network ID"), val => \$self->{ifcfg}{WIRELESS_NWID}, advanced => 1 },
{ label => N("Operating frequency"), val => \$self->{ifcfg}{WIRELESS_FREQ}, advanced => 1 },
{ label => N("Sensitivity threshold"), val => \$self->{ifcfg}{WIRELESS_SENS}, advanced => 1 },
diff --git a/lib/network/netcenter.pm b/lib/network/netcenter.pm
index 389bc03..f6deee3 100755
--- a/lib/network/netcenter.pm
+++ b/lib/network/netcenter.pm
@@ -129,10 +129,11 @@ sub get_connections() {
}
sub advanced_settings {
- my ($in) = @_;
+ my ($in, $net) = @_;
my $u = network::network::advanced_settings_read();
- if (network::network::advanced_choose($in, $u)) {
+ if (network::network::advanced_choose($in, $net, $u)) {
network::network::advanced_settings_write($u);
+ network::network::write_network_conf($net);
}
}
@@ -165,7 +166,7 @@ sub main {
map_index { build_cmanager_box($_, $::i == 0) } @cmanagers,
])),
0, gtknew('HButtonBox', spacing => 6, layout => 'end', children_loose => [
- gtknew('Button', text => N("Advanced settings"), clicked => sub { advanced_settings($in) }),
+ gtknew('Button', text => N("Advanced settings"), clicked => sub { advanced_settings($in, $net) }),
gtknew('Button', text => N("Quit"), clicked => sub { Gtk2->main_quit }),
]),
]),
diff --git a/lib/network/network.pm b/lib/network/network.pm
index 2009171..fdce396 100644
--- a/lib/network/network.pm
+++ b/lib/network/network.pm
@@ -6,6 +6,7 @@ package network::network; # $Id$wir
use strict;
+use lang;
use Socket;
use common;
use run_program;
@@ -18,6 +19,8 @@ my $resolv_file = "/etc/resolv.conf";
my $tmdns_file = "/etc/tmdns.conf";
our $wireless_d = "/etc/sysconfig/network-scripts/wireless.d";
+# list of CRDA domains
+our @crda_domains = qw(AE AL AM AN AR AT AU AZ BA BE BG BH BL BN BO BR BY BZ CA CH CL CN CO CR CS CY CZ DE DK DO DZ EC EE EG ES FI FR GB GE GR GT HK HN HR HU ID IE IL IN IR IS IT JM JO JP KP KR KW KZ LB LI LK LT LU LV MA MC MK MO MT MX MY NL NO NP NZ OM PA PE PG PH PK PL PR PT QA RO RU SA SE SG SI SK SV SY TH TN TR TT TW UA US UY UZ VE VN YE ZA ZW);
@ISA = qw(Exporter);
@EXPORT = qw(addDefaultRoute dns dnsServers gateway guessHostname is_ip is_ip_forbidden masked_ip netmask resolv);
@@ -103,7 +106,7 @@ sub write_network_conf {
}
$net->{network}{NETWORKING} = 'yes';
- setVarsInSh($::prefix . $network_file, $net->{network}, qw(HOSTNAME NETWORKING GATEWAY GATEWAYDEV NISDOMAIN FORWARD_IPV4 NETWORKING_IPV6 IPV6_DEFAULTDEV));
+ setVarsInSh($::prefix . $network_file, $net->{network}, qw(HOSTNAME NETWORKING GATEWAY GATEWAYDEV NISDOMAIN FORWARD_IPV4 NETWORKING_IPV6 IPV6_DEFAULTDEV CRDA_DOMAIN));
}
sub write_zeroconf {
@@ -488,12 +491,14 @@ sub advanced_settings_write {
}
sub advanced_choose {
- my ($in, $u) = @_;
+ my ($in, $net, $u) = @_;
my $use_http_for_https = $u->{https_proxy} eq $u->{http_proxy};
$in->ask_from(N("Advanced network settings"),
N("Here you can configure advanced network settings. Please note that you have to reboot the machine for changes to take effect."),
- [ { label => "<b>".N("TCP/IP settings")."</b>"},
+ [
+ { label => N("Wireless regulatory domain"), val => \$net->{network}{CRDA_DOMAIN}, sort => 1, list => \@crda_domains },
+ { label => "<b>".N("TCP/IP settings")."</b>"},
{ text => N("Disable IPv6"), val => \$u->{ipv6_disabled}, type => "bool" },
{ text => N("Disable TCP Window Scaling"), val => \$u->{disable_window_scaling}, type => "bool"},
{ text => N("Disable TCP Timestamps"), val => \$u->{disable_tcp_timestamps}, type => "bool"},
@@ -682,6 +687,20 @@ sub proxy_configure {
proxy_configure_mozilla_firefox($proxy);
}
+sub detect_crda_domain {
+ my $crda = { getVarsFromSh($::prefix . $network_file) }->{CRDA_DOMAIN};
+ if (!$crda) {
+ my $locale = lang::read($>);
+ my $country = $locale->{country};
+ if (grep($country, @crda_domains)) {
+ $crda = $country;
+ } else {
+ $crda = "US";
+ }
+ }
+ $crda;
+}
+
sub read_net_conf {
my ($net) = @_;
add2hash($net->{network} ||= {}, read_conf($::prefix . $network_file));
@@ -701,6 +720,8 @@ sub read_net_conf {
foreach (all($::prefix . $wireless_d)) {
$net->{wireless}{$_} = { getVarsFromSh($::prefix . $wireless_d . '/' . $_) };
}
+ # detect default CRDA_DOMAIN
+ $net->{network}{CRDA_DOMAIN} ||= detect_crda_domain();
netprofile_read($net);
if (my $default_intf = network::tools::get_default_gateway_interface($net)) {
$net->{net_interface} = $default_intf;