equal
deleted
inserted
replaced
1363 |
1363 |
1364 __ASSERT_DEBUG(iSubConnectionProvider.IsOpen(), User::Panic(KSpecAssert_ESockSSocksspshm, 48)); // legacy flows have no control side; should never get here |
1364 __ASSERT_DEBUG(iSubConnectionProvider.IsOpen(), User::Panic(KSpecAssert_ESockSSocksspshm, 48)); // legacy flows have no control side; should never get here |
1365 } |
1365 } |
1366 else if (iHostResolverNotify) |
1366 else if (iHostResolverNotify) |
1367 {//workaroud to indicate to CHostResolver we've got connection info |
1367 {//workaroud to indicate to CHostResolver we've got connection info |
1368 if (aBindTo.iNodeId.Ptr()) |
1368 if (!aBindTo.iNodeId.Ptr()) |
1369 { |
|
1370 iHostResolverNotify->StartSending(); |
|
1371 } |
|
1372 else |
|
1373 { |
1369 { |
1374 iHostResolverNotify->Error(KErrDisconnected); |
1370 iHostResolverNotify->Error(KErrDisconnected); |
1375 } |
1371 } |
1376 } |
1372 } |
1377 |
|
1378 |
|
1379 |
|
1380 } |
1373 } |
1381 |
1374 |
1382 |
1375 |
1383 void CTransportFlowShim::Rejoin(const TCFFlow::TRejoin& aRejoinMessage) |
1376 void CTransportFlowShim::Rejoin(const TCFFlow::TRejoin& aRejoinMessage) |
1384 { |
1377 { |
1413 { |
1406 { |
1414 iStartRequest.ReplyTo(Id(), TCFDataClient::TStarted().CRef()); |
1407 iStartRequest.ReplyTo(Id(), TCFDataClient::TStarted().CRef()); |
1415 iStartRequest.Close(); |
1408 iStartRequest.Close(); |
1416 SetStarted(); |
1409 SetStarted(); |
1417 ClearStopped(); |
1410 ClearStopped(); |
|
1411 |
|
1412 // A held-over resolution request will now work (if it ever will) |
|
1413 if (iHostResolverNotify) |
|
1414 { |
|
1415 iHostResolverNotify->StartSending(); |
|
1416 } |
|
1417 |
1418 return; |
1418 return; |
1419 } |
1419 } |
1420 |
1420 |
1421 //We need a bearer |
1421 //We need a bearer |
1422 PostNoBearer(); //Ask for bearer if not requested already |
1422 PostNoBearer(); //Ask for bearer if not requested already |