I'm looking at XX-5178, which requires a settings change in the
registrar from
SIP_REDIRECT.999-AUTHROUTER.SIPX_PROXY : 10.1.1.11:5060;transport=tcp
to
SIP_REDIRECT.999-AUTHROUTER.SIPX_PROXY : example.com;transport=tcp
that is - changing from the proxy ip address and port to the domain name
(so that in an HA configuration either proxy can be used).
The attached patch seems as though it aught to do the right thing, but
fails the sipXconfig unit test because it doesn't actually replace the
value of ${domain.name} specified by the registrar-config.vm template.
diff --git a/sipXconfig/neoconf/etc/sipxregistrar/registrar-config.vm b/sipXconfig/neoconf/etc/sipxregistrar/registrar-config.vm
index eecd862..024fb87 100644
--- a/sipXconfig/neoconf/etc/sipxregistrar/registrar-config.vm
+++ b/sipXconfig/neoconf/etc/sipxregistrar/registrar-config.vm
@@ -74,7 +74,7 @@ SIP_REDIRECT_AUTHORITY_LEVEL.998-TIMEOFDAY : 100
# AuthRouter is always last.
SIP_REDIRECT_HOOK_LIBRARY.999-AUTHROUTER : @sipxpbx.lib.dir@/libRedirectorAuthRouter.so
SIP_REDIRECT_AUTHORITY_LEVEL.999-AUTHROUTER : 100
-SIP_REDIRECT.999-AUTHROUTER.SIPX_PROXY : ${location.address}:${proxyService.sipPort};transport=tcp
+SIP_REDIRECT.999-AUTHROUTER.SIPX_PROXY : ${domain.name};transport=tcp
# See HaSetup.pdf for how to use the following
SIP_REGISTRAR_XMLRPC_PORT : 5077
diff --git a/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/service/SipxRegistrarConfiguration.java b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/service/SipxRegistrarConfiguration.java
index 4b8660b..90eb1ed 100644
--- a/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/service/SipxRegistrarConfiguration.java
+++ b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/service/SipxRegistrarConfiguration.java
@@ -12,11 +12,13 @@ package org.sipfoundry.sipxconfig.service;
import org.apache.velocity.VelocityContext;
import org.sipfoundry.sipxconfig.admin.commserver.Location;
import org.sipfoundry.sipxconfig.admin.commserver.LocationsManager;
+import org.sipfoundry.sipxconfig.domain.DomainManager;
public class SipxRegistrarConfiguration extends SipxServiceConfiguration {
public static final String OPENFIRE_HOST = "openfire-host";
public static final String OPENFIRE_XML_RPCPORT = "openfire-xml-rpc-port";
private LocationsManager m_locationsManager;
+ private DomainManager m_domainManager;
@Override
protected VelocityContext setupContext(Location location) {
@@ -59,4 +61,8 @@ public class SipxRegistrarConfiguration extends SipxServiceConfiguration {
m_locationsManager = locationsManager;
}
+ public String getDomainName() {
+ return m_domainManager.getDomain().getName();
+ }
+
}
diff --git a/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/service/service.beans.xml b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/service/service.beans.xml
index 0ae316a..cc960fe 100644
--- a/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/service/service.beans.xml
+++ b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/service/service.beans.xml
@@ -186,6 +186,7 @@
<property name="template" value="sipxregistrar/registrar-config.vm" />
<property name="name" value="registrar-config" />
<property name="locationsManager" ref="locationsManager" />
+ <property name="domainManager" ref="domainManager" />
</bean>
<bean id="presenceRoutingConfiguration" class="org.sipfoundry.sipxconfig.service.PresenceRoutingConfiguration"
diff --git a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/expected-registrar-config-with-openfire b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/expected-registrar-config-with-openfire
index 167e9e8..da34401 100644
--- a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/expected-registrar-config-with-openfire
+++ b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/expected-registrar-config-with-openfire
@@ -67,7 +67,7 @@ SIP_REDIRECT_AUTHORITY_LEVEL.998-TIMEOFDAY : 100
# AuthRouter is always last.
SIP_REDIRECT_HOOK_LIBRARY.999-AUTHROUTER : @sipxpbx.lib.dir@/libRedirectorAuthRouter.so
SIP_REDIRECT_AUTHORITY_LEVEL.999-AUTHROUTER : 100
-SIP_REDIRECT.999-AUTHROUTER.SIPX_PROXY : 192.168.1.1:5060;transport=tcp
+SIP_REDIRECT.999-AUTHROUTER.SIPX_PROXY : example.org;transport=tcp
# See HaSetup.pdf for how to use the following
SIP_REGISTRAR_XMLRPC_PORT : 5077
diff --git a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/expected-registrar-config-without-openfire b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/expected-registrar-config-without-openfire
index 15f7280..ba043d5 100644
--- a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/expected-registrar-config-without-openfire
+++ b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/expected-registrar-config-without-openfire
@@ -61,7 +61,7 @@ SIP_REDIRECT_AUTHORITY_LEVEL.998-TIMEOFDAY : 100
# AuthRouter is always last.
SIP_REDIRECT_HOOK_LIBRARY.999-AUTHROUTER : @sipxpbx.lib.dir@/libRedirectorAuthRouter.so
SIP_REDIRECT_AUTHORITY_LEVEL.999-AUTHROUTER : 100
-SIP_REDIRECT.999-AUTHROUTER.SIPX_PROXY : 192.168.1.1:5060;transport=tcp
+SIP_REDIRECT.999-AUTHROUTER.SIPX_PROXY : example.org;transport=tcp
# See HaSetup.pdf for how to use the following
SIP_REGISTRAR_XMLRPC_PORT : 5077
diff --git a/sipXinterop/sipx_confdir/registrar-config.in.pre b/sipXinterop/sipx_confdir/registrar-config.in.pre
index e6d2b05..aa42199 100644
--- a/sipXinterop/sipx_confdir/registrar-config.in.pre
+++ b/sipXinterop/sipx_confdir/registrar-config.in.pre
@@ -75,7 +75,7 @@ SIP_REDIRECT_AUTHORITY_LEVEL.998-TIMEOFDAY : 100
# AuthRouter is always last.
SIP_REDIRECT_HOOK_LIBRARY.999-AUTHROUTER : @SIPX_LIBDIR@/libRedirectorAuthRouter.so
SIP_REDIRECT_AUTHORITY_LEVEL.999-AUTHROUTER : 100
-SIP_REDIRECT.999-AUTHROUTER.SIPX_PROXY : @INTEROP_ADDR@:5060;transport=tcp
+SIP_REDIRECT.999-AUTHROUTER.SIPX_PROXY : @SIP_DOMAIN_NAME@;transport=tcp
# See HaSetup.pdf for how to use the following
SIP_REGISTRAR_XMLRPC_PORT :
_______________________________________________
sipx-dev mailing list [email protected]
List Archive: http://list.sipfoundry.org/archive/sipx-dev
Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev
sipXecs IP PBX -- http://www.sipfoundry.org/
