chore: update to actual api

paullouisageneau · Jan 14, 2025 · af8f6c8 · af8f6c8
1 parent dc78582
commit af8f6c8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/deps/libjuice b/deps/libjuice
diff --git a/include/rtc/global.hpp b/include/rtc/global.hpp
@@ -35,9 +35,8 @@ RTC_CPP_EXPORT void Preload();
 RTC_CPP_EXPORT std::shared_future<void> Cleanup();
 
 RTC_CPP_EXPORT struct UnhandledStunRequest {
-	optional<std::string> ufrag;
-	optional<std::string> pwd;
-	uint8_t family;
+	optional<std::string> localUfrag;
+	optional<std::string> remoteUfrag;
 	std::string address;
 	uint16_t port;
 };

diff --git a/src/global.cpp b/src/global.cpp
@@ -95,14 +95,13 @@ void SetSctpSettings(SctpSettings s) { impl::Init::Instance().setSctpSettings(st
 
 UnhandledStunRequestCallback unboundStunCallback;
 
-void InvokeUnhandledStunRequestCallback (const juice_stun_binding_t *info, void *user_ptr) {
+void InvokeUnhandledStunRequestCallback (const juice_mux_binding_request *info, void *user_ptr) {
 	PLOG_DEBUG << "Invoking Unbind STUN listener";
 	auto callback = static_cast<UnhandledStunRequestCallback *>(user_ptr);
 
 	(*callback)({
-		.ufrag = std::string(info->ufrag),
-		.pwd = std::string(info->pwd),
-		.family = info->family,
+		.localUfrag = std::string(info->local_ufrag),
+		.remoteUfrag = std::string(info->remote_ufrag),
 		.address = std::string(info->address),
 		.port = info->port
 	});
@@ -115,7 +114,8 @@ void OnUnhandledStunRequest ([[maybe_unused]] std::string host, [[maybe_unused]]
 	if (callback == NULL) {
 		PLOG_DEBUG << "Removing unhandled STUN request listener";
 
-		if (juice_unbind_stun() < 0) {
+		// call with NULL callback to unbind
+		if (juice_mux_listen(host.c_str(), port, NULL, NULL) < 0) {
 			throw std::runtime_error("Could not unbind STUN listener");
 		}
 		unboundStunCallback = NULL;
@@ -131,7 +131,7 @@ void OnUnhandledStunRequest ([[maybe_unused]] std::string host, [[maybe_unused]]
 
 	unboundStunCallback = std::move(callback);
 
-	if (juice_bind_stun(host.c_str(), port, &InvokeUnhandledStunRequestCallback, &unboundStunCallback) < 0) {
+	if (juice_mux_listen(host.c_str(), port, &InvokeUnhandledStunRequestCallback, &unboundStunCallback) < 0) {
 		throw std::invalid_argument("Could add listener for unhandled STUN requests");
 	}
 	#endif
+13 −0		include/juice/juice.h
+8 −4		src/agent.c
+67 −1		src/conn.c
+2 −0		src/conn.h
+34 −8		src/conn_mux.c
+1 −0		src/conn_mux.h
+1 −0		src/conn_poll.c
+1 −0		src/conn_thread.c
+9 −11		src/juice.c