equal
deleted
inserted
replaced
404 } |
404 } |
405 break; |
405 break; |
406 } |
406 } |
407 // Socket Connect has completed |
407 // Socket Connect has completed |
408 case EConnecting: |
408 case EConnecting: |
|
409 iTimer->Cancel(); // Valid SUPL server, Cancel timer started for this purpose |
409 if(iStatus == KErrNone) |
410 if(iStatus == KErrNone) |
410 { |
411 { |
411 if(iVariantEnabled) |
412 if(iVariantEnabled) |
412 { |
413 { |
413 iTrace->Trace(_L("CSuplConnection::RunL Making Secure Connection"), KTraceFileName, __LINE__); |
414 iTrace->Trace(_L("CSuplConnection::RunL Making Secure Connection"), KTraceFileName, __LINE__); |
414 iState = EMakingSecureConn; |
415 iState = EMakingSecureConn; |
|
416 |
415 MakeSecureConnection(); |
417 MakeSecureConnection(); |
416 } |
418 } |
417 else |
419 else |
418 { |
420 { |
419 // Log |
421 // Log |
601 |
603 |
602 EXPORT_C void CSuplConnection::CancelConnect(TRequestStatus &aStatus) |
604 EXPORT_C void CSuplConnection::CancelConnect(TRequestStatus &aStatus) |
603 { |
605 { |
604 // Log |
606 // Log |
605 iTrace->Trace(_L("CSuplConnection::CancelConnect"), KTraceFileName, __LINE__); |
607 iTrace->Trace(_L("CSuplConnection::CancelConnect"), KTraceFileName, __LINE__); |
606 |
608 iTimer->Cancel(); // Cancel all timers |
607 if (iConnArray.Count() > 1) |
609 if (iConnArray.Count() > 1) |
608 { |
610 { |
609 CompleteConnectCancel(aStatus); |
611 CompleteConnectCancel(aStatus); |
610 return; |
612 return; |
611 } |
613 } |
772 } |
774 } |
773 case ELookingUp: |
775 case ELookingUp: |
774 { |
776 { |
775 iResolver.Cancel(); |
777 iResolver.Cancel(); |
776 break; |
778 break; |
777 } |
779 } |
|
780 case EConnecting: |
|
781 { |
|
782 iState = EFailure; |
|
783 iSocket.Close(); |
|
784 #ifndef __WINS__ // Bug Fix for close connection |
|
785 // Close the RConnection |
|
786 iConnection.Close(); |
|
787 #endif |
|
788 break; |
|
789 } |
778 default: |
790 default: |
779 { |
791 { |
780 if(iVariantEnabled) |
792 if(iVariantEnabled) |
781 { |
793 { |
782 iTrace->Trace(_L("CSuplConnection::Secure DoCancel"), KTraceFileName, __LINE__); |
794 iTrace->Trace(_L("CSuplConnection::Secure DoCancel"), KTraceFileName, __LINE__); |
1141 { |
1153 { |
1142 // Log |
1154 // Log |
1143 iTrace->Trace(_L("CSuplConnection::Connect(void)"), KTraceFileName, __LINE__); |
1155 iTrace->Trace(_L("CSuplConnection::Connect(void)"), KTraceFileName, __LINE__); |
1144 |
1156 |
1145 iState = EConnecting; |
1157 iState = EConnecting; |
|
1158 iTimer->Start(4000000); // For DNS pass case , but not a valid SUPL server |
1146 iSocket.Connect(iAddress, iStatus); |
1159 iSocket.Connect(iAddress, iStatus); |
1147 SetActive(); |
1160 SetActive(); |
1148 } |
1161 } |
1149 |
1162 |
1150 // ----------------------------------------------------------------------------- |
1163 // ----------------------------------------------------------------------------- |