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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: |
bash scripts/check-clang.sh
mac-os-build-clang:
runs-on: macos-11
runs-on: macos-12
env:
CC: /usr/bin/clang
CXX: /usr/bin/clang++
Expand All @@ -50,7 +50,7 @@ jobs:
cd build
./tst/webrtc_client_test
mac-os-build-gcc:
runs-on: macos-11
runs-on: macos-12
env:
CC: gcc
CXX: g++
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
cd build
./tst/webrtc_client_test
static-build-mac:
runs-on: macos-11
runs-on: macos-12
env:
AWS_KVS_LOG_LEVEL: 2
permissions:
Expand Down
2 changes: 1 addition & 1 deletion samples/Common.c
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ STATUS initializePeerConnection(PSampleConfiguration pSampleConfiguration, PRtcP
}

CHK_STATUS(createPeerConnection(&configuration, ppRtcPeerConnection));
CleanUp:
CleanUp:

CHK_LOG_ERR(retStatus);

Expand Down
1 change: 0 additions & 1 deletion src/source/Ice/IceAgent.c
Original file line number Diff line number Diff line change
Expand Up @@ -1861,7 +1861,6 @@ STATUS iceAgentInitRelayCandidate(PIceAgent pIceAgent, UINT32 iceServerIndex, KV
callback.relayAddressAvailableFn = NULL;
callback.turnStateFailedFn = turnStateFailedFn;


CHK_STATUS(createTurnConnection(&pIceAgent->iceServers[iceServerIndex], pIceAgent->timerQueueHandle,
TURN_CONNECTION_DATA_TRANSFER_MODE_SEND_INDIDATION, protocol, &callback, pNewCandidate->pSocketConnection,
pIceAgent->pConnectionListener, &pTurnConnection));
Expand Down
9 changes: 9 additions & 0 deletions src/source/PeerConnection/Rtcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,15 @@ static STATUS onRtcpReceiverReport(PRtcpPacket pRtcpPacket, PKvsPeerConnection p
UINT32 rttPropDelayMsec = 0, rttPropDelay, delaySinceLastSR, lastSR, interarrivalJitter, extHiSeqNumReceived, cumulativeLost, senderSSRC, ssrc1;
UINT64 currentTimeNTP = convertTimestampToNTP(GETTIME());

UNUSED_PARAM(rttPropDelayMsec);
UNUSED_PARAM(rttPropDelay);
UNUSED_PARAM(delaySinceLastSR);
UNUSED_PARAM(lastSR);
UNUSED_PARAM(interarrivalJitter);
UNUSED_PARAM(extHiSeqNumReceived);
UNUSED_PARAM(cumulativeLost);
UNUSED_PARAM(senderSSRC);

CHK(pKvsPeerConnection != NULL && pRtcpPacket != NULL, STATUS_NULL_ARG);
// https://tools.ietf.org/html/rfc3550#section-6.4.2
if (pRtcpPacket->payloadLength != RTCP_PACKET_RECEIVER_REPORT_MINLEN) {
Expand Down
4 changes: 3 additions & 1 deletion src/source/Sctp/Sctp.c
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,8 @@ INT32 onSctpInboundPacket(struct socket* sock, union sctp_sockstore addr, PVOID
if (data != NULL) {
free(data);
}

if (STATUS_FAILED(retStatus)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you add a log check error here please?

return -1;
}
return 1;
}
4 changes: 4 additions & 0 deletions src/source/Signaling/LwsApiCalls.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ INT32 lwsHttpCallbackRoutine(struct lws* wsi, enum lws_callback_reasons reason,
PStateMachineState pStateMachineState;
BOOL skewMapContains = FALSE;

UNUSED_PARAM(logLevel);
DLOGV("HTTPS callback with reason %d", reason);

// Early check before accessing the custom data field to see if we are interested in processing the message
Expand Down Expand Up @@ -1493,6 +1494,9 @@ STATUS joinStorageSessionLws(PSignalingClient pSignalingClient, UINT64 time)
PCHAR pResponseStr;
UINT32 resultLen;

UNUSED_PARAM(pResponseStr);
UNUSED_PARAM(pLwsCallInfo);
UNUSED_PARAM(resultLen);
Copy link
Contributor

Choose a reason for hiding this comment

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

These seem like something we should log. Why else are we having these variables be stored locally?

CHK(pSignalingClient != NULL, STATUS_NULL_ARG);
CHK(pSignalingClient->channelEndpointWebrtc[0] != '\0', STATUS_INTERNAL_ERROR);

Expand Down
2 changes: 1 addition & 1 deletion src/source/Signaling/StateMachine.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ StateMachineState SIGNALING_STATE_MACHINE_STATES[] = {
fromGetIceConfigSignalingState, executeGetIceConfigSignalingState, defaultSignalingStateTransitionHook, SIGNALING_STATES_DEFAULT_RETRY_COUNT,
STATUS_SIGNALING_GET_ICE_CONFIG_CALL_FAILED},
{SIGNALING_STATE_READY, SIGNALING_STATE_GET_ICE_CONFIG | SIGNALING_STATE_DISCONNECTED | SIGNALING_STATE_READY, fromReadySignalingState,
executeReadySignalingState, defaultSignalingStateTransitionHook, INFINITE_RETRY_COUNT_SENTINEL, STATUS_SIGNALING_READY_CALLBACK_FAILED},
executeReadySignalingState, defaultSignalingStateTransitionHook, INFINITE_RETRY_COUNT_SENTINEL, STATUS_SIGNALING_READY_CALLBACK_FAILED},
{SIGNALING_STATE_CONNECT,
SIGNALING_STATE_READY | SIGNALING_STATE_DISCONNECTED | SIGNALING_STATE_CONNECTED | SIGNALING_STATE_JOIN_SESSION | SIGNALING_STATE_CONNECT,
fromConnectSignalingState, executeConnectSignalingState, defaultSignalingStateTransitionHook, INFINITE_RETRY_COUNT_SENTINEL,
Expand Down
2 changes: 2 additions & 0 deletions src/source/Stun/Stun.c
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,8 @@ STATUS deserializeStunPacket(PBYTE pStunBuffer, UINT32 bufferSize, PBYTE passwor
BOOL fingerprintFound = FALSE, messaageIntegrityFound = FALSE;
PBYTE pData, pTransaction;

UNUSED_PARAM(pStunAttributeFingerprint);

CHK(pStunBuffer != NULL && ppStunPacket != NULL, STATUS_NULL_ARG);
CHK(bufferSize >= STUN_HEADER_LEN, STATUS_INVALID_ARG);

Expand Down
16 changes: 8 additions & 8 deletions tst/IngestionFunctionalityTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ TEST_F(IngestionFunctionalityTest, basicCreateConnectJoinSession)
EXPECT_EQ(1, describeCount);
EXPECT_EQ(1, describeMediaCount);
EXPECT_EQ(1, getEndpointCount);
EXPECT_EQ(0, getIceConfigCount);
EXPECT_EQ(1, getIceConfigCount);

EXPECT_EQ(1, connectCount);

Expand Down Expand Up @@ -466,7 +466,7 @@ TEST_F(IngestionFunctionalityTest, iceReconnectEmulationWithJoinSession)
EXPECT_EQ(1, describeCount);
EXPECT_EQ(1, describeMediaCount);
EXPECT_EQ(1, getEndpointCount);
EXPECT_EQ(0, getIceConfigCount);
EXPECT_EQ(1, getIceConfigCount);
EXPECT_EQ(1, connectCount);

// This channel has ENABLED status so we should be calling join session
Expand Down Expand Up @@ -508,7 +508,7 @@ TEST_F(IngestionFunctionalityTest, iceReconnectEmulationWithJoinSession)
EXPECT_EQ(1, describeCount);
EXPECT_EQ(1, describeMediaCount);
EXPECT_EQ(1, getEndpointCount);
EXPECT_EQ(1, getIceConfigCount);
EXPECT_EQ(2, getIceConfigCount);
EXPECT_EQ(2, connectCount);

// This channel has ENABLED status so we should be calling join session
Expand Down Expand Up @@ -583,7 +583,7 @@ TEST_F(IngestionFunctionalityTest, iceServerConfigRefreshNotConnectedJoinSession
EXPECT_EQ(0, signalingStatesCounts[SIGNALING_CLIENT_STATE_CREATE]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_GET_ENDPOINT]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_GET_ICE_CONFIG]);
EXPECT_EQ(2, signalingStatesCounts[SIGNALING_CLIENT_STATE_READY]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_READY]);
EXPECT_EQ(0, signalingStatesCounts[SIGNALING_CLIENT_STATE_CONNECTING]);
EXPECT_EQ(0, signalingStatesCounts[SIGNALING_CLIENT_STATE_CONNECTED]);
EXPECT_EQ(0, signalingStatesCounts[SIGNALING_CLIENT_STATE_JOIN_SESSION]);
Expand Down Expand Up @@ -612,7 +612,7 @@ TEST_F(IngestionFunctionalityTest, iceServerConfigRefreshNotConnectedJoinSession
EXPECT_EQ(0, signalingStatesCounts[SIGNALING_CLIENT_STATE_CREATE]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_GET_ENDPOINT]);
EXPECT_LT(2, signalingStatesCounts[SIGNALING_CLIENT_STATE_GET_ICE_CONFIG]);
EXPECT_EQ(2, signalingStatesCounts[SIGNALING_CLIENT_STATE_READY]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_READY]);
EXPECT_EQ(0, signalingStatesCounts[SIGNALING_CLIENT_STATE_CONNECTING]);
EXPECT_EQ(0, signalingStatesCounts[SIGNALING_CLIENT_STATE_CONNECTED]);
EXPECT_EQ(0, signalingStatesCounts[SIGNALING_CLIENT_STATE_JOIN_SESSION]);
Expand All @@ -634,8 +634,8 @@ TEST_F(IngestionFunctionalityTest, iceServerConfigRefreshNotConnectedJoinSession

EXPECT_EQ(0, signalingStatesCounts[SIGNALING_CLIENT_STATE_CREATE]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_GET_ENDPOINT]);
EXPECT_LT(2, signalingStatesCounts[SIGNALING_CLIENT_STATE_GET_ICE_CONFIG]);
EXPECT_EQ(3, signalingStatesCounts[SIGNALING_CLIENT_STATE_READY]);
EXPECT_LT(3, signalingStatesCounts[SIGNALING_CLIENT_STATE_GET_ICE_CONFIG]);
EXPECT_EQ(2, signalingStatesCounts[SIGNALING_CLIENT_STATE_READY]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_CONNECTING]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_CONNECTED]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_JOIN_SESSION]);
Expand Down Expand Up @@ -726,7 +726,7 @@ TEST_F(IngestionFunctionalityTest, iceServerConfigRefreshConnectedJoinSessionWit
// We should not be calling create because it's pre-created at the start of the test
EXPECT_EQ(0, signalingStatesCounts[SIGNALING_CLIENT_STATE_CREATE]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_GET_ENDPOINT]);
EXPECT_EQ(0, signalingStatesCounts[SIGNALING_CLIENT_STATE_GET_ICE_CONFIG]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_GET_ICE_CONFIG]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_READY]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_CONNECTING]);
EXPECT_EQ(1, signalingStatesCounts[SIGNALING_CLIENT_STATE_CONNECTED]);
Expand Down
2 changes: 0 additions & 2 deletions tst/JitterBufferFunctionalityTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1137,11 +1137,9 @@ TEST_F(JitterBufferFunctionalityTest, timestampOverflowTest)
UINT32 pktCount = 7;
UINT32 startingSequenceNumber = 0;
UINT32 missingSequenceNumber = 0;
UINT32 firstSequenceNumber = 0;
initializeJitterBuffer(4, 0, pktCount);
srand(time(0));
startingSequenceNumber = rand()%UINT16_MAX;
firstSequenceNumber = startingSequenceNumber - 1;

// First frame "1"
mPRtpPackets[0]->payloadLength = 1;
Expand Down
Loading
Loading