Skip to content

Commit b820e2e

Browse files
codingspiritcodingspirit
authored
add support for CN region (#1612)
Signed-off-by: Alex Li <zhiqinli@amazon.com> Signed-off-by: Alex Li <zhiqinli@amazon.com>
1 parent ced19d0 commit b820e2e

File tree

7 files changed

+22
-9
lines changed

7 files changed

+22
-9
lines changed

‎samples/Common.c

+7-1
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,13 @@ STATUS initializePeerConnection(PSampleConfiguration pSampleConfiguration, PRtcP
357357
configuration.iceTransportPolicy = ICE_TRANSPORT_POLICY_ALL;
358358

359359
// Set the STUN server
360-
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, pSampleConfiguration->channelInfo.pRegion);
360+
PCHAR pKinesisVideoStunUrlPostFix = KINESIS_VIDEO_STUN_URL_POSTFIX;
361+
// If region is in CN, add CN region uri postfix
362+
if (STRSTR(pSampleConfiguration->channelInfo.pRegion, "cn-")) {
363+
pKinesisVideoStunUrlPostFix = KINESIS_VIDEO_STUN_URL_POSTFIX_CN;
364+
}
365+
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, pSampleConfiguration->channelInfo.pRegion,
366+
pKinesisVideoStunUrlPostFix);
361367

362368
if (pSampleConfiguration->useTurn) {
363369
// Set the URIs from the configuration

‎src/include/com/amazonaws/kinesis/video/webrtcclient/Include.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,9 @@ extern "C" {
623623
/**
624624
* Parameterized string for KVS STUN Server
625625
*/
626-
#define KINESIS_VIDEO_STUN_URL "stun:stun.kinesisvideo.%s.amazonaws.com:443"
626+
#define KINESIS_VIDEO_STUN_URL_POSTFIX "amazonaws.com"
627+
#define KINESIS_VIDEO_STUN_URL_POSTFIX_CN "amazonaws.com.cn"
628+
#define KINESIS_VIDEO_STUN_URL "stun:stun.kinesisvideo.%s.%s:443"
627629

628630
/**
629631
* Default signaling SSL port

‎src/source/Signaling/ChannelInfo.c

+4
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ STATUS createValidateChannelInfo(PChannelInfo pOrigChannelInfo, PChannelInfo* pp
127127
// Create a fully qualified URI
128128
SNPRINTF(pCurPtr, MAX_CONTROL_PLANE_URI_CHAR_LEN, "%s%s.%s%s", CONTROL_PLANE_URI_PREFIX, KINESIS_VIDEO_SERVICE_NAME, pChannelInfo->pRegion,
129129
CONTROL_PLANE_URI_POSTFIX);
130+
// If region is in CN, add CN region uri postfix
131+
if (STRSTR(pChannelInfo->pRegion, "cn-")) {
132+
STRCAT(pCurPtr, ".cn");
133+
}
130134
}
131135

132136
pChannelInfo->pControlPlaneUrl = pCurPtr;

‎tst/PeerConnectionFunctionalityTest.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ TEST_F(PeerConnectionFunctionalityTest, sendDataWithClosedSocketConnectionWithHo
232232
PSocketConnection pSocketConnection;
233233

234234
MEMSET(&configuration, 0x00, SIZEOF(RtcConfiguration));
235-
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION);
235+
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION, TEST_DEFAULT_STUN_URL_POSTFIX);
236236

237237
EXPECT_EQ(createPeerConnection(&configuration, &offerPc), STATUS_SUCCESS);
238238
EXPECT_EQ(createPeerConnection(&configuration, &answerPc), STATUS_SUCCESS);
@@ -524,7 +524,7 @@ TEST_F(PeerConnectionFunctionalityTest, connectTwoPeersWithHostAndStun)
524524
MEMSET(&configuration, 0x00, SIZEOF(RtcConfiguration));
525525

526526
// Set the STUN server
527-
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION);
527+
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION, TEST_DEFAULT_STUN_URL_POSTFIX);
528528

529529
EXPECT_EQ(createPeerConnection(&configuration, &offerPc), STATUS_SUCCESS);
530530
EXPECT_EQ(createPeerConnection(&configuration, &answerPc), STATUS_SUCCESS);

‎tst/SdpApiTest.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ a=group:BUNDLE 0
614614
RtcSessionDescriptionInit offerSdp{};
615615
RtcSessionDescriptionInit answerSdp{};
616616

617-
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION);
617+
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION, TEST_DEFAULT_STUN_URL_POSTFIX);
618618

619619
track1.kind = MEDIA_STREAM_TRACK_KIND_VIDEO;
620620
track1.codec = RTC_CODEC_VP8;
@@ -667,7 +667,7 @@ a=group:BUNDLE 0
667667
RtcSessionDescriptionInit offerSdp{};
668668
RtcSessionDescriptionInit answerSdp{};
669669

670-
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION);
670+
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION, TEST_DEFAULT_STUN_URL_POSTFIX);
671671

672672
track1.kind = MEDIA_STREAM_TRACK_KIND_VIDEO;
673673
track1.codec = RTC_CODEC_VP8;
@@ -725,7 +725,7 @@ a=group:BUNDLE 0
725725
RtcSessionDescriptionInit offerSdp{};
726726
RtcSessionDescriptionInit answerSdp{};
727727

728-
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION);
728+
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION, TEST_DEFAULT_STUN_URL_POSTFIX);
729729

730730
track1.kind = MEDIA_STREAM_TRACK_KIND_VIDEO;
731731
track1.codec = RTC_CODEC_VP8;
@@ -788,7 +788,7 @@ a=ice-options:trickle
788788
RtcSessionDescriptionInit offerSdp{};
789789
RtcSessionDescriptionInit answerSdp{};
790790

791-
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION);
791+
SNPRINTF(configuration.iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION, TEST_DEFAULT_STUN_URL_POSTFIX);
792792

793793
track1.kind = MEDIA_STREAM_TRACK_KIND_VIDEO;
794794
track1.codec = RTC_CODEC_VP8;

‎tst/WebRTCClientTestFixture.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ void WebRtcClientTestBase::getIceServers(PRtcConfiguration pRtcConfiguration)
256256
EXPECT_EQ(STATUS_SUCCESS, signalingClientGetIceConfigInfoCount(mSignalingClientHandle, &iceConfigCount));
257257

258258
// Set the STUN server
259-
SNPRINTF(pRtcConfiguration->iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION);
259+
SNPRINTF(pRtcConfiguration->iceServers[0].urls, MAX_ICE_CONFIG_URI_LEN, KINESIS_VIDEO_STUN_URL, TEST_DEFAULT_REGION, TEST_DEFAULT_STUN_URL_POSTFIX);
260260

261261
for (uriCount = 0, i = 0; i < iceConfigCount; i++) {
262262
EXPECT_EQ(STATUS_SUCCESS, signalingClientGetIceConfigInfo(mSignalingClientHandle, i, &pIceConfigInfo));

‎tst/WebRTCClientTestFixture.h

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <atomic>
99

1010
#define TEST_DEFAULT_REGION ((PCHAR) "us-west-2")
11+
#define TEST_DEFAULT_STUN_URL_POSTFIX (KINESIS_VIDEO_STUN_URL_POSTFIX)
1112
#define TEST_STREAMING_TOKEN_DURATION (40 * HUNDREDS_OF_NANOS_IN_A_SECOND)
1213
#define TEST_JITTER_BUFFER_CLOCK_RATE (1000)
1314
#define TEST_SIGNALING_MASTER_CLIENT_ID (PCHAR) "Test_Master_ClientId"

0 commit comments

Comments
 (0)