Skip to content

Commit

Permalink
Check if rtcp port is > 0 before creating a RTCP socket.
Browse files Browse the repository at this point in the history
  • Loading branch information
@atoppi
atoppi committed Dec 17, 2019
1 parent 84d9f87 commit a0b7dbf
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 3 deletions.
4 changes: 3 additions & 1 deletion html/admin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":7088/admin";
else
server = "https://" + window.location.hostname + ":7889/admin";

server = ["https://" + window.location.hostname + "/admin"];
// If you don't want the page to prompt you for a password, insert it here
var secret = "";
var secret = "janusoverlord";

var session = null; // Selected session
var handle = null; // Selected handle
Expand Down
1 change: 1 addition & 0 deletions html/audiobridgetest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":8088/janus";
else
server = "https://" + window.location.hostname + ":8089/janus";
server = ["wss://" + window.location.hostname + "/janus-ws", "https://" + window.location.hostname + "/janus"];

var janus = null;
var mixertest = null;
Expand Down
1 change: 1 addition & 0 deletions html/devicetest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":8088/janus";
else
server = "https://" + window.location.hostname + ":8089/janus";
server = ["wss://" + window.location.hostname + "/janus-ws", "https://" + window.location.hostname + "/janus"];

var janus = null;
var echotest = null;
Expand Down
1 change: 1 addition & 0 deletions html/echotest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":8088/janus";
else
server = "https://" + window.location.hostname + ":8089/janus";
server = ["wss://" + window.location.hostname + "/janus-ws", "https://" + window.location.hostname + "/janus"];

var janus = null;
var echotest = null;
Expand Down
1 change: 1 addition & 0 deletions html/nosiptest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":8088/janus";
else
server = "https://" + window.location.hostname + ":8089/janus";
server = ["wss://" + window.location.hostname + "/janus-ws", "https://" + window.location.hostname + "/janus"];

var janus = null;

Expand Down
1 change: 1 addition & 0 deletions html/recordplaytest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":8088/janus";
else
server = "https://" + window.location.hostname + ":8089/janus";
server = ["wss://" + window.location.hostname + "/janus-ws", "https://" + window.location.hostname + "/janus"];

var janus = null;
var recordplay = null;
Expand Down
2 changes: 1 addition & 1 deletion html/screensharingtest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":8088/janus";
else
server = "https://" + window.location.hostname + ":8089/janus";

server = ["wss://" + window.location.hostname + "/janus-ws", "https://" + window.location.hostname + "/janus"];

var janus = null;
var screentest = null;
Expand Down
1 change: 1 addition & 0 deletions html/siptest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":8088/janus";
else
server = "https://" + window.location.hostname + ":8089/janus";
server = ["wss://" + window.location.hostname + "/janus-ws", "https://" + window.location.hostname + "/janus"];

var janus = null;
var sipcall = null;
Expand Down
1 change: 1 addition & 0 deletions html/streamingtest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":8088/janus";
else
server = "https://" + window.location.hostname + ":8089/janus";
server = ["wss://" + window.location.hostname + "/janus-ws", "https://" + window.location.hostname + "/janus"];

var janus = null;
var streaming = null;
Expand Down
1 change: 1 addition & 0 deletions html/textroomtest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":8088/janus";
else
server = "https://" + window.location.hostname + ":8089/janus";
server = ["wss://" + window.location.hostname + "/janus-ws", "https://" + window.location.hostname + "/janus"];

var janus = null;
var textroom = null;
Expand Down
1 change: 1 addition & 0 deletions html/videocalltest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":8088/janus";
else
server = "https://" + window.location.hostname + ":8089/janus";
server = ["wss://" + window.location.hostname + "/janus-ws", "https://" + window.location.hostname + "/janus"];

var janus = null;
var videocall = null;
Expand Down
1 change: 1 addition & 0 deletions html/videoroomtest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":8088/janus";
else
server = "https://" + window.location.hostname + ":8089/janus";
server = ["wss://" + window.location.hostname + "/janus-ws", "https://" + window.location.hostname + "/janus"];

var janus = null;
var sfutest = null;
Expand Down
1 change: 1 addition & 0 deletions html/voicemailtest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":8088/janus";
else
server = "https://" + window.location.hostname + ":8089/janus";
server = ["wss://" + window.location.hostname + "/janus-ws", "https://" + window.location.hostname + "/janus"];

var janus = null;
var vmailtest = null;
Expand Down
1 change: 1 addition & 0 deletions html/vp9svctest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(window.location.protocol === 'http:')
server = "http://" + window.location.hostname + ":8088/janus";
else
server = "https://" + window.location.hostname + ":8089/janus";
server = ["wss://" + window.location.hostname + "/janus-ws", "https://" + window.location.hostname + "/janus"];

var janus = null;
var sfutest = null;
Expand Down
2 changes: 1 addition & 1 deletion plugins/janus_videoroom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1736,7 +1736,7 @@ static guint32 janus_videoroom_rtp_forwarder_add_helper(janus_videoroom_publishe
/* Do we need to bind to a port for RTCP? */
int fd = -1;
uint16_t local_rtcp_port = 0;
if(!is_data && rtcp_port > -1) {
if(!is_data && rtcp_port > 0) {
fd = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
if(fd < 0) {
janus_mutex_unlock(&p->rtp_forwarders_mutex);
Expand Down

0 comments on commit a0b7dbf

Please sign in to comment.