equal
deleted
inserted
replaced
187 iWlanAdapter = CNSmlWLanAdapter::NewL(iCallBack, *iDatabase); |
187 iWlanAdapter = CNSmlWLanAdapter::NewL(iCallBack, *iDatabase); |
188 } |
188 } |
189 |
189 |
190 iNetworkId = KErrNotFound; |
190 iNetworkId = KErrNotFound; |
191 iLingerValue = NULL; |
191 iLingerValue = NULL; |
192 iLingerFlag = ETrue; |
192 iLingerFlag = ETrue; |
|
193 isAdd = EFalse; |
193 } |
194 } |
194 |
195 |
195 //------------------------------------------------------------------------------ |
196 //------------------------------------------------------------------------------ |
196 // void CNSmlInternetAdapter::DDFVersionL() |
197 // void CNSmlInternetAdapter::DDFVersionL() |
197 //------------------------------------------------------------------------------ |
198 //------------------------------------------------------------------------------ |
301 // |
302 // |
302 // NAPDef-node fields |
303 // NAPDef-node fields |
303 // |
304 // |
304 MSmlDmDDFObject& nNameDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfNAPName); // Name |
305 MSmlDmDDFObject& nNameDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfNAPName); // Name |
305 FillNodeInfoL( nNameDDF, |
306 FillNodeInfoL( nNameDDF, |
306 aclTypesAddGet, |
307 aclTypesNoDelete, |
307 MSmlDmDDFObject::EZeroOrOne, |
308 MSmlDmDDFObject::EZeroOrOne, |
308 MSmlDmDDFObject::EDynamic, |
309 MSmlDmDDFObject::EDynamic, |
309 MSmlDmDDFObject::EChr, |
310 MSmlDmDDFObject::EChr, |
310 KNSmlDdfNAPNameDesc); |
311 KNSmlDdfNAPNameDesc); |
311 |
312 |
828 const TInt aStatusRef ) |
829 const TInt aStatusRef ) |
829 { |
830 { |
830 _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): begin"); |
831 _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): begin"); |
831 DBG_ARGS8(_S8("AP:add aURI AddLeafObjectL - %S - %S"), &aURI, &aParentLUID); |
832 DBG_ARGS8(_S8("AP:add aURI AddLeafObjectL - %S - %S"), &aURI, &aParentLUID); |
832 DBG_ARGS8(_S8("AP:Object %S"), &aObject); |
833 DBG_ARGS8(_S8("AP:Object %S"), &aObject); |
|
834 |
|
835 isAdd = ETrue; |
833 |
836 |
834 TInt parentLUID(0); |
837 TInt parentLUID(0); |
835 if(aParentLUID.Length()<=0 ) |
838 if(aParentLUID.Length()<=0 ) |
836 { |
839 { |
837 if (aURI.Match(_L8("AP/*/Px/*" ))!= KErrNotFound) |
840 if (aURI.Match(_L8("AP/*/Px/*" ))!= KErrNotFound) |
3485 else if (fType == CNSmlInternetAdapter::ESpec) |
3488 else if (fType == CNSmlInternetAdapter::ESpec) |
3486 { |
3489 { |
3487 // name |
3490 // name |
3488 if ( aURI.Find( KNSmlDdfNAPName ) >= 0 ) |
3491 if ( aURI.Find( KNSmlDdfNAPName ) >= 0 ) |
3489 { |
3492 { |
3490 CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(serviceType, |
3493 TUint32 iapID10 = IntLUID(aLUID); |
|
3494 /* CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(serviceType, |
3491 qDB, |
3495 qDB, |
3492 serviceId); |
3496 serviceId);*/ |
|
3497 CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP), |
|
3498 TPtrC(COMMDB_ID), |
|
3499 iapID); |
3493 |
3500 |
3494 errorCode = tableView->GotoFirstRecord(); |
3501 errorCode = tableView->GotoFirstRecord(); |
3495 |
3502 |
3496 if ( errorCode == KErrNone ) |
3503 if ( errorCode == KErrNone ) |
3497 { |
3504 { |
3498 TBuf<KCommsDbSvrMaxFieldLength> columnValue; |
3505 TBuf<KCommsDbSvrMaxFieldLength> columnValue; |
3499 TRAPD(leavecode,tableView->ReadTextL(qColumn, columnValue)); |
3506 TRAPD(leavecode,tableView->ReadTextL(TPtrC(COMMDB_NAME ), columnValue)); |
3500 if(leavecode != 0) |
3507 if(leavecode != 0) |
3501 { |
3508 { |
3502 CleanupStack::PopAndDestroy(); // tableView |
3509 CleanupStack::PopAndDestroy(); // tableView |
3503 CleanupStack::PopAndDestroy(pushed); |
3510 CleanupStack::PopAndDestroy(pushed); |
3504 _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end"); |
3511 _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end"); |
3506 } |
3513 } |
3507 aObject.InsertL(aObject.Size(),ConvertTo8LC(columnValue)); |
3514 aObject.InsertL(aObject.Size(),ConvertTo8LC(columnValue)); |
3508 pushed++; |
3515 pushed++; |
3509 } |
3516 } |
3510 CleanupStack::PopAndDestroy(); // tableView |
3517 CleanupStack::PopAndDestroy(); // tableView |
|
3518 CleanupStack::PopAndDestroy(pushed); |
|
3519 return CSmlDmAdapter::EOk; |
3511 } |
3520 } |
3512 // BearerL + NoPxForL + IAPService |
3521 // BearerL + NoPxForL + IAPService |
3513 else if (aURI.Find(KNSmlDdfIAPService) >= 0) |
3522 else if (aURI.Find(KNSmlDdfIAPService) >= 0) |
3514 { |
3523 { |
3515 aObject.InsertL(aObject.Size(),SetIntObjectLC(serviceId)); |
3524 aObject.InsertL(aObject.Size(),SetIntObjectLC(serviceId)); |
4833 tableView->ReadTextL( TPtrC(COMMDB_NAME ), name); |
4842 tableView->ReadTextL( TPtrC(COMMDB_NAME ), name); |
4834 if ( name.Compare( aObject ) != 0 ) |
4843 if ( name.Compare( aObject ) != 0 ) |
4835 { |
4844 { |
4836 // Not correct name |
4845 // Not correct name |
4837 // Remove all mappings from AP/xxx level |
4846 // Remove all mappings from AP/xxx level |
4838 TInt ret = iCallBack->RemoveMappingL( KNSmlInternetAdapterImplUid, |
4847 if(isAdd) |
4839 GetDynamicAPNodeUri( aURI ) , ETrue ); |
4848 { |
4840 iPrevURI->Des().Format( KNullDesC8 ); |
4849 TInt ret = iCallBack->RemoveMappingL( KNSmlInternetAdapterImplUid, |
4841 iPrevLUID = 0; |
4850 GetDynamicAPNodeUri( aURI ) , ETrue ); |
|
4851 iPrevURI->Des().Format( KNullDesC8 ); |
|
4852 iPrevLUID = 0; |
|
4853 } |
|
4854 else |
|
4855 { |
|
4856 iIAPExists = ETrue; |
|
4857 iLeafType = EDMUpdate; |
|
4858 } |
|
4859 |
4842 } |
4860 } |
4843 else |
4861 else |
4844 { |
4862 { |
4845 iIAPExists = ETrue; |
4863 iIAPExists = ETrue; |
4846 iLeafType = EDMUpdate; |
4864 iLeafType = EDMUpdate; |