Merge remote branch 'fsorig/master'

Conflicts: src/mod/endpoints/mod_sofia/sofia_glue.c
2011-02-18 22:50:00 -05:00 · 2011-02-18 22:50:00 -05:00 · f785d4b3ff
parent 4c4ca08dfc 39ff78bfae
commit f785d4b3ff
60 changed files with 1341 additions and 418 deletions
--- a/conf/autoload_configs/modules.conf.xml
+++ b/conf/autoload_configs/modules.conf.xml
@ -52,6 +52,7 @@
    <load module="mod_hash"/>
    <load module="mod_voicemail"/>
    <!--<load module="mod_directory"/>-->
+    <!--<load module="mod_distributor"/>-->
    <!--<load module="mod_lcr"/>-->
    <load module="mod_esf"/>
    <load module="mod_fsv"/>
--- a/conf/autoload_configs/switch.conf.xml
+++ b/conf/autoload_configs/switch.conf.xml
@ -98,7 +98,9 @@
    <!-- <param name="core-db-name" value="/dev/shm/core.db" /> -->
    <!-- The system will create all the db schemas automatically, set this to false to avoid this behaviour-->
    <!--<param name="auto-create-schemas" value="true"/>-->
-	 <!-- <param name="core-dbtype" value="MSSQL"/> -->
+    <!-- <param name="core-dbtype" value="MSSQL"/> -->
+    <!-- Allow multiple registrations to the same account in the central registration table -->
+    <!-- <param name="multiple-registrations" value="true"/> -->
  </settings>

 </configuration>
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@ -35,6 +35,7 @@ freeswitch (1.0.7)
 	config: Disallow global-intercept and group-intercept can intercept an outbound call in default dialplan (r:890871ba/FS-2777)
 	config: fix single domain assumption in default config to be more portable *cough* bkw *cough* (r:f987903e)
 	config: Bump Doxygen.conf version to 1.0.6... belatedly (r:cfeae1ba)
+	config: docs for acl (r:57b410eb)
 	core: Add RTCP support (FSRTP-14)
 	core: handle some errors on missing db handle conditions
 	core: add ... and shutdown as a fail-safe when no modules are loaded
@ -164,6 +165,24 @@ freeswitch (1.0.7)
 	core: drop rtp frame that was already replaced with a cng frame (r:34a0ca50)
 	core: fix partial match counting as exact match in dmachine (r:5eb951aa)
 	core: try to adjust the timer to be ok with the horrible 10000 microsecond kernel resolution on amazon ec3 but that doesn't mean it's not horribly wrong to run the kernel that slow (r:903b2901)
+	core: make exact matches return sooner in dmachine (r:e897646e)
+	core: don't let inherit_codec work when we have ep_codec_string set and the B-leg codec is not in that list since it will lead to failure (r:f79f9766)
+	core: set maximum query run time to 30 seconds at least on drivers that support SQL_ATTR_QUERY_TIMEOUT (r:5bb525e1)
+	core: dd switch_cache_db_affected_rows() to switch_core_sqldb (and switch_odbc) and expose it through Lua dbh:affected_rows() (r:d79cf484/FS-2962)
+	core: add bind meta on A-D and refactor (r:27869d7a)
+	core: add temp_hold_music var that is only valid until you transfer the call and finishing touches on bind meta to A-D (r:b262f44c)
+	core: add function to help set session read codec to slinear (r:1a08df9b)
+	core: add rtp_bug IGNORE_DTMF_DURATION to speed up dtmf detection of RFC2833 on strange carriers (r:b3fc001e)
+	core: Fix crash when re-connecting to non-working database server (r:29daaa07/FS-2960)
+	core: treat EINTR returns as a BREAK (now mapped to SWITCH_STATUS_INTR), we appriciate the interrupted syscalls but we would like to continue working properly (r:316963c5)
+	core: eat rtp frames with the wrong payload type number (r:fe1711fd)
+	core: up assert vaule on header loop detection to 1 meeeeelyonne for hmmhesegs (r:d9c56345)
+	core: Fix race condition in originate where USER_BUSY is reported as a no answer (r:cc06fdb5/FS-2992)
+	core: Allow check ip change to be optional (r:1cf79386/FS-2917)
+	core: handle 2833 in do_flush instead of dropping valid dtmf (r:3fa3e11c/FS-3002)
+	core: add record_restart_time_limit_on_dtmf var (r:7a1dcb69)
+	core: fix unreachable condition with a null args to make any key stop playback/record etc without dequing and remove hard-coded flush digits in play_and_get_digits be sure to flush it yourself before using (r:976859bb)
+	core: Fix a lock on reloadxml when stderr write is blocked.  Also remove an error parsing print since reason generated were wrong and duplicate. (r:2d6161e8)
 	embedded languages: Provide core level support for conditional Set Global Variable (r:c017c24b/FSCORE-612)
 	embedded languages: add insertFile front end to switch_ivr_insert_file and reswig (r:c4e350ab)
 	lang: Improve French phrase files (FSCONFIG-23)
@ -188,11 +207,14 @@ freeswitch (1.0.7)
 	libesl: Make last_event pointer last longer (r:a15f51d5/ESL-37)
 	libesl: use a packet buffer for ESL (r:2081bf97)
 	libesl: Noevent/Noevents disparity (r:d29d83d7/ESL-53)
+	libesl: FS-2957 esl lib on windows fails to build (r:5254df04/FS-2957)
+	libesl: Small fix on ESL that cause event_id to be set wrong on headers that had value failure. (r:eb88304a)
 	libfreetdm: implemented freetdm config nodes and ss7 initial configuration
 	libfreetdm: fix codec for CAS signaling (r:b76e7f18)
 	libfreetdm: freetdm: ss7- added support for incoming group blocks, started adding support for ansi (r:c219a73c)
 	libg7221: A bunch of tweaks to the G.722.1 codec (r:5d548570)
 	libgnutls: link to libgcrypt as well, please report any platforms this breaks, but it should be portable (r:c569fb0f/FS-1248)
+	libjs: non-portable comment syntax in .s files 
 	libopenzap: Add CLI tracing
 	libs: Merged OpenZAP and FreeTDM into the FreeSWITCH tree.
 	libs: Add support for TLS on Windows using openssl (r:1abe3b93/MODSOFIA-92)
@ -207,6 +229,7 @@ freeswitch (1.0.7)
 	libspandsp: Fix Windows build after libspandsp update (r:d70cc852/FSBUILD-293)
 	libspandsp: Fix for T.30 processing of operator interrupts, to improve compatibility with some machines, which seem to send them when no operator is around. (r:84ee0ae6)
 	libspandsp: spandsp t38 fax receiving error in win XP - regression from f029f7ef (r:761cec8f/FS-2766)
+	libspandsp: Added missing error codes when an ECM FAX is abandoned with the T30_ERR message (r:ec57dc7a)
 	mod_avmd: Initial check in - Advanced Voicemail Detect (r:10c6a30a) (by Eric Des Courtis)
 	mod_avmd: Add to windows build (r:df4bd935)
 	mod_avmd: Fix mem leak (r:cd951384/FS-2839)
@ -229,8 +252,12 @@ freeswitch (1.0.7)
 	mod_callcenter: Fix bad return type so it compile on archlinux, thx bougyman (r:3a475986)
 	mod_callcenter: Make callcenter_config agent get return the value of the item requested.  Also added queue param max-wait-time-with-no-agent-time-reached: If the max-wai-time-with-no-agent is already reached for the queue, then new caller can wait for x amount of second before it kicked out of the queue rather than get rejected automatically. (r:81a03869)
 	mod_callcenter: Add new event socket agent-offering.  Plus some documentation and better handling of bad agent type -- FS-2869 (r:80174cf3/FS-2869)
+	mod_callcenter: Add error response for queue load and queue reload (FS-2988) (r:49a5effc/FS-2988)
 	mod_cdr_sqlite: initial commit (r:f625fe3b)
 	mod_cdr_sqlite: config file for mod_cdr_sqlite (r:25bc8fe3)
+	mod_cdr_sqlite: Drop transaction BEGIN/END around INSERT. We're only executing one command, and autocommit will automatically rollback if the INSERT fails. Sync state_handlers with mod_cdr_csv. Minor libpq fixups. (r:0f95b870)
+	mod_celt: Bump celt to 0.10.0 (r:231fbe5e)
+	mod_celt: update code in mod_celt to match API of 0.10.0 (r:6e4c30ea)
 	mod_cidlookup: null xml is bad (r:095815f8)
 	mod_cid_lookup: honor skipcitystate when using whitepages (r:a66654de/FSMOD-53)
 	mod_commands: make break uuid_break and add cascade flag 
@ -252,6 +279,7 @@ freeswitch (1.0.7)
 	mod_commands: Dramatic jitterbuffer changes (r:d5470961)
 	mod_commands: add uuid_buglist to fetch the current media-bugs attached to a given session uuid (r:f6eab64c)
 	mod_commands: add recovery_refresh app and api and use it in mod_conference to send a message to the channel telling it to sync its recovery snapshot (r:650393fb)
+	mod_commands: add moh by default to uuid_broadcast when only broadcasting to A leg use aleg arg to disable this (r:d164a797)
 	mod_conference: Fix reporting of volume up/down (MODAPP-419)
 	mod_conference: add last talking time per member to conference xml list
 	mod_conference: add terminate-on-silence conference param
@ -265,6 +293,10 @@ freeswitch (1.0.7)
 	mod_conference: Add a chan var conference_enter_sound to override conference enter-sound param on the profile (r:651acc62)
 	mod_conference: Add an unique id to the conference obj so that we can track conferences. (r:479f3de2)
 	mod_conference: Fix corrupted audio when playing "you are now (un)muted..." (r:10257c7d/FS-2768)
+	mod_conference: clear last_transferred conference when you exit the conference app (r:fb017a52)
+	mod_conference: Add energy level to conference_add_event_member_data (r:8d6d52e0)
+	mod_conference: if more digits than the length of the correct pin the remaining digits are accounted for next retry (r:b88cd345/FS-3000)
+	mod_conference: Fix unexpected behavior with endconf and auto-outcalls and pre_answer (r:6f58e6aa/FS-2771)
 	mod_curl: use method=post when post requested (r:c6a4ddd0/FSMOD-69)
 	mod_db: fix stack corruption (MODAPP-407)
 	mod_dialplan_xml: Add in the INFO log the caller id number when processing a request (Currenly only show the caller name) (r:e1df5e13)
@ -282,12 +314,16 @@ freeswitch (1.0.7)
 	mod_dptools: refactor export code and add new bridge_export app which is like export but exports across when one channel bridges another (r:4aa9a838)
 	mod_dptools: add bind_digit_action application (r:9537197b)
 	mod_dptools: emit event when user presses DTMFs (r:37298f56)
+	mod_dptools: Log error when there's no IVR menus configured when you call 'ivr' DP app (r:30034891)
+	mod_easyroute: Fix possible segfaults and memory leak during unload, and add new setting odbc-retries (r:7fbc47f8/FS-2973)
 	mod_erlang_event: Make XML fetch reply ACKs distinguishable, update freeswitch.erl (r:9d44ed04)
 	mod_erlang_event: Add 3 new commands; session_event, session_noevents, session_nixevent (r:698fa045)
 	mod_erlang_event: generate long node names the same as erlang does (r:9ad509c2)
 	mod_erlang_event: Improve some logging to include UUIDs (r:c0d51b83)
 	mod_erlang_event: Support for reading erlang cookie from a file (r:094ffe37)
 	mod_erlang_event: Rewrite XML fetch conditional wait to be more sane (Reported by James Aimonetti) (r:6941c6eb/FS-2775)
+	mod_erlang_event: Don't urlencode events (and destroy an event after use) (r:4eccdfef)
+	mod_erlang_event Add proper locking for the list of XML bindings (r:9fe440b2)
 	mod_event_socket: fix up other users of switch_event_xmlize() to use SWITCH_EVENT_NONE (r:d6eb7562)
 	mod_event_socket: Fix small mem leaks (r:e4f90584/MODEVENT-68)
 	mod_event_socket: Add "-ERR" to api cmd response when failure occurs (r:58759052/FS-2827)
@ -301,6 +337,8 @@ freeswitch (1.0.7)
 	mod_fifo: add outbound_ring_timeout param to mod_fifo (r:3885eea7)
 	mod_fifo: add default_lag to fifo (r:dd4fb5be)
 	mod_fifo: Fix crash when using fifo_destroy_after_use (r:ee562c82/FS-2879)
+	mod_fifo: don't seg in edge case error conditions (r:9ee13b72)
+	mod_fifo: set tracking data before enabling hooks (r:34267869)
 	mod_freetdm: Fix for TON and NPI not passed through to channel variables on incoming calls
 	mod_freetdm: add pvt data to freetdm channels fix fxs features (r:9d456900)
 	mod_freetdm: export and import boost custom data (r:edb2d582)
@ -334,6 +372,7 @@ freeswitch (1.0.7)
 	mod_freetdm: created cmake files for freetdm (r:fc55997b)
 	mod_freetdm: ss7 - added support to control mtp2, mtp3, and isup timers via freetdm.conf.xml (r:4455d581)
 	mod_freetdm: made ftmod_r2 use FTDM_SPAN_USE_SIGNALS_QUEUE and properly send FTDM_SIGEVENT_SIGSTATUS_CHANGED (r:af5f0a4a)
+	mod_fsk: add mod_fsk (r:fcc912a9)
 	mod_gsmopen: copy from branch
 	mod_gsmopen: fix FS-2793, compilation stops (r:355c0dbb/FS-2793)
 	mod_gsmopen: retry serial initialization if failed, zeroing audio buffers, slower retry on soundcard busy (EAGAIN) (r:c7aefe93)
@ -351,6 +390,7 @@ freeswitch (1.0.7)
 	mod_hash: use 5 seconds connection timeouts for remote connections (r:7431fbe9)
 	mod_hash: use esl_recv_timed with a 5000ms timeout when doing api commands (r:27d8378f)
 	mod_hash: limit_remote_thread sending invalid handle to esl_connect_timeout causing core (r:6cdd3e2a/MODAPP-446)
+	mod_hash: avoid scheduler caling a function on null hash during shutdown (r:8458adeb)
 	mod_h323: initial t.38 support. remake logical channel opening. add missing param name in example config. (r:8c58074c)
 	mod_h323: some t.38 and lockinng improvements. replace ptrace with switch_log_printf. (r:5efe5c88)
 	mod_h323: add missing conf prameter (r:0b353d7a)
@ -379,6 +419,8 @@ freeswitch (1.0.7)
 	mod_lua: Made 2nd arg to freeswitch.Dbh:query (cb func) optional (r:87db11af)
 	mod_lua: Added SAF_ROUTING_EXEC flag to lua app, so it can be run inline (r:7d5ca1c0)
 	mod_lua: spelling error in -ERR return code encounterd -> encountered (r:86e7cdc5/FS-2949)
+	mod_lua: Make dbh:connected accessible from Lua - thanks Grmt (r:09e6fd3f)
+	mod_lua: Added optional core: prefix to first arg passed to freeswitch.Dbh for giving direct access to sqlite db (r:a0181479)
 	mod_managed: Added wrapper for switch_event_bind for .net (r:a5f07a80/MODLANG-165)
 	mod_managed: add additional support (r:5be58aac)
 	mod_managed: add mono 2.8 patch file see FS-2774 (r:6a948bd9/FS-2774)
@ -442,6 +484,7 @@ freeswitch (1.0.7)
 	mod_snapshot: fix bad codepaths in mod_snapshot (r:844ac220)
 	mod_sndfile: Add support for .alaw and .ulaw to mod_sndfile (r:facf09b8/MODFORM-41)
 	mod_sndfile: return break in mod_sndfile when seek returns failure (r:564dc7e4)
+	mod_snmp: initial checkin of mod_snmp (r:6e2b1bd3)
 	mod_sofia: Send SIP MESSAGE to unregistered users by prefixing sip: to user@domain
 	mod_sofia: fix callee being updated with callee information
 	mod_sofia: set appearance-index in update statement for SLA
@ -548,6 +591,20 @@ freeswitch (1.0.7)
 	mod_sofia: improve fail2ban logging (r:f4d52d4c/FS-2943)
 	mod_sofia: refactor sofia_contact to try the profile_name first then the domain to resolve the profile then fall back to querying every profile to reduce confusion with multi-homers (d'oh) also special profile name * will force a search-all situation (r:81608da0)
 	mod_sofia: support allowing pidf-ful presence clients to share the same account and 'appear offline' without influencing each other =/ also refactor the contact generation string based on nat into a helper function (r:97a68c50)
+	mod_sofia: gateway not identified when extension-in-contact is set (r:7b289941/FS-502)
+	mod_sofia: Fix erroneous error log on SQL statement (r:2c595a6c/FS-2961)
+	mod_sofia: Fix routing behavior of inbound calls from gateways that only match gateway based on the gw request uri param (r:0132cd3f)
+	mod_sofia: don't say we are not for polycom phones (safe rport) when its not really nat (r:9462f53c)
+	mod_sofia: Set route header as a var on channel like Diversion header (r:d41e6498)
+	mod_sofia: fix seg related to ptime mismatch + CNG + PLC (if you ever get purple ptime mismatch warnings you want this patch) (r:54de293b)
+	mod_sofia: be more iOS friendly when using TCP or TLS because the phone never sleeps thus drains the battery (r:159ae989)
+	mod_sofia: add send-presence-on-register (true|false|first-only) param to sofia and api command sofia global debug [presence|sla|none]
+	mod_sofia: disable media timeout when encountering a recvonly stream (r:029d68ce)
+	mod_sofia: fix sofia flush_inbound_reg to work when @domain is given (r:68bf642c)
+	mod_sofia: fix session timer failure when freeswitch is generating the sdp and there are enough dynamic codecs enabled to conflict with the 2833 pt (4 by default) (r:018a3800)
+	mod_sofia: Places ;fs_path= within the contact string <...> when using NDLB-connectile-dysfunction-2.0, instead of just appending to the end of the contact string. (r:afc02747/FS-2989)
+	mod_sofia: Fix handling SUBSCRIBE to &quot;park+&quot; fifo, the NOTIFY data was not being generated from mod_fifo data. (r:3dd9d5c0/FS-3007)
+	mod_sofia: fsctl pause improvements (r:008e527c/FS-3012)
 	mod_spandsp: initial checkin of mod_fax/mod_voipcodecs merge into mod_spandsp (r:fa9a59a8)
 	mod_spandsp: rework of new mod_spandsp to have functions broken up into different c files (r:65400642)
 	mod_spandsp: improve duplicate digit detection and add 'min_dup_digit_spacing_ms' channel variable for use with the dtmf detector (r:eab4f246/FSMOD-45)
@ -559,6 +616,7 @@ freeswitch (1.0.7)
 	mod_spandsp: deadlock in mod_spandsp (mod_spandsp_fax.c) (r:b02c69bb/FS-1690)
 	mod_spandsp: T.38 reINVITE glare condition causes FAX processing to stop. (r:04aa7ef9/FS-1682)
 	mod_spandsp: improve nat handling when using stun or host as ext-rtp-ip (r:03e74c51/FS-526)
+	mod_spandsp: Fire event when fax is finished; indicates result of fax attempt (r:314a2a1e/FS-3004)
 	mod_spidermonkey: allow vars to be set containing vars from languages (r:5cd072a3)
 	mod_spidermonkey: fix seg in js hangup (r:7d554c11)
 	mod_spidermonkey: Fix mod_spidermonkey build on FreeBSD, (Undefined symbol PR_LocalTimeParameters). (r:3edb8419)
@ -579,10 +637,14 @@ freeswitch (1.0.7)
 	mod_voicemail: add quotes to vm_cc command generated internally to escape spaces in the caller id name (r:5f012813)
 	mod_voicemail: Play caller id of callee prior to playing a vmail (r:e7b97907/FS-2719)
 	mod_voicemail: FS-1776 Add support for per user operator exten override param vm-operator-extension (r:df5b3498/FS-1776)
+	mod_voicemail: Set email address from within directory (r:83ce26b2/FS-2972)
+	mod_voicemail: add events for record/change greeting and record name (r:54421f59)
+	mod_voicemail: let vmain-key and operator-key be set empty (r:de49305a)
 	mod_xml_cdr: add force_process_cdr var to process b leg cdr on a case by case basis when b leg cdr is disabled (XML-17)
 	mod_xml_cdr: add leg param to query string (XML-24)
 	mod_xml_cdr: fix locked sessions (XML-26)
 	mod_xml_cdr: fix minor memory leaks and config bug (r:19253d83/MODEVENT-62)
+	mod_xml_cdr: Fix prefix-a-leg not respected for url submission (r:ea9021a2/FS-2998)
 	mod_xml_rpc: Fix crash if unauthorized XML RPC is attempted (r:9835395c/FS-184)
 	scripts: added honeypot.pl and blacklist.pl which add extra SIP security options (r:b6a81ba7)
 	scripts: do simple verification to make sure we are getting IP addresses from VoIP abuse blacklist (r:b0049160)
--- a/freeswitch.spec
+++ b/freeswitch.spec
@ -27,6 +27,14 @@
 # Maintainer(s): Michal Bielicki <michal.bielicki (at) ++nospam_please++ seventhsignal.de
 #
 ######################################################################################################################
+# Module build settings
+%define build_sng_isdn 0
+%define build_sng_ss7 0
+%define build_sng_tc 0
+%{?with_sang_tc:%define build_sng_tc 1 }
+%{?with_sang_isdn:%define build_sng_isdn 1 }
+%{?with_sang_ss7:%define build_sng_ss7 1 }
+
 ######################################################################################################################
 #
 # disable rpath checking
@ -54,7 +62,7 @@ Vendor:       	http://www.freeswitch.org/
 #
 ######################################################################################################################
 Source0:    http://files.freeswitch.org/%{name}-%{version}.tar.bz2
-Source1:	http://files.freeswitch.org/downloads/libs/celt-0.7.1.tar.gz
+Source1:	http://files.freeswitch.org/downloads/libs/celt-0.10.0.tar.gz
 Source2:	http://files.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz
 Source3:	http://files.freeswitch.org/downloads/libs/lame-3.97.tar.gz
 Source4:	http://files.freeswitch.org/downloads/libs/libshout-2.2.2.tar.gz
@ -65,6 +73,8 @@ Source8:	http://files.freeswitch.org/downloads/libs/soundtouch-1.3.1.tar.gz
 Source9:	http://files.freeswitch.org/downloads/libs/sphinxbase-0.4.99-20091212.tar.gz
 Source10:	http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
 Source11:	http://files.freeswitch.org/downloads/libs/libmemcached-0.32.tar.gz
+Source12:       http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz
+Source13:       http://files.freeswitch.org/downloads/libs/opus-0.9.0.tar.gz
 Prefix:        	%{prefix}


@ -109,6 +119,8 @@ BuildRequires: which
 BuildRequires: zlib-devel
 BuildRequires: e2fsprogs-devel
 BuildRequires: libtheora-devel
+BuildRequires: libxml2-devel
+BuildRequires: bison
 Requires: alsa-lib
 Requires: libogg
 Requires: libvorbis
@ -124,6 +136,7 @@ Requires: zlib
 Requires: libtiff
 Requires: python
 Requires: libtheora
+Requires: libxml2

 %if %{?suse_version:1}0
 %if 0%{?suse_version} > 910
@ -282,14 +295,72 @@ German language phrases module and directory structure for say module and voicem
 Summary:	Provides a unified interface to hardware TDM cards and ss7 stacks for FreeSWITCH
 Group:		System/Libraries
 Requires:        %{name} = %{version}-%{release}
-%{?with_sang_isdn: Requires: wanpipe }
-%{?with_sang_isdn: Requires: libsng_isdn }
-%{?with_sang_isdn: BuildRequires: wanpipe }
-%{?with_sang_isdn: BuildRequires: libang_isdn }

 %description freetdm
 FreeTDM

+%if %{build_sng_isdn}
+
+%package freetdm-sng-isdn
+Summary:	Sangoma ISDN Module for FreeTDM
+Group:		System/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-freetdm = %{version}-%{release}
+Requires: wanpipe 
+Requires: libsng_isdn 
+BuildRequires: wanpipe 
+BuildRequires: libsng_isdn 
+
+%description freetdm-sng-isdn
+Sangoma ISDN Module for freetdm
+
+%endif
+
+%if %{build_sng_ss7}
+
+%package freetdm-sng-ss7
+Summary:	Provides a unified interface to hardware TDM cards and ss7 stacks for FreeSWITCH, Sangoma SS7 Module
+Group:		System/Libraries
+Requires:        %{name} = %{version}-%{release}
+Requires:       %{name}-freetdm = %{version}-%{release}
+Requires: wanpipe 
+Requires: libsng_ss7 
+BuildRequires: wanpipe 
+BuildRequires: libsng_ss7 
+
+%description freetdm-sng-ss7
+Sangoma SMG-SS7 drivers for FreeTDM
+
+%endif
+
+
+%if %{build_sng_tc}
+
+%package sangoma-codec
+Summary:	Sangoma D100 and D500 Codec Card Support
+Group:		System/Libraries
+Requires:        %{name} = %{version}-%{release}
+Requires: sng-tc-linux
+BuildRequires: sng-tc-linux
+
+%description sangoma-codec
+Sangoma D100 and D500 Codec Card Support
+
+%endif
+
+%package skypopen
+Summary:	Skype Endpoint
+Group:          System/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:	libX11
+BuildRequires:	libX11-devel
+
+%description skypopen
+This software (Skypopen) uses the Skype API but is not endorsed, certified or otherwise approved in any way by Skype.
+Skypopen is an endpoint (channel driver) that uses the Skype client as an interface to the Skype network, and allows 
+incoming and outgoing Skype calls to/from FreeSWITCH (that can be bridged, originated, answered, etc. as in all other 
+endpoints, e.g. Sofia-SIP).
+
 ######################################################################################################################
 #
 #				Unpack and prepare Source archives, copy stuff around etc ..
@ -309,6 +380,8 @@ cp %{SOURCE8} libs/
 cp %{SOURCE9} libs/
 cp %{SOURCE10} libs/
 cp %{SOURCE11} libs/
+cp %{SOURCE12} libs/
+cp %{SOURCE13} libs/

 ######################################################################################################################
 #
@ -358,7 +431,11 @@ ASR_TTS_MODULES="asr_tts/mod_pocketsphinx asr_tts/mod_flite asr_tts/mod_unimrcp"
 #
 ######################################################################################################################
 CODECS_MODULES="codecs/mod_bv codecs/mod_h26x codecs/mod_speex codecs/mod_celt codecs/mod_codec2 codecs/mod_ilbc codecs/mod_mp4v \
-                codecs/mod_silk codecs/mod_siren codecs/mod_theora"
+                codecs/mod_opus codecs/mod_silk codecs/mod_siren codecs/mod_theora "
+#
+%if %{build_sng_tc}
+CODECS_MODULES+="codecs/mod_sangoma_codec"
+%endif
 ######################################################################################################################
 #
 #					Dialplan Modules
@ -377,7 +454,7 @@ DIRECTORIES_MODULES=""
 #
 ######################################################################################################################
 ENDPOINTS_MODULES="endpoints/mod_dingaling endpoints/mod_loopback ../../libs/freetdm/mod_freetdm endpoints/mod_portaudio \
-                   endpoints/mod_sofia"
+                   endpoints/mod_sofia endpoints/mod_skinny endpoints/mod_skypopen"
 
 ######################################################################################################################
 #
@ -483,11 +560,13 @@ fi
 		%{?configure_options}

 #Create the version header file here
-cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/%{version}/g" > src/include/switch_version.h
-touch .noversion
+#cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/%{version}/g" > src/include/switch_version.h
+#touch .noversion

 %{__make}

+cd libs/esl
+%{__make} pymod

 ######################################################################################################################
 #
@ -503,6 +582,11 @@ touch .noversion
 %{__mkdir} -p %{buildroot}%{logfiledir}
 %{__mkdir} -p %{buildroot}%{runtimedir}

+#install the esl stuff
+cd libs/esl
+%{__make} DESTDIR=%{buildroot} pymod-install
+cd ../..
+
 %ifos linux
 # Install init files
 # On SuSE:
@ -522,6 +606,23 @@ touch .noversion
 # Add monit file
 %{__install} -D -m 644 build/freeswitch.monitrc %{buildroot}/etc/monit.d/freeswitch.monitrc
 %endif
+######################################################################################################################
+#
+#                               Remove files that are not wanted if they exist
+#
+######################################################################################################################
+
+%if %{build_sng_ss7}
+#do not delete a thing
+%else
+%{__rm} -f %{buildroot}/%{prefix}/mod/ftmod_sangoma_ss7*
+%endif
+%if %{build_sng_isdn}
+#do not delete a thing
+%else
+%{__rm} -f %{buildroot}/%{prefix}/mod/ftmod_sangoma_isdn*
+%endif
+


 ######################################################################################################################
@ -545,8 +646,6 @@ fi

 chkconfig --add freeswitch

-
-
 %postun
 ######################################################################################################################
 #
@ -790,6 +889,7 @@ fi
 %{prefix}/mod/mod_mp4v.so*
 %{prefix}/mod/mod_native_file.so*
 %{prefix}/mod/mod_nibblebill.so*
+%{prefix}/mod/mod_opus.so*
 %{prefix}/mod/mod_pocketsphinx.so*
 %{prefix}/mod/mod_portaudio.so*
 %{prefix}/mod/mod_portaudio_stream.so*
@ -798,6 +898,7 @@ fi
 %{prefix}/mod/mod_shout.so*
 %{prefix}/mod/mod_silk.so*
 %{prefix}/mod/mod_siren.so*
+%{prefix}/mod/mod_skinny.so*
 %{prefix}/mod/mod_sndfile.so*
 %{prefix}/mod/mod_snom.so*
 %{prefix}/mod/mod_sofia.so*
@ -831,7 +932,7 @@ fi
 %{prefix}/include/*.h
 ######################################################################################################################
 #
-#						OpenZAP Module for TDM Interaction
+#						FreeTDM Module for TDM Interaction
 #
 ######################################################################################################################
 %files freetdm
@ -844,7 +945,26 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/zt.conf
 %{prefix}/lib/libfreetdm.so*
 %{prefix}/mod/mod_freetdm.so*
-%{prefix}/mod/ftm*.so*
+%{prefix}/mod/ftmod_skel*.so*
+%{prefix}/mod/ftmod_[a-r,t-z]*.so*
+
+%if %{build_sng_tc}
+%files sangoma-codec
+%defattr(-, freeswitch, daemon)
+%{prefix}/mod/mod_sangoma_codec.so*
+%endif
+
+%if %{build_sng_ss7}
+%files freetdm-sng-ss7
+%defattr(-, freeswitch, daemon)
+%{prefix}/mod/ftmod_sangoma_ss7.so*
+%endif
+
+%if %{build_sng_isdn}
+%files freetdm-sng-isdn
+%defattr(-, freeswitch, daemon)
+%{prefix}/mod/ftmod_sangoma_isdn.so*
+%endif

 ######################################################################################################################
 #
@ -899,9 +1019,14 @@ fi
 %defattr(-,freeswitch,daemon)
 %{prefix}/mod/mod_python*.so*
 %attr(0644, root, bin) /usr/lib/python*/site-packages/freeswitch.py*
+%attr(0755, root, bin) /usr/lib/python*/site-packages/_ESL.so*
+%attr(0755, root, bin) /usr/lib/python*/site-packages/ESL.py*
 %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/autoload_configs
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/python.conf.xml

+%files skypopen
+%defattr(-,freeswitch,daemon)
+%{prefix}/mod/mod_skypopen.so*
 ######################################################################################################################
 #
 #						Language Modules
@ -956,6 +1081,17 @@ fi
 #
 ######################################################################################################################
 %changelog
+* Wed Feb 16 2011 - michal.bielicki@seventhsignal.de
+- added mod_skinny
+- added sangoma libraries
+- added sangoma codec module for D100 and D150 and D500
+- added skypopen module
+- fixes for ss7 freetdm modules
+- added mod_opus
+- added selector for sangoma modules
+- addded python esl module to rpm
+- some minor cleanups
+- cut sangoma modules into separate rpms as addons for freetdm
 * Tue Jan 18 2011 - michal.bielicki@seventhsignal.de
 - Fedora adjustments
 * Fri Oct 15 2010 - michal.bielicki@seventhsignal.de
@ -1090,3 +1226,4 @@ fi
 - Added devel package
 * Thu Mar 15 2007 - peter+rpmspam@suntel.com.tr
 - Initial RPM release
+
--- a/libs/esl/Makefile
+++ b/libs/esl/Makefile
@ -95,4 +95,7 @@ managedmod: $(MYLIB)
 phpmod-install: phpmod
 	$(MAKE) -C php install

+pymod-install: pymod
+	$(MAKE) -C python install
+
 everymod: perlmod phpmod luamod pymod rubymod javamod managedmod
--- a/libs/esl/java/Makefile
+++ b/libs/esl/java/Makefile
@ -1,4 +1,4 @@
-LOCAL_CFLAGS=-I../src/include -I/usr/java/jdk1.6.0_14/include -I/usr/java/jdk1.6.0_14/include/linux -I/usr/lib/jvm/java-6-openjdk/include/
+LOCAL_CFLAGS=-I../src/include -I/usr/java/jdk1.6.0_14/include -I/usr/java/jdk1.6.0_14/include/linux -I/usr/lib/jvm/java-6-openjdk/include/ -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux
 GCC_WARNING_JUNK=-w
 CLASSES=org/freeswitch/esl/*

--- a/libs/esl/php/Makefile
+++ b/libs/esl/php/Makefile
@ -25,6 +25,6 @@ swigclean:
 reswig:	swigclean esl_wrap.cpp

 install: ESL.so
-	cp ESL.so $(shell php-config --extension-dir)
-	cp ESL.php $(shell php -r 'echo ini_get("include_path");' | cut -d: -f2)
-	echo 'extension=ESL.so' >> $(shell php-config --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=)/esl.ini
+	cp ESL.so $(DESTDIR)/$(shell php-config --extension-dir)
+	cp ESL.php /$(DESTDIR)/$(shell php -r 'echo ini_get("include_path");' | cut -d: -f2)
+	echo 'extension=ESL.so' >> $(DESTDIR)/$(shell php-config --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=)/esl.ini
--- a/libs/esl/python/Makefile
+++ b/libs/esl/python/Makefile
@ -1,5 +1,6 @@
 LOCAL_CFLAGS=`python ./python-config --includes`
 LOCAL_LDFLAGS=`python ./python-config --ldflags`
+SITE_DIR=$(DESTDIR)/`python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`

 all: _ESL.so

@ -12,6 +13,10 @@ esl_wrap.o: esl_wrap.cpp
 _ESL.so: esl_wrap.o
 	$(CXX) $(SOLINK) esl_wrap.o $(MYLIB) $(LOCAL_LDFLAGS) -o _ESL.so -L. $(LIBS)

+install: _ESL.so
+	install -m 755 _ESL.so $(SITE_DIR)
+	install -m 755 ESL.py $(SITE_DIR)
+
 clean:
 	rm -f *.o *.so *~

--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@ -2175,8 +2175,6 @@ static ftdm_status_t _ftdm_channel_call_hangup_nl(const char *file, const char *
 {
 	ftdm_status_t status = FTDM_SUCCESS;
 	
-	ftdm_set_echocancel_call_end(chan);
-	
 	if (chan->state != FTDM_CHANNEL_STATE_DOWN) {
 		if (chan->state == FTDM_CHANNEL_STATE_HANGUP) {
 			/* make user's life easier, and just ignore double hangup requests */
--- a/libs/freetdm/src/ftdm_state.c
+++ b/libs/freetdm/src/ftdm_state.c
@ -83,6 +83,8 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_complete_state(const char *file, const c
 		msg.channel = fchan;
 		msg.event_id = FTDM_SIGEVENT_DIALING;
 		ftdm_span_send_signal(fchan->span, &msg);
+	} else if (state == FTDM_CHANNEL_STATE_HANGUP) {
+		ftdm_set_echocancel_call_end(fchan);
 	}

 	/* MAINTENANCE WARNING
--- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
@ -8665,10 +8665,6 @@ void outgoing_destroy(nta_outgoing_t *orq)
  orq->orq_destroyed = 1;
  orq->orq_callback = outgoing_default_cb;
  orq->orq_magic = NULL;
-
-  if (orq->orq_method != sip_method_invite &&
-      orq->orq_method != sip_method_ack)
-    outgoing_terminate(orq);
 }

 /** @internal Outgoing transaction timer routine.
--- a/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
+++ b/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
@ -1036,13 +1036,15 @@ int soa_sdp_mode_set(sdp_session_t const *user,

    assert(s2u);

-    for (j = 0, um = user->sdp_media; j != s2u[i]; um = um->m_next, j++)
-      assert(um);
+    for (j = 0, um = user->sdp_media; j != s2u[i]; um = um->m_next, j++) {
+		if (!um) break;
+	}
+
    if (um == NULL) {
      if (dryrun)
-	return 1;
+		  return 1;
      else
-	retval = 1;
+		  retval = 1;
      sm->m_rejected = 1;
      sm->m_mode = sdp_inactive;
      sm->m_port = 0;
--- a/scripts/perl/randomize-passwords.pl
+++ b/scripts/perl/randomize-passwords.pl
@ -0,0 +1,179 @@
+#!/usr/bin/perl
+#
+# randomize-passwords.pl
+#
+# Randomizes the auth passwords for any file in the file spec given by the user
+# Randomizes the vm passwords for the same files
+# Creates a backup copy of each file altered; optionally will remove backups
+# 
+# This program uses only pure Perl modules so it should be portable.
+#
+# Michael S. Collins
+# 2009-11-11
+# 
+# Freely contributed to the FreeSWITCH project for use as the developers and community see fit
+
+use strict;
+use warnings;
+use Getopt::Long;
+use File::Basename;
+use File::Copy;
+
+$|++;
+
+## 'CHARACTERS' contains punctuation marks
+use constant CHARACTERS => 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-=+?></.,!@#$%^&*();:';
+my $numchars = length(CHARACTERS);
+
+## 'ALPHACHARS' contains upper and lower case letters and digits but no punctuation
+use constant ALPHACHARS => 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
+my $numalphas = length(ALPHACHARS);
+
+my $vmlen = 4;         # Length of VM password
+my $authlen = 10;      # Length of auth password
+my $filespec;          # File specification 
+my $delbak;            # Flag - delete backups (default = keep backups)
+my $nopunct;           # Flag - set to true to disable punction marks (i.e. alphanumerics only) in auth passwords
+
+my $opts_ok = GetOptions ("h"         => \&usage,
+                          "help"      => \&usage,
+                          "vmlen=i"   => \$vmlen,
+                          "authlen=i" => \$authlen,
+                          "files=s"   => \$filespec,
+                          "D"         => \$delbak,
+			  "nopunct"   => \$nopunct,
+			  );
+
+## Confirm that a file spec was provided
+if ( ! $filespec ) {
+    warn "\nPlease provide a file specification.\n";
+    die "Example: --files=/usr/local/freeswitch/conf/directory/default/1*.xml\n\n";
+}
+
+## Collect the files
+my @FILELIST = glob($filespec);
+if ( ! @FILELIST ) {
+    print "\nNo files found matching this spec:\n$filespec\n";
+    exit(0);
+} else {
+    print "\nFound " . @FILELIST . " file(s).\n\n";
+}
+
+## Iterate through the list, process each file
+foreach my $file ( @FILELIST ) {
+    print "Processing file: $file\n";
+    my $bakfile = $file . '.bak';
+
+    if ( move($file,$bakfile) ) {
+	print "  $file ===> $bakfile\n";
+    } else {
+	print "  Unable to backup $file to $bakfile. Skipping...\n";
+        next;
+    }
+
+    ## FILEIN is the backup file, FILEOUT is the updated file
+    open(FILEIN ,'<',$bakfile) or die "Could not open $bakfile - aborting operation.\n";
+    open(FILEOUT,'>',$file   ) or die "Could not open $file - aborting operation.\n";
+
+    ## Retrieve new passwords from random generators
+    my $newauth =  &get_random_chars($authlen);
+    my $newvm   =  &get_random_digits($vmlen);
+    
+    ## Loop through "bak" file, replace passwords, write out to original file
+    while(<FILEIN>) {
+	## Check for passwords; if found swap
+	if ( m/param name="password"/ ) {
+	    # Found auth password, swap it
+	    s/value="(.*?)"/value="$newauth"/;
+            print "    Old/new auth pass: $1 ==> $newauth\n";
+	}
+
+	if ( m/param name="vm-password"/ ) {
+	    # Found vm password, swap it
+	    s/value="(.*?)"/value="$newvm"/;
+            print "      Old/new vm pass: $1 ==> $newvm\n";
+	}
+
+        print FILEOUT $_;
+
+    } ## while(<FILEIN>)
+
+    close(FILEIN);
+    close(FILEOUT);
+
+    ## Clear out the backup file if user asked for it
+    if ( $delbak ) {
+        print "    Removing $bakfile...\n";
+	unlink $bakfile;
+    }
+    print "    Finished with $file.\n\n";
+
+} ## foreach my $file ( @FILELIST )
+
+exit(0);
+
+## Return random chars for auth password
+sub get_random_chars () {
+    my $length = shift;
+    if ( ! $length ) { $length = $authlen; }
+    my $chars;
+
+    if ( $nopunct ) {
+	foreach my $i (1 .. $length) {
+	    my $nextchar = substr( ALPHACHARS,int(rand $numalphas),1 );
+	    $chars .= $nextchar;
+	}
+
+    } else {
+	foreach my $i (1 .. $length) {
+	    my $nextchar = substr( CHARACTERS,int(rand $numchars),1 );
+	    $chars .= $nextchar;
+	}
+    }
+    return $chars;
+}
+
+## Return only digits for vm password
+sub get_random_digits () {
+    my $length = shift;
+    if ( ! $length ) { $length = $vmlen; }
+    my $digits;
+    foreach my $i (1 .. $length) {
+	my $nextdigit = int(rand 10);
+        $digits .= $nextdigit;
+    }
+    return $digits;
+
+}
+
+sub usage () {
+print <<END_USAGE
+
+Randomize passwords for FreeSWITCH directory entries.
+
+Usage:  ./randomize-passwords.pl --files=<file spec> [-D] [--vmlen=<vm pass length>] [--authlen=<auth pass length>]
+
+Options:
+  
+  -h, --help       Display this help page
+
+  -D               Delete backups (default is to save backups)
+
+  --files          Specify files to process. Use typical file globs. On a standard Linux install it would look like:
+                   --files=/usr/local/freeswitch/conf/directory/default/1*.xml
+
+  --vmlen          Set length of voice mail password. (Default is 4 digits)
+
+  --authlen        Set length of auth password. (Default is 10 characters)
+
+  --nopunct        Disable punction marks in auth passwords, i.e. alphanumerics only
+
+Example:
+  To randomize all the passwords for a default Linux install, with 6 digit VM passwords, use this command:
+
+  ./randomize-passwords.pl --files=/usr/local/freeswitch/conf/directory/default/1*.xml -D --vmlen=6
+
+END_USAGE
+;
+exit(0);
+}
--- a/src/include/private/switch_core_pvt.h
+++ b/src/include/private/switch_core_pvt.h
@ -248,6 +248,7 @@ struct switch_runtime {
 	int max_sql_buffer_len;
 	switch_dbtype_t odbc_dbtype;
 	char hostname[256];
+	int multiple_registrations;
 };

 extern struct switch_runtime runtime;
--- a/src/include/switch_rtp.h
+++ b/src/include/switch_rtp.h
@ -437,6 +437,8 @@ SWITCH_DECLARE(void) switch_rtp_set_private(switch_rtp_t *rtp_session, void *pri
 */
 SWITCH_DECLARE(void) switch_rtp_set_telephony_event(switch_rtp_t *rtp_session, switch_payload_t te);
 SWITCH_DECLARE(void) switch_rtp_set_telephony_recv_event(switch_rtp_t *rtp_session, switch_payload_t te);
+SWITCH_DECLARE(void) switch_rtp_set_recv_pt(switch_rtp_t *rtp_session, switch_payload_t pt);
+
 /*! 
  \brief Set the payload type for comfort noise
  \param rtp_session the RTP session to modify
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@ -780,7 +780,7 @@ SWITCH_STANDARD_API(user_data_function)
 	if ((domain = strchr(user, '@'))) {
 		*domain++ = '\0';
 	} else {
-		if ((dup_domain = switch_core_get_variable("domain"))) {
+		if ((dup_domain = switch_core_get_variable_dup("domain"))) {
 			domain = dup_domain;
 		} else {
 			domain = "cluecon.com";
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@ -266,6 +266,7 @@ typedef struct conference_obj {
 	switch_thread_rwlock_t *rwlock;
 	uint32_t count;
 	int32_t energy_level;
+	int32_t agc_energy_level;
 	uint8_t min;
 	switch_speech_handle_t lsh;
 	switch_speech_handle_t *sh;
@ -326,6 +327,7 @@ struct conference_member {
 	uint32_t frame_size;
 	uint8_t *mux_frame;
 	uint32_t read;
+	uint32_t vol_period;
 	int32_t energy_level;
 	int32_t agc_volume_in_level;
 	int32_t volume_in_level;
@ -345,7 +347,7 @@ struct conference_member {
 	uint32_t verbose_events;
 	uint32_t avg_score;
 	uint32_t avg_itt;
-	uint32_t avg_tally;	
+	uint32_t avg_tally;
 	struct conference_member *next;
 	switch_ivr_dmachine_t *dmachine;
 };
@ -1940,6 +1942,17 @@ static void conference_loop_fn_hangup(conference_member_t *member, caller_contro
 	switch_clear_flag_locked(member, MFLAG_RUNNING);
 }

+static void clear_avg(conference_member_t *member)
+{
+
+	member->agc_volume_in_level = 0;
+	member->avg_score = 0;
+	member->avg_itt = 0;
+	member->avg_tally = 0;
+	member->nt_tally = 0;
+}
+
+
 /* marshall frames from the call leg to the conference thread for muxing to other call legs */
 static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, void *obj)
 {
@ -1948,7 +1961,7 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
 	switch_channel_t *channel;
 	switch_status_t status;
 	switch_frame_t *read_frame = NULL;
-	uint32_t hangover = 40, hangunder = 15, hangover_hits = 0, hangunder_hits = 0, energy_level = 0, diff_level = 400;
+	uint32_t hangover = 40, hangunder = 5, hangover_hits = 0, hangunder_hits = 0, energy_level = 0, diff_level = 400;
 	switch_codec_implementation_t read_impl = { 0 };
 	switch_core_session_t *session = member->session;
 	int check_floor_change;
@ -1991,6 +2004,7 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
 				if (++hangover_hits >= hangover) {
 					hangover_hits = hangunder_hits = 0;
 					switch_clear_flag_locked(member, MFLAG_TALKING);
+					clear_avg(member);

 					if (test_eflag(member->conference, EFLAG_STOP_TALKING) &&
 						switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
@ -2006,19 +2020,9 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
 		
 		/* Check for input volume adjustments */
 		if (!member->conference->agc_level) {
-			member->agc_volume_in_level = 0;
-			member->avg_score = 0;
-			member->avg_itt = 0;
-			member->avg_tally = 0;
-		}
-
-		if (member->conference->agc_level && member->agc_volume_in_level) {
-			switch_change_sln_volume(read_frame->data, read_frame->datalen / 2, member->agc_volume_in_level);
-		} else if (member->volume_in_level) {
-			switch_change_sln_volume(read_frame->data, read_frame->datalen / 2, member->volume_in_level);
+			clear_avg(member);
 		}
 		
-
 		energy_level = member->energy_level;

 		/* if the member can speak, compute the audio energy level and */
@ -2027,7 +2031,8 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
 			uint32_t energy = 0, i = 0, samples = 0, j = 0;
 			int16_t *data;
 			int divisor = 0;
-			int one_sec = (read_impl.actual_samples_per_second / read_impl.samples_per_packet);
+			int agc_period = (read_impl.actual_samples_per_second / read_impl.samples_per_packet) / 2;
+			int combined_vol = 0;

 			data = read_frame->data;

@ -2037,77 +2042,62 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v

 			member->score = 0;

+			combined_vol = member->agc_volume_in_level;
+			if (member->conference->agc_level) {
+				combined_vol += member->agc_volume_in_level;
+			}
+
+			if (combined_vol) {
+				switch_change_sln_volume(read_frame->data, read_frame->datalen / 2, combined_vol);
+			}
+			
 			if ((samples = read_frame->datalen / sizeof(*data))) {
 				for (i = 0; i < samples; i++) {
 					energy += abs(data[j]);
 					j += read_impl.number_of_channels;
 				}
 				member->score = energy / (samples / divisor);
-				member->avg_tally += member->score;
-				member->avg_score = member->avg_tally / ++member->avg_itt;
-				if (!member->avg_itt) member->avg_tally = member->score;
 			}

+			if (member->vol_period) {
+				member->vol_period--;
+			}
+			
 			if (member->conference->agc_level && member->score && 
-				switch_test_flag(member, MFLAG_TALKING) && 
 				switch_test_flag(member, MFLAG_CAN_SPEAK) &&
-				member->score > member->energy_level
+				member->score > member->conference->agc_energy_level
 				) {
-				int diff = member->conference->agc_level - member->score;

-				if (abs(diff) >= 200) {
-					member->agc_concur++;
-				} else {
-					member->agc_concur = 0;
-				}
-
-#if 0				
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG8,
-								  "conf %s FOO %d %d %d %d %d\n", 
-								  member->conference->name,
-								  member->id, diff, member->conference->agc_level, 
-								  member->score, member->agc_volume_in_level);
-#endif
+				member->avg_tally += member->score;
+				member->avg_itt++;
+				if (!member->avg_itt) member->avg_itt++;
+				member->avg_score = member->avg_tally / member->avg_itt;
 				
-				if (member->agc_concur >= one_sec) {
-					if (member->score < member->conference->agc_level) {
-						member->agc_volume_in_level++;
-						
-						switch_normalize_volume(member->agc_volume_in_level);

-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG7,
-										  "conf %s AGC +++ %d %d %d %d %d\n", 
-										  member->conference->name,
-										  member->id, diff, member->conference->agc_level, 
-										  member->score, member->agc_volume_in_level);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG7,
+								  "conf %s AGC %d %d %d %d %d %d\n", 
+								  member->conference->name,
+								  member->id, member->conference->agc_level - member->avg_score, member->conference->agc_level, 
+								  member->score, member->avg_score, member->agc_volume_in_level);

-					} else {
-						member->agc_volume_in_level--;
-						
-						switch_normalize_volume(member->agc_volume_in_level);

-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG7,
-										  "conf %s AGC --- %d %d %d %d %d\n", 
-										  member->conference->name,
-										  member->id, diff, member->conference->agc_level, 
-										  member->score, member->agc_volume_in_level);
+				
+				if (++member->nt_tally >= agc_period) {
+					if (!member->vol_period) {
+						if (member->avg_score < member->conference->agc_level) {
+							member->agc_volume_in_level++;
+							switch_normalize_volume(member->agc_volume_in_level);
+							member->vol_period = (read_impl.actual_samples_per_second / read_impl.samples_per_packet) * 2;
+						}
+					
+						if (member->avg_score > member->conference->agc_level) {
+							member->agc_volume_in_level--;
+							switch_normalize_volume(member->agc_volume_in_level);
+							member->vol_period = (read_impl.actual_samples_per_second / read_impl.samples_per_packet) * 2;
+						}
 					}
-					member->agc_concur = 0;
-				}
-				member->nt_tally = 0;
-			} else {
-				member->nt_tally++;
-				member->agc_concur = 0;
-
-				if (member->nt_tally > one_sec * 5) {
-					member->agc_volume_in_level = 0;
 					member->nt_tally = 0;
-					member->avg_itt = 0;
-                    member->avg_tally = 0;
-                    member->avg_score = member->score;
 				}
-
-
 			}

 			member->score_iir = (int) (((1.0 - SCORE_DECAY) * (float) member->score) + (SCORE_DECAY * (float) member->score_iir));
@ -2162,6 +2152,7 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
 					if (++hangover_hits >= hangover) {
 						hangover_hits = hangunder_hits = 0;
 						switch_clear_flag_locked(member, MFLAG_TALKING);
+						clear_avg(member);

 						if (test_eflag(member->conference, EFLAG_STOP_TALKING) &&
 							switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
@ -3421,7 +3412,7 @@ static switch_status_t conf_api_sub_mute(conference_member_t *member, switch_str

 static switch_status_t conf_api_sub_agc(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-	int level;
+	int level, energy_level;
 	int on = 0;

 	if (argc == 2) {
@ -3439,7 +3430,13 @@ static switch_status_t conf_api_sub_agc(conference_obj_t *conference, switch_str
 	if (argc > 3) {
 		level = atoi(argv[3]);
 	} else {
-		level = 2000;
+		level = 650;
+	}
+
+	if (argc > 4) {
+		energy_level = atoi(argv[4]);
+	} else {
+		energy_level = 100;
 	}

 	if (level > conference->energy_level) {
@ -3447,9 +3444,10 @@ static switch_status_t conf_api_sub_agc(conference_obj_t *conference, switch_str
 		conference->avg_itt = 0;
 		conference->avg_tally = 0;
 		conference->agc_level = level;
-		
+		conference->agc_energy_level = energy_level;
+
 		if (stream) {
-			stream->write_function(stream, "OK AGC ENABLED %d\n", conference->agc_level);
+			stream->write_function(stream, "OK AGC ENABLED %d %d\n", conference->agc_level, conference->agc_energy_level);
 		}
 		
 	} else {
@ -3823,7 +3821,7 @@ static void conference_xlist(conference_obj_t *conference, switch_xml_t x_confer

 	if (conference->agc_level) {
 		char tmp[30] = "";
-		switch_snprintf(tmp, sizeof(tmp), "%d", conference->agc_level);
+		switch_snprintf(tmp, sizeof(tmp), "%d:%d", conference->agc_level, conference->agc_energy_level);
 		switch_xml_set_attr_d_buf(x_conference, "agc", tmp);
 	}

@ -4878,7 +4876,6 @@ static switch_status_t conference_outcall(conference_obj_t *conference,

 	rdlock = 1;
 	peer_channel = switch_core_session_get_channel(peer_session);
-	switch_channel_set_state(peer_channel, CS_SOFT_EXECUTE);

 	/* make sure the conference still exists */
 	if (!switch_test_flag(conference, CFLAG_RUNNING)) {
@ -6392,16 +6389,30 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_c

 	if (!zstr(auto_gain_level)) {
 		int level = 0;
+		int energy_level = 100;

 		if (switch_true(auto_gain_level)) {
-			level = 2000;
+			level = 650;
 		} else {
+			char *p;
+			int tmp = 0;
+
 			level = atoi(auto_gain_level);
+			if ((p = strchr(auto_gain_level, ':'))) {
+				p++;
+				if (p) tmp = atoi(p);
+				if (tmp > 0) {
+					energy_level = tmp;
+				}
+			}
 		}

 		if (level > 0 && level > conference->energy_level) {
 			conference->agc_level = level;
 		}
+
+		conference->agc_energy_level = energy_level;
+		
 	}

 	if (!zstr(maxmember_sound)) {
--- a/src/mod/applications/mod_voicemail/mod_voicemail.c
+++ b/src/mod/applications/mod_voicemail/mod_voicemail.c
@ -1725,8 +1725,7 @@ static void update_mwi(vm_profile_t *profile, const char *id, const char *domain

 #define FREE_DOMAIN_ROOT() if (x_user) switch_xml_free(x_user); x_user = NULL

-
-static void voicemail_check_main(switch_core_session_t *session, vm_profile_t *profile, const char *domain_name, const char *id, int auth)
+static void voicemail_check_main(switch_core_session_t *session, vm_profile_t *profile, const char *domain_name, const char *id, int auth, const char *uuid_in)
 {
 	vm_check_state_t vm_check_state = VM_CHECK_START;
 	switch_channel_t *channel = switch_core_session_get_channel(session);
@ -1900,6 +1899,9 @@ static void voicemail_check_main(switch_core_session_t *session, vm_profile_t *p
 					cbt.type = play_msg_type;
 					cbt.move = VM_MOVE_NEXT;
 					vm_execute_sql_callback(profile, profile->mutex, sql, listen_callback, &cbt);
+					if (!zstr(uuid_in) && strcmp(cbt.uuid, uuid_in)) {
+						continue;
+					}
 					status = listen_file(session, profile, &cbt);
 					if (cbt.move == VM_MOVE_PREV) {
 						if (cur_message <= 0) {
@ -3017,6 +3019,8 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p
 						vm_email = switch_core_session_strdup(session, val);
 					} else if (!strcasecmp(var, "vm-notify-mailto")) {
 						vm_notify_email = switch_core_session_strdup(session, val);
+					} else if (!strcasecmp(var, "vm-skip-instructions")) {
+						skip_instructions = switch_true(val);
 					} else if (!strcasecmp(var, "email-addr")) {
 						email_addr = switch_core_session_strdup(session, val);
 					} else if (!strcasecmp(var, "vm-email-all-messages") && (send_main = switch_true(val))) {
@ -3154,12 +3158,12 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p
 		if (*buf != '\0') {
 		  greet_key_press:
 			if (switch_stristr(buf, profile->login_keys)) {
-				voicemail_check_main(session, profile, domain_name, id, 0);
+				voicemail_check_main(session, profile, domain_name, id, 0, NULL);
 			} else if ((!zstr(profile->operator_ext) || !zstr(operator_ext)) && !zstr(profile->operator_key) && !strcasecmp(buf, profile->operator_key) ) {
 				int argc;
 				char *argv[4];
 				char *mycmd;
-
+				
 				if ((!zstr(operator_ext) && (mycmd = switch_core_session_strdup(session, operator_ext))) ||
 				    (!zstr(profile->operator_ext) && (mycmd = switch_core_session_strdup(session, profile->operator_ext)))) {
 					argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
@ -3292,7 +3296,7 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p


 #define VM_DESC "voicemail"
-#define VM_USAGE "[check] [auth] <profile_name> <domain_name> [<id>]"
+#define VM_USAGE "[check] [auth] <profile_name> <domain_name> [<id>] [uuid]"

 SWITCH_STANDARD_APP(voicemail_function)
 {
@ -3304,6 +3308,7 @@ SWITCH_STANDARD_APP(voicemail_function)
 	const char *domain_name = NULL;
 	const char *id = NULL;
 	const char *auth_var = NULL;
+	const char *uuid = NULL;
 	int x = 0, check = 0, auth = 0;
 	switch_channel_t *channel = switch_core_session_get_channel(session);

@ -3363,7 +3368,10 @@ SWITCH_STANDARD_APP(voicemail_function)
 	}

 	if (check) {
-		voicemail_check_main(session, profile, domain_name, id, auth);
+		if (argv[x]) {
+			uuid = argv[x++];
+		}
+		voicemail_check_main(session, profile, domain_name, id, auth, uuid);
 	} else {
 		voicemail_leave_main(session, profile, domain_name, id);
 	}
--- a/src/mod/endpoints/mod_khomp/Install/files/khomp.conf.xml
+++ b/src/mod/endpoints/mod_khomp/Install/files/khomp.conf.xml
@ -272,6 +272,15 @@ a FXS branch.
 <param name="fxs-bina" value="yes"/>
 -->

+<!--
+Enables/disables the use of sharp (#) as an end-of-number digit on FXS 
+channels for instant dialing. This does not affect special numbers which
+start on sharp, like #8 or #1. 
+(default = yes) 
+
+<param name="fxs-sharp-dial" value="yes" />
+-->
+
 <!--
 This is the delay time to really disconnect a channel after the disconnect
 event arrive. If a connect event comes up in this interval, then the 
@ -312,6 +321,21 @@ you may need to set this option to 'no'.
 <param name="ignore-letter-dtmfs" value="yes"/>
 -->

+<!--
+When there is a request to indicate busy for an incoming KFXO call, the 
+ringing channel is taken off hook and then placed on hook, so it now goes
+to answered state and we can send audio throught the line.
+
+If the off/on hook time interval is too short, the PSTN may ignore it, and 
+keep the line in a ringing state. If it is too long, the call may be charged.
+The option below defines the delay between the line being answered and being
+disconnected, in miliseconds (from 50ms to 90000ms).
+
+(default = 1250)
+
+<param name="fxo-busy-disconnection" value="1250"/>
+-->
+
 <!--
 For KFXO series boards, defines if audio will be allowed being sent into
 outgoing calls before it has been connected.
--- a/src/mod/endpoints/mod_khomp/commons/base/config_commons.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/config_commons.hpp
@ -69,6 +69,6 @@
 #define COMMONS_VERSION_MINOR 1

 #define COMMONS_AT_LEAST(x,y) \
-    (COMMONS_VERSION_MAJOR > x || (COMMONS_VERSION_MAJOR == x && COMMONS_VERSION_MINOR >= y))
+    ((COMMONS_VERSION_MAJOR > x) || (COMMONS_VERSION_MAJOR == x && COMMONS_VERSION_MINOR >= y))

 #endif  /* _CONFIG_COMMONS_HPP_ */
--- a/src/mod/endpoints/mod_khomp/commons/base/config_options.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/config_options.hpp
@ -690,6 +690,32 @@ namespace Config
            iter->second.set(object, value);
        }

+        template < typename Object >
+        Messages commit(Object * const object, const std::string & name)
+        {
+            Messages msgs;
+
+            OptionMap::iterator i = _map.find(name);
+
+            if (i != _map.end())
+            {
+                try
+                {
+                    i->second.commit(object);
+                }
+                catch (Failure & e)
+                {
+                    msgs.push_back(e.what());
+                }
+            }
+            else
+            {
+                msgs.push_back(STG(FMT("unable to find option: %s") % name));
+            };
+
+            return msgs;
+        }
+
        template < typename Object >
        Messages commit(Object * const object)
        {
@ -718,7 +744,7 @@ namespace Config
        }

        template < typename Object >
-        bool loaded(Object * object, std::string name)
+        bool loaded(Object * object, const std::string & name)
        {
            OptionMap::iterator iter = find_option(name);

--- a/src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.cpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.cpp
@ -144,9 +144,8 @@ bool Configfile::deserialize(std::ifstream & fd)
            if (adjust(section, opt, val))
                continue;

-            _errors.push_back(STG(FMT("option '%s' does "
-                "not exist or '%s' is not a valid value (at section '%s')")
-                % opt % val % section->name()));
+            _errors.push_back(STG(FMT("option '%s' does not exist or '%s' is not "
+                "a valid value (at section '%s')") % opt % val % section->name()));
        }
    }

--- a/src/mod/endpoints/mod_khomp/commons/base/k3lapi.cpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/k3lapi.cpp
@ -205,6 +205,15 @@ std::string K3LAPIBase::get_param(K3L_EVENT *ev, const char *name) const
    return res;
 }

+std::string K3LAPIBase::get_param_optional(K3L_EVENT *ev, const char *name) const
+{
+    std::string res;
+
+    (void)get_param(ev, name, res);
+
+    return res;
+}
+
 void K3LAPIBase::init(void)
 {
    if (_device_count != 0) return;
--- a/src/mod/endpoints/mod_khomp/commons/base/k3lapi.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/k3lapi.hpp
@ -317,7 +317,9 @@ struct K3LAPIBase
    /* pega valores em strings de eventos */

    KLibraryStatus get_param(K3L_EVENT *ev, const char *name, std::string &res) const;
+
    std::string get_param(K3L_EVENT *ev, const char *name) const;
+    std::string get_param_optional(K3L_EVENT *ev, const char *name) const;

    /* inicializa valores em cache */

--- a/src/mod/endpoints/mod_khomp/commons/base/logger.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/logger.hpp
@ -52,22 +52,16 @@
 #include <refcounter.hpp>
 #include <flagger.hpp>

-#if defined(COMMONS_LIBRARY_USING_ASTERISK)
+#if defined(COMMONS_LIBRARY_USING_ASTERISK) || defined(COMMONS_LIBRARY_USING_FREESWITCH)
 extern "C"
 {
-    #include <asterisk.h>
-    #include <asterisk/localtime.h>
+    #include <time.h>
 }
 #elif defined(COMMONS_LIBRARY_USING_CALLWEAVER)
 extern "C"
 {
    #include <callweaver/localtime.h>
 }
-#elif defined(COMMONS_LIBRARY_USING_FREESWITCH)
-extern "C"
-{
-    #include <time.h>
-}
 #endif
 /*

@ -424,77 +418,26 @@ struct Logger

                    if (opt._flags[Option::DATETIME])
                    {
-#if defined(COMMONS_LIBRARY_USING_ASTERISK)
-#if ASTERISK_AT_LEAST(1,6,0)
-                        struct timeval tv;
-                        struct ast_tm  lt;
-
-                        gettimeofday(&tv, NULL);
-
-#else
+#if defined(COMMONS_LIBRARY_USING_ASTERISK) || defined(COMMONS_LIBRARY_USING_CALLWEAVER) || defined(COMMONS_LIBRARY_USING_FREESWITCH)
                        time_t      tv;
                        struct tm   lt;

                        time (&tv);
-#endif
-
-#if ASTERISK_AT_LEAST(1,4,5)
-                        ast_localtime (&tv, &lt, NULL);
-#else
                        localtime_r (&tv, &lt);
-#endif

-#elif defined(COMMONS_LIBRARY_USING_CALLWEAVER) || defined(COMMONS_LIBRARY_USING_FREESWITCH)
-                        time_t      tv;
-                        struct tm   lt;
-
-                        time (&tv);
-
-                        localtime_r (&tv, &lt);
-#endif
                        out_msg += STG(FMT("[%02d-%02d-%02d %02d:%02d:%02d] ")
                            % (lt.tm_year % 100) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour
                            % lt.tm_min % lt.tm_sec);
+#endif
                    }

                    if (opt._flags[Option::DATETIMEMS])
                    {
-#if defined(COMMONS_LIBRARY_USING_ASTERISK)
-#if ASTERISK_AT_LEAST(1,6,0)
-                        struct timeval tv;
-                        struct ast_tm  lt;
-
-                        gettimeofday(&tv, NULL);
-
-#else
+#if defined(COMMONS_LIBRARY_USING_ASTERISK) || defined(COMMONS_LIBRARY_USING_CALLWEAVER) || defined(COMMONS_LIBRARY_USING_FREESWITCH)
                        time_t      tv;
                        struct tm   lt;

                        time (&tv);
-#endif
-
-#if ASTERISK_AT_LEAST(1,4,5)
-                        ast_localtime (&tv, &lt, NULL);
-#else
-                        localtime_r (&tv, &lt);
-#endif
-
-#if ASTERISK_AT_LEAST(1,6,0)
-                        out_msg += STG(FMT("[%02d-%02d-%02d %02d:%02d:%02d:%04d] ")
-                            % (lt.tm_year % 100) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
-                            % lt.tm_sec % (tv.tv_usec / 1000));
-#else
-                        out_msg += STG(FMT("[%02d-%02d-%02d %02d:%02d:%02d:%04d] ")
-                            % (lt.tm_year % 100) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
-                            % lt.tm_sec % (tv * 1000));
-#endif
-
-#elif defined(COMMONS_LIBRARY_USING_CALLWEAVER) || defined(COMMONS_LIBRARY_USING_FREESWITCH)
-                        time_t      tv;
-                        struct tm   lt;
-
-                        time (&tv);
-
                        localtime_r (&tv, &lt);

                        out_msg += STG(FMT("[%02d-%02d-%02d %02d:%02d:%02d:%04d] ")
--- a/src/mod/endpoints/mod_khomp/commons/base/simple_lock.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/simple_lock.hpp
@ -52,7 +52,7 @@
 /* This struct uses static polymorphism, and derived classes should implement  *
 * the "lock/trylock/unlock()" methods for correct code compilation.           *
 * The base class also features reference counting, so derived classes should  *
- * implement the "unreference()" method for releasing resources.               */
+ * implement the "unreference_data()" method for releasing resources.               */

 template < typename Implementor >
 struct SimpleLockCommon: COUNTER_SUPER( SimpleLockCommon < Implementor > )
@ -95,7 +95,7 @@ struct SimpleLockCommon: COUNTER_SUPER( SimpleLockCommon < Implementor > )
  protected:
    void unreference(void)
    {
-        static_cast<Implementor*>(this)->unreference();
+        static_cast<Implementor*>(this)->unreference_data();
    }
 };

--- a/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/simple_lock.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/simple_lock.hpp
@ -73,7 +73,7 @@ struct SimpleLockBasic: public SimpleLockCommon < Implementor >
        /* do nothing */
    };

-    void unreference()
+    void unreference_data()
    {
        switch_mutex_destroy(_mutex);

--- a/src/mod/endpoints/mod_khomp/commons/base/verbose.cpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/verbose.cpp
@ -2505,9 +2505,11 @@ std::string Verbose::command(const int32 cmd_code, const int32 dev_idx, const in
        case VerboseTraits::K_CM_LOG_REQUEST:
        case VerboseTraits::K_CM_LOG_CREATE_DISPATCHER:
        case VerboseTraits::K_CM_LOG_DESTROY_DISPATCHER:
-
        case VerboseTraits::K_CM_PING:
 #endif
+//#if K3L_AT_LEAST(2,1,0)
+//        case VerboseTraits::K_CM_LOG_UPDATE:
+//#endif
            return show(buf, commandName(code), Target(NONE));
 #if K3L_AT_LEAST(2,1,0)
        case VerboseTraits::K_CM_START_FAX_TX:
--- a/src/mod/endpoints/mod_khomp/docs/Manual.html
+++ b/src/mod/endpoints/mod_khomp/docs/Manual.html
@ -29,7 +29,10 @@
 </p>
 <pre><b>Sintaxe:</b> &lt;param name="..." value="..."/&gt;
 </pre>
-<ul><li><b>dialplan</b>: Nome do módulo de <i>dialplan</i> em uso.
+<p><br />
+</p>
+<ul><li><b>accountcode</b>: Define o account code padrão para chamadas no Endpoint. Esta opção pode ser qualquer string alfanumérica; 
+</li><li><b>dialplan</b>: Nome do módulo de <i>dialplan</i> em uso.
 </li><li><b>auto-fax-adjustment</b>: Ativa ("yes") ou desativa ("no") o ajuste automático do canal (desabilitar o cancelador de eco e a supressão DTMF) ao detectar tom de FAX; 
 </li><li><b>auto-gain-control</b>: Ativa ("yes") ou desativa ("no") a ativação do controle automático de ganho (AGC) pelo Endpoint; 
 </li><li><b>context-digital</b>: Contexto de entrada para ligações em placas digitais (o padrão é "khomp-DD-LL", onde "DD" será substituído, no momento da ligação, pelo número do dispositivo, "LL" pelo número do link, "CCC" pelo número do canal e "SSSS" pelo número serial do dispositivo); 
@ -49,6 +52,7 @@
 </li><li><b>fxs-global-orig</b>: Número inicial para numeração seqüencial de ramais das placas <b>KFXS</b> que não estiverem listadas na seção <b>&lt;fxs-branches&gt;</b> (a numeração segue ordem crescente por número da placa e número do canal físico) (o padrão é "0"); 
 </li><li><b>fxs-co-dialtone</b>: Seqüências de números, separados por vírgula, que disparam um tom contínuo (de central pública) em ramais FXS (ex: "0,99" faz com que, ao discar "0" ou "99", o usuário receba o tom de linha contínuo) (o padrão é vazio);
 </li><li><b>fxs-bina</b>: Quando ativada ("yes"), ligações para ramais FXS enviarão os dígitos correspondentes ao telefone de origem em sinalização BINA DTMF (o valor padrão é "no");
+</li><li><b>language</b>: Define idioma para ligações nas placas Khomp; 
 </li><li><b>ignore-letter-dtmfs</b>: Define se o canal deve ignorar DTMFs incomuns detectados pela placa (A, B, C e D). Entretanto, se você necessita passar esses dígitos pela placa, você deve ajustar esta opção para "no" (o valor padrão é "yes");
 </li><li><b>input-volume</b>: Define o volume de entrada das ligações, varia de -10 a +10&nbsp;; 
 </li><li><b>kommuter-activation</b>: Define se a ativação de dispositivos kommuter encontrados no sistema será feita de forma automática ("auto"), ou de forma manual ("manual") pelo usuário, através do comando "khomp kommuter on/off"; 
@ -119,6 +123,8 @@
 <ul><li>context; 
 </li><li>input-volume; 
 </li><li>output-volume; 
+</li><li>language; 
+</li><li>accountcode;
 </li><li>calleridnum; 
 </li><li>calleridname;
 </li><li>flash-to-digits.
@ -1011,7 +1017,7 @@ install: **  for knowing how to proceed with the installation.  **
 <p>Este configurador, por sua vez, mostra todas as opções possíveis de configuração da placa. Os parâmetros que não forem configurados assumem os valores padrão automaticamente, e são compatíveis com a maior parte dos sistemas. Maiores detalhes sobre este programa podem ser obtidos na seção de número '2'. 
 </p><p><br />
 </p>
-<ul><li> <b>IMPORTANTE</b>: Para o FreeSWITCH iniciar, é preciso que a placa da khomp esteja configurada e todos módulos estejam rodando (conforme mostrado acima). <b>Caso a placa não esteja configurada, o FreeSWITCH não iniciará</b>.<br /><br />Se você deseja rodar o sistema sem a placa da Khomp, é preciso configurar o FreeSWITCH para ele não carregar o módulo da Khomp. Para isso, abra o arquivo "<i>/usr/local/freeswitch/conf/autoload_configs/modules.conf.xml</i>", e comente a linha que carrega o módulo:<br />
+<ul><li> <b>IMPORTANTE</b>: Para o FreeSWITCH iniciar, é preciso que a placa da khomp esteja configurada e todos módulos estejam rodando (conforme mostrado acima). <br /><br />Se você deseja rodar o sistema sem a placa da Khomp, é preciso configurar o FreeSWITCH para ele não carregar o módulo da Khomp. Para isso, abra o arquivo <b>/usr/local/freeswitch/conf/autoload_configs/modules.conf.xml</b>, e comente a linha que carrega o módulo:<br />
 </li></ul>
 <pre>
  &lt;!-- &lt;load module=&quot;mod_khomp&quot; /&gt; --&gt;
@ -1080,4 +1086,6 @@ Por fim, para carregar o servidor de processos, basta executar o seguinte comand
 O <i>script</i> <b>/etc/init.d/khompdrv</b> é responsável por carregar os módulos <i>kpci9030.ko</i> e <i>kpex8311.ko</i> no <i>kernel</i>, que deve ser realizada automaticamente na inicialização do sistema. Em caso de problemas, verifique a seção <a href="#Solu.C3.A7.C3.A3o_de_problemas" title="">Solução de problemas</a>.
 <br />
 </p><p><br />
+Para mais detalhes: <a href="http://www.khomp.com.br" class="external free" title="http://www.khomp.com.br" rel="nofollow">http://www.khomp.com.br</a>
+</p><p><br />
 </p></body></html>
--- a/src/mod/endpoints/mod_khomp/docs/Manual.pdf
+++ b/src/mod/endpoints/mod_khomp/docs/Manual.pdf
--- a/src/mod/endpoints/mod_khomp/docs/README.html
+++ b/src/mod/endpoints/mod_khomp/docs/README.html
@ -6,7 +6,7 @@
 <a name="Utilizando_o_Endpoint_da_Khomp" id="Utilizando_o_Endpoint_da_Khomp"></a><h1> <span class="mw-headline"> Utilizando o <i>Endpoint</i> da Khomp </span></h1>
 <p>Após a instalação e inicialização dos serviços necessários pela Khomp, o FreeSWITCH já pode ser carregado ou inicializado.
 </p>
-<ul><li> <b>AVISO</b>: É imprescindível que o <b>FreeSWITCH</b> não seja executado utilizando a opção que desabilita o escalonamento em tempo real (-nort), <b>especialmente</b> se este estiver sendo executado lado-a-lado com servidores <i>web</i> ou servidores de banco de dados. Não realizar este procedimento pode resultar em perda de qualidade do áudio, gerando um sério comprometimento no andamento das ligações do sistema.
+<ul><li> <b>AVISO</b>: Evite usar a opção <b>-nort</b>, pois ela desabilita escalonamento em tempo real, é imprescindível que o <b>FreeSWITCH</b> esteja utilizando o escalonamento em tempo real, especialmente se este estiver sendo executado lado-a-lado com servidores <i>web</i> ou servidores de banco de dados. Utilizar a opção <b>-nort</b> pode resultar em perda de qualidade do áudio, gerando um sério comprometimento nas ligações do sistema.
 </li></ul>
 <p>Após a inicialização do FreeSWITCH, pode-se verificar se o módulo da Khomp foi carregado através do seguinte comando:<br /> 
 </p>
--- a/src/mod/endpoints/mod_khomp/docs/README.pdf
+++ b/src/mod/endpoints/mod_khomp/docs/README.pdf
--- a/src/mod/endpoints/mod_khomp/docs/README_en.html
+++ b/src/mod/endpoints/mod_khomp/docs/README_en.html
@ -6,10 +6,9 @@
 <a name="Using_the_Khomp_Endpoint" id="Using_the_Khomp_Endpoint"></a><h1> <span class="mw-headline"> Using the Khomp Endpoint </span></h1>
 <p>After installation and startup services required by Khomp, FreeSWITCH can now be loaded or initialized.
 </p>
-<ul><li><b>WARNING</b>: It is imperative that the<b>FreeSWITCH</b> is not executed using the option that disables the escalation in real time (-nort), <b>especially</b> if this is running side-by server-side with web servers or database. Failure to do so may result in loss of audio quality, causing a serious commitment on the progress of system connections.
+<ul><li><b>WARNING</b>: Avoid using the <b>-nort</b>, as it disables real-time scheduling, it is essential that the <b>FreeSwitch</b> are using real-time scheduling, especially if it is running side-by-side with <i>web</i> servers or database . Use the <b>-nort</b> may result in loss of audio quality, causing a serious commitment on the progress of system connections.
 </li></ul>
 <p>After initialization of FreeSWITCH, you can verify that the module was loaded Khomp through the following command: <br />
-</p><p><br />
 </p>
 <pre> freeswitch@hostname&gt; module_exists mod_khomp
 </pre>
--- a/src/mod/endpoints/mod_khomp/docs/README_en.pdf
+++ b/src/mod/endpoints/mod_khomp/docs/README_en.pdf
--- a/src/mod/endpoints/mod_khomp/docs/User_Guide.html
+++ b/src/mod/endpoints/mod_khomp/docs/User_Guide.html
@ -30,7 +30,8 @@ If you need to set advanced parameters of the board and/or signaling, the progra
 </p>
 <pre><b>Sintaxe:</b> &lt;param name="..." value="..."/&gt;
 </pre>
-<ul><li><b>dialplan</b>: Name of the dialplan module in use.
+<ul><li><b>accountcode</b>: Sets the default account code to calls in the Endpoint. This option can be any alphanumeric string;
+</li><li><b>dialplan</b>: Name of the dialplan module in use.
 </li><li><b>auto-fax-adjustment</b>: Enable ("yes") or disables ("no") the automatic adjustment of the channel (disable the echo canceller and the suppression DTMF) tone to detect FAX (local option)&nbsp;;
 </li><li><b>auto-gain-control</b>:Enable ("yes") or disables ("no") the activation of the automatic gain control (AGC) by the Endpoint (local option);
 </li><li><b>context-digital</b>: Context for incoming connections on digital boards (the default is "khomp-DD-LL", where "DD" will be replaced at the time of connection by the device number, "LL" by the number of the link, "CCC" by channel number and "SSSS" for the device serial number);
@ -54,6 +55,7 @@ If you need to set advanced parameters of the board and/or signaling, the progra
 </li><li><b>input-volume</b>: Sets the volume gain for incoming audio (entering the board), from -10 to +10 (local option);
 </li><li><b>kommuter-activation</b>: Sets whether to activate devices kommuter found in the system will be done automatically ("auto") by the channel, or manually ("manual") by the user through the command "khomp kommuter on/off" 
 </li><li><b>kommuter-timeout</b>: Sets the timeout (in seconds) for initializing the kommuter devices. If this timeout is reached without receiving notification of the channel, the devices will switch back to "off" condition. The minimum value is "0", where the links will always remain switched "on", and the maximum is "255";
+</li><li><b>language</b>: Set language to Khomp board calls;
 </li><li><b>log-to-console</b>: Set log messages to be printed on the console;
 </li><li><b>log-to-disk</b> (old "log"): Set log messages to be saved to disk;
 </li><li><b>out-of-band-DTMF</b> (former <b>dtmfsuppression</b>): Activate ("yes") or disables ("no") the removal and DTMF sending these out-of-band (local option);
@ -125,6 +127,8 @@ For details, please refer to the configuration file for examples.
 </li><li>output-volume; 
 </li><li>calleridnum; 
 </li><li>calleridname;
+</li><li>language;
+</li><li>accountcode;
 </li><li>flash-to-digits.
 </li></ul>
 <p>Each option is separated from each other by a pipe "|" or a slash "/" and defined after the colon ":". Example:
@ -1018,7 +1022,7 @@ install: **  for knowing how to proceed with the installation.  **
 </pre>
 <p>This configurator, in turn, shows all possible options for card configuration. The parameters that are not configured automatically assume the default values, and are compatible with most systems. More details about this program can be obtained from the section number '2 '.
 </p>
-<ul><li> <b>ATTENTION'<i>: To start FreeSWITCH&reg;, it is necessary that the board is configured Khomp and all modules are running (as shown above). </i></b><i>If the card is not configured, FreeSWITCH will not start<b>.<br /> <br /> If you want to run the system without the board Khomp, you need to configure FreeSWITCH for it does not load the module Khomp. To do this, open the "</b></i><b>/usr/local/freeswitch/conf/autoload_configs/modules.conf.xml</b> and comment the line:<br />
+<ul><li> <b>ATTENTION</b>: To start FreeSWITCH&reg;, it is necessary that the Khomp board is configured and all modules are running (as shown above). <br /> <br /> If you want to run the system without the Khomp board, you need to configure FreeSWITCH for it does not load the module Khomp. To do this, open the <b>/usr/local/freeswitch/conf/autoload_configs/modules.conf.xml</b> and comment the line:<br />
 </li></ul>
 <pre> 
 &lt;!-- &lt;load module=&quot;mod_khomp&quot; /&gt; --&gt;
@ -1060,7 +1064,7 @@ install: **  for knowing how to proceed with the installation.  **
 <br />
 </p>
 <a name="Ap.C3.AAndice" id="Ap.C3.AAndice"></a><h1> <span class="mw-headline"> Apêndice </span></h1>
-<p>Nesta seção, encontram-se informações úteis sobre o Endpoint e componentes relacionados.
+<p>This section presents useful informations about Endpoint and related components.
 </p>
 <a name="Arrangement_of_installed_files" id="Arrangement_of_installed_files"></a><h2> <span class="mw-headline"> Arrangement of installed files </span></h2>
 <p>The directories created/modified in this facility are:
@ -1084,5 +1088,6 @@ install: **  for knowing how to proceed with the installation.  **
 </pre>
 <p>The script <b>/etc/init.d/khompdrv</b> is responsible for loading modules <b>kpci9030.ko</b> and <b>kpex8311.ko</b> in the kernel, which should be carried out automatically at system startup. In case of problems, check the <a href="#Troubleshooting" title="">Troubleshooting</a> section. 
 </p><p><br />
+</p><p>For more details: <a href="http://www.khomp.com.br" class="external free" title="http://www.khomp.com.br" rel="nofollow">http://www.khomp.com.br</a>
 </p><p><br />
 </p></body></html>
--- a/src/mod/endpoints/mod_khomp/docs/User_Guide.pdf
+++ b/src/mod/endpoints/mod_khomp/docs/User_Guide.pdf
--- a/src/mod/endpoints/mod_khomp/include/cli.h
+++ b/src/mod/endpoints/mod_khomp/include/cli.h
@ -733,17 +733,21 @@ struct Cli
            options.push_back("fxs-global-orig");
            options.push_back("fxs-co-dialtone");
            options.push_back("fxs-bina");
+            options.push_back("fxs-sharp-dial");
            options.push_back("disconnect-delay");
            options.push_back("delay-ringback-co");
            options.push_back("delay-ringback-pbx");
            options.push_back("ignore-letter-dtmfs");
            options.push_back("fxo-send-pre-audio");
+            options.push_back("fxo-busy-disconnection");
            options.push_back("fxs-digit-timeout");
            options.push_back("drop-collect-call");
            options.push_back("kommuter-activation");
            options.push_back("kommuter-timeout");
            options.push_back("user-transfer-digits");
            options.push_back("flash-to-digits");
+            options.push_back("accountcode");
+            options.push_back("audio-packet-length");

            brief = "Get configuration options in the Khomp channel.";

@ -821,17 +825,21 @@ struct Cli
            options.push_back("fxs-global-orig");
            options.push_back("fxs-co-dialtone");
            options.push_back("fxs-bina");
+            options.push_back("fxs-sharp-dial");
            options.push_back("disconnect-delay");
            options.push_back("delay-ringback-co");
            options.push_back("delay-ringback-pbx");
            options.push_back("ignore-letter-dtmfs");
            options.push_back("fxo-send-pre-audio");
+            options.push_back("fxo-busy-disconnection");
            options.push_back("fxs-digit-timeout");
            options.push_back("drop-collect-call");
            options.push_back("kommuter-activation");
            options.push_back("kommuter-timeout");
            options.push_back("user-transfer-digits");
            options.push_back("flash-to-digits");
+            options.push_back("accountcode");
+            options.push_back("audio-packet-length");

            brief = "Ajust configuration options in the Khomp channel.";

@ -933,6 +941,36 @@ struct Cli
        bool execute(int argc, char *argv[]);
    } KhompRevision;

+    /* khomp dump config */
+    static struct _KhompDumpConfig : public Command
+    {
+        _KhompDumpConfig()
+        {
+            complete_name = "dump config";
+            brief = "Dump configuration values on screen.";
+
+            usage =                                                            \
+"\nUsage: khomp dump config\n\n"                                               \
+"Dump configuration values loaded on memory.\n ";                              
+            
+            _commands.push_back(this);
+        }
+
+        /* just to hide unavaible options */
+        bool removeUnavaible(const std::string &s)
+        {
+            if(s == "atxfer" || s == "blindxfer" || s == "callgroup" ||
+               s == "mohclass" || s == "native-bridge" || s == "recording" ||
+               s == "record-prefix" || s == "transferdigittimeout" ||
+               s == "pickupgroup" || s == "has-ctbus" || 
+               s == "user-transfer-digits")
+                return true;
+            return false;
+        }
+        
+        bool execute(int argc, char *argv[]);
+    } KhompDumpConfig;
+
    /* khomp send command */
    static struct _KhompSendCommand : public Command
    {
--- a/src/mod/endpoints/mod_khomp/include/k3l.h
+++ b/src/mod/endpoints/mod_khomp/include/k3l.h
@ -231,6 +231,8 @@ struct KVoIPSeize

 #define CM_USER_INFORMATION         0x0F

+#define CM_USER_INFORMATION_EX      0x2B
+
 #define CM_VOIP_SEIZE				0x23


@ -369,6 +371,8 @@ struct KVoIPSeize

 #define EV_USER_INFORMATION         0x0F

+#define EV_USER_INFORMATION_EX      0x1D 
+
 #define EV_DIALED_DIGIT             0x10

 #define EV_SIP_REGISTER_INFO        0x11
@ -713,6 +717,8 @@ enum KH100CtbusFreq
 #define CM_START_CADENCE			0xA1

 #define CM_STOP_CADENCE				0xA2
+
+#define CM_SET_INPUT_MODE				0xA3
 #if !defined KR2D_H
 #define KR2D_H

@ -925,6 +931,7 @@ enum KSignGroupII
 #ifndef _KISDN_H_
 #define _KISDN_H_
 #define KMAX_USER_USER_LEN              32
+#define KMAX_USER_USER_EX_LEN           254
 #define KMAX_SUBADRESS_INFORMATION_LEN  20 

 enum KQ931Cause
@ -1845,6 +1852,12 @@ struct KUserInformation
    int32 UserInfoLength;
    byte  UserInfo[ KMAX_USER_USER_LEN ];
 };
+struct KUserInformationEx
+{
+    int32 ProtocolDescriptor;
+    int32 UserInfoLength;
+    byte  UserInfo[ KMAX_USER_USER_EX_LEN ];
+};
 struct KISDNSubaddressInformation
 {
    KQ931TypeOfSubaddress TypeOfSubaddress;
--- a/src/mod/endpoints/mod_khomp/include/khomp_pvt.h
+++ b/src/mod/endpoints/mod_khomp/include/khomp_pvt.h
@ -305,8 +305,6 @@ struct KhompPvt
            {
                try
                {
-                    //std::string type((name == "input_volume")?"input":"output");
-
                    int i = Strings::tolong(value);
    
                    if (i < -10 || i > 10)
@ -614,6 +612,7 @@ public:

    virtual bool indicateRinging();
    virtual bool sendDtmf(std::string digit);
+    virtual void cleanupIndications(bool force);

    /* Methods */

@ -849,7 +848,31 @@ public:
        if(!name)
            return NULL;

-        return switch_core_get_variable(name);
+#if SWITCH_LESS_THAN(1,0,6)
+        const char * tmp = switch_core_get_variable(name);
+
+        if(!tmp) return NULL;
+
+        const char * val = strdup(tmp);
+
+        return val;
+#else
+        return switch_core_get_variable_dup(name);
+#endif
+    }
+
+    void freeFSGlobalVar(const char ** val)
+    {
+        if(!val || !*val) return;
+
+#if SWITCH_LESS_THAN(1,0,6)
+        free((void *)*val);
+        *val = NULL;
+#else
+        char * v = (char *)*val;
+        switch_safe_free(v);
+        *val=NULL;
+#endif
    }

    bool mixer(const char *file, const char *func, int line, 
--- a/src/mod/endpoints/mod_khomp/include/khomp_pvt_fxo.h
+++ b/src/mod/endpoints/mod_khomp/include/khomp_pvt_fxo.h
@ -138,7 +138,7 @@ struct KhompPvtFXO: public KhompPvt

        TriState _var_fax_adjust;

-        //ChanTimer::Index _idx_disconnect;        
+        ChanTimer::Index _busy_disconnect;        
    };
 /******************************************************************************/
    KhompPvtFXO(K3LAPIBase::GenericTarget & target) : KhompPvt(target) 
@ -240,6 +240,7 @@ struct KhompPvtFXO: public KhompPvt
    bool autoGainControl(bool enable);
    void setAnswerInfo(int answer_info);
    bool indicateBusyUnlocked(int cause, bool sent_signaling = false);
+    static void busyDisconnect(Board::KhompPvt * pvt);
    void reportFailToReceive(int fail_code);
    bool validContexts(MatchExtension::ContextListType & contexts, 
                       std::string extra_context = "");
@ -266,13 +267,20 @@ struct KhompPvtFXO: public KhompPvt

    virtual bool cleanup(CleanupType type = CLN_HARD)
    {
-        //Board::board(_target.device)->_timers.del(callFXO()->_idx_disconnect);
-        //callFXO()->_idx_disconnect.reset();
-        
+        try
+        {
+            Board::board(_target.device)->_timers.del(callFXO()->_busy_disconnect);
+        }
+        catch (K3LAPITraits::invalid_device & err)
+        {
+            LOG(ERROR, PVT_FMT(target(), "Unable to get device: %d!") % err.device);
+        }
+
        call()->_flags.clear(Kflags::CALL_WAIT_SEIZE);
        call()->_flags.clear(Kflags::EARLY_RINGBACK);

        _transfer->clear();
+        callFXO()->_busy_disconnect.reset();

        switch (type)
        {
@ -312,6 +320,16 @@ struct KhompPvtFXO: public KhompPvt

 //    static void delayedDisconnect(Board::KhompPvt * pvt);

+    void cleanupIndications(bool force)
+    {
+        if (call()->_indication == INDICA_BUSY && !force)
+        {
+            DBG(FUNC, PVT_FMT(_target, "skipping busy indication cleanup on FXO channel."));
+            return;
+        }
+
+        KhompPvt::cleanupIndications(force);
+    }
 };
 /******************************************************************************/
 /******************************************************************************/
--- a/src/mod/endpoints/mod_khomp/include/khomp_pvt_kxe1.h
+++ b/src/mod/endpoints/mod_khomp/include/khomp_pvt_kxe1.h
@ -272,24 +272,39 @@ struct KhompPvtISDN: public KhompPvtE1

        bool process(std::string name, std::string value = "")
        {
-            if (name == "uui")
+            if ((name == "uui" ) || (name == "uui_ex"))
            {
-                Strings::vector_type values;
-                Strings::tokenize(value, values, "#", 2);
-
-                try
+                if(value.find("#") != std::string::npos)
                {
-                    std::string uui_proto_s = values[0];
-                    std::string uui_data_s = values[1];
+                    Strings::vector_type values;
+                    Strings::tokenize(value, values, "#", 2);

-                    _uui_descriptor = Strings::toulong(uui_proto_s);
-                    _uui_information.append(uui_data_s);
+                    try
+                    {
+                        std::string uui_proto_s = values[0];
+                        _uui_extended = (name == "uui_ex");
+                        _uui_descriptor = Strings::toulong(uui_proto_s);
+                        _uui_information.clear();

-                    DBG(FUNC, FMT("uui adjusted (%s, '%s')!") % uui_proto_s.c_str() % uui_data_s.c_str());
-                }
-                catch (...)
+                        for (unsigned int i = 0; i < values[1].size(); ++i) 
+                            _uui_information += STG(FMT("%02hhx") % ((unsigned char)values[1][i]));
+
+                        DBG(FUNC, FMT("uui adjusted (ex=%s, proto=%s, data='%s')!") 
+                                % (_uui_extended ? "true" : "false")
+                                % uui_proto_s.c_str()
+                                % _uui_information.c_str());
+                    }
+                    catch (...)
+                    {
+                        LOG(ERROR, FMT("invalid %s protocol descriptor: '%s' is not a number.") 
+                                % (_uui_extended ? "uui_ex" : "uui")
+                                % value.c_str());
+                    }
+                } 
+                else
                {
-                    LOG(ERROR, FMT("invalid uui protocol descriptor: '%s' is not a number.") % value.c_str());
+                    LOG(ERROR, FMT("invalid %s protocol descriptor, need a '#'.") 
+                            % (_uui_extended ? "uui_ex" : "uui"))
                }
            }
            else if (name == "usr_xfer")
@ -306,6 +321,7 @@ struct KhompPvtISDN: public KhompPvtE1
    
        bool clear()
        {
+            _uui_extended = false;
            _uui_descriptor = -1;
            _uui_information.clear();
            _isdn_cause = -1;
@ -322,6 +338,7 @@ struct KhompPvtISDN: public KhompPvtE1
        long int     _uui_descriptor;
        std::string  _uui_information;
        long int     _isdn_cause;
+        bool         _uui_extended;

        /* what should we dial to trigger an user-signaled transfer? */
        /* used for xfer on user signaling */
@ -329,6 +346,13 @@ struct KhompPvtISDN: public KhompPvtE1
        std::string _user_xfer_buffer;
        std::string _digits_buffer;
        std::string _qsig_number;
+        
+        /* isdn information  */
+        std::string _isdn_orig_type_of_number;
+        std::string _isdn_orig_numbering_plan;
+        std::string _isdn_dest_type_of_number;
+        std::string _isdn_dest_numbering_plan;
+        std::string _isdn_orig_presentation;

    };
 /******************************************************************************/
@ -429,12 +453,29 @@ struct KhompPvtISDN: public KhompPvtE1

                std::string descriptor = STG(FMT("%d") % callISDN()->_uui_descriptor);

+                setFSChannelVar("KUserInfoExtended", (callISDN()->_uui_extended ? "true" : "false"));
                setFSChannelVar("KUserInfoDescriptor", descriptor.c_str());
                setFSChannelVar("KUserInfoData", callISDN()->_uui_information.c_str());

+                callISDN()->_uui_extended = false; 
                callISDN()->_uui_descriptor = -1;
                callISDN()->_uui_information.clear();
            }
+
+            if (!callISDN()->_isdn_orig_type_of_number.empty())
+                setFSChannelVar("KISDNOrigTypeOfNumber", callISDN()->_isdn_orig_type_of_number.c_str());
+
+            if (!callISDN()->_isdn_dest_type_of_number.empty())
+                setFSChannelVar("KISDNDestTypeOfNumber", callISDN()->_isdn_dest_type_of_number.c_str());
+
+            if (!callISDN()->_isdn_orig_numbering_plan.empty())
+                setFSChannelVar("KISDNOrigNumberingPlan", callISDN()->_isdn_orig_numbering_plan.c_str());
+
+            if (!callISDN()->_isdn_dest_numbering_plan.empty())
+                setFSChannelVar("KISDNDestNumberingPlan", callISDN()->_isdn_dest_numbering_plan.c_str());
+
+            if (!callISDN()->_isdn_orig_presentation.empty())
+                setFSChannelVar("KISDNOrigPresentation", callISDN()->_isdn_orig_presentation.c_str());
        }
        catch(Board::KhompPvt::InvalidSwitchChannel & err)
        {
@ -444,8 +485,33 @@ struct KhompPvtISDN: public KhompPvtE1
        KhompPvtE1::setSpecialVariables();
    }

-    Transfer<CallISDN, false> * _transfer;
+    virtual void getSpecialVariables()
+    {
+        try
+        {
+            const char * isdn_orig_type = getFSChannelVar("KISDNOrigTypeOfNumber");
+            const char * isdn_dest_type = getFSChannelVar("KISDNDestTypeOfNumber");
+            const char * isdn_orig_numbering = getFSChannelVar("KISDNOrigNumberingPlan");
+            const char * isdn_dest_numbering = getFSChannelVar("KISDNDestNumberingPlan");
+            const char * isdn_orig_presentation = getFSChannelVar("KISDNOrigPresentation");

+            LOG(ERROR, PVT_FMT(_target,"ISDNORIG: %s") % (isdn_orig_type ? isdn_orig_type : ""));
+
+            callISDN()->_isdn_orig_type_of_number = (isdn_orig_type ? isdn_orig_type : "");
+            callISDN()->_isdn_dest_type_of_number = (isdn_dest_type ? isdn_dest_type : "");
+            callISDN()->_isdn_orig_numbering_plan = (isdn_orig_numbering ? isdn_orig_numbering : "");
+            callISDN()->_isdn_dest_numbering_plan = (isdn_dest_numbering ? isdn_dest_numbering : "");
+            callISDN()->_isdn_orig_presentation   = (isdn_orig_presentation ? isdn_orig_presentation : "");
+        }
+        catch(Board::KhompPvt::InvalidSwitchChannel & err)
+        {
+            LOG(ERROR, PVT_FMT(_target, "(ISDN) %s") % err._msg.c_str());
+        }
+
+        KhompPvt::getSpecialVariables();
+    }
+       
+    Transfer<CallISDN, false> * _transfer;
 };
 /******************************************************************************/
 /********************************* R2 Channel *********************************/
@ -472,7 +538,6 @@ struct KhompPvtR2: public KhompPvtE1
                {
                   LOG(ERROR, FMT("invalid r2 category: '%s' is not a number.") % value.c_str());
                }
-
            }
            else
            {
@ -554,7 +619,23 @@ struct KhompPvtR2: public KhompPvtE1
    {
        return (CallR2 *)call();
    }
-    
+
+    bool forceDisconnect(void)
+    {
+        char cmd[] = { 0x07, (char)(_target.object + 1) };
+        
+        try
+        {
+            Globals::k3lapi.raw_command(_target.device, 0, cmd, sizeof(cmd));
+        }
+        catch(K3LAPI::failed_raw_command &e)
+        {
+            return false;
+        }
+
+        return true;
+    };
+
    int makeCall(std::string params = "");
    bool doChannelAnswer(CommandRequest &); 
    bool doChannelHangup(CommandRequest &);
@ -609,9 +690,9 @@ struct KhompPvtR2: public KhompPvtE1
            /* r2 caller category */
            if (callR2()->_r2_category != -1)
            {
-                setFSChannelVar("KR2GotCategory",Verbose::signGroupII((KSignGroupII)callR2()->_r2_category).c_str());
+                setFSChannelVar("KR2GotCategory",STG(FMT("%d") % callR2()->_r2_category).c_str());
+                setFSChannelVar("KR2StrCategory",Verbose::signGroupII((KSignGroupII)callR2()->_r2_category).c_str());
            }
-
        }
        catch(Board::KhompPvt::InvalidSwitchChannel & err)
        {
@ -834,9 +915,9 @@ struct KhompPvtFXS: public KhompPvt
            _ring_off_ext = -1;

            _incoming_exten.clear();
-            _flash_transfer.clear();
+            //_flash_transfer.clear();

-            _uuid_other_session.clear();
+            //_uuid_other_session.clear();
 
            return Call::clear();
        }
@ -850,10 +931,10 @@ struct KhompPvtFXS: public KhompPvt

        std::string _incoming_exten;
        
-        ChanTimer::Index _idx_transfer;
+        //ChanTimer::Index _idx_transfer;

-        std::string _flash_transfer;
-        std::string _uuid_other_session;
+        //std::string _flash_transfer;
+        //std::string _uuid_other_session;
        

    };
@ -936,9 +1017,9 @@ struct KhompPvtFXS: public KhompPvt
                       std::string extra_context = "");
    bool isOK(void);

-    bool startTransfer();
-    bool stopTransfer();
-    bool transfer(std::string & context, bool blind = false);
+    //bool startTransfer();
+    //bool stopTransfer();
+    //bool transfer(std::string & context, bool blind = false);

    bool hasNumberDial() { return false; }
    
@ -996,7 +1077,7 @@ struct KhompPvtFXS: public KhompPvt

    static OrigToNseqMapType generateNseqMap();
    static void dialTimer(KhompPvt * pvt);
-    static void transferTimer(KhompPvt * pvt);
+    //static void transferTimer(KhompPvt * pvt);

    static std::string padOrig(std::string orig_base, unsigned int padding)
    {
@ -1015,21 +1096,16 @@ struct KhompPvtFXS: public KhompPvt
        return STG(FMT(STG(FMT("%%0%dd") % orig_size)) % (orig_numb + padding));
    }

-    /*
-    virtual void getSpecialVariables()
+    void cleanupIndications(bool force)
    {
-        try
+        if (call()->_indication == INDICA_BUSY && !force)
        {
-        }
-        catch(Board::KhompPvt::InvalidSwitchChannel & err)
-        {
-            LOG(ERROR, PVT_FMT(_target, "(FXS) %s") % err._msg.c_str());
+            DBG(FUNC, PVT_FMT(_target, "skipping busy indication cleanup on FXS channel."));
+            return;
        }

-        KhompPvt::getSpecialVariables();
+        KhompPvt::cleanupIndications(force);
    }
-    */
-
 };
 /******************************************************************************/
 /******************************************************************************/
--- a/src/mod/endpoints/mod_khomp/include/opt.h
+++ b/src/mod/endpoints/mod_khomp/include/opt.h
@ -108,10 +108,13 @@ struct Options
    Config::Value< bool > _recording;
    Config::Value< bool > _has_ctbus;
    Config::Value< bool > _fxs_bina;
-    Config::Value< bool > _fxo_send_pre_audio;
+    Config::Value< bool > _fxs_sharp_dial;
    Config::Value< bool > _drop_collect_call;
    Config::Value< bool > _ignore_letter_dtmfs;
    Config::Value< bool > _optimize_audio_path;
+    
+    Config::Value< bool > _fxo_send_pre_audio;
+    Config::Value< unsigned int > _fxo_busy_disconnection;

    Config::Value< bool         > _auto_fax_adjustment;
    Config::Value< unsigned int > _fax_adjustment_timeout;
--- a/src/mod/endpoints/mod_khomp/include/revision.h
+++ b/src/mod/endpoints/mod_khomp/include/revision.h
@ -1 +1 @@
-#define MOD_KHOMP_VERSION "1.0 - (rev: 5891)"
+#define MOD_KHOMP_VERSION "1.0 - (rev: 6034)"
--- a/src/mod/endpoints/mod_khomp/src/cli.cpp
+++ b/src/mod/endpoints/mod_khomp/src/cli.cpp
@ -75,6 +75,7 @@ void Cli::registerCommands(APIFunc func,switch_loadable_module_interface_t **mod
 " khomp channels unblock {all | <board> all | <board> <channel>}\n"            \
 " khomp clear links [<board> [<link>]]\n"                                      \
 " khomp clear statistics [<board> [<channel>]]\n"                              \
+" khomp dump config\n"                                                         \
 " khomp get <option>\n"                                                        \
 " khomp kommuter {on|off}\n"                                                   \
 " khomp kommuter count\n"                                                      \
@ -128,6 +129,10 @@ void Cli::registerCommands(APIFunc func,switch_loadable_module_interface_t **mod
 /* is responsible for parse and execute all commands */
 bool Cli::parseCommands(int argc, char *argv[])
 {
+    /*
+     * DEBUG_CLI_CMD();
+     */
+
    /* khomp summary */
    if (ARG_CMP(0, "summary"))
        return EXEC_CLI_CMD(Cli::KhompSummary);
@ -163,7 +168,15 @@ bool Cli::parseCommands(int argc, char *argv[])
        if(ARG_CMP(1, "statistics"))
            return EXEC_CLI_CMD(Cli::KhompClearStatistics);
    }
-    
+   
+    /* khomp dump */
+    else if(ARG_CMP(0, "dump"))
+    {
+        /* khomp dump config */
+        if(ARG_CMP(1, "config"))
+            return EXEC_CLI_CMD(Cli::KhompDumpConfig);
+    }
+ 
    /* khomp reset */
    else if(ARG_CMP(0, "reset"))
    {
@ -285,6 +298,7 @@ Cli::_KhompShowChannels       Cli::KhompShowChannels;
 Cli::_KhompShowLinks          Cli::KhompShowLinks;
 Cli::_KhompShowStatistics     Cli::KhompShowStatistics;
 Cli::_KhompClearLinks         Cli::KhompClearLinks;
+Cli::_KhompDumpConfig         Cli::KhompDumpConfig;
 Cli::_KhompClearStatistics    Cli::KhompClearStatistics;
 Cli::_KhompResetLinks         Cli::KhompResetLinks;
 Cli::_KhompChannelsDisconnect Cli::KhompChannelsDisconnect;
@ -337,7 +351,9 @@ bool Cli::_KhompSummary::execute(int argc, char *argv[])
        K::Logger::Logg2(classe, stream, "|------------------------------------------------------------------|");
    }

-    if (k3lGetDeviceConfig(-1, ksoAPI, &apiCfg, sizeof(apiCfg)) == ksSuccess)
+    const bool running = (k3lGetDeviceConfig(-1, ksoAPI, &apiCfg, sizeof(apiCfg)) == ksSuccess);
+
+    if(running)
    {
        switch(output_type)
        {
@ -376,6 +392,28 @@ bool Cli::_KhompSummary::execute(int argc, char *argv[])
                break;
        }
    }
+    else
+    {
+        switch(output_type)
+        {
+            case Cli::VERBOSE:
+            {
+                K::Logger::Logg2(classe, stream, "| Connection to KServer broken, please check system logs!          |");
+            } break;
+
+            case Cli::CONCISE:
+            {
+                K::Logger::Logg2(classe, stream, "CONNECTION BROKEN");
+            } break;
+
+            case Cli::XML:
+            {
+                 /* summary/k3lapi */
+                switch_xml_t xk3lapi = switch_xml_add_child_d(root, "k3lapi",0);
+                switch_xml_set_txt_d(xk3lapi, "CONNECTION BROKEN");
+            } break;
+        }
+    }

 #ifndef MOD_KHOMP_VERSION
 #define MOD_KHOMP_VERSION "unknown"
@ -423,6 +461,20 @@ bool Cli::_KhompSummary::execute(int argc, char *argv[])
            break;
    }

+    if(!running)
+    {
+        if (output_type == Cli::VERBOSE)
+            K::Logger::Logg2(classe,stream, " ------------------------------------------------------------------");
+      
+        if (output_type == Cli::XML)
+        {
+            printXMLOutput(stream);
+            clearRoot();
+        }
+
+        return false;
+    }
+
    if (output_type == Cli::XML)
    {
        /* summary/board */
@ -2154,6 +2206,38 @@ bool Cli::_KhompClearStatistics::execute(int argc, char *argv[])
    return true;
 }

+bool Cli::_KhompDumpConfig::execute(int argc, char *argv[])
+{
+    if (argc != 2) 
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    const Config::StringSet opts = Globals::options.options();
+
+    K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
+    K::Logger::Logg2(C_CLI, stream, "|--------------------------- Khomp Options Dump -------------------------|");
+    K::Logger::Logg2(C_CLI, stream, "|------------------------------------------------------------------------|");
+
+    for (Config::StringSet::const_iterator itr = opts.begin(); itr != opts.end(); ++itr)
+    {   try
+        {
+            if(removeUnavaible((*itr))) continue;                
+            K::Logger::Logg2(C_CLI, stream, FMT("| %-24s => %42s |")
+                    % (*itr) % Globals::options.get(&(Opt::_options), (*itr)));
+        }
+        catch(Config::EmptyValue &e)
+        {
+            K::Logger::Logg(C_ERROR, FMT("%s (%s)") % e.what() % (*itr));
+        }
+    }    
+
+    K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
+
+    return true;
+}
+
 void Cli::_KhompResetLinks::resetLink(unsigned int device, unsigned int link)
 {
    try
@ -2718,10 +2802,18 @@ bool Cli::_KhompSet::execute(int argc, char *argv[])
    try  
    {    
        Globals::options.process(&Opt::_options, (const char *) argv[1], (const char *) args.c_str());
+        const Config::Options::Messages msgs = Globals::options.commit(&Opt::_options, (const char *)argv[1]);
+
+        for (Config::Options::Messages::const_iterator i = msgs.begin(); i != msgs.end(); ++i) 
+        {
+            K::Logger::Logg2(C_ERROR, stream, FMT("%s.") % (*i));
+        }
+
+        K::Logger::Logg2(C_CLI, stream, FMT("Setting %s for value %s") % argv[1] % argv[2]);
    }    
    catch (Config::Failure &e)
    {    
-        K::Logger::Logg2(C_CLI,stream, FMT("config processing error: %s.") % e.what());
+        K::Logger::Logg2(C_ERROR,stream, FMT("config processing error: %s.") % e.what());
    }    

    return true;
@ -2891,7 +2983,6 @@ bool Cli::_KhompSelectSim::execute(int argc, char *argv[])
            K::Logger::Logg2(C_CLI, stream, "ERROR: Unable to select sim card"); 
            return false;
        }
-
    }
    catch (Strings::invalid_value & e)
    {
--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt.cpp
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt.cpp
@ -1119,12 +1119,7 @@ bool Board::KhompPvt::cleanup(CleanupType type)
        /* pára cadências e limpa estado das flags */
        stopCadence();

-        if (call()->_indication != INDICA_NONE)
-        {
-            call()->_indication = INDICA_NONE;
-
-            mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
-        }
+        cleanupIndications(true);

        if(call()->_input_volume >= -10 && call()->_input_volume <= 10)
            setVolume("input" , Opt::_options._input_volume());
@ -1152,6 +1147,15 @@ bool Board::KhompPvt::cleanup(CleanupType type)
    return true;
 }

+void Board::KhompPvt::cleanupIndications(bool force)
+{
+    if (call()->_indication != INDICA_NONE)
+    {
+        call()->_indication = INDICA_NONE;
+        mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
+    }
+}
+
 bool Board::KhompPvt::isFree(bool just_phy)
 {
    //DBG(FUNC, DP(this, "c"));
@ -1168,28 +1172,6 @@ bool Board::KhompPvt::isFree(bool just_phy)
        if(session())
            return false;

-        /*
-		if (!is_gsm())
-		{
-			if (calls.at(0).owner != NULL)
-			{
-				DBG(FUNC, DP(this, "we have owner, not free!"));
-				return false;
-			}
-		}
-		else
-		{
-			for (int i = 0; i < 6; i++)
-			{
-
-				call_data_type & data = calls.at(i);
-
-				if (data.owner != NULL)
-					return false;
-			}
-		}
-        */
-
 		bool free_state = !(_call->_flags.check(Kflags::IS_INCOMING) || _call->_flags.check(Kflags::IS_OUTGOING));

 		DBG(FUNC, PVT_FMT(target(), "[free = %s]") % (free_state ? "yes" : "no"));
@ -1559,7 +1541,7 @@ bool Board::KhompPvt::echoCancellation(bool enable)

 bool Board::KhompPvt::autoGainControl(bool enable)
 {
-    bool ret = command(KHOMP_LOG,(enable ? CM_ENABLE_AGC : CM_DISABLE_AGC));//, SCE_SHOW_DEBUG);
+    bool ret = command(KHOMP_LOG,(enable ? CM_ENABLE_AGC : CM_DISABLE_AGC));
    return ret;
 }

@ -1625,10 +1607,11 @@ bool Board::KhompPvt::setCollectCall()
    DBG(FUNC, PVT_FMT(_target, "option drop collect call is '%s'") % (Opt::_options._drop_collect_call() ? "yes" : "no"));

    // get global filter configuration value
-    tmp_var = switch_core_get_variable_dup("KDropCollectCall");
+    tmp_var = getFSGlobalVar("KDropCollectCall");
    confvalues.push_back(getTriStateValue(tmp_var));
    DBG(FUNC, PVT_FMT(_target, "global KDropCollectCall was '%s'") % (tmp_var ? tmp_var : "(empty)"));
-	switch_safe_free(tmp_var);
+
+    freeFSGlobalVar(&tmp_var);

    try 
    {
@ -2052,6 +2035,7 @@ bool Board::KhompPvt::onNoAnswer(K3L_EVENT *e)
    DBG(FUNC, PVT_FMT(_target, "Detected: \"%s\"") %  Verbose::callStartInfo((KCallStartInfo)e->AddInfo).c_str());   

    // Fire a custom event about this 
+    /* MUST USE THE NEW EVENT SYSTEM
    switch_event_t * event;
    if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, KHOMP_EVENT_MAINT) == SWITCH_STATUS_SUCCESS)
    {
@ -2062,6 +2046,8 @@ bool Board::KhompPvt::onNoAnswer(K3L_EVENT *e)

        switch_event_fire(&event);
    }
+    */
+
    return true;
 }

--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt_fxo.cpp
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt_fxo.cpp
@ -715,37 +715,47 @@ bool BoardFXO::KhompPvtFXO::indicateBusyUnlocked(int cause, bool sent_signaling)

    if(call()->_flags.check(Kflags::IS_INCOMING))
    {
+        /* already connected or sent signaling... */
+        mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+        
        if(!call()->_flags.check(Kflags::CONNECTED) && !sent_signaling)
        {
-            //we are talking about branches, not trunks 
+            /* we are talking about branches, not trunks */ 
            command(KHOMP_LOG, CM_CONNECT);
-            command(KHOMP_LOG, CM_DISCONNECT);
-        }
-        else
-        {
-            //already connected or sent signaling... 
-            mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+            callFXO()->_busy_disconnect = Board::board(_target.device)->_timers.add(Opt::_options._fxo_busy_disconnection(), &BoardFXO::KhompPvtFXO::busyDisconnect, this);
        }
    }
    else if(call()->_flags.check(Kflags::IS_OUTGOING))
    {
-        //already connected or sent signaling... 
+        /* already connected or sent signaling... */
        mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
    }

    DBG(FUNC,PVT_FMT(_target, "(FXO) r"));
-    
    return true; 
 }

+void BoardFXO::KhompPvtFXO::busyDisconnect(Board::KhompPvt * pvt)
+{
+    DBG(FUNC, PVT_FMT(pvt->target(), "Disconnecting FXO"));
+
+    try 
+    {   
+        ScopedPvtLock lock(pvt);
+        pvt->command(KHOMP_LOG, CM_DISCONNECT);
+    }   
+    catch (...)
+    {
+        LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock the pvt !"));
+    }  
+}
+
 void BoardFXO::KhompPvtFXO::reportFailToReceive(int fail_code)
 {
    KhompPvt::reportFailToReceive(fail_code);

    command(KHOMP_LOG, CM_CONNECT);
-
    command(KHOMP_LOG, CM_DISCONNECT);
-
 }

 bool BoardFXO::KhompPvtFXO::validContexts(
--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt_gsm.cpp
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt_gsm.cpp
@ -312,6 +312,9 @@ int BoardGSM::KhompPvtGSM::makeCall(std::string params)
        command(KHOMP_LOG, CM_DISABLE_CALL_ANSWER_INFO);
    }

+    if(!_call->_orig_addr.compare("restricted"))
+        params += " orig_addr=\"restricted\"";
+
    int ret = KhompPvt::makeCall(params);

    if(ret != ksSuccess)
--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt_kxe1.cpp
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt_kxe1.cpp
@ -372,18 +372,37 @@ bool BoardE1::onLinkStatus(K3L_EVENT *e)

 bool BoardE1::KhompPvtISDN::onSyncUserInformation(K3L_EVENT *e)
 {
-    KUserInformation * info = (KUserInformation *) (((char*)e) + sizeof(K3L_EVENT));
+    DBG(FUNC,PVT_FMT(_target, "Synchronizing"));

-    callISDN()->_uui_descriptor = info->ProtocolDescriptor;
+    if(callISDN()->_uui_extended)
+    {
+        KUserInformationEx * info = (KUserInformationEx *) (((char*)e) + sizeof(K3L_EVENT));
+        callISDN()->_uui_descriptor = (long int) info->ProtocolDescriptor;
+        
+        /* clean string */
+        callISDN()->_uui_information.clear();

-    /* clean string */
-    callISDN()->_uui_information.clear();
+        if (info->UserInfoLength)
+        {    
+            /* append to a clean string */
+            for (unsigned int i = 0; i < info->UserInfoLength; ++i) 
+                callISDN()->_uui_information += STG(FMT("%02hhx") % ((unsigned char) info->UserInfo[i]));
+        }    
+    }
+    else
+    {
+        KUserInformation * info = (KUserInformation *) (((char*)e) + sizeof(K3L_EVENT));
+        callISDN()->_uui_descriptor = info->ProtocolDescriptor;
+        
+        /* clean string */
+        callISDN()->_uui_information.clear();

-    if (info->UserInfoLength)
-    {    
-        /* append to a clean string */
-        callISDN()->_uui_information.append((const char *)info->UserInfo, info->UserInfoLength);
-    }    
+        if (info->UserInfoLength)
+        {    
+            for (unsigned int i = 0; i < info->UserInfoLength; ++i) 
+                callISDN()->_uui_information += STG(FMT("%02hhx") % ((unsigned char) info->UserInfo[i]));
+        }    
+    }

    return true;
 }
@ -440,15 +459,20 @@ bool BoardE1::KhompPvtISDN::onNewCall(K3L_EVENT *e)
    bool isdn_reverse_charge = false;
    std::string isdn_reverse_charge_str;
    bool ret;
-    
+   
    try
    {
+        callISDN()->_isdn_orig_type_of_number = Globals::k3lapi.get_param(e, "isdn_orig_type_of_number"); 
+        callISDN()->_isdn_orig_numbering_plan = Globals::k3lapi.get_param(e, "isdn_orig_numbering_plan"); 
+        callISDN()->_isdn_dest_type_of_number = Globals::k3lapi.get_param(e, "isdn_dest_type_of_number"); 
+        callISDN()->_isdn_dest_numbering_plan = Globals::k3lapi.get_param(e, "isdn_dest_numbering_plan"); 
+        callISDN()->_isdn_orig_presentation   = Globals::k3lapi.get_param(e, "isdn_orig_presentation"); 
        isdn_reverse_charge_str = Globals::k3lapi.get_param(e, "isdn_reverse_charge");
        isdn_reverse_charge = Strings::toboolean(isdn_reverse_charge_str);
    }
    catch(K3LAPI::get_param_failed & err)
    {
-        /* do nothing, maybe the parameter is not sent */
+        LOG(WARNING, PVT_FMT(_target, "maybe the parameter is not sent (%s)'") % err.name.c_str());
    }
    catch (Strings::invalid_value & err)
    {
@ -866,25 +890,84 @@ int BoardE1::KhompPvtISDN::makeCall(std::string params)
        DBG(FUNC,PVT_FMT(_target, "got userinfo"));   

        /* grab this information first, avoiding latter side-effects */
-        const char * info_data = call->_uui_information.c_str();
-        size_t       info_size = std::min(call->_uui_information.size(), (size_t)KMAX_USER_USER_LEN);
+        const bool        info_extd = call->_uui_extended;
+        const long int    info_desc = call->_uui_descriptor;
+        const std::string info_data = call->_uui_information.c_str();
+        const size_t      info_size = std::min<size_t>(call->_uui_information.size(), (info_extd ? KMAX_USER_USER_EX_LEN : KMAX_USER_USER_LEN) << 1) >> 1;

-        KUserInformation info;
-
-        info.ProtocolDescriptor = call->_uui_descriptor;
-        info.UserInfoLength = info_size;
-
-        memcpy((void *) info.UserInfo, (const void *) info_data, info_size);
-
-        if (!command(KHOMP_LOG, CM_USER_INFORMATION, (const char *)&info))
+        bool res = true;
+    
+        if(info_extd)
        {
-            LOG(ERROR,PVT_FMT(_target, "UUI could not be sent before dialing!"));   
+            KUserInformationEx info;
+
+            info.ProtocolDescriptor = info_desc;
+            info.UserInfoLength = info_size;
+
+            for (unsigned int pos = 0u, index = 0u; pos < info_size; index+=2, ++pos)
+                info.UserInfo[pos] = (unsigned char)Strings::toulong(info_data.substr(index,2), 16); 
+
+            if (!command(KHOMP_LOG, CM_USER_INFORMATION_EX, (const char *) &info))
+            {
+                LOG(ERROR,PVT_FMT(_target, "UUI could not be sent before dialing!"));   
+            }
+        } 
+        else
+        {
+            KUserInformation info;
+
+            info.ProtocolDescriptor = info_desc;
+            info.UserInfoLength = info_size;
+
+            for (unsigned int pos = 0u, index = 0u; pos < info_size; index+=2, ++pos)
+                info.UserInfo[pos] = (unsigned char)Strings::toulong(info_data.substr(index,2), 16); 
+
+            if (!command(KHOMP_LOG, CM_USER_INFORMATION, (const char *) &info))
+            {
+                LOG(ERROR,PVT_FMT(_target, "UUI could not be sent before dialing!"));   
+            }
        }

+        call->_uui_extended = false; 
        call->_uui_descriptor = -1;
        call->_uui_information.clear();
    }

+    if (!callISDN()->_isdn_orig_type_of_number.empty()) 
+    {
+        params += "isdn_orig_type_of_number=\""; 
+        params += callISDN()->_isdn_orig_type_of_number; 
+        params += "\" "; 
+    }
+
+    if (!callISDN()->_isdn_dest_type_of_number.empty()) 
+    { 
+        params += "isdn_dest_type_of_number=\""; 
+        params += callISDN()->_isdn_dest_type_of_number; 
+        params += "\" "; 
+    }
+
+    if (!callISDN()->_isdn_orig_numbering_plan.empty()) 
+    { 
+        params += "isdn_orig_numbering_plan=\""; 
+        params += callISDN()->_isdn_orig_numbering_plan; 
+        params += "\" "; 
+    }
+
+    if (!callISDN()->_isdn_dest_numbering_plan.empty()) 
+    { 
+        params += "isdn_dest_numbering_plan=\""; 
+        params += callISDN()->_isdn_dest_numbering_plan; 
+        params += "\" "; 
+    }
+
+    if (!callISDN()->_isdn_orig_presentation.empty())
+    { 
+        params += "isdn_orig_presentation=\"";   
+        params += callISDN()->_isdn_orig_presentation; 
+        params += "\" "; 
+    }
+
    int ret = KhompPvtE1::makeCall(params);

    call->_cleanup_upon_hangup = (ret == ksInvalidParams || ret == ksBusy);
@ -995,12 +1078,6 @@ bool BoardE1::KhompPvtR2::doChannelAnswer(CommandRequest &cmd)
        // is this a collect call?
        bool has_recv_collect_call = _call->_collect_call;

-        if(has_recv_collect_call)
-            DBG(FUNC, PVT_FMT(target(), "receive a collect call"));
-
-        if(call()->_flags.check(Kflags::DROP_COLLECT))
-            DBG(FUNC, PVT_FMT(target(), "flag DROP_COLLECT == true"));
-        
        // do we have to drop collect calls?
        bool has_drop_collect_call = call()->_flags.check(Kflags::DROP_COLLECT);

@ -1013,29 +1090,37 @@ bool BoardE1::KhompPvtR2::doChannelAnswer(CommandRequest &cmd)
        if(do_send_ring)
        {       
            call()->_flags.clear(Kflags::NEEDS_RINGBACK_CMD);
+
+            //TODO: callFailFromCause ??
            std::string cause = ( do_drop_call ? STG(FMT("r2_cond_b=\"%d\"") % kgbBusy) : "" );
            command(KHOMP_LOG,CM_RINGBACK,cause.c_str());

            usleep(75000);
        }

-        if(!(do_drop_call && do_send_ring))
+        if(!do_drop_call)
        {
            command(KHOMP_LOG, CM_CONNECT);
        }

-        if(has_drop_collect_call && !do_send_ring) 
+        if(!do_send_ring && has_drop_collect_call) 
        {
+            usleep(75000);
+
            if(has_recv_collect_call)
            {
-                usleep(75000);
-
-                DBG(FUNC, PVT_FMT(target(), "disconnecting collect call doChannelAnswer R2"));
-                command(KHOMP_LOG,CM_DISCONNECT);
-
                // thou shalt not talk anymore!
                stopListen();
                stopStream();
+
+                if (call()->_indication == INDICA_NONE)
+                {    
+                    call()->_indication = INDICA_BUSY;
+                    mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+                }    
+
+                DBG(FUNC, PVT_FMT(_target,"forcing disconnect for collect call"));
+                forceDisconnect();
            }
            else
            {
@ -1797,6 +1882,8 @@ bool BoardE1::KhompPvtR2::onNewCall(K3L_EVENT *e)
                DBG(FUNC,PVT_FMT(_target, "Setting DROP_COLLECT flag"));
            }

+            freeFSGlobalVar(&drop_str);            
+
            // keeping the hardcore mode
            if (do_drop_collect && call()->_collect_call)
            {
@ -2388,6 +2475,7 @@ void BoardE1::KhompPvtFXS::dialTimer(KhompPvt * pvt)

 }

+/*
 void BoardE1::KhompPvtFXS::transferTimer(KhompPvt * pvt)
 {
    DBG(FUNC, PVT_FMT(pvt->target(), "c"));
@ -2420,7 +2508,7 @@ void BoardE1::KhompPvtFXS::transferTimer(KhompPvt * pvt)
            return;
        }

-        /* begin context adjusting + processing */
+        // begin context adjusting + processing 
        MatchExtension::ContextListType contexts;

        pvt_fxs->validContexts(contexts);
@ -2469,6 +2557,7 @@ void BoardE1::KhompPvtFXS::transferTimer(KhompPvt * pvt)
    DBG(FUNC, PVT_FMT(pvt->target(), "r"));

 }
+*/

 bool BoardE1::KhompPvtFXS::onChannelRelease(K3L_EVENT *e)
 {
@ -2480,22 +2569,23 @@ bool BoardE1::KhompPvtFXS::onChannelRelease(K3L_EVENT *e)
    {
        ScopedPvtLock lock(this);

+        /*
        if(!callFXS()->_uuid_other_session.empty() && session())
        {
-            /*
-            switch_core_session_t *hold_session;
+            
+            //switch_core_session_t *hold_session;

-            if ((hold_session = switch_core_session_locate(callFXS()->_uuid_other_session.c_str()))) 
-            {
-                switch_channel_t * hold = switch_core_session_get_channel(hold_session);
-                switch_channel_stop_broadcast(hold);
-                switch_channel_wait_for_flag(hold, CF_BROADCAST, SWITCH_FALSE, 5000, NULL);
-                switch_core_session_rwunlock(hold_session);
-            }
-            */
+            //if ((hold_session = switch_core_session_locate(callFXS()->_uuid_other_session.c_str()))) 
+            //{
+            //    switch_channel_t * hold = switch_core_session_get_channel(hold_session);
+            //    switch_channel_stop_broadcast(hold);
+            //    switch_channel_wait_for_flag(hold, CF_BROADCAST, SWITCH_FALSE, 5000, NULL);
+            //    switch_core_session_rwunlock(hold_session);
+            //}
+            
            try
            {
-                /* get other side of the bridge */
+                // get other side of the bridge 
                switch_core_session_t * peer_session = getFSLockedPartnerSession();
                unlockPartner(peer_session);
                DBG(FUNC, PVT_FMT(target(), "bridge with the new session"));
@ -2509,6 +2599,7 @@ bool BoardE1::KhompPvtFXS::onChannelRelease(K3L_EVENT *e)

            callFXS()->_uuid_other_session.clear();
        }
+        */

        ret = KhompPvt::onChannelRelease(e);

@ -2523,7 +2614,7 @@ bool BoardE1::KhompPvtFXS::onChannelRelease(K3L_EVENT *e)
    return ret;
 
 }
-
+/*
 bool BoardE1::KhompPvtFXS::startTransfer()
 {
    DBG(FUNC, PVT_FMT(target(), "c"));
@ -2596,7 +2687,7 @@ bool BoardE1::KhompPvtFXS::stopTransfer()

    try
    {
-        /* get other side of the bridge */
+        // get other side of the bridge 
        switch_core_session_t * peer_session = getFSLockedPartnerSession();
        switch_channel_t * peer_channel = getFSChannel(peer_session);

@ -2664,33 +2755,33 @@ static switch_status_t xferHook(switch_core_session_t *session)
    else if (state == CS_HANGUP) 
    {
        switch_core_event_hook_remove_state_change(session, xferHook);
-/*
-        BoardE1::KhompPvtFXS * pvt = static_cast<BoardE1::KhompPvtFXS*>(switch_core_session_get_private(session));
-        
-        if(!pvt)
-        {
-            DBG(FUNC, D("pvt is NULL"));
-            return SWITCH_STATUS_FALSE;
-        }

-        try
-        {
-            ScopedPvtLock lock(pvt);
+        //BoardE1::KhompPvtFXS * pvt = static_cast<BoardE1::KhompPvtFXS*>(switch_core_session_get_private(session));
+        //
+        //if(!pvt)
+        //{
+        //    DBG(FUNC, D("pvt is NULL"));
+        //    return SWITCH_STATUS_FALSE;
+        //}

-            if(!pvt->callFXS()->_uuid_other_session.empty())
-            {
-                DBG(FUNC, D("bridge after hangup"));
-                std::string number = pvt->callFXS()->_uuid_other_session;
-                pvt->callFXS()->_uuid_other_session.clear();
+        //try
+        //{
+        //    ScopedPvtLock lock(pvt);
+
+        //    if(!pvt->callFXS()->_uuid_other_session.empty())
+        //    {
+        //        DBG(FUNC, D("bridge after hangup"));
+        //        std::string number = pvt->callFXS()->_uuid_other_session;
+        //        pvt->callFXS()->_uuid_other_session.clear();
+
+        //        switch_ivr_uuid_bridge(switch_core_session_get_uuid(session), number.c_str());
+        //    }
+        //}
+        //catch(ScopedLockFailed & err)
+        //{
+        //   LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock: %s!") %  err._msg.c_str());            
+        //}

-                switch_ivr_uuid_bridge(switch_core_session_get_uuid(session), number.c_str());
-            }
-        }
-        catch(ScopedLockFailed & err)
-        {
-            LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock: %s!") %  err._msg.c_str());            
-        }
-*/
    }

    return SWITCH_STATUS_SUCCESS;
@ -2716,7 +2807,7 @@ bool BoardE1::KhompPvtFXS::transfer(std::string & context, bool blind)

    try
    {
-        /* get other side of the bridge */
+        // get other side of the bridge 
        switch_core_session_t * peer_session = getFSLockedPartnerSession();
        switch_channel_t * peer_channel = getFSChannel(peer_session);

@ -2774,16 +2865,16 @@ bool BoardE1::KhompPvtFXS::transfer(std::string & context, bool blind)
            call()->_flags.set(Kflags::GEN_CO_RING);
            startCadence(PLAY_RINGBACK);

-            /*
-            try
-            {
-                call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_options._ringback_co_delay(), &Board::KhompPvt::coRingGen,this);
-            }
-            catch (K3LAPITraits::invalid_device & err)
-            {
-                LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
-            }
-            */
+            
+            //try
+            //{
+            //    call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_options._ringback_co_delay(), &Board::KhompPvt::coRingGen,this);
+            //}
+            //catch (K3LAPITraits::invalid_device & err)
+            //{
+             //   LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
+            //}
+            
        }
    }
    catch(Board::KhompPvt::InvalidSwitchChannel & err)
@ -2796,6 +2887,7 @@ bool BoardE1::KhompPvtFXS::transfer(std::string & context, bool blind)

    return true;
 }
+*/

 bool BoardE1::KhompPvtFXS::onDtmfDetected(K3L_EVENT *e)
 {
@ -2902,6 +2994,7 @@ bool BoardE1::KhompPvtFXS::onDtmfDetected(K3L_EVENT *e)
                    break;
            }
        }
+        /*
        else if(callFXS()->_flags.check(Kflags::FXS_OFFHOOK) &&
                callFXS()->_flags.check(Kflags::FXS_FLASH_TRANSFER))
        {
@ -2922,7 +3015,7 @@ bool BoardE1::KhompPvtFXS::onDtmfDetected(K3L_EVENT *e)

            callFXS()->_flash_transfer += e->AddInfo;
    
-            /* begin context adjusting + processing */
+            // begin context adjusting + processing
            MatchExtension::ContextListType contexts;

            validContexts(contexts);
@ -2949,7 +3042,7 @@ bool BoardE1::KhompPvtFXS::onDtmfDetected(K3L_EVENT *e)
                case MatchExtension::MATCH_MORE:
                    DBG(FUNC, PVT_FMT(target(), "match more..."));

-                    /* can match, will match more, and it's an external call? */
+                    // can match, will match more, and it's an external call?
                    for (DestVectorType::const_iterator i = Opt::_options._fxs_co_dialtone().begin(); i != Opt::_options._fxs_co_dialtone().end(); i++)
                    {
                        if (callFXS()->_flash_transfer == (*i))
@ -2975,6 +3068,7 @@ bool BoardE1::KhompPvtFXS::onDtmfDetected(K3L_EVENT *e)
                }
            }
        }
+        */
        else
        {
            ret = KhompPvt::onDtmfDetected(e);
@ -3042,6 +3136,7 @@ bool BoardE1::KhompPvtFXS::onFlashDetected(K3L_EVENT *e)

 /******************************************************************************/
        //Old implementation, not used
+        /*
        if(callFXS()->_flags.check(Kflags::FXS_FLASH_TRANSFER))
        {
            DBG(FUNC, PVT_FMT(_target, "(FXS) transfer canceled"));
@ -3078,6 +3173,7 @@ bool BoardE1::KhompPvtFXS::onFlashDetected(K3L_EVENT *e)
            DBG(FUNC, PVT_FMT(target(), "(FXS) r (unable to start transfer)"));
            return false;
        }
+        */
 /******************************************************************************/

    }
@ -3207,7 +3303,8 @@ bool BoardE1::KhompPvtFXS::doChannelHangup(CommandRequest &cmd)
    try
    {
        ScopedPvtLock lock(this);
-        
+       
+        /*
        if(!callFXS()->_uuid_other_session.empty())
        {
            DBG(FUNC,PVT_FMT(_target, "unable to transfer"));
@ -3225,6 +3322,7 @@ bool BoardE1::KhompPvtFXS::doChannelHangup(CommandRequest &cmd)
            }
            callFXS()->_uuid_other_session.clear();            
        }
+        */

        if (call()->_flags.check(Kflags::IS_INCOMING))
        {
--- a/src/mod/endpoints/mod_khomp/src/opt.cpp
+++ b/src/mod/endpoints/mod_khomp/src/opt.cpp
@ -75,11 +75,14 @@ void Opt::initialize(void)
 	Globals::options.add(Config::Option("recording",           &Options::_recording,           true));
 	Globals::options.add(Config::Option("has-ctbus",           &Options::_has_ctbus,           false));
 	Globals::options.add(Config::Option("fxs-bina",            &Options::_fxs_bina,            true));
-	Globals::options.add(Config::Option("fxo-send-pre-audio",  &Options::_fxo_send_pre_audio,  true));
+	Globals::options.add(Config::Option("fxs-sharp-dial",      &Options::_fxs_sharp_dial,      true));
 	Globals::options.add(Config::Option("drop-collect-call",   &Options::_drop_collect_call,   false));
 	Globals::options.add(Config::Option("ignore-letter-dtmfs", &Options::_ignore_letter_dtmfs, true));
 	Globals::options.add(Config::Option("optimize-audio-path", &Options::_optimize_audio_path, false));

+    Globals::options.add(Config::Option("fxo-send-pre-audio",     &Options::_fxo_send_pre_audio,  true));
+    Globals::options.add(Config::Option("fxo-busy-disconnection", &Options::_fxo_busy_disconnection, 1250u, 50u, 90000u));
+
    Globals::options.add(Config::Option("auto-fax-adjustment",    &Options::_auto_fax_adjustment,    true));
    Globals::options.add(Config::Option("fax-adjustment-timeout", &Options::_fax_adjustment_timeout, 30u, 3u, 9999u));

--- a/src/mod/endpoints/mod_khomp/src/spec.cpp
+++ b/src/mod/endpoints/mod_khomp/src/spec.cpp
@ -78,8 +78,6 @@ static SpecRetType processSpecAtom(std::string & atom, SpecFlagsType & flags, Sp
 		return processSpecAtoms(allocstr, flags, fun);
    }

-    //Regex::Expression e("(((([bB])[ ]*([0-9]+))|(([sS])[ ]*([0-9]+)))[ ]*(([cClL])[ ]*([0-9]+)[ ]*([-][ ]*([0-9]+))?)?)|(([rR])[ ]*([0-9]+)[ ]*([-][ ]*([0-9]+))?)", Regex::E_EXTENDED);
-
 	Regex::Match what(allocstr, Globals::regex_allocation);

 	if (!what.matched())
--- a/src/mod/endpoints/mod_khomp/src/utils.cpp
+++ b/src/mod/endpoints/mod_khomp/src/utils.cpp
@ -244,21 +244,26 @@ bool MatchExtension::canMatch(std::string & context, std::string & exten,
        return true;
    }

-    size_t finished = exten.find('#');
-
-    if(finished != std::string::npos)
+    if (Opt::_options._fxs_sharp_dial())
    {
-        if(exten.size() <= 1)
+        char key_digit  = '#';
+        size_t finished = exten.find_last_of(key_digit);
+        char last_char  = exten.at(exten.size() - 1);
+    
+        if(finished != std::string::npos && last_char == key_digit)
        {
-            DBG(FUNC, FMT("exten=%s size=%d") % exten % exten.size());
-            return true;
+            if(exten.size() <= 1)
+            {
+                DBG(FUNC, FMT("exten=%s size=%d") % exten % exten.size());
+                return true;
+            }
+
+            exten.erase(finished);
+            DBG(FUNC, FMT("match exact!!! exten=%s") % exten);
+            return false;
        }
-
-        exten.erase(finished);
-        DBG(FUNC, FMT("match exact!!! exten=%s") % exten);
-        return false;
    }
-
+    
    return true;

 /*
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@ -96,8 +96,10 @@ typedef struct private_object private_object_t;
 #define SOFIA_MULTIPART_PREFIX_T "~sip_mp_"
 #define SOFIA_SIP_HEADER_PREFIX "sip_h_"
 #define SOFIA_SIP_RESPONSE_HEADER_PREFIX "sip_rh_"
+#define SOFIA_SIP_RESPONSE_HEADER_PREFIX_T "~sip_rh_"
 #define SOFIA_SIP_BYE_HEADER_PREFIX "sip_bye_h_"
 #define SOFIA_SIP_PROGRESS_HEADER_PREFIX "sip_ph_"
+#define SOFIA_SIP_PROGRESS_HEADER_PREFIX_T "~sip_ph_"
 #define SOFIA_SIP_HEADER_PREFIX_T "~sip_h_"
 #define SOFIA_DEFAULT_PORT "5060"
 #define SOFIA_DEFAULT_TLS_PORT "5061"
@ -587,6 +589,8 @@ struct private_object {
 	sofia_private_t *sofia_private;
 	uint8_t flags[TFLAG_MAX];
 	switch_payload_t agreed_pt;
+	switch_payload_t audio_recv_pt;
+	switch_payload_t video_recv_pt;
 	switch_core_session_t *session;
 	switch_channel_t *channel;
 	switch_frame_t read_frame;
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@ -2148,8 +2148,13 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag)
 			if (!zstr(from_domain)) {
 				gateway->from_domain = switch_core_strdup(gateway->pool, from_domain);
 			}
+			
+			if (!zstr(register_transport) && !switch_stristr("transport=", proxy)) {
+				gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s;transport=%s", proxy, register_transport);
+			} else {
+				gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s", proxy);
+			}

-			gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s", proxy);
 			gateway->register_from = switch_core_sprintf(gateway->pool, "<sip:%s@%s;transport=%s>",
 														 from_user, !zstr(from_domain) ? from_domain : proxy, register_transport);

@ -4142,7 +4147,7 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status


 		if ((status == 180 || status == 183 || status == 200)) {
-			const char *x_freeswitch_support;
+			const char *x_freeswitch_support, *vval;

 			switch_channel_set_flag(channel, CF_MEDIA_ACK);

@ -4156,7 +4161,26 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
 				switch_channel_set_variable(channel, "sip_user_agent", sip->sip_server->g_string);
 			}

-			sofia_glue_set_extra_headers(channel, sip, SOFIA_SIP_PROGRESS_HEADER_PREFIX);
+			if (status == 200) {
+				sofia_glue_set_extra_headers(channel, sip, SOFIA_SIP_RESPONSE_HEADER_PREFIX);
+			} else {
+				sofia_glue_set_extra_headers(channel, sip, SOFIA_SIP_PROGRESS_HEADER_PREFIX);
+			}
+
+			if (!(vval = switch_channel_get_variable(channel, "sip_copy_custom_headers")) || switch_true(vval)) {
+				switch_core_session_t *other_session;
+				
+				if (switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) {
+					if (status == 200) {
+						switch_ivr_transfer_variable(session, other_session, SOFIA_SIP_RESPONSE_HEADER_PREFIX_T);
+					} else {
+						switch_ivr_transfer_variable(session, other_session, SOFIA_SIP_PROGRESS_HEADER_PREFIX_T);
+					}
+					switch_core_session_rwunlock(other_session);
+				}
+			}
+			
+

 			sofia_update_callee_id(session, profile, sip, SWITCH_FALSE);

--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@ -826,7 +826,7 @@ void sofia_glue_attach_private(switch_core_session_t *session, sofia_profile_t *
 		tech_pvt->recv_te = tech_pvt->te = profile->te;
 	}

-	tech_pvt->dtmf_type = profile->dtmf_type;
+	tech_pvt->dtmf_type = tech_pvt->profile->dtmf_type;

 	if (!sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG)) {
 		if (tech_pvt->bcng_pt) {
@ -838,6 +838,7 @@ void sofia_glue_attach_private(switch_core_session_t *session, sofia_profile_t *

 	tech_pvt->session = session;
 	tech_pvt->channel = switch_core_session_get_channel(session);
+	sofia_glue_check_dtmf_type(tech_pvt);
 	switch_channel_set_cap(tech_pvt->channel, CC_MEDIA_ACK);
 	switch_channel_set_cap(tech_pvt->channel, CC_BYPASS_MEDIA);
 	switch_channel_set_cap(tech_pvt->channel, CC_PROXY_MEDIA);
@ -3236,6 +3237,11 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f
 			switch_rtp_set_telephony_recv_event(tech_pvt->rtp_session, tech_pvt->recv_te);
 		}

+		if (tech_pvt->audio_recv_pt != tech_pvt->agreed_pt) {
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_CRIT, "Set audio receive payload to %u\n", tech_pvt->audio_recv_pt);
+			switch_rtp_set_recv_pt(tech_pvt->rtp_session, tech_pvt->audio_recv_pt);
+		}
+
 		if (sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG) ||
 			((val = switch_channel_get_variable(tech_pvt->channel, "supress_cng")) && switch_true(val)) ||
 			((val = switch_channel_get_variable(tech_pvt->channel, "suppress_cng")) && switch_true(val))) {
@ -3309,7 +3315,7 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f
 				if ((rport = switch_channel_get_variable(tech_pvt->channel, "sip_remote_video_rtcp_port"))) {
 					remote_rtcp_port = (switch_port_t)atoi(rport);
 				}
-
+				
 				if (switch_rtp_set_remote_address
 					(tech_pvt->video_rtp_session, tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port, remote_rtcp_port, SWITCH_TRUE,
 					 &err) != SWITCH_STATUS_SUCCESS) {
@ -3414,6 +3420,13 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f
 					switch_rtp_set_ssrc(tech_pvt->video_rtp_session, ssrc_ul);
 				}

+
+				if (tech_pvt->video_recv_pt != tech_pvt->video_agreed_pt) {
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, 
+									  "Set video receive payload to %u\n", tech_pvt->video_recv_pt);
+					switch_rtp_set_recv_pt(tech_pvt->rtp_session, tech_pvt->video_recv_pt);
+				}
+
 				switch_channel_set_variable_printf(tech_pvt->channel, "sip_use_video_pt", "%d", tech_pvt->video_agreed_pt);
 				tech_pvt->video_ssrc = switch_rtp_get_ssrc(tech_pvt->rtp_session);
 				switch_channel_set_variable_printf(tech_pvt->channel, "rtp_use_video_ssrc", "%u", tech_pvt->ssrc);
@ -4040,6 +4053,24 @@ switch_t38_options_t *sofia_glue_extract_t38_options(switch_core_session_t *sess

 }

+switch_status_t sofia_glue_get_offered_pt(private_object_t *tech_pvt, const switch_codec_implementation_t *mimp, switch_payload_t *pt)
+{
+	int i = 0;
+
+	for (i = 0; i < tech_pvt->num_codecs; i++) {
+		const switch_codec_implementation_t *imp = tech_pvt->codecs[i];
+
+		if (!strcasecmp(imp->iananame, mimp->iananame)) {
+			*pt = tech_pvt->ianacodes[i];
+
+			return SWITCH_STATUS_SUCCESS;
+		}
+	}
+
+	return SWITCH_STATUS_FALSE;
+}
+
+
 uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_sdp)
 {
 	uint8_t match = 0;
@ -4556,9 +4587,17 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
 					switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port);
 					switch_channel_set_variable(tech_pvt->channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE, tech_pvt->remote_sdp_audio_ip);
 					switch_channel_set_variable(tech_pvt->channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE, tmp);
-
+					tech_pvt->audio_recv_pt = map->rm_pt;
+					
+					if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+						sofia_glue_get_offered_pt(tech_pvt, mimp, &tech_pvt->audio_recv_pt);
+					}
+					
+					switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->audio_recv_pt);
+					switch_channel_set_variable(tech_pvt->channel, "sip_audio_recv_pt", tmp);
+					
 				}
-
+				
 				if (match) {
 					if (sofia_glue_tech_set_codec(tech_pvt, 1) == SWITCH_STATUS_SUCCESS) {
 						got_audio = 1;
@ -4585,7 +4624,7 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
 				}
 			}

-
+			
 			if (!match && greedy && mine < tech_pvt->num_codecs) {
 				mine++;
 				skip = 0;
@ -4667,6 +4706,16 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
 						switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->video_agreed_pt);
 						switch_channel_set_variable(tech_pvt->channel, "sip_video_pt", tmp);
 						sofia_glue_check_video_codecs(tech_pvt);
+
+						tech_pvt->video_recv_pt = map->rm_pt;
+						
+						if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+							sofia_glue_get_offered_pt(tech_pvt, mimp, &tech_pvt->video_recv_pt);
+						}
+
+						switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->video_recv_pt);
+						switch_channel_set_variable(tech_pvt->channel, "sip_video_recv_pt", tmp);
+						
 						break;
 					} else {
 						vmatch = 0;
@ -5166,7 +5215,7 @@ static int recover_callback(void *pArg, int argc, char **argv, char **columnName
 			if ((tmp = switch_channel_get_variable(channel, "sip_use_pt"))) {
 				tech_pvt->pt = tech_pvt->agreed_pt = (switch_payload_t)atoi(tmp);
 			}
-
+			
 			sofia_glue_tech_set_codec(tech_pvt, 1);

 			tech_pvt->adv_sdp_audio_ip = tech_pvt->extrtpip = (char *) ip;
@ -5221,6 +5270,19 @@ static int recover_callback(void *pArg, int argc, char **argv, char **columnName
 				switch_xml_free(xml);
 				return 0;
 			}
+			
+			if (switch_rtp_ready(tech_pvt->rtp_session)) {
+				if ((tmp = switch_channel_get_variable(channel, "sip_audio_recv_pt"))) {
+					switch_rtp_set_recv_pt(tech_pvt->rtp_session, atoi(tmp));
+				}
+			}
+
+			if (switch_rtp_ready(tech_pvt->video_rtp_session)) {
+				if ((tmp = switch_channel_get_variable(channel, "sip_video_recv_pt"))) {
+					switch_rtp_set_recv_pt(tech_pvt->rtp_session, atoi(tmp));
+				}
+			}
+
 		}

 		if (switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) {
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@ -189,16 +189,8 @@ switch_status_t sofia_presence_chat_send(const char *proto, const char *from, co

 		dup_dest = strdup(dst->contact);

-		if (switch_stristr("fs_path", dst->contact)) {
-			const char *s;
-
-			if ((s = switch_stristr("fs_path=", dst->contact))) {
-				s += 8;
-			}
-			if (s) {
-				remote_host = strdup(s);
-				switch_url_decode(remote_host);
-			}
+		if (dst->route_uri) {
+			remote_host = strdup(dst->route_uri);
 			if (!zstr(remote_host)) {
 				switch_split_user_domain(remote_host, NULL, &remote_ip);
 			}
@ -239,8 +231,14 @@ switch_status_t sofia_presence_chat_send(const char *proto, const char *from, co

 		status = SWITCH_STATUS_SUCCESS;

-		/* if this cries, add contact here too, change the 1 to 0 and omit the safe_free */
+		/*
+		if ((p = strstr(contact, ";fs_"))) {
+			*p = '\0';
+		}
+		*/

+		/* if this cries, add contact here too, change the 1 to 0 and omit the safe_free */
+		
 		msg_nh = nua_handle(profile->nua, NULL,
 							TAG_IF(dst->route_uri, NUTAG_PROXY(dst->route_uri)),
 							TAG_IF(dst->route, SIPTAG_ROUTE_STR(dst->route)),
--- a/src/switch_core.c
+++ b/src/switch_core.c
@ -1549,6 +1549,8 @@ static void switch_load_core_config(const char *file)
 					if (tmp > -1 && tmp < 11) {
 						switch_core_session_ctl(SCSC_DEBUG_LEVEL, &tmp);
 					}
+				} else if (!strcasecmp(var, "multiple-registrations")) {
+					runtime.multiple_registrations = switch_true(val);
 				} else if (!strcasecmp(var, "sql-buffer-len")) {
 					int tmp = atoi(val);

--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@ -1653,7 +1653,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_add_registration(const char *user, c
 		return SWITCH_STATUS_FALSE;
 	}

-	sql = switch_mprintf("delete from registrations where hostname='%q' and (url='%q' or token='%q')", switch_core_get_hostname(), url, switch_str_nil(token));
+	if (runtime.multiple_registrations) {
+		sql = switch_mprintf("delete from registrations where hostname='%q' and (url='%q' or token='%q')", 
+							 switch_core_get_hostname(), url, switch_str_nil(token));
+	} else {
+		sql = switch_mprintf("delete from registrations where reg_user='%q' and realm='%q' and hostname='%q'", 
+							 user, realm, switch_core_get_hostname());
+	}
+
 	switch_cache_db_execute_sql(dbh, sql, NULL);
 	free(sql);

--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@ -1398,8 +1398,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uu
 				return SWITCH_STATUS_FALSE;
 			}

-			if (!switch_channel_test_flag(originator_channel, CF_ANSWERED)) {
-				if (switch_channel_test_flag(originatee_channel, CF_ANSWERED)) {
+			//if (!switch_channel_test_flag(originator_channel, CF_ANSWERED)) {
+			if (!switch_channel_media_ready(originator_channel)) {
+				if (switch_channel_media_ready(originatee_channel)) {
+				//if (switch_channel_test_flag(originatee_channel, CF_ANSWERED)) {
 					swap_session = originator_session;
 					originator_session = originatee_session;
 					originatee_session = swap_session;
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@ -126,6 +126,7 @@ struct switch_rtp_rfc2833_data {
 	unsigned int out_digit_dur;
 	uint16_t in_digit_seq;
 	uint32_t in_digit_ts;
+	uint32_t last_in_digit_ts;
 	uint32_t in_digit_sanity;
 	uint32_t in_interleaved;
 	uint32_t timestamp_dtmf;
@ -306,6 +307,7 @@ static handle_rfc2833_result_t handle_rfc2833(switch_rtp_t *rtp_session, switch_
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed DTMF payload check.\n");
 			rtp_session->dtmf_data.last_digit = 0;
 			rtp_session->dtmf_data.in_digit_ts = 0;
+			rtp_session->dtmf_data.in_digit_sanity = 0;
 		}

 		end = packet[1] & 0x80 ? 1 : 0;
@ -355,6 +357,15 @@ static handle_rfc2833_result_t handle_rfc2833(switch_rtp_t *rtp_session, switch_
 			}

 			if (end) {
+				if (!rtp_session->dtmf_data.in_digit_ts && rtp_session->dtmf_data.last_in_digit_ts != ts) {
+#ifdef DEBUG_2833
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "start with end packet %d\n", ts);
+#endif
+					rtp_session->dtmf_data.last_in_digit_ts = ts;
+					rtp_session->dtmf_data.in_digit_ts = ts;
+					rtp_session->dtmf_data.first_digit = key;
+					rtp_session->dtmf_data.in_digit_sanity = 2000;
+				}
 				if (rtp_session->dtmf_data.in_digit_ts) {
 					switch_dtmf_t dtmf = { key, duration };

@ -395,7 +406,11 @@ static handle_rfc2833_result_t handle_rfc2833(switch_rtp_t *rtp_session, switch_
 				}

 			} else if (!rtp_session->dtmf_data.in_digit_ts) {
+#ifdef DEBUG_2833
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "start %d\n", ts);
+#endif
 				rtp_session->dtmf_data.in_digit_ts = ts;
+				rtp_session->dtmf_data.last_in_digit_ts = ts;
 				rtp_session->dtmf_data.first_digit = key;
 				rtp_session->dtmf_data.in_digit_sanity = 2000;
 			}
@ -1578,7 +1593,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session
 	rtp_session->recv_msg.header.cc = 0;

 	rtp_session->payload = payload;
-
+	rtp_session->rpayload = payload;

 	rtp_session->rtcp_send_msg.header.version = 2;
 	rtp_session->rtcp_send_msg.header.p = 0;
@ -1773,6 +1788,12 @@ SWITCH_DECLARE(void) switch_rtp_set_telephony_recv_event(switch_rtp_t *rtp_sessi
 	}
 }

+SWITCH_DECLARE(void) switch_rtp_set_recv_pt(switch_rtp_t *rtp_session, switch_payload_t pt)
+{
+	rtp_session->rpayload = pt;
+}
+
+
 SWITCH_DECLARE(void) switch_rtp_set_cng_pt(switch_rtp_t *rtp_session, switch_payload_t pt)
 {
 	rtp_session->cng_pt = pt;
@ -2345,7 +2366,7 @@ static void do_flush(switch_rtp_t *rtp_session)
 					if (bytes > rtp_header_len && rtp_session->recv_te && rtp_session->recv_msg.header.pt == rtp_session->recv_te) {
 						handle_rfc2833(rtp_session, bytes, &do_cng);
 #ifdef DEBUG_2833
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "*** RTP packet handled in flush loop ***\n");
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "*** RTP packet handled in flush loop %d ***\n", do_cng);
 #endif
 					}

@ -2640,13 +2661,25 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 	
 	while (switch_rtp_ready(rtp_session)) {
 		int do_cng = 0;
+		int read_pretriggered = 0;
 		bytes = 0;

 		if (rtp_session->timer.interval) {
 			if ((switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH)) &&
 				rtp_session->read_pollfd) {
 				if (switch_poll(rtp_session->read_pollfd, 1, &fdr, 0) == SWITCH_STATUS_SUCCESS) {
-					rtp_session->hot_hits += rtp_session->samples_per_interval;
+					status = read_rtp_packet(rtp_session, &bytes, flags);
+					/* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Initial %d\n", bytes); */
+					read_pretriggered = 1;
+
+					if (switch_poll(rtp_session->read_pollfd, 1, &fdr, 0) == SWITCH_STATUS_SUCCESS) {
+						/* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Trigger %d\n", rtp_session->hot_hits); */
+						rtp_session->hot_hits += rtp_session->samples_per_interval;
+					} else {
+						rtp_session->hot_hits = 0;
+						switch_core_timer_sync(&rtp_session->timer);
+						goto recvfrom;
+					}
 					
 					if (rtp_session->hot_hits >= rtp_session->samples_per_second * 5) {
 						switch_set_flag(rtp_session, SWITCH_RTP_FLAG_FLUSH);
@ -2674,7 +2707,9 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 		}

 	recvfrom:
-		bytes = 0;
+		if (!read_pretriggered) {
+			bytes = 0;
+		}
 		read_loops++;
 		poll_loop = 0;

@ -2685,7 +2720,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 		if (!rtp_session->timer.interval && rtp_session->read_pollfd) {
 			int pt = poll_sec * 1000000;

-			if (rtp_session->dtmf_data.out_digit_dur > 0) {
+			if (rtp_session->dtmf_data.out_digit_dur > 0 || rtp_session->dtmf_data.in_digit_sanity) {
 				pt = 20000;
 			}
 			
@ -2694,13 +2729,18 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 			}

 			poll_status = switch_poll(rtp_session->read_pollfd, 1, &fdr, pt);
+			do_2833(rtp_session, session);
+
 			if (rtp_session->dtmf_data.out_digit_dur > 0) {
-				do_2833(rtp_session, session);
+				return_cng_frame();
 			}
 		}

 		if (poll_status == SWITCH_STATUS_SUCCESS) {
-			status = read_rtp_packet(rtp_session, &bytes, flags);
+			if (!read_pretriggered) {
+				status = read_rtp_packet(rtp_session, &bytes, flags);
+				/* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Read bytes %d\n", bytes); */
+			}
 		} else {
 			if (!SWITCH_STATUS_IS_BREAK(poll_status) && poll_status != SWITCH_STATUS_TIMEOUT) {
 				char tmp[128] = "";
@ -2813,7 +2853,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 			rtp_session->recv_msg.header.pt != 13 && 
 			rtp_session->recv_msg.header.pt != rtp_session->recv_te && 
 			(!rtp_session->cng_pt || rtp_session->recv_msg.header.pt != rtp_session->cng_pt) && 
-			rtp_session->recv_msg.header.pt != rtp_session->payload) {
+			rtp_session->recv_msg.header.pt != rtp_session->rpayload) {
 			/* drop frames of incorrect payload number and return CNG frame instead */
 			return_cng_frame();
 		}
@ -3131,8 +3171,6 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 			rtp_session->recv_msg.header.pt = 97;
 		}

-		rtp_session->rpayload = (switch_payload_t) rtp_session->recv_msg.header.pt;
-
 		break;

 	do_continue:
--- a/src/switch_time.c
+++ b/src/switch_time.c
@ -58,12 +58,7 @@ static int MONO = 1;
 static int MONO = 0;
 #endif

-#if defined(HAVE_CLOCK_NANOSLEEP)
-static int NANO = 1;
-#else
 static int NANO = 0;
-#endif
-

 static int OFFSET = 0;