Merge branch 'master' into v1.4.beta

2026-07-23 20:51:58 +00:00 · 2013-08-04 17:59:32 -05:00
parent 8ca6fe728d 80f9168226
commit 10d52ed863
124 changed files with 6061 additions and 6582 deletions
@@ -38,6 +38,7 @@
 *.tbz2
 *.deb
 *.swp
+*.serial
 aclocal.m4
 autom4te.cache
 config.cache
@@ -153,7 +154,8 @@ Release/
 /src/mod/applications/mod_osp/Makefile.in
 /src/mod/applications/mod_rss/Makefile
 /src/mod/applications/mod_snipe_hunt/Makefile
-/src/mod/codecs/mod_com_g729/
+/src/mod/codecs/mod_com_g729/Makefile
+/src/mod/codecs/mod_com_g729/Makefile.in
 /src/mod/codecs/mod_dahdi_codec/Makefile
 /src/mod/dialplans/mod_dialplan_directory/Makefile
 /src/mod/formats/mod_shell_stream/Makefile
@@ -170,8 +172,6 @@ Release/

 BuildLog.htm

-Win32/
-win32/
 !/libs/win32/
 !/libs/speex/win32/
 !/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/
@@ -570,6 +570,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_math_fixed_tables", "l
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcbt", "libs\win32\libcbt\libcbt.2010.vcxproj", "{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\spandsp\src\msvc\make_cielab_luts.2010.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Win32 = All|Win32
@@ -3791,6 +3793,21 @@ Global
 		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x64.Build.0 = Release|x64
 		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x64 Setup.ActiveCfg = Release|Win32
 		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x86 Setup.ActiveCfg = Release|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.All|Win32.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.All|Win32.Build.0 = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.All|x64.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.All|x64 Setup.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.All|x86 Setup.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.Build.0 = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64 Setup.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x86 Setup.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.Build.0 = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64 Setup.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x86 Setup.ActiveCfg = All|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3907,6 +3924,7 @@ Global
 		{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{9D04A840-CE18-4FF5-A6D3-0A2BB92FF2E6} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
@@ -575,6 +575,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_math_fixed_tables", "l
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcbt", "libs\win32\libcbt\libcbt.2012.vcxproj", "{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\spandsp\src\msvc\make_cielab_luts.2012.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Win32 = All|Win32
@@ -3801,6 +3803,21 @@ Global
 		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x64.Build.0 = Release|x64
 		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x64 Setup.ActiveCfg = Release|Win32
 		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x86 Setup.ActiveCfg = Release|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.All|Win32.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.All|Win32.Build.0 = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.All|x64.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.All|x64 Setup.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.All|x86 Setup.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.Build.0 = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64 Setup.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x86 Setup.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.Build.0 = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64 Setup.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x86 Setup.ActiveCfg = All|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3915,8 +3932,9 @@ Global
 		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{C13CC324-0032-4492-9A30-310A6BD64FF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{2386B892-35F5-46CF-A0F0-10394D2FBF9B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
@@ -48,7 +48,7 @@
    <!-- Applications -->
    <load module="mod_commands"/>
    <load module="mod_conference"/>
-    <!-- load module="mod_curl" -->
+    <!-- <load module="mod_curl"/> -->
    <load module="mod_db"/>
    <load module="mod_dptools"/>
    <load module="mod_expr"/>
@@ -0,0 +1 @@
+/usr/lib/freeswitch/mod/FreeSWITCH.Managed.dll
@@ -0,0 +1,5 @@
+/usr/lib/freeswitch/mod/mod_spidermonkey_core_db.so
+/usr/lib/freeswitch/mod/mod_spidermonkey_curl.so
+/usr/lib/freeswitch/mod/mod_spidermonkey_odbc.so
+/usr/lib/freeswitch/mod/mod_spidermonkey_socket.so
+/usr/lib/freeswitch/mod/mod_spidermonkey_teletone.so
@@ -0,0 +1,117 @@
+How to Contribute Patches to FreeSWITCH
+=======================================
+
+Download the Source Code
+------------------------
+
+    git clone git://git.freeswitch.org/freeswitch.git
+    cd freeswitch
+
+Create Your Patch
+-----------------
+
+    # create a topic/feature branch in your local repository
+    git checkout -b myfeature
+
+    # make your change
+    emacs .
+
+    # commit the results locally; see below for how to write a good
+    # commit message
+    git commit -va
+
+    # create more commits as needed such that each commit represents a
+    # logically separate change
+    #while true; do emacs .; git commit -va; done
+
+    # create patch files
+    git format-patch origin/master..HEAD
+
+    # you'll now have a number of *.patch files in your current
+    # directory
+
+    # navigate to the FreeSWITCH JIRA
+    chromium http://jira.freeswitch.org/
+
+    # create an account in JIRA and create a new issue;
+    # attach the patch file(s) you created to the issue
+
+Writing a Good Commit Message
+-----------------------------
+
+Your commit message consists of two parts: the subject and the body.
+
+The subject is like the subject in an email message.  It should be
+short -- typically less than 50 characters -- and it should concisely
+describe the purpose or effect of your change.
+
+If you're having a difficult time writing a short subject for your
+commit, perhaps your commit should be broken into smaller separate
+commits.
+
+The commit body can be longer and can consist of multiple paragraphs.
+The text of the body should be hard wrapped to 68-72 characters.
+
+When writing the commit body, describe in detail the problem that your
+commit aims to solve, how your commit solves the problem, and any
+changes in behavior that result from your change, such as new
+variables, command flags, or breaks in backward compatibility.
+
+Your commit message should be written in the present tense in
+imperative style.  Your message should talk about what the patch
+*does*, not what you *did* to write it.
+
+The commit subject is the first line of your commit message, then
+there is an empty line, then your commit body starts.  A good commit
+message might look like this:
+
+> Add frobinator support to mod_sofia
+> 
+> Without proper frobinator support users had to make multiple calls
+> to shell scripts to do the sort of frobbing needed in high call
+> volume environments.
+> 
+> With this change, we now link to libfrob and support the IETF
+> draft-cross-voip-frobbing API.
+> 
+> After appropriate amounts of frobbing have been done, a new variable
+> `frobbing_done` is set in the caller's channel.
+> 
+> FS-XXXX --resolve
+
+Patches Related to JIRA Issues
+------------------------------
+
+When your patch is related to an issue logged in JIRA, add the
+identifier for the issue (e.g. FS-XXXX) to the body of your commit
+message at the beginning of a line, typically the last line or just
+before "Signed-off-by:" and "Thanks-to:" lines.  This helps our JIRA
+bot do useful things by relating the commit to the issue.
+
+If you believe your patch resolves the issue in question, follow the
+issue number with a space and the "--resolve" directive as in the
+example above.
+
+Where to Go for Help
+--------------------
+
+If you have any questions or run into any roadblocks please reach out
+to us.  You can send an email to our development mailing list:
+
+> http://lists.freeswitch.org/mailman/listinfo/freeswitch-dev
+
+Note that while you're free to send a patch to that list for questions
+or for review, patches sent to the mailing list will not be considered
+for inclusion.  Patches that you want included in FreeSWITCH must be
+submitted to JIRA.
+
+You can also reach us on freenode.net at:
+
+> #freeswitch-dev
+  
+Finally, feel free to join us in our weekly conference call.  Many of
+the core developers are often on the call and you'll have an
+opportunity at the beginning or end of the call to ask your questions:
+
+> http://wiki.freeswitch.org/wiki/Weekly_Conference_Call
+
@@ -116,14 +116,14 @@ Source2:	http://files.freeswitch.org/downloads/libs/flite-1.5.1-current.tar.bz2
 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
 Source5:	http://files.freeswitch.org/downloads/libs/mpg123-1.13.2.tar.gz
-Source6:	http://files.freeswitch.org/downloads/libs/openldap-2.4.11.tar.gz
-Source7:	http://files.freeswitch.org/downloads/libs/pocketsphinx-0.7.tar.gz
-Source8:	http://files.freeswitch.org/downloads/libs/soundtouch-1.6.0.tar.gz
-Source9:	http://files.freeswitch.org/downloads/libs/sphinxbase-0.7.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
+#Source6:	http://files.freeswitch.org/downloads/libs/openldap-2.4.11.tar.gz
+Source6:	http://files.freeswitch.org/downloads/libs/pocketsphinx-0.7.tar.gz
+Source7:	http://files.freeswitch.org/downloads/libs/soundtouch-1.6.0.tar.gz
+Source8:	http://files.freeswitch.org/downloads/libs/sphinxbase-0.7.tar.gz
+Source9:	http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
+Source10:	http://files.freeswitch.org/downloads/libs/libmemcached-0.32.tar.gz
+Source11:       http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz
+Source12:       http://files.freeswitch.org/downloads/libs/opus-0.9.0.tar.gz
 Prefix:        	%{prefix}


@@ -137,7 +137,7 @@ Prefix:        	%{prefix}
 #BuildRequires: openldap2-devel
 BuildRequires: lzo-devel
 %else
-BuildRequires: openldap-devel
+#BuildRequires: openldap-devel
 %endif
 BuildRequires: autoconf
 BuildRequires: automake
@@ -182,7 +182,7 @@ Requires: ncurses
 Requires: openssl
 Requires: unixODBC
 Requires: libjpeg
-Requires: openldap
+#Requires: openldap
 Requires: db4
 Requires: gdbm
 Requires: zlib
@@ -778,13 +778,13 @@ Theora Video Codec support for FreeSWITCH open source telephony platform.
 #				FreeSWITCH Directory Modules
 ######################################################################################################################

-%package directory-ldap
-Summary:        LDAP Directory support for FreeSWITCH open source telephony platform
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
+#%package directory-ldap
+#Summary:        LDAP Directory support for FreeSWITCH open source telephony platform
+#Group:          System/Libraries
+#Requires:       %{name} = %{version}-%{release}

-%description directory-ldap
-LDAP Directory support for FreeSWITCH open source telephony platform.
+#%description directory-ldap
+#LDAP Directory support for FreeSWITCH open source telephony platform.

 ######################################################################################################################
 #				FreeSWITCH Endpoint Modules
@@ -1274,7 +1274,6 @@ cp %{SOURCE9} libs/
 cp %{SOURCE10} libs/
 cp %{SOURCE11} libs/
 cp %{SOURCE12} libs/
-cp %{SOURCE13} libs/

 ######################################################################################################################
 #
@@ -2084,9 +2083,9 @@ fi
 #
 ######################################################################################################################

-%files directory-ldap
-%defattr(-,freeswitch,daemon)
-%{MODINSTDIR}/mod_theora.so*
+#%files directory-ldap
+#%defattr(-,freeswitch,daemon)
+#%{MODINSTDIR}/mod_theora.so*

 ######################################################################################################################
 #
@@ -263,6 +263,10 @@ App.callsController = Ember.ArrayController.create({

 		});
 	},
+	delete: function(uuid) {
+		var obj = this.content.findProperty("uuid", uuid);
+		if (obj) this.content.removeObject(obj);// else alert(uuid);
+	},
 	dump: function(uuid) {
 		var obj = this.content.findProperty("uuid", uuid);
 		console.log(obj.getProperties(["uuid", "cid_num"]));
@@ -711,10 +715,15 @@ App.usersController = Ember.ArrayController.create({
 });

 App.initialize();
-
+var global_debug_event = false;

 function eventCallback(data) {
 	console.log(data["Event-Name"]);
+
+	if (global_debug_event) {
+		console.log(data);
+	}
+
 	if (data["Event-Name"] == "CHANNEL_CREATE") {
 		var channel = {
 			uuid: data["Unique-ID"],
@@ -724,8 +733,47 @@ function eventCallback(data) {
 			direction: data["Call-Direction"]
 		}
 		App.channelsController.pushObject(App.Channel.create(channel));
+
+		var x = $('#auto_update_calls')[0];
+		if (typeof x != "undefined" && x.checked) {
+			return;
+		}
+
+		App.callsController.pushObject(App.Call.create(channel));
 	} else if (data["Event-Name"] == "CHANNEL_HANGUP_COMPLETE") {
 		App.channelsController.delete(data["Unique-ID"]);
+
+		var x = $('#auto_update_calls')[0];
+		if (typeof x != "undefined" && x.checked) {
+			return;
+		}
+
+		App.callsController.delete(data["Unique-ID"]);
+	} else if (data["Event-Name"] == "CHANNEL_BRIDGE") {
+		var x = $('#auto_update_calls')[0];
+		if (typeof x != "undefined" && x.checked) {
+			return;
+		}
+
+		App.callsController.delete(data["Unique-ID"]);
+		App.callsController.delete(data["Other-Leg-Unique-ID"]);
+
+		var call = {
+			uuid: data["Unique-ID"],
+			b_uuid: data["Other-Leg-Unique-ID"],
+			cid_num: data["Caller-Caller-ID-Number"],
+			b_cid_num: data["Other-Leg-Caller-ID-Number"],
+			dest: data["Caller-Destination-Number"],
+			b_dest: data["Other-Leg-Destination-Number"],
+			callstate: data["Channel-Call-State"],
+			b_callstate: data["Channel-Call-State"],
+			direction: data["Call-Direction"],
+			b_direction: data["Other-Leg-Direction"],
+			created: data["Caller-Channel-Created-Time"]
+		};
+
+		App.callsController.pushObject(App.Call.create(call));
+
 	} else if (data["Event-Name"] == "CHANNEL_CALLSTATE") {
 		var obj = App.channelsController.content.findProperty("uuid", data["Unique-ID"]);
 		if (obj) {
@@ -0,0 +1,19 @@
+// var ie_console_alertFallback = true;
+// var ie_console_divFallback = true;
+
+if (typeof console === "undefined" || typeof console.log === "undefined") {
+ console = {};
+
+ if (typeof ie_console_divFallback != "undefined") {
+    console.log = function(msg) {
+      $('#ie_console_debug_div').append(msg);
+      $('#ie_console_debug_div').append("<br>");
+    }
+ } else if (typeof ie_console_alertFallback != "undefined" ) {
+     console.log = function(msg) {
+          alert(msg);
+     };
+ } else {
+     console.log = function() {};
+ }
+}
@@ -529,6 +529,66 @@
 			The FreeSWITCH Portal Project is Created by <a href="http://www.dujinfang.com">Seven Du</a>.
 			Available with MPL1.1 licence - Same as FreeSWITCH.
 		</p>
+
+
+		<p>The FreeSWITCH Portal Project is designed to show an intuitive view of the FreeSWITCH internals. It can be used by FreeSWITCH funs, administrators, developers etc. It does not aims to replace GUIs such as FusionPBX or blue.box. It would be very easy to use and super helpful for new FreeSWITCH users.
+
+		<hr>
+		<h2>Philosophy</h2>
+
+		<p>To provide a GUI out of the box without depends on external resources like PHP or a webserver such as Apache or Nginx.
+
+		<p>Mainly developed with static html and Javascripts, and perhaps some lua scripts can help do some more magic things later.
+
+		<h2>Install</h2>
+
+		<p>If you see this page it means you already installed. Remember it works Out of the Box!
+
+		<h2>Todo</h2>
+
+
+		<li>Modify users: A raw idea to add a new user would be something like below and reloadxml.
+
+		<pre>sed -e 's/1000/new-user/g' 1000.xml > new-user.xml</pre>
+
+		<li>Modify dialplan and/or other XMLs: possible to use some online XML editor and
+			can save the XML with some lua or C code at the backend,
+			although there are security concerns.
+
+		<li>Store information in DB: I guess the Dbh handle in lua should can do something like this.
+
+		<li>Web terminal: With terminal.js like things and websocket we can really build a web version of fs_cli
+
+		<li>rtmp web client support to make and receive calls
+
+		<li>WebRTC?
+
+		<li>Logging, Event Debugging or SIP tracing: Yeah, more magic
+
+		<li>i18n
+
+		<h2>Security</h2>
+
+		<p>The primary goal is to help new users learn and use FreeSWITCH.
+			Please <strong>DON'T</strong> put this on your production server as
+			I haven't think anything about security.
+
+		<p>You can disable this by delete or move the portal directory out of /usr/local/freeswitch/htdocs . e.g.
+
+		<pre>mv /usr/local/freeswitch/htdocs/portal /usr/local/freeswitch/</pre>
+
+		And move back any time you want.
+
+		<h2>Development</h2>
+
+		<li>I started this project to learn how to use bootstrap and ember.js,
+			the latter said it is a framework for <strong>creating ambitious web applications</strong>.
+
+		<li>Contributions and patches are welcome.
+		<br>
+		<br>
+		<br>
+		<br>
 	</script>

 	<script type="text/x-handlebars" data-template-name="users">
@@ -627,6 +687,7 @@
 <!-- Le javascript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
+<script src="assets/js/ie-console.js"></script>
 <script src="assets/js/jquery-1.9.1.min.js"></script>
 <script src="assets/js/handlebars.js"></script>
 <script src="assets/js/ember-1.0.0-rc.1.js"></script>
@@ -709,6 +770,7 @@
 			$('#ws-status').html('Socket Connected').css("color", "green");
 			// socket.send("event json all");
 			socket.send("event json CHANNEL_CREATE");
+			socket.send("event json CHANNEL_BRIDGE");
 			socket.send("event json CHANNEL_HANGUP_COMPLETE");
 			socket.send("event json CHANNEL_CALLSTATE");
 		}
@@ -716,7 +778,6 @@
 		socket.onmessage =function(msg) {
 			// console.log(msg.data);
 			var data = JSON.parse(msg.data);
-			console.log(data["Event-Name"]);

 			eventCallback(data);
 		}
@@ -238,16 +238,48 @@ opal
 /ldns/Makefile
 /ldns/packaging/ldns-config
 /libcodec2/src/c2dec
+/libcodec2/src/c2demo
 /libcodec2/src/c2enc
 /libcodec2/src/c2sim
+/libcodec2/src/codebook.c
+/libcodec2/src/codebookd.c
+/libcodec2/src/codebookdt.c
+/libcodec2/src/codebookge.c
+/libcodec2/src/codebookjnd.c
+/libcodec2/src/codebookjvm.c
+/libcodec2/src/codebookvqanssi.c
+/libcodec2/src/fdmdv_demod
+/libcodec2/src/fdmdv_get_test_bits
+/libcodec2/src/fdmdv_interleave
+/libcodec2/src/fdmdv_mod
+/libcodec2/src/fdmdv_put_test_bits
+/libcodec2/src/generate_codebook
+/libcodec2/src/genlspdtcb
+/libcodec2/unittest/create_interleaver
+/libcodec2/unittest/de
 /libcodec2/unittest/extract
+/libcodec2/unittest/genampdata
 /libcodec2/unittest/genlsp
+/libcodec2/unittest/genphdata
 /libcodec2/unittest/genres
+/libcodec2/unittest/lspsync
+/libcodec2/unittest/polar2rect
+/libcodec2/unittest/pre
+/libcodec2/unittest/scalarlsptest
+/libcodec2/unittest/t48_8
 /libcodec2/unittest/tcodec2
+/libcodec2/unittest/tfdmdv
+/libcodec2/unittest/tfifo
 /libcodec2/unittest/tinterp
+/libcodec2/unittest/tlspsens
 /libcodec2/unittest/tnlp
+/libcodec2/unittest/tprede
 /libcodec2/unittest/tquant
+/libcodec2/unittest/vq_train_jvm
 /libcodec2/unittest/vqtrain
+/libcodec2/unittest/vqtrainjnd
+/libcodec2/unittest/vqtrainph
+/libcodec2/unittest/vqtrainsp
 /libdingaling/build/compile
 /libdingaling/Makefile
 /libdingaling/Makefile.in
@@ -355,6 +387,11 @@ opal
 /libwebsockets/compile
 /libwebsockets/test-server/Makefile
 /libwebsockets/test-server/Makefile.in
+/libwebsockets/test-server/libwebsockets-test-client
+/libwebsockets/test-server/libwebsockets-test-fraggle
+/libwebsockets/test-server/libwebsockets-test-ping
+/libwebsockets/test-server/libwebsockets-test-server
+/libwebsockets/test-server/libwebsockets-test-server-extpoll
 /mongo-cxx-driver-v*/
 /mpg123/
 /libmpg123/
@@ -925,9 +962,12 @@ opal
 /sipcc/Makefile
 /sipcc/Makefile.in

-/yaml/
+/yaml/Makefile
 /yaml/config.h
+/yaml/include/Makefile
+/yaml/src/Makefile
 /yaml/stamp-h1
+/yaml/tests/Makefile
 /yaml/tests/example-deconstructor
 /yaml/tests/example-deconstructor-alt
 /yaml/tests/example-reformatter
@@ -937,6 +977,7 @@ opal
 /yaml/tests/run-loader
 /yaml/tests/run-parser
 /yaml/tests/run-scanner
+
 /zeromq-*/
 /jpeg-8d/

@@ -26,6 +26,9 @@ testr2
 testsangomaboost
 testtones

+!/msvc/testanalog/
+!/msvc/testboost/
+
 !/sample/boost/Makefile
 !/sample/dso/Makefile

@@ -22,3 +22,6 @@ testisdn
 testpri
 testr2
 testtones
+
+!/msvc/testanalog/
+!/msvc/testisdn/
@@ -1 +1 @@
-Thu Jul 11 17:38:06 CDT 2013
+Mon Jul 29 16:07:25 CDT 2013
@@ -1062,11 +1062,15 @@ int nua_client_response(nua_client_request_t *cr,
    sip_method_t method = cr->cr_method;
    int terminated, graceful = 1;

-    if (status < 700)
-      terminated = sip_response_terminates_dialog(status, method, &graceful);
-    else
-      /* XXX - terminate usage by all internal error responses */
-      terminated = 0, graceful = 1;
+    if (status < 700) {
+		terminated = sip_response_terminates_dialog(status, method, &graceful);
+		if (terminated && !cr->cr_initial) {
+			terminated = 0, graceful = 1;
+		}
+	} else {
+		/* XXX - terminate usage by all internal error responses */
+		terminated = 0, graceful = 1;
+	}

    if (terminated < 0)
      cr->cr_terminated = terminated;
@@ -885,12 +885,16 @@ tport_t *tport_alloc_secondary(tport_primary_t *pri,
    self->tp_stime = self->tp_ktime = self->tp_rtime = su_now();

    if (pri->pri_vtable->vtp_init_secondary &&
-	pri->pri_vtable->vtp_init_secondary(self, socket, accepted,
-					    return_reason) < 0) {
-      if (pri->pri_vtable->vtp_deinit_secondary)
-	pri->pri_vtable->vtp_deinit_secondary(self);
-      su_home_zap(self->tp_home);
-      return NULL;
+
+		pri->pri_vtable->vtp_init_secondary(self, socket, accepted, return_reason) < 0) {
+
+		if (pri->pri_vtable->vtp_deinit_secondary) {
+			pri->pri_vtable->vtp_deinit_secondary(self);
+		}
+		su_timer_destroy(self->tp_timer);
+		su_home_zap(self->tp_home);
+
+		return NULL;
    }

    /* Set IP TOS if it is set in primary */
@@ -456,13 +456,17 @@ int tport_ws_init_secondary(tport_t *self, int socket, int accepted,
  if ( wspri->ws_secure ) wstp->ws_secure = 1;

  memset(&wstp->ws, 0, sizeof(wstp->ws));
-  
+
  if (ws_init(&wstp->ws, socket, wstp->ws_secure ? wspri->ssl_ctx : NULL, 0) < 0) {
+	  ws_destroy(&wstp->ws);
+	  su_close(socket);
+	  wstp->ws_initialized = -1;
 	  return *return_reason = "WS_INIT", -1;
  }

  wstp->ws_initialized = 1;
  self->tp_pre_framed = 1;
+  


  return 0;
@@ -242,6 +242,10 @@ int ws_handshake(wsh_t *wsh)
 		}
 	}

+	if (bytes > sizeof(wsh->buffer)) {
+		goto err;
+	}
+
 	*(wsh->buffer+bytes) = '\0';
 	
 	if (strncasecmp(wsh->buffer, "GET ", 4)) {
@@ -325,7 +329,8 @@ issize_t ws_raw_read(wsh_t *wsh, void *data, size_t bytes)
 #else
 		if (x++) Sleep(10);
 #endif
-		} while (r == -1 && (errno == EAGAIN || errno == EINTR) && x < 100);
+		} while (r == -1 && (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK || 
+							 errno == 35 || errno == 730035 || errno == 2 || errno == 60) && x < 100);
 	
 	if (x >= 100) {
 		r = -1;
@@ -462,7 +467,12 @@ int ws_init(wsh_t *wsh, ws_socket_t sock, SSL_CTX *ssl_ctx, int close_sock)
 	}

 	while (!wsh->down && !wsh->handshake) {
-		ws_handshake(wsh);
+		int r = ws_handshake(wsh);
+
+		if (r < 0) {
+			wsh->down = 1;
+			return -1;
+		}
 	}

 	if (wsh->down) {
@@ -384,7 +384,7 @@ static void start_tx(adsi_tx_state_t *s)
        dtmf_tx_init(&s->dtmftx, NULL, NULL);
        break;
    case ADSI_STANDARD_TDD:
-        fsk_tx_init(&s->fsktx, &preset_fsk_specs[FSK_WEITBRECHT], async_tx_get_bit, &s->asynctx);
+        fsk_tx_init(&s->fsktx, &preset_fsk_specs[FSK_WEITBRECHT_4545], async_tx_get_bit, &s->asynctx);
        async_tx_init(&s->asynctx, 5, ASYNC_PARITY_NONE, 2, FALSE, adsi_tdd_get_async_byte, s);
        /* Schedule an explicit shift at the start of baudot transmission */
        s->baudot_shift = 2;
@@ -448,7 +448,7 @@ SPAN_DECLARE(adsi_rx_state_t *) adsi_rx_init(adsi_rx_state_t *s,
    case ADSI_STANDARD_TDD:
        /* TDD uses 5 bit data, no parity and 1.5 stop bits. We scan for the first stop bit, and
           ride over the fraction. */
-        fsk_rx_init(&s->fskrx, &preset_fsk_specs[FSK_WEITBRECHT], FSK_FRAME_MODE_5N1_FRAMES, adsi_tdd_put_async_byte, s);
+        fsk_rx_init(&s->fskrx, &preset_fsk_specs[FSK_WEITBRECHT_4545], FSK_FRAME_MODE_5N1_FRAMES, adsi_tdd_put_async_byte, s);
        break;
    }
    s->standard = standard;
@@ -69,6 +69,7 @@ const fsk_spec_t preset_fsk_specs[] =
        300*100
    },
    {
+        /* This is mode 2 of the V.23 spec. Mode 1 (the 600baud mode) is not defined here */
        "V23 ch 1",
        1700 + 400,
        1700 - 400,
@@ -124,6 +125,14 @@ const fsk_spec_t preset_fsk_specs[] =
        -30,
         50*100
    },
+    {
+        "Weitbrecht 47.6",  /* Used for V.18 probing */
+        1600 + 200,
+        1600 - 200,
+        -14,
+        -30,
+         4760
+    },
    {
        "V21 (110bps) ch 1",
        1080 + 100,
@@ -427,6 +427,9 @@
      <Project>{dee932ab-5911-4700-9eeb-8c7090a0a330}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
+    <ProjectReference Include="msvc\make_cielab_luts.2010.vcxproj">
+      <Project>{85f0cf8c-c7ab-48f6-ba19-cc94cf87f981}</Project>
+    </ProjectReference>
    <ProjectReference Include="msvc\make_math_fixed_tables.2010.vcxproj">
      <Project>{9d04a840-ce18-4ff5-a6d3-0a2bb92ff2e6}</Project>
    </ProjectReference>
@@ -431,6 +431,9 @@
      <Project>{dee932ab-5911-4700-9eeb-8c7090a0a330}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
+    <ProjectReference Include="msvc\make_cielab_luts.2012.vcxproj">
+      <Project>{85f0cf8c-c7ab-48f6-ba19-cc94cf87f981}</Project>
+    </ProjectReference>
    <ProjectReference Include="msvc\make_math_fixed_tables.2012.vcxproj">
      <Project>{2386b892-35f5-46cf-a0f0-10394d2fbf9b}</Project>
    </ProjectReference>
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="All|Win32">
+      <Configuration>All</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>make_cielab_luts</ProjectName>
+    <ProjectGuid>{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}</ProjectGuid>
+    <RootNamespace>make_cielab_luts</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\make_cielab_luts\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='All|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;.\spandsp;.\msvc;..\..\tiff-4.0.2\libtiff;.\generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>"$(TargetPath)" &gt;"$(ProjectDir)..\cielab_luts.h"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\make_cielab_luts.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="All|Win32">
+      <Configuration>All</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>make_cielab_luts</ProjectName>
+    <ProjectGuid>{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}</ProjectGuid>
+    <RootNamespace>make_cielab_luts</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\make_cielab_luts\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='All|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;.\spandsp;.\msvc;..\..\tiff-4.0.2\libtiff;.\generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>"$(TargetPath)" &gt;"$(ProjectDir)..\cielab_luts.h"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\make_cielab_luts.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -27,7 +27,7 @@
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\make_at_dictionary\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\make_math_fixed_tables\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='All|Win32'">false</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'">
@@ -28,7 +28,7 @@
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\make_at_dictionary\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\make_math_fixed_tables\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='All|Win32'">false</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'">
@@ -109,9 +109,10 @@ enum
    FSK_BELL103CH1,
    FSK_BELL103CH2,
    FSK_BELL202,
-    FSK_WEITBRECHT,     /* 45.45 baud version, used for TDD (Telecom Device for the Deaf) */
-    FSK_WEITBRECHT50,   /* 50 baud version, used for TDD (Telecom Device for the Deaf) */
-    FSK_V21CH1_110      /* 110 bps version of V.21 channel 1, as used by V.18 */
+    FSK_WEITBRECHT_4545,    /* 45.45 baud version, used for TDD (Telecom Device for the Deaf) */
+    FSK_WEITBRECHT_50,      /* 50 baud version, used for TDD (Telecom Device for the Deaf) */
+    FSK_WEITBRECHT_476,     /* 47.6 baud version, used for V.18 probing */
+    FSK_V21CH1_110          /* 110 bps version of V.21 channel 1, as used by V.18 */
 };

 enum
@@ -76,16 +76,6 @@ SPAN_DECLARE(void) set_lab_gamut2(lab_params_t *s, int L_P, int L_Q, int a_P, in

 SPAN_DECLARE(void) get_lab_gamut2(lab_params_t *s, int *L_P, int *L_Q, int *a_P, int *a_Q, int *b_P, int *b_Q);

-SPAN_DECLARE(int) t42_itulab_to_itulab(logging_state_t *logging, tdata_t *dst, tsize_t *dstlen, tdata_t src, tsize_t srclen, uint32_t width, uint32_t height);
-
-SPAN_DECLARE(int) t42_itulab_to_jpeg(logging_state_t *logging, lab_params_t *s, tdata_t *dst, tsize_t *dstlen, tdata_t src, tsize_t srclen);
-
-SPAN_DECLARE(int) t42_jpeg_to_itulab(logging_state_t *logging, lab_params_t *s, tdata_t *dst, tsize_t *dstlen, tdata_t src, tsize_t srclen);
-
-SPAN_DECLARE(int) t42_srgb_to_itulab(logging_state_t *logging, lab_params_t *s, tdata_t *dst, tsize_t *dstlen, tdata_t src, tsize_t srclen, uint32_t width, uint32_t height);
-
-SPAN_DECLARE(int) t42_itulab_to_srgb(logging_state_t *logging, lab_params_t *s, tdata_t dst, tsize_t *dstlen, tdata_t src, tsize_t srclen, uint32_t *width, uint32_t *height);
-
 SPAN_DECLARE(void) t42_encode_set_options(t42_encode_state_t *s, uint32_t l0, int quality, int options);

 SPAN_DECLARE(int) t42_encode_set_image_width(t42_encode_state_t *s, uint32_t image_width);
@@ -49,68 +49,44 @@ typedef int (*t4_row_write_handler_t)(void *user_data, const uint8_t buf[], size
 typedef enum
 {
    /*! No compression */
-    T4_COMPRESSION_NONE = 0,
-    /*! T.1 1D compression */
-    T4_COMPRESSION_T4_1D = 1,
+    T4_COMPRESSION_NONE = 0x01,
+    /*! T.4 1D compression */
+    T4_COMPRESSION_T4_1D = 0x02,
    /*! T.4 2D compression */
-    T4_COMPRESSION_T4_2D = 2,
+    T4_COMPRESSION_T4_2D = 0x04,
    /*! T.6 2D compression */
-    T4_COMPRESSION_T6 = 3,
+    T4_COMPRESSION_T6 = 0x08,
    /*! T.85 monochrome JBIG coding with L0 fixed. */
-    T4_COMPRESSION_T85 = 4,
+    T4_COMPRESSION_T85 = 0x10,
    /*! T.85 monochrome JBIG coding with L0 variable. */
-    T4_COMPRESSION_T85_L0 = 5,
+    T4_COMPRESSION_T85_L0 = 0x20,
    /*! T.43 gray-scale/colour JBIG coding */
-    T4_COMPRESSION_T43 = 6,
+    T4_COMPRESSION_T43 = 0x40,
    /*! T.45 run length colour compression */
-    T4_COMPRESSION_T45 = 7,
+    T4_COMPRESSION_T45 = 0x80,
    /*! T.42 + T.81 + T.30 Annex E colour JPEG coding */
-    T4_COMPRESSION_T42_T81 = 8,
+    T4_COMPRESSION_T42_T81 = 0x100,
    /*! T.42 + T.81 + T.30 Annex K colour sYCC-JPEG coding */
-    T4_COMPRESSION_SYCC_T81 = 9,
+    T4_COMPRESSION_SYCC_T81 = 0x200,
    /*! T.88 monochrome JBIG2 compression */
-    T4_COMPRESSION_T88 = 10
-} t4_image_compression_t;
-
-enum
-{
-    /*! No compression */
-    T4_SUPPORT_COMPRESSION_NONE = 0x01,
-    /*! T.1 1D compression */
-    T4_SUPPORT_COMPRESSION_T4_1D = 0x02,
-    /*! T.4 2D compression */
-    T4_SUPPORT_COMPRESSION_T4_2D = 0x04,
-    /*! T.6 2D compression */
-    T4_SUPPORT_COMPRESSION_T6 = 0x08,
-    /*! T.85 monochrome JBIG compression, with fixed L0 */
-    T4_SUPPORT_COMPRESSION_T85 = 0x10,
-    /*! T.85 monochrome JBIG compression, with variable L0 */
-    T4_SUPPORT_COMPRESSION_T85_L0 = 0x20,
-    /*! T.43 colour JBIG compression */
-    T4_SUPPORT_COMPRESSION_T43 = 0x40,
-    /*! T.45 run length colour compression */
-    T4_SUPPORT_COMPRESSION_T45 = 0x80,
-    /*! T.81 + T.30 Annex E colour JPEG compression */
-    T4_SUPPORT_COMPRESSION_T42_T81 = 0x100,
-    /*! T.81 + T.30 Annex K colour sYCC-JPEG compression */
-    T4_SUPPORT_COMPRESSION_SYCC_T81 = 0x200,
-    /*! T.88 monochrome JBIG2 compression */
-    T4_SUPPORT_COMPRESSION_T88 = 0x400,
+    T4_COMPRESSION_T88 = 0x400,
+    /*! Support solour compression without sub-sampling */
+    T4_COMPRESSION_NO_SUBSAMPLING = 0x800000,
    /*! Gray-scale support by multi-level codecs */
-    T4_SUPPORT_COMPRESSION_GRAYSCALE = 0x1000000,
+    T4_COMPRESSION_GRAYSCALE = 0x1000000,
    /*! Colour support by multi-level codecs */
-    T4_SUPPORT_COMPRESSION_COLOUR = 0x2000000,
+    T4_COMPRESSION_COLOUR = 0x2000000,
    /*! 12 bit mode for gray-scale and colour */
-    T4_SUPPORT_COMPRESSION_12BIT = 0x4000000,
+    T4_COMPRESSION_12BIT = 0x4000000,
    /*! Convert a colour image to a gray-scale one */
-    T4_SUPPORT_COMPRESSION_COLOUR_TO_GRAY = 0x8000000,
+    T4_COMPRESSION_COLOUR_TO_GRAY = 0x8000000,
    /*! Dither a gray-scale image down a simple bilevel image, with rescaling to fit a FAX page */
-    T30_SUPPORT_GRAY_TO_BILEVEL = 0x10000000,
+    T4_COMPRESSION_GRAY_TO_BILEVEL = 0x10000000,
    /*! Dither a colour image down a simple bilevel image, with rescaling to fit a FAX page */
-    T30_SUPPORT_COLOUR_TO_BILEVEL = 0x20000000,
+    T4_COMPRESSION_COLOUR_TO_BILEVEL = 0x20000000,
    /*! Rescale an image (except a bi-level image) to fit a permitted FAX width when necessary */
-    T4_SUPPORT_COMPRESSION_RESCALING = 0x40000000
-};
+    T4_COMPRESSION_RESCALING = 0x40000000
+} t4_image_compression_t;

 /*! Image type */
 typedef enum
@@ -169,71 +145,36 @@ typedef enum
 enum
 {
    /*! Standard FAX resolution 204dpi x 98dpi - bi-level only */
-    T4_RESOLUTION_R8_STANDARD = 1,
+    T4_RESOLUTION_R8_STANDARD = 0x1,
    /*! Fine FAX resolution 204dpi x 196dpi - bi-level only */
-    T4_RESOLUTION_R8_FINE = 2,
+    T4_RESOLUTION_R8_FINE = 0x2,
    /*! Super-fine FAX resolution 204dpi x 391dpi - bi-level only */
-    T4_RESOLUTION_R8_SUPERFINE = 3,
+    T4_RESOLUTION_R8_SUPERFINE = 0x4,
    /*! Double FAX resolution 408dpi x 391dpi - bi-level only */
-    T4_RESOLUTION_R16_SUPERFINE = 4,
+    T4_RESOLUTION_R16_SUPERFINE = 0x8,

    /*! 100dpi x 100dpi - gray-scale and colour only */
-    T4_RESOLUTION_100_100 = 5,
+    T4_RESOLUTION_100_100 = 0x10,
    /*! 200dpi x 100dpi - bi-level only */
-    T4_RESOLUTION_200_100 = 6,
+    T4_RESOLUTION_200_100 = 0x20,
    /*! 200dpi x 200dpi */
-    T4_RESOLUTION_200_200 = 7,
+    T4_RESOLUTION_200_200 = 0x40,
    /*! 200dpi x 400dpi - bi-level only */
-    T4_RESOLUTION_200_400 = 8,
+    T4_RESOLUTION_200_400 = 0x80,
    /*! 300dpi x 300dpi */
-    T4_RESOLUTION_300_300 = 9,
+    T4_RESOLUTION_300_300 = 0x100,
    /*! 300dpi x 600dpi - bi-level only */
-    T4_RESOLUTION_300_600 = 10,
+    T4_RESOLUTION_300_600 = 0x200,
    /*! 400dpi x 400dpi */
-    T4_RESOLUTION_400_400 = 11,
+    T4_RESOLUTION_400_400 = 0x400,
    /*! 400dpi x 800dpi - bi-level only */
-    T4_RESOLUTION_400_800 = 12,
+    T4_RESOLUTION_400_800 = 0x800,
    /*! 600dpi x 600dpi */
-    T4_RESOLUTION_600_600 = 13,
+    T4_RESOLUTION_600_600 = 0x1000,
    /*! 600dpi x 1200dpi - bi-level only */
-    T4_RESOLUTION_600_1200 = 14,
+    T4_RESOLUTION_600_1200 = 0x2000,
    /*! 1200dpi x 1200dpi */
-    T4_RESOLUTION_1200_1200 = 15
-};
-
-enum
-{
-    /*! Support standard FAX resolution 204dpi x 98dpi - bi-level only */
-    T4_SUPPORT_RESOLUTION_R8_STANDARD = 0x1,
-    /*! Support fine FAX resolution 204dpi x 196dpi - bi-level only */
-    T4_SUPPORT_RESOLUTION_R8_FINE = 0x2,
-    /*! Support super-fine FAX resolution 204dpi x 391dpi - bi-level only */
-    T4_SUPPORT_RESOLUTION_R8_SUPERFINE = 0x4,
-    /*! Support double FAX resolution 408dpi x 391dpi - bi-level only */
-    T4_SUPPORT_RESOLUTION_R16_SUPERFINE = 0x8,
-
-    /*! Support 100dpi x 100dpi - gray-scale and colour only */
-    T4_SUPPORT_RESOLUTION_100_100 = 0x10,
-    /*! Support 200dpi x 100dpi - bi-level only */
-    T4_SUPPORT_RESOLUTION_200_100 = 0x20,
-    /*! Support 200dpi x 200dpi */
-    T4_SUPPORT_RESOLUTION_200_200 = 0x40,
-    /*! Support 200dpi x 400dpi - bi-level only */
-    T4_SUPPORT_RESOLUTION_200_400 = 0x80,
-    /*! Support 300dpi x 300dpi */
-    T4_SUPPORT_RESOLUTION_300_300 = 0x100,
-    /*! Support 300dpi x 600dpi - bi-level only */
-    T4_SUPPORT_RESOLUTION_300_600 = 0x200,
-    /*! Support 400dpi x 400dpi */
-    T4_SUPPORT_RESOLUTION_400_400 = 0x400,
-    /*! Support 400dpi x 800dpi - bi-level only */
-    T4_SUPPORT_RESOLUTION_400_800 = 0x800,
-    /*! Support 600dpi x 600dpi */
-    T4_SUPPORT_RESOLUTION_600_600 = 0x1000,
-    /*! Support 600dpi x 1200dpi - bi-level only */
-    T4_SUPPORT_RESOLUTION_600_1200 = 0x2000,
-    /*! Support 1200dpi x 1200dpi */
-    T4_SUPPORT_RESOLUTION_1200_1200 = 0x4000
+    T4_RESOLUTION_1200_1200 = 0x4000
 };

 /*!
@@ -77,6 +77,12 @@ SPAN_DECLARE(int) t4_t6_encode_set_encoding(t4_t6_encode_state_t *s, int encodin
    \return 0 for success, otherwise -1. */
 SPAN_DECLARE(int) t4_t6_encode_set_image_width(t4_t6_encode_state_t *s, int image_width);

+/*! \brief Set the length of the image.
+    \param s The T.4/T.6 context.
+    \param image_length The image length, in pixels.
+    \return 0 for success, otherwise -1. */
+SPAN_DECLARE(int) t4_t6_encode_set_image_length(t4_t6_encode_state_t *s, int image_length);
+
 /*! \brief Get the width of the image.
    \param s The T.4/T.6 context.
    \return The width of the image, in pixels. */
@@ -212,6 +212,14 @@ ImageLayer(34732)                                                   LONG
 #define     COMPRESSION_T43             10
 #endif

+typedef enum
+{
+    T4_IMAGE_FORMAT_OK = 0,
+    T4_IMAGE_FORMAT_INCOMPATIBLE = -1,
+    T4_IMAGE_FORMAT_NOSIZESUPPORT = -2,
+    T4_IMAGE_FORMAT_NORESSUPPORT = -3
+} t4_image_format_status_t;
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -267,7 +275,55 @@ SPAN_DECLARE(int) t4_tx_get_bit(t4_tx_state_t *s);
            indicates that the end of the document has been reached. */
 SPAN_DECLARE(int) t4_tx_get(t4_tx_state_t *s, uint8_t buf[], size_t max_len);

-/*! \brief Set the encoding for the encoded data.
+/*! \brief Get the compression for the encoded data.
+    \param s The T.4 context.
+    \return the chosen compression for success, otherwise -1. */
+SPAN_DECLARE(int) t4_tx_get_tx_compression(t4_tx_state_t *s);
+
+/*! \brief Get the image type of the encoded data.
+    \param s The T.4 context.
+    \return the chosen image type for success, otherwise -1. */
+SPAN_DECLARE(int) t4_tx_get_tx_image_type(t4_tx_state_t *s);
+
+/*! \brief Get the X and Y resolution code of the current page.
+    \param s The T.4 context.
+    \return The resolution code,. */
+SPAN_DECLARE(int) t4_tx_get_tx_resolution(t4_tx_state_t *s);
+
+/*! \brief Get the column-to-column (x) resolution of the current page.
+    \param s The T.4 context.
+    \return The resolution, in pixels per metre. */
+SPAN_DECLARE(int) t4_tx_get_tx_x_resolution(t4_tx_state_t *s);
+
+/*! \brief Get the row-to-row (y) resolution of the current page.
+    \param s The T.4 context.
+    \return The resolution, in pixels per metre. */
+SPAN_DECLARE(int) t4_tx_get_tx_y_resolution(t4_tx_state_t *s);
+
+/*! \brief Get the width of the encoded data.
+    \param s The T.4 context.
+    \return the width, in pixels, for success, otherwise -1. */
+SPAN_DECLARE(int) t4_tx_get_tx_image_width(t4_tx_state_t *s);
+
+/*! \brief Get the width code of the encoded data.
+    \param s The T.4 context.
+    \return the width code, for success, otherwise -1. */
+SPAN_DECLARE(int) t4_tx_get_tx_image_width_code(t4_tx_state_t *s);
+
+/*! \brief Auto-select the format in which to send the image.
+    \param s The T.4 context.
+    \param supported_compressions The set of compressions supported for this transmission
+    \param supported_image_sizes The set of image sizes supported for this transmission
+    \param supported_bilevel_resolutions The set of bi-level resolutions supported for this transmission
+    \param supported_colour_resolutions The set of gray scale and colour resolutions supported for this transmission
+    \return A t4_image_format_status_t result code */
+SPAN_DECLARE(int) t4_tx_set_tx_image_format(t4_tx_state_t *s,
+                                            int supported_compressions,
+                                            int supported_image_sizes,
+                                            int supported_bilevel_resolutions,
+                                            int supported_colour_resolutions);
+
+/*! \brief Set the compression for the encoded data.
    \param s The T.4 context.
    \param encoding The encoding.
    \return 0 for success, otherwise -1. */
@@ -331,31 +387,6 @@ SPAN_DECLARE(int) t4_tx_set_row_read_handler(t4_tx_state_t *s, t4_row_read_handl
    \param row_squashing_ratio Vertical squashing ratio. */
 SPAN_DECLARE(void) t4_tx_set_row_squashing_ratio(t4_tx_state_t *s, int row_squashing_ratio);

-/*! \brief Get the row-to-row (y) resolution of the current page.
-    \param s The T.4 context.
-    \return The resolution, in pixels per metre. */
-SPAN_DECLARE(int) t4_tx_get_y_resolution(t4_tx_state_t *s);
-
-/*! \brief Get the column-to-column (x) resolution of the current page.
-    \param s The T.4 context.
-    \return The resolution, in pixels per metre. */
-SPAN_DECLARE(int) t4_tx_get_x_resolution(t4_tx_state_t *s);
-
-/*! \brief Get the X and Y resolution code of the current page.
-    \param s The T.4 context.
-    \return The resolution code,. */
-SPAN_DECLARE(int) t4_tx_get_resolution(t4_tx_state_t *s);
-
-/*! \brief Get the width of the current page, in pixel columns.
-    \param s The T.4 context.
-    \return The number of columns. */
-SPAN_DECLARE(int) t4_tx_get_image_width(t4_tx_state_t *s);
-
-/*! \brief Get the type of the current page, in pixel columns.
-    \param s The T.4 context.
-    \return The type. */
-SPAN_DECLARE(int) t4_tx_get_image_type(t4_tx_state_t *s);
-
 /*! \brief Get the number of pages in the file.
    \param s The T.4 context.
    \return The number of pages, or -1 if there is an error. */
@@ -38,23 +38,25 @@ typedef struct v18_state_s v18_state_t;

 enum
 {
-    V18_MODE_NONE = 0,
+    V18_MODE_NONE = 0x0001,
    /* V.18 Annex A - Weitbrecht TDD at 45.45bps (US TTY), half-duplex, 5 bit baudot (USA). */
-    V18_MODE_5BIT_45 = 1,
+    V18_MODE_5BIT_4545 = 0x0002,
    /* V.18 Annex A - Weitbrecht TDD at 50bps (International TTY), half-duplex, 5 bit baudot (UK, Australia and others). */
-    V18_MODE_5BIT_50 = 2,
+    V18_MODE_5BIT_50 = 0x0004,
    /* V.18 Annex B - DTMF encoding of ASCII (Denmark, Holland and others). */
-    V18_MODE_DTMF = 3,
+    V18_MODE_DTMF = 0x0008,
    /* V.18 Annex C - EDT (European Deaf Telephone) 110bps, V.21, half-duplex, ASCII (Germany, Austria, Switzerland and others). */
-    V18_MODE_EDT = 4,
+    V18_MODE_EDT = 0x0010,
    /* V.18 Annex D - 300bps, Bell 103, duplex, ASCII (USA). */
-    V18_MODE_BELL103 = 5,
+    V18_MODE_BELL103 = 0x0020,
    /* V.18 Annex E - 1200bps Videotex terminals, ASCII (France). */
-    V18_MODE_V23VIDEOTEX = 6,
+    V18_MODE_V23VIDEOTEX = 0x0040,
    /* V.18 Annex F - V.21 text telephone, V.21, duplex, ASCII (Sweden, Norway and Finland). */
-    V18_MODE_V21TEXTPHONE = 7,
+    V18_MODE_V21TEXTPHONE = 0x0080,
    /* V.18 Annex G - V.18 text telephone mode. */
-    V18_MODE_V18TEXTPHONE = 8,
+    V18_MODE_V18TEXTPHONE = 0x0100,
+    /* V.18 Annex A - Used during probing. */
+    V18_MODE_5BIT_476 = 0x0200,
    /* Use repetitive shift characters where character set shifts are used */ 
    V18_MODE_REPETITIVE_SHIFTS_OPTION = 0x1000
 };
@@ -171,28 +173,6 @@ SPAN_DECLARE_NONSTD(int) v18_rx_fillin(v18_state_t *s, int len);
            invalid, this function will return -1. */
 SPAN_DECLARE(int) v18_put(v18_state_t *s, const char msg[], int len);

-/*! Convert a text string to a V.18 DTMF string.
-    \brief Convert a text string to a V.18 DTMF string.
-    \param s The V.18 context.
-    \param dtmf The resulting DTMF string.
-    \param msg The text string to be converted.
-    \return The length of the DTMF string.
-*/
-SPAN_DECLARE(int) v18_encode_dtmf(v18_state_t *s, char dtmf[], const char msg[]);
-
-/*! Convert a V.18 DTMF string to a text string.
-    \brief Convert a V.18 DTMF string to a text string.
-    \param s The V.18 context.
-    \param msg The resulting test string.
-    \param dtmf The DTMF string to be converted.
-    \return The length of the text string.
-*/
-SPAN_DECLARE(int) v18_decode_dtmf(v18_state_t *s, char msg[], const char dtmf[]);
-
-SPAN_DECLARE(uint16_t) v18_encode_baudot(v18_state_t *s, uint8_t ch);
-
-SPAN_DECLARE(uint8_t) v18_decode_baudot(v18_state_t *s, uint8_t ch);
-
 /*! \brief Return a short name for an V.18 mode
    \param mode The code for the V.18 mode.
    \return A pointer to the name.
@@ -435,7 +435,6 @@ static void decode_20digit_msg(t30_state_t *s, char *msg, const uint8_t *pkt, in
 static void decode_url_msg(t30_state_t *s, char *msg, const uint8_t *pkt, int len);
 static int decode_nsf_nss_nsc(t30_state_t *s, uint8_t *msg[], const uint8_t *pkt, int len);
 static void set_min_scan_time(t30_state_t *s);
-static int send_cfr_sequence(t30_state_t *s, int start);
 static void timer_t2_start(t30_state_t *s);
 static void timer_t2a_start(t30_state_t *s);
 static void timer_t2b_start(t30_state_t *s);
@@ -1195,9 +1194,9 @@ int t30_build_dis_or_dtc(t30_state_t *s)
    /* No scan-line padding required, but some may be specified by the application. */
    set_ctrl_bits(s->local_dis_dtc_frame, s->local_min_scan_time_code, T30_DIS_BIT_MIN_SCAN_LINE_TIME_CAPABILITY_1);

-    if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T4_2D))
+    if ((s->supported_compressions & T4_COMPRESSION_T4_2D))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_2D_CAPABLE);
-    if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_NONE))
+    if ((s->supported_compressions & T4_COMPRESSION_NONE))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_UNCOMPRESSED_CAPABLE);
    if (s->ecm_allowed)
    {
@@ -1206,50 +1205,55 @@ int t30_build_dis_or_dtc(t30_state_t *s)

        /* Only offer the option of fancy compression schemes, if we are
           also offering the ECM option needed to support them. */
-        if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T6))
+        if ((s->supported_compressions & T4_COMPRESSION_T6))
            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T6_CAPABLE);
-        if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T85))
+        if ((s->supported_compressions & T4_COMPRESSION_T85))
        {
            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T85_CAPABLE);
            /* Bit 79 set with bit 78 clear is invalid, so only check for L0
               support here. */
-            if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T85_L0))
+            if ((s->supported_compressions & T4_COMPRESSION_T85_L0))
                set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T85_L0_CAPABLE);
        }

-        if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_COLOUR))
-            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_FULL_COLOUR_CAPABLE);
-
-        if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T42_T81))
-            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T81_CAPABLE);
-        if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T43))
-        {
-            /* Note 25 of table 2/T.30 */
-            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T43_CAPABLE);
-            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T81_CAPABLE);
-        }
-        if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T45))
-            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T45_CAPABLE);
-        if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_SYCC_T81))
-        {
-            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T81_CAPABLE);
-            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_SYCC_T81_CAPABLE);
-        }
-        //if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T88))
+        //if ((s->supported_compressions & T4_COMPRESSION_T88))
        //{
        //    set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T88_CAPABILITY_1);
        //    set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T88_CAPABILITY_2);
        //    set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T88_CAPABILITY_3);
        //}

-        if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_12BIT))
-            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_12BIT_CAPABLE);
+        //if ((s->supported_compressions & (T4_COMPRESSION_COLOUR | T4_COMPRESSION_GRAYSCALE)))
+        {
+            if ((s->supported_compressions & T4_COMPRESSION_COLOUR))
+                set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_FULL_COLOUR_CAPABLE);

-        //if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_NO_SUBSAMPLING))
-        //    set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_NO_SUBSAMPLING);
+            if ((s->supported_compressions & T4_COMPRESSION_T42_T81))
+                set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T81_CAPABLE);
+            if ((s->supported_compressions & T4_COMPRESSION_T43))
+            {
+                /* Note 25 of table 2/T.30 */
+                set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T81_CAPABLE);
+                set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T43_CAPABLE);
+                /* No plane interleave */
+            }
+            if ((s->supported_compressions & T4_COMPRESSION_T45))
+                set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T45_CAPABLE);
+            if ((s->supported_compressions & T4_COMPRESSION_SYCC_T81))
+            {
+                set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_T81_CAPABLE);
+                set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_SYCC_T81_CAPABLE);
+            }

-        /* No custom illuminant */
-        /* No custom gamut range */
+            if ((s->supported_compressions & T4_COMPRESSION_12BIT))
+                set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_12BIT_CAPABLE);
+
+            //if ((s->supported_compressions & T4_COMPRESSION_NO_SUBSAMPLING))
+            //    set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_NO_SUBSAMPLING);
+
+            /* No custom illuminant */
+            /* No custom gamut range */
+        }
    }
    if ((s->supported_t30_features & T30_SUPPORT_FIELD_NOT_VALID))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_FNV_CAPABLE);
@@ -1257,12 +1261,6 @@ int t30_build_dis_or_dtc(t30_state_t *s)
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_MULTIPLE_SELECTIVE_POLLING_CAPABLE);
    if ((s->supported_t30_features & T30_SUPPORT_POLLED_SUB_ADDRESSING))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_POLLED_SUBADDRESSING_CAPABLE);
-
-    /* No plane interleave */
-    /* No G.726 */
-    /* No extended voice coding */
-    /* Superfine minimum scan line time pattern follows fine */
-
    if ((s->supported_t30_features & T30_SUPPORT_SELECTIVE_POLLING))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_SELECTIVE_POLLING_CAPABLE);
    if ((s->supported_t30_features & T30_SUPPORT_SUB_ADDRESSING))
@@ -1270,10 +1268,16 @@ int t30_build_dis_or_dtc(t30_state_t *s)
    if ((s->supported_t30_features & T30_SUPPORT_IDENTIFICATION))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_PASSWORD);

+    /* No G.726 */
+    /* No extended voice coding */
+    /* Superfine minimum scan line time pattern follows fine */
+
    /* Ready to transmit a data file (polling) */
    if (s->tx_file[0])
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_READY_TO_TRANSMIT_DATA_FILE);

+    /* No simple phase C BFT negotiations */
+    /* No extended BFT negotiations */
    /* No Binary file transfer (BFT) */
    /* No Document transfer mode (DTM) */
    /* No Electronic data interchange (EDI) */
@@ -1295,67 +1299,65 @@ int t30_build_dis_or_dtc(t30_state_t *s)
    /* No HFX40-I hashing */
    /* No alternative hashing system number 2 */
    /* No alternative hashing system number 3 */
-    /* No T.44 (mixed raster content) */

+    /* No T.44 (mixed raster content) */
    /* No page length maximum strip size for T.44 (mixed raster content) */
-    /* No simple phase C BFT negotiations */
-    /* No extended BFT negotiations */

    if ((s->supported_t30_features & T30_SUPPORT_INTERNET_SELECTIVE_POLLING_ADDRESS))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_INTERNET_SELECTIVE_POLLING_ADDRESS);
    if ((s->supported_t30_features & T30_SUPPORT_INTERNET_ROUTING_ADDRESS))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_INTERNET_ROUTING_ADDRESS);

-    if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_1200_1200))
+    if ((s->supported_bilevel_resolutions & T4_RESOLUTION_1200_1200))
    {
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_1200_1200_CAPABLE);
-        if ((s->supported_colour_resolutions & T4_SUPPORT_RESOLUTION_1200_1200))
+        if ((s->supported_colour_resolutions & T4_RESOLUTION_1200_1200))
            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_COLOUR_GRAY_1200_1200_CAPABLE);
    }
-    if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_600_1200))
+    if ((s->supported_bilevel_resolutions & T4_RESOLUTION_600_1200))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_600_1200_CAPABLE);
-    if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_600_600))
+    if ((s->supported_bilevel_resolutions & T4_RESOLUTION_600_600))
    {
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_600_600_CAPABLE);
-        if ((s->supported_colour_resolutions & T4_SUPPORT_RESOLUTION_600_600))
+        if ((s->supported_colour_resolutions & T4_RESOLUTION_600_600))
            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_COLOUR_GRAY_600_600_CAPABLE);
    }
-    if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_400_800))
+    if ((s->supported_bilevel_resolutions & T4_RESOLUTION_400_800))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_400_800_CAPABLE);
-    if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_R16_SUPERFINE))
+    if ((s->supported_bilevel_resolutions & T4_RESOLUTION_R16_SUPERFINE))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_400_400_CAPABLE);
-    if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_400_400))
+    if ((s->supported_bilevel_resolutions & T4_RESOLUTION_400_400))
    {
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_400_400_CAPABLE);
-        if ((s->supported_colour_resolutions & T4_SUPPORT_RESOLUTION_400_400))
+        if ((s->supported_colour_resolutions & T4_RESOLUTION_400_400))
            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_COLOUR_GRAY_300_300_400_400_CAPABLE);
    }
-    if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_300_600))
+    if ((s->supported_bilevel_resolutions & T4_RESOLUTION_300_600))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_300_600_CAPABLE);
-    if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_300_300))
+    if ((s->supported_bilevel_resolutions & T4_RESOLUTION_300_300))
    {
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_300_300_CAPABLE);
-        if ((s->supported_colour_resolutions & T4_SUPPORT_RESOLUTION_300_300))
+        if ((s->supported_colour_resolutions & T4_RESOLUTION_300_300))
            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_COLOUR_GRAY_300_300_400_400_CAPABLE);
    }
-    if ((s->supported_bilevel_resolutions & (T4_SUPPORT_RESOLUTION_200_400 | T4_SUPPORT_RESOLUTION_R8_SUPERFINE)))
+    if ((s->supported_bilevel_resolutions & (T4_RESOLUTION_200_400 | T4_RESOLUTION_R8_SUPERFINE)))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_200_400_CAPABLE);
-    if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_R8_FINE))
+    if ((s->supported_bilevel_resolutions & T4_RESOLUTION_R8_FINE))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_200_200_CAPABLE);
-    if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_200_200))
+    if ((s->supported_bilevel_resolutions & T4_RESOLUTION_200_200))
    {
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_200_200_CAPABLE);
-        if ((s->supported_colour_resolutions & T4_SUPPORT_RESOLUTION_200_200))
+        if ((s->supported_colour_resolutions & T4_RESOLUTION_200_200))
            set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_FULL_COLOUR_CAPABLE);
    }
    /* Standard FAX resolution bi-level image support goes without saying */
-    if ((s->supported_colour_resolutions & T4_SUPPORT_RESOLUTION_100_100))
+    if ((s->supported_colour_resolutions & T4_RESOLUTION_100_100))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_COLOUR_GRAY_100_100_CAPABLE);

-    if ((s->supported_bilevel_resolutions & (T4_SUPPORT_RESOLUTION_R8_STANDARD | T4_SUPPORT_RESOLUTION_R8_FINE | T4_SUPPORT_RESOLUTION_R8_SUPERFINE | T4_SUPPORT_RESOLUTION_R16_SUPERFINE)))
-        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_INCH_RESOLUTION_PREFERRED);
-    if ((s->supported_bilevel_resolutions & (T4_SUPPORT_RESOLUTION_200_100 | T4_SUPPORT_RESOLUTION_200_200 | T4_SUPPORT_RESOLUTION_200_400 | T4_SUPPORT_RESOLUTION_300_300 | T4_SUPPORT_RESOLUTION_300_600 | T4_SUPPORT_RESOLUTION_400_400 | T4_SUPPORT_RESOLUTION_400_800 | T4_SUPPORT_RESOLUTION_600_600 | T4_SUPPORT_RESOLUTION_600_1200 | T4_SUPPORT_RESOLUTION_1200_1200)))
+    if ((s->supported_bilevel_resolutions & (T4_RESOLUTION_R8_STANDARD | T4_RESOLUTION_R8_FINE | T4_RESOLUTION_R8_SUPERFINE | T4_RESOLUTION_R16_SUPERFINE)))
        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_METRIC_RESOLUTION_PREFERRED);
+    if ((s->supported_bilevel_resolutions & (T4_RESOLUTION_200_100 | T4_RESOLUTION_200_200 | T4_RESOLUTION_200_400 | T4_RESOLUTION_300_300 | T4_RESOLUTION_300_600 | T4_RESOLUTION_400_400 | T4_RESOLUTION_400_800 | T4_RESOLUTION_600_600 | T4_RESOLUTION_600_1200 | T4_RESOLUTION_1200_1200)))
+        set_ctrl_bit(s->local_dis_dtc_frame, T30_DIS_BIT_INCH_RESOLUTION_PREFERRED);

    /* No double sided printing (alternate mode) */
    /* No double sided printing (continuous mode) */
@@ -1426,11 +1428,11 @@ static int build_dcs(t30_state_t *s)
    int image_type;

    /* Reacquire page information, in case the image was resized, flattened, etc. */
-    s->x_resolution = t4_tx_get_x_resolution(&s->t4.tx);
-    s->y_resolution = t4_tx_get_y_resolution(&s->t4.tx);
-    s->current_page_resolution = t4_tx_get_resolution(&s->t4.tx);
-    s->image_width = t4_tx_get_image_width(&s->t4.tx);
-    image_type = t4_tx_get_image_type(&s->t4.tx);
+    s->current_page_resolution = t4_tx_get_tx_resolution(&s->t4.tx);
+    s->x_resolution = t4_tx_get_tx_x_resolution(&s->t4.tx);
+    s->y_resolution = t4_tx_get_tx_y_resolution(&s->t4.tx);
+    s->image_width = t4_tx_get_tx_image_width(&s->t4.tx);
+    image_type = t4_tx_get_tx_image_type(&s->t4.tx);

    /* Make a DCS frame based on local issues and the latest received DIS/DTC frame.
       Negotiate the result based on what both parties can do. */
@@ -1829,40 +1831,40 @@ static int analyze_rx_dis_dtc(t30_state_t *s, const uint8_t *msg, int len)
    if (!s->error_correcting_mode)
    {
        /* Remove any compression schemes which need error correction to work. */
-        s->mutual_compressions &= (0xF0000000 | T4_SUPPORT_COMPRESSION_NONE | T4_SUPPORT_COMPRESSION_T4_1D | T4_SUPPORT_COMPRESSION_T4_2D);
+        s->mutual_compressions &= (0xF0000000 | T4_COMPRESSION_NONE | T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D);
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_2D_CAPABLE))
-            s->mutual_compressions &= ~T4_SUPPORT_COMPRESSION_T4_2D;
+            s->mutual_compressions &= ~T4_COMPRESSION_T4_2D;
    }
    else
    {
        /* Check the bi-level capabilities */
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_2D_CAPABLE))
-            s->mutual_compressions &= ~T4_SUPPORT_COMPRESSION_T4_2D;
+            s->mutual_compressions &= ~T4_COMPRESSION_T4_2D;
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_T6_CAPABLE))
-            s->mutual_compressions &= ~T4_SUPPORT_COMPRESSION_T6;
+            s->mutual_compressions &= ~T4_COMPRESSION_T6;
        /* T.85 L0 capable without T.85 capable is an invalid combination, so let
           just zap both capabilities if the far end is not T.85 capable. */
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_T85_CAPABLE))
-            s->mutual_compressions &= ~(T4_SUPPORT_COMPRESSION_T85 | T4_SUPPORT_COMPRESSION_T85_L0);
+            s->mutual_compressions &= ~(T4_COMPRESSION_T85 | T4_COMPRESSION_T85_L0);
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_T85_L0_CAPABLE))
-            s->mutual_compressions &= ~T4_SUPPORT_COMPRESSION_T85_L0;
+            s->mutual_compressions &= ~T4_COMPRESSION_T85_L0;

        /* Check for full colour or only gray-scale from the multi-level codecs */
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_FULL_COLOUR_CAPABLE))
-            s->mutual_compressions &= ~T4_SUPPORT_COMPRESSION_COLOUR;
+            s->mutual_compressions &= ~T4_COMPRESSION_COLOUR;

        /* Check the colour capabilities */
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_T81_CAPABLE))
-            s->mutual_compressions &= ~T4_SUPPORT_COMPRESSION_T42_T81;
+            s->mutual_compressions &= ~T4_COMPRESSION_T42_T81;
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_SYCC_T81_CAPABLE))
-            s->mutual_compressions &= ~T4_SUPPORT_COMPRESSION_SYCC_T81;
+            s->mutual_compressions &= ~T4_COMPRESSION_SYCC_T81;
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_T43_CAPABLE))
-            s->mutual_compressions &= ~T4_SUPPORT_COMPRESSION_T43;
+            s->mutual_compressions &= ~T4_COMPRESSION_T43;
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_T45_CAPABLE))
-            s->mutual_compressions &= ~T4_SUPPORT_COMPRESSION_T45;
+            s->mutual_compressions &= ~T4_COMPRESSION_T45;

        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_12BIT_CAPABLE))
-            s->mutual_compressions &= ~T4_SUPPORT_COMPRESSION_12BIT;
+            s->mutual_compressions &= ~T4_COMPRESSION_12BIT;
        //if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_NO_SUBSAMPLING))
        //    ???? = T4_COMPRESSION_T42_T81_SUBSAMPLING;

@@ -1874,75 +1876,75 @@ static int analyze_rx_dis_dtc(t30_state_t *s, const uint8_t *msg, int len)
    s->mutual_colour_resolutions = s->supported_colour_resolutions;
    if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_1200_1200_CAPABLE))
    {
-        s->mutual_bilevel_resolutions &= ~T4_SUPPORT_RESOLUTION_1200_1200;
-        s->mutual_colour_resolutions &= ~T4_SUPPORT_RESOLUTION_1200_1200;
+        s->mutual_bilevel_resolutions &= ~T4_RESOLUTION_1200_1200;
+        s->mutual_colour_resolutions &= ~T4_RESOLUTION_1200_1200;
    }
    else
    {
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_COLOUR_GRAY_1200_1200_CAPABLE))
-            s->mutual_colour_resolutions &= ~T4_SUPPORT_RESOLUTION_1200_1200;
+            s->mutual_colour_resolutions &= ~T4_RESOLUTION_1200_1200;
    }
    if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_600_1200_CAPABLE))
-        s->mutual_bilevel_resolutions &= ~T4_SUPPORT_RESOLUTION_600_1200;
+        s->mutual_bilevel_resolutions &= ~T4_RESOLUTION_600_1200;
    if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_600_600_CAPABLE))
    {
-        s->mutual_bilevel_resolutions &= ~T4_SUPPORT_RESOLUTION_600_600;
-        s->mutual_colour_resolutions &= ~T4_SUPPORT_RESOLUTION_600_600;
+        s->mutual_bilevel_resolutions &= ~T4_RESOLUTION_600_600;
+        s->mutual_colour_resolutions &= ~T4_RESOLUTION_600_600;
    }
    else
    {
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_COLOUR_GRAY_600_600_CAPABLE))
-            s->mutual_colour_resolutions &= ~T4_SUPPORT_RESOLUTION_600_600;
+            s->mutual_colour_resolutions &= ~T4_RESOLUTION_600_600;
    }
    if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_400_800_CAPABLE))
-        s->mutual_bilevel_resolutions &= ~T4_SUPPORT_RESOLUTION_400_800;
+        s->mutual_bilevel_resolutions &= ~T4_RESOLUTION_400_800;
    if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_400_400_CAPABLE))
    {
-        s->mutual_bilevel_resolutions &= ~(T4_SUPPORT_RESOLUTION_400_400 | T4_SUPPORT_RESOLUTION_R16_SUPERFINE);
-        s->mutual_colour_resolutions &= ~T4_SUPPORT_RESOLUTION_400_400;
+        s->mutual_bilevel_resolutions &= ~(T4_RESOLUTION_400_400 | T4_RESOLUTION_R16_SUPERFINE);
+        s->mutual_colour_resolutions &= ~T4_RESOLUTION_400_400;
    }
    else
    {
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_COLOUR_GRAY_300_300_400_400_CAPABLE))
-            s->mutual_colour_resolutions &= ~T4_SUPPORT_RESOLUTION_400_400;
+            s->mutual_colour_resolutions &= ~T4_RESOLUTION_400_400;
    }
    if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_300_600_CAPABLE))
-        s->mutual_bilevel_resolutions &= ~T4_SUPPORT_RESOLUTION_300_600;
+        s->mutual_bilevel_resolutions &= ~T4_RESOLUTION_300_600;
    if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_300_300_CAPABLE))
    {
-        s->mutual_bilevel_resolutions &= ~T4_SUPPORT_RESOLUTION_300_300;
-        s->mutual_colour_resolutions &= ~T4_SUPPORT_RESOLUTION_300_300;
+        s->mutual_bilevel_resolutions &= ~T4_RESOLUTION_300_300;
+        s->mutual_colour_resolutions &= ~T4_RESOLUTION_300_300;
    }
    else
    {
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_COLOUR_GRAY_300_300_400_400_CAPABLE))
-            s->mutual_colour_resolutions &= ~T4_SUPPORT_RESOLUTION_300_300;
+            s->mutual_colour_resolutions &= ~T4_RESOLUTION_300_300;
    }
    if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_200_400_CAPABLE))
    {
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_INCH_RESOLUTION_PREFERRED))
-            s->mutual_bilevel_resolutions &= ~T4_SUPPORT_RESOLUTION_200_400;
+            s->mutual_bilevel_resolutions &= ~T4_RESOLUTION_200_400;
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_METRIC_RESOLUTION_PREFERRED))
-            s->mutual_bilevel_resolutions &= ~T4_SUPPORT_RESOLUTION_R8_SUPERFINE;
+            s->mutual_bilevel_resolutions &= ~T4_RESOLUTION_R8_SUPERFINE;
    }
    if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_200_200_CAPABLE))
    {
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_INCH_RESOLUTION_PREFERRED))
-            s->mutual_bilevel_resolutions &= ~T4_SUPPORT_RESOLUTION_200_200;
+            s->mutual_bilevel_resolutions &= ~T4_RESOLUTION_200_200;
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_METRIC_RESOLUTION_PREFERRED))
-            s->mutual_bilevel_resolutions &= ~T4_SUPPORT_RESOLUTION_R8_FINE;
-        s->mutual_colour_resolutions &= ~T4_SUPPORT_RESOLUTION_200_200;
+            s->mutual_bilevel_resolutions &= ~T4_RESOLUTION_R8_FINE;
+        s->mutual_colour_resolutions &= ~T4_RESOLUTION_200_200;
    }
    else
    {
        if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_INCH_RESOLUTION_PREFERRED))
-            s->mutual_colour_resolutions &= ~T4_SUPPORT_RESOLUTION_200_200;
+            s->mutual_colour_resolutions &= ~T4_RESOLUTION_200_200;
    }
    if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_INCH_RESOLUTION_PREFERRED))
-        s->mutual_bilevel_resolutions &= ~T4_SUPPORT_RESOLUTION_200_100;
-    /* Never suppress T4_SUPPORT_RESOLUTION_R8_STANDARD */
+        s->mutual_bilevel_resolutions &= ~T4_RESOLUTION_200_100;
+    /* Never suppress T4_RESOLUTION_R8_STANDARD */
    if (!test_ctrl_bit(s->far_dis_dtc_frame, T30_DIS_BIT_COLOUR_GRAY_100_100_CAPABLE))
-        s->mutual_colour_resolutions &= ~T4_SUPPORT_RESOLUTION_100_100;
+        s->mutual_colour_resolutions &= ~T4_RESOLUTION_100_100;

    s->mutual_image_sizes = s->supported_image_sizes;
    /* 215mm wide is always supported */
@@ -2068,7 +2070,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        /* Note 35 of Table 2/T.30 */
        if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_FULL_COLOUR_MODE))
        {
-            if ((s->supported_colour_resolutions & T4_SUPPORT_COMPRESSION_COLOUR))
+            if ((s->supported_colour_resolutions & T4_COMPRESSION_COLOUR))
            {
                /* We are going to work in full colour mode */
            }
@@ -2076,7 +2078,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)

        if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_12BIT_COMPONENT))
        {
-            if ((s->supported_colour_resolutions & T4_SUPPORT_COMPRESSION_12BIT))
+            if ((s->supported_colour_resolutions & T4_COMPRESSION_12BIT))
            {
                /* We are going to work in 12 bit mode */
            }
@@ -2084,17 +2086,17 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)

        if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_NO_SUBSAMPLING))
        {
-            //???? = T4_SUPPORT_COMPRESSION_T42_T81_SUBSAMPLING;
+            //???? = T4_COMPRESSION_T42_T81_SUBSAMPLING;
        }

        if (!test_ctrl_bit(dcs_frame, T30_DCS_BIT_PREFERRED_HUFFMAN_TABLES))
        {
-            //???? = T4_SUPPORT_COMPRESSION_T42_T81_HUFFMAN;
+            //???? = T4_COMPRESSION_T42_T81_HUFFMAN;
        }

        if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_COLOUR_GRAY_1200_1200))
        {
-            if ((s->supported_colour_resolutions & T4_SUPPORT_RESOLUTION_1200_1200))
+            if ((s->supported_colour_resolutions & T4_RESOLUTION_1200_1200))
            {
                s->x_resolution = T4_X_RESOLUTION_1200;
                s->y_resolution = T4_Y_RESOLUTION_1200;
@@ -2104,7 +2106,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_COLOUR_GRAY_600_600))
        {
-            if ((s->supported_colour_resolutions & T4_SUPPORT_RESOLUTION_600_600))
+            if ((s->supported_colour_resolutions & T4_RESOLUTION_600_600))
            {
                s->x_resolution = T4_X_RESOLUTION_600;
                s->y_resolution = T4_Y_RESOLUTION_600;
@@ -2114,7 +2116,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_400_400))
        {
-            if ((s->supported_colour_resolutions & T4_SUPPORT_RESOLUTION_400_400))
+            if ((s->supported_colour_resolutions & T4_RESOLUTION_400_400))
            {
                s->x_resolution = T4_X_RESOLUTION_400;
                s->y_resolution = T4_Y_RESOLUTION_400;
@@ -2124,7 +2126,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_300_300))
        {
-            if ((s->supported_colour_resolutions & T4_SUPPORT_RESOLUTION_300_300))
+            if ((s->supported_colour_resolutions & T4_RESOLUTION_300_300))
            {
                s->x_resolution = T4_X_RESOLUTION_300;
                s->y_resolution = T4_Y_RESOLUTION_300;
@@ -2134,7 +2136,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_200_200))
        {
-            if ((s->supported_colour_resolutions & T4_SUPPORT_RESOLUTION_200_200))
+            if ((s->supported_colour_resolutions & T4_RESOLUTION_200_200))
            {
                s->x_resolution = T4_X_RESOLUTION_200;
                s->y_resolution = T4_Y_RESOLUTION_200;
@@ -2144,7 +2146,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_COLOUR_GRAY_100_100))
        {
-            if ((s->supported_colour_resolutions & T4_SUPPORT_RESOLUTION_100_100))
+            if ((s->supported_colour_resolutions & T4_RESOLUTION_100_100))
            {
                s->x_resolution = T4_X_RESOLUTION_100;
                s->y_resolution = T4_Y_RESOLUTION_100;
@@ -2156,22 +2158,22 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        /* Check which compression the far end has decided to use. */
        if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_T81_MODE))
        {
-            if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T42_T81))
+            if ((s->supported_compressions & T4_COMPRESSION_T42_T81))
                s->line_compression = T4_COMPRESSION_T42_T81;
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_T43_MODE))
        {
-            if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T43))
+            if ((s->supported_compressions & T4_COMPRESSION_T43))
                s->line_compression = T4_COMPRESSION_T43;
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_T45_MODE))
        {
-            if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T45))
+            if ((s->supported_compressions & T4_COMPRESSION_T45))
                s->line_compression = T4_COMPRESSION_T45;
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_SYCC_T81_MODE))
        {
-            if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_SYCC_T81))
+            if ((s->supported_compressions & T4_COMPRESSION_SYCC_T81))
                s->line_compression = T4_COMPRESSION_SYCC_T81;
        }
    }
@@ -2180,7 +2182,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        /* Bi-level image */
        if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_1200_1200))
        {
-            if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_1200_1200))
+            if ((s->supported_bilevel_resolutions & T4_RESOLUTION_1200_1200))
            {
                s->x_resolution = T4_X_RESOLUTION_1200;
                s->y_resolution = T4_Y_RESOLUTION_1200;
@@ -2190,7 +2192,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_600_1200))
        {
-            if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_600_1200))
+            if ((s->supported_bilevel_resolutions & T4_RESOLUTION_600_1200))
            {
                s->x_resolution = T4_X_RESOLUTION_600;
                s->y_resolution = T4_Y_RESOLUTION_1200;
@@ -2200,7 +2202,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_600_600))
        {
-            if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_600_600))
+            if ((s->supported_bilevel_resolutions & T4_RESOLUTION_600_600))
            {
                s->x_resolution = T4_X_RESOLUTION_600;
                s->y_resolution = T4_Y_RESOLUTION_600;
@@ -2210,7 +2212,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_400_800))
        {
-            if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_400_800))
+            if ((s->supported_bilevel_resolutions & T4_RESOLUTION_400_800))
            {
                s->x_resolution = T4_X_RESOLUTION_400;
                s->y_resolution = T4_Y_RESOLUTION_800;
@@ -2222,7 +2224,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        {
            if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_INCH_RESOLUTION))
            {
-                if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_400_400))
+                if ((s->supported_bilevel_resolutions & T4_RESOLUTION_400_400))
                {
                    s->x_resolution = T4_X_RESOLUTION_400;
                    s->y_resolution = T4_Y_RESOLUTION_400;
@@ -2232,7 +2234,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
            }
            else
            {
-                if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_R16_SUPERFINE))
+                if ((s->supported_bilevel_resolutions & T4_RESOLUTION_R16_SUPERFINE))
                {
                    s->x_resolution = T4_X_RESOLUTION_R16;
                    s->y_resolution = T4_Y_RESOLUTION_SUPERFINE;
@@ -2243,7 +2245,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_300_600))
        {
-            if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_300_600))
+            if ((s->supported_bilevel_resolutions & T4_RESOLUTION_300_600))
            {
                s->x_resolution = T4_X_RESOLUTION_300;
                s->y_resolution = T4_Y_RESOLUTION_600;
@@ -2253,7 +2255,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_300_300))
        {
-            if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_300_300))
+            if ((s->supported_bilevel_resolutions & T4_RESOLUTION_300_300))
            {
                s->x_resolution = T4_X_RESOLUTION_300;
                s->y_resolution = T4_Y_RESOLUTION_300;
@@ -2265,7 +2267,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        {
            if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_INCH_RESOLUTION))
            {
-                if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_200_400))
+                if ((s->supported_bilevel_resolutions & T4_RESOLUTION_200_400))
                {
                    s->x_resolution = T4_X_RESOLUTION_200;
                    s->y_resolution = T4_Y_RESOLUTION_400;
@@ -2275,7 +2277,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
            }
            else
            {
-                if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_R8_SUPERFINE))
+                if ((s->supported_bilevel_resolutions & T4_RESOLUTION_R8_SUPERFINE))
                {
                    s->x_resolution = T4_X_RESOLUTION_R8;
                    s->y_resolution = T4_Y_RESOLUTION_SUPERFINE;
@@ -2288,7 +2290,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
        {
            if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_INCH_RESOLUTION))
            {
-                if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_200_200))
+                if ((s->supported_bilevel_resolutions & T4_RESOLUTION_200_200))
                {
                    s->x_resolution = T4_X_RESOLUTION_200;
                    s->y_resolution = T4_Y_RESOLUTION_200;
@@ -2298,7 +2300,7 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
            }
            else
            {
-                if ((s->supported_bilevel_resolutions & T4_SUPPORT_RESOLUTION_R8_FINE))
+                if ((s->supported_bilevel_resolutions & T4_RESOLUTION_R8_FINE))
                {
                    s->x_resolution = T4_X_RESOLUTION_R8;
                    s->y_resolution = T4_Y_RESOLUTION_FINE;
@@ -2332,32 +2334,32 @@ static int analyze_rx_dcs(t30_state_t *s, const uint8_t *msg, int len)
            ||
            test_ctrl_bit(dcs_frame, T30_DCS_BIT_T88_MODE_3))
        {
-            if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T88))
+            if ((s->supported_compressions & T4_COMPRESSION_T88))
                s->line_compression = T4_COMPRESSION_T88;
        }
        if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_T85_L0_MODE))
        {
-            if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T85_L0))
+            if ((s->supported_compressions & T4_COMPRESSION_T85_L0))
                s->line_compression = T4_COMPRESSION_T85_L0;
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_T85_MODE))
        {
-            if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T85))
+            if ((s->supported_compressions & T4_COMPRESSION_T85))
                s->line_compression = T4_COMPRESSION_T85;
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_T6_MODE))
        {
-            if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T6))
+            if ((s->supported_compressions & T4_COMPRESSION_T6))
                s->line_compression = T4_COMPRESSION_T6;
        }
        else if (test_ctrl_bit(dcs_frame, T30_DCS_BIT_2D_MODE))
        {
-            if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T4_2D))
+            if ((s->supported_compressions & T4_COMPRESSION_T4_2D))
                s->line_compression = T4_COMPRESSION_T4_2D;
        }
        else
        {
-            if ((s->supported_compressions & T4_SUPPORT_COMPRESSION_T4_1D))
+            if ((s->supported_compressions & T4_COMPRESSION_T4_1D))
                s->line_compression = T4_COMPRESSION_T4_1D;
        }
    }
@@ -2399,11 +2401,9 @@ static int step_fallback_entry(t30_state_t *s)
    }
    if (fallback_sequence[s->current_fallback].which == 0)
        return -1;
-    /* TODO: This only sets the minimum row time for future pages. It doesn't fix up the
-             current page, though it is benign - fallback will only result in an excessive
-             minimum. */
+    /* We need to update the minimum scan time, in case we are in non-ECM mode. */
    set_min_scan_time(s);
-    /* We need to rebuild the DCS message we will send. */
+    /* Now we need to rebuild the DCS message we will send. */
    build_dcs(s);
    return s->current_fallback;
 }
@@ -2669,16 +2669,18 @@ static void set_min_scan_time(t30_state_t *s)
        }
        span_log(&s->logging, SPAN_LOG_FLOW, "Remote FAX does not support fine resolution. Squashing image.\n");
        /* Fall through */
-    default:
    case T4_Y_RESOLUTION_STANDARD:
    case T4_Y_RESOLUTION_100:
        s->min_scan_time_code = translate_min_scan_time[0][min_bits_field];
        break;
+    default:
+        s->min_scan_time_code = T30_MIN_SCAN_0MS;
+        break;
    }
-    if (!s->error_correcting_mode  &&  (s->iaf & T30_IAF_MODE_NO_FILL_BITS))
+    if ((s->iaf & T30_IAF_MODE_NO_FILL_BITS))
        min_row_bits = 0;
    else
-        min_row_bits = fallback_sequence[s->current_fallback].bit_rate*min_scan_times[s->min_scan_time_code]/1000;
+        min_row_bits = (fallback_sequence[s->current_fallback].bit_rate*min_scan_times[s->min_scan_time_code])/1000;
    span_log(&s->logging, SPAN_LOG_FLOW, "Minimum bits per row will be %d\n", min_row_bits);
    t4_tx_set_min_bits_per_row(&s->t4.tx, min_row_bits);
 }
@@ -2714,10 +2716,11 @@ static int start_sending_document(t30_state_t *s)
        return -1;
    }

-    s->x_resolution = t4_tx_get_x_resolution(&s->t4.tx);
-    s->y_resolution = t4_tx_get_y_resolution(&s->t4.tx);
-    s->image_width = t4_tx_get_image_width(&s->t4.tx);
-    /* The minimum scan time to be used can't be evaluated until we know the Y resolution. */
+    s->x_resolution = t4_tx_get_tx_x_resolution(&s->t4.tx);
+    s->y_resolution = t4_tx_get_tx_y_resolution(&s->t4.tx);
+    s->image_width = t4_tx_get_tx_image_width(&s->t4.tx);
+    /* The minimum scan time to be used can't be evaluated until we know the Y resolution, and
+       must be evaluated before the minimum scan row bits can be evaluated. */
    set_min_scan_time(s);

    if (s->error_correcting_mode)
@@ -2793,13 +2796,13 @@ static int process_rx_dis_dtc(t30_state_t *s, const uint8_t *msg, int len)
    }

    /* Choose a compression scheme from amongst those mutually available */
-    if ((s->mutual_compressions & T4_SUPPORT_COMPRESSION_T85_L0))
+    if ((s->mutual_compressions & T4_COMPRESSION_T85_L0))
        s->line_compression = T4_COMPRESSION_T85_L0;
-    else if ((s->mutual_compressions & T4_SUPPORT_COMPRESSION_T85))
+    else if ((s->mutual_compressions & T4_COMPRESSION_T85))
        s->line_compression = T4_COMPRESSION_T85;
-    else if ((s->mutual_compressions & T4_SUPPORT_COMPRESSION_T6))
+    else if ((s->mutual_compressions & T4_COMPRESSION_T6))
        s->line_compression = T4_COMPRESSION_T6;
-    else if ((s->mutual_compressions & T4_SUPPORT_COMPRESSION_T4_2D))
+    else if ((s->mutual_compressions & T4_COMPRESSION_T4_2D))
        s->line_compression = T4_COMPRESSION_T4_2D;
    else
        s->line_compression = T4_COMPRESSION_T4_1D;
@@ -6483,7 +6486,8 @@ SPAN_DECLARE(void) t30_front_end_status(void *user_data, int status)
            {
                /* Send the end of page or partial page message */
                set_phase(s, T30_PHASE_D_TX);
-                s->next_tx_step = check_next_tx_step(s);
+                if (s->ecm_at_page_end)
+                    s->next_tx_step = check_next_tx_step(s);
                if (send_pps_frame(s) == T30_NULL)
                    set_state(s, T30_STATE_IV_PPS_NULL);
                else
@@ -6805,10 +6809,13 @@ SPAN_DECLARE(t30_state_t *) t30_init(t30_state_t *s,

    /* Default to the basic modems. */
    s->supported_modems = T30_SUPPORT_V27TER | T30_SUPPORT_V29 | T30_SUPPORT_V17;
-    s->supported_compressions = T4_SUPPORT_COMPRESSION_T4_1D | T4_SUPPORT_COMPRESSION_T4_2D;
-    s->supported_bilevel_resolutions = T4_SUPPORT_RESOLUTION_R8_STANDARD
-                                     | T4_SUPPORT_RESOLUTION_R8_FINE
-                                     | T4_SUPPORT_RESOLUTION_R8_SUPERFINE;
+    s->supported_compressions = T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D;
+    s->supported_bilevel_resolutions = T4_RESOLUTION_R8_STANDARD
+                                     | T4_RESOLUTION_R8_FINE
+                                     | T4_RESOLUTION_R8_SUPERFINE
+                                     | T4_RESOLUTION_200_100
+                                     | T4_RESOLUTION_200_200
+                                     | T4_RESOLUTION_200_400;
    s->supported_image_sizes = T4_SUPPORT_WIDTH_215MM
                             | T4_SUPPORT_LENGTH_US_LETTER
                             | T4_SUPPORT_LENGTH_US_LEGAL
@@ -685,29 +685,32 @@ SPAN_DECLARE(int) t30_set_supported_modems(t30_state_t *s, int supported_modems)
 SPAN_DECLARE(int) t30_set_supported_compressions(t30_state_t *s, int supported_compressions)
 {
    /* Mask out the ones we actually support today. */
-    supported_compressions &= T4_SUPPORT_COMPRESSION_T4_1D
-                            | T4_SUPPORT_COMPRESSION_T4_2D
-                            | T4_SUPPORT_COMPRESSION_T6
-                            | T4_SUPPORT_COMPRESSION_T85
-                            | T4_SUPPORT_COMPRESSION_T85_L0
+    supported_compressions &= T4_COMPRESSION_T4_1D
+                            | T4_COMPRESSION_T4_2D
+                            | T4_COMPRESSION_T6
+                            | T4_COMPRESSION_T85
+                            | T4_COMPRESSION_T85_L0
 #if defined(SPANDSP_SUPPORT_T88)
-                            | T4_SUPPORT_COMPRESSION_T88
+                            | T4_COMPRESSION_T88
+#endif
+                            //| T4_COMPRESSION_T42_T81
+#if defined(SPANDSP_SUPPORT_SYCC_T81)
+                            | T4_COMPRESSION_SYCC_T81
 #endif
-                            //| T4_SUPPORT_COMPRESSION_T81
 #if defined(SPANDSP_SUPPORT_T43)
-                            | T4_SUPPORT_COMPRESSION_T43
+                            | T4_COMPRESSION_T43
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
-                            | T4_SUPPORT_COMPRESSION_T45
+                            | T4_COMPRESSION_T45
 #endif
 #if 0
-                            | T4_SUPPORT_COMPRESSION_GRAYSCALE
-                            | T4_SUPPORT_COMPRESSION_COLOUR
-                            | T4_SUPPORT_COMPRESSION_12BIT
-                            | T4_SUPPORT_COMPRESSION_COLOUR_TO_GRAY
-                            | T4_SUPPORT_COMPRESSION_GRAY_TO_BILEVEL
-                            | T4_SUPPORT_COMPRESSION_COLOUR_TO_BILEVEL
-                            | T4_SUPPORT_COMPRESSION_RESCALING
+                            | T4_COMPRESSION_GRAYSCALE
+                            | T4_COMPRESSION_COLOUR
+                            | T4_COMPRESSION_12BIT
+                            | T4_COMPRESSION_COLOUR_TO_GRAY
+                            | T4_COMPRESSION_GRAY_TO_BILEVEL
+                            | T4_COMPRESSION_COLOUR_TO_BILEVEL
+                            | T4_COMPRESSION_RESCALING
 #endif
                            | 0;
    s->supported_compressions = supported_compressions;
@@ -718,23 +721,23 @@ SPAN_DECLARE(int) t30_set_supported_compressions(t30_state_t *s, int supported_c

 SPAN_DECLARE(int) t30_set_supported_bilevel_resolutions(t30_state_t *s, int supported_resolutions)
 {
-    supported_resolutions &= T4_SUPPORT_RESOLUTION_R8_STANDARD
-                           | T4_SUPPORT_RESOLUTION_R8_FINE
-                           | T4_SUPPORT_RESOLUTION_R8_SUPERFINE
-                           | T4_SUPPORT_RESOLUTION_R16_SUPERFINE
-                           | T4_SUPPORT_RESOLUTION_200_100
-                           | T4_SUPPORT_RESOLUTION_200_200
-                           | T4_SUPPORT_RESOLUTION_200_400
-                           | T4_SUPPORT_RESOLUTION_300_300
-                           | T4_SUPPORT_RESOLUTION_300_600
-                           | T4_SUPPORT_RESOLUTION_400_400
-                           | T4_SUPPORT_RESOLUTION_400_800
-                           | T4_SUPPORT_RESOLUTION_600_600
-                           | T4_SUPPORT_RESOLUTION_600_1200
-                           | T4_SUPPORT_RESOLUTION_1200_1200;
+    supported_resolutions &= T4_RESOLUTION_R8_STANDARD
+                           | T4_RESOLUTION_R8_FINE
+                           | T4_RESOLUTION_R8_SUPERFINE
+                           | T4_RESOLUTION_R16_SUPERFINE
+                           | T4_RESOLUTION_200_100
+                           | T4_RESOLUTION_200_200
+                           | T4_RESOLUTION_200_400
+                           | T4_RESOLUTION_300_300
+                           | T4_RESOLUTION_300_600
+                           | T4_RESOLUTION_400_400
+                           | T4_RESOLUTION_400_800
+                           | T4_RESOLUTION_600_600
+                           | T4_RESOLUTION_600_1200
+                           | T4_RESOLUTION_1200_1200;
    /* Make sure anything needed for colour is enabled as a bi-level image, as that is a
       rule from T.30. 100x100 is an exception, as it doesn't exist as a bi-level resolution. */
-    supported_resolutions |= (s->supported_colour_resolutions & ~T4_SUPPORT_RESOLUTION_100_100);
+    supported_resolutions |= (s->supported_colour_resolutions & ~T4_RESOLUTION_100_100);
    s->supported_bilevel_resolutions = supported_resolutions;
    t30_build_dis_or_dtc(s);
    return 0;
@@ -743,16 +746,16 @@ SPAN_DECLARE(int) t30_set_supported_bilevel_resolutions(t30_state_t *s, int supp

 SPAN_DECLARE(int) t30_set_supported_colour_resolutions(t30_state_t *s, int supported_resolutions)
 {
-    supported_resolutions &= T4_SUPPORT_RESOLUTION_100_100
-                           | T4_SUPPORT_RESOLUTION_200_200
-                           | T4_SUPPORT_RESOLUTION_300_300
-                           | T4_SUPPORT_RESOLUTION_400_400
-                           | T4_SUPPORT_RESOLUTION_600_600
-                           | T4_SUPPORT_RESOLUTION_1200_1200;
+    supported_resolutions &= T4_RESOLUTION_100_100
+                           | T4_RESOLUTION_200_200
+                           | T4_RESOLUTION_300_300
+                           | T4_RESOLUTION_400_400
+                           | T4_RESOLUTION_600_600
+                           | T4_RESOLUTION_1200_1200;
    s->supported_colour_resolutions = supported_resolutions;
    /* Make sure anything needed for colour is enabled as a bi-level image, as that is a
       rule from T.30. 100x100 is an exception, as it doesn't exist as a bi-level resolution. */
-    s->supported_bilevel_resolutions |= (s->supported_colour_resolutions & ~T4_SUPPORT_RESOLUTION_100_100);
+    s->supported_bilevel_resolutions |= (s->supported_colour_resolutions & ~T4_RESOLUTION_100_100);
    t30_build_dis_or_dtc(s);
    return 0;
 }
@@ -371,6 +371,7 @@ static int set_tiff_directory_info(t4_rx_state_t *s)
        break;
 #if defined(SPANDSP_SUPPORT_T88)
    case T4_COMPRESSION_T88:
+        s->metadata.image_length = t88_decode_get_image_length(&s->decoder.t88);
        break;
 #endif
    case T4_COMPRESSION_T42_T81:
@@ -383,6 +384,7 @@ static int set_tiff_directory_info(t4_rx_state_t *s)
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
    case T4_COMPRESSION_T45:
+        s->metadata.image_length = t45_decode_get_image_length(&s->decoder.t45);
        break;
 #endif
    }
@@ -661,31 +663,31 @@ SPAN_DECLARE(int) t4_rx_put_bit(t4_rx_state_t *s, int bit)

 SPAN_DECLARE(int) t4_rx_put(t4_rx_state_t *s, const uint8_t buf[], size_t len)
 {
+    uint8_t *buf2;
+
    s->line_image_size += 8*len;
-    switch (s->metadata.compression)
+
+    if (s->pre_encoded_len > 0)
    {
-    case T4_COMPRESSION_T4_1D:
-    case T4_COMPRESSION_T4_2D:
-    case T4_COMPRESSION_T6:
-        return t4_t6_decode_put(&s->decoder.t4_t6, buf, len);
-    case T4_COMPRESSION_T85:
-    case T4_COMPRESSION_T85_L0:
-        return t85_decode_put(&s->decoder.t85, buf, len);
-#if defined(SPANDSP_SUPPORT_T88)
-    case T4_COMPRESSION_T88:
-        break;
-#endif
-    case T4_COMPRESSION_T42_T81:
-        return t42_decode_put(&s->decoder.t42, buf, len);
-#if defined(SPANDSP_SUPPORT_T43)
-    case T4_COMPRESSION_T43:
-        return t43_decode_put(&s->decoder.t43, buf, len);
-#endif
-#if defined(SPANDSP_SUPPORT_T45)
-    case T4_COMPRESSION_T45:
-        break;
-#endif
+        if (s->pre_encoded_len < s->pre_encoded_ptr + 65536)
+        {
+            s->pre_encoded_len += 65536;
+            if ((buf2 = realloc(s->pre_encoded_buf, s->pre_encoded_len)) == NULL)
+            {
+                if (s->pre_encoded_buf)
+                    free(s->pre_encoded_buf);
+                return -1;
+            }
+            s->pre_encoded_buf = buf2;
+        }
+        memcpy(&s->pre_encoded_buf[s->pre_encoded_ptr], buf, len);
+        s->pre_encoded_ptr += len;
+        return T4_DECODE_MORE_DATA;
    }
+
+    if (s->image_put_handler)
+        return s->image_put_handler((void *) &s->decoder, buf, len);
+
    return T4_DECODE_OK;
 }
 /*- End of function --------------------------------------------------------*/
@@ -738,20 +740,20 @@ static void select_tiff_compression(t4_rx_state_t *s, int output_image_type)
    {
        /* Only provide for one form of coding throughout the file, even though the
           coding on the wire could change between pages. */
-        if ((s->supported_tiff_compressions & T4_SUPPORT_COMPRESSION_T85))
+        if ((s->supported_tiff_compressions & T4_COMPRESSION_T85))
            s->tiff.compression = T4_COMPRESSION_T85;
-        else if ((s->supported_tiff_compressions & T4_SUPPORT_COMPRESSION_T6))
+        else if ((s->supported_tiff_compressions & T4_COMPRESSION_T6))
            s->tiff.compression = T4_COMPRESSION_T6;
-        else if ((s->supported_tiff_compressions & T4_SUPPORT_COMPRESSION_T4_2D))
+        else if ((s->supported_tiff_compressions & T4_COMPRESSION_T4_2D))
            s->tiff.compression = T4_COMPRESSION_T4_2D;
-        else if ((s->supported_tiff_compressions & T4_SUPPORT_COMPRESSION_T4_1D))
+        else if ((s->supported_tiff_compressions & T4_COMPRESSION_T4_1D))
            s->tiff.compression = T4_COMPRESSION_T4_1D;
    }
    else
    {
-        if ((s->supported_tiff_compressions & T4_SUPPORT_COMPRESSION_T42_T81))
+        if ((s->supported_tiff_compressions & T4_COMPRESSION_T42_T81))
            s->tiff.compression = T4_COMPRESSION_T42_T81;
-        else if ((s->supported_tiff_compressions & T4_SUPPORT_COMPRESSION_T43))
+        else if ((s->supported_tiff_compressions & T4_COMPRESSION_T43))
            s->tiff.compression = T4_COMPRESSION_T43;
    }
 }
@@ -884,7 +886,7 @@ SPAN_DECLARE(int) t4_rx_set_row_write_handler(t4_rx_state_t *s, t4_row_write_han
        return t85_decode_set_row_write_handler(&s->decoder.t85, handler, user_data);
 #if defined(SPANDSP_SUPPORT_T88)
    case T4_COMPRESSION_T88:
-        break;
+        return t88_decode_set_row_write_handler(&s->decoder.t88, handler, user_data);
 #endif
    case T4_COMPRESSION_T42_T81:
        return t42_decode_set_row_write_handler(&s->decoder.t42, handler, user_data);
@@ -894,7 +896,7 @@ SPAN_DECLARE(int) t4_rx_set_row_write_handler(t4_rx_state_t *s, t4_row_write_han
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
    case T4_COMPRESSION_T45:
-        break;
+        return t45_decode_set_row_write_handler(&s->decoder.t45, handler, user_data);
 #endif
    }
    return -1;
@@ -942,7 +944,7 @@ SPAN_DECLARE(void) t4_rx_get_transfer_statistics(t4_rx_state_t *s, t4_stats_t *t
        break;
 #endif
    case T4_COMPRESSION_T42_T81:
-        t->type = 0;
+        t->type = T4_IMAGE_TYPE_COLOUR_8BIT; //T4_IMAGE_TYPE_GRAY_8BIT;
        t->width = t42_decode_get_image_width(&s->decoder.t42);
        t->length = t42_decode_get_image_length(&s->decoder.t42);
        t->image_type = t->type;
@@ -952,7 +954,7 @@ SPAN_DECLARE(void) t4_rx_get_transfer_statistics(t4_rx_state_t *s, t4_stats_t *t
        break;
 #if defined(SPANDSP_SUPPORT_T43)
    case T4_COMPRESSION_T43:
-        t->type = 0;
+        t->type = T4_IMAGE_TYPE_COLOUR_8BIT;
        t->width = t43_decode_get_image_width(&s->decoder.t43);
        t->length = t43_decode_get_image_length(&s->decoder.t43);
        t->image_type = t->type;
@@ -975,29 +977,42 @@ SPAN_DECLARE(int) t4_rx_start_page(t4_rx_state_t *s)

    switch (s->metadata.compression)
    {
+    case 0:
+        s->pre_encoded_ptr = 0;
+        s->pre_encoded_len = 0;
+        s->image_put_handler = NULL;
+        break;
    case T4_COMPRESSION_T4_1D:
    case T4_COMPRESSION_T4_2D:
    case T4_COMPRESSION_T6:
        t4_t6_decode_restart(&s->decoder.t4_t6, s->metadata.image_width);
+        s->image_put_handler = (t4_image_put_handler_t) t4_t6_decode_put;
        break;
    case T4_COMPRESSION_T85:
    case T4_COMPRESSION_T85_L0:
        t85_decode_restart(&s->decoder.t85);
+        s->image_put_handler = (t4_image_put_handler_t) t85_decode_put;
        break;
 #if defined(SPANDSP_SUPPORT_T88)
    case T4_COMPRESSION_T88:
+        t88_decode_restart(&s->decoder.t88);
+        s->image_put_handler = (t4_image_put_handler_t) t88_decode_put;
        break;
 #endif
    case T4_COMPRESSION_T42_T81:
        t42_decode_restart(&s->decoder.t42);
+        s->image_put_handler = (t4_image_put_handler_t) t42_decode_put;
        break;
 #if defined(SPANDSP_SUPPORT_T43)
    case T4_COMPRESSION_T43:
        t43_decode_restart(&s->decoder.t43);
+        s->image_put_handler = (t4_image_put_handler_t) t43_decode_put;
        break;
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
    case T4_COMPRESSION_T45:
+        t45_decode_restart(&s->decoder.t45);
+        s->image_put_handler = (t4_image_put_handler_t) t45_decode_put;
        break;
 #endif
    }
@@ -1037,35 +1052,41 @@ SPAN_DECLARE(int) t4_rx_end_page(t4_rx_state_t *s)
    int length;

    length = 0;
+
+    if (s->image_put_handler)
+        s->image_put_handler((void *) &s->decoder, NULL, 0);
+
    switch (s->metadata.compression)
    {
    case T4_COMPRESSION_T4_1D:
    case T4_COMPRESSION_T4_2D:
    case T4_COMPRESSION_T6:
-        t4_t6_decode_put(&s->decoder.t4_t6, NULL, 0);
        length = t4_t6_decode_get_image_length(&s->decoder.t4_t6);
        break;
    case T4_COMPRESSION_T85:
    case T4_COMPRESSION_T85_L0:
-        t85_decode_put(&s->decoder.t85, NULL, 0);
        length = t85_decode_get_image_length(&s->decoder.t85);
        break;
 #if defined(SPANDSP_SUPPORT_T88)
    case T4_COMPRESSION_T88:
+        length = t88_decode_get_image_length(&s->decoder.t88);
        break;
 #endif
    case T4_COMPRESSION_T42_T81:
-        t42_decode_put(&s->decoder.t42, NULL, 0);
        length = t42_decode_get_image_length(&s->decoder.t42);
+        if (s->decoder.t42.samples_per_pixel == 3)
+            select_tiff_compression(s, T4_IMAGE_TYPE_COLOUR_8BIT);
+        else
+            select_tiff_compression(s, T4_IMAGE_TYPE_GRAY_8BIT);
        break;
 #if defined(SPANDSP_SUPPORT_T43)
    case T4_COMPRESSION_T43:
-        t43_decode_put(&s->decoder.t43, NULL, 0);
        length = t43_decode_get_image_length(&s->decoder.t43);
        break;
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
    case T4_COMPRESSION_T45:
+        length = t45_decode_get_image_length(&s->decoder.t45);
        break;
 #endif
    }
@@ -1156,7 +1177,7 @@ SPAN_DECLARE(int) t4_rx_release(t4_rx_state_t *s)
        return t85_decode_release(&s->decoder.t85);
 #if defined(SPANDSP_SUPPORT_T88)
    case T4_COMPRESSION_T88:
-        break;
+        return t88_decode_release(&s->decoder.t88);
 #endif
    case T4_COMPRESSION_T42_T81:
        return t42_decode_release(&s->decoder.t42);
@@ -1166,7 +1187,7 @@ SPAN_DECLARE(int) t4_rx_release(t4_rx_state_t *s)
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
    case T4_COMPRESSION_T45:
-        break;
+        return t45_decode_release(&s->decoder.t45);
 #endif
    }
    return -1;
@@ -1040,6 +1040,12 @@ SPAN_DECLARE(int) t4_t6_encode_set_image_width(t4_t6_encode_state_t *s, int imag
 }
 /*- End of function --------------------------------------------------------*/

+SPAN_DECLARE(int) t4_t6_encode_set_image_length(t4_t6_encode_state_t *s, int image_length)
+{
+    return 0;
+}
+/*- End of function --------------------------------------------------------*/
+
 SPAN_DECLARE(uint32_t) t4_t6_encode_get_image_width(t4_t6_encode_state_t *s)
 {
    return s->image_width;
@@ -132,18 +132,19 @@ static const res_table_t y_res_table[] =
    {             -1.00f, -1}
 };

-static const int resolution_map[10][10] =
+static const int resolution_map[10][9] =
 {
-    {                    0, 0,                     0,  T4_RESOLUTION_R8_STANDARD,                     0,                     0,                           0,                      0, 0,                       0},
-    {T4_RESOLUTION_100_100, 0, T4_RESOLUTION_200_100,                          0,                     0,                     0,                           0,                      0, 0,                       0},
-    {                    0, 0,                     0,      T4_RESOLUTION_R8_FINE,                     0,                     0,                           0,                      0, 0,                       0},
-    {                    0, 0, T4_RESOLUTION_200_200,                          0,                     0,                     0,                           0,                      0, 0,                       0},
-    {                    0, 0,                     0,                          0, T4_RESOLUTION_300_300,                     0,                           0,                      0, 0,                       0},
-    {                    0, 0,                     0, T4_RESOLUTION_R8_SUPERFINE,                     0,                     0, T4_RESOLUTION_R16_SUPERFINE,                      0, 0,                       0},
-    {                    0, 0, T4_RESOLUTION_200_400,                          0,                     0, T4_RESOLUTION_400_400,                           0,                      0, 0,                       0},
-    {                    0, 0,                     0,                          0, T4_RESOLUTION_300_600,                     0,                           0,  T4_RESOLUTION_600_600, 0,                       0},
-    {                    0, 0,                     0,                          0,                     0, T4_RESOLUTION_400_800,                           0,                      0, 0,                       0},
-    {                    0, 0,                     0,                          0,                     0,                     0,                           0, T4_RESOLUTION_600_1200, 0, T4_RESOLUTION_1200_1200},
+    /*  x =           100 102                    200                         204                    300                    400                          408                     600                     1200 */
+    {                    0, 0,                     0,  T4_RESOLUTION_R8_STANDARD,                     0,                     0,                           0,                      0,                       0}, /* y = 3.85/mm */
+    {T4_RESOLUTION_100_100, 0, T4_RESOLUTION_200_100,                          0,                     0,                     0,                           0,                      0,                       0}, /* y = 100 */
+    {                    0, 0,                     0,      T4_RESOLUTION_R8_FINE,                     0,                     0,                           0,                      0,                       0}, /* y = 7.7/mm */
+    {                    0, 0, T4_RESOLUTION_200_200,                          0,                     0,                     0,                           0,                      0,                       0}, /* y = 200 */
+    {                    0, 0,                     0,                          0, T4_RESOLUTION_300_300,                     0,                           0,                      0,                       0}, /* y = 300 */
+    {                    0, 0,                     0, T4_RESOLUTION_R8_SUPERFINE,                     0,                     0, T4_RESOLUTION_R16_SUPERFINE,                      0,                       0}, /* y = 154/mm */
+    {                    0, 0, T4_RESOLUTION_200_400,                          0,                     0, T4_RESOLUTION_400_400,                           0,                      0,                       0}, /* y = 400 */
+    {                    0, 0,                     0,                          0, T4_RESOLUTION_300_600,                     0,                           0,  T4_RESOLUTION_600_600,                       0}, /* y = 600 */
+    {                    0, 0,                     0,                          0,                     0, T4_RESOLUTION_400_800,                           0,                      0,                       0}, /* y = 800 */
+    {                    0, 0,                     0,                          0,                     0,                     0,                           0, T4_RESOLUTION_600_1200, T4_RESOLUTION_1200_1200}  /* y = 1200 */
 };

 #if defined(SPANDSP_SUPPORT_TIFF_FX)
@@ -484,7 +485,7 @@ static int test_tiff_directory_info(t4_tx_state_t *s)

    parm32 = 0;
    TIFFGetField(t->tiff_file, TIFFTAG_IMAGEWIDTH, &parm32);
-    if (s->metadata.image_width != (int) parm32)
+    if (s->tiff.image_width != (int) parm32)
        return 1;
    x_resolution = 0.0f;
    TIFFGetField(t->tiff_file, TIFFTAG_XRESOLUTION, &x_resolution);
@@ -540,16 +541,16 @@ static int tiff_row_read_handler(void *user_data, uint8_t buf[], size_t len)
    int j;

    s = (t4_tx_state_t *) user_data;
-    if (s->tiff.row >= s->metadata.image_length)
+    if (s->tiff.row >= s->tiff.image_length)
        return 0;
    memcpy(buf, &s->tiff.image_buffer[s->tiff.row*len], len);
    s->tiff.row++;

    /* If this is a bi-level image which has more vertical resolution than the
       far end will accept, we need to squash it down to size. */
-    for (i = 1;  i < s->row_squashing_ratio  &&  s->tiff.row < s->metadata.image_length;  i++)
+    for (i = 1;  i < s->row_squashing_ratio  &&  s->tiff.row < s->tiff.image_length;  i++)
    {
-        for (j = 0;  j < s->metadata.image_width/8;  j++)
+        for (j = 0;  j < s->tiff.image_width/8;  j++)
            buf[j] |= s->tiff.image_buffer[s->tiff.row*len + j];
        s->tiff.row++;
    }
@@ -603,7 +604,6 @@ static int read_tiff_t85_image(t4_tx_state_t *s)
 {
    int biggest;
    int num_strips;
-    int total_len;
    int len;
    int i;
    int result;
@@ -614,8 +614,8 @@ static int read_tiff_t85_image(t4_tx_state_t *s)

    /* Size up and allocate the buffer for the raw data */
    num_strips = TIFFNumberOfStrips(s->tiff.tiff_file);
-    biggest = TIFFRawStripSize(s->tiff.tiff_file, 0);
-    for (i = 1;  i < num_strips;  i++)
+    biggest = 0;
+    for (i = 0;  i < num_strips;  i++)
    {
        len = TIFFRawStripSize(s->tiff.tiff_file, i);
        if (len > biggest)
@@ -624,11 +624,14 @@ static int read_tiff_t85_image(t4_tx_state_t *s)
    if ((raw_data = malloc(biggest)) == NULL)
        return -1;

-    s->tiff.image_size = s->metadata.image_length*((s->metadata.image_width + 7)/8);
+    s->tiff.image_size = s->tiff.image_length*((s->tiff.image_width + 7)/8);
    if (s->tiff.image_size >= s->tiff.image_buffer_size)
    {
        if ((t = realloc(s->tiff.image_buffer, s->tiff.image_size)) == NULL)
+        {
+            free(raw_data);
            return -1;
+        }
        s->tiff.image_buffer_size = s->tiff.image_size;
        s->tiff.image_buffer = t;
    }
@@ -639,14 +642,14 @@ static int read_tiff_t85_image(t4_tx_state_t *s)
    t85_decode_init(&t85, packing_row_write_handler, &pack);
    t85_decode_set_comment_handler(&t85, 1000, embedded_comment_handler, s);

-    total_len = 0;
    result = -1;
-    for (i = 0;  i < num_strips;  i++, total_len += len)
+    for (i = 0;  i < num_strips;  i++)
    {
        len = TIFFRawStripSize(s->tiff.tiff_file, i);
        if ((len = TIFFReadRawStrip(s->tiff.tiff_file, i, raw_data, len)) < 0)
        {
-            span_log(&s->logging, SPAN_LOG_WARNING, "%s: ReadRaw error.\n", s->tiff.file);
+            span_log(&s->logging, SPAN_LOG_WARNING, "%s: TIFFReadRawStrip error.\n", s->tiff.file);
+            free(raw_data);
            return -1;
        }
        result = t85_decode_put(&t85, raw_data, len);
@@ -657,7 +660,7 @@ static int read_tiff_t85_image(t4_tx_state_t *s)
        result = t85_decode_put(&t85, NULL, 0);

    len = t85_decode_get_compressed_image_size(&t85);
-    span_log(&s->logging, SPAN_LOG_WARNING, "Compressed image is %d bytes, %d rows\n", len/8, s->metadata.image_length);
+    span_log(&s->logging, SPAN_LOG_WARNING, "Compressed image is %d bytes, %d rows\n", len/8, s->tiff.image_length);
    t85_decode_release(&t85);
    free(raw_data);
    return 0;
@@ -716,20 +719,26 @@ static int read_tiff_t43_image(t4_tx_state_t *s, uint8_t **buf)
 #endif

 #if 0
-static int read_tiff_t42_t81_image(t4_tx_state_t *s, uint8_t **buf)
+static int read_tiff_t42_t81_image(t4_tx_state_t *s)
 {
    int total_len;
    int len;
    int i;
    int num_strips;
    int total_image_len;
-    int image_size;
+    uint8_t *t;
    uint8_t *raw_data;
    uint8_t *jpeg_table;
    uint32_t jpeg_table_len;
-    uint32_t w;
-    uint32_t h;
-    tsize_t off;
+    packer_t pack;
+    uint16_t bits_per_sample;
+    uint16_t samples_per_pixel;
+    t42_decode_state_t t42;
+
+    bits_per_sample = 1;
+    TIFFGetField(s->tiff.tiff_file, TIFFTAG_BITSPERSAMPLE, &bits_per_sample);
+    samples_per_pixel = 1;
+    TIFFGetField(s->tiff.tiff_file, TIFFTAG_SAMPLESPERPIXEL, &samples_per_pixel);

    num_strips = TIFFNumberOfStrips(s->tiff.tiff_file);
    total_image_len = 0;
@@ -752,7 +761,8 @@ static int read_tiff_t42_t81_image(t4_tx_state_t *s, uint8_t **buf)
    {
        if ((len = TIFFReadRawStrip(s->tiff.tiff_file, i, &raw_data[total_len], total_image_len - total_len)) < 0)
        {
-            span_log(&s->logging, SPAN_LOG_FLOW, "TIFF read error.\n");
+            span_log(&s->logging, SPAN_LOG_WARNING, "%s: TIFFReadRawStrip error.\n", s->tiff.file);
+            free(raw_data);
            return -1;
        }
    }
@@ -762,18 +772,30 @@ static int read_tiff_t42_t81_image(t4_tx_state_t *s, uint8_t **buf)
    if (total_len != total_image_len)
        span_log(&s->logging, SPAN_LOG_FLOW, "Size mismatch %d %d\n", (int) total_len, (int) total_image_len);

-    image_size = 3*s->metadata.image_length*s->metadata.image_width;
-    if ((*buf = malloc(image_size)) == NULL)
-        return -1;
-
-    off = 0;
-    if (!t42_itulab_to_srgb(&s->logging, &s->lab_params, *buf, &off, raw_data, total_image_len, &w, &h))
+    s->tiff.image_size = samples_per_pixel*s->tiff.image_width*s->tiff.image_length;
+    if (s->tiff.image_size >= s->tiff.image_buffer_size)
    {
-        span_log(&s->logging, SPAN_LOG_FLOW, "Failed to convert from ITULAB.\n");
-        return -1;
+        if ((t = realloc(s->tiff.image_buffer, s->tiff.image_size)) == NULL)
+        {
+            free(raw_data);
+            return -1;
+        }
+        s->tiff.image_buffer_size = s->tiff.image_size;
+        s->tiff.image_buffer = t;
    }
+
+    t42_decode_init(&t42, packing_row_write_handler, &pack);
+
+    pack.buf = s->tiff.image_buffer;
+    pack.ptr = 0;
+    pack.row = 0;
+
+    t42_decode_put(&t42, raw_data, total_image_len);
+    t42_decode_put(&t42, NULL, 0);
+
+    t42_decode_release(&t42);
    free(raw_data);
-    return image_size;
+    return s->tiff.image_size;
 }
 /*- End of function --------------------------------------------------------*/
 #endif
@@ -788,7 +810,7 @@ static int read_tiff_decompressed_image(t4_tx_state_t *s)

    /* Decode the whole image into a buffer */
    /* Let libtiff handle the decompression */
-    s->tiff.image_size = s->metadata.image_length*TIFFScanlineSize(s->tiff.tiff_file);
+    s->tiff.image_size = s->tiff.image_length*TIFFScanlineSize(s->tiff.tiff_file);
    if (s->tiff.image_size >= s->tiff.image_buffer_size)
    {
        if ((t = realloc(s->tiff.image_buffer, s->tiff.image_size)) == NULL)
@@ -797,14 +819,13 @@ static int read_tiff_decompressed_image(t4_tx_state_t *s)
        s->tiff.image_buffer = t;
    }

-    /* Allow for the image being stored in multiple strips, although it is rare to find
-       a stripped image in a T.4 or T.6 encoded file. */
+    /* Allow for the image being stored in multiple strips. */
    num_strips = TIFFNumberOfStrips(s->tiff.tiff_file);
    for (i = 0, total_len = 0;  i < num_strips;  i++, total_len += len)
    {
        if ((len = TIFFReadEncodedStrip(s->tiff.tiff_file, i, &s->tiff.image_buffer[total_len], s->tiff.image_size - total_len)) < 0)
        {
-            span_log(&s->logging, SPAN_LOG_WARNING, "%s: Read error.\n", s->tiff.file);
+            span_log(&s->logging, SPAN_LOG_WARNING, "%s: TIFFReadEncodedStrip error.\n", s->tiff.file);
            return -1;
        }
    }
@@ -934,7 +955,7 @@ static int set_row_read_handler(t4_tx_state_t *s, t4_row_read_handler_t handler,
        return t85_encode_set_row_read_handler(&s->encoder.t85, handler, user_data);
 #if defined(SPANDSP_SUPPORT_T88)
    case T4_COMPRESSION_T88:
-        break;
+        return t88_encode_set_row_read_handler(&s->encoder.t88, handler, user_data);
 #endif
    case T4_COMPRESSION_T42_T81:
    case T4_COMPRESSION_SYCC_T81:
@@ -945,7 +966,7 @@ static int set_row_read_handler(t4_tx_state_t *s, t4_row_read_handler_t handler,
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
    case T4_COMPRESSION_T45:
-        break;
+        return t45_encode_set_row_read_handler(&s->encoder.t45, handler, user_data);
 #endif
    }
    return -1;
@@ -996,7 +1017,8 @@ static int make_header(t4_tx_state_t *s)

 static int header_row_read_handler(void *user_data, uint8_t buf[], size_t len)
 {
-    int repeats;
+    int x_repeats;
+    int y_repeats;
    int pattern;
    int pos;
    int row;
@@ -1007,28 +1029,30 @@ static int header_row_read_handler(void *user_data, uint8_t buf[], size_t len)
    switch (s->metadata.y_resolution)
    {
    case T4_Y_RESOLUTION_1200:
-        repeats = 12;
+        y_repeats = 12;
        break;
    case T4_Y_RESOLUTION_800:
-        repeats = 8;
+        y_repeats = 8;
        break;
    case T4_Y_RESOLUTION_600:
-        repeats = 6;
+        y_repeats = 6;
        break;
    case T4_Y_RESOLUTION_SUPERFINE:
-        repeats = 4;
+    case T4_Y_RESOLUTION_400:
+        y_repeats = 4;
        break;
    case T4_Y_RESOLUTION_300:
-        repeats = 3;
+        y_repeats = 3;
        break;
    case T4_Y_RESOLUTION_FINE:
-        repeats = 2;
+    case T4_Y_RESOLUTION_200:
+        y_repeats = 2;
        break;
    default:
-        repeats = 1;
+        y_repeats = 1;
        break;
    }
-    repeats /= s->row_squashing_ratio;
+    y_repeats /= s->row_squashing_ratio;
    if (s->header_overlays_image)
    {
        /* Read and dump a row of the real image, allowing for the possibility
@@ -1039,7 +1063,7 @@ static int header_row_read_handler(void *user_data, uint8_t buf[], size_t len)
            return len;
        }
    }
-    row = s->header_row/repeats;
+    row = s->header_row/y_repeats;
    pos = 0;
    for (t = s->header_text;  *t  &&  pos <= len - 2;  t++)
    {
@@ -1050,7 +1074,7 @@ static int header_row_read_handler(void *user_data, uint8_t buf[], size_t len)
    while (pos < len)
        buf[pos++] = 0;
    s->header_row++;
-    if (s->header_row >= 16*repeats)
+    if (s->header_row >= 16*y_repeats)
    {
        /* End of header. Change to normal image row data. */
        set_row_read_handler(s, s->row_handler, s->row_handler_user_data);
@@ -1088,10 +1112,10 @@ SPAN_DECLARE(int) t4_tx_set_row_read_handler(t4_tx_state_t *s, t4_row_read_handl
 }
 /*- End of function --------------------------------------------------------*/

-SPAN_DECLARE(int) t4_tx_set_tx_encoding(t4_tx_state_t *s, int encoding)
+SPAN_DECLARE(int) t4_tx_set_tx_encoding(t4_tx_state_t *s, int compression)
 {
    {
-        switch (encoding)
+        switch (compression)
        {
        case T4_COMPRESSION_T4_1D:
        case T4_COMPRESSION_T4_2D:
@@ -1103,12 +1127,12 @@ SPAN_DECLARE(int) t4_tx_set_tx_encoding(t4_tx_state_t *s, int encoding)
            case T4_COMPRESSION_T6:
                break;
            default:
-                t4_t6_encode_init(&s->encoder.t4_t6, encoding, s->metadata.image_width, s->metadata.image_length, s->row_handler, s->row_handler_user_data);
+                t4_t6_encode_init(&s->encoder.t4_t6, compression, s->metadata.image_width, s->metadata.image_length, s->row_handler, s->row_handler_user_data);
                t4_t6_encode_set_max_2d_rows_per_1d_row(&s->encoder.t4_t6, -s->metadata.y_resolution);
                break;
            }
-            s->metadata.compression = encoding;
-            if (t4_t6_encode_set_encoding(&s->encoder.t4_t6, encoding))
+            s->metadata.compression = compression;
+            if (t4_t6_encode_set_encoding(&s->encoder.t4_t6, compression))
                return -1;
            return s->metadata.compression;
        case T4_COMPRESSION_T85:
@@ -1122,7 +1146,7 @@ SPAN_DECLARE(int) t4_tx_set_tx_encoding(t4_tx_state_t *s, int encoding)
                t85_encode_init(&s->encoder.t85, s->metadata.image_width, s->metadata.image_length, s->row_handler, s->row_handler_user_data);
                break;
            }
-            s->metadata.compression = encoding;
+            s->metadata.compression = compression;
            return s->metadata.compression;
 #if defined(SPANDSP_SUPPORT_T88)
        case T4_COMPRESSION_T88:
@@ -1131,9 +1155,10 @@ SPAN_DECLARE(int) t4_tx_set_tx_encoding(t4_tx_state_t *s, int encoding)
            case T4_COMPRESSION_T88:
                break;
            default:
+                t88_encode_init(&s->encoder.t88, s->metadata.image_width, s->metadata.image_length, s->row_handler, s->row_handler_user_data);
                break;
            }
-            s->metadata.compression = encoding;
+            s->metadata.compression = compression;
            return s->metadata.compression;
 #endif
        case T4_COMPRESSION_T42_T81:
@@ -1147,7 +1172,7 @@ SPAN_DECLARE(int) t4_tx_set_tx_encoding(t4_tx_state_t *s, int encoding)
                t42_encode_init(&s->encoder.t42, s->metadata.image_width, s->metadata.image_length, s->row_handler, s->row_handler_user_data);
                break;
            }
-            s->metadata.compression = encoding;
+            s->metadata.compression = compression;
            return s->metadata.compression;
 #if defined(SPANDSP_SUPPORT_T43)
        case T4_COMPRESSION_T43:
@@ -1159,7 +1184,7 @@ SPAN_DECLARE(int) t4_tx_set_tx_encoding(t4_tx_state_t *s, int encoding)
                t43_encode_init(&s->encoder.t43, s->metadata.image_width, s->metadata.image_length, s->row_handler, s->row_handler_user_data);
                break;
            }
-            s->metadata.compression = encoding;
+            s->metadata.compression = compression;
            return s->metadata.compression;
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
@@ -1169,9 +1194,10 @@ SPAN_DECLARE(int) t4_tx_set_tx_encoding(t4_tx_state_t *s, int encoding)
            case T4_COMPRESSION_T45:
                break;
            default:
+                t45_encode_init(&s->encoder.t45, s->metadata.image_width, s->metadata.image_length, s->row_handler, s->row_handler_user_data);
                break;
            }
-            s->metadata.compression = encoding;
+            s->metadata.compression = compression;
            return s->metadata.compression;
 #endif
        }
@@ -1193,6 +1219,42 @@ SPAN_DECLARE(void) t4_tx_set_min_bits_per_row(t4_tx_state_t *s, int bits)
 }
 /*- End of function --------------------------------------------------------*/

+SPAN_DECLARE(int) t4_tx_get_tx_compression(t4_tx_state_t *s)
+{
+    return s->metadata.compression;
+}
+/*- End of function --------------------------------------------------------*/
+
+SPAN_DECLARE(int) t4_tx_get_tx_image_type(t4_tx_state_t *s)
+{
+    return s->metadata.image_type;
+}
+/*- End of function --------------------------------------------------------*/
+
+SPAN_DECLARE(int) t4_tx_get_tx_resolution(t4_tx_state_t *s)
+{
+    return s->metadata.resolution_code;
+}
+/*- End of function --------------------------------------------------------*/
+
+SPAN_DECLARE(int) t4_tx_get_tx_x_resolution(t4_tx_state_t *s)
+{
+    return s->metadata.x_resolution;
+}
+/*- End of function --------------------------------------------------------*/
+
+SPAN_DECLARE(int) t4_tx_get_tx_y_resolution(t4_tx_state_t *s)
+{
+    return s->metadata.y_resolution;
+}
+/*- End of function --------------------------------------------------------*/
+
+SPAN_DECLARE(int) t4_tx_get_tx_image_width(t4_tx_state_t *s)
+{
+    return s->metadata.image_width;
+}
+/*- End of function --------------------------------------------------------*/
+
 SPAN_DECLARE(void) t4_tx_set_image_width(t4_tx_state_t *s, int image_width)
 {
    s->metadata.image_width = image_width;
@@ -1209,6 +1271,7 @@ SPAN_DECLARE(void) t4_tx_set_image_width(t4_tx_state_t *s, int image_width)
        break;
 #if defined(SPANDSP_SUPPORT_T88)
    case T4_COMPRESSION_T88:
+        t88_encode_set_image_width(&s->encoder.t88, image_width);
        break;
 #endif
    case T4_COMPRESSION_T42_T81:
@@ -1222,6 +1285,7 @@ SPAN_DECLARE(void) t4_tx_set_image_width(t4_tx_state_t *s, int image_width)
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
    case T4_COMPRESSION_T45:
+        t45_encode_set_image_width(&s->encoder.t45, image_width);
        break;
 #endif
    }
@@ -1239,6 +1303,7 @@ static void t4_tx_set_image_length(t4_tx_state_t *s, uint32_t image_length)
        break;
 #if defined(SPANDSP_SUPPORT_T88)
    case T4_COMPRESSION_T88:
+        t88_encode_set_image_length(&s->encoder.t88, image_length);
        break;
 #endif
    case T4_COMPRESSION_T42_T81:
@@ -1252,6 +1317,7 @@ static void t4_tx_set_image_length(t4_tx_state_t *s, uint32_t image_length)
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
    case T4_COMPRESSION_T45:
+        t45_encode_set_image_length(&s->encoder.t45, image_length);
        break;
 #endif
    }
@@ -1271,12 +1337,6 @@ SPAN_DECLARE(void) t4_tx_set_max_2d_rows_per_1d_row(t4_tx_state_t *s, int max)
 }
 /*- End of function --------------------------------------------------------*/

-SPAN_DECLARE(int) t4_tx_get_image_width(t4_tx_state_t *s)
-{
-    return s->metadata.image_width;
-}
-/*- End of function --------------------------------------------------------*/
-
 SPAN_DECLARE(void) t4_tx_set_header_overlays_image(t4_tx_state_t *s, int header_overlays_image)
 {
    s->header_overlays_image = header_overlays_image;
@@ -1301,30 +1361,6 @@ SPAN_DECLARE(void) t4_tx_set_header_tz(t4_tx_state_t *s, struct tz_s *tz)
 }
 /*- End of function --------------------------------------------------------*/

-SPAN_DECLARE(int) t4_tx_get_y_resolution(t4_tx_state_t *s)
-{
-    return s->metadata.y_resolution;
-}
-/*- End of function --------------------------------------------------------*/
-
-SPAN_DECLARE(int) t4_tx_get_x_resolution(t4_tx_state_t *s)
-{
-    return s->metadata.x_resolution;
-}
-/*- End of function --------------------------------------------------------*/
-
-SPAN_DECLARE(int) t4_tx_get_resolution(t4_tx_state_t *s)
-{
-    return s->metadata.resolution_code;
-}
-/*- End of function --------------------------------------------------------*/
-
-SPAN_DECLARE(int) t4_tx_get_image_type(t4_tx_state_t *s)
-{
-    return s->metadata.image_type;
-}
-/*- End of function --------------------------------------------------------*/
-
 SPAN_DECLARE(int) t4_tx_get_pages_in_file(t4_tx_state_t *s)
 {
    int max;
@@ -1354,12 +1390,14 @@ SPAN_DECLARE(void) t4_tx_get_transfer_statistics(t4_tx_state_t *s, t4_stats_t *t
    t->image_type = s->tiff.image_type;
    t->image_width = s->tiff.image_width;
    t->image_length = s->tiff.image_length;
+
    t->image_x_resolution = s->tiff.x_resolution;
    t->image_y_resolution = s->tiff.y_resolution;
-
    t->x_resolution = s->metadata.x_resolution;
    t->y_resolution = s->metadata.y_resolution/s->row_squashing_ratio;
+
    t->compression = s->metadata.compression;
+
    switch (s->metadata.compression)
    {
    case T4_COMPRESSION_T4_1D:
@@ -1379,6 +1417,9 @@ SPAN_DECLARE(void) t4_tx_get_transfer_statistics(t4_tx_state_t *s, t4_stats_t *t
        break;
 #if defined(SPANDSP_SUPPORT_T88)
    case T4_COMPRESSION_T88:
+        t->width = t88_encode_get_image_width(&s->encoder.t88);
+        t->length = t88_encode_get_image_length(&s->encoder.t88);
+        t->line_image_size = t88_encode_get_compressed_image_size(&s->encoder.t88)/8;
        break;
 #endif
    case T4_COMPRESSION_T42_T81:
@@ -1398,6 +1439,9 @@ SPAN_DECLARE(void) t4_tx_get_transfer_statistics(t4_tx_state_t *s, t4_stats_t *t
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
    case T4_COMPRESSION_T45:
+        t->width = t45_encode_get_image_width(&s->encoder.t45);
+        t->length = t45_encode_get_image_length(&s->encoder.t45);
+        t->line_image_size = t45_encode_get_compressed_image_size(&s->encoder.t45)/8;
        break;
 #endif
    }
@@ -1417,7 +1461,7 @@ SPAN_DECLARE(int) t4_tx_image_complete(t4_tx_state_t *s)
        return t85_encode_image_complete(&s->encoder.t85);
 #if defined(SPANDSP_SUPPORT_T88)
    case T4_COMPRESSION_T88:
-        break;
+        return t88_encode_image_complete(&s->encoder.t88);
 #endif
    case T4_COMPRESSION_T42_T81:
    case T4_COMPRESSION_SYCC_T81:
@@ -1428,7 +1472,7 @@ SPAN_DECLARE(int) t4_tx_image_complete(t4_tx_state_t *s)
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
    case T4_COMPRESSION_T45:
-        break;
+        return t45_encode_image_complete(&s->encoder.t45);
 #endif
    }
    return SIG_STATUS_END_OF_DATA;
@@ -1444,31 +1488,17 @@ SPAN_DECLARE(int) t4_tx_get_bit(t4_tx_state_t *s)

 SPAN_DECLARE(int) t4_tx_get(t4_tx_state_t *s, uint8_t buf[], size_t max_len)
 {
-    switch (s->metadata.compression)
+    if (s->pre_encoded_len > 0)
    {
-    case T4_COMPRESSION_T4_1D:
-    case T4_COMPRESSION_T4_2D:
-    case T4_COMPRESSION_T6:
-        return t4_t6_encode_get(&s->encoder.t4_t6, buf, max_len);
-    case T4_COMPRESSION_T85:
-    case T4_COMPRESSION_T85_L0:
-        return t85_encode_get(&s->encoder.t85, buf, max_len);
-#if defined(SPANDSP_SUPPORT_T88)
-    case T4_COMPRESSION_T88:
-        break;
-#endif
-    case T4_COMPRESSION_T42_T81:
-    case T4_COMPRESSION_SYCC_T81:
-        return t42_encode_get(&s->encoder.t42, buf, max_len);
-#if defined(SPANDSP_SUPPORT_T43)
-    case T4_COMPRESSION_T43:
-        return t43_encode_get(&s->encoder.t43, buf, max_len);
-#endif
-#if defined(SPANDSP_SUPPORT_T45)
-    case T4_COMPRESSION_T45:
-        break;
-#endif
+        if (max_len > (s->pre_encoded_len - s->pre_encoded_ptr))
+            max_len = s->pre_encoded_len - s->pre_encoded_ptr;
+        memcpy(buf, &s->pre_encoded_buf[s->pre_encoded_ptr], max_len);
+        s->pre_encoded_ptr += max_len;
+        return max_len;
    }
+
+    if (s->image_get_handler)
+        return s->image_get_handler((void *) &s->encoder, buf, max_len);
    return 0;
 }
 /*- End of function --------------------------------------------------------*/
@@ -1497,31 +1527,43 @@ SPAN_DECLARE(int) t4_tx_start_page(t4_tx_state_t *s)
    case T4_COMPRESSION_T4_2D:
    case T4_COMPRESSION_T6:
        t4_t6_encode_restart(&s->encoder.t4_t6, s->metadata.image_width, s->metadata.image_length);
+        s->image_get_handler = (t4_image_get_handler_t) t4_t6_encode_get;
        break;
    case T4_COMPRESSION_T85:
    case T4_COMPRESSION_T85_L0:
        t85_encode_restart(&s->encoder.t85, s->metadata.image_width, s->metadata.image_length);
+        s->image_get_handler = (t4_image_get_handler_t) t85_encode_get;
        break;
 #if defined(SPANDSP_SUPPORT_T88)
    case T4_COMPRESSION_T88:
+        t88_encode_restart(&s->encoder.t88, s->metadata.image_width, s->metadata.image_length);
+        s->image_get_handler = (t4_image_get_handler_t) t88_encode_get;
        break;
 #endif
    case T4_COMPRESSION_T42_T81:
    case T4_COMPRESSION_SYCC_T81:
        t42_encode_restart(&s->encoder.t42, s->metadata.image_width, s->metadata.image_length);
+        s->image_get_handler = (t4_image_get_handler_t) t42_encode_get;
        break;
 #if defined(SPANDSP_SUPPORT_T43)
    case T4_COMPRESSION_T43:
        t43_encode_restart(&s->encoder.t43, s->metadata.image_width, s->metadata.image_length);
+        s->image_get_handler = (t4_image_get_handler_t) t43_encode_get;
        break;
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
    case T4_COMPRESSION_T45:
+        t45_encode_restart(&s->encoder.t45, s->metadata.image_width, s->metadata.image_length);
+        s->image_get_handler = (t4_image_get_handler_t) t45_encode_get;
        break;
 #endif
+    default:
+        s->image_get_handler = NULL;
+        break;
    }
    /* If there is a page header, create that first */
-    if (s->tiff.image_type == T4_IMAGE_TYPE_BILEVEL  &&  s->header_info  &&  s->header_info[0]  &&  make_header(s) == 0)
+    if (s->metadata.image_type == T4_IMAGE_TYPE_BILEVEL  &&  s->header_info  &&  s->header_info[0]  &&  make_header(s) == 0)
+    //if (s->header_info  &&  s->header_info[0]  &&  make_header(s) == 0)
    {
        s->header_row = 0;
        set_row_read_handler(s, header_row_read_handler, (void *) s);
@@ -1634,7 +1676,7 @@ SPAN_DECLARE(int) t4_tx_release(t4_tx_state_t *s)
        return t85_encode_release(&s->encoder.t85);
 #if defined(SPANDSP_SUPPORT_T88)
    case T4_COMPRESSION_T88:
-        break;
+        return t88_encode_release(&s->encoder.t88);
 #endif
    case T4_COMPRESSION_T42_T81:
    case T4_COMPRESSION_SYCC_T81:
@@ -1645,7 +1687,7 @@ SPAN_DECLARE(int) t4_tx_release(t4_tx_state_t *s)
 #endif
 #if defined(SPANDSP_SUPPORT_T45)
    case T4_COMPRESSION_T45:
-        break;
+        return t45_encode_release(&s->encoder.t45);
 #endif
    }
    return -1;
@@ -78,13 +78,13 @@
            Silence for 0.5s then send TXP
        DTMF
            Proceed as Annex B
-        1650Hz (V21 ch 2 low)
+        1650Hz (V21 ch 2 low) [1650Hz +-12Hz]
            Proceed as Annex F in call mode
-        1300Hz (Calling tone)
+        1300Hz (Calling tone) [1300Hz +-16Hz]
            Proceed as Annex E in call mode
-        1400Hz/1800Hz (Weitbrecht)
+        1400Hz/1800Hz (Weitbrecht) [1400Hz +-5% and 1800Hz +-5%]
            Detect rate and proceed as Annex A
-        980Hz/1180Hz (V21 ch 1)
+        980Hz/1180Hz (V21 ch 1) [980Hz +-12Hz, 1180Hz +-12Hz]
            Start timer Tr
        2225Hz (Bell ANS)
            Proceed as Annex D call mode
@@ -98,21 +98,21 @@
            Monitor as caller for 980Hz or 1300Hz
        CI/XCI
            Respond with ANSam
-        1300Hz
+        1300Hz [1300Hz +-16Hz]
            Probe
        Timer Ta (3s)
            Probe
-        1400Hz/1800Hz (Weitbrecht)
+        1400Hz/1800Hz (Weitbrecht) [1400Hz +-5% and 1800Hz +-5%]
            Detect rate and proceed as Annex A
        DTMF
            Proceed as Annex B
-        980Hz (V21 ch 1 low)
+        980Hz (V21 ch 1 low) [980Hz +-12Hz]
            Start timer Te
        1270Hz (Bell103 ch 2 high)
            Proceed as Annex D answer mode
        2225Hz (Bell ANS)
            Proceed as Annex D call mode
-        1650Hz (V21 ch 2 low)
+        1650Hz (V21 ch 2 low) [1650Hz +-12Hz]
            Proceed as Annex F answer mode
        ANSam
            Proceed as V.8 caller Annex G
@@ -131,6 +131,7 @@ struct dtmf_to_ascii_s

 static const struct dtmf_to_ascii_s dtmf_to_ascii[] =
 {
+    {"###0", '!'},
    {"###1", 'C'},
    {"###2", 'F'},
    {"###3", 'I'},
@@ -140,7 +141,6 @@ static const struct dtmf_to_ascii_s dtmf_to_ascii[] =
    {"###7", 'U'},
    {"###8", 'X'},
    {"###9", ';'},
-    {"###0", '!'},
    {"##*1", 'A'},
    {"##*2", 'D'},
    {"##*3", 'G'},
@@ -373,71 +373,174 @@ static const uint8_t txp[] = "1111111111000101011100001101110000010101";
    100 ms mark. */
 static const uint8_t xci[] = "01111111110111111111";

-static int cmp(const void *s, const void *t)
+/* The entries here must match the order in which the related names are defined in v18.h */
+static const int automoding_sequences[][6] =
 {
-    const char *ss;
-    struct dtmf_to_ascii_s *tt;
-
-    ss = (const char *) s;
-    tt = (struct dtmf_to_ascii_s *) t;
-    return strncmp(ss, tt->dtmf, strlen(tt->dtmf));
-}
-/*- End of function --------------------------------------------------------*/
-
-SPAN_DECLARE(int) v18_encode_dtmf(v18_state_t *s, char dtmf[], const char msg[])
-{
-    const char *t;
-    const char *v;
-    char *u;
-
-    t = msg;
-    u = dtmf;
-    while (*t)
    {
-        v = ascii_to_dtmf[*t & 0x7F];
-        while (*v)
-            *u++ = *v++;
-        t++;
-    }
-    *u = '\0';
-
-    return u - dtmf;
-}
-/*- End of function --------------------------------------------------------*/
-
-SPAN_DECLARE(int) v18_decode_dtmf(v18_state_t *s, char msg[], const char dtmf[])
-{
-    int entries;
-    const char *t;
-    char *u;
-    struct dtmf_to_ascii_s *ss;
-
-    entries = sizeof(dtmf_to_ascii)/sizeof(dtmf_to_ascii[0]) - 1;
-    t = dtmf;
-    u = msg;
-    while (*t)
+        /* Dummy entry 0 */
+        V18_MODE_5BIT_4545,
+        V18_MODE_BELL103,
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_EDT,
+        V18_MODE_DTMF
+    },
    {
-        ss = bsearch(t, dtmf_to_ascii, entries, sizeof(dtmf_to_ascii[0]), cmp);
-        if (ss)
-        {
-            t += strlen(ss->dtmf);
-            *u++ = ss->ascii;
-        }
-        else
-        {
-            /* Can't match the code. Let's assume this is a code we just don't know, and skip over it */
-            while (*t == '#'  ||  *t == '*')
-                t++;
-            if (*t)
-                t++;
-        }
+        /* Australia */
+        V18_MODE_5BIT_50,
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_EDT,
+        V18_MODE_DTMF,
+        V18_MODE_BELL103
+    },
+    {
+        /* Ireland */
+        V18_MODE_5BIT_50,
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_EDT,
+        V18_MODE_DTMF,
+        V18_MODE_BELL103
+    },
+    {
+        /* Germany */
+        V18_MODE_EDT,
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_5BIT_50,
+        V18_MODE_DTMF,
+        V18_MODE_BELL103
+    },
+    {
+        /* Switzerland */
+        V18_MODE_EDT,
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_5BIT_50,
+        V18_MODE_DTMF,
+        V18_MODE_BELL103
+    },
+    {
+        /* Italy */
+        V18_MODE_EDT,
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_5BIT_50,
+        V18_MODE_DTMF,
+        V18_MODE_BELL103
+    },
+    {
+        /* Spain */
+        V18_MODE_EDT,
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_5BIT_50,
+        V18_MODE_DTMF,
+        V18_MODE_BELL103
+    },
+    {
+        /* Austria */
+        V18_MODE_EDT,
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_5BIT_50,
+        V18_MODE_DTMF,
+        V18_MODE_BELL103
+    },
+    {
+        /* Netherlands */
+        V18_MODE_DTMF,
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_5BIT_50,
+        V18_MODE_EDT,
+        V18_MODE_BELL103
+    },
+    {
+        /* Iceland */
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_DTMF,
+        V18_MODE_5BIT_50,
+        V18_MODE_EDT,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_BELL103
+    },
+    {
+        /* Norway */
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_DTMF,
+        V18_MODE_5BIT_50,
+        V18_MODE_EDT,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_BELL103
+    },
+    {
+        /* Sweden */
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_DTMF,
+        V18_MODE_5BIT_50,
+        V18_MODE_EDT,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_BELL103
+    },
+    {
+        /* Finland */
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_DTMF,
+        V18_MODE_5BIT_50,
+        V18_MODE_EDT,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_BELL103
+    },
+    {
+        /* Denmark */
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_DTMF,
+        V18_MODE_5BIT_50,
+        V18_MODE_EDT,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_BELL103
+    },
+    {
+        /* UK */
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_5BIT_50,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_EDT,
+        V18_MODE_DTMF,
+        V18_MODE_BELL103
+    },
+    {
+        /* USA */
+        V18_MODE_5BIT_4545,
+        V18_MODE_BELL103,
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_EDT,
+        V18_MODE_DTMF
+    },
+    {
+        /* France */
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_EDT,
+        V18_MODE_DTMF,
+        V18_MODE_5BIT_50,
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_BELL103
+    },
+    {
+        /* Belgium */
+        V18_MODE_V23VIDEOTEX,
+        V18_MODE_EDT,
+        V18_MODE_DTMF,
+        V18_MODE_5BIT_50,
+        V18_MODE_V21TEXTPHONE,
+        V18_MODE_BELL103
    }
-    *u = '\0';
-    return u - msg;
-}
-/*- End of function --------------------------------------------------------*/
+};

-SPAN_DECLARE(uint16_t) v18_encode_baudot(v18_state_t *s, uint8_t ch)
+static uint16_t encode_baudot(v18_state_t *s, uint8_t ch)
 {
    static const uint8_t conv[128] =
    {
@@ -449,7 +552,7 @@ SPAN_DECLARE(uint16_t) v18_encode_baudot(v18_state_t *s, uint8_t ch)
        0xFF, /* ENQ */
        0xFF, /* ACK */
        0xFF, /* BEL */
-        0x00, /* BS */
+        0x40, /* BS */
        0x44, /* HT >> SPACE */
        0x42, /* LF */
        0x42, /* VT >> LF */
@@ -572,14 +675,7 @@ SPAN_DECLARE(uint16_t) v18_encode_baudot(v18_state_t *s, uint8_t ch)
    };
    uint16_t shift;

-    if (ch == 0x7F)
-    {
-        /* DLE is a special character meaning "force a
-           change to the letter character set */
-        shift = BAUDOT_LETTER_SHIFT;
-        return 0;
-    }
-    ch = conv[ch];
+    ch = conv[ch & 0x7F];
    /* Is it a non-existant code? */
    if (ch == 0xFF)
        return 0;
@@ -605,7 +701,7 @@ SPAN_DECLARE(uint16_t) v18_encode_baudot(v18_state_t *s, uint8_t ch)
 }
 /*- End of function --------------------------------------------------------*/

-SPAN_DECLARE(uint8_t) v18_decode_baudot(v18_state_t *s, uint8_t ch)
+static uint8_t decode_baudot(v18_state_t *s, uint8_t ch)
 {
    static const uint8_t conv[2][32] =
    {
@@ -624,8 +720,8 @@ SPAN_DECLARE(uint8_t) v18_decode_baudot(v18_state_t *s, uint8_t ch)
    default:
        return conv[s->baudot_rx_shift][ch];
    }
-    /* return 0 if we did not produce a character */
-    return 0;
+    /* Return 0xFF if we did not produce a character */
+    return 0xFF;
 }
 /*- End of function --------------------------------------------------------*/

@@ -649,7 +745,7 @@ static int v18_tdd_get_async_byte(void *user_data)
    if (s->tx_signal_on)
    {
        /* The FSK should now be switched off. */
-        s->tx_signal_on = FALSE;
+        s->tx_signal_on = 0;
    }
    return 0x1F;
 }
@@ -659,14 +755,16 @@ static void v18_dtmf_get(void *user_data)
 {
    v18_state_t *s;
    int ch;
-    const char *v;
+    int len;
+    const char *t;

    s = (v18_state_t *) user_data;
    if ((ch = queue_read_byte(&s->queue.queue)) >= 0)
    {
-        v = ascii_to_dtmf[ch & 0x7F];
-        dtmf_tx_put(&s->dtmf_tx, v, strlen(v));
-        s->rx_suppression = ((300 + 100*strlen(v))*SAMPLE_RATE)/1000;
+        t = ascii_to_dtmf[ch & 0x7F];
+        len = strlen(t);
+        dtmf_tx_put(&s->dtmf_tx, t, len);
+        s->rx_suppression = ((300 + 100*len)*SAMPLE_RATE)/1000;
    }
 }
 /*- End of function --------------------------------------------------------*/
@@ -685,7 +783,7 @@ static int v18_edt_get_async_byte(void *user_data)
    if (s->tx_signal_on)
    {
        /* The FSK should now be switched off. */
-        s->tx_signal_on = FALSE;
+        s->tx_signal_on = 0;
    }
    return 0;
 }
@@ -726,7 +824,7 @@ static void v18_tdd_put_async_byte(void *user_data, int byte)
        return;
    }
    span_log(&s->logging, SPAN_LOG_FLOW, "Rx byte %x\n", byte);
-    if ((octet = v18_decode_baudot(s, byte)))
+    if ((octet = decode_baudot(s, byte)) != 0xFF)
        s->rx_msg[s->rx_msg_len++] = octet;
    if (s->rx_msg_len >= 256)
    {
@@ -738,11 +836,55 @@ static void v18_tdd_put_async_byte(void *user_data, int byte)
 }
 /*- End of function --------------------------------------------------------*/

+static int decode_dtmf_cmp(const void *s, const void *t)
+{
+    const char *ss;
+    struct dtmf_to_ascii_s *tt;
+
+    ss = (const char *) s;
+    tt = (struct dtmf_to_ascii_s *) t;
+    return strncmp(ss, tt->dtmf, strlen(tt->dtmf));
+}
+/*- End of function --------------------------------------------------------*/
+
+static int decode_dtmf(v18_state_t *s, char msg[], const char dtmf[])
+{
+    int entries;
+    int len;
+    const char *t;
+    char *u;
+    struct dtmf_to_ascii_s *ss;
+
+    entries = sizeof(dtmf_to_ascii)/sizeof(dtmf_to_ascii[0]) - 1;
+    t = dtmf;
+    u = msg;
+    while (*t)
+    {
+        ss = bsearch(t, dtmf_to_ascii, entries, sizeof(dtmf_to_ascii[0]), decode_dtmf_cmp);
+        if (ss)
+        {
+            len = strlen(ss->dtmf);
+            t += len;
+            *u++ = ss->ascii;
+            return len;
+        }
+        /* Can't match the code. Let's assume this is a code we just don't know, and skip over it */
+        while (*t == '#'  ||  *t == '*')
+            t++;
+        if (*t)
+            t++;
+    }
+    *u = '\0';
+    return u - msg;
+}
+/*- End of function --------------------------------------------------------*/
+
 static void v18_dtmf_put(void *user_data, const char dtmf[], int len)
 {
    v18_state_t *s;
    char buf[128];
    int i;
+    int matched;

    s = (v18_state_t *) user_data;
    if (s->rx_suppression > 0)
@@ -753,11 +895,17 @@ static void v18_dtmf_put(void *user_data, const char dtmf[], int len)
        if (dtmf[i] >= '0'  &&  dtmf[i] <= '9')
        {
            s->rx_msg[s->rx_msg_len] = '\0';
-            if (v18_decode_dtmf(s, buf, (const char *) s->rx_msg) > 0)
+            if ((matched = decode_dtmf(s, buf, (const char *) s->rx_msg)) > 0)
+            {
+                buf[1] = '\0';
                s->put_msg(s->user_data, (const uint8_t *) buf, 1);
-            s->rx_msg_len = 0;
+            }
+            if (s->rx_msg_len > matched)
+                memcpy(&s->rx_msg[0], &s->rx_msg[matched], s->rx_msg_len - matched);
+            s->rx_msg_len -= matched;
        }
    }
+    s->in_progress = 5*SAMPLE_RATE;
 }
 /*- End of function --------------------------------------------------------*/

@@ -815,7 +963,7 @@ SPAN_DECLARE_NONSTD(int) v18_tx(v18_state_t *s, int16_t *amp, int max_len)
            if (len < max_len)
            {
                if ((lenx = fsk_tx(&s->fsk_tx, amp + len, max_len - len)) <= 0)
-                    s->tx_signal_on = FALSE;
+                    s->tx_signal_on = 0;
                len += lenx;
            }
            break;
@@ -894,12 +1042,12 @@ SPAN_DECLARE(int) v18_put(v18_state_t *s, const char msg[], int len)
    }
    switch (s->mode)
    {
-    case V18_MODE_5BIT_45:
+    case V18_MODE_5BIT_4545:
    case V18_MODE_5BIT_50:
        for (i = 0;  i < len;  i++)
        {
            n = 0;
-            if ((x = v18_encode_baudot(s, msg[i])))
+            if ((x = encode_baudot(s, msg[i])))
            {
                if ((x & 0x3E0))
                    buf[n++] = (uint8_t) ((x >> 5) & 0x1F);
@@ -907,7 +1055,7 @@ SPAN_DECLARE(int) v18_put(v18_state_t *s, const char msg[], int len)
                /* TODO: Deal with out of space condition */
                if (queue_write(&s->queue.queue, (const uint8_t *) buf, n) < 0)
                    return i;
-                s->tx_signal_on = TRUE;
+                s->tx_signal_on = 1;
            }
        }
        return len;
@@ -920,12 +1068,14 @@ SPAN_DECLARE(int) v18_put(v18_state_t *s, const char msg[], int len)

 SPAN_DECLARE(const char *) v18_mode_to_str(int mode)
 {
-    switch ((mode & 0xFF))
+    switch ((mode & 0xFFF))
    {
    case V18_MODE_NONE:
        return "None";
-    case V18_MODE_5BIT_45:
+    case V18_MODE_5BIT_4545:
        return "Weitbrecht TDD (45.45bps)";
+    case V18_MODE_5BIT_476:
+        return "Weitbrecht TDD (47.6bps)";
    case V18_MODE_5BIT_50:
        return "Weitbrecht TDD (50bps)";
    case V18_MODE_DTMF:
@@ -958,6 +1108,9 @@ SPAN_DECLARE(v18_state_t *) v18_init(v18_state_t *s,
                                     put_msg_func_t put_msg,
                                     void *user_data)
 {
+    if (nation < 0  ||  nation >= V18_AUTOMODING_END)
+        return NULL;
+
    if (s == NULL)
    {
        if ((s = (v18_state_t *) malloc(sizeof(*s))) == NULL)
@@ -965,33 +1118,45 @@ SPAN_DECLARE(v18_state_t *) v18_init(v18_state_t *s,
    }
    memset(s, 0, sizeof(*s));
    s->calling_party = calling_party;
-    s->mode = mode & 0xFF;
+    s->mode = mode & ~V18_MODE_REPETITIVE_SHIFTS_OPTION;
    s->put_msg = put_msg;
    s->user_data = user_data;

    switch (s->mode)
    {
-    case V18_MODE_5BIT_45:
-        s->repeat_shifts = mode & 0x100;
-        fsk_tx_init(&s->fsk_tx, &preset_fsk_specs[FSK_WEITBRECHT], async_tx_get_bit, &s->async_tx);
+    case V18_MODE_5BIT_4545:
+        s->repeat_shifts = mode & V18_MODE_REPETITIVE_SHIFTS_OPTION;
+        fsk_tx_init(&s->fsk_tx, &preset_fsk_specs[FSK_WEITBRECHT_4545], async_tx_get_bit, &s->async_tx);
        async_tx_init(&s->async_tx, 5, ASYNC_PARITY_NONE, 2, FALSE, v18_tdd_get_async_byte, s);
        /* Schedule an explicit shift at the start of baudot transmission */
        s->baudot_tx_shift = 2;
        /* TDD uses 5 bit data, no parity and 1.5 stop bits. We scan for the first stop bit, and
           ride over the fraction. */
-        fsk_rx_init(&s->fsk_rx, &preset_fsk_specs[FSK_WEITBRECHT], FSK_FRAME_MODE_5N1_FRAMES, v18_tdd_put_async_byte, s);
+        fsk_rx_init(&s->fsk_rx, &preset_fsk_specs[FSK_WEITBRECHT_4545], FSK_FRAME_MODE_5N1_FRAMES, v18_tdd_put_async_byte, s);
+        s->baudot_rx_shift = 0;
+        s->next_byte = (uint8_t) 0xFF;
+        break;
+    case V18_MODE_5BIT_476:
+        s->repeat_shifts = mode & V18_MODE_REPETITIVE_SHIFTS_OPTION;
+        fsk_tx_init(&s->fsk_tx, &preset_fsk_specs[FSK_WEITBRECHT_476], async_tx_get_bit, &s->async_tx);
+        async_tx_init(&s->async_tx, 5, ASYNC_PARITY_NONE, 2, FALSE, v18_tdd_get_async_byte, s);
+        /* Schedule an explicit shift at the start of baudot transmission */
+        s->baudot_tx_shift = 2;
+        /* TDD uses 5 bit data, no parity and 1.5 stop bits. We scan for the first stop bit, and
+           ride over the fraction. */
+        fsk_rx_init(&s->fsk_rx, &preset_fsk_specs[FSK_WEITBRECHT_476], FSK_FRAME_MODE_5N1_FRAMES, v18_tdd_put_async_byte, s);
        s->baudot_rx_shift = 0;
        s->next_byte = (uint8_t) 0xFF;
        break;
    case V18_MODE_5BIT_50:
-        s->repeat_shifts = mode & 0x100;
-        fsk_tx_init(&s->fsk_tx, &preset_fsk_specs[FSK_WEITBRECHT50], async_tx_get_bit, &s->async_tx);
+        s->repeat_shifts = mode & V18_MODE_REPETITIVE_SHIFTS_OPTION;
+        fsk_tx_init(&s->fsk_tx, &preset_fsk_specs[FSK_WEITBRECHT_50], async_tx_get_bit, &s->async_tx);
        async_tx_init(&s->async_tx, 5, ASYNC_PARITY_NONE, 2, FALSE, v18_tdd_get_async_byte, s);
        /* Schedule an explicit shift at the start of baudot transmission */
        s->baudot_tx_shift = 2;
        /* TDD uses 5 bit data, no parity and 1.5 stop bits. We scan for the first stop bit, and
           ride over the fraction. */
-        fsk_rx_init(&s->fsk_rx, &preset_fsk_specs[FSK_WEITBRECHT50], FSK_FRAME_MODE_5N1_FRAMES, v18_tdd_put_async_byte, s);
+        fsk_rx_init(&s->fsk_rx, &preset_fsk_specs[FSK_WEITBRECHT_50], FSK_FRAME_MODE_5N1_FRAMES, v18_tdd_put_async_byte, s);
        s->baudot_rx_shift = 0;
        s->next_byte = (uint8_t) 0xFF;
        break;
@@ -63,7 +63,7 @@ struct
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_STANDARD,
        T4_WIDTH_R8_A4,
-        1100,
+        1002,
        COMPRESSION_CCITT_T4,
        0
    },
@@ -72,7 +72,7 @@ struct
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_STANDARD,
        T4_WIDTH_R8_A4,
-        1100,
+        1002,
        COMPRESSION_CCITT_T4,
        1
    },
@@ -81,7 +81,7 @@ struct
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_STANDARD,
        T4_WIDTH_R8_A4,
-        1100,
+        237,
        COMPRESSION_CCITT_T4,
        2
    },
@@ -90,7 +90,7 @@ struct
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_STANDARD,
        T4_WIDTH_R8_A4,
-        1100,
+        237,
        COMPRESSION_CCITT_T4,
        3
    },
@@ -99,7 +99,7 @@ struct
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_STANDARD,
        T4_WIDTH_R8_A4,
-        1100,
+        400,
        COMPRESSION_CCITT_T4,
        4
    },
@@ -108,7 +108,7 @@ struct
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_STANDARD,
        T4_WIDTH_R8_A4,
-        1100,
+        1079,
        COMPRESSION_CCITT_T4,
        5
    },
@@ -117,7 +117,7 @@ struct
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_STANDARD,
        T4_WIDTH_R8_A4,
-        1100,
+        1728,
        COMPRESSION_CCITT_T4,
        6
    },
@@ -153,7 +153,7 @@ struct
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_STANDARD,
        T4_WIDTH_R8_A4,
-        1100,
+        1079,
        COMPRESSION_CCITT_T4,
        5
    },
@@ -178,12 +178,6 @@ struct
 int photo_metric = PHOTOMETRIC_MINISWHITE;
 int fill_order = FILLORDER_LSB2MSB;

-static void clear_row(uint8_t buf[], int width)
-{
-    memset(buf, 0, width/8 + 1);
-}
-/*- End of function --------------------------------------------------------*/
-
 static void set_pixel(uint8_t buf[], int row, int pixel)
 {
    row--;
@@ -191,13 +185,6 @@ static void set_pixel(uint8_t buf[], int row, int pixel)
 }
 /*- End of function --------------------------------------------------------*/

-static void clear_pixel(uint8_t buf[], int row, int pixel)
-{
-    row--;
-    buf[row*1728/8 + pixel/8] &= ~(0x80 >> (pixel & 0x07));
-}
-/*- End of function --------------------------------------------------------*/
-
 static void set_pixel_range(uint8_t buf[], int row, int start, int end)
 {
    int i;
@@ -207,6 +194,13 @@ static void set_pixel_range(uint8_t buf[], int row, int start, int end)
 }
 /*- End of function --------------------------------------------------------*/

+static void clear_pixel(uint8_t buf[], int row, int pixel)
+{
+    row--;
+    buf[row*1728/8 + pixel/8] &= ~(0x80 >> (pixel & 0x07));
+}
+/*- End of function --------------------------------------------------------*/
+
 static void clear_pixel_range(uint8_t buf[], int row, int start, int end)
 {
    int i;
@@ -216,6 +210,12 @@ static void clear_pixel_range(uint8_t buf[], int row, int start, int end)
 }
 /*- End of function --------------------------------------------------------*/

+static void clear_row(uint8_t buf[], int width)
+{
+    memset(buf, 0, width/8 + 1);
+}
+/*- End of function --------------------------------------------------------*/
+
 static int create_white_page(TIFF *tiff_file)
 {
    uint8_t image_buffer[8192];
@@ -593,7 +593,6 @@ int main(int argc, char *argv[])
        TIFFSetField(tiff_file, TIFFTAG_BITSPERSAMPLE, 1);
        TIFFSetField(tiff_file, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
        TIFFSetField(tiff_file, TIFFTAG_SAMPLESPERPIXEL, 1);
-        TIFFSetField(tiff_file, TIFFTAG_ROWSPERSTRIP, -1L);
        TIFFSetField(tiff_file, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
        TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, photo_metric);
        TIFFSetField(tiff_file, TIFFTAG_FILLORDER, fill_order);
@@ -625,6 +624,7 @@ int main(int argc, char *argv[])
        image_length = sequence[i].length;
        TIFFSetField(tiff_file, TIFFTAG_PAGENUMBER, 0, 1);
        TIFFSetField(tiff_file, TIFFTAG_CLEANFAXDATA, CLEANFAXDATA_CLEAN);
+        TIFFSetField(tiff_file, TIFFTAG_ROWSPERSTRIP, 128);
        TIFFSetField(tiff_file, TIFFTAG_IMAGELENGTH, image_length);
        TIFFCheckpointDirectory(tiff_file);

@@ -665,7 +665,11 @@ int main(int argc, char *argv[])
            break;
        }
        /* ....then the directory entry, and libtiff is happy. */
-        TIFFSetField(tiff_file, TIFFTAG_IMAGELENGTH, image_length);
+        if (image_length != sequence[i].length)
+        {
+            printf("Length mismatch - %d: %d vs %d\n", i, image_length, sequence[i].length);
+            exit(2);
+        }

        TIFFWriteDirectory(tiff_file);
    }
@@ -63,7 +63,6 @@ int main(int argc, char *argv[])
 {
    int image_width;
    int row;
-    int resunit;
    int output_compression;
    int output_t4_options;
    uint8_t image_buffer[1024];
@@ -99,7 +98,6 @@ int main(int argc, char *argv[])
    TIFFSetField(tiff_file, TIFFTAG_BITSPERSAMPLE, 1);
    TIFFSetField(tiff_file, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
    TIFFSetField(tiff_file, TIFFTAG_SAMPLESPERPIXEL, 1);
-    TIFFSetField(tiff_file, TIFFTAG_ROWSPERSTRIP, -1L);
    TIFFSetField(tiff_file, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
    TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISWHITE);
    TIFFSetField(tiff_file, TIFFTAG_FILLORDER, FILLORDER_LSB2MSB);
@@ -108,16 +106,15 @@ int main(int argc, char *argv[])
    y_resolution = y_res/100.0f;
    TIFFSetField(tiff_file, TIFFTAG_XRESOLUTION, floorf(x_resolution*2.54f + 0.5f));
    TIFFSetField(tiff_file, TIFFTAG_YRESOLUTION, floorf(y_resolution*2.54f + 0.5f));
-    resunit = RESUNIT_INCH;
-    TIFFSetField(tiff_file, TIFFTAG_RESOLUTIONUNIT, resunit);
+    TIFFSetField(tiff_file, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH);

-    TIFFSetField(tiff_file, TIFFTAG_SOFTWARE, "spandsp");
    if (gethostname(buf, sizeof(buf)) == 0)
        TIFFSetField(tiff_file, TIFFTAG_HOSTCOMPUTER, buf);

+    TIFFSetField(tiff_file, TIFFTAG_SOFTWARE, "Spandsp");
    TIFFSetField(tiff_file, TIFFTAG_IMAGEDESCRIPTION, "Checkerboard or dithered ones");
    TIFFSetField(tiff_file, TIFFTAG_MAKE, "soft-switch.org");
-    TIFFSetField(tiff_file, TIFFTAG_MODEL, "test data");
+    TIFFSetField(tiff_file, TIFFTAG_MODEL, "testy");

    time(&now);
    tm = localtime(&now);
@@ -131,6 +128,7 @@ int main(int argc, char *argv[])
            tm->tm_sec);
    TIFFSetField(tiff_file, TIFFTAG_DATETIME, buf);

+    TIFFSetField(tiff_file, TIFFTAG_ROWSPERSTRIP, image_length);
    TIFFSetField(tiff_file, TIFFTAG_IMAGELENGTH, image_length);
    TIFFSetField(tiff_file, TIFFTAG_PAGENUMBER, 0, 1);
    TIFFSetField(tiff_file, TIFFTAG_CLEANFAXDATA, CLEANFAXDATA_CLEAN);
@@ -2,7 +2,7 @@
 * SpanDSP - a series of DSP components for telephony
 *
 * generate_sized_pages.c - Create a series of TIFF files in the various page sizes
- *                        and resolutions.
+ *                          and resolutions.
 *
 * Written by Steve Underwood <steveu@coppice.org>
 *
@@ -55,6 +55,7 @@ struct
    int y_res;
    int width;
    int length;
+    int squashing_factor;
 } sequence[] =
 {
    {
@@ -62,304 +63,531 @@ struct
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_STANDARD,
        T4_WIDTH_R8_A4,
-        1100
+        1100,
+        1
    },
    {
        "bilevel_R8_385_B4.tif",
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_STANDARD,
        T4_WIDTH_R8_B4,
-        1200
+        1200,
+        1
    },
    {
        "bilevel_R8_385_A3.tif",
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_STANDARD,
        T4_WIDTH_R8_A3,
-        1556
+        1556,
+        1
    },
    {
        "bilevel_R8_77_A4.tif",
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_FINE,
        T4_WIDTH_R8_A4,
-        1100*2
+        1100*2,
+        1
    },
    {
        "bilevel_R8_77_B4.tif",
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_FINE,
        T4_WIDTH_R8_B4,
-        1200*2
+        1200*2,
+        1
    },
    {
        "bilevel_R8_77_A3.tif",
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_FINE,
        T4_WIDTH_R8_A3,
-        1556*2
+        1556*2,
+        1
    },
    {
        "bilevel_R8_154_A4.tif",
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_SUPERFINE,
        T4_WIDTH_R8_A4,
-        1100*4
+        1100*4,
+        1
    },
    {
        "bilevel_R8_154_B4.tif",
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_SUPERFINE,
        T4_WIDTH_R8_B4,
-        1200*4
+        1200*4,
+        1
    },
    {
        "bilevel_R8_154_A3.tif",
        T4_X_RESOLUTION_R8,
        T4_Y_RESOLUTION_SUPERFINE,
        T4_WIDTH_R8_A3,
-        1556*4
+        1556*4,
+        1
    },
    {
        "bilevel_R16_154_A4.tif",
        T4_X_RESOLUTION_R16,
        T4_Y_RESOLUTION_SUPERFINE,
        T4_WIDTH_R16_A4,
-        1100*4
+        1100*4,
+        1
    },
    {
        "bilevel_R16_154_B4.tif",
        T4_X_RESOLUTION_R16,
        T4_Y_RESOLUTION_SUPERFINE,
        T4_WIDTH_R16_B4,
-        1200*4
+        1200*4,
+        1
    },
    {
        "bilevel_R16_154_A3.tif",
        T4_X_RESOLUTION_R16,
        T4_Y_RESOLUTION_SUPERFINE,
        T4_WIDTH_R16_A3,
-        1556*4
+        1556*4,
+        1
    },
    {
        "bilevel_200_100_A4.tif",
        T4_X_RESOLUTION_200,
        T4_Y_RESOLUTION_100,
        T4_WIDTH_200_A4,
-        1100
+        1100,
+        1
    },
    {
        "bilevel_200_100_B4.tif",
        T4_X_RESOLUTION_200,
        T4_Y_RESOLUTION_100,
        T4_WIDTH_200_B4,
-        1200
+        1200,
+        1
    },
    {
        "bilevel_200_100_A3.tif",
        T4_X_RESOLUTION_200,
        T4_Y_RESOLUTION_100,
        T4_WIDTH_200_A3,
-        1556
+        1556,
+        1
    },
    {
        "bilevel_200_200_A4.tif",
        T4_X_RESOLUTION_200,
        T4_Y_RESOLUTION_200,
        T4_WIDTH_200_A4,
-        1100*2
+        1100*2,
+        1
    },
    {
        "bilevel_200_200_B4.tif",
        T4_X_RESOLUTION_200,
        T4_Y_RESOLUTION_200,
        T4_WIDTH_200_B4,
-        1200*2
+        1200*2,
+        1
    },
    {
        "bilevel_200_200_A3.tif",
        T4_X_RESOLUTION_200,
        T4_Y_RESOLUTION_200,
        T4_WIDTH_200_A3,
-        1556*2
+        1556*2,
+        1
    },
    {
        "bilevel_200_400_A4.tif",
        T4_X_RESOLUTION_200,
        T4_Y_RESOLUTION_400,
        T4_WIDTH_200_A4,
-        1100*4
+        1100*4,
+        1
    },
    {
        "bilevel_200_400_B4.tif",
        T4_X_RESOLUTION_200,
        T4_Y_RESOLUTION_400,
        T4_WIDTH_200_B4,
-        1200*4
+        1200*4,
+        1
    },
    {
        "bilevel_200_400_A3.tif",
        T4_X_RESOLUTION_200,
        T4_Y_RESOLUTION_400,
        T4_WIDTH_200_A3,
-        1556*4
+        1556*4,
+        1
    },
    {
        "bilevel_300_300_A4.tif",
        T4_X_RESOLUTION_300,
        T4_Y_RESOLUTION_300,
        T4_WIDTH_300_A4,
-        1100*3
+        1100*3,
+        1
    },
    {
        "bilevel_300_300_B4.tif",
        T4_X_RESOLUTION_300,
        T4_Y_RESOLUTION_300,
        T4_WIDTH_300_B4,
-        1200*3
+        1200*3,
+        1
    },
    {
        "bilevel_300_300_A3.tif",
        T4_X_RESOLUTION_300,
        T4_Y_RESOLUTION_300,
        T4_WIDTH_300_A3,
-        1556*3
+        1556*3,
+        1
    },
    {
        "bilevel_300_600_A4.tif",
        T4_X_RESOLUTION_300,
        T4_Y_RESOLUTION_600,
        T4_WIDTH_300_A4,
-        1100*6
+        1100*6,
+        1
    },
    {
        "bilevel_300_600_B4.tif",
        T4_X_RESOLUTION_300,
        T4_Y_RESOLUTION_600,
        T4_WIDTH_300_B4,
-        1200*6
+        1200*6,
+        1
    },
    {
        "bilevel_300_600_A3.tif",
        T4_X_RESOLUTION_300,
        T4_Y_RESOLUTION_600,
        T4_WIDTH_300_A3,
-        1556*6
+        1556*6,
+        1
    },
    {
        "bilevel_400_400_A4.tif",
        T4_X_RESOLUTION_400,
        T4_Y_RESOLUTION_400,
        T4_WIDTH_400_A4,
-        1100*4
+        1100*4,
+        1
    },
    {
        "bilevel_400_400_B4.tif",
        T4_X_RESOLUTION_400,
        T4_Y_RESOLUTION_400,
        T4_WIDTH_400_B4,
-        1200*4
+        1200*4,
+        1
    },
    {
        "bilevel_400_400_A3.tif",
        T4_X_RESOLUTION_400,
        T4_Y_RESOLUTION_400,
        T4_WIDTH_400_A3,
-        1556*4
+        1556*4,
+        1
    },
    {
        "bilevel_400_800_A4.tif",
        T4_X_RESOLUTION_400,
        T4_Y_RESOLUTION_800,
        T4_WIDTH_400_A4,
-        1100*8
+        1100*8,
+        1
    },
    {
        "bilevel_400_800_B4.tif",
        T4_X_RESOLUTION_400,
        T4_Y_RESOLUTION_800,
        T4_WIDTH_400_B4,
-        1200*8
+        1200*8,
+        1
    },
    {
        "bilevel_400_800_A3.tif",
        T4_X_RESOLUTION_400,
        T4_Y_RESOLUTION_800,
        T4_WIDTH_400_A3,
-        1556*8
+        1556*8,
+        1
    },
    {
        "bilevel_600_600_A4.tif",
        T4_X_RESOLUTION_600,
        T4_Y_RESOLUTION_600,
        T4_WIDTH_600_A4,
-        1100*6
+        1100*6,
+        1
    },
    {
        "bilevel_600_600_B4.tif",
        T4_X_RESOLUTION_600,
        T4_Y_RESOLUTION_600,
        T4_WIDTH_600_B4,
-        1200*6
+        1200*6,
+        1
    },
    {
        "bilevel_600_600_A3.tif",
        T4_X_RESOLUTION_600,
        T4_Y_RESOLUTION_600,
        T4_WIDTH_600_A3,
-        1556*6
+        1556*6,
+        1
    },
    {
        "bilevel_600_1200_A4.tif",
        T4_X_RESOLUTION_600,
        T4_Y_RESOLUTION_1200,
        T4_WIDTH_600_A4,
-        1100*12
+        1100*12,
+        1
    },
    {
        "bilevel_600_1200_B4.tif",
        T4_X_RESOLUTION_600,
        T4_Y_RESOLUTION_1200,
        T4_WIDTH_600_B4,
-        1200*12
+        1200*12,
+        1
    },
    {
        "bilevel_600_1200_A3.tif",
        T4_X_RESOLUTION_600,
        T4_Y_RESOLUTION_1200,
        T4_WIDTH_600_A3,
-        1556*12
+        1556*12,
+        1
    },
    {
        "bilevel_1200_1200_A4.tif",
        T4_X_RESOLUTION_1200,
        T4_Y_RESOLUTION_1200,
        T4_WIDTH_1200_A4,
-        1100*12
+        1100*12,
+        1
    },
    {
        "bilevel_1200_1200_B4.tif",
        T4_X_RESOLUTION_1200,
        T4_Y_RESOLUTION_1200,
        T4_WIDTH_1200_B4,
-        1200*12
+        1200*12,
+        1
    },
    {
        "bilevel_1200_1200_A3.tif",
        T4_X_RESOLUTION_1200,
        T4_Y_RESOLUTION_1200,
        T4_WIDTH_1200_A3,
-        1556*12
+        1556*12,
+        1
+    },
+    {
+        "bilevel_R8_77SQ_A4.tif",
+        T4_X_RESOLUTION_R8,
+        T4_Y_RESOLUTION_STANDARD,
+        T4_WIDTH_R8_A4,
+        1100,
+        2
+    },
+    {
+        "bilevel_R8_77SQ_B4.tif",
+        T4_X_RESOLUTION_R8,
+        T4_Y_RESOLUTION_STANDARD,
+        T4_WIDTH_R8_B4,
+        1200,
+        2
+    },
+    {
+        "bilevel_R8_77SQ_A3.tif",
+        T4_X_RESOLUTION_R8,
+        T4_Y_RESOLUTION_STANDARD,
+        T4_WIDTH_R8_A3,
+        1556,
+        2
+    },
+    {
+        "bilevel_R8_154SQSQ_A4.tif",
+        T4_X_RESOLUTION_R8,
+        T4_Y_RESOLUTION_STANDARD,
+        T4_WIDTH_R8_A4,
+        1100,
+        4
+    },
+    {
+        "bilevel_R8_154SQSQ_B4.tif",
+        T4_X_RESOLUTION_R8,
+        T4_Y_RESOLUTION_STANDARD,
+        T4_WIDTH_R8_B4,
+        1200,
+        4
+    },
+    {
+        "bilevel_R8_154SQSQ_A3.tif",
+        T4_X_RESOLUTION_R8,
+        T4_Y_RESOLUTION_STANDARD,
+        T4_WIDTH_R8_A3,
+        1556,
+        4
+    },
+    {
+        "bilevel_R8_154SQ_A4.tif",
+        T4_X_RESOLUTION_R8,
+        T4_Y_RESOLUTION_FINE,
+        T4_WIDTH_R8_A4,
+        1100*2,
+        2
+    },
+    {
+        "bilevel_R8_154SQ_B4.tif",
+        T4_X_RESOLUTION_R8,
+        T4_Y_RESOLUTION_FINE,
+        T4_WIDTH_R8_B4,
+        1200*2,
+        2
+    },
+    {
+        "bilevel_R8_154SQ_A3.tif",
+        T4_X_RESOLUTION_R8,
+        T4_Y_RESOLUTION_FINE,
+        T4_WIDTH_R8_A3,
+        1556*2,
+        2
+    },
+    {
+        "bilevel_200_200SQ_A4.tif",
+        T4_X_RESOLUTION_200,
+        T4_Y_RESOLUTION_100,
+        T4_WIDTH_200_A4,
+        1100,
+        2
+    },
+    {
+        "bilevel_200_200SQ_B4.tif",
+        T4_X_RESOLUTION_200,
+        T4_Y_RESOLUTION_100,
+        T4_WIDTH_200_B4,
+        1200,
+        2
+    },
+    {
+        "bilevel_200_200SQ_A3.tif",
+        T4_X_RESOLUTION_200,
+        T4_Y_RESOLUTION_100,
+        T4_WIDTH_200_A3,
+        1556,
+        2
+    },
+    {
+        "bilevel_200_400SQSQ_A4.tif",
+        T4_X_RESOLUTION_200,
+        T4_Y_RESOLUTION_100,
+        T4_WIDTH_200_A4,
+        1100,
+        4
+    },
+    {
+        "bilevel_200_400SQSQ_B4.tif",
+        T4_X_RESOLUTION_200,
+        T4_Y_RESOLUTION_100,
+        T4_WIDTH_200_B4,
+        1200,
+        4
+    },
+    {
+        "bilevel_200_400SQSQ_A3.tif",
+        T4_X_RESOLUTION_200,
+        T4_Y_RESOLUTION_100,
+        T4_WIDTH_200_A3,
+        1556,
+        4
+    },
+    {
+        "bilevel_200_400SQ_A4.tif",
+        T4_X_RESOLUTION_200,
+        T4_Y_RESOLUTION_200,
+        T4_WIDTH_200_A4,
+        1100*2,
+        2
+    },
+    {
+        "bilevel_200_400SQ_B4.tif",
+        T4_X_RESOLUTION_200,
+        T4_Y_RESOLUTION_200,
+        T4_WIDTH_200_B4,
+        1200*2,
+        2
+    },
+    {
+        "bilevel_200_400SQ_A3.tif",
+        T4_X_RESOLUTION_200,
+        T4_Y_RESOLUTION_200,
+        T4_WIDTH_200_A3,
+        1556*2,
+        2
    },
    {
        NULL,
        0,
        0,
        0,
+        0,
        0
    },
 };

+static void set_pixel(uint8_t buf[], int row, int pixel)
+{
+    row--;
+    buf[row*1728/8 + pixel/8] |= (0x80 >> (pixel & 0x07));
+}
+/*- End of function --------------------------------------------------------*/
+
+static void set_pixel_range(uint8_t buf[], int row, int start, int end)
+{
+    int i;
+
+    for (i = start;  i <= end;  i++)
+        set_pixel(buf, row, i);
+}
+/*- End of function --------------------------------------------------------*/
+
+#if 0
+static void clear_pixel(uint8_t buf[], int row, int pixel)
+{
+    row--;
+    buf[row*1728/8 + pixel/8] &= ~(0x80 >> (pixel & 0x07));
+}
+/*- End of function --------------------------------------------------------*/
+
+static void clear_pixel_range(uint8_t buf[], int row, int start, int end)
+{
+    int i;
+
+    for (i = start;  i <= end;  i++)
+        clear_pixel(buf, row, i);
+}
+/*- End of function --------------------------------------------------------*/
+#endif
+
+static void clear_row(uint8_t buf[], int width)
+{
+    memset(buf, 0, width/8 + 1);
+}
+/*- End of function --------------------------------------------------------*/
+
 int main(int argc, char *argv[])
 {
    int row;
@@ -371,6 +599,8 @@ int main(int argc, char *argv[])
    float x_resolution;
    float y_resolution;
    int i;
+    int j;
+    int k;
    int opt;
    int compression;
    int photo_metric;
@@ -424,7 +654,6 @@ int main(int argc, char *argv[])
        TIFFSetField(tiff_file, TIFFTAG_BITSPERSAMPLE, 1);
        TIFFSetField(tiff_file, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
        TIFFSetField(tiff_file, TIFFTAG_SAMPLESPERPIXEL, 1);
-        TIFFSetField(tiff_file, TIFFTAG_ROWSPERSTRIP, -1L);
        TIFFSetField(tiff_file, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
        TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, photo_metric);
        TIFFSetField(tiff_file, TIFFTAG_FILLORDER, fill_order);
@@ -435,13 +664,13 @@ int main(int argc, char *argv[])
        TIFFSetField(tiff_file, TIFFTAG_YRESOLUTION, floorf(y_resolution*2.54f + 0.5f));
        TIFFSetField(tiff_file, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH);

-        TIFFSetField(tiff_file, TIFFTAG_SOFTWARE, "spandsp");
        if (gethostname(buf, sizeof(buf)) == 0)
            TIFFSetField(tiff_file, TIFFTAG_HOSTCOMPUTER, buf);

-        TIFFSetField(tiff_file, TIFFTAG_IMAGEDESCRIPTION, "Blank test image");
+        TIFFSetField(tiff_file, TIFFTAG_SOFTWARE, "Spandsp");
+        TIFFSetField(tiff_file, TIFFTAG_IMAGEDESCRIPTION, "Diagonally striped test image");
        TIFFSetField(tiff_file, TIFFTAG_MAKE, "soft-switch.org");
-        TIFFSetField(tiff_file, TIFFTAG_MODEL, "test data");
+        TIFFSetField(tiff_file, TIFFTAG_MODEL, "testy");

        time(&now);
        tm = localtime(&now);
@@ -455,6 +684,7 @@ int main(int argc, char *argv[])
                tm->tm_sec);
        TIFFSetField(tiff_file, TIFFTAG_DATETIME, buf);

+        TIFFSetField(tiff_file, TIFFTAG_ROWSPERSTRIP, sequence[i].length);
        TIFFSetField(tiff_file, TIFFTAG_IMAGELENGTH, sequence[i].length);
        TIFFSetField(tiff_file, TIFFTAG_PAGENUMBER, 0, 1);
        TIFFSetField(tiff_file, TIFFTAG_CLEANFAXDATA, CLEANFAXDATA_CLEAN);
@@ -462,9 +692,18 @@ int main(int argc, char *argv[])
        TIFFCheckpointDirectory(tiff_file);

        /* Write the image first.... */
+        /* Produce a pattern of diagonal bands */
        for (row = 0;  row < sequence[i].length;  row++)
        {
-            memset(image_buffer, 0, sequence[i].width/8 + 1);
+            clear_row(image_buffer, sequence[i].width);
+            for (j = 0;  j < sequence[i].squashing_factor;  j++)
+            {
+                k = row*sequence[i].squashing_factor + j;
+                if (((k/sequence[i].width) & 1) == 0)
+                    set_pixel_range(image_buffer, 1, k%sequence[i].width, sequence[i].width - 1);
+                else
+                    set_pixel_range(image_buffer, 1, 0, k%sequence[i].width);
+            }
            if (TIFFWriteScanline(tiff_file, image_buffer, row, 0) < 0)
            {
                printf("Write error at row %d.\n", row);
@@ -81,11 +81,14 @@ int main(int argc, char *argv[])
    TIFFSetField(tiff_file, TIFFTAG_XRESOLUTION, 204.0f);
    TIFFSetField(tiff_file, TIFFTAG_YRESOLUTION, 196.0f);
    TIFFSetField(tiff_file, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH);
-    TIFFSetField(tiff_file, TIFFTAG_SOFTWARE, "Spandsp");
-    TIFFSetField(tiff_file, TIFFTAG_HOSTCOMPUTER, "host");
    TIFFSetField(tiff_file, TIFFTAG_FAXSUBADDRESS, "1111");
+
+    if (gethostname(buf, sizeof(buf)) == 0)
+        TIFFSetField(tiff_file, TIFFTAG_HOSTCOMPUTER, buf);
+
+    TIFFSetField(tiff_file, TIFFTAG_SOFTWARE, "Spandsp");
    TIFFSetField(tiff_file, TIFFTAG_IMAGEDESCRIPTION, "Image in stripes");
-    TIFFSetField(tiff_file, TIFFTAG_MAKE, "spandsp");
+    TIFFSetField(tiff_file, TIFFTAG_MAKE, "soft-switch.org");
    TIFFSetField(tiff_file, TIFFTAG_MODEL, "testy");

    time(&now);
@@ -860,81 +860,95 @@ int main(int argc, char *argv[])
        case 0:
            /* Allow anything */
            t30_set_supported_bilevel_resolutions(t30_state[i],
-                                                  T4_SUPPORT_RESOLUTION_R8_STANDARD
-                                                | T4_SUPPORT_RESOLUTION_R8_FINE
-                                                | T4_SUPPORT_RESOLUTION_R8_SUPERFINE
-                                                | T4_SUPPORT_RESOLUTION_R16_SUPERFINE
-                                                | T4_SUPPORT_RESOLUTION_200_100
-                                                | T4_SUPPORT_RESOLUTION_200_200
-                                                | T4_SUPPORT_RESOLUTION_200_400
-                                                | T4_SUPPORT_RESOLUTION_300_300
-                                                | T4_SUPPORT_RESOLUTION_300_600
-                                                | T4_SUPPORT_RESOLUTION_400_400
-                                                | T4_SUPPORT_RESOLUTION_400_800
-                                                | T4_SUPPORT_RESOLUTION_600_600
-                                                | T4_SUPPORT_RESOLUTION_600_1200
-                                                | T4_SUPPORT_RESOLUTION_1200_1200);
+                                                  T4_RESOLUTION_R8_STANDARD
+                                                | T4_RESOLUTION_R8_FINE
+                                                | T4_RESOLUTION_R8_SUPERFINE
+                                                | T4_RESOLUTION_R16_SUPERFINE
+                                                | T4_RESOLUTION_200_100
+                                                | T4_RESOLUTION_200_200
+                                                | T4_RESOLUTION_200_400
+                                                | T4_RESOLUTION_300_300
+                                                | T4_RESOLUTION_300_600
+                                                | T4_RESOLUTION_400_400
+                                                | T4_RESOLUTION_400_800
+                                                | T4_RESOLUTION_600_600
+                                                | T4_RESOLUTION_600_1200
+                                                | T4_RESOLUTION_1200_1200);
            break;
        case 1:
            /* Allow anything metric */
            t30_set_supported_bilevel_resolutions(t30_state[i],
-                                                  T4_SUPPORT_RESOLUTION_R8_STANDARD
-                                                | T4_SUPPORT_RESOLUTION_R8_FINE
-                                                | T4_SUPPORT_RESOLUTION_R8_SUPERFINE
-                                                | T4_SUPPORT_RESOLUTION_R16_SUPERFINE);
+                                                  T4_RESOLUTION_R8_STANDARD
+                                                | T4_RESOLUTION_R8_FINE
+                                                | T4_RESOLUTION_R8_SUPERFINE
+                                                | T4_RESOLUTION_R16_SUPERFINE);
            break;
        case 2:
            /* Allow anything inch based */
            t30_set_supported_bilevel_resolutions(t30_state[i],
-                                                  T4_SUPPORT_RESOLUTION_200_100
-                                                | T4_SUPPORT_RESOLUTION_200_200
-                                                | T4_SUPPORT_RESOLUTION_200_400
-                                                | T4_SUPPORT_RESOLUTION_300_300
-                                                | T4_SUPPORT_RESOLUTION_300_600
-                                                | T4_SUPPORT_RESOLUTION_400_400
-                                                | T4_SUPPORT_RESOLUTION_400_800
-                                                | T4_SUPPORT_RESOLUTION_600_600
-                                                | T4_SUPPORT_RESOLUTION_600_1200
-                                                | T4_SUPPORT_RESOLUTION_1200_1200);
+                                                  T4_RESOLUTION_200_100
+                                                | T4_RESOLUTION_200_200
+                                                | T4_RESOLUTION_200_400
+                                                | T4_RESOLUTION_300_300
+                                                | T4_RESOLUTION_300_600
+                                                | T4_RESOLUTION_400_400
+                                                | T4_RESOLUTION_400_800
+                                                | T4_RESOLUTION_600_600
+                                                | T4_RESOLUTION_600_1200
+                                                | T4_RESOLUTION_1200_1200);
            break;
        case 3:
            /* Allow only restricted length resolution */
            t30_set_supported_bilevel_resolutions(t30_state[i],
-                                                  T4_SUPPORT_RESOLUTION_R8_STANDARD
-                                                | T4_SUPPORT_RESOLUTION_R8_FINE
-                                                | T4_SUPPORT_RESOLUTION_200_100
-                                                | T4_SUPPORT_RESOLUTION_200_200);
+                                                  T4_RESOLUTION_R8_STANDARD
+                                                | T4_RESOLUTION_R8_FINE
+                                                | T4_RESOLUTION_200_100
+                                                | T4_RESOLUTION_200_200);
            break;
        case 4:
            /* Allow only more restricted length resolution */
            t30_set_supported_bilevel_resolutions(t30_state[i],
-                                                  T4_SUPPORT_RESOLUTION_R8_STANDARD
-                                                | T4_SUPPORT_RESOLUTION_200_100);
+                                                  T4_RESOLUTION_R8_STANDARD
+                                                | T4_RESOLUTION_200_100);
            break;
        }
        if (colour_enabled)
        {
            t30_set_supported_colour_resolutions(t30_state[i],
-                                                 T4_SUPPORT_RESOLUTION_100_100
-                                               | T4_SUPPORT_RESOLUTION_200_200
-                                               | T4_SUPPORT_RESOLUTION_300_300
-                                               | T4_SUPPORT_RESOLUTION_400_400
-                                               | T4_SUPPORT_RESOLUTION_600_600
-                                               | T4_SUPPORT_RESOLUTION_1200_1200);
+                                                 T4_RESOLUTION_100_100
+                                               | T4_RESOLUTION_200_200
+                                               | T4_RESOLUTION_300_300
+                                               | T4_RESOLUTION_400_400
+                                               | T4_RESOLUTION_600_600
+                                               | T4_RESOLUTION_1200_1200);
        }
        else
        {
            t30_set_supported_colour_resolutions(t30_state[i], 0);
        }
-        t30_set_supported_output_compressions(t30_state[i], T4_SUPPORT_COMPRESSION_T4_2D);
+        t30_set_supported_output_compressions(t30_state[i], T4_COMPRESSION_T4_2D);
        t30_set_ecm_capability(t30_state[i], use_ecm);
        t30_set_supported_compressions(t30_state[i],
-                                       T4_SUPPORT_COMPRESSION_T4_1D
-                                     | T4_SUPPORT_COMPRESSION_T4_2D
-                                     | T4_SUPPORT_COMPRESSION_T6
-                                     //| T4_SUPPORT_COMPRESSION_t42_T81
-                                     | T4_SUPPORT_COMPRESSION_T85
-                                     | T4_SUPPORT_COMPRESSION_T85_L0);
+                                       T4_COMPRESSION_T4_1D
+                                     | T4_COMPRESSION_T4_2D
+                                     | T4_COMPRESSION_T6
+                                     | T4_COMPRESSION_T85
+                                     | T4_COMPRESSION_T85_L0
+#if 0
+                                     //| T4_COMPRESSION_T88
+                                     | T4_COMPRESSION_T43
+                                     | T4_COMPRESSION_T45
+                                     | T4_COMPRESSION_T42_T81
+                                     | T4_COMPRESSION_SYCC_T81
+                                     | T4_COMPRESSION_GRAYSCALE
+                                     | T4_COMPRESSION_COLOUR
+                                     | T4_COMPRESSION_12BIT
+                                     | T4_COMPRESSION_COLOUR_TO_GRAY
+                                     | T4_COMPRESSION_GRAY_TO_BILEVEL
+                                     | T4_COMPRESSION_COLOUR_TO_BILEVEL
+                                     | T4_COMPRESSION_RESCALING
+#endif
+                                     | 0);
        t30_set_minimum_scan_line_time(t30_state[i], scan_line_time);

        if (mode[i] == T38_GATEWAY_FAX)
@@ -39,6 +39,31 @@ run_fax_test()
    echo tested ${FILE}
 }

+run_fax_squash_test()
+{
+    # Test with lengthwise squashing of a bilevel image
+    rm -f fax_tests.tif
+    echo ./fax_tests -b ${SQ} ${OPTS} -i ${IN_FILE}
+    ./fax_tests -b ${SQ} ${OPTS} -i ${IN_FILE} >xyzzy 2>xyzzy2
+    RETVAL=$?
+    if [ $RETVAL != 0 ]
+    then
+        echo fax_tests failed!
+        exit $RETVAL
+    fi
+    # Now use tiffcmp to check the results. It will return non-zero if any page images differ. The -t
+    # option means the normal differences in tags will be ignored.
+    tiffcmp -t ${OUT_FILE} fax_tests.tif >/dev/null
+    RETVAL=$?
+    if [ $RETVAL != 0 ]
+    then
+        echo fax_tests failed!
+        exit $RETVAL
+    fi
+    rm -f fax_tests.tif
+    echo tested ${FILE}
+}
+
 run_colour_fax_test()
 {
    rm -f fax_tests.tif
@@ -70,49 +95,154 @@ LOCALTESTS_DIR=../test-data/local
 # Colour/gray -> bilevel by not allowing ECM
 for OPTS in "-p AA" "-p TT" "-p GG" "-p TG" "-p GT"
 do
-    IN_FILE="${LOCALTESTS_DIR}/lenna-colour.tif"
-    OUT_FILE="${LOCALTESTS_DIR}/lenna-colour-bilevel.tif"
-    run_colour_fax_test
+    echo Colour to bi-level tests disabled
+#    IN_FILE="${LOCALTESTS_DIR}/lenna-colour.tif"
+#    OUT_FILE="${LOCALTESTS_DIR}/lenna-colour-bilevel.tif"
+#    run_colour_fax_test

-    IN_FILE="${LOCALTESTS_DIR}/lenna-bw.tif"
-    OUT_FILE="${LOCALTESTS_DIR}/lenna-bw-bilevel.tif"
-    run_colour_fax_test
+#    IN_FILE="${LOCALTESTS_DIR}/lenna-bw.tif"
+#    OUT_FILE="${LOCALTESTS_DIR}/lenna-bw-bilevel.tif"
+#    run_colour_fax_test

-    IN_FILE="${TIFFFX_DIR}/c03x_02x.tif"
-    OUT_FILE="${TIFFFX_DIR}/c03x_02x.tif"
-    run_colour_fax_test
+#    IN_FILE="${LOCALTESTS_DIR}/lenna-colour.tif"
+#    OUT_FILE="${LOCALTESTS_DIR}/lenna-bw-bilevel.tif"
+#    run_colour_fax_test

-    IN_FILE="${TIFFFX_DIR}/l02x_02x.tif"
-    OUT_FILE="${TIFFFX_DIR}/l02x_02x.tif"
-    run_colour_fax_test
+#    IN_FILE="${TIFFFX_DIR}/c03x_02x.tif"
+#    OUT_FILE="${TIFFFX_DIR}/c03x_02x.tif"
+#    run_colour_fax_test

-    IN_FILE="${TIFFFX_DIR}/l04x_02x.tif"
-    OUT_FILE="${TIFFFX_DIR}/l04x_02x.tif"
-    run_colour_fax_test
+#    IN_FILE="${TIFFFX_DIR}/l02x_02x.tif"
+#    OUT_FILE="${TIFFFX_DIR}/l02x_02x.tif"
+#    run_colour_fax_test
+
+#    IN_FILE="${TIFFFX_DIR}/l04x_02x.tif"
+#    OUT_FILE="${TIFFFX_DIR}/l04x_02x.tif"
+#    run_colour_fax_test
 done

-# Colour/gray -> colour/gray by allowing ECM
+# Colour/gray -> colour/gray
 for OPTS in "-p AA -C -e" "-p TT -C -e" "-p GG -C -e" "-p TG -C -e" "-p GT -C -e"
 do
-    IN_FILE="${LOCALTESTS_DIR}/lenna-colour.tif"
-    OUT_FILE="${LOCALTESTS_DIR}/lenna-colour.tif"
-    run_colour_fax_test
+    echo Colour to colour tests disabled
+#    IN_FILE="${LOCALTESTS_DIR}/lenna-colour.tif"
+#    OUT_FILE="${LOCALTESTS_DIR}/lenna-colour-out.tif"
+#    run_colour_fax_test

-    IN_FILE="${LOCALTESTS_DIR}/lenna-bw.tif"
-    OUT_FILE="${LOCALTESTS_DIR}/lenna-bw.tif"
-    run_colour_fax_test
+#    IN_FILE="${LOCALTESTS_DIR}/lenna-bw.tif"
+#    OUT_FILE="${LOCALTESTS_DIR}/lenna-bw-out.tif"
+#    run_colour_fax_test

-    IN_FILE="${TIFFFX_DIR}/c03x_02x.tif"
-    OUT_FILE="${TIFFFX_DIR}/c03x_02x.tif"
-    run_colour_fax_test
+#    IN_FILE="${TIFFFX_DIR}/c03x_02x.tif"
+#    OUT_FILE="${TIFFFX_DIR}/c03x_02x-out.tif"
+#    run_colour_fax_test

-    IN_FILE="${TIFFFX_DIR}/l02x_02x.tif"
-    OUT_FILE="${TIFFFX_DIR}/l02x_02x.tif"
-    run_colour_fax_test
+#    IN_FILE="${TIFFFX_DIR}/l02x_02x.tif"
+#    OUT_FILE="${TIFFFX_DIR}/l02x_02x.tif"
+#    run_colour_fax_test

-    IN_FILE="${TIFFFX_DIR}/l04x_02x.tif"
-    OUT_FILE="${TIFFFX_DIR}/l04x_02x.tif"
-    run_colour_fax_test
+#    IN_FILE="${TIFFFX_DIR}/l04x_02x.tif"
+#    OUT_FILE="${TIFFFX_DIR}/l04x_02x.tif"
+#    run_colour_fax_test
+done
+
+# Bi-level tests with image squashing
+for OPTS in "-p AA" "-p AA -e" "-p TT" "-p TT -e" "-p GG" "-p GG -e" "-p TG" "-p TG -e" "-p GT" "-p GT -e"
+do
+    IN_FILE="${ITUTESTS_DIR}/bilevel_R8_77_A4.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_R8_77SQ_A4.tif"
+    SQ=4
+    run_fax_squash_test
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_R8_77_B4.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_R8_77SQ_B4.tif"
+    SQ=4
+    run_fax_squash_test
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_R8_77_A3.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_R8_77SQ_A3.tif"
+    SQ=4
+    run_fax_squash_test
+
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_R8_154_A4.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_R8_154SQ_A4.tif"
+    SQ=3
+    run_fax_squash_test
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_R8_154_B4.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_R8_154SQ_B4.tif"
+    SQ=3
+    run_fax_squash_test
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_R8_154_A3.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_R8_154SQ_A3.tif"
+    SQ=3
+    run_fax_squash_test
+
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_R8_154_A4.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_R8_154SQSQ_A4.tif"
+    SQ=4
+    run_fax_squash_test
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_R8_154_B4.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_R8_154SQSQ_B4.tif"
+    SQ=4
+    run_fax_squash_test
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_R8_154_A3.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_R8_154SQSQ_A3.tif"
+    SQ=4
+    run_fax_squash_test
+
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_200_200_A4.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_200_200SQ_A4.tif"
+    SQ=4
+    run_fax_squash_test
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_200_200_B4.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_200_200SQ_B4.tif"
+    SQ=4
+    run_fax_squash_test
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_200_200_A3.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_200_200SQ_A3.tif"
+    SQ=4
+    run_fax_squash_test
+
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_200_400_A4.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_200_400SQ_A4.tif"
+    SQ=3
+    run_fax_squash_test
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_200_400_B4.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_200_400SQ_B4.tif"
+    SQ=3
+    run_fax_squash_test
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_200_400_A3.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_200_400SQ_A3.tif"
+    SQ=3
+    run_fax_squash_test
+
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_200_400_A4.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_200_400SQSQ_A4.tif"
+    SQ=4
+    run_fax_squash_test
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_200_400_B4.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_200_400SQSQ_B4.tif"
+    SQ=4
+    run_fax_squash_test
+
+    IN_FILE="${ITUTESTS_DIR}/bilevel_200_400_A3.tif"
+    OUT_FILE="${ITUTESTS_DIR}/bilevel_200_400SQSQ_A3.tif"
+    SQ=4
+    run_fax_squash_test
 done

 # Bi-level tests
@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
        t30_set_phase_d_handler(t30, phase_d_handler, (void *) (intptr_t) 'A');
        t30_set_phase_e_handler(t30, phase_e_handler, (void *) (intptr_t) 'A');
        t30_set_ecm_capability(t30, use_ecm);
-        t30_set_supported_compressions(t30, T4_SUPPORT_COMPRESSION_T4_1D | T4_SUPPORT_COMPRESSION_T4_2D | T4_SUPPORT_COMPRESSION_T6 | T4_SUPPORT_COMPRESSION_T85);
+        t30_set_supported_compressions(t30, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D | T4_COMPRESSION_T6 | T4_COMPRESSION_T85);

        if (pcap_scan_pkts(input_file_name, src_addr, src_port, dest_addr, dest_port, t38_terminal_timing_update, process_packet, NULL))
            exit(2);
@@ -497,7 +497,7 @@ int main(int argc, char *argv[])
        t30_set_phase_d_handler(t30, phase_d_handler, (void *) (intptr_t) 'B');
        t30_set_phase_e_handler(t30, phase_e_handler, (void *) (intptr_t) 'B');
        t30_set_ecm_capability(t30, use_ecm);
-        t30_set_supported_compressions(t30, T4_SUPPORT_COMPRESSION_T4_1D | T4_SUPPORT_COMPRESSION_T4_2D | T4_SUPPORT_COMPRESSION_T6);
+        t30_set_supported_compressions(t30, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D | T4_COMPRESSION_T6);

        logging = fax_get_logging_state(fax_state);
        span_log_set_level(logging, SPAN_LOG_DEBUG | SPAN_LOG_SHOW_TAG | SPAN_LOG_SHOW_SAMPLE_TIME);
@@ -554,9 +554,9 @@ int main(int argc, char *argv[])

                if (t4_tx_start_page(send_state))
                    break;
-                t4_rx_set_x_resolution(receive_state, t4_tx_get_x_resolution(send_state));
-                t4_rx_set_y_resolution(receive_state, t4_tx_get_y_resolution(send_state));
-                t4_rx_set_image_width(receive_state, t4_tx_get_image_width(send_state));
+                t4_rx_set_x_resolution(receive_state, t4_tx_get_tx_x_resolution(send_state));
+                t4_rx_set_y_resolution(receive_state, t4_tx_get_tx_y_resolution(send_state));
+                t4_rx_set_image_width(receive_state, t4_tx_get_tx_image_width(send_state));
            }
            t4_rx_start_page(receive_state);
            detect_non_ecm_page_end(-1, compression);
@@ -393,23 +393,23 @@ static void fax_prepare(void)
                                | T4_SUPPORT_LENGTH_US_LEGAL
                                | T4_SUPPORT_LENGTH_UNLIMITED);
    t30_set_supported_bilevel_resolutions(t30,
-                                          T4_SUPPORT_RESOLUTION_R8_STANDARD
-                                        | T4_SUPPORT_RESOLUTION_R8_FINE
-                                        | T4_SUPPORT_RESOLUTION_R8_SUPERFINE
-                                        | T4_SUPPORT_RESOLUTION_R16_SUPERFINE
-                                        | T4_SUPPORT_RESOLUTION_200_100
-                                        | T4_SUPPORT_RESOLUTION_200_200
-                                        | T4_SUPPORT_RESOLUTION_200_400
-                                        | T4_SUPPORT_RESOLUTION_300_300
-                                        | T4_SUPPORT_RESOLUTION_300_600
-                                        | T4_SUPPORT_RESOLUTION_400_400
-                                        | T4_SUPPORT_RESOLUTION_400_800
-                                        | T4_SUPPORT_RESOLUTION_600_600
-                                        | T4_SUPPORT_RESOLUTION_600_1200
-                                        | T4_SUPPORT_RESOLUTION_1200_1200);
+                                          T4_RESOLUTION_R8_STANDARD
+                                        | T4_RESOLUTION_R8_FINE
+                                        | T4_RESOLUTION_R8_SUPERFINE
+                                        | T4_RESOLUTION_R16_SUPERFINE
+                                        | T4_RESOLUTION_200_100
+                                        | T4_RESOLUTION_200_200
+                                        | T4_RESOLUTION_200_400
+                                        | T4_RESOLUTION_300_300
+                                        | T4_RESOLUTION_300_600
+                                        | T4_RESOLUTION_400_400
+                                        | T4_RESOLUTION_400_800
+                                        | T4_RESOLUTION_600_600
+                                        | T4_RESOLUTION_600_1200
+                                        | T4_RESOLUTION_1200_1200);
    t30_set_supported_colour_resolutions(t30, 0);
    t30_set_supported_modems(t30, T30_SUPPORT_V27TER | T30_SUPPORT_V29 | T30_SUPPORT_V17);
-    t30_set_supported_compressions(t30, T4_SUPPORT_COMPRESSION_T4_1D | T4_SUPPORT_COMPRESSION_T4_2D | T4_SUPPORT_COMPRESSION_T6);
+    t30_set_supported_compressions(t30, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D | T4_COMPRESSION_T6);
    t30_set_phase_b_handler(t30, phase_b_handler, (void *) (intptr_t) 'A');
    t30_set_phase_d_handler(t30, phase_d_handler, (void *) (intptr_t) 'A');
    t30_set_phase_e_handler(t30, phase_e_handler, (void *) (intptr_t) 'A');
@@ -242,6 +242,8 @@ struct switch_runtime {
 	int32_t sps_last;
 	int32_t sps_peak;
 	int32_t sps_peak_fivemin;
+	int32_t sessions_peak;
+	int32_t sessions_peak_fivemin;
 	switch_log_level_t hard_log_level;
 	char *mailer_app;
 	char *mailer_app_args;
@@ -68,6 +68,7 @@ typedef enum {
 	SCMF_RUNNING,
 	SCMF_DISABLE_TRANSCODING,
 	SCMF_AUTOFIX_TIMING,
+	SCMF_AUTOFIX_PT,
 	SCMF_CODEC_GREEDY,
 	SCMF_CODEC_SCROOGE,
 	SCMF_DISABLE_HOLD,
@@ -242,7 +243,7 @@ SWITCH_DECLARE(switch_rtp_stats_t *) switch_core_media_get_stats(switch_core_ses


 SWITCH_DECLARE(void) switch_core_media_set_sdp_codec_string(switch_core_session_t *session, const char *r_sdp);
-SWITCH_DECLARE(void) switch_core_media_reset_autofix_timing(switch_core_session_t *session, switch_media_type_t type);
+SWITCH_DECLARE(void) switch_core_media_reset_autofix(switch_core_session_t *session, switch_media_type_t type);
 SWITCH_DECLARE(void) switch_core_media_check_outgoing_proxy(switch_core_session_t *session, switch_core_session_t *o_session);
 SWITCH_DECLARE(switch_status_t) switch_core_media_codec_chosen(switch_core_session_t *session, switch_media_type_t media);
 SWITCH_DECLARE (void) switch_core_media_recover_session(switch_core_session_t *session);
@@ -90,6 +90,7 @@ SWITCH_DECLARE(bool) email(char *to, char *from, char *headers = NULL, char *bod
 											const char *short_greeting_sound,
 											const char *invalid_sound,
 											const char *exit_sound,
+											const char *transfer_sound,
 											const char *confirm_macro,
 											const char *confirm_key,
 											const char *tts_engine,
@@ -787,6 +787,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_parser_set_terminator(sw
 *\param short_greeting_sound Optional pointer to a shorter main sound for subsequent loops.
 *\param invalid_sound Optional pointer to a sound to play after invalid input.
 *\param exit_sound Optional pointer to a sound to play upon exiting the menu.
+ *\param transfer_sound Optional pointer to a sound to play upon transfer away from the menu.
 *\param confirm_macro phrase macro name to confirm input
 *\param confirm_key the dtmf key required for positive confirmation
 *\param tts_engine the tts engine to use for this menu
@@ -807,6 +808,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t ** new_me
 													 const char *short_greeting_sound,
 													 const char *invalid_sound,
 													 const char *exit_sound,
+													 const char *transfer_sound,
 													 const char *confirm_macro,
 													 const char *confirm_key,
 													 const char *tts_engine,
@@ -762,10 +762,17 @@ typedef enum {
 	  If this setting is enabled it will NOT do this (old behaviour).
 	 */

-	RTP_BUG_FLUSH_JB_ON_DTMF = (1 << 10)
+	RTP_BUG_FLUSH_JB_ON_DTMF = (1 << 10),
 	
 	/* FLUSH JITTERBUFFER When getting RFC2833 to reduce bleed through */

+	RTP_BUG_ACCEPT_ANY_PAYLOAD = (1 << 11)
+
+	/* 
+	  Make FS accept any payload type instead of dropping and returning CNG frame. Workaround while FS only supports a single payload per rtp session.
+	  This can be used by endpoint modules to detect payload changes and act appropriately (ex: sofia could send a reINVITE with single codec).
+	  This should probably be a flag, but flag enum is already full!
+	*/

 } switch_rtp_bug_flag_t;

@@ -1889,7 +1896,9 @@ typedef enum {
 	SCSC_API_EXPANSION,
 	SCSC_RECOVER,
 	SCSC_SPS_PEAK,
-	SCSC_SPS_PEAK_FIVEMIN
+	SCSC_SPS_PEAK_FIVEMIN,
+	SCSC_SESSIONS_PEAK,
+	SCSC_SESSIONS_PEAK_FIVEMIN
 } switch_session_ctl_t;

 typedef enum {
@@ -24,16 +24,19 @@
 /applications/mod_stress/Makefile
 /applications/mod_stress/Makefile.in
 /applications/mod_stress/mod_stress.log
+/applications/mod_translate/Makefile
 /applications/mod_valet_parking/Makefile
 /applications/mod_voicemail/Makefile
 /asr_tts/mod_unimrcp/Makefile
 /asr_tts/mod_unimrcp/Makefile.in
 /asr_tts/mod_unimrcp/mod_unimrcp.log
 /asr_tts/mod_flite/*/*/mod_flite_manifest.rc
+/codecs/mod_b64/Makefile
 /codecs/mod_skel_codec/Makefile
 /codecs/mod_vp8/Makefile
 /dialplans/mod_dialplan_asterisk/Makefile
 /dialplans/mod_dialplan_xml/Makefile
+/endpoints/mod_html5/mod_html5.log
 /endpoints/mod_portaudio/Makefile
 /endpoints/mod_portaudio/Makefile.in
 /endpoints/mod_portaudio/mod_portaudio.log
@@ -55,8 +58,9 @@
 /formats/mod_portaudio_stream/Makefile.in
 /formats/mod_portaudio_stream/mod_portaudio_stream.log
 /formats/mod_tone_stream/Makefile
-/languages/mod_java/freeswitch.jar
 /languages/mod_java/Makefile
+/languages/mod_java/classes/
+/languages/mod_java/freeswitch.jar
 /languages/mod_lua/Makefile
 /languages/mod_lua/Makefile.in
 /languages/mod_lua/mod_lua.log
@@ -2013,6 +2013,7 @@ SWITCH_STANDARD_API(status_function)
 {
 	switch_core_time_duration_t duration = { 0 };
 	int sps = 0, last_sps = 0, max_sps = 0, max_sps_fivemin = 0;
+	int sessions_peak = 0, sessions_peak_fivemin = 0; /* Max Concurrent Sessions buffers */
 	switch_bool_t html = SWITCH_FALSE;	/* shortcut to format.html	*/
 	char * nl = "\n";					/* shortcut to format.nl	*/
 	stream_format format = { 0 };
@@ -2056,11 +2057,14 @@ SWITCH_STANDARD_API(status_function)
 						   switch_core_ready() ? "ready" : "not ready", nl);

 	stream->write_function(stream, "%" SWITCH_SIZE_T_FMT " session(s) since startup%s", switch_core_session_id() - 1, nl);
+	switch_core_session_ctl(SCSC_SESSIONS_PEAK, &sessions_peak);
+	switch_core_session_ctl(SCSC_SESSIONS_PEAK_FIVEMIN, &sessions_peak_fivemin);
+	stream->write_function(stream, "%d session(s) - peak %d, last 5min %d %s", switch_core_session_count(), sessions_peak, sessions_peak_fivemin, nl);
 	switch_core_session_ctl(SCSC_LAST_SPS, &last_sps);
 	switch_core_session_ctl(SCSC_SPS, &sps);
 	switch_core_session_ctl(SCSC_SPS_PEAK, &max_sps);
 	switch_core_session_ctl(SCSC_SPS_PEAK_FIVEMIN, &max_sps_fivemin);
-	stream->write_function(stream, "%d session(s) - %d out of max %d per sec peak %d (%d last 5min) %s", switch_core_session_count(), last_sps, sps, max_sps, max_sps_fivemin, nl);
+	stream->write_function(stream, "%d session(s) per Sec out of max %d, peak %d, last 5min %d %s", last_sps, sps, max_sps, max_sps_fivemin, nl);
 	stream->write_function(stream, "%d session(s) max%s", switch_core_session_limit(0), nl);
 	stream->write_function(stream, "min idle cpu %0.2f/%0.2f%s", switch_core_min_idle_cpu(-1.0), switch_core_idle_cpu(), nl);

@@ -25,6 +25,7 @@
 * 
 * Rupa Schomaker <rupa@rupa.com>
 * Yossi Neiman <mishehu@freeswitch.org>
+ * Seven Du <dujinfang@gmail.com>
 *
 * mod_curl.c -- API for performing http queries
 *
@@ -106,6 +107,12 @@ struct callback_obj {
 };
 typedef struct callback_obj callback_t;

+struct curl_options_obj {
+	long connect_timeout;
+	long timeout;
+};
+typedef struct curl_options_obj curl_options_t;
+
 static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data)
 {
 	register unsigned int realsize = (unsigned int) (size * nmemb);
@@ -138,7 +145,7 @@ static size_t header_callback(void *ptr, size_t size, size_t nmemb, void *data)
 	return realsize;
 }

-static http_data_t *do_lookup_url(switch_memory_pool_t *pool, const char *url, const char *method, const char *data, const char *content_type)
+static http_data_t *do_lookup_url(switch_memory_pool_t *pool, const char *url, const char *method, const char *data, const char *content_type, curl_options_t *options)
 {
 	switch_CURL *curl_handle = NULL;
 	long httpRes = 0;
@@ -159,6 +166,16 @@ static http_data_t *do_lookup_url(switch_memory_pool_t *pool, const char *url, c
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "method: %s, url: %s, content-type: %s\n", method, url, content_type);
 	curl_handle = switch_curl_easy_init();

+	if (options) {
+		if (options->connect_timeout) {
+			switch_curl_easy_setopt(curl_handle, CURLOPT_CONNECTTIMEOUT, options->connect_timeout);
+		}
+
+		if (options->timeout) {
+			switch_curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, options->timeout);
+		}
+	}
+
 	if (!strncasecmp(url, "https", 5)) {
 		switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
 		switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0);
@@ -710,6 +727,8 @@ SWITCH_STANDARD_APP(curl_app_function)
 	switch_curl_slist_t *slist = NULL;
 	switch_stream_handle_t stream = { 0 };
 	int i = 0;
+	curl_options_t options = { 0 };
+	const char *curl_timeout;

 	if (session) {
 		pool = switch_core_session_get_pool(session);
@@ -750,7 +769,16 @@ SWITCH_STANDARD_APP(curl_app_function)
 		}
 	}

-	http_data = do_lookup_url(pool, url, method, postdata, content_type);
+	curl_timeout = switch_channel_get_variable(channel, "curl_connect_timeout");
+
+	if (curl_timeout) options.connect_timeout = atoi(curl_timeout);
+
+	curl_timeout = switch_channel_get_variable(channel, "curl_timeout");
+
+	if (curl_timeout) options.timeout = atoi(curl_timeout);
+
+
+	http_data = do_lookup_url(pool, url, method, postdata, content_type, &options);
 	if (do_json) {
 		switch_channel_set_variable(channel, "curl_response_data", print_json(pool, http_data));
 	} else {
@@ -843,7 +871,7 @@ SWITCH_STANDARD_API(curl_function)
 			}
 		}

-		http_data = do_lookup_url(pool, url, method, postdata, content_type);
+		http_data = do_lookup_url(pool, url, method, postdata, content_type, NULL);
 		if (do_json) {
 			stream->write_function(stream, "%s", print_json(pool, http_data));
 		} else {
@@ -1052,6 +1052,8 @@ SWITCH_STANDARD_APP(sched_transfer_function)
 	if (!zstr(data) && (mydata = switch_core_session_strdup(session, data))) {
 		if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 2) {
 			time_t when;
+			uint32_t id;
+			char ids[80] = "";

 			if (*argv[0] == '+') {
 				when = switch_epoch_time_now(NULL) + atol(argv[0] + 1);
@@ -1059,7 +1061,9 @@ SWITCH_STANDARD_APP(sched_transfer_function)
 				when = atol(argv[0]);
 			}

-			switch_ivr_schedule_transfer(when, switch_core_session_get_uuid(session), argv[1], argv[2], argv[3]);
+			id = switch_ivr_schedule_transfer(when, switch_core_session_get_uuid(session), argv[1], argv[2], argv[3]);
+			snprintf(ids, sizeof(ids), "%u", id);
+			switch_channel_set_variable(switch_core_session_get_channel(session), "last_sched_id", ids);			
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Args\n");
 		}
@@ -1114,6 +1118,8 @@ SWITCH_STANDARD_APP(sched_broadcast_function)
 		if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 2) {
 			time_t when;
 			switch_media_flag_t flags = SMF_NONE;
+			uint32_t id;
+			char ids[80] = "";

 			if (*argv[0] == '+') {
 				when = switch_epoch_time_now(NULL) + atol(argv[0] + 1);
@@ -1133,7 +1139,9 @@ SWITCH_STANDARD_APP(sched_broadcast_function)
 				flags |= SMF_ECHO_ALEG;
 			}

-			switch_ivr_schedule_broadcast(when, switch_core_session_get_uuid(session), argv[1], flags);
+			id = switch_ivr_schedule_broadcast(when, switch_core_session_get_uuid(session), argv[1], flags);
+			snprintf(ids, sizeof(ids), "%u", id);
+			switch_channel_set_variable(switch_core_session_get_channel(session), "last_sched_id", ids);
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Args\n");
 		}
@@ -1343,7 +1351,16 @@ SWITCH_STANDARD_APP(sched_cancel_function)
 	if (zstr(group)) {
 		group = switch_core_session_get_uuid(session);
 	}
-	switch_scheduler_del_task_group(group);
+
+	if (switch_is_digit_string(group)) {
+		int64_t tmp;
+		tmp = (uint32_t) atoi(group);
+		if (tmp > 0) {
+			switch_scheduler_del_task_id((uint32_t) tmp);
+		}
+	} else {
+		switch_scheduler_del_task_group(group);
+	}
 }

 static void base_set (switch_core_session_t *session, const char *data, switch_stack_t stack)
@@ -934,7 +934,7 @@ struct call_helper {
 	switch_memory_pool_t *pool;
 };

-#define MAX_ROWS 25
+#define MAX_ROWS 250
 struct callback_helper {
 	int need;
 	switch_memory_pool_t *pool;
@@ -648,7 +648,7 @@ switch_status_t load_configuration(switch_bool_t reload)
 								"Unable to add tone_descriptor: %s, tone: %s.  (too many tones)\n", name, tone_name);
 						switch_goto_status(SWITCH_STATUS_FALSE, done);
 					}
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, 
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10,
 							"Adding tone_descriptor: %s, tone: %s(%d)\n", name, tone_name, id);
 					/* add elements to tone */
 					for (element = switch_xml_child(tone, "element"); element; element = switch_xml_next(element)) {
@@ -683,7 +683,7 @@ switch_status_t load_configuration(switch_bool_t reload)
 							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid element param.\n");
 							switch_goto_status(SWITCH_STATUS_FALSE, done);
 						}
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, 
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10,
 								"Adding tone_descriptor: %s, tone: %s(%d), element (%d, %d, %d, %d)\n", name, tone_name, id, freq1, freq2, min, max);
 						tone_descriptor_add_tone_element(descriptor, id, freq1, freq2, min, max);
 					}
@@ -713,7 +713,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_spandsp_init)
 	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
 	switch_mutex_init(&spandsp_globals.mutex, SWITCH_MUTEX_NESTED, pool);

-	SWITCH_ADD_APP(app_interface, "t38_gateway", "Convert to T38 Gateway if tones are heard", "Convert to T38 Gateway if tones are heard", 
+	SWITCH_ADD_APP(app_interface, "t38_gateway", "Convert to T38 Gateway if tones are heard", "Convert to T38 Gateway if tones are heard",
 				   t38_gateway_function, "", SAF_MEDIA_TAP);

 	SWITCH_ADD_APP(app_interface, "rxfax", "FAX Receive Application", "FAX Receive Application", spanfax_rx_function, SPANFAX_RX_USAGE,
@@ -734,7 +734,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_spandsp_init)

 	SWITCH_ADD_APP(app_interface, "spandsp_send_tdd", "Send TDD data", "Send TDD data", tdd_send_function, "", SAF_NONE);

-	SWITCH_ADD_APP(app_interface, "spandsp_start_fax_detect", "start fax detect", "start fax detect", spandsp_fax_detect_session_function, 
+	SWITCH_ADD_APP(app_interface, "spandsp_start_fax_detect", "start fax detect", "start fax detect", spandsp_fax_detect_session_function,
 				   "<app>[ <arg>][ <timeout>][ <tone_type>]", SAF_NONE);

 	SWITCH_ADD_APP(app_interface, "spandsp_stop_fax_detect", "stop fax detect", "stop fax detect", spandsp_stop_fax_detect_session_function, "", SAF_NONE);
@@ -752,9 +752,10 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_spandsp_init)
 		SWITCH_ADD_APP(app_interface, "stop_tone_detect", "Stop background tone detection with cadence", "", stop_tone_detect_app, "", SAF_NONE);
 		SWITCH_ADD_API(api_interface, "start_tone_detect", "Start background tone detection with cadence", start_tone_detect_api, "<uuid> <name>");
 		SWITCH_ADD_API(api_interface, "stop_tone_detect", "Stop background tone detection with cadence", stop_tone_detect_api, "<uuid>");
+		switch_console_set_complete("add start_tone_detect ::console::list_uuid");
+		switch_console_set_complete("add stop_tone_detect ::console::list_uuid");
 	}

-
 	SWITCH_ADD_API(api_interface, "start_tdd_detect", "Start background tdd detection", start_tdd_detect_api, "<uuid>");
 	SWITCH_ADD_API(api_interface, "stop_tdd_detect", "Stop background tdd detection", stop_tdd_detect_api, "<uuid>");

@@ -1,4 +1,4 @@
-/* 
+/*
 * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
 * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
 *
@@ -141,7 +141,7 @@ switch_status_t spandsp_fax_detect_session(switch_core_session_t *session,
 														   int hits, const char *app, const char *data, switch_tone_detect_callback_t callback);

 switch_status_t spandsp_fax_stop_detect_session(switch_core_session_t *session);
-void spanfax_log_message(void *user_data, int level, const char *msg);
+void mod_spandsp_log_message(void *session, int level, const char *msg);
 switch_status_t load_configuration(switch_bool_t reload);
 void mod_spandsp_indicate_data(switch_core_session_t *session, switch_bool_t self, switch_bool_t on);

@@ -150,11 +150,11 @@ static int get_v18_mode(switch_core_session_t *session)
 {
 	switch_channel_t *channel = switch_core_session_get_channel(session);
 	const char *var;
-	int r = V18_MODE_5BIT_45;
+	int r = V18_MODE_5BIT_4545;

 	if ((var = switch_channel_get_variable(channel, "v18_mode"))) {
 		if (!strcasecmp(var, "5BIT_45") || !strcasecmp(var, "baudot")) {
-			r = V18_MODE_5BIT_45;
+			r = V18_MODE_5BIT_4545;
 		} else if (!strcasecmp(var, "5BIT_50")) {
 			r = V18_MODE_5BIT_50;
 		} else if (!strcasecmp(var, "DTMF")) {
@@ -349,6 +349,7 @@ switch_status_t spandsp_tdd_decode_session(switch_core_session_t *session)
 typedef struct {
 	switch_core_session_t *session;
 	dtmf_rx_state_t *dtmf_detect;
+	int verbose;
 	char last_digit;
 	uint32_t samples;
 	uint32_t last_digit_end;
@@ -394,6 +395,10 @@ static switch_bool_t inband_dtmf_callback(switch_media_bug_t *bug, void *user_da
 	switch (type) {
 	case SWITCH_ABC_TYPE_INIT: {
 		pvt->dtmf_detect = dtmf_rx_init(NULL, NULL, NULL);
+		span_log_set_message_handler(dtmf_rx_get_logging_state(pvt->dtmf_detect), mod_spandsp_log_message, pvt->session);
+		if (pvt->verbose) {
+			span_log_set_level(dtmf_rx_get_logging_state(pvt->dtmf_detect), SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
+		}
 		dtmf_rx_parms(pvt->dtmf_detect, pvt->filter_dialtone, pvt->twist, pvt->reverse_twist, pvt->threshold);
 		dtmf_rx_set_realtime_callback(pvt->dtmf_detect, spandsp_dtmf_rx_realtime_callback, pvt);
 		break;
@@ -500,6 +505,10 @@ switch_status_t spandsp_inband_dtmf_session(switch_core_session_t *session)
 		pvt->filter_dialtone = 0;
 	}

+	if ((value = switch_channel_get_variable(channel, "dtmf_verbose"))) {
+		pvt->verbose = switch_true(value);
+	}
+
 	if (switch_channel_pre_answer(channel) != SWITCH_STATUS_SUCCESS) {
 		return SWITCH_STATUS_FALSE;
 	}
@@ -554,7 +563,7 @@ static switch_bool_t callprogress_detector_process_buffer(switch_media_bug_t *bu
 * Allocate the tone descriptor
 *
 * @param descriptor the descriptor to create
- * @param name the descriptor name 
+ * @param name the descriptor name
 * @param memory_pool the pool to use
 * @return SWITCH_STATUS_SUCCESS if successful
 */
@@ -632,7 +641,7 @@ static void tone_report_callback(void *user_data, int code, int level, int delay

 /**
 * Process tone segment report from spandsp (for debugging)
- * 
+ *
 * @param user_data the tone_detector
 * @param f1 the first frequency of the segment
 * @param f2 the second frequency of the segment
@@ -705,7 +714,7 @@ static switch_bool_t tone_detector_process_buffer(tone_detector_t *detector, voi
 * Destroy the tone detector
 * @param detector the detector to destroy
 */
-static void tone_detector_destroy(tone_detector_t *detector) 
+static void tone_detector_destroy(tone_detector_t *detector)
 {
 	if (detector) {
 		if (detector->spandsp_detector) {
@@ -720,7 +729,7 @@ static void tone_detector_destroy(tone_detector_t *detector)
 * Start call progress detection
 *
 * @param session the session to detect
- * @param name of the descriptor to use 
+ * @param name of the descriptor to use
 * @return SWITCH_STATUS_SUCCESS if successful
 */
 switch_status_t callprogress_detector_start(switch_core_session_t *session, const char *name)
@@ -759,7 +768,7 @@ switch_status_t callprogress_detector_start(switch_core_session_t *session, cons
 /**
 * Process a buffer of audio data for call progress tones
 *
- * @param bug the session's media bug 
+ * @param bug the session's media bug
 * @param user_data the detector
 * @param type the type of data available from the bug
 * @return SWITCH_TRUE
@@ -817,7 +826,7 @@ static switch_bool_t callprogress_detector_process_buffer(switch_media_bug_t *bu

 /**
 * Stop call progress detection
- * @param session the session to stop 
+ * @param session the session to stop
 * @return SWITCH_STATUS_SUCCESS if successful
 */
 switch_status_t callprogress_detector_stop(switch_core_session_t *session)
@@ -1,4 +1,4 @@
-/* 
+/*
 * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
 * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
 *
@@ -167,7 +167,7 @@ static int del_pvt(pvt_t *del_pvt)
 			r = 1;
 			break;
 		}
-	
+
 		l = p;
 	}

@@ -259,15 +259,11 @@ static void counter_increment(void)
 	switch_mutex_unlock(spandsp_globals.mutex);
 }

-void spanfax_log_message(void *user_data, int level, const char *msg)
+void mod_spandsp_log_message(void *user_data, int level, const char *msg)
 {
 	int fs_log_level;
-    switch_core_session_t *session;
-    pvt_t *pvt;
-    
-	pvt = (pvt_t *) user_data;
-	session = pvt->session;
-    
+	switch_core_session_t *session = (switch_core_session_t *)user_data;
+
 	switch (level) {
 	case SPAN_LOG_NONE:
 		return;
@@ -329,7 +325,7 @@ static int phase_b_handler(t30_state_t *s, void *user_data, int result)
 	switch_channel_set_variable(channel, "fax_remote_model", switch_str_nil(t30_get_rx_model(s)));


-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "=== Negotiation Result =======================================================\n"); 
+	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "=== Negotiation Result =======================================================\n");
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Remote station id: %s\n", far_ident);
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Local station id:  %s\n", local_ident);
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Transfer Rate:     %i\n", t30_stats.bit_rate);
@@ -339,7 +335,7 @@ static int phase_b_handler(t30_state_t *s, void *user_data, int result)
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "remote vendor:    %s\n", switch_str_nil(t30_get_rx_vendor(s)));
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "remote model:     %s\n", switch_str_nil(t30_get_rx_model(s)));

-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "==============================================================================\n"); 
+	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "==============================================================================\n");

 	switch_channel_execute_on(channel, "execute_on_fax_phase_b");

@@ -673,9 +669,9 @@ static int t38_tx_packet_handler(t38_core_state_t *s, void *user_data, const uin

 	if (r < 0) {
 		t30_state_t *t30;
-	
+
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "TERMINATING T30 STATE\n");
-	
+
 		if (pvt->t38_state && (t30 = t38_terminal_get_t30_state(pvt->t38_state))) {
 			t30_terminate(t30);
 		}
@@ -733,8 +729,8 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)

 		fax_set_transmit_on_idle(fax, TRUE);

-		span_log_set_message_handler(fax_get_logging_state(fax), spanfax_log_message, pvt);
-		span_log_set_message_handler(t30_get_logging_state(t30), spanfax_log_message, pvt);
+		span_log_set_message_handler(fax_get_logging_state(fax), mod_spandsp_log_message, pvt->session);
+		span_log_set_message_handler(t30_get_logging_state(t30), mod_spandsp_log_message, pvt->session);

 		if (pvt->verbose) {
 			span_log_set_level(fax_get_logging_state(fax), SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
@@ -772,7 +768,7 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)

 			pvt->t38_core = t38_terminal_get_t38_core_state(pvt->t38_state);

-			if (udptl_init(pvt->udptl_state, UDPTL_ERROR_CORRECTION_REDUNDANCY, fec_span, fec_entries, 
+			if (udptl_init(pvt->udptl_state, UDPTL_ERROR_CORRECTION_REDUNDANCY, fec_span, fec_entries,
 					(udptl_rx_packet_handler_t *) t38_core_rx_ifp_packet, (void *) pvt->t38_core) == NULL) {
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot initialize my UDPTL structs\n");
 				return SWITCH_STATUS_FALSE;
@@ -789,8 +785,8 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)
 				}
 			}

-			span_log_set_message_handler(t38_terminal_get_logging_state(t38), spanfax_log_message, pvt);
-			span_log_set_message_handler(t30_get_logging_state(t30), spanfax_log_message, pvt);
+			span_log_set_message_handler(t38_terminal_get_logging_state(t38), mod_spandsp_log_message, pvt->session);
+			span_log_set_message_handler(t30_get_logging_state(t30), mod_spandsp_log_message, pvt->session);

 			if (pvt->verbose) {
 				span_log_set_level(t38_terminal_get_logging_state(t38), SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
@@ -811,13 +807,13 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot initialize my T.38 structs\n");
 			t38_gateway_free(pvt->t38_gateway_state);
 			pvt->t38_gateway_state = NULL;
-			
+
 			return SWITCH_STATUS_FALSE;
 		}

 		pvt->t38_core = t38_gateway_get_t38_core_state(pvt->t38_gateway_state);

-		if (udptl_init(pvt->udptl_state, UDPTL_ERROR_CORRECTION_REDUNDANCY, fec_span, fec_entries, 
+		if (udptl_init(pvt->udptl_state, UDPTL_ERROR_CORRECTION_REDUNDANCY, fec_span, fec_entries,
 						(udptl_rx_packet_handler_t *) t38_core_rx_ifp_packet, (void *) pvt->t38_core) == NULL) {
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot initialize my UDPTL structs\n");
 			t38_gateway_free(pvt->t38_gateway_state);
@@ -843,8 +839,8 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)
 			t38_gateway_set_ecm_capability(pvt->t38_gateway_state, TRUE);
 		}

-		span_log_set_message_handler(t38_gateway_get_logging_state(pvt->t38_gateway_state), spanfax_log_message, pvt);
-		span_log_set_message_handler(t38_core_get_logging_state(pvt->t38_core), spanfax_log_message, pvt);
+		span_log_set_message_handler(t38_gateway_get_logging_state(pvt->t38_gateway_state), mod_spandsp_log_message, pvt->session);
+		span_log_set_message_handler(t38_core_get_logging_state(pvt->t38_core), mod_spandsp_log_message, pvt->session);

 		if (pvt->verbose) {
 			span_log_set_level(t38_gateway_get_logging_state(pvt->t38_gateway_state), SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
@@ -879,14 +875,14 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)
 								  T4_SUPPORT_LENGTH_US_LETTER | T4_SUPPORT_LENGTH_US_LEGAL | T4_SUPPORT_LENGTH_UNLIMITED
 								| T4_SUPPORT_WIDTH_215MM | T4_SUPPORT_WIDTH_255MM | T4_SUPPORT_WIDTH_303MM);
 	t30_set_supported_bilevel_resolutions(t30,
-										  T4_SUPPORT_RESOLUTION_R8_STANDARD
-										| T4_SUPPORT_RESOLUTION_R8_FINE
-										| T4_SUPPORT_RESOLUTION_R8_SUPERFINE
-										| T4_SUPPORT_RESOLUTION_R16_SUPERFINE
-                                        | T4_SUPPORT_RESOLUTION_200_100
-                                        | T4_SUPPORT_RESOLUTION_200_200
-                                        | T4_SUPPORT_RESOLUTION_200_400
-                                        | T4_SUPPORT_RESOLUTION_400_400);
+										  T4_RESOLUTION_R8_STANDARD
+										| T4_RESOLUTION_R8_FINE
+										| T4_RESOLUTION_R8_SUPERFINE
+										| T4_RESOLUTION_R16_SUPERFINE
+                                        | T4_RESOLUTION_200_100
+                                        | T4_RESOLUTION_200_200
+                                        | T4_RESOLUTION_200_400
+                                        | T4_RESOLUTION_400_400);
 	t30_set_supported_colour_resolutions(t30, 0);

 	if (pvt->disable_v17) {
@@ -898,11 +894,11 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)
 	}

 	if (pvt->use_ecm) {
-		t30_set_supported_compressions(t30, T4_SUPPORT_COMPRESSION_T4_1D | T4_SUPPORT_COMPRESSION_T4_2D | T4_SUPPORT_COMPRESSION_T6 | T4_SUPPORT_COMPRESSION_T85 | T4_SUPPORT_COMPRESSION_T85_L0);
+		t30_set_supported_compressions(t30, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D | T4_COMPRESSION_T6 | T4_COMPRESSION_T85 | T4_COMPRESSION_T85_L0);
 		t30_set_ecm_capability(t30, TRUE);
 		switch_channel_set_variable(channel, "fax_ecm_requested", "1");
 	} else {
-		t30_set_supported_compressions(t30, T4_SUPPORT_COMPRESSION_T4_1D | T4_SUPPORT_COMPRESSION_T4_2D);
+		t30_set_supported_compressions(t30, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D);
 		switch_channel_set_variable(channel, "fax_ecm_requested", "0");
 	}

@@ -988,7 +984,7 @@ static t38_mode_t configure_t38(pvt_t *pvt)
 	t38_set_jbig_transcoding(pvt->t38_core, t38_options->T38FaxTranscodingJBIG);
 	t38_set_max_datagram_size(pvt->t38_core, t38_options->T38FaxMaxDatagram);

-	if (t38_options->T38FaxRateManagement) { 
+	if (t38_options->T38FaxRateManagement) {
 		if (!strcasecmp(t38_options->T38FaxRateManagement, "transferredTCF")) {
 			method = 2;
 		} else {
@@ -1043,7 +1039,7 @@ static t38_mode_t negotiate_t38(pvt_t *pvt)
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "T38FaxMaxDatagram = %d\n", t38_options->T38FaxMaxDatagram);
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "T38FaxUdpEC = '%s'\n", t38_options->T38FaxUdpEC);
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "T38VendorInfo = '%s'\n", switch_str_nil(t38_options->T38VendorInfo));
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "ip = '%s'\n", 
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "ip = '%s'\n",
 				t38_options->remote_ip ? t38_options->remote_ip : "Not specified");
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "port = %d\n", t38_options->remote_port);

@@ -1128,7 +1124,7 @@ static t38_mode_t request_t38(pvt_t *pvt)
 	}

 	if ((t38_options = switch_channel_get_private(channel, "t38_options"))) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, 
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
 				"%s already has T.38 data\n", switch_channel_get_name(channel));
 		enabled = 0;
 	}
@@ -1427,11 +1423,11 @@ void mod_spandsp_fax_process_fax(switch_core_session_t *session, const char *dat
 		int tx = 0;
 		switch_status_t status;

-		/* 
+		/*
 		   if we are in T.38 mode, we should: 1- initialize the ptv->t38_state stuff, if not done
 		   and then set some callbacks when reading frames.
 		   The only thing we need, then, in this loop, is:
-		   - read a frame without blocking 
+		   - read a frame without blocking
 		   - eventually feed that frame in spandsp,
 		   - call t38_terminal_send_timeout(), sleep for a while

@@ -1458,7 +1454,7 @@ void mod_spandsp_fax_process_fax(switch_core_session_t *session, const char *dat
 					switch_channel_set_app_flag_key("T38", channel, CF_APP_T38_NEGOTIATED);
 					spanfax_init(pvt, T38_MODE);
 					configure_t38(pvt);
-	
+
 					/* This will change the rtp stack to udptl mode */
 					msg.from = __FILE__;
 					msg.message_id = SWITCH_MESSAGE_INDICATE_UDPTL_MODE;
@@ -1475,7 +1471,7 @@ void mod_spandsp_fax_process_fax(switch_core_session_t *session, const char *dat
 						request_t38(pvt);
 					}
 				}
-	
+
 				if (switch_channel_test_app_flag_key("T38", channel, CF_APP_T38)) {
 					if (negotiate_t38(pvt) == T38_MODE_NEGOTIATED) {
 						/* is is safe to call this again, it was already called above in AUDIO_MODE */
@@ -1493,11 +1489,11 @@ void mod_spandsp_fax_process_fax(switch_core_session_t *session, const char *dat
 					/* dunno what to do, most likely you will not get too many of these since we turn off the timer in udptl mode */
 					continue;
 				}
-	
+
 				if (switch_test_flag(read_frame, SFF_UDPTL_PACKET) && read_frame->packet && read_frame->packetlen) {
 					/* now we know we can cast frame->packet to a udptl structure */
 					//switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "READ %d udptl bytes\n", read_frame->packetlen);
-	
+
 					udptl_rx_packet(pvt->udptl_state, read_frame->packet, read_frame->packetlen);
 				}
 			}
@@ -1602,7 +1598,7 @@ static switch_status_t t38_gateway_on_soft_execute(switch_core_session_t *sessio

 	if (!(other_session = switch_core_session_locate(peer_uuid))) {
 		switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "%s Cannot locate channel with uuid %s", 
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "%s Cannot locate channel with uuid %s",
 				switch_channel_get_name(channel), peer_uuid);
 		goto end;
 	}
@@ -1829,13 +1825,13 @@ static switch_status_t t38_gateway_on_consume_media(switch_core_session_t *sessi
 	switch_ivr_sleep(session, 0, SWITCH_TRUE, NULL);

 	if (switch_true(t38_trace)) {
-		trace_read = switch_core_session_sprintf(session, "%s%s%s_read.raw", SWITCH_GLOBAL_dirs.temp_dir, 
+		trace_read = switch_core_session_sprintf(session, "%s%s%s_read.raw", SWITCH_GLOBAL_dirs.temp_dir,
 							SWITCH_PATH_SEPARATOR, switch_core_session_get_uuid(session));

 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Tracing inbound audio to %s\n", trace_read);
 		switch_channel_set_variable(channel, "t38_trace_read", trace_read);

-		trace_write = switch_core_session_sprintf(session, "%s%s%s_write.raw", SWITCH_GLOBAL_dirs.temp_dir, 
+		trace_write = switch_core_session_sprintf(session, "%s%s%s_write.raw", SWITCH_GLOBAL_dirs.temp_dir,
 							SWITCH_PATH_SEPARATOR, switch_core_session_get_uuid(session));

 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Tracing outbound audio to %s\n", trace_write);
@@ -1865,7 +1861,7 @@ static switch_status_t t38_gateway_on_consume_media(switch_core_session_t *sessi
 		} else {
 			if (read_fd != FAX_INVALID_SOCKET) {
 				switch_ssize_t rv;
-				do { rv = write(read_fd, read_frame->data, read_frame->datalen); } while (rv == -1 && errno == EINTR); 
+				do { rv = write(read_fd, read_frame->data, read_frame->datalen); } while (rv == -1 && errno == EINTR);
 		}
 		if (t38_gateway_rx(pvt->t38_gateway_state, (int16_t *) read_frame->data, read_frame->samples)) {
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "fax_rx reported an error\n");
@@ -1994,7 +1990,7 @@ switch_bool_t t38_gateway_start(switch_core_session_t *session, const char *app,
 		switch_channel_set_variable(peer ? channel : other_channel, "t38_gateway_format", "audio");


-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s starting gateway mode to %s\n", 
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s starting gateway mode to %s\n",
 				switch_channel_get_name(peer ? channel : other_channel),
 				switch_channel_get_name(peer ? other_channel : channel));

@@ -2033,20 +2029,20 @@ typedef struct {
 	int expires;
 	int default_sleep;
 	int default_expires;
-	switch_tone_detect_callback_t callback;	
+	switch_tone_detect_callback_t callback;
 	modem_connect_tones_rx_state_t rx_tones;

 	switch_media_bug_t *bug;
 	switch_core_session_t *session;
 	int bug_running;
-	
+
 } spandsp_fax_tone_container_t;

 static switch_status_t tone_on_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf, switch_dtmf_direction_t direction)
 {
 	switch_channel_t *channel = switch_core_session_get_channel(session);
 	spandsp_fax_tone_container_t *cont = switch_channel_get_private(channel, "_fax_tone_detect_");
-	
+

 	if (!cont || dtmf->digit != 'f') {
 		return SWITCH_STATUS_SUCCESS;
@@ -2060,7 +2056,7 @@ static switch_status_t tone_on_dtmf(switch_core_session_t *session, const switch
 			switch_core_session_execute_application_async(cont->session, cont->app, cont->data);
 		}
 	}
-		
+
 	return SWITCH_STATUS_SUCCESS;

 }
@@ -2085,13 +2081,13 @@ static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_da
 	case SWITCH_ABC_TYPE_WRITE_REPLACE:
 		{
 			int skip = 0;
-			
+
 			if (type == SWITCH_ABC_TYPE_READ_REPLACE) {
 				frame = switch_core_media_bug_get_read_replace_frame(bug);
 			} else {
 				frame = switch_core_media_bug_get_write_replace_frame(bug);
 			}
-			
+
 			if (cont->sleep) {
 				cont->sleep--;
 				if (cont->sleep) {
@@ -2122,7 +2118,7 @@ static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_da

 			if (cont->hits) {
 				switch_event_t *event;
-				
+
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_DEBUG,
 								  "Fax Tone Detected. [%s][%s]\n", cont->app, switch_str_nil(cont->data));

@@ -2134,7 +2130,7 @@ static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_da
 						switch_core_session_execute_application_async(cont->session, cont->app, cont->data);
 					}
 				}
-				
+

 				if (switch_event_create(&event, SWITCH_EVENT_DETECTED_TONE) == SWITCH_STATUS_SUCCESS) {
 					switch_event_t *dup;
@@ -2148,7 +2144,7 @@ static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_da
 					    channel = switch_core_session_get_channel(session);
 					    if (channel) switch_channel_event_set_data(channel, event);
 					}
-				
+
 					if (switch_event_dup(&dup, event) == SWITCH_STATUS_SUCCESS) {
 						switch_event_fire(&dup);
 					}
@@ -2163,7 +2159,7 @@ static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_da

 				rval = SWITCH_FALSE;
 			}
-			
+
 		}
 		break;
 	case SWITCH_ABC_TYPE_WRITE:
@@ -346,23 +346,23 @@ switch_status_t modem_init(modem_t *modem, modem_control_handler_t control_handl

 	if (spandsp_globals.modem_verbose) {
 		logging = t31_get_logging_state(modem->t31_state);
-		span_log_set_message_handler(logging, spanfax_log_message, NULL);
+		span_log_set_message_handler(logging, mod_spandsp_log_message, NULL);
 		span_log_set_level(logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);

 		logging = v17_rx_get_logging_state(&modem->t31_state->audio.modems.fast_modems.v17_rx);
-		span_log_set_message_handler(logging, spanfax_log_message, NULL);
+		span_log_set_message_handler(logging, mod_spandsp_log_message, NULL);
 		span_log_set_level(logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);

 		logging = v29_rx_get_logging_state(&modem->t31_state->audio.modems.fast_modems.v29_rx);
-		span_log_set_message_handler(logging, spanfax_log_message, NULL);
+		span_log_set_message_handler(logging, mod_spandsp_log_message, NULL);
 		span_log_set_level(logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);

 		logging = v27ter_rx_get_logging_state(&modem->t31_state->audio.modems.fast_modems.v27ter_rx);
-		span_log_set_message_handler(logging, spanfax_log_message, NULL);
+		span_log_set_message_handler(logging, mod_spandsp_log_message, NULL);
 		span_log_set_level(logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);

 		logging = t38_core_get_logging_state(modem->t38_core);
-		span_log_set_message_handler(logging, spanfax_log_message, NULL);
+		span_log_set_message_handler(logging, mod_spandsp_log_message, NULL);
 		span_log_set_level(logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
 	}

@@ -650,6 +650,8 @@ SWITCH_STANDARD_APP(valet_parking_function)
 			switch_event_fire(&event);
 		}

+		switch_channel_set_variable(channel, "valet_lot_extension", ext);
+
 		valet_send_presence(lot_name, lot, token, SWITCH_TRUE);

 		if ((rf.exten = switch_channel_get_variable(channel, "valet_parking_orbit_exten"))) {
@@ -1918,7 +1918,7 @@ static void update_mwi(vm_profile_t *profile, const char *id, const char *domain
 		yn = "yes";
 	}
 	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", yn);
-	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MWI-Update-Reason", update_reason);
+	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Update-Reason", update_reason);
 	switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", "%s@%s", id, domain_name);
 	/* 
 	switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", total_new_messages, total_saved_messages,
@@ -15,7 +15,7 @@
    <!--
    Wait for another digit by default
    -->
-    <extension name="Default">
+    <extension name="Default" continue="true">
      <condition>
        <action application="skinny-wait" />
      </condition>
@@ -2,8 +2,19 @@
 <user id="SEP001120AABBCC">
   <params>
    <!-- for devices requesting firmware via SCCP, like ATA186
-    <param name="skinny-firmware-version" value="ATA030101SCCP04"
-    <param name="skinny-soft-key-set-set" value="default"
+    <param name="skinny-firmware-version" value="ATA030101SCCP04">
+    <param name="skinny-soft-key-set-set" value="default">
+    <param name="ext-voicemail" value="voicemail">
+    <param name="ext-redial" value="redial">
+    <param name="ext-meetme" value="conference">
+    -->
+
+    <!-- if you define an extension that runs 'pickup' application with 'key' as the data
+        this will cause the PickUp softkey to route to that extension. Combine with adding ",pickup/key"
+        to bridge call to implement PickUp groups -->
+
+    <!--
+    <param name="ext-pickup" value="pickup-key">
    -->
    <param name="foo" value="bar"/>
   </params>
@@ -14,6 +14,7 @@
    <param name="auto-restart" value="true"/>
    <param name="ext-voicemail" value="vmain"/>
    <param name="ext-redial" value="redial"/>
+    <!-- <param name="ext-meetme" value="conference"/> -->
  </settings>
  <soft-key-set-sets>
    <soft-key-set-set name="default">
@@ -171,6 +171,8 @@ switch_status_t skinny_profile_dump(const skinny_profile_t *profile, switch_stre
 	stream->write_function(stream, "Listener-Threads  \t%d\n", profile->listener_threads);
 	stream->write_function(stream, "Ext-Voicemail     \t%s\n", profile->ext_voicemail);
 	stream->write_function(stream, "Ext-Redial        \t%s\n", profile->ext_redial);
+	stream->write_function(stream, "Ext-MeetMe        \t%s\n", profile->ext_meetme);
+	stream->write_function(stream, "Ext-PickUp        \t%s\n", profile->ext_pickup);
 	stream->write_function(stream, "%s\n", line);

 	return SWITCH_STATUS_SUCCESS;
@@ -1326,12 +1328,64 @@ static int flush_listener_callback(void *pArg, int argc, char **argv, char **col
 	return 0;
 }

+void skinny_clean_device_from_db(listener_t *listener, char *device_name)
+{
+	if(!zstr(device_name)) {
+		skinny_profile_t *profile = listener->profile;
+		char *sql;
+
+		skinny_log_l(listener, SWITCH_LOG_DEBUG, 
+			"Clean device from DB with name '%s'\n",
+			device_name);
+
+		if ((sql = switch_mprintf(
+						"DELETE FROM skinny_devices "
+						"WHERE name='%s'",
+						device_name))) {
+			skinny_execute_sql(profile, sql, profile->sql_mutex);
+			switch_safe_free(sql);
+		}
+
+		if ((sql = switch_mprintf(
+						"DELETE FROM skinny_lines "
+						"WHERE device_name='%s'",
+						device_name))) {
+			skinny_execute_sql(profile, sql, profile->sql_mutex);
+			switch_safe_free(sql);
+		}
+
+		if ((sql = switch_mprintf(
+						"DELETE FROM skinny_buttons "
+						"WHERE device_name='%s'",
+						device_name))) {
+			skinny_execute_sql(profile, sql, profile->sql_mutex);
+			switch_safe_free(sql);
+		}
+
+		if ((sql = switch_mprintf(
+						"DELETE FROM skinny_active_lines "
+						"WHERE device_name='%s'",
+						device_name))) {
+			skinny_execute_sql(profile, sql, profile->sql_mutex);
+			switch_safe_free(sql);
+		}
+
+	} else {
+		skinny_log_l_msg(listener, SWITCH_LOG_DEBUG, 
+			"Clean device from DB, missing device name.\n");
+	}
+}
+
 void skinny_clean_listener_from_db(listener_t *listener)
 {
 	if(!zstr(listener->device_name)) {
 		skinny_profile_t *profile = listener->profile;
 		char *sql;

+		skinny_log_l(listener, SWITCH_LOG_DEBUG, 
+			"Clean listener from DB with name '%s' and instance '%d'\n",
+			listener->device_name, listener->device_instance);
+
 		if ((sql = switch_mprintf(
 						"DELETE FROM skinny_devices "
 						"WHERE name='%s' and instance=%d",
@@ -1364,6 +1418,9 @@ void skinny_clean_listener_from_db(listener_t *listener)
 			switch_safe_free(sql);
 		}

+	} else {
+		skinny_log_l_msg(listener, SWITCH_LOG_DEBUG, 
+			"Clean listener from DB, missing device name.\n");
 	}
 }

@@ -1547,9 +1604,11 @@ static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj)

 		if (skinny_handle_request(listener, request) != SWITCH_STATUS_SUCCESS) {
 			switch_clear_flag_locked(listener, LFLAG_RUNNING);
+			switch_safe_free(request);
 			break;
+		} else {
+			switch_safe_free(request);
 		}
-
 	}

 	remove_listener(listener);
@@ -1795,14 +1854,8 @@ switch_status_t skinny_profile_set(skinny_profile_t *profile, const char *var, c
 		profile->keep_alive = atoi(val);
 	} else if (!strcasecmp(var, "date-format")) {
 		strncpy(profile->date_format, val, 6);
-	} else if (!strcasecmp(var, "odbc-dsn")) {
-		if (!zstr(val)) {
-			if (switch_odbc_available()) {
-				profile->odbc_dsn = switch_core_strdup(profile->pool, val);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n");
-			}
-		}
+	} else if (!strcasecmp(var, "odbc-dsn") && !zstr(val)) {
+		profile->odbc_dsn = switch_core_strdup(profile->pool, val);
 	} else if (!strcasecmp(var, "debug")) {
 		profile->debug = atoi(val);
 	} else if (!strcasecmp(var, "auto-restart")) {
@@ -1815,6 +1868,14 @@ switch_status_t skinny_profile_set(skinny_profile_t *profile, const char *var, c
 		if (!profile->ext_redial || strcmp(val, profile->ext_redial)) {
 			profile->ext_redial = switch_core_strdup(profile->pool, val);
 		}
+	} else if (!strcasecmp(var, "ext-meetme")) {
+		if (!profile->ext_meetme || strcmp(val, profile->ext_meetme)) {
+			profile->ext_meetme = switch_core_strdup(profile->pool, val);
+		}
+	} else if (!strcasecmp(var, "ext-pickup")) {
+		if (!profile->ext_pickup || strcmp(val, profile->ext_pickup)) {
+			profile->ext_pickup = switch_core_strdup(profile->pool, val);
+		}
 	} else {
 		return SWITCH_STATUS_FALSE;
 	}
@@ -1907,6 +1968,14 @@ static switch_status_t load_skinny_config(void)
 					skinny_profile_set(profile, "ext-redial", "redial");
 				}

+				if (!profile->ext_meetme) {
+					skinny_profile_set(profile, "ext-meetme", "conference");
+				}
+
+				if (!profile->ext_pickup) {
+					skinny_profile_set(profile, "ext-pickup", "pickup");
+				}
+
 				if (profile->port == 0) {
 					profile->port = 2000;
 				}
@@ -2198,6 +2267,10 @@ static void skinny_message_waiting_event_handler(switch_event_t *event)
 		return;
 	}

+	if (!strncmp("sip:", account, 4)) {
+		return;
+	}
+
 	if (!(yn = switch_event_get_header(event, "mwi-messages-waiting"))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing required Header 'MWI-Messages-Waiting'\n");
 		return;
@@ -35,6 +35,12 @@

 #include <switch.h>

+/*****************************************************************************/
+/* UTILITY MACROS */
+/*****************************************************************************/
+#define empty_null(a) ((a)?(a):NULL)
+#define empty_null2(a,b) ((a)?(a):empty_null(b))
+
 /*****************************************************************************/
 /* LOGGING FUNCTIONS */
 /*****************************************************************************/
@@ -117,6 +123,8 @@ struct skinny_profile {
 	/* extensions */
 	char *ext_voicemail;
 	char *ext_redial;
+	char *ext_meetme;
+	char *ext_pickup;
 	/* db */
 	char *dbname;
 	char *odbc_dsn;
@@ -182,6 +190,10 @@ struct listener {
 	uint32_t flags;
 	time_t expire_time;
 	struct listener *next;
+	char *ext_voicemail;
+	char *ext_redial;
+	char *ext_meetme;
+	char *ext_pickup;
 };

 typedef struct listener listener_t;
@@ -276,6 +288,7 @@ uint8_t listener_is_ready(listener_t *listener);
 switch_status_t kill_listener(listener_t *listener, void *pvt);
 switch_status_t keepalive_listener(listener_t *listener, void *pvt);
 void skinny_clean_listener_from_db(listener_t *listener);
+void skinny_clean_device_from_db(listener_t *listener, char *device_name);

 /*****************************************************************************/
 /* CHANNEL FUNCTIONS */
@@ -233,6 +233,8 @@ static switch_status_t skinny_api_list_settings(const char *line, const char *cu
 	switch_console_push_match(&my_matches, "auto-restart");
 	switch_console_push_match(&my_matches, "ext-voicemail");
 	switch_console_push_match(&my_matches, "ext-redial");
+	switch_console_push_match(&my_matches, "ext-meetme");
+	switch_console_push_match(&my_matches, "ext-pickup");

 	if (my_matches) {
 		*matches = my_matches;
@@ -110,7 +110,7 @@ switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req)
 	char *ptr;
 	switch_status_t status = SWITCH_STATUS_SUCCESS;

-	request = switch_core_alloc(listener->pool, SKINNY_MESSAGE_MAXSIZE);
+	request = calloc(SKINNY_MESSAGE_MAXSIZE,1);

 	if (!request) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate memory.\n");
@@ -122,6 +122,7 @@ switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req)
 	while (listener_is_ready(listener)) {
 		uint8_t do_sleep = 1;
 		if (listener->expire_time && listener->expire_time < switch_epoch_time_now(NULL)) {
+			switch_safe_free(request);
 			return SWITCH_STATUS_TIMEOUT;
 		}
 		if(bytes < SKINNY_MESSAGE_FIELD_SIZE) {
@@ -135,6 +136,7 @@ switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req)
 		status = switch_socket_recv(listener->sock, ptr, &mlen);

 		if (listener->expire_time && listener->expire_time < switch_epoch_time_now(NULL)) {
+			switch_safe_free(request);
 			return SWITCH_STATUS_TIMEOUT;
 		}

@@ -143,6 +145,7 @@ switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req)
 		}
 		if (!switch_status_is_timeup(status) && !SWITCH_STATUS_IS_BREAK(status) && (status != SWITCH_STATUS_SUCCESS)) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Socket break with status=%d.\n", status);
+			switch_safe_free(request);
 			return SWITCH_STATUS_FALSE;
 		}

@@ -162,17 +165,20 @@ switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req)
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
 							"Skinny client sent invalid data. Length should be greater than 4 but got %d.\n",
 							request->length);
+					switch_safe_free(request);
 					return SWITCH_STATUS_FALSE;
 				}
 				if(request->length + 2*SKINNY_MESSAGE_FIELD_SIZE > SKINNY_MESSAGE_MAXSIZE) {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
 							"Skinny client sent too huge data. Got %d which is above threshold %d.\n",
 							request->length, SKINNY_MESSAGE_MAXSIZE - 2*SKINNY_MESSAGE_FIELD_SIZE);
+					switch_safe_free(request);
 					return SWITCH_STATUS_FALSE;
 				}
 				if(bytes >= request->length + 2*SKINNY_MESSAGE_FIELD_SIZE) {
 					/* Message body */
 					*req = request;
+					/* Do not free here, caller needs to do it */
 					return  SWITCH_STATUS_SUCCESS;
 				}
 			}
@@ -181,6 +187,8 @@ switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req)
 			switch_cond_next();
 		}
 	}
+
+	switch_safe_free(request);
 	return SWITCH_STATUS_SUCCESS;
 }

@@ -463,16 +471,15 @@ switch_status_t perform_send_keep_alive_ack(listener_t *listener,
 		const char *file, const char *func, int line)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12);
-	message->type = KEEP_ALIVE_ACK_MESSAGE;
-	message->length = 4;
+
+	skinny_create_empty_message(message, KEEP_ALIVE_ACK_MESSAGE);

 	if ( listener->profile->debug >= 10 ) {
 		skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
 			"Sending Keep Alive Ack%s\n", "");
 	}

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_register_ack(listener_t *listener,
@@ -484,9 +491,9 @@ switch_status_t perform_send_register_ack(listener_t *listener,
 		char *reserved2)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reg_ack));
-	message->type = REGISTER_ACK_MESSAGE;
-	message->length = 4 + sizeof(message->data.reg_ack);
+
+	skinny_create_message(message, REGISTER_ACK_MESSAGE, reg_ack);
+
 	message->data.reg_ack.keep_alive = keep_alive;
 	strncpy(message->data.reg_ack.date_format, date_format, 6);
 	strncpy(message->data.reg_ack.reserved, reserved, 2);
@@ -497,7 +504,7 @@ switch_status_t perform_send_register_ack(listener_t *listener,
 		"Sending Register Ack with Keep Alive (%d), Date Format (%s), Secondary Keep Alive (%d)\n",
 		keep_alive, date_format, secondary_keep_alive);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_speed_dial_stat_res(listener_t *listener,
@@ -507,9 +514,8 @@ switch_status_t perform_send_speed_dial_stat_res(listener_t *listener,
 		char *speed_label)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.speed_dial_res));
-	message->type = SPEED_DIAL_STAT_RES_MESSAGE;
-	message->length = 4 + sizeof(message->data.speed_dial_res);
+
+	skinny_create_message(message, SPEED_DIAL_STAT_RES_MESSAGE, speed_dial_res);

 	message->data.speed_dial_res.number = number;
    strncpy(message->data.speed_dial_res.line, speed_line, 24);
@@ -519,7 +525,7 @@ switch_status_t perform_send_speed_dial_stat_res(listener_t *listener,
 		"Sending Speed Dial Stat Res with Number (%d), Line (%s), Label (%s)\n",
 		number, speed_line, speed_label);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_start_tone(listener_t *listener,
@@ -530,9 +536,9 @@ switch_status_t perform_send_start_tone(listener_t *listener,
 		uint32_t call_id)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.start_tone));
-	message->type = START_TONE_MESSAGE;
-	message->length = 4 + sizeof(message->data.start_tone);
+
+	skinny_create_message(message, START_TONE_MESSAGE, start_tone);
+
 	message->data.start_tone.tone = tone;
 	message->data.start_tone.reserved = reserved;
 	message->data.start_tone.line_instance = line_instance;
@@ -542,7 +548,7 @@ switch_status_t perform_send_start_tone(listener_t *listener,
 		"Sending Start Tone with Tone (%s), Line Instance (%d), Call ID (%d)\n", 
 		skinny_tone2str(tone), line_instance, call_id);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_stop_tone(listener_t *listener,
@@ -551,16 +557,16 @@ switch_status_t perform_send_stop_tone(listener_t *listener,
 		uint32_t call_id)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.stop_tone));
-	message->type = STOP_TONE_MESSAGE;
-	message->length = 4 + sizeof(message->data.stop_tone);
+
+	skinny_create_message(message, STOP_TONE_MESSAGE, stop_tone);
+
 	message->data.stop_tone.line_instance = line_instance;
 	message->data.stop_tone.call_id = call_id;

 	skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
 		"Sending Stop Tone with Line Instance (%d), Call ID (%d)\n", line_instance, call_id);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_set_ringer(listener_t *listener,
@@ -571,9 +577,9 @@ switch_status_t perform_send_set_ringer(listener_t *listener,
 		uint32_t call_id)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.ringer));
-	message->type = SET_RINGER_MESSAGE;
-	message->length = 4 + sizeof(message->data.ringer);
+
+	skinny_create_message(message, SET_RINGER_MESSAGE, ringer);
+
 	message->data.ringer.ring_type = ring_type;
 	message->data.ringer.ring_mode = ring_mode;
 	message->data.ringer.line_instance = line_instance;
@@ -583,7 +589,7 @@ switch_status_t perform_send_set_ringer(listener_t *listener,
 		"Sending SetRinger with Ring Type (%s), Mode (%s), Line Instance (%d), Call ID (%d)\n",
 		skinny_ring_type2str(ring_type), skinny_ring_mode2str(ring_mode), line_instance, call_id);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_set_lamp(listener_t *listener,
@@ -593,9 +599,9 @@ switch_status_t perform_send_set_lamp(listener_t *listener,
 		uint32_t mode)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.lamp));
-	message->type = SET_LAMP_MESSAGE;
-	message->length = 4 + sizeof(message->data.lamp);
+
+	skinny_create_message(message, SET_LAMP_MESSAGE, lamp);
+
 	message->data.lamp.stimulus = stimulus;
 	message->data.lamp.stimulus_instance = stimulus_instance;
 	message->data.lamp.mode = mode;
@@ -604,7 +610,7 @@ switch_status_t perform_send_set_lamp(listener_t *listener,
 		"Sending Set Lamp with Stimulus (%s), Stimulus Instance (%d), Mode (%s)\n",
 		skinny_button2str(stimulus), stimulus_instance, skinny_lamp_mode2str(mode));

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_set_speaker_mode(listener_t *listener,
@@ -612,15 +618,15 @@ switch_status_t perform_send_set_speaker_mode(listener_t *listener,
 		uint32_t mode)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.speaker_mode));
-	message->type = SET_SPEAKER_MODE_MESSAGE;
-	message->length = 4 + sizeof(message->data.speaker_mode);
+
+	skinny_create_message(message, SET_SPEAKER_MODE_MESSAGE, speaker_mode);
+
 	message->data.speaker_mode.mode = mode;

 	skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
 		"Sending Set Speaker Mode with Mode (%s)\n", skinny_speaker_mode2str(mode));

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_srvreq_response(listener_t *listener, 
@@ -629,9 +635,7 @@ switch_status_t perform_send_srvreq_response(listener_t *listener,
 {
 	skinny_message_t *message;

-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.serv_res_mess));
-	message->type = SERVER_RESPONSE_MESSAGE;
-	message->length = 4 + sizeof(message->data.serv_res_mess);
+	skinny_create_message(message, SERVER_RESPONSE_MESSAGE, serv_res_mess);

 	message->data.serv_res_mess.serverListenPort[0] = port;
 	switch_inet_pton(AF_INET,ip, &message->data.serv_res_mess.serverIpAddr[0]);
@@ -640,7 +644,7 @@ switch_status_t perform_send_srvreq_response(listener_t *listener,
 	skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
 		"Sending Server Request Response with IP (%s) and Port (%d)\n", ip, port);

-	return skinny_send_reply(listener, message);
+	return skinny_send_reply(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_start_media_transmission(listener_t *listener,
@@ -657,9 +661,9 @@ switch_status_t perform_send_start_media_transmission(listener_t *listener,
 		uint32_t g723_bitrate)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.start_media));
-	message->type = START_MEDIA_TRANSMISSION_MESSAGE;
-	message->length = 4 + sizeof(message->data.start_media);
+
+	skinny_create_message(message, START_MEDIA_TRANSMISSION_MESSAGE, start_media);
+
 	message->data.start_media.conference_id = conference_id;
 	message->data.start_media.pass_thru_party_id = pass_thru_party_id;
 	message->data.start_media.remote_ip = remote_ip;
@@ -676,7 +680,7 @@ switch_status_t perform_send_start_media_transmission(listener_t *listener,
 		"Send Start Media Transmission with Conf ID(%d), Passthrough Party ID (%d), ...\n", 
 		conference_id, pass_thru_party_id);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_stop_media_transmission(listener_t *listener,
@@ -686,9 +690,9 @@ switch_status_t perform_send_stop_media_transmission(listener_t *listener,
 		uint32_t conference_id2)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.stop_media));
-	message->type = STOP_MEDIA_TRANSMISSION_MESSAGE;
-	message->length = 4 + sizeof(message->data.stop_media);
+
+	skinny_create_message(message, STOP_MEDIA_TRANSMISSION_MESSAGE, stop_media);
+
 	message->data.stop_media.conference_id = conference_id;
 	message->data.stop_media.pass_thru_party_id = pass_thru_party_id;
 	message->data.stop_media.conference_id2 = conference_id2;
@@ -698,7 +702,7 @@ switch_status_t perform_send_stop_media_transmission(listener_t *listener,
 		"Send Stop Media Transmission with Conf ID (%d), Passthrough Party ID (%d), Conf ID2 (%d)\n", 
 		conference_id, pass_thru_party_id, conference_id2);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_call_info(listener_t *listener,
@@ -725,9 +729,9 @@ switch_status_t perform_send_call_info(listener_t *listener,
 		uint32_t party_pi_restriction_bits)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.call_info));
-	message->type = CALL_INFO_MESSAGE;
-	message->length = 4 + sizeof(message->data.call_info);
+
+	skinny_create_message(message, CALL_INFO_MESSAGE, call_info);
+
 	strncpy(message->data.call_info.calling_party_name, calling_party_name, 40);
 	strncpy(message->data.call_info.calling_party, calling_party, 24);
 	strncpy(message->data.call_info.called_party_name, called_party_name, 40);
@@ -752,7 +756,7 @@ switch_status_t perform_send_call_info(listener_t *listener,
 	skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
 		"Send Call Info with Line Instance (%d)...\n", line_instance);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_define_time_date(listener_t *listener,
@@ -768,9 +772,9 @@ switch_status_t perform_send_define_time_date(listener_t *listener,
 		uint32_t timestamp)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.define_time_date));
-	message->type = DEFINE_TIME_DATE_MESSAGE;
-	message->length = 4+sizeof(message->data.define_time_date);
+
+	skinny_create_message(message, DEFINE_TIME_DATE_MESSAGE, define_time_date);
+
 	message->data.define_time_date.year = year;
 	message->data.define_time_date.month = month;
 	message->data.define_time_date.day_of_week = day_of_week;
@@ -785,7 +789,7 @@ switch_status_t perform_send_define_time_date(listener_t *listener,
 		"Send Define Time Date with %.4d-%.2d-%.2d %.2d:%.2d:%.2d.%d, Timestamp (%d), DOW (%d)\n", 
 		year, month, day, hour, minute, seconds, milliseconds, timestamp, day_of_week);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_define_current_time_date(listener_t *listener,
@@ -812,14 +816,13 @@ switch_status_t perform_send_capabilities_req(listener_t *listener,
 		const char *file, const char *func, int line)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12);
-	message->type = CAPABILITIES_REQ_MESSAGE;
-	message->length = 4;
+
+	skinny_create_empty_message(message, CAPABILITIES_REQ_MESSAGE);

 	skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
 		"Send Capabilities Req%s\n", "");

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_version(listener_t *listener,
@@ -827,15 +830,15 @@ switch_status_t perform_send_version(listener_t *listener,
 		char *version)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.version));
-	message->type = VERSION_MESSAGE;
-	message->length = 4+ sizeof(message->data.version);
+
+	skinny_create_message(message, VERSION_MESSAGE, version);
+
 	strncpy(message->data.version.version, version, 16);

 	skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
 		"Send Version with Version(%s)\n", version);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_register_reject(listener_t *listener,
@@ -843,15 +846,15 @@ switch_status_t perform_send_register_reject(listener_t *listener,
 		char *error)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reg_rej));
-	message->type = REGISTER_REJECT_MESSAGE;
-	message->length = 4 + sizeof(message->data.reg_rej);
+
+	skinny_create_message(message, REGISTER_REJECT_MESSAGE, reg_rej);
+
 	strncpy(message->data.reg_rej.error, error, 33);

 	skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
 		"Send Register Reject with Error (%s)\n", error);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_open_receive_channel(listener_t *listener,
@@ -866,9 +869,9 @@ switch_status_t perform_send_open_receive_channel(listener_t *listener,
 		uint32_t reserved[10])
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.open_receive_channel));
-	message->type = OPEN_RECEIVE_CHANNEL_MESSAGE;
-	message->length = 4 + sizeof(message->data.open_receive_channel);
+
+	skinny_create_message(message, OPEN_RECEIVE_CHANNEL_MESSAGE, open_receive_channel);
+
 	message->data.open_receive_channel.conference_id = conference_id;
 	message->data.open_receive_channel.pass_thru_party_id = pass_thru_party_id;
 	message->data.open_receive_channel.ms_per_packet = ms_per_packet;
@@ -892,7 +895,7 @@ switch_status_t perform_send_open_receive_channel(listener_t *listener,
 	skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
 		"Send Open Receive Channel with Conf ID (%d), ...\n", conference_id);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_close_receive_channel(listener_t *listener,
@@ -902,9 +905,9 @@ switch_status_t perform_send_close_receive_channel(listener_t *listener,
 		uint32_t conference_id2)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.close_receive_channel));
-	message->type = CLOSE_RECEIVE_CHANNEL_MESSAGE;
-	message->length = 4 + sizeof(message->data.close_receive_channel);
+
+	skinny_create_message(message, CLOSE_RECEIVE_CHANNEL_MESSAGE, close_receive_channel);
+
 	message->data.close_receive_channel.conference_id = conference_id;
 	message->data.close_receive_channel.pass_thru_party_id = pass_thru_party_id;
 	message->data.close_receive_channel.conference_id2 = conference_id2;
@@ -912,7 +915,7 @@ switch_status_t perform_send_close_receive_channel(listener_t *listener,
 	skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
 		"Send Close Receive Channel with Conf ID (%d), ...\n", conference_id);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_select_soft_keys(listener_t *listener,
@@ -923,9 +926,9 @@ switch_status_t perform_send_select_soft_keys(listener_t *listener,
 		uint32_t valid_key_mask)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.select_soft_keys));
-	message->type = SELECT_SOFT_KEYS_MESSAGE;
-	message->length = 4 + sizeof(message->data.select_soft_keys);
+
+	skinny_create_message(message, SELECT_SOFT_KEYS_MESSAGE, select_soft_keys);
+
 	message->data.select_soft_keys.line_instance = line_instance;
 	message->data.select_soft_keys.call_id = call_id;
 	message->data.select_soft_keys.soft_key_set = soft_key_set;
@@ -935,7 +938,7 @@ switch_status_t perform_send_select_soft_keys(listener_t *listener,
 		"Send Select Soft Keys with Line Instance (%d), Call ID (%d), Soft Key Set (%d), Valid Key Mask (%x)\n",
 			line_instance, call_id, soft_key_set, valid_key_mask);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_call_state(listener_t *listener,
@@ -945,9 +948,9 @@ switch_status_t perform_send_call_state(listener_t *listener,
 		uint32_t call_id)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.call_state));
-	message->type = CALL_STATE_MESSAGE;
-	message->length = 4 + sizeof(message->data.call_state);
+
+	skinny_create_message(message, CALL_STATE_MESSAGE, call_state);
+
 	message->data.call_state.call_state = call_state;
 	message->data.call_state.line_instance = line_instance;
 	message->data.call_state.call_id = call_id;
@@ -956,7 +959,7 @@ switch_status_t perform_send_call_state(listener_t *listener,
 		"Send Call State with State (%s), Line Instance (%d), Call ID (%d)\n",
 		skinny_call_state2str(call_state), line_instance, call_id);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_display_prompt_status(listener_t *listener,
@@ -969,9 +972,8 @@ switch_status_t perform_send_display_prompt_status(listener_t *listener,
 	skinny_message_t *message;
 	char *tmp;

-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.display_prompt_status));
-	message->type = DISPLAY_PROMPT_STATUS_MESSAGE;
-	message->length = 4 + sizeof(message->data.display_prompt_status);
+	skinny_create_message(message, DISPLAY_PROMPT_STATUS_MESSAGE, display_prompt_status);
+
 	message->data.display_prompt_status.timeout = timeout;
 	strncpy(message->data.display_prompt_status.display, display, 32);
 	message->data.display_prompt_status.line_instance = line_instance;
@@ -985,7 +987,7 @@ switch_status_t perform_send_display_prompt_status(listener_t *listener,

 	switch_safe_free(tmp);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_display_prompt_status_textid(listener_t *listener,
@@ -997,9 +999,9 @@ switch_status_t perform_send_display_prompt_status_textid(listener_t *listener,
 {
 	skinny_message_t *message;
 	char *label;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.display_prompt_status));
-	message->type = DISPLAY_PROMPT_STATUS_MESSAGE;
-	message->length = 4 + sizeof(message->data.display_prompt_status);
+
+	skinny_create_message(message, DISPLAY_PROMPT_STATUS_MESSAGE, display_prompt_status);
+
 	message->data.display_prompt_status.timeout = timeout;

 	label = skinny_textid2raw(display_textid);
@@ -1013,7 +1015,7 @@ switch_status_t perform_send_display_prompt_status_textid(listener_t *listener,
 		"Send Display Prompt Status with Timeout (%d), Display (%s), Line Instance (%d), Call ID (%d)\n", 
 		timeout, skinny_textid2str(display_textid), line_instance, call_id);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_clear_prompt_status(listener_t *listener,
@@ -1022,9 +1024,9 @@ switch_status_t perform_send_clear_prompt_status(listener_t *listener,
 		uint32_t call_id)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.clear_prompt_status));
-	message->type = CLEAR_PROMPT_STATUS_MESSAGE;
-	message->length = 4 + sizeof(message->data.clear_prompt_status);
+
+	skinny_create_message(message, CLEAR_PROMPT_STATUS_MESSAGE, clear_prompt_status);
+
 	message->data.clear_prompt_status.line_instance = line_instance;
 	message->data.clear_prompt_status.call_id = call_id;

@@ -1032,7 +1034,7 @@ switch_status_t perform_send_clear_prompt_status(listener_t *listener,
 		"Send Clear Prompt Status with Line Instance (%d), Call ID (%d)\n",
 		line_instance, call_id);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_activate_call_plane(listener_t *listener,
@@ -1040,15 +1042,15 @@ switch_status_t perform_send_activate_call_plane(listener_t *listener,
 		uint32_t line_instance)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.activate_call_plane));
-	message->type = ACTIVATE_CALL_PLANE_MESSAGE;
-	message->length = 4 + sizeof(message->data.activate_call_plane);
+
+	skinny_create_message(message, ACTIVATE_CALL_PLANE_MESSAGE, activate_call_plane);
+
 	message->data.activate_call_plane.line_instance = line_instance;

 	skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
 		"Send Activate Call Plane with Line Instance (%d)\n", line_instance);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_back_space_request(listener_t *listener,
@@ -1057,9 +1059,9 @@ switch_status_t perform_send_back_space_request(listener_t *listener,
 		uint32_t call_id)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.back_space_req));
-	message->type = BACK_SPACE_REQ_MESSAGE;
-	message->length = 4 + sizeof(message->data.back_space_req);
+
+	skinny_create_message(message, BACK_SPACE_REQ_MESSAGE, back_space_req);
+
 	message->data.back_space_req.line_instance = line_instance;
 	message->data.back_space_req.call_id = call_id;

@@ -1067,7 +1069,7 @@ switch_status_t perform_send_back_space_request(listener_t *listener,
 		"Send Back Space Request with Line Instance (%d), Call ID (%d)\n",
 		line_instance, call_id);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);

 }

@@ -1078,9 +1080,9 @@ switch_status_t perform_send_dialed_number(listener_t *listener,
 		uint32_t call_id)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.dialed_number));
-	message->type = DIALED_NUMBER_MESSAGE;
-	message->length = 4 + sizeof(message->data.dialed_number);
+
+	skinny_create_message(message, DIALED_NUMBER_MESSAGE, dialed_number);
+
 	strncpy(message->data.dialed_number.called_party, called_party, 24);
 	message->data.dialed_number.line_instance = line_instance;
 	message->data.dialed_number.call_id = call_id;
@@ -1089,7 +1091,7 @@ switch_status_t perform_send_dialed_number(listener_t *listener,
 		"Send Dialed Number with Number (%s), Line Instance (%d), Call ID (%d)\n",
 		called_party, line_instance, call_id);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_display_pri_notify(listener_t *listener,
@@ -1099,9 +1101,9 @@ switch_status_t perform_send_display_pri_notify(listener_t *listener,
 		char *notify)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.display_pri_notify));
-	message->type = DISPLAY_PRI_NOTIFY_MESSAGE;
-	message->length = 4 + sizeof(message->data.display_pri_notify);
+
+	skinny_create_message(message, DISPLAY_PRI_NOTIFY_MESSAGE, display_pri_notify);
+
 	message->data.display_pri_notify.message_timeout = message_timeout;
 	message->data.display_pri_notify.priority = priority;
 	strncpy(message->data.display_pri_notify.notify, notify, 32);
@@ -1110,7 +1112,7 @@ switch_status_t perform_send_display_pri_notify(listener_t *listener,
 		"Send Display Pri Notify with Timeout (%d), Priority (%d), Message (%s)\n", 
 		message_timeout, priority, notify);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }


@@ -1119,15 +1121,15 @@ switch_status_t perform_send_reset(listener_t *listener,
 		uint32_t reset_type)
 {
 	skinny_message_t *message;
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reset));
-	message->type = RESET_MESSAGE;
-	message->length = 4 + sizeof(message->data.reset);
+
+	skinny_create_message(message, RESET_MESSAGE, reset);
+
 	message->data.reset.reset_type = reset_type;

 	skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
 		"Send Reset with Type (%s)\n", skinny_device_reset_type2str(reset_type));

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_data(listener_t *listener,
@@ -1142,13 +1144,17 @@ switch_status_t perform_send_data(listener_t *listener,
 {
 	skinny_message_t *message;
 	switch_assert(data_length == strlen(data));
+
 	/* data_length should be a multiple of 4 */
 	if ((data_length % 4) != 0) {
 		data_length = (data_length / 4 + 1) * 4;
 	}
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.data)+data_length-1);
+
+	/* This one needs explicit allocation */
+	message = calloc(12+sizeof(message->data.data)+data_length-1, 1);
 	message->type = message_type;
 	message->length = 4 + sizeof(message->data.data)+data_length-1;
+
 	message->data.data.application_id = application_id;
 	message->data.data.line_instance = line_instance;
 	message->data.data.call_id = call_id;
@@ -1159,7 +1165,7 @@ switch_status_t perform_send_data(listener_t *listener,
 	skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
 		"Send Data with Data Length (%d)\n", data_length);

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

 switch_status_t perform_send_extended_data(listener_t *listener, 
@@ -1179,13 +1185,17 @@ switch_status_t perform_send_extended_data(listener_t *listener,
 {
 	skinny_message_t *message;
 	switch_assert(data_length == strlen(data));
+
 	/* data_length should be a multiple of 4 */
 	if ((data_length % 4) != 0) {
 		data_length = (data_length / 4 + 1) * 4;
 	}
-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.extended_data)+data_length-1);
+
+	/* This one needs explicit allocation */
+	message = calloc(12+sizeof(message->data.extended_data)+data_length-1, 1);
 	message->type = message_type;
 	message->length = 4 + sizeof(message->data.extended_data)+data_length-1;
+
 	message->data.extended_data.application_id = application_id;
 	message->data.extended_data.line_instance = line_instance;
 	message->data.extended_data.call_id = call_id;
@@ -1202,32 +1212,45 @@ switch_status_t perform_send_extended_data(listener_t *listener,
 		"Send Extended Data with Application ID (%d), Line Instance (%d), Call ID (%d), ...\n", 
 		application_id, line_instance, call_id );

-	return skinny_send_reply_quiet(listener, message);
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
 }

-switch_status_t skinny_perform_send_reply_quiet(listener_t *listener, const char *file, const char *func, int line, skinny_message_t *reply)
+switch_status_t skinny_perform_send_reply_quiet(listener_t *listener, const char *file, const char *func, int line, skinny_message_t *reply,
+	switch_bool_t discard)
 {
 	char *ptr;
 	switch_size_t len;
+	switch_status_t res;
+
 	switch_assert(reply != NULL);
+
 	len = reply->length+8;
 	ptr = (char *) reply;

 	if (listener_is_ready(listener)) {
-		return switch_socket_send(listener->sock, ptr, &len);
+		res = switch_socket_send(listener->sock, ptr, &len);
+
+		if ( discard ) { switch_safe_free(reply); }
+		return res;
 	} else {
 		skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_WARNING,
 				"Not sending %s (type=%x,length=%d) while not ready.\n",
 				skinny_message_type2str(reply->type), reply->type, reply->length);
+
+		if ( discard ) { switch_safe_free(reply); }
 		return SWITCH_STATUS_FALSE;
 	}
 }

-switch_status_t skinny_perform_send_reply(listener_t *listener, const char *file, const char *func, int line, skinny_message_t *reply)
+switch_status_t skinny_perform_send_reply(listener_t *listener, const char *file, const char *func, int line, skinny_message_t *reply,
+	switch_bool_t discard)
 {
 	char *ptr;
 	switch_size_t len;
+	switch_status_t res;
+
 	switch_assert(reply != NULL);
+
 	len = reply->length+8;
 	ptr = (char *) reply;

@@ -1237,11 +1260,16 @@ switch_status_t skinny_perform_send_reply(listener_t *listener, const char *file
 					"Sending %s (type=%x,length=%d).\n",
 					skinny_message_type2str(reply->type), reply->type, reply->length);
 		}
-		return switch_socket_send(listener->sock, ptr, &len);
+		res = switch_socket_send(listener->sock, ptr, &len);
+
+		if ( discard ) { switch_safe_free(reply); }
+		return res;
 	} else {
 		skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_WARNING,
 				"Not sending %s (type=%x,length=%d) while not ready.\n",
 				skinny_message_type2str(reply->type), reply->type, reply->length);
+
+		if ( discard ) { switch_safe_free(reply); }
 		return SWITCH_STATUS_FALSE;
 	}
 }
@@ -87,6 +87,17 @@ char* skinny_codec2string(skinny_codecs skinnycodec);
 /* SKINNY MESSAGE DATA */
 /*****************************************************************************/

+#define skinny_create_message(message,msgtype,field) \
+    message = calloc(12 + sizeof(message->data.field), 1); \
+    message->type = msgtype; \
+    message->length = 4 + sizeof(message->data.field)
+
+#define skinny_create_empty_message(message,msgtype) \
+    message = calloc(12, 1); \
+    message->type = msgtype; \
+    message->length = 4
+
+
 /* KeepAliveMessage */
 #define KEEP_ALIVE_MESSAGE 0x0000

@@ -955,11 +966,11 @@ void skinny_speed_dial_get(listener_t *listener, uint32_t instance, struct speed
 void skinny_service_url_get(listener_t *listener, uint32_t instance, struct service_url_stat_res_message **button);
 void skinny_feature_get(listener_t *listener, uint32_t instance, struct feature_stat_res_message **button);

-switch_status_t skinny_perform_send_reply(listener_t *listener, const char *file, const char *func, int line, skinny_message_t *reply);
-#define  skinny_send_reply(listener, reply)  skinny_perform_send_reply(listener, __FILE__, __SWITCH_FUNC__, __LINE__, reply)
+switch_status_t skinny_perform_send_reply(listener_t *listener, const char *file, const char *func, int line, skinny_message_t *reply, switch_bool_t discard);
+#define  skinny_send_reply(listener, reply, discard)  skinny_perform_send_reply(listener, __FILE__, __SWITCH_FUNC__, __LINE__, reply, discard)

-switch_status_t skinny_perform_send_reply_quiet(listener_t *listener, const char *file, const char *func, int line, skinny_message_t *reply);
-#define  skinny_send_reply_quiet(listener, reply)  skinny_perform_send_reply_quiet(listener, __FILE__, __SWITCH_FUNC__, __LINE__, reply)
+switch_status_t skinny_perform_send_reply_quiet(listener_t *listener, const char *file, const char *func, int line, skinny_message_t *reply, switch_bool_t discard);
+#define  skinny_send_reply_quiet(listener, reply, discard)  skinny_perform_send_reply_quiet(listener, __FILE__, __SWITCH_FUNC__, __LINE__, reply, discard)

 switch_status_t skinny_handle_request(listener_t *listener, skinny_message_t *request);

@@ -58,8 +58,6 @@ uint32_t soft_key_template_default_textids[] = {
 	SKINNY_TEXTID_IDIVERT
 };

-#define TEXT_ID_LEN 20
-
 uint32_t soft_key_template_default_events[] = {
 	SOFTKEY_REDIAL,
 	SOFTKEY_NEWCALL,
@@ -76,7 +74,7 @@ uint32_t soft_key_template_default_events[] = {
 	SOFTKEY_CONF,
 	SOFTKEY_PARK,
 	SOFTKEY_JOIN,
-	SOFTKEY_MEETMECONF,
+	SOFTKEY_MEETME,
 	SOFTKEY_CALLPICKUP,
 	SOFTKEY_GRPCALLPICKUP,
 	SOFTKEY_DND,
@@ -700,6 +698,8 @@ switch_status_t skinny_session_answer(switch_core_session_t *session, listener_t
 	switch_assert(listener);
 	switch_assert(listener->profile);

+	skinny_hold_active_calls(listener);
+
 	channel = switch_core_session_get_channel(session);
 	tech_pvt = switch_core_session_get_private(session);

@@ -973,6 +973,9 @@ switch_status_t skinny_handle_register(listener_t *listener, skinny_message_t *r
 	skinny_device_event(listener, &params, SWITCH_EVENT_REQUEST_PARAMS, SWITCH_EVENT_SUBCLASS_ANY);
 	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "action", "skinny-auth");

+	/* clean up all traces before adding to database */
+	skinny_clean_device_from_db(listener, request->data.reg.device_name);
+
 	if (switch_xml_locate_user("id", request->data.reg.device_name, profile->domain, "", &xroot, &xdomain, &xuser, &xgroup, params) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't find device [%s@%s]\n"
 				"You must define a domain called '%s' in your directory and add a user with id=\"%s\".\n"
@@ -982,6 +985,11 @@ switch_status_t skinny_handle_register(listener_t *listener, skinny_message_t *r
 		goto end;
 	}

+	/* we clean up device above, so this below block will never trigger. I don't
+		know the full details of why there would be multiple listeners with 
+		the same device - maybe a VGC or similar? Not really high priority for
+		support at the moment, but may need to revisit this later */
+
 	skinny_profile_find_listener_by_device_name_and_instance(listener->profile,
 			request->data.reg.device_name, request->data.reg.instance, &listener2);
 	if (listener2) {
@@ -993,9 +1001,6 @@ switch_status_t skinny_handle_register(listener_t *listener, skinny_message_t *r
 		goto end;
 	}

-	/* clean up all traces before adding to database */
-	skinny_clean_listener_from_db(listener);
-
 	if ((sql = switch_mprintf(
 					"INSERT INTO skinny_devices "
 					"(name, user_id, instance, ip, type, max_streams, codec_string) "
@@ -1027,6 +1032,22 @@ switch_status_t skinny_handle_register(listener_t *listener, skinny_message_t *r
 					strncpy(listener->firmware_version, value, 16);
 				} else if (!strcasecmp(name, "skinny-soft-key-set-set")) {
 					listener->soft_key_set_set = switch_core_strdup(profile->pool, value);
+				} else if (!strcasecmp(name, "ext-voicemail")) {
+					if (!listener->ext_voicemail || strcmp(value,listener->ext_voicemail)) {
+						listener->ext_voicemail = switch_core_strdup(profile->pool, value);
+					}
+				} else if (!strcasecmp(name, "ext-redial")) {
+					if (!listener->ext_redial || strcmp(value,listener->ext_redial)) {
+						listener->ext_redial = switch_core_strdup(profile->pool, value);
+					}
+				} else if (!strcasecmp(name, "ext-meetme")) {
+					if (!listener->ext_meetme || strcmp(value,listener->ext_meetme)) {
+						listener->ext_meetme = switch_core_strdup(profile->pool, value);
+					}
+				} else if (!strcasecmp(name, "ext-pickup")) {
+					if (!listener->ext_pickup || strcmp(value,listener->ext_pickup)) {
+						listener->ext_pickup = switch_core_strdup(profile->pool, value);
+					}
 				}
 			}
 		}
@@ -1260,7 +1281,8 @@ switch_status_t skinny_handle_stimulus_message(listener_t *listener, skinny_mess
 	switch(request->data.stimulus.instance_type) {
 		case SKINNY_BUTTON_LAST_NUMBER_REDIAL:
 			skinny_create_incoming_session(listener, &line_instance, &session);
-			skinny_session_process_dest(session, listener, line_instance, listener->profile->ext_redial, '\0', 0);
+			skinny_session_process_dest(session, listener, line_instance, 
+				empty_null2(listener->ext_redial,listener->profile->ext_redial), '\0', 0);
 			break;
 		case SKINNY_BUTTON_SPEED_DIAL:
 			skinny_speed_dial_get(listener, request->data.stimulus.instance, &button_speed_dial);
@@ -1289,7 +1311,8 @@ switch_status_t skinny_handle_stimulus_message(listener_t *listener, skinny_mess
 			break;
 		case SKINNY_BUTTON_VOICEMAIL:
 			skinny_create_incoming_session(listener, &line_instance, &session);
-			skinny_session_process_dest(session, listener, line_instance, listener->profile->ext_voicemail, '\0', 0);
+			skinny_session_process_dest(session, listener, line_instance, 
+				empty_null2(listener->ext_voicemail, listener->profile->ext_voicemail), '\0', 0);
 			break;

 		case SKINNY_BUTTON_LINE:
@@ -1415,15 +1438,13 @@ switch_status_t skinny_handle_forward_stat_req_message(listener_t *listener, ski

 	skinny_check_data_length(request, sizeof(request->data.forward_stat_req));

-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.forward_stat));
-	message->type = FORWARD_STAT_MESSAGE;
-	message->length = 4 + sizeof(message->data.forward_stat);
+	skinny_create_message(message, FORWARD_STAT_MESSAGE, forward_stat);

 	message->data.forward_stat.line_instance = request->data.forward_stat_req.line_instance;

 	skinny_log_l(listener, SWITCH_LOG_DEBUG, "Handle Forward Stat Req Message with Line Instance (%d)\n", 
 		request->data.forward_stat_req.line_instance);
-	skinny_send_reply_quiet(listener, message);
+	skinny_send_reply_quiet(listener, message, SWITCH_TRUE);

 	return SWITCH_STATUS_SUCCESS;
 }
@@ -1450,15 +1471,13 @@ switch_status_t skinny_handle_line_stat_request(listener_t *listener, skinny_mes

 	skinny_check_data_length(request, sizeof(request->data.line_req));

-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.line_res));
-	message->type = LINE_STAT_RES_MESSAGE;
-	message->length = 4 + sizeof(message->data.line_res);
+	skinny_create_message(message, LINE_STAT_RES_MESSAGE, line_res);

 	skinny_line_get(listener, request->data.line_req.number, &button);

 	memcpy(&message->data.line_res, button, sizeof(struct line_stat_res_message));

-	skinny_send_reply(listener, message);
+	skinny_send_reply(listener, message, SWITCH_TRUE);

 	return SWITCH_STATUS_SUCCESS;
 }
@@ -1496,9 +1515,7 @@ switch_status_t skinny_handle_config_stat_request(listener_t *listener, skinny_m

 	profile = listener->profile;

-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.config_res));
-	message->type = CONFIG_STAT_RES_MESSAGE;
-	message->length = 4 + sizeof(message->data.config_res);
+	skinny_create_message(message, CONFIG_STAT_RES_MESSAGE, config_res);

 	if ((sql = switch_mprintf(
 					"SELECT name, user_id, instance, '' AS user_name, '' AS server_name, "
@@ -1515,7 +1532,7 @@ switch_status_t skinny_handle_config_stat_request(listener_t *listener, skinny_m
 		skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_config_stat_res_callback, message);
 		switch_safe_free(sql);
 	}
-	skinny_send_reply(listener, message);
+	skinny_send_reply(listener, message, SWITCH_TRUE);

 	return SWITCH_STATUS_SUCCESS;
 }
@@ -1566,9 +1583,7 @@ switch_status_t skinny_handle_button_template_request(listener_t *listener, skin

 	profile = listener->profile;

-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.button_template));
-	message->type = BUTTON_TEMPLATE_RES_MESSAGE;
-	message->length = 4 + sizeof(message->data.button_template);
+	skinny_create_message(message, BUTTON_TEMPLATE_RES_MESSAGE, button_template);

 	message->data.button_template.button_offset = 0;
 	message->data.button_template.button_count = 0;
@@ -1611,9 +1626,7 @@ switch_status_t skinny_handle_button_template_request(listener_t *listener, skin
 		}
 	}

-
-
-	return skinny_send_reply(listener, message);;
+	return skinny_send_reply(listener, message, SWITCH_TRUE);
 }

 switch_status_t skinny_handle_version_request(listener_t *listener, skinny_message_t *request)
@@ -1674,7 +1687,11 @@ switch_status_t skinny_handle_capabilities_response(listener_t *listener, skinny
 	}
 	i = 0;
 	pos = 0;
-	codec_string = switch_core_alloc(listener->pool, string_len+1);
+	codec_string = calloc(string_len+1,1);
+	if ( !codec_string ) {
+		skinny_log_l_msg(listener, SWITCH_LOG_ERROR, "Unable to allocate memory for codec string.\n");
+		return SWITCH_STATUS_FALSE;
+	}
 	for (string_pos = 0; string_pos < string_len; string_pos++) {
 		char *codec = codec_order[i];
 		switch_assert(i < n);
@@ -1696,6 +1713,7 @@ switch_status_t skinny_handle_capabilities_response(listener_t *listener, skinny
 		switch_safe_free(sql);
 	}
 	skinny_log_l(listener, SWITCH_LOG_DEBUG, "Codecs %s supported.\n", codec_string);
+	switch_safe_free(codec_string);
 	return SWITCH_STATUS_SUCCESS;
 }

@@ -1831,7 +1849,7 @@ switch_status_t skinny_handle_soft_key_set_request(listener_t *listener, skinny_
 		skinny_log_l(listener, SWITCH_LOG_DEBUG, "Handle Soft Key Set Request with Set (%s)\n", "default");
 	}
 	if (message) {
-		skinny_send_reply(listener, message);
+		skinny_send_reply_quiet(listener, message, SWITCH_FALSE);
 	} else {
 		skinny_log_l(listener, SWITCH_LOG_ERROR, "Profile %s doesn't have a default <soft-key-set-set>.\n", 
 			listener->profile->name);
@@ -1864,7 +1882,8 @@ switch_status_t skinny_handle_soft_key_event_message(listener_t *listener, skinn
 	switch(request->data.soft_key_event.event) {
 		case SOFTKEY_REDIAL:
 			status = skinny_create_incoming_session(listener, &line_instance, &session);
-			skinny_session_process_dest(session, listener, line_instance, listener->profile->ext_redial, '\0', 0);
+			skinny_session_process_dest(session, listener, line_instance, 
+				empty_null2(listener->ext_redial,listener->profile->ext_redial), '\0', 0);
 			break;
 		case SOFTKEY_NEWCALL:
 			status = skinny_create_incoming_session(listener, &line_instance, &session);
@@ -1922,6 +1941,17 @@ switch_status_t skinny_handle_soft_key_event_message(listener_t *listener, skinn
 				}
 			}
 			break;
+		case SOFTKEY_MEETME:
+			skinny_create_incoming_session(listener, &line_instance, &session);
+			skinny_session_process_dest(session, listener, line_instance, 
+				empty_null2(listener->ext_meetme, listener->profile->ext_meetme), '\0', 0);
+			break;
+		case SOFTKEY_CALLPICKUP:
+		case SOFTKEY_GRPCALLPICKUP:
+			skinny_create_incoming_session(listener, &line_instance, &session);
+			skinny_session_process_dest(session, listener, line_instance, 
+				empty_null2(listener->ext_pickup, listener->profile->ext_pickup), '\0', 0);
+			break;
 		default:
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
 					"Unknown SoftKeyEvent type: %d.\n", request->data.soft_key_event.event);
@@ -1943,14 +1973,13 @@ switch_status_t skinny_handle_unregister(listener_t *listener, skinny_message_t
 	skinny_device_event(listener, &event, SWITCH_EVENT_CUSTOM, SKINNY_EVENT_UNREGISTER);
 	switch_event_fire(&event);

-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.unregister_ack));
-	message->type = UNREGISTER_ACK_MESSAGE;
-	message->length = 4 + sizeof(message->data.unregister_ack);
+	skinny_create_message(message, UNREGISTER_ACK_MESSAGE, unregister_ack);
+
 	message->data.unregister_ack.unregister_status = 0; /* OK */

 	skinny_log_l(listener, SWITCH_LOG_DEBUG, "Handle Unregister with Status (%d)\n", message->data.unregister_ack.unregister_status);
 	
-	skinny_send_reply_quiet(listener, message);
+	skinny_send_reply_quiet(listener, message, SWITCH_TRUE);

 	/* Close socket */
 	switch_clear_flag_locked(listener, LFLAG_RUNNING);
@@ -1969,18 +1998,15 @@ switch_status_t skinny_handle_soft_key_template_request(listener_t *listener, sk
 	switch_assert(listener->profile);
 	switch_assert(listener->device_name);

-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.soft_key_template));
-	message->type = SOFT_KEY_TEMPLATE_RES_MESSAGE;
-	message->length = 4 + sizeof(message->data.soft_key_template);
+	skinny_create_message(message, SOFT_KEY_TEMPLATE_RES_MESSAGE, soft_key_template);

 	message->data.soft_key_template.soft_key_offset = 0;
 	message->data.soft_key_template.soft_key_count = 21;
 	message->data.soft_key_template.total_soft_key_count = 21;

-	memset(message->data.soft_key_template.soft_key, 0, sizeof(message->data.soft_key_template));
-	for (i=0; i< TEXT_ID_LEN; i++) {
+	for (i=0; i < sizeof(soft_key_template_default_textids)/4; i++) {
 		char *label = skinny_textid2raw(soft_key_template_default_textids[i]);
-		strcpy(message->data.soft_key_template.soft_key[i].soft_key_label, skinny_textid2raw(soft_key_template_default_textids[i]));
+		strncpy(message->data.soft_key_template.soft_key[i].soft_key_label, label, sizeof(message->data.soft_key_template.soft_key[i].soft_key_label));
 		switch_safe_free(label);

 		message->data.soft_key_template.soft_key[i].soft_key_event = soft_key_template_default_events[i];
@@ -1988,7 +2014,7 @@ switch_status_t skinny_handle_soft_key_template_request(listener_t *listener, sk
 		
 	skinny_log_l_msg(listener, SWITCH_LOG_DEBUG, "Handle Soft Key Template Request with Default Template\n");

-	skinny_send_reply_quiet(listener, message);
+	skinny_send_reply_quiet(listener, message, SWITCH_TRUE);

 	return SWITCH_STATUS_SUCCESS;
 }
@@ -2041,12 +2067,16 @@ switch_status_t skinny_handle_data_message(listener_t *listener, skinny_message_
 	switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-DeviceToUser-Call-Id", "%d", request->data.data.call_id);
 	switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-DeviceToUser-Transaction-Id", "%d", request->data.data.transaction_id);
 	switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-DeviceToUser-Data-Length", "%d", request->data.data.data_length);
-	/* Ensure that the body is null-terminated */
+	
 	tmp = malloc(request->data.data.data_length + 1);
 	memcpy(tmp, request->data.data.data, request->data.data.data_length);
+
+	/* Ensure that the body is null-terminated */
 	tmp[request->data.data.data_length] = '\0';
 	switch_event_add_body(event, "%s", tmp);
+
 	switch_safe_free(tmp);
+
 	switch_event_fire(&event);

 	return SWITCH_STATUS_SUCCESS;
@@ -2059,15 +2089,13 @@ switch_status_t skinny_handle_service_url_stat_request(listener_t *listener, ski

 	skinny_check_data_length(request, sizeof(request->data.service_url_req));

-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.service_url_res));
-	message->type = SERVICE_URL_STAT_RES_MESSAGE;
-	message->length = 4 + sizeof(message->data.service_url_res);
+	skinny_create_message(message, SERVICE_URL_STAT_RES_MESSAGE, service_url_res);

 	skinny_service_url_get(listener, request->data.service_url_req.service_url_index, &button);

 	memcpy(&message->data.service_url_res, button, sizeof(struct service_url_stat_res_message));

-	skinny_send_reply(listener, message);
+	skinny_send_reply(listener, message, SWITCH_TRUE);

 	return SWITCH_STATUS_SUCCESS;
 }
@@ -2079,15 +2107,13 @@ switch_status_t skinny_handle_feature_stat_request(listener_t *listener, skinny_

 	skinny_check_data_length(request, sizeof(request->data.feature_req));

-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.feature_res));
-	message->type = FEATURE_STAT_RES_MESSAGE;
-	message->length = 4 + sizeof(message->data.feature_res);
+	skinny_create_message(message, FEATURE_STAT_RES_MESSAGE, feature_res);

 	skinny_feature_get(listener, request->data.feature_req.feature_index, &button);

 	memcpy(&message->data.feature_res, button, sizeof(struct feature_stat_res_message));

-	skinny_send_reply(listener, message);
+	skinny_send_reply(listener, message, SWITCH_TRUE);

 	return SWITCH_STATUS_SUCCESS;
 }
@@ -2113,32 +2139,46 @@ switch_status_t skinny_handle_extended_data_message(listener_t *listener, skinny
 	switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-DeviceToUser-Conference-Id", "%d", request->data.extended_data.conference_id);
 	switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-DeviceToUser-App-Instance-Id", "%d", request->data.extended_data.app_instance_id);
 	switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-DeviceToUser-Routing-Id", "%d", request->data.extended_data.routing_id);
-	/* Ensure that the body is null-terminated */
+
 	tmp = malloc(request->data.data.data_length + 1);
 	memcpy(tmp, request->data.data.data, request->data.data.data_length);
+
+	/* Ensure that the body is null-terminated */
 	tmp[request->data.data.data_length] = '\0';
 	switch_event_add_body(event, "%s", tmp);
+
 	switch_safe_free(tmp);
 	switch_event_fire(&event);

 	return SWITCH_STATUS_SUCCESS;
 }
+
 switch_status_t skinny_handle_dialed_phone_book_message(listener_t *listener, skinny_message_t *request)
 {
 	skinny_message_t *message;

 	skinny_check_data_length(request, sizeof(request->data.dialed_phone_book));

-	message = switch_core_alloc(listener->pool, 12+sizeof(message->data.dialed_phone_book_ack));
-	message->type = DIALED_PHONE_BOOK_ACK_MESSAGE;
-	message->length = 4 + sizeof(message->data.dialed_phone_book_ack);
+	skinny_create_message(message, DIALED_PHONE_BOOK_ACK_MESSAGE, dialed_phone_book_ack);
+
 	message->data.dialed_phone_book_ack.number_index = request->data.dialed_phone_book.number_index;
 	message->data.dialed_phone_book_ack.line_instance = request->data.dialed_phone_book.line_instance;
 	message->data.dialed_phone_book_ack.unknown = request->data.dialed_phone_book.unknown;
 	message->data.dialed_phone_book_ack.unknown2 = 0;

+#if 0
+	/* Not sure why this isn't being sent at this point, need to investigate */
+	skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
+		"Sending Handle Dialed Phone Book Ack Message with Number Index (%d), Line Instance (%d)\n",
+		request->data.dialed_phone_book.number_index, request->data.dialed_phone_book.line_instance);
+
+	return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
+#else
+	switch_safe_free(message);
 	return SWITCH_STATUS_SUCCESS;
+#endif
 }
+
 switch_status_t skinny_handle_accessory_status_message(listener_t *listener, skinny_message_t *request)
 {
 	char *sql;
@@ -239,7 +239,7 @@ SKINNY_DECLARE_STR2ID(skinny_str2button, SKINNY_BUTTONS, -1)
 		{SOFTKEY_CONF, "SoftkeyConf"},
 		{SOFTKEY_PARK, "SoftkeyPark"},
 		{SOFTKEY_JOIN, "SoftkeyJoin"},
-		{SOFTKEY_MEETMECONF, "SoftkeyMeetmeconfrm"},
+		{SOFTKEY_MEETME, "SoftkeyMeetme"},
 		{SOFTKEY_CALLPICKUP, "SoftkeyCallpickup"},
 		{SOFTKEY_GRPCALLPICKUP, "SoftkeyGrpcallpickup"},
 		{SOFTKEY_DND, "SoftkeyDnd"},
@@ -192,7 +192,7 @@ enum skinny_soft_key_event {
 	SOFTKEY_CONF = 0x0D,
 	SOFTKEY_PARK = 0x0E,
 	SOFTKEY_JOIN = 0x0F,
-	SOFTKEY_MEETMECONF = 0x10,
+	SOFTKEY_MEETME = 0x10,
 	SOFTKEY_CALLPICKUP = 0x11,
 	SOFTKEY_GRPCALLPICKUP = 0x12,
 	SOFTKEY_DND = 0x13,
@@ -522,7 +522,7 @@ int skypopen_signaling_read(private_t *tech_pvt)
 								 tech_pvt->chatmessages[i].from_handle, tech_pvt->chatmessages[i].from_dispname, tech_pvt->chatmessages[i].body);
 							if (strcmp(tech_pvt->chatmessages[i].from_handle, tech_pvt->skype_user)) {	//if the message was not sent by myself
 								incoming_chatmessage(tech_pvt, i);
-								memset(&tech_pvt->chatmessages[i], '\0', sizeof(&tech_pvt->chatmessages[i]));
+								memset(&tech_pvt->chatmessages[i], '\0', sizeof(tech_pvt->chatmessages[i]));

 								sprintf(msg_to_skype, "SET CHATMESSAGE %s SEEN", id);
 								skypopen_signaling_write(tech_pvt, msg_to_skype);
@@ -531,7 +531,7 @@ int skypopen_signaling_read(private_t *tech_pvt)
 									("CHATMESSAGE %s is in position %d in the chatmessages array, type=%s, id=%s, chatname=%s, from_handle=%s, from_dispname=%s, body=%s NOT DELETED\n",
 									 SKYPOPEN_P_LOG, id, i, tech_pvt->chatmessages[i].type, tech_pvt->chatmessages[i].id, tech_pvt->chatmessages[i].chatname,
 									 tech_pvt->chatmessages[i].from_handle, tech_pvt->chatmessages[i].from_dispname, tech_pvt->chatmessages[i].body);
-								memset(&tech_pvt->chatmessages[i], '\0', sizeof(&tech_pvt->chatmessages[i]));
+								memset(&tech_pvt->chatmessages[i], '\0', sizeof(tech_pvt->chatmessages[i]));
 								DEBUGA_SKYPE("chatmessage %s HAS BEEN DELETED\n", SKYPOPEN_P_LOG, id);
 							}

@@ -1199,13 +1199,35 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 			char *xdest;

 			if (event && uuid) {
+				char payload_str[255] = "SIP/2.0 403 Forbidden\r\n";
+				if (msg->numeric_arg) {
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
+							"%s Completing blind transfer with success\n", switch_channel_get_name(channel));
+					switch_set_string(payload_str, "SIP/2.0 200 OK\r\n");
+				} else if (uuid) {
+					switch_core_session_t *other_session = switch_core_session_locate(uuid);
+					if (other_session) {
+						switch_channel_t *other_channel = switch_core_session_get_channel(other_session);
+						const char *invite_failure_status = switch_channel_get_variable(other_channel, "sip_invite_failure_status");
+						const char *invite_failure_str = switch_channel_get_variable(other_channel, "sip_invite_failure_status");
+						if (!zstr(invite_failure_status) && !zstr(invite_failure_str)) {
+							snprintf(payload_str, sizeof(payload_str), "SIP/2.0 %s %s\r\n", invite_failure_status, invite_failure_str);
+							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
+									"%s Completing blind transfer with custom failure: %s %s\n",
+									switch_channel_get_name(channel), invite_failure_status, invite_failure_str);
+						}
+						switch_core_session_rwunlock(other_session);
+					}
+				}
+				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
+						"%s Completing blind transfer with status: %s\n", switch_channel_get_name(channel), payload_str);
 				nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag;version=2.0"),
 						   NUTAG_SUBSTATE(nua_substate_terminated),
-						   SIPTAG_SUBSCRIPTION_STATE_STR("terminated;reason=noresource"), 
-						   SIPTAG_PAYLOAD_STR(msg->numeric_arg ? "SIP/2.0 200 OK\r\n" : "SIP/2.0 403 Forbidden\r\n"), 
-						   SIPTAG_EVENT_STR(event), TAG_END());				
+						   SIPTAG_SUBSCRIPTION_STATE_STR("terminated;reason=noresource"),
+						   SIPTAG_PAYLOAD_STR(payload_str),
+						   SIPTAG_EVENT_STR(event), TAG_END());
+

-				
 				if (!msg->numeric_arg) {
 					xdest = switch_core_session_sprintf(session, "intercept:%s", uuid);
 					switch_ivr_session_transfer(session, xdest, "inline", NULL);
@@ -1251,8 +1273,8 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 				switch_channel_set_flag(tech_pvt->channel, CF_SECURE);
 			}

-			if (sofia_test_media_flag(tech_pvt->profile, SCMF_AUTOFIX_TIMING)) {
-				switch_core_media_reset_autofix_timing(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO);
+			if (sofia_test_media_flag(tech_pvt->profile, SCMF_AUTOFIX_TIMING) || sofia_test_media_flag(tech_pvt->profile, SCMF_AUTOFIX_PT)) {
+				switch_core_media_reset_autofix(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO);
 			}
 		}
 		break;
@@ -253,7 +253,7 @@ static void extract_header_vars(sofia_profile_t *profile, sip_t const *sip,
 			
 			switch_channel_set_variable(channel, "sip_full_via", (char *)stream.data);

-			if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+			if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND || switch_stristr("TCP", (char *)stream.data)) {
 				switch_channel_set_variable(channel, "sip_recover_via", (char *)stream.data);
 			}

@@ -3714,6 +3714,7 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
 					sofia_set_pflag(profile, PFLAG_DISABLE_100REL);
 					profile->auto_restart = 1;
 					sofia_set_media_flag(profile, SCMF_AUTOFIX_TIMING);
+					sofia_set_media_flag(profile, SCMF_AUTOFIX_PT);
 					sofia_set_media_flag(profile, SCMF_RTP_AUTOFLUSH_DURING_BRIDGE);
 					profile->contact_user = SOFIA_DEFAULT_CONTACT_USER;
 					sofia_set_pflag(profile, PFLAG_PASS_CALLEE_ID);
@@ -4272,7 +4273,7 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
 						} else if (!strcasecmp(val, "contact") || switch_true(val)) {
 							sofia_set_pflag(profile, PFLAG_MULTIREG);
 							sofia_set_pflag(profile, PFLAG_MULTIREG_CONTACT);
-						} else if (switch_true(val)) {
+						} else if (!switch_true(val)) {
 							sofia_clear_pflag(profile, PFLAG_MULTIREG);
 							//sofia_clear_pflag(profile, PFLAG_MULTIREG_CONTACT);
 						}
@@ -4325,6 +4326,12 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
 						} else {
 							sofia_clear_media_flag(profile, SCMF_AUTOFIX_TIMING);
 						}
+					} else if (!strcasecmp(var, "rtp-autofix-pt")) {
+						if (switch_true(val)) {
+							sofia_set_media_flag(profile, SCMF_AUTOFIX_PT);
+						} else {
+							sofia_clear_media_flag(profile, SCMF_AUTOFIX_PT);
+						}
 					} else if (!strcasecmp(var, "contact-user")) {
 						profile->contact_user = switch_core_strdup(profile->pool, val);
 					} else if (!strcasecmp(var, "nat-options-ping")) {
@@ -5034,6 +5041,13 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
 			switch_channel_set_variable(channel, "sip_hangup_disposition", "recv_refuse");
 		}

+		if (status >= 400) {
+			char status_str[5];
+			switch_snprintf(status_str, sizeof(status_str), "%d", status);
+			switch_channel_set_variable_partner(channel, "sip_invite_failure_status", status_str);
+			switch_channel_set_variable_partner(channel, "sip_invite_failure_phrase", phrase);
+		}
+
 		if (status >= 400 && sip->sip_reason && sip->sip_reason->re_protocol && (!strcasecmp(sip->sip_reason->re_protocol, "Q.850")
 				|| !strcasecmp(sip->sip_reason->re_protocol, "FreeSWITCH")
 				|| !strcasecmp(sip->sip_reason->re_protocol, profile->sdp_username)) && sip->sip_reason->re_cause) {
@@ -5181,8 +5195,8 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
 			
 			sofia_update_callee_id(session, profile, sip, SWITCH_FALSE);

-			if (sofia_test_media_flag(tech_pvt->profile, SCMF_AUTOFIX_TIMING)) {
-				switch_core_media_reset_autofix_timing(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO);
+			if (sofia_test_media_flag(tech_pvt->profile, SCMF_AUTOFIX_TIMING) || sofia_test_media_flag(tech_pvt->profile, SCMF_AUTOFIX_PT)) {
+				switch_core_media_reset_autofix(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO);
 			}

 		}
@@ -8001,6 +8015,8 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
 		if (!strcmp(network_ip, profile->sipip) && network_port == profile->sip_port) {
 			calling_myself++;
 		} else {
+			switch_event_create(&v_event, SWITCH_EVENT_REQUEST_PARAMS);
+
 			if (sofia_reg_handle_register(nua, profile, nh, sip, de, REG_INVITE, key, sizeof(key), &v_event, NULL, NULL, &x_user)) {
 				if (v_event) {
 					switch_event_destroy(&v_event);
@@ -8021,7 +8037,6 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia



-	
 	tech_pvt->mparams.remote_ip = switch_core_session_strdup(session, network_ip);
 	tech_pvt->mparams.remote_port = network_port;

@@ -8095,13 +8110,25 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
 	switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);

 	if (x_user) {
-		const char *user = NULL, *domain = NULL;
+		const char *ruser = NULL, *rdomain = NULL, *user = switch_xml_attr(x_user, "id"), *domain = switch_xml_attr(x_user, "domain-name");

 		if (v_event) {
-			user = switch_event_get_header(v_event, "username");
-			domain = switch_event_get_header(v_event, "domain_name");
+			switch_event_header_t *hp;
+
+			for (hp = v_event->headers; hp; hp = hp->next) {
+				switch_channel_set_variable(channel, hp->name, hp->value);
+			}
+
+			ruser = switch_event_get_header(v_event, "username");
+			rdomain = switch_event_get_header(v_event, "domain_name");
+			
+			switch_channel_set_variable(channel, "requested_user_name", ruser);
+			switch_channel_set_variable(channel, "requested_domain_name", rdomain);
 		}

+		if (!user) user = ruser;
+		if (!domain) domain = rdomain;
+		
 		switch_ivr_set_user_xml(session, NULL, user, domain, x_user);
 		switch_xml_free(x_user);
 		x_user = NULL;
@@ -986,7 +986,6 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
 		switch_channel_set_variable(channel, "sip_to_host", sofia_glue_get_host(to_str, switch_core_session_get_pool(session)));
 		switch_channel_set_variable(channel, "sip_from_host", sofia_glue_get_host(from_str, switch_core_session_get_pool(session)));

-
 		if (!(tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL,
 										NUTAG_URL(url_str),
 										TAG_IF(call_id, SIPTAG_CALL_ID_STR(call_id)),
@@ -1221,6 +1220,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
 						  "Local SDP:\n%s\n", tech_pvt->mparams.local_sdp_str);
 	}

+
 	if (sofia_use_soa(tech_pvt)) {
 		nua_invite(tech_pvt->nh,
 				   NUTAG_AUTOANSWER(0),
@@ -1850,10 +1850,13 @@ int sofia_recover_callback(switch_core_session_t *session)
 		tech_pvt->redirected = switch_core_session_sprintf(session, "sip:%s", switch_channel_get_variable(channel, "sip_contact_uri"));

 		if (zstr(rr)) {
-			switch_channel_set_variable_printf(channel, "sip_invite_route_uri", "<sip:%s@%s:%s;lr>",
+			switch_channel_set_variable_printf(channel, "sip_invite_route_uri", "<sip:%s@%s:%s;transport=%s>",
 											   switch_channel_get_variable(channel, "sip_from_user"),
-											   switch_channel_get_variable(channel, "sip_network_ip"), switch_channel_get_variable(channel, "sip_network_port")
+											   switch_channel_get_variable(channel, "sip_network_ip"), 
+											   switch_channel_get_variable(channel, "sip_network_port"),
+											   switch_channel_get_variable(channel,"sip_via_protocol")
 											   );
+
 		}

 		tech_pvt->dest = switch_core_session_sprintf(session, "sip:%s", switch_channel_get_variable(channel, "sip_from_uri"));
@@ -1889,8 +1892,6 @@ int sofia_recover_callback(switch_core_session_t *session)
 	if (session) {
 		const char *use_uuid;

-		switch_channel_set_flag(channel, CF_RECOVERING);
-
 		if ((use_uuid = switch_channel_get_variable(channel, "origination_uuid"))) {
 			if (switch_core_session_set_uuid(session, use_uuid) == SWITCH_STATUS_SUCCESS) {
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s set UUID=%s\n", switch_channel_get_name(channel),
@@ -48,6 +48,7 @@ const char *default_template =

 static struct {
 	switch_memory_pool_t *pool;
+	switch_mutex_t *mutex;
 	switch_hash_t *fd_hash;
 	switch_hash_t *template_hash;
 	char *log_dir;
@@ -130,6 +131,7 @@ static void write_cdr(const char *path, const char *log_line)
 	unsigned int bytes_in, bytes_out;
 	int loops = 0;

+	switch_mutex_lock(globals.mutex);
 	if (!(fd = switch_core_hash_find(globals.fd_hash, path))) {
 		fd = switch_core_alloc(globals.pool, sizeof(*fd));
 		switch_assert(fd);
@@ -139,6 +141,7 @@ static void write_cdr(const char *path, const char *log_line)
 		fd->path = switch_core_strdup(globals.pool, path);
 		switch_core_hash_insert(globals.fd_hash, path, fd);
 	}
+	switch_mutex_unlock(globals.mutex);

 	switch_mutex_lock(fd->mutex);
 	bytes_out = (unsigned) strlen(log_line);
@@ -275,6 +278,7 @@ static void do_rotate_all()
 		return;
 	}

+	switch_mutex_lock(globals.mutex);
 	for (hi = switch_hash_first(NULL, globals.fd_hash); hi; hi = switch_hash_next(hi)) {
 		switch_hash_this(hi, NULL, NULL, &val);
 		fd = (cdr_fd_t *) val;
@@ -282,6 +286,7 @@ static void do_rotate_all()
 		do_rotate(fd);
 		switch_mutex_unlock(fd->mutex);
 	}
+	switch_mutex_unlock(globals.mutex);
 }


@@ -410,6 +415,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_cdr_csv_load)

 	load_config(pool);

+	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool);
+
 	if ((status = switch_dir_make_recursive(globals.log_dir, SWITCH_DEFAULT_DIR_PERMS, pool)) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s\n", globals.log_dir);
 		return status;
@@ -10,6 +10,7 @@ LOCAL_OBJS= $(IKS_LA) \
 	iks_helpers.o \
 	nlsml.o \
 	rayo_components.o \
+	rayo_elements.o \
 	rayo_input_component.o \
 	rayo_output_component.o \
 	rayo_prompt_component.o \
@@ -21,6 +22,7 @@ LOCAL_SOURCES=	\
 	iks_helpers.c \
 	nlsml.c \
 	rayo_components.c \
+	rayo_elements.c \
 	rayo_input_component.c \
 	rayo_output_component.c \
 	rayo_prompt_component.c \
@@ -305,6 +305,93 @@ int value_matches(const char *value, const char *rule)
 	return 0;
 }

+/**
+ * Validate boolean
+ * @param value
+ * @return SWTICH_TRUE if boolean
+ */
+int iks_attrib_is_bool(const char *value)
+{
+	if (value && *value && (!strcasecmp("true", value) || !strcasecmp("false", value))) {
+		return SWITCH_TRUE;
+	}
+	return SWITCH_FALSE;
+}
+
+/**
+ * Validate integer
+ * @param value
+ * @return SWTICH_TRUE if not negative
+ */
+int iks_attrib_is_not_negative(const char *value)
+{
+	if (value && *value && switch_is_number(value)) {
+		int value_i = atoi(value);
+		if (value_i >= 0) {
+			return SWITCH_TRUE;
+		}
+	}
+	return SWITCH_FALSE;
+}
+
+/**
+ * Validate integer
+ * @param value
+ * @return SWTICH_TRUE if positive
+ */
+int iks_attrib_is_positive(const char *value)
+{
+	if (value && *value && switch_is_number(value)) {
+		int value_i = atoi(value);
+		if (value_i > 0) {
+			return SWITCH_TRUE;
+		}
+	}
+	return SWITCH_FALSE;
+}
+
+/**
+ * Validate integer
+ * @param value
+ * @return SWTICH_TRUE if positive or -1
+ */
+int iks_attrib_is_positive_or_neg_one(const char *value)
+{
+	if (value && *value && switch_is_number(value)) {
+		int value_i = atoi(value);
+		if (value_i == -1 || value_i > 0) {
+			return SWITCH_TRUE;
+		}
+	}
+	return SWITCH_FALSE;
+}
+
+/**
+ * Validate string
+ * @param value
+ * @return SWTICH_TRUE
+ */
+int iks_attrib_is_any(const char *value)
+{
+	return SWITCH_TRUE;
+}
+
+/**
+ * Validate decimal
+ * @param value
+ * @return SWTICH_TRUE if 0.0 <= x <= 1.0
+ */
+int iks_attrib_is_decimal_between_zero_and_one(const char *value)
+{
+	if (value && *value && switch_is_number(value)) {
+		double value_d = atof(value);
+		if (value_d >= 0.0 || value_d <= 1.0) {
+			return SWITCH_TRUE;
+		}
+	}
+	return SWITCH_FALSE;
+}
+
 #define IKS_SHA256_HEX_DIGEST_LENGTH ((SHA256_DIGEST_LENGTH * 2) + 1)

 /**
@@ -73,101 +73,20 @@ extern char *iks_server_dialback_key(const char *secret, const char *receiving_s
 /** A function to validate attribute value */
 typedef int (*iks_attrib_validation_function)(const char *);

-#define ELEMENT(name) inline int VALIDATE_##name(iks *node) { int result = 1; if (!node) return 0;
+#define ELEMENT_DECL(name) extern int VALIDATE_##name(iks *node);
+#define ELEMENT(name) int VALIDATE_##name(iks *node) { int result = 1; if (!node) return 0;
 #define ATTRIB(name, def, rule) result &= iks_attrib_is_##rule(iks_find_attrib_default(node, #name, #def));
 #define STRING_ATTRIB(name, def, rule) result &= value_matches(iks_find_attrib_default(node, #name, #def), rule);
 #define ELEMENT_END return result; }

 extern int value_matches(const char *value, const char *rule);

-#define ATTRIB_RULE(rule) inline int iks_attrib_is_ ## rule (const char *value)
-
-/**
- * Validate boolean
- * @param value
- * @return SWTICH_TRUE if boolean
- */
-ATTRIB_RULE(bool)
-{
-	if (value && *value && (!strcasecmp("true", value) || !strcasecmp("false", value))) {
-		return SWITCH_TRUE;
-	}
-	return SWITCH_FALSE;
-}
-
-/**
- * Validate integer
- * @param value
- * @return SWTICH_TRUE if not negative
- */
-ATTRIB_RULE(not_negative)
-{
-	if (value && *value && switch_is_number(value)) {
-		int value_i = atoi(value);
-		if (value_i >= 0) {
-			return SWITCH_TRUE;
-		}
-	}
-	return SWITCH_FALSE;
-}
-
-/**
- * Validate integer
- * @param value
- * @return SWTICH_TRUE if positive
- */
-ATTRIB_RULE(positive)
-{
-	if (value && *value && switch_is_number(value)) {
-		int value_i = atoi(value);
-		if (value_i > 0) {
-			return SWITCH_TRUE;
-		}
-	}
-	return SWITCH_FALSE;
-}
-
-/**
- * Validate integer
- * @param value
- * @return SWTICH_TRUE if positive or -1
- */
-ATTRIB_RULE(positive_or_neg_one)
-{
-	if (value && *value && switch_is_number(value)) {
-		int value_i = atoi(value);
-		if (value_i == -1 || value_i > 0) {
-			return SWITCH_TRUE;
-		}
-	}
-	return SWITCH_FALSE;
-}
-
-/**
- * Validate string
- * @param value
- * @return SWTICH_TRUE
- */
-ATTRIB_RULE(any)
-{
-	return SWITCH_TRUE;
-}
-
-/**
- * Validate decimal
- * @param value
- * @return SWTICH_TRUE if 0.0 <= x <= 1.0
- */
-ATTRIB_RULE(decimal_between_zero_and_one)
-{
-	if (value && *value && switch_is_number(value)) {
-		double value_d = atof(value);
-		if (value_d >= 0.0 || value_d <= 1.0) {
-			return SWITCH_TRUE;
-		}
-	}
-	return SWITCH_FALSE;
-}
+extern int iks_attrib_is_bool(const char *value);
+extern int iks_attrib_is_not_negative(const char *value);
+extern int iks_attrib_is_positive(const char *value);
+extern int iks_attrib_is_positive_or_neg_one(const char *value);
+extern int iks_attrib_is_any(const char *value);
+extern int iks_attrib_is_decimal_between_zero_and_one(const char *value);

 #endif

@@ -0,0 +1,117 @@
+/*
+ * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2013, Grasshopper
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is Grasshopper
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Chris Rienzo <chris.rienzo@grasshopper.com>
+ *
+ * rayo_elements.c -- Rayo XML element definition
+ *
+ */
+#include "rayo_elements.h"
+
+/**
+ * <input> component validation
+ */
+ELEMENT(RAYO_INPUT)
+	STRING_ATTRIB(mode, any, "any,dtmf,voice")
+	ATTRIB(terminator,, any)
+	ATTRIB(recognizer,, any)
+	ATTRIB(language, en-US, any)
+	ATTRIB(initial-timeout, -1, positive_or_neg_one)
+	ATTRIB(inter-digit-timeout, -1, positive_or_neg_one)
+	ATTRIB(sensitivity, 0.5, decimal_between_zero_and_one)
+	ATTRIB(min-confidence, 0, decimal_between_zero_and_one)
+	ATTRIB(max-silence, -1, positive_or_neg_one)
+	/* for now, only NLSML */
+	STRING_ATTRIB(match-content-type, application/nlsml+xml, "application/nlsml+xml")
+	/* internal attribs for prompt support */
+	ATTRIB(barge-event, false, bool)
+	ATTRIB(start-timers, true, bool)
+ELEMENT_END
+
+/**
+ * <output> component validation
+ */
+ELEMENT(RAYO_OUTPUT)
+	ATTRIB(start-offset, 0, not_negative)
+	ATTRIB(start-paused, false, bool)
+	ATTRIB(repeat-interval, 0, not_negative)
+	ATTRIB(repeat-times, 1, not_negative)
+	ATTRIB(max-time, -1, positive_or_neg_one)
+	ATTRIB(renderer,, any)
+	ATTRIB(voice,, any)
+ELEMENT_END
+
+/**
+ * <output><seek> validation
+ */
+ELEMENT(RAYO_OUTPUT_SEEK)
+	STRING_ATTRIB(direction,, "forward,back")
+	ATTRIB(amount,-1, positive)
+ELEMENT_END
+
+/**
+ * <prompt> component validation
+ */
+ELEMENT(RAYO_PROMPT)
+	ATTRIB(barge-in, true, bool)
+ELEMENT_END
+
+/**
+ * <record> component validation
+ */
+ELEMENT(RAYO_RECORD)
+	ATTRIB(format, mp3, any)
+	ATTRIB(start-beep, false, bool)
+	ATTRIB(stop-beep, false, bool)
+	ATTRIB(start-paused, false, bool)
+	ATTRIB(max-duration, -1, positive_or_neg_one)
+	ATTRIB(initial-timeout, -1, positive_or_neg_one)
+	ATTRIB(final-timeout, -1, positive_or_neg_one)
+	STRING_ATTRIB(direction, duplex, "duplex,send,recv")
+	ATTRIB(mix, false, bool)
+ELEMENT_END
+
+/**
+ * <join> command validation
+ */
+ELEMENT(RAYO_JOIN)
+	/* for now, only allow duplex
+	STRING_ATTRIB(direction, duplex, "send,recv,duplex"); */
+	STRING_ATTRIB(direction, duplex, "duplex")
+	STRING_ATTRIB(media, bridge, "bridge,direct")
+	ATTRIB(call-uri,, any)
+	ATTRIB(mixer-name,, any)
+ELEMENT_END
+
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
+ */
+
@@ -23,7 +23,7 @@
 * Contributor(s):
 * Chris Rienzo <chris.rienzo@grasshopper.com>
 *
- * rayo_elements.h -- Rayo XML element definition
+ * rayo_elements.h -- Rayo XML elements
 *
 */
 #ifndef RAYO_ELEMENTS_H
@@ -31,80 +31,12 @@

 #include "iks_helpers.h"

-/**
- * <input> component validation
- */
-ELEMENT(RAYO_INPUT)
-	STRING_ATTRIB(mode, any, "any,dtmf,voice")
-	ATTRIB(terminator,, any)
-	ATTRIB(recognizer,, any)
-	ATTRIB(language, en-US, any)
-	ATTRIB(initial-timeout, -1, positive_or_neg_one)
-	ATTRIB(inter-digit-timeout, -1, positive_or_neg_one)
-	ATTRIB(sensitivity, 0.5, decimal_between_zero_and_one)
-	ATTRIB(min-confidence, 0, decimal_between_zero_and_one)
-	ATTRIB(max-silence, -1, positive_or_neg_one)
-	/* for now, only NLSML */
-	STRING_ATTRIB(match-content-type, application/nlsml+xml, "application/nlsml+xml")
-	/* internal attribs for prompt support */
-	ATTRIB(barge-event, false, bool)
-	ATTRIB(start-timers, true, bool)
-ELEMENT_END
-
-/**
- * <output> component validation
- */
-ELEMENT(RAYO_OUTPUT)
-	ATTRIB(start-offset, 0, not_negative)
-	ATTRIB(start-paused, false, bool)
-	ATTRIB(repeat-interval, 0, not_negative)
-	ATTRIB(repeat-times, 1, not_negative)
-	ATTRIB(max-time, -1, positive_or_neg_one)
-	ATTRIB(renderer,, any)
-	ATTRIB(voice,, any)
-ELEMENT_END
-
-/**
- * <output><seek> validation
- */
-ELEMENT(RAYO_OUTPUT_SEEK)
-	STRING_ATTRIB(direction,, "forward,back")
-	ATTRIB(amount,-1, positive)
-ELEMENT_END
-
-/**
- * <prompt> component validation
- */
-ELEMENT(RAYO_PROMPT)
-	ATTRIB(barge-in, true, bool)
-ELEMENT_END
-
-/**
- * <record> component validation
- */
-ELEMENT(RAYO_RECORD)
-	ATTRIB(format, mp3, any)
-	ATTRIB(start-beep, false, bool)
-	ATTRIB(stop-beep, false, bool)
-	ATTRIB(start-paused, false, bool)
-	ATTRIB(max-duration, -1, positive_or_neg_one)
-	ATTRIB(initial-timeout, -1, positive_or_neg_one)
-	ATTRIB(final-timeout, -1, positive_or_neg_one)
-	STRING_ATTRIB(direction, duplex, "duplex,send,recv")
-	ATTRIB(mix, false, bool)
-ELEMENT_END
-
-/**
- * <join> command validation
- */
-ELEMENT(RAYO_JOIN)
-	/* for now, only allow duplex
-	STRING_ATTRIB(direction, duplex, "send,recv,duplex"); */
-	STRING_ATTRIB(direction, duplex, "duplex")
-	STRING_ATTRIB(media, bridge, "bridge,direct")
-	ATTRIB(call-uri,, any)
-	ATTRIB(mixer-name,, any)
-ELEMENT_END
+ELEMENT_DECL(RAYO_INPUT)
+ELEMENT_DECL(RAYO_OUTPUT)
+ELEMENT_DECL(RAYO_OUTPUT_SEEK)
+ELEMENT_DECL(RAYO_PROMPT)
+ELEMENT_DECL(RAYO_RECORD)
+ELEMENT_DECL(RAYO_JOIN)

 #endif

@@ -149,7 +149,7 @@ peakSessionsPerSecond OBJECT-TYPE
        "Peak sessions per second"
    ::= { systemStats 8 }

-peakSessionsPerSecond OBJECT-TYPE
+peakSessionsPerSecondFiveMin OBJECT-TYPE
    SYNTAX      Gauge32
    MAX-ACCESS  read-only
    STATUS      current
@@ -157,6 +157,21 @@ peakSessionsPerSecond OBJECT-TYPE
        "Peak sessions per second last 5 minutes"
    ::= { systemStats 9 }

+peakSessions OBJECT-TYPE
+    SYNTAX      Gauge32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "Peak sessions"
+    ::= { systemStats 10 }
+
+peakSessionsFiveMin OBJECT-TYPE
+    SYNTAX      Gauge32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "Peak sessions last 5 minutes"
+    ::= { systemStats 11 }

 ChannelEntry ::= SEQUENCE {
    chanIndex           Integer32,
@@ -158,7 +158,7 @@ void init_subagent(switch_memory_pool_t *pool)
 	DEBUGMSGTL(("init_subagent", "mod_snmp subagent initializing\n"));

 	netsnmp_register_scalar_group(netsnmp_create_handler_registration("identity", handle_identity, identity_oid, OID_LENGTH(identity_oid), HANDLER_CAN_RONLY), 1, 2);
-	netsnmp_register_scalar_group(netsnmp_create_handler_registration("systemStats", handle_systemStats, systemStats_oid, OID_LENGTH(systemStats_oid), HANDLER_CAN_RONLY), 1, 9);
+	netsnmp_register_scalar_group(netsnmp_create_handler_registration("systemStats", handle_systemStats, systemStats_oid, OID_LENGTH(systemStats_oid), HANDLER_CAN_RONLY), 1, 11);

 	ch_table_info = switch_core_alloc(pool, sizeof(netsnmp_table_registration_info));
 	netsnmp_table_helper_add_indexes(ch_table_info, ASN_INTEGER, 0);
@@ -266,6 +266,14 @@ int handle_systemStats(netsnmp_mib_handler *handler, netsnmp_handler_registratio
 			switch_core_session_ctl(SCSC_SPS_PEAK_FIVEMIN, &int_val);
 			snmp_set_var_typed_integer(requests->requestvb, ASN_GAUGE, int_val);
 			break;
+		case SS_PEAK_SESSIONS:
+			switch_core_session_ctl(SCSC_SESSIONS_PEAK, &int_val);
+			snmp_set_var_typed_integer(requests->requestvb, ASN_GAUGE, int_val);
+			break;
+		case SS_PEAK_SESSIONS_FIVEMIN:
+			switch_core_session_ctl(SCSC_SESSIONS_PEAK_FIVEMIN, &int_val);
+			snmp_set_var_typed_integer(requests->requestvb, ASN_GAUGE, int_val);
+			break;
 		default:
 			snmp_log(LOG_WARNING, "Unregistered OID-suffix requested (%d)\n", (int) subid);
 			netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHOBJECT);
@@ -48,6 +48,8 @@
 #define SS_MAX_SESSIONS_PER_SECOND	7
 #define SS_PEAK_SESSIONS_PER_SECOND	8
 #define SS_PEAK_SESSIONS_PER_FIVEMIN	9
+#define SS_PEAK_SESSIONS		10
+#define SS_PEAK_SESSIONS_FIVEMIN	11

 /* .1.3.6.1.4.1.27880.1.9 */
 #define CH_INDEX			1
@@ -313,4 +313,8 @@ public class CoreSession {
    return new SWIGTYPE_p_switch_status_t(freeswitchJNI.CoreSession_run_dtmf_callback(swigCPtr, this, SWIGTYPE_p_void.getCPtr(input), SWIGTYPE_p_switch_input_type_t.getCPtr(itype)), true);
  }

+  public void consoleLog(String level_str, String msg) {
+    freeswitchJNI.CoreSession_consoleLog(swigCPtr, this, level_str, msg);
+  }
+
 }
@@ -33,8 +33,8 @@ public class IVRMenu {
    swigCPtr = 0;
  }

-  public IVRMenu(IVRMenu main, String name, String greeting_sound, String short_greeting_sound, String invalid_sound, String exit_sound, String confirm_macro, String confirm_key, String tts_engine, String tts_voice, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts) {
-    this(freeswitchJNI.new_IVRMenu(IVRMenu.getCPtr(main), main, name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, confirm_macro, confirm_key, tts_engine, tts_voice, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts), true);
+  public IVRMenu(IVRMenu main, String name, String greeting_sound, String short_greeting_sound, String invalid_sound, String exit_sound, String transfer_sound, String confirm_macro, String confirm_key, String tts_engine, String tts_voice, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts) {
+    this(freeswitchJNI.new_IVRMenu(IVRMenu.getCPtr(main), main, name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, transfer_sound, confirm_macro, confirm_key, tts_engine, tts_voice, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts), true);
  }

  public void bindAction(String action, String arg, String bind) {
@@ -15,7 +15,7 @@ class freeswitchJNI {
  public final static native void consoleCleanLog(String jarg1);
  public final static native boolean running();
  public final static native boolean email(String jarg1, String jarg2, String jarg3, String jarg4, String jarg5, String jarg6, String jarg7);
-  public final static native long new_IVRMenu(long jarg1, IVRMenu jarg1_, String jarg2, String jarg3, String jarg4, String jarg5, String jarg6, String jarg7, String jarg8, String jarg9, String jarg10, int jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16);
+  public final static native long new_IVRMenu(long jarg1, IVRMenu jarg1_, String jarg2, String jarg3, String jarg4, String jarg5, String jarg6, String jarg7, String jarg8, String jarg9, String jarg10, String jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17);
  public final static native void delete_IVRMenu(long jarg1);
  public final static native void IVRMenu_bindAction(long jarg1, IVRMenu jarg1_, String jarg2, String jarg3, String jarg4);
  public final static native void IVRMenu_execute(long jarg1, IVRMenu jarg1_, long jarg2, CoreSession jarg2_, String jarg3);
@@ -157,6 +157,7 @@ class freeswitchJNI {
  public final static native long CoreSession_get_cb_args(long jarg1, CoreSession jarg1_);
  public final static native void CoreSession_check_hangup_hook(long jarg1, CoreSession jarg1_);
  public final static native long CoreSession_run_dtmf_callback(long jarg1, CoreSession jarg1_, long jarg2, long jarg3);
+  public final static native void CoreSession_consoleLog(long jarg1, CoreSession jarg1_, String jarg2, String jarg3);
  public final static native void console_log(String jarg1, String jarg2);
  public final static native void console_clean_log(String jarg1);
  public final static native void msleep(long jarg1);
@@ -360,7 +360,7 @@ SWIGEXPORT jboolean JNICALL Java_org_freeswitch_swig_freeswitchJNI_email(JNIEnv
 }


-SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_new_1IVRMenu(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4, jstring jarg5, jstring jarg6, jstring jarg7, jstring jarg8, jstring jarg9, jstring jarg10, jint jarg11, jint jarg12, jint jarg13, jint jarg14, jint jarg15, jint jarg16) {
+SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_new_1IVRMenu(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4, jstring jarg5, jstring jarg6, jstring jarg7, jstring jarg8, jstring jarg9, jstring jarg10, jstring jarg11, jint jarg12, jint jarg13, jint jarg14, jint jarg15, jint jarg16, jint jarg17) {
  jlong jresult = 0 ;
  IVRMenu *arg1 = (IVRMenu *) 0 ;
  char *arg2 = (char *) 0 ;
@@ -372,12 +372,13 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_new_1IVRMenu(JNI
  char *arg8 = (char *) 0 ;
  char *arg9 = (char *) 0 ;
  char *arg10 = (char *) 0 ;
-  int arg11 ;
+  char *arg11 = (char *) 0 ;
  int arg12 ;
  int arg13 ;
  int arg14 ;
  int arg15 ;
  int arg16 ;
+  int arg17 ;
  IVRMenu *result = 0 ;
  
  (void)jenv;
@@ -429,13 +430,18 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_new_1IVRMenu(JNI
    arg10 = (char *)jenv->GetStringUTFChars(jarg10, 0);
    if (!arg10) return 0;
  }
-  arg11 = (int)jarg11; 
+  arg11 = 0;
+  if (jarg11) {
+    arg11 = (char *)jenv->GetStringUTFChars(jarg11, 0);
+    if (!arg11) return 0;
+  }
  arg12 = (int)jarg12; 
  arg13 = (int)jarg13; 
  arg14 = (int)jarg14; 
  arg15 = (int)jarg15; 
  arg16 = (int)jarg16; 
-  result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,arg11,arg12,arg13,arg14,arg15,arg16);
+  arg17 = (int)jarg17; 
+  result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,arg12,arg13,arg14,arg15,arg16,arg17);
  *(IVRMenu **)&jresult = result; 
  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
  if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
@@ -446,6 +452,7 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_new_1IVRMenu(JNI
  if (arg8) jenv->ReleaseStringUTFChars(jarg8, (const char *)arg8);
  if (arg9) jenv->ReleaseStringUTFChars(jarg9, (const char *)arg9);
  if (arg10) jenv->ReleaseStringUTFChars(jarg10, (const char *)arg10);
+  if (arg11) jenv->ReleaseStringUTFChars(jarg11, (const char *)arg11);
  return jresult;
 }

@@ -3091,6 +3098,31 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1run
 }


+SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1consoleLog(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(CoreSession **)&jarg1; 
+  arg2 = 0;
+  if (jarg2) {
+    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
+    if (!arg2) return ;
+  }
+  arg3 = 0;
+  if (jarg3) {
+    arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0);
+    if (!arg3) return ;
+  }
+  (arg1)->consoleLog(arg2,arg3);
+  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
+  if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
+}
+
+
 SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_console_1log(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2) {
  char *arg1 = (char *) 0 ;
  char *arg2 = (char *) 0 ;
@@ -1706,15 +1706,16 @@ static int _wrap_new_IVRMenu(lua_State* L) {
  char *arg8 = (char *) 0 ;
  char *arg9 = (char *) 0 ;
  char *arg10 = (char *) 0 ;
-  int arg11 ;
+  char *arg11 = (char *) 0 ;
  int arg12 ;
  int arg13 ;
  int arg14 ;
  int arg15 ;
  int arg16 ;
+  int arg17 ;
  IVRMenu *result = 0 ;
  
-  SWIG_check_num_args("IVRMenu",16,16)
+  SWIG_check_num_args("IVRMenu",17,17)
  if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("IVRMenu",1,"IVRMenu *");
  if(!lua_isstring(L,2)) SWIG_fail_arg("IVRMenu",2,"char const *");
  if(!lua_isstring(L,3)) SWIG_fail_arg("IVRMenu",3,"char const *");
@@ -1725,12 +1726,13 @@ static int _wrap_new_IVRMenu(lua_State* L) {
  if(!lua_isstring(L,8)) SWIG_fail_arg("IVRMenu",8,"char const *");
  if(!lua_isstring(L,9)) SWIG_fail_arg("IVRMenu",9,"char const *");
  if(!lua_isstring(L,10)) SWIG_fail_arg("IVRMenu",10,"char const *");
-  if(!lua_isnumber(L,11)) SWIG_fail_arg("IVRMenu",11,"int");
+  if(!lua_isstring(L,11)) SWIG_fail_arg("IVRMenu",11,"char const *");
  if(!lua_isnumber(L,12)) SWIG_fail_arg("IVRMenu",12,"int");
  if(!lua_isnumber(L,13)) SWIG_fail_arg("IVRMenu",13,"int");
  if(!lua_isnumber(L,14)) SWIG_fail_arg("IVRMenu",14,"int");
  if(!lua_isnumber(L,15)) SWIG_fail_arg("IVRMenu",15,"int");
  if(!lua_isnumber(L,16)) SWIG_fail_arg("IVRMenu",16,"int");
+  if(!lua_isnumber(L,17)) SWIG_fail_arg("IVRMenu",17,"int");
  
  if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_IVRMenu,0))){
    SWIG_fail_ptr("new_IVRMenu",1,SWIGTYPE_p_IVRMenu);
@@ -1745,13 +1747,14 @@ static int _wrap_new_IVRMenu(lua_State* L) {
  arg8 = (char *)lua_tostring(L, 8);
  arg9 = (char *)lua_tostring(L, 9);
  arg10 = (char *)lua_tostring(L, 10);
-  arg11 = (int)lua_tonumber(L, 11);
+  arg11 = (char *)lua_tostring(L, 11);
  arg12 = (int)lua_tonumber(L, 12);
  arg13 = (int)lua_tonumber(L, 13);
  arg14 = (int)lua_tonumber(L, 14);
  arg15 = (int)lua_tonumber(L, 15);
  arg16 = (int)lua_tonumber(L, 16);
-  result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,arg11,arg12,arg13,arg14,arg15,arg16);
+  arg17 = (int)lua_tonumber(L, 17);
+  result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,arg12,arg13,arg14,arg15,arg16,arg17);
  SWIG_arg=0;
  SWIG_NewPointerObj(L,result,SWIGTYPE_p_IVRMenu,1); SWIG_arg++; 
  return SWIG_arg;
@@ -6140,6 +6143,36 @@ fail:
 }


+static int _wrap_CoreSession_consoleLog(lua_State* L) {
+  int SWIG_arg = -1;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  
+  SWIG_check_num_args("consoleLog",3,3)
+  if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("consoleLog",1,"CoreSession *");
+  if(!lua_isstring(L,2)) SWIG_fail_arg("consoleLog",2,"char *");
+  if(!lua_isstring(L,3)) SWIG_fail_arg("consoleLog",3,"char *");
+  
+  if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_CoreSession,0))){
+    SWIG_fail_ptr("CoreSession_consoleLog",1,SWIGTYPE_p_CoreSession);
+  }
+  
+  arg2 = (char *)lua_tostring(L, 2);
+  arg3 = (char *)lua_tostring(L, 3);
+  (arg1)->consoleLog(arg2,arg3);
+  SWIG_arg=0;
+  
+  return SWIG_arg;
+  
+  if(0) SWIG_fail;
+  
+fail:
+  lua_error(L);
+  return SWIG_arg;
+}
+
+
 static void swig_delete_CoreSession(void *obj) {
 CoreSession *arg1 = (CoreSession *) obj;
 delete arg1;
@@ -6192,6 +6225,7 @@ static swig_lua_method swig_CoreSession_methods[] = {
    {"get_cb_args", _wrap_CoreSession_get_cb_args}, 
    {"check_hangup_hook", _wrap_CoreSession_check_hangup_hook}, 
    {"run_dtmf_callback", _wrap_CoreSession_run_dtmf_callback}, 
+    {"consoleLog", _wrap_CoreSession_consoleLog}, 
    {0,0}
 };
 static swig_lua_attribute swig_CoreSession_attributes[] = {
@@ -11441,6 +11441,22 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_get_results(void * jarg1, void
 }


+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_get_result_headers(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  switch_event_t **arg2 = (switch_event_t **) 0 ;
+  switch_asr_flag_t *arg3 = (switch_asr_flag_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (switch_event_t **)jarg2; 
+  arg3 = (switch_asr_flag_t *)jarg3; 
+  result = (switch_status_t)switch_core_asr_get_result_headers(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_load_grammar(void * jarg1, char * jarg2, char * jarg3) {
  int jresult ;
  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
@@ -13575,6 +13591,20 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_refresh_video(void * jarg1
 }


+SWIGEXPORT int SWIGSTDCALL CSharp_switch_stream_system_fork(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_stream_handle_t *arg2 = (switch_stream_handle_t *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_stream_handle_t *)jarg2; 
+  result = (int)switch_stream_system_fork((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_module_name_set(void * jarg1, char * jarg2) {
  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
  char *arg2 = (char *) 0 ;
@@ -21887,6 +21917,28 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_get_results_get(vo
 }


+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_get_result_headers_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *))jarg2; 
+  if (arg1) (arg1)->asr_get_result_headers = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_get_result_headers_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *)) ((arg1)->asr_get_result_headers);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_start_input_timers_set(void * jarg1, void * jarg2) {
  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
  switch_status_t (*arg2)(switch_asr_handle_t *) = (switch_status_t (*)(switch_asr_handle_t *)) 0 ;
@@ -31647,6 +31699,24 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_play_and_detect_speech(void * jarg1
 }


+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_init(void * jarg1, char * jarg2, char * jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_asr_handle_t *arg4 = (switch_asr_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_asr_handle_t *)jarg4; 
+  result = (switch_status_t)switch_ivr_detect_speech_init(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, void * jarg6) {
  int jresult ;
  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
@@ -32737,7 +32807,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_set_terminator(
 }


-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_init(void * jarg1, void * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, char * jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17, void * jarg18) {
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_init(void * jarg1, void * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, char * jarg11, char * jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17, int jarg18, void * jarg19) {
  int jresult ;
  switch_ivr_menu_t **arg1 = (switch_ivr_menu_t **) 0 ;
  switch_ivr_menu_t *arg2 = (switch_ivr_menu_t *) 0 ;
@@ -32750,13 +32820,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_init(void * jarg1, void * jarg
  char *arg9 = (char *) 0 ;
  char *arg10 = (char *) 0 ;
  char *arg11 = (char *) 0 ;
-  int arg12 ;
+  char *arg12 = (char *) 0 ;
  int arg13 ;
  int arg14 ;
  int arg15 ;
  int arg16 ;
  int arg17 ;
-  switch_memory_pool_t *arg18 = (switch_memory_pool_t *) 0 ;
+  int arg18 ;
+  switch_memory_pool_t *arg19 = (switch_memory_pool_t *) 0 ;
  switch_status_t result;
  
  arg1 = (switch_ivr_menu_t **)jarg1; 
@@ -32770,14 +32841,15 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_init(void * jarg1, void * jarg
  arg9 = (char *)jarg9; 
  arg10 = (char *)jarg10; 
  arg11 = (char *)jarg11; 
-  arg12 = (int)jarg12; 
+  arg12 = (char *)jarg12; 
  arg13 = (int)jarg13; 
  arg14 = (int)jarg14; 
  arg15 = (int)jarg15; 
  arg16 = (int)jarg16; 
  arg17 = (int)jarg17; 
-  arg18 = (switch_memory_pool_t *)jarg18; 
-  result = (switch_status_t)switch_ivr_menu_init(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,arg12,arg13,arg14,arg15,arg16,arg17,arg18);
+  arg18 = (int)jarg18; 
+  arg19 = (switch_memory_pool_t *)jarg19; 
+  result = (switch_status_t)switch_ivr_menu_init(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,(char const *)arg12,arg13,arg14,arg15,arg16,arg17,arg18,arg19);
  jresult = result; 
  return jresult;
 }
@@ -33249,6 +33321,26 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_user(void * jarg1, char * jarg2
 }


+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_user_xml(void * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_xml_t arg5 = (switch_xml_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (switch_xml_t)jarg5; 
+  result = (switch_status_t)switch_ivr_set_user_xml(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_sound_test(void * jarg1) {
  int jresult ;
  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
@@ -34446,6 +34538,20 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_ssrc(void * jarg1, unsigned lon
 }


+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_remote_ssrc(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  uint32_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (switch_status_t)switch_rtp_set_remote_ssrc(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_rtp_set_end_port(unsigned short jarg1) {
  unsigned short jresult ;
  switch_port_t arg1 ;
@@ -38787,7 +38893,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_email(char * jarg1, char * jarg2, cha
 }


-SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, int jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, char * jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17) {
  void * jresult ;
  IVRMenu *arg1 = (IVRMenu *) 0 ;
  char *arg2 = (char *) 0 ;
@@ -38799,12 +38905,13 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, cha
  char *arg8 = (char *) 0 ;
  char *arg9 = (char *) 0 ;
  char *arg10 = (char *) 0 ;
-  int arg11 ;
+  char *arg11 = (char *) 0 ;
  int arg12 ;
  int arg13 ;
  int arg14 ;
  int arg15 ;
  int arg16 ;
+  int arg17 ;
  IVRMenu *result = 0 ;
  
  arg1 = (IVRMenu *)jarg1; 
@@ -38817,13 +38924,14 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, cha
  arg8 = (char *)jarg8; 
  arg9 = (char *)jarg9; 
  arg10 = (char *)jarg10; 
-  arg11 = (int)jarg11; 
+  arg11 = (char *)jarg11; 
  arg12 = (int)jarg12; 
  arg13 = (int)jarg13; 
  arg14 = (int)jarg14; 
  arg15 = (int)jarg15; 
  arg16 = (int)jarg16; 
-  result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,arg11,arg12,arg13,arg14,arg15,arg16);
+  arg17 = (int)jarg17; 
+  result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,arg12,arg13,arg14,arg15,arg16,arg17);
  jresult = (void *)result; 
  return jresult;
 }
@@ -40541,6 +40649,18 @@ SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_check_hangup_hook(void * jarg1) {
 }


+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_consoleLog(void * jarg1, char * jarg2, char * jarg3) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  (arg1)->consoleLog(arg2,arg3);
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_console_log(char * jarg1, char * jarg2) {
  char *arg1 = (char *) 0 ;
  char *arg2 = (char *) 0 ;
@@ -11813,6 +11813,22 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_get_results(void * jarg1, void
 }


+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_get_result_headers(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  switch_event_t **arg2 = (switch_event_t **) 0 ;
+  switch_asr_flag_t *arg3 = (switch_asr_flag_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (switch_event_t **)jarg2; 
+  arg3 = (switch_asr_flag_t *)jarg3; 
+  result = (switch_status_t)switch_core_asr_get_result_headers(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_load_grammar(void * jarg1, char * jarg2, char * jarg3) {
  int jresult ;
  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
@@ -13959,6 +13975,20 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_refresh_video(void * jarg1
 }


+SWIGEXPORT int SWIGSTDCALL CSharp_switch_stream_system_fork(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_stream_handle_t *arg2 = (switch_stream_handle_t *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_stream_handle_t *)jarg2; 
+  result = (int)switch_stream_system_fork((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_module_name_set(void * jarg1, char * jarg2) {
  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
  char *arg2 = (char *) 0 ;
@@ -22483,6 +22513,29 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_get_results_get(vo
 }


+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_get_result_headers_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *))jarg2; 
+  if (arg1) (arg1)->asr_get_result_headers = arg2;
+  
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_get_result_headers_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *)) ((arg1)->asr_get_result_headers);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_start_input_timers_set(void * jarg1, void * jarg2) {
  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
  switch_status_t (*arg2)(switch_asr_handle_t *) = (switch_status_t (*)(switch_asr_handle_t *)) 0 ;
@@ -32469,6 +32522,24 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_play_and_detect_speech(void * jarg1
 }


+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_init(void * jarg1, char * jarg2, char * jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_asr_handle_t *arg4 = (switch_asr_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_asr_handle_t *)jarg4; 
+  result = (switch_status_t)switch_ivr_detect_speech_init(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, void * jarg6) {
  int jresult ;
  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
@@ -33559,7 +33630,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_set_terminator(
 }


-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_init(void * jarg1, void * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, char * jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17, void * jarg18) {
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_init(void * jarg1, void * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, char * jarg11, char * jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17, int jarg18, void * jarg19) {
  int jresult ;
  switch_ivr_menu_t **arg1 = (switch_ivr_menu_t **) 0 ;
  switch_ivr_menu_t *arg2 = (switch_ivr_menu_t *) 0 ;
@@ -33572,13 +33643,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_init(void * jarg1, void * jarg
  char *arg9 = (char *) 0 ;
  char *arg10 = (char *) 0 ;
  char *arg11 = (char *) 0 ;
-  int arg12 ;
+  char *arg12 = (char *) 0 ;
  int arg13 ;
  int arg14 ;
  int arg15 ;
  int arg16 ;
  int arg17 ;
-  switch_memory_pool_t *arg18 = (switch_memory_pool_t *) 0 ;
+  int arg18 ;
+  switch_memory_pool_t *arg19 = (switch_memory_pool_t *) 0 ;
  switch_status_t result;
  
  arg1 = (switch_ivr_menu_t **)jarg1; 
@@ -33592,14 +33664,15 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_init(void * jarg1, void * jarg
  arg9 = (char *)jarg9; 
  arg10 = (char *)jarg10; 
  arg11 = (char *)jarg11; 
-  arg12 = (int)jarg12; 
+  arg12 = (char *)jarg12; 
  arg13 = (int)jarg13; 
  arg14 = (int)jarg14; 
  arg15 = (int)jarg15; 
  arg16 = (int)jarg16; 
  arg17 = (int)jarg17; 
-  arg18 = (switch_memory_pool_t *)jarg18; 
-  result = (switch_status_t)switch_ivr_menu_init(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,arg12,arg13,arg14,arg15,arg16,arg17,arg18);
+  arg18 = (int)jarg18; 
+  arg19 = (switch_memory_pool_t *)jarg19; 
+  result = (switch_status_t)switch_ivr_menu_init(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,(char const *)arg12,arg13,arg14,arg15,arg16,arg17,arg18,arg19);
  jresult = result; 
  return jresult;
 }
@@ -34071,6 +34144,26 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_user(void * jarg1, char * jarg2
 }


+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_user_xml(void * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_xml_t arg5 = (switch_xml_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (switch_xml_t)jarg5; 
+  result = (switch_status_t)switch_ivr_set_user_xml(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_sound_test(void * jarg1) {
  int jresult ;
  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
@@ -35289,6 +35382,20 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_ssrc(void * jarg1, unsigned lon
 }


+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_remote_ssrc(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  uint32_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (switch_status_t)switch_rtp_set_remote_ssrc(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_rtp_set_end_port(unsigned short jarg1) {
  unsigned short jresult ;
  switch_port_t arg1 ;
@@ -39685,7 +39792,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_email(char * jarg1, char * jarg2, cha
 }


-SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, int jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, char * jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17) {
  void * jresult ;
  IVRMenu *arg1 = (IVRMenu *) 0 ;
  char *arg2 = (char *) 0 ;
@@ -39697,12 +39804,13 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, cha
  char *arg8 = (char *) 0 ;
  char *arg9 = (char *) 0 ;
  char *arg10 = (char *) 0 ;
-  int arg11 ;
+  char *arg11 = (char *) 0 ;
  int arg12 ;
  int arg13 ;
  int arg14 ;
  int arg15 ;
  int arg16 ;
+  int arg17 ;
  IVRMenu *result = 0 ;
  
  arg1 = (IVRMenu *)jarg1; 
@@ -39715,13 +39823,14 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, cha
  arg8 = (char *)jarg8; 
  arg9 = (char *)jarg9; 
  arg10 = (char *)jarg10; 
-  arg11 = (int)jarg11; 
+  arg11 = (char *)jarg11; 
  arg12 = (int)jarg12; 
  arg13 = (int)jarg13; 
  arg14 = (int)jarg14; 
  arg15 = (int)jarg15; 
  arg16 = (int)jarg16; 
-  result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,arg11,arg12,arg13,arg14,arg15,arg16);
+  arg17 = (int)jarg17; 
+  result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,arg12,arg13,arg14,arg15,arg16,arg17);
  jresult = (void *)result; 
  return jresult;
 }
@@ -505,6 +505,10 @@ public class CoreSession : IDisposable {
    freeswitchPINVOKE.CoreSession_check_hangup_hook(swigCPtr);
  }

+  public void consoleLog(string level_str, string msg) {
+    freeswitchPINVOKE.CoreSession_consoleLog(swigCPtr, level_str, msg);
+  }
+
 }

 }
@@ -2460,6 +2464,11 @@ public class freeswitch {
    return ret;
  }

+  public static switch_status_t switch_core_asr_get_result_headers(switch_asr_handle ah, SWIGTYPE_p_p_switch_event headers, SWIGTYPE_p_unsigned_long flags) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_asr_get_result_headers(switch_asr_handle.getCPtr(ah), SWIGTYPE_p_p_switch_event.getCPtr(headers), SWIGTYPE_p_unsigned_long.getCPtr(flags));
+    return ret;
+  }
+
  public static switch_status_t switch_core_asr_load_grammar(switch_asr_handle ah, string grammar, string name) {
    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_asr_load_grammar(switch_asr_handle.getCPtr(ah), grammar, name);
    return ret;
@@ -3132,6 +3141,11 @@ public class freeswitch {
    return ret;
  }

+  public static int switch_stream_system_fork(string cmd, switch_stream_handle stream) {
+    int ret = freeswitchPINVOKE.switch_stream_system_fork(cmd, switch_stream_handle.getCPtr(stream));
+    return ret;
+  }
+
  public static switch_status_t switch_loadable_module_init(switch_bool_t autoload) {
    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_loadable_module_init((int)autoload);
    return ret;
@@ -5132,6 +5146,11 @@ public class freeswitch {
    return ret;
  }

+  public static switch_status_t switch_ivr_detect_speech_init(SWIGTYPE_p_switch_core_session session, string mod_name, string dest, switch_asr_handle ah) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_detect_speech_init(SWIGTYPE_p_switch_core_session.getCPtr(session), mod_name, dest, switch_asr_handle.getCPtr(ah));
+    return ret;
+  }
+
  public static switch_status_t switch_ivr_detect_speech(SWIGTYPE_p_switch_core_session session, string mod_name, string grammar, string name, string dest, switch_asr_handle ah) {
    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_detect_speech(SWIGTYPE_p_switch_core_session.getCPtr(session), mod_name, grammar, name, dest, switch_asr_handle.getCPtr(ah));
    return ret;
@@ -5464,8 +5483,8 @@ public class freeswitch {
    return ret;
  }

-  public static switch_status_t switch_ivr_menu_init(SWIGTYPE_p_p_switch_ivr_menu new_menu, SWIGTYPE_p_switch_ivr_menu main, string name, string greeting_sound, string short_greeting_sound, string invalid_sound, string exit_sound, string confirm_macro, string confirm_key, string tts_engine, string tts_voice, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts, SWIGTYPE_p_apr_pool_t pool) {
-    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_menu_init(SWIGTYPE_p_p_switch_ivr_menu.getCPtr(new_menu), SWIGTYPE_p_switch_ivr_menu.getCPtr(main), name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, confirm_macro, confirm_key, tts_engine, tts_voice, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts, SWIGTYPE_p_apr_pool_t.getCPtr(pool));
+  public static switch_status_t switch_ivr_menu_init(SWIGTYPE_p_p_switch_ivr_menu new_menu, SWIGTYPE_p_switch_ivr_menu main, string name, string greeting_sound, string short_greeting_sound, string invalid_sound, string exit_sound, string transfer_sound, string confirm_macro, string confirm_key, string tts_engine, string tts_voice, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts, SWIGTYPE_p_apr_pool_t pool) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_menu_init(SWIGTYPE_p_p_switch_ivr_menu.getCPtr(new_menu), SWIGTYPE_p_switch_ivr_menu.getCPtr(main), name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, transfer_sound, confirm_macro, confirm_key, tts_engine, tts_voice, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts, SWIGTYPE_p_apr_pool_t.getCPtr(pool));
    return ret;
  }

@@ -5608,6 +5627,11 @@ public class freeswitch {
    return ret;
  }

+  public static switch_status_t switch_ivr_set_user_xml(SWIGTYPE_p_switch_core_session session, string prefix, string user, string domain, switch_xml x_user) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_set_user_xml(SWIGTYPE_p_switch_core_session.getCPtr(session), prefix, user, domain, switch_xml.getCPtr(x_user));
+    return ret;
+  }
+
  public static switch_status_t switch_ivr_sound_test(SWIGTYPE_p_switch_core_session session) {
    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_sound_test(SWIGTYPE_p_switch_core_session.getCPtr(session));
    return ret;
@@ -5777,6 +5801,11 @@ public class freeswitch {
    return ret;
  }

+  public static switch_status_t switch_rtp_set_remote_ssrc(SWIGTYPE_p_switch_rtp rtp_session, uint ssrc) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_set_remote_ssrc(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), ssrc);
+    return ret;
+  }
+
  public static ushort switch_rtp_set_end_port(ushort port) {
    ushort ret = freeswitchPINVOKE.switch_rtp_set_end_port(port);
    return ret;
@@ -9827,6 +9856,9 @@ class freeswitchPINVOKE {
  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_asr_get_results")]
  public static extern int switch_core_asr_get_results(HandleRef jarg1, ref string jarg2, HandleRef jarg3);

+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_asr_get_result_headers")]
+  public static extern int switch_core_asr_get_result_headers(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3);
+
  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_asr_load_grammar")]
  public static extern int switch_core_asr_load_grammar(HandleRef jarg1, string jarg2, string jarg3);

@@ -10346,6 +10378,9 @@ class freeswitchPINVOKE {
  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_refresh_video")]
  public static extern int switch_core_session_refresh_video(HandleRef jarg1);

+  [DllImport("mod_managed", EntryPoint="CSharp_switch_stream_system_fork")]
+  public static extern int switch_stream_system_fork(string jarg1, HandleRef jarg2);
+
  [DllImport("mod_managed", EntryPoint="CSharp_switch_loadable_module_interface_module_name_set")]
  public static extern void switch_loadable_module_interface_module_name_set(HandleRef jarg1, string jarg2);

@@ -12356,6 +12391,12 @@ class freeswitchPINVOKE {
  [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_asr_get_results_get")]
  public static extern IntPtr switch_asr_interface_asr_get_results_get(HandleRef jarg1);

+  [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_asr_get_result_headers_set")]
+  public static extern void switch_asr_interface_asr_get_result_headers_set(HandleRef jarg1, HandleRef jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_asr_get_result_headers_get")]
+  public static extern IntPtr switch_asr_interface_asr_get_result_headers_get(HandleRef jarg1);
+
  [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_asr_start_input_timers_set")]
  public static extern void switch_asr_interface_asr_start_input_timers_set(HandleRef jarg1, HandleRef jarg2);

@@ -14735,6 +14776,9 @@ class freeswitchPINVOKE {
  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_play_and_detect_speech")]
  public static extern int switch_ivr_play_and_detect_speech(HandleRef jarg1, string jarg2, string jarg3, string jarg4, ref string jarg5, uint jarg6, HandleRef jarg7);

+  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_detect_speech_init")]
+  public static extern int switch_ivr_detect_speech_init(HandleRef jarg1, string jarg2, string jarg3, HandleRef jarg4);
+
  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_detect_speech")]
  public static extern int switch_ivr_detect_speech(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, HandleRef jarg6);

@@ -14934,7 +14978,7 @@ class freeswitchPINVOKE {
  public static extern int switch_ivr_digit_stream_parser_set_terminator(HandleRef jarg1, char jarg2);

  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_menu_init")]
-  public static extern int switch_ivr_menu_init(HandleRef jarg1, HandleRef jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7, string jarg8, string jarg9, string jarg10, string jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17, HandleRef jarg18);
+  public static extern int switch_ivr_menu_init(HandleRef jarg1, HandleRef jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7, string jarg8, string jarg9, string jarg10, string jarg11, string jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17, int jarg18, HandleRef jarg19);

  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_menu_bind_action")]
  public static extern int switch_ivr_menu_bind_action(HandleRef jarg1, int jarg2, string jarg3, string jarg4);
@@ -15020,6 +15064,9 @@ class freeswitchPINVOKE {
  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_set_user")]
  public static extern int switch_ivr_set_user(HandleRef jarg1, string jarg2);

+  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_set_user_xml")]
+  public static extern int switch_ivr_set_user_xml(HandleRef jarg1, string jarg2, string jarg3, string jarg4, HandleRef jarg5);
+
  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_sound_test")]
  public static extern int switch_ivr_sound_test(HandleRef jarg1);

@@ -15299,6 +15346,9 @@ class freeswitchPINVOKE {
  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_set_ssrc")]
  public static extern int switch_rtp_set_ssrc(HandleRef jarg1, uint jarg2);

+  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_set_remote_ssrc")]
+  public static extern int switch_rtp_set_remote_ssrc(HandleRef jarg1, uint jarg2);
+
  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_set_end_port")]
  public static extern ushort switch_rtp_set_end_port(ushort jarg1);

@@ -16341,7 +16391,7 @@ class freeswitchPINVOKE {
  public static extern bool email(string jarg1, string jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7);

  [DllImport("mod_managed", EntryPoint="CSharp_new_IvrMenu")]
-  public static extern IntPtr new_IvrMenu(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7, string jarg8, string jarg9, string jarg10, int jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16);
+  public static extern IntPtr new_IvrMenu(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7, string jarg8, string jarg9, string jarg10, string jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17);

  [DllImport("mod_managed", EntryPoint="CSharp_delete_IvrMenu")]
  public static extern void delete_IvrMenu(HandleRef jarg1);
@@ -16745,6 +16795,9 @@ class freeswitchPINVOKE {
  [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_check_hangup_hook")]
  public static extern void CoreSession_check_hangup_hook(HandleRef jarg1);

+  [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_consoleLog")]
+  public static extern void CoreSession_consoleLog(HandleRef jarg1, string jarg2, string jarg3);
+
  [DllImport("mod_managed", EntryPoint="CSharp_console_log")]
  public static extern void console_log(string jarg1, string jarg2);

@@ -17272,7 +17325,7 @@ public class IvrMenu : IDisposable {
    }
  }

-  public IvrMenu(IvrMenu main, string name, string greeting_sound, string short_greeting_sound, string invalid_sound, string exit_sound, string confirm_macro, string confirm_key, string tts_engine, string tts_voice, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts) : this(freeswitchPINVOKE.new_IvrMenu(IvrMenu.getCPtr(main), name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, confirm_macro, confirm_key, tts_engine, tts_voice, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts), true) {
+  public IvrMenu(IvrMenu main, string name, string greeting_sound, string short_greeting_sound, string invalid_sound, string exit_sound, string transfer_sound, string confirm_macro, string confirm_key, string tts_engine, string tts_voice, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts) : this(freeswitchPINVOKE.new_IvrMenu(IvrMenu.getCPtr(main), name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, transfer_sound, confirm_macro, confirm_key, tts_engine, tts_voice, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts), true) {
  }

  public void bindAction(string action, string arg, string bind) {
@@ -18081,6 +18134,36 @@ namespace FreeSWITCH.Native {
 using System;
 using System.Runtime.InteropServices;

+public class SWIGTYPE_p_f_p_switch_asr_handle_p_p_switch_event_p_unsigned_long__switch_status_t {
+  private HandleRef swigCPtr;
+
+  internal SWIGTYPE_p_f_p_switch_asr_handle_p_p_switch_event_p_unsigned_long__switch_status_t(IntPtr cPtr, bool futureUse) {
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  protected SWIGTYPE_p_f_p_switch_asr_handle_p_p_switch_event_p_unsigned_long__switch_status_t() {
+    swigCPtr = new HandleRef(null, IntPtr.Zero);
+  }
+
+  internal static HandleRef getCPtr(SWIGTYPE_p_f_p_switch_asr_handle_p_p_switch_event_p_unsigned_long__switch_status_t obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+}
+
+}
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 2.0.1
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+namespace FreeSWITCH.Native {
+
+using System;
+using System.Runtime.InteropServices;
+
 public class SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__char_int_p_q_const__char_p_unsigned_long__switch_status_t {
  private HandleRef swigCPtr;

@@ -23930,6 +24013,17 @@ public class switch_asr_interface : IDisposable {
    } 
  }

+  public SWIGTYPE_p_f_p_switch_asr_handle_p_p_switch_event_p_unsigned_long__switch_status_t asr_get_result_headers {
+    set {
+      freeswitchPINVOKE.switch_asr_interface_asr_get_result_headers_set(swigCPtr, SWIGTYPE_p_f_p_switch_asr_handle_p_p_switch_event_p_unsigned_long__switch_status_t.getCPtr(value));
+    } 
+    get {
+      IntPtr cPtr = freeswitchPINVOKE.switch_asr_interface_asr_get_result_headers_get(swigCPtr);
+      SWIGTYPE_p_f_p_switch_asr_handle_p_p_switch_event_p_unsigned_long__switch_status_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_p_switch_asr_handle_p_p_switch_event_p_unsigned_long__switch_status_t(cPtr, false);
+      return ret;
+    } 
+  }
+
  public SWIGTYPE_p_f_p_switch_asr_handle__switch_status_t asr_start_input_timers {
    set {
      freeswitchPINVOKE.switch_asr_interface_asr_start_input_timers_set(swigCPtr, SWIGTYPE_p_f_p_switch_asr_handle__switch_status_t.getCPtr(value));
@@ -25827,6 +25921,8 @@ public enum switch_channel_flag_t {
  CF_VERBOSE_SDP,
  CF_DTLS_OK,
  CF_VIDEO_PASSIVE,
+  CF_NOVIDEO,
+  CF_VIDEO_ECHO,
  CF_FLAG_MAX
 }

@@ -35097,7 +35193,11 @@ public enum switch_session_ctl_t {
  SCSC_DEBUG_SQL,
  SCSC_SQL,
  SCSC_API_EXPANSION,
-  SCSC_RECOVER
+  SCSC_RECOVER,
+  SCSC_SPS_PEAK,
+  SCSC_SPS_PEAK_FIVEMIN,
+  SCSC_SESSIONS_PEAK,
+  SCSC_SESSIONS_PEAK_FIVEMIN
 }

 }
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`/usr/lib/freeswitch/mod/FreeSWITCH.Managed.dll`