equal
deleted
inserted
replaced
671 |
671 |
672 TInt eapId = GetEAPIdFromUri( aURI ); |
672 TInt eapId = GetEAPIdFromUri( aURI ); |
673 if (eapId == KErrNotFound) |
673 if (eapId == KErrNotFound) |
674 { |
674 { |
675 _DBG_FILE("CNSmlWLanAdapter::AddLeafObjectL(): Non-EAP setting."); |
675 _DBG_FILE("CNSmlWLanAdapter::AddLeafObjectL(): Non-EAP setting."); |
|
676 if(luid==KErrNotFound) |
|
677 { |
|
678 return; |
|
679 } |
676 err = iWlanSettings->GetWlanSettings( luid, *iSettings ); |
680 err = iWlanSettings->GetWlanSettings( luid, *iSettings ); |
677 } |
681 } |
678 else |
682 else |
679 { |
683 { |
680 _DBG_FILE("CNSmlWLanAdapter::AddLeafObjectL(): EAP setting."); |
684 _DBG_FILE("CNSmlWLanAdapter::AddLeafObjectL(): EAP setting."); |
1557 |
1561 |
1558 |
1562 |
1559 if( ( NumOfUriSegs( aURI ) < 6 ) |
1563 if( ( NumOfUriSegs( aURI ) < 6 ) |
1560 || (aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*") ) != KErrNotFound && NumOfUriSegs( aURI ) == 6 ) ) |
1564 || (aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*") ) != KErrNotFound && NumOfUriSegs( aURI ) == 6 ) ) |
1561 { |
1565 { |
|
1566 if(luid==KErrNotFound) |
|
1567 { |
|
1568 return; |
|
1569 } |
1562 TInt ret = iWlanSettings->DeleteWlanSettings( luid ); |
1570 TInt ret = iWlanSettings->DeleteWlanSettings( luid ); |
1563 |
1571 |
1564 if( ret == KErrNone ) |
1572 if( ret == KErrNone ) |
1565 { |
1573 { |
1566 status = CSmlDmAdapter::EOk; |
1574 status = CSmlDmAdapter::EOk; |
1741 // The luid supplied is ok |
1749 // The luid supplied is ok |
1742 luid = GetIdFromLuid( aLUID ); |
1750 luid = GetIdFromLuid( aLUID ); |
1743 } |
1751 } |
1744 |
1752 |
1745 TPtrC8 lastUriSeg = GetLastUriSeg( aURI ); |
1753 TPtrC8 lastUriSeg = GetLastUriSeg( aURI ); |
1746 |
1754 |
|
1755 if(luid==KErrNotFound) |
|
1756 { |
|
1757 return; |
|
1758 } |
|
1759 |
1747 TInt err = iWlanSettings->GetWlanSettings( luid, *iSettings ); |
1760 TInt err = iWlanSettings->GetWlanSettings( luid, *iSettings ); |
1748 |
1761 |
1749 if( err == KErrNotFound ) |
1762 if( err == KErrNotFound ) |
1750 { |
1763 { |
1751 |
1764 |
2449 |
2462 |
2450 //AP/<x>/NAPDef/<x>/ |
2463 //AP/<x>/NAPDef/<x>/ |
2451 if( aURI.Match( _L8("AP/*/NAPDef/*") ) != KErrNotFound && uriSegs==4 ) |
2464 if( aURI.Match( _L8("AP/*/NAPDef/*") ) != KErrNotFound && uriSegs==4 ) |
2452 { |
2465 { |
2453 DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->NAPDef - <%S> <%S>"), &aURI, &aLUID ); |
2466 DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->NAPDef - <%S> <%S>"), &aURI, &aLUID ); |
2454 if( iWlanSettings->RecordExists( luid ) < 0 ) |
2467 if(luid==KErrNotFound) |
|
2468 { |
|
2469 return; |
|
2470 } |
|
2471 if( iWlanSettings->RecordExists( luid ) < 0 ) |
2455 { |
2472 { |
2456 currentUriSegmentList->InsertL( 0, KNSmlNAPDefWlanNode ); |
2473 currentUriSegmentList->InsertL( 0, KNSmlNAPDefWlanNode ); |
2457 iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk ); |
2474 iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk ); |
2458 iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 ); |
2475 iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 ); |
2459 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok"); |
2476 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok"); |
2482 iCallBack->SetResultsL(aResultsRef,*currentUriSegmentList,KNullDesC8); |
2499 iCallBack->SetResultsL(aResultsRef,*currentUriSegmentList,KNullDesC8); |
2483 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok"); |
2500 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok"); |
2484 } |
2501 } |
2485 else |
2502 else |
2486 { |
2503 { |
|
2504 if(luid==KErrNotFound) |
|
2505 { |
|
2506 return; |
|
2507 } |
2487 if( iWlanSettings->RecordExists( luid ) < 0) |
2508 if( iWlanSettings->RecordExists( luid ) < 0) |
2488 { |
2509 { |
2489 iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound); |
2510 iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound); |
2490 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status: Not found"); |
2511 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status: Not found"); |
2491 } |
2512 } |
2520 |
2541 |
2521 //AP/<x>/NAPDef/<x>/WLAN/<x> |
2542 //AP/<x>/NAPDef/<x>/WLAN/<x> |
2522 else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*") ) != KErrNotFound && uriSegs==6 ) |
2543 else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*") ) != KErrNotFound && uriSegs==6 ) |
2523 { |
2544 { |
2524 DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->NAPDef - <%S> <%S>"), &aURI, &aLUID ); |
2545 DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->NAPDef - <%S> <%S>"), &aURI, &aLUID ); |
|
2546 if(luid==KErrNotFound) |
|
2547 { |
|
2548 return; |
|
2549 } |
2525 if( iWlanSettings->RecordExists( luid ) < 0 ) |
2550 if( iWlanSettings->RecordExists( luid ) < 0 ) |
2526 { |
2551 { |
2527 iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound ); |
2552 iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound ); |
2528 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end"); |
2553 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end"); |
2529 } |
2554 } |
2572 |
2597 |
2573 //AP/<x>/NAPDef/<x>/WEPKey/<x> |
2598 //AP/<x>/NAPDef/<x>/WEPKey/<x> |
2574 else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/WEPKey/*") ) != KErrNotFound && uriSegs==8 ) |
2599 else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/WEPKey/*") ) != KErrNotFound && uriSegs==8 ) |
2575 { |
2600 { |
2576 DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->WEPKey/* - <%S> <%D>"), &aURI, luid ); |
2601 DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->WEPKey/* - <%S> <%D>"), &aURI, luid ); |
|
2602 if(luid==KErrNotFound) |
|
2603 { |
|
2604 return; |
|
2605 } |
2577 if( iWlanSettings->RecordExists( luid ) < 0 ) |
2606 if( iWlanSettings->RecordExists( luid ) < 0 ) |
2578 { |
2607 { |
2579 //wlan settings not found for aLUID |
2608 //wlan settings not found for aLUID |
2580 iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound ); |
2609 iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound ); |
2581 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end"); |
2610 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end"); |
2618 iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 ); |
2647 iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 ); |
2619 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok"); |
2648 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok"); |
2620 } |
2649 } |
2621 else |
2650 else |
2622 { |
2651 { |
|
2652 if(luid==KErrNotFound) |
|
2653 { |
|
2654 return; |
|
2655 } |
2623 if( iWlanSettings->RecordExists( luid ) < 0) |
2656 if( iWlanSettings->RecordExists( luid ) < 0) |
2624 { |
2657 { |
2625 iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound); |
2658 iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound); |
2626 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status: Not found"); |
2659 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status: Not found"); |
2627 } |
2660 } |
2653 } |
2686 } |
2654 //AP/<x>/NAPDef/<x>/WLAN/<x>/SecondarySSID/* |
2687 //AP/<x>/NAPDef/<x>/WLAN/<x>/SecondarySSID/* |
2655 else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/SecondarySSID/*") ) != KErrNotFound && uriSegs==8 ) |
2688 else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/SecondarySSID/*") ) != KErrNotFound && uriSegs==8 ) |
2656 { |
2689 { |
2657 DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->SecondarySSID/* - <%S> <%D>"), &aURI, luid ); |
2690 DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->SecondarySSID/* - <%S> <%D>"), &aURI, luid ); |
|
2691 if(luid==KErrNotFound) |
|
2692 { |
|
2693 return; |
|
2694 } |
2658 if( iWlanSettings->RecordExists( luid ) < 0 ) |
2695 if( iWlanSettings->RecordExists( luid ) < 0 ) |
2659 { |
2696 { |
2660 //wlan settings not found for aLUID |
2697 //wlan settings not found for aLUID |
2661 iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound ); |
2698 iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound ); |
2662 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end"); |
2699 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end"); |
2675 DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->EAP - <%S> <%S> <%D> <%D>"), &aURI, &aLUID, aResultsRef, aStatusRef ); |
2712 DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->EAP - <%S> <%S> <%D> <%D>"), &aURI, &aLUID, aResultsRef, aStatusRef ); |
2676 |
2713 |
2677 // Need to get the service id from parent node |
2714 // Need to get the service id from parent node |
2678 luid = GetServiceIdFromUriL ( aURI ); |
2715 luid = GetServiceIdFromUriL ( aURI ); |
2679 |
2716 |
|
2717 if(luid==KErrNotFound) |
|
2718 { |
|
2719 return; |
|
2720 } |
2680 if( iWlanSettings->RecordExists( luid ) < 0 ) |
2721 if( iWlanSettings->RecordExists( luid ) < 0 ) |
2681 { |
2722 { |
2682 //wlan settings not found for aLUID |
2723 //wlan settings not found for aLUID |
2683 iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound ); |
2724 iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound ); |
2684 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end"); |
2725 _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end"); |