--- a/adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodemathandler.cpp	Mon Nov 09 10:36:19 2009 +0000
+++ b/adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodemathandler.cpp	Thu Jan 14 10:44:58 2010 +0200
@@ -97,17 +97,16 @@
     iReceivedMessage( NULL ),
     iPepObjId(0),
     iPipeController(NULL),
-    iDisconnected( EFalse )
+    iDisconnected( EFalse ),
+    iModemAtExistInCmt( EFalse )
     {
     C_TRACE (( _T("CModemAtHandler::CModemAtHandler") ));
-    
     }
 
 void CModemAtHandler::DoCancel()
     {
     C_TRACE (( _T("CModemAtHandler::DoCancel()") ));
     iIscApi->ReceiveCancel();
-    
     }
 
 
@@ -229,7 +228,7 @@
 #ifndef __WINSCW__
       OpenChannelL();
 #ifndef NCP_COMMON_BRIDGE_FAMILY
-      iPipeController->SendTaskIdQuery();
+      iPipeController->QueryModemAtFromNameService();
 #endif
 #else
       iEmulatedValue = 0;
@@ -237,16 +236,6 @@
     
     }
 
-
-TInt CModemAtHandler::GetMinSizeDividendByFour( TInt aSize)
-    {
-     C_TRACE (( _T("CModemAtHandler::GetMinSizeDividendByFour(%d)"),aSize ));
-     aSize += aSize % KAlignToFourBytes;
-      
-     C_TRACE (( _T("CModemAtHandler::GetMinSizeDividendByFour return: %d"),aSize ));
-     return aSize;
-    }
-
 TInt CModemAtHandler::SendATCommand(const TUint8 aDteId,
     const TATPluginInterface aPluginType,
     const TUint8 aMessageType,
@@ -273,7 +262,11 @@
 
     TInt size = ISI_HEADER_SIZE + AT_MODEM_CMD_REQ_OFFSET_CMDLINEBUFFER + aCmd.Length();
     
-    TInt sizeWithFillers = GetMinSizeDividendByFour( size );
+    TInt sizeWithFillers = size;
+    while( sizeWithFillers % KAlignToFourBytes )
+        {
+        sizeWithFillers++;
+        }
     C_TRACE((_L("Message length %d"), sizeWithFillers));
 
     HBufC8* message = HBufC8::New( sizeWithFillers );
@@ -424,7 +417,14 @@
     
 TInt CModemAtHandler::Connect(const TUint8 aDteId)
     {
-   C_TRACE (( _T("CModemAtHandler::Connect()") ));
+    C_TRACE (( _T("CModemAtHandler::Connect()") ));
+
+    if( !iModemAtExistInCmt )
+        {
+        C_TRACE((_T("Connection failed, PN_AT_MODEM is not in CMT")));
+        TRACE_ASSERT_ALWAYS;
+        return KErrNotFound;
+        }
 
     C_TRACE((_L("Connecting with dteid:%d "), aDteId));
     SetDisconnected( EFalse );
@@ -694,3 +694,9 @@
     TRACE_ASSERT( result == AT_MODEM_RESULT_OK );
     }
 
+void CModemAtHandler::SetModemAtExistsInCmt( TBool aModemAtExistsInCmt )
+    {
+    C_TRACE((_T("CModemAtHandler::SetModemAtExistsInCmt(%d)"), (TInt)aModemAtExistsInCmt));
+    iModemAtExistInCmt = aModemAtExistsInCmt;
+    }
+