scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 12:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

holepunch: Fix building as plugin

Browse Source
This commit is contained in:
Martin Piatka
2022-01-12 11:49:10 +01:00
parent f7d7c9cb09
commit cbab1306aa
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main.cpp
View File

@@ -1215,13 +1215,22 @@ static int adjust_params(struct ug_options *opt) {
punch_c.host_addr = punched_host;
punch_c.host_addr_len = sizeof(punched_host);
if(!punch_udp(punch_c)){
auto punch_fcn = reinterpret_cast<bool(*)(Holepunch_config)>(
const_cast<void *>(
load_library("udp_holepunch", LIBRARY_CLASS_UNDEFINED, HOLEPUNCH_ABI_VERSION)));
if(!punch_fcn){
log_msg(LOG_LEVEL_ERROR, "Failed to load holepunching module\n");
return EXIT_FAILURE;
}
if(!punch_fcn(punch_c)){
log_msg(LOG_LEVEL_ERROR, "Hole punching failed.\n");
return EXIT_FAILURE;
}
log_msg(LOG_LEVEL_INFO, "[holepunch] remote: %s\n rx: %d\n tx: %d\n",
punched_host, opt->video_rx_port, opt->video_tx_port);
punched_host, opt->video_rx_port, opt->video_tx_port);
opt->requested_receiver = punched_host;
opt->audio.host = punched_host;
#endif //HAVE_LIBJUICE

9
src/utils/udp_holepunch.c
View File

@@ -35,6 +35,12 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_unix.h"
#include "config_win32.h"
#endif
#include <juice/juice.h>
#include <string.h>
#include <assert.h>
@@ -47,6 +53,7 @@
#include "utils/udp_holepunch.h"
#include "debug.h"
#include "lib_common.h"
#ifdef _WIN32
#include <windows.h>
@@ -382,3 +389,5 @@ bool punch_udp(struct Holepunch_config c){
return true;
}
REGISTER_MODULE(udp_holepunch, punch_udp, LIBRARY_CLASS_UNDEFINED, HOLEPUNCH_ABI_VERSION);

2
src/utils/udp_holepunch.h
View File

@@ -46,6 +46,8 @@
extern "C" {
#endif
#define HOLEPUNCH_ABI_VERSION 1
struct Holepunch_config{
const char *client_name;
const char *room_name;