Merge branch 'master' into v1.4.beta

Conflicts:
	configure.in

conf/rayo/autoload_configs/ssml.conf.xml

@@ -21,6 +21,7 @@
 	<!-- map interpret-as to say macros -->
 	<macros>
 		<macro name="cardinal" method="pronounced" type="number"/>
+		<macro name="characters" method="pronounced" type="name_spelled"/>
 	</macros>
 
 </configuration>

libs/sofia-sip/libsofia-sip-ua/tport/tport_type_ws.c

@@ -229,7 +229,7 @@ int tport_recv_stream_ws(tport_t *self)
   if (N < 0) {
 	  err = errno = EHOSTDOWN;
 	  SU_DEBUG_1(("%s(%p): su_getmsgsize(): %s (%d) N=%ld\n", __func__, (void *)self,
-				  su_strerror(err), err, N));
+				  su_strerror(err), err, (long)N));
 	  return 0;
   }
 

src/include/switch_types.h

@@ -538,7 +538,7 @@ typedef enum {
 	SWITCH_XML_SECTION_CONFIG = (1 << 0),
 	SWITCH_XML_SECTION_DIRECTORY = (1 << 1),
 	SWITCH_XML_SECTION_DIALPLAN = (1 << 2),
-	SWITCH_XML_SECTION_PHRASES = (1 << 3),
+	SWITCH_XML_SECTION_LANGUAGES = (1 << 3),
 	SWITCH_XML_SECTION_CHATPLAN = (1 << 4),
 
 	/* Nothing after this line */

src/mod/formats/mod_ssml/conf/autoload_configs/ssml.conf.xml

@@ -21,6 +21,7 @@
 	<!-- map interpret-as to say macros -->
 	<macros>
 		<macro name="cardinal" method="pronounced" type="number"/>
+		<macro name="characters" method="pronounced" type="name_spelled"/>
 	</macros>
 
 </configuration>

src/mod/languages/mod_managed/freeswitch_wrap.cxx

@@ -9808,6 +9808,18 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_switchname() {
 }
 
 
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_domain(int jarg1) {
+  char * jresult ;
+  switch_bool_t arg1 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_bool_t)jarg1; 
+  result = (char *)switch_core_get_domain(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_set_variable(char * jarg1, char * jarg2) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -10094,6 +10106,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_exec(void * jarg1, void *
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_video_reset(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_video_reset(arg1);
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_execute_application_get_flags(void * jarg1, char * jarg2, char * jarg3, void * jarg4) {
   int jresult ;
   switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
@@ -15028,6 +15048,16 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_run_complete_func(char * jarg1,
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_push_match_unique(void * jarg1, char * jarg2) {
+  switch_console_callback_match_t **arg1 = (switch_console_callback_match_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_console_callback_match_t **)jarg1; 
+  arg2 = (char *)jarg2; 
+  switch_console_push_match_unique(arg1,(char const *)arg2);
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_push_match(void * jarg1, char * jarg2) {
   switch_console_callback_match_t **arg1 = (switch_console_callback_match_t **) 0 ;
   char *arg2 = (char *) 0 ;
@@ -15814,6 +15844,26 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_find_local_ip(char * jarg1, int jarg2,
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_find_interface_ip(char * jarg1, int jarg2, void * jarg3, char * jarg4, int jarg5) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  int *arg3 = (int *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (switch_status_t)switch_find_interface_ip(arg1,arg2,arg3,(char const *)arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT char * SWIGSTDCALL CSharp_get_addr(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   char * jresult ;
   char *arg1 = (char *) 0 ;
@@ -39286,6 +39336,29 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_task_cmd_id_get(voi
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_repeat_set(void * jarg1, unsigned long jarg2) {
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->repeat = arg2;
+  
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_task_repeat_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  result = (uint32_t) ((arg1)->repeat);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_group_set(void * jarg1, char * jarg2) {
   switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
   char *arg2 = (char *) 0 ;

src/switch_xml.c

@@ -200,7 +200,7 @@ static struct xml_section_t SECTIONS[] = {
 	{"config", SWITCH_XML_SECTION_CONFIG},
 	{"directory", SWITCH_XML_SECTION_DIRECTORY},
 	{"dialplan", SWITCH_XML_SECTION_DIALPLAN},
-	{"phrases", SWITCH_XML_SECTION_PHRASES},
+	{"languages", SWITCH_XML_SECTION_LANGUAGES},
 	{"chatplan", SWITCH_XML_SECTION_CHATPLAN},
 	{NULL, 0}
 };