From 1c6611a7fb4f91b6f10ca801f04ece533e83a037 Mon Sep 17 00:00:00 2001 From: Ghazi Triki Date: Mon, 2 Jul 2018 22:24:57 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20SIP=20connection=20test=20and=20improve?= =?UTF-8?q?=20logging=20for=20SIP=C2=A8Application=20class.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigbluebutton/clientcheck/service/RTMPTunnelingService.as | 3 ++- .../java/org/bigbluebutton/voiceconf/red5/Application.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bbb-client-check/src/org/bigbluebutton/clientcheck/service/RTMPTunnelingService.as b/bbb-client-check/src/org/bigbluebutton/clientcheck/service/RTMPTunnelingService.as index a3e6803fc663..30d5921ad8f5 100644 --- a/bbb-client-check/src/org/bigbluebutton/clientcheck/service/RTMPTunnelingService.as +++ b/bbb-client-check/src/org/bigbluebutton/clientcheck/service/RTMPTunnelingService.as @@ -43,6 +43,7 @@ package org.bigbluebutton.clientcheck.service private static var RECORD_MOCK:Boolean=false; private static var EXTERNAL_USER_ID_MOCK:String="123456"; private static var INTERNAL_USER_ID_MOCK:String="654321"; + private static var CLIENT_CONN_ID:String="client-conn-id"; private static var LOCK_ON_MOCK:Boolean=true; public function init():void @@ -60,7 +61,7 @@ package org.bigbluebutton.clientcheck.service // sip has a different way of connecting to the red5 server, need to fake connection data. if (systemConfiguration.rtmpApps[i].applicationUri.indexOf("sip") > 0) { - _netConnection.connect(systemConfiguration.rtmpApps[i].applicationUri, ROOM_MOCK, EXTERNAL_USER_ID_MOCK, USER_NAME_MOCK, INTERNAL_USER_ID_MOCK); + _netConnection.connect(systemConfiguration.rtmpApps[i].applicationUri, ROOM_MOCK, EXTERNAL_USER_ID_MOCK, USER_NAME_MOCK, INTERNAL_USER_ID_MOCK, CLIENT_CONN_ID); continue; } else diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Application.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Application.java index 7521484f3785..42d7240014ae 100755 --- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Application.java +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Application.java @@ -86,7 +86,7 @@ public void appStop(IScope scope) { public boolean appConnect(IConnection conn, Object[] params) { if(params.length != 5) { - log.error("Invalid number of parameters. param length=" + params.length); + log.error("Invalid number of parameters. Provided parameters={} .Required parameters=5", params.length); return false; }