1809 TBool CCmPluginWlan::ManuallyConfigureL() |
1809 TBool CCmPluginWlan::ManuallyConfigureL() |
1810 { |
1810 { |
1811 LOGGER_ENTERFN( "CCmPluginWlan::ManuallyConfigureL" ); |
1811 LOGGER_ENTERFN( "CCmPluginWlan::ManuallyConfigureL" ); |
1812 |
1812 |
1813 TBool proceed ( EFalse ); |
1813 TBool proceed ( EFalse ); |
1814 TBool askNWModeAndSec ( EFalse ); |
|
1815 |
1814 |
1816 // Step 1 - WLAN Network Name query (SSID) |
1815 // Step 1 - WLAN Network Name query (SSID) |
1817 // sets: ECmName, EWlanSSID |
1816 // sets: ECmName, EWlanSSID |
1818 RBuf nwName; |
1817 RBuf nwName; |
1819 nwName.CreateL( KCmWlanNWNameMaxLength ); |
1818 nwName.CreateL( KCmWlanNWNameMaxLength ); |
1820 CleanupClosePushL( nwName ); |
1819 CleanupClosePushL( nwName ); |
1821 |
1820 |
1822 proceed = ShowNWNameQueryL( nwName ); |
1821 proceed = ShowNWNameQueryL( nwName ); |
1823 |
1822 |
1824 TWlanConnectionExtentedSecurityMode securityMode = |
1823 if ( proceed ) |
|
1824 { |
|
1825 TWlanNetMode nwMode( EInfra ); |
|
1826 |
|
1827 TWlanConnectionExtentedSecurityMode securityMode = |
1825 EWlanConnectionExtentedSecurityModeOpen; |
1828 EWlanConnectionExtentedSecurityModeOpen; |
1826 |
1829 |
1827 TWpaMode wpaMode = EWpaModeUndefined; |
1830 TWpaMode wpaMode = EWpaModeUndefined; |
1828 |
1831 |
1829 if ( proceed ) |
1832 proceed = ProceedWithManualL ( ETrue, nwMode, securityMode, wpaMode ); |
1830 { |
|
1831 TWlanNetMode nwMode( EInfra ); |
|
1832 |
|
1833 // Step 2 - SSID scan ( first broadcast, then direct ) |
|
1834 // sets: EWlanConnectionMode |
|
1835 // EWlanScanSSID |
|
1836 // EWlanSecurityMode |
|
1837 |
|
1838 TWlanSsid ssid; |
|
1839 ssid.Copy( nwName ); |
|
1840 |
|
1841 TBool protectedSetupSupported = EFalse; |
|
1842 if ( ScanForWlanNwL( ssid, nwMode, securityMode, protectedSetupSupported ) ) |
|
1843 { |
|
1844 if ( protectedSetupSupported ) |
|
1845 { |
|
1846 TBool wifiret = ProtectedSetupL( ssid ); |
|
1847 switch ( wifiret ) |
|
1848 { |
|
1849 case WiFiProt::EWiFiCancel: //cancel pressed, cancel process |
|
1850 { |
|
1851 CleanupStack::PopAndDestroy( &nwName ); //cleanup and return |
|
1852 return EFalse; |
|
1853 //break; |
|
1854 } |
|
1855 case WiFiProt::EWiFiOK: |
|
1856 { |
|
1857 CleanupStack::PopAndDestroy( &nwName );//cleanup and return |
|
1858 //UpdateSecuritySettingsL(); |
|
1859 return ETrue; |
|
1860 //break; |
|
1861 } |
|
1862 case WiFiProt::EWifiNoAuto://proceed with normal setup |
|
1863 { |
|
1864 break; |
|
1865 } |
|
1866 default: |
|
1867 { |
|
1868 User::Leave( KErrNotSupported ); |
|
1869 break; |
|
1870 } |
|
1871 } |
|
1872 } |
|
1873 |
|
1874 if ( securityMode == EWlanConnectionExtentedSecurityModeWpaPsk |
|
1875 || securityMode == EWlanConnectionExtentedSecurityModeWpa2Psk ) |
|
1876 { |
|
1877 wpaMode = EWpaModePreSharedKey; |
|
1878 } |
|
1879 else if ( securityMode == EWlanConnectionExtentedSecurityModeWpa |
|
1880 || securityMode == EWlanConnectionExtentedSecurityMode802d1x |
|
1881 || securityMode == EWlanConnectionExtentedSecurityModeWpa2 ) |
|
1882 { |
|
1883 wpaMode = EWpaModeEap; |
|
1884 } |
|
1885 } |
|
1886 else |
|
1887 { |
|
1888 askNWModeAndSec = ETrue; |
|
1889 } |
|
1890 proceed = ProceedWithManualL ( askNWModeAndSec, nwMode, securityMode, wpaMode ); |
|
1891 } |
1833 } |
1892 CleanupStack::PopAndDestroy( &nwName ); |
1834 CleanupStack::PopAndDestroy( &nwName ); |
1893 |
1835 |
1894 return proceed; |
1836 return proceed; |
1895 } |
1837 } |