Update to latest UniMRCP version. MRCP requests can no timeout if there is no server response.

libs/unimrcp/modules/mrcp-sofiasip/include/mrcp_sdp.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Arsen Chaloyan
+ * Copyright 2008-2010 Arsen Chaloyan
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +12,12 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * $Id: mrcp_sdp.h 1474 2010-02-07 20:51:47Z achaloyan $
  */
 
-#ifndef __MRCP_SDP_H__
-#define __MRCP_SDP_H__
+#ifndef MRCP_SDP_H
+#define MRCP_SDP_H
 
 /**
  * @file mrcp_sdp.h
@@ -37,4 +39,4 @@ MRCP_DECLARE(apr_size_t) sdp_resource_discovery_string_generate(const char *ip,
 
 APT_END_EXTERN_C
 
-#endif /*__MRCP_SDP_H__*/
+#endif /* MRCP_SDP_H */

libs/unimrcp/modules/mrcp-sofiasip/include/mrcp_sofiasip_client_agent.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Arsen Chaloyan
+ * Copyright 2008-2010 Arsen Chaloyan
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +12,12 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * $Id: mrcp_sofiasip_client_agent.h 1700 2010-05-21 18:56:06Z achaloyan $
  */
 
-#ifndef __MRCP_SOFIASIP_CLIENT_AGENT_H__
-#define __MRCP_SOFIASIP_CLIENT_AGENT_H__
+#ifndef MRCP_SOFIASIP_CLIENT_AGENT_H
+#define MRCP_SOFIASIP_CLIENT_AGENT_H
 
 /**
  * @file mrcp_sofiasip_client_agent.h
@@ -40,30 +42,26 @@ struct mrcp_sofia_client_config_t {
 	apr_port_t local_port;
 	/** Local SIP user name */
 	char      *local_user_name;
-	
-	/** Remote IP address */
-	char      *remote_ip;
-	/** Remote SIP port */
-	apr_port_t remote_port;
-	/** Remote SIP user name */
-	char      *remote_user_name;
-
-	/** Force destination ip address. Should be used only in case 
-	SDP contains incorrect connection address (local IP address behind NAT) */
-	apt_bool_t force_destination;
-
 	/** User agent name */
 	char      *user_agent_name;
 	/** SDP origin */
 	char      *origin;
 	/** SIP transport */
 	char      *transport;
+	/** SIP T1 timer */
+	apr_size_t sip_t1;
+	/** SIP T2 timer */
+	apr_size_t sip_t2;
+	/** SIP T4 timer */
+	apr_size_t sip_t4;
+	/** SIP T1x64 timer */
+	apr_size_t sip_t1x64;
 };
 
 /**
  * Create Sofia-SIP signaling agent.
  */
-MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_sofiasip_client_agent_create(mrcp_sofia_client_config_t *config, apr_pool_t *pool);
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_sofiasip_client_agent_create(const char *id, mrcp_sofia_client_config_t *config, apr_pool_t *pool);
 
 /**
  * Allocate Sofia-SIP config.
@@ -72,4 +70,4 @@ MRCP_DECLARE(mrcp_sofia_client_config_t*) mrcp_sofiasip_client_config_alloc(apr_
 
 APT_END_EXTERN_C
 
-#endif /*__MRCP_SOFIASIP_CLIENT_AGENT_H__*/
+#endif /* MRCP_SOFIASIP_CLIENT_AGENT_H */

libs/unimrcp/modules/mrcp-sofiasip/include/mrcp_sofiasip_server_agent.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Arsen Chaloyan
+ * Copyright 2008-2010 Arsen Chaloyan
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +12,12 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * $Id: mrcp_sofiasip_server_agent.h 1700 2010-05-21 18:56:06Z achaloyan $
  */
 
-#ifndef __MRCP_SOFIASIP_SERVER_AGENT_H__
-#define __MRCP_SOFIASIP_SERVER_AGENT_H__
+#ifndef MRCP_SOFIASIP_SERVER_AGENT_H
+#define MRCP_SOFIASIP_SERVER_AGENT_H
 
 /**
  * @file mrcp_sofiasip_server_agent.h
@@ -38,7 +40,6 @@ struct mrcp_sofia_server_config_t {
 	char      *ext_ip;
 	/** Local port to bind to */
 	apr_port_t local_port;
-
 	/** SIP user name */
 	char      *user_name;
 	/** User agent name */
@@ -47,16 +48,23 @@ struct mrcp_sofia_server_config_t {
 	char      *origin;
 	/** SIP transport */
 	char      *transport;
-
 	/** Force destination ip address. Should be used only in case 
 	SDP contains incorrect connection address (local IP address behind NAT) */
 	apt_bool_t force_destination;
+	/** SIP T1 timer */
+	apr_size_t sip_t1;
+	/** SIP T2 timer */
+	apr_size_t sip_t2;
+	/** SIP T4 timer */
+	apr_size_t sip_t4;
+	/** SIP T1x64 timer */
+	apr_size_t sip_t1x64;
 };
 
 /**
  * Create Sofia-SIP signaling agent.
  */
-MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_sofiasip_server_agent_create(mrcp_sofia_server_config_t *config, apr_pool_t *pool);
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_sofiasip_server_agent_create(const char *id, mrcp_sofia_server_config_t *config, apr_pool_t *pool);
 
 /**
  * Allocate Sofia-SIP config.
@@ -65,4 +73,4 @@ MRCP_DECLARE(mrcp_sofia_server_config_t*) mrcp_sofiasip_server_config_alloc(apr_
 
 APT_END_EXTERN_C
 
-#endif /*__MRCP_SOFIASIP_SERVER_AGENT_H__*/
+#endif /* MRCP_SOFIASIP_SERVER_AGENT_H */