From: Mathieu Rene <mrene@avgs.ca>
Date: Wed, 25 Jul 2012 19:11:42 +0000 (-0400)
Subject: Merge branch 'nsg-4.3' of git.sangoma.com:smg_freeswitch into nsg-4.3
X-Git-Tag: v1.2.3^2~71^2^2~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64e2680b671b378f7a58cc9c0744bf79155191ed;p=thirdparty%2Ffreeswitch.git

Merge branch 'nsg-4.3' of git.sangoma.com:smg_freeswitch into nsg-4.3

Conflicts:
	src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
---

64e2680b671b378f7a58cc9c0744bf79155191ed
diff --cc src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
index f2ecbe002b,03f03b5c2d..d74fb31d1e
--- a/src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
+++ b/src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
@@@ -153,7 -150,8 +154,9 @@@ struct megaco_profile_s 
  	char*					rtp_termination_id_prefix;
  	int						rtp_termination_id_len;
  	char*                	peer_list[MG_MAX_PEERS];     /* MGC Peer ID LIST */
 +    char*                   codec_prefs;
+ 	int						inact_tmr;                   /* inactivity timer value */
+     uint32_t                inact_tmr_task_id;                 /* FS timer scheduler task-id */
      
      switch_thread_rwlock_t  *contexts_rwlock;
      uint32_t next_context_id;