From 283a0af5227182f2f035f1a5f2fd94e7f3075811 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 2 May 2008 14:19:00 +0000 Subject: extract add_nework_to_wpa_supplicant function --- lib/network/connection/wireless.pm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm index 239320a..9c68ab7 100644 --- a/lib/network/connection/wireless.pm +++ b/lib/network/connection/wireless.pm @@ -599,16 +599,19 @@ set TxRate=0)), $self->SUPER::build_ifcfg_settings($settings); } +sub add_nework_to_wpa_supplicant { + my ($self) = @_; + if ($self->{access}{network}{encryption} eq 'wpa-eap') { + wpa_supplicant_add_eap_network($self->{access}{network}); + } else { + wpa_supplicant_add_network($self->{access}{network}{essid}, $self->{access}{network}{encryption}, $self->{access}{network}{key}, $self->{access}{network}{force_ascii_key}, $self->{access}{network}{mode}); + } +} + sub write_settings { my ($self, $o_net, $o_modules_conf) = @_; - if ($self->need_wpa_supplicant) { - if ($self->{access}{network}{encryption} eq 'wpa-eap') { - wpa_supplicant_add_eap_network($self->{access}{network}); - } else { - wpa_supplicant_add_network($self->{access}{network}{essid}, $self->{access}{network}{encryption}, $self->{access}{network}{key}, $self->{access}{network}{force_ascii_key}, $self->{access}{network}{mode}); - } - } + $self->add_nework_to_wpa_supplicant if $self->need_wpa_supplicant; wlan_ng_configure($self->{access}{network}{essid}, $self->{access}{network}{key}, $self->get_interface, $self->get_driver) if $self->{thirdparty}{name} eq 'prism2'; -- cgit v1.2.1