BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,092 Commits 13 Branches 260 Tags 1.1 GiB
42794c99d0
Commit Graph

311 Commits

Author SHA1 Message Date
Ghazi Triki
e30a37db26 Add settings.gradle for pres-checker project. 2019-02-06 16:09:59 +01:00
Richard Alam
b84b5d8552 Merge branch 'grails-gradle-update' of https://github.com/riadvice/bigbluebutton into riadvice-grails-gradle-update 2019-01-25 08:06:46 -08:00
Richard Alam
d34ee2a90e - when freeswitch initiates hanging up of global audio call, we need to hangup all 
listen only callers. If not, the globak audio stream is destroyed and not re-recreated
   resulting in no audio for listen only.
 2019-01-24 12:55:33 -08:00
Ghazi Triki
cae165f2a9 Update red5 app gradle version and build files. 2019-01-09 15:39:12 +01:00
Richard Alam
a6aad5c106 - update jars for upgrading to latest red5 2018-12-10 09:41:59 -08:00
Ghazi Triki
6b20807fc1 Fix class import. 2018-11-30 11:09:14 +01:00
Ghazi Triki
6b6d35ceb2 Match red5 application dependencies to the currently installed version. 2018-11-23 11:09:36 -02:00
Ghazi Triki
d8588da28a Add support for redis password. 2018-11-22 16:02:55 -02:00
Ghazi Triki
35fa440b81 Improve build shell scripts. 2018-11-22 12:53:42 -02:00
Ghazi Triki
4ecda1e003 Improve red5 applications dependencies. 2018-11-22 11:35:48 -02:00
Ghazi Triki
e768cbe3c5 Updated red5 applications configuration to accept redis parameters. 2018-11-21 19:31:01 -02:00
Ghazi Triki
dc5c98b8cf Updated Red5 applications configuration. 2018-11-21 12:34:23 -02:00
Ghazi Triki
fbd1d631d6 Move redis communication classes from red5 applications to bbb-apps-common project. 2018-11-21 10:55:06 -02:00
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-11-01 14:00:54 +01:00
Richard Alam
e1e07db885 - we still need to remove the connection from the global audio list but not send the global audio left event 
to akka-apps
 2018-10-25 16:21:47 -07:00
Richard Alam
82bff6d573 - check if the client reconnected and when the old connection cleans up, do not hangup the 
user from the voice conference
 2018-10-25 15:56:09 -07:00
Richard Alam
446c2e28f4 - allow deploying of sip app to red5 2018-10-25 15:55:34 -07:00
Ghazi Triki
2820178b83 Updated JVM projects dependencies and configuration. 2018-08-05 22:37:11 +01:00
Ghazi Triki
1d9ef19dd0 Better params check and logging for RTMP connections. 2018-07-03 22:35:33 +01:00
Anton Georgiev
eca2e50e1a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into current 2018-07-03 20:17:42 +00:00
Ghazi Triki
1c6611a7fb Fix SIP connection test and improve logging for SIP¨Application class. 2018-07-02 22:24:57 +01:00
Richard Alam
14327a1edf Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-branch 2018-06-19 12:58:51 -07:00
Richard Alam
fd652e84e0 - some dev scripts to build bbb-voice and bbb-video 2018-06-11 08:31:41 -07:00
Richard Alam
a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
 2018-06-06 08:23:13 -07:00
Richard Alam
b352ee2c95 - change log timestamp format so they are all the same 2018-05-15 10:50:40 -07:00
Richard Alam
d740e36435 - add client connId to client logs so we can correlate client conn logs with red5 side conn logs 2018-04-25 16:00:06 -07:00
Richard Alam
1d68c02235 - upgrade voice to red5 mar 18, 2018 2018-04-11 11:40:02 -07:00
Richard Alam
1354b065be Merge branch 'require-auth-token-on-red5-connect' of github.com:ritzalam/bigbluebutton into merge-20-with-master 2018-01-29 12:36:41 -08:00
Richard Alam
2297ca50b9 - validate auth token for bbb-voice 2018-01-24 13:58:16 -08:00
Richard Alam
df4ba41faf - wire up message receivers for bbb-voice 2018-01-24 13:40:02 -08:00
Richard Alam
3bf2662aba - start adding check for bbb-voice 2018-01-24 12:53:31 -08:00
Richard Alam
ae80469351 - upgrade to red5 oct-10-2017 2017-10-10 11:19:41 -07:00
Chad Pilkey
86da035674 move the global audio messages to the 2.0 format 2017-07-13 18:09:15 -04:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Richard Alam
8f6213b77d - upgrade to latest red5 2016-11-22 20:45:58 +00:00
Richard Alam
3ead2b449b - minor formatting from IDE 2016-11-22 15:59:05 +00:00
Richard Alam
9f383c9799 - do not use another thread to do the transcoding. The thread doesn't get cleaned up when the call ends 
and the thread is waiting for packet in the queue. I am noticing a lot of threads hanging around
   in Yourkit from the mem dump. Not sure if this is contributing to OOM.
 2016-11-21 20:14:47 +00:00
Pedro Beschorner Marin
00c565d17a Fixed one broken lib in bbb-voice 2016-09-01 13:25:45 +00:00
Pedro Beschorner Marin
e47cd67903 Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0 
Conflicts:
	bbb-video/build.gradle
	bbb-voice/build.gradle
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	deskshare/app/build.gradle
	deskshare/build.gradle
 2016-06-20 16:11:04 +00:00
Felipe Cecagno
2a424e7549 update dependencies not available anymore on Blindside Networks Google Code repository 2016-06-14 11:22:16 -03:00
kreismann
1001ea5a53 Cleaning onCallModifying 
This function is responsible for building the 200 OK to answer the REINVITE coming from Freeswitch. In our cause, we just need to use bbb-voice local sdp to answer it. To a later and permanent change, however, it's recommended to investigate the SdpTools.java. My guess is that sdpMediaProduct function is comparing the media codecs in a wrong way.
 2016-06-13 17:25:56 -03:00
kreismann
17828c35f7 bbb-voice now responds OK with local SDP 
bbb-voice was responding the Freeswitch REINVITE with 200 OK containing remote SDP and with no media description.
 2016-06-13 17:24:42 -03:00
kreismann
8e952c224d Getting bbb-voice ip to make SIP Header 
The 'From' field must contain bbb-voice IP. We were getting Freeswitch IP instead (that is ok ONLY when bbb-voice and Freeswitch share the same machine with same IP Address).
 2016-06-13 17:22:11 -03:00
Richard Alam
35d0c07cac Clean up 
Removing unused source files so we can remove jmx dependency jar.
 2016-03-31 18:53:53 +00:00
Richard Alam
9562afde46 Upgrade to Gradle 2.12 
Update builds to use gradle 2.12
 2016-03-31 18:53:08 +00:00
Richard Alam
be050216b0 Updating screenshare 
Updating Red5 triggered updating of ffmpeg jars for screensharing.
 2016-03-30 21:18:39 +00:00
Richard Alam
53dc204e8d Update to Java 8 
Change dependencies to build against latest red5 to upgrade to java 8
 2016-03-24 18:54:51 +00:00
Ghazi Triki
62a721b310 Update gson library version to 2.5 for all server projects. 2016-01-27 16:44:22 +01:00
Richard Alam
52d2ed1666 - try to fix auto-reconnect for listen only users 2015-09-03 14:04:48 +00:00
Richard Alam
ddc726a6ce Merge pull request #2757 from ritzalam/manage-redis-pubsub-connection 
Manage redis pubsub connection
 2015-09-02 10:26:47 -04:00