Merge branch 'master' into releases.3.5

src/include/private/switch_core_pvt.h

@@ -195,9 +195,9 @@ struct switch_media_bug {
 	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;
+	uint32_t record_frame_size;
+	uint32_t record_pre_buffer_count;
+	uint32_t record_pre_buffer_max;
 	switch_frame_t *ping_frame;
 	struct switch_media_bug *next;
 };
@@ -260,6 +260,7 @@ struct switch_runtime {
 	uint32_t max_db_handles;
 	uint32_t db_handle_timeout;
 	int cpu_count;
+	uint32_t time_sync;
 };
 
 extern struct switch_runtime runtime;

src/include/switch_channel.h

@@ -403,6 +403,7 @@ SWITCH_DECLARE(void) switch_channel_clear_flag_recursive(switch_channel_t *chann
 SWITCH_DECLARE(switch_status_t) switch_channel_perform_answer(switch_channel_t *channel, const char *file, const char *func, int line);
 
 SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_channel_t *channel, const char *file, const char *func, int line);
+SWITCH_DECLARE(void) switch_channel_check_zrtp(switch_channel_t *channel);
 
 /*!
   \brief Answer a channel (initiate/acknowledge a successful connection)

src/include/switch_core.h

@@ -217,6 +217,8 @@ SWITCH_DECLARE(uint32_t) switch_core_media_bug_clear_flag(_In_ switch_media_bug_
 */
 SWITCH_DECLARE(void) switch_core_media_bug_set_read_replace_frame(_In_ switch_media_bug_t *bug, _In_ switch_frame_t *frame);
 
+SWITCH_DECLARE(uint32_t) switch_core_cpu_count(void);
+
 /*!
   \brief Remove a media bug from the session
   \param session the session to remove the bug from
@@ -270,6 +272,8 @@ SWITCH_DECLARE(void) switch_core_media_bug_flush(_In_ switch_media_bug_t *bug);
 */
 SWITCH_DECLARE(switch_status_t) switch_core_media_bug_flush_all(_In_ switch_core_session_t *session);
 
+SWITCH_DECLARE(switch_status_t) switch_core_media_bug_set_pre_buffer_framecount(switch_media_bug_t *bug, uint32_t framecount);
+
 ///\}
 
 ///\defgroup pa1 Port Allocation

src/include/switch_rtp.h

@@ -196,6 +196,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_s
 SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session);
 
 SWITCH_DECLARE(void) switch_rtp_break(switch_rtp_t *rtp_session);
+SWITCH_DECLARE(void) switch_rtp_flush(switch_rtp_t *rtp_session);
 
 /*! 
   \brief Test if an RTP session is ready

src/include/switch_types.h

@@ -314,7 +314,8 @@ typedef enum {
 	SCF_CLEAR_SQL = (1 << 17),
 	SCF_THREADED_SYSTEM_EXEC = (1 << 18),
 	SCF_SYNC_CLOCK_REQUESTED = (1 << 19),
-	SCF_CORE_ODBC_REQ = (1 << 20)
+	SCF_CORE_ODBC_REQ = (1 << 20),
+	SCF_DEBUG_SQL = (1 << 21)
 } switch_core_flag_enum_t;
 typedef uint32_t switch_core_flag_t;
 
@@ -1208,6 +1209,8 @@ typedef enum {
 	CF_VIDEO_REFRESH_REQ,
 	CF_SERVICE_AUDIO,
 	CF_SERVICE_VIDEO,
+	CF_ZRTP_HASH,
+	CF_ZRTP_PASS,
 	/* 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
@@ -1741,7 +1744,8 @@ typedef enum {
 	SCSC_PAUSE_CHECK,
 	SCSC_READY_CHECK,
 	SCSC_THREADED_SYSTEM_EXEC,
-	SCSC_SYNC_CLOCK_WHEN_IDLE
+	SCSC_SYNC_CLOCK_WHEN_IDLE,
+	SCSC_DEBUG_SQL,
 } switch_session_ctl_t;
 
 typedef enum {