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 ba45b35cf726b699f452081e0c0bbe897066543b..60a229a7fe3c4ecedc694bf8ef70cb819c28e8d0 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
@@ -38,9 +38,9 @@ public class Application extends MultiThreadedApplicationAdapter {
callStreamFactory.setScope(scope);
sipPeerManager.setCallStreamFactory(callStreamFactory);
sipPeerManager.setClientConnectionManager(clientConnManager);
- sipPeerManager.createSipPeer(sipServerHost, sipServerHost, startSipPort, startRtpPort, stopRtpPort);
+ sipPeerManager.createSipPeer("default", sipServerHost, startSipPort, startRtpPort, stopRtpPort);
try {
- sipPeerManager.register(sipServerHost, username, password);
+ sipPeerManager.register("default", username, password);
} catch (PeerNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java
index 78a837e7b25f8860b6d75eaad092f195aac7b284..17d71a1be87889b582610d6cd4d11f5944bd0053 100755
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java
+++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java
@@ -16,7 +16,6 @@ public class Service {
private MessageFormat callExtensionPattern = new MessageFormat("{0}");
public Boolean call(String peerId, String callerName, String destination) {
-// destination = "600";
log.debug("Joining voice conference " + destination);
String extension = callExtensionPattern.format(new String[] { destination });
try {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
index ca240593dd9f57e2c328c2d94282b83df476631d..a9df9f2a0a3744deddb950fd5e1b92b5a9bb09ca 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
@@ -156,12 +156,12 @@ package org.bigbluebutton.modules.phone.managers {
//********************************************************************************************
public function doCall(dialStr:String):void {
LogUtil.debug("Calling " + dialStr);
- netConnection.call("voiceconf.call", null, "127.0.0.1", username, dialStr);
+ netConnection.call("voiceconf.call", null, "default", username, dialStr);
}
public function doHangUp():void {
if (isConnected) {
- netConnection.call("voiceconf.hangup", null, "127.0.0.1");
+ netConnection.call("voiceconf.hangup", null, "default");
isConnected = false;
}
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/PhoneManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/PhoneManager.as
index 76b46b33065d9aa72b6047d6637e444215029e98..920fed7adaf0fa8231d39b431009aee04724ed2d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/PhoneManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/PhoneManager.as
@@ -60,8 +60,8 @@ package org.bigbluebutton.modules.phone.managers
}
public function dialConference():void {
- LogUtil.debug("Dialing...." + attributes.voicebridge);
- connectionManager.doCall(attributes.voicebridge);
+ LogUtil.debug("Dialing...." + attributes.webvoiceconf);
+ connectionManager.doCall(attributes.webvoiceconf);
}
public function callConnected(event:CallConnectedEvent):void {
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
old mode 100644
new mode 100755
index 58ca4fe7eb74d10aa2fb35abb632b89dad74eb7d..90973180d6709eabed654dddb19a01a0bceb4bb3
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
@@ -97,6 +97,7 @@ class ApiController {
String attPW = params.attendeePW
String modPW = params.moderatorPW
String voiceBr = params.voiceBridge
+ String webVoice = params.webVoiceConf
String welcomeMessage = params.welcome
String dialNumber = params.dialNumber
String logoutUrl = params.logoutURL
@@ -130,6 +131,7 @@ class ApiController {
}
DynamicConference conf = new DynamicConference(name, mtgID, attPW, modPW, maxParts)
conf.setVoiceBridge(voiceBr == null || voiceBr == "" ? mtgID : voiceBr)
+ conf.setWebVoiceConf(webVoice == null || webVoice == "" ? conf.voiceBridge : webVoice)
if ((dynamicConferenceService.testVoiceBridge != null) && (conf.voiceBridge == dynamicConferenceService.testVoiceBridge)) {
if (dynamicConferenceService.testConferenceMock != null)
@@ -235,6 +237,7 @@ class ApiController {
session["conference"] = conf.getMeetingToken()
session["room"] = conf.getMeetingToken()
session["voicebridge"] = conf.getVoiceBridge()
+ session["webvoiceconf"] = conf.getWebVoiceConf()
session["mode"] = "LIVE"
session["record"] = false
session['welcome'] = conf.welcome
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy
old mode 100644
new mode 100755
index 7ae3c793e2ff91c0a6865921a61239781d73ca38..82e22aba36e5b1152087adefe554147561d9c27d
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy
@@ -228,7 +228,8 @@ class PublicScheduledSessionController {
def rl = session["role"]
def cnf = session["conference"]
def rm = session["room"]
- def vb = session["voicebridge"]
+ def vb = session["voicebridge"]
+ def wbv = session["webvoiceconf"]
def rec = session["record"]
def md = session["mode"]
def confName = session["conferencename"]
@@ -262,7 +263,8 @@ class PublicScheduledSessionController {
role("$rl")
conference("$cnf")
room("$rm")
- voicebridge("${vb}")
+ voicebridge("${vb}")
+ webvoiceconf("${wbv}")
mode("$md")
record("$rec")
welcome("$welcomeMsg")
diff --git a/bigbluebutton-web/src/groovy/org/bigbluebutton/api/domain/DynamicConference.groovy b/bigbluebutton-web/src/groovy/org/bigbluebutton/api/domain/DynamicConference.groovy
old mode 100644
new mode 100755
index eae28a380a3c7a9d4bdb4eb68f0c2265bac12c1e..30f3442cc908e6553cbf7c8aa37b8d2f24685873
--- a/bigbluebutton-web/src/groovy/org/bigbluebutton/api/domain/DynamicConference.groovy
+++ b/bigbluebutton-web/src/groovy/org/bigbluebutton/api/domain/DynamicConference.groovy
@@ -37,7 +37,7 @@ public class DynamicConference extends Conference {
String meetingID
String meetingToken
String voiceBridge
-
+ String webVoiceConf
String moderatorPassword
String attendeePassword
String welcome