equal
deleted
inserted
replaced
1349 // current point in the connection history, so that when the client asks |
1349 // current point in the connection history, so that when the client asks |
1350 // for the connections themselves, we give them a consistent answer. |
1350 // for the connections themselves, we give them a consistent answer. |
1351 if ( err == KErrNone ) |
1351 if ( err == KErrNone ) |
1352 { |
1352 { |
1353 iServer.SetConnectionHistoryPointer(Id()); |
1353 iServer.SetConnectionHistoryPointer(Id()); |
|
1354 iInGetConnectionsProcedure = ETrue; |
1354 } |
1355 } |
1355 CompleteClient(aMessage, err); |
1356 CompleteClient(aMessage, err); |
1356 } |
1357 } |
1357 |
1358 |
1358 void CRemConSession::GetConnections(const RMessage2& aMessage) |
1359 void CRemConSession::GetConnections(const RMessage2& aMessage) |
1365 ) |
1366 ) |
1366 { |
1367 { |
1367 PANIC_MSG(aMessage, KRemConClientPanicCat, ERemConClientPanicClientTypeNotSet); |
1368 PANIC_MSG(aMessage, KRemConClientPanicCat, ERemConClientPanicClientTypeNotSet); |
1368 return; |
1369 return; |
1369 } |
1370 } |
|
1371 |
|
1372 iInGetConnectionsProcedure = EFalse; |
1370 |
1373 |
1371 // Get the array of connections at the point in the history we're |
1374 // Get the array of connections at the point in the history we're |
1372 // interested in and write it back to the client. NB This is not |
1375 // interested in and write it back to the client. NB This is not |
1373 // necessarily the Last item in the history but the item that we were |
1376 // necessarily the Last item in the history but the item that we were |
1374 // pointing at when GetConnectionCount was called. |
1377 // pointing at when GetConnectionCount was called. |
1567 } |
1570 } |
1568 |
1571 |
1569 void CRemConSession::ConnectionsChanged() |
1572 void CRemConSession::ConnectionsChanged() |
1570 { |
1573 { |
1571 LOG_FUNC; |
1574 LOG_FUNC; |
1572 |
1575 |
|
1576 LOG1(_L("\tiInGetConnectionsProcedure = %d"), iInGetConnectionsProcedure); |
|
1577 // Only update the connections history pointer if we're not in the middle |
|
1578 // of a 'GetConnections' procedure. |
|
1579 if ( !iInGetConnectionsProcedure ) |
|
1580 { |
|
1581 iServer.SetConnectionHistoryPointer(Id()); |
|
1582 } |
1573 LOG1(_L("\tiNotifyConnectionsChangeMsg.Handle = %d"), iNotifyConnectionsChangeMsg.Handle()); |
1583 LOG1(_L("\tiNotifyConnectionsChangeMsg.Handle = %d"), iNotifyConnectionsChangeMsg.Handle()); |
1574 if ( iNotifyConnectionsChangeMsg.Handle() ) |
1584 if ( iNotifyConnectionsChangeMsg.Handle() ) |
1575 { |
1585 { |
1576 // Set the connection history pointer to point to the latest item and then complete the |
|
1577 // NotifyConnectionChange request of the client. |
|
1578 iServer.SetConnectionHistoryPointer(Id()); |
|
1579 CompleteClient(iNotifyConnectionsChangeMsg, KErrNone); |
1586 CompleteClient(iNotifyConnectionsChangeMsg, KErrNone); |
1580 } |
1587 } |
1581 } |
1588 } |
1582 |
1589 |
1583 void CRemConSession::CompleteSend() |
1590 void CRemConSession::CompleteSend() |