- remove extra sip users

- rename a few properties

bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Application.java

@@ -21,12 +21,9 @@ public class Application extends MultiThreadedApplicationAdapter {
     private ClientConnectionManager clientConnManager;
     
     private String sipServerHost = "localhost";
-    private int startSipPort = 5070;
-    private int stopSipPort = 5099;
-    private int sipPort;
-    private int startRtpPort = 3000;
-	private int stopRtpPort = 3029;
-	private int rtpPort;
+    private int sipPort = 5070;
+    private int startAudioPort = 3000;
+	private int stopAudioPort = 3029;
 	private String password = "secret";
 	private String username;
 	private CallStreamFactory callStreamFactory;
@@ -38,7 +35,7 @@ public class Application extends MultiThreadedApplicationAdapter {
     	callStreamFactory.setScope(scope);
     	sipPeerManager.setCallStreamFactory(callStreamFactory);
         sipPeerManager.setClientConnectionManager(clientConnManager);
-        sipPeerManager.createSipPeer("default", sipServerHost, startSipPort, startRtpPort, stopRtpPort);
+        sipPeerManager.createSipPeer("default", sipServerHost, sipPort, startAudioPort, stopAudioPort);
         try {
 			sipPeerManager.register("default", username, password);
 		} catch (PeerNotFoundException e) {
@@ -125,20 +122,16 @@ public class Application extends MultiThreadedApplicationAdapter {
     	this.password = pw;
     }
     
-    public void setStartSIPPort(int startSIPPort) {
-		this.startSipPort = startSIPPort;
+    public void setSipPort(int sipPort) {
+		this.sipPort = sipPort;
 	}
 
-	public void setStopSIPPort(int stopSIPPort) {
-		this.stopSipPort = stopSIPPort;
+	public void setStartAudioPort(int startRTPPort) {
+		this.startAudioPort = startRTPPort;
 	}
 
-	public void setStartRTPPort(int startRTPPort) {
-		this.startRtpPort = startRTPPort;
-	}
-
-	public void setStopRTPPort(int stopRTPPort) {
-		this.stopRtpPort = stopRTPPort;
+	public void setStopAudioPort(int stopRTPPort) {
+		this.stopAudioPort = stopRTPPort;
 	}
 	
 	public void setSipPeerManager(SipPeerManager spm) {

bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java

@@ -75,6 +75,9 @@ public class SipPeer implements SipRegisterAgentListener {
         registeredProfile.keepaliveTime=8000;
         registeredProfile.acceptTime=0;
         registeredProfile.hangupTime=20;   
+        
+        log.debug( "SIPUser register : {}", fromURL );
+        log.debug( "SIPUser register : {}", registeredProfile.contactUrl );
     }
     
 

bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties

@@ -1,18 +1,10 @@
 # The address of your asterisk server
 #sip.server.host=192.168.0.182
 sip.server.host=127.0.0.1
-sip.server.username=3000
+sip.server.port=5070
+sip.server.username=bbbuser
 sip.server.password=secret
 
-# The start/stop SIP ports that the application is going
-# to use to connect to the asterisk server.
-# These are unassigned ports as defined here 
-# (http://www.iana.org/assignments/port-numbers)
-# We are setting up 100 default SIP users (see RTP ports below)
-# so we need one port per user.
-startSIPPort=34480
-stopSIPPort=34579
-
 # The start/stop RTP port the application is going to use
 # for the media stream.
 # NOTE: This will also be used as SIP users to REGISTER with
@@ -20,8 +12,8 @@ stopSIPPort=34579
 # in your bbb_sip.conf. 
 # See http://code.google.com/p/bigbluebutton/source/browse/#svn/trunk/bbb-voice-conference/config/asterisk
 # create-sip-users.sh script to create the users.
-startRTPPort=34380
-stopRTPPort=34479
+startAudioPort=34380
+stopAudioPort=34479
 
 # An extension pattern, in case your asterisk extensions.conf
 # uses a naming convetion for your meeting rooms

bbb-voice/src/main/webapp/WEB-INF/red5-web.xml

@@ -30,12 +30,11 @@
 
 	<bean id="web.handler" class="org.bigbluebutton.voiceconf.red5.Application">
 		<property name="sipServerHost" value="${sip.server.host}" />
+		<property name="sipPort" value="${sip.server.port}" />
 		<property name="username" value="${sip.server.username}" />
 		<property name="password" value="${sip.server.password}" />
-		<property name="startSIPPort" value="${startSIPPort}" />
-		<property name="stopSIPPort" value="${stopSIPPort}" />
-		<property name="startRTPPort" value="${startRTPPort}" />
-		<property name="stopRTPPort" value="${stopRTPPort}" />
+		<property name="startAudioPort" value="${startAudioPort}" />
+		<property name="stopAudioPort" value="${stopAudioPort}" />
 		<property name="sipPeerManager" ref="sipPeerManager"/>
 		<property name="clientConnectionManager" ref="clientConnectionManager"/>
 	</bean>