From: David Yat Sin <dyatsin@sangoma.com>
Date: Wed, 25 Jul 2012 15:15:18 +0000 (-0400)
Subject: Merge branch 'releases.3.5' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3
X-Git-Tag: v1.2.3^2~71^2^2~131^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b0fbe605c35c2c1e8f1afd4962fe9cce008bc5c;p=thirdparty%2Ffreeswitch.git

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
---

8b0fbe605c35c2c1e8f1afd4962fe9cce008bc5c
diff --cc conf/vanilla/autoload_configs/modules.conf.xml
index cb45a1598c,f88bb7b7c0..ef40fd1992
--- a/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 src/mod/endpoints/mod_sofia/mod_sofia.h
index fa4fdc0b10,f6ea3c6496..8a8e277da4
--- a/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 93f7c56254,039cad9eb6..3bad17ce17
--- a/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, " \