Merge branch 'master' into smgmaster

Conflicts:
	build/modules.conf.in
	src/mod/loggers/mod_logfile/mod_logfile.c

src/include/private/switch_core_pvt.h

@@ -193,6 +193,12 @@ struct switch_media_bug {
 	switch_thread_id_t thread_id;
 	char *function;
 	char *target;
+	switch_codec_implementation_t read_impl;
+	switch_codec_implementation_t write_impl;
+	switch_timer_t timer;
+	uint32_t last_read_ts;
+	uint32_t last_write_ts;
+	switch_frame_t *ping_frame;
 	struct switch_media_bug *next;
 };
 

src/include/switch.h

@@ -109,7 +109,6 @@
 #include "switch_platform.h"
 #include "switch_types.h"
 #include "switch_apr.h"
-#include "switch_curl.h"
 #include "switch_mprintf.h"
 #include "switch_core_db.h"
 #include "switch_dso.h"

src/include/switch_channel.h

@@ -591,7 +591,10 @@ SWITCH_DECLARE(void) switch_channel_event_set_extended_data(_In_ switch_channel_
   \return the original string if no expansion takes place otherwise a new string that must be freed
   \note it's necessary to test if the return val is the same as the input and free the string if it is not.
 */
-SWITCH_DECLARE(char *) switch_channel_expand_variables(_In_ switch_channel_t *channel, _In_ const char *in);
+SWITCH_DECLARE(char *) switch_channel_expand_variables_check(switch_channel_t *channel, const char *in, switch_event_t *var_list, switch_event_t *api_list);
+#define switch_channel_expand_variables(_channel, _in) switch_channel_expand_variables_check(_channel, _in, NULL, NULL)
+
+
 SWITCH_DECLARE(char *) switch_channel_build_param_string(_In_ switch_channel_t *channel, _In_opt_ switch_caller_profile_t *caller_profile,
 														 _In_opt_ const char *prefix);
 SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(_In_ switch_channel_t *channel);

src/include/switch_core.h

@@ -995,7 +995,9 @@ SWITCH_DECLARE(void) switch_core_thread_session_end(_In_ switch_core_session_t *
   \brief Launch a service thread on a session to drop inbound data
   \param session the session the launch thread on
 */
-SWITCH_DECLARE(void) switch_core_service_session(_In_ switch_core_session_t *session);
+SWITCH_DECLARE(void) switch_core_service_session_av(_In_ switch_core_session_t *session, switch_bool_t audio, switch_bool_t video);
+#define switch_core_service_session(_s) switch_core_service_session_av(_s, SWITCH_TRUE, SWITCH_FALSE)
+
 
 /*! 
   \brief Request an outgoing session spawned from an existing session using a desired endpoing module
@@ -1467,6 +1469,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_destroy(switch_codec_t *codec)
 */
 SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(_In_ switch_core_session_t *session, switch_codec_t *codec);
 
+/*! 
+  \brief Assign the original read codec to a given session.  This is the read codec used by an endpoint.
+  \param session session to add the codec to
+  \param codec the codec to add
+  \return SWITCH_STATUS_SUCCESS if successful
+*/
+SWITCH_DECLARE(switch_status_t) switch_core_session_set_real_read_codec(_In_ switch_core_session_t *session, switch_codec_t *codec);
+
 SWITCH_DECLARE(void) switch_core_session_unset_read_codec(_In_ switch_core_session_t *session);
 SWITCH_DECLARE(void) switch_core_session_unset_write_codec(_In_ switch_core_session_t *session);
 
@@ -2115,6 +2125,7 @@ SWITCH_DECLARE(uint32_t) switch_core_default_dtmf_duration(uint32_t duration);
 SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string);
 SWITCH_DECLARE(switch_status_t) switch_console_set_alias(const char *string);
 SWITCH_DECLARE(int) switch_system(const char *cmd, switch_bool_t wait);
+SWITCH_DECLARE(int) switch_stream_system(const char *cmd, switch_stream_handle_t *stream);
 SWITCH_DECLARE(void) switch_cond_yield(switch_interval_time_t t);
 SWITCH_DECLARE(void) switch_cond_next(void);
 SWITCH_DECLARE(switch_status_t) switch_core_chat_send_args(const char *dest_proto, const char *proto, const char *from, const char *to,
@@ -2302,7 +2313,8 @@ SWITCH_DECLARE(char *) switch_say_file_handle_detach_path(switch_say_file_handle
 SWITCH_DECLARE(void) switch_say_file_handle_destroy(switch_say_file_handle_t **sh);
 SWITCH_DECLARE(switch_status_t) switch_say_file_handle_create(switch_say_file_handle_t **sh, const char *ext, switch_event_t **var_event);
 SWITCH_DECLARE(void) switch_say_file(switch_say_file_handle_t *sh, const char *fmt, ...);
-
+SWITCH_DECLARE(int) switch_max_file_desc(void);
+SWITCH_DECLARE(void) switch_close_extra_files(int *keep, int keep_ttl);
 
 SWITCH_END_EXTERN_C
 #endif

src/include/switch_curl.h

@@ -49,7 +49,7 @@ SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_setopt(CURL *handle, switch_CUR
 SWITCH_DECLARE(const char *) switch_curl_easy_strerror(switch_CURLcode errornum );
 SWITCH_DECLARE(void) switch_curl_init(void);
 SWITCH_DECLARE(void) switch_curl_destroy(void);
-
+SWITCH_DECLARE(switch_status_t) switch_curl_process_form_post_params(switch_event_t *event, switch_CURL *curl_handle, struct curl_httppost **formpostp);
 																
 #endif
 

src/include/switch_event.h

@@ -104,7 +104,8 @@ struct switch_event {
 
 typedef enum {
 	EF_UNIQ_HEADERS = (1 << 0),
-	EF_NO_CHAT_EXEC = (1 << 1)
+	EF_NO_CHAT_EXEC = (1 << 1),
+	EF_DEFAULT_ALLOW = (1 << 2)
 } switch_event_flag_t;
 
 
@@ -329,7 +330,8 @@ SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, con
 
 SWITCH_DECLARE(switch_status_t) switch_event_set_body(switch_event_t *event, const char *body);
 
-SWITCH_DECLARE(char *) switch_event_expand_headers(switch_event_t *event, const char *in);
+SWITCH_DECLARE(char *) switch_event_expand_headers_check(switch_event_t *event, const char *in, switch_event_t *var_list, switch_event_t *api_list);
+#define switch_event_expand_headers(_event, _in) switch_event_expand_headers_check(_event, _in, NULL, NULL)
 
 SWITCH_DECLARE(switch_status_t) switch_event_create_pres_in_detailed(_In_z_ char *file, _In_z_ char *func, _In_ int line,
 																	 _In_z_ const char *proto, _In_z_ const char *login,
@@ -399,7 +401,7 @@ SWITCH_DECLARE(void) switch_event_deliver(switch_event_t **event);
 #define switch_event_fire_data(event, data) switch_event_fire_detailed(__FILE__, (const char * )__SWITCH_FUNC__, __LINE__, event, data)
 
 SWITCH_DECLARE(char *) switch_event_build_param_string(switch_event_t *event, const char *prefix, switch_hash_t *vars_map);
-
+SWITCH_DECLARE(int) switch_event_check_permission_list(switch_event_t *list, const char *name);
 ///\}
 
 SWITCH_END_EXTERN_C

src/include/switch_ivr.h

@@ -162,13 +162,18 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_count(switch_core_sess
   \param mod_name the module name of the ASR library
   \param grammar the grammar text, URI, or local file name
   \param result of speech recognition, allocated from the session pool
+  \param input_timeout time to wait for input
+  \param args arguements to pass for callbacks etc
   \return SWITCH_STATUS_SUCCESS if all is well
 */
 SWITCH_DECLARE(switch_status_t) switch_ivr_play_and_detect_speech(switch_core_session_t *session, 
-														const char *file,
-														const char *mod_name,
-														const char *grammar,
-														char **result);
+																  const char *file, 
+																  const char *mod_name,
+																  const char *grammar,
+																  char **result,
+																  uint32_t input_timeout,
+																  switch_input_args_t *args);
+
 
 /*!
   \brief Engage background Speech detection on a session
@@ -911,6 +916,7 @@ SWITCH_DECLARE(switch_bool_t) switch_ivr_uuid_exists(const char *uuid);
 
 
 
+SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_last_ping(switch_ivr_dmachine_t *dmachine);
 SWITCH_DECLARE(const char *) switch_ivr_dmachine_get_name(switch_ivr_dmachine_t *dmachine);
 SWITCH_DECLARE(void) switch_ivr_dmachine_set_match_callback(switch_ivr_dmachine_t *dmachine, switch_ivr_dmachine_callback_t match_callback);
 SWITCH_DECLARE(void) switch_ivr_dmachine_set_nonmatch_callback(switch_ivr_dmachine_t *dmachine, switch_ivr_dmachine_callback_t nonmatch_callback);

src/include/switch_json.h

@@ -61,56 +61,56 @@ typedef struct cJSON_Hooks {
 } cJSON_Hooks;
 
 // Supply malloc, realloc and free functions to cJSON
-extern void cJSON_InitHooks(cJSON_Hooks* hooks);
+SWITCH_DECLARE(void) cJSON_InitHooks(cJSON_Hooks* hooks);
 
 
 // Supply a block of JSON, and this returns a cJSON object you can interrogate. Call cJSON_Delete when finished.
-extern cJSON *cJSON_Parse(const char *value);
+SWITCH_DECLARE(cJSON *)cJSON_Parse(const char *value);
 // Render a cJSON entity to text for transfer/storage. Free the char* when finished.
-extern char  *cJSON_Print(cJSON *item);
+SWITCH_DECLARE(char *)cJSON_Print(cJSON *item);
 // Render a cJSON entity to text for transfer/storage without any formatting. Free the char* when finished.
-extern char  *cJSON_PrintUnformatted(cJSON *item);
+SWITCH_DECLARE(char *)cJSON_PrintUnformatted(cJSON *item);
 // Delete a cJSON entity and all subentities.
-extern void   cJSON_Delete(cJSON *c);
+SWITCH_DECLARE(void)   cJSON_Delete(cJSON *c);
 
 // Returns the number of items in an array (or object).
-extern int	  cJSON_GetArraySize(cJSON *array);
+SWITCH_DECLARE(int)	  cJSON_GetArraySize(cJSON *array);
 // Retrieve item number "item" from array "array". Returns NULL if unsuccessful.
-extern cJSON *cJSON_GetArrayItem(cJSON *array,int item);
+SWITCH_DECLARE(cJSON *)cJSON_GetArrayItem(cJSON *array,int item);
 // Get item "string" from object. Case insensitive.
-extern cJSON *cJSON_GetObjectItem(cJSON *object,const char *string);
+SWITCH_DECLARE(cJSON *)cJSON_GetObjectItem(cJSON *object,const char *string);
 	
 // These calls create a cJSON item of the appropriate type.
-extern cJSON *cJSON_CreateNull(void);
-extern cJSON *cJSON_CreateTrue(void);
-extern cJSON *cJSON_CreateFalse(void);
-extern cJSON *cJSON_CreateNumber(double num);
-extern cJSON *cJSON_CreateString(const char *string);
-extern cJSON *cJSON_CreateArray(void);
-extern cJSON *cJSON_CreateObject(void);
+SWITCH_DECLARE(cJSON *)cJSON_CreateNull(void);
+SWITCH_DECLARE(cJSON *)cJSON_CreateTrue(void);
+SWITCH_DECLARE(cJSON *)cJSON_CreateFalse(void);
+SWITCH_DECLARE(cJSON *)cJSON_CreateNumber(double num);
+SWITCH_DECLARE(cJSON *)cJSON_CreateString(const char *string);
+SWITCH_DECLARE(cJSON *)cJSON_CreateArray(void);
+SWITCH_DECLARE(cJSON *)cJSON_CreateObject(void);
 
 // These utilities create an Array of count items.
-extern cJSON *cJSON_CreateIntArray(int *numbers,int count);
-extern cJSON *cJSON_CreateFloatArray(float *numbers,int count);
-extern cJSON *cJSON_CreateDoubleArray(double *numbers,int count);
-extern cJSON *cJSON_CreateStringArray(const char **strings,int count);
+SWITCH_DECLARE(cJSON *)cJSON_CreateIntArray(int *numbers,int count);
+SWITCH_DECLARE(cJSON *)cJSON_CreateFloatArray(float *numbers,int count);
+SWITCH_DECLARE(cJSON *)cJSON_CreateDoubleArray(double *numbers,int count);
+SWITCH_DECLARE(cJSON *)cJSON_CreateStringArray(const char **strings,int count);
 
 // Append item to the specified array/object.
-extern void cJSON_AddItemToArray(cJSON *array, cJSON *item);
-extern void	cJSON_AddItemToObject(cJSON *object,const char *string,cJSON *item);
+SWITCH_DECLARE(void) cJSON_AddItemToArray(cJSON *array, cJSON *item);
+SWITCH_DECLARE(void)	cJSON_AddItemToObject(cJSON *object,const char *string,cJSON *item);
 // Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON.
-extern void cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
-extern void	cJSON_AddItemReferenceToObject(cJSON *object,const char *string,cJSON *item);
+SWITCH_DECLARE(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
+SWITCH_DECLARE(void)	cJSON_AddItemReferenceToObject(cJSON *object,const char *string,cJSON *item);
 
 // Remove/Detatch items from Arrays/Objects.
-extern cJSON *cJSON_DetachItemFromArray(cJSON *array,int which);
-extern void   cJSON_DeleteItemFromArray(cJSON *array,int which);
-extern cJSON *cJSON_DetachItemFromObject(cJSON *object,const char *string);
-extern void   cJSON_DeleteItemFromObject(cJSON *object,const char *string);
+SWITCH_DECLARE(cJSON *)cJSON_DetachItemFromArray(cJSON *array,int which);
+SWITCH_DECLARE(void)   cJSON_DeleteItemFromArray(cJSON *array,int which);
+SWITCH_DECLARE(cJSON *)cJSON_DetachItemFromObject(cJSON *object,const char *string);
+SWITCH_DECLARE(void)   cJSON_DeleteItemFromObject(cJSON *object,const char *string);
 	
 // Update array items.
-extern void cJSON_ReplaceItemInArray(cJSON *array,int which,cJSON *newitem);
-extern void cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
+SWITCH_DECLARE(void) cJSON_ReplaceItemInArray(cJSON *array,int which,cJSON *newitem);
+SWITCH_DECLARE(void) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
 
 #define cJSON_AddNullToObject(object,name)	cJSON_AddItemToObject(object, name, cJSON_CreateNull())
 #define cJSON_AddTrueToObject(object,name)	cJSON_AddItemToObject(object, name, cJSON_CreateTrue())

src/include/switch_ssl.h

@@ -32,6 +32,10 @@
 #define __SWITCH_SSL_H
 
 #if defined(HAVE_OPENSSL)
+#if defined (MACOSX) || defined(DARWIN)
+/* Disable depricated-declarations on OS X */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
 #include <openssl/crypto.h>
 
 static switch_mutex_t **ssl_mutexes;

src/include/switch_types.h

@@ -785,6 +785,12 @@ typedef struct {
 #pragma pack(pop, r1)
 #endif
 
+typedef struct audio_buffer_header_s {
+	uint32_t ts;
+	uint32_t len;
+} audio_buffer_header_t;
+
+
 /*!
   \enum switch_priority_t
   \brief Priority Indication
@@ -1199,6 +1205,9 @@ typedef enum {
 	CF_ZOMBIE_EXEC,
 	CF_INTERCEPT,
 	CF_INTERCEPTED,
+	CF_VIDEO_REFRESH_REQ,
+	CF_SERVICE_AUDIO,
+	CF_SERVICE_VIDEO,
 	/* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
 	/* IF YOU ADD NEW ONES CHECK IF THEY SHOULD PERSIST OR ZERO THEM IN switch_core_session.c switch_core_session_request_xml() */
 	CF_FLAG_MAX

src/include/switch_utils.h

@@ -834,6 +834,9 @@ SWITCH_DECLARE(const char *) switch_inet_ntop(int af, void const *src, char *dst
 SWITCH_DECLARE(char *) switch_uuid_str(char *buf, switch_size_t len);
 SWITCH_DECLARE(char *) switch_format_number(const char *num);
 
+SWITCH_DECLARE(unsigned int) switch_atoui(const char *nptr);
+SWITCH_DECLARE(unsigned long) switch_atoul(const char *nptr);
+
 SWITCH_END_EXTERN_C
 #endif
 /* For Emacs: