Revision: 3fcaa5710014
Author: Jean Deruelle <[email protected]>
Date: Fri Aug 10 06:02:07 2012
Log: Fixes Issue 141
http://code.google.com/p/sipservlets/source/detail?r=3fcaa5710014
Modified:
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/Attribute.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/Constants.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipDefinition.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipServerService.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipSubsystemAdd.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipSubsystemParser.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/resources/org/mobicents/as7/LocalDescriptions.properties
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/Attribute.java
Sat Apr 14 08:54:05 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/Attribute.java
Fri Aug 10 06:02:07 2012
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat Inc., and individual contributors as indicated
+ * TeleStax, Open Source Cloud Communications Copyright 2012.
+ * and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -32,6 +32,9 @@
UNKNOWN(null),
APPLICATION_ROUTER(Constants.APPLICATION_ROUTER),
+
ADDITIONAL_PARAMETERABLE_HEADERS(Constants.ADDITIONAL_PARAMETERABLE_HEADERS),
+ BASE_TIMER_INTERVAL(Constants.BASE_TIMER_INTERVAL),
+
CANCELED_TIMER_TASKS_PURGE_PERIOD(Constants.CANCELED_TIMER_TASKS_PURGE_PERIOD),
CA_CERTIFICATE_FILE(Constants.CA_CERTIFICATE_FILE),
CA_CERTIFICATE_PASSWORD(Constants.CA_CERTIFICATE_PASSWORD),
CA_REVOCATION_URL(Constants.CA_REVOCATION_URL),
@@ -46,6 +49,7 @@
DEFAULT_VIRTUAL_SERVER(Constants.DEFAULT_VIRTUAL_SERVER),
DEFAULT_WEB_MODULE(Constants.DEFAULT_WEB_MODULE),
DEVELOPMENT(Constants.DEVELOPMENT),
+
DIALOG_PENDING_REQUEST_CHECKING(Constants.DIALOG_PENDING_REQUEST_CHECKING),
DIRECTORY(Constants.DIRECTORY),
DISABLED(Constants.DISABLED),
DISPLAY_SOURCE_FRAGMENT(Constants.DISPLAY_SOURCE_FRAGMENT),
@@ -105,7 +109,10 @@
STUN_SERVER_ADDRESS(Constants.STUN_SERVER_ADDRESS),
STUN_SERVER_PORT(Constants.STUN_SERVER_PORT),
SUBSTITUTION(Constants.SUBSTITUTION),
+ T2_INTERVAL(Constants.T2_INTERVAL),
+ T4_INTERVAL(Constants.T4_INTERVAL),
TARGET_VM(Constants.TARGET_VM),
+ TIMER_D_INTERVAL(Constants.TIMER_D_INTERVAL),
TRIM_SPACES(Constants.TRIM_SPACES),
TRUSTSTORE_TYPE(Constants.TRUSTSTORE_TYPE),
TAG_POOLING(Constants.TAG_POOLING),
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/Constants.java
Sun Jul 8 12:14:07 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/Constants.java
Fri Aug 10 06:02:07 2012
@@ -1,8 +1,8 @@
/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
+ * TeleStax, Open Source Cloud Communications Copyright 2012.
+ * and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
@@ -19,7 +19,6 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-
package org.mobicents.as7;
/**
@@ -28,7 +27,9 @@
interface Constants {
String ACCESS_LOG = "access-log";
+ String ADDITIONAL_PARAMETERABLE_HEADERS
= "additional-parameterable-heders";
String ALIAS = "alias";
+ String BASE_TIMER_INTERVAL = "base-timer-interval";
String CA_CERTIFICATE_FILE = "ca-certificate-file";
String CA_CERTIFICATE_PASSWORD = "ca-certificate-password";
String CA_REVOCATION_URL = "ca-revocation-url";
@@ -42,6 +43,7 @@
String CONFIGURATION = "configuration";
String CONNECTOR = "connector";
String APPLICATION_ROUTER = "application-router";
+ String CANCELED_TIMER_TASKS_PURGE_PERIOD
= "canceled-timer-tasks-purge-period";
String CONCURRENCY_CONTROL_MODE = "concurrency-control-mode";
String CONGESTION_CONTROL_INTERVAL = "congestion-control-interval";
String CONTAINER = "container";
@@ -49,6 +51,7 @@
String DEFAULT_VIRTUAL_SERVER = "default-virtual-server";
String DEFAULT_WEB_MODULE = "default-web-module";
String DEVELOPMENT = "development";
+ String DIALOG_PENDING_REQUEST_CHECKING
= "dialog-pending-request-checking";
String DIRECTORY = "directory";
String DISABLED = "disabled";
String DISPLAY_SOURCE_FRAGMENT = "display-source-fragment";
@@ -116,9 +119,12 @@
String STUN_SERVER_PORT = "stun-server-port";
String SUBSTITUTION = "substitution";
String SUBSYSTEM = "subsystem";
+ String T2_INTERVAL = "t2-interval";
+ String T4_INTERVAL = "t4-interval";
String TAG_POOLING = "tag-pooling";
String TARGET_VM = "target-vm";
String TEST = "test";
+ String TIMER_D_INTERVAL = "timer-d-interval";
String TRIM_SPACES = "trim-spaces";
String TRUSTSTORE_TYPE = "truststore-type";
String USE_PRETTY_ENCODING = "use-pretty-encoding";
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipDefinition.java
Sun Jul 8 12:14:07 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipDefinition.java
Fri Aug 10 06:02:07 2012
@@ -1,3 +1,24 @@
+/*
+ * TeleStax, Open Source Cloud Communications Copyright 2012.
+ * and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.mobicents.as7;
import static
org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD;
@@ -86,7 +107,57 @@
.setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
.setDefaultValue(new ModelNode(true))
.build();
-
+ protected static final SimpleAttributeDefinition
ADDITIONAL_PARAMETERABLE_HEADERS =
+ new
SimpleAttributeDefinitionBuilder(Constants.ADDITIONAL_PARAMETERABLE_HEADERS,
ModelType.STRING, true)
+ .setAllowExpression(true)
+ .setXmlName(Constants.ADDITIONAL_PARAMETERABLE_HEADERS)
+ .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
+ .setDefaultValue(null)
+ .build();
+ protected static final SimpleAttributeDefinition BASE_TIMER_INTERVAL =
+ new
SimpleAttributeDefinitionBuilder(Constants.BASE_TIMER_INTERVAL,
ModelType.INT, true)
+ .setAllowExpression(true)
+ .setXmlName(Constants.BASE_TIMER_INTERVAL)
+ .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
+ .setDefaultValue(new ModelNode(500))
+ .build();
+ protected static final SimpleAttributeDefinition T2_INTERVAL =
+ new SimpleAttributeDefinitionBuilder(Constants.T2_INTERVAL,
ModelType.INT, true)
+ .setAllowExpression(true)
+ .setXmlName(Constants.T2_INTERVAL)
+ .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
+ .setDefaultValue(new ModelNode(4000))
+ .build();
+ protected static final SimpleAttributeDefinition T4_INTERVAL =
+ new SimpleAttributeDefinitionBuilder(Constants.T4_INTERVAL,
ModelType.INT, true)
+ .setAllowExpression(true)
+ .setXmlName(Constants.T4_INTERVAL)
+ .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
+ .setDefaultValue(new ModelNode(5000))
+ .build();
+ protected static final SimpleAttributeDefinition TIMER_D_INTERVAL =
+ new
SimpleAttributeDefinitionBuilder(Constants.TIMER_D_INTERVAL, ModelType.INT,
true)
+ .setAllowExpression(true)
+ .setXmlName(Constants.TIMER_D_INTERVAL)
+ .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
+ .setDefaultValue(new ModelNode(32000))
+ .build();
+ protected static final SimpleAttributeDefinition
DIALOG_PENDING_REQUEST_CHECKING =
+ new
SimpleAttributeDefinitionBuilder(Constants.DIALOG_PENDING_REQUEST_CHECKING,
ModelType.BOOLEAN, true)
+ .setAllowExpression(true)
+ .setXmlName(Constants.DIALOG_PENDING_REQUEST_CHECKING)
+ .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
+ .setDefaultValue(new ModelNode(false))
+ .build();
+ protected static final SimpleAttributeDefinition
CANCELED_TIMER_TASKS_PURGE_PERIOD =
+ new
SimpleAttributeDefinitionBuilder(Constants.CANCELED_TIMER_TASKS_PURGE_PERIOD,
ModelType.INT, true)
+ .setAllowExpression(true)
+ .setXmlName(Constants.CANCELED_TIMER_TASKS_PURGE_PERIOD)
+ .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
+ .setDefaultValue(new ModelNode(-1))
+ .build();
+
+
private SipDefinition() {
super(PathElement.pathElement(ModelDescriptionConstants.SUBSYSTEM,
SipExtension.SUBSYSTEM_NAME),
SipExtension.getResourceDescriptionResolver(null));
@@ -112,5 +183,12 @@
registration.registerReadWriteAttribute(CONGESTION_CONTROL_INTERVAL, null,
new ReloadRequiredWriteAttributeHandler(CONGESTION_CONTROL_INTERVAL));
registration.registerReadWriteAttribute(CONCURRENCY_CONTROL_MODE,
null, new ReloadRequiredWriteAttributeHandler(CONCURRENCY_CONTROL_MODE));
registration.registerReadWriteAttribute(USE_PRETTY_ENCODING, null,
new ReloadRequiredWriteAttributeHandler(USE_PRETTY_ENCODING));
+
registration.registerReadWriteAttribute(ADDITIONAL_PARAMETERABLE_HEADERS,
null, new
ReloadRequiredWriteAttributeHandler(ADDITIONAL_PARAMETERABLE_HEADERS));
+ registration.registerReadWriteAttribute(BASE_TIMER_INTERVAL, null,
new ReloadRequiredWriteAttributeHandler(BASE_TIMER_INTERVAL));
+ registration.registerReadWriteAttribute(T2_INTERVAL, null, new
ReloadRequiredWriteAttributeHandler(T2_INTERVAL));
+ registration.registerReadWriteAttribute(T4_INTERVAL, null, new
ReloadRequiredWriteAttributeHandler(T4_INTERVAL));
+ registration.registerReadWriteAttribute(TIMER_D_INTERVAL, null,
new ReloadRequiredWriteAttributeHandler(TIMER_D_INTERVAL));
+
registration.registerReadWriteAttribute(DIALOG_PENDING_REQUEST_CHECKING,
null, new
ReloadRequiredWriteAttributeHandler(DIALOG_PENDING_REQUEST_CHECKING));
+
registration.registerReadWriteAttribute(CANCELED_TIMER_TASKS_PURGE_PERIOD,
null, new
ReloadRequiredWriteAttributeHandler(CANCELED_TIMER_TASKS_PURGE_PERIOD));
}
}
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipServerService.java
Sun Jul 8 12:14:07 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipServerService.java
Fri Aug 10 06:02:07 2012
@@ -1,16 +1,23 @@
/*
- * JBoss, Home of Professional Open Source Copyright 2010, Red Hat Inc.,
and individual contributors as indicated by the
+ * TeleStax, Open Source Cloud Communications Copyright 2012.
+ * and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
*
- * @authors tag. See the copyright.txt in the distribution for a full
listing of individual contributors.
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
*
- * This is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This software is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.mobicents.as7;
@@ -53,10 +60,17 @@
private String sipStackPropertiesFile;
final String sipPathName;
final String sipAppDispatcherClass;
+ final String additionalParameterableHeaders;
final int sipCongestionControlInterval;
final String sipConcurrencyControlMode;
final boolean usePrettyEncoding;
-
+ final int baseTimerInterval;
+ final int t2Interval;
+ final int t4Interval;
+ final int timerDInterval;
+ final boolean dialogPendingRequestChecking;
+ final int canceledTimerTasksPurgePeriod;
+
private final String instanceId;
// private Engine engine;
@@ -69,17 +83,39 @@
private final InjectedValue<MBeanServer> mbeanServer = new
InjectedValue<MBeanServer>();
private final InjectedValue<PathManager> pathManagerInjector = new
InjectedValue<PathManager>();
- public SipServerService(final String sipAppRouterFile, final String
sipStackPropertiesFile, final String sipPathName, String
sipAppDispatcherClass, int sipCongestionControlInterval, String
sipConcurrencyControlMode, boolean usePrettyEncoding, String instanceId) {
+ public SipServerService(
+ final String sipAppRouterFile,
+ final String sipStackPropertiesFile,
+ final String sipPathName,
+ String sipAppDispatcherClass,
+ String additionalParameterableHeaders,
+ int sipCongestionControlInterval,
+ String sipConcurrencyControlMode,
+ boolean usePrettyEncoding,
+ int baseTimerInterval,
+ int t2Interval,
+ int t4Interval,
+ int timerDInterval,
+ boolean dialogPendingRequestChecking,
+ int canceledTimerTasksPurgePeriod,
+ String instanceId) {
// this.defaultHost = defaultHost;
// this.useNative = useNative;
this.sipAppRouterFile = sipAppRouterFile;
this.sipStackPropertiesFile = sipStackPropertiesFile;
this.sipPathName = sipPathName;
this.sipAppDispatcherClass = sipAppDispatcherClass;
+ this.additionalParameterableHeaders = additionalParameterableHeaders;
this.sipCongestionControlInterval = sipCongestionControlInterval;
this.sipConcurrencyControlMode = sipConcurrencyControlMode;
this.instanceId = instanceId;
this.usePrettyEncoding = usePrettyEncoding;
+ this.baseTimerInterval = baseTimerInterval;
+ this.t2Interval = t2Interval;
+ this.t4Interval = t4Interval;
+ this.timerDInterval = timerDInterval;
+ this.dialogPendingRequestChecking = dialogPendingRequestChecking;
+ this.canceledTimerTasksPurgePeriod = canceledTimerTasksPurgePeriod;
}
/** {@inheritDoc} */
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipSubsystemAdd.java
Tue Jul 24 13:43:32 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipSubsystemAdd.java
Fri Aug 10 06:02:07 2012
@@ -1,8 +1,8 @@
/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
+ * TeleStax, Open Source Cloud Communications Copyright 2012.
+ * and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
@@ -19,7 +19,6 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-
package org.mobicents.as7;
import java.util.List;
@@ -88,6 +87,13 @@
SipDefinition.CONGESTION_CONTROL_INTERVAL.validateAndSet(operation, model);
SipDefinition.CONCURRENCY_CONTROL_MODE.validateAndSet(operation,
model);
SipDefinition.USE_PRETTY_ENCODING.validateAndSet(operation, model);
+
SipDefinition.ADDITIONAL_PARAMETERABLE_HEADERS.validateAndSet(operation,
model);
+ SipDefinition.BASE_TIMER_INTERVAL.validateAndSet(operation, model);
+ SipDefinition.T2_INTERVAL.validateAndSet(operation, model);
+ SipDefinition.T4_INTERVAL.validateAndSet(operation, model);
+ SipDefinition.TIMER_D_INTERVAL.validateAndSet(operation, model);
+
SipDefinition.DIALOG_PENDING_REQUEST_CHECKING.validateAndSet(operation,
model);
+
SipDefinition.CANCELED_TIMER_TASKS_PURGE_PERIOD.validateAndSet(operation,
model);
}
@Override
@@ -110,6 +116,12 @@
final ModelNode sipAppDispatcherClassModel =
SipDefinition.SIP_APP_DISPATCHER_CLASS.resolveModelAttribute(context,
fullModel);
final String sipAppDispatcherClass =
sipAppDispatcherClassModel.isDefined() ?
sipAppDispatcherClassModel.asString() : null;
+
+ final ModelNode usePrettyEncodingModel =
SipDefinition.CANCELED_TIMER_TASKS_PURGE_PERIOD.resolveModelAttribute(context,
fullModel);
+ final boolean usePrettyEncoding =
usePrettyEncodingModel.isDefined() ? usePrettyEncodingModel.asBoolean() :
true;
+
+ final ModelNode additionalParameterableHeadersModel =
SipDefinition.ADDITIONAL_PARAMETERABLE_HEADERS.resolveModelAttribute(context,
fullModel);
+ final String additionalParameterableHeaders =
additionalParameterableHeadersModel.isDefined() ?
additionalParameterableHeadersModel.asString() : null;
final ModelNode sipCongestionControlIntervalModel =
SipDefinition.CONGESTION_CONTROL_INTERVAL.resolveModelAttribute(context,
fullModel);
final int sipCongestionControlInterval =
sipCongestionControlIntervalModel.isDefined() ?
sipCongestionControlIntervalModel.asInt() : -1;
@@ -117,8 +129,23 @@
final ModelNode sipConcurrencyControlModeModel =
SipDefinition.CONCURRENCY_CONTROL_MODE.resolveModelAttribute(context,
fullModel);
final String sipConcurrencyControlMode =
sipConcurrencyControlModeModel.isDefined() ?
sipConcurrencyControlModeModel.asString() : null;
- final ModelNode usePrettyEncodingModel =
SipDefinition.USE_PRETTY_ENCODING.resolveModelAttribute(context, fullModel);
- final boolean usePrettyEncoding =
usePrettyEncodingModel.isDefined() ? usePrettyEncodingModel.asBoolean() :
true;
+ final ModelNode baseTimerIntervalModel =
SipDefinition.BASE_TIMER_INTERVAL.resolveModelAttribute(context, fullModel);
+ final int baseTimerInterval = baseTimerIntervalModel.isDefined() ?
baseTimerIntervalModel.asInt() : 500;
+
+ final ModelNode t2IntervalModel =
SipDefinition.T2_INTERVAL.resolveModelAttribute(context, fullModel);
+ final int t2Interval = t2IntervalModel.isDefined() ?
t2IntervalModel.asInt() : 4000;
+
+ final ModelNode t4IntervalModel =
SipDefinition.T4_INTERVAL.resolveModelAttribute(context, fullModel);
+ final int t4Interval = t4IntervalModel.isDefined() ?
t4IntervalModel.asInt() : 5000;
+
+ final ModelNode timerDIntervalModel =
SipDefinition.TIMER_D_INTERVAL.resolveModelAttribute(context, fullModel);
+ final int timerDInterval = timerDIntervalModel.isDefined() ?
timerDIntervalModel.asInt() : 32000;
+
+ final ModelNode dialogPendingRequestCheckingModel =
SipDefinition.DIALOG_PENDING_REQUEST_CHECKING.resolveModelAttribute(context,
fullModel);
+ final boolean dialogPendingRequestChecking =
dialogPendingRequestCheckingModel.isDefined() ?
dialogPendingRequestCheckingModel.asBoolean() : false;
+
+ final ModelNode canceledTimerTasksPurgePeriodModel =
SipDefinition.CANCELED_TIMER_TASKS_PURGE_PERIOD.resolveModelAttribute(context,
fullModel);
+ final int canceledTimerTasksPurgePeriod =
canceledTimerTasksPurgePeriodModel.isDefined() ?
canceledTimerTasksPurgePeriodModel.asInt() : -1;
// final String instanceId =
operation.hasDefined(Constants.INSTANCE_ID) ?
operation.get(Constants.INSTANCE_ID).asString() : null;
// final String sipAppRouterFile =
operation.hasDefined(Constants.APPLICATION_ROUTER) ?
operation.get(Constants.APPLICATION_ROUTER).asString() : null;
@@ -129,7 +156,22 @@
// final String sipConcurrencyControlMode =
operation.hasDefined(Constants.CONCURRENCY_CONTROL_MODE) ?
operation.get(Constants.CONCURRENCY_CONTROL_MODE).asString() : null;
// final boolean usePrettyEncoding =
operation.hasDefined(Constants.USE_PRETTY_ENCODING) ?
operation.get(Constants.USE_PRETTY_ENCODING).asBoolean() : true;
- final SipServerService service = new
SipServerService(sipAppRouterFile, sipStackPropertiesFile, sipPathName,
sipAppDispatcherClass, sipCongestionControlInterval,
sipConcurrencyControlMode, usePrettyEncoding, instanceId);
+ final SipServerService service = new SipServerService(
+ sipAppRouterFile,
+ sipStackPropertiesFile,
+ sipPathName,
+ sipAppDispatcherClass,
+ additionalParameterableHeaders,
+ sipCongestionControlInterval,
+ sipConcurrencyControlMode,
+ usePrettyEncoding,
+ baseTimerInterval,
+ t2Interval,
+ t4Interval,
+ timerDInterval,
+ dialogPendingRequestChecking,
+ canceledTimerTasksPurgePeriod,
+ instanceId);
newControllers.add(context.getServiceTarget().addService(SipSubsystemServices.JBOSS_SIP,
service)
.addDependency(PathManagerService.SERVICE_NAME,
PathManager.class, service.getPathManagerInjector())
.addDependency(DependencyType.OPTIONAL,
ServiceName.JBOSS.append("mbean", "server"), MBeanServer.class,
service.getMbeanServer())
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipSubsystemParser.java
Sun Jul 8 12:14:07 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipSubsystemParser.java
Fri Aug 10 06:02:07 2012
@@ -1,8 +1,8 @@
/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
+ * TeleStax, Open Source Cloud Communications Copyright 2012.
+ * and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
@@ -19,7 +19,6 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-
package org.mobicents.as7;
import static
org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD;
@@ -83,6 +82,13 @@
SipDefinition.CONCURRENCY_CONTROL_MODE.marshallAsAttribute(node,
false, writer);
SipDefinition.CONGESTION_CONTROL_INTERVAL.marshallAsAttribute(node, false,
writer);
SipDefinition.USE_PRETTY_ENCODING.marshallAsAttribute(node, false,
writer);
+
SipDefinition.ADDITIONAL_PARAMETERABLE_HEADERS.marshallAsAttribute(node,
false, writer);
+ SipDefinition.BASE_TIMER_INTERVAL.marshallAsAttribute(node, false,
writer);
+ SipDefinition.T2_INTERVAL.marshallAsAttribute(node, false, writer);
+ SipDefinition.T4_INTERVAL.marshallAsAttribute(node, false, writer);
+ SipDefinition.TIMER_D_INTERVAL.marshallAsAttribute(node, false,
writer);
+
SipDefinition.DIALOG_PENDING_REQUEST_CHECKING.marshallAsAttribute(node,
false, writer);
+
SipDefinition.CANCELED_TIMER_TASKS_PURGE_PERIOD.marshallAsAttribute(node,
false, writer);
if(node.hasDefined(CONNECTOR)) {
for(final Property connector :
node.get(CONNECTOR).asPropertyList()) {
final ModelNode config = connector.getValue();
@@ -117,6 +123,13 @@
case SIP_STACK_PROPS:
case SIP_APP_DISPATCHER_CLASS:
case SIP_PATH_NAME:
+ case ADDITIONAL_PARAMETERABLE_HEADERS:
+ case BASE_TIMER_INTERVAL:
+ case T2_INTERVAL:
+ case T4_INTERVAL:
+ case TIMER_D_INTERVAL:
+ case DIALOG_PENDING_REQUEST_CHECKING:
+ case CANCELED_TIMER_TASKS_PURGE_PERIOD:
case CONGESTION_CONTROL_INTERVAL:
case CONCURRENCY_CONTROL_MODE:
case USE_PRETTY_ENCODING:
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/resources/org/mobicents/as7/LocalDescriptions.properties
Sun Jul 29 18:41:35 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/resources/org/mobicents/as7/LocalDescriptions.properties
Fri Aug 10 06:02:07 2012
@@ -10,6 +10,13 @@
sip.congestion-control-interval=Congestion control interval.
sip.concurrency-control-mode=Sip servlets container concurrency control
mode.
sip.use-pretty-encoding=If true, Via, Route, and RecordRouteheader field
information shall be split into multiple lines.
+sip.additional-parameterable-headers=Comma separated list of header names
that are treated as parameterable by the container in addition to the
standard parameterable headers defined in the Sip Servlets 1.1
Specification.
+sip.base-timer-interval=Specifies the T1 Base Timer Interval, which allows
the SIP Servlets container to adjust its timers depending on network
conditions.
+sip.t2-interval=Specifies the T2 Interval, which allows the SIP Servlets
container to adjust its timers depending on network conditions.
+sip.t4-interval=Specifies the T4 Interval, which allows the SIP Servlets
container to adjust its timers depending on network conditions.
+sip.timer-d-interval=Specifies the Timer D Interval, which allows the SIP
Servlets container to adjust its timers depending on network conditions
+sip.dialog-pending-request-checking=This property enables and disables
error checking when SIP transactions overlap
+sip.canceled-timer-tasks-purge-period=Defines a period to due a purge in
the container timer schedulers. The purge may prevent excessive memory
usage for apps that cancel most of the timers it sets.
sip.configuration=The common sip container configuration.