equal
deleted
inserted
replaced
778 |
778 |
779 iState = EInitialConnectionPending; |
779 iState = EInitialConnectionPending; |
780 iProxySap->SetNotify(this); |
780 iProxySap->SetNotify(this); |
781 iProxySap->SetRemName(addr); |
781 iProxySap->SetRemName(addr); |
782 iProxySap->ActiveOpen(); |
782 iProxySap->ActiveOpen(); |
|
783 DoAccessRequestL(); |
783 } |
784 } |
784 |
785 |
785 void CDedicatedBondingSession::CleanupStartMessage(TAny* aPtr) |
786 void CDedicatedBondingSession::CleanupStartMessage(TAny* aPtr) |
786 { |
787 { |
787 LOG_STATIC_FUNC |
788 LOG_STATIC_FUNC |
813 { |
814 { |
814 iState = EFinalConnectionPending; |
815 iState = EFinalConnectionPending; |
815 addr.SetBTAddr(iProxySap->RemoteAddress()); |
816 addr.SetBTAddr(iProxySap->RemoteAddress()); |
816 iProxySap->SetRemName(addr); // triggers finding a link again. |
817 iProxySap->SetRemName(addr); // triggers finding a link again. |
817 iProxySap->ActiveOpen(); |
818 iProxySap->ActiveOpen(); |
|
819 DoAccessRequestL(); |
818 break; |
820 break; |
819 } |
821 } |
820 // else not deferred so complete now.... |
822 // else not deferred so complete now.... |
821 // fall-through... |
823 // fall-through... |
822 case EInitialConnection: |
824 case EInitialConnection: |
828 if(aResult == EBTSecManAccessDenied) |
830 if(aResult == EBTSecManAccessDenied) |
829 { |
831 { |
830 err = KErrAccessDenied; |
832 err = KErrAccessDenied; |
831 } |
833 } |
832 break; |
834 break; |
|
835 case EInitialConnectionPending: |
|
836 case EFinalConnectionPending: |
|
837 // Access request shouldn't successfully complete if the connection is still pending |
|
838 __ASSERT_DEBUG(aResult != EBTSecManAccessGranted, PANIC(KPairingServerFaultCat, EPairingServerUnexpectedAccessCallback)); |
|
839 // We should get the MSocketNotify::Error callback, so don't do anything else |
|
840 break; |
833 default: |
841 default: |
834 LOG1(_L("Unexpected Access Request Complete in state %d"), iState); |
842 LOG1(_L("Unexpected Access Request Complete in state %d"), iState); |
835 __ASSERT_DEBUG(EFalse, PANIC(KPairingServerFaultCat, EPairingServerUnexpectedAccessCallback)); |
843 __ASSERT_DEBUG(EFalse, PANIC(KPairingServerFaultCat, EPairingServerUnexpectedAccessCallback)); |
836 break; |
844 break; |
837 } |
845 } |
861 LOG_FUNC |
869 LOG_FUNC |
862 switch(iState) |
870 switch(iState) |
863 { |
871 { |
864 case EInitialConnectionPending: |
872 case EInitialConnectionPending: |
865 iState = EInitialConnection; |
873 iState = EInitialConnection; |
866 DoAccessRequestL(); |
|
867 break; |
874 break; |
868 case EFinalConnectionPending: |
875 case EFinalConnectionPending: |
869 iState = EFinalConnection; |
876 iState = EFinalConnection; |
870 DoAccessRequestL(); |
|
871 break; |
877 break; |
872 case EInitialConnection: |
878 case EInitialConnection: |
873 case EFinalConnection: |
879 case EFinalConnection: |
874 // Apparently multiple connect completes are allowed by CSocket |
880 // Apparently multiple connect completes are allowed by CSocket |
875 break; |
881 break; |