Skip to content

MSB-196: Add extensions hooks to UssdCallManager #2643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MSB-196: Add extensions hooks to UssdCallManager #2643

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion ...comm/restcomm.ussd/src/main/java/org/restcomm/connect/ussd/telephony/UssdCallManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@
import org.restcomm.connect.dao.entities.Application;
import org.restcomm.connect.dao.entities.IncomingPhoneNumber;
import org.restcomm.connect.dao.entities.MostOptimalNumberResponse;
import org.restcomm.connect.extension.api.ExtensionType;
import org.restcomm.connect.extension.api.RestcommExtensionException;
import org.restcomm.connect.extension.api.RestcommExtensionGeneric;
import org.restcomm.connect.extension.controller.ExtensionController;
import org.restcomm.connect.http.client.rcmlserver.resolver.RcmlserverResolver;
import org.restcomm.connect.interpreter.StartInterpreter;
import org.restcomm.connect.telephony.api.CallManagerResponse;
Expand Down Expand Up @@ -86,6 +90,9 @@ public class UssdCallManager extends RestcommUntypedActor {
private final String ussdGatewayUsername;
private final String ussdGatewayPassword;

//List of extensions for CallManager
List<RestcommExtensionGeneric> extensions;

// configurable switch whether to use the To field in a SIP header to determine the callee address
// alternatively the Request URI can be used
private boolean useTo;
Expand All @@ -111,6 +118,10 @@ public UssdCallManager(Configuration configuration, ServletContext context, SipF
this.ussdGatewayUri = ussdGatewayConfig.getString("ussd-gateway-uri");
this.ussdGatewayUsername = ussdGatewayConfig.getString("ussd-gateway-user");
this.ussdGatewayPassword = ussdGatewayConfig.getString("ussd-gateway-password");
extensions = ExtensionController.getInstance().getExtensions(ExtensionType.CallManager);
if (logger.isInfoEnabled()) {
logger.info("UssdCallManager extensions: " + (extensions != null ? extensions.size() : "0"));
}
}

private ActorRef ussdCall() {
Expand Down Expand Up @@ -161,8 +172,18 @@ public void onReceive(final Object message) throws Exception {
response(message);
} else if (CreateCall.class.equals(klass)) {
try {
ExtensionController ec = ExtensionController.getInstance();
this.createCallRequest = (CreateCall) message;
sender.tell(new CallManagerResponse<ActorRef>(outbound(message)), self);
ec.executePreOutboundAction(this.createCallRequest, extensions);
if(this.createCallRequest.isAllowed()){
sender.tell(new CallManagerResponse<ActorRef>(outbound(message)), self);
}else{
//Extensions didn't allowed this call
final String errMsg = "Not Allowed to make this outbound call";
logger.warning(errMsg);
sender.tell(new CallManagerResponse<ActorRef>(new RestcommExtensionException(errMsg), this.createCallRequest), self());
}

} catch (final Exception exception) {
sender.tell(new CallManagerResponse<ActorRef>(exception), self);
}
Expand Down