|
|
|
@ -1,12 +1,12 @@
|
|
|
|
|
Index: configure.ac
|
|
|
|
|
--- configure.ac.orig 2020-06-17 12:06:07.000000000 +0200
|
|
|
|
|
+++ configure.ac 2020-06-21 00:31:47.533513000 +0200
|
|
|
|
|
@@ -20,38 +20,14 @@
|
|
|
|
|
--- configure.ac.orig 2021-02-08 10:37:41.000000000 +0100
|
|
|
|
|
+++ configure.ac 2021-02-08 20:10:47.180043000 +0100
|
|
|
|
|
@@ -20,39 +20,12 @@
|
|
|
|
|
# Common CFLAGS
|
|
|
|
|
CFLAGS="$CFLAGS \
|
|
|
|
|
-fPIC \
|
|
|
|
|
- -fstack-protector-all \
|
|
|
|
|
-fstrict-aliasing \
|
|
|
|
|
- -fstrict-aliasing \
|
|
|
|
|
- -ggdb3 \
|
|
|
|
|
-pthread \
|
|
|
|
|
- -Wall \
|
|
|
|
@ -28,7 +28,7 @@ Index: configure.ac
|
|
|
|
|
-Wno-missing-field-initializers \
|
|
|
|
|
-Wno-redundant-decls \
|
|
|
|
|
-Wno-undef \
|
|
|
|
|
-Wno-unused-parameter \
|
|
|
|
|
- -Wno-unused-parameter \
|
|
|
|
|
- -Wold-style-definition \
|
|
|
|
|
- -Wpacked \
|
|
|
|
|
- -Wpointer-arith \
|
|
|
|
@ -36,12 +36,13 @@ Index: configure.ac
|
|
|
|
|
- -Wstrict-prototypes \
|
|
|
|
|
- -Wswitch-default \
|
|
|
|
|
- -Wunused \
|
|
|
|
|
- -Wwrite-strings"
|
|
|
|
|
+ "
|
|
|
|
|
- -Wwrite-strings \
|
|
|
|
|
- -Werror=implicit-function-declaration"
|
|
|
|
|
+ -Wno-unused-parameter"
|
|
|
|
|
|
|
|
|
|
case "$CC" in
|
|
|
|
|
clang*)
|
|
|
|
|
@@ -63,10 +39,8 @@
|
|
|
|
|
@@ -64,10 +37,8 @@
|
|
|
|
|
*)
|
|
|
|
|
# Specific gcc flags
|
|
|
|
|
CFLAGS="$CFLAGS \
|
|
|
|
@ -52,11 +53,11 @@ Index: configure.ac
|
|
|
|
|
+ "
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
JANUS_VERSION=102
|
|
|
|
|
JANUS_VERSION=110
|
|
|
|
|
Index: janus.c
|
|
|
|
|
--- janus.c.orig 2020-06-17 12:06:07.000000000 +0200
|
|
|
|
|
+++ janus.c 2020-06-21 00:31:47.534127000 +0200
|
|
|
|
|
@@ -327,7 +327,7 @@
|
|
|
|
|
--- janus.c.orig 2021-02-08 10:37:41.000000000 +0100
|
|
|
|
|
+++ janus.c 2021-02-08 20:02:08.499892000 +0100
|
|
|
|
|
@@ -378,7 +378,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));
|
|
|
|
@ -65,7 +66,7 @@ Index: janus.c
|
|
|
|
|
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);
|
|
|
|
|
@@ -5172,6 +5172,7 @@
|
|
|
|
|
@@ -5334,6 +5334,7 @@
|
|
|
|
|
if (!transport) {
|
|
|
|
|
JANUS_LOG(LOG_ERR, "\tCouldn't load transport plugin '%s': %s\n", transportent->d_name, dlerror());
|
|
|
|
|
} else {
|
|
|
|
@ -73,7 +74,7 @@ Index: janus.c
|
|
|
|
|
create_t *create = (create_t*) dlsym(transport, "create");
|
|
|
|
|
const char *dlsym_error = dlerror();
|
|
|
|
|
if (dlsym_error) {
|
|
|
|
|
@@ -5241,15 +5242,6 @@
|
|
|
|
|
@@ -5403,15 +5404,6 @@
|
|
|
|
|
exit(1); /* FIXME Should we really give up? */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -90,9 +91,9 @@ Index: janus.c
|
|
|
|
|
if(daemonize) {
|
|
|
|
|
int code = 0;
|
|
|
|
|
Index: plugins/janus_audiobridge.c
|
|
|
|
|
--- plugins/janus_audiobridge.c.orig 2020-06-17 12:06:07.000000000 +0200
|
|
|
|
|
+++ plugins/janus_audiobridge.c 2020-06-21 00:31:47.534808000 +0200
|
|
|
|
|
@@ -809,7 +809,10 @@
|
|
|
|
|
--- plugins/janus_audiobridge.c.orig 2021-02-08 10:37:41.000000000 +0100
|
|
|
|
|
+++ plugins/janus_audiobridge.c 2021-02-08 20:02:08.500605000 +0100
|
|
|
|
|
@@ -864,7 +864,10 @@
|
|
|
|
|
#include <ogg/ogg.h>
|
|
|
|
|
#endif
|
|
|
|
|
#include <netdb.h>
|
|
|
|
@ -104,8 +105,8 @@ Index: plugins/janus_audiobridge.c
|
|
|
|
|
#include "../debug.h"
|
|
|
|
|
#include "../apierror.h"
|
|
|
|
|
Index: rtcp.h
|
|
|
|
|
--- rtcp.h.orig 2020-06-17 12:06:07.000000000 +0200
|
|
|
|
|
+++ rtcp.h 2020-06-21 00:31:47.534951000 +0200
|
|
|
|
|
--- rtcp.h.orig 2021-02-08 10:37:41.000000000 +0100
|
|
|
|
|
+++ rtcp.h 2021-02-08 20:02:08.500745000 +0100
|
|
|
|
|
@@ -19,6 +19,8 @@
|
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
|
#ifdef __MACH__
|
|
|
|
@ -116,8 +117,8 @@ Index: rtcp.h
|
|
|
|
|
#include <endian.h>
|
|
|
|
|
#endif
|
|
|
|
|
Index: rtp.h
|
|
|
|
|
--- rtp.h.orig 2020-06-17 12:06:07.000000000 +0200
|
|
|
|
|
+++ rtp.h 2020-06-21 00:32:30.422311000 +0200
|
|
|
|
|
--- rtp.h.orig 2021-02-08 10:37:41.000000000 +0100
|
|
|
|
|
+++ rtp.h 2021-02-08 20:02:08.500866000 +0100
|
|
|
|
|
@@ -19,6 +19,11 @@
|
|
|
|
|
#define __BYTE_ORDER BYTE_ORDER
|
|
|
|
|
#define __BIG_ENDIAN BIG_ENDIAN
|
|
|
|
@ -131,8 +132,8 @@ Index: rtp.h
|
|
|
|
|
#include <endian.h>
|
|
|
|
|
#endif
|
|
|
|
|
Index: text2pcap.c
|
|
|
|
|
--- text2pcap.c.orig 2020-06-17 12:06:07.000000000 +0200
|
|
|
|
|
+++ text2pcap.c 2020-06-21 00:32:42.526438000 +0200
|
|
|
|
|
--- text2pcap.c.orig 2021-02-08 10:37:41.000000000 +0100
|
|
|
|
|
+++ text2pcap.c 2021-02-08 20:02:08.500990000 +0100
|
|
|
|
|
@@ -41,6 +41,11 @@
|
|
|
|
|
#define __BYTE_ORDER BYTE_ORDER
|
|
|
|
|
#define __BIG_ENDIAN BIG_ENDIAN
|
|
|
|
@ -146,9 +147,9 @@ Index: text2pcap.c
|
|
|
|
|
#include <endian.h>
|
|
|
|
|
#endif
|
|
|
|
|
Index: transports/janus_websockets.c
|
|
|
|
|
--- transports/janus_websockets.c.orig 2020-06-17 12:06:07.000000000 +0200
|
|
|
|
|
+++ transports/janus_websockets.c 2020-06-21 00:31:47.535418000 +0200
|
|
|
|
|
@@ -274,7 +274,7 @@
|
|
|
|
|
--- transports/janus_websockets.c.orig 2021-02-08 10:37:41.000000000 +0100
|
|
|
|
|
+++ transports/janus_websockets.c 2021-02-08 20:02:08.501216000 +0100
|
|
|
|
|
@@ -293,7 +293,7 @@
|
|
|
|
|
#if (LWS_LIBRARY_VERSION_MAJOR >= 4)
|
|
|
|
|
static lws_retry_bo_t pingpong = { 0 };
|
|
|
|
|
#endif
|
|
|
|
@ -157,7 +158,7 @@ Index: transports/janus_websockets.c
|
|
|
|
|
/* Helper method to return the interface associated with a local IP address */
|
|
|
|
|
static char *janus_websockets_get_interface_name(const char *ip) {
|
|
|
|
|
struct ifaddrs *addrs = NULL, *iap = NULL;
|
|
|
|
|
@@ -553,13 +553,6 @@
|
|
|
|
|
@@ -591,13 +591,6 @@
|
|
|
|
|
/* Force single-thread server */
|
|
|
|
|
wscinfo.count_threads = 1;
|
|
|
|
|
|
|
|
|
@ -171,7 +172,7 @@ Index: transports/janus_websockets.c
|
|
|
|
|
|
|
|
|
|
/* Setup the Janus API WebSockets server(s) */
|
|
|
|
|
item = janus_config_get(config, config_general, janus_config_type_item, "ws");
|
|
|
|
|
@@ -580,12 +573,22 @@
|
|
|
|
|
@@ -618,12 +611,22 @@
|
|
|
|
|
item = janus_config_get(config, config_general, janus_config_type_item, "ws_ip");
|
|
|
|
|
if(item && item->value) {
|
|
|
|
|
ip = (char *)item->value;
|
|
|
|
|