Merge branch 'releases.3.5' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3

Conflicts:
	.gitignore
	conf/insideout/autoload_configs/modules.conf.xml
	conf/vanilla/autoload_configs/modules.conf.xml
	src/mod/endpoints/mod_sofia/mod_sofia.h
	src/switch_rtp.c

diff --cc conf/vanilla/autoload_configs/modules.conf.xml
index cb45a1598c32b3dcbd6449030a489fdb6479600e,f88bb7b7c0df15bc760f3431ea58e4605a9aeab4..ef40fd19920f1e846fdd89e3cb744f5397b51ace
--- 1/conf/vanilla/autoload_configs/modules.conf.xml
--- 2/conf/vanilla/autoload_configs/modules.conf.xml
+++ b/conf/vanilla/autoload_configs/modules.conf.xml
@@@ -80,10 -82,10 +82,14 @@@
      <load module="mod_g723_1"/>
      <load module="mod_g729"/>
      <load module="mod_amr"/>
++<<<<<<< HEAD
 +    <!--    <load module="mod_ilbc"/> -->
++=======
+     <!--<load module="mod_ilbc"/>-->
++>>>>>>> eb0404d0256dee4696b3ae1b62c4b1cef9327a0d
      <load module="mod_speex"/>
      <load module="mod_h26x"/>
-     <load module="mod_siren"/>
+     <!--<load module="mod_siren"/>-->
      <!--<load module="mod_isac"/>-->
      <!--<load module="mod_celt"/>-->
      <!--<load module="mod_opus"/>-->

diff --cc libs/freetdm/Makefile.am
Simple merge

diff --cc libs/freetdm/mod_freetdm/mod_freetdm.c
Simple merge

diff --cc libs/freetdm/src/ftdm_io.c
Simple merge

diff --cc libs/freetdm/src/include/freetdm.h
Simple merge

diff --cc libs/freetdm/src/include/private/ftdm_types.h
Simple merge

diff --cc src/include/switch_apr.h
Simple merge

diff --cc src/include/switch_types.h
Simple merge

diff --cc src/mod/endpoints/mod_sofia/mod_sofia.c
Simple merge

diff --cc src/mod/endpoints/mod_sofia/mod_sofia.h
index fa4fdc0b10290df0dc05d4247beb0b49b60ab134,f6ea3c6496bcaf82e136c80f8741405226d6a570..8a8e277da45f29acefd8d7435afdd1f5083edc82
--- 1/src/mod/endpoints/mod_sofia/mod_sofia.h
--- 2/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@@ -1152,4 -1187,15 +1187,16 @@@ void sofia_process_dispatch_event(sofia
  char *sofia_glue_get_host(const char *str, switch_memory_pool_t *pool);
  void sofia_presence_check_subscriptions(sofia_profile_t *profile, time_t now);
  void sofia_msg_thread_start(int idx);
 +void crtp_init(switch_loadable_module_interface_t *module_interface);
+ 
+ 
+ /* For Emacs:
+  * Local Variables:
+  * mode:c
+  * indent-tabs-mode:t
+  * tab-width:4
+  * c-basic-offset:4
+  * End:
+  * For VIM:
+  * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
+  */

diff --cc src/switch_rtp.c
index 93f7c5625420c169f3a4098b3e75750ce67fd7fb,039cad9eb6182bf5d2eb57e68a06ef3bf92b47b8..3bad17ce170045df98c7f7c32b72a3e8211d39f2
--- 1/src/switch_rtp.c
--- 2/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@@ -256,54 -270,9 +270,49 @@@ struct switch_rtp 
        int zinit;
  #endif
  
-       switch_time_t send_time;
-       switch_byte_t auto_adj_used;
-       uint8_t pause_jb;
-       uint16_t last_seq;
-       switch_time_t last_read_time;
-       switch_size_t last_flush_packet_count;
+ 
  };
  
 +struct switch_rtcp_source {
 +      unsigned ssrc1:32;
 +      unsigned fraction_lost:8;
 +      unsigned cumulative_lost:24;
 +      unsigned hi_seq_recieved:32;
 +      unsigned interarrival_jitter:32;
 +      unsigned lsr:32;
 +      unsigned lsr_delay:32;
 +};
 +
 +
 +#if SWITCH_BYTE_ORDER == __BIG_ENDIAN
 +struct switch_rtcp_s_desc_head {
 +      unsigned v:2;
 +      unsigned padding:1;
 +      unsigned sc:5;
 +      unsigned pt:8;
 +      unsigned length:16;
 +};
 +
 +#else /*  BIG_ENDIAN */
 +
 +struct switch_rtcp_s_desc_head {
 +      unsigned sc:5;
 +      unsigned padding:1;
 +      unsigned v:2;
 +      unsigned pt:8;
 +      unsigned length:16;
 +};
 +
 +#endif
 +
 +
 +struct switch_rtcp_s_desc_trunk {
 +      unsigned ssrc:32;
 +      unsigned cname:8;
 +      unsigned length:8;
 +      char text[1]; 
 +};
 +
  struct switch_rtcp_senderinfo {
        unsigned ssrc:32;
        unsigned ntp_msw:32;
@@@ -2866,10 -2856,9 +2899,10 @@@ static switch_status_t read_rtcp_packet
  
                                rtp_session->stats.rtcp.packet_count += sr->pc;
                                rtp_session->stats.rtcp.octet_count += sr->oc;
 +                              rtp_session->stats.rtcp.peer_ssrc = ntohl(sr->ssrc);
  
                                /* sender report */
-                               switch_log_printf(SWITCH_CHANNEL_LOG, /*SWITCH_LOG_DEBUG10*/ SWITCH_LOG_INFO,"Received a SR with %d report blocks, " \
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG10,"Received a SR with %d report blocks, " \
                                                                  "length in words = %d, " \
                                                                  "SSRC = 0x%X, " \
                                                                  "NTP MSW = %u, " \