FCL/sf/mw/ipconnmgmt: comparison cmmanager/cmmgr/cmmserver/src/cmmserver.cpp

equal deleted inserted replaced

-:7ec726f93df1
+:489cf6208544
 const TUint CCmmServer::iCmmRangeCount = 12;
 const TInt CCmmServer::iCmmRanges[iCmmRangeCount] =
 {
-0,      //   0-10
+0,      //  1.   0-11
-11,     //  11-14
+12,     //  2.  12-15
-15,     //  15-21
+16,     //  3.  16-22
-22,     //  22-99
+23,     //  4.  23-99
-100,    // 100-112
+100,    //  5. 100-113
-113,    // 113-126
+114,    //  6. 114-128
-127,    // 127-199
+129,    //  7. 129-199
-200,    // 200-205
+200,    //  8. 200-205
-206,    // 206-210
+206,    //  9. 206-210
-211,    // 211-214
+211,    // 10. 211-214
-215,    // 215-220
+215,    // 11. 215-220
-221     // 221-KMaxInt
+221     // 12. 221-KMaxInt
 };
 const TUint8 CCmmServer::iCmmElementIndex[iCmmRangeCount] =
 {
-CPolicyServer::EAlwaysPass,     // 0-10
+CPolicyServer::EAlwaysPass,     // 0-11
-CPolicyServer::ECustomCheck,    // 11-14
+CPolicyServer::ECustomCheck,    // 12-15
-CPolicyServer::ECustomCheck,    // 15-21
+CPolicyServer::ECustomCheck,    // 16-22
-CPolicyServer::ENotSupported,   // 22-99
+CPolicyServer::ENotSupported,   // 23-99
-CPolicyServer::EAlwaysPass,     // 100-112
+CPolicyServer::EAlwaysPass,     // 100-113
-CPolicyServer::ECustomCheck,    // 113-126
+CPolicyServer::ECustomCheck,    // 114-128
-CPolicyServer::ENotSupported,   // 127-199
+CPolicyServer::ENotSupported,   // 129-199
 CPolicyServer::EAlwaysPass,     // 200-205
 CPolicyServer::ECustomCheck,    // 206-210
 CPolicyServer::ECustomCheck,    // 211-214
 CPolicyServer::ECustomCheck,    // 215-220
 CPolicyServer::ENotSupported    // 221->
 {_INIT_SECURITY_POLICY_C2(ECapabilityReadDeviceData, ECapabilityWriteDeviceData),
 CPolicyServer::EFailClient},
 {_INIT_SECURITY_POLICY_C1(ECapabilityNetworkControl), CPolicyServer::EFailClient},
 };
-const CPolicyServer::TPolicy CCmmServer::iCmmPolicy = //TODO, check comments
+const CPolicyServer::TPolicy CCmmServer::iCmmPolicy =
 {
 CPolicyServer::EAlwaysPass, // Specifies all connect attempts should pass
 iCmmRangeCount,     // Count of ranges
-iCmmRanges,         // 0-999, 1000-1008, 1009...
+iCmmRanges,         // 0-11, 12-15, 16...
-iCmmElementIndex,   // Only range 1000-1008 are checked
+iCmmElementIndex,   // What to do for each range
 iCmmElements        // The list of policy elements
 };
 // -----------------------------------------------------------------------------
 TInt& /*aAction*/,
 TSecurityInfo& /*aMissing*/ )
 {
 switch ( aMessage.Function() )
 {
-// ***********  2nd range: 11-14 *************
+// ***********  2nd range: 12-15 *************
 case ECmmGetConnMethodInfoInt:
 case ECmmGetConnMethodInfoBool:
 case ECmmGetConnMethodInfoString:
 case ECmmGetConnMethodInfoString8:
 // ***********  10th range: 211-214 *************
 case CMManager::EWlanWepKeyIndex:
 // WAPI:
 case CMManager::EWlanWapiPsk:
 case CMManager::EWlanWapiPskFormat:
 // 802.1x:
-case CMManager::EWlan802_1xAllowUnencrypted: //TODO, should this be here?
+case CMManager::EWlan802_1xAllowUnencrypted:
 // Authentication:
 case CMManager::ECmIFAuthName:
 case CMManager::EPacketDataIFAuthName:
 case CMManager::ECmIFAuthPass:
 case CMManager::EPacketDataIFAuthPass:
 // ECapabilityReadDeviceData
 return ( iCmmElements[0].iPolicy.CheckPolicy( aMessage ) ) ?
 EPass : EFail;
 }
 default:
-// By default reading does not need any capabilities
+// By default reading does not need any capabilities.
 return EPass;
 }
 }
-// ***********  3rd range: 15-21 *************
+// ***********  3rd range: 16-22 *************
 case ECmmUpdateBearerPriorityArray:
 case ECmmWriteDefaultConnection:
 case ECmmWriteGeneralConnectionSettings:
-{
+// At this phase all capabilities are not checked because of
-// ECapabilityWriteDeviceData is needed for writing
+// it's too heavy operation...
-return ( iCmmElements[1].iPolicy.CheckPolicy( aMessage ) ) ?
+// At Session phase the protection of the destination and/or
-EPass : EFail;
+// connection method is checked. If protected,
-}
+// ECapabilityNetworkControl is checked.
 case ECmmCopyConnMethod:
 case ECmmMoveConnMethod:
 case ECmmRemoveConnMethod:
 case ECmmRemoveAllReferences:
 {
-// At this phase capability is not checked because of
-// it's too heavy operation...
-// At later phase the protection of the target destination
-// and/or connection method is checked.
-return EPass;
-}
-// ***********  6th range: 113-126 *************
-case EDestCreateDestinationWithName:
-case EDestCreateDestinationWithNameAndId:
-{
 // ECapabilityWriteDeviceData is needed for writing
 return ( iCmmElements[1].iPolicy.CheckPolicy( aMessage ) ) ?
 EPass : EFail;
 }
+// ***********  6th range: 114-128 *************
+case EDestCreateDestinationWithName:
+case EDestCreateDestinationWithNameAndId:
 case EDestIsConnected:
 case EDestAddConnMethod:
 case EDestAddEmbeddedDestination:
 case EDestDeleteConnMethod:
 case EDestRemoveConnMethod:
 case EDestSetMetadata:
 case EDestSetProtection:
 case EDestSetHidden:
 case EDestUpdate:
 case EDestDelete:
-{
+case EDestSetIcon:
-// At this phase capability is not checked because of
-// it's too heavy operation...
-// At Session phase the protection of the destination and/or
-// connection method is checked. If destination/connection method
-// is protected ECapabilityNetworkControl is required from a
-// client.
-return EPass;
-}
-// ***********  9th range: 206-210 *************
-case ECMCreateConnMethod:
-case ECMCreateConnMethodWithId:
 {
 // ECapabilityWriteDeviceData is needed for writing
 return ( iCmmElements[1].iPolicy.CheckPolicy( aMessage ) ) ?
 EPass : EFail;
 }
+// ***********  9th range: 206-210 *************
+// ECapabilityWriteDeviceData is needed for writing
+case ECMCreateConnMethod:
+case ECMCreateConnMethodWithId:
+// At this phase all capabilities are not checked because of
+// it's too heavy operation...
+// At Session phase the protection of the destination and/or
+// connection method is checked. If protected,
+// ECapabilityNetworkControl is checked.
 case ECMCreateConnMethodToDest:
 case ECMCreateConnMethodToDestWithId:
 case ECMCreateCopyOfExisting:
 {
-// At this phase capability is not checked because of
+return ( iCmmElements[1].iPolicy.CheckPolicy( aMessage ) ) ?
-// it's too heavy operation...
+EPass : EFail;
-// At Session phase the protection of the destination and/or
-// connection method is checked.
-return EPass;
 }
 // ***********  11th range: 215-220 *************
+// Protection of the CM is checked later(protected needs ECapabilityNetworkControl)
 case ECMSetIntAttribute:
 case ECMSetBoolAttribute:
 case ECMSetStringAttribute:
 case ECMSetString8Attribute:
 {
 case CMManager::EWlanWepKeyIndex:
 // WAPI:
 case CMManager::EWlanWapiPsk:
 case CMManager::EWlanWapiPskFormat:
 // 802.1x:
-case CMManager::EWlan802_1xAllowUnencrypted: //TODO, should this be here?
+case CMManager::EWlan802_1xAllowUnencrypted:
 // Authentication:
 case CMManager::ECmIFAuthName:
 case CMManager::EPacketDataIFAuthName:
 case CMManager::ECmIFAuthPass:
 case CMManager::EPacketDataIFAuthPass:
 }
 }
 case ECMDelete:
 case ECMUpdate:
 {
-// ECapabilityWriteDeviceData
+// ECapabilityWriteDeviceData (if protected, ECapabilityNetworkControl
+// is checked later).
 return ( iCmmElements[1].iPolicy.CheckPolicy( aMessage ) ) ?
 EPass : EFail;
 }
 default:
 return EPass;
+}
+}
+/**
+* This is for checking client's capabilities at later phase after
+* protections of destination/connection method have been checked
+* first.
+*/
+CPolicyServer::TCustomResult CCmmServer::CapabilityCheckWithProtection(
+const RMessage2& aMessage )
+{
+switch ( aMessage.Function() )
+{
+case ECmmCopyConnMethod:
+case ECmmMoveConnMethod:
+case ECmmRemoveConnMethod:
+case ECmmRemoveAllReferences:
+case EDestAddConnMethod:
+case EDestDeleteConnMethod:
+case EDestAddEmbeddedDestination:
+case EDestRemoveConnMethod:
+case EDestModifyPriority:
+case EDestSetName:
+case EDestSetMetadata:
+case EDestSetProtection:
+case EDestSetHidden:
+case EDestUpdate:
+case EDestDelete:
+case EDestSetIcon:
+case ECMCreateConnMethodToDest:
+case ECMCreateConnMethodToDestWithId:
+case ECMUpdate:
+case ECMDelete:
+case ECMSetIntAttribute:
+case ECMSetBoolAttribute:
+case ECMSetStringAttribute:
+case ECMSetString8Attribute:
+{
+// ECapabilityNetworkControl
+return ( iCmmElements[3].iPolicy.CheckPolicy( aMessage ) ) ? EPass : EFail;
+}
+default:
+// Execution should never come here.
+return EFail;
 }
 }
 CCmmServer::CCmmServer( TInt aPriority ) : CPolicyServer( aPriority, iCmmPolicy )
 {
 const TVersion& /*aVersion*/,
 const RMessage2& /*aMessage*/ ) const
 {
 OstTraceFunctionEntry0( CCMMSERVER_NEWSESSIONL_ENTRY );
-return CCmmSession::NewL( *const_cast<CCmmServer*>( this ), iCmManager->Cache() );
+CSession2* session = CCmmSession::NewL( *const_cast<CCmmServer*>( this ), iCmManager->Cache() );
+OstTraceFunctionExit0( CCMMSERVER_NEWSESSIONL_EXIT );
+return session;
 }
 // -----------------------------------------------------------------------------
 // Increments the session counter. Cancels the shutdown timer if active.
 // -----------------------------------------------------------------------------
 if ( !iShutdown->IsActive() )
 {
 iShutdown->Start();
 }
 }
 OstTraceFunctionExit0( CCMMSERVER_DECREMENTSESSIONS_EXIT );
 }
 // -----------------------------------------------------------------------------
 // CCmmServer::NewContainerL
 //
 CObjectCon* CCmmServer::NewContainerL()
 {
 OstTraceFunctionEntry0( CCMMSERVER_NEWCONTAINERL_ENTRY );
-return iContainerIndex->CreateL();
+CObjectCon* container = iContainerIndex->CreateL();
+OstTraceFunctionExit0( CCMMSERVER_NEWCONTAINERL_EXIT );
+return container;
 }
 // -----------------------------------------------------------------------------
 // CCmmServer::RemoveContainer
 // -----------------------------------------------------------------------------
 // skipping the call to request another message. So we issue the
 // request here in order to keep the server running.
 ReStart();
 OstTraceFunctionExit0( CCMMSERVER_RUNERROR_EXIT );
 return KErrNone;
 }
 // -----------------------------------------------------------------------------
 // CCmmServer::CmManager

changeset 27	489cf6208544
parent 20	9c97ad6591ae
child 40	c5b848e6c7d1