Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.11.0 Release #2018

Merged
merged 22 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMake/Dependencies/libmbedtls-CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ message(STATUS "C flags here are ${CMAKE_C_FLAGS}")
ExternalProject_Add(
project_libmbedtls
GIT_REPOSITORY https://github.com/ARMmbed/mbedtls.git
GIT_TAG v2.25.0
GIT_TAG v2.28.5
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/build
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX}
Expand Down
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ endif()
if(ENABLE_KVS_THREADPOOL)
file(GLOB THREADPOOL_SOURCE_FILES "src/source/Threadpool/*.c")
add_library(kvsWebRtcThreadpool ${LINKAGE} ${THREADPOOL_SOURCE_FILES})
target_link_libraries(kvsWebRtcThreadpool PRIVATE kvspicUtils)
target_link_libraries(kvsWebRtcThreadpool PUBLIC kvspicUtils)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All consuming libraries of kvsWebRtcThreadpool (A.K.A. EXTRA_DEPS) already link with kvspicUtils, so seems PRIVATE linking would be more appropriate here since we don not need to expose the consuming libraries to kvspicUtils through kvsWebRtcThreadpool. Is there another reason this change was made?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't work on SoCs without this change for static build.

set(EXTRA_DEPS ${EXTRA_DEPS} kvsWebRtcThreadpool)
endif()

Expand Down Expand Up @@ -428,6 +428,13 @@ if(COMPILER_WARNINGS)
target_compile_options(kvsWebrtcSignalingClient PUBLIC -Wall -Werror -pedantic -Wextra -Wno-unknown-warning-option)
endif()

if(ENABLE_KVS_THREADPOOL)
install(TARGETS kvsWebRtcThreadpool
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
endif()

install(TARGETS kvsWebrtcClient kvsWebrtcSignalingClient
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
Expand Down
2 changes: 0 additions & 2 deletions src/source/Ice/IceAgent.c
Original file line number Diff line number Diff line change
Expand Up @@ -2122,7 +2122,6 @@ STATUS iceAgentNominatingStateSetup(PIceAgent pIceAgent)

MUTEX_UNLOCK(pIceAgent->lock);
locked = FALSE;
checkIceAgentStateMachine(pIceAgent);

CleanUp:

Expand Down Expand Up @@ -2383,7 +2382,6 @@ STATUS incomingDataHandler(UINT64 customData, PSocketConnection pSocketConnectio
CHK_STATUS(handleStunPacket(pIceAgent, pBuffer, bufferLen, pSocketConnection, pSrc, pDest));
MUTEX_UNLOCK(pIceAgent->lock);
locked = FALSE;
checkIceAgentStateMachine(pIceAgent);
}
}

Expand Down
22 changes: 0 additions & 22 deletions src/source/Ice/IceAgentStateMachine.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,6 @@ StateMachineState ICE_AGENT_STATE_MACHINE_STATES[] = {

UINT32 ICE_AGENT_STATE_MACHINE_STATE_COUNT = ARRAY_SIZE(ICE_AGENT_STATE_MACHINE_STATES);

STATUS checkIceAgentStateMachine(PIceAgent pIceAgent)
sirknightj marked this conversation as resolved.
Show resolved Hide resolved
{
ENTERS();
STATUS retStatus = STATUS_SUCCESS;
BOOL transitionReady = FALSE;
CHK(pIceAgent != NULL && pIceAgent->pStateMachine != NULL, STATUS_NULL_ARG);

// if a state transition is ready, tell the timer to kick the timer
CHK_STATUS(checkForStateTransition(pIceAgent->pStateMachine, &transitionReady));
if (transitionReady) {
// dangerous to have any mutexes locked by timerqueue when entering this function
CHK_STATUS(timerQueueKick(pIceAgent->timerQueueHandle, pIceAgent->iceAgentStateTimerTask));
}

CleanUp:

CHK_LOG_ERR(retStatus);

LEAVES();
return retStatus;
}

STATUS stepIceAgentStateMachine(PIceAgent pIceAgent)
{
ENTERS();
Expand Down
1 change: 0 additions & 1 deletion src/source/Ice/IceAgentStateMachine.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ extern "C" {
#define ICE_AGENT_STATE_FAILED_STR (PCHAR) "ICE_AGENT_STATE_FAILED"

// Whether to step the state machine
STATUS checkIceAgentStateMachine(PIceAgent);
STATUS stepIceAgentStateMachine(PIceAgent);
STATUS acceptIceAgentMachineState(PIceAgent, UINT64);
STATUS iceAgentStateMachineCheckDisconnection(PIceAgent, PUINT64);
Expand Down
1 change: 0 additions & 1 deletion src/source/Ice/TurnConnection.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ STATUS turnConnectionIncomingDataHandler(PTurnConnection pTurnConnection, PBYTE
} else {
CHK_STATUS(turnConnectionHandleStun(pTurnConnection, pCurrent, processedDataLen));
}
checkTurnConnectionStateMachine(pTurnConnection);
} else {
/* must be channel data if not stun */
CHK_STATUS(turnConnectionHandleChannelData(pTurnConnection, pCurrent, remainingDataSize, &channelDataList[totalChannelDataCount],
Expand Down
24 changes: 0 additions & 24 deletions src/source/Ice/TurnConnectionStateMachine.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,30 +60,6 @@ PCHAR turnConnectionGetStateStr(UINT64 state)
return TURN_STATE_UNKNOWN_STR;
}

STATUS checkTurnConnectionStateMachine(PTurnConnection pTurnConnection)
{
ENTERS();
STATUS retStatus = STATUS_SUCCESS;
BOOL transitionReady = FALSE;

CHK(pTurnConnection != NULL && pTurnConnection->pStateMachine != NULL, STATUS_NULL_ARG);

// if a state transition is ready, tell the timer to kick the timer
CHK_STATUS(checkForStateTransition(pTurnConnection->pStateMachine, &transitionReady));

if (transitionReady) {
// dangerous to have any mutexes locked by timerqueue when entering this function
CHK_STATUS(timerQueueKick(pTurnConnection->timerQueueHandle, pTurnConnection->timerCallbackId));
unicornss marked this conversation as resolved.
Show resolved Hide resolved
}

CleanUp:

CHK_LOG_ERR(retStatus);

LEAVES();
return retStatus;
}

STATUS stepTurnConnectionStateMachine(PTurnConnection pTurnConnection)
{
ENTERS();
Expand Down
1 change: 0 additions & 1 deletion src/source/Ice/TurnConnectionStateMachine.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ extern "C" {
// Whether to step the state machine
STATUS stepTurnConnectionStateMachine(PTurnConnection);
STATUS acceptTurnMachineState(PTurnConnection, UINT64);
STATUS checkTurnConnectionStateMachine(PTurnConnection);
PCHAR turnStateGetStateStr(UINT64 state);

/**
Expand Down