Skip to content

Commit 621b670

Browse files
disa6302disa6302
committed
Disable AWS for lws ubuntu 20.04
1 parent 805656f commit 621b670

File tree

3 files changed

+140
-144
lines changed

3 files changed

+140
-144
lines changed

‎.github/workflows/ci.yml

Lines changed: 138 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -507,157 +507,154 @@ jobs:
507507
- name: Install dependencies
508508
run: |
509509
sudo apt clean && sudo apt update
510-
sudo apt-get -y install libcurl4-openssl-dev
511-
openssl version
512510
- name: Build repository
513511
run: |
514512
# TODO: Remove the following line. This is only a workaround for enabling IPv6, https://github.com/travis-ci/travis-ci/issues/8891.
515513
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
516514
mkdir build && cd build
517-
cmake .. -DBUILD_TEST=TRUE
515+
cmake .. -DBUILD_TEST=TRUE -DENABLE_AWS_SDK_IN_TESTS=OFF
518516
make
519517
- name: Run tests
520518
run: |
521519
cd build
522520
timeout --signal=SIGABRT 60m ./tst/webrtc_client_test
523-
ubuntu-os-build-openssl-old:
524-
runs-on: ubuntu-latest
525-
env:
526-
AWS_KVS_LOG_LEVEL: 2
527-
permissions:
528-
id-token: write
529-
contents: read
530-
steps:
531-
- name: Clone repository
532-
uses: actions/checkout@v3
533-
- name: Configure AWS Credentials
534-
uses: aws-actions/configure-aws-credentials@v2
535-
with:
536-
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
537-
aws-region: ${{ secrets.AWS_REGION }}
538-
- name: Install dependencies
539-
run: |
540-
sudo apt clean && sudo apt update
541-
sudo apt-get -y install libcurl4-openssl-dev
542-
openssl version
543-
- name: Build repository
544-
run: |
545-
# TODO: Remove the following line. This is only a workaround for enabling IPv6, https://github.com/travis-ci/travis-ci/issues/8891.
546-
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
547-
mkdir build && cd build
548-
cmake .. -DBUILD_TEST=TRUE -DBUILD_OLD_OPENSSL_VERSION=ON -DENABLE_AWS_SDK_IN_TESTS=OFF
549-
make
550-
- name: Run tests
551-
run: |
552-
cd build
553-
timeout --signal=SIGABRT 60m ./tst/webrtc_client_test
554-
windows-msvc-openssl:
555-
runs-on: windows-2022
556-
env:
557-
AWS_KVS_LOG_LEVEL: 1
558-
permissions:
559-
id-token: write
560-
contents: read
561-
steps:
562-
- name: Clone repository
563-
uses: actions/checkout@v3
564-
- name: Configure AWS Credentials
565-
uses: aws-actions/configure-aws-credentials@v2
566-
with:
567-
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
568-
aws-region: ${{ secrets.AWS_REGION }}
569-
- name: Move cloned repo
570-
shell: powershell
571-
run: |
572-
mkdir C:\webrtc
573-
Move-Item -Path "D:\a\amazon-kinesis-video-streams-webrtc-sdk-c\amazon-kinesis-video-streams-webrtc-sdk-c\*" -Destination "C:\webrtc"
574-
- name: Install dependencies
575-
shell: powershell
576-
run: |
577-
choco install gstreamer --version=1.16.2
578-
choco install gstreamer-devel --version=1.16.2
579-
curl.exe -o C:\tools\pthreads-w32-2-9-1-release.zip ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip
580-
mkdir C:\tools\pthreads-w32-2-9-1-release\
581-
Expand-Archive -Path C:\tools\pthreads-w32-2-9-1-release.zip -DestinationPath C:\tools\pthreads-w32-2-9-1-release
582-
# - name: Build libwebsockets from source
583-
# shell: powershell
584-
# run: |
585-
# $env:Path += ';C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\a\amazon-kinesis-video-streams-webrtc-sdk-c\amazon-kinesis-video-streams-webrtc-sdk-c\open-source\bin;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\lib\x64;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\include'
586-
# git config --system core.longpaths true
587-
# cd C:\tools\
588-
# git clone https://github.com/warmcat/libwebsockets.git
589-
# git checkout v4.2.2
590-
# cd libwebsockets
591-
# mkdir build
592-
# cd build
593-
# cmake .. -DLWS_HAVE_PTHREAD_H=1 -DLWS_EXT_PTHREAD_INCLUDE_DIR="C:\\tools\\pthreads-w32-2-9-1-release\\Pre-built.2\\include" -DLWS_EXT_PTHREAD_LIBRARIES="C:\\tools\\pthreads-w32-2-9-1-release\\Pre-built.2\\lib\\x64\\libpthreadGC2.a" -DLWS_WITH_MINIMAL_EXAMPLES=1 -DLWS_OPENSSL_INCLUDE_DIRS="C:\\Program Files\\OpenSSL\\include" -DLWS_OPENSSL_LIBRARIES="C:\\Program Files\\OpenSSL\\lib\\libssl.lib;C:\\Program Files\\OpenSSL\\lib\\libcrypto.lib"
594-
# cmake --build . --config DEBUG
595-
- name: Build repository
596-
shell: powershell
597-
run: |
598-
openssl version
599-
cd C:\webrtc
600-
git config --system core.longpaths true
601-
.github\build_windows_openssl.bat
602-
- name: Run tests
603-
shell: powershell
604-
run: |
605-
$env:Path += ';C:\webrtc\open-source\bin;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\dll\x64;C:\webrtc\build'
606-
& "C:\webrtc\build\tst\webrtc_client_test.exe" --gtest_filter="-DataChannelFunctionalityTest.*:DtlsApiTest*:IceApiTest.*:IceFunctionalityTest.*:PeerConnectionFunctionalityTest.*:SignalingApiFunctionalityTest.*:TurnConnectionFunctionalityTest.*:RtpFunctionalityTest.marshallUnmarshallH264Data:RtpFunctionalityTest.packingUnpackingVerifySameH264Frame:RtcpFunctionalityTest.onRtcpPacketCompound:RtcpFunctionalityTest.twcc3"
607-
windows-msvc-openssl-old:
608-
runs-on: windows-2022
609-
env:
610-
AWS_KVS_LOG_LEVEL: 1
611-
permissions:
612-
id-token: write
613-
contents: read
614-
steps:
615-
- name: Clone repository
616-
uses: actions/checkout@v3
617-
- name: Configure AWS Credentials
618-
uses: aws-actions/configure-aws-credentials@v2
619-
with:
620-
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
621-
aws-region: ${{ secrets.AWS_REGION }}
622-
- name: Move cloned repo
623-
shell: powershell
624-
run: |
625-
mkdir C:\webrtc
626-
Move-Item -Path "D:\a\amazon-kinesis-video-streams-webrtc-sdk-c\amazon-kinesis-video-streams-webrtc-sdk-c\*" -Destination "C:\webrtc"
627-
- name: Install dependencies
628-
shell: powershell
629-
run: |
630-
choco install gstreamer --version=1.16.2
631-
choco install gstreamer-devel --version=1.16.2
632-
curl.exe -o C:\tools\pthreads-w32-2-9-1-release.zip ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip
633-
mkdir C:\tools\pthreads-w32-2-9-1-release\
634-
Expand-Archive -Path C:\tools\pthreads-w32-2-9-1-release.zip -DestinationPath C:\tools\pthreads-w32-2-9-1-release
635-
# - name: Build libwebsockets from source
636-
# shell: powershell
637-
# run: |
638-
# $env:Path += ';C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\a\amazon-kinesis-video-streams-webrtc-sdk-c\amazon-kinesis-video-streams-webrtc-sdk-c\open-source\bin;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\lib\x64;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\include'
639-
# git config --system core.longpaths true
640-
# cd C:\tools\
641-
# git clone https://github.com/warmcat/libwebsockets.git
642-
# git checkout v4.2.2
643-
# cd libwebsockets
644-
# mkdir build
645-
# cd build
646-
# cmake .. -DLWS_HAVE_PTHREAD_H=1 -DLWS_EXT_PTHREAD_INCLUDE_DIR="C:\\tools\\pthreads-w32-2-9-1-release\\Pre-built.2\\include" -DLWS_EXT_PTHREAD_LIBRARIES="C:\\tools\\pthreads-w32-2-9-1-release\\Pre-built.2\\lib\\x64\\libpthreadGC2.a" -DLWS_WITH_MINIMAL_EXAMPLES=1 -DLWS_OPENSSL_INCLUDE_DIRS="C:\\Program Files\\OpenSSL\\include" -DLWS_OPENSSL_LIBRARIES="C:\\Program Files\\OpenSSL\\lib\\libssl.lib;C:\\Program Files\\OpenSSL\\lib\\libcrypto.lib"
647-
# cmake --build . --config DEBUG
648-
- name: Build repository
649-
shell: powershell
650-
run: |
651-
openssl version
652-
cd C:\webrtc
653-
git config --system core.longpaths true
654-
.github\build_windows_openssl_old.bat
655-
- name: Run tests
656-
shell: powershell
657-
run: |
658-
$env:Path += ';C:\webrtc\open-source\bin;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\dll\x64;C:\webrtc\build'
659-
& "C:\webrtc\build\tst\webrtc_client_test.exe" --gtest_filter="-DataChannelFunctionalityTest.*:DtlsApiTest*:IceApiTest.*:IceFunctionalityTest.*:PeerConnectionFunctionalityTest.*:SignalingApiFunctionalityTest.*:TurnConnectionFunctionalityTest.*:RtpFunctionalityTest.marshallUnmarshallH264Data:RtpFunctionalityTest.packingUnpackingVerifySameH264Frame:RtcpFunctionalityTest.onRtcpPacketCompound:RtcpFunctionalityTest.twcc3"
660-
521+
# ubuntu-os-build-openssl-old:
522+
# runs-on: ubuntu-latest
523+
# env:
524+
# AWS_KVS_LOG_LEVEL: 2
525+
# permissions:
526+
# id-token: write
527+
# contents: read
528+
# steps:
529+
# - name: Clone repository
530+
# uses: actions/checkout@v3
531+
# - name: Configure AWS Credentials
532+
# uses: aws-actions/configure-aws-credentials@v2
533+
# with:
534+
# role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
535+
# aws-region: ${{ secrets.AWS_REGION }}
536+
# - name: Install dependencies
537+
# run: |
538+
# sudo apt clean && sudo apt update
539+
# sudo apt-get -y install libcurl4-openssl-dev
540+
# - name: Build repository
541+
# run: |
542+
# # TODO: Remove the following line. This is only a workaround for enabling IPv6, https://github.com/travis-ci/travis-ci/issues/8891.
543+
# sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
544+
# mkdir build && cd build
545+
# cmake .. -DBUILD_TEST=TRUE -DBUILD_OLD_OPENSSL_VERSION=ON -DENABLE_AWS_SDK_IN_TESTS=OFF
546+
# make
547+
# - name: Run tests
548+
# run: |
549+
# cd build
550+
# timeout --signal=SIGABRT 60m ./tst/webrtc_client_test
551+
# windows-msvc-openssl:
552+
# runs-on: windows-2022
553+
# env:
554+
# AWS_KVS_LOG_LEVEL: 1
555+
# permissions:
556+
# id-token: write
557+
# contents: read
558+
# steps:
559+
# - name: Clone repository
560+
# uses: actions/checkout@v3
561+
# - name: Configure AWS Credentials
562+
# uses: aws-actions/configure-aws-credentials@v2
563+
# with:
564+
# role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
565+
# aws-region: ${{ secrets.AWS_REGION }}
566+
# - name: Move cloned repo
567+
# shell: powershell
568+
# run: |
569+
# mkdir C:\webrtc
570+
# Move-Item -Path "D:\a\amazon-kinesis-video-streams-webrtc-sdk-c\amazon-kinesis-video-streams-webrtc-sdk-c\*" -Destination "C:\webrtc"
571+
# - name: Install dependencies
572+
# shell: powershell
573+
# run: |
574+
# choco install gstreamer --version=1.16.2
575+
# choco install gstreamer-devel --version=1.16.2
576+
# curl.exe -o C:\tools\pthreads-w32-2-9-1-release.zip ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip
577+
# mkdir C:\tools\pthreads-w32-2-9-1-release\
578+
# Expand-Archive -Path C:\tools\pthreads-w32-2-9-1-release.zip -DestinationPath C:\tools\pthreads-w32-2-9-1-release
579+
# # - name: Build libwebsockets from source
580+
# # shell: powershell
581+
# # run: |
582+
# # $env:Path += ';C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\a\amazon-kinesis-video-streams-webrtc-sdk-c\amazon-kinesis-video-streams-webrtc-sdk-c\open-source\bin;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\lib\x64;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\include'
583+
# # git config --system core.longpaths true
584+
# # cd C:\tools\
585+
# # git clone https://github.com/warmcat/libwebsockets.git
586+
# # git checkout v4.2.2
587+
# # cd libwebsockets
588+
# # mkdir build
589+
# # cd build
590+
# # cmake .. -DLWS_HAVE_PTHREAD_H=1 -DLWS_EXT_PTHREAD_INCLUDE_DIR="C:\\tools\\pthreads-w32-2-9-1-release\\Pre-built.2\\include" -DLWS_EXT_PTHREAD_LIBRARIES="C:\\tools\\pthreads-w32-2-9-1-release\\Pre-built.2\\lib\\x64\\libpthreadGC2.a" -DLWS_WITH_MINIMAL_EXAMPLES=1 -DLWS_OPENSSL_INCLUDE_DIRS="C:\\Program Files\\OpenSSL\\include" -DLWS_OPENSSL_LIBRARIES="C:\\Program Files\\OpenSSL\\lib\\libssl.lib;C:\\Program Files\\OpenSSL\\lib\\libcrypto.lib"
591+
# # cmake --build . --config DEBUG
592+
# - name: Build repository
593+
# shell: powershell
594+
# run: |
595+
# openssl version
596+
# cd C:\webrtc
597+
# git config --system core.longpaths true
598+
# .github\build_windows_openssl.bat
599+
# - name: Run tests
600+
# shell: powershell
601+
# run: |
602+
# $env:Path += ';C:\webrtc\open-source\bin;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\dll\x64;C:\webrtc\build'
603+
# & "C:\webrtc\build\tst\webrtc_client_test.exe" --gtest_filter="-DataChannelFunctionalityTest.*:DtlsApiTest*:IceApiTest.*:IceFunctionalityTest.*:PeerConnectionFunctionalityTest.*:SignalingApiFunctionalityTest.*:TurnConnectionFunctionalityTest.*:RtpFunctionalityTest.marshallUnmarshallH264Data:RtpFunctionalityTest.packingUnpackingVerifySameH264Frame:RtcpFunctionalityTest.onRtcpPacketCompound:RtcpFunctionalityTest.twcc3"
604+
# windows-msvc-openssl-old:
605+
# runs-on: windows-2022
606+
# env:
607+
# AWS_KVS_LOG_LEVEL: 1
608+
# permissions:
609+
# id-token: write
610+
# contents: read
611+
# steps:
612+
# - name: Clone repository
613+
# uses: actions/checkout@v3
614+
# - name: Configure AWS Credentials
615+
# uses: aws-actions/configure-aws-credentials@v2
616+
# with:
617+
# role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
618+
# aws-region: ${{ secrets.AWS_REGION }}
619+
# - name: Move cloned repo
620+
# shell: powershell
621+
# run: |
622+
# mkdir C:\webrtc
623+
# Move-Item -Path "D:\a\amazon-kinesis-video-streams-webrtc-sdk-c\amazon-kinesis-video-streams-webrtc-sdk-c\*" -Destination "C:\webrtc"
624+
# - name: Install dependencies
625+
# shell: powershell
626+
# run: |
627+
# choco install gstreamer --version=1.16.2
628+
# choco install gstreamer-devel --version=1.16.2
629+
# curl.exe -o C:\tools\pthreads-w32-2-9-1-release.zip ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip
630+
# mkdir C:\tools\pthreads-w32-2-9-1-release\
631+
# Expand-Archive -Path C:\tools\pthreads-w32-2-9-1-release.zip -DestinationPath C:\tools\pthreads-w32-2-9-1-release
632+
# # - name: Build libwebsockets from source
633+
# # shell: powershell
634+
# # run: |
635+
# # $env:Path += ';C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\a\amazon-kinesis-video-streams-webrtc-sdk-c\amazon-kinesis-video-streams-webrtc-sdk-c\open-source\bin;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\lib\x64;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\include'
636+
# # git config --system core.longpaths true
637+
# # cd C:\tools\
638+
# # git clone https://github.com/warmcat/libwebsockets.git
639+
# # git checkout v4.2.2
640+
# # cd libwebsockets
641+
# # mkdir build
642+
# # cd build
643+
# # cmake .. -DLWS_HAVE_PTHREAD_H=1 -DLWS_EXT_PTHREAD_INCLUDE_DIR="C:\\tools\\pthreads-w32-2-9-1-release\\Pre-built.2\\include" -DLWS_EXT_PTHREAD_LIBRARIES="C:\\tools\\pthreads-w32-2-9-1-release\\Pre-built.2\\lib\\x64\\libpthreadGC2.a" -DLWS_WITH_MINIMAL_EXAMPLES=1 -DLWS_OPENSSL_INCLUDE_DIRS="C:\\Program Files\\OpenSSL\\include" -DLWS_OPENSSL_LIBRARIES="C:\\Program Files\\OpenSSL\\lib\\libssl.lib;C:\\Program Files\\OpenSSL\\lib\\libcrypto.lib"
644+
# # cmake --build . --config DEBUG
645+
# - name: Build repository
646+
# shell: powershell
647+
# run: |
648+
# openssl version
649+
# cd C:\webrtc
650+
# git config --system core.longpaths true
651+
# .github\build_windows_openssl_old.bat
652+
# - name: Run tests
653+
# shell: powershell
654+
# run: |
655+
# $env:Path += ';C:\webrtc\open-source\bin;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\dll\x64;C:\webrtc\build'
656+
# & "C:\webrtc\build\tst\webrtc_client_test.exe" --gtest_filter="-DataChannelFunctionalityTest.*:DtlsApiTest*:IceApiTest.*:IceFunctionalityTest.*:PeerConnectionFunctionalityTest.*:SignalingApiFunctionalityTest.*:TurnConnectionFunctionalityTest.*:RtpFunctionalityTest.marshallUnmarshallH264Data:RtpFunctionalityTest.packingUnpackingVerifySameH264Frame:RtcpFunctionalityTest.onRtcpPacketCompound:RtcpFunctionalityTest.twcc3"
657+
#
661658
# # windows-msvc-mbedtls:
662659
# # runs-on: windows-2022
663660
# # env:

‎CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,9 @@ if(BUILD_DEPENDENCIES)
177177
-DOPENSSL_DIR=${OPEN_SRC_INSTALL_PREFIX}
178178
-DUSE_OPENSSL=${USE_OPENSSL}
179179
-DUSE_MBEDTLS=${USE_MBEDTLS}
180-
-DLWS_OPENSSL_LIBRARIES=${OPEN_SRC_INSTALL_PREFIX}
181180
-DLWS_OPENSSL_CRYPTO_LIBRARY=${OPENSSL_CRYPTO_LIBRARY}
182181
-DLWS_OPENSSL_SSL_LIBRARY=${OPENSSL_SSL_LIBRARY}
183-
-DLWS_OPENSSL_INCLUDE_DIRS=${OPENSSL_INCLUDE_DIRS}
182+
-DLWS_OPENSSL_INCLUDE_DIRS=${OPENSSL_INCLUDE_DIR}
184183
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS})
185184
endif()
186185
build_dependency(websockets ${BUILD_ARGS})

‎src/source/Signaling/LwsApiCalls.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ INT32 lwsHttpCallbackRoutine(struct lws* wsi, enum lws_callback_reasons reason,
5757
customData = lws_get_opaque_user_data(wsi);
5858
pLwsCallInfo = (PLwsCallInfo) customData;
5959

60-
lws_set_log_level(LLL_NOTICE | LLL_WARN | LLL_ERR, NULL);
60+
lws_set_log_level(LLL_NOTICE | LLL_WARN | LLL_ERR | LLL_DEBUG, NULL);
6161

6262
CHK(pLwsCallInfo != NULL && pLwsCallInfo->pSignalingClient != NULL && pLwsCallInfo->pSignalingClient->pLwsContext != NULL &&
6363
pLwsCallInfo->callInfo.pRequestInfo != NULL && pLwsCallInfo->protocolIndex == PROTOCOL_INDEX_HTTPS,

0 commit comments

Comments
 (0)