Cleanup commented out code

awslabs · Oct 16, 2023 · e36fb47 · e36fb47
1 parent ef3dc13
commit e36fb47
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/source/Ice/IceAgent.c b/src/source/Ice/IceAgent.c
@@ -1803,10 +1803,6 @@ STATUS turnStateFailedFn(PSocketConnection pSocketConnection, UINT64 data)
     UNUSED_PARAM(pSocketConnection);
 
     STATUS retStatus = STATUS_SUCCESS;
-    /* There is data race condition when editing the candidate state without holding
-     * the IceAgent lock. However holding the turn lock and then locking the ice agent lock
-     * can result in a dead lock. Ice must always be locked first, and then turn.
-     */
 
     PIceCandidate pNewCandidate = (PIceCandidate) data;
     CHK(pNewCandidate != NULL, STATUS_NULL_ARG);
@@ -2497,7 +2493,6 @@ STATUS handleStunPacket(PIceAgent pIceAgent, PBYTE pBuffer, UINT32 bufferLen, PS
                           iceAgentGetCandidateTypeStr(pIceCandidatePair->local->iceCandidateType), pIceCandidatePair->local->id,
                           pIceCandidatePair->remote->id);
                     pIceCandidatePair->nominated = TRUE;
-                    // checkIceAgentStateMachine(pIceAgent);
                 }
             }
 
@@ -2599,7 +2594,6 @@ STATUS handleStunPacket(PIceAgent pIceAgent, PBYTE pBuffer, UINT32 bufferLen, PS
             if (pIceCandidatePair->state != ICE_CANDIDATE_PAIR_STATE_SUCCEEDED) {
                 DLOGD("Pair succeeded! %s %s", pIceCandidatePair->local->id, pIceCandidatePair->remote->id);
                 pIceCandidatePair->state = ICE_CANDIDATE_PAIR_STATE_SUCCEEDED;
-                // checkIceAgentStateMachine(pIceAgent);
                 retStatus = hashTableGet(pIceCandidatePair->requestSentTime, checkSum, &requestSentTime);
                 if (hashTableGet(pIceCandidatePair->requestSentTime, checkSum, &requestSentTime) == STATUS_SUCCESS) {
                     pIceCandidatePair->roundTripTime = GETTIME() - requestSentTime;

diff --git a/src/source/Ice/TurnConnectionStateMachine.c b/src/source/Ice/TurnConnectionStateMachine.c
@@ -207,7 +207,7 @@ STATUS fromCheckSocketConnectionTurnState(UINT64 customData, PUINT64 pState)
         CHK(FALSE, STATUS_SUCCESS);
     }
 
-    if (socketConnectionIsConnected(pTurnConnection->pControlChannel)) { // pTurnConnection->state == TURN_STATE_CHECK_SOCKET_CONNECTION) {
+    if (socketConnectionIsConnected(pTurnConnection->pControlChannel)) {
         state = TURN_STATE_GET_CREDENTIALS;
     }