Skip to content
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

SIP REFER method is now working with organizations #2905

Closed
wants to merge 1 commit into from
Closed

SIP REFER method is now working with organizations #2905

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
32 changes: 26 additions & 6 deletions ...tcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/SIPOrganizationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,33 @@ public static Sid getOrganizationSidBySipURIHost(OrganizationsDao orgDao, final
return organization == null ? null : organization.getSid();
}

public static Sid searchOrganizationBySIPRequest(OrganizationsDao orgDao, SipServletRequest request) {
//first try with requetURI
Sid destinationOrganizationSid = getOrganizationSidBySipURIHost(orgDao,
(SipURI) request.getRequestURI());
if (destinationOrganizationSid == null) {
public static Sid searchOrganizationBySIPRequest(OrganizationsDao orgDao, SipServletRequest request)
{
Sid destinationOrganizationSid = null;
SipURI sipURI = null;
if (!request.getMethod().equals("REFER")) {
//first try with requetURI
destinationOrganizationSid = getOrganizationSidBySipURIHost(orgDao, (SipURI)request.getRequestURI());
// try to get destinationOrganizationSid from toUri
destinationOrganizationSid = getOrganizationSidBySipURIHost(orgDao, (SipURI) request.getTo().getURI());
if (destinationOrganizationSid == null) {
destinationOrganizationSid = getOrganizationSidBySipURIHost(orgDao, (SipURI)request.getTo().getURI());
}
}else{
// The Request URI from SIP REFER method is going with the IP Address instead of the domain name
// try to get destinationOrganizationSid from Refer-To
try{
sipURI = (SipURI)request.getAddressHeader("Refer-To").getURI();
} catch (ServletParseException e){
logger.error("sipURI is NULL");
}
if (sipURI != null){
destinationOrganizationSid = getOrganizationSidBySipURIHost(orgDao, sipURI);
if(destinationOrganizationSid == null){
logger.error("destinationOrganizationSid is NULL: Refer-To Uri is: "+ sipURI);
}else{
logger.debug("searchOrganizationBySIPRequest: destinationOrganizationSid: "+destinationOrganizationSid +" Refer-To Uri is: "+sipURI);
}
}
}
return destinationOrganizationSid;
}
Expand Down