You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
141 lines
4.2 KiB
141 lines
4.2 KiB
Index: configure.ac |
|
--- configure.ac.orig 2021-10-18 17:46:53.000000000 +0200 |
|
+++ configure.ac 2021-10-18 20:30:02.167603000 +0200 |
|
@@ -20,39 +20,12 @@ |
|
# Common CFLAGS |
|
CFLAGS="$CFLAGS \ |
|
-fPIC \ |
|
- -fstack-protector-all \ |
|
- -fstrict-aliasing \ |
|
- -ggdb3 \ |
|
-pthread \ |
|
- -Wall \ |
|
- -Warray-bounds \ |
|
- -Wextra \ |
|
- -Wformat-nonliteral \ |
|
- -Wformat-security \ |
|
- -Wformat=2 \ |
|
- -Winit-self \ |
|
- -Winline \ |
|
- -Wlarger-than=65537 \ |
|
- -Wmissing-declarations \ |
|
- -Wmissing-format-attribute \ |
|
- -Wmissing-include-dirs \ |
|
- -Wmissing-noreturn \ |
|
- -Wmissing-prototypes \ |
|
- -Wnested-externs \ |
|
-Wno-aggregate-return \ |
|
-Wno-missing-field-initializers \ |
|
-Wno-redundant-decls \ |
|
-Wno-undef \ |
|
- -Wno-unused-parameter \ |
|
- -Wold-style-definition \ |
|
- -Wpacked \ |
|
- -Wpointer-arith \ |
|
- -Wsign-compare \ |
|
- -Wstrict-prototypes \ |
|
- -Wswitch-default \ |
|
- -Wunused \ |
|
- -Wwrite-strings \ |
|
- -Werror=implicit-function-declaration" |
|
+ -Wno-unused-parameter" |
|
|
|
case "$CC" in |
|
*clang*) |
|
@@ -69,10 +42,8 @@ |
|
*) |
|
# Specific gcc flags |
|
CFLAGS="$CFLAGS \ |
|
- -Wcast-align \ |
|
-Wno-override-init \ |
|
- -Wunsafe-loop-optimizations \ |
|
- -Wunused-but-set-variable" |
|
+ " |
|
esac |
|
|
|
JANUS_VERSION=115 |
|
Index: janus.c |
|
--- janus.c.orig 2021-10-18 17:46:53.000000000 +0200 |
|
+++ janus.c 2021-10-18 20:30:02.168236000 +0200 |
|
@@ -395,7 +395,7 @@ |
|
g_snprintf(glib2_version, sizeof(glib2_version), "%d.%d.%d", glib_major_version, glib_minor_version, glib_micro_version); |
|
json_object_set_new(deps, "glib2", json_string(glib2_version)); |
|
json_object_set_new(deps, "jansson", json_string(JANSSON_VERSION)); |
|
- json_object_set_new(deps, "libnice", json_string(libnice_version_string)); |
|
+ json_object_set_new(deps, "libnice", json_string("0")); |
|
json_object_set_new(deps, "libsrtp", json_string(srtp_get_version_string())); |
|
#ifdef HAVE_TURNRESTAPI |
|
curl_version_info_data *curl_version = curl_version_info(CURLVERSION_NOW); |
|
@@ -5494,6 +5494,7 @@ |
|
if (!transport) { |
|
JANUS_LOG(LOG_ERR, "\tCouldn't load transport plugin '%s': %s\n", transportent->d_name, dlerror()); |
|
} else { |
|
+ (void)dlerror(); |
|
create_t *create = (create_t*) dlsym(transport, "create"); |
|
const char *dlsym_error = dlerror(); |
|
if (dlsym_error) { |
|
@@ -5563,15 +5564,6 @@ |
|
exit(1); /* FIXME Should we really give up? */ |
|
} |
|
|
|
- /* Make sure libnice is recent enough, otherwise print a warning */ |
|
- int libnice_version = 0; |
|
- if(libnice_version_string != NULL && sscanf(libnice_version_string, "%*d.%*d.%d", &libnice_version) == 1) { |
|
- if(libnice_version < 16) { |
|
- JANUS_LOG(LOG_WARN, "libnice version outdated: %s installed, at least 0.1.16 recommended. Notice the installed version was checked at build time: if you updated libnice in the meanwhile, re-configure and recompile to get rid of this warning\n", |
|
- libnice_version_string); |
|
- } |
|
- } |
|
- |
|
/* Ok, Janus has started! Let the parent now about this if we're daemonizing */ |
|
if(daemonize) { |
|
int code = 0; |
|
Index: plugins/janus_audiobridge.c |
|
--- plugins/janus_audiobridge.c.orig 2021-10-18 17:46:53.000000000 +0200 |
|
+++ plugins/janus_audiobridge.c 2021-10-18 20:30:02.169040000 +0200 |
|
@@ -969,8 +969,10 @@ |
|
#endif |
|
#include <arpa/inet.h> |
|
#include <net/if.h> |
|
+#include <sys/types.h> |
|
#include <sys/socket.h> |
|
#include <netdb.h> |
|
+#include <netinet/in.h> |
|
#include <sys/time.h> |
|
#include <poll.h> |
|
|
|
Index: transports/janus_websockets.c |
|
--- transports/janus_websockets.c.orig 2021-10-18 17:46:53.000000000 +0200 |
|
+++ transports/janus_websockets.c 2021-10-18 21:35:52.409893000 +0200 |
|
@@ -383,6 +383,9 @@ |
|
{ |
|
janus_config_item *item; |
|
char item_name[255]; |
|
+#ifdef __FreeBSD__ |
|
+ int ipv4_only = 0; |
|
+#endif |
|
|
|
item = janus_config_get(config, config_container, janus_config_type_item, prefix); |
|
if(!item || !item->value || !janus_is_true(item->value)) { |
|
@@ -486,10 +489,8 @@ |
|
} |
|
|
|
#ifdef __FreeBSD__ |
|
- if (ipv4_only) { |
|
+ if (ipv4_only) |
|
info.options |= LWS_SERVER_OPTION_DISABLE_IPV6; |
|
- ipv4_only = 0; |
|
- } |
|
#endif |
|
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK) |
|
if (unixpath) |
|
@@ -529,9 +530,6 @@ |
|
JANUS_LOG(LOG_WARN, "libwebsockets has been built without IPv6 support, will bind to IPv4 only\n"); |
|
#endif |
|
|
|
-#ifdef __FreeBSD__ |
|
- int ipv4_only = 0; |
|
-#endif |
|
/* This is the callback we'll need to invoke to contact the Janus core */ |
|
gateway = callback; |
|
|
|
|