From 501717666f7307faef1d8066d9b1058c5f84da84 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Thu, 24 Jun 2010 10:06:55 -0400
Subject: [PATCH] - remove extra sip users - rename a few properties
---
.../config/asterisk/bbb_sip.conf | 1392 +----------------
.../voiceconf/red5/Application.java | 27 +-
.../bigbluebutton/voiceconf/sip/SipPeer.java | 3 +
.../WEB-INF/bigbluebutton-sip.properties | 16 +-
.../src/main/webapp/WEB-INF/red5-web.xml | 7 +-
5 files changed, 22 insertions(+), 1423 deletions(-)
diff --git a/bbb-voice-conference/config/asterisk/bbb_sip.conf b/bbb-voice-conference/config/asterisk/bbb_sip.conf
index 6dbe04d2c3..101eab4285 100644
--- a/bbb-voice-conference/config/asterisk/bbb_sip.conf
+++ b/bbb-voice-conference/config/asterisk/bbb_sip.conf
@@ -1,1394 +1,6 @@
-
-
-[34380]
-type=friend
-username=34380
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34381]
-type=friend
-username=34381
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34382]
-type=friend
-username=34382
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34383]
-type=friend
-username=34383
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34384]
-type=friend
-username=34384
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34385]
-type=friend
-username=34385
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34386]
-type=friend
-username=34386
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34387]
-type=friend
-username=34387
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34388]
-type=friend
-username=34388
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34389]
-type=friend
-username=34389
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34390]
-type=friend
-username=34390
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34391]
-type=friend
-username=34391
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34392]
-type=friend
-username=34392
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34393]
-type=friend
-username=34393
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34394]
-type=friend
-username=34394
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34395]
-type=friend
-username=34395
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34396]
-type=friend
-username=34396
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34397]
-type=friend
-username=34397
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34398]
-type=friend
-username=34398
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34399]
-type=friend
-username=34399
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34400]
-type=friend
-username=34400
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34401]
-type=friend
-username=34401
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34402]
-type=friend
-username=34402
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34403]
-type=friend
-username=34403
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34404]
-type=friend
-username=34404
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34405]
-type=friend
-username=34405
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34406]
-type=friend
-username=34406
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34407]
-type=friend
-username=34407
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34408]
-type=friend
-username=34408
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34409]
-type=friend
-username=34409
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34410]
-type=friend
-username=34410
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34411]
-type=friend
-username=34411
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34412]
-type=friend
-username=34412
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34413]
-type=friend
-username=34413
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34414]
-type=friend
-username=34414
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34415]
-type=friend
-username=34415
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34416]
-type=friend
-username=34416
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34417]
-type=friend
-username=34417
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34418]
-type=friend
-username=34418
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34419]
-type=friend
-username=34419
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34420]
-type=friend
-username=34420
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34421]
-type=friend
-username=34421
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34422]
-type=friend
-username=34422
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34423]
-type=friend
-username=34423
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34424]
-type=friend
-username=34424
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34425]
-type=friend
-username=34425
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34426]
-type=friend
-username=34426
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34427]
-type=friend
-username=34427
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34428]
-type=friend
-username=34428
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34429]
-type=friend
-username=34429
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34430]
-type=friend
-username=34430
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34431]
-type=friend
-username=34431
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34432]
-type=friend
-username=34432
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34433]
-type=friend
-username=34433
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34434]
-type=friend
-username=34434
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34435]
-type=friend
-username=34435
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34436]
-type=friend
-username=34436
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34437]
-type=friend
-username=34437
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34438]
-type=friend
-username=34438
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34439]
-type=friend
-username=34439
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34440]
-type=friend
-username=34440
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34441]
-type=friend
-username=34441
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34442]
-type=friend
-username=34442
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34443]
-type=friend
-username=34443
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34444]
-type=friend
-username=34444
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34445]
-type=friend
-username=34445
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34446]
-type=friend
-username=34446
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34447]
-type=friend
-username=34447
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34448]
-type=friend
-username=34448
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34449]
-type=friend
-username=34449
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34450]
-type=friend
-username=34450
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34451]
-type=friend
-username=34451
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34452]
-type=friend
-username=34452
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34453]
-type=friend
-username=34453
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34454]
-type=friend
-username=34454
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34455]
-type=friend
-username=34455
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34456]
-type=friend
-username=34456
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34457]
-type=friend
-username=34457
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34458]
-type=friend
-username=34458
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34459]
-type=friend
-username=34459
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34460]
-type=friend
-username=34460
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34461]
-type=friend
-username=34461
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34462]
-type=friend
-username=34462
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34463]
-type=friend
-username=34463
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34464]
-type=friend
-username=34464
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34465]
-type=friend
-username=34465
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34466]
-type=friend
-username=34466
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34467]
-type=friend
-username=34467
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34468]
-type=friend
-username=34468
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34469]
-type=friend
-username=34469
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34470]
-type=friend
-username=34470
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34471]
-type=friend
-username=34471
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34472]
-type=friend
-username=34472
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34473]
-type=friend
-username=34473
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34474]
-type=friend
-username=34474
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34475]
-type=friend
-username=34475
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34476]
-type=friend
-username=34476
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34477]
-type=friend
-username=34477
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34478]
-type=friend
-username=34478
-insecure=very
-qualify=no
-nat=yes
-host=dynamic
-canreinvite=no
-context=bbb-voip
-disallow=all
-allow=ulaw
-
-
-
-[34479]
+[bbbuser]
type=friend
-username=34479
+username=bbbuser
insecure=very
qualify=no
nat=yes
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 60a229a7fe..8a478f1a43 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
@@ -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) {
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java
index 754f66d41c..2f9fbdc553 100755
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java
+++ b/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 );
}
diff --git a/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties b/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties
index e16b0e3222..7df07a8590 100755
--- a/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties
+++ b/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
diff --git a/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml b/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
index 2542fe2337..56e6886b63 100755
--- a/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
+++ b/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>
--
GitLab