[openmeetings] branch master updated: [OPENMEETINGS-2239] code clean-up
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 61382c8 [OPENMEETINGS-2239] code clean-up
61382c8 is described below
commit 61382c888eb6a9be61d37bcd9d988294a08df24b
Author: Maxim Solodovnik
AuthorDate: Wed Dec 23 10:06:26 2020 +0700
[OPENMEETINGS-2239] code clean-up
---
.../src/main/java/org/apache/openmeetings/core/remote/KStream.java| 4
1 file changed, 4 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index 5c1f5fd..75fa04c 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -62,7 +62,6 @@ import org.kurento.client.MediaObject;
import org.kurento.client.MediaPipeline;
import org.kurento.client.MediaProfileSpecType;
import org.kurento.client.MediaType;
-import org.kurento.client.OfferOptions;
import org.kurento.client.RecorderEndpoint;
import org.kurento.client.RtpEndpoint;
import org.kurento.client.WebRtcEndpoint;
@@ -577,9 +576,6 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
@Override
public void onRegisterOk() {
rtpEndpoint = getRtpEndpoint(pipeline);
- OfferOptions options = new OfferOptions();
- options.setOfferToReceiveAudio(hasAudio);
- options.setOfferToReceiveVideo(hasVideo);
if (!sipClient) {
if (hasAudio) {
outgoingMedia.connect(rtpEndpoint,
MediaType.AUDIO);
[openmeetings] branch master updated: [OPENMEETINGS-2239] code clean-up
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 2807167 [OPENMEETINGS-2239] code clean-up
2807167 is described below
commit 2807167a7a571f700f9f27d63468ba6681b4a93b
Author: Maxim Solodovnik
AuthorDate: Fri Oct 30 09:43:09 2020 +0700
[OPENMEETINGS-2239] code clean-up
---
.../org/apache/openmeetings/core/remote/KStream.java | 17 +++--
.../apache/openmeetings/core/sip/ISipCallbacks.java | 3 ++-
.../org/apache/openmeetings/core/sip/SipManager.java | 17 -
.../openmeetings/core/sip/SipStackProcessor.java | 19 ---
.../org/apache/openmeetings/web/app/Application.java | 2 +-
5 files changed, 42 insertions(+), 16 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index 8410cd3..650ecbe 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -179,10 +179,8 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
sipProcessor = kHandler.getSipManager().createSipStackProcessor(
randomUUID().toString()
, kRoom.getRoom()
- , this); // TODO check this
- sipProcessor.ifPresent(ssp -> {
- ssp.register();
- });
+ , this);
+ sipProcessor.ifPresent(SipStackProcessor::register);
if (kRoom.isRecording()) {
startRecord();
}
@@ -545,8 +543,15 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
}
@Override
- public void onRegister() {
+ public void onRegisterOk() {
rtpEndpoint = getRtpEndpoint(pipeline);
- sipProcessor.get().invite(kRoom.getRoom(), sdpOffer);
+ outgoingMedia.connect(rtpEndpoint, MediaType.AUDIO); //TODO
VIDEO
+ sipProcessor.get().invite(kRoom.getRoom(), null);
+ }
+
+ @Override
+ public void onInviteOk(String sdp) {
+ String answer = rtpEndpoint.processOffer(sdp);
+ sipProcessor.get().invite(kRoom.getRoom(), answer);
}
}
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
index a11fc98..a04f275 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
@@ -19,5 +19,6 @@
package org.apache.openmeetings.core.sip;
public interface ISipCallbacks {
- void onRegister();
+ void onRegisterOk();
+ void onInviteOk(String sdp);
}
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
index 4c42e88..c55463b 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
@@ -21,6 +21,7 @@ package org.apache.openmeetings.core.sip;
import static org.apache.openmeetings.util.OmFileHelper.SIP_USER_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.isSipEnabled;
+import java.util.BitSet;
import java.util.Optional;
import java.util.function.Function;
@@ -84,6 +85,7 @@ public class SipManager implements ISipManager {
private ManagerConnectionFactory factory;
private String sipUserPicture;
+ private BitSet ports;
@PostConstruct
public void init() {
@@ -93,6 +95,7 @@ public class SipManager implements ISipManager {
, managerPort
, managerUser
, managerPass);
+ ports = new BitSet(maxLocalWsPort - minLocalWsPort);
}
}
@@ -273,6 +276,18 @@ public class SipManager implements ISipManager {
log.warn("Asterisk is not configured or denied in room
#{}", r.getId());
return Optional.empty();
}
- return Optional.of(new SipStackProcessor(this, name,
minLocalWsPort, callbacks)); /// FIXME TODO
+ int port;
+ synchronized (ports) {
+ int free = ports.nextClearBit(0);
+
[openmeetings] branch master updated: [OPENMEETINGS-2239] code clean-up
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 2807167 [OPENMEETINGS-2239] code clean-up
2807167 is described below
commit 2807167a7a571f700f9f27d63468ba6681b4a93b
Author: Maxim Solodovnik
AuthorDate: Fri Oct 30 09:43:09 2020 +0700
[OPENMEETINGS-2239] code clean-up
---
.../org/apache/openmeetings/core/remote/KStream.java | 17 +++--
.../apache/openmeetings/core/sip/ISipCallbacks.java | 3 ++-
.../org/apache/openmeetings/core/sip/SipManager.java | 17 -
.../openmeetings/core/sip/SipStackProcessor.java | 19 ---
.../org/apache/openmeetings/web/app/Application.java | 2 +-
5 files changed, 42 insertions(+), 16 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index 8410cd3..650ecbe 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -179,10 +179,8 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
sipProcessor = kHandler.getSipManager().createSipStackProcessor(
randomUUID().toString()
, kRoom.getRoom()
- , this); // TODO check this
- sipProcessor.ifPresent(ssp -> {
- ssp.register();
- });
+ , this);
+ sipProcessor.ifPresent(SipStackProcessor::register);
if (kRoom.isRecording()) {
startRecord();
}
@@ -545,8 +543,15 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
}
@Override
- public void onRegister() {
+ public void onRegisterOk() {
rtpEndpoint = getRtpEndpoint(pipeline);
- sipProcessor.get().invite(kRoom.getRoom(), sdpOffer);
+ outgoingMedia.connect(rtpEndpoint, MediaType.AUDIO); //TODO
VIDEO
+ sipProcessor.get().invite(kRoom.getRoom(), null);
+ }
+
+ @Override
+ public void onInviteOk(String sdp) {
+ String answer = rtpEndpoint.processOffer(sdp);
+ sipProcessor.get().invite(kRoom.getRoom(), answer);
}
}
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
index a11fc98..a04f275 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
@@ -19,5 +19,6 @@
package org.apache.openmeetings.core.sip;
public interface ISipCallbacks {
- void onRegister();
+ void onRegisterOk();
+ void onInviteOk(String sdp);
}
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
index 4c42e88..c55463b 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
@@ -21,6 +21,7 @@ package org.apache.openmeetings.core.sip;
import static org.apache.openmeetings.util.OmFileHelper.SIP_USER_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.isSipEnabled;
+import java.util.BitSet;
import java.util.Optional;
import java.util.function.Function;
@@ -84,6 +85,7 @@ public class SipManager implements ISipManager {
private ManagerConnectionFactory factory;
private String sipUserPicture;
+ private BitSet ports;
@PostConstruct
public void init() {
@@ -93,6 +95,7 @@ public class SipManager implements ISipManager {
, managerPort
, managerUser
, managerPass);
+ ports = new BitSet(maxLocalWsPort - minLocalWsPort);
}
}
@@ -273,6 +276,18 @@ public class SipManager implements ISipManager {
log.warn("Asterisk is not configured or denied in room
#{}", r.getId());
return Optional.empty();
}
- return Optional.of(new SipStackProcessor(this, name,
minLocalWsPort, callbacks)); /// FIXME TODO
+ int port;
+ synchronized (ports) {
+ int free = ports.nextClearBit(0);
+
