diff --git a/build.sh b/build.sh index 5a5e9b28..df4fa7a9 100755 --- a/build.sh +++ b/build.sh @@ -16,6 +16,6 @@ cmake .. -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=$GENERATORS_DIR/conan_toolch -DPRIVMX_BUILD_DEBUG_APPS=OFF \ -DPRIVMX_BUILD_ENDPOINT_INTERFACE=ON \ -DPRIVMX_ENABLE_TESTS=ON \ - -DPRIVMX_ENABLE_TESTS_E2E=ON \ + -DPRIVMX_ENABLE_TESTS_E2E=ON cmake --build . -- -j20 source $GENERATORS_DIR/deactivate_conanbuild.sh diff --git a/endpoint/stream/stream/include/privmx/endpoint/stream/StreamApiLowImpl.hpp b/endpoint/stream/stream/include/privmx/endpoint/stream/StreamApiLowImpl.hpp index 8fb4335f..1749b49b 100644 --- a/endpoint/stream/stream/include/privmx/endpoint/stream/StreamApiLowImpl.hpp +++ b/endpoint/stream/stream/include/privmx/endpoint/stream/StreamApiLowImpl.hpp @@ -113,7 +113,6 @@ class StreamApiLowImpl : public privmx::utils::ManualManagedClass getModuleKeysAndVersionFromServer(std::string moduleId) override; core::ModuleKeys streamRoomToModuleKeys(server::StreamRoomInfo streamRoom); void assertTurnServerUri(const std::string& uri); + void acceptOfferOnReconfigure(const int64_t sessionId, const SdpWithTypeModel& sdp); static int32_t nextIdCounter; static int32_t nextId() { return nextIdCounter++; } diff --git a/endpoint/stream/stream/include/privmx/endpoint/stream/varinterface/StreamApiLowVarInterface.hpp b/endpoint/stream/stream/include/privmx/endpoint/stream/varinterface/StreamApiLowVarInterface.hpp index 17f0da85..71f0d593 100644 --- a/endpoint/stream/stream/include/privmx/endpoint/stream/varinterface/StreamApiLowVarInterface.hpp +++ b/endpoint/stream/stream/include/privmx/endpoint/stream/varinterface/StreamApiLowVarInterface.hpp @@ -51,13 +51,12 @@ class StreamApiLowVarInterface { UpdateSubscriberStream = 17, RemoveSubscriberStream = 18, Trickle = 19, - AcceptOfferOnReconfigure = 20, - KeyManagement = 21, - UpdateStream = 22, - JoinStreamRoomEx = 23, - ListStreamRoomParticipants = 24, - EncryptDataChannelMessage = 25, - DecryptDataChannelMessage = 26, + KeyManagement = 20, + UpdateStream = 21, + JoinStreamRoomEx = 22, + ListStreamRoomParticipants = 23, + EncryptDataChannelMessage = 24, + DecryptDataChannelMessage = 25, }; StreamApiLowVarInterface(core::Connection connection, const core::VarSerializer& serializer) @@ -91,7 +90,6 @@ class StreamApiLowVarInterface { Poco::Dynamic::Var listStreamRoomParticipants(const Poco::Dynamic::Var& args); Poco::Dynamic::Var trickle(const Poco::Dynamic::Var& args); - Poco::Dynamic::Var acceptOfferOnReconfigure(const Poco::Dynamic::Var& args); Poco::Dynamic::Var setNewOfferOnReconfigure(const Poco::Dynamic::Var& args); Poco::Dynamic::Var encryptDataChannelMessage(const Poco::Dynamic::Var& args); diff --git a/endpoint/stream/stream/include_pub/privmx/endpoint/stream/StreamApiLow.hpp b/endpoint/stream/stream/include_pub/privmx/endpoint/stream/StreamApiLow.hpp index e14b8f6e..4b368bb2 100644 --- a/endpoint/stream/stream/include_pub/privmx/endpoint/stream/StreamApiLow.hpp +++ b/endpoint/stream/stream/include_pub/privmx/endpoint/stream/StreamApiLow.hpp @@ -78,7 +78,6 @@ class StreamApiLow : public privmx::endpoint::core::ExtendedPointeracceptOfferOnReconfigure(sessionId, sdp); - } catch (const privmx::utils::PrivmxException& e) { - core::ExceptionConverter::rethrowAsCoreException(e); - throw core::Exception("ExceptionConverter rethrow error"); - } -} - void StreamApiLow::setNewOfferOnReconfigure(const int64_t sessionId, const SdpWithTypeModel& sdp) { auto impl = getImpl(); core::Validator::validateNumberPositive(sessionId, "field:sessionId "); diff --git a/endpoint/stream/stream/src/varinterface/StreamApiLowVarInterface.cpp b/endpoint/stream/stream/src/varinterface/StreamApiLowVarInterface.cpp index 009046bb..94d05c9b 100644 --- a/endpoint/stream/stream/src/varinterface/StreamApiLowVarInterface.cpp +++ b/endpoint/stream/stream/src/varinterface/StreamApiLowVarInterface.cpp @@ -232,14 +232,6 @@ Poco::Dynamic::Var StreamApiLowVarInterface::trickle(const Poco::Dynamic::Var& a return {}; } -Poco::Dynamic::Var StreamApiLowVarInterface::acceptOfferOnReconfigure(const Poco::Dynamic::Var& args) { - auto argsArr = core::VarInterfaceUtil::validateAndExtractArray(args, 2); - auto sessionId = _deserializer.deserialize(argsArr->get(0), "sessionId"); - auto jsep = _deserializer.deserialize(argsArr->get(1), "jsep"); - _streamApi.acceptOfferOnReconfigure(sessionId, jsep); - return {}; -} - Poco::Dynamic::Var StreamApiLowVarInterface::setNewOfferOnReconfigure(const Poco::Dynamic::Var& args) { auto argsArr = core::VarInterfaceUtil::validateAndExtractArray(args, 2); auto sessionId = _deserializer.deserialize(argsArr->get(0), "sessionId"); diff --git a/test/test_env/utils/empty_server_and_mongo.yml b/test/test_env/utils/empty_server_and_mongo.yml index 4edc6d1f..a3483252 100644 --- a/test/test_env/utils/empty_server_and_mongo.yml +++ b/test/test_env/utils/empty_server_and_mongo.yml @@ -15,7 +15,7 @@ services: start_interval: 1s teamserver: - image: privmx-bridge + image: ${DOCKER_BRIDGE_IMAGE}:${DOCKER_BRIDGE_VERSION} env_file: - path: ./bridge.env required: false