diff --git a/Freeswitch.2008.sln b/Freeswitch.2008.sln
index 5e27743f6a..d31ca4a53e 100644
--- a/Freeswitch.2008.sln
+++ b/Freeswitch.2008.sln
@@ -2036,18 +2036,18 @@ Global
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64.Build.0 = Release|Win32
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|Win32.Build.0 = Debug|Win32
-		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|x64.ActiveCfg = Debug|Win32
-		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|x64.Build.0 = Debug|Win32
+		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|x64.ActiveCfg = Debug|x64
+		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|x64.Build.0 = Debug|x64
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|Win32.ActiveCfg = Release|Win32
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|Win32.Build.0 = Release|Win32
-		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.ActiveCfg = Release|Win32
-		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.Build.0 = Release|Win32
+		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.ActiveCfg = Release|x64
+		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.Build.0 = Release|x64
 		{7EB71250-F002-4ED8-92CA-CA218114537A}.All|Win32.ActiveCfg = Release|Win32
 		{7EB71250-F002-4ED8-92CA-CA218114537A}.All|x64.ActiveCfg = Release|Win32
 		{7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|x64.ActiveCfg = Debug|Win32
+		{7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|x64.ActiveCfg = Debug|x64
 		{7EB71250-F002-4ED8-92CA-CA218114537A}.Release|Win32.ActiveCfg = Release|Win32
-		{7EB71250-F002-4ED8-92CA-CA218114537A}.Release|x64.ActiveCfg = Release|Win32
+		{7EB71250-F002-4ED8-92CA-CA218114537A}.Release|x64.ActiveCfg = Release|x64
 		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|Win32.ActiveCfg = Release|Win32
 		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|x64.ActiveCfg = Release|Win32
 		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2057,9 +2057,9 @@ Global
 		{464AAB78-5489-4916-BE51-BF8D61822311}.All|Win32.ActiveCfg = Release|Win32
 		{464AAB78-5489-4916-BE51-BF8D61822311}.All|x64.ActiveCfg = Release|Win32
 		{464AAB78-5489-4916-BE51-BF8D61822311}.Debug|Win32.ActiveCfg = Debug|Win32
-		{464AAB78-5489-4916-BE51-BF8D61822311}.Debug|x64.ActiveCfg = Debug|Win32
+		{464AAB78-5489-4916-BE51-BF8D61822311}.Debug|x64.ActiveCfg = Debug|x64
 		{464AAB78-5489-4916-BE51-BF8D61822311}.Release|Win32.ActiveCfg = Release|Win32
-		{464AAB78-5489-4916-BE51-BF8D61822311}.Release|x64.ActiveCfg = Release|Win32
+		{464AAB78-5489-4916-BE51-BF8D61822311}.Release|x64.ActiveCfg = Release|x64
 		{0AD1177E-1FD8-4643-9391-431467A11084}.All|Win32.ActiveCfg = Release|x64
 		{0AD1177E-1FD8-4643-9391-431467A11084}.All|x64.ActiveCfg = Release|x64
 		{0AD1177E-1FD8-4643-9391-431467A11084}.All|x64.Build.0 = Release|x64
@@ -2474,24 +2474,24 @@ Global
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64.Build.0 = Release|Win32
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|Win32.Build.0 = Debug|Win32
-		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.ActiveCfg = Debug|Win32
-		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.Build.0 = Debug|Win32
+		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.ActiveCfg = Debug|x64
+		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.Build.0 = Debug|x64
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|Win32.ActiveCfg = Release|Win32
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|Win32.Build.0 = Release|Win32
-		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.ActiveCfg = Release|Win32
-		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.Build.0 = Release|Win32
+		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.ActiveCfg = Release|x64
+		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.Build.0 = Release|x64
 		{BA599D0A-4310-4505-91DA-6A6447B3E289}.All|Win32.ActiveCfg = Release|Win32
 		{BA599D0A-4310-4505-91DA-6A6447B3E289}.All|x64.ActiveCfg = Release|Win32
 		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|x64.ActiveCfg = Debug|Win32
+		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|x64.ActiveCfg = Debug|x64
 		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|Win32.ActiveCfg = Release|Win32
-		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|x64.ActiveCfg = Release|Win32
+		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|x64.ActiveCfg = Release|x64
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|Win32.ActiveCfg = Release|Win32
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|x64.ActiveCfg = Release|Win32
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|x64.ActiveCfg = Debug|Win32
+		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|x64.ActiveCfg = Debug|x64
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|Win32.ActiveCfg = Release|Win32
-		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|x64.ActiveCfg = Release|Win32
+		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|x64.ActiveCfg = Release|x64
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.All|Win32.ActiveCfg = Release|x64
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.All|x64.ActiveCfg = Release|x64
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.All|x64.Build.0 = Release|x64
diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln
index 4729745778..5722802839 100644
--- a/Freeswitch.2010.sln
+++ b/Freeswitch.2010.sln
@@ -705,1734 +705,2908 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_h323", "src\mod\endpoin
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_distributor", "src\mod\applications\mod_distributor\mod_distributor.2010.vcxproj", "{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "w32\Setup\Setup.wixproj", "{47213370-B933-487D-9F45-BCA26D7E2B6F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Win32 = All|Win32
 		All|x64 = All|x64
+		All|x64 Setup = All|x64 Setup
+		All|x86 Setup = All|x86 Setup
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Debug|x64 Setup = Debug|x64 Setup
+		Debug|x86 Setup = Debug|x86 Setup
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
+		Release|x64 Setup = Release|x64 Setup
+		Release|x86 Setup = Release|x86 Setup
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.All|Win32.ActiveCfg = Release|x64
 		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.All|x64.ActiveCfg = Release|x64
 		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.All|x64.Build.0 = Release|x64
+		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.All|x64 Setup.ActiveCfg = Release|x64
+		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.All|x64 Setup.Build.0 = Release|x64
+		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.All|x86 Setup.ActiveCfg = Release|x64
 		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug|Win32.Build.0 = Debug|Win32
 		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug|x64.ActiveCfg = Debug|x64
 		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug|x64.Build.0 = Debug|x64
+		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release|Win32.ActiveCfg = Release|Win32
 		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release|Win32.Build.0 = Release|Win32
 		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release|x64.ActiveCfg = Release|x64
 		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release|x64.Build.0 = Release|x64
+		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release|x64 Setup.ActiveCfg = Release|x64
+		{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.All|Win32.ActiveCfg = Release|x64
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.All|x64.ActiveCfg = Release|x64
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.All|x64.Build.0 = Release|x64
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.All|x64 Setup.ActiveCfg = Release|x64
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.All|x64 Setup.Build.0 = Release|x64
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.All|x86 Setup.ActiveCfg = Release|x64
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|Win32.Build.0 = Debug|Win32
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|x64.ActiveCfg = Debug|x64
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|x64.Build.0 = Debug|x64
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|Win32.ActiveCfg = Release|Win32
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|Win32.Build.0 = Release|Win32
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|x64.ActiveCfg = Release|x64
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|x64.Build.0 = Release|x64
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|x64 Setup.ActiveCfg = Release|x64
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.All|Win32.ActiveCfg = Release Passthrough|x64
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.All|x64.ActiveCfg = Release Passthrough|x64
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.All|x64.Build.0 = Release Passthrough|x64
+		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.All|x64 Setup.ActiveCfg = Release Passthrough|x64
+		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.All|x64 Setup.Build.0 = Release Passthrough|x64
+		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.All|x86 Setup.ActiveCfg = Release Passthrough|x64
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|Win32.ActiveCfg = Debug Passthrough|Win32
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|Win32.Build.0 = Debug Passthrough|Win32
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|x64.ActiveCfg = Debug Passthrough|x64
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|x64.Build.0 = Debug Passthrough|x64
+		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|x64 Setup.ActiveCfg = Debug Passthrough|x64
+		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|x86 Setup.ActiveCfg = Debug Passthrough|Win32
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|Win32.ActiveCfg = Release Passthrough|Win32
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|Win32.Build.0 = Release Passthrough|Win32
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|x64.ActiveCfg = Release Passthrough|x64
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|x64.Build.0 = Release Passthrough|x64
+		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|x64 Setup.ActiveCfg = Release Passthrough|x64
+		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|x86 Setup.ActiveCfg = Release Passthrough|Win32
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.All|Win32.ActiveCfg = Release|x64
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.All|x64.ActiveCfg = Release|x64
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.All|x64.Build.0 = Release|x64
+		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.All|x64 Setup.ActiveCfg = Release|x64
+		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.All|x64 Setup.Build.0 = Release|x64
+		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.All|x86 Setup.ActiveCfg = Release|x64
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|Win32.Build.0 = Debug|Win32
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|x64.ActiveCfg = Debug|x64
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|x64.Build.0 = Debug|x64
+		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|Win32.ActiveCfg = Release|Win32
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|Win32.Build.0 = Release|Win32
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|x64.ActiveCfg = Release|x64
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|x64.Build.0 = Release|x64
+		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|x64 Setup.ActiveCfg = Release|x64
+		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.All|Win32.ActiveCfg = Release|x64
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.All|x64.ActiveCfg = Release|x64
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.All|x64.Build.0 = Release|x64
+		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.All|x64 Setup.ActiveCfg = Release|x64
+		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.All|x64 Setup.Build.0 = Release|x64
+		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.All|x86 Setup.ActiveCfg = Release|x64
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|Win32.Build.0 = Debug|Win32
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|x64.ActiveCfg = Debug|x64
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|x64.Build.0 = Debug|x64
+		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.ActiveCfg = Release|Win32
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.Build.0 = Release|Win32
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|x64.ActiveCfg = Release|x64
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|x64.Build.0 = Release|x64
+		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|x64 Setup.ActiveCfg = Release|x64
+		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.All|Win32.ActiveCfg = Release|x64
 		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.All|x64.ActiveCfg = Release|x64
 		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.All|x64.Build.0 = Release|x64
+		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.All|x64 Setup.ActiveCfg = Release|x64
+		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.All|x64 Setup.Build.0 = Release|x64
+		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.All|x86 Setup.ActiveCfg = Release|x64
 		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|Win32.Build.0 = Debug|Win32
 		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|x64.ActiveCfg = Debug|x64
 		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|x64.Build.0 = Debug|x64
+		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|Win32.ActiveCfg = Release|Win32
 		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|Win32.Build.0 = Release|Win32
 		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|x64.ActiveCfg = Release|x64
 		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|x64.Build.0 = Release|x64
+		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|x64 Setup.ActiveCfg = Release|x64
+		{5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|Win32.ActiveCfg = Release|Win32
 		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|x64.ActiveCfg = Release|Win32
+		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|x64 Setup.ActiveCfg = Release|Win32
+		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|x86 Setup.ActiveCfg = Release|Win32
 		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|x64.ActiveCfg = Debug|Win32
+		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.Release|Win32.ActiveCfg = Release|Win32
 		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.Release|x64.ActiveCfg = Release|Win32
+		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.All|Win32.ActiveCfg = Release|x64
 		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.All|x64.ActiveCfg = Release|x64
 		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.All|x64.Build.0 = Release|x64
+		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.All|x64 Setup.ActiveCfg = Release|x64
+		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.All|x64 Setup.Build.0 = Release|x64
+		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.All|x86 Setup.ActiveCfg = Release|x64
 		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|Win32.Build.0 = Debug|Win32
 		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|x64.ActiveCfg = Debug|x64
 		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|x64.Build.0 = Debug|x64
+		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Release|Win32.ActiveCfg = Release|Win32
 		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Release|Win32.Build.0 = Release|Win32
 		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Release|x64.ActiveCfg = Release|x64
 		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Release|x64.Build.0 = Release|x64
+		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Release|x64 Setup.ActiveCfg = Release|x64
+		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.All|Win32.ActiveCfg = Release MS-LDAP|x64
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.All|x64.ActiveCfg = Release MS-LDAP|x64
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.All|x64.Build.0 = Release MS-LDAP|x64
+		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.All|x64 Setup.ActiveCfg = Release MS-LDAP|x64
+		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.All|x64 Setup.Build.0 = Release MS-LDAP|x64
+		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.All|x86 Setup.ActiveCfg = Release MS-LDAP|x64
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Debug|Win32.ActiveCfg = Debug MS-LDAP|Win32
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Debug|Win32.Build.0 = Debug MS-LDAP|Win32
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Debug|x64.ActiveCfg = Debug MS-LDAP|x64
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Debug|x64.Build.0 = Debug MS-LDAP|x64
+		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Debug|x64 Setup.ActiveCfg = Debug MS-LDAP|x64
+		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Debug|x86 Setup.ActiveCfg = Debug MS-LDAP|Win32
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Release|Win32.ActiveCfg = Release MS-LDAP|Win32
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Release|Win32.Build.0 = Release MS-LDAP|Win32
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Release|x64.ActiveCfg = Release MS-LDAP|x64
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Release|x64.Build.0 = Release MS-LDAP|x64
+		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Release|x64 Setup.ActiveCfg = Release MS-LDAP|x64
+		{EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Release|x86 Setup.ActiveCfg = Release MS-LDAP|Win32
 		{A27CCA23-1541-4337-81A4-F0A6413078A0}.All|Win32.ActiveCfg = Release|x64
 		{A27CCA23-1541-4337-81A4-F0A6413078A0}.All|x64.ActiveCfg = Release|x64
 		{A27CCA23-1541-4337-81A4-F0A6413078A0}.All|x64.Build.0 = Release|x64
+		{A27CCA23-1541-4337-81A4-F0A6413078A0}.All|x64 Setup.ActiveCfg = Release|x64
+		{A27CCA23-1541-4337-81A4-F0A6413078A0}.All|x64 Setup.Build.0 = Release|x64
+		{A27CCA23-1541-4337-81A4-F0A6413078A0}.All|x86 Setup.ActiveCfg = Release|x64
 		{A27CCA23-1541-4337-81A4-F0A6413078A0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A27CCA23-1541-4337-81A4-F0A6413078A0}.Debug|Win32.Build.0 = Debug|Win32
 		{A27CCA23-1541-4337-81A4-F0A6413078A0}.Debug|x64.ActiveCfg = Debug|x64
 		{A27CCA23-1541-4337-81A4-F0A6413078A0}.Debug|x64.Build.0 = Debug|x64
+		{A27CCA23-1541-4337-81A4-F0A6413078A0}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{A27CCA23-1541-4337-81A4-F0A6413078A0}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{A27CCA23-1541-4337-81A4-F0A6413078A0}.Release|Win32.ActiveCfg = Release|Win32
 		{A27CCA23-1541-4337-81A4-F0A6413078A0}.Release|Win32.Build.0 = Release|Win32
 		{A27CCA23-1541-4337-81A4-F0A6413078A0}.Release|x64.ActiveCfg = Release|x64
 		{A27CCA23-1541-4337-81A4-F0A6413078A0}.Release|x64.Build.0 = Release|x64
+		{A27CCA23-1541-4337-81A4-F0A6413078A0}.Release|x64 Setup.ActiveCfg = Release|x64
+		{A27CCA23-1541-4337-81A4-F0A6413078A0}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{784113EF-44D9-4949-835D-7065D3C7AD08}.All|Win32.ActiveCfg = Release|x64
 		{784113EF-44D9-4949-835D-7065D3C7AD08}.All|x64.ActiveCfg = Release|x64
 		{784113EF-44D9-4949-835D-7065D3C7AD08}.All|x64.Build.0 = Release|x64
+		{784113EF-44D9-4949-835D-7065D3C7AD08}.All|x64 Setup.ActiveCfg = Release|x64
+		{784113EF-44D9-4949-835D-7065D3C7AD08}.All|x64 Setup.Build.0 = Release|x64
+		{784113EF-44D9-4949-835D-7065D3C7AD08}.All|x86 Setup.ActiveCfg = Release|x64
 		{784113EF-44D9-4949-835D-7065D3C7AD08}.Debug|Win32.ActiveCfg = Debug|Win32
 		{784113EF-44D9-4949-835D-7065D3C7AD08}.Debug|Win32.Build.0 = Debug|Win32
 		{784113EF-44D9-4949-835D-7065D3C7AD08}.Debug|x64.ActiveCfg = Debug|x64
 		{784113EF-44D9-4949-835D-7065D3C7AD08}.Debug|x64.Build.0 = Debug|x64
+		{784113EF-44D9-4949-835D-7065D3C7AD08}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{784113EF-44D9-4949-835D-7065D3C7AD08}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{784113EF-44D9-4949-835D-7065D3C7AD08}.Release|Win32.ActiveCfg = Release|Win32
 		{784113EF-44D9-4949-835D-7065D3C7AD08}.Release|Win32.Build.0 = Release|Win32
 		{784113EF-44D9-4949-835D-7065D3C7AD08}.Release|x64.ActiveCfg = Release|x64
 		{784113EF-44D9-4949-835D-7065D3C7AD08}.Release|x64.Build.0 = Release|x64
+		{784113EF-44D9-4949-835D-7065D3C7AD08}.Release|x64 Setup.ActiveCfg = Release|x64
+		{784113EF-44D9-4949-835D-7065D3C7AD08}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.All|Win32.ActiveCfg = Release|x64
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.All|x64.ActiveCfg = Release|x64
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.All|x64.Build.0 = Release|x64
+		{89385C74-5860-4174-9CAF-A39E7C48909C}.All|x64 Setup.ActiveCfg = Release|x64
+		{89385C74-5860-4174-9CAF-A39E7C48909C}.All|x64 Setup.Build.0 = Release|x64
+		{89385C74-5860-4174-9CAF-A39E7C48909C}.All|x86 Setup.ActiveCfg = Release|x64
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Debug|Win32.Build.0 = Debug|Win32
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Debug|x64.ActiveCfg = Debug|x64
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Debug|x64.Build.0 = Debug|x64
+		{89385C74-5860-4174-9CAF-A39E7C48909C}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{89385C74-5860-4174-9CAF-A39E7C48909C}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|Win32.ActiveCfg = Release|Win32
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|Win32.Build.0 = Release|Win32
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64.ActiveCfg = Release|x64
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64.Build.0 = Release|x64
+		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64 Setup.ActiveCfg = Release|x64
+		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|Win32.ActiveCfg = Release|x64
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64.ActiveCfg = Release|x64
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64.Build.0 = Release|x64
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64 Setup.ActiveCfg = Release|x64
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64 Setup.Build.0 = Release|x64
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x86 Setup.ActiveCfg = Release|x64
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.Build.0 = Debug|Win32
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64.ActiveCfg = Debug|x64
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.ActiveCfg = Release|Win32
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.Build.0 = Release|Win32
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64.ActiveCfg = Release|x64
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64 Setup.ActiveCfg = Release|x64
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|Win32.ActiveCfg = Release|x64
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x64.ActiveCfg = Release|x64
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x64.Build.0 = Release|x64
+		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x64 Setup.ActiveCfg = Release|x64
+		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x64 Setup.Build.0 = Release|x64
+		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x86 Setup.ActiveCfg = Release|x64
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.Debug|x64.ActiveCfg = Debug|x64
+		{692F6330-4D87-4C82-81DF-40DB5892636E}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{692F6330-4D87-4C82-81DF-40DB5892636E}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.Release|Win32.ActiveCfg = Release|Win32
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.Release|x64.ActiveCfg = Release|x64
+		{692F6330-4D87-4C82-81DF-40DB5892636E}.Release|x64 Setup.ActiveCfg = Release|x64
+		{692F6330-4D87-4C82-81DF-40DB5892636E}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.All|Win32.ActiveCfg = Release|x64
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.All|x64.ActiveCfg = Release|x64
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.All|x64.Build.0 = Release|x64
+		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.All|x64 Setup.ActiveCfg = Release|x64
+		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.All|x64 Setup.Build.0 = Release|x64
+		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.All|x86 Setup.ActiveCfg = Release|x64
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Debug|Win32.Build.0 = Debug|Win32
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Debug|x64.ActiveCfg = Debug|x64
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Debug|x64.Build.0 = Debug|x64
+		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|Win32.ActiveCfg = Release|Win32
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|Win32.Build.0 = Release|Win32
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|x64.ActiveCfg = Release|x64
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|x64.Build.0 = Release|x64
+		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|x64 Setup.ActiveCfg = Release|x64
+		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.All|Win32.ActiveCfg = Release|x64
 		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.All|x64.ActiveCfg = Release|x64
 		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.All|x64.Build.0 = Release|x64
+		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.All|x64 Setup.ActiveCfg = Release|x64
+		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.All|x64 Setup.Build.0 = Release|x64
+		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.All|x86 Setup.ActiveCfg = Release|x64
 		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|Win32.Build.0 = Debug|Win32
 		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|x64.ActiveCfg = Debug|x64
 		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|x64.Build.0 = Debug|x64
+		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|Win32.ActiveCfg = Release|Win32
 		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|Win32.Build.0 = Release|Win32
 		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|x64.ActiveCfg = Release|x64
 		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|x64.Build.0 = Release|x64
+		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|x64 Setup.ActiveCfg = Release|x64
+		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.All|Win32.ActiveCfg = Release|x64
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.All|x64.ActiveCfg = Release|x64
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.All|x64.Build.0 = Release|x64
+		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.All|x64 Setup.ActiveCfg = Release|x64
+		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.All|x64 Setup.Build.0 = Release|x64
+		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.All|x86 Setup.ActiveCfg = Release|x64
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Debug|Win32.Build.0 = Debug|Win32
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Debug|x64.ActiveCfg = Debug|x64
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Debug|x64.Build.0 = Debug|x64
+		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Release|Win32.ActiveCfg = Release|Win32
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Release|Win32.Build.0 = Release|Win32
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Release|x64.ActiveCfg = Release|x64
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Release|x64.Build.0 = Release|x64
+		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Release|x64 Setup.ActiveCfg = Release|x64
+		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{1C453396-D912-4213-89FD-9B489162B7B5}.All|Win32.ActiveCfg = Release|x64
 		{1C453396-D912-4213-89FD-9B489162B7B5}.All|x64.ActiveCfg = Release|x64
 		{1C453396-D912-4213-89FD-9B489162B7B5}.All|x64.Build.0 = Release|x64
+		{1C453396-D912-4213-89FD-9B489162B7B5}.All|x64 Setup.ActiveCfg = Release|x64
+		{1C453396-D912-4213-89FD-9B489162B7B5}.All|x64 Setup.Build.0 = Release|x64
+		{1C453396-D912-4213-89FD-9B489162B7B5}.All|x86 Setup.ActiveCfg = Release|x64
 		{1C453396-D912-4213-89FD-9B489162B7B5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1C453396-D912-4213-89FD-9B489162B7B5}.Debug|Win32.Build.0 = Debug|Win32
 		{1C453396-D912-4213-89FD-9B489162B7B5}.Debug|x64.ActiveCfg = Debug|x64
 		{1C453396-D912-4213-89FD-9B489162B7B5}.Debug|x64.Build.0 = Debug|x64
+		{1C453396-D912-4213-89FD-9B489162B7B5}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{1C453396-D912-4213-89FD-9B489162B7B5}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{1C453396-D912-4213-89FD-9B489162B7B5}.Release|Win32.ActiveCfg = Release|Win32
 		{1C453396-D912-4213-89FD-9B489162B7B5}.Release|Win32.Build.0 = Release|Win32
 		{1C453396-D912-4213-89FD-9B489162B7B5}.Release|x64.ActiveCfg = Release|x64
 		{1C453396-D912-4213-89FD-9B489162B7B5}.Release|x64.Build.0 = Release|x64
+		{1C453396-D912-4213-89FD-9B489162B7B5}.Release|x64 Setup.ActiveCfg = Release|x64
+		{1C453396-D912-4213-89FD-9B489162B7B5}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.All|Win32.ActiveCfg = Release|x64
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.All|x64.ActiveCfg = Release|x64
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.All|x64.Build.0 = Release|x64
+		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.All|x64 Setup.ActiveCfg = Release|x64
+		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.All|x64 Setup.Build.0 = Release|x64
+		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.All|x86 Setup.ActiveCfg = Release|x64
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Debug|Win32.Build.0 = Debug|Win32
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Debug|x64.ActiveCfg = Debug|x64
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Debug|x64.Build.0 = Debug|x64
+		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|Win32.ActiveCfg = Release|Win32
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|Win32.Build.0 = Release|Win32
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|x64.ActiveCfg = Release|x64
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|x64.Build.0 = Release|x64
+		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|x64 Setup.ActiveCfg = Release|x64
+		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|Win32.ActiveCfg = Release|x64
 		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|x64.ActiveCfg = Release|x64
 		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|x64.Build.0 = Release|x64
+		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|x64 Setup.ActiveCfg = Release|x64
+		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|x64 Setup.Build.0 = Release|x64
+		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|x86 Setup.ActiveCfg = Release|x64
 		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|Win32.Build.0 = Debug|Win32
 		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|x64.ActiveCfg = Debug|x64
 		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|x64.Build.0 = Debug|x64
+		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|Win32.ActiveCfg = Release|Win32
 		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|Win32.Build.0 = Release|Win32
 		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|x64.ActiveCfg = Release|x64
 		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|x64.Build.0 = Release|x64
+		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|x64 Setup.ActiveCfg = Release|x64
+		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{C24FB505-05D7-4319-8485-7540B44C8603}.All|Win32.ActiveCfg = Release|x64
 		{C24FB505-05D7-4319-8485-7540B44C8603}.All|x64.ActiveCfg = Release|x64
 		{C24FB505-05D7-4319-8485-7540B44C8603}.All|x64.Build.0 = Release|x64
+		{C24FB505-05D7-4319-8485-7540B44C8603}.All|x64 Setup.ActiveCfg = Release|x64
+		{C24FB505-05D7-4319-8485-7540B44C8603}.All|x64 Setup.Build.0 = Release|x64
+		{C24FB505-05D7-4319-8485-7540B44C8603}.All|x86 Setup.ActiveCfg = Release|x64
 		{C24FB505-05D7-4319-8485-7540B44C8603}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C24FB505-05D7-4319-8485-7540B44C8603}.Debug|Win32.Build.0 = Debug|Win32
 		{C24FB505-05D7-4319-8485-7540B44C8603}.Debug|x64.ActiveCfg = Debug|x64
 		{C24FB505-05D7-4319-8485-7540B44C8603}.Debug|x64.Build.0 = Debug|x64
+		{C24FB505-05D7-4319-8485-7540B44C8603}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{C24FB505-05D7-4319-8485-7540B44C8603}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{C24FB505-05D7-4319-8485-7540B44C8603}.Release|Win32.ActiveCfg = Release|Win32
 		{C24FB505-05D7-4319-8485-7540B44C8603}.Release|Win32.Build.0 = Release|Win32
 		{C24FB505-05D7-4319-8485-7540B44C8603}.Release|x64.ActiveCfg = Release|x64
 		{C24FB505-05D7-4319-8485-7540B44C8603}.Release|x64.Build.0 = Release|x64
+		{C24FB505-05D7-4319-8485-7540B44C8603}.Release|x64 Setup.ActiveCfg = Release|x64
+		{C24FB505-05D7-4319-8485-7540B44C8603}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.All|Win32.ActiveCfg = Release|x64
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.All|x64.ActiveCfg = Release|x64
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.All|x64.Build.0 = Release|x64
+		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.All|x64 Setup.ActiveCfg = Release|x64
+		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.All|x64 Setup.Build.0 = Release|x64
+		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.All|x86 Setup.ActiveCfg = Release|x64
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.Debug|Win32.Build.0 = Debug|Win32
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.Debug|x64.ActiveCfg = Debug|x64
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.Debug|x64.Build.0 = Debug|x64
+		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.Release|Win32.ActiveCfg = Release|Win32
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.Release|Win32.Build.0 = Release|Win32
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.Release|x64.ActiveCfg = Release|x64
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.Release|x64.Build.0 = Release|x64
+		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.Release|x64 Setup.ActiveCfg = Release|x64
+		{B5881A85-FE70-4F64-8607-2CAAE52669C6}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.All|Win32.ActiveCfg = Release|x64
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.All|x64.ActiveCfg = Release|x64
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.All|x64.Build.0 = Release|x64
+		{05515420-16DE-4E63-BE73-85BE85BA5142}.All|x64 Setup.ActiveCfg = Release|x64
+		{05515420-16DE-4E63-BE73-85BE85BA5142}.All|x64 Setup.Build.0 = Release|x64
+		{05515420-16DE-4E63-BE73-85BE85BA5142}.All|x86 Setup.ActiveCfg = Release|x64
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Debug|Win32.ActiveCfg = Debug|Win32
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Debug|Win32.Build.0 = Debug|Win32
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Debug|x64.ActiveCfg = Debug|x64
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Debug|x64.Build.0 = Debug|x64
+		{05515420-16DE-4E63-BE73-85BE85BA5142}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{05515420-16DE-4E63-BE73-85BE85BA5142}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.ActiveCfg = Release|Win32
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.Build.0 = Release|Win32
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Release|x64.ActiveCfg = Release|x64
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Release|x64.Build.0 = Release|x64
+		{05515420-16DE-4E63-BE73-85BE85BA5142}.Release|x64 Setup.ActiveCfg = Release|x64
+		{05515420-16DE-4E63-BE73-85BE85BA5142}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{1906D736-08BD-4EE1-924F-B536249B9A54}.All|Win32.ActiveCfg = Release DLL|x64
 		{1906D736-08BD-4EE1-924F-B536249B9A54}.All|x64.ActiveCfg = Release DLL|x64
 		{1906D736-08BD-4EE1-924F-B536249B9A54}.All|x64.Build.0 = Release DLL|x64
+		{1906D736-08BD-4EE1-924F-B536249B9A54}.All|x64 Setup.ActiveCfg = Release DLL|x64
+		{1906D736-08BD-4EE1-924F-B536249B9A54}.All|x64 Setup.Build.0 = Release DLL|x64
+		{1906D736-08BD-4EE1-924F-B536249B9A54}.All|x86 Setup.ActiveCfg = Release DLL|x64
 		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.Build.0 = Debug|Win32
 		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|x64.ActiveCfg = Debug|x64
 		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|x64.Build.0 = Debug|x64
+		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|Win32.ActiveCfg = Release|Win32
 		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|Win32.Build.0 = Release|Win32
 		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|x64.ActiveCfg = Release|x64
 		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|x64.Build.0 = Release|x64
+		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|x64 Setup.ActiveCfg = Release|x64
+		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.All|Win32.ActiveCfg = Release Dll|x64
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.All|x64.ActiveCfg = Release Dll|x64
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.All|x64.Build.0 = Release Dll|x64
+		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.All|x64 Setup.ActiveCfg = Release Dll|x64
+		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.All|x64 Setup.Build.0 = Release Dll|x64
+		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.All|x86 Setup.ActiveCfg = Release Dll|x64
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.Debug|Win32.Build.0 = Debug|Win32
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.Debug|x64.ActiveCfg = Debug|x64
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.Debug|x64.Build.0 = Debug|x64
+		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.Release|Win32.ActiveCfg = Release|Win32
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.Release|Win32.Build.0 = Release|Win32
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.Release|x64.ActiveCfg = Release|x64
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.Release|x64.Build.0 = Release|x64
+		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.Release|x64 Setup.ActiveCfg = Release|x64
+		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.All|Win32.ActiveCfg = Release DLL|x64
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.All|x64.ActiveCfg = Release DLL|x64
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.All|x64.Build.0 = Release DLL|x64
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.All|x64 Setup.ActiveCfg = Release DLL|x64
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.All|x64 Setup.Build.0 = Release DLL|x64
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.All|x86 Setup.ActiveCfg = Release DLL|x64
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Debug|Win32.Build.0 = Debug|Win32
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Debug|x64.ActiveCfg = Debug|x64
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Debug|x64.Build.0 = Debug|x64
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Release|Win32.ActiveCfg = Release|Win32
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Release|Win32.Build.0 = Release|Win32
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Release|x64.ActiveCfg = Release|x64
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Release|x64.Build.0 = Release|x64
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Release|x64 Setup.ActiveCfg = Release|x64
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.All|Win32.ActiveCfg = Release DLL|x64
 		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.All|x64.ActiveCfg = Release DLL|x64
 		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.All|x64.Build.0 = Release DLL|x64
+		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.All|x64 Setup.ActiveCfg = Release DLL|x64
+		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.All|x64 Setup.Build.0 = Release DLL|x64
+		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.All|x86 Setup.ActiveCfg = Release DLL|x64
 		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.Debug|Win32.Build.0 = Debug|Win32
 		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.Debug|x64.ActiveCfg = Debug|x64
 		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.Debug|x64.Build.0 = Debug|x64
+		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.Release|Win32.ActiveCfg = Release|Win32
 		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.Release|Win32.Build.0 = Release|Win32
 		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.Release|x64.ActiveCfg = Release|x64
 		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.Release|x64.Build.0 = Release|x64
+		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.Release|x64 Setup.ActiveCfg = Release|x64
+		{8D04B550-D240-4A44-8A18-35DA3F7038D9}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{1CED5987-A529-46DC-B30F-870D85FF9C94}.All|Win32.ActiveCfg = Release|x64
 		{1CED5987-A529-46DC-B30F-870D85FF9C94}.All|x64.ActiveCfg = Release|x64
 		{1CED5987-A529-46DC-B30F-870D85FF9C94}.All|x64.Build.0 = Release|x64
+		{1CED5987-A529-46DC-B30F-870D85FF9C94}.All|x64 Setup.ActiveCfg = Release|x64
+		{1CED5987-A529-46DC-B30F-870D85FF9C94}.All|x64 Setup.Build.0 = Release|x64
+		{1CED5987-A529-46DC-B30F-870D85FF9C94}.All|x86 Setup.ActiveCfg = Release|x64
 		{1CED5987-A529-46DC-B30F-870D85FF9C94}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1CED5987-A529-46DC-B30F-870D85FF9C94}.Debug|Win32.Build.0 = Debug|Win32
 		{1CED5987-A529-46DC-B30F-870D85FF9C94}.Debug|x64.ActiveCfg = Debug|x64
 		{1CED5987-A529-46DC-B30F-870D85FF9C94}.Debug|x64.Build.0 = Debug|x64
+		{1CED5987-A529-46DC-B30F-870D85FF9C94}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{1CED5987-A529-46DC-B30F-870D85FF9C94}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.ActiveCfg = Release|Win32
 		{1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.Build.0 = Release|Win32
 		{1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|x64.ActiveCfg = Release|x64
 		{1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|x64.Build.0 = Release|x64
+		{1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|x64 Setup.ActiveCfg = Release|x64
+		{1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.All|Win32.ActiveCfg = Release|x64
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.All|x64.ActiveCfg = Release|x64
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.All|x64.Build.0 = Release|x64
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.All|x64 Setup.ActiveCfg = Release|x64
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.All|x64 Setup.Build.0 = Release|x64
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.All|x86 Setup.ActiveCfg = Release|x64
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|Win32.Build.0 = Debug|Win32
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|x64.ActiveCfg = Debug|x64
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|x64.Build.0 = Debug|x64
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|Win32.ActiveCfg = Release|Win32
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|Win32.Build.0 = Release|Win32
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|x64.ActiveCfg = Release|x64
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|x64.Build.0 = Release|x64
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|x64 Setup.ActiveCfg = Release|x64
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.All|Win32.ActiveCfg = Release|x64
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.All|x64.ActiveCfg = Release|x64
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.All|x64.Build.0 = Release|x64
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.All|x64 Setup.ActiveCfg = Release|x64
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.All|x64 Setup.Build.0 = Release|x64
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.All|x86 Setup.ActiveCfg = Release|x64
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.Build.0 = Debug|Win32
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|x64.ActiveCfg = Debug|x64
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|x64.Build.0 = Debug|x64
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.ActiveCfg = Release|Win32
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.Build.0 = Release|Win32
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|x64.ActiveCfg = Release|x64
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|x64.Build.0 = Release|x64
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|x64 Setup.ActiveCfg = Release|x64
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|Win32.ActiveCfg = Release|x64
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|x64.ActiveCfg = Release|x64
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|x64.Build.0 = Release|x64
+		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|x64 Setup.ActiveCfg = Release|x64
+		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|x64 Setup.Build.0 = Release|x64
+		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|x86 Setup.ActiveCfg = Release|x64
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|Win32.Build.0 = Debug|Win32
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|x64.ActiveCfg = Debug|x64
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|x64.Build.0 = Debug|x64
+		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|Win32.ActiveCfg = Release|Win32
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|Win32.Build.0 = Release|Win32
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|x64.ActiveCfg = Release|x64
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|x64.Build.0 = Release|x64
+		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|x64 Setup.ActiveCfg = Release|x64
+		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.All|Win32.ActiveCfg = Release|x64
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.All|x64.ActiveCfg = Release|x64
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.All|x64.Build.0 = Release|x64
+		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.All|x64 Setup.ActiveCfg = Release|x64
+		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.All|x64 Setup.Build.0 = Release|x64
+		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.All|x86 Setup.ActiveCfg = Release|x64
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|Win32.Build.0 = Debug|Win32
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|x64.ActiveCfg = Debug|x64
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|x64.Build.0 = Debug|x64
+		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|Win32.ActiveCfg = Release|Win32
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|Win32.Build.0 = Release|Win32
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|x64.ActiveCfg = Release|x64
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|x64.Build.0 = Release|x64
+		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|x64 Setup.ActiveCfg = Release|x64
+		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.All|Win32.ActiveCfg = Debug|x64
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.All|x64.ActiveCfg = Debug|x64
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.All|x64.Build.0 = Debug|x64
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.All|x64 Setup.ActiveCfg = Debug|x64
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.All|x64 Setup.Build.0 = Debug|x64
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.All|x86 Setup.ActiveCfg = Debug|x64
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|Win32.ActiveCfg = Debug|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|Win32.Build.0 = Debug|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|x64.ActiveCfg = Debug|x64
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|x64.Build.0 = Debug|x64
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|Win32.ActiveCfg = Release|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|Win32.Build.0 = Release|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|x64.ActiveCfg = Release|x64
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|x64.Build.0 = Release|x64
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|x64 Setup.ActiveCfg = Release|x64
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|Win32.ActiveCfg = Debug|x64
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|x64.ActiveCfg = Debug|x64
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|x64.Build.0 = Debug|x64
+		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|x64 Setup.ActiveCfg = Debug|x64
+		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|x64 Setup.Build.0 = Debug|x64
+		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|x86 Setup.ActiveCfg = Debug|x64
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|Win32.Build.0 = Debug|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|x64.ActiveCfg = Debug|x64
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|x64.Build.0 = Debug|x64
+		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.ActiveCfg = Release|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.Build.0 = Release|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.ActiveCfg = Release|x64
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.Build.0 = Release|x64
+		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64 Setup.ActiveCfg = Release|x64
+		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|Win32.ActiveCfg = Debug|x64
 		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64.ActiveCfg = Debug|x64
 		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64.Build.0 = Debug|x64
+		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64 Setup.ActiveCfg = Debug|x64
+		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64 Setup.Build.0 = Debug|x64
+		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x86 Setup.ActiveCfg = Debug|x64
 		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.Build.0 = Debug|Win32
 		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.ActiveCfg = Debug|x64
 		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.Build.0 = Debug|x64
+		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.ActiveCfg = Release|Win32
 		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.Build.0 = Release|Win32
 		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.ActiveCfg = Release|x64
 		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.Build.0 = Release|x64
+		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64 Setup.ActiveCfg = Release|x64
+		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|Win32.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.Build.0 = Release|x64
+		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64 Setup.ActiveCfg = Release|x64
+		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64 Setup.Build.0 = Release|x64
+		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x86 Setup.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.Debug|Win32.Build.0 = Debug|Win32
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.Debug|x64.ActiveCfg = Debug|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.Debug|x64.Build.0 = Debug|x64
+		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.ActiveCfg = Release|Win32
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.Build.0 = Release|Win32
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|x64.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|x64.Build.0 = Release|x64
+		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|x64 Setup.ActiveCfg = Release|x64
+		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.All|Win32.ActiveCfg = Release|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.All|Win32.Build.0 = Release|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.All|x64.ActiveCfg = Release|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.All|x64.Build.0 = Release|Win32
+		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.All|x64 Setup.ActiveCfg = Release|Win32
+		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.All|x64 Setup.Build.0 = Release|Win32
+		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.All|x86 Setup.ActiveCfg = Release|Win32
+		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.All|x86 Setup.Build.0 = Release|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|Win32.Build.0 = Debug|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|x64.ActiveCfg = Debug|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|x64.Build.0 = Debug|Win32
+		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|Win32.ActiveCfg = Release|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|Win32.Build.0 = Release|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|x64.ActiveCfg = Release|Win32
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|x64.Build.0 = Release|Win32
+		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.All|Win32.ActiveCfg = Release DLL|x64
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.All|x64.ActiveCfg = Release DLL|x64
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.All|x64.Build.0 = Release DLL|x64
+		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.All|x64 Setup.ActiveCfg = Release DLL|x64
+		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.All|x64 Setup.Build.0 = Release DLL|x64
+		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.All|x86 Setup.ActiveCfg = Release DLL|x64
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.ActiveCfg = Debug DLL|Win32
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.Build.0 = Debug DLL|Win32
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|x64.ActiveCfg = Debug DLL|x64
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|x64.Build.0 = Debug DLL|x64
+		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|x64 Setup.ActiveCfg = Debug DLL|x64
+		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|x86 Setup.ActiveCfg = Debug DLL|Win32
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|Win32.ActiveCfg = Release DLL|Win32
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|Win32.Build.0 = Release DLL|Win32
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|x64.ActiveCfg = Release DLL|x64
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|x64.Build.0 = Release DLL|x64
+		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|x64 Setup.ActiveCfg = Release DLL|x64
+		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|x86 Setup.ActiveCfg = Release DLL|Win32
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.All|Win32.ActiveCfg = Release Passthrough|x64
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.All|x64.ActiveCfg = Release Passthrough|x64
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.All|x64.Build.0 = Release Passthrough|x64
+		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.All|x64 Setup.ActiveCfg = Release Passthrough|x64
+		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.All|x64 Setup.Build.0 = Release Passthrough|x64
+		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.All|x86 Setup.ActiveCfg = Release Passthrough|x64
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Debug|Win32.ActiveCfg = Debug Passthrough|Win32
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Debug|Win32.Build.0 = Debug Passthrough|Win32
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Debug|x64.ActiveCfg = Debug Passthrough|x64
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Debug|x64.Build.0 = Debug Passthrough|x64
+		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Debug|x64 Setup.ActiveCfg = Debug Passthrough|x64
+		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Debug|x86 Setup.ActiveCfg = Debug Passthrough|Win32
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|Win32.ActiveCfg = Release Passthrough|Win32
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|Win32.Build.0 = Release Passthrough|Win32
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|x64.ActiveCfg = Release Passthrough|x64
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|x64.Build.0 = Release Passthrough|x64
+		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|x64 Setup.ActiveCfg = Release Passthrough|x64
+		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|x86 Setup.ActiveCfg = Release Passthrough|Win32
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|Win32.ActiveCfg = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|x64.ActiveCfg = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|x64.Build.0 = Release|x64
+		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|x64 Setup.ActiveCfg = Release|x64
+		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|x64 Setup.Build.0 = Release|x64
+		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|x86 Setup.ActiveCfg = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Debug|Win32.Build.0 = Debug|Win32
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Debug|x64.ActiveCfg = Debug|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Debug|x64.Build.0 = Debug|x64
+		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|Win32.ActiveCfg = Release|Win32
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|Win32.Build.0 = Release|Win32
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64.ActiveCfg = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64.Build.0 = Release|x64
+		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64 Setup.ActiveCfg = Release|x64
+		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|Win32.ActiveCfg = Release|x64
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64.ActiveCfg = Release|x64
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64.Build.0 = Release|x64
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64 Setup.ActiveCfg = Release|x64
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64 Setup.Build.0 = Release|x64
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x86 Setup.ActiveCfg = Release|x64
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.Build.0 = Debug|Win32
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64.ActiveCfg = Debug|x64
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.ActiveCfg = Release|Win32
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.Build.0 = Release|Win32
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64.ActiveCfg = Release|x64
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64 Setup.ActiveCfg = Release|x64
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|Win32.ActiveCfg = Release|x64
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64.ActiveCfg = Release|x64
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64.Build.0 = Release|x64
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64 Setup.ActiveCfg = Release|x64
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64 Setup.Build.0 = Release|x64
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x86 Setup.ActiveCfg = Release|x64
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.Build.0 = Debug|Win32
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64.ActiveCfg = Debug|x64
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.ActiveCfg = Release|Win32
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.Build.0 = Release|Win32
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64.ActiveCfg = Release|x64
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64 Setup.ActiveCfg = Release|x64
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|Win32.ActiveCfg = Release|x64
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|x64.ActiveCfg = Release|x64
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|x64.Build.0 = Release|x64
+		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|x64 Setup.ActiveCfg = Release|x64
+		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|x64 Setup.Build.0 = Release|x64
+		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|x86 Setup.ActiveCfg = Release|x64
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Debug|Win32.Build.0 = Debug|Win32
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Debug|x64.ActiveCfg = Debug|x64
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Debug|x64.Build.0 = Debug|x64
+		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Release|Win32.ActiveCfg = Release|Win32
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Release|Win32.Build.0 = Release|Win32
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Release|x64.ActiveCfg = Release|x64
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Release|x64.Build.0 = Release|x64
+		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Release|x64 Setup.ActiveCfg = Release|x64
+		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|Win32.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|x64.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|x64.Build.0 = Release|x64
+		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|x64 Setup.ActiveCfg = Release|x64
+		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|x64 Setup.Build.0 = Release|x64
+		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|x86 Setup.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Debug|Win32.Build.0 = Debug|Win32
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Debug|x64.ActiveCfg = Debug|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Debug|x64.Build.0 = Debug|x64
+		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|Win32.ActiveCfg = Release|Win32
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|Win32.Build.0 = Release|Win32
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64.Build.0 = Release|x64
+		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64 Setup.ActiveCfg = Release|x64
+		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|Win32.ActiveCfg = Release|x64
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64.ActiveCfg = Release|x64
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64.Build.0 = Release|x64
+		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64 Setup.ActiveCfg = Release|x64
+		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64 Setup.Build.0 = Release|x64
+		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x86 Setup.ActiveCfg = Release|x64
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.Build.0 = Debug|Win32
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64.ActiveCfg = Debug|x64
+		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.ActiveCfg = Release|Win32
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.Build.0 = Release|Win32
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64.ActiveCfg = Release|x64
+		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64 Setup.ActiveCfg = Release|x64
+		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|Win32.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64.Build.0 = Release|x64
+		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64 Setup.ActiveCfg = Release|x64
+		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64 Setup.Build.0 = Release|x64
+		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x86 Setup.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|Win32.Build.0 = Debug|Win32
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|x64.ActiveCfg = Debug|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|x64.Build.0 = Debug|x64
+		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|Win32.ActiveCfg = Release|Win32
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|Win32.Build.0 = Release|Win32
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|x64.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|x64.Build.0 = Release|x64
+		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|x64 Setup.ActiveCfg = Release|x64
+		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.All|Win32.ActiveCfg = Release|x64
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.All|x64.ActiveCfg = Release|x64
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.All|x64.Build.0 = Release|x64
+		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.All|x64 Setup.ActiveCfg = Release|x64
+		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.All|x64 Setup.Build.0 = Release|x64
+		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.All|x86 Setup.ActiveCfg = Release|x64
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Debug|Win32.Build.0 = Debug|Win32
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Debug|x64.ActiveCfg = Debug|x64
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Debug|x64.Build.0 = Debug|x64
+		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|Win32.ActiveCfg = Release|Win32
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|Win32.Build.0 = Release|Win32
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|x64.ActiveCfg = Release|x64
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|x64.Build.0 = Release|x64
+		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|x64 Setup.ActiveCfg = Release|x64
+		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|Win32.ActiveCfg = Release DirectSound|x64
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64.ActiveCfg = Release DirectSound|x64
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64.Build.0 = Release DirectSound|x64
+		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64 Setup.ActiveCfg = Release DirectSound|x64
+		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64 Setup.Build.0 = Release DirectSound|x64
+		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x86 Setup.ActiveCfg = Release DirectSound|x64
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.Build.0 = Debug|Win32
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug|x64
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug|x64
+		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release|Win32
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release|Win32
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release|x64
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release|x64
+		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64 Setup.ActiveCfg = Release|x64
+		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|Win32.ActiveCfg = Release|x64
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64.ActiveCfg = Release|x64
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64.Build.0 = Release|x64
+		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64 Setup.ActiveCfg = Release|x64
+		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64 Setup.Build.0 = Release|x64
+		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x86 Setup.ActiveCfg = Release|x64
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Debug|Win32.ActiveCfg = Debug|Win32
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Debug|Win32.Build.0 = Debug|Win32
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Debug|x64.ActiveCfg = Debug|x64
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Debug|x64.Build.0 = Debug|x64
+		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Release|Win32.ActiveCfg = Release|Win32
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Release|Win32.Build.0 = Release|Win32
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Release|x64.ActiveCfg = Release|x64
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Release|x64.Build.0 = Release|x64
+		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Release|x64 Setup.ActiveCfg = Release|x64
+		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.All|Win32.ActiveCfg = Release Passthrough|x64
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.All|x64.ActiveCfg = Release Passthrough|x64
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.All|x64.Build.0 = Release Passthrough|x64
+		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.All|x64 Setup.ActiveCfg = Release Passthrough|x64
+		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.All|x64 Setup.Build.0 = Release Passthrough|x64
+		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.All|x86 Setup.ActiveCfg = Release Passthrough|x64
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Debug|Win32.ActiveCfg = Debug Passthrough|Win32
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Debug|Win32.Build.0 = Debug Passthrough|Win32
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Debug|x64.ActiveCfg = Debug Passthrough|x64
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Debug|x64.Build.0 = Debug Passthrough|x64
+		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Debug|x64 Setup.ActiveCfg = Debug Passthrough|x64
+		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Debug|x86 Setup.ActiveCfg = Debug Passthrough|Win32
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|Win32.ActiveCfg = Release Passthrough|Win32
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|Win32.Build.0 = Release Passthrough|Win32
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|x64.ActiveCfg = Release Passthrough|x64
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|x64.Build.0 = Release Passthrough|x64
+		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|x64 Setup.ActiveCfg = Release Passthrough|x64
+		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|x86 Setup.ActiveCfg = Release Passthrough|Win32
 		{2C3C2423-234B-4772-8899-D3B137E5CA35}.All|Win32.ActiveCfg = Release|x64
 		{2C3C2423-234B-4772-8899-D3B137E5CA35}.All|x64.ActiveCfg = Release|x64
 		{2C3C2423-234B-4772-8899-D3B137E5CA35}.All|x64.Build.0 = Release|x64
+		{2C3C2423-234B-4772-8899-D3B137E5CA35}.All|x64 Setup.ActiveCfg = Release|x64
+		{2C3C2423-234B-4772-8899-D3B137E5CA35}.All|x64 Setup.Build.0 = Release|x64
+		{2C3C2423-234B-4772-8899-D3B137E5CA35}.All|x86 Setup.ActiveCfg = Release|x64
 		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|Win32.Build.0 = Debug|Win32
 		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|x64.ActiveCfg = Debug|x64
 		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|x64.Build.0 = Debug|x64
+		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|Win32.ActiveCfg = Release|Win32
 		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|Win32.Build.0 = Release|Win32
 		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|x64.ActiveCfg = Release|x64
 		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|x64.Build.0 = Release|x64
+		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|x64 Setup.ActiveCfg = Release|x64
+		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.All|Win32.ActiveCfg = Release|x64
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.All|x64.ActiveCfg = Release|x64
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.All|x64.Build.0 = Release|x64
+		{3850D93A-5F24-4922-BC1C-74D08C37C256}.All|x64 Setup.ActiveCfg = Release|x64
+		{3850D93A-5F24-4922-BC1C-74D08C37C256}.All|x64 Setup.Build.0 = Release|x64
+		{3850D93A-5F24-4922-BC1C-74D08C37C256}.All|x86 Setup.ActiveCfg = Release|x64
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.Debug|Win32.Build.0 = Debug|Win32
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.Debug|x64.ActiveCfg = Debug|x64
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.Debug|x64.Build.0 = Debug|x64
+		{3850D93A-5F24-4922-BC1C-74D08C37C256}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{3850D93A-5F24-4922-BC1C-74D08C37C256}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.Release|Win32.ActiveCfg = Release|Win32
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.Release|Win32.Build.0 = Release|Win32
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.Release|x64.ActiveCfg = Release|x64
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.Release|x64.Build.0 = Release|x64
+		{3850D93A-5F24-4922-BC1C-74D08C37C256}.Release|x64 Setup.ActiveCfg = Release|x64
+		{3850D93A-5F24-4922-BC1C-74D08C37C256}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.All|Win32.ActiveCfg = Release|x64
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.All|x64.ActiveCfg = Release|x64
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.All|x64.Build.0 = Release|x64
+		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.All|x64 Setup.ActiveCfg = Release|x64
+		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.All|x64 Setup.Build.0 = Release|x64
+		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.All|x86 Setup.ActiveCfg = Release|x64
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Debug|Win32.Build.0 = Debug|Win32
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Debug|x64.ActiveCfg = Debug|x64
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Debug|x64.Build.0 = Debug|x64
+		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|Win32.ActiveCfg = Release|Win32
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|Win32.Build.0 = Release|Win32
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64.ActiveCfg = Release|x64
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64.Build.0 = Release|x64
+		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64 Setup.ActiveCfg = Release|x64
+		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|Win32.ActiveCfg = Release|x64
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64.ActiveCfg = Release|x64
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64.Build.0 = Release|x64
+		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64 Setup.ActiveCfg = Release|x64
+		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64 Setup.Build.0 = Release|x64
+		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x86 Setup.ActiveCfg = Release|x64
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.ActiveCfg = Debug|Win32
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.Build.0 = Debug|Win32
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.ActiveCfg = Debug|x64
+		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.ActiveCfg = Release|Win32
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.Build.0 = Release|Win32
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.ActiveCfg = Release|x64
+		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64 Setup.ActiveCfg = Release|x64
+		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|Win32.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64.Build.0 = Release|x64
+		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64 Setup.ActiveCfg = Release|x64
+		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64 Setup.Build.0 = Release|x64
+		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x86 Setup.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.Debug|Win32.Build.0 = Debug|Win32
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.Debug|x64.ActiveCfg = Debug|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.Debug|x64.Build.0 = Debug|x64
+		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.Release|Win32.ActiveCfg = Release|Win32
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.Release|Win32.Build.0 = Release|Win32
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.Release|x64.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.Release|x64.Build.0 = Release|x64
+		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.Release|x64 Setup.ActiveCfg = Release|x64
+		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.All|Win32.ActiveCfg = Release|x64
 		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.All|x64.ActiveCfg = Release|x64
 		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.All|x64.Build.0 = Release|x64
+		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.All|x64 Setup.ActiveCfg = Release|x64
+		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.All|x64 Setup.Build.0 = Release|x64
+		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.All|x86 Setup.ActiveCfg = Release|x64
 		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Debug|Win32.Build.0 = Debug|Win32
 		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Debug|x64.ActiveCfg = Debug|x64
 		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Debug|x64.Build.0 = Debug|x64
+		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Release|Win32.ActiveCfg = Release|Win32
 		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Release|Win32.Build.0 = Release|Win32
 		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Release|x64.ActiveCfg = Release|x64
 		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Release|x64.Build.0 = Release|x64
+		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Release|x64 Setup.ActiveCfg = Release|x64
+		{5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.All|Win32.ActiveCfg = Release|x64
 		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.All|x64.ActiveCfg = Release|x64
 		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.All|x64.Build.0 = Release|x64
+		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.All|x64 Setup.ActiveCfg = Release|x64
+		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.All|x64 Setup.Build.0 = Release|x64
+		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.All|x86 Setup.ActiveCfg = Release|x64
 		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Debug|Win32.Build.0 = Debug|Win32
 		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Debug|x64.ActiveCfg = Debug|x64
 		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Debug|x64.Build.0 = Debug|x64
+		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Release|Win32.ActiveCfg = Release|Win32
 		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Release|Win32.Build.0 = Release|Win32
 		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Release|x64.ActiveCfg = Release|x64
 		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Release|x64.Build.0 = Release|x64
+		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Release|x64 Setup.ActiveCfg = Release|x64
+		{FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.All|Win32.ActiveCfg = Release|x64
 		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.All|x64.ActiveCfg = Release|x64
 		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.All|x64.Build.0 = Release|x64
+		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.All|x64 Setup.ActiveCfg = Release|x64
+		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.All|x64 Setup.Build.0 = Release|x64
+		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.All|x86 Setup.ActiveCfg = Release|x64
 		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.Debug|Win32.ActiveCfg = Debug|Win32
 		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.Debug|Win32.Build.0 = Debug|Win32
 		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.Debug|x64.ActiveCfg = Debug|x64
 		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.Debug|x64.Build.0 = Debug|x64
+		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.Release|Win32.ActiveCfg = Release|Win32
 		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.Release|Win32.Build.0 = Release|Win32
 		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.Release|x64.ActiveCfg = Release|x64
 		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.Release|x64.Build.0 = Release|x64
+		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.Release|x64 Setup.ActiveCfg = Release|x64
+		{06E3A538-AB32-44F2-B477-755FF9CB5D37}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.All|Win32.ActiveCfg = Release|x64
 		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.All|x64.ActiveCfg = Release|x64
 		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.All|x64.Build.0 = Release|x64
+		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.All|x64 Setup.ActiveCfg = Release|x64
+		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.All|x64 Setup.Build.0 = Release|x64
+		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.All|x86 Setup.ActiveCfg = Release|x64
 		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Debug|Win32.Build.0 = Debug|Win32
 		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Debug|x64.ActiveCfg = Debug|x64
 		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Debug|x64.Build.0 = Debug|x64
+		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Release|Win32.ActiveCfg = Release|Win32
 		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Release|Win32.Build.0 = Release|Win32
 		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Release|x64.ActiveCfg = Release|x64
 		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Release|x64.Build.0 = Release|x64
+		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Release|x64 Setup.ActiveCfg = Release|x64
+		{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.All|Win32.ActiveCfg = Release|x64
 		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.All|x64.ActiveCfg = Release|x64
 		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.All|x64.Build.0 = Release|x64
+		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.All|x64 Setup.ActiveCfg = Release|x64
+		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.All|x64 Setup.Build.0 = Release|x64
+		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.All|x86 Setup.ActiveCfg = Release|x64
 		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Debug|Win32.Build.0 = Debug|Win32
 		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Debug|x64.ActiveCfg = Debug|x64
 		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Debug|x64.Build.0 = Debug|x64
+		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Release|Win32.ActiveCfg = Release|Win32
 		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Release|Win32.Build.0 = Release|Win32
 		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Release|x64.ActiveCfg = Release|x64
 		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Release|x64.Build.0 = Release|x64
+		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Release|x64 Setup.ActiveCfg = Release|x64
+		{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.All|Win32.ActiveCfg = Release|x64
 		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.All|x64.ActiveCfg = Release|x64
 		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.All|x64.Build.0 = Release|x64
+		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.All|x64 Setup.ActiveCfg = Release|x64
+		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.All|x64 Setup.Build.0 = Release|x64
+		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.All|x86 Setup.ActiveCfg = Release|x64
 		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Debug|Win32.Build.0 = Debug|Win32
 		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Debug|x64.ActiveCfg = Debug|x64
 		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Debug|x64.Build.0 = Debug|x64
+		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Release|Win32.ActiveCfg = Release|Win32
 		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Release|Win32.Build.0 = Release|Win32
 		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Release|x64.ActiveCfg = Release|x64
 		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Release|x64.Build.0 = Release|x64
+		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Release|x64 Setup.ActiveCfg = Release|x64
+		{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{F6A33240-8F29-48BD-98F0-826995911799}.All|Win32.ActiveCfg = Release|x64
 		{F6A33240-8F29-48BD-98F0-826995911799}.All|x64.ActiveCfg = Release|x64
 		{F6A33240-8F29-48BD-98F0-826995911799}.All|x64.Build.0 = Release|x64
+		{F6A33240-8F29-48BD-98F0-826995911799}.All|x64 Setup.ActiveCfg = Release|x64
+		{F6A33240-8F29-48BD-98F0-826995911799}.All|x64 Setup.Build.0 = Release|x64
+		{F6A33240-8F29-48BD-98F0-826995911799}.All|x86 Setup.ActiveCfg = Release|x64
 		{F6A33240-8F29-48BD-98F0-826995911799}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F6A33240-8F29-48BD-98F0-826995911799}.Debug|Win32.Build.0 = Debug|Win32
 		{F6A33240-8F29-48BD-98F0-826995911799}.Debug|x64.ActiveCfg = Debug|x64
 		{F6A33240-8F29-48BD-98F0-826995911799}.Debug|x64.Build.0 = Debug|x64
+		{F6A33240-8F29-48BD-98F0-826995911799}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{F6A33240-8F29-48BD-98F0-826995911799}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{F6A33240-8F29-48BD-98F0-826995911799}.Release|Win32.ActiveCfg = Release|Win32
 		{F6A33240-8F29-48BD-98F0-826995911799}.Release|Win32.Build.0 = Release|Win32
 		{F6A33240-8F29-48BD-98F0-826995911799}.Release|x64.ActiveCfg = Release|x64
 		{F6A33240-8F29-48BD-98F0-826995911799}.Release|x64.Build.0 = Release|x64
+		{F6A33240-8F29-48BD-98F0-826995911799}.Release|x64 Setup.ActiveCfg = Release|x64
+		{F6A33240-8F29-48BD-98F0-826995911799}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.All|Win32.ActiveCfg = Release|x64
 		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.All|x64.ActiveCfg = Release|x64
 		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.All|x64.Build.0 = Release|x64
+		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.All|x64 Setup.ActiveCfg = Release|x64
+		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.All|x64 Setup.Build.0 = Release|x64
+		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.All|x86 Setup.ActiveCfg = Release|x64
 		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.Debug|Win32.Build.0 = Debug|Win32
 		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.Debug|x64.ActiveCfg = Debug|x64
 		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.Debug|x64.Build.0 = Debug|x64
+		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.Release|Win32.ActiveCfg = Release|Win32
 		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.Release|Win32.Build.0 = Release|Win32
 		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.Release|x64.ActiveCfg = Release|x64
 		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.Release|x64.Build.0 = Release|x64
+		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.Release|x64 Setup.ActiveCfg = Release|x64
+		{65A6273D-FCAB-4C55-B09E-65100141A5D4}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.All|Win32.ActiveCfg = Release|x64
 		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.All|x64.ActiveCfg = Release|x64
 		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.All|x64.Build.0 = Release|x64
+		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.All|x64 Setup.ActiveCfg = Release|x64
+		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.All|x64 Setup.Build.0 = Release|x64
+		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.All|x86 Setup.ActiveCfg = Release|x64
 		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Debug|Win32.Build.0 = Debug|Win32
 		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Debug|x64.ActiveCfg = Debug|x64
 		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Debug|x64.Build.0 = Debug|x64
+		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Release|Win32.ActiveCfg = Release|Win32
 		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Release|Win32.Build.0 = Release|Win32
 		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Release|x64.ActiveCfg = Release|x64
 		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Release|x64.Build.0 = Release|x64
+		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Release|x64 Setup.ActiveCfg = Release|x64
+		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.All|Win32.ActiveCfg = Release|x64
 		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.All|x64.ActiveCfg = Release|x64
 		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.All|x64.Build.0 = Release|x64
+		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.All|x64 Setup.ActiveCfg = Release|x64
+		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.All|x64 Setup.Build.0 = Release|x64
+		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.All|x86 Setup.ActiveCfg = Release|x64
 		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Debug|Win32.Build.0 = Debug|Win32
 		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Debug|x64.ActiveCfg = Debug|x64
 		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Debug|x64.Build.0 = Debug|x64
+		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Release|Win32.ActiveCfg = Release|Win32
 		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Release|Win32.Build.0 = Release|Win32
 		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Release|x64.ActiveCfg = Release|x64
 		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Release|x64.Build.0 = Release|x64
+		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Release|x64 Setup.ActiveCfg = Release|x64
+		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.All|Win32.ActiveCfg = Release|x64
 		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.All|x64.ActiveCfg = Release|x64
 		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.All|x64.Build.0 = Release|x64
+		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.All|x64 Setup.ActiveCfg = Release|x64
+		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.All|x64 Setup.Build.0 = Release|x64
+		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.All|x86 Setup.ActiveCfg = Release|x64
 		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Debug|Win32.Build.0 = Debug|Win32
 		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Debug|x64.ActiveCfg = Debug|x64
 		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Debug|x64.Build.0 = Debug|x64
+		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Release|Win32.ActiveCfg = Release|Win32
 		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Release|Win32.Build.0 = Release|Win32
 		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Release|x64.ActiveCfg = Release|x64
 		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Release|x64.Build.0 = Release|x64
+		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Release|x64 Setup.ActiveCfg = Release|x64
+		{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.All|Win32.ActiveCfg = Release|x64
 		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.All|x64.ActiveCfg = Release|x64
 		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.All|x64.Build.0 = Release|x64
+		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.All|x64 Setup.ActiveCfg = Release|x64
+		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.All|x64 Setup.Build.0 = Release|x64
+		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.All|x86 Setup.ActiveCfg = Release|x64
 		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Debug|Win32.Build.0 = Debug|Win32
 		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Debug|x64.ActiveCfg = Debug|x64
 		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Debug|x64.Build.0 = Debug|x64
+		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Release|Win32.ActiveCfg = Release|Win32
 		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Release|Win32.Build.0 = Release|Win32
 		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Release|x64.ActiveCfg = Release|x64
 		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Release|x64.Build.0 = Release|x64
+		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Release|x64 Setup.ActiveCfg = Release|x64
+		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.All|Win32.ActiveCfg = Release|x64
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.All|x64.ActiveCfg = Release|x64
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.All|x64.Build.0 = Release|x64
+		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.All|x64 Setup.ActiveCfg = Release|x64
+		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.All|x64 Setup.Build.0 = Release|x64
+		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.All|x86 Setup.ActiveCfg = Release|x64
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Debug|Win32.Build.0 = Debug|Win32
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Debug|x64.ActiveCfg = Debug|x64
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Debug|x64.Build.0 = Debug|x64
+		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|Win32.ActiveCfg = Release|Win32
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|Win32.Build.0 = Release|Win32
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x64.ActiveCfg = Release|x64
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x64.Build.0 = Release|x64
+		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x64 Setup.ActiveCfg = Release|x64
+		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|Win32.ActiveCfg = Release|x64
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64.ActiveCfg = Release|x64
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64.Build.0 = Release|x64
+		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64 Setup.ActiveCfg = Release|x64
+		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64 Setup.Build.0 = Release|x64
+		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x86 Setup.ActiveCfg = Release|x64
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|Win32.ActiveCfg = Debug|Win32
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|Win32.Build.0 = Debug|Win32
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64.ActiveCfg = Debug|x64
+		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|Win32.ActiveCfg = Release|Win32
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|Win32.Build.0 = Release|Win32
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64.ActiveCfg = Release|x64
+		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64 Setup.ActiveCfg = Release|x64
+		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|Win32.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.Build.0 = Release|x64
+		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64 Setup.ActiveCfg = Release|x64
+		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64 Setup.Build.0 = Release|x64
+		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x86 Setup.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Debug|Win32.Build.0 = Debug|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Debug|x64.ActiveCfg = Debug|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Debug|x64.Build.0 = Debug|x64
+		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|Win32.ActiveCfg = Release|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|Win32.Build.0 = Release|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|x64.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|x64.Build.0 = Release|x64
+		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|x64 Setup.ActiveCfg = Release|x64
+		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.All|Win32.ActiveCfg = Release|x64
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.All|x64.ActiveCfg = Release|x64
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.All|x64.Build.0 = Release|x64
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.All|x64 Setup.ActiveCfg = Release|x64
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.All|x64 Setup.Build.0 = Release|x64
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.All|x86 Setup.ActiveCfg = Release|x64
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Debug|Win32.Build.0 = Debug|Win32
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Debug|x64.ActiveCfg = Debug|x64
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Debug|x64.Build.0 = Debug|x64
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Release|Win32.ActiveCfg = Release|Win32
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Release|Win32.Build.0 = Release|Win32
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Release|x64.ActiveCfg = Release|x64
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Release|x64.Build.0 = Release|x64
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Release|x64 Setup.ActiveCfg = Release|x64
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.All|Win32.ActiveCfg = Release|x64
 		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.All|x64.ActiveCfg = Release|x64
 		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.All|x64.Build.0 = Release|x64
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.All|x64 Setup.ActiveCfg = Release|x64
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.All|x64 Setup.Build.0 = Release|x64
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.All|x86 Setup.ActiveCfg = Release|x64
 		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Debug|Win32.Build.0 = Debug|Win32
 		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Debug|x64.ActiveCfg = Debug|x64
 		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Debug|x64.Build.0 = Debug|x64
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Release|Win32.ActiveCfg = Release|Win32
 		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Release|Win32.Build.0 = Release|Win32
 		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Release|x64.ActiveCfg = Release|x64
 		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Release|x64.Build.0 = Release|x64
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Release|x64 Setup.ActiveCfg = Release|x64
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{0D108721-EAE8-4BAF-8102-D8960EC93647}.All|Win32.ActiveCfg = Debug|x64
 		{0D108721-EAE8-4BAF-8102-D8960EC93647}.All|x64.ActiveCfg = Debug|x64
 		{0D108721-EAE8-4BAF-8102-D8960EC93647}.All|x64.Build.0 = Debug|x64
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.All|x64 Setup.ActiveCfg = Debug|x64
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.All|x64 Setup.Build.0 = Debug|x64
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.All|x86 Setup.ActiveCfg = Debug|x64
 		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Debug|Win32.Build.0 = Debug|Win32
 		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Debug|x64.ActiveCfg = Debug|x64
 		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Debug|x64.Build.0 = Debug|x64
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|Win32.ActiveCfg = Release|Win32
 		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|Win32.Build.0 = Release|Win32
 		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|x64.ActiveCfg = Release|x64
 		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|x64.Build.0 = Release|x64
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|x64 Setup.ActiveCfg = Release|x64
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{B535402E-38D2-4D54-8360-423ACBD17192}.All|Win32.ActiveCfg = Release|x64
 		{B535402E-38D2-4D54-8360-423ACBD17192}.All|x64.ActiveCfg = Release|x64
 		{B535402E-38D2-4D54-8360-423ACBD17192}.All|x64.Build.0 = Release|x64
+		{B535402E-38D2-4D54-8360-423ACBD17192}.All|x64 Setup.ActiveCfg = Release|x64
+		{B535402E-38D2-4D54-8360-423ACBD17192}.All|x64 Setup.Build.0 = Release|x64
+		{B535402E-38D2-4D54-8360-423ACBD17192}.All|x86 Setup.ActiveCfg = Release|x64
 		{B535402E-38D2-4D54-8360-423ACBD17192}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B535402E-38D2-4D54-8360-423ACBD17192}.Debug|Win32.Build.0 = Debug|Win32
 		{B535402E-38D2-4D54-8360-423ACBD17192}.Debug|x64.ActiveCfg = Debug|x64
 		{B535402E-38D2-4D54-8360-423ACBD17192}.Debug|x64.Build.0 = Debug|x64
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{B535402E-38D2-4D54-8360-423ACBD17192}.Release|Win32.ActiveCfg = Release|Win32
 		{B535402E-38D2-4D54-8360-423ACBD17192}.Release|Win32.Build.0 = Release|Win32
 		{B535402E-38D2-4D54-8360-423ACBD17192}.Release|x64.ActiveCfg = Release|x64
 		{B535402E-38D2-4D54-8360-423ACBD17192}.Release|x64.Build.0 = Release|x64
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Release|x64 Setup.ActiveCfg = Release|x64
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.All|Win32.ActiveCfg = Release|Win32
 		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.All|Win32.Build.0 = Release|Win32
 		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.All|x64.ActiveCfg = Release|Win32
 		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.All|x64.Build.0 = Release|Win32
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.All|x64 Setup.ActiveCfg = Release|Win32
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.All|x64 Setup.Build.0 = Release|Win32
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.All|x86 Setup.ActiveCfg = Release|Win32
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.All|x86 Setup.Build.0 = Release|Win32
 		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Debug|Win32.Build.0 = Debug|Win32
 		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Debug|x64.ActiveCfg = Debug|Win32
 		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Debug|x64.Build.0 = Debug|Win32
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Release|Win32.ActiveCfg = Release|Win32
 		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Release|Win32.Build.0 = Release|Win32
 		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Release|x64.ActiveCfg = Release|Win32
 		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Release|x64.Build.0 = Release|Win32
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{2DEE4895-1134-439C-B688-52203E57D878}.All|Win32.ActiveCfg = Release|Win32
 		{2DEE4895-1134-439C-B688-52203E57D878}.All|Win32.Build.0 = Release|Win32
 		{2DEE4895-1134-439C-B688-52203E57D878}.All|x64.ActiveCfg = Release|Win32
 		{2DEE4895-1134-439C-B688-52203E57D878}.All|x64.Build.0 = Release|Win32
+		{2DEE4895-1134-439C-B688-52203E57D878}.All|x64 Setup.ActiveCfg = Release|Win32
+		{2DEE4895-1134-439C-B688-52203E57D878}.All|x64 Setup.Build.0 = Release|Win32
+		{2DEE4895-1134-439C-B688-52203E57D878}.All|x86 Setup.ActiveCfg = Release|Win32
+		{2DEE4895-1134-439C-B688-52203E57D878}.All|x86 Setup.Build.0 = Release|Win32
 		{2DEE4895-1134-439C-B688-52203E57D878}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2DEE4895-1134-439C-B688-52203E57D878}.Debug|Win32.Build.0 = Debug|Win32
 		{2DEE4895-1134-439C-B688-52203E57D878}.Debug|x64.ActiveCfg = Debug|Win32
 		{2DEE4895-1134-439C-B688-52203E57D878}.Debug|x64.Build.0 = Debug|Win32
+		{2DEE4895-1134-439C-B688-52203E57D878}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{2DEE4895-1134-439C-B688-52203E57D878}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{2DEE4895-1134-439C-B688-52203E57D878}.Release|Win32.ActiveCfg = Release|Win32
 		{2DEE4895-1134-439C-B688-52203E57D878}.Release|Win32.Build.0 = Release|Win32
 		{2DEE4895-1134-439C-B688-52203E57D878}.Release|x64.ActiveCfg = Release|Win32
 		{2DEE4895-1134-439C-B688-52203E57D878}.Release|x64.Build.0 = Release|Win32
+		{2DEE4895-1134-439C-B688-52203E57D878}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{2DEE4895-1134-439C-B688-52203E57D878}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.All|Win32.ActiveCfg = Release|Win32
 		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.All|Win32.Build.0 = Release|Win32
 		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.All|x64.ActiveCfg = Release|Win32
 		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.All|x64.Build.0 = Release|Win32
+		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.All|x64 Setup.ActiveCfg = Release|Win32
+		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.All|x64 Setup.Build.0 = Release|Win32
+		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.All|x86 Setup.ActiveCfg = Release|Win32
+		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.All|x86 Setup.Build.0 = Release|Win32
 		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Debug|Win32.Build.0 = Debug|Win32
 		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Debug|x64.ActiveCfg = Debug|Win32
 		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Debug|x64.Build.0 = Debug|Win32
+		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Release|Win32.ActiveCfg = Release|Win32
 		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Release|Win32.Build.0 = Release|Win32
 		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Release|x64.ActiveCfg = Release|Win32
 		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Release|x64.Build.0 = Release|Win32
+		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.All|Win32.ActiveCfg = Debug|x64
 		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.All|x64.ActiveCfg = Debug|x64
 		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.All|x64.Build.0 = Debug|x64
+		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.All|x64 Setup.ActiveCfg = Debug|x64
+		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.All|x64 Setup.Build.0 = Debug|x64
+		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.All|x86 Setup.ActiveCfg = Debug|x64
 		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Debug|Win32.Build.0 = Debug|Win32
 		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Debug|x64.ActiveCfg = Debug|x64
 		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Debug|x64.Build.0 = Debug|x64
+		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Release|Win32.ActiveCfg = Release|Win32
 		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Release|Win32.Build.0 = Release|Win32
 		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Release|x64.ActiveCfg = Release|x64
 		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Release|x64.Build.0 = Release|x64
+		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Release|x64 Setup.ActiveCfg = Release|x64
+		{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{94001A0E-A837-445C-8004-F918F10D0226}.All|Win32.ActiveCfg = Debug|x64
 		{94001A0E-A837-445C-8004-F918F10D0226}.All|x64.ActiveCfg = Debug|x64
 		{94001A0E-A837-445C-8004-F918F10D0226}.All|x64.Build.0 = Debug|x64
+		{94001A0E-A837-445C-8004-F918F10D0226}.All|x64 Setup.ActiveCfg = Debug|x64
+		{94001A0E-A837-445C-8004-F918F10D0226}.All|x64 Setup.Build.0 = Debug|x64
+		{94001A0E-A837-445C-8004-F918F10D0226}.All|x86 Setup.ActiveCfg = Debug|x64
 		{94001A0E-A837-445C-8004-F918F10D0226}.Debug|Win32.ActiveCfg = Debug|Win32
 		{94001A0E-A837-445C-8004-F918F10D0226}.Debug|Win32.Build.0 = Debug|Win32
 		{94001A0E-A837-445C-8004-F918F10D0226}.Debug|x64.ActiveCfg = Debug|x64
 		{94001A0E-A837-445C-8004-F918F10D0226}.Debug|x64.Build.0 = Debug|x64
+		{94001A0E-A837-445C-8004-F918F10D0226}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{94001A0E-A837-445C-8004-F918F10D0226}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{94001A0E-A837-445C-8004-F918F10D0226}.Release|Win32.ActiveCfg = Release|Win32
 		{94001A0E-A837-445C-8004-F918F10D0226}.Release|Win32.Build.0 = Release|Win32
 		{94001A0E-A837-445C-8004-F918F10D0226}.Release|x64.ActiveCfg = Release|x64
 		{94001A0E-A837-445C-8004-F918F10D0226}.Release|x64.Build.0 = Release|x64
+		{94001A0E-A837-445C-8004-F918F10D0226}.Release|x64 Setup.ActiveCfg = Release|x64
+		{94001A0E-A837-445C-8004-F918F10D0226}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{2286DA73-9FC5-45BC-A508-85994C3317AB}.All|Win32.ActiveCfg = Release|x64
 		{2286DA73-9FC5-45BC-A508-85994C3317AB}.All|x64.ActiveCfg = Release|x64
 		{2286DA73-9FC5-45BC-A508-85994C3317AB}.All|x64.Build.0 = Release|x64
+		{2286DA73-9FC5-45BC-A508-85994C3317AB}.All|x64 Setup.ActiveCfg = Release|x64
+		{2286DA73-9FC5-45BC-A508-85994C3317AB}.All|x64 Setup.Build.0 = Release|x64
+		{2286DA73-9FC5-45BC-A508-85994C3317AB}.All|x86 Setup.ActiveCfg = Release|x64
 		{2286DA73-9FC5-45BC-A508-85994C3317AB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2286DA73-9FC5-45BC-A508-85994C3317AB}.Debug|Win32.Build.0 = Debug|Win32
 		{2286DA73-9FC5-45BC-A508-85994C3317AB}.Debug|x64.ActiveCfg = Debug|x64
 		{2286DA73-9FC5-45BC-A508-85994C3317AB}.Debug|x64.Build.0 = Debug|x64
+		{2286DA73-9FC5-45BC-A508-85994C3317AB}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{2286DA73-9FC5-45BC-A508-85994C3317AB}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{2286DA73-9FC5-45BC-A508-85994C3317AB}.Release|Win32.ActiveCfg = Release|Win32
 		{2286DA73-9FC5-45BC-A508-85994C3317AB}.Release|Win32.Build.0 = Release|Win32
 		{2286DA73-9FC5-45BC-A508-85994C3317AB}.Release|x64.ActiveCfg = Release|x64
 		{2286DA73-9FC5-45BC-A508-85994C3317AB}.Release|x64.Build.0 = Release|x64
+		{2286DA73-9FC5-45BC-A508-85994C3317AB}.Release|x64 Setup.ActiveCfg = Release|x64
+		{2286DA73-9FC5-45BC-A508-85994C3317AB}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|Win32.ActiveCfg = Release|Win32
 		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|Win32.Build.0 = Release|Win32
 		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64.ActiveCfg = Release|Win32
 		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64.Build.0 = Release|Win32
+		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64 Setup.ActiveCfg = Release|Win32
+		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64 Setup.Build.0 = Release|Win32
+		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x86 Setup.ActiveCfg = Release|Win32
+		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x86 Setup.Build.0 = Release|Win32
 		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|Win32.Build.0 = Debug|Win32
 		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|x64.ActiveCfg = Debug|Win32
 		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|x64.Build.0 = Debug|Win32
+		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|Win32.ActiveCfg = Release|Win32
 		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|Win32.Build.0 = Release|Win32
 		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x64.ActiveCfg = Release|Win32
 		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x64.Build.0 = Release|Win32
+		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|Win32.ActiveCfg = Release|Win32
 		{87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|x64.ActiveCfg = Release|Win32
+		{87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|x64 Setup.ActiveCfg = Release|Win32
+		{87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|x86 Setup.ActiveCfg = Release|Win32
 		{87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|Win32.ActiveCfg = Debug|Win32
 		{87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|x64.ActiveCfg = Debug|Win32
+		{87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{87A1FE3D-F410-4C8E-9591-8C625985BC70}.Release|Win32.ActiveCfg = Release|Win32
 		{87A1FE3D-F410-4C8E-9591-8C625985BC70}.Release|x64.ActiveCfg = Release|Win32
+		{87A1FE3D-F410-4C8E-9591-8C625985BC70}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{87A1FE3D-F410-4C8E-9591-8C625985BC70}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|Win32.ActiveCfg = Release|Win32
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|Win32.Build.0 = Release|Win32
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64.ActiveCfg = Release|Win32
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64.Build.0 = Release|Win32
+		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64 Setup.ActiveCfg = Release|Win32
+		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64 Setup.Build.0 = Release|Win32
+		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x86 Setup.ActiveCfg = Release|Win32
+		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x86 Setup.Build.0 = Release|Win32
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|Win32.Build.0 = Debug|Win32
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|x64.ActiveCfg = Debug|x64
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|x64.Build.0 = Debug|x64
+		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|Win32.ActiveCfg = Release|Win32
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|Win32.Build.0 = Release|Win32
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.ActiveCfg = Release|x64
 		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.Build.0 = Release|x64
+		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64 Setup.ActiveCfg = Release|x64
+		{7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{7EB71250-F002-4ED8-92CA-CA218114537A}.All|Win32.ActiveCfg = Release|Win32
 		{7EB71250-F002-4ED8-92CA-CA218114537A}.All|x64.ActiveCfg = Release|Win32
+		{7EB71250-F002-4ED8-92CA-CA218114537A}.All|x64 Setup.ActiveCfg = Release|Win32
+		{7EB71250-F002-4ED8-92CA-CA218114537A}.All|x86 Setup.ActiveCfg = Release|Win32
 		{7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|x64.ActiveCfg = Debug|x64
+		{7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{7EB71250-F002-4ED8-92CA-CA218114537A}.Release|Win32.ActiveCfg = Release|Win32
 		{7EB71250-F002-4ED8-92CA-CA218114537A}.Release|x64.ActiveCfg = Release|x64
+		{7EB71250-F002-4ED8-92CA-CA218114537A}.Release|x64 Setup.ActiveCfg = Release|x64
+		{7EB71250-F002-4ED8-92CA-CA218114537A}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|Win32.ActiveCfg = Release|Win32
 		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|x64.ActiveCfg = Release|Win32
+		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|x64 Setup.ActiveCfg = Release|Win32
+		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|x86 Setup.ActiveCfg = Release|Win32
 		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|x64.ActiveCfg = Debug|Win32
+		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|Win32.ActiveCfg = Release|Win32
 		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|x64.ActiveCfg = Release|Win32
+		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{464AAB78-5489-4916-BE51-BF8D61822311}.All|Win32.ActiveCfg = Release|Win32
 		{464AAB78-5489-4916-BE51-BF8D61822311}.All|x64.ActiveCfg = Release|Win32
+		{464AAB78-5489-4916-BE51-BF8D61822311}.All|x64 Setup.ActiveCfg = Release|Win32
+		{464AAB78-5489-4916-BE51-BF8D61822311}.All|x86 Setup.ActiveCfg = Release|Win32
 		{464AAB78-5489-4916-BE51-BF8D61822311}.Debug|Win32.ActiveCfg = Debug|Win32
 		{464AAB78-5489-4916-BE51-BF8D61822311}.Debug|x64.ActiveCfg = Debug|x64
+		{464AAB78-5489-4916-BE51-BF8D61822311}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{464AAB78-5489-4916-BE51-BF8D61822311}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{464AAB78-5489-4916-BE51-BF8D61822311}.Release|Win32.ActiveCfg = Release|Win32
 		{464AAB78-5489-4916-BE51-BF8D61822311}.Release|x64.ActiveCfg = Release|x64
+		{464AAB78-5489-4916-BE51-BF8D61822311}.Release|x64 Setup.ActiveCfg = Release|x64
+		{464AAB78-5489-4916-BE51-BF8D61822311}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{0AD1177E-1FD8-4643-9391-431467A11084}.All|Win32.ActiveCfg = Release|x64
 		{0AD1177E-1FD8-4643-9391-431467A11084}.All|x64.ActiveCfg = Release|x64
 		{0AD1177E-1FD8-4643-9391-431467A11084}.All|x64.Build.0 = Release|x64
+		{0AD1177E-1FD8-4643-9391-431467A11084}.All|x64 Setup.ActiveCfg = Release|x64
+		{0AD1177E-1FD8-4643-9391-431467A11084}.All|x64 Setup.Build.0 = Release|x64
+		{0AD1177E-1FD8-4643-9391-431467A11084}.All|x86 Setup.ActiveCfg = Release|x64
 		{0AD1177E-1FD8-4643-9391-431467A11084}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0AD1177E-1FD8-4643-9391-431467A11084}.Debug|Win32.Build.0 = Debug|Win32
 		{0AD1177E-1FD8-4643-9391-431467A11084}.Debug|x64.ActiveCfg = Debug|x64
 		{0AD1177E-1FD8-4643-9391-431467A11084}.Debug|x64.Build.0 = Debug|x64
+		{0AD1177E-1FD8-4643-9391-431467A11084}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{0AD1177E-1FD8-4643-9391-431467A11084}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{0AD1177E-1FD8-4643-9391-431467A11084}.Release|Win32.ActiveCfg = Release|Win32
 		{0AD1177E-1FD8-4643-9391-431467A11084}.Release|Win32.Build.0 = Release|Win32
 		{0AD1177E-1FD8-4643-9391-431467A11084}.Release|x64.ActiveCfg = Release|x64
 		{0AD1177E-1FD8-4643-9391-431467A11084}.Release|x64.Build.0 = Release|x64
+		{0AD1177E-1FD8-4643-9391-431467A11084}.Release|x64 Setup.ActiveCfg = Release|x64
+		{0AD1177E-1FD8-4643-9391-431467A11084}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.All|Win32.ActiveCfg = Release Static|x64
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.All|x64.ActiveCfg = Release Static|x64
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.All|x64.Build.0 = Release Static|x64
+		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.All|x64 Setup.ActiveCfg = Release Static|x64
+		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.All|x64 Setup.Build.0 = Release Static|x64
+		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.All|x86 Setup.ActiveCfg = Release Static|x64
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Debug|Win32.ActiveCfg = Debug|Win32
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Debug|x64.ActiveCfg = Debug|x64
+		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Release|Win32.ActiveCfg = Release|Win32
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Release|x64.ActiveCfg = Release|x64
+		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Release|x64 Setup.ActiveCfg = Release|x64
+		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.All|Win32.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.All|Win32.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.All|x64.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.All|x64.Build.0 = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.All|x64 Setup.ActiveCfg = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.All|x64 Setup.Build.0 = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.All|x86 Setup.ActiveCfg = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.All|x86 Setup.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Debug|Win32.Build.0 = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Debug|x64.ActiveCfg = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Debug|x64.Build.0 = Debug|Win32
+		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Release|Win32.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Release|Win32.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Release|x64.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Release|x64.Build.0 = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|Win32.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|Win32.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|x64.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|x64.Build.0 = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|x64 Setup.ActiveCfg = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|x64 Setup.Build.0 = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|x86 Setup.ActiveCfg = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|x86 Setup.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Debug|Win32.Build.0 = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Debug|x64.ActiveCfg = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Debug|x64.Build.0 = Debug|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Release|Win32.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Release|Win32.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Release|x64.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Release|x64.Build.0 = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.All|Win32.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.All|Win32.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.All|x64.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.All|x64.Build.0 = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.All|x64 Setup.ActiveCfg = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.All|x64 Setup.Build.0 = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.All|x86 Setup.ActiveCfg = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.All|x86 Setup.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Debug|Win32.Build.0 = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Debug|x64.ActiveCfg = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Debug|x64.Build.0 = Debug|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Release|Win32.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Release|Win32.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Release|x64.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Release|x64.Build.0 = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.All|Win32.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.All|Win32.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.All|x64.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.All|x64.Build.0 = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.All|x64 Setup.ActiveCfg = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.All|x64 Setup.Build.0 = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.All|x86 Setup.ActiveCfg = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.All|x86 Setup.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Debug|Win32.Build.0 = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Debug|x64.ActiveCfg = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Debug|x64.Build.0 = Debug|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Release|Win32.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Release|Win32.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Release|x64.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Release|x64.Build.0 = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.All|Win32.ActiveCfg = Debug|x64
 		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.All|x64.ActiveCfg = Debug|x64
 		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.All|x64.Build.0 = Debug|x64
+		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.All|x64 Setup.ActiveCfg = Debug|x64
+		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.All|x64 Setup.Build.0 = Debug|x64
+		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.All|x86 Setup.ActiveCfg = Debug|x64
 		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.Debug|Win32.Build.0 = Debug|Win32
 		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.Debug|x64.ActiveCfg = Debug|x64
 		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.Debug|x64.Build.0 = Debug|x64
+		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.Release|Win32.ActiveCfg = Release|Win32
 		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.Release|Win32.Build.0 = Release|Win32
 		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.Release|x64.ActiveCfg = Release|x64
 		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.Release|x64.Build.0 = Release|x64
+		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.Release|x64 Setup.ActiveCfg = Release|x64
+		{E316772F-5D8F-4F2A-8F71-094C3E859D34}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.All|Win32.ActiveCfg = Debug|x64
 		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.All|x64.ActiveCfg = Debug|x64
 		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.All|x64.Build.0 = Debug|x64
+		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.All|x64 Setup.ActiveCfg = Debug|x64
+		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.All|x64 Setup.Build.0 = Debug|x64
+		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.All|x86 Setup.ActiveCfg = Debug|x64
 		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.Debug|Win32.Build.0 = Debug|Win32
 		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.Debug|x64.ActiveCfg = Debug|x64
 		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.Debug|x64.Build.0 = Debug|x64
+		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.Release|Win32.ActiveCfg = Release|Win32
 		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.Release|Win32.Build.0 = Release|Win32
 		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.Release|x64.ActiveCfg = Release|x64
 		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.Release|x64.Build.0 = Release|x64
+		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.Release|x64 Setup.ActiveCfg = Release|x64
+		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{38FE0559-9910-43A8-9E45-3E5004C27692}.All|Win32.ActiveCfg = Release|x64
 		{38FE0559-9910-43A8-9E45-3E5004C27692}.All|x64.ActiveCfg = Release|x64
 		{38FE0559-9910-43A8-9E45-3E5004C27692}.All|x64.Build.0 = Release|x64
+		{38FE0559-9910-43A8-9E45-3E5004C27692}.All|x64 Setup.ActiveCfg = Release|x64
+		{38FE0559-9910-43A8-9E45-3E5004C27692}.All|x64 Setup.Build.0 = Release|x64
+		{38FE0559-9910-43A8-9E45-3E5004C27692}.All|x86 Setup.ActiveCfg = Release|x64
 		{38FE0559-9910-43A8-9E45-3E5004C27692}.Debug|Win32.ActiveCfg = Debug|Win32
 		{38FE0559-9910-43A8-9E45-3E5004C27692}.Debug|Win32.Build.0 = Debug|Win32
 		{38FE0559-9910-43A8-9E45-3E5004C27692}.Debug|x64.ActiveCfg = Debug|x64
 		{38FE0559-9910-43A8-9E45-3E5004C27692}.Debug|x64.Build.0 = Debug|x64
+		{38FE0559-9910-43A8-9E45-3E5004C27692}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{38FE0559-9910-43A8-9E45-3E5004C27692}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{38FE0559-9910-43A8-9E45-3E5004C27692}.Release|Win32.ActiveCfg = Release|Win32
 		{38FE0559-9910-43A8-9E45-3E5004C27692}.Release|Win32.Build.0 = Release|Win32
 		{38FE0559-9910-43A8-9E45-3E5004C27692}.Release|x64.ActiveCfg = Release|x64
 		{38FE0559-9910-43A8-9E45-3E5004C27692}.Release|x64.Build.0 = Release|x64
+		{38FE0559-9910-43A8-9E45-3E5004C27692}.Release|x64 Setup.ActiveCfg = Release|x64
+		{38FE0559-9910-43A8-9E45-3E5004C27692}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.All|Win32.ActiveCfg = Debug|x64
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.All|x64.ActiveCfg = Debug|x64
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.All|x64.Build.0 = Debug|x64
+		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.All|x64 Setup.ActiveCfg = Debug|x64
+		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.All|x64 Setup.Build.0 = Debug|x64
+		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.All|x86 Setup.ActiveCfg = Debug|x64
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Debug|Win32.Build.0 = Debug|Win32
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Debug|x64.ActiveCfg = Debug|x64
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Debug|x64.Build.0 = Debug|x64
+		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|Win32.ActiveCfg = Release|Win32
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|Win32.Build.0 = Release|Win32
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|x64.ActiveCfg = Release|x64
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|x64.Build.0 = Release|x64
+		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|x64 Setup.ActiveCfg = Release|x64
+		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|Win32.ActiveCfg = Release|x64
 		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|x64.ActiveCfg = Release|x64
 		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|x64.Build.0 = Release|x64
+		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|x64 Setup.ActiveCfg = Release|x64
+		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|x64 Setup.Build.0 = Release|x64
+		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|x86 Setup.ActiveCfg = Release|x64
 		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|Win32.Build.0 = Debug|Win32
 		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|x64.ActiveCfg = Debug|x64
 		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|x64.Build.0 = Debug|x64
+		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|Win32.ActiveCfg = Release|Win32
 		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|Win32.Build.0 = Release|Win32
 		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|x64.ActiveCfg = Release|x64
 		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|x64.Build.0 = Release|x64
+		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|x64 Setup.ActiveCfg = Release|x64
+		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|Win32.ActiveCfg = Release|x64
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|x64.ActiveCfg = Release|x64
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|x64.Build.0 = Release|x64
+		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|x64 Setup.ActiveCfg = Release|x64
+		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|x64 Setup.Build.0 = Release|x64
+		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|x86 Setup.ActiveCfg = Release|x64
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Debug|Win32.Build.0 = Debug|Win32
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Debug|x64.ActiveCfg = Debug|x64
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Debug|x64.Build.0 = Debug|x64
+		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Release|Win32.ActiveCfg = Release|Win32
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Release|Win32.Build.0 = Release|Win32
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Release|x64.ActiveCfg = Release|x64
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Release|x64.Build.0 = Release|x64
+		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Release|x64 Setup.ActiveCfg = Release|x64
+		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.All|Win32.ActiveCfg = Release_Mono|x64
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.All|x64.ActiveCfg = Release_Mono|x64
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.All|x64.Build.0 = Release_Mono|x64
+		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.All|x64 Setup.ActiveCfg = Release_Mono|x64
+		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.All|x64 Setup.Build.0 = Release_Mono|x64
+		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.All|x86 Setup.ActiveCfg = Release_Mono|x64
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Debug|Win32.ActiveCfg = Debug_CLR|Win32
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Debug|Win32.Build.0 = Debug_CLR|Win32
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Debug|x64.ActiveCfg = Debug_CLR|x64
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Debug|x64.Build.0 = Debug_CLR|x64
+		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Debug|x64 Setup.ActiveCfg = Debug_CLR|x64
+		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Debug|x86 Setup.ActiveCfg = Debug_CLR|Win32
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Release|Win32.ActiveCfg = Release_CLR|Win32
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Release|Win32.Build.0 = Release_CLR|Win32
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Release|x64.ActiveCfg = Release_CLR|x64
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Release|x64.Build.0 = Release_CLR|x64
+		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Release|x64 Setup.ActiveCfg = Release_CLR|x64
+		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Release|x86 Setup.ActiveCfg = Release_CLR|Win32
 		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.All|Win32.ActiveCfg = Release|Any CPU
 		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.All|x64.ActiveCfg = Release|Any CPU
+		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.All|x64 Setup.ActiveCfg = Release|Any CPU
+		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.All|x86 Setup.ActiveCfg = Release|Any CPU
 		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|Win32.Build.0 = Debug|Any CPU
 		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|x64.ActiveCfg = Debug|x64
 		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|x64.Build.0 = Debug|x64
+		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|x86 Setup.ActiveCfg = Debug|Any CPU
 		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|Win32.ActiveCfg = Release|Any CPU
 		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|Win32.Build.0 = Release|Any CPU
 		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|x64.ActiveCfg = Release|x64
 		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|x64.Build.0 = Release|x64
+		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|x64 Setup.ActiveCfg = Release|x64
+		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|x86 Setup.ActiveCfg = Release|Any CPU
 		{E796E337-DE78-4303-8614-9A590862EE95}.All|Win32.ActiveCfg = Release|Win32
 		{E796E337-DE78-4303-8614-9A590862EE95}.All|Win32.Build.0 = Release|Win32
 		{E796E337-DE78-4303-8614-9A590862EE95}.All|x64.ActiveCfg = Release|Win32
 		{E796E337-DE78-4303-8614-9A590862EE95}.All|x64.Build.0 = Release|Win32
+		{E796E337-DE78-4303-8614-9A590862EE95}.All|x64 Setup.ActiveCfg = Release|Win32
+		{E796E337-DE78-4303-8614-9A590862EE95}.All|x64 Setup.Build.0 = Release|Win32
+		{E796E337-DE78-4303-8614-9A590862EE95}.All|x86 Setup.ActiveCfg = Release|Win32
+		{E796E337-DE78-4303-8614-9A590862EE95}.All|x86 Setup.Build.0 = Release|Win32
 		{E796E337-DE78-4303-8614-9A590862EE95}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E796E337-DE78-4303-8614-9A590862EE95}.Debug|Win32.Build.0 = Debug|Win32
 		{E796E337-DE78-4303-8614-9A590862EE95}.Debug|x64.ActiveCfg = Debug|Win32
 		{E796E337-DE78-4303-8614-9A590862EE95}.Debug|x64.Build.0 = Debug|Win32
+		{E796E337-DE78-4303-8614-9A590862EE95}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{E796E337-DE78-4303-8614-9A590862EE95}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{E796E337-DE78-4303-8614-9A590862EE95}.Release|Win32.ActiveCfg = Release|Win32
 		{E796E337-DE78-4303-8614-9A590862EE95}.Release|Win32.Build.0 = Release|Win32
 		{E796E337-DE78-4303-8614-9A590862EE95}.Release|x64.ActiveCfg = Release|Win32
 		{E796E337-DE78-4303-8614-9A590862EE95}.Release|x64.Build.0 = Release|Win32
+		{E796E337-DE78-4303-8614-9A590862EE95}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{E796E337-DE78-4303-8614-9A590862EE95}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{419C8F80-D858-4B48-A25C-AF4007608137}.All|Win32.ActiveCfg = Release|x64
 		{419C8F80-D858-4B48-A25C-AF4007608137}.All|x64.ActiveCfg = Release|x64
 		{419C8F80-D858-4B48-A25C-AF4007608137}.All|x64.Build.0 = Release|x64
+		{419C8F80-D858-4B48-A25C-AF4007608137}.All|x64 Setup.ActiveCfg = Release|x64
+		{419C8F80-D858-4B48-A25C-AF4007608137}.All|x64 Setup.Build.0 = Release|x64
+		{419C8F80-D858-4B48-A25C-AF4007608137}.All|x86 Setup.ActiveCfg = Release|x64
 		{419C8F80-D858-4B48-A25C-AF4007608137}.Debug|Win32.ActiveCfg = Debug|Win32
 		{419C8F80-D858-4B48-A25C-AF4007608137}.Debug|Win32.Build.0 = Debug|Win32
 		{419C8F80-D858-4B48-A25C-AF4007608137}.Debug|x64.ActiveCfg = Debug|x64
 		{419C8F80-D858-4B48-A25C-AF4007608137}.Debug|x64.Build.0 = Debug|x64
+		{419C8F80-D858-4B48-A25C-AF4007608137}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{419C8F80-D858-4B48-A25C-AF4007608137}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{419C8F80-D858-4B48-A25C-AF4007608137}.Release|Win32.ActiveCfg = Release|Win32
 		{419C8F80-D858-4B48-A25C-AF4007608137}.Release|Win32.Build.0 = Release|Win32
 		{419C8F80-D858-4B48-A25C-AF4007608137}.Release|x64.ActiveCfg = Release|x64
 		{419C8F80-D858-4B48-A25C-AF4007608137}.Release|x64.Build.0 = Release|x64
+		{419C8F80-D858-4B48-A25C-AF4007608137}.Release|x64 Setup.ActiveCfg = Release|x64
+		{419C8F80-D858-4B48-A25C-AF4007608137}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.All|Win32.ActiveCfg = Release|x64
 		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.All|x64.ActiveCfg = Release|x64
 		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.All|x64.Build.0 = Release|x64
+		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.All|x64 Setup.ActiveCfg = Release|x64
+		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.All|x64 Setup.Build.0 = Release|x64
+		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.All|x86 Setup.ActiveCfg = Release|x64
 		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.Debug|Win32.Build.0 = Debug|Win32
 		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.Debug|x64.ActiveCfg = Debug|x64
 		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.Debug|x64.Build.0 = Debug|x64
+		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.Release|Win32.ActiveCfg = Release|Win32
 		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.Release|Win32.Build.0 = Release|Win32
 		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.Release|x64.ActiveCfg = Release|x64
 		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.Release|x64.Build.0 = Release|x64
+		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.Release|x64 Setup.ActiveCfg = Release|x64
+		{B3F424EC-3D8F-417C-B244-3919D5E1A577}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.All|Win32.ActiveCfg = Release|x64
 		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.All|x64.ActiveCfg = Release|x64
 		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.All|x64.Build.0 = Release|x64
+		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.All|x64 Setup.ActiveCfg = Release|x64
+		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.All|x64 Setup.Build.0 = Release|x64
+		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.All|x86 Setup.ActiveCfg = Release|x64
 		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.Debug|Win32.ActiveCfg = Debug|Win32
 		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.Debug|Win32.Build.0 = Debug|Win32
 		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.Debug|x64.ActiveCfg = Debug|x64
 		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.Debug|x64.Build.0 = Debug|x64
+		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.Release|Win32.ActiveCfg = Release|Win32
 		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.Release|Win32.Build.0 = Release|Win32
 		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.Release|x64.ActiveCfg = Release|x64
 		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.Release|x64.Build.0 = Release|x64
+		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.Release|x64 Setup.ActiveCfg = Release|x64
+		{14E4A972-9CFB-436D-B0A5-4943F3F80D47}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.All|Win32.ActiveCfg = Release|x64
 		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.All|x64.ActiveCfg = Release|x64
 		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.All|x64.Build.0 = Release|x64
+		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.All|x64 Setup.ActiveCfg = Release|x64
+		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.All|x64 Setup.Build.0 = Release|x64
+		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.All|x86 Setup.ActiveCfg = Release|x64
 		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.Debug|Win32.Build.0 = Debug|Win32
 		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.Debug|x64.ActiveCfg = Debug|x64
 		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.Debug|x64.Build.0 = Debug|x64
+		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.Release|Win32.ActiveCfg = Release|Win32
 		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.Release|Win32.Build.0 = Release|Win32
 		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.Release|x64.ActiveCfg = Release|x64
 		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.Release|x64.Build.0 = Release|x64
+		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.Release|x64 Setup.ActiveCfg = Release|x64
+		{1BC8A8EC-E03B-44DF-BCD9-088650F4D29C}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{0B6C905B-142E-4999-B39D-92FF7951E921}.All|Win32.ActiveCfg = Release|x64
 		{0B6C905B-142E-4999-B39D-92FF7951E921}.All|x64.ActiveCfg = Release|x64
 		{0B6C905B-142E-4999-B39D-92FF7951E921}.All|x64.Build.0 = Release|x64
+		{0B6C905B-142E-4999-B39D-92FF7951E921}.All|x64 Setup.ActiveCfg = Release|x64
+		{0B6C905B-142E-4999-B39D-92FF7951E921}.All|x64 Setup.Build.0 = Release|x64
+		{0B6C905B-142E-4999-B39D-92FF7951E921}.All|x86 Setup.ActiveCfg = Release|x64
 		{0B6C905B-142E-4999-B39D-92FF7951E921}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0B6C905B-142E-4999-B39D-92FF7951E921}.Debug|Win32.Build.0 = Debug|Win32
 		{0B6C905B-142E-4999-B39D-92FF7951E921}.Debug|x64.ActiveCfg = Debug|x64
 		{0B6C905B-142E-4999-B39D-92FF7951E921}.Debug|x64.Build.0 = Debug|x64
+		{0B6C905B-142E-4999-B39D-92FF7951E921}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{0B6C905B-142E-4999-B39D-92FF7951E921}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{0B6C905B-142E-4999-B39D-92FF7951E921}.Release|Win32.ActiveCfg = Release|Win32
 		{0B6C905B-142E-4999-B39D-92FF7951E921}.Release|Win32.Build.0 = Release|Win32
 		{0B6C905B-142E-4999-B39D-92FF7951E921}.Release|x64.ActiveCfg = Release|x64
 		{0B6C905B-142E-4999-B39D-92FF7951E921}.Release|x64.Build.0 = Release|x64
+		{0B6C905B-142E-4999-B39D-92FF7951E921}.Release|x64 Setup.ActiveCfg = Release|x64
+		{0B6C905B-142E-4999-B39D-92FF7951E921}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.All|Win32.ActiveCfg = Release|x64
 		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.All|x64.ActiveCfg = Release|x64
 		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.All|x64.Build.0 = Release|x64
+		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.All|x64 Setup.ActiveCfg = Release|x64
+		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.All|x64 Setup.Build.0 = Release|x64
+		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.All|x86 Setup.ActiveCfg = Release|x64
 		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Debug|Win32.Build.0 = Debug|Win32
 		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Debug|x64.ActiveCfg = Debug|x64
 		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Debug|x64.Build.0 = Debug|x64
+		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Release|Win32.ActiveCfg = Release|Win32
 		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Release|Win32.Build.0 = Release|Win32
 		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Release|x64.ActiveCfg = Release|x64
 		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Release|x64.Build.0 = Release|x64
+		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Release|x64 Setup.ActiveCfg = Release|x64
+		{CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.All|Win32.ActiveCfg = Release|x64
 		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.All|x64.ActiveCfg = Release|x64
 		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.All|x64.Build.0 = Release|x64
+		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.All|x64 Setup.ActiveCfg = Release|x64
+		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.All|x64 Setup.Build.0 = Release|x64
+		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.All|x86 Setup.ActiveCfg = Release|x64
 		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Debug|Win32.Build.0 = Debug|Win32
 		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Debug|x64.ActiveCfg = Debug|x64
 		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Debug|x64.Build.0 = Debug|x64
+		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Release|Win32.ActiveCfg = Release|Win32
 		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Release|Win32.Build.0 = Release|Win32
 		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Release|x64.ActiveCfg = Release|x64
 		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Release|x64.Build.0 = Release|x64
+		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Release|x64 Setup.ActiveCfg = Release|x64
+		{D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.All|Win32.ActiveCfg = Release|x64
 		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.All|x64.ActiveCfg = Release|x64
 		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.All|x64.Build.0 = Release|x64
+		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.All|x64 Setup.ActiveCfg = Release|x64
+		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.All|x64 Setup.Build.0 = Release|x64
+		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.All|x86 Setup.ActiveCfg = Release|x64
 		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.Debug|Win32.ActiveCfg = Debug|Win32
 		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.Debug|Win32.Build.0 = Debug|Win32
 		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.Debug|x64.ActiveCfg = Debug|x64
 		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.Debug|x64.Build.0 = Debug|x64
+		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.Release|Win32.ActiveCfg = Release|Win32
 		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.Release|Win32.Build.0 = Release|Win32
 		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.Release|x64.ActiveCfg = Release|x64
 		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.Release|x64.Build.0 = Release|x64
+		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.Release|x64 Setup.ActiveCfg = Release|x64
+		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.All|Win32.ActiveCfg = Release|x64
 		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.All|x64.ActiveCfg = Release|x64
 		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.All|x64.Build.0 = Release|x64
+		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.All|x64 Setup.ActiveCfg = Release|x64
+		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.All|x64 Setup.Build.0 = Release|x64
+		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.All|x86 Setup.ActiveCfg = Release|x64
 		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Debug|Win32.Build.0 = Debug|Win32
 		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Debug|x64.ActiveCfg = Debug|x64
 		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Debug|x64.Build.0 = Debug|x64
+		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|Win32.ActiveCfg = Release|Win32
 		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|Win32.Build.0 = Release|Win32
 		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|x64.ActiveCfg = Release|x64
 		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|x64.Build.0 = Release|x64
+		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|x64 Setup.ActiveCfg = Release|x64
+		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|Win32.ActiveCfg = Release|x64
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|x64.ActiveCfg = Release|x64
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|x64.Build.0 = Release|x64
+		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|x64 Setup.ActiveCfg = Release|x64
+		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|x64 Setup.Build.0 = Release|x64
+		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|x86 Setup.ActiveCfg = Release|x64
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.ActiveCfg = Debug|Win32
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.Build.0 = Debug|Win32
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|x64.ActiveCfg = Debug|x64
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|x64.Build.0 = Debug|x64
+		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.ActiveCfg = Release|Win32
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.Build.0 = Release|Win32
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x64.ActiveCfg = Release|x64
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x64.Build.0 = Release|x64
+		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x64 Setup.ActiveCfg = Release|x64
+		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|Win32.ActiveCfg = Release|x64
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|x64.ActiveCfg = Release|x64
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|x64.Build.0 = Release|x64
+		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|x64 Setup.ActiveCfg = Release|x64
+		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|x64 Setup.Build.0 = Release|x64
+		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|x86 Setup.ActiveCfg = Release|x64
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.Build.0 = Debug|Win32
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|x64.ActiveCfg = Debug|x64
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|x64.Build.0 = Debug|x64
+		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.ActiveCfg = Release|Win32
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.Build.0 = Release|Win32
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.ActiveCfg = Release|x64
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.Build.0 = Release|x64
+		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64 Setup.ActiveCfg = Release|x64
+		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.All|Win32.ActiveCfg = Release_WM5_PPC_ARM|x64
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.All|x64.ActiveCfg = Release_WM5_PPC_ARM|x64
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.All|x64.Build.0 = Release_WM5_PPC_ARM|x64
+		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.All|x64 Setup.ActiveCfg = Release_WM5_PPC_ARM|x64
+		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.All|x64 Setup.Build.0 = Release_WM5_PPC_ARM|x64
+		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.All|x86 Setup.ActiveCfg = Release_WM5_PPC_ARM|x64
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.Build.0 = Debug|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|x64.ActiveCfg = Debug|x64
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|x64.Build.0 = Debug|x64
+		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.ActiveCfg = Release|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.Build.0 = Release|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|x64.ActiveCfg = Release|x64
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|x64.Build.0 = Release|x64
+		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|x64 Setup.ActiveCfg = Release|x64
+		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.All|Win32.ActiveCfg = Release_Static_SSE|x64
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.All|x64.ActiveCfg = Release_Static_SSE|x64
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.All|x64.Build.0 = Release_Static_SSE|x64
+		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.All|x64 Setup.ActiveCfg = Release_Static_SSE|x64
+		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.All|x64 Setup.Build.0 = Release_Static_SSE|x64
+		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.All|x86 Setup.ActiveCfg = Release_Static_SSE|x64
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug|Win32.Build.0 = Debug|Win32
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug|x64.ActiveCfg = Debug|x64
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug|x64.Build.0 = Debug|x64
+		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|Win32.ActiveCfg = Release|Win32
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|Win32.Build.0 = Release|Win32
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|x64.ActiveCfg = Release|x64
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|x64.Build.0 = Release|x64
+		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|x64 Setup.ActiveCfg = Release|x64
+		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.All|Win32.ActiveCfg = Release|x64
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.All|x64.ActiveCfg = Release|x64
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.All|x64.Build.0 = Release|x64
+		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.All|x64 Setup.ActiveCfg = Release|x64
+		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.All|x64 Setup.Build.0 = Release|x64
+		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.All|x86 Setup.ActiveCfg = Release|x64
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Debug|Win32.Build.0 = Debug|Win32
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Debug|x64.ActiveCfg = Debug|x64
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Debug|x64.Build.0 = Debug|x64
+		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Release|Win32.ActiveCfg = Release|Win32
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Release|Win32.Build.0 = Release|Win32
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Release|x64.ActiveCfg = Release|x64
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Release|x64.Build.0 = Release|x64
+		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Release|x64 Setup.ActiveCfg = Release|x64
+		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D0B36172-CD76-454A-9B89-990025266C2A}.All|Win32.ActiveCfg = Release|x64
 		{D0B36172-CD76-454A-9B89-990025266C2A}.All|x64.ActiveCfg = Release|x64
 		{D0B36172-CD76-454A-9B89-990025266C2A}.All|x64.Build.0 = Release|x64
+		{D0B36172-CD76-454A-9B89-990025266C2A}.All|x64 Setup.ActiveCfg = Release|x64
+		{D0B36172-CD76-454A-9B89-990025266C2A}.All|x64 Setup.Build.0 = Release|x64
+		{D0B36172-CD76-454A-9B89-990025266C2A}.All|x86 Setup.ActiveCfg = Release|x64
 		{D0B36172-CD76-454A-9B89-990025266C2A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D0B36172-CD76-454A-9B89-990025266C2A}.Debug|Win32.Build.0 = Debug|Win32
 		{D0B36172-CD76-454A-9B89-990025266C2A}.Debug|x64.ActiveCfg = Debug|x64
 		{D0B36172-CD76-454A-9B89-990025266C2A}.Debug|x64.Build.0 = Debug|x64
+		{D0B36172-CD76-454A-9B89-990025266C2A}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{D0B36172-CD76-454A-9B89-990025266C2A}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D0B36172-CD76-454A-9B89-990025266C2A}.Release|Win32.ActiveCfg = Release|Win32
 		{D0B36172-CD76-454A-9B89-990025266C2A}.Release|Win32.Build.0 = Release|Win32
 		{D0B36172-CD76-454A-9B89-990025266C2A}.Release|x64.ActiveCfg = Release|x64
 		{D0B36172-CD76-454A-9B89-990025266C2A}.Release|x64.Build.0 = Release|x64
+		{D0B36172-CD76-454A-9B89-990025266C2A}.Release|x64 Setup.ActiveCfg = Release|x64
+		{D0B36172-CD76-454A-9B89-990025266C2A}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{05C9FB27-480E-4D53-B3B7-6338E2526666}.All|Win32.ActiveCfg = Release|Win32
 		{05C9FB27-480E-4D53-B3B7-6338E2526666}.All|Win32.Build.0 = Release|Win32
 		{05C9FB27-480E-4D53-B3B7-6338E2526666}.All|x64.ActiveCfg = Release|Win32
+		{05C9FB27-480E-4D53-B3B7-6338E2526666}.All|x64 Setup.ActiveCfg = Release|Win32
+		{05C9FB27-480E-4D53-B3B7-6338E2526666}.All|x86 Setup.ActiveCfg = Release|Win32
+		{05C9FB27-480E-4D53-B3B7-6338E2526666}.All|x86 Setup.Build.0 = Release|Win32
 		{05C9FB27-480E-4D53-B3B7-6338E2526666}.Debug|Win32.ActiveCfg = Debug|Win32
 		{05C9FB27-480E-4D53-B3B7-6338E2526666}.Debug|x64.ActiveCfg = Debug|Win32
+		{05C9FB27-480E-4D53-B3B7-6338E2526666}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{05C9FB27-480E-4D53-B3B7-6338E2526666}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{05C9FB27-480E-4D53-B3B7-6338E2526666}.Release|Win32.ActiveCfg = Release|Win32
 		{05C9FB27-480E-4D53-B3B7-6338E2526666}.Release|x64.ActiveCfg = Release|Win32
+		{05C9FB27-480E-4D53-B3B7-6338E2526666}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{05C9FB27-480E-4D53-B3B7-6338E2526666}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{CC1DD008-9406-448D-A0AD-33C3186CFADB}.All|Win32.ActiveCfg = Release|Win32
 		{CC1DD008-9406-448D-A0AD-33C3186CFADB}.All|x64.ActiveCfg = Release|Win32
+		{CC1DD008-9406-448D-A0AD-33C3186CFADB}.All|x64 Setup.ActiveCfg = Release|Win32
+		{CC1DD008-9406-448D-A0AD-33C3186CFADB}.All|x86 Setup.ActiveCfg = Release|Win32
 		{CC1DD008-9406-448D-A0AD-33C3186CFADB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CC1DD008-9406-448D-A0AD-33C3186CFADB}.Debug|x64.ActiveCfg = Debug|x64
+		{CC1DD008-9406-448D-A0AD-33C3186CFADB}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{CC1DD008-9406-448D-A0AD-33C3186CFADB}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{CC1DD008-9406-448D-A0AD-33C3186CFADB}.Release|Win32.ActiveCfg = Release|Win32
 		{CC1DD008-9406-448D-A0AD-33C3186CFADB}.Release|x64.ActiveCfg = Release|x64
+		{CC1DD008-9406-448D-A0AD-33C3186CFADB}.Release|x64 Setup.ActiveCfg = Release|x64
+		{CC1DD008-9406-448D-A0AD-33C3186CFADB}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|Win32.ActiveCfg = All|Win32
 		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|Win32.Build.0 = All|Win32
 		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|x64.ActiveCfg = All|Win32
+		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|x64 Setup.ActiveCfg = All|Win32
+		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|x86 Setup.ActiveCfg = All|Win32
+		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|x86 Setup.Build.0 = All|Win32
 		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|Win32.ActiveCfg = All|Win32
 		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|Win32.Build.0 = All|Win32
 		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|x64.ActiveCfg = All|Win32
 		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|x64.Build.0 = All|Win32
+		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|x64 Setup.ActiveCfg = All|Win32
+		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|x86 Setup.ActiveCfg = All|Win32
 		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|Win32.ActiveCfg = All|Win32
 		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|Win32.Build.0 = All|Win32
 		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|x64.ActiveCfg = All|Win32
 		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|x64.Build.0 = All|Win32
+		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|x64 Setup.ActiveCfg = All|Win32
+		{DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|x86 Setup.ActiveCfg = All|Win32
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|Win32.ActiveCfg = All|Win32
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|Win32.Build.0 = All|Win32
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|x64.ActiveCfg = All|Win32
+		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|x64 Setup.ActiveCfg = All|Win32
+		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|x86 Setup.ActiveCfg = All|Win32
+		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|x86 Setup.Build.0 = All|Win32
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|Win32.ActiveCfg = All|Win32
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|Win32.Build.0 = All|Win32
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|x64.ActiveCfg = All|Win32
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|x64.Build.0 = All|Win32
+		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|x64 Setup.ActiveCfg = All|Win32
+		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|x86 Setup.ActiveCfg = All|Win32
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|Win32.ActiveCfg = All|Win32
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|Win32.Build.0 = All|Win32
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x64.ActiveCfg = All|Win32
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x64.Build.0 = All|Win32
+		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x64 Setup.ActiveCfg = All|Win32
+		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x86 Setup.ActiveCfg = All|Win32
 		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.All|Win32.ActiveCfg = Release|x64
 		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.All|x64.ActiveCfg = Release|x64
 		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.All|x64.Build.0 = Release|x64
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.All|x64 Setup.ActiveCfg = Release|x64
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.All|x64 Setup.Build.0 = Release|x64
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.All|x86 Setup.ActiveCfg = Release|x64
 		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Debug|Win32.ActiveCfg = Debug|Win32
 		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Debug|x64.ActiveCfg = Debug|x64
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|Win32.ActiveCfg = Release|Win32
 		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|x64.ActiveCfg = Release|x64
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|x64 Setup.ActiveCfg = Release|x64
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|Win32.ActiveCfg = Release|Win32
 		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|Win32.Build.0 = Release|Win32
 		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|x64.ActiveCfg = Release|Win32
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|x64 Setup.ActiveCfg = Release|Win32
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|x86 Setup.ActiveCfg = Release|Win32
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|x86 Setup.Build.0 = Release|Win32
 		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|x64.ActiveCfg = Debug|Win32
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|Win32.ActiveCfg = Release|Win32
 		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|x64.ActiveCfg = Release|Win32
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{1F0A8A77-E661-418F-BB92-82172AE43803}.All|Win32.ActiveCfg = Release|Win32
 		{1F0A8A77-E661-418F-BB92-82172AE43803}.All|x64.ActiveCfg = Release|Win32
+		{1F0A8A77-E661-418F-BB92-82172AE43803}.All|x64 Setup.ActiveCfg = Release|Win32
+		{1F0A8A77-E661-418F-BB92-82172AE43803}.All|x86 Setup.ActiveCfg = Release|Win32
 		{1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|x64.ActiveCfg = Debug|Win32
+		{1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{1F0A8A77-E661-418F-BB92-82172AE43803}.Release|Win32.ActiveCfg = Release|Win32
 		{1F0A8A77-E661-418F-BB92-82172AE43803}.Release|x64.ActiveCfg = Release|Win32
+		{1F0A8A77-E661-418F-BB92-82172AE43803}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{1F0A8A77-E661-418F-BB92-82172AE43803}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{4F5C9D55-98EF-4256-8311-32D7BD360406}.All|Win32.ActiveCfg = Release|Win32
 		{4F5C9D55-98EF-4256-8311-32D7BD360406}.All|Win32.Build.0 = Release|Win32
 		{4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64.ActiveCfg = Release|Win32
 		{4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64.Build.0 = Release|Win32
+		{4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64 Setup.ActiveCfg = Release|Win32
+		{4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64 Setup.Build.0 = Release|Win32
+		{4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x86 Setup.ActiveCfg = Release|Win32
+		{4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x86 Setup.Build.0 = Release|Win32
 		{4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|Win32.Build.0 = Debug|Win32
 		{4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x64.ActiveCfg = Debug|Win32
 		{4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x64.Build.0 = Debug|Win32
+		{4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|Win32.ActiveCfg = Release|Win32
 		{4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|Win32.Build.0 = Release|Win32
 		{4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x64.ActiveCfg = Release|Win32
 		{4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x64.Build.0 = Release|Win32
+		{4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|Win32.ActiveCfg = Release|Win32
 		{E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|x64.ActiveCfg = Release|Win32
+		{E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|x64 Setup.ActiveCfg = Release|Win32
+		{E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|x86 Setup.ActiveCfg = Release|Win32
 		{E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|x64.ActiveCfg = Debug|Win32
+		{E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|Win32.ActiveCfg = Release|Win32
 		{E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|x64.ActiveCfg = Release|Win32
+		{E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|Win32.ActiveCfg = Release|Win32
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|Win32.Build.0 = Release|Win32
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64.ActiveCfg = Release|Win32
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64.Build.0 = Release|Win32
+		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64 Setup.ActiveCfg = Release|Win32
+		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64 Setup.Build.0 = Release|Win32
+		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x86 Setup.ActiveCfg = Release|Win32
+		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x86 Setup.Build.0 = Release|Win32
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|Win32.Build.0 = Debug|Win32
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.ActiveCfg = Debug|x64
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.Build.0 = Debug|x64
+		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|Win32.ActiveCfg = Release|Win32
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|Win32.Build.0 = Release|Win32
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.ActiveCfg = Release|x64
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.Build.0 = Release|x64
+		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64 Setup.ActiveCfg = Release|x64
+		{D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{BA599D0A-4310-4505-91DA-6A6447B3E289}.All|Win32.ActiveCfg = Release|Win32
 		{BA599D0A-4310-4505-91DA-6A6447B3E289}.All|x64.ActiveCfg = Release|Win32
+		{BA599D0A-4310-4505-91DA-6A6447B3E289}.All|x64 Setup.ActiveCfg = Release|Win32
+		{BA599D0A-4310-4505-91DA-6A6447B3E289}.All|x86 Setup.ActiveCfg = Release|Win32
 		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|x64.ActiveCfg = Debug|x64
+		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|Win32.ActiveCfg = Release|Win32
 		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|x64.ActiveCfg = Release|x64
+		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|x64 Setup.ActiveCfg = Release|x64
+		{BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|Win32.ActiveCfg = Release|Win32
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|x64.ActiveCfg = Release|Win32
+		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|x64 Setup.ActiveCfg = Release|Win32
+		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|x86 Setup.ActiveCfg = Release|Win32
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|x64.ActiveCfg = Debug|x64
+		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|Win32.ActiveCfg = Release|Win32
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|x64.ActiveCfg = Release|x64
+		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|x64 Setup.ActiveCfg = Release|x64
+		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.All|Win32.ActiveCfg = Release|x64
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.All|x64.ActiveCfg = Release|x64
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.All|x64.Build.0 = Release|x64
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.All|x64 Setup.ActiveCfg = Release|x64
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.All|x64 Setup.Build.0 = Release|x64
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.All|x86 Setup.ActiveCfg = Release|x64
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|Win32.Build.0 = Debug|Win32
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|x64.ActiveCfg = Debug|x64
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|x64.Build.0 = Debug|x64
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.Release|Win32.ActiveCfg = Release|Win32
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.Release|Win32.Build.0 = Release|Win32
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.Release|x64.ActiveCfg = Release|x64
 		{70564D74-199A-4452-9C60-19ED5F242F0D}.Release|x64.Build.0 = Release|x64
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.Release|x64 Setup.ActiveCfg = Release|x64
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.All|Win32.ActiveCfg = Release|x64
 		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.All|x64.ActiveCfg = Release|x64
 		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.All|x64.Build.0 = Release|x64
+		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.All|x64 Setup.ActiveCfg = Release|x64
+		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.All|x64 Setup.Build.0 = Release|x64
+		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.All|x86 Setup.ActiveCfg = Release|x64
 		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Debug|Win32.Build.0 = Debug|Win32
 		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Debug|x64.ActiveCfg = Debug|x64
 		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Debug|x64.Build.0 = Debug|x64
+		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Release|Win32.ActiveCfg = Release|Win32
 		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Release|Win32.Build.0 = Release|Win32
 		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Release|x64.ActiveCfg = Release|x64
 		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Release|x64.Build.0 = Release|x64
+		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Release|x64 Setup.ActiveCfg = Release|x64
+		{3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.All|Win32.ActiveCfg = Release|x64
 		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.All|Win32.Build.0 = Release|x64
 		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.All|x64.ActiveCfg = Release|x64
 		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.All|x64.Build.0 = Release|x64
+		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.All|x64 Setup.ActiveCfg = Release|x64
+		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.All|x64 Setup.Build.0 = Release|x64
+		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.All|x86 Setup.ActiveCfg = Release|x64
+		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.All|x86 Setup.Build.0 = Release|x64
 		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.Debug|Win32.Build.0 = Debug|Win32
 		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.Debug|x64.ActiveCfg = Debug|x64
 		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.Debug|x64.Build.0 = Debug|x64
+		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.Release|Win32.ActiveCfg = Release|Win32
 		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.Release|Win32.Build.0 = Release|Win32
 		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.Release|x64.ActiveCfg = Release|x64
 		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.Release|x64.Build.0 = Release|x64
+		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.Release|x64 Setup.ActiveCfg = Release|x64
+		{0382E8FD-CFDC-41C0-8B03-792C7C84FC31}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{432DB165-1EB2-4781-A9C0-71E62610B20A}.All|Win32.ActiveCfg = Release|x64
 		{432DB165-1EB2-4781-A9C0-71E62610B20A}.All|x64.ActiveCfg = Release|x64
+		{432DB165-1EB2-4781-A9C0-71E62610B20A}.All|x64 Setup.ActiveCfg = Release|x64
+		{432DB165-1EB2-4781-A9C0-71E62610B20A}.All|x86 Setup.ActiveCfg = Release|x64
 		{432DB165-1EB2-4781-A9C0-71E62610B20A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{432DB165-1EB2-4781-A9C0-71E62610B20A}.Debug|Win32.Build.0 = Debug|Win32
 		{432DB165-1EB2-4781-A9C0-71E62610B20A}.Debug|x64.ActiveCfg = Debug|x64
 		{432DB165-1EB2-4781-A9C0-71E62610B20A}.Debug|x64.Build.0 = Debug|x64
+		{432DB165-1EB2-4781-A9C0-71E62610B20A}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{432DB165-1EB2-4781-A9C0-71E62610B20A}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{432DB165-1EB2-4781-A9C0-71E62610B20A}.Release|Win32.ActiveCfg = Release|Win32
 		{432DB165-1EB2-4781-A9C0-71E62610B20A}.Release|Win32.Build.0 = Release|Win32
 		{432DB165-1EB2-4781-A9C0-71E62610B20A}.Release|x64.ActiveCfg = Release|x64
 		{432DB165-1EB2-4781-A9C0-71E62610B20A}.Release|x64.Build.0 = Release|x64
+		{432DB165-1EB2-4781-A9C0-71E62610B20A}.Release|x64 Setup.ActiveCfg = Release|x64
+		{432DB165-1EB2-4781-A9C0-71E62610B20A}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.All|Win32.ActiveCfg = Release|Win32
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.All|Win32.Build.0 = Release|Win32
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.All|x64.ActiveCfg = Release|Win32
+		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.All|x64 Setup.ActiveCfg = Release|Win32
+		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.All|x86 Setup.ActiveCfg = Release|Win32
+		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.All|x86 Setup.Build.0 = Release|Win32
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|Win32.Build.0 = Debug|Win32
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|x64.ActiveCfg = Debug|x64
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|x64.Build.0 = Debug|x64
+		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|Win32.ActiveCfg = Release|Win32
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|Win32.Build.0 = Release|Win32
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|x64.ActiveCfg = Release|x64
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|x64.Build.0 = Release|x64
+		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|x64 Setup.ActiveCfg = Release|x64
+		{CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.All|Win32.ActiveCfg = Release|x64
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.All|x64.ActiveCfg = Release|x64
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.All|x64.Build.0 = Release|x64
+		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.All|x64 Setup.ActiveCfg = Release|x64
+		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.All|x64 Setup.Build.0 = Release|x64
+		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.All|x86 Setup.ActiveCfg = Release|x64
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Debug|Win32.Build.0 = Debug|Win32
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Debug|x64.ActiveCfg = Debug|x64
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Debug|x64.Build.0 = Debug|x64
+		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|Win32.ActiveCfg = Release|Win32
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|Win32.Build.0 = Release|Win32
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.ActiveCfg = Release|x64
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.Build.0 = Release|x64
+		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64 Setup.ActiveCfg = Release|x64
+		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|Win32.ActiveCfg = Release|Win32
 		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|Win32.Build.0 = Release|Win32
 		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|x64.ActiveCfg = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|x64 Setup.ActiveCfg = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|x86 Setup.ActiveCfg = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|x86 Setup.Build.0 = Release|Win32
 		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.Build.0 = Debug|Win32
 		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|x64.ActiveCfg = Debug|x64
 		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|x64.Build.0 = Debug|x64
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.ActiveCfg = Release|Win32
 		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.Build.0 = Release|Win32
 		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|x64.ActiveCfg = Release|x64
 		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|x64.Build.0 = Release|x64
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|x64 Setup.ActiveCfg = Release|x64
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|Win32.ActiveCfg = Release|Win32
 		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|Win32.Build.0 = Release|Win32
 		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|x64.ActiveCfg = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|x64 Setup.ActiveCfg = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|x86 Setup.ActiveCfg = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|x86 Setup.Build.0 = Release|Win32
 		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.Build.0 = Debug|Win32
 		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|x64.ActiveCfg = Debug|x64
 		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|x64.Build.0 = Debug|x64
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.ActiveCfg = Release|Win32
 		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.Build.0 = Release|Win32
 		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|x64.ActiveCfg = Release|x64
 		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|x64.Build.0 = Release|x64
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|x64 Setup.ActiveCfg = Release|x64
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|Win32.ActiveCfg = Release|Win32
 		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|Win32.Build.0 = Release|Win32
 		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|x64.ActiveCfg = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|x64 Setup.ActiveCfg = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|x86 Setup.ActiveCfg = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|x86 Setup.Build.0 = Release|Win32
 		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.Build.0 = Debug|Win32
 		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|x64.ActiveCfg = Debug|x64
 		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|x64.Build.0 = Debug|x64
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.ActiveCfg = Release|Win32
 		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.Build.0 = Release|Win32
 		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|x64.ActiveCfg = Release|x64
 		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|x64.Build.0 = Release|x64
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|x64 Setup.ActiveCfg = Release|x64
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|Win32.ActiveCfg = Release|Win32
 		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|Win32.Build.0 = Release|Win32
 		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|x64.ActiveCfg = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|x64 Setup.ActiveCfg = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|x86 Setup.ActiveCfg = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|x86 Setup.Build.0 = Release|Win32
 		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.ActiveCfg = Debug|Win32
 		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.Build.0 = Debug|Win32
 		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|x64.ActiveCfg = Debug|x64
 		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|x64.Build.0 = Debug|x64
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.ActiveCfg = Release|Win32
 		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.Build.0 = Release|Win32
 		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|x64.ActiveCfg = Release|x64
 		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|x64.Build.0 = Release|x64
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|x64 Setup.ActiveCfg = Release|x64
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|Win32.ActiveCfg = Release|Win32
 		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|Win32.Build.0 = Release|Win32
 		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|x64.ActiveCfg = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|x64 Setup.ActiveCfg = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|x86 Setup.ActiveCfg = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|x86 Setup.Build.0 = Release|Win32
 		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.ActiveCfg = Debug|Win32
 		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.Build.0 = Debug|Win32
 		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|x64.ActiveCfg = Debug|x64
 		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|x64.Build.0 = Debug|x64
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.ActiveCfg = Release|Win32
 		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.Build.0 = Release|Win32
 		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|x64.ActiveCfg = Release|x64
 		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|x64.Build.0 = Release|x64
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|x64 Setup.ActiveCfg = Release|x64
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|Win32.ActiveCfg = Release|Win32
 		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|Win32.Build.0 = Release|Win32
 		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|x64.ActiveCfg = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|x64 Setup.ActiveCfg = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|x86 Setup.ActiveCfg = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|x86 Setup.Build.0 = Release|Win32
 		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.Build.0 = Debug|Win32
 		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|x64.ActiveCfg = Debug|x64
 		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|x64.Build.0 = Debug|x64
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.ActiveCfg = Release|Win32
 		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.Build.0 = Release|Win32
 		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|x64.ActiveCfg = Release|x64
 		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|x64.Build.0 = Release|x64
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|x64 Setup.ActiveCfg = Release|x64
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|Win32.ActiveCfg = Release|Win32
 		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|Win32.Build.0 = Release|Win32
 		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|x64.ActiveCfg = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|x64 Setup.ActiveCfg = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|x86 Setup.ActiveCfg = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|x86 Setup.Build.0 = Release|Win32
 		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.Build.0 = Debug|Win32
 		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|x64.ActiveCfg = Debug|x64
 		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|x64.Build.0 = Debug|x64
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.ActiveCfg = Release|Win32
 		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.Build.0 = Release|Win32
 		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|x64.ActiveCfg = Release|x64
 		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|x64.Build.0 = Release|x64
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|x64 Setup.ActiveCfg = Release|x64
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|Win32.ActiveCfg = Release|Win32
 		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|Win32.Build.0 = Release|Win32
 		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|x64.ActiveCfg = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|x64 Setup.ActiveCfg = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|x86 Setup.ActiveCfg = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|x86 Setup.Build.0 = Release|Win32
 		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.Build.0 = Debug|Win32
 		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|x64.ActiveCfg = Debug|x64
 		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|x64.Build.0 = Debug|x64
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.ActiveCfg = Release|Win32
 		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.Build.0 = Release|Win32
 		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|x64.ActiveCfg = Release|x64
 		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|x64.Build.0 = Release|x64
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|x64 Setup.ActiveCfg = Release|x64
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|Win32.ActiveCfg = Release|Win32
 		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|Win32.Build.0 = Release|Win32
 		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|x64.ActiveCfg = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|x64 Setup.ActiveCfg = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|x86 Setup.ActiveCfg = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|x86 Setup.Build.0 = Release|Win32
 		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.Build.0 = Debug|Win32
 		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|x64.ActiveCfg = Debug|x64
 		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|x64.Build.0 = Debug|x64
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.ActiveCfg = Release|Win32
 		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.Build.0 = Release|Win32
 		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|x64.ActiveCfg = Release|x64
 		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|x64.Build.0 = Release|x64
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|x64 Setup.ActiveCfg = Release|x64
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|Win32.ActiveCfg = Release|x64
 		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.ActiveCfg = Release|x64
 		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.Build.0 = Release|x64
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64 Setup.ActiveCfg = Release|x64
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64 Setup.Build.0 = Release|x64
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x86 Setup.ActiveCfg = Release|x64
 		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.Build.0 = Debug|Win32
 		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.ActiveCfg = Debug|x64
 		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.Build.0 = Debug|x64
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.ActiveCfg = Release|Win32
 		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.Build.0 = Release|Win32
 		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.ActiveCfg = Release|x64
 		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.Build.0 = Release|x64
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64 Setup.ActiveCfg = Release|x64
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|Win32.ActiveCfg = Release|Win32
 		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|Win32.Build.0 = Release|Win32
 		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x64.ActiveCfg = Release|Win32
+		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x64 Setup.ActiveCfg = Release|Win32
+		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x86 Setup.ActiveCfg = Release|Win32
+		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x86 Setup.Build.0 = Release|Win32
 		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|Win32.Build.0 = Debug|Win32
 		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64.ActiveCfg = Debug|Win32
 		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64.Build.0 = Debug|Win32
+		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|Win32.ActiveCfg = Release|Win32
 		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|Win32.Build.0 = Release|Win32
 		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64.ActiveCfg = Release|Win32
 		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64.Build.0 = Release|Win32
+		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|Win32.ActiveCfg = Release|x64
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.ActiveCfg = Release|x64
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.Build.0 = Release|x64
+		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64 Setup.ActiveCfg = Release|x64
+		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64 Setup.Build.0 = Release|x64
+		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x86 Setup.ActiveCfg = Release|x64
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|Win32.Build.0 = Debug|Win32
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x64.ActiveCfg = Debug|x64
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x64.Build.0 = Debug|x64
+		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|Win32.ActiveCfg = Release|Win32
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|Win32.Build.0 = Release|Win32
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x64.ActiveCfg = Release|x64
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x64.Build.0 = Release|x64
+		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x64 Setup.ActiveCfg = Release|x64
+		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|Win32.ActiveCfg = Release Passthrough|x64
 		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64.ActiveCfg = Release Passthrough|x64
 		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64.Build.0 = Release Passthrough|x64
+		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64 Setup.ActiveCfg = Release Passthrough|x64
+		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64 Setup.Build.0 = Release Passthrough|x64
+		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x86 Setup.ActiveCfg = Release Passthrough|x64
 		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|Win32.Build.0 = Debug|Win32
 		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x64.ActiveCfg = Debug|x64
 		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x64.Build.0 = Debug|x64
+		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|Win32.ActiveCfg = Release|Win32
 		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|Win32.Build.0 = Release|Win32
 		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x64.ActiveCfg = Release|x64
 		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x64.Build.0 = Release|x64
+		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x64 Setup.ActiveCfg = Release|x64
+		{4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|Win32.ActiveCfg = Release|Win32
 		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|Win32.Build.0 = Release|Win32
 		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|x64.ActiveCfg = Release|Win32
+		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|x64 Setup.ActiveCfg = Release|Win32
+		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|x86 Setup.ActiveCfg = Release|Win32
+		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|x86 Setup.Build.0 = Release|Win32
 		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.Debug|x64.ActiveCfg = Debug|Win32
+		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.Release|Win32.ActiveCfg = Release|Win32
 		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.Release|x64.ActiveCfg = Release|Win32
+		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.All|Win32.ActiveCfg = Release|x64
 		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.All|x64.ActiveCfg = Release|x64
 		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.All|x64.Build.0 = Release|x64
+		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.All|x64 Setup.ActiveCfg = Release|x64
+		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.All|x64 Setup.Build.0 = Release|x64
+		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.All|x86 Setup.ActiveCfg = Release|x64
 		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Debug|Win32.Build.0 = Debug|Win32
 		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Debug|x64.ActiveCfg = Debug|x64
 		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Debug|x64.Build.0 = Debug|x64
+		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|Win32.ActiveCfg = Release|Win32
 		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|Win32.Build.0 = Release|Win32
 		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x64.ActiveCfg = Release|x64
 		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x64.Build.0 = Release|x64
+		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x64 Setup.ActiveCfg = Release|x64
+		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|Win32.ActiveCfg = Release|Win32
 		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|Win32.Build.0 = Release|Win32
 		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x64.ActiveCfg = Release|Win32
+		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x64 Setup.ActiveCfg = Release|Win32
+		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x86 Setup.ActiveCfg = Release|Win32
+		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x86 Setup.Build.0 = Release|Win32
 		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|Win32.Build.0 = Debug|Win32
 		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64.ActiveCfg = Debug|Win32
 		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64.Build.0 = Debug|Win32
+		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|Win32.ActiveCfg = Release|Win32
 		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|Win32.Build.0 = Release|Win32
 		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64.ActiveCfg = Release|Win32
 		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64.Build.0 = Release|Win32
+		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{9778F1C0-09BC-4698-8EBC-BD982247209A}.All|Win32.ActiveCfg = Release|x64
 		{9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64.ActiveCfg = Release|x64
 		{9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64.Build.0 = Release|x64
+		{9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64 Setup.ActiveCfg = Release|x64
+		{9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64 Setup.Build.0 = Release|x64
+		{9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x86 Setup.ActiveCfg = Release|x64
 		{9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|Win32.Build.0 = Debug|Win32
 		{9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64.ActiveCfg = Debug|x64
 		{9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64.Build.0 = Debug|x64
+		{9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|Win32.ActiveCfg = Release|Win32
 		{9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|Win32.Build.0 = Release|Win32
 		{9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64.ActiveCfg = Release|x64
 		{9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64.Build.0 = Release|x64
+		{9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64 Setup.ActiveCfg = Release|x64
+		{9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|Win32.ActiveCfg = Release|x64
 		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64.ActiveCfg = Release|x64
 		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64.Build.0 = Release|x64
+		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64 Setup.ActiveCfg = Release|x64
+		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64 Setup.Build.0 = Release|x64
+		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x86 Setup.ActiveCfg = Release|x64
 		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Debug|Win32.Build.0 = Debug|Win32
 		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Debug|x64.ActiveCfg = Debug|x64
 		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Debug|x64.Build.0 = Debug|x64
+		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|Win32.ActiveCfg = Release|Win32
 		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|Win32.Build.0 = Release|Win32
 		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|x64.ActiveCfg = Release|x64
 		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|x64.Build.0 = Release|x64
+		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|x64 Setup.ActiveCfg = Release|x64
+		{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.All|Win32.ActiveCfg = Release|Win32
 		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.All|Win32.Build.0 = Release|Win32
 		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.All|x64.ActiveCfg = Release|Win32
+		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.All|x64 Setup.ActiveCfg = Release|Win32
+		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.All|x86 Setup.ActiveCfg = Release|Win32
+		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.All|x86 Setup.Build.0 = Release|Win32
 		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|Win32.ActiveCfg = Debug|Win32
 		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|Win32.Build.0 = Debug|Win32
 		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|x64.ActiveCfg = Debug|x64
 		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|x64.Build.0 = Debug|x64
+		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|Win32.ActiveCfg = Release|Win32
 		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|Win32.Build.0 = Release|Win32
 		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|x64.ActiveCfg = Release|x64
 		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|x64.Build.0 = Release|x64
+		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|x64 Setup.ActiveCfg = Release|x64
+		{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.All|Win32.ActiveCfg = Release|Win32
 		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.All|Win32.Build.0 = Release|Win32
 		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.All|x64.ActiveCfg = Release|Win32
+		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.All|x64 Setup.ActiveCfg = Release|Win32
+		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.All|x86 Setup.ActiveCfg = Release|Win32
+		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.All|x86 Setup.Build.0 = Release|Win32
 		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.Debug|Win32.Build.0 = Debug|Win32
 		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.Debug|x64.ActiveCfg = Debug|x64
 		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.Debug|x64.Build.0 = Debug|x64
+		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.Release|Win32.ActiveCfg = Release|Win32
 		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.Release|Win32.Build.0 = Release|Win32
 		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.Release|x64.ActiveCfg = Release|x64
 		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.Release|x64.Build.0 = Release|x64
+		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.Release|x64 Setup.ActiveCfg = Release|x64
+		{990BAA76-89D3-4E38-8479-C7B28784EFC8}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.All|Win32.ActiveCfg = Release|x64
 		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.All|x64.ActiveCfg = Release|x64
 		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.All|x64.Build.0 = Release|x64
+		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.All|x64 Setup.ActiveCfg = Release|x64
+		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.All|x64 Setup.Build.0 = Release|x64
+		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.All|x86 Setup.ActiveCfg = Release|x64
 		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.Debug|Win32.Build.0 = Debug|Win32
 		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.Debug|x64.ActiveCfg = Debug|x64
 		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.Debug|x64.Build.0 = Debug|x64
+		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.Release|Win32.ActiveCfg = Release|Win32
 		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.Release|Win32.Build.0 = Release|Win32
 		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.Release|x64.ActiveCfg = Release|x64
 		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.Release|x64.Build.0 = Release|x64
+		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.Release|x64 Setup.ActiveCfg = Release|x64
+		{1E21AFE0-6FDB-41D2-942D-863607C24B91}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.All|Win32.ActiveCfg = Release|x64
 		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.All|x64.ActiveCfg = Release|x64
 		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.All|x64.Build.0 = Release|x64
+		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.All|x64 Setup.ActiveCfg = Release|x64
+		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.All|x64 Setup.Build.0 = Release|x64
+		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.All|x86 Setup.ActiveCfg = Release|x64
 		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.Debug|Win32.Build.0 = Debug|Win32
 		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.Debug|x64.ActiveCfg = Debug|x64
 		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.Debug|x64.Build.0 = Debug|x64
+		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.Release|Win32.ActiveCfg = Release|Win32
 		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.Release|Win32.Build.0 = Release|Win32
 		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.Release|x64.ActiveCfg = Release|x64
 		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.Release|x64.Build.0 = Release|x64
+		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.Release|x64 Setup.ActiveCfg = Release|x64
+		{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.All|Win32.ActiveCfg = Release|x64
 		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.All|x64.ActiveCfg = Release|x64
 		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.All|x64.Build.0 = Release|x64
+		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.All|x64 Setup.ActiveCfg = Release|x64
+		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.All|x64 Setup.Build.0 = Release|x64
+		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.All|x86 Setup.ActiveCfg = Release|x64
 		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Debug|Win32.Build.0 = Debug|Win32
 		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Debug|x64.ActiveCfg = Debug|x64
 		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Debug|x64.Build.0 = Debug|x64
+		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Release|Win32.ActiveCfg = Release|Win32
 		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Release|Win32.Build.0 = Release|Win32
 		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Release|x64.ActiveCfg = Release|x64
 		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Release|x64.Build.0 = Release|x64
+		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Release|x64 Setup.ActiveCfg = Release|x64
+		{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.All|Win32.ActiveCfg = Release|x64
 		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.All|x64.ActiveCfg = Release|x64
 		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.All|x64.Build.0 = Release|x64
+		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.All|x64 Setup.ActiveCfg = Release|x64
+		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.All|x64 Setup.Build.0 = Release|x64
+		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.All|x86 Setup.ActiveCfg = Release|x64
 		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.Debug|Win32.Build.0 = Debug|Win32
 		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.Debug|x64.ActiveCfg = Debug|x64
 		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.Debug|x64.Build.0 = Debug|x64
+		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.Release|Win32.ActiveCfg = Release|Win32
 		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.Release|Win32.Build.0 = Release|Win32
 		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.Release|x64.ActiveCfg = Release|x64
 		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.Release|x64.Build.0 = Release|x64
+		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.Release|x64 Setup.ActiveCfg = Release|x64
+		{B4B62169-5AD4-4559-8707-3D933AC5DB39}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.All|Win32.ActiveCfg = Release|x64
 		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.All|x64.ActiveCfg = Release|x64
 		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.All|x64.Build.0 = Release|x64
+		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.All|x64 Setup.ActiveCfg = Release|x64
+		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.All|x64 Setup.Build.0 = Release|x64
+		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.All|x86 Setup.ActiveCfg = Release|x64
 		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Debug|Win32.ActiveCfg = Debug|Win32
 		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Debug|Win32.Build.0 = Debug|Win32
 		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Debug|x64.ActiveCfg = Debug|x64
 		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Debug|x64.Build.0 = Debug|x64
+		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Release|Win32.ActiveCfg = Release|Win32
 		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Release|Win32.Build.0 = Release|Win32
 		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Release|x64.ActiveCfg = Release|x64
 		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Release|x64.Build.0 = Release|x64
+		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Release|x64 Setup.ActiveCfg = Release|x64
+		{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D578E676-7EC8-4548-BD8B-845C635F14AD}.All|Win32.ActiveCfg = Release|Win32
 		{D578E676-7EC8-4548-BD8B-845C635F14AD}.All|Win32.Build.0 = Release|Win32
 		{D578E676-7EC8-4548-BD8B-845C635F14AD}.All|x64.ActiveCfg = Release|Win32
+		{D578E676-7EC8-4548-BD8B-845C635F14AD}.All|x64 Setup.ActiveCfg = Release|Win32
+		{D578E676-7EC8-4548-BD8B-845C635F14AD}.All|x86 Setup.ActiveCfg = Release|Win32
+		{D578E676-7EC8-4548-BD8B-845C635F14AD}.All|x86 Setup.Build.0 = Release|Win32
 		{D578E676-7EC8-4548-BD8B-845C635F14AD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D578E676-7EC8-4548-BD8B-845C635F14AD}.Debug|Win32.Build.0 = Debug|Win32
 		{D578E676-7EC8-4548-BD8B-845C635F14AD}.Debug|x64.ActiveCfg = Debug|Win32
 		{D578E676-7EC8-4548-BD8B-845C635F14AD}.Debug|x64.Build.0 = Debug|Win32
+		{D578E676-7EC8-4548-BD8B-845C635F14AD}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{D578E676-7EC8-4548-BD8B-845C635F14AD}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{D578E676-7EC8-4548-BD8B-845C635F14AD}.Release|Win32.ActiveCfg = Release|Win32
 		{D578E676-7EC8-4548-BD8B-845C635F14AD}.Release|Win32.Build.0 = Release|Win32
 		{D578E676-7EC8-4548-BD8B-845C635F14AD}.Release|x64.ActiveCfg = Release|Win32
 		{D578E676-7EC8-4548-BD8B-845C635F14AD}.Release|x64.Build.0 = Release|Win32
+		{D578E676-7EC8-4548-BD8B-845C635F14AD}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{D578E676-7EC8-4548-BD8B-845C635F14AD}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.All|Win32.ActiveCfg = Release|x64
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.All|x64.ActiveCfg = Release|x64
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.All|x64.Build.0 = Release|x64
+		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.All|x64 Setup.ActiveCfg = Release|x64
+		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.All|x64 Setup.Build.0 = Release|x64
+		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.All|x86 Setup.ActiveCfg = Release|x64
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.Build.0 = Debug|Win32
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|x64.ActiveCfg = Debug|x64
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|x64.Build.0 = Debug|x64
+		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Release|Win32.ActiveCfg = Release|Win32
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Release|Win32.Build.0 = Release|Win32
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Release|x64.ActiveCfg = Release|x64
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Release|x64.Build.0 = Release|x64
+		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Release|x64 Setup.ActiveCfg = Release|x64
+		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.All|Win32.ActiveCfg = Release|x64
 		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.All|x64.ActiveCfg = Release|x64
 		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.All|x64.Build.0 = Release|x64
+		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.All|x64 Setup.ActiveCfg = Release|x64
+		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.All|x64 Setup.Build.0 = Release|x64
+		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.All|x86 Setup.ActiveCfg = Release|x64
 		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.Debug|x64.ActiveCfg = Debug|x64
+		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.Release|Win32.ActiveCfg = Release|Win32
 		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.Release|x64.ActiveCfg = Release|x64
+		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.Release|x64 Setup.ActiveCfg = Release|x64
+		{B889A18E-70A7-44B5-B2C9-47798D4F43B3}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{05C9FB27-480E-4D53-B3B7-7338E2514666}.All|Win32.ActiveCfg = Release|Win32
 		{05C9FB27-480E-4D53-B3B7-7338E2514666}.All|Win32.Build.0 = Release|Win32
 		{05C9FB27-480E-4D53-B3B7-7338E2514666}.All|x64.ActiveCfg = Release|Win32
+		{05C9FB27-480E-4D53-B3B7-7338E2514666}.All|x64 Setup.ActiveCfg = Release|Win32
+		{05C9FB27-480E-4D53-B3B7-7338E2514666}.All|x86 Setup.ActiveCfg = Release|Win32
+		{05C9FB27-480E-4D53-B3B7-7338E2514666}.All|x86 Setup.Build.0 = Release|Win32
 		{05C9FB27-480E-4D53-B3B7-7338E2514666}.Debug|Win32.ActiveCfg = Debug|Win32
 		{05C9FB27-480E-4D53-B3B7-7338E2514666}.Debug|x64.ActiveCfg = Debug|x64
+		{05C9FB27-480E-4D53-B3B7-7338E2514666}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{05C9FB27-480E-4D53-B3B7-7338E2514666}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{05C9FB27-480E-4D53-B3B7-7338E2514666}.Release|Win32.ActiveCfg = Release|Win32
 		{05C9FB27-480E-4D53-B3B7-7338E2514666}.Release|x64.ActiveCfg = Release|x64
+		{05C9FB27-480E-4D53-B3B7-7338E2514666}.Release|x64 Setup.ActiveCfg = Release|x64
+		{05C9FB27-480E-4D53-B3B7-7338E2514666}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.All|Win32.ActiveCfg = Release|x64
 		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.All|x64.ActiveCfg = Release|x64
 		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.All|x64.Build.0 = Release|x64
+		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.All|x64 Setup.ActiveCfg = Release|x64
+		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.All|x64 Setup.Build.0 = Release|x64
+		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.All|x86 Setup.ActiveCfg = Release|x64
 		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.Debug|x64.ActiveCfg = Debug|x64
+		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.Release|Win32.ActiveCfg = Release|Win32
 		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.Release|x64.ActiveCfg = Release|x64
+		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.Release|x64 Setup.ActiveCfg = Release|x64
+		{5C2B4D88-3BEA-4FE0-90DF-FA9836099D5F}.Release|x86 Setup.ActiveCfg = Release|Win32
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.All|Win32.ActiveCfg = Release|x86
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.All|x64.ActiveCfg = Release|x86
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.All|x64 Setup.ActiveCfg = Release|x86
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.All|x86 Setup.ActiveCfg = Release|x86
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.Debug|Win32.ActiveCfg = Debug|x86
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.Debug|x64.ActiveCfg = Debug|x64
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.Debug|x64 Setup.ActiveCfg = Debug|x64
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.Debug|x64 Setup.Build.0 = Debug|x64
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.Debug|x86 Setup.ActiveCfg = Debug|x86
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.Debug|x86 Setup.Build.0 = Debug|x86
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.Release|Win32.ActiveCfg = Release|x86
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.Release|x64.ActiveCfg = Release|x64
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.Release|x64 Setup.ActiveCfg = Release|x64
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.Release|x64 Setup.Build.0 = Release|x64
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.Release|x86 Setup.ActiveCfg = Release|x86
+		{47213370-B933-487D-9F45-BCA26D7E2B6F}.Release|x86 Setup.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Makefile.am b/Makefile.am
index b11e3ff988..944511dac9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -267,7 +267,7 @@ src/include/switch_swigable_cpp.h: $(switch_srcdir)/src/include/switch_cpp.h
 ##
 ## Applications
 ##
-bin_PROGRAMS = freeswitch fs_cli fs_ivrd tone2wav
+bin_PROGRAMS = freeswitch fs_cli fs_ivrd tone2wav fs_encode
 
 ##
 ## fs_cli ()
@@ -281,6 +281,14 @@ fs_cli_CFLAGS += -DHAVE_EDITLINE -I$(switch_srcdir)/libs/libedit/src
 fs_cli_LDADD   = libs/libedit/src/.libs/libedit.a
 endif
 
+##
+## fs_encode ()
+##
+fs_encode_SOURCES = src/fs_encode.c
+fs_encode_CFLAGS = $(AM_CFLAGS)
+fs_encode_LDFLAGS = $(AM_LDFLAGS) $(CORE_LIBS)
+fs_encode_LDADD = libfreeswitch.la
+
 ##
 ## tone2wav ()
 ##
diff --git a/bootstrap.sh b/bootstrap.sh
index 4e65c5ca15..2dd76c409c 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -148,7 +148,7 @@ if [ "x$libtoolize" = "x" ]; then
     exit 1
 fi
 if [ ! -x "$libtoolize" ]; then
-    echo "$libtoolize does not exist or ist not executable"
+    echo "$libtoolize does not exist or is not executable"
     exit 1
 fi
 
diff --git a/build/modules.conf.in b/build/modules.conf.in
index 35ec1bb8a3..87b4718bd4 100644
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -105,5 +105,5 @@ say/mod_say_ru
 #say/mod_say_th
 
 ## Experimental Modules (don't cry if they're broken)
-#../../contrib/mod/endpoints/mod_khomp
+#endpoints/mod_khomp
 #../../contrib/mod/xml_int/mod_xml_odbc
diff --git a/conf/autoload_configs/callcenter.conf.xml b/conf/autoload_configs/callcenter.conf.xml
index 9140193b22..a069413ac6 100644
--- a/conf/autoload_configs/callcenter.conf.xml
+++ b/conf/autoload_configs/callcenter.conf.xml
@@ -13,6 +13,7 @@
       <param name="time-base-score" value="system"/>
       <param name="max-wait-time" value="0"/>
       <param name="max-wait-time-with-no-agent" value="0"/>
+      <param name="max-wait-time-with-no-agent-time-reached" value="5"/>
       <param name="tier-rules-apply" value="false"/>
       <param name="tier-rule-wait-second" value="300"/>
       <param name="tier-rule-wait-multiply-level" value="true"/>
diff --git a/conf/autoload_configs/erlang_event.conf.xml b/conf/autoload_configs/erlang_event.conf.xml
index ec14e21a25..62deb84f67 100644
--- a/conf/autoload_configs/erlang_event.conf.xml
+++ b/conf/autoload_configs/erlang_event.conf.xml
@@ -2,7 +2,16 @@
   <settings>
     <param name="listen-ip" value="0.0.0.0"/>
     <param name="listen-port" value="8031"/>
+    <!-- Specify the first part of the node name
+         (the host part after the @ will be autodetected)
+         OR pass a complete nodename to avoid autodetection
+         eg. freeswitch@example or freeswitch@example.com.
+         If you pass a complete node name, the 'shortname' parameter has no effect. -->
+    <param name="nodename" value="freeswitch"/>
+    <!-- Specify this OR 'cookie-file' or $HOME/.erlang.cookie will be read -->
     <param name="cookie" value="ClueCon"/>
+    <!-- Read a cookie from an arbitary erlang cookie file instead -->
+    <!--<param name="cookie-file" value="/tmp/erlang.cookie"/>-->
     <param name="shortname" value="true"/>
     <!-- in additon to cookie, optionally restrict by ACL -->
     <!--<param name="apply-inbound-acl" value="lan"/>-->
diff --git a/conf/autoload_configs/modules.conf.xml b/conf/autoload_configs/modules.conf.xml
index 37e1b2f891..f5627fe965 100644
--- a/conf/autoload_configs/modules.conf.xml
+++ b/conf/autoload_configs/modules.conf.xml
@@ -1,15 +1,113 @@
 <configuration name="modules.conf" description="Modules">
   <modules>
     
+    <!-- Loggers (I'd load these first) -->
     <load module="mod_console"/>
     <load module="mod_logfile"/>
+    <!-- <load module="mod_syslog"/> -->
+
+    <!--<load module="mod_yaml"/>-->
+
+    <!-- Multi-Faceted -->
+    <!-- mod_enum is a dialplan interface, an application interface and an api command interface -->
+    <load module="mod_enum"/>
+
+    <!-- XML Interfaces -->
+    <!-- <load module="mod_xml_rpc"/> -->
+    <!-- <load module="mod_xml_curl"/> -->
+    <!-- <load module="mod_xml_cdr"/> -->
+
+    <!-- Event Handlers -->
+    <load module="mod_cdr_csv"/>
+    <!-- <load module="mod_event_multicast"/> -->
     <load module="mod_event_socket"/>
+    <!-- <load module="mod_zeroconf"/> -->
+    <!-- <load module="mod_erlang_event"/> -->
+
+    <!-- Directory Interfaces -->
+    <!-- <load module="mod_ldap"/> -->
+
+    <!-- Endpoints -->
+    <!-- <load module="mod_dingaling"/> -->
+    <!-- <load module="mod_portaudio"/> -->
+    <!-- <load module="mod_alsa"/> -->
     <load module="mod_sofia"/>
+    <load module="mod_loopback"/>
+    <!-- <load module="mod_woomera"/> -->
+    <!-- <load module="mod_freetdm"/> -->
+    <!-- <load module="mod_openzap"/> -->
+    <!-- <load module="mod_unicall"/> -->
+    <!-- <load module="mod_skinny"/> -->
+
+    <!-- Applications -->
     <load module="mod_commands"/>
+    <load module="mod_conference"/>
+    <load module="mod_db"/>
     <load module="mod_dptools"/>
     <load module="mod_expr"/>
+    <load module="mod_fifo"/>
+    <load module="mod_hash"/>
+    <load module="mod_voicemail"/>
+    <!--<load module="mod_directory"/>-->
+    <!--<load module="mod_lcr"/>-->
+    <load module="mod_esf"/>
+    <load module="mod_fsv"/>
+    <load module="mod_cluechoo"/>
+    <load module="mod_valet_parking"/>
+    <!--<load module="mod_spy"/>-->
+
+    <!-- SNOM Module -->
+    <!--<load module="mod_snom"/>-->
+
+    <!-- Dialplan Interfaces -->
+    <!-- <load module="mod_dialplan_directory"/> -->
     <load module="mod_dialplan_xml"/>
+    <load module="mod_dialplan_asterisk"/>
+
+    <!-- Codec Interfaces -->
+    <load module="mod_spandsp"/>
+    <load module="mod_g723_1"/>
+    <load module="mod_g729"/>
+    <load module="mod_amr"/>
+    <load module="mod_ilbc"/>
+    <load module="mod_speex"/>
+    <load module="mod_h26x"/>
+    <load module="mod_siren"/>
+    <!--<load module="mod_celt"/>-->
+
+    <!-- File Format Interfaces -->
     <load module="mod_sndfile"/>
     <load module="mod_native_file"/>
+    <!--For icecast/mp3 streams/files-->
+    <!--<load module="mod_shout"/>-->
+    <!--For local streams (play all the files in a directory)-->
+    <load module="mod_local_stream"/>
+    <load module="mod_tone_stream"/>
+    <load module="mod_file_string"/>
+
+    <!-- Timers -->
+
+    <!-- Languages -->
+    <load module="mod_spidermonkey"/>
+    <!-- <load module="mod_perl"/> -->
+    <!-- <load module="mod_python"/> -->
+    <!-- <load module="mod_java"/> -->
+    <load module="mod_lua"/>
+
+    <!-- ASR /TTS -->
+    <!-- <load module="mod_flite"/> -->
+    <!-- <load module="mod_pocketsphinx"/> -->
+    <!-- <load module="mod_cepstral"/> -->
+    <!-- <load module="mod_tts_commandline"/> -->
+    <!-- <load module="mod_rss"/> -->
+    
+    <!-- Say -->
+    <load module="mod_say_en"/>
+    <load module="mod_say_ru"/>
+    <!-- <load module="mod_say_zh"/> -->
+
+    <!-- Third party modules -->
+    <!--<load module="mod_nibblebill"/>-->
+
   </modules>
 </configuration>
diff --git a/conf/autoload_configs/switch.conf.xml b/conf/autoload_configs/switch.conf.xml
index e861b1b61a..896dd0e712 100644
--- a/conf/autoload_configs/switch.conf.xml
+++ b/conf/autoload_configs/switch.conf.xml
@@ -86,6 +86,7 @@
     <!-- <param name="core-db-dsn" value="dsn:username:password" /> -->
     <!-- The system will create all the db schemas automatically, set this to false to avoid this behaviour-->
     <!--<param name="auto-create-schemas" value="true"/>-->
+	 <!-- <param name="core-dbtype" value="MSSQL"/> -->
   </settings>
 
 </configuration>
diff --git a/conf/autoload_configs/voicemail.conf.xml b/conf/autoload_configs/voicemail.conf.xml
index 14ad98b41c..06bd6f6dca 100644
--- a/conf/autoload_configs/voicemail.conf.xml
+++ b/conf/autoload_configs/voicemail.conf.xml
@@ -33,9 +33,10 @@
       <param name="ff-key" value="6"/>
       <param name="rew-key" value="4"/>
       <param name="skip-greet-key" value="#"/>
-      <!--<param name="previous-message-key" value=""/>-->
-      <!--<param name="next-message-key" value=""/>-->
-      <!--<param name="skip-info-key" value=""/>-->
+      <param name="previous-message-key" value="1"/>-->
+      <param name="next-message-key" value="3"/>
+      <param name="skip-info-key" value="*"/>
+      <param name="repeat-message-key" value="0"/>
       <param name="record-silence-threshold" value="200"/>
       <param name="record-silence-hits" value="2"/>
       <param name="web-template-file" value="web-vm.tpl"/>
diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index 8bdcfa0da2..42a3bcc31f 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -95,7 +95,7 @@
     <extension name="global-intercept">
       <condition field="destination_number" expression="^886$">
 	<action application="answer"/>
-	<action application="intercept" data="${hash(select/${domain_name}-last_dial/global)}"/>
+	<action application="intercept" data="${hash(select/${domain_name}-last_dial_ext/global)}"/>
 	<action application="sleep" data="2000"/>
       </condition>
     </extension>
@@ -103,7 +103,7 @@
     <extension name="group-intercept">
       <condition field="destination_number" expression="^\*8$">
 	<action application="answer"/>
-	<action application="intercept" data="${hash(select/${domain_name}-last_dial/${callgroup})}"/>
+	<action application="intercept" data="${hash(select/${domain_name}-last_dial_ext/${callgroup})}"/>
 	<action application="sleep" data="2000"/>
       </condition>
     </extension>
@@ -260,6 +260,8 @@
 	<action application="set" data="continue_on_fail=true"/>
 	<action application="hash" data="insert/${domain_name}-call_return/${dialed_extension}/${caller_id_number}"/>
 	<action application="hash" data="insert/${domain_name}-last_dial_ext/${dialed_extension}/${uuid}"/>
+	<action application="hash" data="insert/${domain_name}-last_dial_ext/${called_party_callgroup}/${uuid}"/>
+	<action application="hash" data="insert/${domain_name}-last_dial_ext/global/${uuid}"/>
 	<action application="set" data="called_party_callgroup=${user_data(${dialed_extension}@${domain_name} var callgroup)}"/>
 	<!--<action application="export" data="nolocal:sip_secure_media=${user_data(${dialed_extension}@${domain_name} var sip_secure_media)}"/>-->
 	<action application="hash" data="insert/${domain_name}-last_dial/${called_party_callgroup}/${uuid}"/>
diff --git a/debian/READ_BEFORE_CHANGING_ANYTHING_IN_HERE b/debian/READ_BEFORE_CHANGING_ANYTHING_IN_HERE
new file mode 100644
index 0000000000..17480db19e
--- /dev/null
+++ b/debian/READ_BEFORE_CHANGING_ANYTHING_IN_HERE
@@ -0,0 +1,29 @@
+Please do not change the maintainer (as found in the control file).
+
+Please DO send me a note before changing anything here.  Also, PLEASE DO MAKE A
+JIRA FIRST !!!!
+
+This request is the result of far too many sleepless nights and far too many
+people breaking this far too often.  So, HANDS OFF FOR NOW !!!!
+
+Again, to be perfectly clear:
+1. Do not make any changes before verifying that they are OK with the current
+maintainer (yes, that is me*).
+
+2. Before the mere idea of making a change crosses your mind, create a ticket in
+Jira and assign it to the current maintainer.
+
+3. As current maintainer, I have other obligations besides fixing things people
+break in the Debian build.  So, please be patient; it can sometimes take a
+bit for me to respond.
+
+4. Creating and maintaining this packages has been a lot of work.  Please help
+me maintain it by not fixing it to death.
+
+5. The maintainer is always right.
+
+6. If you believe the maintainer is wrong, please see item #5.
+
+
+
+* Michal Bielicki <michal.bielicki@seventhsignal.de>
diff --git a/debian/changelog b/debian/changelog
index 7f4e8d7749..8065d932e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,53 @@
+freeswitch (1.0.head~git.master.20101015.1-1) unstable; urgency=low
+
+  * reintroduced mod_flite
+  * disabled the patching stuff introduced by Julien ... needs an overwork
+  * reintroduced mod_tts_commandline
+  * cleaned up rules file and module make rules
+  * more trivial changes and updates :)
+
+ -- Michal Bielicki <michal.bielicki@seventhsignal.de>  Fri, 15 Oct 2010 13:14:02 +0200
+
+freeswitch (1.0.head~git.master.20101014.1-1) unstable; urgency=low
+
+  * replaced mod_openzap with mod_freetdm
+  * added mod_theora
+  * added mod_codec2
+  * added mod_amrwb
+  * added mod_portaudio_stream
+  * cleaned up rules file and module make rules
+  * added patches from Julien Duqene (FS-369)
+  * Various trivial changes and updates :)
+
+ -- Michal Bielicki <michal.bielicki@seventhsignal.de>  Fri, 15 Oct 2010 05:05:02 +0200
+
+freeswitch (1.0.head~git.master.20100601.2-1) unstable; urgency=low
+
+  * Various trivial changes and updates.
+  * Change upstream package version numbering scheme for unreleased versions:
+    new format is major.minor.micro~git.branch.date.commits-1
+  * Change source format to 3.0 (quilt).
+  * Upgrade debhelper compatibility to version 7.
+  * Update maintainer data and copyright file; now includes the full text
+    of the MPL since it is not (yet?) available in /usr/share/common-licenses/
+
+  * Build and install mod_file_string.so (FSBUILD-247)
+  * Work around build failure caused by clean rules for openzap.
+
+  * Remove several libraries from explicit dependencies, there were no special
+    version requirements and they should be picked up by dh_shlibdeps.
+  * Add dh_makeshlibs and make dh_shlibsdeps work again.
+  * Move openssl to Suggests: as it is not a required package to install or
+    run freeswitch.
+
+  * Add upstream-convert rule to apply patches, generate orig tarball
+    and set package version.
+  * Add check to ensure debian patches are applied before attempting build.
+  * Fix clean rule to avoid unwanted tree change before building orig.tar
+    archives with git-buildpackage.
+
+ -- Julien Plissonneau Duquene <exp-end-2010-06-88a41947@aqiii.org>  Tue, 01 Jun 2010 09:53:44 -0400
+
 freeswitch (1.0.6-1ubuntu1) maverick; urgency=low
 
   [ Gabriel Gunderson ]
@@ -15,7 +65,7 @@ freeswitch (1.0.4-1ubuntu2) karmic; urgency=low
     * upgrade: Add more verbosity when building to make it easier to find build
       errors.
     * upgrade: Remove the requirement for EXACTLY automake1.9 and change it to
-      need atleast automake 1.9
+      need at least automake 1.9
     * upgrade: Add the modules (directory, cluechoo, and valet_parking) to the
       build files. These are in the standard build, so they should be here too.
 
@@ -574,7 +624,7 @@ freeswitch (1.0.1-1) unstable; urgency=low
    * ADD: reboot option for sip phones to flush_inboud_reg sofia profile api command
    * FIX: add small padding to end of mp3 to avoid cut off mp3 recording
    * FIX: patch multiple SDP connection lines in sdp for proxy media mode (MODENDP-109)
-   * FIX: don't parse ringback varable in proxy situations
+   * FIX: don't parse ringback variable in proxy situations
    * ADD: per call vm recording ext with vm_message_ext variable
    * ADD: sip_bye_h prefix to add headers to bye
    * ENHANCEMENT: more interfaces available in show fsapi command
@@ -596,7 +646,7 @@ freeswitch (1.0.1~trunk) unstable; urgency=low
      - Added mod_say_es and mod_say_nl
      - Updated descriptions
      - Added mod_cdr_csv
-   * Fixed typos and some errors in the previus patch.
+   * Fixed typos and some errors in the previous patch.
    * Modified monit script. Now it should work.
    * The debian build system now bootstrap automagically if it's necessary and all scripts are in place.
 
diff --git a/debian/compat b/debian/compat
index b8626c4cff..7f8f011eb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 92b4e6ada5..f5068bffe5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,22 @@ Source: freeswitch
 Section: comm
 Priority: extra
 Maintainer: FreeSWITCH developers <freeswitch-dev@lists.freeswitch.org>
-Uploaders: Michal Bielicki <michal.bielicki@voiceworks.pl>, Gabriel Gunderson <gabe@gundy.org>, William King <quentusrex@gmail.com>, Mathieu Parent <sathieu@debian.org>
-Build-Depends: debhelper (>= 5), fakeroot, wget, automake (>=1.9), autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev, libtiff4-dev, python-dev, libx11-dev, uuid-dev
+Uploaders: Michal Bielicki <michal.bielicki@seventhsignal.pl>, Gabriel Gunderson <gabe@gundy.org>, William King <quentusrex@gmail.com>, Mathieu Parent <sathieu@debian.org>
+Build-Depends: debhelper (>= 7), wget, automake (>=1.9), autoconf, libtool,
+ unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev,
+ libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev,
+ libdb-dev, libgnutls-dev, libtiff4-dev, python-dev, libx11-dev, uuid-dev
 Homepage: http://freeswitch.org/
 Standards-Version: 3.9.1
-Vcs-Svn: http://svn.freeswitch.org/svn/freeswitch/trunk/
-Vcs-Browser: http://fisheye.freeswitch.org/browse/FreeSWITCH
+Vcs-Git: git://git.freeswitch.org/freeswitch.git
+Vcs-Browser: http://fisheye.freeswitch.org/browse/freeswitch.git
 
 Package: freeswitch
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, unixodbc, libasound2, libcurl3, openssl, libncurses5, libvorbis0a, libuuid1
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: freeswitch-lang-en
-Suggests: freeswitch-spidermonkey, freeswitch-lua, freeswitch-perl, freeswitch-sounds-music-8000, monit 
+Suggests: freeswitch-spidermonkey, freeswitch-lua, freeswitch-perl,
+ freeswitch-sounds-music-8000, monit, openssl 
 Description: open source telephony platform
  FreeSWITCH is an open source telephony platform designed to facilitate the
  creation of voice and chat driven products scaling from a soft-phone up to a
@@ -48,8 +52,8 @@ Description: development libraries and header files for FreeSWITCH
  gateway or a media server to host IVR applications using simple scripts or XML
  to control the callflow.
  .
- This package contains the include files used if you wish to compile a package which requires FreeSWITCH's
- source file headers. 
+ This package contains the include files used if you wish to compile a package 
+ which require FreeSWITCH's source file headers. 
 
 Package: freeswitch-spidermonkey
 Architecture: any
@@ -123,6 +127,19 @@ Description: pass through AMR codec support for FreeSWITCH
  .
  This package contains the mod_amr codec module.
 
+Package: freeswitch-codec-passthru-amrwb
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
+Description: pass through AMRWB codec support for FreeSWITCH
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to a
+ soft-switch.  It can be used as a simple switching engine, a PBX, a media
+ gateway or a media server to host IVR applications using simple scripts or XML
+ to control the callflow.
+ .
+ This package contains the mod_amrwb codec module.
+
+
 Package: freeswitch-codec-passthru-g729
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
@@ -139,7 +156,8 @@ Package: freeswitch-lang-en
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
 Recommends: freeswitch-sounds-en-us-callie-8000
-Suggests: freeswitch-sounds-en-us-callie-16000, freeswitch-sounds-en-us-callie-32000, freeswitch-sounds-en-us-callie-48000
+Suggests: freeswitch-sounds-en-us-callie-16000, freeswitch-sounds-en-us-callie-32000,
+ freeswitch-sounds-en-us-callie-48000
 Description: English language files for FreeSWITCH
  FreeSWITCH is an open source telephony platform designed to facilitate the
  creation of voice and chat driven products scaling from a soft-phone up to a
@@ -219,7 +237,8 @@ Package: freeswitch-lang-ru
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
 Recommends: freeswitch-sounds-ru-ru-elena-8000
-Suggests: freeswitch-sounds-ru-ru-elena-16000, freeswitch-sounds-ru-ru-elena-32000, freeswitch-sounds-ru-ru-elena-48000
+Suggests: freeswitch-sounds-ru-ru-elena-16000, freeswitch-sounds-ru-ru-elena-32000,
+ freeswitch-sounds-ru-ru-elena-48000
 Description: Russian language files for FreeSWITCH
  FreeSWITCH is an open source telephony platform designed to facilitate the
  creation of voice and chat driven products scaling from a soft-phone up to a
@@ -229,3 +248,18 @@ Description: Russian language files for FreeSWITCH
  .
  This package contains the mod_say_ru module and available language
  configuration files.
+
+Package: freeswitch-freetdm
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
+Description: FreeTDM is a signaling and board API abstraction used mainly by the
+ FreeSWITCH project to place calls in TDM and analog telephony circuits. The library
+ was previously named "OpenZAP". Sangoma has worked along with the FreeSWITCH
+ developers in this library so Sangoma's customers can also use it to do custom
+ development. The library is still under heavy development but the overall API
+ does not change often. The intention of the library is to present a consistent
+ API for different telephony signaling stacks and board I/O APIs.  FreeTDM can
+ either be used as a standalone API or along with FreeSWITCH as an endpoint
+ (mod_freetdm). If you want to use it as a part of FreeSWITCH remember following
+ the FreeSWITCH configuration section.
+ This package contains all the freetdm modules and libs and submodules
diff --git a/debian/copyright b/debian/copyright
index 45eb67b0c9..f95b7df2e0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,51 +1,538 @@
 This package was debianized by Michal Bielicki 
-<michal.bielicki@voiceworks.pl> on Now 25, 2007.
-
-The current Debian maintainer is Nicholas Amorim <nicholas@montrealconsultoria.com.br>
+<michal.bielicki@seventhsignal.de> on Nov 25, 2007.
 
 The source was downloaded from http://www.freewitch.org/
 
-Upstream authors:
-Anthony Minessale II <anthmct@yahoo.com>
-Portions created by the Initial Developer are Copyright (C) 2006-2009
-the Initial Developer. All Rights Reserved.
+Upstream maintainers:
+  Current: Michal Bielicki <michal.bielicki@seventhsignal.de>
+  Past: Nicholas Amorim <nicholas@montrealconsultoria.com.br>
+See changelog.Debian.gz for a full list of contributors.
 
-The PRIMARY AUTHORS are (and/or have been):
+The Initial Developer of the Original Code is
+Anthony Minessale II <anthm@freeswitch.org>
+Portions created by the Initial Developer are Copyright (C)
+ the Initial Developer. All Rights Reserved.
 
- Anthony Minessale II <anthmct@yahoo.com> - Primary developer of all core components
- 	and many of the included modules.  Much of freeswitch is based on his work.
- 
- Michael Jerris <mike@jerris.com> - Windows porter and responsible for the 
-  windows\msvc build system.
+ The PRIMARY AUTHORS are (and/or have been):
+
+  Anthony Minessale II <anthm@freeswitch.org> - Primary developer of all core
+    components and many of the included modules.  Much of freeswitch is based
+    on his work.
+
+  Michael Jerris <mike@jerris.com> - Windows porter and responsible for the
+    windows\msvc build system.
 
 And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
 people who have submitted patches, reported bugs, and generally made Freeswitch
 that much better:
 
- Brian K. West - For countless hours of work on BSD and Mac support, finding countless bugs, and moral support.  Xcode project files.
- Joshua Colp - For his help making mod_exosip possible (which we are now getting rid of but oh well), 
-               and for just being a swell guy! (until he backstabbed us, c'est la vie)
- Michal "cypromis" Bielicki (michal.bielicki  AT voiceworks.pl) - Solaris porting, and autotools enhancements, debian, rpm and solaris packaging.
- James Martelletti <james@nerdc0re.com> - All around cool guy (mod_syslog)
- Johny Kadarisman <jkr888@gmail.com>
- Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com>  -  implementation of mod_cdr (perldd, mysql, csv)
- Stefan Knoblich - Various patches and support.  Thanks.
- Justin Unger - <justinunger at gmail dot com> Lots of help with patches and SIP testing. Thanks! 
- Paul D. Tinsley - Various patches and support. <pdt at jackhammer.org> 
- Ken Rice - <krice AT suspicious.org> - xmlcdr, sofia improvements, load testing.
- Neal Horman <neal at wanlink dot com> - conference improvements, switch_ivr menu additions and other tweaks.
- Johny Kadarisman <jkr888 at gmail.com> - mod_python fixups.
- Michael Murdock <mike at mmurdock dot org> - testing, documentation, bug finding and usability enhancements.
- Matt Klein <mklein@nmedia.net>
- Jonas Gauffin <jonas at gauffin dot org> - Bugfixes and additions in mod_spidermonkey_odbc
- Damjan Jovanovic <moctodliamgtavojtodnajmad backwards> - mod_java
+  Brian K. West - For countless hours of work on BSD and Mac support, finding
+    countless bugs, and moral support.  Xcode project files.
+  Joshua Colp - For his help making mod_exosip possible (which we are now
+    getting rid of but oh well), and for just being a swell guy!
+  Michal "cypromis" Bielicki (michal.bielicki  AT voiceworks.pl) - Solaris
+    porting, and autotools enhancements, debian, rpm and solaris packaging.
+  James Martelletti <james@nerdc0re.com> - All around cool guy (mod_syslog)
+  Johny Kadarisman <jkr888@gmail.com>
+  Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com>  -
+    implementation of mod_cdr (perldd, mysql, csv)
+  Stefan Knoblich - Sofia TLS, various patches and support.  Thanks.
+  Justin Unger - <justinunger at gmail dot com> Lots of help with patches and
+    SIP testing. Thanks! 
+  Paul D. Tinsley - Various patches and support. <pdt at jackhammer.org> 
+  Ken Rice - <krice AT suspicious.org> - xmlcdr, sofia improvements, load
+    testing, 1 liners here and there.
+  Neal Horman <neal at wanlink dot com> - conference improvements, switch_ivr
+    menu additions and other tweaks.
+  Johny Kadarisman <jkr888 at gmail.com> - mod_python fixups.
+  Michael Murdock <mike at mmurdock dot org> - testing, documentation, bug
+    finding and usability enhancements.
+  Matt Klein <mklein@nmedia.net>
+  Jonas Gauffin <jonas at gauffin dot org> - mod_cdr_odbc,
+    mod_spidermonkey_socket, Bugfixes and additions in mod_spidermonkey_odbc and
+    mod_spidermonkey, .net event socket library.
+  Damjan Jovanovic <moctodliamgtavojtodnajmad backwards> - mod_java
+  Juan Jose Comellas <juanjo@comellas.org> - Patch to switch_utils for arg
+    parsing.
+  Dale Thatcher <freeswitch at dalethatcher dot com> - Additions to
+    mod_conference.
+  Simon Perreault & Marc Blanchet from Viagenie.ca - IPv6 Support.
  
 A big THANK YOU goes to:
 
-Justin Cassidy - Build related cleanups and automatic build setup.
-Bret McDanel - Javascript Documentation, constant feedback and input, many other things I am sure I am forgetting.
+  Justin Cassidy - Build related cleanups and automatic build setup.
+  Bret McDanel - Javascript Documentation, constant feedback and input, many
+    other things I am sure I am forgetting.
+
+
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``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 ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
 
-You are free to distribute this software under the terms of
-the MPL Mozilla Public License. On Debian systems, the complete
-text of the GNU General Public License can be found in the file
-'/usr/share/common-licenses/MPL'.
diff --git a/debian/freeswitch-codec-passthru-amrwb.install b/debian/freeswitch-codec-passthru-amrwb.install
new file mode 100644
index 0000000000..022462d001
--- /dev/null
+++ b/debian/freeswitch-codec-passthru-amrwb.install
@@ -0,0 +1 @@
+opt/freeswitch/mod/mod_amrwb.so*
diff --git a/debian/freeswitch-freetdm.conffiles b/debian/freeswitch-freetdm.conffiles
new file mode 100644
index 0000000000..f14e37f3db
--- /dev/null
+++ b/debian/freeswitch-freetdm.conffiles
@@ -0,0 +1,6 @@
+opt/freeswitch/conf/tones.conf
+opt/freeswitch/conf/autoload_configs/freetdm.conf.xml
+opt/freeswitch/conf/pika.conf
+opt/freeswitch/conf/freetdm.conf
+opt/freeswitch/conf/wanpipe.conf
+opt/freeswitch/conf/zt.conf
diff --git a/debian/freeswitch-freetdm.install b/debian/freeswitch-freetdm.install
new file mode 100644
index 0000000000..cdca887dd3
--- /dev/null
+++ b/debian/freeswitch-freetdm.install
@@ -0,0 +1,10 @@
+opt/freeswitch/conf/tones.conf
+opt/freeswitch/conf/autoload_configs/freetdm.conf.xml
+opt/freeswitch/conf/pika.conf
+opt/freeswitch/conf/freetdm.conf
+opt/freeswitch/conf/wanpipe.conf
+opt/freeswitch/conf/zt.conf
+opt/freeswitch/lib/libfreetdm.so*
+opt/freeswitch/mod/mod_freetdm.so*
+opt/freeswitch/mod/ftm*.so*
+
diff --git a/debian/freeswitch-python.config b/debian/freeswitch-python.config
new file mode 100644
index 0000000000..1c1746c875
--- /dev/null
+++ b/debian/freeswitch-python.config
@@ -0,0 +1 @@
+opt/freeswitch/conf/autoload_configs/python.conf.xml
diff --git a/debian/freeswitch-python.install b/debian/freeswitch-python.install
new file mode 100644
index 0000000000..2773f0c780
--- /dev/null
+++ b/debian/freeswitch-python.install
@@ -0,0 +1,3 @@
+opt/freeswitch/conf/autoload_configs/python.conf.xml
+opt/freeswitch/mod/mod_python.so*
+usr/lib/python2.*/*-packages/freeswitch.py*
diff --git a/debian/freeswitch.conffiles b/debian/freeswitch.conffiles
index a6f9ce380f..20da33de15 100644
--- a/debian/freeswitch.conffiles
+++ b/debian/freeswitch.conffiles
@@ -83,10 +83,8 @@
 /opt/freeswitch/conf/ivr_menus/demo_ivr.xml
 /opt/freeswitch/conf/jingle_profiles/client.xml
 /opt/freeswitch/conf/jingle_profiles/server.xml
-/opt/freeswitch/conf/m3ua.conf
 /opt/freeswitch/conf/mime.types
 /opt/freeswitch/conf/notify-voicemail.tpl
-/opt/freeswitch/conf/pika.conf
 /opt/freeswitch/conf/sip_profiles/external/example.xml
 /opt/freeswitch/conf/sip_profiles/external.xml
 /opt/freeswitch/conf/sip_profiles/internal/example.xml
@@ -94,8 +92,6 @@
 /opt/freeswitch/conf/sip_profiles/internal.xml
 /opt/freeswitch/conf/skinny_profiles/internal.xml
 /opt/freeswitch/conf/tetris.ttml
-/opt/freeswitch/conf/tones.conf
 /opt/freeswitch/conf/vars.xml
 /opt/freeswitch/conf/voicemail.tpl
 /opt/freeswitch/conf/web-vm.tpl
-/opt/freeswitch/conf/zt.conf
diff --git a/debian/freeswitch.init b/debian/freeswitch.init
index 36129cbe90..1eb71ac6d6 100755
--- a/debian/freeswitch.init
+++ b/debian/freeswitch.init
@@ -5,7 +5,7 @@
 # Required-Stop:     $network $local_fs $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: The FreeSwitch Voice Switching System
+# Short-Description: The FreeSWITCH Voice Switching System
 # Description:       An advanced platform for voice services
 ### END INIT INFO
 
@@ -16,7 +16,7 @@
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/opt/freeswitch/bin
-DESC="FreeSwitch Voice Switching System"
+DESC="FreeSWITCH Voice Switching System"
 NAME=freeswitch
 DAEMON=/opt/freeswitch/bin/$NAME
 USER=freeswitch
diff --git a/debian/freeswitch.install b/debian/freeswitch.install
index 087d167859..3c838cde94 100644
--- a/debian/freeswitch.install
+++ b/debian/freeswitch.install
@@ -1,9 +1,9 @@
 opt/freeswitch/bin/freeswitch
 opt/freeswitch/bin/fs_cli
+opt/freeswitch/bin/fs_encode
 opt/freeswitch/bin/fs_ivrd
 opt/freeswitch/bin/fsxs
 opt/freeswitch/bin/gentls_cert
-opt/freeswitch/bin/scripts/*
 opt/freeswitch/conf/autoload_configs/acl.conf.xml
 opt/freeswitch/conf/autoload_configs/alsa.conf.xml
 opt/freeswitch/conf/autoload_configs/callcenter.conf.xml
@@ -31,7 +31,6 @@ opt/freeswitch/conf/autoload_configs/memcache.conf.xml
 opt/freeswitch/conf/autoload_configs/modules.conf.xml
 opt/freeswitch/conf/autoload_configs/nibblebill.conf.xml
 opt/freeswitch/conf/autoload_configs/opal.conf.xml
-opt/freeswitch/conf/autoload_configs/openzap.conf.xml
 opt/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml
 opt/freeswitch/conf/autoload_configs/portaudio.conf.xml
 opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml
@@ -91,11 +90,8 @@ opt/freeswitch/conf/fur_elise.ttml
 opt/freeswitch/conf/ivr_menus/demo_ivr.xml
 opt/freeswitch/conf/jingle_profiles/client.xml
 opt/freeswitch/conf/jingle_profiles/server.xml
-opt/freeswitch/conf/m3ua.conf
 opt/freeswitch/conf/mime.types
 opt/freeswitch/conf/notify-voicemail.tpl
-opt/freeswitch/conf/openzap.conf
-opt/freeswitch/conf/pika.conf
 opt/freeswitch/conf/sip_profiles/external/example.xml
 opt/freeswitch/conf/sip_profiles/external.xml
 opt/freeswitch/conf/sip_profiles/internal/example.xml
@@ -103,69 +99,71 @@ opt/freeswitch/conf/sip_profiles/internal-ipv6.xml
 opt/freeswitch/conf/sip_profiles/internal.xml
 opt/freeswitch/conf/skinny_profiles/internal.xml
 opt/freeswitch/conf/tetris.ttml
-opt/freeswitch/conf/tones.conf
 opt/freeswitch/conf/vars.xml
 opt/freeswitch/conf/voicemail.tpl
-opt/freeswitch/conf/wanpipe.conf
 opt/freeswitch/conf/web-vm.tpl
-opt/freeswitch/conf/zt.conf
 opt/freeswitch/htdocs/*
 opt/freeswitch/lib/libfreeswitch*.so*
-opt/freeswitch/lib/libopenzap*.so*
+opt/freeswitch/mod/mod_avmd.so*
+opt/freeswitch/mod/mod_bv.so*
 opt/freeswitch/mod/mod_callcenter.so*
 opt/freeswitch/mod/mod_cdr_csv.so*
 opt/freeswitch/mod/mod_celt.so*
 opt/freeswitch/mod/mod_cidlookup.so*
 opt/freeswitch/mod/mod_cluechoo.so*
+opt/freeswitch/mod/mod_console.so*
+opt/freeswitch/mod/mod_codec2.so*
 opt/freeswitch/mod/mod_commands.so*
 opt/freeswitch/mod/mod_conference.so*
 opt/freeswitch/mod/mod_console.so*
 opt/freeswitch/mod/mod_curl.so*
+opt/freeswitch/mod/mod_db.so*
 opt/freeswitch/mod/mod_dialplan*.so*
 opt/freeswitch/mod/mod_dingaling.so*
 opt/freeswitch/mod/mod_directory.so*
+opt/freeswitch/mod/mod_distributor.so*
 opt/freeswitch/mod/mod_dptools.so*
 opt/freeswitch/mod/mod_easyroute.so*
 opt/freeswitch/mod/mod_enum.so*
 opt/freeswitch/mod/mod_esf.so*
 opt/freeswitch/mod/mod_event_*.so*
 opt/freeswitch/mod/mod_expr.so*
-opt/freeswitch/mod/mod_spandsp.so*
 opt/freeswitch/mod/mod_fifo.so*
+opt/freeswitch/mod/mod_file_string.so*
+opt/freeswitch/mod/mod_flite.so*
 opt/freeswitch/mod/mod_fsv.so*
+opt/freeswitch/mod/mod_hash.so*
 opt/freeswitch/mod/mod_h26x.so*
 opt/freeswitch/mod/mod_ilbc.so*
 opt/freeswitch/mod/mod_lcr.so*
-opt/freeswitch/mod/mod_db.so*
-opt/freeswitch/mod/mod_hash.so*
+opt/freeswitch/mod/mod_limit.so*
 opt/freeswitch/mod/mod_local_stream.so*
 opt/freeswitch/mod/mod_logfile.so*
 opt/freeswitch/mod/mod_loopback.so*
+opt/freeswitch/mod/mod_memcache.so*
+opt/freeswitch/mod/mod_mp4v.so*
 opt/freeswitch/mod/mod_native_file.so*
 opt/freeswitch/mod/mod_nibblebill.so*
-opt/freeswitch/mod/mod_openzap.so
 opt/freeswitch/mod/mod_portaudio.so*
+opt/freeswitch/mod/mod_portaudio_stream.so*
+opt/freeswitch/mod/mod_redis.so*
 opt/freeswitch/mod/mod_rss.so*
 opt/freeswitch/mod/mod_shout.so*
+opt/freeswitch/mod/mod_silk.so*
 opt/freeswitch/mod/mod_siren.so*
 opt/freeswitch/mod/mod_skinny.so*
 opt/freeswitch/mod/mod_skypopen.so*
 opt/freeswitch/mod/mod_sndfile.so*
 opt/freeswitch/mod/mod_snom.so*
 opt/freeswitch/mod/mod_sofia.so*
+opt/freeswitch/mod/mod_spandsp.so*
 opt/freeswitch/mod/mod_speex.so*
 opt/freeswitch/mod/mod_spy.so*
 opt/freeswitch/mod/mod_syslog.so*
+opt/freeswitch/mod/mod_theora.so*
 opt/freeswitch/mod/mod_tone_stream.so*
 opt/freeswitch/mod/mod_tts_commandline.so*
 opt/freeswitch/mod/mod_valet_parking.so*
 opt/freeswitch/mod/mod_vmd.so*
 opt/freeswitch/mod/mod_voicemail.so*
 opt/freeswitch/mod/mod_xml_*.so*
-opt/freeswitch/mod/ozmod_analog_em.so*
-opt/freeswitch/mod/ozmod_analog.so*
-opt/freeswitch/mod/ozmod_isdn.so*
-opt/freeswitch/mod/ozmod_skel.so*
-opt/freeswitch/mod/ozmod_ss7_boost.so*
-opt/freeswitch/mod/ozmod_wanpipe.so*
-opt/freeswitch/mod/ozmod_zt.so*
diff --git a/debian/postinst b/debian/postinst
index 31a2536d4e..696171eb5a 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -24,9 +24,16 @@ case "$1" in
 		if ! getent passwd freeswitch >/dev/null; then
 			adduser --disabled-password  --quiet --system \
 			--home /opt/freeswitch \
-			--gecos "FreeSwitch Voice Platform" --ingroup daemon \
+			--gecos "FreeSWITCH Voice Platform" --ingroup daemon \
 			freeswitch
 			adduser freeswitch audio
+               else
+                       if [ "$(getent passwd freeswitch | cut -d : -f 6)" != "/opt/freeswitch" ]; then
+                               echo "Error: pre-existing freeswitch user with non-standard home directory." >&2
+                               exit 1
+                       fi
+                       usermod -d /opt/freeswitch -c "FreeSWITCH daemon,,," \
+                               -g daemon -G audio freeswitch
 		fi
  
 		mkdir -p /opt/freeswitch
diff --git a/debian/postrm b/debian/postrm
index 9dbbeb0246..97718dfacd 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for openfire
+# postrm script for freeswitch
 #
 # see: dh_installdeb(1)
 
diff --git a/debian/rules b/debian/rules
index 114ad64f34..94aee73a00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,40 +1,40 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# This file is public domain software, originally written by Joey Hess. 
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 export DH_OPTIONS
 export DEB_DH_INSTALL_SOURCEDIR=debian/tmp
-export PASSTHRU_CODEC_MODULES=codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr
+export PASSTHRU_CODEC_MODULES=codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr codecs/mod_amrwb
 # Modules listed by those built by default, then those that are added in this package
-export APPLICATIONS_MODULES=applications/mod_cluechoo applications/mod_commands applications/mod_conference applications/mod_dptools \
-                            applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_fsv \
-                            applications/mod_hash applications/mod_db applications/mod_valet_parking applications/mod_voicemail applications/mod_rss \
-                            applications/mod_spandsp applications/mod_cidlookup applications/mod_curl applications/mod_easyroute \
-			    applications/mod_lcr applications/mod_nibblebill applications/mod_snom \
-			    applications/mod_spy applications/mod_vmd applications/mod_directory applications/mod_callcenter
-export ASR_TTS_MODULES=asr_tts/mod_tts_commandline
-export CODECS_MODULES=codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex codecs/mod_siren codecs/mod_celt
-export DIALPLANS_MODULES=dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml
-export DIRECTORIES_MODULES=
-export DOTNET_MODULES=
-export ENDPOINTS_MODULES=endpoints/mod_dingaling endpoints/mod_portaudio endpoints/mod_sofia \
-			 endpoints/mod_loopback ../../libs/openzap/mod_openzap endpoints/mod_skypopen \
-			 endpoints/mod_skinny
+export APPLICATION_MODULES_AE= applications/mod_avmd applications/mod_callcenter applications/mod_cidlookup applications/mod_cluechoo \
+ applications/mod_commands applications/mod_conference applications/mod_curl applications/mod_db applications/mod_directory \
+ applications/mod_distributor applications/mod_dptools applications/mod_easyroute applications/mod_enum \
+ applications/mod_esf applications/mod_expr 
+export APPLICATION_MODULES_FM= applications/mod_fifo applications/mod_fsv applications/mod_hash applications/mod_lcr applications/mod_limit \
+ applications/mod_memcache 
+export APPLICATION_MODULES_NY= applications/mod_nibblebill applications/mod_redis applications/mod_rss applications/mod_snom \
+ applications/mod_spandsp applications/mod_spy applications/mod_stress \
+ applications/mod_valet_parking applications/mod_vmd applications/mod_voicemail 
+
+export APPLICATIONS_MODULES= $(APPLICATION_MODULES_AE) $(APPLICATION_MODULES_FM) $(APPLICATION_MODULES_NY) $(APPLICATION_MODULES_VZ) 
+export ASR_TTS_MODULES= asr_tts/mod_pocketsphinx  asr_tts/mod_flite asr_tts/mod_tts_commandline
+export CODECS_MODULES= codecs/mod_bv codecs/mod_h26x codecs/mod_speex codecs/mod_celt codecs/mod_codec2 codecs/mod_ilbc codecs/mod_mp4v \
+ codecs/mod_silk codecs/mod_siren codecs/mod_theora 
+export DIALPLANS_MODULES= dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml 
+export ENDPOINTS_MODULES= endpoints/mod_dingaling endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_loopback  \
+ ../../libs/freetdm/mod_freetdm endpoints/mod_skypopen endpoints/mod_skinny 
 export EVENT_HANDLERS_MODULES=event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_cdr_csv
-export FORMATS_MODULES=formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream formats/mod_shout
+export FORMATS_MODULES= formats/mod_file_string formats/mod_local_stream formats/mod_native_file formats/mod_portaudio_stream \
+ formats/mod_shout formats/mod_sndfile formats/mod_tone_stream 
 export LANGUAGES_MODULES=languages/mod_spidermonkey languages/mod_perl languages/mod_lua languages/mod_python
 export LOGGERS_MODULES=loggers/mod_console loggers/mod_logfile loggers/mod_syslog
 export SAY_MODULES=say/mod_say_en say/mod_say_it say/mod_say_de say/mod_say_fr say/mod_say_es say/mod_say_nl say/mod_say_ru
-export TIMERS_MODULES=
-export DISABLED_MODULES=applications/mod_memcache applications/mod_soundtouch directories/mod_ldap languages/mod_java \
-			asr_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe \
-			event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf
 export XML_INT_MODULES=xml_int/mod_xml_rpc  xml_int/mod_xml_curl xml_int/mod_xml_cdr
-export MYMODULES=$(PASSTHRU_CODEC_MODULES) $(APPLICATIONS_MODULES) $(ASR_TTS_MODULES) $(CODECS_MODULES) $(DIALPLANS_MODULES) $(DIRECTORIES_MODULES) $(DOTNET_MODULES) $(ENDPOINTS_MODULES) $(EVENT_HANDLERS_MODULES) $(FORMATS_MODULES) $(LANGUAGES_MODULES) $(LOGGERS_MODULES) $(SAY_MODULES) $(TIMERS_MODULES) $(XML_INT_MODULES)
+export MYMODULES= $(PASSTHRU_CODEC_MODULES) $(APPLICATIONS_MODULES) $(ASR_TTS_MODULES) $(CODECS_MODULES) $(DIALPLANS_MODULES) $(ENDPOINTS_MODULES) $(EVENT_HANDLERS_MODULES) $(FORMATS_MODULES) $(LANGUAGES_MODULES) $(LOGGERS_MODULES) $(SAY_MODULES) $(XML_INT_MODULES)
 export MODULES=$(MYMODULES)
 
+
+
 ifndef AUTOCONF
 	AUTOCONFS := $(wildcard /usr/bin/autoconf*)
 	AUTOCONF = $(shell which autoconf)
@@ -57,6 +57,116 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	FEATURES += --disable-optimization
 endif
 
+.pc/applied-patches:
+	@echo
+	@echo \ \ Sorry, currently this package cannot be built directly from upstream
+	@echo \ \ source git/tarball: patches are needed for policy compliance, and the
+	@echo \ \ "new 3.0 (quilt) source format requires patches to be already applied."
+	@echo
+	@echo \ \ Please first convert this tree by running:
+	@echo -e \\t./debian/rules upstream-convert
+	@echo
+	@echo \ \ Note that this will insert an entry in debian/changelog, rename the
+	@echo \ \ current directory to the version number there, create a .orig.tar.bz2
+	@echo \ \ archive and apply all the patches in debian/patches/series.
+	@echo
+	@echo \ \ Using git-buildpackage is not recommended for now.
+	@echo
+	@exit 1
+
+upstream-convert:
+	@dh_testdir
+	@test -s .pc/applied-patches && \
+		echo "Aborted: patches are already applied." && \
+		exit 1 || exit 0
+	   # update (or not) version number in debian/changelog
+	   @set -e ; \
+			   echo Checking version number ; \
+			   v1="$$(dpkg-parsechangelog | sed -e '/^Version: / ! d' -e 's/^Version: //')" ; \
+			   v2="$${v1}" ; \
+			   echo "  Current version: $${v1}" ; \
+			   if [ "$$(which git)" = "" -o ! -d .git ] ; then \
+					   echo Git not available. Keeping current version number. ; \
+					   exit 0 ; \
+			   fi ; \
+			   if [ "$$(which debchange)" = "" ] ; then \
+					   echo debchange not available. Keeping current version number. ; \
+					   exit 0 ; \
+			   fi ; \
+			   if echo -n "$${v1}" | grep -q '~git\.[a-z0-9]\+\.20[0-9]\{6\}\.[0-9]\+-[^-]\+$$' ; then \
+					   maj1="$$(echo -n "$${v1}" | sed -e 's/^\([^.]\+\)\..*$$/\1/')" ; \
+					   min1="$$(echo -n "$${v1}" | sed -e 's/^[^.]\+\.\([^.]\+\)\..*$$/\1/')" ; \
+					   mic1="$$(echo -n "$${v1}" | sed -e 's/^[^.]\+\.[^.]\+\.\([a-zA-Z0-9]\+\).*$$/\1/')" ; \
+					   b1="$$(echo -n "$${v1}" | sed -e 's/^.*~git\.\([a-z0-9]\+\)\.\(20[0-9]\{6\}\)\.[0-9]\+-[^-]\+$$/\1/')" ; \
+					   d1="$$(echo -n "$${v1}" | sed -e 's/^.*\.\(20[0-9]\{6\}\)\.[0-9]\+-[^-]\+$$/\1/')" ; \
+					   n1="$$(echo -n "$${v1}" | sed -e 's/^.*\.20[0-9]\{6\}\.\([0-9]\+\)-[^-]\+$$/\1/')" ; \
+					   maj2="$$(sed -e '/^AC_SUBST(SWITCH_VERSION_MAJOR/ ! d' -e 's/^.*\[\([^\[]\+\)\][^\]]*$$/\1/' configure.in)" ; \
+					   min2="$$(sed -e '/^AC_SUBST(SWITCH_VERSION_MINOR/ ! d' -e 's/^.*\[\([^\[]\+\)\][^\]]*$$/\1/' configure.in)" ; \
+					   mic2="$$(sed -e '/^AC_SUBST(SWITCH_VERSION_MICRO/ ! d' -e 's/^.*\[\([^\[]\+\)\][^\]]*$$/\1/' configure.in)" ; \
+					   b2="$$(git branch | sed -e '/^[^*]/ d' -e 's/* \(.*\)/\1/')" ; \
+					   d2="$$(TZ=UTC git log --date=local -1 --format='%ai' | sed -e 's/^\(....\).\(..\).\(..\).*$$/\1\2\3/')" ; \
+					   n2="$$(TZ=UTC git log --date=local --format=oneline --since="$${d2::4}-$${d2:4:2}-$${d2:6:2} 00:00" | wc -l)" ; \
+					   if [ "$${b2}" != "$$(echo "$${b2}" | tr -dc a-z0-9)" ] ; then \
+							   echo Invalid branch name "'$${b2}'". Aborted. ; \
+							   exit 1; \
+					   fi ; \
+					   if [ "$${b1}.$${d1}.$${n1}" != "$${b2}.$${d2}.$${n2}" \
+							   -o "$${maj1}.$${min1}.$${mic1}" != "$${maj2}.$${min2}.$${mic2}" ] ; then \
+							   v2="$$(echo -n "$${maj2}.$${min2}.$${mic2}")" ; \
+							   v2="$${v2}$$(echo -n "$${v1}" | sed -e 's/^[^.]\+\.[^.]\+\.[^.]\+\(.*\)~git\..*$$/\1/')" ; \
+							   v2="$${v2}~git.$${b2}.$${d2}.$${n2}-1" ; \
+							   echo "	  New version: $${v2}" ; \
+							   echo Updating debian/changelog with new version number ; \
+							   debchange -v "$${v2}" "New upstream release" ; \
+					   else \
+							   echo Version number already correct, no change. ; \
+					   fi ; \
+			   else \
+					   echo 'Not a ~git. version number. Keeping current version number.' ; \
+			   fi
+	   # rename (or not) current directory to match packagename-version.number
+	   @set -e ; \
+			   echo Checking directory name ; \
+			   d1="$$(basename "$$(cd . && echo "$$PWD")")" ; \
+			   d2="$$(dpkg-parsechangelog | sed -e '/^Source: / ! d' -e 's/^Source: //')" ; \
+			   d2="$${d2}-$$(dpkg-parsechangelog | sed -e '/^Version: / ! d' -e 's/^Version: \(.*\)-[^-]\+$$/\1/')" ; \
+			   if [ "$${d1}" != "$${d2}" ] ; then \
+					   if [ -e "../$${d2}" ] ; then \
+							   test . -ef "../$${d2}" && exit 0 ; \
+							   echo Aborted: directory "../$${d2}" already exists. ; \
+							   exit 1 ; \
+					   fi ; \
+					   echo Renaming current directory to "$${d2}" ; \
+					   mv ../$${d1} ../$${d2} ; \
+			   fi
+	   # create .orig.tar.bz2
+	   @set -e ; \
+			   n="$$(dpkg-parsechangelog | sed -e '/^Source: / ! d' -e 's/^Source: //')" ; \
+			   d="$${n}-$$(dpkg-parsechangelog | sed -e '/^Version: / ! d' -e 's/^Version: \(.*\)-[^-]\+$$/\1/')" ; \
+			   n="$${n}_$$(dpkg-parsechangelog | sed -e '/^Version: / ! d' -e 's/^Version: \(.*\)-[^-]\+$$/\1/').orig.tar.bz2" ; \
+			   echo "Creating source archive $${n}" ; \
+			   cd .. && tar cjf "$${n}" --exclude='.git*' "$${d}"
+	   # apply patches
+	   @set -e ; \
+			   echo "Applying patches in debian/patches/series" ; \
+			   QUILT_PATCHES=debian/patches ; \
+			   export QUILT_PATCHES ; \
+			   while quilt next ; do \
+					   quilt push -v ; \
+					   quilt refresh ; \
+			   done
+	   # remind user to change dir
+	   @echo Done.
+	   @echo
+	   @if [ "$(CURDIR)" != "$$PWD" ] ; then \
+			   echo \ \ You should now tell your shell to update its current working directory: ; \
+			   echo -e \\t'cd $$(pwd)' ; \
+			   echo \ \ or ; \
+			   echo -e "\\tcd $$PWD" ; \
+			   echo ; \
+	   fi
+
+
 config.status: configure
 	dh_testdir
 	rm -f modules.conf
@@ -65,15 +175,12 @@ config.status: configure
 	for i in $(MODULES); do echo $$i >> modules.conf; done
 	./configure --prefix=/opt/freeswitch --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES}
 
-configure:
-	if test ! -f Makefile.in ;  then \
-	    if test -f ./bootstrap.sh ; then \
-		AUTOCONF=${AUTOCONF} ./bootstrap.sh ; \
-	    else \
-		echo "No Makefile.in and no known way to bootstrap." ; \
-		exit 1; \
-	    fi; \
-	fi;
+configure: bootstrap.sh # .pc/applied-patches
+	   dh_testdir
+	   test -e /usr/share/misc/config.sub && cp -f /usr/share/misc/config.sub build/config/config.sub
+	   test -e /usr/share/misc/config.guess && cp -f /usr/share/misc/config.guess build/config/config.guess
+	   AUTOCONF=${AUTOCONF} ./bootstrap.sh
+
 
 build: build-stamp
 build-stamp:  config.status
@@ -83,19 +190,13 @@ build-stamp:  config.status
 
 	touch $@
 
-clean:
+clean:  # .pc/applied-patches
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
 
 	-$(MAKE) update-clean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub build/config/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess build/config/config.guess
-endif
-	rm -f config.status
+	rm -f configure config.status
 	rm -f */*/config.status
 	rm -f */*/*/config.status
 	dh_clean
@@ -103,8 +204,8 @@ endif
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
-	dh_installdirs -A --sourcedir=debian/tmp
+	dh_prep
+	dh_installdirs -A
 
 	VERBOSE=1 $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
@@ -123,11 +224,12 @@ binary-arch: build install
 	cp debian/monit/freeswitch.monitrc debian/freeswitch/etc/monit/freeswitch.monitrc
 	dh_install --sourcedir=debian/tmp
 	dh_link
-	dh_strip --dbg-package=freeswitch
+	dh_strip --dbg-package=freeswitch-dbg
 	dh_compress
 	dh_fixperms --exclude /opt/freeswitch/conf
+	dh_makeshlibs
+	dh_shlibdeps
 	dh_installdeb
-	dh_shlibdeps --exclude=/opt/freeswitch
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
diff --git a/debian/sounds/freeswitch-sounds-en-us-callie/debian/changelog b/debian/sounds/freeswitch-sounds-en-us-callie/debian/changelog
index adb1dfc517..9ca1d1a933 100644
--- a/debian/sounds/freeswitch-sounds-en-us-callie/debian/changelog
+++ b/debian/sounds/freeswitch-sounds-en-us-callie/debian/changelog
@@ -1,3 +1,12 @@
+freeswitch-sounds-en-us-callie  (1.0.head-git.master,20101014.1-1) unstable; urgency=low
+
+  * Change upstream package version numbering scheme for unreleased versions:
+    new format is major.minor.micro~git.branch.date.commits-1
+  * Change source format to 3.0 (quilt).
+  * Upgrade debhelper compatibility to version 7.
+
+ -- Michal Bielicki <michal.bielicki@seventhsignal.de> Fr, 14 Oct 2010 05:05:02 +0200
+
 freeswitch-sounds-en-us-callie (1.0.12-0ubuntu1) jaunty; urgency=low
 
   * Initial: This is the initial working build of the en-us-callie sounds
diff --git a/debian/sounds/freeswitch-sounds-en-us-callie/debian/control b/debian/sounds/freeswitch-sounds-en-us-callie/debian/control
index 1af616adb8..3408328ca1 100644
--- a/debian/sounds/freeswitch-sounds-en-us-callie/debian/control
+++ b/debian/sounds/freeswitch-sounds-en-us-callie/debian/control
@@ -2,8 +2,9 @@ Source: freeswitch-sounds-en-us-callie
 Maintainer: Freeswitch Debian Team <debian@freeswitch.org>
 Section: net
 Priority: extra
-Build-Depends: debhelper (>= 5), fakeroot, sox
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7), sox
+Homepage: http://www.freeswitch.org/
+Standards-Version: 3.8.4
 
 Package: freeswitch-sounds-en-us-callie-8000
 Architecture: all
@@ -47,14 +48,18 @@ Description: English language sounds for the FreeSWITCH(TM) (48000)
 Package: freeswitch-sounds-en-us-callie
 Architecture: all
 Depends: sox, freeswitch-sounds-en-us-callie-48000
-Conflicts: freeswitch-sounds-en-us-callie-omega, freeswitch-sounds-en-us-callie-8000, freeswitch-sounds-en-us-callie-16000, freeswitch-sounds-en-us-callie-32000
+Conflicts: freeswitch-sounds-en-us-callie-omega,
+ freeswitch-sounds-en-us-callie-8000, freeswitch-sounds-en-us-callie-16000,
+ freeswitch-sounds-en-us-callie-32000
 Description: English language files for FreeSWITCH(TM)
  This package generates the 8k, 16k, and 32k from the installed 48k
  sounds. You can select which ones you want.
 
 Package: freeswitch-sounds-en-us-callie-omega
 Architecture: all
-Depends: freeswitch-sounds-en-us-callie-48000, freeswitch-sounds-en-us-callie-32000, freeswitch-sounds-en-us-callie-16000, freeswitch-sounds-en-us-callie-8000
+Depends: freeswitch-sounds-en-us-callie-48000,
+ freeswitch-sounds-en-us-callie-32000, freeswitch-sounds-en-us-callie-16000,
+ freeswitch-sounds-en-us-callie-8000
 Conflicts: freeswitch-sounds-en-us-callie
 Description: English language files for FreeSWITCH(TM)
  This package depends on the pregenerated 8khz, 16khz, 32khz, and 48khz sounds
diff --git a/debian/sounds/freeswitch-sounds-music/debian/changelog b/debian/sounds/freeswitch-sounds-music/debian/changelog
index 5f18ff3277..2d639c0691 100644
--- a/debian/sounds/freeswitch-sounds-music/debian/changelog
+++ b/debian/sounds/freeswitch-sounds-music/debian/changelog
@@ -1,3 +1,12 @@
+freeswitch-sounds-music (1.0.head-git.master,20101014.1-1) unstable; urgency=low
+
+  * Change upstream package version numbering scheme for unreleased versions:
+    new format is major.minor.micro~git.branch.date.commits-1
+  * Change source format to 3.0 (quilt).
+  * Upgrade debhelper compatibility to version 7.
+
+ -- Michal Bielicki <michal.bielicki@seventhsignal.de> Fr, 14 Oct 2010 05:05:02 +0200
+
 freeswitch-sounds-music (1.0.8-0ubuntu3) jaunty; urgency=low
 
   * Fixed: empty binary files for some packages
diff --git a/debian/sounds/freeswitch-sounds-music/debian/control b/debian/sounds/freeswitch-sounds-music/debian/control
index d03c2aa64e..20cfd5e3df 100644
--- a/debian/sounds/freeswitch-sounds-music/debian/control
+++ b/debian/sounds/freeswitch-sounds-music/debian/control
@@ -1,9 +1,10 @@
 Source: freeswitch-sounds-music
-Maintainer: Freeswitch Debian Team <debian@freeswitch.org>
+Maintainer: Freeswitch development Team <freeswitch-dev@freeswitch.org>
 Section: net
 Priority: extra
-Build-Depends: debhelper (>= 5), fakeroot, sox
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7), sox
+Homepage: http://www.freeswitch.org/
+Standards-Version: 3.8.4
 
 Package: freeswitch-sounds-music-8000
 Architecture: all
@@ -47,14 +48,18 @@ Description: music for FreeSWITCH(TM) (48000)
 Package: freeswitch-sounds-music
 Architecture: all
 Depends: sox, freeswitch-sounds-music-48000
-Conflicts: freeswitch-sounds-music-omega, freeswitch-sounds-music-8000, freeswitch-sounds-music-16000, freeswitch-sounds-music-32000
+Conflicts: freeswitch-sounds-music-omega,
+ freeswitch-sounds-music-8000, freeswitch-sounds-music-16000,
+ freeswitch-sounds-music-32000
 Description: Music for FreeSWITCH(TM)
  This package generates the 8k, 16k, and 32k from the installed 48k
  sounds. You can select which ones you want.
 
 Package: freeswitch-sounds-music-omega
 Architecture: all
-Depends: freeswitch-sounds-music-48000, freeswitch-sounds-music-32000, freeswitch-sounds-music-16000, freeswitch-sounds-music-8000
+Depends: freeswitch-sounds-music-48000,
+ freeswitch-sounds-music-32000, freeswitch-sounds-music-16000,
+ freeswitch-sounds-music-8000
 Conflicts: freeswitch-sounds-music
 Description: Music for FreeSWITCH(TM)
  This package depends on the pregenerated 8khz, 16khz, 32khz, and 48khz sounds
diff --git a/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/changelog b/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/changelog
index b7de59226e..38cc529ef6 100644
--- a/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/changelog
+++ b/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/changelog
@@ -1,3 +1,12 @@
+freeswitch-sounds-ru-ru-elena (1.0.head-git.master,20101014.1-1) unstable; urgency=low
+
+  * Change upstream package version numbering scheme for unreleased versions:
+    new format is major.minor.micro~git.branch.date.commits-1
+  * Change source format to 3.0 (quilt).
+  * Upgrade debhelper compatibility to version 7.
+
+ -- Michal Bielicki <michal.bielicki@seventhsignal.de> Fr, 14 Oct 2010 05:05:02 +0200
+
 freeswitch-sounds-ru-ru-elena (1.0.12-0ubuntu3) jaunty; urgency=low
 
   * Fixed: Empty binary package bug caused by the second ru folder being
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000000..163aaf8d82
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/substvars b/debian/substvars
index 62293246ae..e69de29bb2 100644
--- a/debian/substvars
+++ b/debian/substvars
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.6-6), libdb4.4, libgcc1 (>= 1:4.1.1-12), libsasl2-2, libssl0.9.8 (>= 0.9.8c-1), libstdc++6 (>= 4.1.1-12), libuuid1, zlib1g (>= 1:1.2.1)
diff --git a/docs/phrase/phrase_en.xml b/docs/phrase/phrase_en.xml
index 318aba18dd..a028a2aae0 100644
--- a/docs/phrase/phrase_en.xml
+++ b/docs/phrase/phrase_en.xml
@@ -384,14 +384,14 @@
       <prompt phrase="Good morning." filename="ivr-good_morning.wav"/>
       <prompt phrase="Good afternoon." filename="ivr-good_afternoon.wav"/>
       <prompt phrase="Good evening." filename="ivr-good_evening.wav"/>
-      <prompt phrase="Thank you." filename="ivr-Thank you.wav"/>
+      <prompt phrase="Thank you." filename="ivr-Thank_you.wav"/>
       <prompt phrase="For..." filename="ivr-for.wav"/>
       <prompt phrase="We are experiencing longer than usual hold times." filename="ivr-longer_than_usual_hold_times.wav"/>
       <prompt phrase="You are the..." filename="ivr-you_are_the.wav"/>
       <prompt phrase="One moment please." filename="ivr-one_moment_please.wav"/>
       <prompt phrase="Your call will be answered in the order it was received." filename="ivr-call_answered_order_received.wav"/>
       <prompt phrase="Please enter the conference number, followed by the pound key" filename="conf-enter_conf_number.wav"/>
-      <prompt phrase="Enter the conference PIN number, followed by the pound key." filename="ivr-enter_conf_pin.wav"/>
+      <prompt phrase="Enter the conference PIN number, followed by the pound key." filename="conf-enter_conf_pin.wav"/>
       <prompt phrase="...has entered the conference." filename="conf-has_joined.wav"/>
       <prompt phrase="...has left the conference." filename="conf-has_left.wav"/>
       <prompt phrase="You entered..." filename="ivr-you_entered.wav"/>
@@ -403,27 +403,30 @@
       <prompt phrase="If this is correct, press 1. If not, press 2." filename="ivr-if_correct_one_if_not_two.wav"/>
       <prompt phrase="To repeat this information..." filename="ivr-repeat_this_information.wav"/>
       <prompt phrase="No no no!" filename="ivr-no_no_no.wav"/>
-      <prompt phrase="Do you mean to press that key?" filename="ivr-did_you_mean_to_press_key.wav"/>
+      <prompt phrase="Did you mean to press that key?" filename="ivr-did_you_mean_to_press_key.wav"/>
       <prompt phrase="Seriously. Did you REALLY mean to press that key?" filename="ivr-seriously_mean_to_press_key.wav"/>
       <prompt phrase="Oh what-EVER." filename="ivr-oh_whatever.wav"/>
       <prompt phrase="That's it! One more mistake and I WILL hang up on your ass." filename="ivr-one_more_mistake.wav"/>
       <prompt phrase="Congratulations, you pressed star. This does not mean you ARE a star. It simply means that you can press buttons and probably have fingers." filename="ivr-congratulations_you_pressed_star.wav"/>
-      <prompt phrase="All of our engineers are busy assisting other sales guys with demonstrating how cool the CudaTel is. Please stay on the line and your call will be answered in the order it was received." filename="ivr-engineers_busy_assisting_other_sales.wav"/>
+      <prompt phrase="All of our engineers are busy assisting other sales guys with demonstrating how cool the CudaTel is." filename="ivr-engineers_busy_assisting_other_sales.wav"/>
       <prompt phrase="The person you are trying to reach is not available and does not have voicemail." filename="vm-not_available_no_voicemail.wav"/>
       <prompt phrase="This message will self-destruct in 5, 4, 3, 2, 1..." filename="ivr-message_self_destruct.wav"/>
       <prompt phrase="You are already muted." filename="conf-you_are_already_muted.wav"/>
       <prompt phrase="You are now bi-directionally muted." filename="conf-you_are_now_bidirectionally_muted.wav"/>
 	  <prompt phrase="All your call are belong to us." filename="ivr-all_your_call_are_belong_to_us.wav"/>
 	  <prompt phrase="I just love the way you press those touch tones!" filename="ivr-love_those_touch_tones.wav"/>
-	  <prompt phrase="Yes we have no bananas." filename="ivr-yes_we_have_no_bananas.wav"/>
+	  <prompt phrase="Yes, we have no bananas." filename="ivr-yes_we_have_no_bananas.wav"/>
 	  <prompt phrase="Dude, you suck!" filename="ivr-dude_you_suck.wav"/>
 	  <prompt phrase="Your call is very important to us, but your sanity is not, so we will be happy to keep you on hold, forever torturing you with our annoying hold music." filename="ivr-on_hold_indefinitely.wav"/>
 	  <prompt phrase="...has left the building." filename="ivr-has_left_the_building.wav"/>
 	  <prompt phrase="This phone is unassigned and may not be used to make external calls." filename="ivr-phone_is_unassigned.wav"/>
 	  <prompt phrase="This phone is not configured properly." filename="ivr-phone_not_configured.wav"/>
+	  <prompt phrase="Congratulations! This phone is configured properly and may now be assigned to a user." filename="ivr-phone_is_configured_properly.wav"/>
 	  <prompt phrase="Please contact the system administrator for assistance." filename="ivr-contact_system_administrator.wav"/>	
 	  <prompt phrase="Barracuda Networks" filename="ivr-barracuda_networks.wav"/>
 	  <prompt phrase="CudaTel Communication Server" filename="ivr-cudatel_communication_server.wav"/>
+	  <prompt phrase="Please enter the first few letters of the person's first or last name" filename="dir-enter_person_first_or_last.wav"/>
+	  <prompt phrase="There are no calls waiting in this queue." filename="ivr-no_calls_waiting_in_queue.wav"/>
 	  <prompt phrase="Brian West" filename="misc-Brian_West.wav"/>
 	  <prompt phrase="Anthony Minessale" filename="misc-Anthony_Minessale.wav"/>
 	  <prompt phrase="Michael Jerris" filename="misc-Michael_Jerris.wav"/>
@@ -435,7 +438,7 @@
 	  <prompt phrase="Andrew Thompson" filename="misc-Andrew_Thompson.wav"/>
 	  <prompt phrase="Graham Saathoff" filename="misc-Graham_Saathoff.wav"/>
 	  <prompt phrase="Nicholaus Belluni" filename="misc-Nicholaus_Belluni.wav"/>
-	  <prompt phrase="Sean Heiney" filename="misc-Sean_Heiney.wav">
+	  <prompt phrase="Sean Heiney" filename="misc-Sean_Heiney.wav"/>
     </ivr>
     <misc>
       <prompt phrase="This call has been secured" filename="call_secured.wav"/>
diff --git a/freeswitch.spec b/freeswitch.spec
index a2c975b5a9..ceacfbafb2 100644
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -331,7 +331,7 @@ export QA_RPATHS=$[ 0x0001|0x0002 ]
 #
 ######################################################################################################################
 APPLICATION_MODULES_AE="applications/mod_avmd applications/mod_callcenter applications/mod_cidlookup applications/mod_cluechoo \
-                        applications/mod_commands applications/mod_conference applications/mod_db applications/mod_directory \
+                        applications/mod_commands applications/mod_conference applications/mod_curl applications/mod_db applications/mod_directory \
                         applications/mod_distributor applications/mod_dptools applications/mod_easyroute applications/mod_enum \
                         applications/mod_esf applications/mod_expr"
 APPLICATION_MODULES_FM="applications/mod_fifo applications/mod_fsv applications/mod_hash applications/mod_lcr applications/mod_limit \
@@ -753,6 +753,7 @@ fi
 %{prefix}/mod/mod_console.so*
 %{prefix}/mod/mod_commands.so*
 %{prefix}/mod/mod_conference.so*
+%{prefix}/mod/mod_curl.so*
 %{prefix}/mod/mod_db.so*
 %{prefix}/mod/mod_dialplan_asterisk.so* 
 %{prefix}/mod/mod_dialplan_directory.so* 
@@ -949,6 +950,8 @@ fi
 #
 ######################################################################################################################
 %changelog
+* Fri Oct 15 2010 - michal.bielicki@seventhsignal.de
+- added mod_curl
 * Sat Oct 09 2010 - michal.bielicki@seventhsignal.de
 - added mod_silk
 - added mod_codec2
diff --git a/libs/esl/java/Makefile b/libs/esl/java/Makefile
index a1e5f93294..9474a83276 100644
--- a/libs/esl/java/Makefile
+++ b/libs/esl/java/Makefile
@@ -1,4 +1,4 @@
-LOCAL_CFLAGS=-I../src/include -I/usr/java/jdk1.6.0_14/include -I/usr/java/jdk1.6.0_14/include/linux
+LOCAL_CFLAGS=-I../src/include -I/usr/java/jdk1.6.0_14/include -I/usr/java/jdk1.6.0_14/include/linux -I/usr/lib/jvm/java-6-openjdk/include/
 GCC_WARNING_JUNK=-w
 CLASSES=org/freeswitch/esl/*
 
diff --git a/libs/freetdm/.gitignore b/libs/freetdm/.gitignore
index 5018c5311b..2b06b30218 100644
--- a/libs/freetdm/.gitignore
+++ b/libs/freetdm/.gitignore
@@ -11,6 +11,20 @@ config.*
 configure
 libtool
 aclocal.m4
+build/libtool.m4
+build/ltoptions.m4
+build/ltsugar.m4
+build/ltversion.m4
+build/lt~obsolete.m4
+
+testanalog
+testapp
+testboost
+testcid
+testpri
+testr2
+testsangomaboost
+testtones
 
 !/sample/boost/Makefile
 !/sample/dso/Makefile
diff --git a/libs/freetdm/Makefile.am b/libs/freetdm/Makefile.am
index d14013ab9b..bc92e1db58 100644
--- a/libs/freetdm/Makefile.am
+++ b/libs/freetdm/Makefile.am
@@ -29,29 +29,34 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PREFIX = $(prefix)
-SRC    = src
+ACLOCAL_AMFLAGS  = -I build
+AUTOMAKE_OPTIONS = foreign
+
+SRC = src
 
 moddir = @modinstdir@
 libdir = @libdir@
-library_includedir = $(PREFIX)/include
+library_includedir = $(prefix)/include
 
-INCS      = -I$(FT_SRCDIR)/$(SRC)/include -I$(FT_SRCDIR)/$(SRC)/isdn/include -I$(FT_SRCDIR)/$(SRC)/include/private
-INCS +=   -I$(FT_SRCDIR)/$(SRC)/ftmod/ftmod_sangoma_boost
-if SNGSS7
-INCS += -I/usr/include/sng_ss7/
-endif 
-if SNGISDN
-INCS += -I/usr/include/sng_isdn/
+INCS  = -I$(FT_SRCDIR)/$(SRC)/include -I$(FT_SRCDIR)/$(SRC)/include/private
+INCS += -I$(FT_SRCDIR)/$(SRC)/ftmod/ftmod_sangoma_boost
+
+if HAVE_SNG_SS7
+INCS += -I/usr/include/sng_ss7
 endif 
 
-MY_CFLAGS = $(INCS) $(FTDM_CFLAGS) -DFTDM_CONFIG_DIR=\"@confdir@\" -DFTDM_MOD_DIR=\"$(moddir)\" @COMP_VENDOR_CFLAGS@ @DEFS@
-COMPILE   = $(CC) $(MY_CFLAGS) $(INCS)
+if HAVE_SNG_ISDN
+INCS += -I/usr/include/sng_isdn
+endif 
+
+FTDM_COMPAT_CFLAGS = $(INCS) -DFTDM_CONFIG_DIR=\"@confdir@\" -DFTDM_MOD_DIR=\"$(moddir)\" @COMP_VENDOR_COMPAT_CFLAGS@ @DEFS@
+FTDM_CFLAGS = $(INCS) -DFTDM_CONFIG_DIR=\"@confdir@\" -DFTDM_MOD_DIR=\"$(moddir)\" @COMP_VENDOR_CFLAGS@ @DEFS@
+COMPILE   = $(CC) $(FTDM_CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)
-LINK      = $(LIBTOOL) --mode=link --tag=CC $(CC) $(MY_CFLAGS) $(LDFLAGS) -o $@
+LINK      = $(LIBTOOL) --mode=link --tag=CC $(CC) $(FTDM_CFLAGS) $(LDFLAGS) -o $@
 
-if DEBUGDTMF
-MY_CFLAGS += -DFTDM_DEBUG_DTMF
+if WANT_DEBUGDTMF
+FTDM_CFLAGS += -DFTDM_DEBUG_DTMF
 endif
 
 
@@ -68,265 +73,226 @@ pkgconfig_DATA = freetdm.pc
 # libfreetdm
 #
 libfreetdm_la_SOURCES = \
-$(SRC)/hashtable.c \
-$(SRC)/hashtable_itr.c \
-$(SRC)/ftdm_io.c \
-$(SRC)/ftdm_queue.c \
-$(SRC)/ftdm_sched.c \
-$(SRC)/ftdm_call_utils.c \
-$(SRC)/ftdm_config.c \
-$(SRC)/ftdm_callerid.c \
-$(SRC)/fsk.c \
-$(SRC)/uart.c \
-$(SRC)/g711.c \
-$(SRC)/libteletone_detect.c \
-$(SRC)/libteletone_generate.c \
-$(SRC)/ftdm_buffer.c \
-$(SRC)/ftdm_threadmutex.c \
-$(SRC)/ftdm_dso.c \
-$(SRC)/ftdm_cpu_monitor.c
+	$(SRC)/hashtable.c \
+	$(SRC)/hashtable_itr.c \
+	$(SRC)/ftdm_io.c \
+	$(SRC)/ftdm_queue.c \
+	$(SRC)/ftdm_sched.c \
+	$(SRC)/ftdm_call_utils.c \
+	$(SRC)/ftdm_config.c \
+	$(SRC)/ftdm_callerid.c \
+	$(SRC)/fsk.c \
+	$(SRC)/uart.c \
+	$(SRC)/g711.c \
+	$(SRC)/libteletone_detect.c \
+	$(SRC)/libteletone_generate.c \
+	$(SRC)/ftdm_buffer.c \
+	$(SRC)/ftdm_threadmutex.c \
+	$(SRC)/ftdm_dso.c \
+	$(SRC)/ftdm_cpu_monitor.c
 
 library_include_HEADERS = \
-$(SRC)/include/freetdm.h \
-$(SRC)/include/ftdm_declare.h \
-$(SRC)/include/ftdm_threadmutex.h \
-$(SRC)/include/ftdm_os.h \
-$(SRC)/include/ftdm_dso.h 
+	$(SRC)/include/freetdm.h \
+	$(SRC)/include/ftdm_declare.h \
+	$(SRC)/include/ftdm_threadmutex.h \
+	$(SRC)/include/ftdm_os.h \
+	$(SRC)/include/ftdm_dso.h 
 
 lib_LTLIBRARIES	       = libfreetdm.la
-libfreetdm_la_CFLAGS   = $(AM_CFLAGS) $(MY_CFLAGS)
+libfreetdm_la_CFLAGS   = $(AM_CFLAGS) $(FTDM_CFLAGS)
 libfreetdm_la_LDFLAGS  = -version-info 1:0:0 $(AM_LDFLAGS)
 libfreetdm_la_LIBADD   = $(LIBS)
 
-MYLIB = libfreetdm.la
-
 core: libfreetdm.la 
 core-install: install-libLTLIBRARIES
 
 #
 # tools & test programs
 #
-noinst_PROGRAMS = testtones detect_tones detect_dtmf testpri testr2 testanalog testapp testcid #testisdn
-if HAVE_SCTP
-noinst_PROGRAMS += testboost
-endif
+noinst_PROGRAMS  = testtones detect_tones detect_dtmf testpri testr2 testanalog testapp testcid
 noinst_PROGRAMS += testsangomaboost
 
 testapp_SOURCES = $(SRC)/testapp.c
 testapp_LDADD   = libfreetdm.la
-testapp_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+testapp_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 
 testcid_SOURCES = $(SRC)/testcid.c
 testcid_LDADD   = libfreetdm.la
-testcid_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+testcid_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 
 testtones_SOURCES = $(SRC)/testtones.c
 testtones_LDADD   = libfreetdm.la
-testtones_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+testtones_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 
 detect_tones_SOURCES = $(SRC)/detect_tones.c
 detect_tones_LDADD   = libfreetdm.la
-detect_tones_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+detect_tones_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 
 detect_dtmf_SOURCES = $(SRC)/detect_dtmf.c
 detect_dtmf_LDADD   = libfreetdm.la
-detect_dtmf_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+detect_dtmf_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 
 #testisdn_SOURCES = $(SRC)/testisdn.c
 #testisdn_LDADD   = libfreetdm.la
-#testisdn_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+#testisdn_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 
 testpri_SOURCES = $(SRC)/testpri.c
 testpri_LDADD   = libfreetdm.la
-testpri_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+testpri_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 
 testr2_SOURCES = $(SRC)/testr2.c
 testr2_LDADD   = libfreetdm.la
-testr2_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+testr2_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 
 if HAVE_SCTP
+noinst_PROGRAMS  += testboost
 testboost_SOURCES = $(SRC)/testboost.c
 testboost_LDADD   = libfreetdm.la
-testboost_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+testboost_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 endif
 
 testsangomaboost_SOURCES = $(SRC)/testsangomaboost.c
 testsangomaboost_LDADD   = libfreetdm.la
-testsangomaboost_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+testsangomaboost_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 
 testanalog_SOURCES = $(SRC)/testanalog.c
 testanalog_LDADD   = libfreetdm.la
-testanalog_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+testanalog_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 
 #
 # ftmod modules
 #
-mod_LTLIBRARIES = ftmod_zt.la ftmod_skel.la ftmod_analog.la ftmod_analog_em.la #ftmod_isdn.la
-
-
-if HAVE_SCTP 
-mod_LTLIBRARIES += ftmod_sangoma_boost.la
-endif
-
-if LIBSANGOMA
-mod_LTLIBRARIES += ftmod_wanpipe.la
-endif
-
-if LIBPRI
-mod_LTLIBRARIES += ftmod_libpri.la
-endif
-
-if PRITAP
-mod_LTLIBRARIES += ftmod_pritap.la
-endif
-
-if SNGSS7
-mod_LTLIBRARIES += ftmod_sangoma_ss7.la
-endif
-
-if SNGISDN
-mod_LTLIBRARIES += ftmod_sangoma_isdn.la
-endif
-
-if OPENR2
-mod_LTLIBRARIES += ftmod_r2.la
-endif
+mod_LTLIBRARIES = ftmod_zt.la ftmod_skel.la ftmod_analog.la ftmod_analog_em.la
 
 ftmod_zt_la_SOURCES = $(SRC)/ftmod/ftmod_zt/ftmod_zt.c
-ftmod_zt_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
-ftmod_zt_la_LDFLAGS = -module -avoid-version
-ftmod_zt_la_LIBADD  = $(MYLIB)
+ftmod_zt_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_zt_la_LDFLAGS = -shared -module -avoid-version
+ftmod_zt_la_LIBADD  = libfreetdm.la
 
 ftmod_skel_la_SOURCES = $(SRC)/ftmod/ftmod_skel/ftmod_skel.c
-ftmod_skel_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+ftmod_skel_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 ftmod_skel_la_LDFLAGS = -module -avoid-version
-ftmod_skel_la_LIBADD  = $(MYLIB)
-
-if LIBSANGOMA
-ftmod_wanpipe_la_SOURCES = $(SRC)/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
-ftmod_wanpipe_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS) -D__LINUX__ -I/usr/include/wanpipe
-ftmod_wanpipe_la_LDFLAGS = -module -avoid-version -lsangoma
-ftmod_wanpipe_la_LIBADD  = $(MYLIB)
-endif
-
-#ftmod_isdn_la_SOURCES = \
-#$(SRC)/isdn/EuroISDNStateNT.c \
-#$(SRC)/isdn/EuroISDNStateTE.c \
-#$(SRC)/isdn/mfifo.c \
-#$(SRC)/isdn/Q921.c \
-#$(SRC)/isdn/Q931api.c \
-#$(SRC)/isdn/Q931.c \
-#$(SRC)/isdn/Q931ie.c \
-#$(SRC)/isdn/Q931mes.c \
-#$(SRC)/isdn/Q931StateNT.c \
-#$(SRC)/isdn/Q931StateTE.c \
-#$(SRC)/isdn/nationalmes.c \
-#$(SRC)/isdn/nationalStateNT.c \
-#$(SRC)/isdn/nationalStateTE.c \
-#$(SRC)/isdn/DMSmes.c \
-#$(SRC)/isdn/DMSStateNT.c \
-#$(SRC)/isdn/DMSStateTE.c \
-#$(SRC)/isdn/5ESSmes.c \
-#$(SRC)/isdn/5ESSStateNT.c \
-#$(SRC)/isdn/5ESSStateTE.c \
-#$(SRC)/isdn/Q932mes.c \
-#$(SRC)/ftmod/ftmod_isdn/ftmod_isdn.c
-
-#ftmod_isdn_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE
-#ftmod_isdn_la_LDFLAGS = $(PCAP_LIB_FLAGS) -module -avoid-version
-#ftmod_isdn_la_LIBADD  = $(MYLIB)
+ftmod_skel_la_LIBADD  = libfreetdm.la
 
 ftmod_analog_la_SOURCES = $(SRC)/ftmod/ftmod_analog/ftmod_analog.c
-ftmod_analog_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
-ftmod_analog_la_LDFLAGS = -module -avoid-version
-ftmod_analog_la_LIBADD  = $(MYLIB)
+ftmod_analog_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_analog_la_LDFLAGS = -shared -module -avoid-version
+ftmod_analog_la_LIBADD  = libfreetdm.la
 
 ftmod_analog_em_la_SOURCES = $(SRC)/ftmod/ftmod_analog_em/ftmod_analog_em.c
-ftmod_analog_em_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
-ftmod_analog_em_la_LDFLAGS = -module -avoid-version
-ftmod_analog_em_la_LIBADD  = $(MYLIB)
+ftmod_analog_em_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_analog_em_la_LDFLAGS = -shared -module -avoid-version
+ftmod_analog_em_la_LIBADD  = libfreetdm.la
+
+if HAVE_LIBSANGOMA
+mod_LTLIBRARIES += ftmod_wanpipe.la
+ftmod_wanpipe_la_SOURCES = $(SRC)/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
+#some structures within Wanpipe drivers are not c99 compatible, so we need to compile ftmod_wanpipe
+#without c99 flags
+ftmod_wanpipe_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_COMPAT_CFLAGS) -D__LINUX__ -I/usr/include/wanpipe
+ftmod_wanpipe_la_LDFLAGS = -shared -module -avoid-version -lsangoma
+ftmod_wanpipe_la_LIBADD  = libfreetdm.la
+endif
+
+if HAVE_LIBISDN
+mod_LTLIBRARIES += ftmod_isdn.la
+ftmod_isdn_la_SOURCES  = $(SRC)/ftmod/ftmod_isdn/ftmod_isdn.c
+ftmod_isdn_la_CFLAGS   = $(AM_CFLAGS) $(FTDM_CFLAGS) -D_GNU_SOURCE $(LIBISDN_CPPFLAGS) $(PCAP_CPPFLAGS)
+ftmod_isdn_la_LDFLAGS  = -shared -module -avoid-version $(LIBISDN_LDFLAGS) $(PCAP_LDFLAGS)
+ftmod_isdn_la_LIBADD   = libfreetdm.la $(LIBISDN_LIBS) $(PCAP_LIBS)
+endif
 
 if HAVE_SCTP
+mod_LTLIBRARIES += ftmod_sangoma_boost.la
 ftmod_sangoma_boost_la_SOURCES = $(SRC)/ftmod/ftmod_sangoma_boost/sangoma_boost_client.c $(SRC)/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
-ftmod_sangoma_boost_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
-ftmod_sangoma_boost_la_LDFLAGS = -module -avoid-version
-ftmod_sangoma_boost_la_LIBADD  = $(MYLIB)
+ftmod_sangoma_boost_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_sangoma_boost_la_LDFLAGS = -shared -module -avoid-version
+ftmod_sangoma_boost_la_LIBADD  = libfreetdm.la
 endif
 
-if LIBPRI
+if HAVE_LIBPRI
+mod_LTLIBRARIES += ftmod_libpri.la
 ftmod_libpri_la_SOURCES = $(SRC)/ftmod/ftmod_libpri/ftmod_libpri.c $(SRC)/ftmod/ftmod_libpri/lpwrap_pri.c
-ftmod_libpri_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
-ftmod_libpri_la_LDFLAGS = -module  -avoid-version -lpri
-ftmod_libpri_la_LIBADD  = $(MYLIB)
+ftmod_libpri_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_libpri_la_LDFLAGS = -shared -module -avoid-version -lpri
+ftmod_libpri_la_LIBADD  = libfreetdm.la
 endif
 
-if PRITAP
+if HAVE_PRITAP
+mod_LTLIBRARIES += ftmod_pritap.la
 ftmod_pritap_la_SOURCES = $(SRC)/ftmod/ftmod_pritap/ftmod_pritap.c 
-ftmod_pritap_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
-ftmod_pritap_la_LDFLAGS = -module  -avoid-version -lpri
-ftmod_pritap_la_LIBADD  = $(MYLIB)
+ftmod_pritap_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_pritap_la_LDFLAGS = -shared -module -avoid-version -lpri
+ftmod_pritap_la_LIBADD  = libfreetdm.la
 endif
 
-if SNGSS7
-ftmod_sangoma_ss7_la_SOURCES =	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c \
-								$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c \
-								$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c \
-								$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_in.c \
-								$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c \
-								$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cntrl.c \
-								$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c \
-								$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c \
-								$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c \
-								$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c \
-								$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_sta.c \
-								$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_sts.c \
-								$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c
-ftmod_sangoma_ss7_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE
-ftmod_sangoma_ss7_la_LDFLAGS = -module  -avoid-version -lsng_ss7
-ftmod_sangoma_ss7_la_LIBADD  = $(MYLIB)
+if HAVE_SNG_SS7
+mod_LTLIBRARIES += ftmod_sangoma_ss7.la
+ftmod_sangoma_ss7_la_SOURCES = \
+	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c \
+	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c \
+	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c \
+	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_in.c \
+	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c \
+	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cntrl.c \
+	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c \
+	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c \
+	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c \
+	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c \
+	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_sta.c \
+	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_sts.c \
+	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c
+
+ftmod_sangoma_ss7_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS) -D_GNU_SOURCE
+ftmod_sangoma_ss7_la_LDFLAGS = -shared -module -avoid-version -lsng_ss7
+ftmod_sangoma_ss7_la_LIBADD  = libfreetdm.la
 endif
 
-if SNGISDN
-ftmod_sangoma_isdn_la_SOURCES = $(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c \
-				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c \
-				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cntrl.c \
-				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c \
-				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c \
-				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c \
-				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c \
-				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c \
-				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c \
-				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
+if HAVE_SNG_ISDN
+mod_LTLIBRARIES += ftmod_sangoma_isdn.la
+ftmod_sangoma_isdn_la_SOURCES = \
+	$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c \
+	$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c \
+	$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cntrl.c \
+	$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c \
+	$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c \
+	$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c \
+	$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c \
+	$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c \
+	$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c \
+	$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
 
-
-ftmod_sangoma_isdn_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE
-ftmod_sangoma_isdn_la_LDFLAGS = -module -avoid-version -lsng_isdn
-ftmod_sangoma_isdn_la_LIBADD  = $(MYLIB)
+ftmod_sangoma_isdn_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS) -D_GNU_SOURCE
+ftmod_sangoma_isdn_la_LDFLAGS = -shared -module -avoid-version -lsng_isdn
+ftmod_sangoma_isdn_la_LIBADD  = libfreetdm.la
 endif
 
-if OPENR2
+if HAVE_OPENR2
+mod_LTLIBRARIES += ftmod_r2.la
 ftmod_r2_la_SOURCES = $(SRC)/ftmod/ftmod_r2/ftmod_r2.c 
-ftmod_r2_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
-ftmod_r2_la_LDFLAGS = -module  -avoid-version -lopenr2
-ftmod_r2_la_LIBADD  = $(MYLIB)
+ftmod_r2_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_r2_la_LDFLAGS = -shared -module -avoid-version -lopenr2
+ftmod_r2_la_LIBADD  = libfreetdm.la
 endif
 
 dox doxygen:
 	doxygen $(FT_SRCDIR)/docs/Doxygen.conf
 
-mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN): $(MYLIB) mod_freetdm/mod_freetdm.c
-	cd mod_freetdm && make
+mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN): libfreetdm.la mod_freetdm/mod_freetdm.c
+	$(MAKE) -C mod_freetdm
 
 mod_freetdm: mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN)
 
 mod_freetdm-install: mod_freetdm
-	cd mod_freetdm && make install
+	$(MAKE) -C mod_freetdm install
 
 mod_freetdm-clean:
-	@if [ -f mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN) ] ; then cd mod_freetdm && make clean ; fi
+	@if [ -f mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN) ] ; then \
+		$(MAKE) -C mod_freetdm clean ; \
+	fi
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(PREFIX)
+	$(mkinstalldirs) $(DESTDIR)$(prefix)
 	$(mkinstalldirs) $(DESTDIR)@confdir@
 	@[ -f "$(DESTDIR)@confdir@/freetdm.conf" ] || ( cp conf/*.conf $(DESTDIR)@confdir@)
 	@echo FreeTDM Installed
diff --git a/libs/freetdm/build/ax_compiler_vendor.m4 b/libs/freetdm/build/ax_compiler_vendor.m4
new file mode 100644
index 0000000000..a24a58da0f
--- /dev/null
+++ b/libs/freetdm/build/ax_compiler_vendor.m4
@@ -0,0 +1,15 @@
+AC_DEFUN([AX_COMPILER_VENDOR],
+[
+AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
+ [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
+  # note: don't check for gcc first since some other compilers define __GNUC__
+  for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
+    vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
+#if !($vencpp)
+      thisisanerror;
+#endif
+])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
+  done
+ ])
+])
diff --git a/libs/freetdm/build/libpcap.m4 b/libs/freetdm/build/libpcap.m4
index c20d345ca6..ea7581e69b 100644
--- a/libs/freetdm/build/libpcap.m4
+++ b/libs/freetdm/build/libpcap.m4
@@ -2,6 +2,10 @@ dnl libpcap.m4--PCAP libraries and includes
 dnl Derrick Brashear
 dnl from KTH krb and Arla
 dnl $Id: libpcap.m4,v 1.4 2006/01/20 20:21:09 snsimon Exp $
+dnl 2010/10/31 (stkn):
+dnl 	rename: PCAP_INC_FLAGS -> PCAP_CPPFLAGS
+dnl 	rename: PCAP_LIB_FLAGS -> PCAP_LDFLAGS	(-L flags only)
+dnl 	add:    PCAP_LIBS (libs only)
 
 AC_DEFUN([PCAP_INC_WHERE1], [
 ac_cv_found_pcap_inc=no
@@ -129,12 +133,14 @@ AC_ARG_WITH(pcap-include,
 	  AC_MSG_RESULT(yes)
 	  PCAP_INC_DIR=$ac_cv_pcap_where_inc
 	  PCAP_LIB_DIR=$ac_cv_pcap_where_lib
-	  PCAP_INC_FLAGS="-I${PCAP_INC_DIR}"
-	  PCAP_LIB_FLAGS="-L${PCAP_LIB_DIR} -lpcap"
+	  PCAP_CPPFLAGS="-I${PCAP_INC_DIR}"
+	  PCAP_LDFLAGS="-L${PCAP_LIB_DIR}"
+	  PCAP_LIBS="-lpcap"
 	  AC_SUBST(PCAP_INC_DIR)
 	  AC_SUBST(PCAP_LIB_DIR)
-	  AC_SUBST(PCAP_INC_FLAGS)
-	  AC_SUBST(PCAP_LIB_FLAGS)
+	  AC_SUBST(PCAP_CPPFLAGS)
+	  AC_SUBST(PCAP_LDFLAGS)
+	  AC_SUBST(PCAP_LIBS)
 	  AC_DEFINE([HAVE_LIBPCAP],[1],[libpcap])
         else
 	  ac_cv_found_pcap=no
diff --git a/libs/freetdm/configure.ac b/libs/freetdm/configure.ac
index 18f83d8f1d..8b878edc09 100644
--- a/libs/freetdm/configure.ac
+++ b/libs/freetdm/configure.ac
@@ -1,119 +1,120 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.59)
-AC_INIT([freetdm],[pre-alpha],[bugs@freeswitch.org])
+AC_PREREQ([2.59])
+AC_INIT([freetdm], [pre-alpha], [bugs@freeswitch.org])
 AC_CONFIG_SRCDIR([src/ftdm_io.c])
 
-AC_CONFIG_AUX_DIR(build)
-AM_INIT_AUTOMAKE(libfreetdm,0.1)
+AC_CONFIG_AUX_DIR([build])
+AC_CONFIG_MACRO_DIR([build])
+AM_INIT_AUTOMAKE([libfreetdm], [0.1])
+
+# >=automake-1.11
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+# override some default libtool behavior and invoke AC_PROG_LIBTOOL
+# (see http://lists.gnu.org/archive/html/libtool/2007-03/msg00000.html)
+m4_defun([_LT_AC_LANG_F77_CONFIG], [:])
+m4_defun([_LT_AC_LANG_GCJ_CONFIG], [:])
+m4_defun([_LT_AC_LANG_RC_CONFIG], [:])
 
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_MAKE_SET
 AM_PROG_CC_C_O
+AC_PROG_LIBTOOL
+AC_PROG_INSTALL
+PKG_PROG_PKG_CONFIG
 
-AC_PREFIX_DEFAULT(/usr/local/freetdm)
-# AC_PREFIX_DEFAULT does not get expanded until too late so we need to do this to use prefix in this script                                                     
-if test "x$prefix" = "xNONE" ; then
-    prefix='/usr/local/freetdm'
+AX_COMPILER_VENDOR
+
+# AC_PREFIX_DEFAULT does not get expanded until too late so we need
+# to do this to use prefix in this script
+AC_PREFIX_DEFAULT([/usr/local/freetdm])
+if test "x${prefix}" = "xNONE" ; then
+	prefix='/usr/local/freetdm'
 fi
 
 # Absolute source/build directory
 FT_SRCDIR=`(cd $srcdir && pwd)`
 ft_builddir=`pwd`
-AC_SUBST(FT_SRCDIR)
-AC_SUBST(ft_builddir)
+AC_SUBST([FT_SRCDIR])
+AC_SUBST([ft_builddir])
 
 if test "$sysconfdir" = "\${prefix}/etc" ; then
-    confdir="$prefix/conf"
+	confdir="$prefix/conf"
 else
-    confdir="$sysconfdir"
+	confdir="$sysconfdir"
 fi
 
-AC_SUBST(confdir)
+AC_SUBST([confdir])
 
-#override some default libtool behavior and invoke AC_PROG_LIBTOOL (see http://lists.gnu.org/archive/html/libtool/2007-03/msg00000.html)
-m4_defun([_LT_AC_LANG_F77_CONFIG], [:])
-m4_defun([_LT_AC_LANG_GCJ_CONFIG], [:])
-m4_defun([_LT_AC_LANG_RC_CONFIG], [:])
-#AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
-AC_PROG_INSTALL
+# Where to install the modules
+AC_ARG_WITH([modinstdir],
+	[AS_HELP_STRING([--with-modinstdir=DIR], [Install modules into this location (default: ${prefix}/mod)])],
+	[case "${withval}" in
+	 no|yes) AC_MSG_ERROR([Invalid value \"${withval}\", option requires a valid path]) ;;
+	 *)	 modinstdir="${withval}" ;;
+	 esac],
+	[modinstdir="${prefix}/mod"]
+)
+AC_SUBST([modinstdir])
 
-# Check for com;iler type
-AC_DEFUN([AX_COMPILER_VENDOR],
-[
-AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
- [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
-  # note: don't check for GCC first, since some other compilers define __GNUC__
-  for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
-	vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
-#if !($vencpp)
-      thisisanerror;
-#endif
-])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
-  done
- ])
-])
-AC_ARG_ENABLE([enable_64], [AS_HELP_STRING([--enable-64], [Enable 64bit compilation])], [enable_64="$enableval"], [enable_64="no"])
-
-AX_COMPILER_VENDOR
+AC_ARG_ENABLE([enable_64],
+	[AS_HELP_STRING([--enable-64], [Enable 64bit compilation])],
+	[enable_64="${enableval}"],
+	[enable_64="no"]
+)
 
 case "${ax_cv_c_compiler_vendor}" in
 gnu)
-    COMP_VENDOR_CFLAGS="-ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0"
-    ;;
+	COMP_VENDOR_CFLAGS="-ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0"
+	;;
 sun)
-    COMP_VENDOR_CFLAGS="-xc99=all -mt -xCC -D__FUNCTION__=__func__ -xvpara"
-    if test "$enable_64" = "yes" ; then
-        COMP_VENDOR_CFLAGS="-m64 $COMP_VENDOR_CFLAGS"
-    fi
-    ;;
+	COMP_VENDOR_CFLAGS="-xc99=all -mt -xCC -D__FUNCTION__=__func__ -xvpara"
+	if test "$enable_64" != "no" ; then
+		COMP_VENDOR_CFLAGS="-m64 $COMP_VENDOR_CFLAGS"
+	fi
+	;;
 *)
-    COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes"
-    ;;
+	COMP_VENDOR_COMPAT_CFLAGS="-Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes"
+	COMP_VENDOR_CFLAGS="-std=c99 $COMP_VENDOR_COMPAT_CFLAGS"
+	;;
 esac
+AC_SUBST([COMP_VENDOR_COMPAT_CFLAGS])
+AC_SUBST([COMP_VENDOR_CFLAGS])
 
 
-#set SOLINK variable based on compiler and host
-if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
-    SOLINK="-Bdynamic -dy -G"
-elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
-    case "$host" in
-        *darwin*)
-            SOLINK="-dynamic -bundle -force-flat-namespace"
-        ;;
-        *-solaris2*)
-            SOLINK="-shared -Xlinker"
-        ;;
-        *)
-            SOLINK="-shared -Xlinker -x"
-        ;;
-    esac
-else
-    AC_ERROR([Please update configure.in with SOLINK values for your compiler])
+#  Enable debugging
+AC_ARG_ENABLE([debug],
+	[AC_HELP_STRING([--enable-debug], [build with debug information])],
+	[enable_debug="${enableval}"],
+	[enable_debug="yes"]
+)
+if test "${enable_debug}" != "no"; then
+        AC_DEFINE([DEBUG], [], [Enable extra debugging.])
+
+	if test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+		COMP_VENDOR_CFLAGS="$COMP_VENDOR_CFLAGS -g -ggdb"
+	fi
 fi
+AC_SUBST([COMP_VENDOR_CFLAGS])
 
 # set DYNAMIC_LIB_EXTEN
 # we should really be using libtool so we don't need to do this
 case "$host" in
-    *cygwin* | *mingw*)
-        DYNAMIC_LIB_EXTEN="dll"
-    ;;
-    *)
-        DYNAMIC_LIB_EXTEN="so"
-    ;;
+*cygwin* | *mingw*)
+	DYNAMIC_LIB_EXTEN="dll"
+	;;
+*)
+	DYNAMIC_LIB_EXTEN="so"
+	;;
 esac
-
-AC_SUBST(SOLINK)
-AC_SUBST(DYNAMIC_LIB_EXTEN)
+AC_SUBST([DYNAMIC_LIB_EXTEN])
 
 AC_CHECK_LIB([dl], [dlopen])
 AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([m], [cos])
-AX_LIB_PCAP
 
 AC_CHECK_HEADERS([netinet/sctp.h netdb.h sys/select.h])
 AM_CONDITIONAL([HAVE_SCTP],[test "${ac_cv_header_netinet_sctp_h}" = "yes"])
@@ -121,105 +122,252 @@ AM_CONDITIONAL([HAVE_SCTP],[test "${ac_cv_header_netinet_sctp_h}" = "yes"])
 AC_CHECK_FUNC([gethostbyname_r],
 	[], [AC_CHECK_LIB([nsl], [gethostbyname_r])]
 )
-if test "$ac_cv_func_gethostbyname_r" = "yes" -o "$ac_cv_lib_nsl_gethostbyname_r" = "yes" ; then
+if test "$ac_cv_func_gethostbyname_r" = "yes" -o "$ac_cv_lib_nsl_gethostbyname_r" = "yes"
+then
+	AC_MSG_CHECKING([whether gethostbyname_r requires five arguments])
 
-AC_MSG_CHECKING([whether gethostbyname_r requires five arguments])
+	ac_cv_func_gethostbyname_r_five_args="no"
 
-ac_cv_func_gethostbyname_r_five_args="no"
+	AC_TRY_COMPILE([#include <netdb.h>],
+		[char *name;
+		 struct hostent *he, *res;
+		 char buffer[2048];
+		 int buflen = 2048;
+		 (void)gethostbyname_r(name, he, buffer, buflen, &res)],
+		[ac_cv_func_gethostbyname_r_five_args="yes"
+	         AC_DEFINE([HAVE_GETHOSTBYNAME_R_FIVE], [1], [gethostbyname_r has five arguments])]
+	)
 
-AC_TRY_COMPILE([#include <netdb.h>],
-	[char *name;
-	 struct hostent *he, *res;
-	 char buffer[2048];
-	 int buflen = 2048;
-	 (void)gethostbyname_r(name, he, buffer, buflen, &res)],
-	[ac_cv_func_gethostbyname_r_five_args="yes"
-         AC_DEFINE([HAVE_GETHOSTBYNAME_R_FIVE], [1], [gethostbyname_r has five arguments])]
-)
-
-    AC_MSG_RESULT([$ac_cv_func_gethostbyname_r_five_args])
-    AC_DEFINE([HAVE_GETHOSTBYNAME_R],[1],[threadsafe gethostbyname])
+	AC_MSG_RESULT([$ac_cv_func_gethostbyname_r_five_args])
+	AC_DEFINE([HAVE_GETHOSTBYNAME_R], [1], [threadsafe gethostbyname])
 fi
 
-#  Enable debugging
-AC_ARG_ENABLE(debug,
-[AC_HELP_STRING([--enable-debug],[build with debug information])],[enable_debug="$enableval"],[enable_debug="yes"])
+##
+## Modules and optional features
+##
+AC_MSG_RESULT([${as_nl}<<>> Modules and optional features])
 
-if test "${enable_debug}" = "yes"; then
-        AC_DEFINE([DEBUG],[],[Enable extra debugging.])
-
-	if test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
-	   COMP_VENDOR_CFLAGS="$COMP_VENDOR_CFLAGS -g -ggdb"
-	fi
-fi
-
-# Where to install the modules
-AC_ARG_WITH([modinstdir],
- [AS_HELP_STRING([--with-modinstdir=DIR], [Install modules into this location (default: $prefix/mod)])], [modinstdir="$withval"], [modinstdir="${prefix}/mod"])
-
-AC_SUBST(modinstdir)
-
-
-# libpri?
-AC_ARG_WITH([libpri],
- [AS_HELP_STRING([--with-libpri], [Install ftmod_libpri])], [enable_libpri="yes"], [enable_libpri="no"])
-AC_SUBST(enable_libpri)
-
-# pritap?
+##
+# pritap (TODO: add checks)
+#
+HAVE_PRITAP="no"
 AC_ARG_WITH([pritap],
- [AS_HELP_STRING([--with-pritap], [Install ftmod_pritap])], [enable_pritap="yes"], [enable_pritap="no"])
-AC_SUBST(enable_pritap)
+	[AS_HELP_STRING([--with-pritap], [Install ftmod_pritap])],
+	[case "${withval}" in
+	 no)	enable_pritap="no" ;;
+	 *)	enable_pritab="yes" ;;
+	 esac],
+	[enable_pritap="no"]
+)
+HAVE_PRITAP="${enable_pritap}"
+AM_CONDITIONAL([HAVE_PRITAP],[test "${enable_pritap}" = "yes"])
 
 # debug dtmf?
 AC_ARG_WITH([debugdtmf],
- [AS_HELP_STRING([--with-debugdtmf], [Debug DTMF])], [enable_debugdtmf="yes"], [enable_debugdtmf="no"])
-AC_SUBST(enable_debugdtmf)
+	[AS_HELP_STRING([--with-debugdtmf], [Debug DTMF])],
+	[case "${withval}" in
+	 no)	enable_debugdtmf="no" ;;
+	 *)	enable_debugdtmf="yes" ;;
+	 esac],
+	[enable_debugdtmf="no"]
+)
+AM_CONDITIONAL([WANT_DEBUGDTMF], [test "${enable_debugdtmf}" = "yes"])
 
-AC_CHECK_LIB([sangoma], [sangoma_span_chan_toif], [have_libsangoma="yes"])
-AM_CONDITIONAL([LIBSANGOMA],[test "${have_libsangoma}" = "yes"])
+##
+# OpenR2 stack
+#
+HAVE_OPENR2="no"
+AC_CHECK_LIB([openr2], [openr2_context_set_io_type], [HAVE_OPENR2="yes"])
+AC_MSG_RESULT([checking whether to build ftmod_r2... ${HAVE_OPENR2}])
+AM_CONDITIONAL([HAVE_OPENR2], [test "${HAVE_OPENR2}" = "yes"])
 
-AM_CONDITIONAL([LIBPRI],[test "${enable_libpri}" = "yes"])
+##
+# Digium libpri (TODO: add checks)
+#
+HAVE_LIBPRI="no"
+AC_ARG_WITH([libpri],
+	[AS_HELP_STRING([--with-libpri], [Install ftmod_libpri])],
+	[case "${withval}" in
+	 no)	enable_libpri="no" ;;
+	 *)	enable_libpri="yes" ;;
+	 esac],
+	[enable_libpri="no"]
+)
+if test "${enable_libpri}" != "no"
+then
+	AC_MSG_RESULT([${as_nl}<<>> Digium libpri])
 
-AM_CONDITIONAL([PRITAP],[test "${enable_pritap}" = "yes"])
+	save_LIBS="${LIBS}"
+	LIBS="${LIBS} -lpri"
+	AC_MSG_CHECKING([whether libpri is usable])
+	AC_LINK_IFELSE(
+		[AC_LANG_PROGRAM(
+			[#include <libpri.h>],
+			[const char *version = pri_get_version();]
+		)],
+		[AC_MSG_RESULT([yes])],
+		[AC_MSG_RESULT([no])
+		 AC_MSG_ERROR([libpri is not installed or unusable (see config.log for details)])]
+	)
 
-AM_CONDITIONAL([DEBUGDTMF],[test "${enable_debugdtmf}" = "yes"])
+	AC_MSG_CHECKING([whether libpri has BRI support])
+	AC_LINK_IFELSE(
+		[AC_LANG_PROGRAM(
+			[extern void pri_new_bri_cb(void);],
+			[pri_new_bri_cb();]
+		)],
+		[AC_DEFINE([HAVE_LIBPRI_BRI], [1], [libpri has BRI support])
+		 AC_MSG_RESULT([yes])],
+		[AC_MSG_RESULT([no])
+		 AC_MSG_NOTICE([You will need libpri-1.4.12_beta1 or newer for BRI support])]
+	)
 
-AC_CHECK_LIB([sng_ss7], [sng_isup_init], [have_sng_ss7="yes"])
-AM_CONDITIONAL([SNGSS7],[test "${have_sng_ss7}" = "yes"])
+	AC_MSG_CHECKING([whether libpri has AOC event support])
+	AC_LINK_IFELSE(
+		[AC_LANG_PROGRAM(
+			[extern void pri_aoc_events_enable(void);],
+			[pri_aoc_events_enable();]
+		)],
+		[AC_DEFINE([HAVE_LIBPRI_AOC], [1], [libpri has AOC event support])
+		 AC_MSG_RESULT([yes])],
+		[AC_MSG_RESULT([no])
+		 AC_MSG_NOTICE([You will need libpri-1.4.12_beta1 or newer for AOC event support])]
+	)
+	LIBS="${save_LIBS}"
+fi
+HAVE_LIBPRI="${enable_libpri}"
+AM_CONDITIONAL([HAVE_LIBPRI],[test "${enable_libpri}" = "yes"])
 
-AC_CHECK_LIB([sng_isdn], [sng_isdn_init], [have_sng_isdn="yes"])
-AM_CONDITIONAL([SNGISDN],[test "${have_sng_isdn}" = "yes"])
+##
+# Sangoma Wanpipe
+#
+HAVE_LIBSANGOMA="no"
+AC_MSG_RESULT([${as_nl}<<>> Sangoma Wanpipe])
+AC_CHECK_LIB([sangoma], [sangoma_span_chan_toif], [HAVE_LIBSANGOMA="yes"])
+AC_MSG_RESULT([checking whether to build ftmod_wanpipe... ${HAVE_LIBSANGOMA}])
+AM_CONDITIONAL([HAVE_LIBSANGOMA], [test "${HAVE_LIBSANGOMA}" = "yes"])
 
-AC_CHECK_LIB([openr2], [openr2_context_set_io_type], [have_openr2="yes"])
-AM_CONDITIONAL([OPENR2],[test "${have_openr2}" = "yes"])
+##
+# Sangoma ISDN stack
+#
+HAVE_SNG_ISDN="no"
+AC_MSG_RESULT([${as_nl}<<>> Sangoma ISDN stack])
+AC_CHECK_LIB([sng_isdn], [sng_isdn_init], [HAVE_SNG_ISDN="yes"])
+AC_MSG_RESULT([checking whether to build ftmod_sangoma_isdn... ${HAVE_SNG_ISDN}])
+AM_CONDITIONAL([HAVE_SNG_ISDN], [test "${HAVE_SNG_ISDN}" = "yes"])
 
-if test "${have_sng_isdn}" = "yes"; then
+if test "${HAVE_SNG_ISDN}" = "yes"; then
 	if test "${build}" == "${host}"
 	then
 		case "${host}" in
 		x86_64-*)
-		# X86_64 machines need additional flags when compiling against libsng_isdn
-		CFLAGS="$CFLAGS -DBIT_64 -DALIGN_64BIT"
-		;;
+			# X86_64 machines need additional flags when compiling against libsng_isdn
+			CFLAGS="$CFLAGS -DBIT_64 -DALIGN_64BIT"
+			;;
 		esac
 	fi
 fi
 
-if test "${have_sng_ss7}" = "yes"; then
+##
+# Sangoma SS7 stack
+#
+HAVE_SNG_SS7="no"
+AC_MSG_RESULT([${as_nl}<<>> Sangoma SS7 stack])
+AC_CHECK_LIB([sng_ss7], [sng_isup_init], [HAVE_SNG_SS7="yes"])
+AC_MSG_RESULT([checking whether to build ftmod_sangoma_ss7... ${HAVE_SNG_SS7}])
+AM_CONDITIONAL([HAVE_SNG_SS7], [test "${HAVE_SNG_SS7}" = "yes"])
+
+if test "${HAVE_SNG_SS7}" = "yes"; then
 	if test "${build}" == "${host}"
 	then
 		case "${host}" in
 		x86_64-*)
-		# X86_64 machines need additional flags when compiling against libsng_isdn
-		CFLAGS="$CFLAGS -DBIT_64 -DALIGN_64BIT"
-		;;
+			# X86_64 machines need additional flags when compiling against libsng_isdn
+			CFLAGS="$CFLAGS -DBIT_64 -DALIGN_64BIT"
+			;;
 		esac
 	fi
 fi
 
-COMP_VENDOR_CFLAGS="$COMP_VENDOR_CFLAGS"
-AC_SUBST(COMP_VENDOR_CFLAGS)
-AC_CONFIG_FILES([Makefile
-		freetdm.pc
-		mod_freetdm/Makefile])
+##
+# libisdn
+#
+HAVE_LIBISDN="no"
+AC_ARG_WITH([libisdn],
+	[AS_HELP_STRING([--with-libisdn], [Install ftmod_isdn (libisdn stack)])],
+	[case "${withval}" in
+	 no)	with_libisdn="no" ;;
+	 *)	with_libisdn="yes" ;;
+	 esac
+	],
+	[with_libisdn="no"]
+)
+if test "${with_libisdn}" != "no"
+then
+	AC_MSG_RESULT([${as_nl}<<>> ftmod_isdn (libisdn stack)])
+	PKG_CHECK_MODULES([libisdn],
+		[libisdn >= 0.0.1],
+		[AC_MSG_CHECKING([libisdn version])
+		 LIBISDN_VERSION="`${PKG_CONFIG} --modversion libisdn`"
+		 if test -z "${LIBISDN_VERSION}"; then
+			AC_MSG_ERROR([Failed to retrieve libisdn version])
+		 fi
+		 AC_MSG_RESULT([${LIBISDN_VERSION}])
+
+		 # check features
+		 AC_MSG_CHECKING([for new experimental API])
+		 AC_COMPILE_IFELSE(
+			[AC_LANG_PROGRAM(
+				[#include <libisdn/version.h>
+				 #if !LIBISDN_FEATURE(API2)
+				 #error "libisdn API v2 not available"
+				 #endif
+				],
+				[;]
+			)],
+			[AC_MSG_RESULT([yes])],
+			[AC_MSG_RESULT([no])]
+		 )
+
+		 HAVE_LIBISDN="yes"
+		 AC_DEFINE([HAVE_LIBISDN], [1], [libisdn support])
+		 AC_SUBST([LIBISDN_CFLAGS],  [${libisdn_CFLAGS}])
+		 AC_SUBST([LIBISDN_CPPFLAGS],[${libisdn_CPPFLAGS}])
+		 AC_SUBST([LIBISDN_LDFLAGS], [${libisdn_LDFLAGS}])
+		 AC_SUBST([LIBISDN_LIBS],    [${libisdn_LIBS}])
+		 AC_SUBST([LIBISDN_VERSION])
+		],
+		[AC_MSG_ERROR([Need libisdn-0.0.1 or higher])]
+	)
+	AX_LIB_PCAP
+fi
+AM_CONDITIONAL([HAVE_LIBISDN], [test "${HAVE_LIBISDN}" = "yes"])
+
+AC_MSG_RESULT([${as_nl}<<>> Creating output files])
+AC_CONFIG_FILES([
+	Makefile
+	freetdm.pc
+	mod_freetdm/Makefile
+])
 AC_OUTPUT
+
+#
+# summary screen
+#
+AC_MSG_RESULT([
+============================ FreeTDM configuration ============================
+
++ Modules
+
+  Signalling:
+	ftmod_isdn......................... ${HAVE_LIBISDN}
+	ftmod_libpri....................... ${HAVE_LIBPRI}
+	ftmod_sangoma_isdn................. ${HAVE_SNG_ISDN}
+	ftmod_sangoma_ss7.................. ${HAVE_SNG_SS7}
+	ftmod_r2........................... ${HAVE_OPENR2}
+	ftmod_pritap....................... ${HAVE_PRITAP}
+  I/O:
+	ftmod_wanpipe...................... ${HAVE_LIBSANGOMA}
+
+===============================================================================
+])
diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index b7b8e040d6..0a35913ec4 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -657,7 +657,7 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
 	status = ftdm_channel_wait(tech_pvt->ftdmchan, &wflags, chunk);
 	
 	if (status == FTDM_FAIL) {
-		ftdm_log(FTDM_LOG_WARNING, "failed to wait for I/O\n");
+		ftdm_log(FTDM_LOG_ERROR, "Failed to wait for I/O\n");
 		goto fail;
 	}
 	
@@ -3088,85 +3088,44 @@ static switch_status_t load_config(void)
 
 	if ((spans = switch_xml_child(cfg, "libpri_spans"))) {
 		for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) {
-			char *id = (char *) switch_xml_attr(myspan, "id");
 			char *name = (char *) switch_xml_attr(myspan, "name");
+			ftdm_conf_parameter_t spanparameters[10];
 			ftdm_status_t zstatus = FTDM_FAIL;
-			const char *context = "default";
+			const char *context  = "default";
 			const char *dialplan = "XML";
-			
-			const char *o_node = "cpe";
-			const char *o_switch = "dms100";
-			const char *o_dp = "unknown";
-			const char *o_l1 = "ulaw";
-			const char *o_debug = "none";
-			const char* opts = "none";	
-					
-			uint32_t span_id = 0;
+			unsigned paramindex = 0;
 			ftdm_span_t *span = NULL;
+			uint32_t span_id = 0;
 
-			
-			for (param = switch_xml_child(myspan, "param"); param; param = param->next) {
+			if (!name) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required attribute 'name'\n");
+				continue;
+			}
+
+			for (param = switch_xml_child(myspan, "param"); param && paramindex < 10; param = param->next) {
 				char *var = (char *) switch_xml_attr_soft(param, "name");
 				char *val = (char *) switch_xml_attr_soft(param, "value");
 
-				if (!strcasecmp(var, "node")) {
-					o_node = val;
-				} else if (!strcasecmp(var, "switch")) {
-					o_switch = val;
-				} else if (!strcasecmp(var, "dp")) {
-					o_dp = val;
-				} else if (!strcasecmp(var, "l1")) {
-					o_l1 = val;
-				} else if (!strcasecmp(var, "debug")) {
-					o_debug = val;
-				} else if (!strcasecmp(var, "context")) {
+				if (!strcasecmp(var, "context")) {
 					context = val;
-				} else if (!strcasecmp(var, "opts")) {
-					opts = val;
 				} else if (!strcasecmp(var, "dialplan")) {
 					dialplan = val;
-				}
-			}
-	
-			if (!id && !name) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required param 'id'\n");
-				continue;
-			}
-			
-			if (name) {
-				zstatus = ftdm_span_find_by_name(name, &span);
-			} else {
-				if (switch_is_number(id)) {
-					span_id = atoi(id);
-					zstatus = ftdm_span_find(span_id, &span);
-				}
-
-				if (zstatus != FTDM_SUCCESS) {
-					zstatus = ftdm_span_find_by_name(id, &span);
+				} else {
+					spanparameters[paramindex].var = var;
+					spanparameters[paramindex].val = val;
+					paramindex++;
 				}
 			}
 
+			zstatus = ftdm_span_find_by_name(name, &span);
 			if (zstatus != FTDM_SUCCESS) {
-				ftdm_log(FTDM_LOG_ERROR, "Error finding FreeTDM span id:%s name:%s\n", switch_str_nil(id), switch_str_nil(name));
+				ftdm_log(FTDM_LOG_ERROR, "Error finding FreeTDM span %s\n", name);
 				continue;
 			}
 
-			if (!span_id) {
-				span_id = ftdm_span_get_id(span);
-			}
-			
-			
-			if (ftdm_configure_span(span, "libpri", on_clear_channel_signal, 
-								   "node", o_node,
-								   "switch", o_switch,
-								   "dp", o_dp,
-								   "l1", o_l1,
-								   "debug", o_debug,
-								   "opts", opts,
-								   FTDM_TAG_END) != FTDM_SUCCESS) {
-				ftdm_log(FTDM_LOG_ERROR, "Error starting FreeTDM span %d node: %s switch: %s dp: %s l1: %s debug: %s error: %s\n", 
-						span_id, switch_str_nil(o_node), switch_str_nil(o_switch), switch_str_nil(o_dp), switch_str_nil(o_l1), switch_str_nil(o_debug),
-						ftdm_span_get_last_error(span));
+			span_id = ftdm_span_get_id(span);
+			if (ftdm_configure_span_signaling(span, "libpri", on_clear_channel_signal, spanparameters) != FTDM_SUCCESS) {
+				ftdm_log(FTDM_LOG_ERROR, "Error configuring FreeTDM span %s\n", name);
 				continue;
 			}
 
diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index f02c9c48db..1ede703a41 100644
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -1751,7 +1751,7 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_open_chan(ftdm_channel_t *ftdmchan)
 		goto done;
 	}
 
-	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_IN_ALARM)) {
+	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_IN_ALARM) && !ftdm_test_flag(ftdmchan->span, FTDM_SPAN_PWR_SAVING)) {
 		snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "%s", "Channel is alarmed\n");
 		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "Cannot open channel when is alarmed\n");
 		goto done;
@@ -3927,6 +3927,11 @@ static ftdm_status_t ftdm_set_channels_alarms(ftdm_span_t *span, int currindex)
 			ftdm_log(FTDM_LOG_ERROR, "%d:%d: Failed to get alarms\n", span->channels[chan_index]->physical_span_id, span->channels[chan_index]->physical_chan_id);
 			return FTDM_FAIL;
 		}
+		if (span->channels[chan_index]->alarm_flags) {
+			ftdm_set_flag_locked(span->channels[chan_index], FTDM_CHANNEL_IN_ALARM);
+		} else {
+			ftdm_clear_flag_locked(span->channels[chan_index], FTDM_CHANNEL_IN_ALARM);
+		}
 	}
 	return FTDM_SUCCESS;
 }
diff --git a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
index d64e711e73..23e67426ca 100644
--- a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
+++ b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
@@ -1,23 +1,23 @@
 /*
  * Copyright (c) 2007, Anthony Minessale II
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  * * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
- * 
+ *
  * * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * 
+ *
  * * Neither the name of the original author; nor the names of any contributors
  * may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * 
- * 
+ *
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -30,266 +30,267 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-/**
- * Workaround for missing u_int / u_short types on solaris
- */
-#if defined(HAVE_LIBPCAP) && defined(__SunOS)
-#define __EXTENSIONS__
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
+#include <private/ftdm_core.h>
+#include <libisdn/Q931.h>
+#include <libisdn/Q921.h>
 
-#include "private/ftdm_core.h"
-#include "Q931.h"
-#include "Q921.h"
 #ifdef WIN32
 #include <windows.h>
 #else
 #include <sys/time.h>
 #endif
 
-#include "ftdm_isdn.h"
+#include "ftmod_isdn.h"
 
 #define LINE "--------------------------------------------------------------------------------"
-//#define IODEBUG
 
 /* helper macros */
 #define FTDM_SPAN_IS_NT(x)	(((ftdm_isdn_data_t *)(x)->signal_data)->mode == Q921_NT)
 
+#define DEFAULT_NATIONAL_PREFIX 	"0"
+#define DEFAULT_INTERNATIONAL_PREFIX	"00"
 
-#ifdef HAVE_LIBPCAP
-/*-------------------------------------------------------------------------*/
-/*Q931ToPcap functions*/
+/*****************************************************************************************
+ * PCAP
+ *          Based on Helmut Kuper's (<helmut.kuper@ewetel.de>) implementation,
+ *          but using a different approach (needs a recent libpcap + wireshark)
+ *****************************************************************************************/
+#ifdef HAVE_PCAP
+#include <arpa/inet.h>		/* htons() */
 #include <pcap.h>
-#endif
 
-#define SNAPLEN 1522
-#define MAX_ETHER_PAYLOAD_SIZE 1500
-#define MIN_ETHER_PAYLOAD_SIZE 42
-#define SIZE_ETHERNET           18
-#define VLANID_OFFSET           15
-#define SIZE_IP                 20
-#define SIZE_TCP                20
-#define SIZE_TPKT               4
-#define SIZE_ETHERNET_CRC       4
-#define OVERHEAD                SIZE_ETHERNET+SIZE_IP+SIZE_TCP+SIZE_TPKT
-#define MAX_Q931_SIZE           MAX_ETHER_PAYLOAD_SIZE-SIZE_IP-SIZE_TCP-SIZE_TPKT
-#define TPKT_SIZE_OFFSET        SIZE_ETHERNET+SIZE_IP+SIZE_TCP+2
-#define IP_SIZE_OFFSET          SIZE_ETHERNET+2
-#define TCP_SEQ_OFFSET		SIZE_ETHERNET+SIZE_IP+4
+#define PCAP_SNAPLEN	1500
 
-#ifdef HAVE_LIBPCAP
-/*Some globals*/
-unsigned long           pcapfilesize = 0;
-unsigned long		tcp_next_seq_no_send = 0;
-unsigned long           tcp_next_seq_no_rec = 0;
-pcap_dumper_t           *pcapfile    = NULL;
-struct pcap_pkthdr      pcaphdr;
-pcap_t                  *pcaphandle  = NULL;
-char 			*pcapfn      = NULL;
-int			do_q931ToPcap= 0;
+struct pcap_context {
+	pcap_dumper_t		*dump;		/*!< pcap file handle  */
+	pcap_t			*handle;	/*!< pcap lib context  */
+	char			*filename;	/*!< capture file name */
+};
 
-/*Predefined Ethernet Frame with Q931-over-IP encapsulated - From remote TDM host to FreeSWITCH*/
-L3UCHAR  recFrame[SNAPLEN]= {
-                                /*IEEE 802.3 VLAN 802.1q Ethernet Frame Header*/
-                                2,0,1,0xAA,0xAA,0xAA,2,0,1,0xBB,0xBB,0xBB,0x81,0,0xE0,0,0x08,0,
-                                /*IPv4 Header (minimal size; no options)*/
-                                0x45,0,0,44,0,0,0,0,64,6,0,0,2,2,2,2,1,1,1,1,
-                                /*TCP-Header*/
-                                0,0x66,0,0x66,0,0,0,0,0,0,0,0,0x50,0,0,1,0,0,0,0,
-                                /*TPKT-Header RFC 1006*/
-                                3,0,0,0
-                            };
-
-/*Predefined Ethernet Frame with Q931-over-IP encapsulated - Frome FreeSWITCH to remote TDM host*/
-L3UCHAR  sendFrame[SNAPLEN]= {
-                                /*IEEE 802.3 VLAN 802.1q Ethernet Frame Header*/
-                                2,0,1,0xBB,0xBB,0xBB,2,0,1,0xAA,0xAA,0xAA,0x81,0,0xE0,0,0x08,0,
-                                /*IPv4 Header (minimal size; no options)*/
-                                0x45,0,0,44,0,0,0,0,64,6,0,0,1,1,1,1,2,2,2,2,
-                                /*TCP-Header*/
-                                0,0x66,0,0x66,0,0,0,0,0,0,0,0,0x50,0,0,1,0,0,0,0,
-                                /*TPKT-Header RFC 1006*/
-                                3,0,0,0
-                             };
-
-/**
- * \brief Opens a pcap file for capture
- * \return Success or failure
- */
-static ftdm_status_t openPcapFile(void)
+static inline ftdm_status_t isdn_pcap_is_open(struct ftdm_isdn_data *isdn)
 {
-        if(!pcaphandle)
-        {
-                pcaphandle = pcap_open_dead(DLT_EN10MB, SNAPLEN);
-                if (!pcaphandle)
-                {
-                        ftdm_log(FTDM_LOG_ERROR, "Can't open pcap session: (%s)\n", pcap_geterr(pcaphandle));
-                        return FTDM_FAIL;
-                }
-        }
-
-        if(!pcapfile){
-                /* Open the dump file */
-                if(!(pcapfile=pcap_dump_open(pcaphandle, pcapfn))){
-                        ftdm_log(FTDM_LOG_ERROR, "Error opening output file (%s)\n", pcap_geterr(pcaphandle));
-                        return FTDM_FAIL;
-                }
-        }
-        else{
-                ftdm_log(FTDM_LOG_WARNING, "Pcap file is already open!\n");
-                return FTDM_FAIL;
-        }
-
-        ftdm_log(FTDM_LOG_DEBUG, "Pcap file '%s' successfully opened!\n", pcapfn);
-
-        pcaphdr.ts.tv_sec  	= 0;
-        pcaphdr.ts.tv_usec 	= 0;
-	pcapfilesize       	= 24;	/*current pcap file header seems to be 24 bytes*/
-	tcp_next_seq_no_send    = 0;
-	tcp_next_seq_no_rec	= 0;
-
-        return FTDM_SUCCESS;
+	return (isdn->pcap) ? 1 : 0;
 }
 
-/**
- * \brief Closes a pcap file
- * \return Success
- */
-static ftdm_status_t closePcapFile(void)
+static inline ftdm_status_t isdn_pcap_capture_both(struct ftdm_isdn_data *isdn)
 {
-	if (pcapfile) {
-		pcap_dump_close(pcapfile);
-		if (pcaphandle) pcap_close(pcaphandle);
+	return ((isdn->flags & (FTDM_ISDN_CAPTURE | FTDM_ISDN_CAPTURE_L3ONLY)) == FTDM_ISDN_CAPTURE) ? 1 : 0;
+}
 
-		ftdm_log(FTDM_LOG_DEBUG, "Pcap file closed! File size is %lu bytes.\n", pcapfilesize);
+static inline ftdm_status_t isdn_pcap_capture_l3only(struct ftdm_isdn_data *isdn)
+{
+	return ((isdn->flags & FTDM_ISDN_CAPTURE) && (isdn->flags & FTDM_ISDN_CAPTURE_L3ONLY)) ? 1 : 0;
+}
 
-		pcaphdr.ts.tv_sec 	= 0;
-		pcaphdr.ts.tv_usec 	= 0;
-		pcapfile		= NULL;
-		pcaphandle 		= NULL;
-		pcapfilesize		= 0;
-		tcp_next_seq_no_send	= 0;
-		tcp_next_seq_no_rec	= 0;
+static ftdm_status_t isdn_pcap_open(struct ftdm_isdn_data *isdn, char *filename)
+{
+	struct pcap_context *pcap = NULL;
+
+	if (!isdn) {
+		return FTDM_FAIL;
 	}
 
-	/*We have allways success with this? I think so*/
+	if (ftdm_strlen_zero(filename)) {
+		return FTDM_FAIL;
+	}
+
+	pcap = malloc(sizeof(struct pcap_context));
+	if (!pcap) {
+		ftdm_log(FTDM_LOG_ERROR, "Failed to allocate isdn pcap context\n");
+		return FTDM_FAIL;
+	}
+
+	memset(pcap, 0, sizeof(struct pcap_context));
+
+	pcap->filename = strdup(filename);
+
+	pcap->handle = pcap_open_dead(DLT_LINUX_LAPD, PCAP_SNAPLEN);
+	if (!pcap->handle) {
+		ftdm_log(FTDM_LOG_ERROR, "Failed to open pcap handle\n");
+		goto error;
+	}
+
+	pcap->dump = pcap_dump_open(pcap->handle, pcap->filename);
+	if (!pcap->dump) {
+		ftdm_log(FTDM_LOG_ERROR, "Failed to open capture file: %s\n", pcap_geterr(pcap->handle));
+		goto error;
+	}
+
+	ftdm_log(FTDM_LOG_INFO, "Capture file \"%s\" opened\n", pcap->filename);
+
+	isdn->pcap = pcap;
+
+	return FTDM_SUCCESS;
+
+error:
+	if (pcap->handle) {
+		pcap_close(pcap->handle);
+	}
+	if (pcap->filename) {
+		free(pcap->filename);
+	}
+
+	free(pcap);
+
+	return FTDM_FAIL;
+}
+
+static ftdm_status_t isdn_pcap_close(struct ftdm_isdn_data *isdn)
+{
+	struct pcap_context *pcap = NULL;
+	long size;
+
+	if (!isdn || !isdn->pcap) {
+		return FTDM_FAIL;
+	}
+	pcap = isdn->pcap;
+
+	isdn->flags &= ~(FTDM_ISDN_CAPTURE | FTDM_ISDN_CAPTURE_L3ONLY);
+	isdn->pcap   = NULL;
+
+	pcap_dump_flush(pcap->dump);
+
+	size = pcap_dump_ftell(pcap->dump);
+	ftdm_log(FTDM_LOG_INFO, "File \"%s\" captured %ld bytes of data\n", pcap->filename, size);
+
+	pcap_dump_close(pcap->dump);
+	pcap_close(pcap->handle);
+
+	free(pcap->filename);
+	free(pcap);
+
 	return FTDM_SUCCESS;
 }
 
-/**
- * \brief Writes a Q931 packet to a pcap file
- * \return Success or failure
- */
-static ftdm_status_t writeQ931PacketToPcap(L3UCHAR* q931buf, L3USHORT q931size, L3ULONG span_id, L3USHORT direction)
+static inline void isdn_pcap_start(struct ftdm_isdn_data *isdn)
 {
-        L3UCHAR                 *frame		= NULL;
-	struct timeval		ts;
-	u_char			spanid		= (u_char)span_id;
-	unsigned long 		*tcp_next_seq_no = NULL;
+	if (!isdn->pcap)
+		return;
 
-	spanid=span_id;
-	
-        /*The total length of the ethernet frame generated by this function has a min length of 66
-        so we don't have to care about padding :)*/
+	isdn->flags |= FTDM_ISDN_CAPTURE;
+}
 
+static inline void isdn_pcap_stop(struct ftdm_isdn_data *isdn)
+{
+	isdn->flags &= ~FTDM_ISDN_CAPTURE;
+}
 
-        /*FS is sending the packet*/
-        if(direction==0){
-		frame=sendFrame;
-		tcp_next_seq_no = &tcp_next_seq_no_send;
-        } 
-	/*FS is receiving the packet*/
-	else{
-		frame=recFrame;
-		tcp_next_seq_no = &tcp_next_seq_no_rec;
+#ifndef ETH_P_LAPD
+#define ETH_P_LAPD 0x0030
+#endif
+
+struct isdn_sll_hdr {
+	uint16_t slltype;
+	uint16_t sllhatype;
+	uint16_t slladdrlen;
+	uint8_t  slladdr[8];
+	uint16_t sllproto;
+};
+
+/* Fake Q.921 I-frame */
+//static const char q921_fake_frame[] = { 0x00, 0x00, 0x00, 0x00 };
+
+enum {
+	ISDN_PCAP_INCOMING = 0,
+	ISDN_PCAP_INCOMING_BCAST = 1,
+	ISDN_PCAP_OUTGOING = 4,
+};
+
+static ftdm_status_t isdn_pcap_write(struct ftdm_isdn_data *isdn, unsigned char *buf, ftdm_ssize_t len, int direction)
+{
+	unsigned char frame[PCAP_SNAPLEN];
+	struct pcap_context *pcap;
+	struct isdn_sll_hdr *sll_hdr = (struct isdn_sll_hdr *)frame;
+	struct pcap_pkthdr hdr;
+	int offset = sizeof(struct isdn_sll_hdr);
+	int nbytes;
+
+	if (!isdn || !isdn->pcap || !buf || !len) {
+		return FTDM_FAIL;
 	}
 
-	/*Set spanid in VLAN-ID tag*/
-        frame[VLANID_OFFSET]    = spanid;
+	pcap = isdn->pcap;
 
-        /*** Write sent packet ***/
-        if(q931size > MAX_Q931_SIZE)
-        {
-                /*WARNING*/
-		ftdm_log(FTDM_LOG_WARNING, "Q931 packet size is too big (%u)! Ignoring it!\n", q931size);
-                return FTDM_FAIL;
-        }
-
-	/*Copy q931 buffer into frame*/
-        memcpy(frame+OVERHEAD,q931buf,q931size);
-
-	/*Store TCP sequence number in TCP header*/
-	frame[TCP_SEQ_OFFSET]=(*tcp_next_seq_no>>24)&0xFF;
-	frame[TCP_SEQ_OFFSET+1]=(*tcp_next_seq_no>>16)&0xFF;
-	frame[TCP_SEQ_OFFSET+2]=(*tcp_next_seq_no>>8)&0xFF;
-	frame[TCP_SEQ_OFFSET+3]=*tcp_next_seq_no & 0xFF;
-
-        /*Store size of TPKT packet*/
-        q931size+=4;
-        frame[TPKT_SIZE_OFFSET]=(q931size>>8)&0xFF;
-        frame[TPKT_SIZE_OFFSET+1]=q931size&0xFF;
-
-	/*Calc next TCP sequence number*/
-	*tcp_next_seq_no+=q931size;
-
-        /*Store size of IP packet*/
-        q931size+=SIZE_IP+SIZE_TCP;
-        frame[IP_SIZE_OFFSET]=(q931size>>8)&0xFF;
-        frame[IP_SIZE_OFFSET+1]=q931size&0xFF;
-
-        pcaphdr.caplen = SIZE_ETHERNET+SIZE_ETHERNET_CRC+q931size;
-        pcaphdr.len = pcaphdr.caplen;
-
-        /* Set Timestamp */
-        /* Get Time in ms. usecs would be better ...  */
-        gettimeofday(&ts, NULL);
-        /*Write it into packet header*/
-        pcaphdr.ts.tv_sec = ts.tv_sec;
-        pcaphdr.ts.tv_usec = ts.tv_usec;
-
-	pcap_dump((u_char*)pcapfile, &pcaphdr, frame);
-        pcap_dump_flush(pcapfile);
-
-        /*Maintain pcap file size*/
-        pcapfilesize+=pcaphdr.caplen;
-        pcapfilesize+=sizeof(struct pcap_pkthdr);
-
-	ftdm_log(FTDM_LOG_DEBUG, "Added %u bytes to pcap file. File size is now %lu, \n", q931size, pcapfilesize);
-
-        return FTDM_SUCCESS;
-}
+	/* Update SLL header */
+	sll_hdr->slltype    = htons(direction);
+	sll_hdr->sllhatype  = 0;
+	sll_hdr->slladdrlen = 1;
+	sll_hdr->slladdr[0] = (isdn->mode == Q921_NT) ? 1 : 0;	/* TODO: NT/TE */
+	sll_hdr->sllproto   = htons(ETH_P_LAPD);
 
+#if 0
+	/* Q.931-only mode: copy fake Q.921 header */
+	if (isdn->flags & FTDM_ISDN_CAPTURE_L3ONLY) {
+		/* copy fake q921 header */
+		memcpy(frame + offset, q921_fake_frame, sizeof(q921_fake_frame));
+		offset += sizeof(q921_fake_frame);
+	}
 #endif
 
-/**
- * \brief Unloads pcap IO
- * \return Success or failure
- */
-static FIO_IO_UNLOAD_FUNCTION(close_pcap)
-{
-#ifdef HAVE_LIBPCAP
-	return closePcapFile();
-#else
+	/* Copy data */
+	nbytes = (len > (PCAP_SNAPLEN - offset)) ? (PCAP_SNAPLEN - offset) : len;
+	memcpy(frame + offset, buf, nbytes);
+
+	/* Update timestamp */
+	memset(&hdr, 0, sizeof(struct pcap_pkthdr));
+	gettimeofday(&hdr.ts, NULL);
+	hdr.caplen = offset + nbytes;
+	hdr.len    = hdr.caplen;
+
+	/* Write packet */
+	pcap_dump((unsigned char *)pcap->dump, &hdr, frame);
+
 	return FTDM_SUCCESS;
-#endif
 }
+#endif	/* HAVE_PCAP */
 
-/*Q931ToPcap functions DONE*/
-/*-------------------------------------------------------------------------*/
 
-/**
- * \brief Gets current time
- * \return Current time (in ms)
- */
 static L2ULONG ftdm_time_now(void)
 {
 	return (L2ULONG)ftdm_current_time_in_ms();
 }
 
 /**
- * \brief Initialises an ISDN channel (outgoing call)
- * \param ftdmchan Channel to initiate call on
- * \return Success or failure
+ * \brief	Returns the signalling status on a channel
+ * \param	ftdmchan	Channel to get status on
+ * \param	status		Pointer to set signalling status
+ * \return	Success or failure
+ */
+static FIO_CHANNEL_GET_SIG_STATUS_FUNCTION(isdn_get_channel_sig_status)
+{
+	*status = FTDM_SIG_STATE_DOWN;
+
+	ftdm_isdn_data_t *isdn_data = ftdmchan->span->signal_data;
+	if (ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING)) {
+		*status = FTDM_SIG_STATE_UP;
+	}
+	return FTDM_SUCCESS;
+}
+
+/**
+ * \brief	Returns the signalling status on a span
+ * \param	span	Span to get status on
+ * \param	status	Pointer to set signalling status
+ * \return	Success or failure
+ */
+static FIO_SPAN_GET_SIG_STATUS_FUNCTION(isdn_get_span_sig_status)
+{
+	*status = FTDM_SIG_STATE_DOWN;
+
+	ftdm_isdn_data_t *isdn_data = span->signal_data;
+	if (ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING)) {
+		*status = FTDM_SIG_STATE_UP;
+	}
+	return FTDM_SUCCESS;
+}
+
+/**
+ * \brief	Create outgoing channel
+ * \param	ftdmchan	Channel to create outgoing call on
+ * \return	Success or failure
  */
 static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(isdn_outgoing_call)
 {
@@ -300,14 +301,12 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(isdn_outgoing_call)
 }
 
 /**
- * \brief Requests an ISDN channel on a span (outgoing call)
- * \param span Span where to get a channel
- * \param chan_id Specific channel to get (0 for any)
- * \param direction Call direction (inbound, outbound)
- * \param caller_data Caller information
- * \param ftdmchan Channel to initialise
- * \return Success or failure
+ * \brief	Create outgoing channel, let module select the channel to use
+ * \param	span		Span to create outgoing call on
+ * \param	caller_data
+ * \return	Success or failure
  */
+#ifdef __TODO__
 static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request)
 {
 	Q931mes_Generic *gen = (Q931mes_Generic *) caller_data->raw_data;
@@ -347,7 +346,7 @@ static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request)
 	BearerCap.ITR       = Q931_ITR_64K;		/* 64k */
 	BearerCap.Layer1Ident = 1;
 	BearerCap.UIL1Prot = (codec == FTDM_CODEC_ALAW) ? Q931_UIL1P_G711A : Q931_UIL1P_G711U;	/* U-law = 2, A-law = 3 */
-	gen->BearerCap = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &BearerCap);
+	gen->BearerCap = Q931AppendIE(gen, (L3UCHAR *) &BearerCap);
 
 	/*
 	 * Channel ID IE
@@ -355,20 +354,20 @@ static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request)
 	Q931InitIEChanID(&ChanID);
 	ChanID.IntType = FTDM_SPAN_IS_BRI(span) ? 0 : 1;		/* PRI = 1, BRI = 0 */
 
-	if(!FTDM_SPAN_IS_NT(span)) {
+	if (!FTDM_SPAN_IS_NT(span)) {
 		ChanID.PrefExcl = (isdn_data->opts & FTDM_ISDN_OPT_SUGGEST_CHANNEL) ? 0 : 1; /* 0 = preferred, 1 exclusive */
 	} else {
 		ChanID.PrefExcl = 1;	/* always exclusive in NT-mode */
 	}
 
-	if(ChanID.IntType) {
+	if (ChanID.IntType) {
 		ChanID.InfoChanSel = 1;				/* None = 0, See Slot = 1, Any = 3 */
 		ChanID.ChanMapType = 3; 			/* B-Chan */
 		ChanID.ChanSlot = (unsigned char)chan_id;
 	} else {
 		ChanID.InfoChanSel = (unsigned char)chan_id & 0x03;	/* None = 0, B1 = 1, B2 = 2, Any = 3 */
 	}
-	gen->ChanID = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &ChanID);
+	gen->ChanID = Q931AppendIE(gen, (L3UCHAR *) &ChanID);
 
 	/*
 	 * Progress IE
@@ -377,15 +376,15 @@ static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request)
 	Progress.CodStand = Q931_CODING_ITU;	/* 0 = ITU */
 	Progress.Location = 0;  /* 0 = User, 1 = Private Network */
 	Progress.ProgDesc = 3;	/* 1 = Not end-to-end ISDN */
-	gen->ProgInd = Q931AppendIE((L3UCHAR *)gen, (L3UCHAR *)&Progress);
+	gen->ProgInd = Q931AppendIE(gen, (L3UCHAR *)&Progress);
 
 	/*
 	 * Display IE
 	 */
-	if (!(isdn_data->opts & FTDM_ISDN_OPT_OMIT_DISPLAY_IE)) {
+	if (!(isdn_data->opts & FTDM_ISDN_OPT_OMIT_DISPLAY_IE) && FTDM_SPAN_IS_NT(span)) {
 		Q931InitIEDisplay(&Display);
 		Display.Size = Display.Size + (unsigned char)strlen(caller_data->cid_name);
-		gen->Display = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &Display);			
+		gen->Display = Q931AppendIE(gen, (L3UCHAR *) &Display);
 		ptrDisplay = Q931GetIEPtr(gen->Display, gen->buf);
 		ftdm_copy_string((char *)ptrDisplay->Display, caller_data->cid_name, strlen(caller_data->cid_name)+1);
 	}
@@ -399,7 +398,7 @@ static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request)
 	CallingNum.PresInd   = Q931_PRES_ALLOWED;
 	CallingNum.ScreenInd = Q931_SCREEN_USER_NOT_SCREENED;
 	CallingNum.Size = CallingNum.Size + (unsigned char)strlen(caller_data->cid_num.digits);
-	gen->CallingNum = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &CallingNum);			
+	gen->CallingNum = Q931AppendIE(gen, (L3UCHAR *) &CallingNum);
 	ptrCallingNum = Q931GetIEPtr(gen->CallingNum, gen->buf);
 	ftdm_copy_string((char *)ptrCallingNum->Digit, caller_data->cid_num.digits, strlen(caller_data->cid_num.digits)+1);
 
@@ -410,10 +409,10 @@ static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request)
 	Q931InitIECalledNum(&CalledNum);
 	CalledNum.TypNum    = Q931_TON_UNKNOWN;
 	CalledNum.NumPlanID = Q931_NUMPLAN_E164;
-	CalledNum.Size = CalledNum.Size + (unsigned char)strlen(caller_data->dnis.digits);
-	gen->CalledNum = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &CalledNum);
+	CalledNum.Size = CalledNum.Size + (unsigned char)strlen(caller_data->ani.digits);
+	gen->CalledNum = Q931AppendIE(gen, (L3UCHAR *) &CalledNum);
 	ptrCalledNum = Q931GetIEPtr(gen->CalledNum, gen->buf);
-	ftdm_copy_string((char *)ptrCalledNum->Digit, caller_data->dnis.digits, strlen(caller_data->dnis.digits)+1);
+	ftdm_copy_string((char *)ptrCalledNum->Digit, caller_data->ani.digits, strlen(caller_data->ani.digits)+1);
 
 	/*
 	 * High-Layer Compatibility IE   (Note: Required for AVM FritzBox)
@@ -423,28 +422,28 @@ static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request)
 	HLComp.Interpret = 4;	/* only possible value */
 	HLComp.PresMeth  = 1;   /* High-layer protocol profile */
 	HLComp.HLCharID  = 1;	/* Telephony = 1, Fax G2+3 = 4, Fax G4 = 65 (Class I)/ 68 (Class II or III) */
-	gen->HLComp = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &HLComp);
+	gen->HLComp = Q931AppendIE(gen, (L3UCHAR *) &HLComp);
 
 	caller_data->call_state = FTDM_CALLER_STATE_DIALING;
-	Q931Rx43(&isdn_data->q931, (L3UCHAR *) gen, gen->Size);
-	
+	Q931Rx43(&isdn_data->q931, gen, gen->Size);
+
 	isdn_data->outbound_crv[gen->CRV] = caller_data;
 	//isdn_data->channels_local_crv[gen->CRV] = ftdmchan;
 
 	while(ftdm_running() && caller_data->call_state == FTDM_CALLER_STATE_DIALING) {
 		ftdm_sleep(1);
-		
+
 		if (!--sanity) {
 			caller_data->call_state = FTDM_CALLER_STATE_FAIL;
 			break;
 		}
 	}
 	isdn_data->outbound_crv[gen->CRV] = NULL;
-	
+
 	if (caller_data->call_state == FTDM_CALLER_STATE_SUCCESS) {
 		ftdm_channel_t *new_chan = NULL;
 		int fail = 1;
-		
+
 		new_chan = NULL;
 		if (caller_data->chan_id < FTDM_MAX_CHANNELS_SPAN && caller_data->chan_id <= span->chan_count) {
 			new_chan = span->channels[caller_data->chan_id];
@@ -455,7 +454,7 @@ static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request)
 				if (new_chan->state == FTDM_CHANNEL_STATE_DOWN || new_chan->state >= FTDM_CHANNEL_STATE_TERMINATING) {
 					int x = 0;
 					ftdm_log(FTDM_LOG_WARNING, "Channel %d:%d ~ %d:%d is already in use waiting for it to become available.\n");
-					
+
 					for (x = 0; x < 200; x++) {
 						if (!ftdm_test_flag(new_chan, FTDM_CHANNEL_INUSE)) {
 							break;
@@ -492,9 +491,9 @@ static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request)
 				}
 
 				fail = 0;
-			} 
+			}
 		}
-		
+
 		if (!fail) {
 			*ftdmchan = new_chan;
 			return FTDM_SUCCESS;
@@ -509,13 +508,13 @@ static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request)
 			//should we be casting here.. or do we need to translate value?
 			cause.Value = (unsigned char) FTDM_CAUSE_WRONG_CALL_STATE;
 			*cause.Diag = '\0';
-			gen->Cause = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &cause);
-			Q931Rx43(&isdn_data->q931, (L3UCHAR *) gen, gen->Size);
+			gen->Cause = Q931AppendIE(gen, (L3UCHAR *) &cause);
+			Q931Rx43(&isdn_data->q931, gen, gen->Size);
 
 			if (gen->CRV) {
 				Q931ReleaseCRV(&isdn_data->q931, gen->CRV);
 			}
-			
+
 			if (new_chan) {
 				ftdm_log(FTDM_LOG_CRIT, "Channel is busy\n");
 			} else {
@@ -523,20 +522,13 @@ static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request)
 			}
 		}
 	}
-	
+
 	*ftdmchan = NULL;
 	return FTDM_FAIL;
 
 }
+#endif /* __TODO__ */
 
-/**
- * \brief Handler for Q931 error
- * \param pvt Private structure (span?)
- * \param id Error number
- * \param p1 ??
- * \param p2 ??
- * \return 0
- */
 static L3INT ftdm_isdn_931_err(void *pvt, L3INT id, L3INT p1, L3INT p2)
 {
 	ftdm_log(FTDM_LOG_ERROR, "ERROR: [%s] [%d] [%d]\n", q931_error_to_name(id), p1, p2);
@@ -544,21 +536,218 @@ static L3INT ftdm_isdn_931_err(void *pvt, L3INT id, L3INT p1, L3INT p2)
 }
 
 /**
- * \brief Handler for Q931 event message
- * \param pvt Span to handle
- * \param msg Message string
- * \param mlen Message string length
- * \return 0
+ * \brief	The new call event handler
+ * \note	W000t!!! \o/  ;D
+ * \todo	A lot
  */
-static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
+static void ftdm_isdn_call_event(struct Q931_Call *call, struct Q931_CallEvent *event, void *priv)
+{
+	Q931_TrunkInfo_t *trunk = NULL;
+	ftdm_isdn_data_t *isdn_data = NULL;
+	ftdm_span_t *zspan = NULL;
+	assert(call);
+	assert(event);
+
+	trunk = Q931CallGetTrunk(call);
+	assert(trunk);
+
+	zspan = Q931CallGetPrivate(call);
+	if (!zspan) {
+		zspan = priv;
+		Q931CallSetPrivate(call, zspan);
+	}
+	assert(zspan);
+
+	isdn_data = zspan->signal_data;
+
+	if (Q931CallIsGlobal(call)) {
+		/*
+		 * Global event
+		 */
+
+		ftdm_log(FTDM_LOG_DEBUG, "Received global event from Q.931\n");
+	}
+	else {
+		ftdm_channel_t *ftdmchan = NULL;
+		ftdm_sigmsg_t sig;
+		int call_crv = Q931CallGetCRV(call);
+		int type;
+
+		/*
+		 * Call-specific event
+		 */
+		ftdm_log(FTDM_LOG_DEBUG, "Received call-specific event from Q.931 for call %d [%hu]\n", Q931CallGetCRV(call), Q931CallGetCRV(call));
+
+		/*
+		 * Try to get associated zap channel
+		 * and init sigmsg struct if there is one
+		 */
+		ftdmchan = Q931CallIsOutgoing(call) ? isdn_data->channels_local_crv[call_crv] : isdn_data->channels_remote_crv[call_crv];
+		if (ftdmchan) {
+			memset(&sig, 0, sizeof(ftdm_sigmsg_t));
+			sig.chan_id = ftdmchan->chan_id;
+			sig.span_id = ftdmchan->span_id;
+			sig.channel = ftdmchan;
+		}
+
+		type = Q931CallEventGetType(event);
+
+		if (type == Q931_EVENT_TYPE_CRV) {
+
+			ftdm_log(FTDM_LOG_DEBUG, "\tCRV event\n");
+
+			switch (Q931CallEventGetId(event)) {
+			case Q931_EVENT_RELEASE_CRV:
+				{
+					/* WARNING contains old interface code, yuck! */
+					if (!ftdmchan) {
+						ftdm_log(FTDM_LOG_DEBUG, "Call %d [0x%x] not associated to zap channel\n", call_crv, call_crv);
+						return;
+					}
+
+					if (ftdmchan->state != FTDM_CHANNEL_STATE_DOWN) {
+						ftdm_log(FTDM_LOG_DEBUG, "Channel %d:%d not in DOWN state, cleaning up\n",
+											ftdmchan->span_id, ftdmchan->chan_id);
+
+						/*
+						 * Send hangup signal to mod_openzap
+						 */
+						if (!sig.channel->caller_data.hangup_cause) {
+							sig.channel->caller_data.hangup_cause = FTDM_CAUSE_NORMAL_CLEARING;
+						}
+
+						sig.event_id = FTDM_SIGEVENT_STOP;
+						isdn_data->sig_cb(&sig);
+
+						/* Release zap channel */
+						ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
+					}
+					return;
+				}
+				break;
+			default:
+				ftdm_log(FTDM_LOG_ERROR, "Unknown CRV event: %d\n", Q931CallEventGetId(event));
+				return;
+			}
+		}
+		else if (type == Q931_EVENT_TYPE_TIMER) {
+			struct Q931_CallTimerEvent *timer_evt = Q931CallEventGetData(event);
+
+			ftdm_log(FTDM_LOG_DEBUG, "\tTimer event\n");
+			assert(timer_evt->id);
+
+			switch (timer_evt->id) {
+			case Q931_TIMER_T303:
+				/*
+				 * SETUP timeout
+				 *
+				 * TE-mode: Q931_EVENT_SETUP_CONFIRM (error)
+				 * NT-mode: Q931_EVENT_RELEASE_INDICATION
+				 */
+				{
+					/* WARNING contains old interface code, yuck! */
+					if (!ftdmchan) {
+						ftdm_log(FTDM_LOG_ERROR, "Call %d [0x%x] not associated to zap channel\n", call_crv, call_crv);
+						return;
+					}
+
+					ftdm_log(FTDM_LOG_DEBUG, "Call setup failed on channel %d:%d\n", ftdmchan->span_id, ftdmchan->chan_id);
+
+					/*
+					 * Send signal to mod_openzap
+					 */
+					sig.channel->caller_data.hangup_cause = FTDM_CAUSE_NETWORK_OUT_OF_ORDER;
+
+					sig.event_id = FTDM_SIGEVENT_STOP;
+					isdn_data->sig_cb(&sig);
+
+					/* Release zap channel */
+					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
+					return;
+				}
+				break;
+
+			default:
+				ftdm_log(FTDM_LOG_ERROR, "Unhandled timer event %d\n", timer_evt->id);
+			}
+		}
+		else if (type == Q931_EVENT_TYPE_MESSAGE) {
+			struct Q931_CallMessageEvent *msg_evt = Q931CallEventGetData(event);
+
+			ftdm_log(FTDM_LOG_DEBUG, "\tMessage event\n");
+			assert(msg_evt);
+
+			/*
+			 * Slowly move stuff from the old event handler into this part...
+			 */
+			switch (Q931CallEventGetId(event)) {
+			case Q931_EVENT_SETUP_CONFIRM:
+			case Q931_EVENT_SETUP_COMPLETE_INDICATION:	/* CONNECT */
+				{
+					/* WARNING contains old interface code, yuck! */
+					if (!ftdmchan) {
+						ftdm_log(FTDM_LOG_ERROR, "Call %d [0x%x] not associated to zap channel\n", call_crv, call_crv);
+						return;
+					}
+					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_UP);
+				}
+				break;
+
+			default:
+				ftdm_log(FTDM_LOG_DEBUG, "Not yet handled message event %d\n", Q931CallEventGetId(event));
+			}
+		}
+		else {
+			ftdm_log(FTDM_LOG_ERROR, "Unknown event type %d\n", type);
+		}
+	}
+}
+
+/**
+ * Copy callednum, readding prefix as needed
+ */
+static void __isdn_get_number(const char *digits, const int ton, char *buf, int size)
+{
+	int offset = 0;
+
+	if (!digits || !buf || size <= 0) {
+		return;
+	}
+
+	switch (ton) {
+	case Q931_TON_NATIONAL:
+		offset = strlen(DEFAULT_NATIONAL_PREFIX);
+		memcpy(buf, DEFAULT_NATIONAL_PREFIX, offset);
+		break;
+	case Q931_TON_INTERNATIONAL:
+		offset = strlen(DEFAULT_INTERNATIONAL_PREFIX);
+		memcpy(buf, DEFAULT_INTERNATIONAL_PREFIX, offset);
+		break;
+	default:
+		break;
+	}
+
+	strncpy(&buf[offset], digits, size - (offset + 1));
+	buf[size - 1] = '\0';
+}
+
+#define isdn_get_number(num, buf) \
+	__isdn_get_number((const char *)(num)->Digit, (num)->TypNum, (char *)buf, sizeof(buf))
+
+
+/**
+ * \brief	The old call event handler (err, call message handler)
+ * \todo	This one must die!
+ */
+static L3INT ftdm_isdn_931_34(void *pvt, struct Q931_Call *call, Q931mes_Generic *msg, int mlen)
 {
 	ftdm_span_t *span = (ftdm_span_t *) pvt;
 	ftdm_isdn_data_t *isdn_data = span->signal_data;
 	Q931mes_Generic *gen = (Q931mes_Generic *) msg;
-	uint32_t chan_id = 0;
+	int chan_id = 0;
 	int chan_hunt = 0;
 	ftdm_channel_t *ftdmchan = NULL;
-	ftdm_caller_data_t *caller_data = NULL;
+//	ftdm_caller_data_t *caller_data = NULL;
 
 	if (Q931IsIEPresent(gen->ChanID)) {
 		Q931ie_ChanID *chanid = Q931GetIEPtr(gen->ChanID, gen->buf);
@@ -579,9 +768,30 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 
 	assert(span != NULL);
 	assert(isdn_data != NULL);
-	
+
+	/*
+	 * Support code for the new event handling system
+	 * Remove this as soon as we have the new api to set up calls
+	 */
+#ifdef __OLD__
+	if (gen->CRV) {
+		struct Q931_Call *call;
+
+		call = Q931GetCallByCRV(&isdn_data->q931, gen->CRV);
+		if (call && !Q931CallGetPrivate(call)) {
+			ftdm_log(FTDM_LOG_DEBUG, "Storing reference to current span in call %d [0x%x]\n", gen->CRV, gen->CRV);
+			Q931CallSetPrivate(call, span);
+		}
+	}
+#else
+	if (call && !Q931CallGetPrivate(call)) {
+		ftdm_log(FTDM_LOG_DEBUG, "Storing reference to current span in call %d [0x%x]\n", gen->CRV, gen->CRV);
+		Q931CallSetPrivate(call, span);
+	}
+#endif
 	ftdm_log(FTDM_LOG_DEBUG, "Yay I got an event! Type:[%02x] Size:[%d] CRV: %d (%#hx, CTX: %s)\n", gen->MesType, gen->Size, gen->CRV, gen->CRV, gen->CRVFlag ? "Terminator" : "Originator");
 
+#ifdef __TODO_OR_REMOVE__
 	if (gen->CRVFlag && (caller_data = isdn_data->outbound_crv[gen->CRV])) {
 		if (chan_id) {
 			caller_data->chan_id = chan_id;
@@ -602,9 +812,10 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 			caller_data->call_state = FTDM_CALLER_STATE_FAIL;
 			break;
 		}
-	
+
 		return 0;
 	}
+#endif
 
 	if (gen->CRVFlag) {
 		ftdmchan = isdn_data->channels_local_crv[gen->CRV];
@@ -629,7 +840,7 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 							ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
 						}
 						break;
-					case 1: 
+					case 1:
 						{ /* change status to "maintenance" */
 							ftdm_set_flag_locked(ftdmchan, FTDM_CHANNEL_SUSPENDED);
 							ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
@@ -663,7 +874,12 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
 				} else {
 					uint32_t i;
+
 					for (i = 1; i < span->chan_count; i++) {
+						/* Skip channels that are down and D-Channels (#OpenZAP-39) */
+						if (span->channels[i]->state == FTDM_CHANNEL_STATE_DOWN || span->channels[i]->type == FTDM_CHAN_TYPE_DQ921)
+							continue;
+
 						ftdm_set_state_locked((span->channels[i]), FTDM_CHANNEL_STATE_RESTART);
 					}
 				}
@@ -698,7 +914,7 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 						sig.channel->caller_data.hangup_cause = (cause) ? cause->Value : FTDM_CAUSE_NORMAL_UNSPECIFIED;
 
 						sig.event_id = FTDM_SIGEVENT_STOP;
-						status = ftdm_span_send_signal(ftdmchan->span, &sig);
+						status = isdn_data->sig_cb(&sig);
 
 						ftdm_log(FTDM_LOG_DEBUG, "Received %s in state %s, requested hangup for channel %d:%d\n", what, ftdm_channel_state2str(ftdmchan->state), ftdmchan->span_id, chan_id);
 					}
@@ -740,17 +956,21 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 			}
 			break;
 		case Q931mes_CONNECT:
+#if 0	/* Handled by new event code */
 			{
 				if (ftdmchan) {
 					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_UP);
 
+#if 0	/* Auto-Ack is enabled, we actually don't need this */
 					gen->MesType = Q931mes_CONNECT_ACKNOWLEDGE;
 					gen->CRVFlag = 0;	/* outbound */
-					Q931Rx43(&isdn_data->q931, (L3UCHAR *) gen, gen->Size);
+					Q931Rx43(&isdn_data->q931, gen, gen->Size);
+#endif
 				} else {
 					ftdm_log(FTDM_LOG_CRIT, "Received Connect with no matching channel %d\n", chan_id);
 				}
 			}
+#endif
 			break;
 		case Q931mes_SETUP:
 			{
@@ -770,13 +990,13 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 									ftdm_channel_state2str(ftdmchan->state));
 					break;
 				}
-				
+
 				ftdmchan = NULL;
 				/*
 				 * Channel selection for incoming calls:
 				 */
 				if (FTDM_SPAN_IS_NT(span) && chan_hunt) {
-					uint32_t x;
+					int x;
 
 					/*
 					 * In NT-mode with channel selection "any",
@@ -864,14 +1084,21 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 							memset(ftdmchan->mod_data, 0, sizeof(ftdm_isdn_bchan_data_t));
 						}
 
-						ftdm_set_string(ftdmchan->caller_data.cid_num.digits, (char *)callingnum->Digit);
-						ftdm_set_string(ftdmchan->caller_data.cid_name, (char *)callingnum->Digit);
-						ftdm_set_string(ftdmchan->caller_data.ani.digits, (char *)callingnum->Digit);
-						if (!overlap_dial) {
-							ftdm_set_string(ftdmchan->caller_data.dnis.digits, (char *)callednum->Digit);
-						}
+						/* copy number readd prefix as needed */
+						isdn_get_number(callingnum, ftdmchan->caller_data.cid_num.digits);
+						isdn_get_number(callingnum, ftdmchan->caller_data.cid_name);
+						isdn_get_number(callingnum, ftdmchan->caller_data.ani.digits);
 
+//						ftdm_set_string(ftdmchan->caller_data.cid_num.digits, (char *)callingnum->Digit);
+//						ftdm_set_string(ftdmchan->caller_data.cid_name, (char *)callingnum->Digit);
+//						ftdm_set_string(ftdmchan->caller_data.ani.digits, (char *)callingnum->Digit);
+						if (!overlap_dial) {
+//							ftdm_set_string(ftdmchan->caller_data.dnis.digits, (char *)callednum->Digit);
+							isdn_get_number(callednum, ftdmchan->caller_data.dnis.digits);
+						}
+#ifdef __TODO_OR_REMOVE__
 						ftdmchan->caller_data.CRV = gen->CRV;
+#endif
 						if (cplen > sizeof(ftdmchan->caller_data.raw_data)) {
 							cplen = sizeof(ftdmchan->caller_data.raw_data);
 						}
@@ -879,8 +1106,8 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 						memcpy(ftdmchan->caller_data.raw_data, msg, cplen);
 						ftdmchan->caller_data.raw_data_len = cplen;
 						fail = 0;
-					} 
-				} 
+					}
+				}
 
 				if (fail) {
 					Q931ie_Cause cause;
@@ -894,8 +1121,8 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 					//should we be casting here.. or do we need to translate value?
 					cause.Value = (unsigned char)((fail_cause) ? fail_cause : FTDM_CAUSE_WRONG_CALL_STATE);
 					*cause.Diag = '\0';
-					gen->Cause = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &cause);
-					Q931Rx43(&isdn_data->q931, (L3UCHAR *) gen, gen->Size);
+					gen->Cause = Q931AppendIE(gen, (L3UCHAR *) &cause);
+					Q931Rx43(&isdn_data->q931, gen, gen->Size);
 
 					if (gen->CRV) {
 						Q931ReleaseCRV(&isdn_data->q931, gen->CRV);
@@ -906,7 +1133,7 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 					} else {
 						ftdm_log(FTDM_LOG_CRIT, "Failed to open channel for new setup message\n");
 					}
-					
+
 				} else {
 					Q931ie_ChanID ChanID;
 
@@ -923,7 +1150,7 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 					} else {
 						ChanID.InfoChanSel = (unsigned char)ftdmchan->chan_id & 0x03;	/* None = 0, B1 = 1, B2 = 2, Any = 3 */
 					}
-					gen->ChanID = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &ChanID);
+					gen->ChanID = Q931AppendIE(gen, (L3UCHAR *) &ChanID);
 
 					if (overlap_dial) {
 						Q931ie_ProgInd progress;
@@ -933,17 +1160,17 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 						 */
 						progress.IEId = Q931ie_PROGRESS_INDICATOR;
 						progress.Size = sizeof(Q931ie_ProgInd);
-						progress.CodStand = Q931_CODING_ITU;	/* ITU */ 
+						progress.CodStand = Q931_CODING_ITU;	/* ITU */
 						progress.Location = 1;	/* private network serving the local user */
 						progress.ProgDesc = 8;	/* call is not end-to-end isdn = 1, in-band information available = 8 */
-						gen->ProgInd = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &progress);
+						gen->ProgInd = Q931AppendIE(gen, (L3UCHAR *) &progress);
 
 						/*
 						 * Send SETUP ACK
 						 */
 						gen->MesType = Q931mes_SETUP_ACKNOWLEDGE;
 						gen->CRVFlag = 1;	/* inbound call */
-						Q931Rx43(&isdn_data->q931, (L3UCHAR *) gen, gen->Size);
+						Q931Rx43(&isdn_data->q931, gen, gen->Size);
 
 						ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DIALTONE);
 					} else {
@@ -998,7 +1225,7 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 							}
 
 							/* TODO: make this more safe with strncat() */
-							pos = (int)strlen(ftdmchan->caller_data.dnis.digits);
+							pos = strlen(ftdmchan->caller_data.dnis.digits);
 							strcat(&ftdmchan->caller_data.dnis.digits[pos],    (char *)callednum->Digit);
 
 							/* update timer */
@@ -1019,61 +1246,6 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 			}
 			break;
 
-		case Q931mes_STATUS_ENQUIRY:
-			{
-				/*
-				 * !! HACK ALERT !!
-				 *
-				 * Map FreeTDM channel states to Q.931 states
-				 */
-				Q931ie_CallState state;
-				Q931ie_Cause cause;
-
-				gen->MesType = Q931mes_STATUS;
-				gen->CRVFlag = gen->CRVFlag ? 0 : 1;
-
-				state.CodStand  = Q931_CODING_ITU;	/* ITU-T */
-				state.CallState = Q931_U0;		/* Default: Null */
-
-				cause.IEId = Q931ie_CAUSE;
-				cause.Size = sizeof(Q931ie_Cause);
-				cause.CodStand = Q931_CODING_ITU;	/* ITU */
-				cause.Location = 1;	/* private network */
-				cause.Recom    = 1;	/* */
-				*cause.Diag    = '\0';
-
-				if(ftdmchan) {
-					switch(ftdmchan->state) {
-					case FTDM_CHANNEL_STATE_UP:
-						state.CallState = Q931_U10;	/* Active */
-						break;
-					case FTDM_CHANNEL_STATE_RING:
-						state.CallState = Q931_U6;	/* Call present */
-						break;
-					case FTDM_CHANNEL_STATE_DIALING:
-						state.CallState = Q931_U1;	/* Call initiated */
-						break;
-					case FTDM_CHANNEL_STATE_DIALTONE:
-						state.CallState = Q931_U25;	/* Overlap receiving */
-						break;
-
-					/* TODO: map missing states */
-
-					default:
-						state.CallState = Q931_U0;
-					}
-
-					cause.Value = 30;	/* response to STATUS ENQUIRY */
-				} else {
-					cause.Value = 98;	/* */
-				}
-
-				gen->CallState = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &state);
-				gen->Cause     = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &cause);
-				Q931Rx43(&isdn_data->q931, (L3UCHAR *) gen, gen->Size);
-			}
-			break;
-
 		default:
 			ftdm_log(FTDM_LOG_CRIT, "Received unhandled message %d (%#x)\n", (int)gen->MesType, (int)gen->MesType);
 			break;
@@ -1083,17 +1255,10 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 	return 0;
 }
 
-/**
- * \brief Handler for Q921 read event
- * \param pvt Span were message is coming from
- * \param ind Q921 indication
- * \param tei Terminal Endpoint Identifier
- * \param msg Message string
- * \param mlen Message string length
- * \return 0 on success, 1 on failure
- */
 static int ftdm_isdn_921_23(void *pvt, Q921DLMsg_t ind, L2UCHAR tei, L2UCHAR *msg, L2INT mlen)
 {
+	ftdm_span_t *span = pvt;
+	ftdm_isdn_data_t *isdn_data = span->signal_data;
 	int ret, offset = (ind == Q921_DL_DATA) ? 4 : 3;
 	char bb[4096] = "";
 
@@ -1101,20 +1266,14 @@ static int ftdm_isdn_921_23(void *pvt, Q921DLMsg_t ind, L2UCHAR tei, L2UCHAR *ms
 	case Q921_DL_DATA:
 	case Q921_DL_UNIT_DATA:
 		print_hex_bytes(msg + offset, mlen - offset, bb, sizeof(bb));
-#ifdef HAVE_LIBPCAP
-		/*Q931ToPcap*/
-                if(do_q931ToPcap==1){
-			ftdm_span_t *span = (ftdm_span_t *) pvt;
-                        if(writeQ931PacketToPcap(msg + offset, mlen - offset, span->span_id, 1) != FTDM_SUCCESS){
-                                ftdm_log(FTDM_LOG_WARNING, "Couldn't write Q931 buffer to pcap file!\n");
-                        }
-                }
-                /*Q931ToPcap done*/
+		ftdm_log(FTDM_LOG_DEBUG, "READ %d\n%s\n%s\n\n", (int)mlen - offset, LINE, bb);
+#ifdef HAVE_PCAP
+		if (isdn_pcap_capture_l3only(isdn_data)) {
+			isdn_pcap_write(isdn_data, msg, mlen, (ind == Q921_DL_UNIT_DATA) ? ISDN_PCAP_INCOMING_BCAST : ISDN_PCAP_INCOMING);
+		}
 #endif
-		ftdm_log(FTDM_LOG_DEBUG, "READ %d\n%s\n%s\n\n\n", (int)mlen - offset, LINE, bb);
-	
 	default:
-		ret = Q931Rx23(pvt, ind, tei, msg, mlen);
+		ret = Q931Rx23(&isdn_data->q931, ind, tei, msg, mlen);
 		if (ret != 0)
 			ftdm_log(FTDM_LOG_DEBUG, "931 parse error [%d] [%s]\n", ret, q931_error_to_name(ret));
 		break;
@@ -1123,35 +1282,22 @@ static int ftdm_isdn_921_23(void *pvt, Q921DLMsg_t ind, L2UCHAR tei, L2UCHAR *ms
 	return ((ret >= 0) ? 1 : 0);
 }
 
-/**
- * \brief Handler for Q921 write event
- * \param pvt Span were message is coming from
- * \param msg Message string
- * \param mlen Message string length
- * \return 0 on success, -1 on failure
- */
 static int ftdm_isdn_921_21(void *pvt, L2UCHAR *msg, L2INT mlen)
 {
 	ftdm_span_t *span = (ftdm_span_t *) pvt;
 	ftdm_size_t len = (ftdm_size_t) mlen;
 	ftdm_isdn_data_t *isdn_data = span->signal_data;
 
-#ifdef IODEBUG
-	char bb[4096] = "";
-	print_hex_bytes(msg, len, bb, sizeof(bb));
-	print_bits(msg, (int)len, bb, sizeof(bb), FTDM_ENDIAN_LITTLE, 0);
-	ftdm_log(FTDM_LOG_DEBUG, "WRITE %d\n%s\n%s\n\n", (int)len, LINE, bb);
-
-#endif
-
 	assert(span != NULL);
+
+#ifdef HAVE_PCAP
+	if (isdn_pcap_capture_both(isdn_data)) {
+		isdn_pcap_write(isdn_data, msg, mlen, ISDN_PCAP_OUTGOING);
+	}
+#endif
 	return ftdm_channel_write(isdn_data->dchan, msg, len, &len) == FTDM_SUCCESS ? 0 : -1;
 }
 
-/**
- * \brief Handler for channel state change
- * \param ftdmchan Channel to handle
- */
 static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 {
 	Q931mes_Generic *gen = (Q931mes_Generic *) ftdmchan->caller_data.raw_data;
@@ -1159,7 +1305,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 	ftdm_sigmsg_t sig;
 	ftdm_status_t status;
 
-	ftdm_log(FTDM_LOG_DEBUG, "%d:%d STATE [%s]\n", 
+	ftdm_log(FTDM_LOG_DEBUG, "%d:%d STATE [%s]\n",
 			ftdmchan->span_id, ftdmchan->chan_id, ftdm_channel_state2str(ftdmchan->state));
 
 	memset(&sig, 0, sizeof(sig));
@@ -1185,11 +1331,15 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 		{
 			if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
 				sig.event_id = FTDM_SIGEVENT_PROGRESS;
-				if ((status = ftdm_span_send_signal(ftdmchan->span, &sig) != FTDM_SUCCESS)) {
+				if ((status = isdn_data->sig_cb(&sig) != FTDM_SUCCESS)) {
 					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
 				}
 			} else {
+				int crv = gen->CRV;
+
+				Q931InitMesGeneric(gen);
 				gen->MesType = Q931mes_CALL_PROCEEDING;
+				gen->CRV     = crv;
 				gen->CRVFlag = 1;	/* inbound */
 
 				if (FTDM_SPAN_IS_NT(ftdmchan->span)) {
@@ -1209,10 +1359,10 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 					} else {
 						ChanID.InfoChanSel = (unsigned char)ftdmchan->chan_id & 0x03;	/* None = 0, B1 = 1, B2 = 2, Any = 3 */
 					}
-					gen->ChanID = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &ChanID);
+					gen->ChanID = Q931AppendIE(gen, (L3UCHAR *) &ChanID);
 				}
 
-				Q931Rx43(&isdn_data->q931, (void *)gen, gen->Size);
+				Q931Rx43(&isdn_data->q931, gen, gen->Size);
 			}
 		}
 		break;
@@ -1229,7 +1379,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 		{
 			if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
 				sig.event_id = FTDM_SIGEVENT_START;
-				if ((status = ftdm_span_send_signal(ftdmchan->span, &sig) != FTDM_SUCCESS)) {
+				if ((status = isdn_data->sig_cb(&sig) != FTDM_SUCCESS)) {
 					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
 				}
 			}
@@ -1239,7 +1389,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 		{
 			ftdmchan->caller_data.hangup_cause = FTDM_CAUSE_NORMAL_UNSPECIFIED;
 			sig.event_id = FTDM_SIGEVENT_RESTART;
-			status = ftdm_span_send_signal(ftdmchan->span, &sig);
+			status = isdn_data->sig_cb(&sig);
 			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 		}
 		break;
@@ -1247,7 +1397,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 		{
 			if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
 				sig.event_id = FTDM_SIGEVENT_PROGRESS_MEDIA;
-				if ((status = ftdm_span_send_signal(ftdmchan->span, &sig) != FTDM_SUCCESS)) {
+				if ((status = isdn_data->sig_cb(&sig) != FTDM_SUCCESS)) {
 					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
 				}
 			} else {
@@ -1259,7 +1409,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 				}
 				gen->MesType = Q931mes_ALERTING;
 				gen->CRVFlag = 1;	/* inbound call */
-				Q931Rx43(&isdn_data->q931, (void *)gen, gen->Size);
+				Q931Rx43(&isdn_data->q931, gen, gen->Size);
 			}
 		}
 		break;
@@ -1267,7 +1417,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 		{
 			if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
 				sig.event_id = FTDM_SIGEVENT_UP;
-				if ((status = ftdm_span_send_signal(ftdmchan->span, &sig) != FTDM_SUCCESS)) {
+				if ((status = isdn_data->sig_cb(&sig) != FTDM_SUCCESS)) {
 					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
 				}
 			} else {
@@ -1280,7 +1430,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 				gen->MesType = Q931mes_CONNECT;
 				gen->BearerCap = 0;
 				gen->CRVFlag = 1;	/* inbound call */
-				Q931Rx43(&isdn_data->q931, (void *)gen, ftdmchan->caller_data.raw_data_len);
+				Q931Rx43(&isdn_data->q931, gen, ftdmchan->caller_data.raw_data_len);
 			}
 		}
 		break;
@@ -1304,7 +1454,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 
 			/*
 			 * Q.931 Setup Message
-			 */ 
+			 */
 			Q931InitMesGeneric(gen);
 			gen->MesType = Q931mes_SETUP;
 			gen->CRVFlag = 0;		/* outbound(?) */
@@ -1319,7 +1469,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 			BearerCap.ITR       = Q931_ITR_64K;	/* 64k = 16, Packet mode = 0 */
 			BearerCap.Layer1Ident = 1;
 			BearerCap.UIL1Prot = (codec == FTDM_CODEC_ALAW) ? 3 : 2;	/* U-law = 2, A-law = 3 */
-			gen->BearerCap = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &BearerCap);
+			gen->BearerCap = Q931AppendIE(gen, (L3UCHAR *) &BearerCap);
 
 			/*
 			 * ChannelID IE
@@ -1334,7 +1484,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 			} else {
 				ChanID.InfoChanSel = (unsigned char)ftdmchan->chan_id & 0x03;	/* None = 0, B1 = 1, B2 = 2, Any = 3 */
 			}
-			gen->ChanID = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &ChanID);
+			gen->ChanID = Q931AppendIE(gen, (L3UCHAR *) &ChanID);
 
 			/*
 			 * Progress IE
@@ -1343,29 +1493,29 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 			Progress.CodStand = Q931_CODING_ITU;	/* 0 = ITU */
 			Progress.Location = 0;  /* 0 = User, 1 = Private Network */
 			Progress.ProgDesc = 3;	/* 1 = Not end-to-end ISDN */
-			gen->ProgInd = Q931AppendIE((L3UCHAR *)gen, (L3UCHAR *)&Progress);
+			gen->ProgInd = Q931AppendIE(gen, (L3UCHAR *)&Progress);
 
 			/*
 			 * Display IE
 			 */
-			if (!(isdn_data->opts & FTDM_ISDN_OPT_OMIT_DISPLAY_IE)) {
+			if (!(isdn_data->opts & FTDM_ISDN_OPT_OMIT_DISPLAY_IE) && FTDM_SPAN_IS_NT(ftdmchan->span)) {
 				Q931InitIEDisplay(&Display);
 				Display.Size = Display.Size + (unsigned char)strlen(ftdmchan->caller_data.cid_name);
-				gen->Display = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &Display);
+				gen->Display = Q931AppendIE(gen, (L3UCHAR *) &Display);
 				ptrDisplay = Q931GetIEPtr(gen->Display, gen->buf);
 				ftdm_copy_string((char *)ptrDisplay->Display, ftdmchan->caller_data.cid_name, strlen(ftdmchan->caller_data.cid_name)+1);
 			}
 
 			/*
 			 * CallingNum IE
-			 */ 
+			 */
 			Q931InitIECallingNum(&CallingNum);
 			CallingNum.TypNum    = ftdmchan->caller_data.ani.type;
 			CallingNum.NumPlanID = Q931_NUMPLAN_E164;
 			CallingNum.PresInd   = Q931_PRES_ALLOWED;
 			CallingNum.ScreenInd = Q931_SCREEN_USER_NOT_SCREENED;
 			CallingNum.Size = CallingNum.Size + (unsigned char)strlen(ftdmchan->caller_data.cid_num.digits);
-			gen->CallingNum = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &CallingNum);
+			gen->CallingNum = Q931AppendIE(gen, (L3UCHAR *) &CallingNum);
 			ptrCallingNum = Q931GetIEPtr(gen->CallingNum, gen->buf);
 			ftdm_copy_string((char *)ptrCallingNum->Digit, ftdmchan->caller_data.cid_num.digits, strlen(ftdmchan->caller_data.cid_num.digits)+1);
 
@@ -1373,12 +1523,12 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 			 * CalledNum IE
 			 */
 			Q931InitIECalledNum(&CalledNum);
-			CalledNum.TypNum    = ftdmchan->caller_data.dnis.type;
+			CalledNum.TypNum    = Q931_TON_UNKNOWN;
 			CalledNum.NumPlanID = Q931_NUMPLAN_E164;
-			CalledNum.Size = CalledNum.Size + (unsigned char)strlen(ftdmchan->caller_data.dnis.digits);
-			gen->CalledNum = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &CalledNum);
+			CalledNum.Size = CalledNum.Size + (unsigned char)strlen(ftdmchan->caller_data.ani.digits);
+			gen->CalledNum = Q931AppendIE(gen, (L3UCHAR *) &CalledNum);
 			ptrCalledNum = Q931GetIEPtr(gen->CalledNum, gen->buf);
-			ftdm_copy_string((char *)ptrCalledNum->Digit, ftdmchan->caller_data.dnis.digits, strlen(ftdmchan->caller_data.dnis.digits)+1);
+			ftdm_copy_string((char *)ptrCalledNum->Digit, ftdmchan->caller_data.ani.digits, strlen(ftdmchan->caller_data.ani.digits)+1);
 
 			/*
 			 * High-Layer Compatibility IE   (Note: Required for AVM FritzBox)
@@ -1388,10 +1538,24 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 			HLComp.Interpret = 4;	/* only possible value */
 			HLComp.PresMeth  = 1;   /* High-layer protocol profile */
 			HLComp.HLCharID  = Q931_HLCHAR_TELEPHONY;	/* Telephony = 1, Fax G2+3 = 4, Fax G4 = 65 (Class I)/ 68 (Class II or III) */   /* TODO: make accessible from user layer */
-			gen->HLComp = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &HLComp);
+			gen->HLComp = Q931AppendIE(gen, (L3UCHAR *) &HLComp);
 
-			Q931Rx43(&isdn_data->q931, (L3UCHAR *) gen, gen->Size);
+			Q931Rx43(&isdn_data->q931, gen, gen->Size);
 			isdn_data->channels_local_crv[gen->CRV] = ftdmchan;
+
+			/*
+			 * Support code for the new event handling system
+			 * Remove this as soon as we have the new api to set up calls
+			 */
+			if (gen->CRV) {
+				struct Q931_Call *call;
+
+				call = Q931GetCallByCRV(&isdn_data->q931, gen->CRV);
+				if (call) {
+					ftdm_log(FTDM_LOG_DEBUG, "Storing reference to current span in call %d [0x%x]\n", gen->CRV, gen->CRV);
+					Q931CallSetPrivate(call, ftdmchan->span);
+				}
+			}
 		}
 		break;
 	case FTDM_CHANNEL_STATE_HANGUP_COMPLETE:
@@ -1400,7 +1564,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 			if(ftdmchan->last_state == FTDM_CHANNEL_STATE_HANGUP) {
 				gen->MesType = Q931mes_RELEASE_COMPLETE;
 
-				Q931Rx43(&isdn_data->q931, (L3UCHAR *) gen, gen->Size);
+				Q931Rx43(&isdn_data->q931, gen, gen->Size);
 			}
 			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 		}
@@ -1433,8 +1597,8 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 				//cause.Value = (unsigned char) FTDM_CAUSE_UNALLOCATED;
 				cause.Value = (unsigned char) ftdmchan->caller_data.hangup_cause;
 				*cause.Diag = '\0';
-				gen->Cause = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &cause);
-				Q931Rx43(&isdn_data->q931, (L3UCHAR *) gen, gen->Size);
+				gen->Cause = Q931AppendIE(gen, (L3UCHAR *) &cause);
+				Q931Rx43(&isdn_data->q931, gen, gen->Size);
 
 				/* we're done, release channel */
 				//ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE);
@@ -1448,8 +1612,8 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 
 				cause.Value = (unsigned char) ftdmchan->caller_data.hangup_cause;
 				*cause.Diag = '\0';
-				gen->Cause = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &cause);
-				Q931Rx43(&isdn_data->q931, (void *)gen, gen->Size);
+				gen->Cause = Q931AppendIE(gen, (L3UCHAR *) &cause);
+				Q931Rx43(&isdn_data->q931, gen, gen->Size);
 
 				/* this will be triggered by the RELEASE_COMPLETE reply */
 				/* ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE); */
@@ -1462,8 +1626,8 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 
 				cause.Value = (unsigned char) ftdmchan->caller_data.hangup_cause;
 				*cause.Diag = '\0';
-				gen->Cause = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &cause);
-				Q931Rx43(&isdn_data->q931, (L3UCHAR *) gen, gen->Size);
+				gen->Cause = Q931AppendIE(gen, (L3UCHAR *) &cause);
+				Q931Rx43(&isdn_data->q931, gen, gen->Size);
 			}
 		}
 		break;
@@ -1472,20 +1636,16 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 			ftdm_log(FTDM_LOG_DEBUG, "Terminating: Direction %s\n", ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND) ? "Outbound" : "Inbound");
 
 			sig.event_id = FTDM_SIGEVENT_STOP;
-			status = ftdm_span_send_signal(ftdmchan->span, &sig);
+			status = isdn_data->sig_cb(&sig);
 			gen->MesType = Q931mes_RELEASE;
 			gen->CRVFlag = ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND) ? 0 : 1;
-			Q931Rx43(&isdn_data->q931, (void *)gen, gen->Size);
+			Q931Rx43(&isdn_data->q931, gen, gen->Size);
 		}
 	default:
 		break;
 	}
 }
 
-/**
- * \brief Checks current state on a span
- * \param span Span to check status on
- */
 static __inline__ void check_state(ftdm_span_t *span)
 {
     if (ftdm_test_flag(span, FTDM_SPAN_STATE_CHANGE)) {
@@ -1503,56 +1663,79 @@ static __inline__ void check_state(ftdm_span_t *span)
     }
 }
 
-/**
- * \brief Processes FreeTDM event on a span
- * \param span Span to process event on
- * \param event Event to process
- * \return Success or failure
- */
+
 static __inline__ ftdm_status_t process_event(ftdm_span_t *span, ftdm_event_t *event)
 {
-	ftdm_log(FTDM_LOG_DEBUG, "EVENT [%s][%d:%d] STATE [%s]\n", 
+	ftdm_isdn_data_t *isdn_data = span->signal_data;
+	ftdm_alarm_flag_t alarmbits;
+	ftdm_sigmsg_t sig;
+
+	memset(&sig, 0, sizeof(sig));
+	sig.chan_id = event->channel->chan_id;
+	sig.span_id = event->channel->span_id;
+	sig.channel = event->channel;
+
+	ftdm_log(FTDM_LOG_DEBUG, "EVENT [%s][%d:%d] STATE [%s]\n",
 			ftdm_oob_event2str(event->enum_id), event->channel->span_id, event->channel->chan_id, ftdm_channel_state2str(event->channel->state));
 
 	switch(event->enum_id) {
 	case FTDM_OOB_ALARM_TRAP:
 		{
+			sig.event_id = FTDM_OOB_ALARM_TRAP;
 			if (event->channel->state != FTDM_CHANNEL_STATE_DOWN) {
-				if (event->channel->type == FTDM_CHAN_TYPE_B) {
-					ftdm_set_state_locked(event->channel, FTDM_CHANNEL_STATE_RESTART);
-				}
+				ftdm_set_state_locked(event->channel, FTDM_CHANNEL_STATE_RESTART);
 			}
-			
-
 			ftdm_set_flag(event->channel, FTDM_CHANNEL_SUSPENDED);
-
-			
-			ftdm_channel_get_alarms(event->channel);
-			ftdm_log(FTDM_LOG_WARNING, "channel %d:%d (%d:%d) has alarms! [%s]\n", 
-					event->channel->span_id, event->channel->chan_id, 
-					event->channel->physical_span_id, event->channel->physical_chan_id, 
+			ftdm_channel_get_alarms(event->channel, &alarmbits);
+			isdn_data->sig_cb(&sig);
+			ftdm_log(FTDM_LOG_WARNING, "channel %d:%d (%d:%d) has alarms [%s]\n",
+					event->channel->span_id, event->channel->chan_id,
+					event->channel->physical_span_id, event->channel->physical_chan_id,
 					event->channel->last_error);
 		}
 		break;
 	case FTDM_OOB_ALARM_CLEAR:
 		{
-			
-			ftdm_log(FTDM_LOG_WARNING, "channel %d:%d (%d:%d) alarms Cleared!\n", event->channel->span_id, event->channel->chan_id,
-					event->channel->physical_span_id, event->channel->physical_chan_id);
-
+			sig.event_id = FTDM_OOB_ALARM_CLEAR;
 			ftdm_clear_flag(event->channel, FTDM_CHANNEL_SUSPENDED);
-			ftdm_channel_get_alarms(event->channel);
+			ftdm_channel_get_alarms(event->channel, &alarmbits);
+			isdn_data->sig_cb(&sig);
 		}
 		break;
+#ifdef __BROKEN_BY_FREETDM_CONVERSION__
+	case FTDM_OOB_DTMF:	/* Taken from ozmod_analog, minus the CALLWAITING state handling */
+		{
+			const char * digit_str = (const char *)event->data;
+
+			if(digit_str) {
+				fio_event_cb_t event_callback = NULL;
+
+				ftdm_channel_queue_dtmf(event->channel, digit_str);
+				if (span->event_callback) {
+					event_callback = span->event_callback;
+				} else if (event->channel->event_callback) {
+					event_callback = event->channel->event_callback;
+				}
+
+				if (event_callback) {
+					event->channel->event_header.channel = event->channel;
+					event->channel->event_header.e_type = FTDM_EVENT_DTMF;
+					event->channel->event_header.data = (void *)digit_str;
+					event_callback(event->channel, &event->channel->event_header);
+					event->channel->event_header.e_type = FTDM_EVENT_NONE;
+					event->channel->event_header.data = NULL;
+				}
+				ftdm_safe_free(event->data);
+			}
+		}
+		break;
+#endif
 	}
 
 	return FTDM_SUCCESS;
 }
 
-/**
- * \brief Checks for events on a span
- * \param span Span to check for events
- */
+
 static __inline__ void check_events(ftdm_span_t *span)
 {
 	ftdm_status_t status;
@@ -1583,12 +1766,7 @@ static __inline__ void check_events(ftdm_span_t *span)
 	}
 }
 
-/**
- * \brief Retrieves tone generation output to be sent
- * \param ts Teletone generator
- * \param map Tone map
- * \return -1 on error, 0 on success
- */
+
 static int teletone_handler(teletone_generation_session_t *ts, teletone_tone_map_t *map)
 {
 	ftdm_buffer_t *dt_buffer = ts->user_data;
@@ -1602,20 +1780,14 @@ static int teletone_handler(teletone_generation_session_t *ts, teletone_tone_map
 	return 0;
 }
 
-/**
- * \brief Main thread function for tone generation on a span
- * \param me Current thread
- * \param obj Span to generate tones on
- */
 static void *ftdm_isdn_tones_run(ftdm_thread_t *me, void *obj)
 {
 	ftdm_span_t *span = (ftdm_span_t *) obj;
 	ftdm_isdn_data_t *isdn_data = span->signal_data;
 	ftdm_buffer_t *dt_buffer = NULL;
-	teletone_generation_session_t ts = {{{{0}}}};
+	teletone_generation_session_t ts = {{{{0}}}};;
 	unsigned char frame[1024];
-	uint32_t x;
-	int interval = 0;
+	int x, interval;
 	int offset = 0;
 
 	ftdm_log(FTDM_LOG_DEBUG, "ISDN tones thread starting.\n");
@@ -1646,7 +1818,7 @@ static void *ftdm_isdn_tones_run(ftdm_thread_t *me, void *obj)
 	ts.duration = ts.rate;
 
 	/* main loop */
-	while(ftdm_running() && ftdm_test_flag(isdn_data, FTDM_ISDN_TONES_RUNNING) && !ftdm_test_flag(isdn_data, FTDM_ISDN_STOP)) {
+	while(ftdm_running() && ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING)) {
 		ftdm_wait_flag_t flags;
 		ftdm_status_t status;
 		int last_chan_state = 0;
@@ -1798,11 +1970,6 @@ done:
 	return NULL;
 }
 
-/**
- * \brief Main thread function for an ISDN span
- * \param me Current thread
- * \param obj Span to monitor
- */
 static void *ftdm_isdn_run(ftdm_thread_t *me, void *obj)
 {
 	ftdm_span_t *span = (ftdm_span_t *) obj;
@@ -1812,15 +1979,16 @@ static void *ftdm_isdn_run(ftdm_thread_t *me, void *obj)
 	int errs = 0;
 
 #ifdef WIN32
-    timeBeginPeriod(1);
+	timeBeginPeriod(1);
 #endif
 
 	ftdm_log(FTDM_LOG_DEBUG, "ISDN thread starting.\n");
 	ftdm_set_flag(isdn_data, FTDM_ISDN_RUNNING);
 
 	Q921Start(&isdn_data->q921);
+	Q931Start(&isdn_data->q931);
 
-	while(ftdm_running() && ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING) && !ftdm_test_flag(isdn_data, FTDM_ISDN_STOP)) {
+	while(ftdm_running() && ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING)) {
 		ftdm_wait_flag_t flags = FTDM_READ;
 		ftdm_status_t status = ftdm_channel_wait(isdn_data->dchan, &flags, 100);
 
@@ -1852,20 +2020,13 @@ static void *ftdm_isdn_run(ftdm_thread_t *me, void *obj)
 			{
 				errs = 0;
 				if (flags & FTDM_READ) {
-
-					if (ftdm_test_flag(isdn_data->dchan, FTDM_CHANNEL_SUSPENDED)) {
-						ftdm_clear_flag_all(span, FTDM_CHANNEL_SUSPENDED);
-					}
 					len = sizeof(frame);
 					if (ftdm_channel_read(isdn_data->dchan, frame, &len) == FTDM_SUCCESS) {
-#ifdef IODEBUG
-						char bb[4096] = "";
-						print_hex_bytes(frame, len, bb, sizeof(bb));
-
-						print_bits(frame, (int)len, bb, sizeof(bb), FTDM_ENDIAN_LITTLE, 0);
-						ftdm_log(FTDM_LOG_DEBUG, "READ %d\n%s\n%s\n\n", (int)len, LINE, bb);
+#ifdef HAVE_PCAP
+						if (isdn_pcap_capture_both(isdn_data)) {
+							isdn_pcap_write(isdn_data, frame, len, ISDN_PCAP_INCOMING);
+						}
 #endif
-
 						Q921QueueHDLCFrame(&isdn_data->q921, frame, (int)len);
 						Q921Rx12(&isdn_data->q921);
 					}
@@ -1876,45 +2037,28 @@ static void *ftdm_isdn_run(ftdm_thread_t *me, void *obj)
 			break;
 		}
 	}
-	
- done:
+
+done:
 	ftdm_channel_close(&isdn_data->dchans[0]);
 	ftdm_channel_close(&isdn_data->dchans[1]);
 	ftdm_clear_flag(isdn_data, FTDM_ISDN_RUNNING);
 
 #ifdef WIN32
-    timeEndPeriod(1);
+	timeEndPeriod(1);
+#endif
+#ifdef HAVE_PCAP
+	if (isdn_pcap_is_open(isdn_data)) {
+		isdn_pcap_close(isdn_data);
+	}
 #endif
-
 	ftdm_log(FTDM_LOG_DEBUG, "ISDN thread ended.\n");
 	return NULL;
 }
 
-/**
- * \brief FreeTDM ISDN signaling module initialisation
- * \return Success
- */
-static FIO_SIG_LOAD_FUNCTION(ftdm_isdn_init)
-{
-	Q931Initialize();
-
-	Q921SetGetTimeCB(ftdm_time_now);
-	Q931SetGetTimeCB(ftdm_time_now);
-
-	return FTDM_SUCCESS;
-}
-
-/**
- * \brief Receives a Q931 indication message
- * \param pvt Span were message is coming from
- * \param ind Q931 indication
- * \param tei Terminal Endpoint Identifier
- * \param msg Message string
- * \param mlen Message string length
- * \return 0 on success
- */
 static int q931_rx_32(void *pvt, Q921DLMsg_t ind, L3UCHAR tei, L3UCHAR *msg, L3INT mlen)
 {
+	ftdm_span_t *span = pvt;
+	ftdm_isdn_data_t *isdn_data = span->signal_data;
 	int offset = 4;
 	char bb[4096] = "";
 
@@ -1924,16 +2068,6 @@ static int q931_rx_32(void *pvt, Q921DLMsg_t ind, L3UCHAR tei, L3UCHAR *msg, L3I
 
 	case Q921_DL_DATA:
 		print_hex_bytes(msg + offset, mlen - offset, bb, sizeof(bb));
-#ifdef HAVE_LIBPCAP
-		/*Q931ToPcap*/
-		if(do_q931ToPcap==1){
-			ftdm_span_t *span = (ftdm_span_t *) pvt;
-			if(writeQ931PacketToPcap(msg + offset, mlen - offset, span->span_id, 0) != FTDM_SUCCESS){
-				ftdm_log(FTDM_LOG_WARNING, "Couldn't write Q931 buffer to pcap file!\n");	
-			}
-		}
-		/*Q931ToPcap done*/
-#endif
 		ftdm_log(FTDM_LOG_DEBUG, "WRITE %d\n%s\n%s\n\n", (int)mlen - offset, LINE, bb);
 		break;
 
@@ -1941,17 +2075,14 @@ static int q931_rx_32(void *pvt, Q921DLMsg_t ind, L3UCHAR tei, L3UCHAR *msg, L3I
 		break;
 	}
 
-	return Q921Rx32(pvt, ind, tei, msg, mlen);
+#ifdef HAVE_PCAP
+	if (isdn_pcap_capture_l3only(isdn_data)) {
+		isdn_pcap_write(isdn_data, msg, mlen, ISDN_PCAP_OUTGOING);
+	}
+#endif
+	return Q921Rx32(&isdn_data->q921, ind, tei, msg, mlen);
 }
 
-/**
- * \brief Logs Q921 message
- * \param pvt Span were message is coming from
- * \param level Q921 log level
- * \param msg Message string
- * \param size Message string length
- * \return 0
- */
 static int ftdm_isdn_q921_log(void *pvt, Q921LogLevel_t level, char *msg, L2INT size)
 {
 	ftdm_span_t *span = (ftdm_span_t *) pvt;
@@ -1960,14 +2091,6 @@ static int ftdm_isdn_q921_log(void *pvt, Q921LogLevel_t level, char *msg, L2INT
 	return 0;
 }
 
-/**
- * \brief Logs Q931 message
- * \param pvt Span were message is coming from
- * \param level Q931 log level
- * \param msg Message string
- * \param size Message string length
- * \return 0
- */
 static L3INT ftdm_isdn_q931_log(void *pvt, Q931LogLevel_t level, char *msg, L3INT size)
 {
 	ftdm_span_t *span = (ftdm_span_t *) pvt;
@@ -1975,9 +2098,7 @@ static L3INT ftdm_isdn_q931_log(void *pvt, Q931LogLevel_t level, char *msg, L3IN
 	ftdm_log("Span", "Q.931", span->span_id, (int)level, "%s", msg);
 	return 0;
 }
-/**
- * \brief ISDN state map
- */
+
 static ftdm_state_map_t isdn_state_map = {
 	{
 		{
@@ -2002,7 +2123,7 @@ static ftdm_state_map_t isdn_state_map = {
 			ZSD_OUTBOUND,
 			ZSM_UNACCEPTABLE,
 			{FTDM_CHANNEL_STATE_DIALING, FTDM_END},
-			{FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END}
+			{FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_DOWN, FTDM_END}
 		},
 		{
 			ZSD_OUTBOUND,
@@ -2076,7 +2197,7 @@ static ftdm_state_map_t isdn_state_map = {
 			ZSD_INBOUND,
 			ZSM_UNACCEPTABLE,
 			{FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
-			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, 
+			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA,
 			 FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_UP, FTDM_END},
 		},
 		{
@@ -2085,17 +2206,11 @@ static ftdm_state_map_t isdn_state_map = {
 			{FTDM_CHANNEL_STATE_UP, FTDM_END},
 			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
 		},
-		
-
 	}
 };
 
 /**
- * \brief Stops an ISDN span
- * \param span Span to halt
- * \return Success
- *
- * Sets a stop flag and waits for the threads to end
+ * \brief	Stop signalling on span
  */
 static ftdm_status_t ftdm_isdn_stop(ftdm_span_t *span)
 {
@@ -2104,9 +2219,9 @@ static ftdm_status_t ftdm_isdn_stop(ftdm_span_t *span)
 	if (!ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING)) {
 		return FTDM_FAIL;
 	}
-		
+
 	ftdm_set_flag(isdn_data, FTDM_ISDN_STOP);
-	
+
 	while(ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING)) {
 		ftdm_sleep(100);
 	}
@@ -2116,15 +2231,10 @@ static ftdm_status_t ftdm_isdn_stop(ftdm_span_t *span)
 	}
 
 	return FTDM_SUCCESS;
-	
 }
 
 /**
- * \brief Starts an ISDN span
- * \param span Span to halt
- * \return Success or failure
- *
- * Launches a thread to monitor the span and a thread to generate tones on the span
+ * \brief	Start signalling on span
  */
 static ftdm_status_t ftdm_isdn_start(ftdm_span_t *span)
 {
@@ -2148,19 +2258,46 @@ static ftdm_status_t ftdm_isdn_start(ftdm_span_t *span)
 	return ret;
 }
 
-/**
- * \brief Parses an option string to flags
- * \param in String to parse for configuration options
- * \return Flags
- */
+
+/*###################################################################*
+ * (text) value parsing / translation
+ *###################################################################*/
+
+static int32_t parse_loglevel(const char *level)
+{
+	if (!level) {
+		return -1;
+	}
+
+	if (!strcasecmp(level, "debug")) {
+		return FTDM_LOG_LEVEL_DEBUG;
+	} else if (!strcasecmp(level, "info")) {
+		return FTDM_LOG_LEVEL_INFO;
+	} else if (!strcasecmp(level, "notice")) {
+		return FTDM_LOG_LEVEL_NOTICE;
+	} else if (!strcasecmp(level, "warning")) {
+		return FTDM_LOG_LEVEL_WARNING;
+	} else if (!strcasecmp(level, "error")) {
+		return FTDM_LOG_LEVEL_ERROR;
+	} else if (!strcasecmp(level, "alert")) {
+		return FTDM_LOG_LEVEL_ALERT;
+	} else if (!strcasecmp(level, "crit")) {
+		return FTDM_LOG_LEVEL_CRIT;
+	} else if (!strcasecmp(level, "emerg")) {
+		return FTDM_LOG_LEVEL_EMERG;
+	} else {
+		return -1;
+	}
+}
+
 static uint32_t parse_opts(const char *in)
 {
 	uint32_t flags = 0;
-	
+
 	if (!in) {
 		return 0;
 	}
-	
+
 	if (strstr(in, "suggest_channel")) {
 		flags |= FTDM_ISDN_OPT_SUGGEST_CHANNEL;
 	}
@@ -2176,17 +2313,259 @@ static uint32_t parse_opts(const char *in)
 	return flags;
 }
 
+static uint32_t parse_dialect(const char *in)
+{
+	if (!in) {
+		return Q931_Dialect_Count;
+	}
+
+#if __UNSUPPORTED__
+	if (!strcasecmp(in, "national")) {
+		return Q931_Dialect_National;
+	}
+	if (!strcasecmp(in, "dms")) {
+		return Q931_Dialect_DMS;
+	}
+#endif
+	if (!strcasecmp(in, "5ess")) {
+		return Q931_Dialect_5ESS;
+	}
+	if (!strcasecmp(in, "dss1")) {
+		return Q931_Dialect_DSS1;
+	}
+	if (!strcasecmp(in, "q931")) {
+		return Q931_Dialect_Q931;
+	}
+	return Q931_Dialect_Count;
+}
+
+
+/*###################################################################*
+ * API commands
+ *###################################################################*/
+
+static const char isdn_api_usage[] =
+#ifdef HAVE_PCAP
+	"isdn capture <span> <start> <filename> [q931only]\n"
+	"isdn capture <span> <stop|suspend|resume>\n"
+#endif
+	"isdn loglevel <span> <q921|q931|all> <loglevel>\n"
+	"isdn dump <span> calls\n"
+	"isdn help";
+
+
 /**
- * \brief Initialises an ISDN span from configuration variables
- * \param span Span to configure
- * \param sig_cb Callback function for event signals
- * \param ap List of configuration variables
- * \return Success or failure
+ * isdn_api
  */
-static FIO_SIG_CONFIGURE_FUNCTION(ftdm_isdn_configure_span)
+static FIO_API_FUNCTION(isdn_api)
+{
+	char *mycmd = NULL, *argv[10] = { 0 };
+	int argc = 0;
+
+	if (data) {
+		mycmd = strdup(data);
+		argc = ftdm_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+	}
+
+	if (!argc || !strcasecmp(argv[0], "help")) {
+		stream->write_function(stream, "%s\n", isdn_api_usage);
+		goto done;
+	}
+	else if (!strcasecmp(argv[0], "dump")) {
+		ftdm_isdn_data_t *isdn_data = NULL;
+		ftdm_span_t *span = NULL;
+		int span_id = 0;
+
+		/* dump <span> calls */
+
+		if (argc < 3) {
+			stream->write_function(stream, "-ERR not enough arguments.\n");
+			goto done;
+		}
+
+		span_id = atoi(argv[1]);
+
+		if (ftdm_span_find_by_name(argv[1], &span) == FTDM_SUCCESS || ftdm_span_find(span_id, &span) == FTDM_SUCCESS) {
+			isdn_data = span->signal_data;
+		} else {
+			stream->write_function(stream, "-ERR invalid span.\n");
+			goto done;
+		}
+
+		if (!strcasecmp(argv[2], "calls")) {
+			/* dump all calls to log */
+			Q931DumpAllCalls(&isdn_data->q931);
+			stream->write_function(stream, "+OK call information dumped to log\n");
+			goto done;
+		}
+	}
+	else if (!strcasecmp(argv[0], "loglevel")) {
+		ftdm_isdn_data_t *isdn_data = NULL;
+		ftdm_span_t *span = NULL;
+		int span_id = 0;
+		int layer   = 0;
+		int level   = 0;
+
+		/* loglevel <span> <q921|q931|all> [level] */
+
+		if (argc < 3) {
+			stream->write_function(stream, "-ERR not enough arguments.\n");
+			goto done;
+		}
+
+		span_id = atoi(argv[1]);
+
+		if (ftdm_span_find_by_name(argv[1], &span) == FTDM_SUCCESS || ftdm_span_find(span_id, &span) == FTDM_SUCCESS) {
+			isdn_data = span->signal_data;
+		} else {
+			stream->write_function(stream, "-ERR invalid span.\n");
+			goto done;
+		}
+
+		if (!strcasecmp(argv[2], "q921")) {
+			layer = 0x01;
+		} else if(!strcasecmp(argv[2], "q931")) {
+			layer = 0x02;
+		} else if (!strcasecmp(argv[2], "all")) {
+			layer = 0x03;
+		} else {
+			stream->write_function(stream, "-ERR invalid layer\n");
+			goto done;
+		}
+
+		if (argc > 3) {
+			/* set loglevel  */
+			if ((level = parse_loglevel(argv[3])) < 0) {
+				stream->write_function(stream, "-ERR invalid loglevel\n");
+				goto done;
+			}
+
+			if (layer & 0x01) {	/* q921 */
+				Q921SetLogLevel(&isdn_data->q921, (Q921LogLevel_t)level);
+			}
+			if (layer & 0x02) {	/* q931 */
+				Q931SetLogLevel(&isdn_data->q931, (Q931LogLevel_t)level);
+			}
+			stream->write_function(stream, "+OK loglevel set");
+		} else {
+			/* get loglevel */
+			if (layer & 0x01) {
+				stream->write_function(stream, "Q.921 loglevel: %s\n",
+					Q921GetLogLevelName(&isdn_data->q921));
+			}
+			if (layer & 0x02) {
+				stream->write_function(stream, "Q.931 loglevel: %s\n",
+					Q931GetLogLevelName(&isdn_data->q931));
+			}
+			stream->write_function(stream, "+OK");
+		}
+		goto done;
+	}
+#ifdef HAVE_PCAP
+	else if (!strcasecmp(argv[0], "capture")) {
+		ftdm_isdn_data_t *isdn_data = NULL;
+		ftdm_span_t *span = NULL;
+		int span_id = 0;
+
+		/* capture <span> <start> <filename> [q931only] */
+		/* capture <span> <stop|suspend|resume> */
+
+		if (argc < 3) {
+			stream->write_function(stream, "-ERR not enough arguments.\n");
+			goto done;
+		}
+
+		span_id = atoi(argv[1]);
+
+		if (ftdm_span_find_by_name(argv[1], &span) == FTDM_SUCCESS || ftdm_span_find(span_id, &span) == FTDM_SUCCESS) {
+			isdn_data = span->signal_data;
+		} else {
+			stream->write_function(stream, "-ERR invalid span.\n");
+			goto done;
+		}
+
+		if (!strcasecmp(argv[2], "start")) {
+			char *filename = NULL;
+
+			if (argc < 4) {
+				stream->write_function(stream, "-ERR not enough parameters.\n");
+				goto done;
+			}
+
+			if (isdn_pcap_is_open(isdn_data)) {
+				stream->write_function(stream, "-ERR capture is already running.\n");
+				goto done;
+			}
+
+			filename = argv[3];
+
+			if (isdn_pcap_open(isdn_data, filename) != FTDM_SUCCESS) {
+				stream->write_function(stream, "-ERR failed to open capture file.\n");
+				goto done;
+			}
+
+			if (argc > 4 && !strcasecmp(argv[4], "q931only")) {
+				isdn_data->flags |= FTDM_ISDN_CAPTURE_L3ONLY;
+			}
+			isdn_pcap_start(isdn_data);
+
+			stream->write_function(stream, "+OK capture started.\n");
+			goto done;
+		}
+		else if(!strcasecmp(argv[2], "stop")) {
+
+			if (!isdn_pcap_is_open(isdn_data)) {
+				stream->write_function(stream, "-ERR capture is not running.\n");
+				goto done;
+			}
+
+			isdn_pcap_stop(isdn_data);
+			isdn_pcap_close(isdn_data);
+
+			stream->write_function(stream, "+OK capture stopped.\n");
+			goto done;
+		}
+		else if(!strcasecmp(argv[2], "suspend")) {
+
+			if (!isdn_pcap_is_open(isdn_data)) {
+				stream->write_function(stream, "-ERR capture is not running.\n");
+				goto done;
+			}
+			isdn_pcap_stop(isdn_data);
+
+			stream->write_function(stream, "+OK capture suspended.\n");
+			goto done;
+		}
+		else if(!strcasecmp(argv[2], "resume")) {
+
+			if (!isdn_pcap_is_open(isdn_data)) {
+				stream->write_function(stream, "-ERR capture is not running.\n");
+				goto done;
+			}
+			isdn_pcap_start(isdn_data);
+
+			stream->write_function(stream, "+OK capture resumed.\n");
+			goto done;
+		}
+		else {
+			stream->write_function(stream, "-ERR wrong action.\n");
+			goto done;
+		}
+	}
+#endif
+	else {
+		stream->write_function(stream, "-ERR invalid command.\n");
+	}
+done:
+	ftdm_safe_free(mycmd);
+
+	return FTDM_SUCCESS;
+}
+
+static FIO_SIG_CONFIGURE_FUNCTION(isdn_configure_span)
 {
 	uint32_t i, x = 0;
-	ftdm_channel_t *dchans[2] = {0};
+	ftdm_channel_t *dchans[2] = { 0 };
 	ftdm_isdn_data_t *isdn_data;
 	const char *tonemap = "us";
 	char *var, *val;
@@ -2194,40 +2573,8 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_isdn_configure_span)
 	int32_t digit_timeout = 0;
 	int q921loglevel = -1;
 	int q931loglevel = -1;
-#ifdef HAVE_LIBPCAP
-	int q931topcap   = -1; 	/*Q931ToPcap*/
-	int openPcap = 0; 	/*Flag: open Pcap file please*/
-#endif
 
 	if (span->signal_type) {
-#ifdef HAVE_LIBPCAP
-		/*Q931ToPcap: Get the content of the q931topcap and pcapfilename args given by mod_freetdm */
-		while((var = va_arg(ap, char *))) {
-			if (!strcasecmp(var, "q931topcap")) {
-				q931topcap = va_arg(ap, int);
-				if(q931topcap==1) {
-					/*PCAP on*/;
-					openPcap=1;
-				} else if (q931topcap==0) {
-					/*PCAP off*/
-					if (closePcapFile() != FTDM_SUCCESS) return FTDM_FAIL;
-					do_q931ToPcap=0;
-					return FTDM_SUCCESS;
-				}
-			}
-			if (!strcasecmp(var, "pcapfilename")) {
-				/*Put filename into global var*/
-				pcapfn = va_arg(ap, char*);
-			}
-		}
-		/*We know now, that user wants to enable Q931ToPcap and what file name he wants, so open it please*/
-		if(openPcap==1){
-			if(openPcapFile() != FTDM_SUCCESS) return FTDM_FAIL;
-			do_q931ToPcap=1;
-			return FTDM_SUCCESS;
-		}
-		/*Q931ToPcap done*/
-#endif
 		snprintf(span->last_error, sizeof(span->last_error), "Span is already configured for signalling [%d].", span->signal_type);
 		return FTDM_FAIL;
 	}
@@ -2236,34 +2583,33 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_isdn_configure_span)
 		ftdm_log(FTDM_LOG_WARNING, "Invalid trunk type '%s' defaulting to T1.\n", ftdm_trunk_type2str(span->trunk_type));
 		span->trunk_type = FTDM_TRUNK_T1;
 	}
-	
+
 	for(i = 1; i <= span->chan_count; i++) {
 		if (span->channels[i]->type == FTDM_CHAN_TYPE_DQ921) {
 			if (x > 1) {
 				snprintf(span->last_error, sizeof(span->last_error), "Span has more than 2 D-Channels!");
 				return FTDM_FAIL;
-			} else {
-				if (ftdm_channel_open(span->span_id, i, &dchans[x]) == FTDM_SUCCESS) {
-					ftdm_log(FTDM_LOG_DEBUG, "opening d-channel #%d %d:%d\n", x, dchans[x]->span_id, dchans[x]->chan_id);
-					dchans[x]->state = FTDM_CHANNEL_STATE_UP;
-					x++;
-				}
+			}
+
+			if (ftdm_channel_open(span->span_id, i, &dchans[x]) == FTDM_SUCCESS) {
+				ftdm_log(FTDM_LOG_DEBUG, "opening d-channel #%d %d:%d\n", x, dchans[x]->span_id, dchans[x]->chan_id);
+				dchans[x]->state = FTDM_CHANNEL_STATE_UP;
+				x++;
 			}
 		}
 	}
-
 	if (!x) {
 		snprintf(span->last_error, sizeof(span->last_error), "Span has no D-Channels!");
 		return FTDM_FAIL;
 	}
 
-	isdn_data = ftdm_malloc(sizeof(*isdn_data));
+	isdn_data = malloc(sizeof(*isdn_data));
 	assert(isdn_data != NULL);
 	memset(isdn_data, 0, sizeof(*isdn_data));
-	
+
 	isdn_data->mode = Q931_TE;
-	dialect = Q931_Dialect_National;
-	
+	dialect = Q931_Dialect_Q931;
+
 	while((var = va_arg(ap, char *))) {
 		if (!strcasecmp(var, "mode")) {
 			if (!(val = va_arg(ap, char *))) {
@@ -2274,8 +2620,9 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_isdn_configure_span)
 			if (!(val = va_arg(ap, char *))) {
 				break;
 			}
-			dialect = q931_str2Q931Dialect_type(val);
+			dialect = parse_dialect(val);
 			if (dialect == Q931_Dialect_Count) {
+				snprintf(span->last_error, sizeof(span->last_error), "Invalid/unknown dialect [%s]!", val);
 				return FTDM_FAIL;
 			}
 		} else if (!strcasecmp(var, "opts")) {
@@ -2314,7 +2661,6 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_isdn_configure_span)
 		}
 	}
 
-
 	if (!digit_timeout) {
 		digit_timeout = DEFAULT_DIGIT_TIMEOUT;
 	}
@@ -2327,7 +2673,7 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_isdn_configure_span)
 	if (isdn_data->mode == Q931_NT) {
 		ftdm_isdn_bchan_data_t *data;
 
-		data = ftdm_malloc((span->chan_count - 1) * sizeof(ftdm_isdn_bchan_data_t));
+		data = malloc(span->chan_count * sizeof(ftdm_isdn_bchan_data_t));
 		if (!data) {
 			return FTDM_FAIL;
 		}
@@ -2339,15 +2685,13 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_isdn_configure_span)
 			}
 		}
 	}
-					
-	span->start = ftdm_isdn_start;
-	span->stop = ftdm_isdn_stop;
-	span->signal_cb = sig_cb;
+
+	isdn_data->sig_cb    = sig_cb;
 	isdn_data->dchans[0] = dchans[0];
 	isdn_data->dchans[1] = dchans[1];
-	isdn_data->dchan = isdn_data->dchans[0];
+	isdn_data->dchan     = isdn_data->dchans[0];
 	isdn_data->digit_timeout = digit_timeout;
-	
+
 	Q921_InitTrunk(&isdn_data->q921,
 				   0,
 				   0,
@@ -2357,55 +2701,104 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_isdn_configure_span)
 				   ftdm_isdn_921_21,
 				   (Q921Tx23CB_t)ftdm_isdn_921_23,
 				   span,
-				   &isdn_data->q931);
+				   span);
 
-	Q921SetLogCB(&isdn_data->q921, &ftdm_isdn_q921_log, isdn_data);
+	Q921SetLogCB(&isdn_data->q921, &ftdm_isdn_q921_log, span);
 	Q921SetLogLevel(&isdn_data->q921, (Q921LogLevel_t)q921loglevel);
-	
-	Q931Api_InitTrunk(&isdn_data->q931,
+
+	Q931InitTrunk(&isdn_data->q931,
 					  dialect,
 					  isdn_data->mode,
 					  span->trunk_type,
 					  ftdm_isdn_931_34,
 					  (Q931Tx32CB_t)q931_rx_32,
 					  ftdm_isdn_931_err,
-					  &isdn_data->q921,
+					  span,
 					  span);
 
-	Q931SetLogCB(&isdn_data->q931, &ftdm_isdn_q931_log, isdn_data);
+	Q931SetLogCB(&isdn_data->q931, &ftdm_isdn_q931_log, span);
 	Q931SetLogLevel(&isdn_data->q931, (Q931LogLevel_t)q931loglevel);
 
-	isdn_data->q931.autoRestartAck = 1;
-	isdn_data->q931.autoConnectAck = 0;
-	isdn_data->q931.autoServiceAck = 1;
-	span->signal_data = isdn_data;
-	span->signal_type = FTDM_SIGTYPE_ISDN;
+	/* Register new event hander CB */
+	Q931SetCallEventCB(&isdn_data->q931, ftdm_isdn_call_event, span);
+
+	/* TODO: hmm, maybe drop the "Trunk" prefix */
+	Q931TrunkSetAutoRestartAck(&isdn_data->q931, 1);
+	Q931TrunkSetAutoConnectAck(&isdn_data->q931, 1);
+	Q931TrunkSetAutoServiceAck(&isdn_data->q931, 1);
+	Q931TrunkSetStatusEnquiry(&isdn_data->q931, 0);
+
+	span->state_map     = &isdn_state_map;
+	span->signal_data   = isdn_data;
+	span->signal_type   = FTDM_SIGTYPE_ISDN;
+	span->start         = ftdm_isdn_start;
+	span->stop          = ftdm_isdn_stop;
 	span->outgoing_call = isdn_outgoing_call;
 
+	span->get_channel_sig_status = isdn_get_channel_sig_status;
+	span->get_span_sig_status    = isdn_get_span_sig_status;
+
+#ifdef __TODO__
 	if ((isdn_data->opts & FTDM_ISDN_OPT_SUGGEST_CHANNEL)) {
 		span->channel_request = isdn_channel_request;
-		ftdm_set_flag(span, FTDM_SPAN_SUGGEST_CHAN_ID);
+		span->flags |= FTDM_SPAN_SUGGEST_CHAN_ID;
 	}
-	span->state_map = &isdn_state_map;
-
+#endif
 	ftdm_span_load_tones(span, tonemap);
 
 	return FTDM_SUCCESS;
 }
 
 /**
- * \brief FreeTDM ISDN signaling module definition
+ * ISDN module io interface
+ * \note	This is really ugly...
  */
-EX_DECLARE_DATA ftdm_module_t ftdm_module = {
-	"isdn",
-	NULL,
-	close_pcap,
-	ftdm_isdn_init,
-	ftdm_isdn_configure_span,
-	NULL
+static ftdm_io_interface_t isdn_interface = {
+	.name = "isdn",
+	.api  = isdn_api
 };
 
+/**
+ * \brief	ISDN module io interface init callback
+ */
+static FIO_IO_LOAD_FUNCTION(isdn_io_load)
+{
+        assert(fio != NULL);
 
+        *fio = &isdn_interface;
+
+        return FTDM_SUCCESS;
+}
+
+/**
+ * \brief	ISDN module load callback
+ */
+static FIO_SIG_LOAD_FUNCTION(isdn_load)
+{
+	Q931Initialize();
+
+	Q921SetGetTimeCB(ftdm_time_now);
+	Q931SetGetTimeCB(ftdm_time_now);
+
+	return FTDM_SUCCESS;
+}
+
+/**
+ * \brief	ISDN module shutdown callback
+ */
+static FIO_SIG_UNLOAD_FUNCTION(isdn_unload)
+{
+	return FTDM_SUCCESS;
+};
+
+ftdm_module_t ftdm_module = {
+	.name          = "isdn",
+	.io_load       = isdn_io_load,
+	.io_unload     = NULL,
+	.sig_load      = isdn_load,
+	.sig_unload    = isdn_unload,
+	.sig_configure = isdn_configure_span
+};
 
 /* For Emacs:
  * Local Variables:
@@ -2415,5 +2808,5 @@ EX_DECLARE_DATA ftdm_module_t ftdm_module = {
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
  */
diff --git a/libs/freetdm/src/ftmod/ftmod_isdn/ftdm_isdn.h b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.h
similarity index 83%
rename from libs/freetdm/src/ftmod/ftmod_isdn/ftdm_isdn.h
rename to libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.h
index 7168abeb3b..95eee90887 100644
--- a/libs/freetdm/src/ftmod/ftmod_isdn/ftdm_isdn.h
+++ b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.h
@@ -1,23 +1,23 @@
 /*
  * Copyright (c) 2007, Anthony Minessale II
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  * * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
- * 
+ *
  * * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * 
+ *
  * * Neither the name of the original author; nor the names of any contributors
  * may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * 
- * 
+ *
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -33,7 +33,6 @@
 
 #ifndef FTDM_ISDN_H
 #define FTDM_ISDN_H
-#include "freetdm.h"
 
 #define DEFAULT_DIGIT_TIMEOUT	10000		/* default overlap timeout: 10 seconds */
 
@@ -42,17 +41,23 @@ typedef enum {
 	FTDM_ISDN_OPT_NONE = 0,
 	FTDM_ISDN_OPT_SUGGEST_CHANNEL = (1 << 0),
 	FTDM_ISDN_OPT_OMIT_DISPLAY_IE = (1 << 1),	/*!< Do not send Caller name in outgoing SETUP message (= Display IE) */
-	FTDM_ISDN_OPT_DISABLE_TONES = (1 << 2),		/*!< Disable tone generating thread (NT mode) */
+	FTDM_ISDN_OPT_DISABLE_TONES   = (1 << 2),	/*!< Disable tone generating thread (NT mode) */
 
 	FTDM_ISDN_OPT_MAX = (2 << 0)
 } ftdm_isdn_opts_t;
 
 typedef enum {
-	FTDM_ISDN_RUNNING = (1 << 0),
-	FTDM_ISDN_TONES_RUNNING = (1 << 1),
-	FTDM_ISDN_STOP = (1 << 2)
+	FTDM_ISDN_RUNNING        = (1 << 0),
+	FTDM_ISDN_TONES_RUNNING  = (1 << 1),
+	FTDM_ISDN_STOP           = (1 << 2),
+
+	FTDM_ISDN_CAPTURE        = (1 << 3),
+	FTDM_ISDN_CAPTURE_L3ONLY = (1 << 4)
 } ftdm_isdn_flag_t;
 
+#ifdef HAVE_PCAP
+struct pcap_context;
+#endif
 
 struct ftdm_isdn_data {
 	Q921Data_t q921;
@@ -60,6 +65,7 @@ struct ftdm_isdn_data {
 	ftdm_channel_t *dchan;
 	ftdm_channel_t *dchans[2];
 	struct ftdm_sigmsg sigmsg;
+	fio_signal_cb_t sig_cb;
 	uint32_t flags;
 	int32_t mode;
 	int32_t digit_timeout;
@@ -67,6 +73,9 @@ struct ftdm_isdn_data {
 	ftdm_caller_data_t *outbound_crv[32768];
 	ftdm_channel_t *channels_local_crv[32768];
 	ftdm_channel_t *channels_remote_crv[32768];
+#ifdef HAVE_PCAP
+	struct pcap_context *pcap;
+#endif
 };
 
 typedef struct ftdm_isdn_data ftdm_isdn_data_t;
@@ -75,7 +84,7 @@ typedef struct ftdm_isdn_data ftdm_isdn_data_t;
 /* b-channel private data */
 struct ftdm_isdn_bchan_data
 {
-	L2ULONG digit_timeout;
+	int32_t digit_timeout;
 };
 
 typedef struct ftdm_isdn_bchan_data ftdm_isdn_bchan_data_t;
@@ -91,6 +100,6 @@ typedef struct ftdm_isdn_bchan_data ftdm_isdn_bchan_data_t;
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
  */
 
diff --git a/libs/freetdm/src/ftmod/ftmod_isdn/ozmod_isdn.2005.vcproj b/libs/freetdm/src/ftmod/ftmod_isdn/ozmod_isdn.2005.vcproj
deleted file mode 100644
index 5c8d2efc0f..0000000000
--- a/libs/freetdm/src/ftmod/ftmod_isdn/ozmod_isdn.2005.vcproj
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ftmod_isdn"
-	ProjectGUID="{729344A5-D5E9-434D-8EE8-AF8C6C795D15}"
-	RootNamespace="ftmod_isdn"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\isdn\5ESSmes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\5ESSStateNT.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\5ESSStateTE.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\DMSmes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\DMSStateNT.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\DMSStateTE.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\EuroISDNStateNT.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\EuroISDNStateTE.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\mfifo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\nationalmes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\nationalStateNT.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\nationalStateTE.c"
-				>
-			</File>
-			<File
-				RelativePath="ftmod_isdn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\Q921.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\Q931.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\Q931api.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\Q931ie.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\Q931mes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\Q931StateNT.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\Q931StateTE.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\Q932mes.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\isdn\include\5ESS.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\include\DMS.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\include\mfifo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\include\national.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\include\Q921.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\include\Q921priv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\include\Q931.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\include\Q931ie.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\isdn\include\Q932.h"
-				>
-			</File>
-			<File
-				RelativePath="ftdm_isdn.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
index a7135aab0d..036e80891c 100644
--- a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
+++ b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
@@ -1,23 +1,23 @@
 /*
  * Copyright (c) 2007, Anthony Minessale II
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  * * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
- * 
+ *
  * * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * 
+ *
  * * Neither the name of the original author; nor the names of any contributors
  * may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * 
- * 
+ *
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -30,10 +30,13 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 #include "private/ftdm_core.h"
 #include "ftmod_libpri.h"
 
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x)	(sizeof((x)) / sizeof((x)[0]))
+#endif
+
 /**
  * \brief Unloads libpri IO module
  * \return Success
@@ -140,100 +143,84 @@ static void s_pri_message(char *s)
 static void s_pri_message(struct pri *pri, char *s)
 #endif
 {
-		ftdm_log(FTDM_LOG_DEBUG, "%s", s);
+	ftdm_log(FTDM_LOG_DEBUG, "%s", s);
 }
 
-/**
- * \brief Parses an option string to flags
- * \param in String to parse for configuration options
- * \return Flags
- */
-static uint32_t parse_opts(const char *in)
-{
-	uint32_t flags = 0;
-	
-	if (!in) {
-		return 0;
-	}
-	
-	if (strstr(in, "suggest_channel")) {
-		flags |= FTMOD_LIBPRI_OPT_SUGGEST_CHANNEL;
-	}
-	
-	if (strstr(in, "omit_display")) {
-		flags |= FTMOD_LIBPRI_OPT_OMIT_DISPLAY_IE;
-	}
-	
-	if (strstr(in, "omit_redirecting_number")) {
-		flags |= FTMOD_LIBPRI_OPT_OMIT_REDIRECTING_NUMBER_IE;
-	}
+static const struct ftdm_libpri_debug {
+	const char *name;
+	const int   flags;
+} ftdm_libpri_debug[] = {
+	{ "q921_raw",     PRI_DEBUG_Q921_RAW   },
+	{ "q921_dump",    PRI_DEBUG_Q921_DUMP  },
+	{ "q921_state",   PRI_DEBUG_Q921_STATE },
+	{ "q921_all",    (PRI_DEBUG_Q921_RAW | PRI_DEBUG_Q921_DUMP | PRI_DEBUG_Q921_STATE) },
 
-	return flags;
-}
+	{ "q931_dump",    PRI_DEBUG_Q931_DUMP    },
+	{ "q931_state",   PRI_DEBUG_Q931_STATE   },
+	{ "q931_anomaly", PRI_DEBUG_Q931_ANOMALY },
+	{ "q931_all",    (PRI_DEBUG_Q931_DUMP | PRI_DEBUG_Q931_STATE | PRI_DEBUG_Q931_ANOMALY) },
+
+	{ "config",       PRI_DEBUG_CONFIG },
+	{ "apdu",         PRI_DEBUG_APDU   },
+	{ "aoc",          PRI_DEBUG_AOC    }
+};
 
 /**
  * \brief Parses a debug string to flags
  * \param in Debug string to parse for
- * \return Flags
+ * \return Flags or -1 if nothing matched
  */
-static int parse_debug(const char *in)
+static int parse_debug(const char *in, int *flags)
 {
-	int flags = 0;
+	int res = -1;
+	int i;
 
-	if (!in) {
+	if (!in || !flags)
+		return -1;
+
+	if (!strcmp(in, "all")) {
+		*flags = PRI_DEBUG_ALL;
+		return 0;
+	}
+	if (strstr(in, "none")) {
+		*flags = 0;
 		return 0;
 	}
 
-	if (strstr(in, "q921_raw")) {
-		flags |= PRI_DEBUG_Q921_RAW;
+	for (i = 0; i < ARRAY_SIZE(ftdm_libpri_debug); i++) {
+		if (strstr(in, ftdm_libpri_debug[i].name)) {
+			*flags |= ftdm_libpri_debug[i].flags;
+			res = 0;
+		}
 	}
-
-	if (strstr(in, "q921_dump")) {
-		flags |= PRI_DEBUG_Q921_DUMP;
-	}
-
-	if (strstr(in, "q921_state")) {
-		flags |= PRI_DEBUG_Q921_STATE;
-	}
-
-	if (strstr(in, "config")) {
-		flags |= PRI_DEBUG_CONFIG;
-	}
-
-	if (strstr(in, "q931_dump")) {
-		flags |= PRI_DEBUG_Q931_DUMP;
-	}
-
-	if (strstr(in, "q931_state")) {
-		flags |= PRI_DEBUG_Q931_STATE;
-	}
-
-	if (strstr(in, "q931_anomaly")) {
-		flags |= PRI_DEBUG_Q931_ANOMALY;
-	}
-
-	if (strstr(in, "apdu")) {
-		flags |= PRI_DEBUG_APDU;
-	}
-
-	if (strstr(in, "aoc")) {
-		flags |= PRI_DEBUG_AOC;
-	}
-
-	if (strstr(in, "all")) {
-		flags |= PRI_DEBUG_ALL;
-	}
-
-	if (strstr(in, "none")) {
-		flags = 0;
-	}
-
-	return flags;
+	return res;
 }
 
+static ftdm_status_t ftdm_libpri_start(ftdm_span_t *span);
 static ftdm_io_interface_t ftdm_libpri_interface;
 
-static ftdm_status_t ftdm_libpri_start(ftdm_span_t *span);
+static const char *ftdm_libpri_usage =
+	"Usage:\n"
+	"libpri kill <span>\n"
+	"libpri debug <span> <all|none|flag,...flagN>\n"
+	"\n"
+	"Possible debug flags:\n"
+	"\tq921_raw     - Q.921 Raw messages\n"
+	"\tq921_dump    - Q.921 Decoded messages\n"
+	"\tq921_state   - Q.921 State machine changes\n"
+	"\tq921_all     - Enable all Q.921 debug options\n"
+	"\n"
+	"\tq931_dump    - Q.931 Messages\n"
+	"\tq931_state   - Q.931 State machine changes\n"
+	"\tq931_anomaly - Q.931 Anomalies\n"
+	"\tq931_all     - Enable all Q.931 debug options\n"
+	"\n"
+	"\tapdu         - Application protocol data unit\n"
+	"\taoc          - Advice of Charge messages\n"
+	"\tconfig       - Configuration\n"
+	"\n"
+	"\tnone         - Disable debugging\n"
+	"\tall          - Enable all debug options\n";
 
 /**
  * \brief API function to kill or debug a libpri span
@@ -244,13 +231,20 @@ static ftdm_status_t ftdm_libpri_start(ftdm_span_t *span);
 static FIO_API_FUNCTION(ftdm_libpri_api)
 {
 	char *mycmd = NULL, *argv[10] = { 0 };
-    int argc = 0;
-	
+	int argc = 0;
+
 	if (data) {
 		mycmd = ftdm_strdup(data);
 		argc = ftdm_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
 	}
 
+	if (argc == 1) {
+		if (!strcasecmp(argv[0], "help") || !strcasecmp(argv[0], "usage")) {
+			stream->write_function(stream, ftdm_libpri_usage);
+			goto done;
+		}
+	}
+
 	if (argc == 2) {
 		if (!strcasecmp(argv[0], "kill")) {
 			int span_id = atoi(argv[1]);
@@ -280,13 +274,20 @@ static FIO_API_FUNCTION(ftdm_libpri_api)
 
 			if (ftdm_span_find_by_name(argv[1], &span) == FTDM_SUCCESS) {
 				ftdm_libpri_data_t *isdn_data = span->signal_data;
+				int flags = 0;
+
 				if (span->start != ftdm_libpri_start) {
 					stream->write_function(stream, "%s: -ERR invalid span.\n", __FILE__);
 					goto done;
 				}
 
-				pri_set_debug(isdn_data->spri.pri, parse_debug(argv[2]));				
-				stream->write_function(stream, "%s: +OK debug set.\n", __FILE__);
+				if (parse_debug(argv[2], &flags) == -1) {
+					stream->write_function(stream, "%s: -ERR invalid debug flags given\n", __FILE__);
+					goto done;
+				}
+
+				pri_set_debug(isdn_data->spri.pri, flags);
+				stream->write_function(stream, "%s: +OK debug %s.\n", __FILE__, (flags) ? "enabled" : "disabled");
 				goto done;
 			} else {
 				stream->write_function(stream, "%s: -ERR invalid span.\n", __FILE__);
@@ -295,16 +296,15 @@ static FIO_API_FUNCTION(ftdm_libpri_api)
 		}
 
 	}
-
 	stream->write_function(stream, "%s: -ERR invalid command.\n", __FILE__);
-	
- done:
 
+done:
 	ftdm_safe_free(mycmd);
 
 	return FTDM_SUCCESS;
 }
 
+
 /**
  * \brief Loads libpri IO module
  * \param fio FreeTDM IO interface
@@ -313,10 +313,10 @@ static FIO_API_FUNCTION(ftdm_libpri_api)
 static FIO_IO_LOAD_FUNCTION(ftdm_libpri_io_init)
 {
 	assert(fio != NULL);
-	memset(&ftdm_libpri_interface, 0, sizeof(ftdm_libpri_interface));
 
+	memset(&ftdm_libpri_interface, 0, sizeof(ftdm_libpri_interface));
 	ftdm_libpri_interface.name = "libpri";
-	ftdm_libpri_interface.api = ftdm_libpri_api;
+	ftdm_libpri_interface.api  = &ftdm_libpri_api;
 
 	*fio = &ftdm_libpri_interface;
 
@@ -445,8 +445,6 @@ static ftdm_state_map_t isdn_state_map = {
 			{FTDM_CHANNEL_STATE_UP, FTDM_END},
 			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
 		},
-		
-
 	}
 };
 
@@ -461,11 +459,9 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 	ftdm_status_t status;
 	ftdm_sigmsg_t sig;
 	q931_call *call = (q931_call *) ftdmchan->call_data;
-	
-	
-	ftdm_log(FTDM_LOG_DEBUG, "%d:%d STATE [%s]\n", 
-			ftdmchan->span_id, ftdmchan->chan_id, ftdm_channel_state2str(ftdmchan->state));
 
+	ftdm_log(FTDM_LOG_DEBUG, "%d:%d STATE [%s]\n",
+			ftdmchan->span_id, ftdmchan->chan_id, ftdm_channel_state2str(ftdmchan->state));
 
 #if 0
 	if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND) && !call) {
@@ -473,7 +469,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 	}
 #endif
 
-	
+
 	memset(&sig, 0, sizeof(sig));
 	sig.chan_id = ftdmchan->chan_id;
 	sig.span_id = ftdmchan->span_id;
@@ -484,7 +480,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 	case FTDM_CHANNEL_STATE_DOWN:
 		{
 			ftdmchan->call_data = NULL;
-			ftdm_channel_done(ftdmchan);			
+			ftdm_channel_done(ftdmchan);
 		}
 		break;
 	case FTDM_CHANNEL_STATE_PROGRESS:
@@ -562,7 +558,6 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 				return;
 			}
 
-			
 			dp = ftdmchan->caller_data.dnis.type;
 			switch(dp) {
 			case FTDM_TON_NATIONAL:
@@ -582,17 +577,26 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 			sr = pri_sr_new();
 			assert(sr);
 			pri_sr_set_channel(sr, ftdmchan->chan_id, 0, 0);
-			pri_sr_set_bearer(sr, 0, isdn_data->l1);
+			pri_sr_set_bearer(sr, PRI_TRANS_CAP_SPEECH, isdn_data->l1);
 			pri_sr_set_called(sr, ftdmchan->caller_data.dnis.digits, dp, 1);
-			pri_sr_set_caller(sr, ftdmchan->caller_data.cid_num.digits, (isdn_data->opts & FTMOD_LIBPRI_OPT_OMIT_DISPLAY_IE ? NULL : ftdmchan->caller_data.cid_name),
-						dp, (ftdmchan->caller_data.pres != 1 ? PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN : PRES_PROHIB_USER_NUMBER_NOT_SCREENED));
+			pri_sr_set_caller(sr, ftdmchan->caller_data.cid_num.digits,
+					(isdn_data->opts & FTMOD_LIBPRI_OPT_OMIT_DISPLAY_IE ? NULL : ftdmchan->caller_data.cid_name),
+					dp,
+					(ftdmchan->caller_data.pres != 1 ? PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN : PRES_PROHIB_USER_NUMBER_NOT_SCREENED));
 
 			if (!(isdn_data->opts & FTMOD_LIBPRI_OPT_OMIT_REDIRECTING_NUMBER_IE)) {
-				pri_sr_set_redirecting(sr, ftdmchan->caller_data.cid_num.digits, dp, PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN, PRI_REDIR_UNCONDITIONAL);
+				pri_sr_set_redirecting(sr, ftdmchan->caller_data.cid_num.digits, dp,
+					PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN, PRI_REDIR_UNCONDITIONAL);
 			}
-
+#ifdef HAVE_LIBPRI_AOC
+			if (isdn_data->opts & FTMOD_LIBPRI_OPT_FACILITY_AOC) {
+				/* request AOC on call */
+				pri_sr_set_aoc_charging_request(sr, (PRI_AOC_REQUEST_S | PRI_AOC_REQUEST_E | PRI_AOC_REQUEST_D));
+				ftdm_log(FTDM_LOG_DEBUG, "Requesting AOC-S/D/E on call\n");
+			}
+#endif
 			if (pri_setup(isdn_data->spri.pri, call, sr)) {
-				ftdmchan->caller_data.hangup_cause = FTDM_CAUSE_DESTINATION_OUT_OF_ORDER;				
+				ftdmchan->caller_data.hangup_cause = FTDM_CAUSE_DESTINATION_OUT_OF_ORDER;
 				ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
 			}
 
@@ -606,7 +610,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 				pri_hangup(isdn_data->spri.pri, call, ftdmchan->caller_data.hangup_cause);
 				pri_destroycall(isdn_data->spri.pri, call);
 				ftdmchan->call_data = NULL;
-			} 
+			}
 			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 		}
 		break;
@@ -633,21 +637,23 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
  */
 static __inline__ void check_state(ftdm_span_t *span)
 {
-    if (ftdm_test_flag(span, FTDM_SPAN_STATE_CHANGE)) {
-        uint32_t j;
-        ftdm_clear_flag_locked(span, FTDM_SPAN_STATE_CHANGE);
-        for(j = 1; j <= span->chan_count; j++) {
-            if (ftdm_test_flag((span->channels[j]), FTDM_CHANNEL_STATE_CHANGE)) {
-				ftdm_mutex_lock(span->channels[j]->mutex);
-		ftdm_channel_lock(span->channels[j]);
-                ftdm_clear_flag((span->channels[j]), FTDM_CHANNEL_STATE_CHANGE);
-                state_advance(span->channels[j]);
-                ftdm_channel_complete_state(span->channels[j]);
-				ftdm_mutex_unlock(span->channels[j]->mutex);
-		ftdm_channel_unlock(span->channels[j]);
-            }
-        }
-    }
+	if (ftdm_test_flag(span, FTDM_SPAN_STATE_CHANGE)) {
+		uint32_t j;
+
+		ftdm_clear_flag_locked(span, FTDM_SPAN_STATE_CHANGE);
+
+		for (j = 1; j <= span->chan_count; j++) {
+			if (ftdm_test_flag((span->channels[j]), FTDM_CHANNEL_STATE_CHANGE)) {
+				ftdm_channel_lock(span->channels[j]);
+
+				ftdm_clear_flag((span->channels[j]), FTDM_CHANNEL_STATE_CHANGE);
+				state_advance(span->channels[j]);
+				ftdm_channel_complete_state(span->channels[j]);
+
+				ftdm_channel_unlock(span->channels[j]);
+			}
+		}
+	}
 }
 
 /**
@@ -659,7 +665,6 @@ static __inline__ void check_state(ftdm_span_t *span)
  */
 static int on_info(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
 {
-
 	ftdm_log(FTDM_LOG_DEBUG, "number is: %s\n", pevent->ring.callednum);
 	if (strlen(pevent->ring.callednum) > 3) {
 		ftdm_log(FTDM_LOG_DEBUG, "final number is: %s\n", pevent->ring.callednum);
@@ -681,7 +686,7 @@ static int on_hangup(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_even
 	ftdm_channel_t *ftdmchan = NULL;
 	q931_call *call = NULL;
 	ftdmchan = span->channels[pevent->hangup.channel];
-	
+
 	if (!ftdmchan) {
 		ftdm_log(FTDM_LOG_CRIT, "-- Hangup on channel %d:%d %s but it's not in use?\n", spri->span->span_id, pevent->hangup.channel);
 		return 0;
@@ -698,7 +703,7 @@ static int on_hangup(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_even
 		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Ignoring remote hangup in state %s with no call data\n", ftdm_channel_state2str(ftdmchan->state));
 		goto done;
 	}
-	
+
 	call = (q931_call *) ftdmchan->call_data;
 	ftdm_log(FTDM_LOG_DEBUG, "-- Hangup on channel %d:%d\n", spri->span->span_id, pevent->hangup.channel);
 	ftdmchan->caller_data.hangup_cause = pevent->hangup.cause;
@@ -727,13 +732,12 @@ static int on_answer(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_even
 	ftdm_channel_t *ftdmchan = NULL;
 
 	ftdmchan = span->channels[pevent->answer.channel];
-	
+
 	if (ftdmchan) {
 		ftdm_log(FTDM_LOG_DEBUG, "-- Answer on channel %d:%d\n", spri->span->span_id, pevent->answer.channel);
 		ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_UP);
 	} else {
 		ftdm_log(FTDM_LOG_DEBUG, "-- Answer on channel %d:%d %s but it's not in use?\n", spri->span->span_id, pevent->answer.channel, ftdmchan->chan_id);
-				
 	}
 
 	return 0;
@@ -750,9 +754,9 @@ static int on_proceed(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_eve
 {
 	ftdm_span_t *span = spri->private_info;
 	ftdm_channel_t *ftdmchan = NULL;
-	
+
 	ftdmchan = span->channels[pevent->proceeding.channel];
-	
+
 	if (ftdmchan) {
 		ftdm_log(FTDM_LOG_DEBUG, "-- Proceeding on channel %d:%d\n", spri->span->span_id, pevent->proceeding.channel);
 		ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA);
@@ -777,7 +781,7 @@ static int on_ringing(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_eve
 	ftdm_channel_t *ftdmchan = NULL;
 
 	ftdmchan = span->channels[pevent->ringing.channel];
-	
+
 	if (ftdmchan) {
 		ftdm_log(FTDM_LOG_DEBUG, "-- Ringing on channel %d:%d\n", spri->span->span_id, pevent->ringing.channel);
 		/* we may get on_ringing even when we're already in FTDM_CHANNEL_STATE_PROGRESS_MEDIA */
@@ -808,7 +812,7 @@ static int on_ring(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event
 	int ret = 0;
 
 	//switch_mutex_lock(globals.channel_mutex);
-	
+
 	ftdmchan = span->channels[pevent->ring.channel];
 	if (!ftdmchan || ftdmchan->state != FTDM_CHANNEL_STATE_DOWN || ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE)) {
 		ftdm_log(FTDM_LOG_WARNING, "--Duplicate Ring on channel %d:%d (ignored)\n", spri->span->span_id, pevent->ring.channel);
@@ -821,13 +825,12 @@ static int on_ring(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event
 		ret = 0;
 		goto done;
 	}
-	
 
 	ftdm_log(FTDM_LOG_NOTICE, "-- Ring on channel %d:%d (from %s to %s)\n", spri->span->span_id, pevent->ring.channel,
 					  pevent->ring.callingnum, pevent->ring.callednum);
-	
+
 	memset(&ftdmchan->caller_data, 0, sizeof(ftdmchan->caller_data));
-	
+
 	ftdm_set_string(ftdmchan->caller_data.cid_num.digits, (char *)pevent->ring.callingnum);
 	if (!ftdm_strlen_zero((char *)pevent->ring.callingname)) {
 		ftdm_set_string(ftdmchan->caller_data.cid_name, (char *)pevent->ring.callingname);
@@ -836,19 +839,18 @@ static int on_ring(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event
 	}
 	ftdm_set_string(ftdmchan->caller_data.ani.digits, (char *)pevent->ring.callingani);
 	ftdm_set_string(ftdmchan->caller_data.dnis.digits, (char *)pevent->ring.callednum);
-	
+
 	if (pevent->ring.ani2 >= 0) {
 		snprintf(ftdmchan->caller_data.aniII, 5, "%.2d", pevent->ring.ani2);
 	}
-	
+
 	// scary to trust this pointer, you'd think they would give you a copy of the call data so you own it......
 	ftdmchan->call_data = pevent->ring.call;
-	
-	ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RING);
-	
- done:
-	//switch_mutex_unlock(globals.channel_mutex);
 
+	ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RING);
+
+done:
+	//switch_mutex_unlock(globals.channel_mutex);
 	return ret;
 }
 
@@ -861,8 +863,13 @@ static int on_ring(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event
 static __inline__ ftdm_status_t process_event(ftdm_span_t *span, ftdm_event_t *event)
 {
 	ftdm_alarm_flag_t alarmbits;
-	ftdm_log(FTDM_LOG_DEBUG, "EVENT [%s][%d][%d:%d] STATE [%s]\n", 
-			ftdm_oob_event2str(event->enum_id), event->enum_id, event->channel->span_id, event->channel->chan_id, ftdm_channel_state2str(event->channel->state));
+
+	ftdm_log(FTDM_LOG_DEBUG, "EVENT [%s][%d][%d:%d] STATE [%s]\n",
+			ftdm_oob_event2str(event->enum_id),
+			event->enum_id,
+			event->channel->span_id,
+			event->channel->chan_id,
+			ftdm_channel_state2str(event->channel->state));
 
 	switch(event->enum_id) {
 	case FTDM_OOB_ALARM_TRAP:
@@ -872,11 +879,9 @@ static __inline__ ftdm_status_t process_event(ftdm_span_t *span, ftdm_event_t *e
 					ftdm_set_state_locked(event->channel, FTDM_CHANNEL_STATE_RESTART);
 				}
 			}
-			
 
 			ftdm_set_flag(event->channel, FTDM_CHANNEL_SUSPENDED);
 
-			
 			ftdm_channel_get_alarms(event->channel, &alarmbits);
 			ftdm_log(FTDM_LOG_WARNING, "channel %d:%d (%d:%d) has alarms! [%s]\n", 
 					event->channel->span_id, event->channel->chan_id, 
@@ -886,7 +891,6 @@ static __inline__ ftdm_status_t process_event(ftdm_span_t *span, ftdm_event_t *e
 		break;
 	case FTDM_OOB_ALARM_CLEAR:
 		{
-			
 			ftdm_log(FTDM_LOG_WARNING, "channel %d:%d (%d:%d) alarms Cleared!\n", event->channel->span_id, event->channel->chan_id,
 					event->channel->physical_span_id, event->channel->physical_chan_id);
 
@@ -913,6 +917,7 @@ static __inline__ void check_events(ftdm_span_t *span)
 	case FTDM_SUCCESS:
 		{
 			ftdm_event_t *event;
+
 			while (ftdm_span_next_event(span, &event) == FTDM_SUCCESS) {
 				if (event->enum_id == FTDM_OOB_NOOP) {
 					continue;
@@ -923,12 +928,12 @@ static __inline__ void check_events(ftdm_span_t *span)
 			}
 		}
 		break;
+
 	case FTDM_FAIL:
-		{
-			ftdm_log(FTDM_LOG_DEBUG, "Event Failure! %d\n", ftdm_running());
-			ftdm_sleep(2000);
-		}
+		ftdm_log(FTDM_LOG_DEBUG, "Event Failure! %d\n", ftdm_running());
+		ftdm_sleep(2000);
 		break;
+
 	default:
 		break;
 	}
@@ -949,8 +954,6 @@ static int check_flags(lpwrap_pri_t *spri)
 
 	check_state(span);
 	check_events(span);
-
-
 	return 0;
 }
 
@@ -967,7 +970,7 @@ static int on_restart(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_eve
 	ftdm_channel_t *ftdmchan;
 
 	ftdm_log(FTDM_LOG_NOTICE, "-- Restarting %d:%d\n", spri->span->span_id, pevent->restart.channel);
-	
+
 	spri->dchan->state = FTDM_CHANNEL_STATE_UP;
 	ftdmchan = span->channels[pevent->restart.channel];
 
@@ -984,6 +987,182 @@ static int on_restart(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_eve
 	return 0;
 }
 
+/*
+ * FACILITY Advice-On-Charge handler
+ */
+#ifdef HAVE_LIBPRI_AOC
+static const char *aoc_billing_id(const int id)
+{
+	switch (id) {
+	case PRI_AOC_E_BILLING_ID_NOT_AVAILABLE:
+		return "not available";
+	case PRI_AOC_E_BILLING_ID_NORMAL:
+		return "normal";
+	case PRI_AOC_E_BILLING_ID_REVERSE:
+		return "reverse";
+	case PRI_AOC_E_BILLING_ID_CREDIT_CARD:
+		return "credit card";
+	case PRI_AOC_E_BILLING_ID_CALL_FORWARDING_UNCONDITIONAL:
+		return "call forwarding unconditional";
+	case PRI_AOC_E_BILLING_ID_CALL_FORWARDING_BUSY:
+		return "call forwarding busy";
+	case PRI_AOC_E_BILLING_ID_CALL_FORWARDING_NO_REPLY:
+		return "call forwarding no reply";
+	case PRI_AOC_E_BILLING_ID_CALL_DEFLECTION:
+		return "call deflection";
+	case PRI_AOC_E_BILLING_ID_CALL_TRANSFER:
+		return "call transfer";
+	default:
+		return "unknown\n";
+	}
+}
+
+static float aoc_money_amount(const struct pri_aoc_amount *amount)
+{
+	switch (amount->multiplier) {
+	case PRI_AOC_MULTIPLIER_THOUSANDTH:
+		return amount->cost * 0.001f;
+	case PRI_AOC_MULTIPLIER_HUNDREDTH:
+		return amount->cost * 0.01f;
+	case PRI_AOC_MULTIPLIER_TENTH:
+		return amount->cost * 0.1f;
+	case PRI_AOC_MULTIPLIER_TEN:
+		return amount->cost * 10.0f;
+	case PRI_AOC_MULTIPLIER_HUNDRED:
+		return amount->cost * 100.0f;
+	case PRI_AOC_MULTIPLIER_THOUSAND:
+		return amount->cost * 1000.0f;
+	default:
+		return amount->cost;
+	}
+}
+
+static int handle_facility_aoc_s(const struct pri_subcmd_aoc_s *aoc_s)
+{
+	/* Left as an excercise to the reader */
+	return 0;
+}
+
+static int handle_facility_aoc_d(const struct pri_subcmd_aoc_d *aoc_d)
+{
+	/* Left as an excercise to the reader */
+	return 0;
+}
+
+static int handle_facility_aoc_e(const struct pri_subcmd_aoc_e *aoc_e)
+{
+	char tmp[1024] = { 0 };
+	int x = 0, offset = 0;
+
+	switch (aoc_e->charge) {
+	case PRI_AOC_DE_CHARGE_FREE:
+		strcat(tmp, "\tcharge-type: none\n");
+		offset = strlen(tmp);
+		break;
+
+	case PRI_AOC_DE_CHARGE_CURRENCY:
+		sprintf(tmp, "\tcharge-type: money\n\tcharge-amount: %.2f\n\tcharge-currency: %s\n",
+				aoc_money_amount(&aoc_e->recorded.money.amount),
+				aoc_e->recorded.money.currency);
+		offset = strlen(tmp);
+		break;
+
+	case PRI_AOC_DE_CHARGE_UNITS:
+		strcat(tmp, "\tcharge-type: units\n");
+		offset = strlen(tmp);
+
+		for (x = 0; x < aoc_e->recorded.unit.num_items; x++) {
+			sprintf(&tmp[offset], "\tcharge-amount: %ld (type: %d)\n",
+					aoc_e->recorded.unit.item[x].number,
+					aoc_e->recorded.unit.item[x].type);
+			offset += strlen(&tmp[offset]);
+		}
+		break;
+
+	default:
+		strcat(tmp, "\tcharge-type: not available\n");
+		offset = strlen(tmp);
+	}
+
+	sprintf(&tmp[offset], "\tbilling-id: %s\n", aoc_billing_id(aoc_e->billing_id));
+	offset += strlen(&tmp[offset]);
+
+	strcat(&tmp[offset], "\tassociation-type: ");
+	offset += strlen(&tmp[offset]);
+
+	switch (aoc_e->associated.charging_type) {
+	case PRI_AOC_E_CHARGING_ASSOCIATION_NOT_AVAILABLE:
+		strcat(&tmp[offset], "not available\n");
+		break;
+	case PRI_AOC_E_CHARGING_ASSOCIATION_NUMBER:
+		sprintf(&tmp[offset], "number\n\tassociation-number: %s\n", aoc_e->associated.charge.number.str);
+		break;
+	case PRI_AOC_E_CHARGING_ASSOCIATION_ID:
+		sprintf(&tmp[offset], "id\n\tassociation-id: %d\n", aoc_e->associated.charge.id);
+		break;
+	default:
+		strcat(&tmp[offset], "unknown\n");
+	}
+
+	ftdm_log(FTDM_LOG_INFO, "AOC-E:\n%s", tmp);
+	return 0;
+}
+#endif
+
+/**
+ * \brief Handler for libpri facility events
+ * \param spri Pri wrapper structure (libpri, span, dchan)
+ * \param event_type Event type (unused)
+ * \param pevent Event
+ * \return 0
+ */
+static int on_facility(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
+{
+	struct pri_event_facility *pfac = (struct pri_event_facility *)pevent;
+	int i = 0;
+
+	if (!pevent)
+		return 0;
+
+	if (!pfac->subcmds || pfac->subcmds->counter_subcmd <= 0)
+		return 0;
+
+	for (i = 0; i < pfac->subcmds->counter_subcmd; i++) {
+		struct pri_subcommand *sub = &pfac->subcmds->subcmd[i];
+		int res = -1;
+
+		switch (sub->cmd) {
+#ifdef HAVE_LIBPRI_AOC
+		case PRI_SUBCMD_AOC_S:	/* AOC-S: Start of call */
+			res = handle_facility_aoc_s(&sub->u.aoc_s);
+			break;
+		case PRI_SUBCMD_AOC_D:	/* AOC-D: During call */
+			res = handle_facility_aoc_d(&sub->u.aoc_d);
+			break;
+		case PRI_SUBCMD_AOC_E:	/* AOC-E: End of call */
+			res = handle_facility_aoc_e(&sub->u.aoc_e);
+			break;
+		case PRI_SUBCMD_AOC_CHARGING_REQ:
+			ftdm_log(FTDM_LOG_NOTICE, "AOC Charging Request received\n");
+			break;
+		case PRI_SUBCMD_AOC_CHARGING_REQ_RSP:
+			ftdm_log(FTDM_LOG_NOTICE, "AOC Charging Request Response received [aoc_s data: %s, req: %x, resp: %x]\n",
+					sub->u.aoc_request_response.valid_aoc_s ? "yes" : "no",
+					sub->u.aoc_request_response.charging_request,
+					sub->u.aoc_request_response.charging_response);
+			break;
+#endif
+		default:
+			ftdm_log(FTDM_LOG_DEBUG, "FACILITY subcommand %d is not implemented, ignoring\n", sub->cmd);
+		}
+
+		ftdm_log(FTDM_LOG_DEBUG, "FACILITY subcommand %d handler returned %d\n", sub->cmd, res);
+	}
+
+	ftdm_log(FTDM_LOG_DEBUG, "Caught Event on span %d %u (%s)\n", spri->span->span_id, event_type, lpwrap_pri_event_str(event_type));
+	return 0;
+}
+
 /**
  * \brief Handler for libpri dchan up event
  * \param spri Pri wrapper structure (libpri, span, dchan)
@@ -998,19 +1177,23 @@ static int on_dchan_up(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_ev
 		ftdm_channel_t *ftdmchan = NULL;
 		ftdm_sigmsg_t sig;
 		int i;
+
 		ftdm_log(FTDM_LOG_INFO, "Span %d D-Chan UP!\n", spri->span->span_id);
 		ftdm_set_flag(spri, LPWRAP_PRI_READY);
 		ftdm_set_state_all(spri->span, FTDM_CHANNEL_STATE_RESTART);
 
 		ftdm_log(FTDM_LOG_NOTICE, "%d:Signaling link status changed to %s\n", spri->span->span_id, ftdm_signaling_status2str(status));
-		for(i=1; i <= spri->span->chan_count; i++) {
+
+		for (i = 1; i <= spri->span->chan_count; i++) {
 			ftdmchan = spri->span->channels[i];
+
 			memset(&sig, 0, sizeof(sig));
 			sig.chan_id = ftdmchan->chan_id;
 			sig.span_id = ftdmchan->span_id;
 			sig.channel = ftdmchan;
 			sig.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
 			sig.raw_data = &status;
+
 			ftdm_span_send_signal(spri->span, &sig);
 		}
 	}
@@ -1025,26 +1208,29 @@ static int on_dchan_up(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_ev
  * \return 0
  */
 static int on_dchan_down(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
-{	
+{
 	if (ftdm_test_flag(spri, LPWRAP_PRI_READY)) {
 		ftdm_signaling_status_t status = FTDM_SIG_STATE_DOWN;
 		ftdm_channel_t *ftdmchan = NULL;
 		ftdm_sigmsg_t sig;
 		int i;
+
 		ftdm_log(FTDM_LOG_INFO, "Span %d D-Chan DOWN!\n", spri->span->span_id);
 		ftdm_clear_flag(spri, LPWRAP_PRI_READY);
 		ftdm_set_state_all(spri->span, FTDM_CHANNEL_STATE_RESTART);
 
-
 		ftdm_log(FTDM_LOG_NOTICE, "%d:Signaling link status changed to %s\n", spri->span->span_id, ftdm_signaling_status2str(status));
-		for(i=1; i <= spri->span->chan_count; i++) {
+
+		for (i = 1; i <= spri->span->chan_count; i++) {
 			ftdmchan = spri->span->channels[i];
+
 			memset(&sig, 0, sizeof(sig));
 			sig.chan_id = ftdmchan->chan_id;
 			sig.span_id = ftdmchan->span_id;
 			sig.channel = ftdmchan;
 			sig.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
 			sig.raw_data = &status;
+
 			ftdm_span_send_signal(spri->span, &sig);
 		}
 	}
@@ -1061,7 +1247,6 @@ static int on_dchan_down(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_
  */
 static int on_anything(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
 {
-
 	ftdm_log(FTDM_LOG_DEBUG, "Caught Event span %d %u (%s)\n", spri->span->span_id, event_type, lpwrap_pri_event_str(event_type));
 	return 0;
 }
@@ -1075,7 +1260,6 @@ static int on_anything(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_ev
  */
 static int on_io_fail(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
 {
-
 	ftdm_log(FTDM_LOG_DEBUG, "Caught Event span %d %u (%s)\n", spri->span->span_id, event_type, lpwrap_pri_event_str(event_type));
 	return 0;
 }
@@ -1084,20 +1268,24 @@ static int on_io_fail(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_eve
  * \brief Main thread function for libpri span (monitor)
  * \param me Current thread
  * \param obj Span to run in this thread
+ *
+ * \todo  Move all init stuff outside of loop or into ftdm_libpri_configure_span()
  */
 static void *ftdm_libpri_run(ftdm_thread_t *me, void *obj)
 {
 	ftdm_span_t *span = (ftdm_span_t *) obj;
 	ftdm_libpri_data_t *isdn_data = span->signal_data;
-	int i, x = 0;
 	int down = 0;
 	int got_d = 0;
-	
+	int res = 0;
+
 	ftdm_set_flag(span, FTDM_SPAN_IN_THREAD);
-	
-	while(ftdm_running() && !ftdm_test_flag(span, FTDM_SPAN_STOP_THREAD)) {
+
+	while (ftdm_running() && !ftdm_test_flag(span, FTDM_SPAN_STOP_THREAD)) {
 		if (!got_d) {
-			for(i = 1; i <= span->chan_count; i++) {
+			int i, x;
+
+			for (i = 1, x = 0; i <= span->chan_count; i++) {
 				if (span->channels[i]->type == FTDM_CHAN_TYPE_DQ921) {
 					if (ftdm_channel_open(span->span_id, i, &isdn_data->dchan) == FTDM_SUCCESS) {
 						ftdm_log(FTDM_LOG_DEBUG, "opening d-channel #%d %d:%d\n", x, isdn_data->dchan->span_id, isdn_data->dchan->chan_id);
@@ -1110,22 +1298,49 @@ static void *ftdm_libpri_run(ftdm_thread_t *me, void *obj)
 				}
 			}
 		}
-
 		if (!got_d) {
 			ftdm_log(FTDM_LOG_ERROR, "Failed to get a D-channel in span %d\n", span->span_id);
 			break;
 		}
-		
-		
-		if (lpwrap_init_pri(&isdn_data->spri,
-								  span,  // span
-								  isdn_data->dchan, // dchan
-								  isdn_data->pswitch,
-								  isdn_data->node,
-								  isdn_data->debug) < 0) {
-			snprintf(span->last_error, sizeof(span->last_error), "PRI init FAIL!");
-		} else {
 
+		/* Initialize libpri trunk */
+		switch (ftdm_span_get_trunk_type(span)) {
+		case FTDM_TRUNK_E1:
+		case FTDM_TRUNK_T1:
+		case FTDM_TRUNK_J1:
+			res = lpwrap_init_pri(&isdn_data->spri, span, isdn_data->dchan,
+					isdn_data->pswitch, isdn_data->node, isdn_data->debug);
+			break;
+		case FTDM_TRUNK_BRI:
+			res = lpwrap_init_bri(&isdn_data->spri, span, isdn_data->dchan,
+					isdn_data->pswitch, isdn_data->node, 1, isdn_data->debug);
+#ifndef HAVE_LIBPRI_BRI
+			goto out;
+#endif
+			break;
+		case FTDM_TRUNK_BRI_PTMP:
+			res = lpwrap_init_bri(&isdn_data->spri, span, isdn_data->dchan,
+					isdn_data->pswitch, isdn_data->node, 0, isdn_data->debug);
+#ifndef HAVE_LIBPRI_BRI
+			goto out;
+#endif
+			break;
+		default:
+			snprintf(span->last_error, sizeof(span->last_error), "Invalid trunk type");
+			goto out;
+		}
+
+#ifdef HAVE_LIBPRI_AOC
+		/*
+		 * Only enable facility on trunk if really required,
+		 * this may help avoid problems on troublesome lines.
+		 */
+		if (isdn_data->opts & FTMOD_LIBPRI_OPT_FACILITY_AOC) {
+			pri_facility_enable(isdn_data->spri.pri);
+		}
+#endif
+
+		if (res == 0) {
 			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_ANY, on_anything);
 			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_RING, on_ring);
 			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_RINGING, on_ringing);
@@ -1139,6 +1354,7 @@ static void *ftdm_libpri_run(ftdm_thread_t *me, void *obj)
 			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_INFO_RECEIVED, on_info);
 			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_RESTART, on_restart);
 			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_IO_FAIL, on_io_fail);
+			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_FACILITY, on_facility);
 
 			if (down) {
 				ftdm_log(FTDM_LOG_INFO, "PRI back up on span %d\n", isdn_data->spri.span->span_id);
@@ -1148,8 +1364,10 @@ static void *ftdm_libpri_run(ftdm_thread_t *me, void *obj)
 
 			isdn_data->spri.on_loop = check_flags;
 			isdn_data->spri.private_info = span;
-			lpwrap_run_pri(&isdn_data->spri);
 
+			lpwrap_run_pri(&isdn_data->spri);
+		} else {
+			snprintf(span->last_error, sizeof(span->last_error), "PRI init FAIL!");
 		}
 
 		if (!ftdm_running() || ftdm_test_flag(span, FTDM_SPAN_STOP_THREAD)) {
@@ -1172,7 +1390,7 @@ static void *ftdm_libpri_run(ftdm_thread_t *me, void *obj)
 		down++;
 		ftdm_sleep(5000);
 	}
-
+out:
 	ftdm_log(FTDM_LOG_DEBUG, "PRI thread ended on span %d\n", span->span_id);
 
 	ftdm_clear_flag(span, FTDM_SPAN_IN_THREAD);
@@ -1197,11 +1415,15 @@ static ftdm_status_t ftdm_libpri_stop(ftdm_span_t *span)
 	}
 
 	ftdm_set_state_all(span, FTDM_CHANNEL_STATE_RESTART);
+
 	check_state(span);
+
 	ftdm_set_flag(span, FTDM_SPAN_STOP_THREAD);
-	while(ftdm_test_flag(span, FTDM_SPAN_IN_THREAD)) {
+
+	while (ftdm_test_flag(span, FTDM_SPAN_IN_THREAD)) {
 		ftdm_sleep(100);
 	}
+
 	check_state(span);
 
 	return FTDM_SUCCESS;
@@ -1241,7 +1463,7 @@ static ftdm_status_t ftdm_libpri_start(ftdm_span_t *span)
  * \param node Node string to convert
  * \return -1 on failure, node value on success
  */
-static int str2node(char *node)
+static int parse_node(const char *node)
 {
 	if (!strcasecmp(node, "cpe") || !strcasecmp(node, "user"))
 		return PRI_CPE;
@@ -1255,7 +1477,7 @@ static int str2node(char *node)
  * \param swtype Swtype string to convert
  * \return Switch value
  */
-static int str2switch(char *swtype)
+static int parse_switch(const char *swtype)
 {
 	if (!strcasecmp(swtype, "ni1"))
 		return PRI_SWITCH_NI1;
@@ -1273,6 +1495,7 @@ static int str2switch(char *swtype)
 		return PRI_SWITCH_GR303_EOC;
 	if (!strcasecmp(swtype, "gr303tmc"))
 		return PRI_SWITCH_GR303_TMC;
+
 	return PRI_SWITCH_DMS100;
 }
 
@@ -1281,11 +1504,11 @@ static int str2switch(char *swtype)
  * \param l1 L1 string to convert
  * \return L1 value
  */
-static int str2l1(char *l1)
+static int parse_l1(const char *l1)
 {
 	if (!strcasecmp(l1, "alaw"))
 		return PRI_LAYER_1_ALAW;
-	
+
 	return PRI_LAYER_1_ULAW;
 }
 
@@ -1294,7 +1517,7 @@ static int str2l1(char *l1)
  * \param dp DP string to convert
  * \return DP value
  */
-static int str2dp(char *dp)
+static int parse_numplan(const char *dp)
 {
 	if (!strcasecmp(dp, "international"))
 		return PRI_INTERNATIONAL_ISDN;
@@ -1310,26 +1533,54 @@ static int str2dp(char *dp)
 	return PRI_UNKNOWN;
 }
 
+/**
+ * \brief Parses an option string to flags
+ * \param in String to parse for configuration options
+ * \return Flags
+ */
+static uint32_t parse_opts(const char *in)
+{
+	uint32_t flags = 0;
+
+	if (!in) {
+		return 0;
+	}
+
+	if (strstr(in, "suggest_channel")) {
+		flags |= FTMOD_LIBPRI_OPT_SUGGEST_CHANNEL;
+	}
+	if (strstr(in, "omit_display")) {
+		flags |= FTMOD_LIBPRI_OPT_OMIT_DISPLAY_IE;
+	}
+	if (strstr(in, "omit_redirecting_number")) {
+		flags |= FTMOD_LIBPRI_OPT_OMIT_REDIRECTING_NUMBER_IE;
+	}
+	if (strstr(in, "aoc")) {
+		flags |= FTMOD_LIBPRI_OPT_FACILITY_AOC;
+	}
+	return flags;
+}
+
 /**
  * \brief Initialises a libpri span from configuration variables
  * \param span Span to configure
  * \param sig_cb Callback function for event signals
- * \param ap List of configuration variables
+ * \param ftdm_parameters List of configuration variables
  * \return Success or failure
  */
-static FIO_SIG_CONFIGURE_FUNCTION(ftdm_libpri_configure_span)
+static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_libpri_configure_span)
 {
 	uint32_t i, x = 0;
+	uint32_t paramindex = 0;
 	//ftdm_channel_t *dchans[2] = {0};
 	ftdm_libpri_data_t *isdn_data;
-	char *var, *val;
-	char *debug = NULL;
+	const char *var, *val;
 
-	if (span->trunk_type >= FTDM_TRUNK_NONE) {
-		ftdm_log(FTDM_LOG_WARNING, "Invalid trunk type '%s' defaulting to T1.\n", ftdm_trunk_type2str(span->trunk_type));
-		span->trunk_type = FTDM_TRUNK_T1;
+	if (ftdm_span_get_trunk_type(span) >= FTDM_TRUNK_NONE) {
+		ftdm_log(FTDM_LOG_WARNING, "Invalid trunk type '%s' defaulting to T1.\n", ftdm_trunk_type2str(ftdm_span_get_trunk_type(span)));
+		ftdm_span_set_trunk_type(span, FTDM_TRUNK_T1);
 	}
-	
+
 	for(i = 1; i <= span->chan_count; i++) {
 		if (span->channels[i]->type == FTDM_CHAN_TYPE_DQ921) {
 			if (x > 1) {
@@ -1346,7 +1597,7 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_libpri_configure_span)
 			}
 		}
 	}
-	
+
 #if 0
 	if (!x) {
 		snprintf(span->last_error, sizeof(span->last_error), "Span has no D-Channels!");
@@ -1358,97 +1609,107 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_libpri_configure_span)
 	assert(isdn_data != NULL);
 	memset(isdn_data, 0, sizeof(*isdn_data));
 
-    if (span->trunk_type == FTDM_TRUNK_E1) {
-        ftdm_log(FTDM_LOG_NOTICE, "Setting default Layer 1 to ALAW since this is an E1 trunk\n");
-        isdn_data->l1 = PRI_LAYER_1_ALAW;
-    } else if (span->trunk_type == FTDM_TRUNK_T1) {
-        ftdm_log(FTDM_LOG_NOTICE, "Setting default Layer 1 to ULAW since this is a T1 trunk\n");
-        isdn_data->l1 = PRI_LAYER_1_ULAW;
-    }
-	
-	while((var = va_arg(ap, char *))) {
+	switch (ftdm_span_get_trunk_type(span)) {
+	case FTDM_TRUNK_BRI:
+	case FTDM_TRUNK_BRI_PTMP:
+#ifndef HAVE_LIBPRI_BRI
+		ftdm_log(FTDM_LOG_ERROR, "Unsupported trunk type: '%s', libpri too old\n", ftdm_trunk_type2str(ftdm_span_get_trunk_type(span)));
+		snprintf(span->last_error, sizeof(span->last_error), "Unsupported trunk type [%s], libpri too old", ftdm_trunk_type2str(ftdm_span_get_trunk_type(span)));
+		return FTDM_FAIL;
+#endif
+	case FTDM_TRUNK_E1:
+		ftdm_log(FTDM_LOG_NOTICE, "Setting default Layer 1 to ALAW since this is an E1/BRI/BRI PTMP trunk\n");
+		isdn_data->l1 = PRI_LAYER_1_ALAW;
+		break;
+	case FTDM_TRUNK_T1:
+	case FTDM_TRUNK_J1:
+		ftdm_log(FTDM_LOG_NOTICE, "Setting default Layer 1 to ULAW since this is a T1/J1 trunk\n");
+		isdn_data->l1 = PRI_LAYER_1_ULAW;
+		break;
+	default:
+		ftdm_log(FTDM_LOG_ERROR, "Invalid trunk type: '%s'\n", ftdm_trunk_type2str(ftdm_span_get_trunk_type(span)));
+		snprintf(span->last_error, sizeof(span->last_error), "Invalid trunk type [%s]", ftdm_trunk_type2str(ftdm_span_get_trunk_type(span)));
+		return FTDM_FAIL;
+	}
+
+	for (paramindex = 0; paramindex < 10 && ftdm_parameters[paramindex].var; paramindex++) {
+		var = ftdm_parameters[paramindex].var;
+		val = ftdm_parameters[paramindex].val;
+
+		if (!val) {
+			ftdm_log(FTDM_LOG_ERROR, "Parameter '%s' has no value\n", var);
+			snprintf(span->last_error, sizeof(span->last_error), "Parameter [%s] has no value", var);
+			return FTDM_FAIL;
+		}
+
 		if (!strcasecmp(var, "node")) {
-			int node;
-			if (!(val = va_arg(ap, char *))) {
-				break;
-			}
-			node = str2node(val);
-			if (-1 == node) {
-				ftdm_log(FTDM_LOG_ERROR, "Unknown node type %s, defaulting to CPE mode\n", val);
-				node = PRI_CPE;
-			}
-			isdn_data->node = node;
-		} else if (!strcasecmp(var, "switch")) {
-			if (!(val = va_arg(ap, char *))) {
-				break;
-			}
-			isdn_data->pswitch = str2switch(val);
-		} else if (!strcasecmp(var, "opts")) {
-			if (!(val = va_arg(ap, char *))) {
-				break;
+			if ((isdn_data->node = parse_node(val)) == -1) {
+				ftdm_log(FTDM_LOG_ERROR, "Unknown node type '%s', defaulting to CPE mode\n", val);
+				isdn_data->node = PRI_CPE;
 			}
+		}
+		else if (!strcasecmp(var, "switch")) {
+			isdn_data->pswitch = parse_switch(val);
+		}
+		else if (!strcasecmp(var, "opts")) {
 			isdn_data->opts = parse_opts(val);
-		} else if (!strcasecmp(var, "dp")) {
-			if (!(val = va_arg(ap, char *))) {
-				break;
+		}
+		else if (!strcasecmp(var, "dp")) {
+			isdn_data->dp = parse_numplan(val);
+		}
+		else if (!strcasecmp(var, "l1")) {
+			isdn_data->l1 = parse_l1(val);
+		}
+		else if (!strcasecmp(var, "debug")) {
+			if (parse_debug(val, &isdn_data->debug) == -1) {
+				ftdm_log(FTDM_LOG_ERROR, "Invalid debug flag, ignoring parameter\n");
+				isdn_data->debug = 0;
 			}
-			isdn_data->dp = str2dp(val);
-		} else if (!strcasecmp(var, "l1")) {
-			if (!(val = va_arg(ap, char *))) {
-				break;
-			}
-			isdn_data->l1 = str2l1(val);
-		} else if (!strcasecmp(var, "debug")) {
-			if (!(val = va_arg(ap, char *))) {
-				break;
-			}
-			debug = val;
-		} else {
+		}
+		else {
+			ftdm_log(FTDM_LOG_ERROR, "Unknown parameter '%s', aborting configuration\n", var);
 			snprintf(span->last_error, sizeof(span->last_error), "Unknown parameter [%s]", var);
 			return FTDM_FAIL;
 		}
 	}
-    
+
 	span->start = ftdm_libpri_start;
-	span->stop = ftdm_libpri_stop;
+	span->stop  = ftdm_libpri_stop;
 	span->signal_cb = sig_cb;
 	//isdn_data->dchans[0] = dchans[0];
 	//isdn_data->dchans[1] = dchans[1];
 	//isdn_data->dchan = isdn_data->dchans[0];
-	
-	isdn_data->debug = parse_debug(debug);
-		
 
 	span->signal_data = isdn_data;
 	span->signal_type = FTDM_SIGTYPE_ISDN;
 	span->outgoing_call = isdn_outgoing_call;
 
+	span->state_map = &isdn_state_map;
+
 	span->get_channel_sig_status = isdn_get_channel_sig_status;
 	span->get_span_sig_status = isdn_get_span_sig_status;
-	
+
 	if ((isdn_data->opts & FTMOD_LIBPRI_OPT_SUGGEST_CHANNEL)) {
 		span->channel_request = isdn_channel_request;
 		ftdm_set_flag(span, FTDM_SPAN_SUGGEST_CHAN_ID);
 	}
 
-	span->state_map = &isdn_state_map;
-
 	return FTDM_SUCCESS;
 }
 
 /**
  * \brief FreeTDM libpri signaling and IO module definition
  */
-ftdm_module_t ftdm_module = { 
+ftdm_module_t ftdm_module = {
 	"libpri",
 	ftdm_libpri_io_init,
 	ftdm_libpri_unload,
 	ftdm_libpri_init,
-	ftdm_libpri_configure_span,
-	NULL
+	NULL,
+	NULL,
+	ftdm_libpri_configure_span
 };
 
-
 /* For Emacs:
  * Local Variables:
  * mode:c
diff --git a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.h b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.h
index 0bf8c46817..b11baec6c5 100644
--- a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.h
+++ b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.h
@@ -42,8 +42,9 @@ typedef enum {
 	FTMOD_LIBPRI_OPT_SUGGEST_CHANNEL = (1 << 0),
 	FTMOD_LIBPRI_OPT_OMIT_DISPLAY_IE = (1 << 1),
 	FTMOD_LIBPRI_OPT_OMIT_REDIRECTING_NUMBER_IE = (1 << 2),
-		
-	FTMOD_LIBPRI_OPT_MAX = (1 << 3)
+	FTMOD_LIBPRI_OPT_FACILITY_AOC = (1 << 3),
+
+	FTMOD_LIBPRI_OPT_MAX = (1 << 4)
 } ftdm_isdn_opts_t;
 
 typedef enum {
diff --git a/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c b/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c
index 8dfba34ec3..de4fa2b232 100644
--- a/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c
+++ b/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c
@@ -1,23 +1,23 @@
 /*
  * Copyright (c) 2009, Anthony Minessale II
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  * * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
- * 
+ *
  * * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * 
+ *
  * * Neither the name of the original author; nor the names of any contributors
  * may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * 
- * 
+ *
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -35,8 +35,8 @@
 
 #include "private/ftdm_core.h"
 #include "lpwrap_pri.h"
-#ifndef HAVE_GETTIMEOFDAY
 
+#ifndef HAVE_GETTIMEOFDAY
 #ifdef WIN32
 #include <mmsystem.h>
 
@@ -92,7 +92,7 @@ static struct lpwrap_pri_event_list LPWRAP_PRI_EVENT_LIST[] = {
 	{8, LPWRAP_PRI_EVENT_ANSWER, "ANSWER"},
 	{9, LPWRAP_PRI_EVENT_HANGUP_ACK, "HANGUP_ACK"},
 	{10, LPWRAP_PRI_EVENT_RESTART_ACK, "RESTART_ACK"},
-	{11, LPWRAP_PRI_EVENT_FACNAME, "FACNAME"},
+	{11, LPWRAP_PRI_EVENT_FACILITY, "FACILITY"},
 	{12, LPWRAP_PRI_EVENT_INFO_RECEIVED, "INFO_RECEIVED"},
 	{13, LPWRAP_PRI_EVENT_PROCEEDING, "PROCEEDING"},
 	{14, LPWRAP_PRI_EVENT_SETUP_ACK, "SETUP_ACK"},
@@ -106,7 +106,10 @@ static struct lpwrap_pri_event_list LPWRAP_PRI_EVENT_LIST[] = {
 #define LINE "--------------------------------------------------------------------------------"
 
 const char *lpwrap_pri_event_str(lpwrap_pri_event_t event_id)
-{ 
+{
+	if (event_id < 0 || event_id >= LPWRAP_PRI_EVENT_MAX)
+		return "";
+
 	return LPWRAP_PRI_EVENT_LIST[event_id].name;
 }
 
@@ -114,8 +117,8 @@ static int __pri_lpwrap_read(struct pri *pri, void *buf, int buflen)
 {
 	struct lpwrap_pri *spri = (struct lpwrap_pri *) pri_get_userdata(pri);
 	ftdm_size_t len = buflen;
-	int res;
 	ftdm_status_t zst;
+	int res;
 
 	if ((zst = ftdm_channel_read(spri->dchan, buf, &len)) != FTDM_SUCCESS) {
 		if (zst == FTDM_FAIL) {
@@ -124,31 +127,31 @@ static int __pri_lpwrap_read(struct pri *pri, void *buf, int buflen)
 		} else {
 			ftdm_log(FTDM_LOG_CRIT, "span %d D-READ TIMEOUT\n", spri->span->span_id);
 		}
-		
+
 		ftdm_clear_flag(spri, LPWRAP_PRI_READY);
 		return -1;
 	}
 	spri->errs = 0;
 	res = (int)len;
-	memset(&((unsigned char*)buf)[res],0,2);
-	res+=2;
+
+	memset(&((unsigned char*)buf)[res], 0, 2);
+	res += 2;
 
 #ifdef IODEBUG
 	{
 		char bb[2048] = { 0 };
 
 		print_hex_bytes(buf, res - 2, bb, sizeof(bb));
-		ftdm_log(FTDM_LOG_DEBUG, "READ %d\n", res-2);
+		ftdm_log(FTDM_LOG_DEBUG, "READ %d\n", res - 2);
 	}
 #endif
-
 	return res;
 }
 
 static int __pri_lpwrap_write(struct pri *pri, void *buf, int buflen)
 {
 	struct lpwrap_pri *spri = (struct lpwrap_pri *) pri_get_userdata(pri);
-	ftdm_size_t len = buflen -2;
+	ftdm_size_t len = buflen - 2;
 
 	if (ftdm_channel_write(spri->dchan, buf, buflen, &len) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_CRIT, "span %d D-WRITE FAIL! [%s]\n", spri->span->span_id, spri->dchan->last_error);
@@ -161,11 +164,10 @@ static int __pri_lpwrap_write(struct pri *pri, void *buf, int buflen)
 		char bb[2048] = { 0 };
 
 		print_hex_bytes(buf, buflen - 2, bb, sizeof(bb));
-		ftdm_log(FTDM_LOG_DEBUG, "WRITE %d\n", (int)buflen-2);
+		ftdm_log(FTDM_LOG_DEBUG, "WRITE %d\n", (int)buflen - 2);
 	}
 #endif
-
-	return (int) buflen;
+	return (int)buflen;
 }
 
 int lpwrap_init_pri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *dchan, int swtype, int node, int debug)
@@ -173,21 +175,63 @@ int lpwrap_init_pri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *
 	int ret = -1;
 
 	memset(spri, 0, sizeof(struct lpwrap_pri));
-	
 	spri->dchan = dchan;
-	spri->span = span;
+	spri->span  = span;
 
-	if (spri->dchan && (spri->pri = pri_new_cb(spri->dchan->sockfd, node, swtype, __pri_lpwrap_read, __pri_lpwrap_write, spri))){
-		unsigned char buf[4] = { 0 };
-		size_t buflen = sizeof(buf), len = 0;
-		pri_set_debug(spri->pri, debug);
-		ret = 0;
-		
-		ftdm_channel_write(spri->dchan, buf, buflen, &len);
-	} else {
-		fprintf(stderr, "Unable to create PRI\n");
+	if (!spri->dchan) {
+		ftdm_log(FTDM_LOG_ERROR, "No D-Channel available, unable to create PRI\n");
+		return ret;
 	}
 
+	if ((spri->pri = pri_new_cb(spri->dchan->sockfd, node, swtype, __pri_lpwrap_read, __pri_lpwrap_write, spri))) {
+		unsigned char buf[4] = { 0 };
+		size_t buflen = sizeof(buf), len = 0;
+
+		pri_set_debug(spri->pri, debug);
+#ifdef HAVE_LIBPRI_AOC
+		pri_aoc_events_enable(spri->pri, 1);
+#endif
+		ftdm_channel_write(spri->dchan, buf, buflen, &len);
+
+		ret = 0;
+	} else {
+		ftdm_log(FTDM_LOG_ERROR, "Unable to create PRI\n");
+	}
+	return ret;
+}
+
+int lpwrap_init_bri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *dchan, int swtype, int node, int ptp, int debug)
+{
+	int ret = -1;
+
+#ifdef HAVE_LIBPRI_BRI
+	memset(spri, 0, sizeof(struct lpwrap_pri));
+	spri->dchan = dchan;
+	spri->span  = span;
+
+	if (!spri->dchan) {
+		ftdm_log(FTDM_LOG_ERROR, "No D-Channel available, unable to create BRI\n");
+		return ret;
+	}
+
+	if ((spri->pri = pri_new_bri_cb(spri->dchan->sockfd, ptp, node, swtype, __pri_lpwrap_read, __pri_lpwrap_write, spri))) {
+		unsigned char buf[4] = { 0 };
+		size_t buflen = sizeof(buf), len = 0;
+
+		pri_set_debug(spri->pri, debug);
+#ifdef HAVE_LIBPRI_AOC
+		pri_aoc_events_enable(spri->pri, 1);
+#endif
+		ftdm_channel_write(spri->dchan, buf, buflen, &len);
+
+		ret = 0;
+	} else {
+		ftdm_log(FTDM_LOG_ERROR, "Unable to create BRI\n");
+	}
+#else
+	ftdm_log(FTDM_LOG_ERROR, "Installed libpri version (%s) has no BRI support\n",
+			pri_get_version());
+#endif
 	return ret;
 }
 
@@ -195,11 +239,11 @@ int lpwrap_init_pri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *
 int lpwrap_one_loop(struct lpwrap_pri *spri)
 {
 	fd_set rfds, efds;
-	struct timeval now = {0,0}, *next;
-	pri_event *event;
+	struct timeval now = {0,0}, *next = NULL;
+	pri_event *event = NULL;
 	event_handler handler;
-    int sel;
-	
+	int sel;
+
 	if (spri->on_loop) {
 		if ((sel = spri->on_loop(spri)) < 0) {
 			return sel;
@@ -231,9 +275,6 @@ int lpwrap_one_loop(struct lpwrap_pri *spri)
 	now.tv_usec = 100000;
 
 	sel = select(pri_fd(spri->pri) + 1, &rfds, NULL, &efds, &now);
-
-	event = NULL;
-
 	if (!sel) {
 		if ((next = pri_schedule_next(spri->pri))) {
 			gettimeofday(&now, NULL);
@@ -248,46 +289,40 @@ int lpwrap_one_loop(struct lpwrap_pri *spri)
 
 	if (event) {
 		/* 0 is catchall event handler */
-		if ((handler = spri->eventmap[event->e] ? spri->eventmap[event->e] : spri->eventmap[0] ? spri->eventmap[0] : NULL)) {
+		if (event->e < 0 || event->e >= LPWRAP_PRI_EVENT_MAX) {
+			handler = spri->eventmap[0];
+		} else if (spri->eventmap[event->e]) {
+			handler = spri->eventmap[event->e];
+		} else {
+			handler = spri->eventmap[0];
+		}
+
+		if (handler) {
 			handler(spri, event->e, event);
 		} else {
 			ftdm_log(FTDM_LOG_CRIT, "No event handler found for event %d.\n", event->e);
 		}
 	}
-
-
 	return sel;
-
-
-	if ((handler = spri->eventmap[LPWRAP_PRI_EVENT_IO_FAIL] ? spri->eventmap[LPWRAP_PRI_EVENT_IO_FAIL] : spri->eventmap[0] ? spri->eventmap[0] : NULL)) {
-		handler(spri, LPWRAP_PRI_EVENT_IO_FAIL, NULL);
-	}
-
-	return -1;
 }
 
 int lpwrap_run_pri(struct lpwrap_pri *spri)
 {
 	int ret = 0;
-	
-	for (;;){
-		ret = lpwrap_one_loop(spri);
-
-		if (ret < 0) {
 
+	for (;;) {
+		if ((ret = lpwrap_one_loop(spri)) < 0) {
 #ifndef WIN32 //This needs to be adressed fror WIN32 still
 			if (errno == EINTR){
 				/* Igonore an interrupted system call */
 				continue;
 			}
-#endif	
+#endif
 			ftdm_log(FTDM_LOG_CRIT, "Error = %i [%s]\n", ret, strerror(errno));
 			break;
 		}
 	}
-
 	return ret;
-
 }
 
 /* For Emacs:
@@ -300,4 +335,3 @@ int lpwrap_run_pri(struct lpwrap_pri *spri)
  * For VIM:
  * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
-
diff --git a/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.h b/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.h
index f92c5bbafa..b62e5fb176 100644
--- a/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.h
+++ b/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.h
@@ -51,7 +51,11 @@ typedef enum {
 	LPWRAP_PRI_EVENT_ANSWER        = PRI_EVENT_ANSWER,
 	LPWRAP_PRI_EVENT_HANGUP_ACK    = PRI_EVENT_HANGUP_ACK,
 	LPWRAP_PRI_EVENT_RESTART_ACK   = PRI_EVENT_RESTART_ACK,
-	LPWRAP_PRI_EVENT_FACNAME       = PRI_EVENT_FACNAME,
+#ifdef PRI_EVENT_FACILITY
+	LPWRAP_PRI_EVENT_FACILITY      = PRI_EVENT_FACILITY,
+#else
+	LPWRAP_PRI_EVENT_FACILITY      = PRI_EVENT_FACNAME,
+#endif
 	LPWRAP_PRI_EVENT_INFO_RECEIVED = PRI_EVENT_INFO_RECEIVED,
 	LPWRAP_PRI_EVENT_PROCEEDING    = PRI_EVENT_PROCEEDING,
 	LPWRAP_PRI_EVENT_SETUP_ACK     = PRI_EVENT_SETUP_ACK,
@@ -121,6 +125,8 @@ struct lpwrap_pri_event_list {
 const char *lpwrap_pri_event_str(lpwrap_pri_event_t event_id);
 int lpwrap_one_loop(struct lpwrap_pri *spri);
 int lpwrap_init_pri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *dchan, int swtype, int node, int debug);
+int lpwrap_init_bri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *dchan, int swtype, int node, int ptp, int debug);
 int lpwrap_run_pri(struct lpwrap_pri *spri);
+#define lpwrap_run_bri(x)	lpwrap_run_pri(x)
 
 #endif
diff --git a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
index 56c0bc6e73..086656128e 100644
--- a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
@@ -403,6 +403,7 @@ static void ftdm_r2_on_call_init(openr2_chan_t *r2chan)
 	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE)) {
 		ftdm_log_chan(ftdmchan, FTDM_LOG_CRIT, "Cannot start call when channel is in use (state = %s)\n", ftdm_channel_state2str(ftdmchan->state));
 		ftdm_mutex_unlock(ftdmchan->mutex);
+		return;
 	}
 
 	if (ftdmchan->state != FTDM_CHANNEL_STATE_DOWN) {
@@ -436,9 +437,6 @@ static void ftdm_r2_on_call_init(openr2_chan_t *r2chan)
 
 	ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_COLLECT);
 	ftdm_mutex_unlock(ftdmchan->mutex);
-
-    ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Span is not threaded, not launching thread for this call\n");
-    return;
 }
 
 /* only called for incoming calls when the ANI, DNIS etc is complete and the user has to decide either to accept or reject the call */
@@ -447,9 +445,7 @@ static void ftdm_r2_on_call_offered(openr2_chan_t *r2chan, const char *ani, cons
 	ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan);
 
 	ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "Call offered with ANI = %s, DNIS = %s, Priority = (%d)\n", ani, dnis, category);
-	//ftdmchan->caller_data.priority = category;
 	ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RING);
-
 }
 
 static void ftdm_r2_on_call_accepted(openr2_chan_t *r2chan, openr2_call_mode_t mode)
@@ -602,8 +598,8 @@ static void ftdm_r2_on_line_idle(openr2_chan_t *r2chan)
 	ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "Far end unblocked in state %s\n", ftdm_channel_state2str(ftdmchan->state));
 	ftdm_clear_flag(ftdmchan, FTDM_CHANNEL_SUSPENDED);
 
-    /* XXX when should we set/unset this flag? XXX */
-    ftdm_set_flag(ftdmchan, FTDM_CHANNEL_SIG_UP);
+	 /* XXX when should we set/unset this flag? XXX */
+	ftdm_set_flag(ftdmchan, FTDM_CHANNEL_SIG_UP);
 }
 
 static void ftdm_r2_write_log(openr2_log_level_t level, const char *file, const char *function, int line, const char *message)
@@ -1116,7 +1112,7 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
 		memset(r2call, 0, sizeof(*r2call));
 		openr2_chan_set_logging_func(r2chan, ftdm_r2_on_chan_log);
 		openr2_chan_set_client_data(r2chan, span->channels[i]);
-        r2call->r2chan = r2chan;
+		r2call->r2chan = r2chan;
 		span->channels[i]->call_data = r2call;
 		/* value and key are the same so just free one of them */
 		snprintf(r2call->name, sizeof(r2call->name), "chancall%d", i);
@@ -1331,8 +1327,8 @@ static int ftdm_r2_state_advance(ftdm_channel_t *ftdmchan)
 static void *ftdm_r2_run(ftdm_thread_t *me, void *obj)
 {
 	openr2_chan_t *r2chan;
-    ftdm_r2_call_t *r2call = NULL;
-    ftdm_channel_t *ftdmchan = NULL;
+	ftdm_r2_call_t *r2call = NULL;
+	ftdm_channel_t *ftdmchan = NULL;
 	ftdm_status_t status;
 	ftdm_span_t *span = (ftdm_span_t *) obj;
 	ftdm_r2_data_t *r2data = span->signal_data;
@@ -1368,16 +1364,14 @@ static void *ftdm_r2_run(ftdm_thread_t *me, void *obj)
 		}
 
 #ifndef WIN32
-        /* figure out what event to poll each channel for. POLLPRI when the channel is down,
-		 * POLLPRI|POLLIN|POLLOUT otherwise.
-		 */
-        memset(poll_events, 0, sizeof(short)*span->chan_count);
-        for (i = 0; i < span->chan_count; i++) {
-            r2chan = R2CALL(span->channels[(i+1)])->r2chan;
-            ftdmchan = openr2_chan_get_client_data(r2chan);
-
-            poll_events[i] = ftdmchan->state == FTDM_CHANNEL_STATE_DOWN ? POLLPRI : (POLLPRI | POLLIN | POLLOUT);
-        }
+		 /* figure out what event to poll each channel for. POLLPRI when the channel is down,
+		  * POLLPRI|POLLIN|POLLOUT otherwise */
+		memset(poll_events, 0, sizeof(short)*span->chan_count);
+		for (i = 0; i < span->chan_count; i++) {
+			r2chan = R2CALL(span->channels[(i+1)])->r2chan;
+			ftdmchan = openr2_chan_get_client_data(r2chan);
+			poll_events[i] = ftdmchan->state == FTDM_CHANNEL_STATE_DOWN ? POLLPRI : (POLLPRI | POLLIN | POLLOUT);
+		}
 
 		status = ftdm_span_poll_event(span, waitms, poll_events);
 #else
@@ -1394,62 +1388,61 @@ static void *ftdm_r2_run(ftdm_thread_t *me, void *obj)
 			continue;
 		}
 
-        if (FTDM_SUCCESS == status) {
+		 if (FTDM_SUCCESS == status) {
 			ftdm_event_t *event;
 			while (ftdm_span_next_event(span, &event) == FTDM_SUCCESS) {
 				if (event->enum_id == FTDM_OOB_CAS_BITS_CHANGE) {
-                    r2call = R2CALL(event->channel);
-                    r2chan = r2call->r2chan;
+					r2call = R2CALL(event->channel);
+					r2chan = r2call->r2chan;
 
 					ftdm_log(FTDM_LOG_DEBUG, "Handling CAS on channel %d.\n", openr2_chan_get_number(r2chan));
 					// we only expect CAS and other OOB events on this thread/loop, once a call is started
 					// the MF events (in-band signaling) are handled in the call thread
 					openr2_chan_process_cas_signaling(r2chan);
-
 				} else {
 					ftdm_log(FTDM_LOG_DEBUG, "Ignoring event %d on channel %d.\n", event->enum_id, openr2_chan_get_number(r2chan));
 					// XXX TODO: handle alarms here XXX
 				}
 			}
 
-            /* XXX
-			 * when ftdm_span_poll_event() returns FTDM_SUCCESS, means there are events pending on the span.
-			 * is it possible to know on which channels those events are pending, without trasvering the span?
-			 * XXX
-             */
-            for (i = 1; i <= span->chan_count; i++) {
-                r2chan = R2CALL(span->channels[i])->r2chan;
-                ftdmchan = openr2_chan_get_client_data(r2chan);
-                r2call = R2CALL(ftdmchan);
+			/* XXX
+			* when ftdm_span_poll_event() returns FTDM_SUCCESS, means there are events pending on the span.
+			* is it possible to know on which channels those events are pending, without traversing the span?
+			* XXX */
+			for (i = 1; i <= span->chan_count; i++) {
+				r2chan = R2CALL(span->channels[i])->r2chan;
+				ftdmchan = openr2_chan_get_client_data(r2chan);
+				r2call = R2CALL(ftdmchan);
 
-                ftdm_mutex_lock(ftdmchan->mutex);
-                ftdm_set_flag(r2call, FTDM_R2_PROCESSING);
+				ftdm_mutex_lock(ftdmchan->mutex);
+				ftdm_set_flag(r2call, FTDM_R2_PROCESSING);
 
-                if (ftdm_r2_state_advance(ftdmchan)) {
-                    ftdm_clear_flag(r2call, FTDM_R2_PROCESSING);
-                    ftdm_mutex_unlock(ftdmchan->mutex);
-                    continue;
-                }
+				if (ftdm_r2_state_advance(ftdmchan)) {
+					ftdm_clear_flag(r2call, FTDM_R2_PROCESSING);
+					ftdm_mutex_unlock(ftdmchan->mutex);
+					continue;
+				}
 
-                /* handle timeout events first if any */
-                openr2_chan_run_schedule(r2chan);
+				/* handle timeout events first if any */
+				openr2_chan_run_schedule(r2chan);
 
-                /* process mf tones, if any */
-                if (openr2_chan_get_read_enabled(r2chan))
-                    openr2_chan_process_mf_signaling(r2chan);
+				/* process mf tones, if any */
+				if (openr2_chan_get_read_enabled(r2chan)) {
+					openr2_chan_process_mf_signaling(r2chan);
+				}
 
-                if (ftdm_r2_state_advance(ftdmchan)) {
-                    ftdm_clear_flag(r2call, FTDM_R2_PROCESSING);
-                    ftdm_mutex_unlock(ftdmchan->mutex);
-                    continue;
-                }
+				if (ftdm_r2_state_advance(ftdmchan)) {
+					ftdm_clear_flag(r2call, FTDM_R2_PROCESSING);
+					ftdm_mutex_unlock(ftdmchan->mutex);
+					continue;
+				}
 
-                ftdm_clear_flag(r2call, FTDM_R2_PROCESSING);
-                ftdm_mutex_unlock(ftdmchan->mutex);
-            }
+				ftdm_clear_flag(r2call, FTDM_R2_PROCESSING);
+				ftdm_mutex_unlock(ftdmchan->mutex);
+			}
 		} else if (status != FTDM_TIMEOUT) {
 			ftdm_log(FTDM_LOG_ERROR, "ftdm_span_poll_event returned %d.\n", status);
-		} 
+		}
 		ftdm_sleep(20);
 	}
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
index 04c3b86c5e..69743115fe 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
@@ -49,7 +49,6 @@ ftdm_channel_t* ftdm_sangoma_isdn_process_event_states(ftdm_span_t *span, sngisd
 static void ftdm_sangoma_isdn_advance_chan_states(ftdm_channel_t *ftdmchan);
 static void ftdm_sangoma_isdn_poll_events(ftdm_span_t *span);
 static void ftdm_sangoma_isdn_process_phy_events(ftdm_span_t *span, ftdm_oob_event_t event);
-
 static void ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdmchan);
 static void ftdm_sangoma_isdn_process_stack_event (ftdm_span_t *span, sngisdn_event_data_t *sngisdn_event);
 
@@ -279,6 +278,10 @@ static void ftdm_sangoma_isdn_process_phy_events(ftdm_span_t *span, ftdm_oob_eve
 static void ftdm_sangoma_isdn_poll_events(ftdm_span_t *span)
 {
 	ftdm_status_t		ret_status;
+	ftdm_channel_t *ftdmchan;
+	ftdm_iterator_t *chaniter = NULL;
+	ftdm_iterator_t *curr = NULL;
+	
 	ret_status = ftdm_span_poll_event(span, 0, NULL);
 	switch(ret_status) {
 		case FTDM_SUCCESS:
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
index 43e35b6dfd..3b264ae02f 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
@@ -100,6 +100,8 @@ ftdm_status_t parse_switchtype(const char* switch_name, ftdm_span_t *span)
 				ftdm_log(FTDM_LOG_ERROR, "%s:Unsupported switchtype %s for trunktype:%s\n", span->name, switch_name, ftdm_trunk_type2str(span->trunk_type));
 				return FTDM_FAIL;
 			}
+			ftdm_set_flag(span, FTDM_SPAN_USE_AV_RATE);
+			ftdm_set_flag(span, FTDM_SPAN_PWR_SAVING);
 			 /* can be > 1 for some BRI variants */
 			break;
 		default:
@@ -188,6 +190,7 @@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_
 	signal_data->min_digits = 8;
 	signal_data->overlap_dial = SNGISDN_OPT_DEFAULT;
 	signal_data->setup_arb = SNGISDN_OPT_DEFAULT;
+	signal_data->timer_t3 = 8;
 
 	signal_data->link_id = span->span_id;
 	span->default_caller_data.bearer_capability = IN_ITC_SPEECH;
@@ -198,6 +201,7 @@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_
 	if (span->trunk_type == FTDM_TRUNK_BRI ||
 		span->trunk_type == FTDM_TRUNK_BRI_PTMP) {
 
+		
 		ftdm_span_set_npi("unknown", &span->default_caller_data.dnis.plan);
 		ftdm_span_set_ton("unknown", &span->default_caller_data.dnis.type);
 		ftdm_span_set_npi("unknown", &span->default_caller_data.cid_num.plan);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
index d8e6c8e00d..1714ac185c 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
@@ -113,6 +113,40 @@ ftdm_status_t sngisdn_stack_stop(ftdm_span_t *span)
 }
 
 
+ftdm_status_t sngisdn_wake_up_phy(ftdm_span_t *span)
+{
+	L1Mngmt cntrl;
+	Pst pst;
+
+	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*)span->signal_data;
+
+	/* initalize the post structure */
+	stack_pst_init(&pst);
+
+	/* insert the destination Entity */
+	pst.dstEnt = ENTL1;
+
+	/* initalize the control structure */
+	memset(&cntrl, 0, sizeof(cntrl));
+
+	/* initalize the control header */
+	stack_hdr_init(&cntrl.hdr);
+
+	cntrl.hdr.msgType = TCNTRL;			/* configuration */
+	cntrl.hdr.entId.ent = ENTL1;		/* entity */
+	cntrl.hdr.entId.inst = S_INST;		/* instance */
+	cntrl.hdr.elmId.elmnt = STTSAP;		/* SAP Specific cntrl */
+
+	cntrl.t.cntrl.action = AENA;
+	cntrl.t.cntrl.subAction = SAELMNT;
+	cntrl.t.cntrl.sapId = signal_data->link_id;
+	
+	if (sng_isdn_phy_cntrl(&pst, &cntrl)) {
+		return FTDM_FAIL;
+	}
+	return FTDM_SUCCESS;
+}
+
 ftdm_status_t sngisdn_activate_phy(ftdm_span_t *span)
 {
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
index 37613cc33d..dd0b9d46d9 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
@@ -135,6 +135,7 @@ void sngisdn_process_con_ind (sngisdn_event_data_t *sngisdn_event)
 			cpy_calling_num_from_stack(&ftdmchan->caller_data, &conEvnt->cgPtyNmb);
 			cpy_called_num_from_stack(&ftdmchan->caller_data, &conEvnt->cdPtyNmb);
 			cpy_calling_name_from_stack(&ftdmchan->caller_data, &conEvnt->display);
+			cpy_redir_num_from_stack(&ftdmchan->caller_data, &conEvnt->redirNmb);
 			ftdm_log_chan(sngisdn_info->ftdmchan, FTDM_LOG_INFO, "Incoming call: Called No:[%s] Calling No:[%s]\n", ftdmchan->caller_data.dnis.digits, ftdmchan->caller_data.cid_num.digits);
 
 			if (conEvnt->bearCap[0].eh.pres) {
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
index bf44cb2e0a..163265177f 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
@@ -38,13 +38,6 @@ extern ftdm_status_t cpy_calling_num_from_user(CgPtyNmb *cgPtyNmb, ftdm_caller_d
 extern ftdm_status_t cpy_called_num_from_user(CdPtyNmb *cdPtyNmb, ftdm_caller_data_t *ftdm);
 extern ftdm_status_t cpy_calling_name_from_user(ConEvnt *conEvnt, ftdm_channel_t *ftdmchan);
 
-void sngisdn_snd_setup(ftdm_channel_t *ftdmchan);
-void sngisdn_snd_proceed(ftdm_channel_t *ftdmchan);
-void sngisdn_snd_progress(ftdm_channel_t *ftdmchan);
-void sngisdn_snd_connect(ftdm_channel_t *ftdmchan);
-void sngisdn_snd_disconnect(ftdm_channel_t *ftdmchan);
-void sngisdn_snd_release(ftdm_channel_t *ftdmchan, uint8_t glare);
-
 
 void sngisdn_snd_setup(ftdm_channel_t *ftdmchan)
 {
@@ -147,6 +140,7 @@ void sngisdn_snd_setup(ftdm_channel_t *ftdmchan)
 
 	cpy_called_num_from_user(&conEvnt.cdPtyNmb, &ftdmchan->caller_data);
 	cpy_calling_num_from_user(&conEvnt.cgPtyNmb, &ftdmchan->caller_data);
+	cpy_redir_num_from_user(&conEvnt.redirNmb, &ftdmchan->caller_data);
 	cpy_calling_name_from_user(&conEvnt, ftdmchan);
 
 	ftdm_log_chan(ftdmchan, FTDM_LOG_INFO, "Sending SETUP (suId:%d suInstId:%u spInstId:%u dchan:%d ces:%d)\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId, signal_data->dchan_id, sngisdn_info->ces);
diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
index e2d85f7ea1..896b8eebd8 100644
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
@@ -1011,13 +1011,15 @@ static FIO_GET_ALARMS_FUNCTION(wanpipe_get_alarms)
 	}
 	alarms = tdm_api.wp_tdm_cmd.fe_alarms;
 #endif
-#if 1 
-	/* DAVIDY - Temporary fix: in the current trunk of libsangoma, for BRI, 
+#ifdef WIN32
+	/* Temporary fix: in the current trunk of libsangoma, for BRI,
 		WAN_TE_BIT_ALARM_RED bit is set if the card is in disconnected state, but this has
 		not been ported to Windows-libsangoma yet */
-	if (alarms) {
-		ftdmchan->alarm_flags |= FTDM_ALARM_RED;
-		alarms = 0;
+	if (FTDM_SPAN_IS_BRI(ftdmchan->span)) {
+		if (alarms) {
+			ftdmchan->alarm_flags |= FTDM_ALARM_RED;
+			alarms = 0;
+		}
 	}
 #endif
 
@@ -1027,6 +1029,7 @@ static FIO_GET_ALARMS_FUNCTION(wanpipe_get_alarms)
 		ftdmchan->alarm_flags |= FTDM_ALARM_RED;
 		alarms &= ~WAN_TE_BIT_ALARM_RED;
 	}
+		
 
 	if (alarms & WAN_TE_BIT_ALARM_AIS) {
 		ftdmchan->alarm_flags |= FTDM_ALARM_BLUE;
@@ -1176,6 +1179,11 @@ FIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event)
 					char tmp_dtmf[2] = { tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_dtmf_digit, 0 };
 					event_id = FTDM_OOB_NOOP;
 
+					if (tmp_dtmf[0] == 'f') {
+						ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Ignoring wanpipe DTMF: %c, fax tones will be passed through!\n", tmp_dtmf[0]);
+						break;
+					}
+
 					if (tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_dtmf_type == WAN_EC_TONE_PRESENT) {
 						ftdm_set_flag_locked(ftdmchan, FTDM_CHANNEL_MUTE);
 					}
diff --git a/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c b/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
index ae9398418a..692b505716 100644
--- a/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
+++ b/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
@@ -867,7 +867,7 @@ static FIO_WAIT_FUNCTION(zt_wait)
 {
 	int32_t inflags = 0;
 	int result;
-    struct pollfd pfds[1];
+	struct pollfd pfds[1];
 
 	if (*flags & FTDM_READ) {
 		inflags |= POLLIN;
@@ -882,13 +882,14 @@ static FIO_WAIT_FUNCTION(zt_wait)
 	}
 
 
-    memset(&pfds[0], 0, sizeof(pfds[0]));
-    pfds[0].fd = ftdmchan->sockfd;
-    pfds[0].events = inflags;
-    result = poll(pfds, 1, to);
+	memset(&pfds[0], 0, sizeof(pfds[0]));
+	pfds[0].fd = ftdmchan->sockfd;
+	pfds[0].events = inflags;
+	result = poll(pfds, 1, to);
 	*flags = 0;
 
 	if (pfds[0].revents & POLLERR) {
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "DAHDI device got POLLERR\n");
 		result = -1;
 	}
 
@@ -900,6 +901,7 @@ static FIO_WAIT_FUNCTION(zt_wait)
 
 	if (result < 0){
 		snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "Poll failed");
+		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Failed to poll DAHDI device: %s\n", strerror(errno));
 		return FTDM_FAIL;
 	}
 
diff --git a/libs/freetdm/src/include/private/ftdm_core.h b/libs/freetdm/src/include/private/ftdm_core.h
index 239eb4a3d9..c5f3c4b821 100644
--- a/libs/freetdm/src/include/private/ftdm_core.h
+++ b/libs/freetdm/src/include/private/ftdm_core.h
@@ -223,7 +223,6 @@ extern "C" {
 #define ftdm_is_dtmf(key)  ((key > 47 && key < 58) || (key > 64 && key < 69) || (key > 96 && key < 101) || key == 35 || key == 42 || key == 87 || key == 119)
 
 #define FTDM_SPAN_IS_BRI(x)	((x)->trunk_type == FTDM_TRUNK_BRI || (x)->trunk_type == FTDM_TRUNK_BRI_PTMP)
-	
 /*!
   \brief Copy flags from one arbitrary object to another
   \command dest the object to copy the flags to
diff --git a/libs/libsndfile/M4/lt~obsolete.m4 b/libs/libsndfile/M4/lt~obsolete.m4
index 637bb2066c..c573da90c5 100644
--- a/libs/libsndfile/M4/lt~obsolete.m4
+++ b/libs/libsndfile/M4/lt~obsolete.m4
@@ -1,13 +1,13 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
@@ -77,7 +77,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
 m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
 m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
 m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
 m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -90,3 +89,10 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
 m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/libs/openzap/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c b/libs/openzap/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c
index 937c67b328..dc2218012e 100644
--- a/libs/openzap/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c
+++ b/libs/openzap/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c
@@ -898,7 +898,7 @@ tryagain:
 
 static void handle_call_loop_start(zap_span_t *span, sangomabc_connection_t *mcon, sangomabc_short_event_t *event)
 {
-	zap_status_t res = ZAP_FAIL;
+	zap_state_change_result_t res = ZAP_FAIL;
 	zap_channel_t *zchan;
 
 	if (!(zchan = find_zchan(span, (sangomabc_short_event_t*)event, 0))) {
@@ -923,7 +923,7 @@ static void handle_call_loop_start(zap_span_t *span, sangomabc_connection_t *mco
 
 static __inline__ void stop_loop(zap_channel_t *zchan)
 {
-	zap_status_t res = ZAP_FAIL;
+	zap_state_change_result_t res = ZAP_STATE_CHANGE_FAIL;
 	zap_channel_command(zchan, ZAP_COMMAND_DISABLE_LOOP, NULL);
 	/* even when we did not sent a msg we set this flag to avoid sending call stop in the DOWN state handler */
 	zap_set_flag(zchan, SFLAG_SENT_FINAL_MSG);
diff --git a/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c b/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
index 40cf2a5a7c..8423aac34b 100644
--- a/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
+++ b/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
@@ -1119,7 +1119,14 @@ ZIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event)
 					event_id = ZAP_OOB_NOOP;
 
 					//zap_log(ZAP_LOG_WARNING, "%d:%d queue hardware dtmf %s %s\n", zchan->span_id, zchan->chan_id, tmp_dtmf, 
-							//tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_dtmf_type == WAN_EC_TONE_PRESENT ? "on" : "off");
+					//tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_dtmf_type == WAN_EC_TONE_PRESENT ? "on" : "off");
+					if (tmp_dtmf[0] == 'f') {
+						if (zap_test_flag(zchan, ZAP_CHANNEL_INUSE)) {
+							zap_channel_queue_dtmf(zchan, tmp_dtmf);
+						}
+						break;
+					}
+
                     if (tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_dtmf_type == WAN_EC_TONE_PRESENT) {
 						zap_set_flag_locked(zchan, ZAP_CHANNEL_MUTE);
 					}
diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index ec0a895cdb..aacfc996d3 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Mon May 31 09:47:08 EDT 2010
+Wed Nov  3 13:53:34 EDT 2010
diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
index 40ee1f8f85..f77cdd3afa 100644
--- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
@@ -1674,7 +1674,7 @@ int agent_set_params(nta_agent_t *agent, tagi_t *tags)
     progress = 60 * 1000;
   agent->sa_progress = progress;
 
-  if (server_rport > 2)
+  if (server_rport > 3)
     server_rport = 1;
   else if (server_rport < 0)
     server_rport = 1;
@@ -3084,7 +3084,9 @@ int agent_check_request_via(nta_agent_t *agent,
     rport = su_sprintf(msg_home(msg), "rport=%u", ntohs(from->su_port));
     msg_header_replace_param(msg_home(msg), v->v_common, rport);
   }
-  else if (agent->sa_server_rport == 2) {
+  else if (agent->sa_server_rport == 2 ||
+		   (agent->sa_server_rport == 3 && sip && sip->sip_user_agent &&
+			sip->sip_user_agent->g_string && !strncasecmp(sip->sip_user_agent->g_string, "Polycom", 7))) {
     rport = su_sprintf(msg_home(msg), "rport=%u", ntohs(from->su_port));
     msg_header_replace_param(msg_home(msg), v->v_common, rport);
   }
@@ -8174,9 +8176,12 @@ outgoing_send(nta_outgoing_t *orq, int retransmit)
 
   if (orq->orq_method == sip_method_ack)
     ;
-  else if (!orq->orq_reliable)
-    outgoing_set_timer(orq, agent->sa_t1); /* Timer A/E */
-  else if (orq->orq_try_tcp_instead && !tport_is_connected(tp))
+  else if (!orq->orq_reliable) {
+    /* race condition on initial t1 timer timeout, set minimum initial timeout to 1000ms */
+	unsigned t1_timer = agent->sa_t1;
+	if (t1_timer < 1000) t1_timer = 1000;
+    outgoing_set_timer(orq, t1_timer); /* Timer A/E */
+  } else if (orq->orq_try_tcp_instead && !tport_is_connected(tp))
     outgoing_set_timer(orq, agent->sa_t4); /* Timer N3 */
 }
 
@@ -8660,6 +8665,10 @@ void outgoing_destroy(nta_outgoing_t *orq)
   orq->orq_destroyed = 1;
   orq->orq_callback = outgoing_default_cb;
   orq->orq_magic = NULL;
+
+  if (orq->orq_method != sip_method_invite &&
+      orq->orq_method != sip_method_ack)
+    outgoing_terminate(orq);
 }
 
 /** @internal Outgoing transaction timer routine.
diff --git a/libs/stfu/stfu.c b/libs/stfu/stfu.c
index 866ae57616..f305a0f3df 100644
--- a/libs/stfu/stfu.c
+++ b/libs/stfu/stfu.c
@@ -280,7 +280,8 @@ stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i)
 
 			i->miss_count++;
 
-			if (i->miss_count > 10 || (i->in_queue->array_len == i->in_queue->array_size) || tried >= i->in_queue->array_size) {
+			if (i->miss_count > 10 || (i->in_queue->array_len == i->in_queue->array_size) || 
+                tried >= (i->in_queue->array_size + i->out_queue->array_size)) {
 				i->running = 0;
 				i->interval = 0;
 				i->out_queue->wr_len = i->out_queue->array_size;
diff --git a/libs/win32/Sound_Files/16khz.2008.vcproj b/libs/win32/Sound_Files/16khz.2008.vcproj
index d8f80bbde6..026987197d 100644
--- a/libs/win32/Sound_Files/16khz.2008.vcproj
+++ b/libs/win32/Sound_Files/16khz.2008.vcproj
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -33,7 +36,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\16000&quot; /C /D /Y /S /I"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -55,7 +58,52 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\16000&quot; /C /D /Y /S /I"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\16000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/libs/win32/Sound_Files/16khzmusic.2008.vcproj b/libs/win32/Sound_Files/16khzmusic.2008.vcproj
index 932d1c5b4f..c09a5aec90 100644
--- a/libs/win32/Sound_Files/16khzmusic.2008.vcproj
+++ b/libs/win32/Sound_Files/16khzmusic.2008.vcproj
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -58,6 +61,51 @@
 				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\music\16000\*.*&quot; &quot;$(OutDir)\sounds\music\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\music\16000\*.*&quot; &quot;$(OutDir)\sounds\music\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\music\16000\*.*&quot; &quot;$(OutDir)\sounds\music\16000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/libs/win32/Sound_Files/32khz.2008.vcproj b/libs/win32/Sound_Files/32khz.2008.vcproj
index d2ac0af2e3..cdf3fa93fc 100644
--- a/libs/win32/Sound_Files/32khz.2008.vcproj
+++ b/libs/win32/Sound_Files/32khz.2008.vcproj
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -33,7 +36,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\32000&quot; /C /D /Y /S /I"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -55,7 +58,52 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\32000&quot; /C /D /Y /S /I"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\32000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\32000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/libs/win32/Sound_Files/32khzmusic.2008.vcproj b/libs/win32/Sound_Files/32khzmusic.2008.vcproj
index aafc1ef50d..7ff356e038 100644
--- a/libs/win32/Sound_Files/32khzmusic.2008.vcproj
+++ b/libs/win32/Sound_Files/32khzmusic.2008.vcproj
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -58,6 +61,51 @@
 				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\music\32000\*.*&quot; &quot;$(OutDir)\sounds\music\32000&quot; /C /D /Y /S /I"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\music\32000\*.*&quot; &quot;$(OutDir)\sounds\music\32000&quot; /C /D /Y /S /I"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\music\32000\*.*&quot; &quot;$(OutDir)\sounds\music\32000&quot; /C /D /Y /S /I"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/libs/win32/Sound_Files/8khz.2008.vcproj b/libs/win32/Sound_Files/8khz.2008.vcproj
index 413c47dc63..5f6d36803e 100644
--- a/libs/win32/Sound_Files/8khz.2008.vcproj
+++ b/libs/win32/Sound_Files/8khz.2008.vcproj
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -33,7 +36,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\8000&quot; /C /D /Y /S /I"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -55,7 +58,52 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\8000&quot; /C /D /Y /S /I"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\voicemail\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ivr\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\conference\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\time\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\digits\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\ascii\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\misc\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\currency\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\phonetic-ascii\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(SolutionDir)libs\sounds\en\us\callie\directory\8000\*.*&quot; &quot;$(OutDir)\sounds\en\us\callie\directory\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/libs/win32/Sound_Files/8khzmusic.2008.vcproj b/libs/win32/Sound_Files/8khzmusic.2008.vcproj
index 2e46ecff8e..a89d14f9f0 100644
--- a/libs/win32/Sound_Files/8khzmusic.2008.vcproj
+++ b/libs/win32/Sound_Files/8khzmusic.2008.vcproj
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -58,6 +61,51 @@
 				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\music\8000\*.*&quot; &quot;$(OutDir)\sounds\music\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\music\8000\*.*&quot; &quot;$(OutDir)\sounds\music\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy &quot;$(SolutionDir)libs\sounds\music\8000\*.*&quot; &quot;$(OutDir)\sounds\music\8000&quot; /C /D /Y /S /I&#x0D;&#x0A;"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/libs/win32/json/libjson.2008.vcproj b/libs/win32/json/libjson.2008.vcproj
index 91a371b48c..5c09e5413c 100644
--- a/libs/win32/json/libjson.2008.vcproj
+++ b/libs/win32/json/libjson.2008.vcproj
@@ -172,7 +172,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -236,7 +236,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
diff --git a/libs/win32/json/libjson.2010.vcxproj b/libs/win32/json/libjson.2010.vcxproj
index 5846ff3e92..a371ac2f46 100644
--- a/libs/win32/json/libjson.2010.vcxproj
+++ b/libs/win32/json/libjson.2010.vcxproj
@@ -96,7 +96,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
@@ -110,7 +110,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
diff --git a/libs/win32/openssl/libeay32.2008.vcproj b/libs/win32/openssl/libeay32.2008.vcproj
index 84cc80b4ee..5681c7cfb9 100644
--- a/libs/win32/openssl/libeay32.2008.vcproj
+++ b/libs/win32/openssl/libeay32.2008.vcproj
@@ -32,7 +32,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&#x0D;&#x0A;copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&#x0D;&#x0A;copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&#x0D;&#x0A;copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&#x0D;&#x0A;if not exist &quot; $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"
+				CommandLine="copy /Y &quot;$(ProjectDir)opensslconf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)applink.c&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)buildinf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)libeay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&quot;&#x0D;&#x0A;if not exist &quot; $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -116,7 +116,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&#x0D;&#x0A;copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&#x0D;&#x0A;copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&#x0D;&#x0A;copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&#x0D;&#x0A;if not exist &quot; $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"
+				CommandLine="copy /Y &quot;$(ProjectDir)opensslconf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)applink.c&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)buildinf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)libeay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&quot;&#x0D;&#x0A;if not exist &quot; $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -201,7 +201,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&#x0D;&#x0A;copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&#x0D;&#x0A;copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&#x0D;&#x0A;copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&#x0D;&#x0A;if not exist &quot; $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"
+				CommandLine="copy /Y &quot;$(ProjectDir)opensslconf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)applink.c&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)buildinf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)libeay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&quot;&#x0D;&#x0A;if not exist &quot; $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -286,7 +286,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&#x0D;&#x0A;copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&#x0D;&#x0A;copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&#x0D;&#x0A;copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&#x0D;&#x0A;if not exist &quot; $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"
+				CommandLine="copy /Y &quot;$(ProjectDir)opensslconf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)applink.c&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)buildinf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)libeay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&quot;&#x0D;&#x0A;if not exist &quot; $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/libs/win32/openssl/libeay32.2010.vcxproj b/libs/win32/openssl/libeay32.2010.vcxproj
index 4d0d9a44ee..ce341a547a 100644
--- a/libs/win32/openssl/libeay32.2010.vcxproj
+++ b/libs/win32/openssl/libeay32.2010.vcxproj
@@ -81,10 +81,10 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h
-copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c
-copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h
-copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def
+      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h"
+copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c"
+copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h"
+copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def"
 if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\" /C /Y /S
 </Command>
     </PreBuildEvent>
@@ -115,10 +115,10 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h
-copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c
-copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h
-copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def
+      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h"
+copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c"
+copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h"
+copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def"
 if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\" /C /Y /S
 </Command>
     </PreBuildEvent>
@@ -151,10 +151,10 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h
-copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c
-copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h
-copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def
+      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h"
+copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c"
+copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h"
+copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def"
 if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\" /C /Y /S
 </Command>
     </PreBuildEvent>
@@ -185,10 +185,10 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h
-copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c
-copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h
-copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def
+      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h"
+copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c"
+copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h"
+copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def"
 if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\" /C /Y /S
 </Command>
     </PreBuildEvent>
diff --git a/libs/win32/openssl/ssleay32.2008.vcproj b/libs/win32/openssl/ssleay32.2008.vcproj
index 1d8654a882..fef7e5c947 100644
--- a/libs/win32/openssl/ssleay32.2008.vcproj
+++ b/libs/win32/openssl/ssleay32.2008.vcproj
@@ -29,7 +29,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"
+				CommandLine="copy /Y &quot;$(ProjectDir)ssleay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -108,7 +108,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"
+				CommandLine="copy /Y &quot;$(ProjectDir)ssleay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -188,7 +188,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"
+				CommandLine="copy /Y &quot;$(ProjectDir)ssleay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -268,7 +268,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"
+				CommandLine="copy /Y &quot;$(ProjectDir)ssleay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/libs/win32/openssl/ssleay32.2010.vcxproj b/libs/win32/openssl/ssleay32.2010.vcxproj
index 1a444bb41f..5312abe2f0 100644
--- a/libs/win32/openssl/ssleay32.2010.vcxproj
+++ b/libs/win32/openssl/ssleay32.2010.vcxproj
@@ -80,7 +80,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def</Command>
+      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"</Command>
     </PreBuildEvent>
     <ClCompile>
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
@@ -107,7 +107,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def</Command>
+      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"</Command>
     </PreBuildEvent>
     <ClCompile>
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
@@ -134,7 +134,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def</Command>
+      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"</Command>
     </PreBuildEvent>
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -164,7 +164,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def</Command>
+      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"</Command>
     </PreBuildEvent>
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
diff --git a/src/fs_encode.c b/src/fs_encode.c
new file mode 100644
index 0000000000..9517802600
--- /dev/null
+++ b/src/fs_encode.c
@@ -0,0 +1,246 @@
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2010, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * 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 FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Mathieu Rene <mrene@avgs.ca>
+ *
+ * fs_encode.c -- Encode a native file
+ *
+ */
+
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600
+#endif
+
+#ifndef WIN32
+#ifdef HAVE_SETRLIMIT
+#include <sys/resource.h>
+#endif
+#endif
+
+#include <switch.h>
+#include <switch_version.h>
+
+
+/* Picky compiler */
+#ifdef __ICC
+#pragma warning (disable:167)
+#endif
+
+int main(int argc, char *argv[]) 
+{
+	int r = 1;
+	switch_bool_t verbose = SWITCH_FALSE;
+	const char *err = NULL;
+	int i;
+	char *extra_modules[100] = { 0 };
+	int extra_modules_count = 0;
+	int cmd_fail = 0;
+	const char *fmtp = "";
+	int ptime = 20;
+	const char *input, *output, *format = NULL;
+	int channels = 1;
+	int rate = 8000;
+	switch_file_handle_t fh_input = { 0 }, fh_output = { 0 };
+	switch_codec_t codec = { 0 };
+	char buf[2048];
+	switch_size_t len = sizeof(buf)/2;
+	switch_memory_pool_t *pool;
+	int bitrate = 0;
+	int blocksize;
+	
+	for (i = 1; i < argc; i++) {
+		if (argv[i][0] == '-') {
+			switch(argv[i][1]) {
+				case 'l':
+					i++;
+					/* Load extra modules */
+					if (strchr(argv[i], ','))  {
+						extra_modules_count = switch_split(argv[i], ',', extra_modules);	
+					} else {
+						extra_modules_count = 1;
+						extra_modules[0] = argv[i];
+					}
+					break;
+				case 'f':
+					fmtp = argv[++i];
+					break;
+				case 'p':
+					ptime = atoi(argv[++i]);
+					break;
+				case 'r':
+					rate = atoi(argv[++i]);
+					break;
+				case 'b':
+					bitrate = atoi(argv[++i]);
+					break;
+				case 'v':
+					verbose = SWITCH_TRUE;
+					break;
+				default:
+					printf("Command line option not recognized: %s\n", argv[i]);
+					cmd_fail = 1;
+			}
+		} else {
+			break;
+		}
+	}
+	
+	if (argc - i < 2 || cmd_fail) {
+		goto usage;
+	}
+	
+	input = argv[i++];
+	output = argv[i++];
+	if (zstr(input) || zstr(output) || !(format = strchr(output, '.'))) {
+		goto usage;
+	}
+	
+	format++;
+	
+	if (switch_core_init(SCF_MINIMAL, verbose, &err) != SWITCH_STATUS_SUCCESS) {
+		fprintf(stderr, "Cannot init core [%s]\n", err);
+		goto end;
+	}
+	
+	switch_loadable_module_init(SWITCH_FALSE);
+	
+	for (i = 0; i < extra_modules_count; i++) {
+		if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) extra_modules[i], SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) {
+			fprintf(stderr, "Cannot init %s [%s]\n", extra_modules[i], err);
+			goto end;
+		}
+	}
+	
+	if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) "mod_sndfile", SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) {
+		fprintf(stderr, "Cannot init mod_sndfile [%s]\n", err);
+		goto end;
+	}
+	
+	if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) "mod_native_file", SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) {
+		fprintf(stderr, "Cannot init mod_native_file [%s]\n", err);
+		goto end;
+	}
+	
+	switch_core_new_memory_pool(&pool);
+	if (verbose) {
+		fprintf(stderr, "Opening file %s\n", input);
+	}
+	if (switch_core_file_open(&fh_input, input, channels, rate, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
+		fprintf(stderr, "Couldn't open %s\n", input);
+		goto end;
+	}
+	
+
+	if (verbose) {
+		fprintf(stderr, "Opening file %s\n", output);
+	}
+	if (switch_core_file_open(&fh_output, output, channels, rate, SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_NATIVE, NULL) != SWITCH_STATUS_SUCCESS) {
+		fprintf(stderr, "Couldn't open %s\n", output);
+		goto end;	
+	}
+
+	if (switch_test_flag(&fh_input, SWITCH_FILE_NATIVE)) {
+		fprintf(stderr, "Input as native file is not implemented\n");
+		goto end;
+	}
+	
+	if (switch_core_codec_init_with_bitrate(&codec, format, fmtp, rate, ptime, channels, bitrate, SWITCH_CODEC_FLAG_ENCODE, NULL, pool) != SWITCH_STATUS_SUCCESS) {
+		fprintf(stderr, "Couldn't initialize codec for %s@%dh@%di\n", format, rate, ptime);
+		goto end;
+	}
+
+	blocksize = len = (rate*ptime)/1000;
+	switch_assert(sizeof(buf) >= len * 2);
+
+	if (verbose) {
+		fprintf(stderr, "Frame size is %d\n", blocksize);	
+	}
+	
+	while (switch_core_file_read(&fh_input, buf, &len) == SWITCH_STATUS_SUCCESS) {
+		char encode_buf[2048];
+		uint32_t encoded_len = sizeof(buf);
+		uint32_t encoded_rate = rate;
+		unsigned int flags = 0;
+		
+		if (switch_core_codec_encode(&codec, NULL, buf, len*2, rate, encode_buf, &encoded_len, &encoded_rate, &flags) != SWITCH_STATUS_SUCCESS) {
+			fprintf(stderr, "Codec encoder error\n");
+			goto end;
+		}
+		
+		len = encoded_len;
+
+		if (switch_core_file_write(&fh_output, encode_buf, &len) != SWITCH_STATUS_SUCCESS) {
+			fprintf(stderr, "Write error\n");
+			goto end;
+		}
+		
+		if (len != encoded_len) {
+			printf("Short write: wrote %"SWITCH_SIZE_T_FMT"/%d bytes\n", len, encoded_len);
+		}
+		
+		len = blocksize;
+	}
+	
+	r = 0;
+
+end:
+	
+	switch_core_codec_destroy(&codec);
+	
+	if (fh_input.file_interface) {
+		switch_core_file_close(&fh_input);		
+	}
+
+	if (fh_output.file_interface) {
+		switch_core_file_close(&fh_output);		
+	}
+
+	if (pool) {
+		switch_core_destroy_memory_pool(&pool);
+	}
+	switch_core_destroy();
+	return r;
+usage:
+	printf("Usage: %s [options] input output\n\n", argv[0]);
+	printf("The output must end in the format, e.g., myfile.SPEEX\n");
+	printf("\t\t -l module[,module]\t Load additional modules (comma-separated)\n");
+	printf("\t\t -f format\t\t fmtp to pass to the codec\n");
+	printf("\t\t -p ptime\t\t ptime to use while encoding\n");
+	printf("\t\t -r rate\t\t sampling rate\n");
+	printf("\t\t -b bitrate\t\t codec bitrate (if supported)\n");
+	printf("\t\t -v\t\t\t verbose\n");
+	return 1;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
+ */
diff --git a/src/include/private/switch_core_pvt.h b/src/include/private/switch_core_pvt.h
index ea02f22fa0..3df9001b0c 100644
--- a/src/include/private/switch_core_pvt.h
+++ b/src/include/private/switch_core_pvt.h
@@ -193,6 +193,11 @@ struct switch_media_bug {
 	struct switch_media_bug *next;
 };
 
+typedef enum {
+	DBTYPE_DEFAULT = 0,
+	DBTYPE_MSSQL = 1,
+} switch_dbtype_t;
+
 struct switch_runtime {
 	switch_time_t initiated;
 	switch_time_t reference;
@@ -237,6 +242,7 @@ struct switch_runtime {
 	double min_idle_time;
 	int sql_buffer_len;
 	int max_sql_buffer_len;
+	switch_dbtype_t odbc_dbtype;
 };
 
 extern struct switch_runtime runtime;
diff --git a/src/include/switch_core_event_hook.h b/src/include/switch_core_event_hook.h
index b60246cf24..575786f5ce 100644
--- a/src/include/switch_core_event_hook.h
+++ b/src/include/switch_core_event_hook.h
@@ -45,6 +45,7 @@ typedef struct switch_io_event_hook_kill_channel switch_io_event_hook_kill_chann
 typedef struct switch_io_event_hook_send_dtmf switch_io_event_hook_send_dtmf_t;
 typedef struct switch_io_event_hook_recv_dtmf switch_io_event_hook_recv_dtmf_t;
 typedef struct switch_io_event_hook_state_change switch_io_event_hook_state_change_t;
+typedef struct switch_io_event_hook_state_run switch_io_event_hook_state_run_t;
 typedef struct switch_io_event_hook_resurrect_session switch_io_event_hook_resurrect_session_t;
 typedef switch_status_t (*switch_outgoing_channel_hook_t)
                 (switch_core_session_t *, switch_event_t *, switch_caller_profile_t *, switch_core_session_t *, switch_originate_flag_t);
@@ -58,6 +59,7 @@ typedef switch_status_t (*switch_kill_channel_hook_t) (switch_core_session_t *,
 typedef switch_status_t (*switch_send_dtmf_hook_t) (switch_core_session_t *, const switch_dtmf_t *, switch_dtmf_direction_t direction);
 typedef switch_status_t (*switch_recv_dtmf_hook_t) (switch_core_session_t *, const switch_dtmf_t *, switch_dtmf_direction_t direction);
 typedef switch_status_t (*switch_state_change_hook_t) (switch_core_session_t *);
+typedef switch_status_t (*switch_state_run_hook_t) (switch_core_session_t *);
 typedef switch_call_cause_t (*switch_resurrect_session_hook_t) (switch_core_session_t **, switch_memory_pool_t **, void *);
 
 /*! \brief Node in which to store custom receive message callback hooks */
@@ -136,6 +138,13 @@ struct switch_io_event_hook_state_change {
 	struct switch_io_event_hook_state_change *next;
 };
 
+/*! \brief Node in which to store state run callback hooks */
+struct switch_io_event_hook_state_run {
+	/*! the state run channel callback hook */
+	switch_state_run_hook_t state_run;
+	struct switch_io_event_hook_state_run *next;
+};
+
 
 struct switch_io_event_hook_resurrect_session {
 	switch_resurrect_session_hook_t resurrect_session;
@@ -166,6 +175,7 @@ struct switch_io_event_hooks {
 	switch_io_event_hook_recv_dtmf_t *recv_dtmf;
 	/*! a list of state change hooks */
 	switch_io_event_hook_state_change_t *state_change;
+	switch_io_event_hook_state_run_t *state_run;
 	switch_io_event_hook_resurrect_session_t *resurrect_session;
 };
 
@@ -218,6 +228,7 @@ NEW_HOOK_DECL_ADD_P(outgoing_channel);
 NEW_HOOK_DECL_ADD_P(receive_message);
 NEW_HOOK_DECL_ADD_P(receive_event);
 NEW_HOOK_DECL_ADD_P(state_change);
+NEW_HOOK_DECL_ADD_P(state_run);
 NEW_HOOK_DECL_ADD_P(read_frame);
 NEW_HOOK_DECL_ADD_P(write_frame);
 NEW_HOOK_DECL_ADD_P(video_read_frame);
@@ -231,6 +242,7 @@ NEW_HOOK_DECL_REM_P(outgoing_channel);
 NEW_HOOK_DECL_REM_P(receive_message);
 NEW_HOOK_DECL_REM_P(receive_event);
 NEW_HOOK_DECL_REM_P(state_change);
+NEW_HOOK_DECL_REM_P(state_run);
 NEW_HOOK_DECL_REM_P(read_frame);
 NEW_HOOK_DECL_REM_P(write_frame);
 NEW_HOOK_DECL_REM_P(video_read_frame);
diff --git a/src/include/switch_event.h b/src/include/switch_event.h
index 1864e397e6..41bc75cada 100644
--- a/src/include/switch_event.h
+++ b/src/include/switch_event.h
@@ -345,11 +345,15 @@ SWITCH_DECLARE(switch_status_t) switch_event_create_pres_in_detailed(_In_z_ char
 */
 #define switch_event_create(event, id) switch_event_create_subclass(event, id, SWITCH_EVENT_SUBCLASS_ANY)
 
-	 static inline switch_status_t switch_event_create_plain(switch_event_t **event, switch_event_types_t event_id)
+static inline switch_status_t switch_event_create_plain(switch_event_t **event, switch_event_types_t event_id)
 {
 	switch_status_t status = switch_event_create(event, SWITCH_EVENT_CLONE);
 	if (status == SWITCH_STATUS_SUCCESS) {
 		(*event)->event_id = event_id;
+
+		if (event_id == SWITCH_EVENT_REQUEST_PARAMS || event_id == SWITCH_EVENT_CHANNEL_DATA) {
+			(*event)->flags |= EF_UNIQ_HEADERS;
+		}
 	}
 
 	return status;
diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h
index fb023848ec..249ac63a58 100644
--- a/src/include/switch_ivr.h
+++ b/src/include/switch_ivr.h
@@ -840,11 +840,13 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_say_ip(switch_core_session_t *session
 
 SWITCH_DECLARE(switch_status_t) switch_ivr_set_user(switch_core_session_t *session, const char *data);
 SWITCH_DECLARE(switch_status_t) switch_ivr_sound_test(switch_core_session_t *session);
-SWITCH_DECLARE(void) switch_process_import(switch_core_session_t *session, switch_channel_t *peer_channel, const char *varname);
+SWITCH_DECLARE(void) switch_process_import(switch_core_session_t *session, switch_channel_t *peer_channel, const char *varname, const char *prefix);
 SWITCH_DECLARE(switch_bool_t) switch_ivr_uuid_exists(const char *uuid);
 
 
 
+SWITCH_DECLARE(void) switch_ivr_dmachine_set_match_callback(switch_ivr_dmachine_t *dmachine, switch_ivr_dmachine_callback_t match_callback);
+SWITCH_DECLARE(void) switch_ivr_dmachine_set_nonmatch_callback(switch_ivr_dmachine_t *dmachine, switch_ivr_dmachine_callback_t nonmatch_callback);
 SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_create(switch_ivr_dmachine_t **dmachine_p, 
 														   const char *name,
 														   switch_memory_pool_t *pool,
diff --git a/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h
index a6013a9386..ae0ce900a9 100644
--- a/src/include/switch_module_interfaces.h
+++ b/src/include/switch_module_interfaces.h
@@ -134,6 +134,7 @@ typedef switch_status_t (*switch_io_send_dtmf_t) (switch_core_session_t *, const
 typedef switch_status_t (*switch_io_receive_message_t) (switch_core_session_t *, switch_core_session_message_t *);
 typedef switch_status_t (*switch_io_receive_event_t) (switch_core_session_t *, switch_event_t *);
 typedef switch_status_t (*switch_io_state_change_t) (switch_core_session_t *);
+typedef switch_status_t (*switch_io_state_run_t) (switch_core_session_t *);
 typedef switch_status_t (*switch_io_read_video_frame_t) (switch_core_session_t *, switch_frame_t **, switch_io_flag_t, int);
 typedef switch_status_t (*switch_io_write_video_frame_t) (switch_core_session_t *, switch_frame_t *, switch_io_flag_t, int);
 typedef switch_call_cause_t (*switch_io_resurrect_session_t) (switch_core_session_t **, switch_memory_pool_t **, void *);
@@ -174,6 +175,8 @@ struct switch_io_routines {
 	switch_io_read_video_frame_t read_video_frame;
 	/*! write a video frame to a session */
 	switch_io_write_video_frame_t write_video_frame;
+	/*! change a sessions channel run state */
+	switch_io_state_run_t state_run;
 	/*! resurrect a session */
 	switch_io_resurrect_session_t resurrect_session;
 	void *padding[10];
diff --git a/src/include/switch_odbc.h b/src/include/switch_odbc.h
index 81039f113d..b8d4bc2f17 100644
--- a/src/include/switch_odbc.h
+++ b/src/include/switch_odbc.h
@@ -58,6 +58,8 @@ SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_exec(switch_odbc_handle_
 															 char **err);
 SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_exec_string(switch_odbc_handle_t *handle, const char *sql, char *resbuf, size_t len, char **err);
 SWITCH_DECLARE(switch_bool_t) switch_odbc_available(void);
+SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_SQLSetAutoCommitAttr(switch_odbc_handle_t *handle, switch_bool_t on);
+SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_SQLEndTran(switch_odbc_handle_t *handle, switch_bool_t commit);
 SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_statement_handle_free(switch_odbc_statement_handle_t *stmt);
 
 /*!
diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index b1fc627354..272d435068 100644
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -840,6 +840,7 @@ typedef enum {
 	SWITCH_STATUS_IGNORE,
 	SWITCH_STATUS_TOO_SMALL,
 	SWITCH_STATUS_FOUND,
+	SWITCH_STATUS_CONTINUE,
 	SWITCH_STATUS_NOT_INITALIZED
 } switch_status_t;
 
@@ -1063,6 +1064,7 @@ typedef enum {
 	CF_CONSUME_ON_ORIGINATE,
 	CF_PASSTHRU_PTIME_MISMATCH,
 	CF_BRIDGE_NOWRITE,
+	CF_RECOVERED,
 	/* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
 	CF_FLAG_MAX
 } switch_channel_flag_t;
@@ -1266,7 +1268,8 @@ typedef enum {
 	SMBF_STEREO = (1 << 5),
 	SMBF_ANSWER_REQ = (1 << 6),
 	SMBF_THREAD_LOCK = (1 << 7),
-	SMBF_PRUNE = (1 << 8)
+	SMBF_PRUNE = (1 << 8),
+	SMBF_NO_PAUSE = (1 << 9)
 } switch_media_bug_flag_enum_t;
 typedef uint32_t switch_media_bug_flag_t;
 
@@ -1304,7 +1307,8 @@ typedef enum {
 	SWITCH_FILE_CALLBACK = (1 << 12),
 	SWITCH_FILE_DONE = (1 << 13),
 	SWITCH_FILE_BUFFER_DONE = (1 << 14),
-	SWITCH_FILE_WRITE_APPEND = (1 << 15)
+	SWITCH_FILE_WRITE_APPEND = (1 << 15),
+	SWITCH_FILE_WRITE_OVER = (1 << 16)
 } switch_file_flag_enum_t;
 typedef uint32_t switch_file_flag_t;
 
diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 945583ee07..3a4f8b253b 100644
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -322,7 +322,7 @@ SWITCH_DECLARE(unsigned char) switch_char_to_rfc2833(char key);
   \param key the key to test
   \return TRUE or FALSE
  */
-#define is_dtmf(key)  ((key > 47 && key < 58) || (key > 64 && key < 69) || (key > 96 && key < 101) || key == 35 || key == 42 || key == 87 || key == 119 || key == 70)
+#define is_dtmf(key)  ((key > 47 && key < 58) || (key > 64 && key < 69) || (key > 96 && key < 101) || key == 35 || key == 42 || key == 87 || key == 119 || key == 70 || key == 102)
 
 #define end_of(_s) *(*_s == '\0' ? _s : _s + strlen(_s) - 1)
 #define end_of_p(_s) (*_s == '\0' ? _s : _s + strlen(_s) - 1)
@@ -711,7 +711,7 @@ SWITCH_DECLARE(int) switch_inet_pton(int af, const char *src, void *dst);
 
 SWITCH_DECLARE(const char *) switch_dow_int2str(int val);
 SWITCH_DECLARE(int) switch_dow_str2int(const char *exp);
-SWITCH_DECLARE(int) switch_dow_cmp(const char *exp, int val);
+SWITCH_DECLARE(switch_bool_t) switch_dow_cmp(const char *exp, int val);
 SWITCH_DECLARE(int) switch_number_cmp(const char *exp, int val);
 SWITCH_DECLARE(int) switch_tod_cmp(const char *exp, int val);
 
diff --git a/src/mod/applications/mod_callcenter/mod_callcenter.c b/src/mod/applications/mod_callcenter/mod_callcenter.c
index ddd2cd5175..1b0ba1331a 100644
--- a/src/mod/applications/mod_callcenter/mod_callcenter.c
+++ b/src/mod/applications/mod_callcenter/mod_callcenter.c
@@ -37,7 +37,6 @@
 #define CC_AGENT_TYPE_UUID_STANDBY "uuid-standby"
 #define CC_SQLITE_DB_NAME "callcenter"
 
-#define CC_MAX_TIME_DIFF_CHECK 5
 /* TODO
    drop caller if no agent login
    dont allow new caller
@@ -429,6 +428,7 @@ struct cc_queue {
 
 	uint32_t max_wait_time;
 	uint32_t max_wait_time_with_no_agent;
+	uint32_t max_wait_time_with_no_agent_time_reached;
 
 	switch_mutex_t *mutex;
 
@@ -540,6 +540,7 @@ cc_queue_t *queue_set_config(cc_queue_t *queue)
 
 	SWITCH_CONFIG_SET_ITEM(queue->config[i++], "max-wait-time", SWITCH_CONFIG_INT, 0, &queue->max_wait_time, 0, &config_int_0_86400, NULL, NULL);
 	SWITCH_CONFIG_SET_ITEM(queue->config[i++], "max-wait-time-with-no-agent", SWITCH_CONFIG_INT, 0, &queue->max_wait_time_with_no_agent, 0, &config_int_0_86400, NULL, NULL);
+	SWITCH_CONFIG_SET_ITEM(queue->config[i++], "max-wait-time-with-no-agent-time-reached", SWITCH_CONFIG_INT, 0, &queue->max_wait_time_with_no_agent_time_reached, 5, &config_int_0_86400, NULL, NULL);
 
 	switch_assert(i < CC_QUEUE_CONFIGITEM_COUNT);
 
@@ -850,7 +851,7 @@ cc_status_t cc_agent_del(const char *agent)
 	return result;
 }
 
-cc_agent_status_t cc_agent_get(const char *key, const char *agent, char *ret_result, size_t ret_result_size)
+cc_status_t cc_agent_get(const char *key, const char *agent, char *ret_result, size_t ret_result_size)
 {
 	cc_status_t result = CC_STATUS_SUCCESS;
 	char *sql;
@@ -890,7 +891,7 @@ cc_agent_status_t cc_agent_get(const char *key, const char *agent, char *ret_res
 
 done:   
 	if (result == CC_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Get Info Agent %s set %s = %s\n", agent, key, res);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Get Info Agent %s %s = %s\n", agent, key, res);
 	}
 
 	return result;
@@ -2023,7 +2024,7 @@ void *SWITCH_THREAD_FUNC cc_member_thread_run(switch_thread_t *thread, void *obj
 		}
 
 		/* Will drop the caller if no agent was found for more than X secondes */
-		if (queue->max_wait_time_with_no_agent > 0 && m->t_member_called < queue->last_agent_exist_check - CC_MAX_TIME_DIFF_CHECK &&
+		if (queue->max_wait_time_with_no_agent > 0 && m->t_member_called < queue->last_agent_exist_check - queue->max_wait_time_with_no_agent_time_reached &&
 				queue->last_agent_exist_check - queue->last_agent_exist >= queue->max_wait_time_with_no_agent) {
 			m->member_cancel_reason = CC_MEMBER_CANCEL_REASON_NO_AGENT_TIMEOUT;
 			switch_channel_set_flag_value(member_channel, CF_BREAK, 2);
@@ -2465,9 +2466,10 @@ SWITCH_STANDARD_API(cc_config_api_function)
 			} else {
 				const char *key = argv[0 + initial_argc];
 				const char *agent = argv[1 + initial_argc];
-				switch (cc_agent_get(key, agent, NULL, 0)) {
+				char ret[64];
+				switch (cc_agent_get(key, agent, ret, sizeof(ret))) {
 					case CC_STATUS_SUCCESS:
-						stream->write_function(stream, "%s", "+OK\n");
+						stream->write_function(stream, "%s", ret);
 						break;
 					case CC_STATUS_INVALID_KEY:
 						stream->write_function(stream, "%s", "-ERR Invalid Agent Update KEY!\n");
@@ -2631,7 +2633,21 @@ SWITCH_STANDARD_API(cc_config_api_function)
 			}
 		} else if (action && !strcasecmp(action, "list")) {
 			if (argc-initial_argc < 1) {
-				stream->write_function(stream, "%s", "-ERR Invalid!\n");
+				switch_hash_index_t *hi;
+				stream->write_function(stream, "%s", "name|strategy|moh_sound|time_base_score|tier_rules_apply|tier_rule_wait_second|tier_rule_wait_multiply_level|tier_rule_no_agent_no_wait|discard_abandoned_after|abandoned_resume_allowed|max_wait_time|max_wait_time_with_no_agent|max_wait_time_with_no_agent_time_reached|record_template\n");
+				switch_mutex_lock(globals.mutex);
+				for (hi = switch_hash_first(NULL, globals.queue_hash); hi; hi = switch_hash_next(hi)) {
+					void *val = NULL;
+					const void *key;
+					switch_ssize_t keylen;
+					cc_queue_t *queue;
+					switch_hash_this(hi, &key, &keylen, &val);
+					queue = (cc_queue_t *) val;
+					stream->write_function(stream, "%s|%s|%s|%s|%s|%d|%s|%s|%d|%s|%d|%d|%d|%s\n", queue->name, queue->strategy, queue->moh, queue->time_base_score, (queue->tier_rules_apply?"true":"false"), queue->tier_rule_wait_second, (queue->tier_rule_wait_multiply_level?"true":"false"), (queue->tier_rule_no_agent_no_wait?"true":"false"), queue->discard_abandoned_after, (queue->abandoned_resume_allowed?"true":"false"), queue->max_wait_time, queue->max_wait_time_with_no_agent, queue->max_wait_time_with_no_agent_time_reached, queue->record_template);
+					queue = NULL;
+				}
+				switch_mutex_unlock(globals.mutex);
+				stream->write_function(stream, "%s", "+OK\n");
 				goto done;
 			} else {
 				const char *queue_name = argv[0 + initial_argc];
diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index 1fb1c95c47..6c43f25d44 100644
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -2019,6 +2019,66 @@ SWITCH_STANDARD_API(transfer_function)
 	return SWITCH_STATUS_SUCCESS;
 }
 
+
+#define DUAL_TRANSFER_SYNTAX "<uuid> <A-dest-exten>[/<A-dialplan>][/<A-context>] <B-dest-exten>[/<B-dialplan>][/<B-context>]"
+SWITCH_STANDARD_API(dual_transfer_function)
+{
+	switch_core_session_t *tsession = NULL, *other_session = NULL;
+	char *mycmd = NULL, *argv[5] = { 0 };
+	int argc = 0;
+	char *tuuid, *dest1, *dest2, *dp1 = NULL, *dp2 = NULL, *context1 = NULL, *context2 = NULL;
+
+	if (zstr(cmd) || !(mycmd = strdup(cmd))) {
+		stream->write_function(stream, "-USAGE: %s\n", DUAL_TRANSFER_SYNTAX);
+		return SWITCH_STATUS_SUCCESS;
+	}
+
+	argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+
+	if (argc != 3) {
+		stream->write_function(stream, "-USAGE: %s\n", DUAL_TRANSFER_SYNTAX);
+		goto done;
+	}
+
+	tuuid = argv[0];
+	dest1 = argv[1];
+	dest2= argv[2];
+
+	if ((dp1 = strchr(dest1, '/'))) {
+		*dp1++ = '\0';
+		if ((context1 = strchr(dp1, '/'))) {
+			*context1++ = '\0';
+		}
+	}
+
+	if ((dp2 = strchr(dest2, '/'))) {
+		*dp2++ = '\0';
+		if ((context2 = strchr(dp2, '/'))) {
+			*context2++ = '\0';
+		}
+	}
+
+	if (zstr(tuuid) || !(tsession = switch_core_session_locate(tuuid))) {
+		stream->write_function(stream, "-ERR No Such Channel!\n");
+		goto done;
+	}
+	
+	if (switch_core_session_get_partner(tsession, &other_session) == SWITCH_STATUS_SUCCESS) {
+		switch_ivr_session_transfer(other_session, dest2, dp2, context2);
+		switch_core_session_rwunlock(other_session);
+	}
+
+	switch_ivr_session_transfer(tsession, dest1, dp1, context1);
+
+	stream->write_function(stream, "+OK\n");
+
+	switch_core_session_rwunlock(tsession);
+
+  done:
+	switch_safe_free(mycmd);
+	return SWITCH_STATUS_SUCCESS;
+}
+
 #define TONE_DETECT_SYNTAX "<uuid> <key> <tone_spec> [<flags> <timeout> <app> <args> <hits>]"
 SWITCH_STANDARD_API(tone_detect_session_function)
 {
@@ -3423,6 +3483,12 @@ SWITCH_STANDARD_API(show_function)
 	char hostname[256] = "";
 	gethostname(hostname, sizeof(hostname));
 
+
+	if (!(cflags & SCF_USE_SQL)) {
+		stream->write_function(stream, "-ERR SQL DISABLED NO DATA AVAILABLE!\n");
+		return SWITCH_STATUS_SUCCESS;
+	}
+
 	if (switch_core_db_handle(&db) != SWITCH_STATUS_SUCCESS) {
 		stream->write_function(stream, "%s", "-ERR Databse Error!\n");
 		return SWITCH_STATUS_SUCCESS;
@@ -3455,11 +3521,6 @@ SWITCH_STANDARD_API(show_function)
 
 	holder.print_title = 1;
 
-	if (!(cflags & SCF_USE_SQL) && command && !strcasecmp(command, "channels")) {
-		stream->write_function(stream, "-ERR SQL DISABLED NO CHANNEL DATA AVAILABLE!\n");
-		goto end;
-	}
-
 	/* If you change the field qty or order of any of these select */
 	/* statements, you must also change show_callback and friends to match! */
 	if (!command) {
@@ -4630,6 +4691,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
 	SWITCH_ADD_API(commands_api_interface, "uuid_setvar_multi", "uuid_setvar_multi", uuid_setvar_multi_function, SETVAR_MULTI_SYNTAX);
 	SWITCH_ADD_API(commands_api_interface, "uuid_setvar", "uuid_setvar", uuid_setvar_function, SETVAR_SYNTAX);
 	SWITCH_ADD_API(commands_api_interface, "uuid_transfer", "Transfer a session", transfer_function, TRANSFER_SYNTAX);
+	SWITCH_ADD_API(commands_api_interface, "uuid_dual_transfer", "Transfer a session and its partner", dual_transfer_function, DUAL_TRANSFER_SYNTAX);
 	SWITCH_ADD_API(commands_api_interface, "uuid_simplify", "Try to cut out of a call path / attended xfer", uuid_simplify_function, SIMPLIFY_SYNTAX);
 	SWITCH_ADD_API(commands_api_interface, "xml_locate", "find some xml", xml_locate_function, "[root | <section> <tag> <tag_attr_name> <tag_attr_val>]");
 	SWITCH_ADD_API(commands_api_interface, "xml_wrap", "Wrap another api command in xml", xml_wrap_api_function, "<command> <args>");
@@ -4749,6 +4811,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
 	switch_console_set_complete("add uuid_setvar_multi ::console::list_uuid");
 	switch_console_set_complete("add uuid_setvar ::console::list_uuid");
 	switch_console_set_complete("add uuid_transfer ::console::list_uuid");
+	switch_console_set_complete("add uuid_dual_transfer ::console::list_uuid");
 	switch_console_set_complete("add version");
 	switch_console_set_complete("add uuid_warning ::console::list_uuid");
 	switch_console_set_complete("add ...");
diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index ed62da107b..4cbb052994 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -40,6 +40,11 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_conference_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_conference_shutdown);
 SWITCH_MODULE_DEFINITION(mod_conference, mod_conference_load, mod_conference_shutdown, NULL);
 
+typedef enum {
+	CONF_SILENT_REQ = (1 << 0),
+	CONF_SILENT_DONE = (1 << 1)
+} conf_app_flag_t;
+
 static const char global_app_name[] = "conference";
 static char *global_cf_name = "conference.conf";
 static char *cf_pin_url_param_name = "X-ConfPin=";
@@ -92,29 +97,6 @@ static struct {
 	switch_event_node_t *node;
 } globals;
 
-typedef enum {
-	CALLER_CONTROL_MUTE,
-	CALLER_CONTROL_MUTE_ON,
-	CALLER_CONTROL_MUTE_OFF,
-	CALLER_CONTROL_DEAF_MUTE,
-	CALLER_CONTROL_ENERGY_UP,
-	CALLER_CONTROL_ENERGY_EQU_CONF,
-	CALLER_CONTROL_ENERGY_DN,
-	CALLER_CONTROL_VOL_TALK_UP,
-	CALLER_CONTROL_VOL_TALK_ZERO,
-	CALLER_CONTROL_VOL_TALK_DN,
-	CALLER_CONTROL_VOL_LISTEN_UP,
-	CALLER_CONTROL_VOL_LISTEN_ZERO,
-	CALLER_CONTROL_VOL_LISTEN_DN,
-	CALLER_CONTROL_HANGUP,
-	CALLER_CONTROL_MENU,
-	CALLER_CONTROL_DIAL,
-	CALLER_CONTROL_EVENT,
-	CALLER_CONTROL_LOCK,
-	CALLER_CONTROL_TRANSFER,
-	CALLER_CONTROL_EXEC_APP
-} caller_control_t;
-
 /* forward declaration for conference_obj and caller_control */
 struct conference_member;
 typedef struct conference_member conference_member_t;
@@ -128,17 +110,10 @@ typedef struct call_list call_list_t;
 
 struct caller_control_actions;
 
-typedef struct caller_control_fn_table {
-	char *key;
-	char *digits;
-	caller_control_t action;
-	void (*handler) (conference_member_t *, struct caller_control_actions *);
-} caller_control_fn_table_t;
-
 typedef struct caller_control_actions {
-	caller_control_fn_table_t *fndesc;
 	char *binded_dtmf;
-	void *data;
+	char *data;
+	char *expanded_data;
 } caller_control_action_t;
 
 typedef struct caller_control_menu_info {
@@ -266,12 +241,12 @@ typedef struct conference_obj {
 	uint32_t max_members;
 	char *maxmember_sound;
 	uint32_t announce_count;
-	switch_ivr_digit_stream_parser_t *dtmf_parser;
 	char *pin;
 	char *pin_sound;
 	char *bad_pin_sound;
 	char *profile_name;
 	char *domain;
+	char *caller_controls;
 	uint32_t flags;
 	member_flag_t mflags;
 	switch_call_cause_t bridge_hangup_cause;
@@ -357,8 +332,6 @@ struct conference_member {
 	uint32_t resample_out_len;
 	conference_file_node_t *fnode;
 	conference_relationship_t *relationships;
-	switch_ivr_digit_stream_parser_t *dtmf_parser;
-	switch_ivr_digit_stream_t *digit_stream;
 	switch_speech_handle_t lsh;
 	switch_speech_handle_t *sh;
 	uint32_t verbose_events;
@@ -366,6 +339,7 @@ struct conference_member {
 	uint32_t avg_itt;
 	uint32_t avg_tally;	
 	struct conference_member *next;
+	switch_ivr_dmachine_t *dmachine;
 };
 
 /* Record Node */
@@ -409,6 +383,7 @@ static void conference_send_all_dtmf(conference_member_t *member, conference_obj
 static switch_status_t conference_say(conference_obj_t *conference, const char *text, uint32_t leadin);
 static void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim);
 static conference_obj_t *conference_find(char *name);
+static void member_bind_controls(conference_member_t *member, const char *controls);
 
 SWITCH_STANDARD_API(conf_api_main);
 
@@ -651,6 +626,7 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
 	char msg[512];				/* conference count announcement */
 	call_list_t *call_list = NULL;
 	switch_channel_t *channel;
+	const char *controls = NULL;
 
 	switch_assert(conference != NULL);
 	switch_assert(member != NULL);
@@ -698,20 +674,21 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
 			switch_clear_flag(conference, CFLAG_WAIT_MOD);
 		}
 
+		channel = switch_core_session_get_channel(member->session);
+		switch_channel_set_variable_printf(channel, "conference_member_id", "%d", member->id);
+		
 		if (conference->count > 1) {
 			if (conference->moh_sound && !switch_test_flag(conference, CFLAG_WAIT_MOD)) {
 				/* stop MoH if any */
 				conference_stop_file(conference, FILE_STOP_ASYNC);
 			}
-			if (conference->enter_sound) {
+
+			if (!switch_channel_test_app_flag_key("conf_silent", channel, CONF_SILENT_REQ) && !zstr(conference->enter_sound)) {
 				conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session),
 									 switch_test_flag(conference, CFLAG_WAIT_MOD) ? 0 : 1);
 			}
 		}
 
-		channel = switch_core_session_get_channel(member->session);
-		switch_channel_set_variable_printf(channel, "conference_member_id", "%d", member->id);
-		
 
 		call_list = (call_list_t *) switch_channel_get_private(channel, "_conference_autocall_list_");
 
@@ -720,7 +697,8 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
 			switch_snprintf(saymsg, sizeof(saymsg), "Auto Calling %d parties", call_list->iteration);
 			conference_member_say(member, saymsg, 0);
 		} else {
-			if (zstr(conference->special_announce)) {
+
+			if (!switch_channel_test_app_flag_key("conf_silent", channel, CONF_SILENT_REQ)) {
 				/* announce the total number of members in the conference */
 				if (conference->count >= conference->announce_count && conference->announce_count > 1) {
 					switch_snprintf(msg, sizeof(msg), "There are %d callers", conference->count);
@@ -750,13 +728,32 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
 			switch_set_flag(conference, CFLAG_ENFORCE_MIN);
 		}
 
-		if (test_eflag(conference, EFLAG_ADD_MEMBER) &&
+		if (!switch_channel_test_app_flag_key("conf_silent", channel, CONF_SILENT_REQ) &&
 			switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
 			conference_add_event_member_data(member, event);
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "add-member");
 			switch_event_fire(&event);
 		}
 
+		switch_channel_clear_app_flag_key("conf_silent", channel, CONF_SILENT_REQ);
+
+
+		switch_ivr_dmachine_create(&member->dmachine, "mod_conference", NULL, 500, 0, NULL, NULL, NULL);
+
+		controls = switch_channel_get_variable(channel, "conference_controls");
+
+		if (zstr(controls)) {
+			controls = conference->caller_controls;
+		}
+
+		if (zstr(controls)) {
+			controls = "default";
+		}
+
+		if (strcasecmp(controls, "none")) {
+			member_bind_controls(member, controls);
+		}
+		
 	}
 	unlock_member(member);
 	switch_mutex_unlock(member->audio_out_mutex);
@@ -787,6 +784,8 @@ static switch_status_t conference_del_member(conference_obj_t *conference, confe
 	member->sh = NULL;
 	unlock_member(member);
 
+	switch_ivr_dmachine_destroy(&member->dmachine);
+
 	switch_mutex_lock(conference->mutex);
 	switch_mutex_lock(conference->member_mutex);
 	switch_mutex_lock(member->audio_in_mutex);
@@ -1454,8 +1453,6 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
 		switch_thread_rwlock_unlock(conference->rwlock);
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write Lock OFF\n");
 
-		switch_ivr_digit_stream_parser_destroy(conference->dtmf_parser);
-
 		if (conference->sh) {
 			switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;
 			switch_core_speech_close(&conference->lsh, &flags);
@@ -1685,6 +1682,7 @@ static void conference_loop_fn_volume_talk_zero(conference_member_t *member, cal
 
 	switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level);
 	conference_member_say(member, msg, 0);
+
 }
 
 static void conference_loop_fn_volume_talk_dn(conference_member_t *member, caller_control_action_t *action)
@@ -1793,7 +1791,7 @@ static void conference_loop_fn_event(conference_member_t *member, caller_control
 		conference_add_event_member_data(member, event);
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "dtmf");
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "DTMF-Key", action->binded_dtmf);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Data", action->data);
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Data", action->expanded_data);
 		switch_event_fire(&event);
 	}
 }
@@ -1812,12 +1810,12 @@ static void conference_loop_fn_transfer(conference_member_t *member, caller_cont
 	if (test_eflag(member->conference, EFLAG_DTMF) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
 		conference_add_event_member_data(member, event);
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "transfer");
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Dialplan", action->data);
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Dialplan", action->expanded_data);
 		switch_event_fire(&event);
 	}
 	switch_clear_flag_locked(member, MFLAG_RUNNING);
 
-	if ((mydata = switch_core_session_strdup(member->session, action->data))) {
+	if ((mydata = switch_core_session_strdup(member->session, action->expanded_data))) {
 		if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
 			if (argc > 0) {
 				exten = argv[0];
@@ -1830,7 +1828,7 @@ static void conference_loop_fn_transfer(conference_member_t *member, caller_cont
 			}
 
 		} else {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Empty transfer string [%s]\n", (char *) action->data);
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Empty transfer string [%s]\n", (char *) action->expanded_data);
 			goto done;
 		}
 	} else {
@@ -1856,14 +1854,16 @@ static void conference_loop_fn_exec_app(conference_member_t *member, caller_cont
 	switch_event_t *event = NULL;
 	switch_channel_t *channel = NULL;
 
+	if (!action->expanded_data) return;
+
 	if (test_eflag(member->conference, EFLAG_DTMF) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
 		conference_add_event_member_data(member, event);
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "execute_app");
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application", action->data);
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application", action->expanded_data);
 		switch_event_fire(&event);
 	}
 
-	if ((mydata = switch_core_session_strdup(member->session, action->data))) {
+	if ((mydata = switch_core_session_strdup(member->session, action->expanded_data))) {
 		if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
 			if (argc > 0) {
 				app = argv[0];
@@ -1873,7 +1873,8 @@ static void conference_loop_fn_exec_app(conference_member_t *member, caller_cont
 			}
 
 		} else {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Empty execute app string [%s]\n", (char *) action->data);
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Empty execute app string [%s]\n", 
+							  (char *) action->expanded_data);
 			goto done;
 		}
 	} else {
@@ -1885,6 +1886,7 @@ static void conference_loop_fn_exec_app(conference_member_t *member, caller_cont
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Unable to find application.\n");
 		goto done;
 	}
+
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG, "Execute app: %s, %s\n", app, arg);
 
 	channel = switch_core_session_get_channel(member->session);
@@ -1895,6 +1897,7 @@ static void conference_loop_fn_exec_app(conference_member_t *member, caller_cont
 	switch_core_session_set_read_codec(member->session, &member->read_codec);
 	switch_channel_clear_app_flag(channel, CF_APP_TAGGED);
   done:
+
 	return;
 }
 
@@ -2299,29 +2302,6 @@ static void launch_conference_loop_input(conference_member_t *member, switch_mem
 	switch_thread_create(&thread, thd_attr, conference_loop_input, member, pool);
 }
 
-static caller_control_fn_table_t ccfntbl[] = {
-	{"mute", "0", CALLER_CONTROL_MUTE, conference_loop_fn_mute_toggle},
-	{"mute on", NULL, CALLER_CONTROL_MUTE_ON, conference_loop_fn_mute_on},
-	{"mute off", NULL, CALLER_CONTROL_MUTE_OFF, conference_loop_fn_mute_off},
-	{"deaf mute", "*", CALLER_CONTROL_DEAF_MUTE, conference_loop_fn_deafmute_toggle},
-	{"energy up", "9", CALLER_CONTROL_ENERGY_UP, conference_loop_fn_energy_up},
-	{"energy equ", "8", CALLER_CONTROL_ENERGY_EQU_CONF, conference_loop_fn_energy_equ_conf},
-	{"energy dn", "7", CALLER_CONTROL_ENERGY_DN, conference_loop_fn_energy_dn},
-	{"vol talk up", "3", CALLER_CONTROL_VOL_TALK_UP, conference_loop_fn_volume_talk_up},
-	{"vol talk zero", "2", CALLER_CONTROL_VOL_TALK_ZERO, conference_loop_fn_volume_talk_zero},
-	{"vol talk dn", "1", CALLER_CONTROL_VOL_TALK_DN, conference_loop_fn_volume_talk_dn},
-	{"vol listen up", "6", CALLER_CONTROL_VOL_LISTEN_UP, conference_loop_fn_volume_listen_up},
-	{"vol listen zero", "5", CALLER_CONTROL_VOL_LISTEN_ZERO, conference_loop_fn_volume_listen_zero},
-	{"vol listen dn", "4", CALLER_CONTROL_VOL_LISTEN_DN, conference_loop_fn_volume_listen_dn},
-	{"hangup", "#", CALLER_CONTROL_HANGUP, conference_loop_fn_hangup},
-	{"event", NULL, CALLER_CONTROL_EVENT, conference_loop_fn_event},
-	{"lock", NULL, CALLER_CONTROL_LOCK, conference_loop_fn_lock_toggle},
-	{"transfer", NULL, CALLER_CONTROL_TRANSFER, conference_loop_fn_transfer},
-	{"execute_application", NULL, CALLER_CONTROL_EXEC_APP, conference_loop_fn_exec_app}
-};
-
-#define CCFNTBL_QTY (sizeof(ccfntbl)/sizeof(ccfntbl[0]))
-
 /* marshall frames from the conference (or file or tts output) to the call leg */
 /* NB. this starts the input thread after some initial setup for the call leg */
 static void conference_loop_output(conference_member_t *member)
@@ -2392,13 +2372,6 @@ static void conference_loop_output(conference_member_t *member)
 		/* Start the input thread */
 		launch_conference_loop_input(member, switch_core_session_get_pool(member->session));
 
-		/* build a digit stream object */
-		if (member->conference->dtmf_parser != NULL
-			&& switch_ivr_digit_stream_new(member->conference->dtmf_parser, &member->digit_stream) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR,
-							  "Danger Will Robinson, there is no digit parser stream object\n");
-		}
-
 		if ((call_list = switch_channel_get_private(channel, "_conference_autocall_list_"))) {
 			const char *cid_name = switch_channel_get_variable(channel, "conference_auto_outcall_caller_id_name");
 			const char *cid_num = switch_channel_get_variable(channel, "conference_auto_outcall_caller_id_number");
@@ -2408,7 +2381,7 @@ static void conference_loop_output(conference_member_t *member)
 			const char *prefix = switch_channel_get_variable(channel, "conference_auto_outcall_prefix");
 			int to = 60;
 
-			if (ann) {
+			if (ann && !switch_channel_test_app_flag_key("conf_silent", channel, CONF_SILENT_REQ)) {
 				member->conference->special_announce = switch_core_strdup(member->conference->pool, ann);
 			}
 
@@ -2449,9 +2422,7 @@ static void conference_loop_output(conference_member_t *member)
 	while (switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(member, MFLAG_ITHREAD)
 		   && switch_channel_ready(channel)) {
 		char dtmf[128] = "";
-		char *digit;
 		switch_event_t *event;
-		caller_control_action_t *caller_action = NULL;
 		int use_timer = 0;
 		switch_buffer_t *use_buffer = NULL;
 		uint32_t mux_used = 0;
@@ -2505,40 +2476,13 @@ static void conference_loop_output(conference_member_t *member)
 
 			if (switch_test_flag(member, MFLAG_DIST_DTMF)) {
 				conference_send_all_dtmf(member, member->conference, dtmf);
-			} else {
-				if (member->conference->dtmf_parser != NULL) {
-					for (digit = dtmf; *digit && caller_action == NULL; digit++) {
-						caller_action = (caller_control_action_t *)
-							switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, *digit);
-					}
-				}
+			} else if (member->dmachine) {
+				switch_ivr_dmachine_feed(member->dmachine, dtmf, NULL);
 			}
-			/* otherwise, clock the parser so that it can handle digit timeout detection */
-		} else if (member->conference->dtmf_parser != NULL) {
-			caller_action = (caller_control_action_t *) switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, '\0');
+		} else if (member->dmachine) {
+			switch_ivr_dmachine_ping(member->dmachine, NULL);
 		}
 
-		/* if a caller action has been detected, handle it */
-		if (caller_action != NULL && caller_action->fndesc != NULL && caller_action->fndesc->handler != NULL) {
-			char *param = NULL;
-
-			if (caller_action->fndesc->action != CALLER_CONTROL_MENU) {
-				param = caller_action->data;
-			}
-#ifdef INTENSE_DEBUG
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session),
-							  SWITCH_LOG_INFO,
-							  "executing caller control '%s' param '%s' on call '%u, %s\n",
-							  caller_action->fndesc->key, param ? param : "none", member->id, switch_channel_get_name(channel));
-#endif
-
-			caller_action->fndesc->handler(member, caller_action);
-
-			/* set up for next pass */
-			caller_action = NULL;
-		}
-
-
 		use_buffer = NULL;
 		mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer);
 
@@ -2582,6 +2526,7 @@ static void conference_loop_output(conference_member_t *member)
 					}
 					if (switch_core_session_write_frame(member->session, &write_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
 						switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
+						switch_mutex_unlock(member->audio_out_mutex);
 						break;
 					}
 				}
@@ -2647,10 +2592,6 @@ static void conference_loop_output(conference_member_t *member)
 	}							/* Rinse ... Repeat */
 
 
-	if (member->digit_stream != NULL) {
-		switch_ivr_digit_stream_destroy(&member->digit_stream);
-	}
-
 	switch_clear_flag_locked(member, MFLAG_RUNNING);
 	switch_core_timer_destroy(&timer);
 
@@ -2933,6 +2874,10 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char *
 
 	switch_assert(conference != NULL);
 
+	if (zstr(file)) {
+		return SWITCH_STATUS_NOTFOUND;
+	}
+
 	switch_mutex_lock(conference->mutex);
 	switch_mutex_lock(conference->member_mutex);
 	count = conference->count;
@@ -4366,8 +4311,9 @@ static switch_status_t conf_api_sub_transfer(conference_obj_t *conference, switc
 					if ((profiles = switch_xml_child(cfg, "profiles"))) {
 						xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name);
 					}
-
-					xml_cfg.controls = switch_xml_child(cfg, "caller-controls");
+					
+					/* Create the conference object. */
+					new_conference = conference_new(conf_name, xml_cfg, pool);
 
 					/* Release the config registry handle */
 					if (cxml) {
@@ -4375,9 +4321,6 @@ static switch_status_t conf_api_sub_transfer(conference_obj_t *conference, switc
 						cxml = NULL;
 					}
 
-					/* Create the conference object. */
-					new_conference = conference_new(conf_name, xml_cfg, pool);
-
 					if (!new_conference) {
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
 						if (pool != NULL) {
@@ -5328,7 +5271,6 @@ static int setup_media(conference_member_t *member, conference_obj_t *conference
 
 }
 
-
 /* Application interface function that is called from the dialplan to join the channel to a conference */
 SWITCH_STANDARD_APP(conference_function)
 {
@@ -5353,7 +5295,10 @@ SWITCH_STANDARD_APP(conference_function)
 	switch_event_t *params = NULL;
 	int locked = 0;
 
-
+	if (!switch_channel_test_app_flag_key("conf_silent", channel, CONF_SILENT_DONE) &&
+		(switch_channel_test_flag(channel, CF_RECOVERED) || switch_true(switch_channel_get_variable(channel, "conference_silent_entry")))) {
+		switch_channel_set_app_flag_key("conf_silent", channel, CONF_SILENT_REQ);
+	}
 
 	if (switch_channel_answer(channel) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Channel answer failed.\n");
@@ -5444,8 +5389,6 @@ SWITCH_STANDARD_APP(conference_function)
 		xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name);
 	}
 
-	xml_cfg.controls = switch_xml_child(cfg, "caller-controls");
-
 	/* if this is a bridging call, and it's not a duplicate, build a */
 	/* conference object, and skip pin handling, and locked checking */
 
@@ -5656,7 +5599,7 @@ SWITCH_STANDARD_APP(conference_function)
 			}
 		}
 
-		if (conference->special_announce) {
+		if (conference->special_announce && !switch_channel_test_app_flag_key("conf_silent", channel, CONF_SILENT_REQ)) {
 			conference_local_play_file(conference, session, conference->special_announce, CONF_DEFAULT_LEADIN, NULL, 0);
 		}
 
@@ -5777,9 +5720,6 @@ SWITCH_STANDARD_APP(conference_function)
 	switch_buffer_destroy(&member.resample_buffer);
 	switch_buffer_destroy(&member.audio_buffer);
 	switch_buffer_destroy(&member.mux_buffer);
-	if (conference && member.dtmf_parser != conference->dtmf_parser) {
-		switch_ivr_digit_stream_parser_destroy(member.dtmf_parser);
-	}
 
 	if (conference) {
 		switch_mutex_lock(conference->mutex);
@@ -5928,88 +5868,6 @@ static switch_status_t chat_send(const char *proto, const char *from, const char
 	return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t conf_default_controls(conference_obj_t *conference)
-{
-	switch_status_t status = SWITCH_STATUS_FALSE;
-	uint32_t i;
-	caller_control_action_t *action;
-
-	switch_assert(conference != NULL);
-
-	for (i = 0, status = SWITCH_STATUS_SUCCESS; status == SWITCH_STATUS_SUCCESS && i < CCFNTBL_QTY; i++) {
-		if (!zstr(ccfntbl[i].digits)) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-							  "Installing default caller control action '%s' bound to '%s'.\n", ccfntbl[i].key, ccfntbl[i].digits);
-			action = (caller_control_action_t *) switch_core_alloc(conference->pool, sizeof(caller_control_action_t));
-			if (action != NULL) {
-				action->fndesc = &ccfntbl[i];
-				action->data = NULL;
-				status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser, ccfntbl[i].digits, action);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-								  "unable to alloc memory for caller control binding '%s' to '%s'\n", ccfntbl[i].key, ccfntbl[i].digits);
-				status = SWITCH_STATUS_MEMERR;
-			}
-		}
-	}
-
-	return status;
-}
-
-static switch_status_t conference_new_install_caller_controls_custom(conference_obj_t *conference, switch_xml_t xml_controls, switch_xml_t xml_menus)
-{
-	switch_status_t status = SWITCH_STATUS_FALSE;
-	switch_xml_t xml_kvp;
-
-	switch_assert(conference != NULL);
-
-	if (!xml_controls) {
-		return status;
-	}
-
-	/* parse the controls tree for caller control digit strings */
-	for (xml_kvp = switch_xml_child(xml_controls, "control"); xml_kvp; xml_kvp = xml_kvp->next) {
-		char *key = (char *) switch_xml_attr(xml_kvp, "action");
-		char *val = (char *) switch_xml_attr(xml_kvp, "digits");
-		char *data = (char *) switch_xml_attr_soft(xml_kvp, "data");
-
-		if (!zstr(key) && !zstr(val)) {
-			uint32_t i;
-
-			/* scan through all of the valid actions, and if found, */
-			/* set the new caller control action digit string, then */
-			/* stop scanning the table, and go to the next xml kvp. */
-			for (i = 0, status = SWITCH_STATUS_NOOP; i < CCFNTBL_QTY && status == SWITCH_STATUS_NOOP; i++) {
-
-				if (strcasecmp(ccfntbl[i].key, key) == 0) {
-
-					caller_control_action_t *action;
-
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Installing caller control action '%s' bound to '%s'.\n", key, val);
-					action = (caller_control_action_t *) switch_core_alloc(conference->pool, sizeof(caller_control_action_t));
-					if (action != NULL) {
-						action->fndesc = &ccfntbl[i];
-						action->data = (void *) switch_core_strdup(conference->pool, data);
-						action->binded_dtmf = switch_core_strdup(conference->pool, val);
-						status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser, val, action);
-					} else {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-										  "unable to alloc memory for caller control binding '%s' to '%s'\n", ccfntbl[i].key, ccfntbl[i].digits);
-						status = SWITCH_STATUS_MEMERR;
-					}
-				}
-			}
-			if (status == SWITCH_STATUS_NOOP) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid caller control action name '%s'.\n", key);
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid caller control config entry pair action = '%s' digits = '%s'\n", key, val);
-		}
-	}
-
-	return status;
-}
-
 static conference_obj_t *conference_find(char *name)
 {
 	conference_obj_t *conference;
@@ -6252,7 +6110,8 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
 	conference->comfort_noise_level = comfort_noise_level;
 	conference->caller_id_name = switch_core_strdup(conference->pool, caller_id_name);
 	conference->caller_id_number = switch_core_strdup(conference->pool, caller_id_number);
-
+	conference->caller_controls = switch_core_strdup(conference->pool, caller_controls);
+	
 
 	if (!zstr(perpetual_sound)) {
 		conference->perpetual_sound = switch_core_strdup(conference->pool, perpetual_sound);
@@ -6376,7 +6235,6 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
 	}
 	conference->rate = rate;
 	conference->interval = interval;
-	conference->dtmf_parser = NULL;
 
 	conference->eflags = 0xFFFFFFFF;
 	if (!zstr(suppress_events)) {
@@ -6394,27 +6252,6 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
 		conference->verbose_events = 1;
 	}
 
-	/* caller control configuration chores */
-	if (switch_ivr_digit_stream_parser_new(conference->pool, &conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) {
-
-		/* if no controls, or default controls specified, install default */
-		if (caller_controls == NULL || *caller_controls == '\0' || strcasecmp(caller_controls, "default") == 0) {
-			status = conf_default_controls(conference);
-		} else if (strcasecmp(caller_controls, "none") != 0) {
-			/* try to build caller control if the group has been specified and != "none" */
-			switch_xml_t xml_controls = switch_xml_find_child(cfg.controls, "group", "name", caller_controls);
-			status = conference_new_install_caller_controls_custom(conference, xml_controls, NULL);
-
-			if (status != SWITCH_STATUS_SUCCESS) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to install caller controls group '%s'\n", caller_controls);
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No caller controls installed.\n");
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate caller control digit parser.\n");
-	}
-
 	/* Activate the conference mutex for exclusivity */
 	switch_mutex_init(&conference->mutex, SWITCH_MUTEX_NESTED, conference->pool);
 	switch_mutex_init(&conference->flag_mutex, SWITCH_MUTEX_NESTED, conference->pool);
@@ -6529,6 +6366,145 @@ static void send_presence(switch_event_types_t id)
 	}
 }
 
+typedef void (*conf_key_callback_t) (conference_member_t *, struct caller_control_actions *);
+
+typedef struct {
+	conference_member_t *member;
+	caller_control_action_t action;
+	conf_key_callback_t handler;
+} key_binding_t;
+
+
+static switch_status_t dmachine_dispatcher(switch_ivr_dmachine_match_t *match)
+{
+	key_binding_t *binding = match->user_data;
+	switch_channel_t *channel;
+
+	if (!binding) return SWITCH_STATUS_FALSE;
+
+	channel = switch_core_session_get_channel(binding->member->session);
+	switch_channel_set_variable(channel, "conference_last_matching_digits", match->match_digits);
+
+	if (binding->action.data) {
+		binding->action.expanded_data = switch_channel_expand_variables(channel, binding->action.data);
+	}
+
+	binding->handler(binding->member, &binding->action);
+
+	if (binding->action.expanded_data != binding->action.data) {
+		free(binding->action.expanded_data);
+		binding->action.expanded_data = NULL;
+	}
+
+	switch_set_flag_locked(binding->member, MFLAG_FLUSH_BUFFER);
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static void do_binding(conference_member_t *member, conf_key_callback_t handler, const char *digits, const char *data)
+{
+	key_binding_t *binding;
+
+	binding = switch_core_alloc(member->pool, sizeof(*binding));
+	binding->member = member;
+
+	binding->action.binded_dtmf = switch_core_strdup(member->pool, digits);
+
+	if (data) {
+		binding->action.data = switch_core_strdup(member->pool, data);
+	}
+
+	binding->handler = handler;
+	switch_ivr_dmachine_bind(member->dmachine, "conf", digits, 0, dmachine_dispatcher, binding);
+	
+}
+
+struct _mapping {
+	const char *name;
+	conf_key_callback_t handler;
+};
+
+static struct _mapping control_mappings[] = {
+    {"mute", conference_loop_fn_mute_toggle},
+    {"mute on", conference_loop_fn_mute_on},
+    {"mute off", conference_loop_fn_mute_off},
+    {"deaf mute", conference_loop_fn_deafmute_toggle},
+    {"energy up", conference_loop_fn_energy_up},
+    {"energy equ", conference_loop_fn_energy_equ_conf},
+    {"energy dn", conference_loop_fn_energy_dn},
+    {"vol talk up", conference_loop_fn_volume_talk_up},
+    {"vol talk zero", conference_loop_fn_volume_talk_zero},
+    {"vol talk dn", conference_loop_fn_volume_talk_dn},
+    {"vol listen up", conference_loop_fn_volume_listen_up},
+    {"vol listen zero", conference_loop_fn_volume_listen_zero},
+    {"vol listen dn", conference_loop_fn_volume_listen_dn},
+    {"hangup", conference_loop_fn_hangup},
+    {"event", conference_loop_fn_event},
+    {"lock", conference_loop_fn_lock_toggle},
+    {"transfer", conference_loop_fn_transfer},
+    {"execute_application", conference_loop_fn_exec_app}
+};
+#define MAPPING_LEN (sizeof(control_mappings)/sizeof(control_mappings[0]))
+
+static void member_bind_controls(conference_member_t *member, const char *controls)
+{
+	switch_xml_t cxml, cfg, xgroups, xcontrol;
+	switch_event_t *params;
+	int i;
+
+	switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS);
+	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Conf-Name", member->conference->name);
+	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Action", "request-controls");
+	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Controls", controls);
+
+	if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf_name);
+		goto end;
+	}
+
+	if (!(xgroups = switch_xml_child(cfg, "caller-controls"))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find caller-controls in %s\n", global_cf_name);
+		goto end;
+	}
+
+	if (!(xgroups = switch_xml_find_child(xgroups, "group", "name", controls))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find caller-controls in %s\n", global_cf_name);
+		goto end;
+	}
+
+
+	for (xcontrol = switch_xml_child(xgroups, "control"); xcontrol; xcontrol = xcontrol->next) {
+        const char *key = switch_xml_attr(xcontrol, "action");
+        const char *digits = switch_xml_attr(xcontrol, "digits");
+        const char *data = switch_xml_attr_soft(xcontrol, "data");
+
+		if (zstr(key) || zstr(digits)) continue;
+
+		for(i = 0; i < MAPPING_LEN; i++) {
+			if (!strcasecmp(key, control_mappings[i].name)) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s binding '%s' to '%s'\n", 
+								  switch_core_session_get_name(member->session), digits, key);
+
+				do_binding(member, control_mappings[i].handler, digits, data);
+			}
+		}
+	}
+
+ end:
+
+	/* Release the config registry handle */
+	if (cxml) {
+		switch_xml_free(cxml);
+		cxml = NULL;
+	}
+	
+	if (params) switch_event_destroy(&params);
+	
+}
+
+
+
+
 /* Called by FreeSWITCH when the module loads */
 SWITCH_MODULE_LOAD_FUNCTION(mod_conference_load)
 {
diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index 06f545928d..4fd6a676ea 100755
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -111,6 +111,8 @@ static switch_status_t digit_nomatch_action_callback(switch_ivr_dmachine_match_t
 	switch_event_t *event;
 	switch_status_t status;
 
+	switch_channel_set_variable(channel, "last_non_matching_digits", match->match_digits);
+
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Digit NOT match binding [%s]\n", 
 					  switch_channel_get_name(channel), match->match_digits);
 
@@ -141,6 +143,8 @@ static switch_status_t digit_action_callback(switch_ivr_dmachine_match_t *match)
 	char *string = act->string;
 	switch_channel_t *channel = switch_core_session_get_channel(act->session);
 
+	switch_channel_set_variable(channel, "last_matching_digits", match->match_digits);
+	
 	if (switch_event_create_plain(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(act->session), SWITCH_LOG_DEBUG, "%s Digit match binding [%s][%s]\n", 
 						  switch_channel_get_name(channel), act->string, act->value);
diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c
index 560b1cd6ad..3943ac6ea6 100644
--- a/src/mod/applications/mod_fifo/mod_fifo.c
+++ b/src/mod/applications/mod_fifo/mod_fifo.c
@@ -29,6 +29,7 @@
  *
  */
 #include <switch.h>
+#define FIFO_APP_KEY "mod_fifo"
 
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_fifo_shutdown);
 SWITCH_MODULE_LOAD_FUNCTION(mod_fifo_load);
@@ -60,7 +61,8 @@ typedef struct {
 
 typedef enum {
 	FIFO_APP_BRIDGE_TAG = (1 << 0),
-	FIFO_APP_TRACKING = (1 << 1)
+	FIFO_APP_TRACKING = (1 << 1),
+	FIFO_APP_DID_HOOK = (1 << 2)
 } fifo_app_flag_t;
 
 
@@ -306,6 +308,8 @@ struct fifo_node {
 	int outbound_per_cycle;
 	char *outbound_name;
 	outbound_strategy_t outbound_strategy;
+	int ring_timeout;
+	int default_lag;
 };
 
 typedef struct fifo_node fifo_node_t;
@@ -864,7 +868,7 @@ static void do_unbridge(switch_core_session_t *consumer_session, switch_core_ses
 		caller_channel = switch_core_session_get_channel(caller_session);
 	}
 
-	if (switch_channel_test_app_flag(consumer_channel, FIFO_APP_BRIDGE_TAG)) {
+	if (switch_channel_test_app_flag_key(FIFO_APP_KEY, consumer_channel, FIFO_APP_BRIDGE_TAG)) {
 		char date[80] = "";
 		switch_time_exp_t tm;
 		switch_time_t ts = switch_micro_time_now();
@@ -874,7 +878,7 @@ static void do_unbridge(switch_core_session_t *consumer_session, switch_core_ses
 		char *sql;
 		switch_event_t *event;
 		
-		switch_channel_clear_app_flag_key(__FILE__, consumer_channel, FIFO_APP_BRIDGE_TAG);
+		switch_channel_clear_app_flag_key(FIFO_APP_KEY, consumer_channel, FIFO_APP_BRIDGE_TAG);
 		switch_channel_set_variable(consumer_channel, "fifo_bridged", NULL);
 				
 		ts = switch_micro_time_now();
@@ -984,11 +988,11 @@ static switch_status_t messagehook (switch_core_session_t *session, switch_core_
 			switch_size_t retsize;
 			const char *ced_name, *ced_number, *cid_name, *cid_number;
 			
-			if (switch_channel_test_app_flag(consumer_channel, FIFO_APP_BRIDGE_TAG)) {
+			if (switch_channel_test_app_flag_key(FIFO_APP_KEY, consumer_channel, FIFO_APP_BRIDGE_TAG)) {
 				goto end;
 			}
 
-			switch_channel_set_app_flag_key(__FILE__, consumer_channel, FIFO_APP_BRIDGE_TAG);
+			switch_channel_set_app_flag_key(FIFO_APP_KEY, consumer_channel, FIFO_APP_BRIDGE_TAG);
 			
 			switch_channel_set_variable(consumer_channel, "fifo_bridged", "true");
 			switch_channel_set_variable(consumer_channel, "fifo_manual_bridge", "true");
@@ -996,8 +1000,10 @@ static switch_status_t messagehook (switch_core_session_t *session, switch_core_
 
 			if (caller_channel) {
 				switch_channel_set_variable(caller_channel, "fifo_role", "caller");
-				switch_process_import(consumer_session, caller_channel, "fifo_caller_consumer_import");
-				switch_process_import(caller_session, consumer_channel, "fifo_consumer_caller_import");
+				switch_process_import(consumer_session, caller_channel, "fifo_caller_consumer_import", 
+									  switch_channel_get_variable(consumer_channel, "fifo_import_prefix"));
+				switch_process_import(caller_session, consumer_channel, "fifo_consumer_caller_import",
+									  switch_channel_get_variable(caller_channel, "fifo_import_prefix"));
 			}
 
 				
@@ -1209,10 +1215,11 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void
 		switch_event_create_brackets(h->originate_string, '{', '}', ',', &ovars, &parsed);
 		switch_event_del_header(ovars, "fifo_outbound_uuid");
 		
-		if (!h->timeout) h->timeout = 60;
+		if (!h->timeout) h->timeout = node->ring_timeout;
 		if (timeout < h->timeout) timeout = h->timeout;
 		
-		stream.write_function(&stream, "[leg_timeout=%d,fifo_outbound_uuid=%s]%s,", h->timeout, h->uuid, parsed ? parsed : h->originate_string);
+		stream.write_function(&stream, "[leg_timeout=%d,fifo_outbound_uuid=%s,fifo_name=%s]%s,",
+							  h->timeout, h->uuid, node->name, parsed ? parsed : h->originate_string);
 		stream2.write_function(&stream2, "%s,", h->uuid);
 		switch_safe_free(parsed);
 		
@@ -1505,17 +1512,17 @@ static void *SWITCH_THREAD_FUNC o_thread_run(switch_thread_t *thread, void *obj)
 	switch_event_add_header(ovars, SWITCH_STACK_BOTTOM, "originate_timeout", "%d", h->timeout);
 
 	if (switch_stristr("origination_caller", h->originate_string)) {
-		originate_string = switch_mprintf("{execute_on_answer='unset fifo_hangup_check',fifo_hangup_check='%q'}%s",
-										  node->name, h->originate_string);
+		originate_string = switch_mprintf("{execute_on_answer='unset fifo_hangup_check',fifo_name='%q',fifo_hangup_check='%q'}%s",
+										  node->name, node->name, h->originate_string);
 	} else {
 		if (!zstr(node->outbound_name)) {
-			originate_string = switch_mprintf("{execute_on_answer='unset fifo_hangup_check',fifo_hangup_check='%q',"
+			originate_string = switch_mprintf("{execute_on_answer='unset fifo_hangup_check',fifo_name='%q',fifo_hangup_check='%q',"
 											  "origination_caller_id_name=Queue,origination_caller_id_number='Queue: %q'}%s",
-											  node->name,  node->outbound_name, h->originate_string);
+											  node->name, node->name,  node->outbound_name, h->originate_string);
 		} else {
-			originate_string = switch_mprintf("{execute_on_answer='unset fifo_hangup_check',fifo_hangup_check='%q',"
+			originate_string = switch_mprintf("{execute_on_answer='unset fifo_hangup_check',fifo_name='%q',fifo_hangup_check='%q',"
 											  "origination_caller_id_name=Queue,origination_caller_id_number='Queue: %q'}%s",
-											  node->name,  node->name, h->originate_string);
+											  node->name, node->name,  node->name, h->originate_string);
 		}
 			
 	}
@@ -2017,9 +2024,10 @@ static switch_status_t hanguphook(switch_core_session_t *session)
     switch_channel_t *channel = switch_core_session_get_channel(session);
     switch_channel_state_t state = switch_channel_get_state(channel);
 	
-	if (state == CS_HANGUP) {
+	if (state >= CS_HANGUP && !switch_channel_test_app_flag_key(FIFO_APP_KEY, channel, FIFO_APP_DID_HOOK)) {
 		dec_use_count(session, SWITCH_TRUE);
 		switch_core_event_hook_remove_state_change(session, hanguphook);
+		switch_channel_set_app_flag_key(FIFO_APP_KEY, channel, FIFO_APP_DID_HOOK);
 	}
 
 	return SWITCH_STATUS_SUCCESS;
@@ -2037,17 +2045,19 @@ SWITCH_STANDARD_APP(fifo_track_call_function)
 		return;
 	}
 
-	if (switch_channel_test_app_flag(channel, FIFO_APP_TRACKING)) {
+	if (switch_channel_test_app_flag_key(FIFO_APP_KEY, channel, FIFO_APP_TRACKING)) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s trying to double-track call!\n", switch_channel_get_name(channel));
 		return;
 	}
 
+	switch_core_event_hook_add_receive_message(session, messagehook);
+	switch_core_event_hook_add_state_run(session, hanguphook);
 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s tracking call on uuid %s!\n", switch_channel_get_name(channel), data);
 
 	add_bridge_call(data);
 
-	switch_channel_set_app_flag_key(__FILE__, channel, FIFO_APP_TRACKING);
+	switch_channel_set_app_flag_key(FIFO_APP_KEY, channel, FIFO_APP_TRACKING);
 
 	switch_channel_set_variable(channel, "fifo_outbound_uuid", data);
 	switch_channel_set_variable(channel, "fifo_track_call", "true");
@@ -2083,9 +2093,6 @@ SWITCH_STANDARD_APP(fifo_track_call_function)
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Caller-CID-Number", cid_number);
 		switch_event_fire(&event);
 	}
-	
-	switch_core_event_hook_add_receive_message(session, messagehook);
-	switch_core_event_hook_add_state_change(session, hanguphook);
 }
 
 
@@ -2346,7 +2353,7 @@ SWITCH_STANDARD_APP(fifo_function)
 		switch_channel_set_variable(channel, "fifo_timestamp", date);
 		switch_channel_set_variable(channel, "fifo_serviced_uuid", NULL);
 
-		switch_channel_set_app_flag_key(__FILE__, channel, FIFO_APP_BRIDGE_TAG);
+		switch_channel_set_app_flag_key(FIFO_APP_KEY, channel, FIFO_APP_BRIDGE_TAG);
 
 		if (chime_list) {
 			char *list_dup = switch_core_session_strdup(session, chime_list);
@@ -2421,7 +2428,7 @@ SWITCH_STANDARD_APP(fifo_function)
 
 	abort:
 
-		switch_channel_clear_app_flag_key(__FILE__, channel, FIFO_APP_BRIDGE_TAG);
+		switch_channel_clear_app_flag_key(FIFO_APP_KEY, channel, FIFO_APP_BRIDGE_TAG);
 
 		fifo_caller_del(switch_core_session_get_uuid(session));
 
@@ -2491,6 +2498,7 @@ SWITCH_STANDARD_APP(fifo_function)
 		if (switch_core_event_hook_remove_receive_message(session, messagehook) == SWITCH_STATUS_SUCCESS) {
 			dec_use_count(session, SWITCH_FALSE);
 			switch_core_event_hook_remove_state_change(session, hanguphook);
+			switch_channel_clear_app_flag_key(FIFO_APP_KEY, channel, FIFO_APP_TRACKING);
 		}
 
 		if (!zstr(strat_str)) {
@@ -2778,7 +2786,7 @@ SWITCH_STANDARD_APP(fifo_function)
 				switch_channel_set_flag(other_channel, CF_BREAK);
 
 				while (switch_channel_ready(channel) && switch_channel_ready(other_channel) && 
-					   switch_channel_test_app_flag(other_channel, FIFO_APP_BRIDGE_TAG)) {
+					   switch_channel_test_app_flag_key(FIFO_APP_KEY, other_channel, FIFO_APP_BRIDGE_TAG)) {
 					status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
 					if (!SWITCH_READ_ACCEPTABLE(status)) {
 						break;
@@ -2842,8 +2850,8 @@ SWITCH_STANDARD_APP(fifo_function)
 
 				switch_core_media_bug_resume(session);
 				switch_core_media_bug_resume(other_session);
-				switch_process_import(session, other_channel, "fifo_caller_consumer_import");
-				switch_process_import(other_session, channel, "fifo_consumer_caller_import");
+				switch_process_import(session, other_channel, "fifo_caller_consumer_import", switch_channel_get_variable(channel, "fifo_import_prefix"));
+				switch_process_import(other_session, channel, "fifo_consumer_caller_import", switch_channel_get_variable(other_channel, "fifo_import_prefix"));
 				if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FIFO_EVENT) == SWITCH_STATUS_SUCCESS) {
 					switch_channel_event_set_data(channel, event);
 					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Name", argv[0]);
@@ -3082,7 +3090,7 @@ SWITCH_STANDARD_APP(fifo_function)
 	switch_mutex_unlock(globals.mutex);
 
 
-	switch_channel_clear_app_flag_key(__FILE__, channel, FIFO_APP_BRIDGE_TAG);
+	switch_channel_clear_app_flag_key(FIFO_APP_KEY, channel, FIFO_APP_BRIDGE_TAG);
 
 	switch_core_media_bug_resume(session);
 
@@ -3512,6 +3520,12 @@ static void list_node(fifo_node_t *node, switch_xml_t x_report, int *off, int ve
 	switch_snprintf(tmp, sizeof(buffer), "%u", node->outbound_per_cycle);
 	switch_xml_set_attr_d(x_fifo, "outbound_per_cycle", tmp);
 
+	switch_snprintf(tmp, sizeof(buffer), "%u", node->ring_timeout);
+	switch_xml_set_attr_d(x_fifo, "ring_timeout", tmp);
+
+	switch_snprintf(tmp, sizeof(buffer), "%u", node->default_lag);
+	switch_xml_set_attr_d(x_fifo, "default_lag", tmp);
+
 	switch_snprintf(tmp, sizeof(buffer), "%u", node->outbound_priority);
 	switch_xml_set_attr_d(x_fifo, "outbound_priority", tmp);
 
@@ -3922,6 +3936,8 @@ static switch_status_t load_config(int reload, int del_all)
 			int taking_calls_i = 1;
 			int timeout_i = 60;
 			int lag_i = 10;
+			int ring_timeout = 60;
+			int default_lag = 30;
 
 			name = switch_xml_attr(fifo, "name");
 
@@ -3975,11 +3991,29 @@ static switch_status_t load_config(int reload, int del_all)
 				node->has_outbound = 1;
 			}
 			
-			
+			if ((val = switch_xml_attr(fifo, "outbound_ring_timeout"))) {
+				int tmp = atoi(val);
+				if (tmp > 10) {
+					ring_timeout = tmp;
+				} else {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid ring_timeout: must be > 10 for queue %s\n", node->name);
+				}
+			}
+
+			if ((val = switch_xml_attr(fifo, "outbound_default_lag"))) {
+				int tmp = atoi(val);
+				if (tmp > 10) {
+					default_lag = tmp;
+				} else {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid default_lag: must be > 10 for queue %s\n", node->name);
+				}
+			}
+
+			node->ring_timeout = ring_timeout;
 			node->outbound_per_cycle = outbound_per_cycle;
 			node->outbound_priority = outbound_priority;
+			node->default_lag = default_lag;
 			
-
 			if (outbound_strategy) {
 				node->outbound_strategy = parse_strat(outbound_strategy);
 				node->has_outbound = 1;
@@ -4011,14 +4045,14 @@ static switch_status_t load_config(int reload, int del_all)
 
 				if (timeout) {
 					if ((timeout_i = atoi(timeout)) < 10) {
-						timeout_i = 60;
+						timeout_i = ring_timeout;
 					}
 
 				}
 
 				if (lag) {
 					if ((lag_i = atoi(lag)) < 0) {
-						lag_i = 10;
+						lag_i = default_lag;
 					}
 				}
 
diff --git a/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c b/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c
index aa7d05cf9e..005924194f 100644
--- a/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c
+++ b/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c
@@ -140,7 +140,7 @@ switch_status_t spandsp_inband_dtmf_session(switch_core_session_t *session)
 	}
 
 	if ((status = switch_core_media_bug_add(session, "spandsp_dtmf_detect", NULL,
-                                            inband_dtmf_callback, pvt, 0, SMBF_READ_REPLACE, &bug)) != SWITCH_STATUS_SUCCESS) {
+                                            inband_dtmf_callback, pvt, 0, SMBF_READ_REPLACE | SMBF_NO_PAUSE, &bug)) != SWITCH_STATUS_SUCCESS) {
 		return status;
 	}
 
diff --git a/src/mod/applications/mod_voicemail/mod_voicemail.c b/src/mod/applications/mod_voicemail/mod_voicemail.c
index 758e5dcf25..e939d7f315 100644
--- a/src/mod/applications/mod_voicemail/mod_voicemail.c
+++ b/src/mod/applications/mod_voicemail/mod_voicemail.c
@@ -69,7 +69,8 @@ typedef enum {
 
 typedef enum {
 	VM_MOVE_NEXT,
-	VM_MOVE_PREV
+	VM_MOVE_PREV,
+	VM_MOVE_SAME
 } msg_move_t;
 
 #define VM_PROFILE_CONFIGITEM_COUNT 100
@@ -107,6 +108,7 @@ struct vm_profile {
 	char rew_key[2];
 	char prev_msg_key[2];
 	char next_msg_key[2];
+	char repeat_msg_key[2];
 	char urgent_key[2];
 	char operator_key[2];
 	char vmain_key[2];
@@ -480,7 +482,7 @@ vm_profile_t *profile_set_config(vm_profile_t *profile)
 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "skip-greet-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
 						   &profile->skip_greet_key, "#", &config_dtmf, NULL, NULL);
 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "skip-info-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
-						   &profile->skip_info_key, "", &config_dtmf, NULL, NULL);
+						   &profile->skip_info_key, "*", &config_dtmf, NULL, NULL);
 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "config-menu-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
 						   &profile->config_menu_key, "5", &config_dtmf, NULL, NULL);
 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "record-greeting-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
@@ -510,9 +512,11 @@ vm_profile_t *profile_set_config(vm_profile_t *profile)
 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "ff-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE, &profile->ff_key, "6", &config_dtmf, NULL, NULL);
 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "rew-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE, &profile->rew_key, "4", &config_dtmf, NULL, NULL);
 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "previous-message-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
-						   &profile->prev_msg_key, "", &config_dtmf, NULL, NULL);
+						   &profile->prev_msg_key, "1", &config_dtmf, NULL, NULL);
 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "next-message-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
-						   &profile->next_msg_key, "", &config_dtmf, NULL, NULL);
+						   &profile->next_msg_key, "3", &config_dtmf, NULL, NULL);
+	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "repeat-message-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
+						   &profile->repeat_msg_key, "0", &config_dtmf, NULL, NULL);
 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "urgent-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
 						   &profile->urgent_key, "*", &config_dtmf, NULL, NULL);
 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "operator-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
@@ -823,7 +827,8 @@ static switch_status_t control_playback(switch_core_session_t *session, void *in
 
 			if (!cc->noexit
 				&& (dtmf->digit == *cc->profile->delete_file_key || dtmf->digit == *cc->profile->save_file_key
-					|| dtmf->digit == *cc->profile->prev_msg_key || dtmf->digit == *cc->profile->next_msg_key
+					|| dtmf->digit == *cc->profile->prev_msg_key || dtmf->digit == *cc->profile->next_msg_key 
+					|| dtmf->digit == *cc->profile->repeat_msg_key
 					|| dtmf->digit == *cc->profile->terminator_key || dtmf->digit == *cc->profile->skip_info_key
 					|| dtmf->digit == *cc->profile->email_key || dtmf->digit == *cc->profile->forward_key)) {
 				*cc->buf = dtmf->digit;
@@ -1483,6 +1488,8 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
 			}
 			if (!strcmp(input, profile->prev_msg_key)) {
 				cbt->move = VM_MOVE_PREV;
+			} else if (!strcmp(input, profile->repeat_msg_key)) {
+				cbt->move = VM_MOVE_SAME;
 			} else if (!strcmp(input, profile->next_msg_key)) {
 				cbt->move = VM_MOVE_NEXT;
 			} else if (!strcmp(input, profile->listen_file_key)) {
@@ -1538,6 +1545,7 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
 				if (voicemail_inject(cmd, session) == SWITCH_STATUS_SUCCESS) {
 					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc);
 					TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "saved", NULL, NULL));
+					cbt->move = VM_MOVE_SAME;
 				} else {
 					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed to Carbon Copy to %s\n", vm_cc);
 					TRY_CODE(switch_ivr_phrase_macro(session, VM_INVALID_EXTENSION_MACRO, vm_cc, NULL, NULL));
@@ -1884,7 +1892,10 @@ static void voicemail_check_main(switch_core_session_t *session, vm_profile_t *p
 						} else {
 							cur_message -= 2;
 						}
+					} else if (cbt.move == VM_MOVE_SAME) {
+						cur_message -= 1;
 					}
+					
 					if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
 						break;
 					}
@@ -2893,6 +2904,7 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p
 	char *read_flags = NORMAL_FLAG_STRING;
 	int priority = 3;
 	int email_attach = 1;
+	char *operator_ext = NULL;
 	char buf[2];
 	char key_buf[80];
 	char *greet_path = NULL;
@@ -2973,6 +2985,8 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p
 						vm_enabled = !switch_false(val);
 					} else if (!strcasecmp(var, "vm-message-ext")) {
 						vm_ext = switch_core_session_strdup(session, val);
+					} else if (!strcasecmp(var, "vm-operator-extension")) {
+						operator_ext = switch_core_session_strdup(session, val);
 					}
 				}
 			}
@@ -3089,12 +3103,13 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p
 		  greet_key_press:
 			if (switch_stristr(buf, profile->login_keys)) {
 				voicemail_check_main(session, profile, domain_name, id, 0);
-			} else if (!zstr(profile->operator_ext) && !zstr(profile->operator_key) && !strcasecmp(buf, profile->operator_key) ) {
+			} else if ((!zstr(profile->operator_ext) || !zstr(operator_ext)) && !zstr(profile->operator_key) && !strcasecmp(buf, profile->operator_key) ) {
 				int argc;
 				char *argv[4];
 				char *mycmd;
 
-				if (!zstr(profile->operator_ext) && (mycmd = switch_core_session_strdup(session, profile->operator_ext))) {
+				if ((!zstr(operator_ext) && (mycmd = switch_core_session_strdup(session, operator_ext))) ||
+				    (!zstr(profile->operator_ext) && (mycmd = switch_core_session_strdup(session, profile->operator_ext)))) {
 					argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
 					if (argc >= 1 && argc <= 4) {
 						switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]);
diff --git a/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2010.vcxproj b/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2010.vcxproj
index ca533a4cfa..7028e53447 100644
--- a/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2010.vcxproj
+++ b/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2010.vcxproj
@@ -189,6 +189,9 @@
     <ProjectReference Include="..\..\..\..\libs\win32\openssl\ssleay32.2010.vcxproj">
       <Project>{b4b62169-5ad4-4559-8707-3d933ac5db39}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\libs\win32\pthread\pthread.2010.vcxproj">
+      <Project>{df018947-0fff-4eb3-bdee-441dc81da7a4}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\libs\win32\sofia\libsofia_sip_ua_static.2010.vcxproj">
       <Project>{70a49bc2-7500-41d0-b75d-edcc5be987a0}</Project>
     </ProjectReference>
diff --git a/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c b/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
index c84dac4509..21bfb958d4 100644
--- a/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
+++ b/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
@@ -33,7 +33,6 @@
  */
 
 #include "switch.h"
-#include "g711.h"
 
 #include <sng_tc/sngtc_node.h>
 
@@ -41,7 +40,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sangoma_codec_shutdown);
 SWITCH_MODULE_DEFINITION(mod_sangoma_codec, mod_sangoma_codec_load, mod_sangoma_codec_shutdown, NULL);
 
-#define IANA_ULAW 0
+#define IANA_LINEAR 10 
 #define SANGOMA_SESS_HASH_KEY_FORMAT "sngtc%lu"
 
 /* it seemed we need higher PTIME than the calling parties, so we assume nobody will use higher ptime than 40 */
@@ -82,6 +81,8 @@ typedef struct vocallo_codec_s {
 	int autoinit; /* initialize on start loop or manually */
 } vocallo_codec_t;
 
+#define ILBC_133_PAYLOAD  97
+#define ILBC_152_PAYLOAD 98
 vocallo_codec_t g_codec_map[] =
 {
 	{ SNGTC_CODEC_PCMU,    0,   "PCMU",    "Sangoma PCMU",      40, 64000,  10000, 80,  160, 80,  1 },
@@ -90,9 +91,10 @@ vocallo_codec_t g_codec_map[] =
 	{ SNGTC_CODEC_G729AB,  18,  "G729",    "Sangoma G729",      40, 8000,   10000, 80,  160, 10,  1 },
 	{ SNGTC_CODEC_G726_32, 122, "G726-32", "Sangoma G.726 32k", 40, 32000,  10000, 80,  160, 40,  1 },
 	{ SNGTC_CODEC_GSM_FR,  3,   "GSM",     "Sangoma GSM",       20, 13200,  20000, 160, 320, 33,  0 },
+	{ SNGTC_CODEC_ILBC_133, ILBC_133_PAYLOAD, "iLBC",    "Sangoma iLBC",     -1, -1,     -1,    -1,  -1,  -1,  0 },
+	{ SNGTC_CODEC_ILBC_152, ILBC_152_PAYLOAD, "iLBC",    "Sangoma iLBC",     -1, -1,     -1,    -1,  -1,  -1,  0 },
+	{ SNGTC_CODEC_G723_1_63, 4, "G723",    "Sangoma G723",     90, 6300,    30000, 240,  480,  24,  0},
 #if 0
-	/* FIXME: grandstream crashes with iLBC implementation */
-	{ SNGTC_CODEC_ILBC,    97,  "iLBC",    "Sangoma ILBC",      -1, -1,     -1,    -1,  -1,  -1,  0 },
 	/* FIXME: sampling rate seems wrong with this, audioooo soooundssssss sloooooow ... */
 	{ SNGTC_CODEC_G722,    9,   "G722",    "Sangoma G722",      20, 64000,  20000, 160, 640, 160, 0 },
 #endif
@@ -103,11 +105,17 @@ vocallo_codec_t g_codec_map[] =
 #define IANACODE_CN 13
 
 /* default codec list to load, users may override, special codec 'all' registers everything available unless listed in noregister */
-static char g_codec_register_list[1024] = "all";
+static char g_codec_register_list[1024] = "G729";
 
 /* default codec list to NOT load, users may override */
 static char g_codec_noregister_list[1024] = "";
 
+#define SANGOMA_RTP_QUEUE_SIZE 4
+struct sangoma_rtp_payload {
+	uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
+	int32_t datalen;
+};
+
 struct codec_data {
 	/* sngtc request and reply */
 	sngtc_codec_request_t request;
@@ -131,7 +139,15 @@ struct codec_data {
 	/* avg Rx time */
 	switch_time_t avgrxus;
 	switch_time_t last_rx_time;
+	switch_time_t last_func_call_time;
 
+	/* RTP queue. The bigger the queue, the bigger the possible delay */
+	struct sangoma_rtp_payload rtp_queue[SANGOMA_RTP_QUEUE_SIZE];
+	uint8_t queue_windex;
+	uint8_t queue_rindex;
+	uint8_t queue_size;
+	uint8_t queue_max_ever;
+	unsigned debug_timing:1;
 };
 
 struct sangoma_transcoding_session {
@@ -172,6 +188,17 @@ static vocallo_codec_t *get_codec_from_iana(int iana)
 	return NULL;
 }
 
+static vocallo_codec_t *get_codec_from_id(int id)
+{
+	int i;
+	for (i = 0; g_codec_map[i].codec_id != -1; i++) {
+		if (id == g_codec_map[i].codec_id) {
+			return &g_codec_map[i];
+		}
+	}
+	return NULL;
+}
+
 static int sangoma_create_rtp_port(void *usr_priv, uint32_t host_ip, uint32_t *p_rtp_port, void **rtp_fd)
 {
 	struct in_addr local_ip_addr = { 0 };
@@ -229,8 +256,8 @@ static int sangoma_create_rtp(void *usr_priv, sngtc_codec_request_leg_t *codec_r
 	sngtc_codec_ipv4_hex_to_str(codec_reply_leg->codec_ip, codec_ip);
 
 	iana = codec_id_to_iana(codec_req_leg->codec_id);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Creating RTP session for host (%s/%d)  vocallo(%s/%d) Iana=%d ms=%d idx=%lu\n",
-					  local_ip, rtp_port, codec_ip, codec_reply_leg->codec_udp_port, iana, 
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Creating RTP session for host (%s/%d)  vocallo(%s/%d) Iana=%d CodecId=%d ms=%d idx=%lu\n",
+					  local_ip, rtp_port, codec_ip, codec_reply_leg->codec_udp_port, iana, codec_req_leg->codec_id, 
 					  codec_req_leg->ms*1000, sess->sessid);
 
 	/* create the RTP socket */
@@ -268,11 +295,11 @@ static switch_status_t switch_sangoma_init(switch_codec_t *codec, switch_codec_f
 	struct sangoma_transcoding_session *sess = NULL;
 	vocallo_codec_t *vcodec;
 	
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sangoma init called.\n");
-
 	encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
 	decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
 
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sangoma init called (encoding = %d, decoding = %d, iana = %d)\n", encoding ? 1 : 0, decoding ? 1 : 0, codec->implementation->ianacode);
+
 	if (!(encoding || decoding)) {
 		return SWITCH_STATUS_FALSE;
 	}
@@ -295,7 +322,7 @@ static switch_status_t switch_sangoma_init(switch_codec_t *codec, switch_codec_f
 	if (encoding) {
 		sess->encoder.request.usr_priv = sess;
 		sess->encoder.request.a.host_ip = g_rtpip;
-		sess->encoder.request.a.codec_id = SNGTC_CODEC_PCMU;
+		sess->encoder.request.a.codec_id = SNGTC_CODEC_L16_1;
 		sess->encoder.request.a.ms = codec->implementation->microseconds_per_packet/1000;
 
 		sess->encoder.request.b.host_ip = g_rtpip;
@@ -310,7 +337,7 @@ static switch_status_t switch_sangoma_init(switch_codec_t *codec, switch_codec_f
 		sess->decoder.request.a.ms = codec->implementation->microseconds_per_packet/1000;
 
 		sess->decoder.request.b.host_ip = g_rtpip;
-		sess->decoder.request.b.codec_id = SNGTC_CODEC_PCMU;
+		sess->decoder.request.b.codec_id = SNGTC_CODEC_L16_1;
 		sess->decoder.request.b.ms = codec->implementation->microseconds_per_packet/1000;
 
 	}
@@ -319,6 +346,7 @@ static switch_status_t switch_sangoma_init(switch_codec_t *codec, switch_codec_f
 	switch_snprintf(sess->hashkey, sizeof(sess->hashkey), SANGOMA_SESS_HASH_KEY_FORMAT, sess->sessid);
 	switch_core_hash_insert(g_sessions_hash, sess->hashkey, sess);
 
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sangoma init done for codec %s/%s, iana = %d\n", codec->implementation->iananame, vcodec->fs_name, codec->implementation->ianacode);
 	switch_mutex_unlock(g_sessions_lock);
 
 	codec->private_info = sess;
@@ -352,6 +380,35 @@ static switch_status_t switch_sangoma_init_ilbc(switch_codec_t *codec, switch_co
 	return switch_sangoma_init(codec, flags, codec_settings);
 }
 
+
+static void flush_rtp(switch_rtp_t *rtp)
+{
+	switch_status_t sres;
+	switch_frame_t read_frame;
+	int flushed = 0;
+	int sanity = 1000;
+	while (sanity--) {
+		sres = switch_rtp_zerocopy_read_frame(rtp, &read_frame, SWITCH_IO_FLAG_NOBLOCK);
+		if (sres == SWITCH_STATUS_GENERR) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read on Sangoma encoder RTP session while flushing: %d\n", sres);
+			return;
+		}
+		if (!read_frame.datalen) {
+			break;
+		}
+		flushed++;
+	}
+	if (!sanity) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Insanely big UDP queue!\n");
+	}
+}
+
+#define SAFE_INDEX_INC(array, index) \
+		(index)++; \
+		if ((index) == switch_arraylen((array))) { \
+			(index) = 0; \
+		}
+
 static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec_t *other_codec,	/* codec that was used by the other side */
 										  void *decoded_data,	/* decoded data that we must encode */
 										  uint32_t decoded_data_len /* decoded data length */ ,
@@ -363,16 +420,21 @@ static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec
 {
 	/* FS core checks the actual samples per second and microseconds per packet to determine the buffer size in the worst case scenario, no need to check
 	 * whether the buffer passed in by the core (encoded_data) will be big enough */
-	switch_frame_t ulaw_frame;
+	switch_frame_t linear_frame;
 	switch_frame_t encoded_frame;
-	switch_status_t sres;
-	switch_time_t now_time, difftime;
-	unsigned char ebuf_ulaw[decoded_data_len / 2];
-	short *dbuf_linear;
+	switch_status_t sres = SWITCH_STATUS_FALSE;
+	uint16_t decoded_byteswapped_data[SWITCH_RECOMMENDED_BUFFER_SIZE];
+	uint16_t *decoded_data_linear = decoded_data;
+	switch_time_t now_time = 0, difftime = 0;
+	switch_time_t func_start_time = 0, func_end_time = 0;
 	int i = 0;
 	int res = 0;
 	struct sangoma_transcoding_session *sess = codec->private_info;
 
+	if (sess->encoder.debug_timing) {
+		func_start_time =  switch_micro_time_now();
+	}
+
 	/* start assuming we will not encode anything */
 	*encoded_data_len = 0;
 
@@ -390,23 +452,30 @@ static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec
 		sess->encoder.txrtp = sess->encoder.reply.tx_fd;
 		sess->encoder.rxrtp = sess->encoder.reply.rx_fd;
 		switch_mutex_unlock(g_sessions_lock);
+		flush_rtp(sess->encoder.rxrtp);
 	}
 
-	/* transcode to ulaw first */
-	dbuf_linear = decoded_data;
-
-	for (i = 0; i < decoded_data_len / sizeof(short); i++) {
-		ebuf_ulaw[i] = linear_to_ulaw(dbuf_linear[i]);
+	if (sess->encoder.debug_timing && sess->encoder.last_func_call_time) {
+		difftime = func_start_time - sess->encoder.last_func_call_time;
+		if (difftime > 25000 || difftime < 15000) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%ldus since last read on encoding session %lu\n", (long)difftime, sess->sessid);
+		}
 	}
-	
+
 	/* do the writing */
-	memset(&ulaw_frame, 0, sizeof(ulaw_frame));	
-	ulaw_frame.source = __FUNCTION__;
-	ulaw_frame.data = ebuf_ulaw;
-	ulaw_frame.datalen = i;
-	ulaw_frame.payload = IANA_ULAW;
+	memset(&linear_frame, 0, sizeof(linear_frame));	
+	linear_frame.source = __FUNCTION__;
+	linear_frame.data = decoded_byteswapped_data;
+	linear_frame.datalen = decoded_data_len;
+	linear_frame.payload = IANA_LINEAR;
 
-	res = switch_rtp_write_frame(sess->encoder.txrtp, &ulaw_frame);
+	/* copy and byte-swap */
+	for (i = 0; i < decoded_data_len/2; i++) {
+		decoded_byteswapped_data[i] = (decoded_data_linear[i] << 8) | (decoded_data_linear[i] >> 8);
+	}
+
+
+	res = switch_rtp_write_frame(sess->encoder.txrtp, &linear_frame);
 	if (-1 == res) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to write to Sangoma encoder RTP session.\n");
 		return SWITCH_STATUS_FALSE;
@@ -420,38 +489,80 @@ static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec
 	sess->encoder.tx++;
 
 	/* do the reading */
-	memset(&encoded_frame, 0, sizeof(encoded_frame));
 	for ( ; ; ) {
+#if 0
+		prevread_time = switch_micro_time_now();
+#endif
 		sres = switch_rtp_zerocopy_read_frame(sess->encoder.rxrtp, &encoded_frame, SWITCH_IO_FLAG_NOBLOCK);
 		if (sres == SWITCH_STATUS_GENERR) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read on Sangoma encoder RTP session: %d\n", sres);
 			return SWITCH_STATUS_FALSE;
 		}
 
+#if 0
+		afterread_time = switch_micro_time_now();
+		difftime = afterread_time - prevread_time;
+		if (difftime > 0) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%ldus to read on encoding session %lu.\n", (long)difftime, sess->sessid);
+		}
+#endif
 		if (0 == encoded_frame.datalen) {
 			break;
 		}
 
-		if (encoded_frame.payload != codec->implementation->ianacode
-		    && encoded_frame.payload != IANACODE_CN) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Read unexpected payload %d in Sangoma encoder RTP session, expecting %d\n",
-					encoded_frame.payload, codec->implementation->ianacode);
-			break;
+		if (encoded_frame.payload == IANACODE_CN) {
+			/* confort noise is treated as silence by us */
+			continue;
 		}
 
-		if (*encoded_data_len) {
-			sess->encoder.rxdiscarded++;
+		if (encoded_frame.datalen != codec->implementation->encoded_bytes_per_packet) {
+			/* seen when silence suppression is enabled */
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Ignoring encoded frame of %d bytes intead of %d bytes\n", encoded_frame.datalen, codec->implementation->encoded_bytes_per_packet);
+			continue;
 		}
 
-		memcpy(encoded_data, encoded_frame.data, encoded_frame.datalen);
-		*encoded_data_len = encoded_frame.datalen;
+		if (encoded_frame.payload != codec->implementation->ianacode) {
+			if (sess->encoder.request.b.codec_id == SNGTC_CODEC_ILBC_152 || sess->encoder.request.b.codec_id == SNGTC_CODEC_ILBC_133) {
+				/* since we moved to SOAP based communications, the mapping between vocallo IANA and our IANA does not work, 
+				 * some codecs checks cannot be completely done, like iLBC */
+				if (encoded_frame.payload != ILBC_152_PAYLOAD && encoded_frame.payload != ILBC_133_PAYLOAD) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Read unexpected payload %d in Sangoma encoder RTP session, expecting either %d or %d\n",
+							encoded_frame.payload, ILBC_152_PAYLOAD, ILBC_133_PAYLOAD);
+					break;
+				}
+			} else {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Read unexpected payload %d in Sangoma encoder RTP session, expecting %d\n",
+						encoded_frame.payload, codec->implementation->ianacode);
+				break;
+			}
+		}
+
+		if (sess->encoder.queue_windex == sess->encoder.queue_rindex) {
+			if (sess->encoder.rtp_queue[sess->encoder.queue_rindex].datalen) {
+				/* if there is something where we want to write, we're dropping it */
+				sess->encoder.rxdiscarded++;
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Discarding encoded frame of %d bytes from RTP session %lu, windex = %d, rindex = %d\n", 
+						sess->encoder.rtp_queue[sess->encoder.queue_rindex].datalen, sess->sessid, sess->encoder.queue_windex, sess->encoder.queue_rindex);
+				SAFE_INDEX_INC(sess->encoder.rtp_queue, sess->encoder.queue_rindex);
+				sess->encoder.queue_size--;
+			}
+		}
+
+		memcpy(sess->encoder.rtp_queue[sess->encoder.queue_windex].data, encoded_frame.data, encoded_frame.datalen);
+		sess->encoder.rtp_queue[sess->encoder.queue_windex].datalen = encoded_frame.datalen;
+		SAFE_INDEX_INC(sess->encoder.rtp_queue, sess->encoder.queue_windex);
+
+		/* monitor the queue size */
+		sess->encoder.queue_size++;
+		if (sess->encoder.queue_size > sess->encoder.queue_max_ever) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Encoder Rx queue for RTP session %lu is now %d, windex = %d, rindex = %d\n", sess->sessid, sess->encoder.queue_size, 
+					sess->encoder.queue_windex, sess->encoder.queue_rindex);
+			sess->encoder.queue_max_ever = sess->encoder.queue_size;
+		}
 	}
 
-	/* update encoding stats if we received a frame */
-	if (*encoded_data_len) {
-		if (*encoded_data_len != codec->implementation->encoded_bytes_per_packet) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Returning odd encoded frame of %d bytes intead of %d bytes\n", *encoded_data_len, codec->implementation->encoded_bytes_per_packet);
-		}
+	/* update encoding stats if we have a frame to give */
+	if (sess->encoder.rtp_queue[sess->encoder.queue_rindex].datalen) {
 		sess->encoder.rx++;
 		now_time = switch_micro_time_now();
 		if (!sess->encoder.last_rx_time) {
@@ -469,10 +580,28 @@ static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec
 			}
 		}
 		sess->encoder.lastrxseqno = encoded_frame.seq;
+
+		/* pop the data from the queue */
+		*encoded_data_len = sess->encoder.rtp_queue[sess->encoder.queue_rindex].datalen;
+		memcpy(encoded_data, sess->encoder.rtp_queue[sess->encoder.queue_rindex].data, *encoded_data_len);
+		sess->encoder.rtp_queue[sess->encoder.queue_rindex].datalen = 0;
+		SAFE_INDEX_INC(sess->encoder.rtp_queue, sess->encoder.queue_rindex);
+		sess->encoder.queue_size--;
+		if (*encoded_data_len != codec->implementation->encoded_bytes_per_packet) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Returning odd encoded frame of %d bytes intead of %d bytes\n", *encoded_data_len, codec->implementation->encoded_bytes_per_packet);
+		}
 	} else {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No output from sangoma encoder\n");
 	}
 
+	if (sess->encoder.debug_timing) {
+		func_end_time = switch_micro_time_now();
+		difftime = func_end_time - func_start_time;
+		if (difftime > 5000) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%ldus to execute encoding function in session %lu.\n", (long)difftime, sess->sessid);
+		}
+		sess->encoder.last_func_call_time = func_end_time;
+	}
 	return SWITCH_STATUS_SUCCESS;
 }
 
@@ -489,14 +618,21 @@ static switch_status_t switch_sangoma_decode(switch_codec_t *codec,	/* codec ses
 	/* FS core checks the actual samples per second and microseconds per packet to determine the buffer size in the worst case scenario, no need to check
 	 * whether the buffer passed in by the core will be enough */
 	switch_frame_t encoded_frame;
-	switch_frame_t ulaw_frame;
-	switch_status_t sres;
-	switch_time_t now_time, difftime;
-	short *dbuf_linear;
-	int i = 0;
+	switch_frame_t linear_frame;
+	switch_status_t sres = SWITCH_STATUS_FALSE;
+	switch_time_t now_time = 0, difftime = 0;
+	switch_time_t func_start_time = 0, func_end_time = 0;
+	uint16_t *dbuf_linear;
+	uint16_t *linear_frame_data;
+	uint16_t *rtp_data_linear;
 	int res = 0;
+	int i = 0;
 	struct sangoma_transcoding_session *sess = codec->private_info;
 
+	if (sess->decoder.debug_timing) {
+		func_start_time =  switch_micro_time_now();
+	}
+
 	dbuf_linear = decoded_data;
 
 	/* start assuming we will not decode anything */
@@ -522,6 +658,14 @@ static switch_status_t switch_sangoma_decode(switch_codec_t *codec,	/* codec ses
 		sess->decoder.txrtp = sess->decoder.reply.tx_fd;
 		sess->decoder.rxrtp = sess->decoder.reply.rx_fd;
 		switch_mutex_unlock(g_sessions_lock);
+		flush_rtp(sess->decoder.rxrtp);
+	}
+
+	if (sess->decoder.debug_timing && sess->decoder.last_func_call_time) {
+		difftime = func_start_time - sess->decoder.last_func_call_time;
+		if (difftime > 25000 || difftime < 15000) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%ldms since last read on decoding session %lu.\n", (long)difftime, sess->sessid);
+		}
 	}
 
 	/* do the writing */
@@ -546,40 +690,70 @@ static switch_status_t switch_sangoma_decode(switch_codec_t *codec,	/* codec ses
 	sess->decoder.tx++;
 
 	/* do the reading */
-	memset(&ulaw_frame, 0, sizeof(ulaw_frame));
 	for ( ; ; ) {
-		sres = switch_rtp_zerocopy_read_frame(sess->decoder.rxrtp, &ulaw_frame, SWITCH_IO_FLAG_NOBLOCK);
+#if 0
+		prevread_time = switch_micro_time_now();
+#endif
+		sres = switch_rtp_zerocopy_read_frame(sess->decoder.rxrtp, &linear_frame, SWITCH_IO_FLAG_NOBLOCK);
 		if (sres == SWITCH_STATUS_GENERR) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read on Sangoma decoder RTP session: %d\n", sres);
 			return SWITCH_STATUS_FALSE;
 		}
 
-		if (0 == ulaw_frame.datalen) {
+#if 0
+		afterread_time = switch_micro_time_now();
+		difftime = afterread_time - prevread_time;
+		if (difftime > 0) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%ldus to read on decoding session %lu.\n", (long)difftime, sess->sessid);
+		}
+#endif
+		if (0 == linear_frame.datalen) {
 			break;
 		}
 
-		if (ulaw_frame.payload != IANA_ULAW
-		    && ulaw_frame.payload != IANACODE_CN) {
+		if (linear_frame.payload == IANACODE_CN) {
+			/* confort noise is treated as silence by us */
+			continue;
+		}
+
+		if (linear_frame.payload != IANA_LINEAR) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Read unexpected payload %d in Sangoma decoder RTP session, expecting %d\n",
-					ulaw_frame.payload, IANA_ULAW);
+					linear_frame.payload, IANA_LINEAR);
 			break;
 		}
 
-		if (*decoded_data_len) {
-			sess->decoder.rxdiscarded++;
+
+		if (sess->decoder.queue_windex == sess->decoder.queue_rindex) {
+			if (sess->decoder.rtp_queue[sess->decoder.queue_rindex].datalen) {
+				/* if there is something where we want to write, we're dropping it */
+				sess->decoder.rxdiscarded++;
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Discarding decoded frame of %d bytes from RTP session %lu, windex = %d, rindex = %d\n", 
+						sess->decoder.rtp_queue[sess->decoder.queue_rindex].datalen, sess->sessid, sess->decoder.queue_windex, sess->decoder.queue_rindex);
+				SAFE_INDEX_INC(sess->decoder.rtp_queue, sess->decoder.queue_rindex);
+				sess->decoder.queue_size--;
+			}
 		}
 
-		/* transcode to linear */
-		for (i = 0; i < ulaw_frame.datalen; i++) {
-			dbuf_linear[i] = ulaw_to_linear(((char *)ulaw_frame.data)[i]);
+		/* byteswap the received data */
+		rtp_data_linear = (unsigned short *)sess->decoder.rtp_queue[sess->decoder.queue_windex].data;
+		linear_frame_data = linear_frame.data;
+		for (i = 0; i < linear_frame.datalen/2; i++) {
+			rtp_data_linear[i] = (linear_frame_data[i] << 8) | (linear_frame_data[i] >> 8);
+		}
+		sess->decoder.rtp_queue[sess->decoder.queue_windex].datalen = linear_frame.datalen;
+
+		SAFE_INDEX_INC(sess->decoder.rtp_queue, sess->decoder.queue_windex);
+
+		/* monitor the queue size */
+		sess->decoder.queue_size++;
+		if (sess->decoder.queue_size > sess->decoder.queue_max_ever) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Encoder Rx queue for RTP session %lu is now %d, windex = %d, rindex = %d\n", sess->sessid, sess->decoder.queue_size, 
+					sess->decoder.queue_windex, sess->decoder.queue_rindex);
+			sess->decoder.queue_max_ever = sess->decoder.queue_size;
 		}
-		*decoded_data_len = i * 2;
 	}
 
-	if (*decoded_data_len) {
-		if (*decoded_data_len != codec->implementation->decoded_bytes_per_packet) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Returning odd decoded frame of %d bytes intead of %d bytes\n", *decoded_data_len, codec->implementation->decoded_bytes_per_packet);
-		}
+	if (sess->decoder.rtp_queue[sess->decoder.queue_rindex].datalen) {
 		/* update decoding stats */
 		sess->decoder.rx++;
 
@@ -594,17 +768,37 @@ static switch_status_t switch_sangoma_decode(switch_codec_t *codec,	/* codec ses
 
 		/* check sequence and bump lost rx packets count if needed */
 		if (sess->decoder.lastrxseqno >= 0) {
-			if (ulaw_frame.seq > (sess->decoder.lastrxseqno + 2) ) {
-				sess->decoder.rxlost += ulaw_frame.seq - sess->decoder.lastrxseqno - 1;
+			if (linear_frame.seq > (sess->decoder.lastrxseqno + 2) ) {
+				sess->decoder.rxlost += linear_frame.seq - sess->decoder.lastrxseqno - 1;
 			}
 		}
-		sess->decoder.lastrxseqno = ulaw_frame.seq;
+		sess->decoder.lastrxseqno = linear_frame.seq;
+
+		/* pop the data from the queue */
+		memcpy(dbuf_linear, sess->decoder.rtp_queue[sess->decoder.queue_rindex].data, sess->decoder.rtp_queue[sess->decoder.queue_rindex].datalen);
+		*decoded_data_len = sess->decoder.rtp_queue[sess->decoder.queue_rindex].datalen;
+		sess->decoder.rtp_queue[sess->decoder.queue_rindex].datalen = 0;
+		SAFE_INDEX_INC(sess->decoder.rtp_queue, sess->decoder.queue_rindex);
+		sess->decoder.queue_size--;
+
+		if (*decoded_data_len != codec->implementation->decoded_bytes_per_packet) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Returning odd decoded frame of %d bytes intead of %d bytes\n", *decoded_data_len, codec->implementation->decoded_bytes_per_packet);
+		}
 	} else {
 		*decoded_data_len = codec->implementation->decoded_bytes_per_packet;
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No output from sangoma decoder, returning silent frame of %d bytes\n", *decoded_data_len);
 		memset(dbuf_linear, 0, *decoded_data_len);
 	}
 
+	if (sess->decoder.debug_timing) {
+		func_end_time = switch_micro_time_now();
+		difftime = func_end_time - func_start_time;
+		if (difftime > 5000) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%ldus to execute decoding function in session %lu.\n", (long)difftime, sess->sessid);
+		}
+		sess->decoder.last_func_call_time = func_end_time;
+	}
+
 	return SWITCH_STATUS_SUCCESS;
 }
 
@@ -652,7 +846,7 @@ static void sangoma_print_stats(switch_stream_handle_t *stream, switch_rtp_numbe
 	stream->write_function(stream, "Flush packet count: %lu\n\n\n", stats->flush_packet_count);
 }
 
-#define SANGOMA_SYNTAX "settings|sessions|stats <session>"
+#define SANGOMA_SYNTAX "settings|sessions|stats <session>|debug <session>|nodebug <session>"
 SWITCH_STANDARD_API(sangoma_function)
 {
 	char *argv[10] = { 0 };
@@ -756,38 +950,83 @@ SWITCH_STANDARD_API(sangoma_function)
 
 		if (sess->encoder.rxrtp) {
 			stats = switch_rtp_get_stats(sess->encoder.rxrtp, NULL);
-			stream->write_function(stream, "=== Encoder ===\n");
+			stream->write_function(stream, "=== %s Encoder ===\n", sess->impl->iananame);
 
-			stream->write_function(stream, "Remote address: %s:%d\n\n", switch_rtp_get_remote_host(sess->encoder.rxrtp), switch_rtp_get_remote_port(sess->encoder.rxrtp));
+			stream->write_function(stream, "Tx L16 from %d.%d.%d.%d:%d to %d.%d.%d.%d:%d\n\n", SNGTC_NIPV4(sess->encoder.reply.a.host_ip), sess->encoder.reply.a.host_udp_port,
+					SNGTC_NIPV4(sess->encoder.reply.a.codec_ip), sess->encoder.reply.a.codec_udp_port);
+			stream->write_function(stream, "Rx %s at %d.%d.%d.%d:%d from %d.%d.%d.%d:%d\n\n", sess->impl->iananame, SNGTC_NIPV4(sess->encoder.reply.b.host_ip), sess->encoder.reply.b.host_udp_port,
+					SNGTC_NIPV4(sess->encoder.reply.b.codec_ip), sess->encoder.reply.b.codec_udp_port);
 
-			stream->write_function(stream, "-- Encoder Inbound Stats --\n");
+
+			stream->write_function(stream, "-- Inbound Stats --\n");
 			stream->write_function(stream, "Rx Discarded: %lu\n", sess->encoder.rxdiscarded);
 			sangoma_print_stats(stream, &stats->inbound);
 			
 
 			stats = switch_rtp_get_stats(sess->encoder.txrtp, NULL);
-			stream->write_function(stream, "-- Encoder Outbound Stats --\n");
+			stream->write_function(stream, "-- Outbound Stats --\n");
 			sangoma_print_stats(stream, &stats->outbound);
-		} else {
-			stream->write_function(stream, "\n=== No Encoder ===\n\n");
 		}
 
 		if (sess->decoder.rxrtp) {
 			stats = switch_rtp_get_stats(sess->decoder.rxrtp, NULL);
 
-			stream->write_function(stream, "=== Decoder ===\n");
-			stream->write_function(stream, "Remote address: %s:%d\n\n", switch_rtp_get_remote_host(sess->decoder.rxrtp), switch_rtp_get_remote_port(sess->decoder.rxrtp));
+			stream->write_function(stream, "=== %s Decoder ===\n", sess->impl->iananame);
+			stream->write_function(stream, "Tx %s from %d.%d.%d.%d:%d to %d.%d.%d.%d:%d\n\n", sess->impl->iananame, SNGTC_NIPV4(sess->decoder.reply.a.host_ip), sess->decoder.reply.a.host_udp_port,
+					SNGTC_NIPV4(sess->decoder.reply.a.codec_ip), sess->decoder.reply.a.codec_udp_port);
+			stream->write_function(stream, "Rx L16 at %d.%d.%d.%d:%d from %d.%d.%d.%d:%d\n\n", SNGTC_NIPV4(sess->decoder.reply.b.host_ip), sess->decoder.reply.b.host_udp_port,
+					SNGTC_NIPV4(sess->decoder.reply.b.codec_ip), sess->decoder.reply.b.codec_udp_port);
 
-			stream->write_function(stream, "-- Decoder Inbound Stats --\n");
+			stream->write_function(stream, "-- Inbound Stats --\n");
 			stream->write_function(stream, "Rx Discarded: %lu\n", sess->decoder.rxdiscarded);
 			sangoma_print_stats(stream, &stats->inbound);
 
 			stats = switch_rtp_get_stats(sess->decoder.txrtp, NULL);
-			stream->write_function(stream, "-- Decoder Outbound Stats --\n");
+			stream->write_function(stream, "-- Outbound Stats --\n");
 			sangoma_print_stats(stream, &stats->outbound);
-		} else {
-			stream->write_function(stream, "\n=== No Decoder ===\n\n");
 		}
+	} else if (!strcasecmp(argv[0], "debug")) {
+		struct sangoma_transcoding_session *sess;
+		unsigned long sessid = 0;
+		int ret = 0;
+		if (argc < 2) {
+			stream->write_function(stream, "%s", SANGOMA_SYNTAX);
+			goto done;
+		} 
+		ret = sscanf(argv[1], "%lu", &sessid);
+		if (ret != 1) {
+			stream->write_function(stream, "%s", SANGOMA_SYNTAX);
+			goto done;
+		} 
+		sess = sangoma_find_session(sessid);
+		if (!sess) {
+			stream->write_function(stream, "Failed to find session %lu\n", sessid);
+			goto done;
+		}
+		sess->encoder.debug_timing = 1;
+		sess->decoder.debug_timing = 1;
+		stream->write_function(stream, "Debug enabled for transcoding session: %lu\n", sessid);
+	} else if (!strcasecmp(argv[0], "nodebug")) {
+		struct sangoma_transcoding_session *sess;
+		unsigned long sessid = 0;
+		int ret = 0;
+		if (argc < 2) {
+			stream->write_function(stream, "%s", SANGOMA_SYNTAX);
+			goto done;
+		} 
+		ret = sscanf(argv[1], "%lu", &sessid);
+		if (ret != 1) {
+			stream->write_function(stream, "%s", SANGOMA_SYNTAX);
+			goto done;
+		} 
+		sess = sangoma_find_session(sessid);
+		if (!sess) {
+			stream->write_function(stream, "Failed to find session %lu\n", sessid);
+			goto done;
+		}
+		sess->encoder.debug_timing = 0;
+		sess->decoder.debug_timing = 0;
+		stream->write_function(stream, "Debug disabled for transcoding session: %lu\n", sessid);
 	} else {
 		stream->write_function(stream, "Unknown Command [%s]\n", argv[0]);
 	}
@@ -911,6 +1150,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
 	switch_codec_interface_t *codec_interface = NULL;
 	switch_api_interface_t *api_interface = NULL;
 	int i = 0, c = 0;
+	int ilbc_done = 0;
+	vocallo_codec_t *ilbc_codec = NULL;
 	int detected = 0, activated = 0;
 
 	/* make sure we have valid configuration */
@@ -949,6 +1190,11 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading codecs, register='%s', noregister='%s'\n", g_codec_register_list, g_codec_noregister_list);
 	for (c = 0; g_codec_map[c].codec_id != -1; c++) {
 
+		if (g_codec_map[c].codec_id == SNGTC_CODEC_L16_1) {
+			/* registering L16 does not make any sense */
+			continue;
+		}
+
 		/* check if the codec is in the load list, otherwise skip it */
 		if (strcasecmp(g_codec_register_list, "all") && !strcasestr(g_codec_register_list, g_codec_map[c].iana_name)) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Not loading codec %s because was not found in the load list\n", 
@@ -969,6 +1215,11 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
 		sngtc_set_iana_code_based_on_codec_id(g_codec_map[c].codec_id, g_codec_map[c].iana);
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Mapped codec %d to IANA %d\n", g_codec_map[c].codec_id, g_codec_map[c].iana);
 
+		/* special check for iLBC to add a single codec interface for both ILBC bitrate versions */
+		if ((g_codec_map[c].codec_id == SNGTC_CODEC_ILBC_152 || g_codec_map[c].codec_id == SNGTC_CODEC_ILBC_133) && ilbc_done) {
+			continue;
+		}
+
 		/* SWITCH_ADD_CODEC allocates a codec interface structure from the pool the core gave us and adds it to the internal interface 
 		 * list the core keeps, gets a codec id and set the given codec name to it.
 		 * At this point there is an empty shell codec interface registered, but not yet implementations */
@@ -1028,11 +1279,13 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
 								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
 				
 				break;
-			case SNGTC_CODEC_ILBC:
+			case SNGTC_CODEC_ILBC_133:
+			case SNGTC_CODEC_ILBC_152:
+				ilbc_codec = get_codec_from_id(SNGTC_CODEC_ILBC_152);
 				switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
 								 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
-								 g_codec_map[c].iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
-								 g_codec_map[c].iana_name, /* the IANA code name */
+								 ilbc_codec->iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
+								 ilbc_codec->iana_name, /* the IANA code name */
 								 "mode=20",	/* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
 								 8000,	/* samples transferred per second */
 								 8000,	/* actual samples transferred per second */
@@ -1048,11 +1301,11 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
 								 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
 								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
 
-#if 0
+				ilbc_codec = get_codec_from_id(SNGTC_CODEC_ILBC_133);
 				switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
 								 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
-								 g_codec_map[c].iana,	/* 97, the IANA code number */
-								 g_codec_map[c].iana_name, /* the IANA code name */
+								 ilbc_codec->iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
+								 ilbc_codec->iana_name, /* the IANA code name */
 								 "mode=30",	/* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
 								 8000,	/* samples transferred per second */
 								 8000,	/* actual samples transferred per second */
@@ -1067,7 +1320,32 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
 								 switch_sangoma_encode,	/* function to encode slinear data into encoded data */
 								 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
 								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
-#endif
+				ilbc_done = 1;
+				break;
+
+			case SNGTC_CODEC_G723_1_63:
+
+				for (i = 1; i <= 3; i++) {
+					switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
+									 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
+									 g_codec_map[c].iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
+									 g_codec_map[c].iana_name, /* the IANA code name */
+									 NULL,	/* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
+									 8000,	/* samples transferred per second */
+									 8000,	/* actual samples transferred per second */
+									 g_codec_map[c].bps, /* bits transferred per second */
+									 g_codec_map[c].mpf * i, /* microseconds per frame */
+									 g_codec_map[c].spf * i, /* samples per frame */
+									 g_codec_map[c].bpfd * i, /* number of bytes per frame decompressed */
+									 g_codec_map[c].bpfc * i, /* number of bytes per frame compressed */
+									 1,	/* number of channels represented */
+									 g_codec_map[c].spf * i, /* number of frames per network packet (I dont think this is used at all) */
+									 switch_sangoma_init,	/* function to initialize a codec session using this implementation */
+									 switch_sangoma_encode,	/* function to encode slinear data into encoded data */
+									 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
+									 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
+				}
+
 				break;
 
 			case SNGTC_CODEC_G722:
@@ -1103,6 +1381,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
 	switch_console_set_complete("add sangoma_codec settings");
 	switch_console_set_complete("add sangoma_codec sessions");
 	switch_console_set_complete("add sangoma_codec stats");
+	switch_console_set_complete("add sangoma_codec debug");
+	switch_console_set_complete("add sangoma_codec nodebug");
 
 	return SWITCH_STATUS_SUCCESS;
 }
diff --git a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/Makefile b/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/Makefile
index 070f941a94..d67bdbbabf 100644
--- a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/Makefile
+++ b/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/Makefile
@@ -1,6 +1,7 @@
 MODNAME=mod_gsmopen
 SVNDEF := -D'GSMOPEN_SVN_VERSION="$(shell svnversion -n .)"'
-LOCAL_CFLAGS += $(SVNDEF) -Wno-error=address -DNO_GSMLIB -I../../../../../../libs/spandsp/src -I../../../../../..//libs/tiff-3.8.2/libtiff
+#LOCAL_CFLAGS += $(SVNDEF) -Wno-error=address -DNO_GSMLIB -I../../../../../../libs/spandsp/src -I../../../../../..//libs/tiff-3.8.2/libtiff
+LOCAL_CFLAGS += $(SVNDEF) -DNO_GSMLIB -I../../../../../../libs/spandsp/src -I../../../../../..//libs/tiff-3.8.2/libtiff
 LOCAL_LDFLAGS=-lasound  -L../../../../../../libs/spandsp/src -lspandsp
 LOCAL_OBJS=gsmopen_protocol.o 
 include ../../../../../../build/modmake.rules
diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
index 40a716671d..cb440d3bcb 100644
--- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
+++ b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
@@ -1209,7 +1209,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 													switch_call_cause_t *cancel_cause)
 {
 	private_t *tech_pvt = NULL;
-	if ((*new_session = switch_core_session_request(gsmopen_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) {
+	if ((*new_session = switch_core_session_request(gsmopen_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, flags, pool)) != 0) {
 		switch_channel_t *channel = NULL;
 		switch_caller_profile_t *caller_profile;
 		char *rdest;
diff --git a/src/mod/endpoints/mod_khomp/Install/files/khomp.conf.xml b/src/mod/endpoints/mod_khomp/Install/files/khomp.conf.xml
new file mode 100644
index 0000000000..45268f304b
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/Install/files/khomp.conf.xml
@@ -0,0 +1,536 @@
+<configuration name="khomp.conf" description="Khomp Configuration">
+<!-- Config for all boards -->
+<settings>
+
+<!--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;; This is the configuration file for the Khomp ;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Endpoint 1.0 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+-->
+ 
+<channels>
+<!-- Section for main configurations about channels. -->
+
+<!--
+Name of the dialplan module in use.
+(default = XML)
+
+<param name="dialplan" value="XML"/>
+-->
+
+<!--
+Enable/disable generalized echo cancellation in the channel, for calls
+passing inside FreeSWITCH (disabled for bridged calls).
+(default = yes)
+
+<param name="echo-canceller" value="yes"/>
+-->
+
+<!--
+Enable/disable AGC (auto gain control). Should be used carefully, as it
+can make line noise really loud.
+(default = yes)
+
+<param name="auto-gain-control" value="yes"/>
+-->
+
+<!--
+Enable/disable sending DTMFs out-band as a way to pass detected DTMFs to
+FreeSWITCH. Needed if FreeSWITCH generates digits for us in bridge application 
+or is being used for IVR ("URA", in pt_BR).
+(default = yes)
+
+<param name="out-of-band-dtmfs" value="yes"/>
+-->
+
+<!--
+Enable/disable DTMF suppression delay. WARNING: if you disable this, DTMFs
+will not be suppressed anymore! You should only use this option if
+"out-of-band-dtmfs" is "no".
+(default = yes)
+
+<param name="suppression-delay" value="yes"/>
+-->
+
+<!--
+Adjust connection automagically if a FAX tone is detected.
+(default = yes)
+
+<param name="auto-fax-adjustment" value="yes"/>
+-->
+
+<!--
+Time (is seconds) since connection, when we may detect FAX tone and perform
+automagical adjustment. After this, FAX tone detection is ignored.
+Possible values: 0 - 9999
+(default = 30).
+
+<param name="fax-adjustment-timeout" value="30"/>
+-->
+
+<!--
+Enable/disable pulse detection (reported as DTMF digits).
+(default = yes)
+
+<param name="pulse-forwarding" value="yes"/>
+-->
+
+<!--
+Enable correct standard following for R2/MFC protocol. Disabled by default,
+as using FreeSWITCH behind a PBX may timeout all outgoing calls without this.
+However, you can set this to "yes" if FreeSWITCH is directly connected to a
+CO (central office) or to a fast signaling PBX, and have a correct
+behaviour for condition obtaining/reporting.
+(default = no)
+
+<param name="r2-strict-behaviour" value="no"/>
+-->
+
+<!--
+Set the delay (in ms) after sending ringback condition where audio stream
+should be opened for the channel. Limited to 25ms min, 500ms max.
+(default = 250)
+
+<param name="r2-preconnect-wait" value="250"/>
+-->
+
+<!--
+Enable/disable native bridge mode (known in pt_BR as "trombone") for calls
+in the Khomp channel, passing the audio inside the board when both channels
+(incoming and outgoing) are of type Khomp. This reduces the echo and the
+audio delay, and frees the host from most audio processing.
+(default = yes)
+
+<param name="native-bridge" value="yes"/>
+-->
+
+<!--
+Defines the incoming context for calls on E1 channels. Some wildcards are
+accepted, and described in the bottom of this file.
+(default = khomp-DD-LL)
+
+<param name="context-digital" value="khomp-DD-LL"/>
+-->
+
+<!--
+Defines the incoming context for calls on FXS channels. Some wildcards are
+accepted, and described in the bottom of this file.
+(default = khomp-DD-CC)
+
+<param name="context-fxs" value="khomp-DD-CC"/>
+-->
+
+<!--
+Defines the incoming context for calls on FXO channels. Some wildcards are
+accepted, and described in the bottom of this file.
+(default = khomp-DD-CC)
+
+<param name="context-fxo" value="khomp-DD-CC"/>
+-->
+
+<!--
+Defines the incoming context for calls on GSM channels. Some wildcards are
+accepted, and described in the bottom of this file.
+(default = khomp-DD-CC)
+
+<param name="context-gsm-call" value="khomp-DD-CC"/>
+-->
+
+<!--
+Defines the incoming context for messages on GSM channels. Some wildcards are
+accepted, and described in the bottom of this file.
+(default = khomp-sms-DD-CC)
+
+<param name="context-gsm-sms" value="khomp-sms-DD-CC"/>
+-->
+
+<!--
+Defines the incoming context for calls on Passive Record boards (KPR). Some 
+wildcards are accepted, and described in the bottom of this file.
+(default = khomp-DD-CC)
+
+<param name="context-pr" value="khomp-DD-CC"/>
+-->
+
+<!--
+Set the logging of messages to console. Possible values (to set more than one,
+separate the values with comma):
+
+ errors    - Error messages, when something goes really wrong.
+ warnings  - Warnings, used when something might not be going as expected.
+ messages  - Generic messages, used to indicate some information.
+ events    - Show received K3L events as console messages.
+ commands  - Show sent K3L commands as console messages.
+ audio     - Enable messages for K3L audio events (very verbose!).
+ modem     - Enable messages for data received from KGSM modems.
+ link      - Enable logging of link status changes.
+ standard  - Special, enable default messages (RECOMMENDED).
+ all       - Special, enable ALL messages (should not be used naively).
+
+(default = standard)
+
+<param name="log-to-console" value="standard"/>
+-->
+
+<!--
+Set the logging of messages to disk. Possible values (to set more than one,
+separate the values with comma):
+
+ errors    - Error messages, when something goes really wrong.
+ warnings  - Warnings, used when something might not be going as expected.
+ messages  - Generic messages, used to indicate some information.
+ events    - Record received K3L events as log messages.
+ commands  - Record sent K3L commands as log messages.
+ audio     - Enable messages for K3L audio events (very verbose!).
+ modem     - Enable messages for data received from KGSM modems.
+ link      - Enable logging of link status changes.
+ functions - Enable debugging for functions. Should not be used naively!).
+ threads   - Enable debugging for threads. Should not be used naively!).
+ locks     - Enable debugging for locks. Should not be used naively!).
+ streams   - Enable debugging for streams. Should not be used naively!).
+ standard  - Special, enable default messages (RECOMMENDED).
+ debugging - Special, enable debug messages (should not be used naively).
+ all       - Special, enable ALL messages (DO NOT USE THIS!).
+
+(default = standard)
+
+<param name="log-to-disk" value="standard"/>
+-->
+
+<!--
+Set the low level tracing. DO NOT USE THIS UNLESS YOU WERE ADVISED TO DO SO.
+Possible values (to set more than one, separate the values with comma):
+
+k3l  - Enable the low level tracing of board's API. 
+        If you are using 'kserver', this option will take no effect. For
+        the k3l tracing to proceed, you will need to (re)start kserver 
+        with 'debug' option. E.g. '#> kserver start -debug'.
+rdsi - Enable ISDN low level debugging.
+r2   - Enable r2 protocol low level debugging.
+
+(default = <empty>)
+
+<param name="trace" value=""/>
+-->
+
+<!--
+Set output volume level. Possible values:
+
+  * '+ N' = increase N times;
+  * '- N' = decrease N times.
+  *   '0' = leave default.
+
+(default = 0)
+
+<param name="output-volume" value="0"/>
+-->
+
+<!--
+Set input volume level. Can only be used if AGC (and not pulse detection)
+is enabled on the board configuration. Possible values:
+
+  * '+ N' = increase N times;
+  * '- N' = decrease N times.
+  *   '0' = leave default.
+
+(default = 0)
+
+<param name="input-volume" value="0"/>
+-->
+
+<!--
+Sets the default AMA flags, affecting the categorization of entries in 
+the call detail records.
+(default = default)
+
+<param name="amaflags" value="default"/>
+-->
+
+<!--
+Sets the account code for calls placed on the channel. The account code may
+be any alphanumeric string
+(default = KhompBoard)
+
+<param name="accountcode" value="KhompBoard"/>
+-->
+
+<!--
+Set the language of the channel (useful for selecting audio messages of a
+specific language on answer).
+(default = <empty>)
+
+<param name="language" value="pt_BR"/>
+-->
+
+<!--
+Set the music on hold class of the channel (useful for selecting a group of
+songs to play on hold).
+(default = default)
+
+<param name="mohclass" value="default"/>
+-->
+
+<!--
+Sets the global orig (CALLERID) base for FXS boards. This number is added
+to a sequencial number, which is incremented for each FXS board and FXS
+channel in the system.
+
+For more example of how to use this option, see channel README file,
+section 'Opcoes do application Bridge', item '<action application="bridge" data="Khomp/r304" />'.
+(default = 0)
+
+<param name="fxs-global-orig" value="0200"/>
+-->
+
+<!--
+Sets the numbers (separated by comma) in which the 'pbx-dialtone' from
+FXS boards will be changed to 'co-dialtone' (public tone), when they are
+pressed.
+(default = <empty>)
+
+<param name="fxs-co-dialtone" value="0,90"/>
+-->
+
+<!--
+Enable or disable sending number of A throught BINA DTMF signalization to
+a FXS branch.
+(default = yes)
+
+<param name="fxs-bina" value="yes"/>
+-->
+
+<!--
+Enable/disable using CTbus for Khomp CTI boards in native bridge.
+(WARNING: just used for internal testings!)
+(default = no)
+
+<param name="has-ctbus" value="no"/>
+-->
+
+<!--
+This is the delay time to really disconnect a channel after the disconnect
+event arrive. If a connect event comes up in this interval, then the 
+disconnection is ignored and the call keeps going on. Values in ms.
+(default = 0)
+
+<param name="disconnect-delay" value="0"/>
+-->
+
+<!--
+This timer controls the delay associated with ringback generation in the
+Khomp channel, when the other side *does not send audio* - in other words,
+this is used when calling peers located at VoIP channels.
+Values are in milliseconds.
+(default = 1500)
+
+<param name="delay-ringback-co" value="1500"/>
+-->
+
+<!--
+This timer controls the delay associated with ringback generation in the
+Khomp channel when the other side report a continuous stream of audio in
+silence - in other words, this is used when the audio is present but does
+not have any tone. Values are in milliseconds.
+(default = 2500)
+
+<param name="delay-ringback-pbx" value="2500"/>
+-->
+
+<!--
+Defines if the channel should optimize audio delay by droping longstanding
+packets from audio buffer. This guarantees the minimal audio delay for the
+user, and avoid delays associated with miscoded SIP clients. However,
+depending on the system's scheduling policy (some 2.6 kernel releases),
+this may result on excessive drop of packets, and audible audio skipping.
+This should not be changed naively.
+(default = no)
+
+<param name="optimize-audio-path" value="no"/>
+-->
+
+<!--
+Defines if the channel should ignore some uncommon DTMF digits detected by
+the board (A, B, C and D). This reduces the number of false positives which
+may happen sometimes, without affecting correctness on traditional
+scenarios. However, if you need to pass those digits througth the board,
+you may need to set this option to 'no'.
+(default = yes)
+
+<param name="ignore-letter-dtmfs" value="yes"/>
+-->
+
+<!--
+For KFXO series boards, defines if audio will be allowed being sent into
+outgoing calls before it has been connected.
+(default = yes)
+
+<param name="fxo-send-pre-audio" value="yes"/>
+-->
+
+<!--
+Defines the timeout, in seconds, between digits of a FXS board's extension.
+(default = 7)
+
+<param name="fxs-digit-timeout" value="7"/>
+-->
+
+<!--
+Enables/Disables the action of dropping collect calls. If enabled, all
+collect calls will be dropped no matter what KDropCollectCall is set to.
+(default = no)
+
+<param name="drop-collect-call" value="no"/>
+-->
+
+<!--
+Defines if the activation and deactivation of Kommuter is done automatically by the channel,
+or manually by the user. Possible values:
+
+auto     - Khomp channel driver starts all kommuter devices at initialization and stops them if the module is unloaded.
+manual   - The user must explicity call the CLI command < khomp kommuter on/off >, that starts or stops the kommuter devices connected to this machine.
+(default = auto)
+
+<param name="kommuter-activation" value="auto"/>
+-->
+
+<!--
+Defines the default value for the Kommuter watchdog in seconds.
+All kommuters conected to this machine will be initialized with this value,
+and will commute the links after reaching this time with no response of the channel.
+The minimum is 0 (will never commute the links), and maximum value is 255 seconds.
+(default = 10)
+
+<param name="kommuter-timeout" value="10"/>
+-->
+
+<!--
+When adjusted to some DTMF digit sequence, it will define those as the digits
+to be used to initialize a call transfer using PBX-to-PBX signaling.
+(default = empty)
+
+<param name="user-transfer-digits" value="#2"/>
+-->
+
+<!--
+Defines the digits to be sent when the flash is detected.
+
+<param name="flash-to-digits" value="*1"/>
+-->
+
+<!--
+;;;;;;;;;;;;;;;;;;;; CONTEXTS WILDCARDS ;;;;;;;;;;;;;;;;;;;;;;
+
+For incoming contexts, you can use the following wildcards:
+
+'DD' (device number): the sequence number of the board on the
+system (can be checked using "khomp summary", valid for all
+board models);
+
+'LL' (link number): the sequence number of link where the call
+has arrived on the board. valid only for E1 boards.
+
+'SSSS' (serial number): the serial number of the board (can
+be checked using "khomp summary", and it's valid for all
+board models);
+
+'CC' (channel number): the channel number on which the call
+or message has arrived (valid for FXO, FXS and GSM boards);
+
+'CCC' (channel number): same as above, but valid only for E1
+channels;
+-->
+
+</channels>
+
+<!--  Section for configuring allocation groups. -->
+<groups>
+<!--
+In this section, you should define options using the following syntax:
+
+<groupname> = <allocation-string>[:<context>]
+
+<param name="pstn" value="b0l0 + b1c38"/>
+<param name="pstn" value="b0l0 + b1c38:from-pstn"/>
+
+You may define your own groups. In the example above, the group 
+called pstn can be used in the bridge string as <action application="brigde" data="Khomp/Gpstn/..." />
+or <action application="brigde" data="Khomp/Gpstn/..." />. As a result, the allocation string will be
+replaced with the one associated with the group "pstn". This is the same
+of doing <action application="brigde" data="Khomp/b0l0 + b1c38/... />.
+In the second example, a context is also defined which can be used in
+extensions.conf for inbound calls on that allocation string's range.
+-->
+</groups>
+
+<!--
+Section for configuring cadences used on FXS boards and the whole
+channel (fast busy, ringback tones, etc).
+-->
+<cadences>
+<!--
+Default value for cadences. You may define your own cadences, and
+also use them in the bridge arguments as "cadence=your_cadence_name".
+
+ "0,0" means a continuous dialtone.
+
+ (default as defined below)
+ <param name="fast-busy" value="100,100" />
+ <param name="ringback" value="1000,4000" />
+ <param name="pbx-dialtone" value="1000,100" />
+ <param name="vm-dialtone " value="1000,100,100,100" />
+ <param name="co-dialtone " value="0,0" />
+-->
+</cadences>
+
+
+<!-- Section for configuring CALLERID's associated with FXS boards. -->
+<fxs-branches>
+<!--
+In this section, you should define options using the following syntax:
+
+'orig_prefix = serial number 0, serial number 1, ...'
+
+ex: <param name="880" value="111,222"/>
+
+In the example above (assuming KFXS-SPX boards 1234 and 4535), the
+branches will be numbered from 800 to 829 in board 1234, and from
+830 to 859 in board 4535.
+-->
+</fxs-branches>
+
+<!-- Section for configuring FXS hotlines. -->
+<fxs-hotlines>
+<!--
+In this section, you should define options using the following syntax:
+
+'orig_prefix = destination_number'
+
+ex: <param name="804" value="32332933" />
+
+In the example above, the branch numbered 804 will call the number
+3233-2933 (Khomp support number) every time the FXS branch goes off hook.
+-->
+</fxs-hotlines>
+
+<!-- Section for configuring specific options for FXS branches. -->
+<fxs-options>
+<!--
+In this section, you should define options using the following syntax:
+
+orig_prefix = option1:value | option2:value | option3:value ...
+
+ex: <param name="804" value="output-volume:+2" />
+
+In the example above, the branch numbered 804 will have specific
+configuration for default output volume set to +2.
+
+Possible values to options is:
+context, input-volume, output-volume language,
+mohclass, amaflags, accountcode, calleridnum, 
+calleridname, mailbox, flash-to-digits.
+-->
+</fxs-options>
+
+</settings>
+</configuration>
diff --git a/src/mod/endpoints/mod_khomp/Makefile b/src/mod/endpoints/mod_khomp/Makefile
new file mode 100644
index 0000000000..94923c7cda
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/Makefile
@@ -0,0 +1,41 @@
+MODNAME := mod_khomp
+VERBOSE := 1
+
+ifeq ($(strip $(FREESWITCH_PATH)),)
+	BASE := ../../../../
+else
+	BASE := $(FREESWITCH_PATH)
+endif
+
+curr_dir := $(shell pwd)
+
+versions := -DFS_VERSION_MAJOR=$(shell bash $(curr_dir)/tools/getversion.sh "SWITCH_VERSION_MAJOR" $(BASE)) -DFS_VERSION_MINOR=$(shell bash $(curr_dir)/tools/getversion.sh "SWITCH_VERSION_MINOR" $(BASE)) -DFS_VERSION_MICRO=$(shell bash $(curr_dir)/tools/getversion.sh "SWITCH_VERSION_MICRO" $(BASE))
+
+LOCAL_CFLAGS = -I./ -I./include -I./commons -I./support -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DCOMMONS_LIBRARY_USING_FREESWITCH -g -ggdb #-DDEBUG_FLAGS
+LOCAL_CFLAGS += $(versions)
+
+LOCAL_LDFLAGS = -lk3l
+
+LOCAL_OBJS = ./commons/k3lapi.o ./commons/k3lutil.o ./commons/config_options.o ./commons/format.o ./commons/strings.o ./commons/ringbuffer.o ./commons/verbose.o ./commons/saved_condition.o ./commons/regex.o ./commons/timer.o ./commons/configurator/configfile.o ./commons/configurator/option.o ./commons/configurator/section.o ./commons/configurator/restriction.o
+LOCAL_OBJS += ./support/klog-config.o ./support/klog-options.o ./support/config_defaults.o
+LOCAL_OBJS += ./src/globals.o ./src/opt.o ./src/frame.o ./src/utils.o ./src/lock.o ./src/spec.o ./src/applications.o ./src/khomp_pvt_fxo.o ./src/khomp_pvt_gsm.o ./src/khomp_pvt_kxe1.o ./src/khomp_pvt_passive.o ./src/khomp_pvt.o ./src/logger.o ./src/cli.o
+
+conf_file_name := khomp.conf.xml
+conf_file_dir := $(curr_dir)/Install/files
+conf_file_dir_alt := $(curr_dir)/conf
+conf_file_install = $(sysconfdir)/autoload_configs
+
+include $(BASE)/build/modmake.rules
+
+depend_install:
+	@echo "Copy $(conf_file_name)"
+	@if test -d  $(conf_file_install) ; then \
+		if test -f $(conf_file_dir)/$(conf_file_name) ; then \
+			cp $(conf_file_dir)/$(conf_file_name) $(conf_file_install)/$(conf_file_name).new ;\
+		else \
+			cp $(conf_file_dir_alt)/$(conf_file_name) $(conf_file_install)/$(conf_file_name).new ;\
+		fi; \
+		if test ! -f "$(conf_file_install)/$(conf_file_name)" ; then \
+			mv $(conf_file_install)/$(conf_file_name).new $(conf_file_install)/$(conf_file_name) ;\
+		fi; \
+	fi;
diff --git a/src/mod/endpoints/mod_khomp/commons/atomic.hpp b/src/mod/endpoints/mod_khomp/commons/atomic.hpp
new file mode 100644
index 0000000000..daa598c9b4
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/atomic.hpp
@@ -0,0 +1,189 @@
+/*
+    KHOMP generic endpoint/channel library.
+
+    This code was based on FreeBSD 7.X SVN (sys/i386/include/atomic.h),
+    with changes regarding optimizations and generalizations, and a
+    remake of the interface to fit use C++ features.
+
+    Code is distributed under original license.
+    Original copyright follows:
+
+ * Copyright (c) 1998 Doug Rabson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+*/
+
+#ifndef _ATOMIC_HPP_
+#define _ATOMIC_HPP_
+
+namespace Atomic
+{
+    // Macros used to insert compare and exchange instructions easily into functions.
+
+    #define MAKE_CMPXCHG_FUNCTION(INS, PTR, EXP, VAL, TYPE)  \
+        PunnedType pexp; pexp.valtype = EXP;                 \
+        PunnedType pval; pval.valtype = VAL;                 \
+        TYPE vexp = *(pexp.podtype);                         \
+        TYPE vval = *(pval.podtype);                         \
+        TYPE res;                                            \
+        unsigned char chg = 0;                               \
+        asm volatile("lock;" INS "sete %1;"                  \
+        : "=a" (res),                           /* 0 */      \
+        "=q" (chg),                             /* 1 */      \
+        "=m" (*(unsigned char **)(PTR))         /* 2 */      \
+        : "r" (vval),                           /* 3 */      \
+        "a" (vexp),                             /* 4 */      \
+        "m" (*(unsigned char **)(PTR))          /* 5 */      \
+        : "memory");                                         \
+        *(pexp.podtype) = res;                               \
+        return (chg != 0 ? true : false);
+
+    #define MAKE_CMPXCHG8B_FUNCTION(PTR,EXP,VAL)           \
+        PunnedType pexp; pexp.valtype = EXP;               \
+        PunnedType pval; pval.valtype = VAL;               \
+        unsigned long long vexp = *(pexp.podtype);         \
+        unsigned long long vval = *(pval.podtype);         \
+        unsigned long long res = (unsigned long long)exp;  \
+        unsigned char chg = 0;                             \
+        asm volatile("lock; cmpxchg8b %2; sete %1;"        \
+        : "+A" (vexp),                    /* 0 (result) */ \
+        "=q" (chg)                        /* 1 */          \
+        : "m" (*(unsigned char**)(PTR)),  /* 2 */          \
+        "b" ((unsigned long)(vval)),                       \
+        "c" ((unsigned long)(vval >> 32)));                \
+        *(pexp.podtype) = vexp;                            \
+        return (chg != 0 ? true : false);
+
+    // Types used for making CMPXCHG instructions independent from base type.
+
+    template < typename ValType, typename PodType >
+    union PunnedTypeTemplate
+    {
+        ValType * valtype;
+        PodType * podtype;
+    };
+
+    template < int SizeOfType, typename ReturnType >
+    struct HelperCreateCAS;
+
+    template < typename ValType >
+    struct HelperCreateCAS<4, ValType>
+    {
+        #if !defined(__LP64__) && !defined(__LP64)
+            typedef unsigned long BaseType;
+        #else
+            typedef unsigned int  BaseType;
+        #endif
+
+        typedef PunnedTypeTemplate< ValType, BaseType > PunnedType;
+
+        inline static bool apply(volatile void *p, ValType * exp, ValType now)
+        {
+            #if !defined(__LP64__) && !defined(__LP64)
+                MAKE_CMPXCHG_FUNCTION("cmpxchgl %3,%5;", p, exp, &now, BaseType);
+            #else
+                MAKE_CMPXCHG_FUNCTION("cmpxchgl %k3,%5;", p, exp, &now, BaseType);
+            #endif
+        }
+    };
+
+    template < typename ValType >
+    struct HelperCreateCAS<8, ValType>
+    {
+        #if !defined(__LP64__) && !defined(__LP64)
+            typedef unsigned long long BaseType;
+        #else
+            typedef unsigned long BaseType;
+        #endif
+
+        typedef PunnedTypeTemplate< ValType, BaseType > PunnedType;
+
+        inline static volatile ValType apply(volatile void *p, ValType * exp, ValType now)
+        {
+            #if !defined(__LP64__) && !defined(__LP64)
+                MAKE_CMPXCHG8B_FUNCTION(p, exp, &now);
+            #else
+                MAKE_CMPXCHG_FUNCTION("cmpxchgq %3,%5;", p, exp, &now, BaseType);
+            #endif
+        }
+
+    };
+
+    // The CAS function itself.
+
+    template < typename ValType >
+    inline bool doCAS(volatile ValType * p, ValType * o, ValType n)
+    {
+        return HelperCreateCAS<sizeof(ValType), ValType>::apply(static_cast<volatile void *>(p), o, n);
+    };
+
+    template < typename ValType >
+    inline bool doCAS(volatile ValType * p, ValType o, ValType n)
+    {
+        return HelperCreateCAS<sizeof(ValType), ValType>::apply(static_cast<volatile void *>(p), &o, n);
+    };
+
+    #undef MAKE_CMPXCHG_32_FUNCTION
+    #undef MAKE_CMPXCHG_64_FUNCTION
+
+    #define MAKE_LOCKED_TEMPLATE(NAME)                                                     \
+    template < typename ValType > inline void do##NAME(volatile ValType * p, ValType v);   \
+    template < typename ValType > inline void do##NAME(volatile ValType * p);
+
+    #define MAKE_LOCKED_FUNCTION(NAME, TYPE, INS, CONS, VAL)                                                                                    \
+    template < > inline void do##NAME < TYPE > (volatile TYPE * p, TYPE v){   asm volatile("lock;" INS : "=m" (*p) : CONS (VAL), "m" (*p)); }   \
+    template < > inline void do##NAME < TYPE > (volatile TYPE * p)        {   asm volatile("lock;" INS : "=m" (*p) : CONS (1),   "m" (*p)); }
+
+    #define MAKE_LOCKED_FUNCTIONS(NAME, TYPE, INS, CONS, VAL)       \
+        MAKE_LOCKED_FUNCTION(NAME, TYPE, INS, CONS, VAL)            \
+        MAKE_LOCKED_FUNCTION(NAME, unsigned TYPE, INS, CONS, VAL)
+
+    MAKE_LOCKED_TEMPLATE(Add);
+    MAKE_LOCKED_TEMPLATE(Sub);
+    MAKE_LOCKED_TEMPLATE(SetBits);
+    MAKE_LOCKED_TEMPLATE(ClearBits);
+
+    MAKE_LOCKED_FUNCTIONS(Add,   int,   "addl %1,%0",  "ir",  v);
+    MAKE_LOCKED_FUNCTIONS(Sub,   int,   "subl %1,%0",  "ir",  v);
+    MAKE_LOCKED_FUNCTIONS(SetBits,   int,   "orl %1,%0",   "ir",  v);
+    MAKE_LOCKED_FUNCTIONS(ClearBits, int,   "andl %1,%0",  "ir", ~v);
+
+    #if !defined(__LP64__) && !defined(__LP64)
+
+    MAKE_LOCKED_FUNCTIONS(Add,   long,  "addl %1,%0",  "ir",  v);
+    MAKE_LOCKED_FUNCTIONS(Sub,   long,  "subl %1,%0",  "ir",  v);
+    MAKE_LOCKED_FUNCTIONS(SetBits,   long,  "orl %1,%0",   "ir",  v);
+    MAKE_LOCKED_FUNCTIONS(ClearBits, long,  "andl %1,%0",  "ir", ~v);
+
+    #else
+
+    MAKE_LOCKED_FUNCTIONS(Add,   long,  "addq %1,%0",  "ir",  v);
+    MAKE_LOCKED_FUNCTIONS(Sub,   long,  "subq %1,%0",  "ir",  v);
+    MAKE_LOCKED_FUNCTIONS(SetBits,   long,  "orq %1,%0",   "ir",  v);
+    MAKE_LOCKED_FUNCTIONS(ClearBits, long,  "andq %1,%0",  "ir", ~v);
+
+    #endif
+};
+
+#endif /* _ATOMIC_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/config_commons.hpp b/src/mod/endpoints/mod_khomp/commons/config_commons.hpp
new file mode 100644
index 0000000000..de8f327df4
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/config_commons.hpp
@@ -0,0 +1,69 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#ifndef _CONFIG_COMMONS_HPP_
+#define _CONFIG_COMMONS_HPP_
+
+/****************************************************************************/
+/* ASTERISK */
+#if   defined(COMMONS_LIBRARY_USING_ASTERISK)
+ #define COMMONS_IMPLEMENTATION asterisk
+/****************************************************************************/
+/* CALLWEAVER */
+#elif defined(COMMONS_LIBRARY_USING_CALLWEAVER)
+ #define COMMONS_IMPLEMENTATION callweaver
+/****************************************************************************/
+/* FREESWITCH */
+#elif defined(COMMONS_LIBRARY_USING_FREESWITCH)
+ #define COMMONS_IMPLEMENTATION freeswitch
+/****************************************************************************/
+/* GNU/LINUX (generic) */
+#elif defined(COMMONS_LIBRARY_USING_GNU_LINUX)
+ #define COMMONS_IMPLEMENTATION gnulinux
+/****************************************************************************/
+#else
+ #error Unknown implementation selected. Please define COMMONS_LIBRARY_USING_* correctly.
+#endif
+
+#define COMMONS_INCLUDE(file) <COMMONS_IMPLEMENTATION/file>
+
+#endif  /* _CONFIG_COMMONS_HPP_ */
+
diff --git a/src/mod/endpoints/mod_khomp/commons/config_options.cpp b/src/mod/endpoints/mod_khomp/commons/config_options.cpp
new file mode 100644
index 0000000000..5383855f65
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/config_options.cpp
@@ -0,0 +1,710 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <config_options.hpp>
+
+ConfigOption::ConfigOption(std::string name, const ConfigOption::StringType & value, const ConfigOption::StringType defvalue, string_allowed_type allowed, bool list_me)
+: _my_name(name), _value_data(new StringData(const_cast<StringType &>(value), defvalue, allowed), true),
+  _list_me(list_me), _values(NULL), _loaded(false)
+{};
+
+ConfigOption::ConfigOption(std::string name, const ConfigOption::StringType & value, const ConfigOption::StringType defvalue, bool list_me)
+: _my_name(name), _value_data(new StringData(const_cast<StringType &>(value), defvalue, string_allowed_type()), true),
+  _list_me(list_me), _values(NULL), _loaded(false)
+{};
+
+ConfigOption::ConfigOption(std::string name, const ConfigOption::SignedIntType & value, const ConfigOption::SignedIntType defvalue,
+                             ConfigOption::SignedIntType min, ConfigOption::SignedIntType max, ConfigOption::SignedIntType step, bool list_me)
+: _my_name(name), _value_data(new SignedIntData(const_cast<SignedIntType &>(value), defvalue, Range<SignedIntType>(min, max, step)), true),
+  _list_me(list_me), _values(NULL), _loaded(false)
+{};
+
+ConfigOption::ConfigOption(std::string name, const ConfigOption::UnsignedIntType & value, const ConfigOption::UnsignedIntType defvalue,
+                             ConfigOption::UnsignedIntType min, ConfigOption::UnsignedIntType max, ConfigOption::UnsignedIntType step, bool list_me)
+: _my_name(name), _value_data(new UnsignedIntData(const_cast<UnsignedIntType &>(value), defvalue, Range<UnsignedIntType>(min, max, step)), true),
+  _list_me(list_me), _values(NULL), _loaded(false)
+{};
+
+ConfigOption::ConfigOption(std::string name, const ConfigOption::BooleanType & value, const ConfigOption::BooleanType defvalue, bool list_me)
+: _my_name(name), _value_data(new BooleanData(const_cast<BooleanType &>(value), defvalue), true),
+  _list_me(list_me), _values(NULL), _loaded(false)
+{};
+
+ConfigOption::ConfigOption(std::string name, ConfigOption::FunctionType fun, std::string defvalue, string_allowed_type allowed, bool list_me)
+: _my_name(name), _value_data(new FunctionData(fun, defvalue, allowed), true),
+  _list_me(list_me), _values(NULL), _loaded(false)
+{};
+
+ConfigOption::ConfigOption(std::string name, ConfigOption::FunctionType fun, std::string defvalue, bool list_me)
+: _my_name(name), _value_data(new FunctionData(fun, defvalue, string_allowed_type()), true),
+  _list_me(list_me), _values(NULL), _loaded(false)
+{};
+
+ConfigOption::ConfigOption(const ConfigOption & o)
+: _my_name(o._my_name), _value_data(o._value_data),
+  _list_me(o._list_me), _values(o._values), _loaded(o._loaded)
+{};
+
+ConfigOption::~ConfigOption(void)
+{
+    if (_values)
+    {
+        for (unsigned int i = 0; _values[i] != NULL; i++)
+            delete _values[i];
+
+        delete[] _values;
+        _values = NULL;
+    }
+};
+
+void ConfigOption::set(ConfigOption::StringType value)
+{
+    switch (_value_data.which())
+    {
+        case ID_STRING:
+        {
+            try
+            {
+                StringData & tmp = _value_data.get<StringData>();
+
+                if (tmp.string_allowed.empty())
+                {
+                    tmp.string_val = value;
+                    _loaded = true;
+                }
+                else
+                {
+                    if (tmp.string_allowed.find(value) != tmp.string_allowed.end())
+                    {
+                        tmp.string_val = value;
+                        _loaded = true;
+                        return;
+                    }
+
+                    std::string allowed_string;
+
+                    for (string_allowed_type::iterator i = tmp.string_allowed.begin(); i != tmp.string_allowed.end(); i++)
+                    {
+                        allowed_string += " '";
+                        allowed_string += (*i);
+                        allowed_string += "'";
+                    }
+
+                    throw ConfigProcessFailure(STG(FMT("value '%s' not allowed for option '%s' (allowed values:%s)")
+                        % value % _my_name % allowed_string));
+                }
+                break;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+        }
+
+        case ID_FUN:
+        {
+            try
+            {
+                FunctionData & tmp = _value_data.get<FunctionData>();
+                tmp.fun_val(value);
+                _loaded = true;
+                break;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+
+        }
+
+        default:
+        {
+            throw ConfigProcessFailure(STG(FMT("option '%s' is not of type string, nor function defined") % _my_name));
+        }
+    }
+}
+
+void ConfigOption::set(ConfigOption::SignedIntType value)
+{
+    try
+    {
+        SignedIntData & tmp = _value_data.get<SignedIntData>();
+
+        if (value < tmp.sint_Range.minimum)
+            throw ConfigProcessFailure(STG(FMT("value '%d' out-of-Range for option '%s' (too low)") % value % _my_name));
+
+        if (value > tmp.sint_Range.maximum)
+            throw ConfigProcessFailure(STG(FMT("value '%d' out-of-Range for option '%s' (too high)") % value % _my_name));
+
+        if (((value - tmp.sint_Range.minimum) % tmp.sint_Range.step) != 0)
+            throw ConfigProcessFailure(STG(FMT("value '%d' out-of-Range for option '%s' (outside allowed step)") % value % _my_name));
+
+        tmp.sint_val = value;
+        _loaded = true;
+    }
+    catch(ValueType::InvalidType & e)
+    {
+        throw;
+    }
+}
+
+void ConfigOption::set(ConfigOption::UnsignedIntType value)
+{
+    try
+    {
+        UnsignedIntData & tmp = _value_data.get<UnsignedIntData>();
+
+        if (value < tmp.uint_Range.minimum)
+            throw ConfigProcessFailure(STG(FMT("value '%d' out-of-Range for option '%s' (too low)") % value % _my_name));
+
+        if (value > tmp.uint_Range.maximum)
+            throw ConfigProcessFailure(STG(FMT("value '%d' out-of-Range for option '%s' (too high)") % value % _my_name));
+
+        if (((value - tmp.uint_Range.minimum) % tmp.uint_Range.step) != 0)
+            throw ConfigProcessFailure(STG(FMT("value '%d' out-of-Range for option '%s' (outside allowed step)") % value % _my_name));
+
+        tmp.uint_val = value;
+        _loaded = true;
+    }
+    catch(ValueType::InvalidType & e)
+    {
+        throw;
+    }
+}
+
+void ConfigOption::set(ConfigOption::BooleanType value)
+{
+    try
+    {
+        BooleanData & tmp = _value_data.get<BooleanData>();
+        tmp.bool_val = value;
+        _loaded = true;
+    }
+    catch(ValueType::InvalidType & e)
+    {
+        throw;
+    }
+}
+
+std::string & ConfigOption::name(void) { return _my_name; };
+
+ConfigOption::value_id_type ConfigOption::type(void)
+{
+    return (value_id_type) _value_data.which();
+};
+
+const char ** ConfigOption::values(void)
+{
+    if (_values != NULL)
+        return _values;
+
+    switch ((value_id_type) _value_data.which())
+    {
+        case ConfigOption::ID_BOOL:
+        {
+            _values = new const char*[3];
+
+            _values[0] = strdup("yes");
+            _values[1] = strdup("no");
+            _values[2] = NULL;
+
+            return _values;
+        }
+
+        case ConfigOption::ID_SINT:
+        {
+            try
+            {
+                SignedIntData & tmp = _value_data.get<SignedIntData>();
+
+
+                unsigned int count = ((tmp.sint_Range.maximum - tmp.sint_Range.minimum) / tmp.sint_Range.step) + 1;
+                unsigned int index = 0;
+
+                _values = new const char*[count + 1];
+
+                for (SignedIntType i = tmp.sint_Range.minimum; i <= tmp.sint_Range.maximum; i += tmp.sint_Range.step, index++)
+                    _values[index] = strdup(STG(FMT("%d") % i).c_str());
+
+                _values[index] = NULL;
+
+                return _values;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+        }
+
+        case ConfigOption::ID_UINT:
+        {
+            try
+            {
+                UnsignedIntData & tmp = _value_data.get<UnsignedIntData>();
+
+                unsigned int count = ((tmp.uint_Range.maximum - tmp.uint_Range.minimum) / tmp.uint_Range.step) + 1;
+                unsigned int index = 0;
+
+                _values = new const char*[count + 1];
+
+                for (UnsignedIntType i = tmp.uint_Range.minimum; i <= tmp.uint_Range.maximum; i += tmp.uint_Range.step, index++)
+                    _values[index] = strdup(STG(FMT("%d") % i).c_str());
+
+                _values[index] = NULL;
+
+                return _values;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+        }
+
+        case ConfigOption::ID_STRING:
+        {
+            try
+            {
+                StringData & tmp = _value_data.get<StringData>();
+
+                _values = new const char*[ tmp.string_allowed.size() + 1 ];
+
+                unsigned int index = 0;
+
+                for (string_allowed_type::iterator i = tmp.string_allowed.begin(); i != tmp.string_allowed.end(); i++, index++)
+                    _values[index] = strdup((*i).c_str());
+
+                _values[index] = NULL;
+
+                return _values;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+        }
+
+        case ConfigOption::ID_FUN:
+        {
+            try
+            {
+                FunctionData & tmp = _value_data.get<FunctionData>();
+
+                _values = new const char*[ tmp.fun_allowed.size() + 1 ];
+
+                unsigned int index = 0;
+
+                for (string_allowed_type::iterator i = tmp.fun_allowed.begin(); i != tmp.fun_allowed.end(); i++, index++)
+                    _values[index] = strdup((*i).c_str());
+
+                _values[index] = NULL;
+                return _values;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+
+        }
+
+        default:
+            throw ConfigProcessFailure(STG(FMT("unknown type identifier '%d'") % _value_data.which()));
+    }
+};
+
+void ConfigOption::reset(void)
+{
+    _loaded = false;
+};
+
+void ConfigOption::commit(void)
+{
+    if (_loaded)
+        return;
+
+    switch ((value_id_type) _value_data.which())
+    {
+        case ConfigOption::ID_BOOL:
+        {
+            try
+            {
+                BooleanData & tmp = _value_data.get<BooleanData>();
+                tmp.bool_val = tmp.bool_default;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+
+            break;
+        }
+
+        case ConfigOption::ID_SINT:
+        {
+            try
+            {
+                SignedIntData & tmp = _value_data.get<SignedIntData>();
+                tmp.sint_val = tmp.sint_default;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+            break;
+        }
+
+        case ConfigOption::ID_UINT:
+        {
+            try
+            {
+                UnsignedIntData & tmp = _value_data.get<UnsignedIntData>();
+                tmp.uint_val = tmp.uint_default;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+            break;
+        }
+
+        case ConfigOption::ID_STRING:
+        {
+            try
+            {
+                StringData & tmp = _value_data.get<StringData>();
+                tmp.string_val = tmp.string_default;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+            break;
+        }
+
+        case ConfigOption::ID_FUN:
+        {
+            try
+            {
+                FunctionData & tmp = _value_data.get<FunctionData>();
+                tmp.fun_val(tmp.fun_default);
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+            break;
+        }
+
+        default:
+            throw ConfigProcessFailure(STG(FMT("unknown type identifier '%d'") % _value_data.which()));
+    }
+
+    _loaded = true;
+};
+
+void ConfigOption::copy_from(ConfigOption & src)
+{
+    if (src._value_data.which() != _value_data.which())
+        throw ConfigProcessFailure(STG(FMT("unable to copy options, source type differs from destination.")));
+
+    if (!src._loaded)
+        return;
+
+    switch ((value_id_type) _value_data.which())
+    {
+        case ConfigOption::ID_BOOL:
+        {
+            try
+            {
+                BooleanData & stmp = src._value_data.get<BooleanData>();
+                BooleanData & dtmp = _value_data.get<BooleanData>();
+                /* do not copy references, but values.. */
+                bool tmpval = stmp.bool_val;
+                dtmp.bool_val = tmpval;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+
+            break;
+        }
+
+        case ConfigOption::ID_SINT:
+        {
+            try
+            {
+                SignedIntData & stmp = src._value_data.get<SignedIntData>();
+                SignedIntData & dtmp = _value_data.get<SignedIntData>();
+                /* do not copy references, but values.. */
+                int tmpval = stmp.sint_val;
+                dtmp.sint_val = tmpval;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+
+            break;
+        }
+
+        case ConfigOption::ID_UINT:
+        {
+            try
+            {
+                UnsignedIntData & stmp = src._value_data.get<UnsignedIntData>();
+                UnsignedIntData & dtmp = _value_data.get<UnsignedIntData>();
+                /* do not copy references, but values.. */
+                unsigned int tmpval = stmp.uint_val;
+                dtmp.uint_val = tmpval;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+
+
+            break;
+        }
+
+        case ConfigOption::ID_STRING:
+        {
+            try
+            {
+                StringData & stmp = src._value_data.get<StringData>();
+                StringData & dtmp = _value_data.get<StringData>();
+                /* do not copy references, but values.. */
+                std::string tmpval = stmp.string_val;
+                dtmp.string_val = tmpval;
+            }
+            catch(ValueType::InvalidType & e)
+            {
+                throw;
+            }
+
+            break;
+        }
+
+        case ConfigOption::ID_FUN:
+        {
+            /* TO IMPLEMENT (NEEDS ANOTHER METHOD ON FUNCTION FOR GETTING VALUE) */
+
+//            FunctionData & tmp = boost::get<FunctionData>(_value_data);
+//
+//            if (!tmp.loaded)
+//            {
+//                tmp.fun_val(tmp.fun_default);
+//                tmp.loaded = true;
+//            }
+            break;
+        }
+
+        default:
+            throw ConfigProcessFailure(STG(FMT("unknown type identifier '%d'") % _value_data.which()));
+    }
+
+    _loaded = true;
+};
+
+/*********************************/
+
+bool ConfigOptions::add(ConfigOption option)
+{
+    //option_map_type::iterator iter2 = _map.begin();
+
+    //boost::tie(iter2, ok2)
+    std::pair<option_map_type::iterator, bool> ret = _map.insert(option_pair_type(option.name(), option));
+
+    return ret.second;
+}
+
+bool ConfigOptions::synonym(std::string equiv_opt, std::string main_opt)
+{
+    //syn_option_map_type::iterator iter = _syn_map.begin();
+
+    //boost::tie(iter, ok)
+    std::pair<syn_option_map_type::iterator, bool> ret = _syn_map.insert(syn_option_pair_type(equiv_opt, main_opt));
+
+    return ret.second;
+}
+
+ConfigOptions::string_set ConfigOptions::options(void)
+{
+    string_set res;
+
+    for (option_map_type::iterator i = _map.begin(); i != _map.end(); i++)
+        res.insert((*i).first);
+
+    return res;
+}
+
+void ConfigOptions::process(const char * name, const char * value)
+{
+    option_map_type::iterator iter = find_option(name);
+
+    if (iter == _map.end())
+        throw ConfigProcessFailure(STG(FMT("unknown option '%s'") % name));
+
+    try
+    {
+        switch ((*iter).second.type())
+        {
+            case ConfigOption::ID_SINT:
+                set<ConfigOption::SignedIntType>((*iter).first, Strings::toulong(value));
+                return;
+            case ConfigOption::ID_UINT:
+                set<ConfigOption::UnsignedIntType>((*iter).first, Strings::tolong(value));
+                return;
+            case ConfigOption::ID_BOOL:
+                set<ConfigOption::BooleanType>((*iter).first, Strings::toboolean(value));
+                return;
+            case ConfigOption::ID_STRING:
+            case ConfigOption::ID_FUN:
+                set<ConfigOption::StringType>((*iter).first, std::string(value));
+                return;
+            default:
+                throw ConfigProcessFailure(STG(FMT("unknown type identifier '%d'") % (*iter).second.type()));
+        }
+    }
+    catch (Strings::invalid_value & e)
+    {
+        throw ConfigProcessFailure(STG(FMT("invalid value '%s' for option '%s'") % value % name));
+    }
+}
+
+const char ** ConfigOptions::values(const char * name)
+{
+    option_map_type::iterator iter = find_option(name);
+
+    if (iter == _map.end())
+        throw ConfigProcessFailure(STG(FMT("unknown option '%s'") % name));
+
+    return (*iter).second.values();
+}
+
+const char ** ConfigOptions::values(void)
+{
+    if (_values != NULL)
+        return _values;
+
+    unsigned int count = 0;
+
+    for (option_map_type::iterator i = _map.begin(); i != _map.end(); i++)
+        if ((*i).second.list_me())
+            ++count;
+
+    _values = new const char*[ count + 1 ];
+
+    unsigned int index = 0;
+
+    for (option_map_type::iterator i = _map.begin(); i != _map.end(); i++)
+    {
+        if ((*i).second.list_me())
+        {
+            _values[index] = strdup((*i).first.c_str());
+            ++index;
+        }
+    }
+
+    _values[index] = NULL;
+
+    return _values;
+}
+
+void ConfigOptions::reset(void)
+{
+    for (option_map_type::iterator i = _map.begin(); i != _map.end(); i++)
+        (*i).second.reset();
+}
+
+ConfigOptions::messages_type ConfigOptions::commit(void)
+{
+    messages_type msgs;
+
+    for (option_map_type::iterator i = _map.begin(); i != _map.end(); i++)
+    {
+        try
+        {
+            (*i).second.commit();
+        }
+        catch (ConfigProcessFailure & e)
+        {
+            msgs.push_back(e.msg);
+        }
+    }
+
+    return msgs;
+}
+
+bool ConfigOptions::loaded(std::string name)
+{
+    option_map_type::iterator iter = find_option(name);
+
+    if (iter == _map.end())
+        return false;
+
+    return iter->second.loaded();
+}
+
+void ConfigOptions::copy_from(ConfigOptions & source, std::string name)
+{
+    option_map_type::iterator iter_src = source.find_option(name);
+    option_map_type::iterator iter_dst = find_option(name);
+
+    if (iter_src == source._map.end())
+        throw ConfigProcessFailure(STG(FMT("unknown option '%s' on source") % name));
+
+    if (iter_dst == _map.end())
+        throw ConfigProcessFailure(STG(FMT("unknown option '%s' on destination") % name));
+
+    iter_dst->second.copy_from(iter_src->second);
+}
+
+ConfigOptions::option_map_type::iterator ConfigOptions::find_option(std::string name)
+{
+    syn_option_map_type::iterator syn_iter = _syn_map.find(name);
+
+    if (syn_iter != _syn_map.end())
+        name = syn_iter->second;
+
+    option_map_type::iterator iter = _map.find(name);
+
+    return iter;
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/config_options.hpp b/src/mod/endpoints/mod_khomp/commons/config_options.hpp
new file mode 100644
index 0000000000..3cfe2e1c78
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/config_options.hpp
@@ -0,0 +1,286 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <set>
+#include <map>
+#include <vector>
+
+#include <strings.hpp>
+
+#include <function.hpp>
+#include <variant.hpp>
+#include <format.hpp>
+
+#ifndef _CONFIG_OPTIONS_HPP_
+#define _CONFIG_OPTIONS_HPP_
+
+struct ConfigProcessFailure
+{
+    ConfigProcessFailure(std::string _msg): msg(_msg) {};
+    std::string msg;
+};
+
+struct ConfigOption
+{
+    typedef int          SignedIntType;
+    typedef unsigned int UnsignedIntType;
+    typedef bool         BooleanType;
+    typedef std::string  StringType;
+
+    typedef Function::Function1 < void, std::string > FunctionType;
+
+    typedef std::set < StringType >     string_allowed_type;
+
+    /* this should reflect 'variant.which()'! */
+    typedef enum
+    {
+        ID_SINT   = 0,
+        ID_UINT   = 1,
+        ID_BOOL   = 2,
+        ID_STRING = 3,
+        ID_FUN    = 4,
+    }
+    value_id_type;
+
+    template < typename number_type >
+    struct Range
+    {
+        Range(number_type _minimum, number_type _maximum, number_type _step)
+        : minimum(_minimum), maximum(_maximum), step(_step) {};
+
+        number_type minimum, maximum, step;
+    };
+
+    struct SignedIntData : public VariantBaseType < void >
+    {
+        SignedIntData(SignedIntType & _sint_val, SignedIntType _sint_default, Range< SignedIntType > _sint_Range)
+        : sint_val(_sint_val), sint_default(_sint_default), sint_Range(_sint_Range) {};
+
+        int which()
+        {
+            return ID_SINT;
+        }
+
+        SignedIntType        & sint_val;
+        SignedIntType          sint_default;
+        Range<SignedIntType>   sint_Range;
+    };
+
+    struct UnsignedIntData : public VariantBaseType < void >
+    {
+        UnsignedIntData(UnsignedIntType & _uint_val, UnsignedIntType _uint_default, Range< UnsignedIntType > _uint_Range)
+        : uint_val(_uint_val), uint_default(_uint_default), uint_Range(_uint_Range) {};
+
+        int which()
+        {
+            return ID_UINT;
+        }
+
+        UnsignedIntType        & uint_val;
+        UnsignedIntType          uint_default;
+        Range<UnsignedIntType>   uint_Range;
+    };
+
+    struct BooleanData : public VariantBaseType < void >
+    {
+        BooleanData(BooleanType & _bool_val, BooleanType _bool_default)
+        : bool_val(_bool_val), bool_default(_bool_default) {};
+
+        int which()
+        {
+            return ID_BOOL;
+        }
+
+        BooleanType      & bool_val;
+        BooleanType        bool_default;
+    };
+
+    struct StringData : public VariantBaseType < void >
+    {
+        StringData(std::string & _string_val, std::string _string_default, string_allowed_type _string_allowed)
+        : string_val(_string_val), string_default(_string_default), string_allowed(_string_allowed) {};
+
+        int which()
+        {
+            return ID_STRING;
+        }
+
+        std::string         & string_val;
+        std::string           string_default;
+        string_allowed_type   string_allowed;
+    };
+
+    struct FunctionData : public VariantBaseType < void >
+    {
+        FunctionData(FunctionType _fun_val, std::string _fun_default, string_allowed_type _fun_allowed)
+        : fun_val(_fun_val), fun_default(_fun_default), fun_allowed(_fun_allowed) {};
+
+        int which()
+        {
+            return ID_FUN;
+        }
+
+        FunctionType             fun_val;
+        std::string          fun_default;
+        string_allowed_type  fun_allowed;
+    };
+
+
+    typedef Variant < VariantBaseType < void > >  ValueType;
+
+    ConfigOption(std::string, const StringType &, const StringType, string_allowed_type allowed, bool list_me = true);
+    ConfigOption(std::string, const StringType &, const StringType = "", bool list_me = true);
+    ConfigOption(std::string, const SignedIntType &, const SignedIntType = 0, SignedIntType min = -INT_MAX, SignedIntType max = INT_MAX, SignedIntType step = 1, bool list_me = true);
+    ConfigOption(std::string, const UnsignedIntType &, const UnsignedIntType = 0, UnsignedIntType min = 0, UnsignedIntType max = UINT_MAX, UnsignedIntType step = 1, bool list_me = true);
+    ConfigOption(std::string, const BooleanType &, const BooleanType = false, bool list_me = true);
+    ConfigOption(std::string, FunctionType, std::string defvalue, string_allowed_type allowed, bool list_me = true);
+    ConfigOption(std::string, FunctionType, std::string defvalue = "", bool list_me = true);
+
+    ConfigOption(const ConfigOption & o);
+
+    ~ConfigOption(void);
+
+    void set(StringType value);
+
+    void set(SignedIntType value);
+    void set(UnsignedIntType value);
+    void set(BooleanType value);
+
+    BooleanType get_bool(){ return _value_data.get<BooleanData>().bool_val; }
+    std::string get_str(){ return _value_data.get<StringData>().string_val; }
+    SignedIntType get_sint(){ return _value_data.get<SignedIntData>().sint_val; }
+    UnsignedIntType get_uint(){ return _value_data.get<UnsignedIntData>().uint_val; }
+
+    std::string    & name(void);
+    value_id_type    type(void);
+
+    const char **  values(void);
+
+    void            reset(void);
+    void           commit(void);
+
+    bool          list_me(void) { return _list_me; };
+    bool           loaded(void) { return _loaded;  };
+
+    void        copy_from(ConfigOption &);
+
+ protected:
+    std::string       _my_name;
+    ValueType     _value_data;
+
+    bool              _list_me;
+    const char **      _values;
+    bool               _loaded;
+};
+
+struct ConfigOptions
+{
+    typedef std::vector < std::string >    messages_type;
+
+    ConfigOptions(void): _values(NULL) {};
+
+    typedef std::set < std::string >  string_set;
+
+    typedef std::map  < std::string, ConfigOption >   option_map_type;
+    typedef std::pair < std::string, ConfigOption >  option_pair_type;
+
+    typedef std::map  < std::string, std::string >   syn_option_map_type;
+    typedef std::pair < std::string, std::string >  syn_option_pair_type;
+
+    bool add(ConfigOption option);
+
+    /* only valid in "process" (for backwards compatibility config files) */
+    bool synonym(std::string, std::string);
+
+    template <typename ValueType>
+    void set(std::string name, ValueType value)
+    {
+        option_map_type::iterator iter = _map.find(name);
+
+        if (iter == _map.end())
+            throw ConfigProcessFailure(STG(FMT("unknown option: %s") % name));
+
+        (*iter).second.set(value);
+    }
+
+    std::string get(std::string name)
+    {
+        option_map_type::iterator iter = _map.find(name);
+
+        if (iter == _map.end())
+            throw ConfigProcessFailure(STG(FMT("unknown option: %s") % name));
+
+        switch((*iter).second.type())
+        {
+            case ConfigOption::ID_BOOL: return (*iter).second.get_bool() ? "yes" : "no";
+            case ConfigOption::ID_STRING: return (*iter).second.get_str();
+            case ConfigOption::ID_UINT: return STG(FMT("%d") % (*iter).second.get_uint());
+            case ConfigOption::ID_SINT: return STG(FMT("%d") % (*iter).second.get_sint());
+            case ConfigOption::ID_FUN: return "";
+        }
+    }
+
+    string_set options(void);
+
+    void process(const char *, const char *); /* process option from file */
+
+    void           reset(void);         /* reset loaded opts */
+    messages_type commit(void);         /* set defaults */
+
+    const char ** values(const char *); /* option value */
+    const char ** values(void);         /* values from options */
+
+    bool          loaded(std::string);  /* return if config was loaded */
+
+    void          copy_from(ConfigOptions &, std::string);
+
+ protected:
+    option_map_type::iterator find_option(std::string);
+
+ protected:
+    option_map_type      _map;
+    syn_option_map_type  _syn_map;
+
+    const char ** _values;
+};
+
+#endif /* _CONFIG_OPTIONS_HPP_ */
+
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/configfile.cpp b/src/mod/endpoints/mod_khomp/commons/configurator/configfile.cpp
new file mode 100644
index 0000000000..6aa2e59201
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/configurator/configfile.cpp
@@ -0,0 +1,241 @@
+/*  
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.  
+  
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or  
+    modify it under the terms of the GNU Lesser General Public  
+    License as published by the Free Software Foundation; either  
+    version 2.1 of the License, or (at your option) any later version.  
+  
+    This library is distributed in the hope that it will be useful,  
+    but WITHOUT ANY WARRANTY; without even the implied warranty of  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+    Lesser General Public License for more details.  
+  
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  
+*/
+#include <errno.h>
+
+#include <configurator/configfile.hpp>
+
+#if _MSC_VER >= 1400
+#undef close
+#endif
+
+void Configfile::ignore(std::string str)
+{
+	_ignores.insert(str);
+};
+
+bool Configfile::select(Section **ptr, std::string str)
+{
+	/* default section == this! */
+	*ptr = this;
+	
+	/* always success by default */
+	return true;
+};
+
+bool Configfile::adjust(Section * section, std::string & opt, std::string & val)
+{
+	return section->load(opt, val);
+};
+
+bool Configfile::deserialize(std::ifstream& fd)
+{
+	Section * section = NULL;
+	
+	/* default selection! */
+	if (!select(&section))
+	{
+		_errors.push_back("default selection has failed!");
+		return false;
+	}
+
+	size_t count = 0;
+
+	while (fd.good())
+	{
+		std::string str;
+
+		/* read one line! */
+		std::getline(fd, str);
+
+		size_t lst = str.size() - 1;
+
+		if (str.size() >= 1 && str[lst] == '\r') //cuida das quebras de linha do tipo \r\n
+		{
+			str.erase(lst,1);
+			--lst;
+		}
+
+		/* empty line! */
+		if (str.size() == 0)
+			continue;
+
+		/* comment! */
+		if (str[0] == '#')
+			continue;
+
+		++count;
+
+		if (str[0] == '[' && str[lst] == ']')
+		{
+			str.erase(0,1);   --lst;
+			str.erase(lst,1); --lst;
+
+			if (!select(&section, str))
+			{
+				_errors.push_back(STG(FMT("erroneous section '%s'") % str));
+
+				/* ignore this section */
+				section = NULL;
+				continue;
+			}
+		}
+		else
+		{
+			std::string::size_type pos = str.find('=');
+
+			if (pos == std::string::npos)
+			{
+				_errors.push_back(STG(FMT("erroneous separator '%s'") % str));
+				continue;
+			};
+
+			if (section == NULL)
+			{
+				_errors.push_back(STG(FMT("no section for option '%s'") % str));
+				continue;
+			}
+
+			std::string  opt(str.substr(0,pos));
+			std::string  val(str.substr(pos+1));
+
+			if (_ignores.find(opt) != _ignores.end())
+				continue;
+
+			if (val == "@") val = "";
+
+			if (adjust(section, opt, val))
+				continue;
+
+			_errors.push_back(STG(FMT("option '%s' does "
+				"not exist or '%s' is not a valid value (at section '%s')")
+				% opt % val % section->name()));
+		}
+	}
+
+	// retorna 'true' se arquivo tinha alguma coisa valida.
+	return (count != 0);
+}
+
+bool Configfile::obtain()
+{
+	std::ifstream fd(_filename.c_str());
+
+	if (!fd.is_open())
+	{
+		_errors.push_back(STG(FMT("unable to open file '%s': %s")
+			% _filename % strerror(errno)));
+		return false;
+	};
+
+	if (!deserialize(fd))
+	{
+		fd.close();
+		return false;
+	}
+
+	fd.close();
+	return true;
+};
+
+void Configfile::recurse(std::ofstream& fd, Section * section)
+{
+	typedef Section::SectionMap::iterator section_iter;
+	typedef Section::OptionMap::iterator  option_iter;
+
+	for (option_iter i = section->option_begin(); i != section->option_end(); i++)
+	{
+		std::string res;
+
+		if ((*i).second.store(res))
+		{
+			if (res == "") res = "@";
+			fd << (*i).first << "=" << res << std::endl;
+		}
+	}
+	
+	if (!section->recursive())
+		return;
+	
+	for (section_iter j = section->section_begin(); j != section->section_end(); j++)
+		recurse(fd, (*j).second);
+}
+
+bool Configfile::serialize(std::ofstream& fd)
+{
+	recurse(fd, this);
+	return true;
+}
+
+bool Configfile::provide()
+{
+	std::string tmp(_filename);
+	tmp += ".new";
+
+	std::ofstream fd(tmp.c_str());
+
+	if (!fd.good())
+	{
+		_errors.push_back(STG(FMT("unable to open file '%s': %s")
+			% tmp % strerror(errno)));
+		return false;
+	}
+
+	if (!serialize(fd))
+	{
+		fd.close();
+		return false;
+	}
+
+	fd.close();
+
+	if (rename(tmp.c_str(), _filename.c_str()) != 0)
+	{
+		_errors.push_back(STG(FMT("unable to replace config file '%s': %s")
+			% _filename % strerror(errno)));
+		return false;
+	}
+
+	return true;
+}
+
+#if _MSC_VER >= 1400
+#define close _close
+#endif
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/configfile.hpp b/src/mod/endpoints/mod_khomp/commons/configurator/configfile.hpp
new file mode 100644
index 0000000000..61f42469af
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/configurator/configfile.hpp
@@ -0,0 +1,90 @@
+/*  
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.  
+  
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or  
+    modify it under the terms of the GNU Lesser General Public  
+    License as published by the Free Software Foundation; either  
+    version 2.1 of the License, or (at your option) any later version.  
+  
+    This library is distributed in the hope that it will be useful,  
+    but WITHOUT ANY WARRANTY; without even the implied warranty of  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+    Lesser General Public License for more details.  
+  
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  
+*/
+
+#include <vector>
+#include <fstream>
+#include <sstream>
+#include <set>
+
+#include <format.hpp>
+
+#include <configurator/section.hpp>
+
+#ifndef _CONFIG_CONFIGFILE_HPP_
+#define _CONFIG_CONFIGFILE_HPP_
+
+struct Configfile: public Section
+{
+	typedef std::list < std::string > ErrorVector;
+	typedef std::set < std::string >  NameSet;
+
+	Configfile(std::string name, std::string desc)
+	: Section(name, desc), _good(false) {};
+
+	virtual ~Configfile() {};
+
+	bool                good() { return _good;     };
+	std::string &   filename() { return _filename; };
+
+	ErrorVector &     errors() { return _errors;   };
+
+	void ignore(std::string);
+
+	virtual bool obtain();
+	virtual bool provide();
+
+ protected:
+	virtual bool select(Section **, std::string str = "");
+	virtual bool adjust(Section *, std::string & opt, std::string & val);
+
+	virtual bool deserialize(std::ifstream &);
+	virtual bool serialize(std::ofstream &);
+
+	void recurse(std::ofstream &, Section *);
+
+ protected:
+	bool             _good;
+	ErrorVector      _errors;
+	NameSet          _ignores;
+	std::string      _filename;
+};
+
+#endif /* _CONFIG_CONFIGFILE_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/option.cpp b/src/mod/endpoints/mod_khomp/commons/configurator/option.cpp
new file mode 100644
index 0000000000..083883e63f
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/configurator/option.cpp
@@ -0,0 +1,185 @@
+/*  
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.  
+  
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or  
+    modify it under the terms of the GNU Lesser General Public  
+    License as published by the Free Software Foundation; either  
+    version 2.1 of the License, or (at your option) any later version.  
+  
+    This library is distributed in the hope that it will be useful,  
+    but WITHOUT ANY WARRANTY; without even the implied warranty of  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+    Lesser General Public License for more details.  
+  
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  
+*/
+
+#include <configurator/option.hpp>
+
+bool Option::equals(std::string & value)
+{
+	switch (_restriction.numeral())
+	{
+		case Restriction::N_UNIQUE:
+		{
+			Restriction::Value my_value;
+
+			if (!_restriction.get(Restriction::F_USER, my_value))
+				return false;
+
+			return (my_value == value);
+		}
+		case Restriction::N_MULTIPLE:
+		{
+			Restriction::Vector my_values;
+
+			if (!_restriction.get(Restriction::F_USER, my_values))
+				return false;
+
+			for (Restriction::Vector::iterator i = my_values.begin(); i != my_values.end(); i++)
+			{
+				if ((*i) == value)
+					return true;
+			}
+			
+			return false;
+		}
+	}
+
+	return false;
+}
+
+bool Option::load(std::string & value)
+{
+	bool ret = _restriction.set(Restriction::F_FILE, value);
+
+	if (ret) _modified = false;
+
+	return ret;
+}
+
+bool Option::change(std::string & value)
+{
+	bool ret = _restriction.set(Restriction::F_FILE, value);
+
+	if (ret) _modified = true;
+
+	return ret;
+}
+
+bool Option::store(std::string & value)
+{
+	switch  (_restriction.numeral())
+	{
+		case Restriction::N_UNIQUE:
+			return _restriction.get(Restriction::F_FILE, value);
+		
+		case Restriction::N_MULTIPLE:
+		{
+			Restriction::Vector values;
+			
+			if (!_restriction.get(Restriction::F_FILE, values))
+				return false;
+
+			Strings::Merger strs;
+ 
+			for (Restriction::Vector::iterator i = values.begin(); i != values.end(); i++)
+				strs.add(*i);
+ 
+			value = strs.merge(","); 
+
+			return true;
+		}
+		
+		default:
+			return false;
+	}
+}
+
+Option::Flags Option::set(const char * value)
+{
+	std::string str_value(value);
+	return set(str_value);
+}
+
+
+Option::Flags Option::set(Restriction::Value & value)
+{
+	Restriction::Value  last_value, curr_value;
+	Flags               flags;
+	
+	bool ret1 = _restriction.get(Restriction::F_USER, last_value);
+	
+	if (!_restriction.set(Restriction::F_USER, value))
+		return flags;
+	
+	flags[F_ADJUSTED] = true;
+
+	bool ret2 = _restriction.get(Restriction::F_USER, curr_value);
+	
+	if (!ret1 || (ret2 && (last_value != curr_value)))
+	{
+		flags[F_MODIFIED] = true;
+		_modified = true;
+	}
+
+	return flags;
+}
+
+Option::Flags Option::set(Restriction::Vector & values)
+{
+	Restriction::Vector  last_values, curr_values;
+	Flags                flags;
+	
+	bool ret1 = _restriction.get(Restriction::F_USER, last_values);
+
+	if (!_restriction.set(Restriction::F_USER, values))
+		return flags;
+		
+	flags[F_ADJUSTED] = true;
+
+	bool ret2 = _restriction.get(Restriction::F_USER, curr_values);
+
+	if (!ret1 || (ret2 && (last_values != curr_values)))
+	{
+		flags[F_MODIFIED] = true;
+		_modified = true;
+	}
+
+	return flags;
+}
+
+bool Option::get(Restriction::Value & value)
+{
+	return _restriction.get(Restriction::F_USER, value);
+}
+
+bool Option::get(Restriction::Vector & values)
+{
+	return _restriction.get(Restriction::F_USER, values);
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/option.hpp b/src/mod/endpoints/mod_khomp/commons/configurator/option.hpp
new file mode 100644
index 0000000000..8aa103a0cc
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/configurator/option.hpp
@@ -0,0 +1,122 @@
+/*  
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.  
+  
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or  
+    modify it under the terms of the GNU Lesser General Public  
+    License as published by the Free Software Foundation; either  
+    version 2.1 of the License, or (at your option) any later version.  
+  
+    This library is distributed in the hope that it will be useful,  
+    but WITHOUT ANY WARRANTY; without even the implied warranty of  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+    Lesser General Public License for more details.  
+  
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  
+*/
+
+#include <iostream>
+
+#include <string>
+#include <list>
+#include <vector>
+
+#include <strings.hpp>
+
+#include <configurator/restriction.hpp>
+
+#ifndef _CONFIG_OPTION_HPP_
+#define _CONFIG_OPTION_HPP_
+
+struct Option
+{
+    enum FlagTypes
+    {
+		F_MODIFIED = 0x0, /* if option was modified */
+		F_ADJUSTED = 0x1, /* if option was correctly formated */
+    };
+
+	struct Flags: public std::vector<bool>
+	{
+		Flags(): std::vector<bool>(2) {};
+	};
+
+	typedef Restriction::Value   Value;
+	typedef Restriction::Vector Vector;
+
+    /* exception */
+    struct InvalidDefaultValue
+    {
+        InvalidDefaultValue(std::string name, std::string value)
+        : _name(name), _value(value) {};
+
+        std::string &  name() { return _name;  };
+        std::string & value() { return _value; };
+
+      protected:
+        std::string _name;
+        std::string _value;
+    };
+
+	Option(std::string name, std::string desc, std::string defvalue, Restriction restriction)
+	: _name(name), _desc(desc), _restriction(restriction), _modified(true)
+	{
+		std::string value(defvalue);
+
+		if (!(set(value)[F_ADJUSTED]))
+            throw InvalidDefaultValue(name, defvalue);
+	}
+
+	const std::string & name()        { return _name; };
+	const std::string & description() { return _desc; };
+
+	Restriction       & restriction() { return _restriction; };
+	bool                modified()    { return _modified;    };
+
+ public:
+	bool    load(std::string &);
+	bool    change(std::string &);
+	bool    store(std::string &);
+
+	Flags   set(const char  *);
+	Flags   set(Value  &);
+	Flags   set(Vector &);
+
+	bool    get(Value  &);
+	bool    get(Vector &);
+
+	bool    equals(std::string &);
+
+ protected:
+	std::string   _name;
+	std::string   _desc;
+
+	Restriction   _restriction;
+	bool          _modified;
+};
+
+#endif /* _CONFIG_OPTION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/restriction.cpp b/src/mod/endpoints/mod_khomp/commons/configurator/restriction.cpp
new file mode 100644
index 0000000000..9653a7c608
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/configurator/restriction.cpp
@@ -0,0 +1,353 @@
+/*  
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.  
+  
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or  
+    modify it under the terms of the GNU Lesser General Public  
+    License as published by the Free Software Foundation; either  
+    version 2.1 of the License, or (at your option) any later version.  
+  
+    This library is distributed in the hope that it will be useful,  
+    but WITHOUT ANY WARRANTY; without even the implied warranty of  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+    Lesser General Public License for more details.  
+  
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  
+*/
+
+#include <math.h>
+#include <string.h>
+
+#include <iostream>
+#include <strings.hpp>
+
+#include <configurator/restriction.hpp>
+
+/* internal helper! */
+bool Restriction::equalNumber(const double a, const double b)
+{
+    char tmp1[64];
+    char tmp2[64];
+
+    snprintf(tmp1, sizeof(tmp1), "%.3f", a);
+    snprintf(tmp2, sizeof(tmp2), "%.3f", b);
+
+    if (strncmp(tmp1, tmp2, sizeof(tmp1)))
+        return false;
+
+    return true;
+}
+
+/* process value to our internal representation */
+
+bool Restriction::process(Restriction::Format fmt,
+		const Restriction::Value & value, Restriction::Value & final)
+{
+	switch (_bounds)
+	{
+		case B_RANGE:
+		{
+			if (_kind != K_NUMBER)
+				return false;
+
+            std::string tmpvalue;
+            
+            Restriction::Value::const_iterator itr = value.begin();
+            Restriction::Value::const_iterator end = value.end();
+            
+            tmpvalue.reserve(value.size());
+
+            // f*cking dot/comma notation!
+            for (; itr != end; ++itr)
+                tmpvalue += ((*itr) != ',' ? (*itr) : '.');
+
+            try
+            {
+    			double newvalue = Strings::todouble(tmpvalue);
+
+                if (newvalue < _init && newvalue > _fini)
+                    return false;
+
+                double res = (newvalue - _init) / _step;
+
+                if (!equalNumber(res, rint(res)))
+                    return false;
+    
+		    	final = value;
+			    return true;
+            }
+            catch (...)
+            {
+                return false;
+            }
+		}
+		
+		case B_LIST:
+	 		for (List::iterator i = _list.begin(); i != _list.end(); i++)
+			{
+				Value & tmp = (*i);
+						
+				if (tmp == value)
+				{
+					final = value;
+					return true;
+				}
+			}
+			return false;
+
+		case B_MAPS:
+			switch (fmt)
+			{
+				case F_USER:
+				{
+		 			Map::iterator i = _map_from_usr.find(std::string(value));
+
+					if (i == _map_from_usr.end())
+						return false;
+
+					Value & tmp = (*i).second;
+
+					final = tmp;
+					return true;
+				}
+
+				case F_FILE:
+				{
+		 			Map::iterator i = _map_from_cfg.find(std::string(value));
+
+					if (i == _map_from_cfg.end())
+						return false;
+
+					final = value;
+					return true;
+				}
+
+				default:
+					break;
+			}
+			return false;
+					
+		case B_FREE:
+			final = value;
+			return true;
+
+		default:
+			break;
+	}
+
+	return false;
+}
+
+/* unprocess the value (outputs the external representation) */
+
+bool Restriction::unprocess(Restriction::Format fmt,
+		const Restriction::Value & value, Restriction::Value & final)
+{
+	switch (_bounds)
+	{
+		case B_MAPS:
+
+			switch (fmt)
+			{
+				case F_USER:
+				{
+ 					Map::iterator i = _map_from_cfg.find(std::string(value));
+
+					if (i == _map_from_cfg.end())
+						return false;
+
+					final = (*i).second;
+					return true;
+				}
+				default:
+					break;
+			}
+
+		default:
+			final = value;
+			return true;
+	}
+}
+
+/***************************** *****************************/
+
+bool Restriction::get(Restriction::Format fmt, Restriction::Value & value)
+{
+	if (_numeral != N_UNIQUE)
+		return false;
+
+	if (!unprocess(fmt, _value._unique, value))
+		return false;
+
+	return true;
+}
+
+bool Restriction::get(Restriction::Format fmt, Restriction::Vector & values)
+{
+	if (_numeral != N_MULTIPLE)
+		return false;
+
+    List & my_values = _value._multiple;
+
+	for (List::iterator i = my_values.begin(); i != my_values.end(); i++)
+	{
+		Value & value = (*i);
+		Value   final;
+				
+		if (!unprocess(fmt, value, final))
+			return false;
+
+		values.push_back(final);
+	};
+
+	return true;
+}
+
+/***************************** *****************************/
+
+bool Restriction::set(Restriction::Format fmt, Restriction::Value &value)
+{
+	switch (_numeral)
+	{
+		case N_UNIQUE:
+		{
+			Value final;
+
+			if (!process(fmt, value, final))
+				return false;
+
+			_value._unique = final;
+			return true;
+		}
+		
+		case N_MULTIPLE:
+		{
+			if (value == "@" || value == "#" || value == "")
+			{
+				_value._multiple.clear();
+				return true;
+			}
+			
+			Strings::vector_type values;
+			Strings::tokenize(value, values, ",");
+			
+			return set(fmt, values);
+		}
+		
+		default:
+			return false;
+	}
+}
+
+bool Restriction::set(Restriction::Format fmt, Restriction::Vector & values)
+{
+	if (_numeral != N_MULTIPLE)
+		return false;
+
+	if (values.empty())
+	{
+		_value._multiple.clear();
+	}
+	else
+	{
+		/* list needed to store temporary values */
+	    List finals;
+
+		for (Vector::iterator i = values.begin(); i != values.end(); i++)
+		{
+			Value & value = (*i);
+			Value   final;
+			
+			if (!process(fmt, value, final))
+				return false;
+
+			finals.push_back(final);
+		}
+		
+		List & lst = _value._multiple;
+
+		/* need to clear values set before */
+		lst.clear();
+		
+		for (List::iterator i = finals.begin(); i != finals.end(); i++)
+		{
+			Value value = (*i);
+			lst.push_back(value);
+		}
+	};
+
+	return true;
+}
+
+/***************************** *****************************/
+
+void Restriction::allowed(Restriction::Vector &vals)
+{
+	switch (_bounds)
+	{
+		case B_FREE:
+			return;
+
+		case B_LIST:
+			for (List::iterator i = _list.begin(); i != _list.end(); i++)
+				vals.push_back((*i));
+			break;
+
+		case B_MAPS:
+			for (Map::iterator i = _map_from_usr.begin(); i != _map_from_usr.end(); i++)
+				vals.push_back((*i).first);
+			break;
+
+		case B_RANGE:
+        {
+			if (_kind != K_NUMBER)
+				return;
+
+            // is there any fraction?
+            bool has_fraction = (!equalNumber(_init, rint(_init))) || (!equalNumber(_fini, rint(_fini))) || (!equalNumber(_step, rint(_step)));
+
+            const char * format = (has_fraction ? "%.2f" : "%02.0f");
+
+			for (double i = _init; i <= _fini; i += _step)
+			{
+				char tmp[32];
+				snprintf(tmp, sizeof(tmp), format, i);
+				vals.push_back(std::string(tmp));
+			}
+			break;
+        }
+
+		default:
+			break;
+	}
+}
+
+void Restriction::init_class()
+{
+	_value._unique.clear();
+	_value._multiple.clear();
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/restriction.hpp b/src/mod/endpoints/mod_khomp/commons/configurator/restriction.hpp
new file mode 100644
index 0000000000..0815ede3db
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/configurator/restriction.hpp
@@ -0,0 +1,321 @@
+/*  
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.  
+  
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or  
+    modify it under the terms of the GNU Lesser General Public  
+    License as published by the Free Software Foundation; either  
+    version 2.1 of the License, or (at your option) any later version.  
+  
+    This library is distributed in the hope that it will be useful,  
+    but WITHOUT ANY WARRANTY; without even the implied warranty of  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+    Lesser General Public License for more details.  
+  
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  
+*/
+
+#include <stdarg.h>
+
+#include <string>
+#include <list>
+#include <vector>
+#include <map>
+
+#ifndef _CONFIG_RESTRICTION_HPP_
+#define _CONFIG_RESTRICTION_HPP_
+
+struct Restriction
+{
+	/* generic types */
+	enum Format
+    {
+        F_USER,
+        F_FILE
+    };
+
+    enum Kind
+    {
+//        K_INTEGER,
+//        K_FLOAT,
+        K_STRING,
+        K_NUMBER // = K_INTEGER // compatibility
+    };
+
+    enum Bounds
+    {
+        B_FREE,
+        B_RANGE,
+        B_LIST,
+        B_MAPS
+    };
+
+    enum Numeral
+    {
+        N_UNIQUE,
+        N_MULTIPLE
+    };
+
+	typedef std::string   Value;
+
+	/* types used for data input */
+	struct Pair
+    {
+        const char *pretty;
+        const char *value;
+    };
+
+	typedef std::pair < Value, Value >   PairMap;
+	typedef std::list < PairMap >        ListMap;
+
+	/* types used internally */
+	typedef std::map < Value, Value >           Map;
+	typedef std::vector < Value >            Vector;
+
+	typedef std::list < Value >                List;
+	typedef std::pair < Value, Value >       MapPair;
+
+    struct Generic
+    {
+        Value _unique;
+        List  _multiple;
+    };
+
+	Restriction(Kind kind, Numeral num)
+	: _kind(kind), _bounds(B_FREE), _numeral(num), _unit(""),
+	  _init(-1), _fini(-1), _step(-1)
+	{
+		init_class();
+	}
+
+/*
+	Restriction(Kind kind, Numeral num,
+	            int init, int fini, int step = 1)
+	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
+	  _iinit(init), _ifini(fini), _istep(step),
+	  _finit(-1), _ffini(-1), _fstep(-1)
+	{
+		init_class();
+	}
+
+	Restriction(Kind kind, Numeral num,
+	            const char *unit, int init, int fini, int step = 1)
+	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
+	  _iinit(init), _ifini(fini), _istep(step),
+	  _finit(-1), _ffini(-1), _fstep(-1)
+	{
+		init_class();
+	}
+
+	Restriction(Kind kind, Numeral num,
+	            std::string unit, int init, int fini, int step = 1)
+	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
+	  _iinit(init), _ifini(fini), _istep(step),
+	  _finit(-1), _ffini(-1), _fstep(-1)
+	{
+		init_class();
+	}
+
+	Restriction(Kind kind, Numeral num,
+	            float init, float fini, float step = 1)
+	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
+	  _iinit(-1), _ifini(-1), _istep(-1)
+	  _finit(init), _ffini(fini), _fstep(step),
+	{
+		init_class();
+	}
+
+	Restriction(Kind kind, Numeral num,
+	            const char *unit, float init, float fini, float step = 1.0)
+	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
+	  _iinit(-1), _ifini(-1), _istep(-1)
+	  _finit(init), _ffini(fini), _fstep(step),
+	{
+		init_class();
+	}
+
+	Restriction(Kind kind, Numeral num,
+	            std::string unit, float init, float fini, float step = 1.0)
+	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
+	  _iinit(-1), _ifini(-1), _istep(-1)
+	  _finit(init), _ffini(fini), _fstep(step),
+	{
+		init_class();
+	}
+*/
+
+	Restriction(Kind kind, Numeral num,
+	            double init, double fini, double step = 1)
+	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(""),
+	  _init(init), _fini(fini), _step(step)
+	{
+		init_class();
+	}
+
+	Restriction(Kind kind, Numeral num,
+	            const char *unit, double init, double fini, double step = 1.0)
+	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
+	  _init(init), _fini(fini), _step(step)
+	{
+		init_class();
+	}
+
+	Restriction(Kind kind, Numeral num,
+	            std::string unit, double init, double fini, double step = 1.0)
+	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
+	  _init(init), _fini(fini), _step(step)
+	{
+		init_class();
+	}
+
+	Restriction(Kind kind, Numeral num,
+	            const char *first, ...)
+	: _kind(kind), _bounds(B_LIST), _numeral(num), _unit(""),
+	  _init(-1), _fini(-1), _step(-1)
+	{
+		_list.push_back(std::string(first));
+
+		va_list ap;
+		va_start(ap, first);
+
+		while (true)
+		{
+			const char *arg = va_arg(ap, const char *);
+
+			if (arg == NULL) break;
+
+			_list.push_back(std::string(arg));
+		}
+		
+		init_class();
+	}
+	
+	Restriction(Kind kind, const char *unit, Numeral num,
+	            const char *first, ...)
+	: _kind(kind), _bounds(B_LIST), _numeral(num), _unit(unit),
+	  _init(-1), _fini(-1), _step(-1)
+	{
+		_list.push_back(std::string(first));
+
+		va_list ap;
+		va_start(ap, first);
+
+		while (true)
+		{
+			const char *arg = va_arg(ap, const char *);
+
+			if (arg == NULL) break;
+
+			_list.push_back(std::string(arg));
+		}
+		
+		init_class();
+	}
+
+	Restriction(Kind kind, Numeral num,
+	            const struct Pair first, ...)
+	: _kind(kind), _bounds(B_MAPS), _numeral(num), _unit(""),
+	  _init(-1), _fini(-1), _step(-1)
+	{
+		_map_from_usr.insert(MapPair(Value(first.pretty), Value(first.value)));
+		_map_from_cfg.insert(MapPair(Value(first.value), Value(first.pretty)));
+
+		va_list ap;
+		va_start(ap, first);
+
+		while (true)
+		{
+			Pair arg = va_arg(ap, Pair);
+
+			if (arg.pretty == NULL) break;
+
+			_map_from_usr.insert(MapPair(Value(arg.pretty), Value(arg.value)));
+			_map_from_cfg.insert(MapPair(Value(arg.value), Value(arg.pretty)));
+		}
+		
+		init_class();
+	}
+	
+	Restriction(Kind kind, Numeral num, List list)
+	: _kind(kind), _bounds(B_LIST), _numeral(num), _unit(""),
+	  _init(-1), _fini(-1), _step(-1), _list(list)
+	{
+		init_class();
+	}
+
+	Restriction(Kind kind, Numeral num, ListMap map)
+	: _kind(kind), _bounds(B_MAPS), _numeral(num), _unit(""),
+	  _init(-1), _fini(-1), _step(-1)
+	{
+		for (ListMap::iterator i = map.begin(); i != map.end(); i++)
+		{
+			_map_from_usr.insert(MapPair(Value((*i).first), Value((*i).second)));
+			_map_from_cfg.insert(MapPair(Value((*i).second), Value((*i).first)));
+		}
+
+		init_class();
+	}
+
+	Kind      kind()    { return _kind;    };
+	Bounds    bounds()  { return _bounds;  };
+	Numeral   numeral() { return _numeral; };
+
+	Value   unit() { return _unit;    };
+
+	bool  set(Format, Vector &);
+	bool  set(Format, Value &);
+
+	bool  get(Format, Vector &);
+	bool  get(Format, Value &);
+
+	void  allowed(Vector &);
+
+ private:
+	bool  process(Format, const Value &, Value &);
+	bool  unprocess(Format, const Value &, Value &);
+	void  init_class();
+
+	bool  equalNumber(const double, const double);
+
+ protected:
+	Kind      _kind;
+	Bounds    _bounds;
+	Numeral   _numeral;
+
+	Value     _unit;
+
+	double    _init, _fini, _step;
+
+    Map       _map_from_usr,
+	          _map_from_cfg;
+
+	List      _list;
+	
+	Generic   _value;
+};
+
+#endif /* _CONFIG_RESTRICTION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/section.cpp b/src/mod/endpoints/mod_khomp/commons/configurator/section.cpp
new file mode 100644
index 0000000000..5d26858054
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/configurator/section.cpp
@@ -0,0 +1,130 @@
+/*  
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.  
+  
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or  
+    modify it under the terms of the GNU Lesser General Public  
+    License as published by the Free Software Foundation; either  
+    version 2.1 of the License, or (at your option) any later version.  
+  
+    This library is distributed in the hope that it will be useful,  
+    but WITHOUT ANY WARRANTY; without even the implied warranty of  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+    Lesser General Public License for more details.  
+  
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  
+*/
+
+#include <configurator/section.hpp>
+
+void Section::options(Section::OptionVector & vec)
+{
+	for (OptionMap::iterator it = _options.begin(); it != _options.end();)
+	{
+		vec.push_back(&((*it).second));
+		++it;
+	}
+}
+
+void Section::sections(Section::SectionVector & vec)
+{
+	for (SectionMap::iterator it = _sections.begin(); it != _sections.end();)
+	{
+		vec.push_back((*it).second);
+		++it;
+	}
+}
+
+/*********/
+
+Option * Section::option_find(std::string & str, bool recurse)
+{
+	OptionMap::iterator i = _options.find(str);
+
+	if (i == _options.end())
+    {
+        if (!recurse)
+            throw not_found();
+
+        for (SectionMap::iterator i = _sections.begin(); i != _sections.end(); i++)
+        {
+            try
+            {
+                return i->second->option_find(str, recurse);
+            }
+            catch (not_found & e)
+            {
+                /* keep looping! */
+            };
+        }
+
+        throw not_found();
+    }
+
+	return &((*i).second);
+}
+
+Option * Section::option_find(const char * str, bool recurse)
+{
+	std::string sstr(str);
+	return option_find(sstr, recurse);
+}
+
+/*********/
+
+Section * Section::section_find(std::string & str, bool recurse)
+{
+	SectionMap::iterator i = _sections.find(str);
+
+	if (i == _sections.end())
+    {
+        if (!recurse)
+            throw not_found();
+
+        for (SectionMap::iterator i = _sections.begin(); i != _sections.end(); i++)
+        {
+            try
+            {
+                return i->second->section_find(str, recurse);
+            }
+            catch (not_found & e)
+            {
+                /* keep looping! */
+            };
+        }
+
+        throw not_found();
+    }
+
+	return ((*i).second);
+}
+
+Section * Section::section_find(const char * str, bool recurse)
+{
+	std::string sstr(str);
+	return section_find(sstr, recurse);
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/section.hpp b/src/mod/endpoints/mod_khomp/commons/configurator/section.hpp
new file mode 100644
index 0000000000..fdb782308a
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/configurator/section.hpp
@@ -0,0 +1,226 @@
+/*  
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.  
+  
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or  
+    modify it under the terms of the GNU Lesser General Public  
+    License as published by the Free Software Foundation; either  
+    version 2.1 of the License, or (at your option) any later version.  
+  
+    This library is distributed in the hope that it will be useful,  
+    but WITHOUT ANY WARRANTY; without even the implied warranty of  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+    Lesser General Public License for more details.  
+  
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  
+*/
+
+#include <string>
+#include <vector>
+#include <map>
+#include <algorithm>
+#include <iostream>
+
+#include <configurator/option.hpp>
+
+#ifndef _CONFIG_SECTION_HPP_
+#define _CONFIG_SECTION_HPP_
+
+struct Section
+{
+	typedef std::map < std::string, Option >   OptionMap;
+	typedef std::vector< Option * >            OptionVector;
+
+	typedef std::map < std::string, Section * > SectionMap;
+	typedef std::vector < Section * >           SectionVector;
+
+	struct not_found {}; /* exception */
+	
+// protected:
+	Section(std::string name, std::string desc, bool recursive = true)
+	: _name(name), _description(desc), _recursive(recursive) {};
+
+	void add(Option o)
+	{
+		_options.insert(std::pair<std::string,Option>(o.name(), o));
+	};
+
+	void del(std::string name)
+	{
+		_options.erase(name);
+	};
+
+	void add(Section *s)
+	{
+		_sections.insert(std::pair<std::string,Section*>(s->name(), s));
+	};
+
+ public:
+	const std::string & name()           { return _name;        };
+	const std::string & description()    { return _description; };
+	const bool		  & recursive()      { return _recursive;   };
+
+	OptionMap::iterator option_begin()   { return _options.begin(); };
+	OptionMap::iterator option_end()     { return _options.end();   };
+
+	SectionMap::iterator section_begin() { return _sections.begin(); };
+	SectionMap::iterator section_end()   { return _sections.end();   };
+
+	/**/
+
+	Option  *  option_find(const char *, bool recurse = false);
+	Section * section_find(const char *, bool recurse = false);
+
+	Option  *  option_find(std::string &, bool recurse = false);
+	Section * section_find(std::string &, bool recurse = false);
+
+	/**/
+
+	void options(OptionVector &);
+	void sections(SectionVector &);
+
+	/**/
+
+	template <typename F>
+	bool search_and_apply(std::string &key, std::string &value, F f)
+	{
+		OptionMap::iterator i = _options.find(key);
+
+		if (i != _options.end())
+			return f((*i).second);
+
+		if (!_recursive)
+			return false;
+
+		return (find_if(_sections.begin(), _sections.end(), f) != _sections.end());
+	}
+
+ private:
+	struct key_value
+	{
+		key_value(std::string &k, std::string &v): _k(k), _v(v) {};
+		std::string & _k, & _v;
+	};
+
+	struct load_section: protected key_value
+	{
+		load_section(std::string &k, std::string &v): key_value(k,v) {};
+
+		bool operator()(Option &o)                 { return o.load(_v);            };
+		bool operator()(SectionMap::value_type &v) { return v.second->load(_k,_v); };
+	};
+
+	struct change_section: protected key_value
+	{
+		change_section(std::string &k, std::string &v): key_value(k,v) {};
+
+		bool operator()(Option &o)                 { return o.change(_v);            };
+		bool operator()(SectionMap::value_type &v) { return v.second->change(_k,_v); };
+	};
+
+	struct store_section: protected key_value
+	{
+		store_section(std::string &k, std::string &v): key_value(k,v) {};
+
+		bool operator()(Option &o)                 { return o.store(_v);            };
+		bool operator()(SectionMap::value_type &v) { return v.second->store(_k,_v); };
+	};
+
+	struct set_section: protected key_value
+	{
+		set_section(std::string &k, std::string &v): key_value(k,v) {};
+
+		bool operator()(Option &o)                 { return (o.set(_v))[Option::F_ADJUSTED]; };
+		bool operator()(SectionMap::value_type &v) { return  v.second->set(_k,_v);           };
+	};
+
+	struct get_section: protected key_value
+	{
+		get_section(std::string &k, std::string &v): key_value(k,v) {};
+
+		bool operator()(Option &o)                 { return o.get(_v);            };
+		bool operator()(SectionMap::value_type &v) { return v.second->get(_k,_v); };
+	};
+
+	struct modified_section
+	{
+		bool operator()(OptionMap::value_type  &v) { return v.second.modified();  };
+		bool operator()(SectionMap::value_type &v) { return v.second->modified(); };
+	};
+
+ public:
+	bool load(const char * key, std::string value)
+	{
+		std::string skey(key);
+		return search_and_apply(skey, value, load_section(skey, value));
+	}
+
+	bool load(std::string &key, std::string &value)
+	{
+		return search_and_apply(key, value, load_section(key, value));
+	}
+
+	bool change(std::string &key, std::string &value)
+	{
+		return search_and_apply(key, value, change_section(key, value));
+	}
+
+	bool store(std::string &key, std::string &value)
+	{
+		return search_and_apply(key, value, store_section(key, value));
+	}
+
+	bool set(std::string &key, std::string &value)
+	{
+		return search_and_apply(key, value, set_section(key, value));
+	}
+
+	bool get(std::string &key, std::string &value)
+	{
+		return search_and_apply(key, value, get_section(key, value));
+	}
+
+	bool modified()
+	{
+		return ((find_if(_options.begin(), _options.end(), modified_section()) != _options.end()) ||
+		        (find_if(_sections.begin(), _sections.end(), modified_section()) != _sections.end()));
+	}
+
+ private:
+	Section() {};
+
+ protected:
+    std::string       _name;
+	std::string       _description;
+
+    OptionMap         _options;
+    SectionMap        _sections;
+
+    bool              _recursive;
+};
+
+#endif /* _CONFIG_SECTION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/flagger.hpp b/src/mod/endpoints/mod_khomp/commons/flagger.hpp
new file mode 100644
index 0000000000..49a4adda0f
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/flagger.hpp
@@ -0,0 +1,102 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <map>
+
+#include <initializer.hpp>
+
+#ifndef _FLAGGER_HPP_
+#define _FLAGGER_HPP_
+
+template < typename Flag >
+struct Flagger
+{
+ protected:
+    struct Bool
+    {
+        Bool():        value(false) {};
+        Bool(bool &v): value(v)     {};
+
+        bool value;
+    };
+
+    typedef std::map< Flag, Bool >  Map;
+
+ public:
+    typedef  Initializer< Flag >  InitFlags;
+
+    Flagger() {};
+
+    Flagger(InitFlags flags)
+    {
+        for (typename InitFlags::iterator i = flags.begin(); i != flags.end(); i++)
+        {
+            Flag & flag = (*i);
+            _map[flag].value = true;
+        };
+    };
+
+    void set(Flag elt, bool value = true)
+    {
+        _map[elt].value = value;
+    }
+
+    bool is_set(Flag elt)
+    {
+        return _map[elt].value;
+    }
+
+    Flagger & operator&(Flag elt)
+    {
+        set(elt);
+        return *this;
+    };
+
+    bool operator[](Flag elt)
+    {
+        return is_set(elt);
+    };
+
+ protected:
+     Map _map;
+};
+
+#endif /* _FLAGGER_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/format.cpp b/src/mod/endpoints/mod_khomp/commons/format.cpp
new file mode 100644
index 0000000000..20f79204ec
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/format.cpp
@@ -0,0 +1,331 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include "format.hpp"
+//#include <iostream>
+
+Format::Format(const char  * format_string, bool raise_exception)
+: _format(format_string), _valid(true), _raise(raise_exception)
+{
+    initialize(format_string);
+}
+
+/*
+Format::Format(std::string & format_string, bool raise_exception)
+: _format(NULL), _valid(true), _raise(raise_exception)
+{
+    initialize(format_string.c_str());
+}
+*/
+
+Format::Format(std::string   format_string, bool raise_exception)
+: _format(format_string), _valid(true), _raise(raise_exception)
+{
+    initialize(format_string.c_str());
+}
+
+void Format::initialize(const char * format_string)
+{
+    std::string txt;
+
+    const char * ptr = format_string;
+
+    while (*ptr != '\0')
+    {
+        if (*ptr != '%')
+        {
+            txt += *ptr;
+            ++ptr;
+            continue;
+        }
+
+        const char * ptr2 = ptr+1;
+
+        if (*ptr2 == '%')
+        {
+            txt += *ptr;
+
+            ptr += 2;
+            continue;
+        }
+
+        if (!txt.empty())
+            push_argument(txt, T_LITERAL);
+
+        std::string arg(1, *ptr);
+
+        ++ptr;
+
+        bool finished = false;
+
+        short long_count = 0;
+        short short_count = 0;
+
+        while(*ptr != '\0' && !finished)
+        {
+            switch (*ptr)
+            {
+                case ' ':
+                    // uncomplete format with ' ', make it a literal.
+                    arg += *ptr;
+                    push_argument(arg, T_LITERAL);
+                    finished = true;
+                    break;
+
+                case '%':
+                    // uncomplete format with '%', make it a literal and start a new format.
+                    push_argument(arg, T_LITERAL);
+                    arg += *ptr;
+                    break;
+
+                case 'h':
+                    short_count = std::min<short>(short_count+1, 2);
+                    long_count = 0;
+                    arg += *ptr;
+                    break;
+
+                case 'l':
+                    long_count = std::min<short>(long_count+1, 2);
+                    short_count = 0;
+                    arg += *ptr;
+                    break;
+
+                case 'd':
+                case 'i':
+                    arg += *ptr;
+                    switch (long_count - short_count)
+                    {
+                        case  2:
+                            push_argument(arg, T_SIGNED_LONG_LONG);
+                            break;
+                        case  1:
+                            push_argument(arg, T_SIGNED_LONG);
+                            break;
+                        case  0:
+                            push_argument(arg, T_SIGNED_INT);
+                            break;
+                        case -1:
+                            push_argument(arg, T_SIGNED_SHORT);
+                            break;
+                        case -2:
+                            push_argument(arg, T_SIGNED_SHORT_SHORT);
+                            break;
+                        default:
+                            break;
+                    }
+                    finished = true;
+                    break;
+
+                case 'o':
+                case 'u':
+                case 'x':
+                case 'X':
+                    arg += *ptr;
+                    switch (long_count - short_count)
+                    {
+                        case  2:
+                            push_argument(arg, T_UNSIGNED_LONG_LONG);
+                            break;
+                        case  1:
+                            push_argument(arg, T_UNSIGNED_LONG);
+                            break;
+                        case  0:
+                            push_argument(arg, T_UNSIGNED_INT);
+                            break;
+                        case -1:
+                            push_argument(arg, T_UNSIGNED_SHORT);
+                            break;
+                        case -2:
+                            push_argument(arg, T_UNSIGNED_SHORT_SHORT);
+                            break;
+                        default:
+                            break;
+                    }
+                    finished = true;
+                    break;
+
+                case 'e':
+                case 'E':
+                case 'f':
+                case 'F':
+                case 'g':
+                case 'G':
+                case 'a':
+                case 'A':
+                    arg += *ptr;
+                    push_argument(arg, T_FLOAT);
+                    finished = true;
+                    break;
+
+                case 'c':
+                    arg += *ptr;
+                    push_argument(arg, T_CHAR);
+                    finished = true;
+                    break;
+
+                case 's':
+                    arg += *ptr;
+                    push_argument(arg, T_STRING);
+                    finished = true;
+                    break;
+
+                case 'p':
+                    arg += *ptr;
+                    push_argument(arg, T_POINTER);
+                    finished = true;
+                    break;
+
+                case 'C':
+                case 'S':
+                case 'm':
+                case 'n': // unsupported for now.
+                    arg += *ptr;
+                    push_argument(arg, T_ANYTHING);
+                    finished = true;
+                    break;
+
+                default:
+                    arg += *ptr;
+                    break;
+            }
+
+            ++ptr;
+        }
+
+        if (!arg.empty())
+            push_argument(arg, T_LITERAL);
+    }
+
+    if (!txt.empty())
+        push_argument(txt, T_LITERAL);
+}
+
+void Format::mark_invalid(std::string & msg)
+{
+    if (_valid)
+    {
+        _valid = false;
+
+        std::string finalmsg;
+
+        finalmsg += "** INVALID FORMAT: ";
+        finalmsg += msg;
+        finalmsg += " **";
+
+        _result = finalmsg;
+    }
+}
+
+void Format::raise_check(void)
+{
+    if (!_valid && _raise)
+        throw InvalidFormat(_result);
+}
+
+bool Format::validity_check(void)
+{
+    raise_check();
+
+    return _valid;
+}
+
+const Format::Argument * Format::next_argument(void)
+{
+//    std::cerr << "size: " << _args.size() << std::endl;
+
+    while (true)
+    {
+//        std::cerr << "loop size: " << _args.size() << std::endl;
+
+        if (_args.empty())
+            return NULL; // throw NoArgumentLeft();
+
+        const Argument & top = _args.front();
+
+        if (top.type() == T_LITERAL)
+        {
+//            std::cerr << "top type == LITERAL, looping..." << std::endl;
+            _result += top.fmts();
+            pop_argument();
+        }
+        else
+        {
+//            std::cerr << "top type: " << top.type() << std::endl;
+            return &top;
+        }
+    }
+}
+
+void Format::pop_argument(void)
+{
+    _args.pop();
+}
+
+void Format::push_argument(std::string & data, Format::Type type)
+{
+//    std::cerr << "pushing type (" << type << ") with format (" << data << ")" << std::endl;
+
+    _args.push(Argument(data, type));
+    data.clear();
+}
+
+std::string Format::str()
+{
+    if (!validity_check())
+        return _result;
+
+    if (next_argument() == NULL)
+        return _result;
+
+    std::string msg;
+
+    msg += "too few arguments passed for format '";
+    msg += _format;
+    msg += "' (";
+    msg += _format;
+    msg += ")";
+
+    mark_invalid(msg);
+
+    return _result;
+}
+
+
diff --git a/src/mod/endpoints/mod_khomp/commons/format.hpp b/src/mod/endpoints/mod_khomp/commons/format.hpp
new file mode 100644
index 0000000000..b1ebe74396
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/format.hpp
@@ -0,0 +1,512 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#ifndef _FORMAT_H_
+#define _FORMAT_H_
+
+#include <cstring>
+#include <cstdlib>
+#include <typeinfo>
+#include <stdexcept>
+#include <string>
+#include <queue>
+#include <iostream>
+#include <stdio.h>
+
+#ifdef WIN32 // WINDOWS
+#include <KHostSystem.h>
+#endif
+
+
+/* macros used for shortening lines and making the code clearer */
+#define STG(x) (x).str()
+#define FMT(x) Format(x)
+
+struct Format
+{
+    static const unsigned int strings_base_length = 64;
+    static const unsigned int generic_base_length = 64;
+
+    struct InvalidFormat
+    {
+        InvalidFormat(std::string msg) : _msg(msg) {}
+
+        std::string _msg;
+    };
+
+    explicit Format(const char  * format_string, bool raise_exception = false);
+    explicit Format(std::string   format_string, bool raise_exception = false);
+
+    void initialize(const char *);
+
+    std::string str(void);
+
+    ////////////////////////////////////////////////////////////
+
+ protected:
+
+    enum Type
+    {
+        T_ANYTHING = 1,
+
+        T_SIGNED_SHORT,
+        T_SIGNED_SHORT_SHORT,
+        T_SIGNED_INT,
+        T_SIGNED_LONG,
+        T_SIGNED_LONG_LONG,
+
+        T_UNSIGNED_SHORT,
+        T_UNSIGNED_SHORT_SHORT,
+        T_UNSIGNED_INT,
+        T_UNSIGNED_LONG,
+        T_UNSIGNED_LONG_LONG,
+
+        T_FLOAT,
+        T_CHAR,
+
+        T_POINTER,
+        T_STRING,
+
+        T_LITERAL
+    };
+
+    struct Argument
+    {
+        Argument(std::string fmts, Type type)
+        : _fmts(fmts), _type(type) {};
+
+        Type                type(void) const { return _type; }
+        const std::string & fmts(void) const { return _fmts; }
+
+     protected:
+        std::string _fmts;
+        Type        _type;
+    };
+
+    typedef std::queue < Argument > ArgumentQueue;
+
+    ////////////////////////////////////////////////////////////
+
+ public:
+
+    template < typename V >
+    Format & operator%( V value )
+    {
+        if (!validity_check())
+            return *this;
+
+        const Argument * top = next_argument();
+
+        if (top == NULL)
+        {
+            std::string msg;
+
+            msg += "too many arguments passed for format '";
+            msg += _format;
+            msg += "'";
+
+            mark_invalid(msg);
+        }
+        else
+        {
+            char temp[generic_base_length];
+
+            if (!generic_verify(value, top->type()))
+            {
+                std::string msg;
+
+                msg += "type mismatch: got type '";
+                msg += typeid(value).name();
+                msg += "' in format '";
+                msg += top->fmts();
+                msg += "' (";
+                msg += _format;
+                msg += ")";
+
+                mark_invalid(msg);
+                return *this;
+            }
+
+            snprintf(temp, sizeof(temp), top->fmts().c_str(), value);
+            _result += temp;
+
+            pop_argument();
+        }
+
+        raise_check();
+        return *this;
+    }
+
+    template < typename V >
+    Format & operator%( V * value )
+    {
+        if (!validity_check())
+            return *this;
+
+        const Argument * top = next_argument();
+
+        if (top == NULL)
+        {
+            std::string msg;
+
+            msg += "too many arguments passed for format '";
+            msg += _format;
+            msg += "'";
+
+            mark_invalid(msg);
+        }
+        else
+        {
+            switch (top->type())
+            {
+                case T_POINTER:
+                {
+                    char temp[generic_base_length];
+                    snprintf(temp, sizeof(temp), top->fmts().c_str(), value);
+                    _result += temp;
+                    break;
+                }
+
+                case T_STRING:
+                {
+                    if ((typeid(const char)          == typeid(V)) ||
+                        (typeid(char)                == typeid(V)) ||
+                        (typeid(const unsigned char) == typeid(V)) ||
+                        (typeid(unsigned char)       == typeid(V)) ||
+                        (typeid(const void)          == typeid(V)) ||
+                        (typeid(void)                == typeid(V)))
+                    {
+                        int len = strlen((const char*)value)+strings_base_length+1;
+
+                        char * temp = new char[len];
+
+                        snprintf(temp, len, top->fmts().c_str(), value);
+                        _result += temp;
+
+                        delete[] temp;
+                    }
+                    else
+                    {
+                        std::string msg;
+
+                        msg += "type mismatch: got type '";
+                        msg += typeid(value).name();
+                        msg += "' in string format (";
+                        msg += _format;
+                        msg += ")";
+
+                        mark_invalid(msg);
+                    }
+                    break;
+                }
+
+                default:
+                {
+                    std::string msg;
+
+                    msg += "type mismatch: got pointer/string type in format '";
+                    msg += top->fmts();
+                    msg += "' (";
+                    msg += _format;
+                    msg += ")";
+
+                    mark_invalid(msg);
+                    break;
+                }
+            }
+
+            pop_argument();
+        }
+
+        raise_check();
+        return *this;
+    }
+
+/*
+    Format & operator%( std::string   value )
+    {
+        return operator%(value);
+    }
+*/
+
+    Format & operator%( const std::string value )
+    {
+        if (!validity_check())
+            return *this;
+
+        const Argument * top = next_argument();
+
+        if (top == NULL)
+        {
+            std::string msg;
+
+            msg += "too many arguments passed for format '";
+            msg += _format;
+            msg += "'";
+
+            mark_invalid(msg);
+        }
+        else
+        {
+            if (top->type() == T_STRING)
+            {
+                int len = value.length()+strings_base_length+1;
+
+                char * temp = new char[len];
+
+                snprintf(temp, len, top->fmts().c_str(), value.c_str());
+                _result += temp;
+
+                delete[] temp;
+            }
+            else
+            {
+                std::string msg;
+
+                msg += "type mismatch: got string type in format '";
+                msg += top->fmts();
+                msg += "' (";
+                msg += _format;
+                msg += ")";
+
+                mark_invalid(msg);
+            }
+
+            pop_argument();
+        }
+
+        raise_check();
+        return *this;
+    }
+
+ protected:
+
+    template < typename V >
+    bool number_verify_signed_short( V value )
+    {
+        return
+           ((typeid(V) == typeid(short int) ||
+             typeid(V) == typeid(short) ||
+             typeid(V) == typeid(const short int) ||
+             typeid(V) == typeid(const short) ||
+             typeid(V) == typeid(volatile short int) ||
+             typeid(V) == typeid(volatile short)) &&
+             sizeof(V) == sizeof(short));
+    }
+
+    template < typename V >
+    bool number_verify_unsigned_short( V value )
+    {
+        return
+           ((typeid(V) == typeid(unsigned short int) ||
+             typeid(V) == typeid(unsigned short) ||
+             typeid(V) == typeid(const unsigned short int) ||
+             typeid(V) == typeid(const unsigned short) ||
+             typeid(V) == typeid(volatile unsigned short int) ||
+             typeid(V) == typeid(volatile unsigned short)) &&
+             sizeof(V) == sizeof(unsigned short));
+    }
+
+    template < typename V >
+    bool number_verify_signed_long( V value )
+    {
+        return
+           ((typeid(V) == typeid(long int) ||
+             typeid(V) == typeid(long) ||
+             typeid(V) == typeid(const long int) ||
+             typeid(V) == typeid(const long) ||
+             typeid(V) == typeid(volatile long int) ||
+             typeid(V) == typeid(volatile long)) &&
+             sizeof(V) == sizeof(long));
+    }
+
+    template < typename V >
+    bool number_verify_unsigned_long( V value )
+    {
+        return
+           ((typeid(V) == typeid(unsigned long int) ||
+             typeid(V) == typeid(unsigned long) ||
+             typeid(V) == typeid(const unsigned long int) ||
+             typeid(V) == typeid(const unsigned long) ||
+             typeid(V) == typeid(volatile unsigned long int) ||
+             typeid(V) == typeid(volatile unsigned long)) &&
+             sizeof(V) == sizeof(long long));
+    }
+
+    template < typename V >
+    bool number_verify_signed_long_long( V value )
+    {
+        return
+           ((typeid(V) == typeid(long long int) ||
+             typeid(V) == typeid(long long) ||
+             typeid(V) == typeid(const long long int) ||
+             typeid(V) == typeid(const long long) ||
+             typeid(V) == typeid(volatile long long) ||
+             typeid(V) == typeid(volatile long long int)) &&
+             sizeof(V) == sizeof(long long));
+    }
+
+    template < typename V >
+    bool number_verify_unsigned_long_long( V value )
+    {
+        return
+           ((typeid(V) == typeid(unsigned long long int) ||
+             typeid(V) == typeid(unsigned long long) ||
+             typeid(V) == typeid(const unsigned long long int) ||
+             typeid(V) == typeid(const unsigned long long) ||
+             typeid(V) == typeid(volatile unsigned long long) ||
+             typeid(V) == typeid(volatile unsigned long long int)) &&
+             sizeof(V) == sizeof(unsigned long long));
+    }
+
+    template < typename V >
+    bool number_verify_signed_int( V value )
+    {
+        return
+            (sizeof(V) <= sizeof(int) ||
+             typeid(V) == typeid(int) ||
+             typeid(V) == typeid(const int) ||
+             typeid(V) == typeid(volatile int));
+    }
+
+    template < typename V >
+    bool number_verify_unsigned_int( V value )
+    {
+        return
+            (sizeof(V) <= sizeof(unsigned int) ||
+             typeid(V) == typeid(unsigned int) ||
+             typeid(V) == typeid(const unsigned int) ||
+             typeid(V) == typeid(volatile unsigned int));
+    }
+
+    template < typename V >
+    bool generic_verify( V value, Type type )
+    {
+        switch (type)
+        {
+            /* EXCEPTION: consider any number an valid input. */
+            case T_SIGNED_INT:
+            case T_UNSIGNED_INT:
+                return
+                    (number_verify_signed_int(value)     ||
+                     number_verify_unsigned_int(value)   ||
+                     number_verify_signed_long(value)    ||
+                     number_verify_unsigned_long(value)  ||
+                     number_verify_signed_short(value)   ||
+                     number_verify_unsigned_short(value));
+
+            case T_SIGNED_SHORT_SHORT:
+                return (typeid(V) == typeid(char) || typeid(V) == typeid(const char));
+
+            case T_SIGNED_SHORT:
+                return number_verify_signed_short(value);
+
+            case T_SIGNED_LONG:
+                return number_verify_signed_long(value);
+
+            case T_SIGNED_LONG_LONG:
+                return number_verify_signed_long_long(value);
+
+            case T_UNSIGNED_SHORT_SHORT:
+                return (typeid(V) == typeid(unsigned char) || typeid(V) == typeid(unsigned char));
+
+            case T_UNSIGNED_SHORT:
+                return number_verify_unsigned_short(value);
+
+            case T_UNSIGNED_LONG:
+                return number_verify_unsigned_long(value);
+
+            case T_UNSIGNED_LONG_LONG:
+                return number_verify_unsigned_long_long(value);
+
+            case T_FLOAT:
+                return (typeid(V) == typeid(float)) || (typeid(V) == typeid(double) ||
+                    typeid(V) == typeid(const float)) || (typeid(V) == typeid(const double));
+
+            case T_CHAR:
+                return (typeid(V) == typeid(char)) || (typeid(V) == typeid(unsigned char) ||
+                    typeid(V) == typeid(const char)) || (typeid(V) == typeid(const unsigned char));
+
+            case T_POINTER:
+            case T_STRING:
+                return false;
+
+            case T_ANYTHING:
+                return true;
+
+            case T_LITERAL:
+                return false;
+        }
+
+        return false;
+    };
+
+    void mark_invalid(std::string &);
+
+    bool validity_check(void);
+    void raise_check(void);
+
+/*
+    struct NoArgumentLeft
+    {
+        NoArgumentLeft(): empty(0) {};
+
+        unsigned int empty;
+    };
+*/
+
+    const Argument * next_argument(void);
+
+    void pop_argument(void);
+    void push_argument(std::string & data, Type type);
+
+ private:
+    std::string   _format;
+
+    bool          _valid;
+    bool          _raise;
+
+    std::string   _result;
+    ArgumentQueue _args;
+};
+
+#endif /* _FORMAT_H_ */
+
diff --git a/src/mod/endpoints/mod_khomp/commons/freeswitch/saved_condition.cpp b/src/mod/endpoints/mod_khomp/commons/freeswitch/saved_condition.cpp
new file mode 100644
index 0000000000..29169f3d54
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/freeswitch/saved_condition.cpp
@@ -0,0 +1,62 @@
+/*  
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.  
+  
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or  
+    modify it under the terms of the GNU Lesser General Public  
+    License as published by the Free Software Foundation; either  
+    version 2.1 of the License, or (at your option) any later version.  
+  
+    This library is distributed in the hope that it will be useful,  
+    but WITHOUT ANY WARRANTY; without even the implied warranty of  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+    Lesser General Public License for more details.  
+  
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  
+*/
+
+#include "saved_condition.hpp"
+
+bool SavedCondition::wait(unsigned int msec)
+{
+	bool ret = true;
+
+    switch_mutex_lock(_mutex);
+
+    if (!_signaled)
+	{
+        /* msec * 1000 = The amount of time in microseconds to wait. */
+		if (switch_thread_cond_timedwait(_condition, _mutex, (switch_interval_time_t)msec * 1000) != 0)
+			ret = false;
+	}
+        
+    _signaled = false;
+
+	switch_mutex_unlock(_mutex);
+
+	return ret;
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/freeswitch/saved_condition.hpp b/src/mod/endpoints/mod_khomp/commons/freeswitch/saved_condition.hpp
new file mode 100644
index 0000000000..8acf0f3e0b
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/freeswitch/saved_condition.hpp
@@ -0,0 +1,136 @@
+/*  
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.  
+  
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or  
+    modify it under the terms of the GNU Lesser General Public  
+    License as published by the Free Software Foundation; either  
+    version 2.1 of the License, or (at your option) any later version.  
+  
+    This library is distributed in the hope that it will be useful,  
+    but WITHOUT ANY WARRANTY; without even the implied warranty of  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+    Lesser General Public License for more details.  
+  
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  
+*/
+
+#ifndef _SAVED_CONDITION_
+#define _SAVED_CONDITION_
+
+#include <saved_condition.hpp>
+
+extern "C"
+{
+    #include <switch.h>
+}
+
+struct SavedCondition : public SavedConditionCommon// : public RefCounter < SavedCondition >
+{
+    typedef switch_thread_cond_t  BaseConditionType;
+    typedef switch_mutex_t        BaseMutexType;
+
+     SavedCondition(switch_memory_pool_t *pool=NULL):
+        _pool(pool),
+        _can_delete_pool(false)
+     {
+        if(!_pool)
+        {
+            switch_core_new_memory_pool(&_pool);
+            _can_delete_pool = true;
+        }
+
+        switch_thread_cond_create(&_condition, _pool);
+        switch_mutex_init(&_mutex, SWITCH_MUTEX_DEFAULT, _pool);
+     }
+
+     //SavedCondition(const SavedCondition &);
+    ~SavedCondition()
+    {
+        switch_thread_cond_destroy(_condition);
+        switch_mutex_destroy(_mutex);
+
+        if(_can_delete_pool)
+            switch_core_destroy_memory_pool(&_pool);
+    }
+
+    void signal(void)
+    {
+        switch_mutex_lock(_mutex);
+
+        _signaled = true;
+        switch_thread_cond_signal(_condition);
+
+        switch_mutex_unlock(_mutex);
+    }
+
+    void broadcast(void)
+    {
+        switch_mutex_lock(_mutex);
+
+        _signaled = true;
+        switch_thread_cond_broadcast(_condition);
+
+        switch_mutex_unlock(_mutex);
+    }
+
+    void wait(void)
+    {
+        switch_mutex_lock(_mutex);
+
+        if (!_signaled)
+            switch_thread_cond_wait(_condition, _mutex);
+        
+        _signaled = false;
+
+        switch_mutex_unlock(_mutex);
+    }
+
+    bool wait(unsigned int);
+
+    void reset(void)
+    {
+        switch_mutex_lock(_mutex);
+
+        _signaled = false;
+
+        switch_mutex_unlock(_mutex);
+    }
+
+    BaseMutexType     * mutex()     { return _mutex;     };
+    BaseConditionType * condition() { return _condition; };
+
+ protected:
+
+    BaseConditionType    *_condition;
+    BaseMutexType        *_mutex;
+    switch_memory_pool_t *_pool;
+    bool                 _can_delete_pool;
+};
+
+#endif /* _SAVED_CONDITION_ */
+
diff --git a/src/mod/endpoints/mod_khomp/commons/freeswitch/simple_lock.hpp b/src/mod/endpoints/mod_khomp/commons/freeswitch/simple_lock.hpp
new file mode 100644
index 0000000000..530d912ee1
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/freeswitch/simple_lock.hpp
@@ -0,0 +1,177 @@
+/*  
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.  
+  
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or  
+    modify it under the terms of the GNU Lesser General Public  
+    License as published by the Free Software Foundation; either  
+    version 2.1 of the License, or (at your option) any later version.  
+  
+    This library is distributed in the hope that it will be useful,  
+    but WITHOUT ANY WARRANTY; without even the implied warranty of  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+    Lesser General Public License for more details.  
+  
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  
+*/
+
+#ifndef _SIMPLE_LOCK_HPP_
+#define _SIMPLE_LOCK_HPP_
+
+#include <simple_lock.hpp>
+
+extern "C"
+{
+    #include <switch.h>
+}
+
+template < typename Implementor >
+struct SimpleLockBasic: public SimpleLockCommon < Implementor >
+{
+    typedef SimpleLockCommon < Implementor >   Super;
+    typedef typename Super::Result            Result;
+
+    typedef switch_mutex_t BaseMutexType;
+
+    SimpleLockBasic(switch_memory_pool_t *pool = NULL)
+    : _pool(pool), _can_delete_pool( (_pool == NULL) )
+
+    {
+        if(!_pool)
+            switch_core_new_memory_pool(&_pool);
+
+        //switch_mutex_init(&_mutex, SWITCH_MUTEX_DEFAULT, _pool);
+        switch_mutex_init(&_mutex, SWITCH_MUTEX_NESTED, _pool);
+    }
+
+    virtual ~SimpleLockBasic()
+    {
+        /* do nothing */
+    };
+    
+    void unreference()
+    {
+        switch_mutex_destroy(_mutex);
+
+        if (_can_delete_pool)
+            switch_core_destroy_memory_pool(&_pool);
+    }
+
+    Result trylock()
+    {
+        switch (switch_mutex_trylock(_mutex))
+        {
+            case SWITCH_STATUS_SUCCESS:
+                return Super::SUCCESS;
+            case SWITCH_STATUS_FALSE:
+            case SWITCH_STATUS_TERM:
+            case SWITCH_STATUS_NOTIMPL:
+            case SWITCH_STATUS_MEMERR:
+            case SWITCH_STATUS_GENERR:
+            case SWITCH_STATUS_SOCKERR:
+            case SWITCH_STATUS_NOTFOUND:
+            case SWITCH_STATUS_UNLOAD:
+            case SWITCH_STATUS_NOUNLOAD:
+            case SWITCH_STATUS_NOT_INITALIZED:
+                return Super::FAILURE;
+            //case SWITCH_STATUS_INUSE:
+            default:
+                return Super::ISINUSE;
+        }
+    }
+
+    void  unlock()
+    {
+        switch_mutex_unlock(_mutex);
+    }
+
+    BaseMutexType * mutex() { return _mutex; };
+
+ protected:
+    BaseMutexType *_mutex;
+    switch_memory_pool_t *_pool;
+    bool _can_delete_pool;
+};
+
+struct SimpleLock: public SimpleLockBasic < SimpleLock >
+{
+    typedef SimpleLockBasic < SimpleLock >   Super;
+    typedef Super::Result                   Result;
+
+    SimpleLock(switch_memory_pool_t *pool = NULL)
+    : Super(pool) {};
+
+    Result lock()
+    {
+        switch (switch_mutex_lock(_mutex))
+        {
+            case SWITCH_STATUS_SUCCESS:
+                return Super::SUCCESS;
+            case SWITCH_STATUS_FALSE:
+            case SWITCH_STATUS_TERM:
+            case SWITCH_STATUS_NOTIMPL:
+            case SWITCH_STATUS_MEMERR:
+            case SWITCH_STATUS_GENERR:
+            case SWITCH_STATUS_SOCKERR:
+            case SWITCH_STATUS_NOTFOUND:
+            case SWITCH_STATUS_UNLOAD:
+            case SWITCH_STATUS_NOUNLOAD:
+            case SWITCH_STATUS_NOT_INITALIZED:
+                return Super::FAILURE;
+            //case SWITCH_STATUS_INUSE:
+            default:
+                return Super::ISINUSE;
+        }
+    }
+};
+
+template < unsigned int Retries = 10, unsigned int Interval = 50 >
+struct SimpleNonBlockLock: public SimpleLockBasic < SimpleNonBlockLock < Retries, Interval > >
+{
+    typedef SimpleLockBasic < SimpleNonBlockLock < Retries, Interval > >   Super;
+    typedef typename Super::Result                                        Result;
+
+    SimpleNonBlockLock(switch_memory_pool_t *pool = NULL)
+    : Super(pool) {};
+
+    inline Result lock()
+    {
+        for (unsigned int i = 0; i < Retries; i++)
+        {
+            Result ret = Super::trylock();
+
+            if (ret != Super::ISINUSE)
+                return ret;
+
+            usleep(Interval * 1000);
+        }
+
+        return Super::ISINUSE;
+    }
+};
+
+#endif /* _SIMPLE_LOCK_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/freeswitch/thread.hpp b/src/mod/endpoints/mod_khomp/commons/freeswitch/thread.hpp
new file mode 100644
index 0000000000..af50240307
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/freeswitch/thread.hpp
@@ -0,0 +1,327 @@
+/*  
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.  
+  
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or  
+    modify it under the terms of the GNU Lesser General Public  
+    License as published by the Free Software Foundation; either  
+    version 2.1 of the License, or (at your option) any later version.  
+  
+    This library is distributed in the hope that it will be useful,  
+    but WITHOUT ANY WARRANTY; without even the implied warranty of  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+    Lesser General Public License for more details.  
+  
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  
+*/
+
+#ifndef _THREAD_HPP_
+#define _THREAD_HPP_
+
+#include <thread.hpp>
+
+extern "C"
+{
+    #include <switch.h>
+}
+
+struct Thread : ThreadCommon
+{
+    typedef switch_thread_t BaseThreadType;
+
+    template<typename T, typename R, typename A>
+    struct ThreadData : ThreadDataCommon
+    {
+        ThreadData(T data, A arg) : _data(data), _arg(arg) {}
+
+        int run()
+        {
+            return _data(_arg);
+        }
+
+        T _data;
+        A _arg;
+    };
+    
+    template<typename T, typename R>
+    struct ThreadData < T, R, void > : ThreadDataCommon
+    {
+        ThreadData(T data) : _data(data) {}
+
+        int run()
+        {
+            return _data();
+        }
+
+        T _data;
+    };
+    
+    template<typename T, typename A>
+    struct ThreadData < T, void, A > : ThreadDataCommon
+    {
+        ThreadData(T data, A arg) : _data(data), _arg(arg) {}
+
+        int run()
+        {
+            _data(_arg);
+            return 0;
+        }
+
+        T _data;
+        A _arg;
+    };
+
+
+    template<typename T>
+    struct ThreadData < T, void, void > : ThreadDataCommon
+    {
+        ThreadData(T data) : _data(data) {}
+
+        int run()
+        {
+            _data();
+            return 0;
+        }
+
+        T _data;
+    };
+
+    template<typename T>
+    Thread(T obj, switch_memory_pool_t *pool=NULL) : 
+            _thread_info(new ThreadData<T, typename DecomposeFunction<T>::Return, void>(obj)),
+            _pool(pool),
+            _can_delete_pool(false)
+    {
+        if(!_pool)
+        {
+            switch_core_new_memory_pool(&_pool);
+            _can_delete_pool = true;
+        }
+
+        _thread_info->_thread = this;
+        _thread_info->_self = NULL;
+        _thread_info->_attribute = NULL;
+
+        if(switch_threadattr_create(
+                (switch_threadattr_t **)&_thread_info->_attribute, _pool) != 0)
+        {
+            _thread_info->_attribute = NULL;
+            return;
+        }
+
+        switch_threadattr_stacksize_set(
+                (switch_threadattr_t *)_thread_info->_attribute, 
+                SWITCH_THREAD_STACKSIZE);
+
+        if(!priority())
+        {
+            _thread_info->_attribute = NULL;
+        }
+
+    }
+    
+    template<typename T, typename A>
+    Thread(T obj, A arg, switch_memory_pool_t *pool=NULL) : 
+            _thread_info(new ThreadData<T, typename DecomposeFunction<T>::Return, A>(obj, arg)),
+            _pool(pool),
+            _can_delete_pool(false)
+    {
+        if(!_pool)
+        {
+            switch_core_new_memory_pool(&_pool);
+            _can_delete_pool = true;
+        }
+
+        _thread_info->_thread = this;
+        _thread_info->_self = NULL;
+        _thread_info->_attribute = NULL;
+
+        if(switch_threadattr_create(
+                (switch_threadattr_t **)&_thread_info->_attribute, _pool) != 0)
+        {
+            _thread_info->_attribute = NULL;
+            return;
+        }
+
+        switch_threadattr_stacksize_set(
+                (switch_threadattr_t *)_thread_info->_attribute, 
+                SWITCH_THREAD_STACKSIZE);
+
+        if(!priority())
+        {
+            _thread_info->_attribute = NULL;
+        }
+
+    }
+
+    ~Thread() 
+    {
+        if(_thread_info)
+            delete _thread_info;
+        
+        if (_can_delete_pool)
+            switch_core_destroy_memory_pool(&_pool);
+    }
+
+    void detach(bool d = true)
+    {
+        if(!_thread_info->_attribute)
+            return;
+
+        /* Non-zero if detached threads should be created. */
+        switch_threadattr_detach_set(
+                (switch_threadattr_t *)_thread_info->_attribute, d ? 1 : 0);
+    }
+
+    bool start()
+    {
+        if(!_pool || !_thread_info->_attribute)
+            return false;
+
+        switch_thread_create((switch_thread_t**)&_thread_info->_self, 
+                (switch_threadattr_t *)_thread_info->_attribute, 
+                run, 
+                _thread_info, 
+                _pool);
+
+        if(!_thread_info->_self)
+            return false;
+
+        return true;
+    }
+
+    int join()
+    {
+        /*
+         * block until the desired thread stops executing.
+         * @param retval The return value from the dead thread.
+         * @param thd The thread to join
+         *
+         * SWITCH_DECLARE(switch_status_t) switch_thread_join(switch_status_t *retval, switch_thread_t *thd);
+        */
+       
+        if(!_thread_info->_self)
+            return -2;
+
+        int retval = 0;
+
+        if(switch_thread_join((switch_status_t*)&retval, 
+                (switch_thread_t *)_thread_info->_self) != 0)
+            return -1;
+
+        return retval;
+    }
+
+    BaseThreadType * self()
+    {
+        //switch_thread_self();
+        //apr_os_thread_current();
+        return (BaseThreadType *)_thread_info->_self;
+    }
+
+private:
+    void exit(int status)
+    {
+        /**
+         * stop the current thread
+         * @param thd The thread to stop
+         * @param retval The return value to pass back to any thread that cares
+         */
+        //SWITCH_DECLARE(switch_status_t) switch_thread_exit(switch_thread_t *thd, switch_status_t retval);
+        switch_thread_exit((switch_thread_t *)_thread_info->_self, (switch_status_t)status);
+
+    }
+
+#ifndef WIN32
+    struct apr_threadattr_t {
+        apr_pool_t *pool;
+        pthread_attr_t attr;
+    };
+#endif
+
+    bool priority()
+    {
+#ifndef WIN32
+        struct sched_param param;
+        
+        struct apr_threadattr_t *myattr = (struct apr_threadattr_t *)_thread_info->_attribute;
+
+        if (pthread_attr_setschedpolicy(
+                (pthread_attr_t *)&myattr->attr, SCHED_RR) < 0)
+            return false;
+
+        if (pthread_attr_getschedparam(
+                (pthread_attr_t *)&myattr->attr, &param) < 0)
+            return false;
+
+        param.sched_priority = sched_get_priority_max(SCHED_RR);
+
+        if (pthread_attr_setschedparam(
+                (pthread_attr_t *)&myattr->attr, &param) < 0)
+            return false;
+
+#endif
+        return true;
+
+/*
+        //BUG in Freeswitch
+        if(switch_threadattr_priority_increase(
+                (switch_threadattr_t *)_thread_info->_attribute) != 0)
+            return false;
+
+        return true;
+*/
+    }
+
+
+protected:
+    ThreadDataCommon * _thread_info;
+    switch_memory_pool_t *_pool;
+    bool _can_delete_pool;
+
+protected:
+
+    static void *SWITCH_THREAD_FUNC run(BaseThreadType *thread, void * obj)
+    {
+        //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 
+        //        "Starting new Thread\n");
+
+        ThreadDataCommon * data = (ThreadDataCommon *)obj;
+        int retval = data->run();
+
+        //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 
+        //        "Stopping new Thread = %d\n", retval);
+
+        ((Thread *)(data->_thread))->exit(retval);
+
+        return NULL;
+    }
+
+};
+
+
+#endif /* _THREAD_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/function.hpp b/src/mod/endpoints/mod_khomp/commons/function.hpp
new file mode 100644
index 0000000000..c448299acd
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/function.hpp
@@ -0,0 +1,337 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the "LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <refcounter.hpp>
+
+#ifndef _FUNCTION_HPP_
+#define _FUNCTION_HPP_
+
+namespace Function
+{
+    struct EmptyFunction {};
+
+    /**/
+
+    template < typename FunctionTraits >
+    struct StorageBase: NEW_REFCOUNTER(StorageBase < FunctionTraits >)
+    {
+        typedef typename FunctionTraits::BaseType BaseType;
+
+        typedef typename FunctionTraits::FunType  FunType;
+        typedef typename FunctionTraits::ObjType  ObjType;
+
+        template < typename Functor >
+        StorageBase(Functor f)
+        : _object(reinterpret_cast<ObjType>(new Functor(f))),
+          _function(reinterpret_cast<FunType>(&(Functor::operator()))),
+          _malloced(true)
+        {};
+
+        template < typename Functor >
+        StorageBase(Functor & f, bool malloced)
+        : _object(reinterpret_cast<ObjType>((malloced ? new Functor(f) : &f))),
+          _function(reinterpret_cast<FunType>(&(Functor::operator()))),
+          _malloced(malloced)
+        {};
+
+        StorageBase()
+        : _object(reinterpret_cast<ObjType>(0)),
+          _function(reinterpret_cast<FunType>(0)),
+          _malloced(false)
+        {};
+
+        StorageBase(const StorageBase & o)
+        : INC_REFCOUNTER(o, StorageBase < FunctionTraits >),
+           _object(o._object), _function(o._function), _malloced(o._malloced)
+        {};
+
+        virtual ~StorageBase() {};
+
+        void unreference()
+        {
+            // TODO: will this work if we delete a different type? //
+            if (_malloced)
+                delete _object;
+        };
+
+        template < typename Functor >
+        void operator=(Functor f)
+        {
+            _object   = reinterpret_cast<ObjType>(new Functor(f)),
+            _function = reinterpret_cast<FunType>(&(Functor::operator()));
+            _malloced = false;
+        }
+
+     protected:
+        ObjType _object;
+        FunType _function;
+        bool    _malloced;
+    };
+
+    /**/
+
+    template < typename R >
+    struct VTable0
+    {
+        R operator()(void) { return R(); };
+    };
+
+    template < >
+    struct VTable0< void >
+    {
+        void operator()(void) { return; };
+    };
+
+    template < typename R >
+    struct Function0Traits
+    {
+        typedef VTable0<R> BaseType;
+
+        typedef R (BaseType::* FunType)(void);
+        typedef BaseType *     ObjType;
+    };
+
+    /**/
+
+    template < typename R, typename A0 >
+    struct VTable1
+    {
+        R operator()(A0 a0) { return R(); };
+    };
+
+    template < typename A0 >
+    struct VTable1< void, A0 >
+    {
+        void operator()(A0 a0) { return; };
+    };
+
+    template < typename R, typename A0 >
+    struct Function1Traits
+    {
+        typedef VTable1<R, A0> BaseType;
+
+        typedef R (BaseType::* FunType)(A0);
+        typedef BaseType *     ObjType;
+    };
+
+    /**/
+
+    template < typename R, typename A0, typename A1 >
+    struct VTable2
+    {
+        R operator()(A0 a0, A1) { return R(); };
+    };
+
+    template < typename A0, typename A1 >
+    struct VTable2< void, A0, A1 >
+    {
+        void operator()(A0 a0, A1 a1) { return; };
+    };
+
+    template < typename R, typename A0, typename A1 >
+    struct Function2Traits
+    {
+        typedef VTable2<R, A0, A1> BaseType;
+
+        typedef R (BaseType::* FunType)(A0, A1);
+        typedef BaseType *     ObjType;
+    };
+
+    /**/
+
+    template < typename R, typename A0, typename A1, typename A2 >
+    struct VTable3
+    {
+        R operator()(A0 a0, A1 a1, A2 a2) { return R(); };
+    };
+
+    template < typename A0, typename A1, typename A2 >
+    struct VTable3< void, A0, A1, A2 >
+    {
+        void operator()(A0 a0, A1 a1, A2 a2) { return; };
+    };
+
+    template < typename R, typename A0, typename A1, typename A2 >
+    struct Function3Traits
+    {
+        typedef VTable3<R, A0, A1, A2> BaseType;
+
+        typedef R (BaseType::* FunType)(A0, A1, A2);
+        typedef BaseType *     ObjType;
+    };
+
+    /**/
+
+    template < typename R, typename A0, typename A1, typename A2, typename A3 >
+    struct VTable4
+    {
+        R operator()(A0 a0, A1 a1, A2 a2, A3 a3) { return R(); };
+    };
+
+    template < typename A0, typename A1, typename A2, typename A3 >
+    struct VTable4< void, A0, A1, A2, A3 >
+    {
+        void operator()(A0 a0, A1 a1, A2 a2, A3 a3) { return; };
+    };
+
+    template < typename R, typename A0, typename A1, typename A2, typename A3 >
+    struct Function4Traits
+    {
+        typedef VTable4<R, A0, A1, A2, A3> BaseType;
+
+        typedef R (BaseType::* FunType)(A0, A1, A2, A3);
+        typedef BaseType *     ObjType;
+    };
+
+    /**/
+
+    template < typename R, typename A0 >
+    struct Function0 : public StorageBase < Function0Traits < R > >
+    {
+        typedef StorageBase < Function0Traits < R > >  Storage;
+
+        template < typename Functor >
+        Function0(Functor f): Storage(f) {};
+
+        template < typename Functor >
+        Function0(Functor & f, bool m): Storage(f, m) {};
+
+        Function0() {};
+
+        R operator()(void)
+        {
+            if (reinterpret_cast<void *>(Storage::_object) == 0)
+                throw EmptyFunction();
+
+            return ((Storage::_object)->*(Storage::_function))();
+        }
+    };
+
+    template < typename R, typename A0 >
+    struct Function1 : public StorageBase < Function1Traits < R, A0 > >
+    {
+        typedef StorageBase < Function1Traits < R, A0 > >  Storage;
+
+        template < typename Functor >
+        Function1(Functor f): Storage(f) {};
+
+        template < typename Functor >
+        Function1(Functor & f, bool m): Storage(f, m) {};
+
+        Function1() {};
+
+        R operator()(A0 a0)
+        {
+            if (reinterpret_cast<void *>(Storage::_object) == 0)
+                throw EmptyFunction();
+
+            return ((Storage::_object)->*(Storage::_function))(a0);
+        }
+    };
+
+    template < typename R, typename A0, typename A1 >
+    struct Function2 : public StorageBase < Function2Traits < R, A0, A1 > >
+    {
+        typedef StorageBase < Function2Traits < R, A0, A1 > >  Storage;
+
+        template < typename Functor >
+        Function2(Functor f): Storage(f) {};
+
+        template < typename Functor >
+        Function2(Functor & f, bool m): Storage(f, m) {};
+
+        Function2() {};
+
+        R operator()(A0 a0, A1 a1)
+        {
+            if (reinterpret_cast<void *>(Storage::_object) == 0)
+                throw EmptyFunction();
+
+            return ((Storage::_object)->*(Storage::_function))(a0, a1);
+        }
+    };
+
+    template < typename R, typename A0, typename A1, typename A2 >
+    struct Function3 : public StorageBase < Function3Traits < R, A0, A1, A2 > >
+    {
+        typedef StorageBase < Function3Traits < R, A0, A1, A2 > >  Storage;
+
+        template < typename Functor >
+        Function3(Functor f): Storage(f) {};
+
+        template < typename Functor >
+        Function3(Functor & f, bool m): Storage(f, m) {};
+
+        Function3() {};
+
+        R operator()(A0 a0, A1 a1, A2 a2)
+        {
+            if (reinterpret_cast<void *>(Storage::_object) == 0)
+                throw EmptyFunction();
+
+            return ((Storage::_object)->*(Storage::_function))(a0, a1, a2);
+        }
+    };
+
+    template < typename R, typename A0, typename A1, typename A2, typename A3 >
+    struct Function4 : public StorageBase < Function4Traits < R, A0, A1, A2, A3 > >
+    {
+        typedef StorageBase < Function4Traits < R, A0, A1, A2, A3 > >  Storage;
+
+        template < typename Functor >
+        Function4(Functor f): Storage(f) {};
+
+        template < typename Functor >
+        Function4(Functor & f, bool m): Storage(f, m) {};
+
+        Function4() {};
+
+        R operator()(A0 a0, A1 a1, A2 a2, A3 a3)
+        {
+            if (reinterpret_cast<void *>(Storage::_object) == 0)
+                throw EmptyFunction();
+
+            return ((Storage::_object)->*(Storage::_function))(a0, a1, a2, a3);
+        }
+    };
+};
+
+#endif /* _FUNCTION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/initializer.hpp b/src/mod/endpoints/mod_khomp/commons/initializer.hpp
new file mode 100644
index 0000000000..e0e110d49c
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/initializer.hpp
@@ -0,0 +1,80 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <vector>
+
+#ifndef _INITIALIZER_HPP_
+#define _INITIALIZER_HPP_
+
+template < typename Type >
+struct Initializer: public std::vector< Type >
+{
+    typedef std::vector< Type > super;
+
+    Initializer(Type   e) { push_back(e); };
+    Initializer(Type & e) { push_back(e); };
+
+    Initializer & operator&(Initializer v)
+    {
+        insert(super::end(), v.begin(), v.end());
+        return *this;
+    };
+
+    Initializer & operator&(Initializer & v)
+    {
+        insert(super::end(), v.begin(), v.end());
+        return *this;
+    };
+
+    Initializer & operator&(Type v)
+    {
+        insert(super::end(), v);
+        return *this;
+    };
+
+    Initializer & operator&(Type  & v)
+    {
+        insert(super::end(), v);
+        return *this;
+    };
+};
+
+#endif /* _INITIALIZER_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/k3lapi.cpp b/src/mod/endpoints/mod_khomp/commons/k3lapi.cpp
new file mode 100644
index 0000000000..f5afa1348f
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/k3lapi.cpp
@@ -0,0 +1,313 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <k3lapi.hpp>
+
+#include <format.hpp>
+#include <verbose.hpp>
+
+K3LAPI::K3LAPI(bool has_exceptions)
+: _has_exceptions(has_exceptions),
+  _device_count(0),  _channel_count(0),  _link_count(0),
+  _device_config(0), _channel_config(0), _link_config(0)
+{};
+
+/* initialize the whole thing! */
+
+void K3LAPI::start(void)
+{
+    /* tie the used k3l to the compiled k3l version */
+    char *ret = k3lStart(k3lApiMajorVersion, k3lApiMinorVersion, 0); //k3lApiBuildVersion);
+
+    if (ret && *ret)
+        throw start_failed(ret);
+
+    /* call init automagically */
+    init();
+}
+
+void K3LAPI::stop(void)
+{
+    k3lStop();
+    fini();
+}
+
+/* envio de comandos para placa */
+
+void K3LAPI::mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 index)
+{
+    KMixerCommand mix;
+
+    mix.Track = track;
+    mix.Source = src;
+    mix.SourceIndex = index;
+
+    command(dev, obj, CM_MIXER, (const char *) &mix);
+}
+
+void K3LAPI::mixerRecord(int32 dev, int32 obj, byte track, KMixerSource src, int32 index)
+{
+    /* estes buffers *NAO PODEM SER ESTATICOS*! */
+    char cmd[] = { 0x3f, 0x03, (char)obj, (char)track, 0xff, 0xff };
+
+    switch (src)
+    {
+        case kmsChannel:
+            cmd[4] = 0x05;
+            cmd[5] = (char)index;
+            break;
+
+        case kmsNoDelayChannel:
+            cmd[4] = 0x0a;
+            cmd[5] = (char)index;
+            break;
+
+        case kmsGenerator:
+            cmd[4] = 0x09;
+
+            switch ((KMixerTone)index)
+            {
+                case kmtSilence:
+                    cmd[5] = 0x0F;
+                    break;
+                case kmtDial:
+                    cmd[5] = 0x08;
+                    break;
+                case kmtBusy:
+                    cmd[5] = 0x0D;
+                    break;
+
+                case kmtFax:
+                case kmtVoice:
+                case kmtEndOf425:
+                case kmtCollect:
+                case kmtEndOfDtmf:
+                    /* TODO: exception, unable to generate */
+                    break;
+            }
+            break;
+
+        case kmsCTbus:
+        case kmsPlay:
+            /* TODO: exception, not implemented! */
+            break;
+    }
+
+    int32 dsp = get_dsp(dev, DSP_AUDIO);
+
+    raw_command(dev, dsp, cmd, sizeof(cmd));
+}
+
+void K3LAPI::mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int32 index)
+{
+    KMixerCommand mix;
+
+    mix.Track = track;
+    mix.Source = src;
+    mix.SourceIndex = index;
+
+    command(dev, obj, CM_MIXER_CTBUS, (const char *) &mix);
+}
+
+void K3LAPI::command(int32 dev, int32 obj, int32 code, std::string & str)
+{
+    command(dev, obj, code, str.c_str());
+}
+
+void K3LAPI::command (int32 dev, int32 obj, int32 code, const char * parms)
+{
+    K3L_COMMAND cmd;
+
+    cmd.Cmd = code;
+    cmd.Object = obj;
+    cmd.Params = (byte *)parms;
+
+    int32 rc = k3lSendCommand(dev, &cmd);
+
+    if (rc != ksSuccess)
+        throw failed_command(code, dev, obj, rc);
+}
+
+void K3LAPI::raw_command(int32 dev, int32 dsp, std::string & str)
+{
+    raw_command(dev, dsp, str.data(), str.size());
+}
+
+void K3LAPI::raw_command(int32 dev, int32 dsp, const char * cmds, int32 size)
+{
+    std::string str(cmds, size);
+
+    int32 rc = k3lSendRawCommand(dev, dsp, (void *)cmds, size);
+
+    if (rc != ksSuccess)
+        throw failed_raw_command(dev, dsp, rc);
+}
+
+KLibraryStatus K3LAPI::get_param(K3L_EVENT *ev, const char *name, std::string &res)
+{
+    char tmp_param[256];
+    memset((void*)tmp_param, 0, sizeof(tmp_param));
+
+    int32 rc = k3lGetEventParam (ev, (sbyte *)name, (sbyte *)tmp_param, sizeof(tmp_param)-1);
+
+    if (rc != ksSuccess)
+        return (KLibraryStatus)rc;
+
+    res.append(tmp_param, strlen(tmp_param));
+    return ksSuccess;
+}
+
+std::string K3LAPI::get_param(K3L_EVENT *ev, const char *name)
+{
+    std::string res;
+
+    KLibraryStatus rc = get_param(ev, name, res);
+
+    if (rc != ksSuccess)
+        throw get_param_failed(name, rc);
+
+    return res;
+}
+
+void K3LAPI::init(void)
+{
+    if (_device_count != 0) return;
+
+    _device_count = k3lGetDeviceCount();
+
+    _device_type    = new KDeviceType[_device_count];
+    _device_config  = new device_conf_type[_device_count];
+    _channel_config = new channel_ptr_conf_type[_device_count];
+    _link_config    = new link_ptr_conf_type[_device_count];
+    _channel_count  = new unsigned int[_device_count];
+    _link_count     = new unsigned int[_device_count];
+
+    for (unsigned int dev = 0; dev < _device_count; dev++)
+    {
+        KLibraryStatus ret = ksSuccess;
+
+        _device_type[dev] = (KDeviceType) k3lGetDeviceType(dev);
+
+        /* caches each device config */
+        ret = (KLibraryStatus)k3lGetDeviceConfig(dev, ksoDevice + dev, &(_device_config[dev]), sizeof(_device_config[dev]));
+
+        if (ret != ksSuccess)
+            throw start_failed(STG(FMT("k3lGetDeviceConfig(dev=%d): %s") % dev % Verbose::status(ret)));
+
+        /* adjust channel/link count for device */
+        _channel_count[dev] = _device_config[dev].ChannelCount;
+        _link_count[dev] = _device_config[dev].LinkCount;
+
+        /* caches each channel config */
+        _channel_config[dev] = new channel_conf_type[_channel_count[dev]];
+
+        for (unsigned int obj = 0; obj < _channel_count[dev]; obj++)
+        {
+            ret = (KLibraryStatus)k3lGetDeviceConfig(dev, ksoChannel + obj, &(_channel_config[dev][obj]), sizeof(_channel_config[dev][obj]));
+
+            if (ret != ksSuccess)
+                throw start_failed(STG(FMT("k3lGetDeviceConfig(dev=%d,chan=%d): %s") % dev % obj % Verbose::status(ret)));
+        }
+
+        /* adjust link count for device */
+        _link_count[dev] = _device_config[dev].LinkCount;
+
+        /* caches each link config */
+        _link_config[dev] = new link_conf_type[_link_count[dev]];
+
+        for (unsigned int obj = 0; obj < _link_count[dev]; obj++)
+        {
+            ret = (KLibraryStatus)k3lGetDeviceConfig(dev, ksoLink + obj, &(_link_config[dev][obj]), sizeof(_link_config[dev][obj]));
+
+            if (ret != ksSuccess)
+                throw start_failed(STG(FMT("k3lGetDeviceConfig(dev=%d,link=%d): %s") % dev % obj % Verbose::status(ret)));
+        }
+    }
+}
+
+void K3LAPI::fini(void)
+{
+    for (unsigned int dev = 0; dev < _device_count; dev++)
+    {
+        if (_channel_config[dev])
+        {
+            delete[] _channel_config[dev];
+            _channel_config[dev] = NULL;
+        }
+
+        if (_link_config[dev])
+        {
+            delete[] _link_config[dev];
+            _link_config[dev] = NULL;
+        }
+    }
+
+    _device_count = 0;
+
+    if (_device_type)    { delete[] _device_type;       _device_type = NULL; }
+    if (_device_config)  { delete[] _device_config;   _device_config = NULL; }
+    if (_channel_config) { delete[] _channel_config; _channel_config = NULL; }
+    if (_link_config)    { delete[] _link_config;       _link_config = NULL; }
+    if (_channel_count)  { delete[] _channel_count;   _channel_count = NULL; }
+    if (_link_count)     { delete[] _link_count;         _link_count = NULL; }
+}
+
+int32 K3LAPI::get_dsp(int32 dev, K3LAPI::DspType type)
+{
+    switch (device_type(dev))
+    {
+        case kdtFXO:
+        case kdtFXOVoIP:
+#if K3L_AT_LEAST(1,6,0)
+        case kdtGSM:
+        case kdtGSMSpx:
+#endif
+#if K3L_AT_LEAST(2,1,0)
+        case kdtGSMUSB:
+        case kdtGSMUSBSpx:
+#endif
+            return 0;
+
+        default:
+            return (type == DSP_AUDIO ? 1 : 0);
+    }
+}
+
diff --git a/src/mod/endpoints/mod_khomp/commons/k3lapi.hpp b/src/mod/endpoints/mod_khomp/commons/k3lapi.hpp
new file mode 100644
index 0000000000..596548405b
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/k3lapi.hpp
@@ -0,0 +1,408 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <string>
+
+#include <k3l.h>
+
+/* if using full k3l.h (for softpbx), version already defined. */
+#ifndef k3lApiMajorVersion
+# include <k3lVersion.h>
+#endif
+
+#ifdef __GNUC_PREREQ
+#if __GNUC_PREREQ(4,3)
+#include <cstring>
+#endif
+#endif
+
+#include <types.hpp>
+
+#ifndef _K3LAPI_HPP_
+#define _K3LAPI_HPP_
+
+struct K3LAPI
+{
+    /* exceptions */
+
+    struct start_failed
+    {
+        start_failed(const char * _msg) : msg(_msg) {};
+        start_failed(std::string  _msg) : msg(_msg) {};
+        std::string msg;
+    };
+
+    struct failed_command
+    {
+        failed_command(int32 _code, unsigned short _dev, unsigned short _obj, int32 _rc)
+        : code(_code), dev(_dev), obj(_obj), rc(_rc) {};
+
+        int32           code;
+        unsigned short  dev;
+        unsigned short  obj;
+        int32           rc;
+    };
+
+    struct failed_raw_command
+    {
+        failed_raw_command(unsigned short _dev, unsigned short _dsp, int32 _rc)
+        : dev(_dev), dsp(_dsp), rc(_rc) {};
+
+        unsigned short  dev;
+        unsigned short  dsp;
+        int32           rc;
+    };
+
+    struct invalid_device
+    {
+        invalid_device(int32 _device)
+        : device(_device) {};
+
+        int32 device;
+    };
+
+    struct invalid_channel
+    {
+        invalid_channel(int32 _device, int32 _channel)
+        : device(_device), channel(_channel) {};
+
+        int32 device, channel;
+    };
+
+    struct invalid_link
+    {
+        invalid_link(unsigned int _device, unsigned int _link)
+        : device(_device), link(_link) {};
+
+        int32 device, link;
+    };
+
+    struct get_param_failed
+    {
+        get_param_failed(std::string _name, int32 _rc)
+        : name(_name), rc((KLibraryStatus)_rc) {};
+
+        std::string name;
+        KLibraryStatus rc;
+    };
+
+    typedef K3L_DEVICE_CONFIG          device_conf_type;
+    typedef K3L_CHANNEL_CONFIG        channel_conf_type;
+    typedef K3L_CHANNEL_CONFIG *  channel_ptr_conf_type;
+    typedef K3L_LINK_CONFIG              link_conf_type;
+    typedef K3L_LINK_CONFIG *        link_ptr_conf_type;
+
+    /* constructors/destructors */
+
+             K3LAPI(bool has_exceptions = false);
+    virtual ~K3LAPI() {};
+
+    /* (init|final)ialize the whole thing! */
+
+    void start(void);
+    void stop(void);
+
+    /* verificacao de intervalos */
+
+    inline bool valid_device(int32 dev)
+    {
+        return (dev >= 0 && dev < ((int32)_device_count));
+    }
+
+    inline bool valid_channel(int32 dev, int32 obj)
+    {
+        return (valid_device(dev) && obj >= 0 && obj < ((int32)_channel_count[dev]));
+    }
+
+    inline bool valid_link(int32 dev, int32 obj)
+    {
+        return (valid_device(dev) && obj >= 0 && obj < ((int32)_link_count[dev]));
+    }
+
+    /*!
+      \brief High level object identifier
+      Since Khomp works with an object concept, this is used to map the
+      object id with its proper type.
+     */
+    struct target
+    {
+        /*! The types a target can have */
+        typedef enum { DEVICE, CHANNEL, MIXER, LINK } target_type;
+
+        target(K3LAPI & k3lapi, target_type type_init, int32 device_value, int32 object_value)
+        : type(type_init),
+          device((unsigned short)device_value),
+          object((unsigned short)object_value)
+        {
+            switch (type_init)
+            {
+                case DEVICE:
+                    if (!k3lapi.valid_device(device_value))
+                        throw invalid_device(device_value);
+                    break;
+
+                case CHANNEL:
+                case MIXER:
+                    if (!k3lapi.valid_channel(device_value, object_value))
+                        throw invalid_channel(device_value, object_value);
+                    break;
+
+                case LINK:
+                    if (!k3lapi.valid_link(device_value, object_value))
+                        throw invalid_link(device_value, object_value);
+                    break;
+            }
+
+        };
+
+        const target_type type;
+
+        const unsigned short device;
+        const unsigned short object;
+    };
+
+    /* envio de comandos para placa (geral) */
+
+    void raw_command(int32 dev, int32 dsp, std::string & str);
+    void raw_command(int32 dev, int32 dsp, const char * cmds, int32 size);
+
+    /* obter dados 'cacheados' (geral) */
+
+    inline unsigned int device_count(void)
+    {
+        return _device_count;
+    }
+
+    /* envio de comandos para placa (sem identificadores) */
+
+    void mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 index);
+    void mixerRecord(int32 dev, int32 obj, byte track, KMixerSource src, int32 index);
+    void mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int32 index);
+
+    void command (int32 dev, int32 obj, int32 code, std::string & str);
+    void command (int32 dev, int32 obj, int32 code, const char * parms = NULL);
+
+    /* obter dados 'cacheados' (sem identificadores) */
+
+    inline unsigned int channel_count(int32 dev)
+    {
+        if (!valid_device(dev))
+        {
+            if (_has_exceptions)
+                throw invalid_device(dev);
+            else
+                return 0;
+        }
+
+        return _channel_count[dev];
+    }
+
+    inline unsigned int link_count(int32 dev)
+    {
+        if (!valid_device(dev))
+        {
+            if (_has_exceptions)
+                throw invalid_device(dev);
+            else
+                return 0;
+        }
+
+        return _link_count[dev];
+    }
+
+    inline uint32 channel_stats(int32 dev, int32 obj, uint32 index)
+    {
+        if (!valid_channel(dev, obj))
+        {
+            if (_has_exceptions)
+                throw invalid_channel(dev, obj);
+            else
+                return 0;
+        }
+
+        uint32 res_value = (uint32)-1;
+        stt_code stt_res = ksFail;
+
+#if K3L_AT_LEAST(2,1,0)
+        stt_res = k3lGetChannelStats(dev, obj, index, &res_value);
+#endif
+
+        if(stt_res != ksSuccess)
+        {
+            return (uint32)-1;
+        }
+
+        return res_value;
+    }
+
+    KDeviceType device_type(int32 dev)
+    {
+        if (!valid_device(dev))
+        {
+            if (_has_exceptions)
+                throw invalid_device(dev);
+            else
+                return kdtDevTypeCount;
+        }
+
+        return _device_type[dev];
+    }
+
+
+    K3L_DEVICE_CONFIG & device_config(int32 dev)
+    {
+        if (!valid_device(dev))
+            throw invalid_device(dev);
+
+        return _device_config[dev];
+    }
+
+    K3L_CHANNEL_CONFIG & channel_config(int32 dev, int32 obj)
+    {
+        if (!valid_channel(dev, obj))
+            throw invalid_channel(dev, obj);
+
+        return _channel_config[dev][obj];
+    }
+
+    K3L_LINK_CONFIG & link_config(int32 dev, int32 obj)
+    {
+        if (!valid_link(dev, obj))
+            throw invalid_channel(dev, obj);
+
+        return _link_config[dev][obj];
+    }
+
+    /* envio de comandos para placa (com identificadores) */
+
+    void mixer(target & tgt, byte track, KMixerSource src, int32 index)
+    {
+        mixer((int32)tgt.device, (int32)tgt.object, track, src, index);
+    }
+
+    void mixerRecord(target & tgt, byte track, KMixerSource src, int32 index)
+    {
+        mixerRecord((int32)tgt.device, (int32)tgt.object, track, src, index);
+    }
+
+    void mixerCTbus(target & tgt, byte track, KMixerSource src, int32 index)
+    {
+        mixerCTbus((int32)tgt.device, (int32)tgt.object, track, src, index);
+    }
+
+    void command (target & tgt, int32 code, std::string & str)
+    {
+        command((int32)tgt.device, (int32)tgt.object, code, str);
+    };
+
+    void command (target & tgt, int32 code, const char * parms = NULL)
+    {
+        command((int32)tgt.device, (int32)tgt.object, code, parms);
+    };
+
+    /* obter dados 'cacheados' (com indentificadores) */
+
+    inline unsigned int channel_count(target & tgt)
+    {
+        return _channel_count[tgt.device];
+    }
+
+    inline unsigned int link_count(target & tgt)
+    {
+        return _link_count[tgt.device];
+    }
+
+    KDeviceType device_type(target & tgt)
+    {
+        return _device_type[tgt.device];
+    }
+
+
+    K3L_DEVICE_CONFIG & device_config(target & tgt)
+    {
+        return _device_config[tgt.device];
+    }
+
+    K3L_CHANNEL_CONFIG & channel_config(target & tgt)
+    {
+        return _channel_config[tgt.device][tgt.object];
+    }
+
+    K3L_LINK_CONFIG & link_config(target & tgt)
+    {
+        return _link_config[tgt.device][tgt.object];
+    }
+
+    /* pega valores em strings de eventos */
+
+    KLibraryStatus get_param(K3L_EVENT *ev, const char *name, std::string &res);
+    std::string get_param(K3L_EVENT *ev, const char *name);
+
+    /* inicializa valores em cache */
+
+    void init(void);
+    void fini(void);
+
+    /* utilidades diversas e informacoes */
+
+    enum DspType
+    {
+        DSP_AUDIO,
+        DSP_SIGNALING,
+    };
+
+    int32 get_dsp(int32, DspType);
+
+ protected:
+
+    const bool           _has_exceptions;
+
+    unsigned int           _device_count;
+    unsigned int *        _channel_count;
+    unsigned int *           _link_count;
+
+         device_conf_type *   _device_config;
+    channel_ptr_conf_type *  _channel_config;
+       link_ptr_conf_type *     _link_config;
+              KDeviceType *     _device_type;
+};
+
+#endif /* _K3LAPI_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/k3lutil.cpp b/src/mod/endpoints/mod_khomp/commons/k3lutil.cpp
new file mode 100644
index 0000000000..83ac82efae
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/k3lutil.cpp
@@ -0,0 +1,234 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <k3lutil.hpp>
+
+std::string K3LUtil::channelStatus(int32 dev, int32 channel,
+        Verbose::Presentation fmt)
+{
+    try
+    {
+        K3L_CHANNEL_CONFIG & config = _k3lapi.channel_config(dev, channel);
+        K3L_CHANNEL_STATUS   status;
+
+        KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus (dev,
+                channel + ksoChannel, &status, sizeof(status));
+
+        switch (ret)
+        {
+            case ksSuccess:  return Verbose::channelStatus(config.Signaling,
+                    status.AddInfo, fmt);
+            default:         return (fmt == Verbose::EXACT ? "<unknown[fail]>"
+                                                            : "Unknown (fail)");
+        }
+    }
+    catch(K3LAPI::invalid_channel & e)
+    {
+        return (fmt == Verbose::EXACT ? "<unknown[fail]>" : "Unknown (fail)");
+    }
+}
+
+std::string K3LUtil::callStatus(int32 dev, int32 channel,
+        Verbose::Presentation fmt)
+{
+    K3L_CHANNEL_STATUS status;
+
+    KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus(dev,
+            channel + ksoChannel, &status, sizeof(status));
+
+    switch (ret)
+    {
+        case ksSuccess:  return Verbose::callStatus(status.CallStatus, fmt);
+        default:         return (fmt == Verbose::EXACT ? "<unknown[fail]>"
+                                                        : "Unknown (fail)");
+    }
+}
+
+std::string K3LUtil::linkStatus(int32 dev, int32 link,
+        Verbose::Presentation fmt, KSignaling sig)
+{
+    try
+    {
+        if (sig == ksigInactive)
+        {
+            K3L_LINK_CONFIG & config = _k3lapi.link_config(dev, link);
+            sig = config.Signaling;
+        }
+
+       	K3L_LINK_STATUS   status;
+
+        KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus (dev,
+                link + ksoLink, &status, sizeof(status));
+
+        switch (ret)
+        {
+            case ksSuccess:  return Verbose::linkStatus(sig, status.E1, fmt);
+            default:         return (fmt == Verbose::EXACT ?
+                                "<unknown[failure]>" : "Unknown (failure)");
+        }
+    }
+    catch(K3LAPI::invalid_channel & e)
+    {
+        return (fmt == Verbose::EXACT ? "<unknown[failure]>"
+                                        : "Unknown (failure)");
+    }
+}
+
+std::string K3LUtil::getLinkStatus(int32 dev, int32 link,
+            Verbose::Presentation fmt)
+{
+    switch (_k3lapi.device_type(dev))
+    {
+#if K3L_AT_LEAST(1,6,0)
+        case kdtFXS:
+        case kdtFXSSpx:
+            return linkStatus(dev, link, fmt, ksigAnalogTerminal);
+
+#if K3L_AT_LEAST(2,1,0)
+        case kdtE1FXSSpx:
+            if (link == 1)
+                return linkStatus(dev, link, fmt, ksigAnalogTerminal);
+#endif
+#endif
+        default:
+            break;
+    }
+
+    K3L_LINK_CONFIG & conf = _k3lapi.link_config(dev, link);
+
+    std::string res = linkStatus(dev, link, fmt);
+
+    if (conf.ReceivingClock & 0x01)
+       res += (fmt == Verbose::EXACT ? ",sync" : " (sync)");
+
+    return res;
+}
+
+unsigned int K3LUtil::physicalLinkCount(int32 dev, bool count_virtual)
+{
+    unsigned int number = 0;
+
+    try
+    {
+        switch (_k3lapi.device_type(dev))
+        {
+#if K3L_AT_LEAST(1,6,0)
+            case kdtFXS:
+                number = (count_virtual ? (_k3lapi.channel_count(dev) < 50 ? 1 : 2) : 0);
+                break;
+
+            case kdtFXSSpx:
+                number = (count_virtual ? (_k3lapi.channel_count(dev) < 30 ? 1 : 2) : 0);
+                break;
+#endif
+
+#if K3L_AT_LEAST(2,1,0)
+            case kdtE1FXSSpx:
+                number = (count_virtual ? 2 : 1);
+                break;
+#endif
+
+            /* E1 boards */
+            case kdtE1:
+            case kdtE1Spx:
+            case kdtE1IP:
+                number = _k3lapi.link_count(dev);
+                break;
+
+            case kdtPR:
+            case kdtE1GW:
+                number = 1;
+                break;
+
+#if K3L_AT_LEAST(1,6,0)
+            case kdtFXO:
+            case kdtFXOVoIP:
+            case kdtGSM:
+            case kdtGSMSpx:
+#else
+            case kdtFX:
+            case kdtFXVoIP:
+#endif
+            case kdtConf:
+            case kdtGWIP:
+#if K3L_AT_LEAST(2,1,0)
+            case kdtGSMUSB:
+            case kdtGSMUSBSpx:
+            case kdtReserved1:    // just to avoid warnings.
+            case kdtDevTypeCount: // just to avoid warnings.
+#endif
+                number = 0;
+                break;
+        }
+    }
+    catch(K3LAPI::invalid_device & e)
+    {
+        return 0;
+    }
+
+    return number;
+}
+
+
+K3LUtil::ErrorCountType K3LUtil::linkErrorCount(int32 dev, int32 link,
+        Verbose::Presentation fmt)
+{
+    ErrorCountType          result;
+    K3L_LINK_ERROR_COUNTER  status;
+
+    KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus (dev,
+            link + ksoLinkMon, &status, sizeof(status));
+
+    switch (ret)
+    {
+        case ksSuccess:
+            for (unsigned int i = klecChangesToLock; i < klecCount; i++)
+            {
+                result.push_back(ErrorCountPairType(Verbose::linkErrorCounter
+                        ((KLinkErrorCounter)i, fmt), status.ErrorCounters[i]));
+            }
+            /* fall */
+
+        default:
+            return result;
+    }
+}
+
diff --git a/src/mod/endpoints/mod_khomp/commons/k3lutil.hpp b/src/mod/endpoints/mod_khomp/commons/k3lutil.hpp
new file mode 100644
index 0000000000..e547f3df6e
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/k3lutil.hpp
@@ -0,0 +1,82 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <string>
+#include <utility>
+#include <list>
+
+#include <k3lapi.hpp>
+#include <verbose.hpp>
+
+#ifndef _K3LUTIL_HPP_
+#define _K3LUTIL_HPP_
+
+struct K3LUtil
+{
+    typedef std::pair < std::string, unsigned int > ErrorCountPairType;
+    typedef std::list < ErrorCountPairType >        ErrorCountType;
+
+    K3LUtil(K3LAPI & k3lapi): _k3lapi(k3lapi) {};
+
+    std::string callStatus(int32 dev, int32 channel,
+            Verbose::Presentation fmt = Verbose::HUMAN);
+
+    std::string channelStatus(int32, int32,
+            Verbose::Presentation fmt = Verbose::HUMAN);
+
+    std::string linkStatus(int32, int32,
+            Verbose::Presentation fmt = Verbose::HUMAN,
+            KSignaling sig = ksigInactive);
+
+    std::string getLinkStatus(int32, int32, 
+            Verbose::Presentation fmt = Verbose::HUMAN);
+
+    unsigned int physicalLinkCount(int32 dev, bool count_virtual = false);
+
+    ErrorCountType linkErrorCount(int32, int32,
+            Verbose::Presentation fmt = Verbose::HUMAN);
+
+ protected:
+    K3LAPI & _k3lapi;
+};
+
+#endif /* _K3LUTIL_HPP_ */
+
diff --git a/src/mod/endpoints/mod_khomp/commons/logger.hpp b/src/mod/endpoints/mod_khomp/commons/logger.hpp
new file mode 100644
index 0000000000..6fcf7bffe3
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/logger.hpp
@@ -0,0 +1,644 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <stdio.h>
+#include <sys/time.h>
+#include <time.h>
+
+#include <map>
+#include <string>
+#include <iostream>
+
+#include <tagged_union.hpp>
+#include <format.hpp>
+#include <refcounter.hpp>
+#include <flagger.hpp>
+
+#if defined(COMMONS_LIBRARY_USING_ASTERISK)
+extern "C"
+{
+    #include <asterisk/localtime.h>
+}
+#elif defined(COMMONS_LIBRARY_USING_CALLWEAVER)
+extern "C"
+{
+    #include <callweaver/localtime.h>
+}
+#elif defined(COMMONS_LIBRARY_USING_FREESWITCH)
+extern "C"
+{
+    #include <time.h>
+}
+#endif
+/*
+
+********************************************************************************
+***************************** 'Logger' user manual *****************************
+********************************************************************************
+
+* Description:
+
+This class does the management of log messages for applications. It works with
+the following axioms:
+
+<*> There are several class of messages.
+<*> There are some outputs, which may be files, sockets, or a console device.
+<*> There are options for classes, for outputs and for the association of both.
+
+The last rule also shows the order in which options are processed: first the
+'classes' options are processed, then 'output' options are processed, and then
+the options for the tuple '(class, output)' are processed.
+
+The options are mapped like this:
+
+  <class-of-message>                  -> options [prefix, flags]
+  <output-sink>                       -> options [prefix]
+( <class-of-message>, <output-sink> ) -> options [prefix, flags]
+
+ - "prefix" means a fixed string prefix before the real message.
+ - "flags" means auxiliary flags (DATETIME, THREADID) which are
+   used to add information based on OS or process context info.
+
+* Example of use:
+
+typedef enum
+{
+    C_DBG_FUNC,
+    C_DBG_LOCK,
+    C_WARNING,
+    C_ERROR,
+    C_CLI,
+}
+AstClassId;
+
+typedef enum
+{
+    F_CONSOLE,
+    F_GENERIC,
+    F_TRACE,
+}
+AstOutputId;
+
+// used to indicate the console log //
+struct AstConsoleLog {};
+
+struct AstPrinter: public Logger::DefaultPrinter
+{
+    typedef Logger::DefaultPrinter Super;
+
+    using namespace Tagged;
+
+    using Super::operator()(int);
+
+    // just 2 type of descriptors //
+    typedef Union < int, Union < AstConsoleLog > > Container;
+
+    ast_printer(std::string & msg): Super(msg) {};
+
+    bool operator()(const AstConsoleLog & log)
+    {
+        ast_console_puts(_msg.c_str());
+        return true;
+    };
+
+#if 0
+    bool operator()(int log)
+    {
+        return Super::operator()(log);
+    };
+#endif
+};
+
+bool start_log()
+{
+    typedef Logger::Manager<AstClassId, AstOutputId, AstPrinter, SimpleLock> LogManager;
+
+    LogManager logger;
+
+    // shortcut definition //
+    typedef LogManager::Option LogOption;
+
+    FILE * log_file = fopen( "output.log", "a");
+
+    if (!log_file)
+        return false;
+
+    logger.add( F_CONSOLE, AstConsoleLog(), "chan_khomp: ");
+    logger.add( F_GENERIC, log_file);
+
+    logger.classe( C_WARNING )
+        & LogOption(F_CONSOLE, "WARNING: ", LogOption::Flags(LogOption::Flag(LogOption::DATETIME)))
+        & LogOption(F_GENERIC, "W: ", LogOption::Flags(LogOption::Flag(LogOption::DATETIME)))
+
+    logger.classe( C_DBG_LOCK ).enabled(false);
+
+    logger.classe( C_DBG_LOCK )
+        & LogOption(F_GENERIC, "L: ", LogOption::Flags
+            (LogOption::flag_type(LogOption::ENABLED) &
+             LogOption::flag_type(LogOption::DATETIME))
+
+    logger(C_WARNING, "eu sou uma mensagem de warning");
+
+    logger.classe(C_WARNING).set(F_GENERIC, LogOption::ENABLED, true);
+    logger.classe(C_WARNING).set(F_CONSOLE, LogOption::ENABLED, false);
+
+    logger.classe(C_CLI).prefix("<K>");
+
+    return true;
+}
+
+void message_the_user(int fd)
+{
+    logger(C_CLI, fd, "eu sou uma mensagem de cli!");
+    logger(C_WARNING, "eu sou um warning");
+}
+
+********************************************************************************
+********************************************************************************
+
+Now, the code..!
+
+*/
+
+#ifndef _LOGGER_HPP_
+#define _LOGGER_HPP_
+
+#include <tagged_union.hpp>
+
+struct Logger
+{
+    /*** a base struct for printing messages in many ways ***/
+
+    struct DefaultPrinter
+    {
+        typedef Tagged::Union < int, Tagged::Union < FILE *, Tagged::Union < std::ostream * > > >  BaseType;
+
+        typedef bool ReturnType;
+
+        DefaultPrinter(std::string & msg): _msg(msg) {};
+
+        bool operator()(std::ostream * out)
+        {
+            (*out) << _msg;
+            out->flush();
+
+            return out->good();
+        }
+
+        bool operator()(FILE * out)
+        {
+            if (fputs(_msg.c_str(), out) < 0)
+                return false;
+
+            if (fflush(out) < 0)
+                return false;
+
+            return true;
+        }
+
+        bool operator()(int out)
+        {
+#ifndef KWIN32
+            return (write(out, _msg.c_str(), _msg.size()) == (int)_msg.size());
+#else
+            // no need for file descriptors on windows
+            return false;
+#endif
+        }
+
+        std::string & msg() { return _msg; }
+
+     protected:
+        std::string & _msg;
+    };
+
+    /*** manage the printing of messages ***/
+
+    template <class ClassId, class OutputId, class Printer, class LockType>
+    struct Manager
+    {
+        typedef  typename Printer::BaseType       BaseType;
+
+     protected:
+         /* holds a stream, and an optimal message prefix */
+        struct OutputOptions
+        {
+            OutputOptions(BaseType & stream, std::string & prefix)
+            : _stream(stream), _prefix(prefix) {};
+
+            BaseType     _stream;
+            std::string  _prefix;
+            LockType     _lock;
+        };
+
+        typedef  std::map < OutputId, OutputOptions > OutputMap;
+
+     public:
+
+        /* print in a specific 'message class' */
+        struct ClassType
+        {
+            ClassType(void)
+            : _enabled(true)
+            {};
+
+//            ClassType(ClassType & o)
+//            : _stream_map(o._stream_map), _prefix(o.prefix),
+//              _lock(o._lock),_enabled(o._enabled)
+//            {};
+
+            /* initializes the options of the (class, stream) pair */
+            struct Option
+            {
+                typedef enum { ENABLED, DATETIME, THREADID, DATETIMEMS } EnumType;
+
+                typedef Flagger< EnumType >             Flags;
+                typedef typename Flags::InitFlags   InitFlags;
+
+                Option(OutputId output, const char * prefix,
+                       Flags flags = InitFlags(ENABLED))
+                : _output(output), _prefix(prefix), _flags(flags) {};
+
+                Option(OutputId output, std::string prefix,
+                       Flags flags = InitFlags(ENABLED))
+                : _output(output), _prefix(prefix), _flags(flags) {};
+
+                Option(OutputId output,
+                    Flags flags = InitFlags(ENABLED))
+                : _output(output), _flags(flags) {};
+
+                OutputId     _output;
+                std::string  _prefix;
+                Flags        _flags;
+            };
+
+         protected:
+
+             /* holds a prefix and a activation status */
+            struct OptionContainer
+            {
+                OptionContainer(std::string prefix, typename Option::Flags flags)
+                : _prefix(prefix), _flags(flags) {};
+
+                std::string            _prefix;
+                typename Option::Flags _flags;
+            };
+
+            typedef std::multimap < OutputId, OptionContainer > OptionMap;
+
+            /* utility function for printing */
+            bool print(std::string & msg, BaseType & stream, LockType & lock)
+            {
+                lock.lock();
+
+                Printer p(msg);
+                bool ret = stream.visit(p);
+
+                lock.unlock();
+
+                return ret;
+            };
+
+/*
+            bool print(std::string & msg, BaseType & stream, LockType & lock)
+            {
+                lock.lock();
+
+                Printer p(msg);
+                bool ret = stream.visit(p);
+
+                lock.unlock();
+
+                return ret;
+            };
+*/
+
+         public:
+            ClassType & operator&(const Option & value)
+            {
+                add(value._output, value._prefix, value._flags);
+                return *this;
+            }
+
+            void add(OutputId output_id, std::string prefix,
+                typename Option::Flags      flags)
+            {
+                typedef std::pair < OutputId, OptionContainer > pair_type;
+                _stream_map.insert(pair_type(output_id, OptionContainer(prefix, flags)));
+            }
+
+            /* get and set methods for active mode */
+            void set(OutputId id, typename Option::EnumType flag, bool value = true)
+            {
+                typename OptionMap::iterator iter = _stream_map.find(id);
+
+                if (iter == _stream_map.end())
+                    return;
+
+                (*iter).second._flags.set(flag, value);
+            }
+
+            bool get(OutputId idx, typename Option::EnumType flag)
+            {
+                typename OptionMap::iterator iter = _stream_map.find(idx);
+
+                if (iter == _stream_map.end())
+                    return false;
+
+                return (*iter).second._flags.is_set(flag);
+            }
+
+            /* get/adjust the enable/disable value for the class */
+            void  enabled(bool enabled) { _enabled = enabled; };
+            bool  enabled()             { return _enabled;    };
+
+            /* get/adjust the classe prefix */
+            void          prefix(const char  * prefix) { _prefix = prefix; }
+            void          prefix(std::string & prefix) { _prefix = prefix; }
+            std::string & prefix()                     { return _prefix;   }
+
+            /* printing function (operator, actually) */
+            bool operator()(OutputMap & out_map, std::string & msg)
+            {
+                if (!_enabled)
+                    return true;
+
+                typedef typename OptionMap::iterator Iter;
+
+                bool ret = true;
+
+                for (Iter iter = _stream_map.begin(); iter != _stream_map.end(); iter++)
+                {
+                    OptionContainer & opt = (*iter).second;
+
+                    if (!opt._flags[Option::ENABLED])
+                        continue;
+
+                    typename OutputMap::iterator out_iter = out_map.find((*iter).first);
+
+                    /* this stream have been added already? if not, skip! */
+                    if (out_iter == out_map.end())
+                        continue;
+
+                    /* final message */
+                    std::string out_msg;
+
+                    if (opt._flags[Option::DATETIME])
+                    {
+#if defined(COMMONS_LIBRARY_USING_ASTERISK)
+#if ASTERISK_AT_LEAST(1,6,0)
+                        struct timeval tv;
+                        struct ast_tm  lt;
+
+                        gettimeofday(&tv, NULL);
+
+#else
+                        time_t      tv;
+                        struct tm   lt;
+
+                        time (&tv);
+#endif
+
+#if ASTERISK_AT_LEAST(1,4,5)
+                        ast_localtime (&tv, &lt, NULL);
+#else
+                        localtime_r (&tv, &lt);
+#endif
+
+                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d] ")
+                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour
+                            % lt.tm_min % lt.tm_sec);
+
+#elif defined(COMMONS_LIBRARY_USING_CALLWEAVER)
+                        time_t      tv;
+                        struct tm   lt;
+
+                        time (&tv);
+
+                        localtime_r (&tv, &lt);
+
+                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d] ")
+                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour
+                            % lt.tm_min % lt.tm_sec);
+
+#elif defined(COMMONS_LIBRARY_USING_FREESWITCH)
+                        time_t      tv;
+                        struct tm   lt;
+
+                        time (&tv);
+
+                        localtime_r (&tv, &lt);
+
+                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d] ")
+                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour
+                            % lt.tm_min % lt.tm_sec);
+
+#endif
+                    }
+
+                    if (opt._flags[Option::DATETIMEMS])
+                    {
+#if defined(COMMONS_LIBRARY_USING_ASTERISK)
+#if ASTERISK_AT_LEAST(1,6,0)
+                        struct timeval tv;
+                        struct ast_tm  lt;
+
+                        gettimeofday(&tv, NULL);
+
+#else
+                        time_t      tv;
+                        struct tm   lt;
+
+                        time (&tv);
+#endif
+
+#if ASTERISK_AT_LEAST(1,4,5)
+                        ast_localtime (&tv, &lt, NULL);
+#else
+                        localtime_r (&tv, &lt);
+#endif
+
+#if ASTERISK_AT_LEAST(1,6,0)
+                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d:%04d] ")
+                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
+                            % lt.tm_sec % (tv.tv_usec / 1000));
+#else
+                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d:%04d] ")
+                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
+                            % lt.tm_sec % (tv * 1000));
+#endif
+
+#elif defined(COMMONS_LIBRARY_USING_CALLWEAVER)
+                        time_t      tv;
+                        struct tm   lt;
+
+                        time (&tv);
+
+                        localtime_r (&tv, &lt);
+
+                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d:%04d] ")
+                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
+                            % lt.tm_sec % (tv * 1000));
+
+#elif defined(COMMONS_LIBRARY_USING_FREESWITCH)
+                        time_t      tv;
+                        struct tm   lt;
+
+                        time (&tv);
+
+                        localtime_r (&tv, &lt);
+
+                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d:%04d] ")
+                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
+                            % lt.tm_sec % (tv * 1000));
+
+#endif
+                    }
+
+                    OutputOptions & out_opt = (*out_iter).second;
+
+                    if (opt._flags[Option::THREADID])
+                    {
+#if defined (COMMONS_LIBRARY_USING_ASTERISK) || defined(COMMONS_LIBRARY_USING_CALLWEAVER) || defined(COMMONS_LIBRARY_USING_FREESWITCH)
+                        out_msg += STG(FMT("t=%08p ") % ((void*)pthread_self()));
+#endif
+                    }
+
+                    out_msg += _prefix;
+                    out_msg += out_opt._prefix;
+                    out_msg += opt._prefix;
+                    out_msg += msg;
+                    out_msg += "\n";
+
+                    ret |= print(out_msg, out_opt._stream, out_opt._lock);
+                }
+
+                return ret;
+            }
+
+            bool operator()(BaseType & stream, std::string & msg)
+            {
+                std::string final_msg;
+
+                final_msg += _prefix;
+                final_msg += msg;
+                final_msg += "\n";
+
+                return print(final_msg, stream, _lock);
+            }
+
+         protected:
+            OptionMap    _stream_map;
+            std::string  _prefix;
+            LockType     _lock;
+            bool         _enabled;
+        };
+
+        /* util declaration */
+        typedef typename ClassType::Option  Option;
+
+        /* class_id_type -> ClassType mapper */
+        typedef std::map < ClassId, ClassType >  ClassMap;
+
+        /* local option pair */
+        typedef std::pair < OutputId, OutputOptions >  OutputOptionPair;
+
+        void add(OutputId output, BaseType stream, const char * prefix = "")
+        {
+            std::string str_prefix(prefix);
+
+            _output_map.insert(OutputOptionPair(output, OutputOptions(stream, str_prefix)));
+        }
+
+        void add(OutputId output, BaseType stream, std::string prefix)
+        {
+            _output_map.insert(OutputOptionPair(output, OutputOptions(stream, prefix)));
+        }
+
+        ClassType & classe(ClassId classeid)
+        {
+            return _classe_map[classeid];
+        }
+
+        bool operator()(ClassId classeid, const char * msg)
+        {
+            std::string str_msg(msg);
+            return _classe_map[classeid](_output_map, str_msg);
+        }
+
+        bool operator()(ClassId classeid, std::string & msg)
+        {
+            return _classe_map[classeid](_output_map, msg);
+        }
+
+        bool operator()(ClassId classeid, Format fmt)
+        {
+            std::string str_fmt = STG(fmt);
+            return _classe_map[classeid](_output_map, str_fmt);
+        }
+
+        bool operator()(ClassId classeid, BaseType stream, const char * msg)
+        {
+            std::string str_msg(msg);
+            return _classe_map[classeid](stream, str_msg);
+        }
+
+        bool operator()(ClassId classeid, BaseType stream, std::string & msg)
+        {
+            return _classe_map[classeid](stream, msg);
+        }
+
+        bool operator()(ClassId classeid, BaseType stream, Format fmt)
+        {
+            std::string str_fmt = STG(fmt);
+            return _classe_map[classeid](stream, str_fmt);
+        }
+
+     protected:
+        ClassMap   _classe_map;
+        OutputMap  _output_map;
+    };
+
+ private:
+    Logger();
+};
+
+#endif /* _LOGGER_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/noncopyable.hpp b/src/mod/endpoints/mod_khomp/commons/noncopyable.hpp
new file mode 100644
index 0000000000..d32faa8913
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/noncopyable.hpp
@@ -0,0 +1,54 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#ifndef _NONCOPYABLE_HPP_
+#define _NONCOPYABLE_HPP_
+
+struct NonCopyable
+{
+    NonCopyable() {};
+ private:
+    NonCopyable(NonCopyable const &)             { };
+    NonCopyable & operator=(NonCopyable const &) { return *this; };
+};
+
+#endif /* _NONCOPYABLE_HPP_ */
+
diff --git a/src/mod/endpoints/mod_khomp/commons/refcounter.hpp b/src/mod/endpoints/mod_khomp/commons/refcounter.hpp
new file mode 100644
index 0000000000..6ba8ae8b2f
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/refcounter.hpp
@@ -0,0 +1,263 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the "LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+/* This struct uses static polymorphism, and derived classes should implement *
+ * the "unreference()" method, which should release all resources when called */
+
+#ifndef _REFCOUNTER_HPP_
+#define _REFCOUNTER_HPP_
+
+#define NEW_REFCOUNTER(...)    public ReferenceCounter< __VA_ARGS__ >
+#define INC_REFCOUNTER(o, ...) ReferenceCounter< __VA_ARGS__ >(static_cast< const ReferenceCounter < __VA_ARGS__ > & >(o))
+
+#include <stdlib.h>
+
+#include <noncopyable.hpp>
+#include <atomic.hpp>
+
+#ifdef DEBUG
+# include <iostream>
+#endif
+
+struct ReferenceData: public NonCopyable
+{
+    ReferenceData()
+    : _data_count(1)
+    {};
+
+    inline unsigned int increment(void)
+    {
+        if (!_data_count)
+            abort();
+
+        Atomic::doAdd(&_data_count);
+
+        return _data_count;
+    }
+
+    inline unsigned int decrement(void)
+    {
+        if (!_data_count)
+            abort();
+
+        Atomic::doSub(&_data_count);
+        return _data_count;
+    }
+
+    volatile unsigned int _data_count;
+};
+
+template < typename T >
+struct ReferenceCounter
+{
+    typedef T Type;
+
+    ReferenceCounter(bool create_counter = true)
+    : _reference_count(0)
+    {
+        reference_restart(create_counter);
+
+#ifdef DEBUG
+        std::cerr <<  ((void*)this) << ": ReferenceCounter() [ref_count="
+            << (_reference_count ? (*_reference_count) : -1) << "]" << std::endl;
+#endif
+    };
+
+    ReferenceCounter(const ReferenceCounter & o)
+    : _reference_count(0)
+    {
+        reference_reflect(o);
+
+#ifdef DEBUG
+        std::cerr << ((void*)this) << ": ReferenceCounter(" << ((void*)(&o)) << ") [ref_count="
+            << (_reference_count ? (*_reference_count) : -1) << "]" << std::endl;
+#endif
+    };
+
+    virtual ~ReferenceCounter()
+    {
+#ifdef DEBUG
+        std::cerr << ((void*)this) << ": ~ReferenceCounter() [ref_count="
+            << (_reference_count ? (*_reference_count) : -1) << "]" << std::endl;
+#endif
+        reference_disconnect(_reference_count);
+    }
+
+    ReferenceCounter & operator=(const ReferenceCounter & o)
+    {
+        reference_reflect(o);
+
+#ifdef DEBUG
+        std::cerr << ((void*)this) << ": ReferenceCounter::operator=(" << ((void*)(&o)) << ") [ref_count="
+            << (_reference_count ? (*_reference_count) : -1) << "]" << std::endl;
+#endif
+
+        return *this;
+    };
+
+ protected:
+    inline void reference_restart(bool create_counter = false)
+    {
+        ReferenceData * oldref = _reference_count;
+
+        _reference_count = (create_counter ? new ReferenceData() : 0);
+
+        if (oldref) reference_disconnect(oldref);
+    }
+
+    inline void reference_reflect(const ReferenceCounter & other)
+    {
+        ReferenceData * newref = other._reference_count;
+        ReferenceData * oldref = _reference_count;
+
+        /* NOTE: increment before, avoid our reference being zero, even *
+         *       for a short period of time.                            */
+
+        if (newref) newref->increment();
+
+        _reference_count = newref;
+
+        if (oldref) reference_disconnect(oldref);
+    };
+
+    inline void reference_disconnect(ReferenceData *& counter)
+    {
+        if (counter)
+        {
+            unsigned int result = counter->decrement();
+
+            if (!result)
+            {
+                static_cast< Type * >(this)->unreference();
+                delete counter;
+            }
+
+            counter = 0;
+        }
+    };
+
+  private:
+    ReferenceData * _reference_count;
+};
+
+template < typename T >
+struct ReferenceContainer: NEW_REFCOUNTER(ReferenceContainer< T >)
+{
+    /* type */
+    typedef T Type;
+
+    /* shorthand */
+    typedef ReferenceCounter < ReferenceContainer< Type > > Counter;
+
+    // TODO: make this a generic exception someday
+    struct NotFound {};
+
+    ReferenceContainer()
+    : Counter(false),
+      _reference_value(0)
+    {};
+
+    ReferenceContainer(Type * value)
+    : _reference_value(value)
+    {};
+
+    ReferenceContainer(const ReferenceContainer & value)
+    : Counter(false),
+      _reference_value(0)
+    {
+        operator()(value);
+    };
+
+    virtual ~ReferenceContainer()
+    {};
+
+    ReferenceContainer operator=(const ReferenceContainer & value)
+    {
+        operator()(value);
+        return *this;
+    };
+
+    /**/
+
+    void unreference()
+    {
+        if (_reference_value)
+        {
+            delete _reference_value;
+            _reference_value = 0;
+        }
+    }
+
+    // simulates a copy constructor
+    void operator()(const ReferenceContainer & value)
+    {
+        Counter::reference_reflect(value);
+
+        _reference_value = const_cast<Type *>(value._reference_value);
+    };
+
+    // shortcut for operator below
+    void operator=(const Type * value)
+    {
+        operator()(value);
+    };
+
+    // accept value (pointer)!
+    void operator()(const Type * value)
+    {
+         Counter::reference_restart((value != 0));
+
+        _reference_value = const_cast<Type *>(value);
+    };
+
+    // return value (pointer)!
+    Type * operator()(void)
+    {
+        return _reference_value;
+    };
+
+  protected:
+    Type * _reference_value;
+
+  protected:
+};
+
+#endif /* _REFCOUNTER_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/regex.cpp b/src/mod/endpoints/mod_khomp/commons/regex.cpp
new file mode 100644
index 0000000000..61f941c214
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/regex.cpp
@@ -0,0 +1,148 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <regex.hpp>
+
+#include <string.h>
+
+void Regex::Expression::initialize(void)
+{
+    unsigned int tmplen = strlen(_expression);
+
+    bool extflag = (_flags & E_EXTENDED);
+
+    for (unsigned int i = 0; i < tmplen; ++i)
+    {
+        switch (_expression[i])
+        {
+            case '\\':
+                ++i;
+
+                if (!extflag && i < tmplen)
+                    if (_expression[i] == '(')
+                        ++_subcounter;
+
+                break;
+
+            case '(':
+                if (extflag)
+                    ++_subcounter;
+
+            default:
+                break;
+        }
+    }
+
+    _errorstate = regcomp(&_comp_regex, _expression, _flags);
+}
+
+std::string Regex::Expression::regerror_as_string(void)
+{
+    unsigned int count = regerror(_errorstate, &_comp_regex, 0, 0) + 1;
+
+    char * msg = new char[count];
+
+    regerror(_errorstate, &_comp_regex, msg, count);
+
+    std::string tmp(msg, count);
+
+    delete[] msg;
+
+    return tmp;
+}
+
+void Regex::Match::initialize(void)
+{
+    if (_expression.valid())
+    {
+        _subcounter = (_expression.subcount() + 2); // 0 + N.. + invalid
+        _submatches = new regmatch_t[_subcounter];
+        _have_match = (regexec(_expression.repr(), _basestring.c_str(),
+            _subcounter, _submatches, _flags) == 0);
+    }
+}
+
+std::string Regex::Match::replace(std::string rep, unsigned int index)
+{
+    ReplaceMap tmp;
+    tmp.insert(ReplacePair(index,rep));
+    return replace(tmp);
+}
+
+std::string Regex::Match::replace(Regex::ReplaceMap & map)
+{
+    if (!_have_match)
+        return _basestring;
+
+    std::string buffer = _basestring;
+
+    try
+    {
+        if (_submatches[0].rm_so != 0 && (map.find(0) != map.end()))
+            return _basestring.replace(_submatches[0].rm_so, _submatches[0].rm_eo - _submatches[0].rm_so, map.find(0)->second);
+
+        for (unsigned int n = 1; (_submatches[n].rm_so != -1) && (n < _subcounter); n++)
+        {
+            //// s    f RRR s f RRR s    f RRRR s  f
+            //// XXXYYY(ZZZ)AAA(BBB)CCCEEE(FFFF)GGGG
+
+            bool globalsubs = false;
+
+            if (map.find(n) == map.end())
+            {
+                if (map.find(UINT_MAX) == map.end())
+                    continue;
+
+                globalsubs = true;
+            }
+
+            buffer = buffer.replace(_submatches[n].rm_so,
+                _submatches[n].rm_eo - _submatches[n].rm_so,
+                map.find((globalsubs ? UINT_MAX : n))->second);
+        }
+    }
+    catch (std::out_of_range e)
+    {
+        return "";
+    }
+
+    return buffer;
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/regex.hpp b/src/mod/endpoints/mod_khomp/commons/regex.hpp
new file mode 100644
index 0000000000..daf20147a8
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/regex.hpp
@@ -0,0 +1,252 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <sys/types.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <string.h>
+#include <regex.h>
+
+#include <iostream>
+#include <string>
+#include <stdexcept>
+#include <map>
+
+#include <refcounter.hpp>
+#include <noncopyable.hpp>
+
+#ifndef _REGEX_HPP_
+#define _REGEX_HPP_
+
+struct Regex
+{
+    enum
+    {
+        E_EXTENDED         = REG_EXTENDED,
+        E_IGNORE_CASE      = REG_ICASE,
+        E_NO_SUB_MATCH     = REG_NOSUB,
+        E_EXPLICIT_NEWLINE = REG_NEWLINE,
+    };
+
+    enum
+    {
+        M_NO_BEGIN_OF_LINE    = REG_NOTBOL,
+        M_NO_END_OF_LINE      = REG_NOTEOL,
+    };
+
+    enum
+    {
+        /* mark replace for full match (submatch "0"). */
+        REP_BASE             = 0u,
+        /* mark global string for replace. */
+        REP_ALL              = UINT_MAX,
+    };
+
+    typedef std::pair < unsigned int, std::string >    ReplacePair;
+    typedef std::map  < unsigned int, std::string >     ReplaceMap;
+
+    struct Expression : public NonCopyable
+    {
+        Expression(const char * expression, unsigned int flags = 0)
+        :  _expression(expression), _alloced(false),
+           _subcounter(0), _errorstate(INT_MAX), _flags(flags)
+        {
+            initialize();
+        }
+
+        Expression(std::string & expression, unsigned int flags = 0)
+        :  _expression(strdup(expression.c_str())), _alloced(true),
+           _subcounter(0), _errorstate(INT_MAX), _flags(flags)
+        {
+            initialize();
+        }
+
+        ~Expression()
+        {
+            if (_errorstate != INT_MAX)
+                regfree(&_comp_regex);
+
+            if (_alloced)
+            {
+                delete _expression;
+                _expression = 0;
+            }
+        }
+
+        bool               valid(void) { return (_errorstate == 0); }
+
+        unsigned int    subcount(void) { return  _subcounter; }
+        const regex_t *     repr(void) { return &_comp_regex; }
+
+        std::string error(void)
+        {
+            switch (_errorstate)
+            {
+                case 0:       return "";
+                case INT_MAX: return "uninitialized";
+                default:      return regerror_as_string();
+            }
+        }
+
+     private:
+        void                initialize(void);
+        std::string regerror_as_string(void);
+
+     protected:
+        const char   * _expression;
+        bool           _alloced;
+
+        unsigned int   _subcounter;
+
+        int            _errorstate;
+        regex_t        _comp_regex;
+
+        unsigned int   _flags;
+    };
+
+    struct Match: NEW_REFCOUNTER(Match)
+    {
+        Match(const char * basestring, Expression & expression, unsigned int flags = 0)
+        : _basestring(basestring), _expression(expression), _subcounter(0), _submatches(0),
+           _have_match(false), _flags(flags)
+        {
+            initialize();
+        }
+
+        Match(std::string & basestring, Expression & expression, unsigned int flags = 0)
+        : _basestring(basestring), _expression(expression), _subcounter(0), _submatches(0),
+          _have_match(false), _flags(flags)
+        {
+            initialize();
+        }
+
+        Match(const Match & o)
+        : INC_REFCOUNTER(o, Match),
+          _basestring(o._basestring), _expression(o._expression),
+          _subcounter(o._subcounter), _submatches(o._submatches),
+          _have_match(o._have_match), _flags(o._flags)
+        {
+        }
+
+        void unreference()
+        {
+            delete[] _submatches;
+        }
+
+        bool matched(void)
+        {
+            return _have_match;
+        }
+
+        bool matched(unsigned int number)
+        {
+            if (_have_match && number < _subcounter)
+                return (_submatches[number].rm_so != -1);
+
+            return false;
+        }
+
+        std::string submatch(int number)
+        {
+            if (!matched(number))
+                return "";
+
+            return _basestring.substr(_submatches[number].rm_so,
+                _submatches[number].rm_eo - _submatches[number].rm_so);
+        }
+
+        /**
+        * \brief gets a map with all matches
+        * \return std::map<int,std::string> with all matches
+        * \note index 0 in map, is the complete string
+        * \author Eduardo Nunes Pereira
+        *
+        * If fails the empty map is returned
+        */
+        std::map<int, std::string> obtain_match_map()
+        {
+            int match_counter = 0;
+            std::map<int,std::string> tmp_map;
+            while(matched(match_counter))
+            {
+                tmp_map.insert(std::make_pair(match_counter,submatch(match_counter)));
+                match_counter++;
+            }
+
+            return tmp_map;
+        }
+
+        /**
+        * \brief replaces strings matched by parentesis
+        * \param each item of the vector is a parentesis replaced
+        * \return string replaced
+        * \note The overload method match only one string in parentesis.
+        * \author Eduardo Nunes Pereira
+        *
+        * If fails the empty string is returned.
+        */
+        std::string replace(ReplaceMap &);
+        std::string replace(std::string, unsigned int index = REP_BASE);
+
+        std::string operator[](int number)
+        {
+            return submatch(number);
+        }
+
+        // NOTE: there is already a way to get subcount defined on EXPRESSION class!
+
+     private:
+        void initialize(void);
+
+     protected:
+        std::string    _basestring;
+        Expression   & _expression;
+
+        unsigned int   _subcounter;
+        regmatch_t   * _submatches;
+
+        bool           _have_match;
+        unsigned int   _flags;
+    };
+};
+
+#endif /* _REGEX_HPP_ */
+
diff --git a/src/mod/endpoints/mod_khomp/commons/ringbuffer.cpp b/src/mod/endpoints/mod_khomp/commons/ringbuffer.cpp
new file mode 100644
index 0000000000..428bd29221
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/ringbuffer.cpp
@@ -0,0 +1,575 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <ringbuffer.hpp>
+
+/********** BUFFER FUNCTIONS **********/
+
+/* writes everything or nothing */
+bool Ringbuffer_traits::traits_provide(char * buffer, const char * value, unsigned int amount, bool skip_overwrite)
+{
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    const unsigned int reader = cache.reader.complete;
+    const unsigned int writer = cache.writer.complete;
+
+    const unsigned int dest = cache.writer.complete - 1;
+
+    const bool reader_less = cache.reader.complete < cache.writer.complete;
+
+    if (amount >= _size)
+        return false;
+
+    bool ret = true;
+
+    /* should we go around the buffer for writing? */
+    if (((writer + amount) > _size) && (reader_less || !skip_overwrite))
+    {
+        /* Documentation of the formula used in the 'if' below.
+         *
+         * [0|1|2|3|4|5|6|7] => size=8
+         *      |   |
+         *  reader  |
+         *         writer
+         *
+         * => writer has places [5,6,7,0,1] to write (5 places).
+         *
+         * =>  8 - (4-2+1) = 8 - (2+1) = 8 - 3 = 5
+         *
+         * > writer goes 1 up, amount goes 1 down.
+         * > reader goes 1 up, amount goes 1 up.
+         * > size goes 1 down, amount goes 1 down.
+         *
+         */
+
+        if ((_size - (writer - reader + 1)) <= amount)
+        {
+            if (skip_overwrite)
+                return false;
+
+            do
+            {
+                Buffer_pointer extra(cache.reader);
+                extra.complete = (extra.complete + amount) % _size;
+
+                if (update(cache.reader, extra))
+                    break;
+            }
+            while (true);
+
+            ret = false;
+        }
+
+        unsigned int wr1 = _size - writer + 1; /* writer is already 1 position after */
+        unsigned int wr2 = amount - wr1;
+
+//        fprintf(stderr, "%p> partial write: (%d/%d) %d/%d [%d/%d]\n", this, wr1, wr2, amount, _size, reader, writer);
+
+        /* two partial writes (one at the end, another at the beginning) */
+        memcpy((void *) &(buffer[dest]), (const void *)  (value),      _block * wr1);
+        memcpy((void *)  (buffer),       (const void *) &(value[wr1]), _block * wr2);
+    }
+    else
+    {
+        if (!reader_less && ((reader - writer) <= amount))
+        {
+            if (skip_overwrite)
+                return false;
+
+            do
+            {
+                Buffer_pointer extra(cache.reader);
+                extra.complete = (extra.complete + amount) % _size;
+
+                if (update(cache.reader, extra))
+                    break;
+            }
+            while (true);
+
+            ret = false;
+        }
+
+//        fprintf(stderr, "%p> full write: a=%d/s=%d [r=%d/w=%d]\n", this, amount, _size, reader, writer);
+
+        /* we are talking about buffers here, man! */
+        memcpy((void *) &(buffer[dest]), (const void *) value, _block * amount);
+    }
+
+    _pointers.writer.complete = ((dest + amount) % _size) + 1;
+    _pointers.writer.partial  = 1;
+
+//    fprintf(stderr, "%p> write end: %d [block=%d]\n", this, writer, _block);
+
+    return ret;
+}
+
+/* returns the number of itens that have been read */
+unsigned int Ringbuffer_traits::traits_consume(const char * buffer, char * value, unsigned int amount, bool atomic_mode)
+{
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    const unsigned int writer = _pointers.writer.complete;
+    const unsigned int reader = _pointers.reader.complete;
+
+    const bool writer_less = writer < reader;
+
+    unsigned int total = 0;
+
+    /* should we go around the buffer for reading? */
+    if (writer_less && (reader + amount >= _size))
+    {
+        total = std::min(_size - (reader - writer + 1), amount);
+
+        if ((total == 0) || (atomic_mode && (total < amount)))
+            return 0;
+
+        unsigned int rd1 = _size - reader;
+        unsigned int rd2 = total - rd1;
+
+//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
+
+        /* two partial consumes (one at the end, another at the beginning) */
+        memcpy((void *)  (value),      (const void *) &(buffer[reader]), _block * rd1);
+        memcpy((void *) &(value[rd1]), (const void *)  (buffer),         _block * rd2);
+    }
+    else
+    {
+        total = std::min((!writer_less ? writer - (reader + 1) : amount), amount);
+
+        if ((total == 0) || (atomic_mode && (total < amount)))
+            return 0;
+
+//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
+
+        /* we are talking about buffers here, man! */
+        memcpy((void *) value, (const void *) &(buffer[reader]), _block * total);
+    }
+
+    do
+    {
+        /* jump the reader forward */
+        Buffer_pointer index((cache.reader.complete + total) % _size);
+
+        if (update(cache.reader, index))
+            break;
+    }
+    while (true);
+
+//    fprintf(stderr, "%p> read end: %d [block=%d]\n", this, reader, _block);
+
+    return total;
+}
+
+/********** TWO-PHASE BUFFER FUNCTIONS ***********/
+
+/* returns the number of itens that have been read */
+unsigned int Ringbuffer_traits::traits_consume_begins(const char * buffer, char * value, unsigned int amount, bool atomic_mode)
+{
+    Buffer_table cache = _pointers;
+
+    /* avoid using different values */
+    const unsigned int reader = cache.reader.complete;
+    const unsigned int writer = cache.writer.complete;
+
+    const bool writer_less = writer < reader;
+
+    unsigned int total = 0;
+
+    /* should we go around the buffer for reading? */
+    if (writer_less && (reader + amount >= _size))
+    {
+        total = std::min(_size - (reader - writer + 1), amount);
+
+        if ((total == 0) || (atomic_mode && (total < amount)))
+            return 0;
+
+        unsigned int rd1 = _size - reader;
+        unsigned int rd2 = total - rd1;
+
+//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
+
+        /* two partial consumes (one at the end, another at the beginning) */
+        memcpy((void *)  (value),      (const void *) &(buffer[reader]), _block * rd1);
+        memcpy((void *) &(value[rd1]), (const void *)  (buffer),         _block * rd2);
+    }
+    else
+    {
+        total = std::min((!writer_less ? writer - (reader + 1) : amount), amount);
+
+        if ((total == 0) || (atomic_mode && (total < amount)))
+            return 0;
+
+//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
+
+        /* we are talking about buffers here, man! */
+        memcpy((void *) value, (const void *) &(buffer[reader]), _block * total);
+    }
+
+//    fprintf(stderr, "%p> read end: %d [%d]\n", this, _reader, _reader_partial);
+
+    return total;
+}
+
+bool Ringbuffer_traits::traits_consume_commit(unsigned int amount)
+{
+   	/* avoid using different values */
+    Buffer_table cache = _pointers;
+
+   	const unsigned int writer = cache.writer.complete;
+    const unsigned int reader = cache.reader.complete;
+
+    const bool writer_less = writer < reader;
+
+    unsigned int total = 0;
+
+    /* should we go around the buffer for reading? */
+    if (writer_less && (reader + amount >= _size))
+    {
+        total = std::min(_size - (reader - writer + 1), amount);
+
+        if (total < amount)
+            return false;
+
+//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
+    }
+    else
+    {
+        total = std::min((!writer_less ? writer - (reader + 1) : amount), amount);
+
+        if (total < amount)
+            return false;
+
+//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
+    }
+
+    do
+    {
+        /* jump the reader forward */
+        Buffer_pointer index(cache.reader);
+        index.complete = (index.complete + total) % _size;
+
+        if (update(cache.reader, index))
+            break;
+    }
+    while (true);
+
+//    fprintf(stderr, "%p> read end: %d [%d]\n", this, _reader, _reader_partial);
+
+    return true;
+}
+
+/********** PARTIAL BUFFER FUNCTIONS (bytes) ***********/
+
+/* writes everything or nothing */
+bool Ringbuffer_traits::traits_provide_partial(char * buffer, const char * value, unsigned int amount)
+{
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    const unsigned int reader = (cache.reader.complete * _block) + cache.reader.partial;
+    const unsigned int writer = ((cache.writer.complete - 1) * _block) + cache.writer.partial;
+
+    const unsigned int size = _size * _block;
+    const unsigned int dest = writer - 1;
+
+//    fprintf(stderr, "%p> provide partial: %d/%d [%d/%d]\n", this, reader, writer, amount, size);
+
+    const bool reader_less = reader < writer;
+
+    /* should we go around the buffer for writing? */
+    if (reader_less && ((writer + amount) > size))
+    {
+        /* Documentation of the formula used in the 'if' below.
+         *
+         * [0|1|2|3|4|5|6|7] => size=8
+         *      |   |
+         *  reader  |
+         *         writer
+         *
+         * => writer has places [5,6,7,0,1] to write (5 places).
+         *
+         * =>  8 - (4-2+1) = 8 - (2+1) = 8 - 3 = 5
+         *
+         * > writer goes 1 up, amount goes 1 down.
+         * > reader goes 1 up, amount goes 1 up.
+         * > size goes 1 down, amount goes 1 down.
+         *
+         */
+
+        if ((size - (writer - reader + 1)) <= amount)
+            return false;
+
+        unsigned int wr1 = size - writer + 1; /* writer is already 1 position after */
+        unsigned int wr2 = amount - wr1;
+
+//        fprintf(stderr, "%p> p partial write: (%d/%d) %d/%d [%d/%d]\n", this, wr1, wr2, amount, size, reader, writer);
+
+        /* two partial writes (one at the end, another at the beginning) */
+        memcpy((void *) &(buffer[dest]), (const void *)  (value),      wr1);
+        memcpy((void *)  (buffer),       (const void *) &(value[wr1]), wr2);
+    }
+    else
+    {
+        if (!reader_less && ((reader - writer) <= amount))
+            return false;
+
+//        fprintf(stderr, "%p> p full write: %d/%d [r=%d/w=%d]\n", this, amount, size, reader, writer);
+
+        /* we are talking about buffers here, man! */
+        memcpy((void *) &(buffer[dest]), (const void *) value, amount);
+    }
+
+    unsigned int new_writer = ((dest + amount) % size) + 1;
+
+    /* update "full length position" */
+    _pointers.writer.complete = (unsigned int)floor((double) new_writer / (double)_block)+1;
+    _pointers.writer.partial  = (unsigned short)(new_writer % _block);
+
+//    fprintf(stderr, "%p> p write end: %d [block=%d]\n", this, new_writer, _block);
+
+    return true;
+}
+
+/* returns the number of bytes that have been read */
+unsigned int Ringbuffer_traits::traits_consume_partial(const char * buffer, char * value, unsigned int amount)
+{
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    const unsigned int writer = ((cache.writer.complete - 1) * _block) + cache.writer.partial;
+    const unsigned int reader = (cache.reader.complete * _block) + cache.reader.partial;
+
+    const unsigned int size = _size * _block;
+
+//    fprintf(stderr, "%p> consume partial: %d/%d [%d/%d]\n", this, reader, writer, amount, size);
+
+    const bool writer_less = writer < reader;
+
+    unsigned int total = 0;
+
+    /* should we go around the buffer for reading? */
+    if (writer_less && (reader + amount >= size))
+    {
+        total = std::min(size - (reader - writer + 1), amount);
+
+        if (total == 0)
+            return 0;
+
+        unsigned int rd1 = size - reader;
+        unsigned int rd2 = total - rd1;
+
+//        fprintf(stderr, "%p> p partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, size, reader, writer);
+
+        /* two partial consumes (one at the end, another at the beginning) */
+        memcpy((void *)  (value),      (const void *) &(buffer[reader]), rd1);
+        memcpy((void *) &(value[rd1]), (const void *)  (buffer),         rd2);
+    }
+    else
+    {
+        total = std::min((writer_less ? amount : writer - (reader + 1)), amount);
+
+        if (total == 0)
+            return 0;
+
+//        fprintf(stderr, "%p> p full read: %d/%d [r=%d/w=%d]\n", this, total, size, reader, writer);
+
+        /* we are talking about buffers here, man! */
+        memcpy((void *) value, (const void *) &(buffer[reader]), total);
+    }
+
+    do
+    {
+        unsigned int new_reader = (((cache.reader.complete * _block) + cache.reader.partial) + total) % size;
+
+        /* jump the reader forward */
+        Buffer_pointer index((unsigned int)floor((double)new_reader / (double)_block),
+            (unsigned short)(new_reader % _block));
+
+        if (update(cache.reader, index))
+        {
+//            fprintf(stderr, "%p> p read end: %d [block=%d]\n", this, new_reader, _block);
+            break;
+        }
+    }
+    while (true);
+
+    return total;
+}
+
+
+
+/********** IO FUNCTIONS **********/
+
+/* returns the number of items written to from buffer to stream */
+unsigned int Ringbuffer_traits::traits_put(const char * buffer, std::ostream &fd, unsigned int amount)
+{
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    const unsigned int reader = cache.reader.complete;
+    const unsigned int writer = cache.writer.complete;
+
+    const bool writer_less = writer < reader;
+
+    unsigned int total = 0;
+
+    /* should we go around the buffer for reading? */
+    if (writer_less && (reader + amount >= _size))
+    {
+        total = std::min(_size - (reader - writer + 1), amount);
+
+        if (total == 0)
+            return 0;
+
+        unsigned int rd1 = _size - reader;
+        unsigned int rd2 = total - rd1;
+
+//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
+
+        /* two partial consumes (one at the end, another at the beginning) */
+        fd.write((const char *) &(buffer[reader]), _block * rd1);
+        fd.write((const char *)  (buffer),         _block * rd2);
+    }
+    else
+    {
+        total = std::min((!writer_less ? writer - (reader + 1) : amount), amount);
+
+        if (total == 0)
+            return 0;
+
+//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
+
+        /* we are talking about buffers here, man! */
+        fd.write((const char *) &(buffer[reader]), _block * total);
+    }
+
+    do
+    {
+        /* jump the reader forward */
+        Buffer_pointer index(cache.reader);
+        index.complete = (index.complete + total) % _size;
+
+        if (update(cache.reader, index))
+            break;
+    }
+    while (true);
+
+    return total;
+}
+
+/* returns number of items read from stream to buffer */
+unsigned int Ringbuffer_traits::traits_get(char * buffer, std::istream &fd, unsigned int amount)
+{
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    const unsigned int reader = cache.reader.complete;
+    const unsigned int writer = cache.writer.complete;
+
+    const unsigned int dest = writer - 1;
+
+    const bool reader_less = reader < writer;
+
+    unsigned int real_amount = 0;
+
+    /* should we go around the buffer for writing? */
+    if (reader_less && ((writer + amount) > _size))
+    {
+        /* Documentation of the formula used in the 'if' below.
+         *
+         * [0|1|2|3|4|5|6|7] => size=8
+         *      |   |
+         *  reader  |
+         *         writer
+         *
+         * => writer has places [5,6,7,0,1] to write (5 places).
+         *
+         * =>  8 - (4-2+1) = 8 - (2+1) = 8 - 3 = 5
+         *
+         * > writer goes 1 up, amount goes 1 down.
+         * > reader goes 1 up, amount goes 1 up.
+         * > size goes 1 down, amount goes 1 down.
+         *
+         */
+
+        if ((_size - (writer - reader + 1)) <= amount)
+            return false;
+
+        unsigned int wr1 = _size - writer + 1; /* writer is already 1 position after */
+        unsigned int wr2 = amount - wr1;
+
+//        fprintf(stderr, "%p> partial write: (%d/%d) %d/%d [%d/%d]\n", this, wr1, wr2, amount, _size, reader, writer);
+
+        unsigned int char_amount = 0;
+
+        /* one partial write on the buffer (at the end) */
+        fd.read((char *) &(buffer[dest]), _block * wr1);
+        char_amount += fd.gcount();
+
+        if (fd.gcount() == (int)(_block * wr1))
+        {
+            /* another partial write on the buffer (at the beginning) */
+            fd.read((char *) (buffer), _block * wr2);
+            char_amount += fd.gcount();
+        }
+
+        real_amount = char_amount / _block;
+    }
+    else
+    {
+        if (!reader_less && ((reader - writer) <= amount))
+            return false;
+
+//        fprintf(stderr, "%p> full write: %d/%d [%d/%d]\n", this, amount, _size, reader, writer);
+
+        /* we are talking about buffers here, man! */
+        fd.read((char *) &(buffer[dest]), _block * amount);
+
+        real_amount = fd.gcount() / _block;
+    }
+
+    _pointers.writer.complete = ((dest + real_amount) % _size) + 1;
+    _pointers.writer.partial  = 1;
+
+    return real_amount;
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/ringbuffer.hpp b/src/mod/endpoints/mod_khomp/commons/ringbuffer.hpp
new file mode 100644
index 0000000000..39f8ffe8fb
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/ringbuffer.hpp
@@ -0,0 +1,416 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+/* WARNING: This is a generic ringbuffer abstraction, which works for single-sized elements,
+            partial elements, single/multi-elements read/writes. It is not wise to mix some
+            functions (partial element write / full element write), since it was not designed
+            with this use in mind.
+
+            Also, it works only for single-reader + single-writer, since it does not depends
+            on external mutex functions.
+ */
+
+#include <string.h>
+
+#include <cmath>
+#include <iostream>
+
+#include <noncopyable.hpp>
+#include <atomic.hpp>
+
+#ifndef _RINGBUFFER_HPP_
+#define _RINGBUFFER_HPP_
+
+struct Buffer_pointer
+{
+    Buffer_pointer(unsigned int _complete = 0u, unsigned short _partial = 0u)
+    : complete(_complete), partial(_partial)
+    {};
+
+    Buffer_pointer(const Buffer_pointer & o)
+    : complete(o.complete), partial(o.partial)
+    {};
+
+    Buffer_pointer(const volatile Buffer_pointer & o)
+    : complete(o.complete), partial(o.partial)
+    {};
+
+    void operator=(const volatile Buffer_pointer o)
+    {
+        complete = o.complete;
+        partial = o.partial;
+    }
+
+    void operator=(const Buffer_pointer o) volatile
+    {
+        complete = o.complete;
+        partial = o.partial;
+    }
+
+    bool operator==(const Buffer_pointer & o)
+    {
+        return (complete == o.complete && partial == o.partial);
+    }
+
+    unsigned int  complete:20;
+    unsigned short partial:12;
+}
+__attribute__((packed));
+
+struct Buffer_table
+{
+    Buffer_table()
+    : reader(0,0),
+      writer(1,1)
+    {};
+
+    Buffer_table(const Buffer_table & o)
+    : reader(o.reader), writer(o.writer)
+    {};
+
+    Buffer_table(const volatile Buffer_table & o)
+    : reader(o.reader), writer(o.writer)
+    {};
+
+    void operator=(const volatile Buffer_table o)
+    {
+        reader = o.reader;
+        writer = o.writer;
+    }
+
+    void operator=(const Buffer_table o) volatile
+    {
+        reader = o.reader;
+        writer = o.writer;
+    }
+
+    bool operator==(const Buffer_table & o)
+    {
+        return (reader == o.reader && writer == o.writer);
+    }
+
+    Buffer_pointer reader;
+    Buffer_pointer writer;
+}
+__attribute__((packed));
+
+struct Ringbuffer_traits
+{
+    Ringbuffer_traits(unsigned int block, unsigned int size)
+    : _block(block), _size(size)
+    {};
+
+    bool         traits_provide(      char *, const char *, unsigned int, bool);
+    unsigned int traits_consume(const char *,       char *, unsigned int, bool);
+
+    unsigned int traits_consume_begins(const char *, char *, unsigned int, bool);
+    bool         traits_consume_commit(unsigned int);
+
+    bool         traits_provide_partial(      char *, const char *, unsigned int);
+    unsigned int traits_consume_partial(const char *,       char *, unsigned int);
+
+    unsigned int traits_get(      char *, std::istream &, unsigned int);
+    unsigned int traits_put(const char *, std::ostream &, unsigned int);
+
+    bool update(Buffer_pointer & cache, Buffer_pointer & update)
+    {
+        return Atomic::doCAS(&(_pointers.reader), &cache, update);
+    }
+
+ protected:
+    const unsigned int      _block;
+    const unsigned int      _size;
+
+    volatile Buffer_table _pointers;
+};
+
+template <typename T>
+struct Ringbuffer: protected Ringbuffer_traits, public NonCopyable
+{
+    struct BufferFull  {};
+    struct BufferEmpty {};
+
+    Ringbuffer(unsigned int size)
+    : Ringbuffer_traits(sizeof(T), size)
+    {
+        _buffer = new T[_size];
+        _malloc = true;
+    };
+
+    Ringbuffer(unsigned int size, T * buffer)
+    : Ringbuffer_traits(sizeof(T), size)
+    {
+        _buffer = buffer;
+        _malloc = false;
+    };
+
+    ~Ringbuffer()
+    {
+        if (_malloc)
+          delete[] _buffer;
+    }
+
+    /***** GENERIC RANGE/INDEX CALCULATION FUNCTIONS *****/
+    bool may_write(Buffer_table & cache)
+    {
+        const unsigned int r = cache.reader.complete;
+        const unsigned int w = cache.writer.complete;
+
+        return (((r - w) != 1) && (!(r == 0 && w == _size)));
+    }
+
+    bool may_read(Buffer_table & cache)
+    {
+        if ((cache.writer.complete - cache.reader.complete) == 1)
+            return false;
+
+        return true;
+    }
+
+    unsigned int writer_next(Buffer_pointer & cache, Buffer_pointer & index)
+    {
+        unsigned int dest = cache.complete - 1,
+                     temp = cache.complete + 1;
+
+        if (temp > _size) index.complete = 1;
+        else              index.complete = temp;
+
+        index.partial = 1;
+
+        return dest;
+    };
+
+    void reader_next(Buffer_pointer & cache, Buffer_pointer & index)
+    {
+        unsigned int temp = cache.complete + 1;
+
+        if (temp == _size) index.complete = 0;
+        else               index.complete = temp;
+
+        index.partial = 0;
+    }
+
+    /***** BUFFER FUNCTIONS *****/
+
+    bool provide(const T & value)
+    {
+        Buffer_table   cache = _pointers;
+        Buffer_pointer index = _pointers.writer;
+
+        if (!may_write(cache))
+            return false;
+
+//        fprintf(stderr, "%p> provide %d/%d!\n", this, reader, writer);
+
+        unsigned int dest = writer_next(cache.writer, index);
+
+        _buffer[dest] = value;
+
+        _pointers.writer = index;
+
+//        fprintf(stderr, "%p> write: %d/%d [%d/%d]\n", this, _pointers.reader, _pointers.writer, _pointers.reader_partial, _pointers.writer_partial);
+
+        return true;
+    }
+
+    bool consume(T & value)
+    {
+        Buffer_table   cache = _pointers;
+        Buffer_pointer index = _pointers.reader;
+
+        if (!may_read(cache))
+            return false;
+
+//        fprintf(stderr, "%p> consume %d/%d!\n", this, reader, writer);
+
+        value = _buffer[index.complete];
+
+        do
+        {
+            reader_next(cache.reader, index);
+
+            if (update(cache.reader, index))
+                break;
+
+            cache.reader = index;
+        }
+        while (true);
+
+//      fprintf(stderr, "%p> read: %d/%d [%d/%d]\n", this, _pointers.reader, _pointers.writer, _pointers.reader_partial, _pointers.writer_partial);
+
+        return true;
+    }
+
+    /* writes everything or nothing */
+    inline bool provide(const T * value, unsigned int amount, bool skip_overwrite = true)
+    {
+        return traits_provide((char *)_buffer, (const char *) value, amount, skip_overwrite);
+    }
+
+    /* returns the number of items that have been read (atomic_mode == true means 'all or nothing') */
+    inline unsigned int consume(T * value, unsigned int amount, bool atomic_mode = false)
+    {
+        return traits_consume((const char *)_buffer, (char *) value, amount, atomic_mode);
+    }
+
+    /***** TWO-PHASE BUFFER FUNCTIONS *****/
+
+    /* returns the number of items that have been read (atomic_mode == true means 'all or nothing') */
+    inline unsigned int consume_begins(T * value, unsigned int amount, bool atomic_mode = false)
+    {
+        return traits_consume_begins((const char *)_buffer, (char *) value, amount, atomic_mode);
+    }
+
+    /* returns true if we could commit that much of buffer (use only after consume_begins).    *
+     * note: you may commit less bytes that have been read to keep some data inside the buffer */
+    inline bool consume_commit(unsigned int amount)
+    {
+        return traits_consume_commit(amount);
+    }
+
+    /***** TWO-PHASE SINGLE-ELEMENT BUFFER FUNCTIONS *****/
+
+    T & provider_start(void)
+    {
+        Buffer_table  cache = _pointers;
+
+        if (!may_write(cache))
+            throw BufferFull();
+
+        unsigned writer = _pointers.writer.complete - 1;
+
+//        fprintf(stderr, "%p> provider start %d/%d!\n", this, reader, writer);
+
+        return _buffer[writer];
+    }
+
+    void provider_commit(void)
+    {
+        unsigned int temp = _pointers.writer.complete + 1;
+
+//        fprintf(stderr, "%p> provider commit %d!\n", this, temp);
+
+        if (temp > _size)
+            temp = 1;
+
+        _pointers.writer.complete = temp;
+        _pointers.writer.partial  = 1;
+
+//        fprintf(stderr, "%p> write: %d/%d [%d/%d]\n", this, _pointers.reader, _pointers.writer, _pointers.reader_partial, _pointers.writer_partial);
+    }
+
+    T & consumer_start(void)
+    {
+        Buffer_table  cache = _pointers;
+
+        if (!may_read(cache))
+            throw BufferEmpty();
+
+        unsigned int reader = _pointers.reader.complete;
+
+//        fprintf(stderr, "%p> consumer start %d/%d!\n", this, reader, writer);
+
+        return _buffer[reader];
+    }
+
+    void consumer_commit(void)
+    {
+        Buffer_pointer cache = _pointers.reader;
+        Buffer_pointer index(cache);
+
+        do
+        {
+            reader_next(cache, index);
+
+            if (update(cache, index))
+                break;
+
+            cache = index;
+        }
+        while (true);
+
+//        fprintf(stderr, "%p> consumer commit %d!\n", this, temp);
+
+//        fprintf(stderr, "%p> read: %d/%d [%d/%d]\n", this, _pointers.reader, _pointers.writer, _pointers.reader_partial, _pointers.writer_partial);
+    }
+
+    /* writes everything or nothing, but works on bytes (may write incomplete elements) */
+    /* WARNING: do not mix this with full element provider */
+    inline bool provider_partial(const char *buffer, unsigned int amount)
+    {
+        return traits_provide_partial((char *)_buffer, buffer, amount);
+    }
+
+    /* returns the number of bytes that have been read (may read incomplete elements) */
+    /* WARNING: do not mix this with full element consumer */
+    inline unsigned int consumer_partial(char *buffer, unsigned int amount)
+    {
+        return traits_consume_partial((const char *)_buffer, buffer, amount);
+    }
+
+    /***** IO FUNCTIONS *****/
+
+    /* returns the number of items written to from buffer to stream */
+    inline unsigned int put(std::ostream &fd, unsigned int amount)
+    {
+        return traits_put((char *)_buffer, fd, amount);
+    }
+
+    /* returns number of items read from stream to buffer */
+    inline unsigned int get(std::istream &fd, unsigned int amount)
+    {
+        return traits_get((const char *)_buffer, fd, amount);
+    }
+
+    void clear()
+    {
+        _pointers.reader.complete = 0;
+        _pointers.reader.partial  = 0;
+        _pointers.writer.complete = 1;
+        _pointers.writer.partial  = 1;
+    }
+
+ protected:
+    T *  _buffer;
+    bool _malloc;
+};
+
+#endif /* _RINGBUFFER_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/saved_condition.cpp b/src/mod/endpoints/mod_khomp/commons/saved_condition.cpp
new file mode 100644
index 0000000000..4c9f80f47f
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/saved_condition.cpp
@@ -0,0 +1,46 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+
+#include <config_commons.hpp>
+
+#include COMMONS_INCLUDE(saved_condition.cpp)
+
diff --git a/src/mod/endpoints/mod_khomp/commons/saved_condition.hpp b/src/mod/endpoints/mod_khomp/commons/saved_condition.hpp
new file mode 100644
index 0000000000..dcfd22423d
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/saved_condition.hpp
@@ -0,0 +1,61 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#ifndef _SAVED_CONDITION_COMMON_HPP_
+#define _SAVED_CONDITION_COMMON_HPP_
+
+#include <config_commons.hpp>
+
+//#include <refcounter.hpp>
+
+struct SavedConditionCommon
+{
+    SavedConditionCommon() : _signaled(false) {}
+
+ protected:
+    bool _signaled;
+};
+
+
+#include COMMONS_INCLUDE(saved_condition.hpp)
+
+#endif /* _SAVED_CONDITION_COMMON_HPP_ */
+
diff --git a/src/mod/endpoints/mod_khomp/commons/scoped_lock.hpp b/src/mod/endpoints/mod_khomp/commons/scoped_lock.hpp
new file mode 100644
index 0000000000..a85627f3cd
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/scoped_lock.hpp
@@ -0,0 +1,95 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <simple_lock.hpp>
+
+struct ScopedLockBasic
+{
+    ScopedLockBasic(void)
+    : _locked(true) {};
+
+    ScopedLockBasic(bool locked)
+    : _locked(locked) {};
+
+    virtual ~ScopedLockBasic() {};
+
+ protected:
+    bool _locked;
+};
+
+
+struct ScopedLock : public ScopedLockBasic
+{
+    struct LockFailed {};
+
+    ScopedLock(SimpleLock & mutex)
+    : ScopedLockBasic(false), _mutex(mutex)
+    {
+        switch (_mutex.lock())
+        {
+            case SimpleLock::ISINUSE:
+            case SimpleLock::FAILURE:
+                throw LockFailed();
+            default:
+                break;
+        }
+
+        _locked = true;
+    }
+
+    ~ScopedLock()
+    {
+        unlock();
+    }
+
+    void unlock()
+    {
+        if (_locked)
+        {
+            _locked = false;
+            _mutex.unlock();
+        }
+    }
+
+ protected:
+    SimpleLock & _mutex;
+};
+
diff --git a/src/mod/endpoints/mod_khomp/commons/simple_lock.hpp b/src/mod/endpoints/mod_khomp/commons/simple_lock.hpp
new file mode 100644
index 0000000000..4f6619f456
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/simple_lock.hpp
@@ -0,0 +1,104 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#ifndef _SIMPLE_LOCK_COMMON_HPP_
+#define _SIMPLE_LOCK_COMMON_HPP_
+
+#include <config_commons.hpp>
+
+#include <unistd.h>
+#include <noncopyable.hpp>
+
+#include <refcounter.hpp>
+
+/* This struct uses static polymorphism, and derived classes should implement  *
+ * the "lock/trylock/unlock()" methods for correct code compilation.           *
+ * The base class also features reference counting, so derived classes should  *
+ * implement the "unreference()" method for releasing resources.               */
+
+template < typename Implementor >
+struct SimpleLockCommon: NEW_REFCOUNTER( SimpleLockCommon < Implementor > )
+{
+    friend class ReferenceCounter < SimpleLockCommon < Implementor > >;
+
+    typedef enum
+    {
+        ISINUSE = 0, // operation not succeded (no error)
+        SUCCESS = 1, // operation succeded (no error)
+        FAILURE = 2, // mutex or state is somehow invalid (error! run for your life!)
+    }
+    Result;
+
+    SimpleLockCommon()
+    {};
+
+    SimpleLockCommon(const SimpleLockCommon & o)
+    : INC_REFCOUNTER(o, SimpleLockCommon)
+    {};
+
+    virtual ~SimpleLockCommon()
+    {};
+
+    inline Result lock()
+    {
+        return static_cast<Implementor*>(this)->lock();
+    }
+
+    inline Result trylock()
+    {
+        return static_cast<Implementor*>(this)->trylock();
+    }
+
+    inline void unlock()
+    {
+        static_cast<Implementor*>(this)->unlock();
+    }
+
+  protected:
+    void unreference(void)
+    {
+        static_cast<Implementor*>(this)->unreference();
+    }
+};
+
+#include COMMONS_INCLUDE(simple_lock.hpp)
+
+#endif /* _SIMPLE_LOCK_COMMON_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/strings.cpp b/src/mod/endpoints/mod_khomp/commons/strings.cpp
new file mode 100644
index 0000000000..5e1cbc7004
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/strings.cpp
@@ -0,0 +1,247 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <strings.hpp>
+
+void Strings::Merger::add(std::string s)
+{
+    _list.push_back(s);
+};
+
+std::string Strings::Merger::merge(const std::string & sep)
+{
+    list_type::iterator i = _list.begin();
+
+    std::string res;
+
+    if (i != _list.end())
+    {
+        res += (*i);
+        ++i;
+    };
+
+    while (i != _list.end())
+    {
+        res += sep;
+        res += (*i);
+        ++i;
+    }
+
+    return res;
+};
+
+std::string Strings::Merger::merge(const char *sep)
+{
+    std::string ssep(sep);
+    return merge(ssep);
+}
+
+unsigned int Strings::tokenize(const std::string & str, Strings::vector_type & tokens,
+    const std::string & delims, long int max_tokens, bool keep_empty)
+{
+    std::string::size_type base = 0;
+
+    std::string::size_type init = str.find_first_not_of(delims, 0);
+    std::string::size_type fini = str.find_first_of(delims, init);
+
+    long int cur_token = 1;
+
+    while (std::string::npos != init)
+    {
+        if (keep_empty && base < init)
+        {
+            std::string::size_type cur_empty = init - base;
+
+            while (cur_empty && cur_token < max_tokens)
+            {
+                tokens.push_back("");
+
+                ++cur_token;
+                --cur_empty;
+            }
+        }
+
+        if (std::string::npos != fini && cur_token < max_tokens)
+        {
+            base = fini + 1;
+
+            tokens.push_back(str.substr(init, fini - init));
+            ++cur_token;
+        }
+        else
+        {
+            base = str.size(); // find_first_of(delims, init);
+
+            tokens.push_back(str.substr(init, str.size() - init));
+           	break;
+        }
+
+   	    init = str.find_first_not_of(delims, fini);
+       	fini = str.find_first_of(delims, init);
+    }
+
+    if (keep_empty && base != str.size())
+    {
+        std::string::size_type cur_empty = str.size() - base + 1;
+
+   	    while (cur_empty && cur_token < max_tokens)
+       	{
+            tokens.push_back("");
+
+   	        ++cur_token;
+       		--cur_empty;
+        }
+
+        if (cur_empty)
+        {
+            std::string::size_type pos = base + cur_empty - 1;
+            tokens.push_back(str.substr(pos, str.size() - pos));
+            ++cur_token;
+        }
+    }
+
+    return (cur_token - 1);
+}
+
+bool Strings::toboolean(std::string str)
+{
+    std::string tmp(str);
+
+    Strings::lower(tmp);
+
+    if ((tmp == "true")  || (tmp == "yes")) return true;
+    if ((tmp == "false") || (tmp == "no"))  return false;
+
+    throw invalid_value(str);
+}
+
+long Strings::tolong(std::string str, int base)
+{
+    char *str_end = 0;
+
+    unsigned long value = strtol(str.c_str(), &str_end, base);
+
+    if (str_end && *str_end == 0)
+        return value;
+
+    throw invalid_value(str);
+}
+
+unsigned long Strings::toulong(std::string str, int base)
+{
+    char *str_end = 0;
+
+    unsigned long value = strtoul(str.c_str(), &str_end, base);
+
+    if (str_end && *str_end == 0)
+        return value;
+
+    throw invalid_value(str);
+}
+
+unsigned long long Strings::toulonglong(std::string str, int base)
+{
+#if defined(_WINDOWS) || defined(_Windows) || defined(_WIN32) || defined(WIN32)
+    throw not_implemented();
+#else
+    char *str_end = 0;
+
+    unsigned long long value = strtoull(str.c_str(), &str_end, base);
+
+    if (str_end && *str_end == 0)
+        return value;
+
+    throw invalid_value(str);
+#endif
+}
+
+double Strings::todouble(std::string str)
+{
+    char *str_end = 0;
+
+    double value = strtod(str.c_str(), &str_end);
+
+    if (str_end && *str_end == 0)
+        return value;
+
+    throw invalid_value(str);
+}
+
+std::string Strings::fromboolean(bool value)
+{
+    if (value) return "true";
+    else       return "false";
+}
+
+std::string Strings::lower(std::string str)
+{
+    std::string res;
+
+    for (std::string::iterator i = str.begin(); i != str.end(); i++)
+        res += tolower((*i));
+
+    return res;
+}
+
+std::string Strings::hexadecimal(std::string value)
+{
+    std::string result;
+
+    for (std::string::iterator i = value.begin(); i != value.end(); i++)
+    {
+        if (i != value.begin())
+            result += " ";
+
+        result += STG(FMT("%2x") % (unsigned int)(*i));
+    }
+
+    return result;
+}
+
+std::string Strings::trim(const std::string& str, const std::string& trim_chars)
+{
+    std::string result(str);
+
+    result.erase( result.find_last_not_of( trim_chars ) + 1 );
+    result.erase( 0, result.find_first_not_of( trim_chars ) );
+
+    return result;
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/strings.hpp b/src/mod/endpoints/mod_khomp/commons/strings.hpp
new file mode 100644
index 0000000000..056b9335c6
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/strings.hpp
@@ -0,0 +1,106 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <limits.h>
+
+#include <list>
+#include <vector>
+#include <string>
+
+#include <types.hpp>
+
+#include <format.hpp>
+
+/* Generic string funcions */
+
+#ifndef _STRINGS_HPP_
+#define _STRINGS_HPP_
+
+struct Strings
+{
+    typedef std::list<std::string>      list_type;
+    typedef std::vector<std::string>  vector_type;
+
+    struct Merger
+    {
+        void          add(std::string);
+
+        std::string merge(const std::string &);
+        std::string merge(const char *);
+
+        bool empty() { return _list.empty(); };
+
+     protected:
+        list_type   _list;
+    };
+
+ public:
+    struct invalid_value
+    {
+        invalid_value(const char  * value): _value(value) {};
+        invalid_value(std::string   value): _value(value) {};
+
+        std::string & value() { return _value; }
+
+     protected:
+         std::string _value;
+    };
+
+    struct not_implemented {};
+
+    static unsigned int tokenize(const std::string &, vector_type &, const std::string & delims = ",;:",
+                                 long int max_toxens = LONG_MAX, bool keep_empty = true);
+
+    static bool        toboolean(std::string);
+    static std::string fromboolean(bool);
+
+    static long               tolong(std::string, int base = 10);
+    static unsigned long      toulong(std::string, int base = 10);
+    static unsigned long long toulonglong(std::string, int base = 10);
+    static double             todouble(std::string);
+
+    static std::string lower(std::string);
+    static std::string hexadecimal(std::string);
+
+    static std::string trim(const std::string&, const std::string& trim_chars = " \f\n\r\t\v");
+};
+
+#endif // _STRINGS_HPP_ //
diff --git a/src/mod/endpoints/mod_khomp/commons/tagged_union.hpp b/src/mod/endpoints/mod_khomp/commons/tagged_union.hpp
new file mode 100644
index 0000000000..1616268c5f
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/tagged_union.hpp
@@ -0,0 +1,307 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#ifndef _TAGGED_UNION_HPP_
+#define _TAGGED_UNION_HPP_
+
+#include <stdexcept>
+
+#include <iostream>
+#include <unistd.h>
+
+namespace Tagged
+{
+    struct EmptyUnion
+    {
+        friend class Value;
+
+        EmptyUnion()
+        : _adjusted(false) {};
+
+        // copy constructor
+        EmptyUnion(const EmptyUnion & o)
+        : _adjusted(o._adjusted) {};
+
+        // copy assignment operator
+        EmptyUnion & operator=(const EmptyUnion & o)
+        {
+            _adjusted = o._adjusted;
+            return *this;
+        };
+
+        ~EmptyUnion() { _adjusted = false; };
+
+        bool operator==(const EmptyUnion & o)
+        {
+            return true;
+        };
+
+      public:
+        void clear(void) { _adjusted = false; };
+      protected:
+        void setup(void) { _adjusted = true;  };
+
+      protected:
+        bool value_set(void)   { return false; };
+        bool value_get(void)   { return false; };
+
+        bool value_check(void) { return false; };
+
+        template < typename S >
+        bool value_visit(S & visitor, typename S::ReturnType & ret)
+        {
+            return false;
+        };
+
+        template < typename S >
+        bool value_visit_void(S & visitor)
+        {
+            return false;
+        };
+
+        bool adjusted()  { return _adjusted;  };
+
+      private:
+        bool _adjusted;
+    };
+
+    template < typename V, typename E = EmptyUnion >
+    struct Union: public E
+    {
+        friend class Value;
+
+        // default constructor
+        Union()
+        : _value(0) {};
+
+        // constructor with initializer
+        template < typename U >
+        Union( U value )
+        : _value(0)
+        {
+            set(value);
+        };
+
+        // copy constructor
+        Union(const Union & o)
+        : E(static_cast<const E&>(o)),
+          _value( (o._value ? new const V(*(o._value)) : 0) )
+        {};
+
+        // copy assignment operator
+        Union & operator=(const Union & o)
+        {
+            if (_value)
+            {
+                delete _value;
+                _value = 0;
+            }
+
+            if (o._value)
+            {
+                _value = new const V(*(o._value));
+            }
+
+            E::operator=(static_cast<const E&>(o));
+
+            return *this;
+        };
+
+        // destructor
+        ~Union()
+        {
+            if (_value)
+            {
+                delete _value;
+                _value = 0;
+            }
+        };
+
+        // equal sign operator
+        template < typename U >
+        void operator=(U value)
+        {
+            set(value);
+        }
+
+        template < typename U >
+        bool check(void)
+        {
+            return value_check(static_cast<const U * const>(0));
+        };
+
+        template < typename U >
+        const U & get(void)
+        {
+            const U * res = 0;
+
+            if (!value_get(&res) || !res)
+                throw std::runtime_error("type mismatch");
+
+            return *res;
+        };
+
+        template < typename U >
+        void set(U val)
+        {
+            if (E::adjusted())
+                clear();
+
+            if (!value_set(val))
+                throw std::runtime_error("unable to set value of invalid type");
+        };
+
+        template < typename S >
+        typename S::ReturnType visit(S visitor)
+        {
+            typename S::ReturnType ret;
+
+            if (!value_visit(visitor, ret))
+                throw std::runtime_error("unable to visit empty value");
+
+            return ret;
+        };
+
+        template < typename S >
+        void visit_void(S visitor)
+        {
+            if (!value_visit_void(visitor))
+                throw std::runtime_error("unable to visit empty value");
+        };
+
+        void clear()
+        {
+            if (_value)
+            {
+                delete _value;
+                _value = 0;
+            }
+
+            E::clear();
+        };
+
+        // compare (equal) operator
+        bool operator==(const Union & o)
+        {
+            bool are_equal = false;
+
+            if (!_value && !(o._value))
+                are_equal = true;
+
+            if (_value && o._value)
+                are_equal = (*_value == *(o._value));
+
+            if (are_equal)
+                return E::operator==(static_cast<const E&>(o));
+
+            return false;
+        };
+
+        // compare types
+        bool sameType(const Union & o)
+        {
+            if ((!(_value) && !(o._value)) || (_value && o._value))
+                return E::operator==(static_cast<const E&>(o));
+
+            return false;
+        };
+
+      protected:
+        using E::value_set;
+        using E::value_get;
+
+        using E::value_check;
+        using E::value_visit;
+        using E::value_visit_void;
+
+        bool value_set(V val)
+        {
+            _value = new const V(val);
+            E::setup();
+
+            return true;
+        };
+
+        bool value_get(const V ** val)
+        {
+            if (!_value)
+                return false;
+
+            *val = _value;
+            return true;
+        }
+
+        bool value_check(const V * const junk)
+        {
+            (void)junk;
+            return (_value != 0);
+        };
+
+        template < typename S >
+        bool value_visit(S & visitor, typename S::ReturnType & ret)
+        {
+            if (_value)
+            {
+                ret = visitor(*const_cast<V*>(_value));
+                return true;
+            };
+
+            return E::value_visit(visitor, ret);
+        };
+
+        template < typename S >
+        bool value_visit_void(S & visitor)
+        {
+            if (_value)
+            {
+                visitor(*const_cast<V*>(_value));
+                return true;
+            };
+
+            return E::value_visit_void(visitor);
+        };
+
+      private:
+        const V * _value;
+    };
+};
+
+#endif /* _TAGGED_UNION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/thread.hpp b/src/mod/endpoints/mod_khomp/commons/thread.hpp
new file mode 100644
index 0000000000..e00d7c875a
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/thread.hpp
@@ -0,0 +1,103 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#ifndef _THREAD_COMMON_HPP_
+#define _THREAD_COMMON_HPP_
+
+#include <config_commons.hpp>
+
+#include <types.hpp>
+//#include <function.hpp>
+
+struct ThreadCommon
+{
+  protected:
+    template<typename FuncPtrType>
+    struct DecomposeFuncPtr;
+
+    template<typename ReturnType, typename ArgType>
+    struct DecomposeFuncPtr<ReturnType(*)(ArgType)>
+    {
+        typedef ReturnType Return;
+    };
+
+    template<typename SomeClass>
+    struct DecomposeFuncPtr
+    {
+        typedef void Return;
+    };
+
+    template<typename ReturnType>
+    struct DecomposeFuncPtr<ReturnType(*)()>
+    {
+        typedef ReturnType Return;
+    };
+
+    template< typename FunctionType >
+    struct DecomposeFunction
+    {
+        typedef typename Select < IsClass< FunctionType >::Result, int,
+            typename DecomposeFuncPtr< FunctionType >::Return >::Result
+        Return;
+    };
+
+  public:
+    struct ThreadDataCommon
+    {
+        ThreadDataCommon() {}
+
+        virtual ~ThreadDataCommon() {}
+
+        virtual int run() = 0;
+
+        ThreadCommon * _thread;
+
+        void * _self;
+        void * _attribute;
+    };
+
+    ThreadCommon() {}
+};
+
+
+#include COMMONS_INCLUDE(thread.hpp)
+
+#endif /* _THREAD_COMMON_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/timer.cpp b/src/mod/endpoints/mod_khomp/commons/timer.cpp
new file mode 100644
index 0000000000..36e32f521a
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/timer.cpp
@@ -0,0 +1,352 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <timer.hpp>
+
+TimerTraits::TimerTraits()
+: _thread((Thread*)0), _purify(false), _last_tick(0), _age_count(0), _shutdown(false)
+{};
+
+bool TimerTraits::start (void)
+{
+    _shutdown = false;
+
+    _condition.reset();
+    _finalized.reset();
+
+    if (!_thread)
+    {
+        _thread = new Thread(TimerTraits::loop_thread(this));
+        _purify = true;
+    }
+
+#if defined(_WINDOWS) || defined(_Windows) || defined(_WIN32) || defined(WIN32)
+    // set priority ...
+#else
+    pthread_attr_t attrs;
+    sched_param    param;
+
+    if (pthread_attr_init(&attrs) < 0)
+        return false;
+
+    if (pthread_attr_setschedpolicy(&attrs, SCHED_RR) < 0)
+        return false;
+
+    if (pthread_attr_getschedparam(&attrs, &param) < 0)
+        return false;
+
+    param.sched_priority = sched_get_priority_max(SCHED_RR);
+
+    if (pthread_attr_setschedparam(&attrs, &param) < 0)
+        return false;
+
+    // set priority...
+
+//    if (pthread_create(&_thread, &attrs, TimerTraits::loop_thread, NULL) < 0)
+//        return false;
+
+    _thread->start();
+#endif
+
+    return true;
+}
+
+bool TimerTraits::stop (void)
+{
+    _shutdown = true;
+
+    _condition.signal();
+
+    _finalized.wait(10000); /* 10 seconds max wait */
+
+    if (_thread && _purify)
+    {
+        delete _thread;
+
+        _thread = (Thread *)0;
+        _purify = false;
+    }
+
+    return true;
+}
+
+//-----------------------------------------
+
+int TimerTraits::loop_thread::operator()(void)
+{
+    try
+    {
+        _timer->loop();
+    }
+    catch( ... )
+    {
+        /* something wrong happened! */
+    }
+
+    _timer->_finalized.signal();
+
+    return 0;
+}
+
+void TimerTraits::execute(ControlSet::iterator init, const TimerTraits::Control & ctrl)
+{
+    volatile CallbackFuncType func = (volatile CallbackFuncType) ctrl._func;
+    volatile CallbackDataType data = (volatile CallbackDataType) ctrl._data;
+
+    _timer_set.erase(init);
+
+    _mutex.unlock();
+
+    func(data);
+}
+
+void TimerTraits::loop (void)
+{
+    while (true)
+    {
+        if (_shutdown) break;
+
+        _mutex.lock();
+
+        ControlSet::iterator init = _timer_set.begin();
+
+        if (init == _timer_set.end())
+        {
+            _mutex.unlock();
+            _condition.wait();
+        }
+        else
+        {
+            const Control & ctrl = *init;
+
+            unsigned int ts_now    = TimerTraits::tick();
+
+            if (_age_count == ctrl._age)
+            {
+                if (ts_now < ctrl._msecs)
+                {
+                    /* age is right, but it is not time to expire yet... */
+                    volatile unsigned int wait_time = ctrl._msecs - ts_now;
+                    _mutex.unlock();
+                    _condition.wait(wait_time); /* expire - now */
+                }
+                else
+                {
+                    /* age is right, and we should expire! */
+                    execute(init, ctrl); /* called locked, return unlocked */
+                }
+            }
+            else if (_age_count < ctrl._age)
+            {
+                /* age is not there yet (need some time to overlap)... */
+                volatile unsigned int wait_time = (UINT_MAX - ts_now) + ctrl._msecs;
+                _mutex.unlock();
+                _condition.wait(wait_time); /* MAX - now + expire */
+            }
+            else
+            {
+                /* age has passed, we should have expired before! */
+                execute(init, ctrl); /* called locked, return unlocked */
+            }
+        }
+    }
+
+    _finalized.signal();
+}
+
+unsigned int TimerTraits::tick()
+{
+#if defined(_WINDOWS) || defined(_Windows) || defined(_WIN32) || defined(WIN32)
+    unsigned int tick =  GetTickCount();
+#else
+    struct timespec ticks;
+
+    // error condition, make the user notice this..
+    if (clock_gettime(CLOCK_MONOTONIC, &ticks) < 0)
+        return 0;
+
+    unsigned int tick = ( ticks.tv_sec * 1000 ) + ( ticks.tv_nsec / 1000000 );
+#endif
+
+    if (_last_tick > tick)
+        ++_age_count;
+
+    _last_tick = tick;
+
+    return tick;
+}
+
+//-----------------------------------------
+
+TimerTraits::Index TimerTraits::traits_add_unlocked (unsigned int msecs, const void * func, const void * data, unsigned int value)
+{
+    unsigned int ms_tick = TimerTraits::tick();
+
+    unsigned int ms_left =  UINT_MAX - ms_tick;
+    unsigned int ms_real =  msecs;
+
+    unsigned int age_num = _age_count;
+
+    if (ms_left < msecs)
+    {
+        ms_real -= ms_left;
+        ++age_num;
+    }
+    else
+    {
+        ms_real += ms_tick;
+    }
+
+    ControlSet::iterator it = _timer_set.insert(Control(age_num,ms_real,func,data,value));
+
+    if (_timer_set.size() == 1 || _timer_set.begin() == it)
+    {
+        _condition.signal();
+    };
+
+    return Index(age_num, ms_real, msecs, func, data, value);
+}
+
+TimerTraits::Index TimerTraits::traits_add (unsigned int msecs, const void * func, const void * data, unsigned int value)
+{
+    _mutex.lock();
+
+    Index idx = traits_add_unlocked(msecs, func, data, value);
+
+    _mutex.unlock();
+
+    return idx;
+}
+
+bool TimerTraits::traits_restart (TimerTraits::Index & idx, bool force)
+{
+    bool ret = false;
+
+    _mutex.lock();
+
+    if (idx.valid)
+    {
+        if (traits_del_unlocked(idx) || force)
+        {
+            idx = traits_add_unlocked(idx.delta, idx.func, idx.data, idx.value);
+            ret = true;
+        }
+    }
+
+    _mutex.unlock();
+
+    return ret;
+}
+
+bool TimerTraits::traits_del_unlocked (TimerTraits::Index & idx)
+{
+    bool ret = false;
+
+    if (idx.valid)
+    {
+        ControlSet::iterator i = _timer_set.lower_bound(Control(idx.era, idx.msec));
+        ControlSet::iterator j = _timer_set.upper_bound(Control(idx.era, idx.msec));
+
+        for (; i != j; i++)
+        {
+            const Control & ctrl = (*i);
+
+            if ((idx.value && !(ctrl._value & idx.value)))
+                continue;
+
+            if (((idx.func && ctrl._func == idx.func) || !idx.func) && ((idx.data && ctrl._data == idx.data) || !idx.data))
+            {
+                if (_timer_set.begin() == i)
+                    _condition.signal();
+
+                _timer_set.erase(i);
+
+                ret = true;
+                break;
+            }
+        }
+
+        idx.valid = false;
+    }
+
+    return ret;
+}
+
+bool TimerTraits::traits_del (TimerTraits::Index & idx)
+{
+    _mutex.lock();
+
+    bool ret = traits_del_unlocked(idx);
+
+    _mutex.unlock();
+
+    return ret;
+}
+
+bool TimerTraits::traits_del (const void * func, const void * data, unsigned int value)
+{
+    bool ret = false;
+
+    _mutex.lock();
+
+    for (ControlSet::iterator i = _timer_set.begin(); i != _timer_set.end(); i++)
+    {
+        const Control & ctrl = (*i);
+
+        if ((value && !(ctrl._value & value)))
+            continue;
+
+        if (((func && ctrl._func == func) || !func) && ((data && ctrl._data == data) || !data))
+        {
+            if (_timer_set.begin() == i)
+                _condition.signal();
+
+            _timer_set.erase(i);
+
+            ret = true;
+            break;
+        }
+    }
+
+    _mutex.unlock();
+
+    return ret;
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/timer.hpp b/src/mod/endpoints/mod_khomp/commons/timer.hpp
new file mode 100644
index 0000000000..382efa1645
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/timer.hpp
@@ -0,0 +1,224 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#if defined(_WINDOWS) || defined(_Windows) || defined(_WIN32) || defined(WIN32)
+#include <windows.h>
+#else
+#include <sched.h>
+#endif
+
+#include <set>
+
+#include <simple_lock.hpp>
+#include <saved_condition.hpp>
+#include <thread.hpp>
+#include <refcounter.hpp>
+
+#ifndef _TIMER_HPP_
+#define _TIMER_HPP_
+
+struct TimerTraits
+{
+    typedef bool          (* CallbackFuncType)(const void * volatile);
+    typedef const void *     CallbackDataType;
+
+    TimerTraits();
+
+    virtual ~TimerTraits() {};
+
+ protected:
+
+    /* pre-declaration, used below */
+    struct ControlCompare;
+
+    struct Control
+    {
+        Control(unsigned int age, unsigned int msecs, const void * func = 0, const void * data = 0, unsigned int value = 0)
+        : _age(age), _msecs(msecs), _func(func), _data(data), _value(value) {}
+
+        unsigned int  _age;
+
+        unsigned int  _msecs;
+
+        const void * _func;
+        const void * _data;
+
+        unsigned int  _value;
+    };
+
+    struct ControlCompare
+    {
+        bool operator()(const Control & c1, const Control & c2) const
+        {
+            return (c1._age < c2._age ? true : c1._msecs < c2._msecs);
+        }
+    };
+
+    typedef std::multiset < Control, ControlCompare > ControlSet;
+
+ public:
+    struct Index
+    {
+        Index(): era(0), msec(0), valid(false) {};
+
+        Index(unsigned int _era, unsigned int _msec, unsigned int _delta, const void * _func, const void * _data, unsigned int _value)
+        : era(_era), msec(_msec), delta(_delta), func(_func), data(_data), value(_value), valid(true) {};
+
+        unsigned int   era;
+        unsigned int  msec;
+
+        unsigned int  delta;
+
+        const void *  func;
+        const void *  data;
+
+        unsigned int value;
+
+        bool         valid;
+
+        void reset(void) { era = 0; msec = 0; valid = false; };
+    };
+
+    /* timer add/remove functions */
+    Index traits_add (unsigned int msecs, const void * func, const void * data = 0, unsigned int value = 0);
+
+    bool traits_restart (Index & idx, bool force);
+
+    bool traits_del (Index & idx);
+    bool traits_del (const void * func, const void * data = 0, unsigned int value = 0);
+
+    /* timer start/stop functions */
+    bool start(void);
+    bool stop(void);
+
+  protected:
+    Index traits_add_unlocked (unsigned int msecs, const void * func, const void * data, unsigned int value);
+
+    bool traits_del_unlocked (Index & idx);
+
+  protected:
+    void execute(ControlSet::iterator, const Control &);
+
+    void loop(void);
+
+    struct loop_thread
+    {
+        loop_thread(TimerTraits *timer) : _timer(timer) {};
+
+        int operator()(void);
+
+      protected:
+        TimerTraits * _timer;
+    };
+
+    unsigned int tick();
+
+    /* variables */
+
+    SavedCondition   _condition;
+
+    SimpleLock       _mutex;
+    Thread         * _thread;
+    bool             _purify;
+
+    ControlSet       _timer_set;
+
+    unsigned int     _last_tick;
+    unsigned int     _age_count;
+
+    SavedCondition   _finalized;
+    bool             _shutdown;
+};
+
+template < typename F, typename D >
+struct TimerTemplate: NEW_REFCOUNTER(TimerTemplate< F, D >)
+{
+    typedef TimerTraits::Index   Index;
+    typedef TimerTraits::Control Control;
+
+    TimerTemplate()
+    : _timer(new TimerTraits())
+    {};
+
+    TimerTemplate(const TimerTemplate< F, D > & o)
+    : INC_REFCOUNTER(o, TimerTemplate< F, D >),
+      _timer(o._timer)
+    {};
+
+    void unreference(void)
+    {
+        if (_timer)
+            delete _timer;
+    };
+
+    bool start() { return _timer->start(); }
+    bool stop()  { return _timer->stop();  }
+
+    inline Index add(unsigned int msecs, F * func, D data = 0, unsigned int value = 0)
+    {
+        return _timer->traits_add(msecs, (const void *)func, (void *)(data), value);
+    }
+
+    inline bool restart(Index & idx, bool force = false)
+    {
+        return _timer->traits_restart(idx, force);
+    }
+
+    inline bool del(Index & idx)
+    {
+        return _timer->traits_del(idx);
+    }
+
+    inline bool del(F * func, D data, unsigned int value = 0)
+    {
+        return _timer->traits_del((const void *)func, (void *)(data), value);
+    }
+
+    inline bool del(unsigned int value)
+    {
+        return _timer->traits_del((const void *)0, (void *)0, value);
+    }
+
+  protected:
+    TimerTraits * _timer;
+};
+
+#endif /* _TIMER_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/types.hpp b/src/mod/endpoints/mod_khomp/commons/types.hpp
new file mode 100644
index 0000000000..adbd8abe36
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/types.hpp
@@ -0,0 +1,81 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#ifndef _TYPES_HPP_
+#define _TYPES_HPP_
+
+/*** Used for conditional compilation based on K3L version ***/
+
+#define K3L_AT_LEAST(major,minor,build) \
+    (((k3lApiMajorVersion == major) && ((k3lApiMinorVersion == minor) && (k3lApiBuildVersion >= build)) || \
+     ((k3lApiMajorVersion == major) && (k3lApiMinorVersion > minor))) || \
+      (k3lApiMajorVersion  > major))
+
+#define K3L_EXACT(major,minor,build) \
+    ((k3lApiMajorVersion == major) && (k3lApiMinorVersion == minor) && (k3lApiBuildVersion >= build))
+
+/*** Used for checking information on classes and stuff.. ***/
+
+template< typename T >
+class IsClass
+{
+  protected:
+    template< typename X > static char ( &A( void(X::*)() ) )[1];
+    template< typename X > static char ( &A( X ) )[2];
+  public:
+    static bool const Result = sizeof( A< T >(0) ) == 1;
+};
+
+/*** Used for template metaprogramming ***/
+
+template < bool Value, typename Then, typename Else >
+struct Select
+{
+    typedef Then Result;
+};
+
+template < typename Then, typename Else >
+struct Select < false, Then, Else >
+{
+    typedef Else Result;
+};
+
+#endif /* _TYPES_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/variant.hpp b/src/mod/endpoints/mod_khomp/commons/variant.hpp
new file mode 100644
index 0000000000..410a770a6e
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/variant.hpp
@@ -0,0 +1,127 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <refcounter.hpp>
+
+#include <typeinfo>
+
+#ifndef _VARIANT_H_
+#define _VARIANT_H_
+
+/* this is internal, should not be used by the user */
+struct NoArgumentDefined {};
+
+template < typename UserReturnType, typename UserArgumentType = NoArgumentDefined >
+struct VariantBaseType
+{
+    typedef UserReturnType       ReturnType;
+    typedef UserArgumentType   ArgumentType;
+
+    virtual ~VariantBaseType() {};
+
+    virtual int which() = 0;
+
+    virtual ReturnType visit(void)           { return ReturnType(); };
+    virtual ReturnType visit(ArgumentType)   { return ReturnType(); };
+};
+
+template < typename BaseType = VariantBaseType < void > >
+struct Variant: NEW_REFCOUNTER(Variant < BaseType >)
+{
+    typedef typename BaseType::ReturnType        ReturnType;
+    typedef typename BaseType::ArgumentType    ArgumentType;
+
+    struct InvalidType {};
+
+    Variant(BaseType * value, bool is_owner = false)
+    : _value(value), _is_owner(is_owner) {};
+
+    Variant(const Variant & v)
+    : INC_REFCOUNTER(v, Variant < BaseType >),
+      _value(v._value), _is_owner(v._is_owner) {};
+
+    virtual ~Variant() {};
+
+    void unreference()
+    {
+        if (_is_owner && _value)
+        {
+            delete _value;
+            _value = 0;
+        }
+    };
+
+    template < typename ValueType >
+    ValueType & get(void)
+    {
+        try
+        {
+            ValueType & ret = dynamic_cast < ValueType & > (*_value);
+            return ret;
+        }
+        catch (std::bad_cast & e)
+        {
+            throw InvalidType();
+        }
+    };
+
+    int which()
+    {
+        return _value->which();
+    }
+
+    ReturnType visit(void)
+    {
+        return _value->visit();
+    }
+
+    ReturnType visit(ArgumentType arg)
+    {
+        return _value->visit(arg);
+    }
+
+ protected:
+    BaseType * _value;
+    bool       _is_owner;
+};
+
+#endif /* _VARIANT_H_ */
+
diff --git a/src/mod/endpoints/mod_khomp/commons/verbose.cpp b/src/mod/endpoints/mod_khomp/commons/verbose.cpp
new file mode 100644
index 0000000000..182d159ca1
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/verbose.cpp
@@ -0,0 +1,3188 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <strings.hpp>
+#include <verbose.hpp>
+
+#define PRESENTATION_CHECK_RETURN(fmt, txtexact, txthuman) \
+    { \
+        switch(fmt) \
+        { \
+            case EXACT: return txtexact; \
+            case HUMAN: return txthuman; \
+        } \
+        return txtexact; \
+    }
+
+/********************************************/
+
+std::string Verbose::channelStatus(int32 dev, int32 obj, int32 cs, Verbose::Presentation fmt)
+{
+    try
+    {
+        K3L_CHANNEL_CONFIG & config = _api.channel_config(dev, obj);
+        return Verbose::channelStatus(config.Signaling, cs, fmt);
+    }
+    catch (...)
+    {
+        return presentation(fmt, "<unknown>", "Unknown");
+    }
+}
+
+#if K3L_AT_LEAST(2,0,0)
+std::string Verbose::event(int32 obj, K3L_EVENT *ev, R2CountryType r2_country, Verbose::Presentation fmt)
+#else
+std::string Verbose::event(int32 obj, K3L_EVENT *ev, Verbose::Presentation fmt)
+#endif
+{
+    try
+    {
+        K3L_CHANNEL_CONFIG & config = _api.channel_config(ev->DeviceId, obj);
+#if K3L_AT_LEAST(2,0,0)
+        return Verbose::event(config.Signaling, obj, ev, r2_country, fmt);
+#else
+        return Verbose::event(config.Signaling, obj, ev, fmt);
+#endif
+    }
+    catch (...)
+    {
+#if K3L_AT_LEAST(2,0,0)
+        return Verbose::event(ksigInactive, obj, ev, r2_country, fmt);
+#else
+        return Verbose::event(ksigInactive, obj, ev, fmt);
+#endif
+    }
+}
+
+/********************************************/
+
+std::string Verbose::echoLocation(KEchoLocation ec, Verbose::Presentation fmt)
+{
+    switch (ec)
+    {
+#if K3L_AT_LEAST(1,5,4)
+        case kelNetwork: return presentation(fmt, "kelNetwork", "Network");
+#else
+        case kelE1:      return presentation(fmt, "kelE1",      "Network");
+#endif
+        case kelCtBus:   return presentation(fmt, "kelCtBus",   "CT-Bus");
+    };
+
+    return presentation(fmt, "<unknown>", "Unknown");
+};
+
+std::string Verbose::echoCancellerConfig(KEchoCancellerConfig ec, Verbose::Presentation fmt)
+{
+    switch (ec)
+    {
+        case keccNotPresent:    return presentation(fmt, "keccNotPresent",    "Not Present");
+        case keccOneSingleBank: return presentation(fmt, "keccOneSingleBank", "One, Single Bank");
+        case keccOneDoubleBank: return presentation(fmt, "keccOneDoubleBank", "One, Double Bank");
+        case keccTwoSingleBank: return presentation(fmt, "keccTwoSingleBank", "Two, Single Bank");
+        case keccTwoDoubleBank: return presentation(fmt, "keccTwoDoubleBank", "Two, Double Bank");
+        case keccFail:          return presentation(fmt, "keccFail",          "Failure");
+    };
+
+    return presentation(fmt, "<unknown>", "Unknown");
+};
+
+// TODO: internal_deviceType / internal_deviceModel
+
+std::string Verbose::deviceName(KDeviceType dt, int32 model, Verbose::Presentation fmt)
+{
+    try
+    {
+        std::string value;
+
+        value += internal_deviceType(dt);
+        value += "-";
+        value += internal_deviceModel(dt, model);
+
+        return value;
+    }
+    catch (internal_not_found & e)
+    {
+        PRESENTATION_CHECK_RETURN(fmt,
+            STG(FMT("[type/model='%d/%d']") % (int)dt % (int)model),
+            STG(FMT("Unknown device type/model (%d/%d)") % (int)dt % (int)model));
+    }
+}
+
+std::string Verbose::deviceType(KDeviceType dt, Verbose::Presentation fmt)
+{
+    try
+    {
+        return internal_deviceType(dt);
+    }
+    catch (internal_not_found & e)
+    {
+        PRESENTATION_CHECK_RETURN(fmt,
+            STG(FMT("[type='%d']") % (int)dt),
+            STG(FMT("Unknown device type (%d)") % (int)dt));
+    }
+}
+
+std::string Verbose::internal_deviceType(KDeviceType dt)
+{
+    switch (dt)
+    {
+        case kdtE1:            return "K2E1";
+
+#if K3L_AT_LEAST(1,6,0)
+        case kdtFXO:           return "KFXO";
+#else
+        case kdtFX:            return "KFXO";
+#endif
+
+        case kdtConf:          return "KCONF";
+        case kdtPR:            return "KPR";
+        case kdtE1GW:          return "KE1GW";
+
+#if K3L_AT_LEAST(1,6,0)
+        case kdtFXOVoIP:       return "KFXVoIP";
+#else
+        case kdtFXVoIP:        return "KFXVoIP";
+#endif
+
+#if K3L_AT_LEAST(1,5,0)
+        case kdtE1IP:          return "K2E1";
+#endif
+#if K3L_AT_LEAST(1,5,1)
+        case kdtE1Spx:         return "K2E1";
+        case kdtGWIP:          return "KGWIP";
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+        case kdtFXS:           return "KFXS";
+        case kdtFXSSpx:        return "KFXS";
+        case kdtGSM:           return "KGSM";
+        case kdtGSMSpx:        return "KGSM";
+#endif
+
+#if K3L_AT_LEAST(2,1,0)
+        case kdtGSMUSB:        return "KGSMUSB";
+        case kdtGSMUSBSpx:     return "KGSMUSB";
+
+        case kdtE1FXSSpx:      return "KE1FXS";
+        case kdtDevTypeCount:  return "DevTypeCount";
+#endif
+
+#if K3L_EXACT(2,1,0)
+        case kdtReserved1:     return "Reserved1";
+#endif
+
+#if K3L_AT_LEAST(2,2,0)
+        case kdtE1AdHoc:       return "KE1AdHoc";
+#endif
+    }
+
+    throw internal_not_found();
+}
+
+std::string Verbose::deviceModel(KDeviceType dt, int32 model, Verbose::Presentation fmt)
+{
+    try
+    {
+        return internal_deviceModel(dt, model);
+    }
+    catch (internal_not_found & e)
+    {
+        PRESENTATION_CHECK_RETURN(fmt,
+            STG(FMT("[model='%d']") % (int)model),
+            STG(FMT("Unknown device model (%d)") % (int)model));
+    }
+}
+
+std::string Verbose::internal_deviceModel(KDeviceType dt, int32 model)
+{
+    switch (dt)
+    {
+        case kdtE1:
+            switch ((KE1DeviceModel)model)
+            {
+                case kdmE1600:   return "600";
+                case kdmE1600E:  return "600E";
+#if K3L_AT_LEAST(2,0,0)
+                case kdmE1600EX: return "600EX";
+#endif
+            }
+            throw internal_not_found();
+
+#if K3L_AT_LEAST(1,6,0)
+        case kdtFXO:
+            switch ((KFXODeviceModel)model)
+#else
+        case kdtFX:
+            switch ((KFXDeviceModel)model)
+#endif
+            {
+#if K3L_AT_LEAST(1,6,0)
+                case kdmFXO80:    return "80";
+                case kdmFXOHI:    return "HI";
+                case kdmFXO160HI: return "160HI";
+#if K3L_AT_LEAST(2,1,0)
+        case kdmFXO240HI: return "240HI";
+#endif
+#else
+                case kdmFXO80:    return "80";
+#endif
+            }
+
+            throw internal_not_found();
+
+        case kdtConf:
+            switch ((KConfDeviceModel)model)
+            {
+                case kdmConf240:   return "240";
+                case kdmConf120:   return "120";
+#if K3L_AT_LEAST(2,0,0)
+                case kdmConf240EX: return "240EX";
+                case kdmConf120EX: return "120EX";
+#endif
+            }
+
+            throw internal_not_found();
+
+        case kdtPR:
+            switch ((KPRDeviceModel)model)
+            {
+#if K3L_AT_LEAST(1,6,0)
+                case kdmPR300v1:       return "300v1";
+                case kdmPR300SpxBased: return "300S";
+#if K3L_AT_LEAST(2,0,0)
+                case kdmPR300EX:       return "300EX";
+#endif
+                case kdmPR300:         return "300";
+            }
+#endif
+            throw internal_not_found();
+
+#if K3L_AT_LEAST(1,4,0)
+        case kdtE1GW:
+            switch ((KE1GWDeviceModel)model)
+            {
+#if K3L_AT_LEAST(1,6,0)
+                case kdmE1GW640:  return "640";
+#if K3L_AT_LEAST(2,0,0)
+                case kdmE1GW640EX:  return "640EX";
+#endif
+#else
+                case kdmE1600V:  return "600V";
+                case kdmE1600EV: return "600EV";
+#endif
+            }
+
+            throw internal_not_found();
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+        case kdtFXOVoIP:
+            switch ((KFXOVoIPDeviceModel)model)
+            {
+                case kdmFXGW180:  return "180";
+            }
+
+            throw internal_not_found();
+
+#elif K3L_AT_LEAST(1,4,0)
+        case kdtFXVoIP:
+            switch ((KFXVoIPDeviceModel)model)
+            {
+                case kdmFXO80V: return "80V";
+            }
+
+            throw internal_not_found();
+#endif
+
+#if K3L_AT_LEAST(1,5,0)
+        case kdtE1IP:
+            switch ((KE1IPDeviceModel)model)
+            {
+#if K3L_AT_LEAST(1,6,0)
+                case kdmE1IP:  return "E1IP";
+#if K3L_AT_LEAST(2,0,0)
+                case kdmE1IPEX:  return "E1IPEX";
+#endif
+#else
+                case kdmE1600EG: return "600EG";
+#endif
+            }
+
+            throw internal_not_found();
+#endif
+
+#if K3L_AT_LEAST(1,5,1)
+        case kdtE1Spx:
+            switch ((KE1SpxDeviceModel)model)
+            {
+                case kdmE1Spx:    return "SPX";
+                case kdm2E1Based: return "SPX-2E1";
+#if K3L_AT_LEAST(2,0,0)
+                case kdmE1SpxEX:    return "SPXEX";
+#endif
+            }
+            throw internal_not_found();
+
+        case kdtGWIP:
+            switch ((KGWIPDeviceModel)model)
+            {
+#if K3L_AT_LEAST(1,6,0)
+                case kdmGWIP:     return "GWIP";
+#if K3L_AT_LEAST(2,0,0)
+                case kdmGWIPEX:     return "GWIPEX";
+#endif
+#else
+                case kdmGW600G:   return "600G";
+                case kdmGW600EG:  return "600EG";
+#endif
+            }
+
+            throw internal_not_found();
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+        case kdtFXS:
+            switch ((KFXSDeviceModel)model)
+            {
+                case kdmFXS300:   return "300";
+#if K3L_AT_LEAST(2,0,0)
+                case kdmFXS300EX:   return "300EX";
+#endif
+            }
+
+            throw internal_not_found();
+
+        case kdtFXSSpx:
+            switch ((KFXSSpxDeviceModel)model)
+            {
+                case kdmFXSSpx300:       return "SPX";
+                case kdmFXSSpx2E1Based:  return "SPX-2E1";
+#if K3L_AT_LEAST(2,0,0)
+                case kdmFXSSpx300EX:       return "SPXEX";
+#endif
+            }
+
+            throw internal_not_found();
+
+        case kdtGSM:
+            switch ((KGSMDeviceModel)model)
+            {
+                case kdmGSM:       return "40";
+#if K3L_AT_LEAST(2,0,0)
+                case kdmGSMEX:     return "40EX";
+#endif
+            }
+
+            throw internal_not_found();
+
+        case kdtGSMSpx:
+            switch ((KGSMSpxDeviceModel)model)
+            {
+                case kdmGSMSpx:    return "SPX";
+#if K3L_AT_LEAST(2,0,0)
+                case kdmGSMSpxEX:  return "SPXEX";
+#endif
+            }
+
+            throw internal_not_found();
+
+#if K3L_AT_LEAST(2,1,0)
+        case kdtGSMUSB:
+            switch ((KGSMUSBDeviceModel)model)
+            {
+                case kdmGSMUSB:    return "20";
+            }
+
+            throw internal_not_found();
+
+        case kdtGSMUSBSpx:
+            switch ((KGSMUSBSpxDeviceModel)model)
+            {
+                case kdmGSMUSBSpx: return "SPX";
+            }
+
+            throw internal_not_found();
+
+        case kdtE1FXSSpx:
+            switch ((KGSMSpxDeviceModel)model)
+            {
+                case kdmE1FXSSpx:   return "SPX";
+                case kdmE1FXSSpxEX: return "SPXEX";
+            }
+
+            throw internal_not_found();
+#if K3L_AT_LEAST(2,2,0)
+        case kdtE1AdHoc:
+            switch((KE1AdHocModel)model)
+            {
+                case kdmE1AdHoc100:  return "E1AdHoc100";
+                case kdmE1AdHoc100E: return "E1AdHoc100E";
+                case kdmE1AdHoc240:  return "E1AdHoc240";
+                case kdmE1AdHoc240E: return "E1AdHoc240E";
+                case kdmE1AdHoc400:  return "E1AdHoc240";
+                case kdmE1AdHoc400E: return "E1AdHoc240E";
+            }
+            throw internal_not_found();
+#endif
+
+#if K3L_EXACT(2,1,0)
+        case kdtReserved1:
+#endif
+        case kdtDevTypeCount:
+            throw internal_not_found();
+
+#endif
+#endif
+    }
+
+    throw internal_not_found();
+}
+
+std::string Verbose::signaling(KSignaling sig, Verbose::Presentation fmt)
+{
+    switch (sig)
+    {
+        case ksigInactive:      return presentation(fmt, "ksigInactive",        "Inactive");
+        case ksigAnalog:        return presentation(fmt, "ksigAnalog",          "FXO (analog)");
+        case ksigContinuousEM:  return presentation(fmt, "ksigContinuousEM",    "E+M Continuous");
+        case ksigPulsedEM:      return presentation(fmt, "ksigPulsedEM",        "E+M PUlsed");
+        case ksigOpenCAS:       return presentation(fmt, "ksigOpenCAS",         "Open CAS");
+        case ksigOpenR2:        return presentation(fmt, "ksigOpenR2",          "Open R2");
+        case ksigR2Digital:     return presentation(fmt, "ksigR2Digital",       "R2/MFC");
+        case ksigUserR2Digital: return presentation(fmt, "ksigUserR2Digital",   "R2/Other");
+#if K3L_AT_LEAST(1,4,0)
+        case ksigSIP:           return presentation(fmt, "ksigSIP",             "SIP");
+#endif
+
+#if K3L_AT_LEAST(1,5,1)
+        case ksigOpenCCS:       return presentation(fmt, "ksigOpenCCS",         "Open CCS");
+        case ksigPRI_EndPoint:  return presentation(fmt, "ksigPRI_EndPoint",    "ISDN Endpoint");
+        case ksigPRI_Network:   return presentation(fmt, "ksigPRI_Network",     "ISDN Network");
+        case ksigPRI_Passive:   return presentation(fmt, "ksigPRI_Passive",     "ISDN Passive");
+#endif
+#if K3L_AT_LEAST(1,5,3)
+        case ksigLineSide:        return presentation(fmt, "ksigLineSide",      "Line Side");
+#endif
+#if K3L_AT_LEAST(1,6,0)
+        case ksigAnalogTerminal: return presentation(fmt, "ksigAnalogTerminal", "FXS (analog)");
+        case ksigGSM:            return presentation(fmt, "ksigGSM",            "GSM");
+        case ksigCAS_EL7:        return presentation(fmt, "ksigCAS_EL7",        "CAS EL7");
+        case ksigE1LC:           return presentation(fmt, "ksigE1LC",           "E1 LC");
+#endif
+#if K3L_AT_LEAST(2,1,0)
+        case ksigISUP:           return presentation(fmt, "ksigISUP",           "ISUP");
+#endif
+#if K3L_EXACT(2,1,0)
+        case ksigFax:            return presentation(fmt, "ksigFax",            "Fax");
+#endif
+#if K3L_AT_LEAST(2,2,0)
+        case ksigISUPPassive:    return presentation(fmt, "ksigISUPPassive",    "ISUP Passive");
+#endif
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[KSignaling='%d']") % (int)sig),
+        STG(FMT("Unknown signaling (%d)") % (int)sig));
+}
+
+std::string Verbose::systemObject(KSystemObject so, Verbose::Presentation fmt)
+{
+    switch (so)
+    {
+        case ksoLink:      return presentation(fmt, "ksoLink",      "Link");
+        case ksoLinkMon:   return presentation(fmt, "ksoLinkMon",   "Link Monitor");
+        case ksoChannel:   return presentation(fmt, "ksoChannel",   "Channel");
+#if K3L_AT_LEAST(2,1,0)
+        case ksoGsmChannel:return presentation(fmt, "ksoGsmChannel","GsmChannel");
+#endif
+        case ksoH100:      return presentation(fmt, "ksoH100",      "H.100");
+        case ksoFirmware:  return presentation(fmt, "ksoFirmware",  "Firmware");
+        case ksoDevice:    return presentation(fmt, "ksoDevice",    "Device");
+        case ksoAPI:       return presentation(fmt, "ksoAPI",       "Software Layer");
+    }
+
+    return presentation(fmt,
+        STG(FMT("[KSystemObject='%d']") % (int)so),
+        STG(FMT("Unknown object (%d)") % (int)so));
+}
+
+std::string Verbose::mixerTone(KMixerTone mt, Verbose::Presentation fmt)
+{
+    switch (mt)
+    {
+        case kmtSilence:   return presentation(fmt, "kmtSilence",   "Silence");
+        case kmtDial:      return presentation(fmt, "kmtDial",      "Dialtone begin");
+        case kmtEndOf425:  return presentation(fmt, "kmtEndOf425",  "Dialtone end");
+        case kmtBusy:      return presentation(fmt, "kmtBusy",      "Busy");
+        case kmtFax:       return presentation(fmt, "kmtFax",       "Fax");
+        case kmtVoice:     return presentation(fmt, "kmtVoice",     "Voice");
+#if K3L_AT_LEAST(1,5,0)
+        case kmtCollect:   return presentation(fmt, "kmtCollect",   "Collect Call");
+#endif
+#if K3L_AT_LEAST(1,5,1)
+        case kmtEndOfDtmf: return presentation(fmt, "kmtEndOfDtmf", "DTMF end");
+#endif
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[KMixerTone='%d']") % (int)mt),
+        STG(FMT("Unknonwn tone (%d)") % (int)mt));
+}
+
+std::string Verbose::mixerSource(KMixerSource ms, Verbose::Presentation fmt)
+{
+    switch (ms)
+    {
+        case kmsChannel:        return presentation(fmt, "kmsChannel",        "Channel");
+        case kmsPlay:           return presentation(fmt, "kmsPlay",           "Player");
+        case kmsGenerator:      return presentation(fmt, "kmsGenerator",      "Generator");
+        case kmsCTbus:          return presentation(fmt, "kmsCTbus",          "CT-bus");
+#if (K3L_AT_LEAST(1,4,0) && !K3L_AT_LEAST(1,6,0))
+        case kmsVoIP:           return presentation(fmt, "kmsVoIP",           "VoIP");
+#endif
+#if K3L_AT_LEAST(1,6,0)
+        case kmsNoDelayChannel: return presentation(fmt, "kmsNoDelayChannel", "No delay channel");
+#endif
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[KMixerSource='%d']") % (int)ms),
+        STG(FMT("Unknonwn source (%d)") % (int)ms));
+}
+
+std::string Verbose::channelFeatures(int32 flags, Verbose::Presentation fmt)
+{
+    if (0x00 != flags)
+    {
+        Strings::Merger strs;
+
+        if (kcfDtmfSuppression & flags)   strs.add(presentation(fmt, "DtmfSuppression",   "DTMF Suppression"));
+        if (kcfCallProgress & flags)      strs.add(presentation(fmt, "CallProgress",      "Call Progress"));
+        if (kcfPulseDetection & flags)    strs.add(presentation(fmt, "PulseDetection",    "Pulse Detection"));
+        if (kcfAudioNotification & flags) strs.add(presentation(fmt, "AudioNotification", "Audio Notification"));
+        if (kcfEchoCanceller & flags)     strs.add(presentation(fmt, "EchoCanceller",     "Echo Canceller"));
+        if (kcfAutoGainControl & flags)   strs.add(presentation(fmt, "AutoGainControl",   "Input AGC"));
+        if (kcfHighImpEvents & flags)     strs.add(presentation(fmt, "HighImpEvents",     "High Impedance Events"));
+#if K3L_AT_LEAST(1,6,0)
+        if (kcfCallAnswerInfo & flags)    strs.add(presentation(fmt, "CallAnswerInfo",    "Call Answer Info"));
+#if !K3L_AT_LEAST(2,2,0)
+        if (kcfOutputVolume & flags)      strs.add(presentation(fmt, "OutputVolume",      "Output Volume"));
+#endif
+        if (kcfPlayerAGC & flags)         strs.add(presentation(fmt, "PlayerAGC",         "Player AGC"));
+#endif
+
+        return presentation(fmt,
+            STG(FMT("kcf{%s}") % strs.merge(",")),
+            STG(FMT("%s") % strs.merge(", ")));
+    };
+
+    PRESENTATION_CHECK_RETURN(fmt, "", "No features");
+}
+
+std::string Verbose::seizeFail(KSeizeFail sf, Verbose::Presentation fmt)
+{
+    switch (sf)
+    {
+        case ksfChannelLocked:   return presentation(fmt, "ksfChannelLocked",   "Channel Locked");
+        case ksfChannelBusy:     return presentation(fmt, "ksfChannelBusy",     "Channel Busy");
+        case ksfIncomingChannel: return presentation(fmt, "ksfIncomingChannel", "Incoming Channel");
+        case ksfDoubleSeizure:   return presentation(fmt, "ksfDoubleSeizure",   "Double Seizure");
+        case ksfCongestion:      return presentation(fmt, "ksfCongestion",      "Congestion");
+        case ksfNoDialTone:      return presentation(fmt, "ksfNoDialTone",      "No Dial Tone");
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[KSeizeFail='%d']") % (int)sf),
+        STG(FMT("Unknown seize fail (%d)") % (int)sf));
+}
+
+#if K3L_AT_LEAST(1,5,0)
+std::string Verbose::internal_sipFailures(KSIP_Failures code, Verbose::Presentation fmt)
+{
+    switch (code)
+    {
+#if K3L_AT_LEAST(1,6,0)
+        case kveResponse_200_OK_Success:                 return presentation(fmt, "kveResponse_200_OK_Success",                 "200 OK");
+#endif
+        case kveRedirection_300_MultipleChoices:         return presentation(fmt, "kveRedirection_300_MultipleChoices",         "300 Multiple Choices");
+        case kveRedirection_301_MovedPermanently:        return presentation(fmt, "kveRedirection_301_MovedPermanently",        "301 Moved Permanently");
+        case kveRedirection_302_MovedTemporarily:        return presentation(fmt, "kveRedirection_302_MovedTemporarily",        "302 Moved Temporarily");
+        case kveRedirection_305_UseProxy:                return presentation(fmt, "kveRedirection_305_UseProxy",                "305 Use Proxy");
+        case kveRedirection_380_AlternativeService:      return presentation(fmt, "kveRedirection_380_AlternativeService",      "380 Alternate Service");
+        case kveFailure_400_BadRequest:                  return presentation(fmt, "kveFailure_400_BadRequest",                  "400 Bad Request");
+        case kveFailure_401_Unauthorized:                return presentation(fmt, "kveFailure_401_Unauthorized",                "401 Unauthorized");
+        case kveFailure_402_PaymentRequired:             return presentation(fmt, "kveFailure_402_PaymentRequired",             "402 Payment Required");
+        case kveFailure_403_Forbidden:                   return presentation(fmt, "kveFailure_403_Forbidden",                   "403 Forbidden");
+        case kveFailure_404_NotFound:                    return presentation(fmt, "kveFailure_404_NotFound",                    "404 Not Found");
+        case kveFailure_405_MethodNotAllowed:            return presentation(fmt, "kveFailure_405_MethodNotAllowed",            "405 Method Not Allowed");
+        case kveFailure_406_NotAcceptable:               return presentation(fmt, "kveFailure_406_NotAcceptable",               "406 Not Acceptable");
+        case kveFailure_407_ProxyAuthenticationRequired: return presentation(fmt, "kveFailure_407_ProxyAuthenticationRequired", "407 Proxy Authentication Required");
+        case kveFailure_408_RequestTimeout:              return presentation(fmt, "kveFailure_408_RequestTimeout",              "408 Request Timeout");
+        case kveFailure_410_Gone:                        return presentation(fmt, "kveFailure_410_Gone",                        "410 Gone");
+        case kveFailure_413_RequestEntityTooLarge:       return presentation(fmt, "kveFailure_413_RequestEntityTooLarge",       "413 Request Entity Too Large");
+        case kveFailure_414_RequestURI_TooLong:          return presentation(fmt, "kveFailure_414_RequestURI_TooLong",          "414 Request URI Too Long");
+        case kveFailure_415_UnsupportedMediaType:        return presentation(fmt, "kveFailure_415_UnsupportedMediaType",        "415 Unsupported Media Type");
+        case kveFailure_416_UnsupportedURI_Scheme:       return presentation(fmt, "kveFailure_416_UnsupportedURI_Scheme",       "416 Unsupported URI Scheme");
+        case kveFailure_420_BadExtension:                return presentation(fmt, "kveFailure_420_BadExtension",                "420 Bad Extension");
+        case kveFailure_421_ExtensionRequired:           return presentation(fmt, "kveFailure_421_ExtensionRequired",           "421 Extension Required");
+        case kveFailure_423_IntervalTooBrief:            return presentation(fmt, "kveFailure_423_IntervalTooBrief",            "423 Internal Too Brief");
+        case kveFailure_480_TemporarilyUnavailable:      return presentation(fmt, "kveFailure_480_TemporarilyUnavailable",      "480 Temporarily Unavailable");
+        case kveFailure_481_CallDoesNotExist:            return presentation(fmt, "kveFailure_481_CallDoesNotExist",            "481 Call Does Not Exist");
+        case kveFailure_482_LoopDetected:                return presentation(fmt, "kveFailure_482_LoopDetected",                "482 Loop Detected");
+        case kveFailure_483_TooManyHops:                 return presentation(fmt, "kveFailure_483_TooManyHops",                 "483 Too Many Hops");
+        case kveFailure_484_AddressIncomplete:           return presentation(fmt, "kveFailure_484_AddressIncomplete",           "484 Address Incomplete");
+        case kveFailure_485_Ambiguous:                   return presentation(fmt, "kveFailure_485_Ambiguous",                   "485 Ambiguous");
+        case kveFailure_486_BusyHere:                    return presentation(fmt, "kveFailure_486_BusyHere",                    "486 Busy Here");
+        case kveFailure_487_RequestTerminated:           return presentation(fmt, "kveFailure_487_RequestTerminated",           "487 Request Terminated");
+        case kveFailure_488_NotAcceptableHere:           return presentation(fmt, "kveFailure_488_NotAcceptableHere",           "488 Not Acceptable Here");
+        case kveFailure_491_RequestPending:              return presentation(fmt, "kveFailure_491_RequestPending",              "491 Request Pending");
+        case kveFailure_493_Undecipherable:              return presentation(fmt, "kveFailure_493_Undecipherable",              "493 Undecipherable");
+        case kveServer_500_InternalError:                return presentation(fmt, "kveServer_500_InternalError",                "500 Internal Error");
+        case kveServer_501_NotImplemented:               return presentation(fmt, "kveServer_501_NotImplemented",               "501 Not Implemented");
+        case kveServer_502_BadGateway:                   return presentation(fmt, "kveServer_502_BadGateway",                   "502 Bad Gateway");
+        case kveServer_503_ServiceUnavailable:           return presentation(fmt, "kveServer_503_ServiceUnavailable",           "503 Service Unavailable");
+        case kveServer_504_TimeOut:                      return presentation(fmt, "kveServer_504_TimeOut",                      "504 Timed Out");
+        case kveServer_505_VersionNotSupported:          return presentation(fmt, "kveServer_505_VersionNotSupported",          "505 Version Not Supported");
+        case kveServer_513_MessageTooLarge:              return presentation(fmt, "kveServer_513_MessageTooLarge",              "513 Message Too Large");
+        case kveGlobalFailure_600_BusyEverywhere:        return presentation(fmt, "kveGlobalFailure_600_BusyEverywhere",        "600 Busy Everywhere");
+        case kveGlobalFailure_603_Decline:               return presentation(fmt, "kveGlobalFailure_603_Decline",               "603 Decline");
+        case kveGlobalFailure_604_DoesNotExistAnywhere:  return presentation(fmt, "kveGlobalFailure_604_DoesNotExistAnywhere",  "604 Does Not Exist Anywhere");
+        case kveGlobalFailure_606_NotAcceptable:         return presentation(fmt, "kveGlobalFailure_606_NotAcceptable",         "606 Not Acceptable");
+    }
+
+    throw internal_not_found();
+}
+
+std::string Verbose::sipFailures(KSIP_Failures code, Verbose::Presentation fmt)
+{
+    try
+    {
+        return internal_sipFailures(code, fmt);
+    }
+    catch (internal_not_found & e)
+    {
+        PRESENTATION_CHECK_RETURN(fmt,
+            STG(FMT("[KSIP_Failures='%d']") % (int)code),
+            STG(FMT("Unknown SIP failure (%d)") % (int)code));
+    }
+}
+
+#endif
+
+#if K3L_AT_LEAST(1,5,1)
+std::string Verbose::internal_isdnCause(KQ931Cause code, Verbose::Presentation fmt)
+{
+    switch (code)
+    {
+        case kq931cNone:                           return presentation(fmt, "kq931cNone",                           "None");
+        case kq931cUnallocatedNumber:              return presentation(fmt, "kq931cUnallocatedNumber",              "Unallocated number");
+        case kq931cNoRouteToTransitNet:            return presentation(fmt, "kq931cNoRouteToTransitNet",            "No route to transmit to network");
+        case kq931cNoRouteToDest:                  return presentation(fmt, "kq931cNoRouteToDest",                  "No route to destination");
+#if 1 /* this changed during K3L 1.6.0 development cycle... */
+        case kq931cSendSpecialInfoTone:            return presentation(fmt, "kq931cSendSpecialInfoTone",            "Send special information tone");
+        case kq931cMisdialedTrunkPrefix:           return presentation(fmt, "kq931cMisdialedTrunkPrefix",           "Misdialed trunk prefix");
+#endif
+        case kq931cChannelUnacceptable:            return presentation(fmt, "kq931cChannelUnacceptable",            "Channel unacceptable");
+        case kq931cCallAwarded:                    return presentation(fmt, "kq931cCallAwarded",                    "Call awarded");
+#if 1 /* this changed during K3L 1.6.0 development cycle... */
+        case kq931cPreemption:                     return presentation(fmt, "kq931cPreemption",                     "Preemption");
+        case kq931cPreemptionCircuitReuse:         return presentation(fmt, "kq931cPreemptionCircuitReuse",         "Preemption circuit reuse");
+        case kq931cQoR_PortedNumber:               return presentation(fmt, "kq931cQoR_PortedNumber",               "QoR ported number");
+#endif
+        case kq931cNormalCallClear:                return presentation(fmt, "kq931cNormalCallClear",                "Normal call clear");
+        case kq931cUserBusy:                       return presentation(fmt, "kq931cUserBusy",                       "User busy");
+        case kq931cNoUserResponding:               return presentation(fmt, "kq931cNoUserResponding",               "No user responding");
+        case kq931cNoAnswerFromUser:               return presentation(fmt, "kq931cNoAnswerFromUser",               "No answer from user");
+#if 1 /* this changed during K3L 1.6.0 development cycle... */
+        case kq931cSubscriberAbsent:               return presentation(fmt, "kq931cSubscriberAbsent",               "Subscriber absent");
+#endif
+        case kq931cCallRejected:                   return presentation(fmt, "kq931cCallRejected",                   "Call rejected");
+        case kq931cNumberChanged:                  return presentation(fmt, "kq931cNumberChanged",                  "Number changed");
+#if 1 /* this changed during K3L 1.6.0 development cycle... */
+        case kq931cRedirectionToNewDest:           return presentation(fmt, "kq931cRedirectionToNewDest",           "Redirection to new destination");
+        case kq931cCallRejectedFeatureDest:        return presentation(fmt, "kq931cCallRejectedFeatureDest",        "Call rejected feature destination");
+        case kq931cExchangeRoutingError:           return presentation(fmt, "kq931cExchangeRoutingError",           "Exchange routing error");
+#endif
+        case kq931cNonSelectedUserClear:           return presentation(fmt, "kq931cNonSelectedUserClear",           "Non selected user clear");
+        case kq931cDestinationOutOfOrder:          return presentation(fmt, "kq931cDestinationOutOfOrder",          "Destination out of order");
+        case kq931cInvalidNumberFormat:            return presentation(fmt, "kq931cInvalidNumberFormat",            "Invalid number format");
+        case kq931cFacilityRejected:               return presentation(fmt, "kq931cFacilityRejected",               "Facility rejected");
+        case kq931cRespStatusEnquiry:              return presentation(fmt, "kq931cRespStatusEnquiry",              "Response status enquiry");
+        case kq931cNormalUnspecified:              return presentation(fmt, "kq931cNormalUnspecified",              "Normal unespecified");
+        case kq931cNoCircuitChannelAvail:          return presentation(fmt, "kq931cNoCircuitChannelAvail",          "No circuit channel available");
+        case kq931cNetworkOutOfOrder:              return presentation(fmt, "kq931cNetworkOutOfOrder",              "Network out of order");
+#if 1 /* this changed during K3L 1.6.0 development cycle... */
+        case kq931cPermanentFrameConnOutOfService: return presentation(fmt, "kq931cPermanentFrameConnOutOfService", "Permanent frame connection out of service");
+        case kq931cPermanentFrameConnOperational:  return presentation(fmt, "kq931cPermanentFrameConnOperational",  "Permanent frame connection operational");
+#endif
+        case kq931cTemporaryFailure:               return presentation(fmt, "kq931cTemporaryFailure",               "Temporary failure");
+        case kq931cSwitchCongestion:               return presentation(fmt, "kq931cSwitchCongestion",               "Switch congestion");
+        case kq931cAccessInfoDiscarded:            return presentation(fmt, "kq931cAccessInfoDiscarded",            "Access information discarded");
+        case kq931cRequestedChannelUnav:           return presentation(fmt, "kq931cRequestedChannelUnav",           "Requested channel unavailable");
+        case kq931cPrecedenceCallBlocked:          return presentation(fmt, "kq931cPrecedenceCallBlocked",          "Precedence call blocked");
+        case kq931cResourceUnavailable:            return presentation(fmt, "kq931cResourceUnavailable",            "Request resource unavailable");
+        case kq931cQosUnavailable:                 return presentation(fmt, "kq931cQosUnavailable",                 "QoS unavailable");
+        case kq931cReqFacilityNotSubsc:            return presentation(fmt, "kq931cReqFacilityNotSubsc",            "Request facility not subscribed");
+        case kq931cOutCallsBarredWithinCUG:        return presentation(fmt, "kq931cOutCallsBarredWithinCUG",        "Out calls barred within UG");
+        case kq931cInCallsBarredWithinCUG:         return presentation(fmt, "kq931cInCallsBarredWithinCUG",         "In calls barred within UG");
+        case kq931cBearerCapabNotAuthor:           return presentation(fmt, "kq931cBearerCapabNotAuthor",           "Bearer capability not authorized");
+        case kq931cBearerCapabNotAvail:            return presentation(fmt, "kq931cBearerCapabNotAvail",            "Bearer capability not available");
+#if 1 /* this changed during K3L 1.6.0 development cycle... */
+        case kq931cInconsistency:                  return presentation(fmt, "kq931cInconsistency",                  "Inconsistency");
+#endif
+        case kq931cServiceNotAvailable:            return presentation(fmt, "kq931cServiceNotAvailable",            "Service not available");
+        case kq931cBcNotImplemented:               return presentation(fmt, "kq931cBcNotImplemented",               "Bearer capability not implemented");
+        case kq931cChannelTypeNotImplem:           return presentation(fmt, "kq931cChannelTypeNotImplem",           "Channel type not implemented");
+        case kq931cReqFacilityNotImplem:           return presentation(fmt, "kq931cReqFacilityNotImplem",           "Request facility not implemented");
+        case kq931cOnlyRestrictedBcAvail:          return presentation(fmt, "kq931cOnlyRestrictedBcAvail",          "Only restricted bearer capability available");
+        case kq931cServiceNotImplemented:          return presentation(fmt, "kq931cServiceNotImplemented",          "Service not implemented");
+        case kq931cInvalidCrv:                     return presentation(fmt, "kq931cInvalidCrv",                     "Invalid call reference value");
+        case kq931cChannelDoesNotExist:            return presentation(fmt, "kq931cChannelDoesNotExist",            "Channel does not exist");
+        case kq931cCallIdDoesNotExist:             return presentation(fmt, "kq931cCallIdDoesNotExist",             "Call identification does not exist");
+        case kq931cCallIdInUse:                    return presentation(fmt, "kq931cCallIdInUse",                    "Call identification in use");
+        case kq931cNoCallSuspended:                return presentation(fmt, "kq931cNoCallSuspended",                "No call suspended");
+        case kq931cCallIdCleared:                  return presentation(fmt, "kq931cCallIdCleared",                  "Call identification cleared");
+#if 1 /* this changed during K3L 1.6.0 development cycle... */
+        case kq931cUserNotMemberofCUG:             return presentation(fmt, "kq931cUserNotMemberofCUG",             "User not member of UG");
+#endif
+        case kq931cIncompatibleDestination:        return presentation(fmt, "kq931cIncompatibleDestination",        "Incompatible destination");
+        case kq931cInvalidTransitNetSel:           return presentation(fmt, "kq931cInvalidTransitNetSel",           "Invalid transit network selected");
+        case kq931cInvalidMessage:                 return presentation(fmt, "kq931cInvalidMessage",                 "Invalid message");
+        case kq931cMissingMandatoryIe:             return presentation(fmt, "kq931cMissingMandatoryIe",             "Missing mandatory information element");
+        case kq931cMsgTypeNotImplemented:          return presentation(fmt, "kq931cMsgTypeNotImplemented",          "Message type not implemented");
+        case kq931cMsgIncompatWithState:           return presentation(fmt, "kq931cMsgIncompatWithState",           "Message incompatible with state");
+        case kq931cIeNotImplemented:               return presentation(fmt, "kq931cIeNotImplemented",               "Information element not implemented");
+        case kq931cInvalidIe:                      return presentation(fmt, "kq931cInvalidIe",                      "Invalid information element");
+        case kq931cMsgIncompatWithState2:          return presentation(fmt, "kq931cMsgIncompatWithState2",          "Message incompatible with state (2)");
+        case kq931cRecoveryOnTimerExpiry:          return presentation(fmt, "kq931cRecoveryOnTimerExpiry",          "Recovery on timer expiry");
+        case kq931cProtocolError:                  return presentation(fmt, "kq931cProtocolError",                  "Protocol error");
+#if 1 /* this changed during K3L 1.6.0 development cycle... */
+        case kq931cMessageWithUnrecognizedParam:   return presentation(fmt, "kq931cMessageWithUnrecognizedParam",   "Message with unrecognized parameters");
+        case kq931cProtocolErrorUnspecified:       return presentation(fmt, "kq931cProtocolErrorUnspecified",       "Protocol error unspecified");
+#endif
+        case kq931cInterworking:                   return presentation(fmt, "kq931cInterworking",                   "Interworking");
+        case kq931cCallConnected:                  return presentation(fmt, "kq931cCallConnected",                  "Call connected");
+        case kq931cCallTimedOut:                   return presentation(fmt, "kq931cCallTimedOut",                   "Call timeout");
+        case kq931cCallNotFound:                   return presentation(fmt, "kq931cCallNotFound",                   "Call not found");
+        case kq931cCantReleaseCall:                return presentation(fmt, "kq931cCantReleaseCall",                "Cannot realese call");
+        case kq931cNetworkFailure:                 return presentation(fmt, "kq931cNetworkFailure",                 "Network failure");
+        case kq931cNetworkRestart:                 return presentation(fmt, "kq931cNetworkRestart",                 "Network restart");
+    }
+
+    throw internal_not_found();
+}
+
+std::string Verbose::isdnCause(KQ931Cause code, Verbose::Presentation fmt)
+{
+    try
+    {
+        return internal_isdnCause(code);
+    }
+    catch (internal_not_found & e)
+    {
+        return STG(FMT("[KQ931Cause='%d']") % (int)code);
+    }
+}
+#endif
+
+#if K3L_AT_LEAST(1,5,2)
+std::string Verbose::isdnDebug(int32 flags, Verbose::Presentation fmt)
+{
+    if (0x00 != flags)
+    {
+        Strings::Merger strs;
+
+        if (flags & kidfQ931)   strs.add("Q931");
+        if (flags & kidfLAPD)   strs.add("LAPD");
+        if (flags & kidfSystem) strs.add("System");
+
+        PRESENTATION_CHECK_RETURN(fmt,
+            STG(FMT("kidf{%s}") % strs.merge(",")),
+            strs.merge(", "));
+    }
+
+    return presentation(fmt, "", "No debug active");
+}
+#endif
+
+#if K3L_AT_LEAST(2,0,0)
+std::string Verbose::internal_signGroupB(KSignGroupB group, R2CountryType country, Verbose::Presentation fmt)
+#else
+std::string Verbose::internal_signGroupB(KSignGroupB group, Verbose::Presentation fmt)
+#endif
+{
+#if K3L_AT_LEAST(2,0,0)
+    switch (country)
+    {
+        case R2_COUNTRY_ARG:
+            switch ((KSignGroupB_Argentina)group)
+            {
+                case kgbArNumberChanged:       return presentation(fmt, "kgbArNumberChanged",      "Number Changed");
+                case kgbArBusy:                return presentation(fmt, "kgbArBusy",               "Busy");
+                case kgbArCongestion:          return presentation(fmt, "kgbArCongestion",         "Congestion");
+                case kgbArInvalidNumber:       return presentation(fmt, "kgbArInvalidNumber",      "Invalid Number");
+                case kgbArLineFreeCharged:     return presentation(fmt, "kgbArLineFreeCharged",    "Line Free Charged");
+                case kgbArLineFreeNotCharged:  return presentation(fmt, "kgbArLineFreeNotCharged", "Line Free Not Charged");
+                case kgbArLineOutOfOrder:      return presentation(fmt, "kgbArLineOutOfOrder",     "Line Out Of Order");
+                case kgbArNone:                return presentation(fmt, "kgbArNone",               "None");
+            }
+            break;
+
+        case R2_COUNTRY_BRA:
+            switch ((KSignGroupB_Brazil)group)
+            {
+                case kgbBrLineFreeCharged:     return presentation(fmt, "kgbBrLineFreeCharged",    "Line Free Charged");
+                case kgbBrLineFreeNotCharged:  return presentation(fmt, "kgbBrLineFreeNotCharged", "Line Free Not Charged");
+                case kgbBrLineFreeChargedLPR:  return presentation(fmt, "kgbBrLineFreeChargedLPR", "Line Free Charged PLR");
+                case kgbBrBusy:                return presentation(fmt, "kgbBrBusy",               "Busy");
+                case kgbBrNumberChanged:       return presentation(fmt, "kgbBrNumberChanged",      "Number Changed");
+                case kgbBrCongestion:          return presentation(fmt, "kgbBrCongestion",         "Congestion");
+                case kgbBrInvalidNumber:       return presentation(fmt, "kgbBrInvalidNumber",      "Invalid Number");
+                case kgbBrLineOutOfOrder:      return presentation(fmt, "kgbBrLineOutOfOrder",     "Line Out Of Order");
+                case kgbBrNone:                return presentation(fmt, "kgbBrNone",               "None");
+            }
+            break;
+
+        case R2_COUNTRY_CHI:
+            switch ((KSignGroupB_Chile)group)
+            {
+                case kgbClNumberChanged:       return presentation(fmt, "kgbClNumberChanged",      "Number Changed");
+                case kgbClBusy:                return presentation(fmt, "kgbClBusy",               "Busy");
+                case kgbClCongestion:          return presentation(fmt, "kgbClCongestion",         "Congestion");
+                case kgbClInvalidNumber:       return presentation(fmt, "kgbClInvalidNumber",      "Invalid Number");
+                case kgbClLineFreeCharged:     return presentation(fmt, "kgbClLineFreeCharged",    "Line Free Charged");
+                case kgbClLineFreeNotCharged:  return presentation(fmt, "kgbClLineFreeNotCharged", "Line Free Not Charged");
+                case kgbClLineOutOfOrder:      return presentation(fmt, "kgbClLineOutOfOrder",     "Line Out Of Order");
+                case kgbClNone:                return presentation(fmt, "kgbClNone",               "None");
+            }
+            break;
+
+        case R2_COUNTRY_MEX:
+            switch ((KSignGroupB_Mexico)group)
+            {
+                case kgbMxLineFreeCharged:     return presentation(fmt, "kgbMxLineFreeCharged",    "Line Free Charged");
+                case kgbMxBusy:                return presentation(fmt, "kgbMxBusy",               "Busy");
+                case kgbMxLineFreeNotCharged:  return presentation(fmt, "kgbMxLineFreeNotCharged", "Line Free Not Charged");
+                case kgbMxNone:                return presentation(fmt, "kgbMxNone",               "None");
+            }
+            break;
+
+        case R2_COUNTRY_URY:
+            switch ((KSignGroupB_Uruguay)group)
+            {
+                case kgbUyNumberChanged:       return presentation(fmt, "kgbUyNumberChanged",      "Number Changed");
+                case kgbUyBusy:                return presentation(fmt, "kgbUyBusy",               "Busy");
+                case kgbUyCongestion:          return presentation(fmt, "kgbUyCongestion",         "Congestion");
+                case kgbUyInvalidNumber:       return presentation(fmt, "kgbUyInvalidNumber",      "Invalid Number");
+                case kgbUyLineFreeCharged:     return presentation(fmt, "kgbUyLineFreeCharged",    "Line Free Charged");
+                case kgbUyLineFreeNotCharged:  return presentation(fmt, "kgbUyLineFreeNotCharged", "Line Free Not Charged");
+                case kgbUyLineOutOfOrder:      return presentation(fmt, "kgbUyLineOutOfOrder",     "Line Out Of Order");
+                case kgbUyNone:                return presentation(fmt, "kgbUyNone",               "None");
+            }
+            break;
+
+        case R2_COUNTRY_VEN:
+            switch ((KSignGroupB_Venezuela)group)
+            {
+                case kgbVeLineFreeChargedLPR:  return presentation(fmt, "kgbVeLineFreeChargedLPR", "Line Free Charged PLR");
+                case kgbVeNumberChanged:       return presentation(fmt, "kgbVeNumberChanged",      "Number Changed");
+                case kgbVeBusy:                return presentation(fmt, "kgbVeBusy",               "Busy");
+                case kgbVeCongestion:          return presentation(fmt, "kgbVeCongestion",         "Congestion");
+                case kgbVeInformationTone:     return presentation(fmt, "kgbVeInformationTone",    "Information Tone");
+                case kgbVeLineFreeCharged:     return presentation(fmt, "kgbVeLineFreeCharged",    "Line Free Charged");
+                case kgbVeLineFreeNotCharged:  return presentation(fmt, "kgbVeLineFreeNotCharged", "Line Free Not Charged");
+                case kgbVeLineBlocked:         return presentation(fmt, "kgbVeLineBlocked",        "Line Blocked");
+                case kgbVeIntercepted:         return presentation(fmt, "kgbVeIntercepted",        "Intercepted");
+                case kgbVeDataTrans:           return presentation(fmt, "kgbVeDataTrans",          "Data Transfer");
+                case kgbVeNone:                return presentation(fmt, "kgbVeNone",               "None");
+            }
+            break;
+    }
+#else
+    switch ((KSignGroupB)group)
+    {
+        case kgbLineFreeCharged:     return presentation(fmt, "kgbLineFreeCharged",    "Line Free Charged");
+        case kgbLineFreeNotCharged:  return presentation(fmt, "kgbLineFreeNotCharged", "Line Free Not Charged");
+        case kgbLineFreeChargedLPR:  return presentation(fmt, "kgbLineFreeChargedLPR", "Line Free Charged PLR");
+        case kgbBusy:                return presentation(fmt, "kgbBusy",               "Busy");
+        case kgbNumberChanged:       return presentation(fmt, "kgbNumberChanged",      "Number Changed");
+        case kgbCongestion:          return presentation(fmt, "kgbCongestion",         "Congestion");
+        case kgbInvalidNumber:       return presentation(fmt, "kgbInvalidNumber",      "Invalid Number");
+        case kgbLineOutOfOrder:      return presentation(fmt, "kgbLineOutOfOrder",     "Line Out Of Order");
+        case kgbNone:                return presentation(fmt, "kgbNone",               "None");
+    }
+#endif
+
+    throw internal_not_found();
+}
+
+#if K3L_AT_LEAST(2,0,0)
+std::string Verbose::signGroupB(KSignGroupB group, R2CountryType r2_country, Verbose::Presentation fmt)
+#else
+std::string Verbose::signGroupB(KSignGroupB group, Verbose::Presentation fmt)
+#endif
+{
+    try
+    {
+#if K3L_AT_LEAST(2,0,0)
+        return internal_signGroupB(group, r2_country, fmt);
+#else
+        return internal_signGroupB(group, fmt);
+#endif
+    }
+    catch (internal_not_found & e)
+    {
+        PRESENTATION_CHECK_RETURN(fmt,
+            STG(FMT("[KSignGroupB='%d']") % (int)group),
+            STG(FMT("Unknown group B (%d)") % (int)group));
+    }
+}
+
+#if K3L_AT_LEAST(2,0,0)
+std::string Verbose::internal_signGroupII(KSignGroupII group, R2CountryType country, Verbose::Presentation fmt)
+#else
+std::string Verbose::internal_signGroupII(KSignGroupII group, Verbose::Presentation fmt)
+#endif
+{
+#if K3L_AT_LEAST(2,0,0)
+    switch (country)
+    {
+        case R2_COUNTRY_ARG:
+            switch ((KSignGroupII_Argentina)group)
+            {
+                case kg2ArOrdinary:             return presentation(fmt, "kg2ArOrdinary",            "Ordinary");
+                case kg2ArPriority:             return presentation(fmt, "kg2ArPriority",            "Priority");
+                case kg2ArMaintenance:          return presentation(fmt, "kg2ArMaintenance",         "Maintenance");
+                case kg2ArLocalPayPhone:        return presentation(fmt, "kg2ArLocalPayPhone",       "Local pay phone");
+                case kg2ArTrunkOperator:        return presentation(fmt, "kg2ArTrunkOperator",       "Trunk operator");
+                case kg2ArDataTrans:            return presentation(fmt, "kg2ArDataTrans",           "Data transfer");
+                case kg2ArCPTP:                 return presentation(fmt, "kg2ArCPTP",                "CPTP");
+                case kg2ArSpecialLine:          return presentation(fmt, "kg2ArSpecialLine",         "Special line");
+                case kg2ArMobileUser:           return presentation(fmt, "kg2ArMobileUser",          "Mobile user");
+                case kg2ArPrivateRedLine:       return presentation(fmt, "kg2ArPrivateRedLine",      "Private red line");
+                case kg2ArSpecialPayPhoneLine:  return presentation(fmt, "kg2ArSpecialPayPhoneLine", "Special pay phone line");
+            }
+            break;
+
+        case R2_COUNTRY_BRA:
+            switch ((KSignGroupII_Brazil)group)
+            {
+                case kg2BrOrdinary:         return presentation(fmt, "kg2BrOrdinary",            "Ordinary");
+                case kg2BrPriority:         return presentation(fmt, "kg2BrPriority",            "Priority");
+                case kg2BrMaintenance:      return presentation(fmt, "kg2BrMaintenance",         "Maintenance");
+                case kg2BrLocalPayPhone:    return presentation(fmt, "kg2BrLocalPayPhone",       "Local pay phone");
+                case kg2BrTrunkOperator:    return presentation(fmt, "kg2BrTrunkOperator",       "Trunk operator");
+                case kg2BrDataTrans:        return presentation(fmt, "kg2BrDataTrans",           "Data transfer");
+                case kg2BrNonLocalPayPhone: return presentation(fmt, "kg2BrNonLocalPayPhone",    "Non local pay phone");
+                case kg2BrCollectCall:      return presentation(fmt, "kg2BrCollectCall",         "Collect call");
+                case kg2BrOrdinaryInter:    return presentation(fmt, "kg2BrOrdinaryInter",       "Ordinary international");
+                case kg2BrTransfered:       return presentation(fmt, "kg2BrTransfered",          "Transfered");
+            }
+            break;
+
+        case R2_COUNTRY_CHI:
+            switch ((KSignGroupII_Chile)group)
+            {
+                case kg2ClOrdinary:               return presentation(fmt, "kg2ClOrdinary",               "Ordinary");
+                case kg2ClPriority:               return presentation(fmt, "kg2ClPriority",               "Priority");
+                case kg2ClMaintenance:            return presentation(fmt, "kg2ClMaintenance",            "Maintenance");
+                case kg2ClTrunkOperator:          return presentation(fmt, "kg2ClTrunkOperator",          "Trunk operator");
+                case kg2ClDataTrans:              return presentation(fmt, "kg2ClDataTrans",              "Data transfer");
+                case kg2ClUnidentifiedSubscriber: return presentation(fmt, "kg2ClUnidentifiedSubscriber", "Unidentified subscriber");
+            }
+            break;
+
+        case R2_COUNTRY_MEX:
+            switch ((KSignGroupII_Mexico)group)
+            {
+                case kg2MxTrunkOperator:    return presentation(fmt, "kg2MxTrunkOperator",       "Trunk operator");
+                case kg2MxOrdinary:         return presentation(fmt, "kg2MxOrdinary",            "Ordinary");
+                case kg2MxMaintenance:      return presentation(fmt, "kg2MxMaintenance",         "Maintenance");
+            }
+            break;
+
+        case R2_COUNTRY_URY:
+            switch ((KSignGroupII_Uruguay)group)
+            {
+                case kg2UyOrdinary:         return presentation(fmt, "kg2UyOrdinary",            "Ordinary");
+                case kg2UyPriority:         return presentation(fmt, "kg2UyPriority",            "Priority");
+                case kg2UyMaintenance:      return presentation(fmt, "kg2UyMaintenance",         "Maintenance");
+                case kg2UyLocalPayPhone:    return presentation(fmt, "kg2UyLocalPayPhone",       "Local pay phone");
+                case kg2UyTrunkOperator:    return presentation(fmt, "kg2UyTrunkOperator",       "Trunk operator");
+                case kg2UyDataTrans:        return presentation(fmt, "kg2UyDataTrans",           "Data transfer");
+                case kg2UyInternSubscriber: return presentation(fmt, "kg2UyInternSubscriber",    "International subscriber");
+            }
+            break;
+
+        case R2_COUNTRY_VEN:
+            switch ((KSignGroupII_Venezuela)group)
+            {
+                case kg2VeOrdinary:           return presentation(fmt, "kg2VeOrdinary",            "Ordinary");
+                case kg2VePriority:           return presentation(fmt, "kg2VePriority",            "Priority");
+                case kg2VeMaintenance:        return presentation(fmt, "kg2VeMaintenance",         "Maintenance");
+                case kg2VeLocalPayPhone:      return presentation(fmt, "kg2VeLocalPayPhone",       "Local pay phone");
+                case kg2VeTrunkOperator:      return presentation(fmt, "kg2VeTrunkOperator",       "Trunk operator");
+                case kg2VeDataTrans:          return presentation(fmt, "kg2VeDataTrans",           "Data transfer");
+                case kg2VeNoTransferFacility: return presentation(fmt, "kg2VeNoTransferFacility",  "No transfer facility");
+            }
+            break;
+    }
+#else
+    switch ((KSignGroupII)group)
+    {
+        case kg2Ordinary:         return presentation(fmt, "kg2Ordinary",            "Ordinary");
+        case kg2Priority:         return presentation(fmt, "kg2Priority",            "Priority");
+        case kg2Maintenance:      return presentation(fmt, "kg2Maintenance",         "Maintenance");
+        case kg2LocalPayPhone:    return presentation(fmt, "kg2LocalPayPhone",       "Local pay phone");
+        case kg2TrunkOperator:    return presentation(fmt, "kg2TrunkOperator",       "Trunk operator");
+        case kg2DataTrans:        return presentation(fmt, "kg2DataTrans",           "Data transfer");
+        case kg2NonLocalPayPhone: return presentation(fmt, "kg2NonLocalPayPhone",    "Non local pay phone");
+        case kg2CollectCall:      return presentation(fmt, "kg2CollectCall",         "Collect call");
+        case kg2OrdinaryInter:    return presentation(fmt, "kg2OrdinaryInter",       "Ordinary international");
+        case kg2Transfered:       return presentation(fmt, "kg2Transfered",          "Transfered");
+    }
+#endif
+
+    throw internal_not_found();
+}
+
+#if K3L_AT_LEAST(2,0,0)
+std::string Verbose::signGroupII(KSignGroupII group, R2CountryType r2_country, Verbose::Presentation fmt)
+#else
+std::string Verbose::signGroupII(KSignGroupII group, Verbose::Presentation fmt)
+#endif
+{
+    try
+    {
+#if K3L_AT_LEAST(2,0,0)
+        return internal_signGroupII(group, r2_country);
+#else
+        return internal_signGroupII(group);
+#endif
+    }
+    catch (internal_not_found & e)
+    {
+        PRESENTATION_CHECK_RETURN(fmt,
+            STG(FMT("[KSignGroupII='%d']") % (int)group),
+            STG(FMT("Unknown group II (%d)") % (int)group));
+    }
+}
+
+#if K3L_AT_LEAST(2,0,0)
+std::string Verbose::callFail(KSignaling sig, R2CountryType country, int32 info, Verbose::Presentation fmt)
+#else
+std::string Verbose::callFail(KSignaling sig, int32 info, Verbose::Presentation fmt)
+#endif
+{
+    try
+    {
+        switch (sig)
+        {
+            case ksigInactive:
+                throw internal_not_found();
+
+            case ksigAnalog:
+                if (('a' <= ((char)info) && 'z' >= ((char)info)) || ('A' <= ((char)info) && 'Z' >= ((char)info)))
+                    return STG(FMT("%c") % (char)info);
+                else
+                    throw internal_not_found();
+
+#if K3L_AT_LEAST(1,5,4)
+            case ksigLineSide:
+#endif
+#if K3L_EXACT(2,1,0)
+            case ksigISUP:
+            case ksigFax:
+#endif
+#if K3L_AT_LEAST(1,6,0)
+            case ksigCAS_EL7:
+            case ksigE1LC:
+                return "NOT IMPLEMENTED";
+
+            case ksigAnalogTerminal:
+#endif
+            case ksigContinuousEM:
+            case ksigPulsedEM:
+
+            case ksigR2Digital:
+            case ksigOpenR2:
+#if K3L_AT_LEAST(2,0,0)
+                return internal_signGroupB((KSignGroupB)info, country);
+#else
+                return internal_signGroupB((KSignGroupB)info);
+#endif
+
+            case ksigOpenCAS:
+            case ksigUserR2Digital:
+#if K3L_AT_LEAST(2,0,0)
+                return internal_signGroupB((KSignGroupB)info, R2_COUNTRY_BRA);
+#else
+                return internal_signGroupB((KSignGroupB)info);
+#endif
+
+#if K3L_AT_LEAST(1,5,0)
+            case ksigSIP:
+                return internal_sipFailures((KSIP_Failures)info);
+#endif
+
+#if K3L_AT_LEAST(1,5,1)
+            case ksigOpenCCS:
+            case ksigPRI_EndPoint:
+            case ksigPRI_Network:
+            case ksigPRI_Passive:
+#if K3L_AT_LEAST(2,2,0)
+            case ksigISUP:
+            case ksigISUPPassive:
+#endif
+                return internal_isdnCause((KQ931Cause)info);
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+            case ksigGSM:
+                return internal_gsmCallCause((KGsmCallCause)info);
+#endif
+        }
+    }
+    catch (internal_not_found & e)
+    {
+        /* this exception is used for breaking the control flow */
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[%s, callFail='%d']") % signaling(sig, fmt) % (int)info),
+        STG(FMT("Unknown call fail code for '%s' (%d)") % signaling(sig, fmt) % (int)info));
+}
+
+std::string Verbose::channelFail(KSignaling sig, int32 code, Verbose::Presentation fmt)
+{
+    try
+    {
+        switch (sig)
+        {
+            case ksigInactive:
+            case ksigAnalog:
+            case ksigSIP:
+#if K3L_EXACT(2,1,0)
+            case ksigISUP:
+            case ksigFax:
+#endif
+                throw internal_not_found();
+
+#if K3L_AT_LEAST(1,6,0)
+            case ksigGSM:
+                return internal_gsmMobileCause((KGsmMobileCause)code);
+
+            case ksigAnalogTerminal:
+            case ksigCAS_EL7:
+            case ksigE1LC:
+#endif
+
+            case ksigContinuousEM:
+            case ksigPulsedEM:
+
+            case ksigLineSide:
+
+            case ksigOpenCAS:
+            case ksigOpenR2:
+            case ksigR2Digital:
+            case ksigUserR2Digital:
+                switch ((KChannelFail)code)
+                {
+                    case kfcRemoteFail:         return presentation(fmt, "kfcRemoteFail",         "Remote failure");
+                    case kfcLocalFail:          return presentation(fmt, "kfcLocalFail",          "Local failure");
+                    case kfcRemoteLock:         return presentation(fmt, "kfcRemoteLock",         "Remote lock");
+                    case kfcLineSignalFail:     return presentation(fmt, "kfcLineSignalFail",     "Line signal failure");
+                    case kfcAcousticSignalFail: return presentation(fmt, "kfcAcousticSignalFail", "Acoustic signal failure");
+                }
+
+                throw internal_not_found();
+
+#if K3L_AT_LEAST(1,5,1)
+            case ksigOpenCCS:
+            case ksigPRI_EndPoint:
+            case ksigPRI_Network:
+            case ksigPRI_Passive:
+#if K3L_AT_LEAST(2,2,0)
+            case ksigISUP:
+            case ksigISUPPassive:
+#endif
+                return internal_isdnCause((KQ931Cause)code);
+#endif
+        }
+    }
+    catch (internal_not_found & e)
+    {
+        /* this exception is used for breaking the control flow */
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[%s, channelFail='%d']") % signaling(sig, fmt) % (int)code),
+        STG(FMT("Unknown channel fail code for '%s' (%d)") % signaling(sig, fmt) % (int)code));
+}
+
+std::string Verbose::internalFail(KInternalFail inf, Verbose::Presentation fmt)
+{
+    switch (inf)
+    {
+        case kifInterruptCtrl:     return presentation(fmt, "kifInterruptCtrl",     "Interrupt control");
+        case kifCommunicationFail: return presentation(fmt, "kifCommunicationFail", "Communication failure");
+        case kifProtocolFail:      return presentation(fmt, "kifProtocolFail",      "Protocol failure");
+        case kifInternalBuffer:    return presentation(fmt, "kifInternalBuffer",    "Internal buffer");
+        case kifMonitorBuffer:     return presentation(fmt, "kifMonitorBuffer",     "Monitor buffer");
+        case kifInitialization:    return presentation(fmt, "kifInitialization",    "Initialization");
+        case kifInterfaceFail:     return presentation(fmt, "kifInterfaceFail",     "Interface failure");
+        case kifClientCommFail:    return presentation(fmt, "kifClientCommFail",    "Client communication failure");
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[KInternalFail='%d']") % (int)inf),
+        STG(FMT("Unknown internal failure (%d)") % (int)inf));
+}
+
+std::string Verbose::linkErrorCounter(KLinkErrorCounter ec, Verbose::Presentation fmt)
+{
+    switch (ec)
+    {
+        case klecChangesToLock:     return presentation(fmt, "klecChangesToLock",     "Changes to lock");
+        case klecLostOfSignal:      return presentation(fmt, "klecLostOfSignal",      "Lost of signal");
+        case klecAlarmNotification: return presentation(fmt, "klecAlarmNotification", "Alarm notification");
+        case klecLostOfFrame:       return presentation(fmt, "klecLostOfFrame",       "Lost of frame");
+        case klecLostOfMultiframe:  return presentation(fmt, "klecLostOfMultiframe",  "Lost of multiframe");
+        case klecRemoteAlarm:       return presentation(fmt, "klecRemoteAlarm",       "Remote alarm");
+        case klecUnknowAlarm:       return presentation(fmt, "klecUnknowAlarm",       "Slip alarm");
+        case klecPRBS:              return presentation(fmt, "klecPRBS",              "PRBS");
+        case klecWrogrBits:         return presentation(fmt, "klecWrongBits",         "Wrong bits");
+        case klecJitterVariation:   return presentation(fmt, "klecJitterVariation",   "Jitter variation");
+        case klecFramesWithoutSync: return presentation(fmt, "klecFramesWithoutSync", "Frames without sync");
+        case klecMultiframeSignal:  return presentation(fmt, "klecMultiframeSignal",  "Multiframe Signal");
+        case klecFrameError:        return presentation(fmt, "klecFrameError",        "Frame error");
+        case klecBipolarViolation:  return presentation(fmt, "klecBipolarViolation",  "Bipolar violation");
+        case klecCRC4:              return presentation(fmt, "klecCRC4",              "CRC4 error");
+        case klecCount:             return ""; /* this should never be verbosed */
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[KLinkErrorCounter='%d']") % (int)ec),
+        STG(FMT("Unknown link error counter (%d)") % (int)ec));
+}
+
+std::string Verbose::callStatus(KCallStatus code, Verbose::Presentation fmt)
+{
+    switch (code)
+    {
+        case kcsFree:       return presentation(fmt, "kcsFree",     "Free");
+        case kcsIncoming:   return presentation(fmt, "kcsIncoming", "Incoming");
+        case kcsOutgoing:   return presentation(fmt, "kcsOutgoing", "Outgoing");
+        case kcsFail:       return presentation(fmt, "kcsFail",     "Failure");
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[KCallStatus='%d']") % (int)code),
+        STG(FMT("Unknown call status (%d)") % (int)code));
+}
+
+std::string Verbose::linkStatus(KSignaling sig, int32 code, Verbose::Presentation fmt)
+{
+    switch (sig)
+    {
+        case ksigInactive:
+            return presentation(fmt, "[ksigInactive]", "Inactive trunk");
+
+        case ksigAnalog:
+            return presentation(fmt, "[ksigAnalog]", "Analog trunk");
+
+#if K3L_AT_LEAST(1,4,1)
+        case ksigSIP:
+            return presentation(fmt, "[ksigSIP]", "SIP trunk");
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+        case ksigGSM:
+            return presentation(fmt, "[ksigGSM]", "GSM trunk");
+#endif
+
+#if K3L_EXACT(2,1,0)
+        case ksigFax:
+            return presentation(fmt, "[ksigFax]", "FAX");
+#endif
+        case ksigContinuousEM:
+        case ksigPulsedEM:
+
+        case ksigOpenCAS:
+        case ksigOpenR2:
+        case ksigR2Digital:
+        case ksigUserR2Digital:
+
+#if K3L_AT_LEAST(1,5,1)
+        case ksigOpenCCS:
+        case ksigPRI_EndPoint:
+        case ksigPRI_Network:
+        case ksigPRI_Passive:
+#endif
+#if K3L_AT_LEAST(1,5,3)
+        case ksigLineSide:
+#endif
+#if K3L_AT_LEAST(1,6,0)
+        case ksigAnalogTerminal:
+        case ksigCAS_EL7:
+        case ksigE1LC:
+#endif
+#if K3L_AT_LEAST(2,2,0)
+        case ksigISUP:
+        case ksigISUPPassive:
+#endif
+            if (kesOk == code)
+            {
+                return presentation(fmt, "kesOk", "Up");
+            }
+            else
+            {
+                Strings::Merger strs;
+
+                if (kesSignalLost & code)         strs.add(presentation(fmt, "SignalLost",         "Signal lost"));
+                if (kesNetworkAlarm & code)       strs.add(presentation(fmt, "NetworkAlarm",       "Network alarm"));
+                if (kesFrameSyncLost & code)      strs.add(presentation(fmt, "FrameSyncLost",      "Frame sync lost"));
+                if (kesMultiframeSyncLost & code) strs.add(presentation(fmt, "MultiframeSyncLost", "Multiframe sync lost"));
+                if (kesRemoteAlarm & code)        strs.add(presentation(fmt, "RemoteAlarm",        "Remote alarm"));
+                if (kesHighErrorRate & code)      strs.add(presentation(fmt, "HighErrorRate",      "High error rate"));
+                if (kesUnknownAlarm & code)       strs.add(presentation(fmt, "UnknownAlarm",       "Slip alarm"));
+                if (kesE1Error & code)            strs.add(presentation(fmt, "E1Error",            "E1 error"));
+
+                PRESENTATION_CHECK_RETURN(fmt,
+                    STG(FMT("kes{%s}") % strs.merge(",")),
+                    strs.merge(", "));
+            }
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[%s, linkStatus='%d']") % signaling(sig) % (int)code),
+        STG(FMT("Unknown link status for '%s' (%d)") % signaling(sig) % (int)code));
+}
+
+std::string Verbose::channelStatus(KSignaling sig, int32 flags, Verbose::Presentation fmt)
+{
+    try
+    {
+        switch (sig)
+        {
+            case ksigInactive:
+                return presentation(fmt, "[ksigInactive]", "Inactive channel");
+
+#if K3L_AT_LEAST(1,4,1)
+            case ksigSIP:
+                return presentation(fmt, "[ksigSIP]", "SIP channel");
+#endif
+#if K3L_EXACT(2,1,0)
+            case ksigISUP:
+                return presentation(fmt, "[ksigISUP]", "ISUP trunk");
+            case ksigFax:
+                return presentation(fmt, "[ksigFax]", "FAX");
+#endif
+
+            case ksigAnalog:
+#if K3L_AT_LEAST(1,6,0)
+                switch ((KFXOChannelStatus)flags)
+#else
+                switch ((KFXChannelStatus)flags)
+#endif
+                {
+                    case kfcsDisabled:   return presentation(fmt, "kfcsDisabled", "Disabled");
+                    case kfcsEnabled:    return presentation(fmt, "kfcsEnabled",  "Enabled");
+                }
+
+                throw internal_not_found();
+
+#if K3L_AT_LEAST(1,6,0)
+            case ksigAnalogTerminal:
+                switch ((KFXSChannelStatus)flags)
+                {
+                    case kfxsOnHook:   return presentation(fmt, "kfxsOnHook",  "On Hook");
+                    case kfxsOffHook:  return presentation(fmt, "kfxsOffHook", "Off Hook");
+                    case kfxsRinging:  return presentation(fmt, "kfxsRinging", "Ringing");
+                    case kfxsFail:     return presentation(fmt, "kfxsFail",    "Failure");
+                }
+
+                throw internal_not_found();
+
+            case ksigGSM:
+                switch ((KGsmChannelStatus)flags)
+                {
+                    case kgsmIdle:            return presentation(fmt, "kgsmIdle",           "Idle");
+                    case kgsmCallInProgress:  return presentation(fmt, "kgsmCallInProgress", "Call in progress");
+                    case kgsmSMSInProgress:   return presentation(fmt, "kgsmSMSInProgress",  "SMS in progress");
+                    case kgsmModemError:      return presentation(fmt, "kgsmModemError",     "Modem error");
+                    case kgsmSIMCardError:    return presentation(fmt, "kgsmSIMCardError",   "SIM card error");
+                    case kgsmNetworkError:    return presentation(fmt, "kgsmNetworkError",   "Network error");
+                    case kgsmNotReady:        return presentation(fmt, "kgsmNotReady",       "Initializing");
+                }
+
+                throw internal_not_found();
+#endif
+
+            /* deprecated, but still.. */
+            case ksigPulsedEM:
+            case ksigContinuousEM:
+
+            case ksigOpenCAS:
+            case ksigOpenR2:
+            case ksigR2Digital:
+            case ksigUserR2Digital:
+
+#if K3L_AT_LEAST(1,5,1)
+            case ksigOpenCCS:
+            case ksigPRI_EndPoint:
+            case ksigPRI_Network:
+            case ksigPRI_Passive:
+#endif
+#if K3L_AT_LEAST(1,5,3)
+            case ksigLineSide:
+#endif
+#if K3L_AT_LEAST(1,6,0)
+            case ksigCAS_EL7:
+            case ksigE1LC:
+#endif
+#if K3L_AT_LEAST(2,2,0)
+            case ksigISUP:
+            case ksigISUPPassive:
+#endif
+            {
+                if (flags == kecsFree)
+                {
+                    return presentation(fmt, "kecsFree", "Free");
+                }
+                else
+                {
+                    Strings::Merger strs;
+
+                    if (flags & kecsBusy)
+                        strs.add("Busy");
+
+                    switch (flags & 0x06)
+                    {
+                        case kecsOutgoing:
+                            strs.add("Outgoing");
+                             break;
+                        case kecsIncoming:
+                            strs.add("Incoming");
+                            break;
+                        case kecsLocked:
+                            strs.add("Locked");
+                        default:
+                            break;
+                    }
+
+                    int32 value = (flags & 0xf0);
+
+                    if (kecsOutgoingLock & value)
+                        strs.add(presentation(fmt, "OutgoingLock", "Outgoing Lock"));
+
+                    if (kecsLocalFail & value)
+                        strs.add(presentation(fmt, "LocalFail", "Local Failure"));
+
+                    if (kecsIncomingLock & value)
+                        strs.add(presentation(fmt, "IncomingLock", "Incoming Lock"));
+
+                    if (kecsRemoteLock & value)
+                        strs.add(presentation(fmt, "RemoteLock", "Remote Lock"));
+
+                    PRESENTATION_CHECK_RETURN(fmt,
+                        STG(FMT("kecs{%s}") % strs.merge(",")),
+                        strs.merge(", "));
+                }
+
+                throw internal_not_found();
+            }
+        }
+    }
+    catch (internal_not_found & e)
+    {
+        /* we use this exception to break the control flow */
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[%s, channelStatus='%d']") % signaling(sig) % flags),
+        STG(FMT("Unknown channel status for '%s' (%d)") % signaling(sig) % flags));
+}
+
+std::string Verbose::status(KLibraryStatus code, Verbose::Presentation fmt)
+{
+    switch (code)
+    {
+        case ksSuccess:        return presentation(fmt, "ksSuccess",        "Success");
+        case ksFail:           return presentation(fmt, "ksFail",           "Failure");
+        case ksTimeOut:        return presentation(fmt, "ksTimeOut",        "Time Out");
+        case ksBusy:           return presentation(fmt, "ksBusy",           "Busy");
+        case ksLocked:         return presentation(fmt, "ksLocked",         "Locked");
+        case ksInvalidParams:  return presentation(fmt, "ksInvalidParams",  "Invalid Parameters");
+        case ksEndOfFile:      return presentation(fmt, "ksEndOfFile",      "End of File");
+        case ksInvalidState:   return presentation(fmt, "ksInvalidState",   "Invalid State");
+        case ksServerCommFail: return presentation(fmt, "ksServerCommFail", "Communication Failure");
+        case ksOverflow:       return presentation(fmt, "ksOverflow",       "Overflow");
+        case ksUnderrun:       return presentation(fmt, "ksUnderrun",       "Underrun");
+
+#if K3L_AT_LEAST(1,4,0)
+        case ksNotFound:       return presentation(fmt, "ksNotFound",       "Not Found");
+        case ksNotAvailable:   return presentation(fmt, "ksNotAvaiable",    "Not Available");
+#endif
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[KLibraryStatus='%d']") % (int)code),
+        STG(FMT("Unknown library status (%d)") % (int)code));
+}
+
+std::string Verbose::h100configIndex(KH100ConfigIndex code, Verbose::Presentation fmt)
+{
+    switch (code)
+    {
+        case khciDeviceMode:         return presentation(fmt, "khciDeviceMode",      "Device Mode");
+        case khciMasterGenClock:     return presentation(fmt, "khciMasterGenClock",  "Master Generated Clock");
+        case khciCTNetRefEnable:     return presentation(fmt, "khciCTNetRefEnable",  "CTBus Network Reference Enable");
+        case khciSCbusEnable:        return presentation(fmt, "khciSCbusEnable",     "SCBus Enable");
+        case khciHMVipEnable:        return presentation(fmt, "khciHMVipEnable",     "HMVip Enable");
+        case khciMVip90Enable:       return presentation(fmt, "khciMVip90Enable",    "MVip90 Enable");
+        case khciCTbusDataEnable:    return presentation(fmt, "khciCTbusDataEnable", "CTBus Data Enable");
+        case khciCTbusFreq03_00:     return presentation(fmt, "khciCTbusFreq03_00",  "CTBus Frequency 03 00"); // TODO: find better name
+        case khciCTbusFreq07_04:     return presentation(fmt, "khciCTbusFreq07_04",  "CTBus Frequency 07 04"); // TODO: find better name
+        case khciCTbusFreq11_08:     return presentation(fmt, "khciCTbusFreq11_08",  "CTBus Frequency 11 08"); // TODO: find better name
+        case khciCTbusFreq15_12:     return presentation(fmt, "khciCTbusFreq15_12",  "CTBus Frequency 15 12"); // TODO: find better name
+        case khciMax:                return presentation(fmt, "khciMax",             "Max"); // TODO: find better name
+        case khciMasterDevId:        return presentation(fmt, "khciMasterDevId",     "Master Device Number");
+        case khciSecMasterDevId:     return presentation(fmt, "khciSecMasterDevId",  "Secondary Master Device Number");
+        case khciCtNetrefDevId:      return presentation(fmt, "khciCtNetrefDevId",   "CTBus Network Reference Device Number");
+#if K3L_AT_LEAST(1,6,0)
+        case khciMaxH100ConfigIndex: return ""; /* do not verbose this value */
+#endif
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[KH100ConfigIndex='%d']") % (int)code),
+        STG(FMT("Unknown H.100 config index (%d)") % (int)code));
+}
+
+#if K3L_AT_LEAST(1,6,0)
+std::string Verbose::callStartInfo(KCallStartInfo code, Verbose::Presentation fmt)
+{
+    switch (code)
+    {
+        case kcsiHumanAnswer:         return presentation(fmt, "kcsiHumanAnswer",         "Human Answer");
+        case kcsiAnsweringMachine:    return presentation(fmt, "kcsiAnsweringMachine",    "Answering Machine");
+        case kcsiCellPhoneMessageBox: return presentation(fmt, "kcsiCellPhoneMessageBox", "Cell Phone Message Box");
+        case kcsiCarrierMessage:      return presentation(fmt, "kcsiCarrierMessage",      "Carrier Message");
+        case kcsiUnknown:             return presentation(fmt, "kcsiUnknown",             "Unknown");
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[KCallStartInfo='%d']") % (int)code),
+        STG(FMT("Unknown call answer info (%d)") % (int)code));
+}
+
+std::string Verbose::gsmCallCause(KGsmCallCause code, Verbose::Presentation fmt)
+{
+    try
+    {
+        return internal_gsmCallCause(code, fmt);
+    }
+    catch (internal_not_found & e)
+    {
+        PRESENTATION_CHECK_RETURN(fmt,
+            STG(FMT("[KGsmCallCause='%d']") % (int)code),
+            STG(FMT("Unknown GSM call cause (%d)") % (int)code));
+    }
+}
+
+std::string Verbose::internal_gsmCallCause(KGsmCallCause code, Verbose::Presentation fmt)
+{
+    switch (code)
+    {
+        case kgccNone:                               return presentation(fmt, "kgccNone",                      "None");
+        case kgccUnallocatedNumber:                  return presentation(fmt, "kgccUnallocatedNumber",         "Unallocated number");
+        case kgccNoRouteToDest:                      return presentation(fmt, "kgccNoRouteToDest",             "No route to destination");
+        case kgccChannelUnacceptable:                return presentation(fmt, "kgccChannelUnacceptable",       "Channel unacceptable");
+        case kgccOperatorDeterminedBarring:          return presentation(fmt, "kgccOperatorDeterminedBarring", "Operator determined barring");
+        case kgccNormalCallClear:                    return presentation(fmt, "kgccNormalCallClear",           "Normal call clear");
+        case kgccUserBusy:                           return presentation(fmt, "kgccUserBusy",                  "User busy");
+        case kgccNoUserResponding:                   return presentation(fmt, "kgccNoUserResponding",          "No user responding");
+        case kgccNoAnswerFromUser:                   return presentation(fmt, "kgccNoAnswerFromUser",          "No answer from user");
+        case kgccCallRejected:                       return presentation(fmt, "kgccCallRejected",              "Call rejected");
+        case kgccNumberChanged:                      return presentation(fmt, "kgccNumberChanged",             "Number changed");
+        case kgccNonSelectedUserClear:               return presentation(fmt, "kgccNonSelectedUserClear",      "Non Selected user clear");
+        case kgccDestinationOutOfOrder:              return presentation(fmt, "kgccDestinationOutOfOrder",     "Destination out of order");
+        case kgccInvalidNumberFormat:                return presentation(fmt, "kgccInvalidNumberFormat",       "Invalid number format");
+        case kgccFacilityRejected:                   return presentation(fmt, "kgccFacilityRejected",          "Facility rejected");
+        case kgccRespStatusEnquiry:                  return presentation(fmt, "kgccRespStatusEnquiry",         "Response status enquiry");
+        case kgccNormalUnspecified:                  return presentation(fmt, "kgccNormalUnspecified",         "Normal, unspecified");
+        case kgccNoCircuitChannelAvail:              return presentation(fmt, "kgccNoCircuitChannelAvail",     "No circuit channel available");
+        case kgccNetworkOutOfOrder:                  return presentation(fmt, "kgccNetworkOutOfOrder",         "Network out of order");
+        case kgccTemporaryFailure:                   return presentation(fmt, "kgccTemporaryFailure",          "Temporary failure");
+        case kgccSwitchCongestion:                   return presentation(fmt, "kgccSwitchCongestion",          "Switch congestion");
+        case kgccAccessInfoDiscarded:                return presentation(fmt, "kgccAccessInfoDiscarded",       "Access information discarded");
+        case kgccRequestedChannelUnav:               return presentation(fmt, "kgccRequestedChannelUnav",      "Requested channel unavailable");
+        case kgccResourceUnavailable:                return presentation(fmt, "kgccResourceUnavailable",       "Resource unavailable");
+        case kgccQosUnavailable:                     return presentation(fmt, "kgccQosUnavailable",            "QoS unavailable");
+        case kgccReqFacilityNotSubsc:                return presentation(fmt, "kgccReqFacilityNotSubsc",       "Request facility not subscribed");
+        case kgccCallBarredWitchCUG:                 return presentation(fmt, "kgccCallBarredWitchCUG",        "Call barred with UG");
+        case kgccBearerCapabNotAuthor:               return presentation(fmt, "kgccBearerCapabNotAuthor",      "Bearer capability not authorized");
+        case kgccBearerCapabNotAvail:                return presentation(fmt, "kgccBearerCapabNotAvail",       "Bearer capability not available");
+        case kgccServiceNotAvailable:                return presentation(fmt, "kgccServiceNotAvailable",       "Service not available");
+        case kgccBcNotImplemented:                   return presentation(fmt, "kgccBcNotImplemented",          "Bearer capability not implemented");
+        case kgccReqFacilityNotImplem:               return presentation(fmt, "kgccReqFacilityNotImplem",      "Request facility not implemented");
+        case kgccOnlyRestrictedBcAvail:              return presentation(fmt, "kgccOnlyRestrictedBcAvail",     "Only restricted bearer capability available");
+        case kgccServiceNotImplemented:              return presentation(fmt, "kgccServiceNotImplemented",     "Service not implemented");
+        case kgccInvalidCrv:                         return presentation(fmt, "kgccInvalidCrv",                "Invalid call reference value");
+        case kgccUserNotMemberOfCUG:                 return presentation(fmt, "kgccUserNotMemberOfCUG",        "User not member of UG");
+        case kgccIncompatibleDestination:            return presentation(fmt, "kgccIncompatibleDestination",   "Incompatible destination");
+        case kgccInvalidTransitNetSel:               return presentation(fmt, "kgccInvalidTransitNetSel",      "Invalid transit network selected");
+        case kgccInvalidMessage:                     return presentation(fmt, "kgccInvalidMessage",            "Invalid message");
+        case kgccMissingMandatoryIe:                 return presentation(fmt, "kgccMissingMandatoryIe",        "Missing mandatory information element");
+        case kgccMsgTypeNotImplemented:              return presentation(fmt, "kgccMsgTypeNotImplemented",     "Message type not implemented");
+        case kgccMsgIncompatWithState:               return presentation(fmt, "kgccMsgIncompatWithState",      "Message incompatible with state");
+        case kgccIeNotImplemented:                   return presentation(fmt, "kgccIeNotImplemented",          "Information element not implemented");
+        case kgccInvalidIe:                          return presentation(fmt, "kgccInvalidIe",                 "Invalid information element");
+        case kgccMsgIncompatWithState2:              return presentation(fmt, "kgccMsgIncompatWithState2",     "Message incompatible with state (2)");
+        case kgccRecoveryOnTimerExpiry:              return presentation(fmt, "kgccRecoveryOnTimerExpiry",     "Recovery on timer expiry");
+        case kgccProtocolError:                      return presentation(fmt, "kgccProtocolError",             "Protocol error");
+        case kgccInterworking:                       return presentation(fmt, "kgccInterworking",              "Interworking");
+    }
+
+    throw internal_not_found();
+}
+
+std::string Verbose::gsmMobileCause(KGsmMobileCause code, Verbose::Presentation fmt)
+{
+    try
+    {
+        return internal_gsmMobileCause(code, fmt);
+    }
+    catch (internal_not_found & e)
+    {
+        PRESENTATION_CHECK_RETURN(fmt,
+            STG(FMT("[KGsmMobileCause='%d']") % (int)code),
+            STG(FMT("Unknown GSM mobile cause (%d)") % (int)code));
+    }
+}
+
+std::string Verbose::internal_gsmMobileCause(KGsmMobileCause code, Verbose::Presentation fmt)
+{
+    switch (code)
+    {
+        case kgmcPhoneFailure:                    return presentation(fmt, "kgmcPhoneFailure",               "Phone failure");
+        case kgmcNoConnectionToPhone:             return presentation(fmt, "kgmcNoConnectionToPhone",        "No connection to phone");
+        case kgmcPhoneAdaptorLinkReserved:        return presentation(fmt, "kgmcPhoneAdaptorLinkReserved",   "Phone adaptor link reserved");
+#if 0 /* this changed during K3L 1.6.0 development cycle... */
+        case kgmcCoperationNotAllowed:            return presentation(fmt, "kgmcCoperationNotAllowed",       "");
+        case kgmcCoperationNotSupported:          return presentation(fmt, "kgmcCoperationNotSupported",     "");
+#else
+        case kgmcOperationNotAllowed:             return presentation(fmt, "kgmcOperationNotAllowed",        "Operation not allowed");
+        case kgmcOperationNotSupported:           return presentation(fmt, "kgmcOperationNotSupported",      "Operation not supported");
+#endif
+        case kgmcPH_SIMPINRequired:               return presentation(fmt, "kgmcPH_SIMPINRequired",          "Phone SIM PIN required");
+        case kgmcPH_FSIMPINRequired:              return presentation(fmt, "kgmcPH_FSIMPINRequired",         "Phone FSIM PIN required");
+        case kgmcPH_FSIMPUKRequired:              return presentation(fmt, "kgmcPH_FSIMPUKRequired",         "Phone FSIM PUK required");
+        case kgmcSIMNotInserted:                  return presentation(fmt, "kgmcSIMNotInserted",             "SIM not inserted");
+        case kgmcSIMPINRequired:                  return presentation(fmt, "kgmcSIMPINRequired",             "SIM PIN required");
+        case kgmcSIMPUKRequired:                  return presentation(fmt, "kgmcSIMPUKRequired",             "SIM PUK required");
+        case kgmcSIMFailure:                      return presentation(fmt, "kgmcSIMFailure",                 "SIM failure");
+        case kgmcSIMBusy:                         return presentation(fmt, "kgmcSIMBusy",                    "SIM busy");
+        case kgmcSIMWrong:                        return presentation(fmt, "kgmcSIMWrong",                   "SIM wrong");
+        case kgmcIncorrectPassword:               return presentation(fmt, "kgmcIncorrectPassword",          "Incorrect password");
+        case kgmcSIMPIN2Required:                 return presentation(fmt, "kgmcSIMPIN2Required",            "SIM PIN2 required");
+        case kgmcSIMPUK2Required:                 return presentation(fmt, "kgmcSIMPUK2Required",            "SIM PUK2 required");
+        case kgmcMemoryFull:                      return presentation(fmt, "kgmcMemoryFull",                 "Memory full");
+        case kgmcInvalidIndex:                    return presentation(fmt, "kgmcInvalidIndex",               "Invalid index");
+        case kgmcNotFound:                        return presentation(fmt, "kgmcNotFound",                   "Not found");
+        case kgmcMemoryFailure:                   return presentation(fmt, "kgmcMemoryFailure",              "Memory failure");
+        case kgmcTextStringTooLong:               return presentation(fmt, "kgmcTextStringTooLong",          "Text string too long");
+        case kgmcInvalidCharInTextString:         return presentation(fmt, "kgmcInvalidCharInTextString",    "Invalid character in text string");
+        case kgmcDialStringTooLong:               return presentation(fmt, "kgmcDialStringTooLong",          "Dial string too long");
+        case kgmcInvalidCharInDialString:         return presentation(fmt, "kgmcInvalidCharInDialString",    "Invalid character in dial string");
+        case kgmcNoNetworkService:                return presentation(fmt, "kgmcNoNetworkService",           "No network service");
+        case kgmcNetworkTimeout:                  return presentation(fmt, "kgmcNetworkTimeout",             "Network timeout");
+        case kgmcNetworkNotAllowed:               return presentation(fmt, "kgmcNetworkNotAllowed",          "Network not allowed");
+        case kgmcCommandAborted:                  return presentation(fmt, "kgmcCommandAborted",             "Command aborted");
+        case kgmcNumParamInsteadTextParam:        return presentation(fmt, "kgmcNumParamInsteadTextParam",   "Number parameter instead of text parameter");
+        case kgmcTextParamInsteadNumParam:        return presentation(fmt, "kgmcTextParamInsteadNumParam",   "Text parameter instead of number parameter");
+        case kgmcNumericParamOutOfBounds:         return presentation(fmt, "kgmcNumericParamOutOfBounds",    "Numeric parameter out of bounds");
+        case kgmcTextStringTooShort:              return presentation(fmt, "kgmcTextStringTooShort",         "Text string too short");
+        case kgmcNetworkPINRequired:              return presentation(fmt, "kgmcNetworkPINRequired",         "Network PIN required");
+        case kgmcNetworkPUKRequired:              return presentation(fmt, "kgmcNetworkPUKRequired",         "Network PUK required");
+        case kgmcNetworkSubsetPINRequired:        return presentation(fmt, "kgmcNetworkSubsetPINRequired",   "Network subset PIN required");
+        case kgmcNetworkSubnetPUKRequired:        return presentation(fmt, "kgmcNetworkSubnetPUKRequired",   "Network subset PUK required");
+        case kgmcServiceProviderPINRequired:      return presentation(fmt, "kgmcServiceProviderPINRequired", "Network service provider PIN required");
+        case kgmcServiceProviderPUKRequired:      return presentation(fmt, "kgmcServiceProviderPUKRequired", "Network service provider PUK required");
+        case kgmcCorporatePINRequired:            return presentation(fmt, "kgmcCorporatePINRequired",       "Corporate PIN required");
+        case kgmcCorporatePUKRequired:            return presentation(fmt, "kgmcCorporatePUKRequired",       "Corporate PUK required");
+        case kgmcSIMServiceOptNotSupported:       return presentation(fmt, "kgmcSIMServiceOptNotSupported",  "SIM Service option not supported");
+        case kgmcUnknown:                         return presentation(fmt, "kgmcUnknown",                    "Unknown");
+        case kgmcIllegalMS_N3:                    return presentation(fmt, "kgmcIllegalMS_N3",               "Illegal MS #3");
+        case kgmcIllegalME_N6:                    return presentation(fmt, "kgmcIllegalME_N6",               "Illegal MS #6");
+        case kgmcGPRSServicesNotAllowed_N7:       return presentation(fmt, "kgmcGPRSServicesNotAllowed_N7",  "GPRS service not allowed #7");
+        case kgmcPLMNNotAllowed_No11:             return presentation(fmt, "kgmcPLMNNotAllowed_No11",        "PLMN not allowed #11");
+        case kgmcLocationAreaNotAllowed_N12:      return presentation(fmt, "kgmcLocationAreaNotAllowed_N12", "Location area not allowed #12");
+        case kgmcRoamingNotAllowed_N13:           return presentation(fmt, "kgmcRoamingNotAllowed_N13",      "Roaming not allowed #13");
+        case kgmcServiceOptNotSupported_N32:      return presentation(fmt, "kgmcServiceOptNotSupported_N32", "Service option not supported #32");
+        case kgmcReqServOptNotSubscribed_N33:     return presentation(fmt, "kgmcReqServOptNotSubscribed_N33", "Registration service option not subscribed #33");
+        case kgmcServOptTempOutOfOrder_N34:       return presentation(fmt, "kgmcServOptTempOutOfOrder_N34",   "Service option temporary out of order #34");
+        case kgmcLongContextActivation:           return presentation(fmt, "kgmcLongContextActivation",       "Long context activation");
+        case kgmcUnspecifiedGPRSError:            return presentation(fmt, "kgmcUnspecifiedGPRSError",        "Unspecified GPRS error");
+        case kgmcPDPAuthenticationFailure:        return presentation(fmt, "kgmcPDPAuthenticationFailure",    "PDP authentication failure");
+        case kgmcInvalidMobileClass:              return presentation(fmt, "kgmcInvalidMobileClass",          "Invalid mobile class");
+        case kgmcGPRSDisconnectionTmrActive:      return presentation(fmt, "kgmcGPRSDisconnectionTmrActive",  "GPRS disconnection TMR active");
+        case kgmcTooManyActiveCalls:              return presentation(fmt, "kgmcTooManyActiveCalls",          "Too many active calls");
+        case kgmcCallRejected:                    return presentation(fmt, "kgmcCallRejected",                "Call rejected");
+        case kgmcUnansweredCallPending:           return presentation(fmt, "kgmcUnansweredCallPending",       "Unanswered call pending");
+        case kgmcUnknownCallingError:             return presentation(fmt, "kgmcUnknownCallingError",         "Unknown calling error");
+        case kgmcNoPhoneNumRecognized:            return presentation(fmt, "kgmcNoPhoneNumRecognized",        "No phone number recognized");
+        case kgmcCallStateNotIdle:                return presentation(fmt, "kgmcCallStateNotIdle",            "Call state not idle");
+        case kgmcCallInProgress:                  return presentation(fmt, "kgmcCallInProgress",              "Call in progress");
+        case kgmcDialStateError:                  return presentation(fmt, "kgmcDialStateError",              "Dial state error");
+        case kgmcUnlockCodeRequired:              return presentation(fmt, "kgmcUnlockCodeRequired",          "Unlock code required");
+        case kgmcNetworkBusy:                     return presentation(fmt, "kgmcNetworkBusy",                 "Network busy");
+        case kgmcInvalidPhoneNumber:              return presentation(fmt, "kgmcInvalidPhoneNumber",          "Invalid phone number");
+        case kgmcNumberEntryAlreadyStarted:       return presentation(fmt, "kgmcNumberEntryAlreadyStarted",   "Number entry already started");
+        case kgmcCancelledByUser:                 return presentation(fmt, "kgmcCancelledByUser",             "Cancelled by user");
+        case kgmcNumEntryCouldNotBeStarted:       return presentation(fmt, "kgmcNumEntryCouldNotBeStarted",   "Number entry could not be started");
+        case kgmcDataLost:                        return presentation(fmt, "kgmcDataLost",                    "Data lost");
+        case kgmcInvalidBessageBodyLength:        return presentation(fmt, "kgmcInvalidBessageBodyLength",    "Invalid message body length");
+        case kgmcInactiveSocket:                  return presentation(fmt, "kgmcInactiveSocket",              "Inactive socket");
+        case kgmcSocketAlreadyOpen:               return presentation(fmt, "kgmcSocketAlreadyOpen",           "Socket already open");
+#if K3L_AT_LEAST(2,1,0)
+        case kgmcSuccess:                         return presentation(fmt, "kgmcSuccess",                     "Success");
+#endif
+    }
+
+    throw internal_not_found();
+}
+
+std::string Verbose::gsmSmsCause(KGsmSmsCause code, Verbose::Presentation fmt)
+{
+    try
+    {
+        return internal_gsmSmsCause(code, fmt);
+    }
+    catch (internal_not_found & e)
+    {
+        PRESENTATION_CHECK_RETURN(fmt,
+            STG(FMT("[KGsmSmsCause='%d']") % (int)code),
+            STG(FMT("Unknown GSM SMS cause (%d)") % (int)code));
+    }
+}
+
+std::string Verbose::internal_gsmSmsCause(KGsmSmsCause code, Verbose::Presentation fmt)
+{
+    switch (code)
+    {
+#if K3L_AT_LEAST(2,1,0)
+        case kgscNone:                           return presentation(fmt, "kgscNone",                         "None");
+#endif
+        case kgscUnassigned:                     return presentation(fmt, "kgscUnassigned",                   "Unassigned number");
+        case kgscOperatorDeterminedBarring:      return presentation(fmt, "kgscOperatorDeterminedBarring",    "Operator determined barring");
+        case kgscCallBarred:                     return presentation(fmt, "kgscCallBarred",                   "Call barred");
+        case kgscSMSTransferRejected:            return presentation(fmt, "kgscSMSTransferRejected",          "SMS transfer rejected");
+        case kgscDestinationOutOfService:        return presentation(fmt, "kgscDestinationOutOfService",      "Destination out of service");
+        case kgscUnidentifiedSubscriber:         return presentation(fmt, "kgscUnidentifiedSubscriber",       "Unidentified subscriber");
+        case kgscFacilityRejected:               return presentation(fmt, "kgscFacilityRejected",             "Facility rejected");
+        case kgscUnknownSubscriber:              return presentation(fmt, "kgscUnknownSubscriber",            "Unknown subscriber");
+        case kgscNetworkOutOfOrder:              return presentation(fmt, "kgscNetworkOutOfOrder",            "Network out of order");
+        case kgscTemporaryFailure:               return presentation(fmt, "kgscTemporaryFailure",             "Temporary failure");
+        case kgscCongestion:                     return presentation(fmt, "kgscCongestion",                   "Congestion");
+        case kgscResourcesUnavailable:           return presentation(fmt, "kgscResourcesUnavailable",         "Resources unavailable");
+        case kgscFacilityNotSubscribed:          return presentation(fmt, "kgscFacilityNotSubscribed",        "Facility not subscribed");
+        case kgscFacilityNotImplemented:         return presentation(fmt, "kgscFacilityNotImplemented",       "Facility not implemented");
+        case kgscInvalidSMSTransferRefValue:     return presentation(fmt, "kgscInvalidSMSTransferRefValue",   "Invalid SMS transfer reference value");
+        case kgscInvalidMessage:                 return presentation(fmt, "kgscInvalidMessage",               "Invalid message");
+        case kgscInvalidMandatoryInformation:    return presentation(fmt, "kgscInvalidMandatoryInformation",  "Invalid mandatory information");
+        case kgscMessageTypeNonExistent:         return presentation(fmt, "kgscMessageTypeNonExistent",       "Message type non existent");
+        case kgscMsgNotCompatWithSMProtState:    return presentation(fmt, "kgscMsgNotCompatWithSMProtState",  "Message not compatible with SMS protection state");
+        case kgscInformationElementNonExiste:    return presentation(fmt, "kgscInformationElementNonExiste",  "Information element non existent");
+        case kgscProtocolError:                  return presentation(fmt, "kgscProtocolError",                "Protocol error");
+        case kgscInterworking:                   return presentation(fmt, "kgscInterworking",                 "Interworking");
+        case kgscTelematicInterworkingNotSup:    return presentation(fmt, "kgscTelematicInterworkingNotSup",  "Telematic interworking not supported");
+        case kgscSMSTypeZeroNotSupported:        return presentation(fmt, "kgscSMSTypeZeroNotSupported",      "SMS type zero not supported");
+        case kgscCannotReplaceSMS:               return presentation(fmt, "kgscCannotReplaceSMS",             "Cannot replace SMS");
+        case kgscUnspecifiedTPPIDError:          return presentation(fmt, "kgscUnspecifiedTPPIDError",        "Unspecified TPPID error");
+        case kgscAlphabetNotSupported:           return presentation(fmt, "kgscAlphabetNotSupported",         "Alphabet not supported");
+        case kgscMessageClassNotSupported:       return presentation(fmt, "kgscMessageClassNotSupported",     "Message class not supported");
+        case kgscUnspecifiedTPDCSError:          return presentation(fmt, "kgscUnspecifiedTPDCSError",        "Unspecified TPDCS error");
+        case kgscCommandCannotBeActioned:        return presentation(fmt, "kgscCommandCannotBeActioned",      "Command cannot be actioned");
+        case kgscCommandUnsupported:             return presentation(fmt, "kgscCommandUnsupported",           "Command unsupported");
+        case kgscUnspecifiedTPCommandError:      return presentation(fmt, "kgscUnspecifiedTPCommandError",    "Unspecified TP command error");
+        case kgscTPDUNotSupported:               return presentation(fmt, "kgscTPDUNotSupported",             "TPDU not supported");
+        case kgscSCBusy:                         return presentation(fmt, "kgscSCBusy",                       "SC busy");
+        case kgscNoSCSubscription:               return presentation(fmt, "kgscNoSCSubscription",             "No SC subscription");
+        case kgscSCSystemFailure:                return presentation(fmt, "kgscSCSystemFailure",              "SC system failure");
+        case kgscInvalidSMEAddress:              return presentation(fmt, "kgscInvalidSMEAddress",            "Invalid SME address");
+        case kgscDestinationSMEBarred:           return presentation(fmt, "kgscDestinationSMEBarred",         "Destination SME barred");
+        case kgscSMRejectedDuplicateSM:          return presentation(fmt, "kgscSMRejectedDuplicateSM",        "SM rejected duplicate SM");
+        case kgscTPVPFNotSupported:              return presentation(fmt, "kgscTPVPFNotSupported",            "TPVPF not supported");
+        case kgscTPVPNotSupported:               return presentation(fmt, "kgscTPVPNotSupported",             "TPVP not supported");
+        case kgscSIMSMSStorageFull:              return presentation(fmt, "kgscSIMSMSStorageFull",            "SIM SMS storage full");
+        case kgscNoSMSStorageCapabilityInSIM:    return presentation(fmt, "kgscNoSMSStorageCapabilityInSIM",  "No SMS storage capability in SIM");
+        case kgscErrorInMS:                      return presentation(fmt, "kgscErrorInMS",                    "Error in SMS");
+        case kgscMemoryCapacityExceeded:         return presentation(fmt, "kgscMemoryCapacityExceeded",       "Memory capatity exceeded");
+        case kgscSIMDataDownloadError:           return presentation(fmt, "kgscSIMDataDownloadError",         "SIM data download error");
+        case kgscUnspecifiedError:               return presentation(fmt, "kgscUnspecifiedError",             "Unspecified error");
+        case kgscPhoneFailure:                   return presentation(fmt, "kgscPhoneFailure",                 "Phone failure");
+        case kgscSmsServiceReserved:             return presentation(fmt, "kgscSmsServiceReserved",           "SMS service reserved");
+        case kgscOperationNotAllowed:            return presentation(fmt, "kgscOperationNotAllowed",          "Operation not allowed");
+        case kgscOperationNotSupported:          return presentation(fmt, "kgscOperationNotSupported",        "Operation not supported");
+        case kgscInvalidPDUModeParameter:        return presentation(fmt, "kgscInvalidPDUModeParameter",      "Invalid PDU mode parameter");
+        case kgscInvalidTextModeParameter:       return presentation(fmt, "kgscInvalidTextModeParameter",     "Invalid text mode parameter");
+        case kgscSIMNotInserted:                 return presentation(fmt, "kgscSIMNotInserted",               "SIM not inserted");
+        case kgscSIMPINNecessary:                return presentation(fmt, "kgscSIMPINNecessary",              "SIM PIN necessary");
+        case kgscPH_SIMPINNecessary:             return presentation(fmt, "kgscPH_SIMPINNecessary",           "Phone SIM PIN necessary");
+        case kgscSIMFailure:                     return presentation(fmt, "kgscSIMFailure",                   "SIM failure");
+        case kgscSIMBusy:                        return presentation(fmt, "kgscSIMBusy",                      "SIM busy");
+        case kgscSIMWrong:                       return presentation(fmt, "kgscSIMWrong",                     "SIM wrong");
+        case kgscMemoryFailure:                  return presentation(fmt, "kgscMemoryFailure",                "Memory failure");
+        case kgscInvalidMemoryIndex:             return presentation(fmt, "kgscInvalidMemoryIndex",           "Invalid memory index");
+        case kgscMemoryFull:                     return presentation(fmt, "kgscMemoryFull",                   "Memory full");
+        case kgscSMSCAddressUnknown:             return presentation(fmt, "kgscSMSCAddressUnknown",           "SMSC address unknown");
+        case kgscNoNetworkService:               return presentation(fmt, "kgscNoNetworkService",             "No network service");
+        case kgscNetworkTimeout:                 return presentation(fmt, "kgscNetworkTimeout",               "Network timeout");
+        case kgscUnknownError:                   return presentation(fmt, "kgscUnknownError",                 "Unknown error");
+        case kgscNetworkBusy:                    return presentation(fmt, "kgscNetworkBusy",                  "Network busy");
+        case kgscInvalidDestinationAddress:      return presentation(fmt, "kgscInvalidDestinationAddress",    "Invalid destination address");
+        case kgscInvalidMessageBodyLength:       return presentation(fmt, "kgscInvalidMessageBodyLength",     "Invalid message body length");
+        case kgscPhoneIsNotInService:            return presentation(fmt, "kgscPhoneIsNotInService",          "Phone is not in service");
+        case kgscInvalidPreferredMemStorage:     return presentation(fmt, "kgscInvalidPreferredMemStorage",   "Invalid preferred memory storage");
+        case kgscUserTerminated:                 return presentation(fmt, "kgscUserTerminated",               "User terminated");
+    }
+
+    throw internal_not_found();
+}
+
+std::string Verbose::q931ProgressIndication(KQ931ProgressIndication code, Verbose::Presentation fmt)
+{
+    try
+    {
+        return internal_q931ProgressIndication(code);
+    }
+    catch (internal_not_found & e)
+    {
+        PRESENTATION_CHECK_RETURN(fmt,
+            STG(FMT("[KQ931ProgressIndication='%d']") % (int)code),
+            STG(FMT("Unknown Q931 progress indication (%d)") % (int)code));
+    }
+}
+
+std::string Verbose::internal_q931ProgressIndication(KQ931ProgressIndication code, Verbose::Presentation fmt)
+{
+    switch (code)
+    {
+        case kq931pTonesMaybeAvailable:     return presentation(fmt, "kq931pTonesMaybeAvailable",  "Tones may be available");
+        case kq931pDestinationIsNonIsdn:    return presentation(fmt, "kq931pDestinationIsNonIsdn", "Destination is not ISDN");
+        case kq931pOriginationIsNonIsdn:    return presentation(fmt, "kq931pOriginationIsNonIsdn", "Origination is not ISDN");
+        case kq931pCallReturnedToIsdn:      return presentation(fmt, "kq931pCallReturnedToIsdn",   "Call returned to ISDN");
+        case kq931pTonesAvailable:          return presentation(fmt, "kq931pTonesAvailable",       "Tones available");
+    }
+
+    throw internal_not_found();
+}
+
+#endif /* K3L_AT_LEAST(1,6,0) */
+
+
+
+
+#if K3L_AT_LEAST(2,1,0)
+std::string Verbose::faxResult(KFaxResult code, Verbose::Presentation fmt)
+{
+    switch (code)
+    {
+        case kfaxrEndOfTransmission:    return presentation(fmt, "kfaxrEndOfTransmission", "EndOfTransmission");
+        case kfaxrStoppedByCommand:     return presentation(fmt, "kfaxrStoppedByCommand", "StoppedByCommand");
+        case kfaxrProtocolTimeout:      return presentation(fmt, "kfaxrProtocolTimeout", "ProtocolTimeout");
+        case kfaxrProtocolError:        return presentation(fmt, "kfaxrProtocolError", "ProtocolError");
+        case kfaxrRemoteDisconnection:  return presentation(fmt, "kfaxrRemoteDisconnection", "RemoteDisconnection");
+        case kfaxrFileError:            return presentation(fmt, "kfaxrFileError", "FileError");
+        case kfaxrUnknown:              return presentation(fmt, "kfaxrUnknown", "Unknown");
+        case kfaxrEndOfReception:       return presentation(fmt, "kfaxrEndOfReception", "EndOfReception");
+        case kfaxrCompatibilityError:   return presentation(fmt, "kfaxrCompatibilityError", "CompatibilityError");
+        case kfaxrQualityError:         return presentation(fmt, "kfaxrQualityError", "QualityError");
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[KFaxResult='%d']") % (int)code),
+        STG(FMT("Unknown fax result (%d)") % (int)code));
+}
+
+std::string Verbose::faxFileErrorCause(KFaxFileErrorCause code, Verbose::Presentation fmt)
+{
+    switch (code)
+    {
+        case kfaxfecTransmissionStopped:       return presentation(fmt, "kfaxfecTransmissionStopped", "TransmissionStopped");
+        case kfaxfecTransmissionError:          return presentation(fmt, "kfaxfecTransmissionError", "TransmissionError");
+        case kfaxfecListCleared:                return presentation(fmt, "kfaxfecListCleared", "ListCleared");
+        case kfaxfecCouldNotOpen:               return presentation(fmt, "kfaxfecCouldNotOpen", "CouldNotOpen");
+        case kfaxfecInvalidHeader:              return presentation(fmt, "kfaxfecInvalidHeader", "InvalidHeader");
+        case kfaxfecDataNotFound:               return presentation(fmt, "kfaxfecDataNotFound", "DataNotFound");
+        case kfaxfecInvalidHeight:              return presentation(fmt, "kfaxfecInvalidHeight", "InvalidHeight");
+        case kfaxfecUnsupportedWidth:           return presentation(fmt, "kfaxfecUnsupportedWidth", "UnsupportedWidth");
+        case kfaxfecUnsupportedCompression:     return presentation(fmt, "kfaxfecUnsupportedCompression", "UnsupportedCompression");
+        case kfaxfecUnsupportedRowsPerStrip:    return presentation(fmt, "kfaxfecUnsupportedRowsPerStrip", "UnsupportedRowsPerStrip");
+        case kfaxfecUnknown:                    return presentation(fmt, "kfaxfecUnknown", "Unknown");
+    }
+
+    PRESENTATION_CHECK_RETURN(fmt,
+        STG(FMT("[KFaxFileErrorCause='%d']") % (int)code),
+        STG(FMT("Unknown fax file error cause (%d)") % (int)code));
+}
+
+#endif
+
+
+/********/
+
+std::string Verbose::commandName(int32 code)
+{
+    switch ((kcommand)code)
+    {
+        case K_CM_SEIZE:                    return "CM_SEIZE";
+        case K_CM_SYNC_SEIZE:               return "CM_SYNC_SEIZE";
+        case K_CM_DIAL_DTMF:                return "CM_DIAL_DTMF";
+#if K3L_AT_LEAST(1,6,0)
+        case K_CM_SIP_REGISTER:             return "CM_SIP_REGISTER";
+#endif
+        case K_CM_DISCONNECT:               return "CM_DISCONNECT";
+        case K_CM_CONNECT:                  return "CM_CONNECT";
+        case K_CM_PRE_CONNECT:              return "CM_PRE_CONNECT";
+        case K_CM_CAS_CHANGE_LINE_STT:      return "CM_CAS_CHANGE_LINE_STT";
+        case K_CM_CAS_SEND_MFC:             return "CM_CAS_SEND_MFC";
+        case K_CM_SET_FORWARD_CHANNEL:      return "CM_SET_FORWARD_CHANNEL";
+        case K_CM_CAS_SET_MFC_DETECT_MODE:  return "CM_CAS_SET_MFC_DETECT_MODE";
+        case K_CM_DROP_COLLECT_CALL:        return "CM_DROP_COLLECT_CALL";
+
+#if K3L_AT_LEAST(1,5,0)
+        case K_CM_MAKE_CALL:                return "CM_MAKE_CALL";
+#endif
+
+#if K3L_AT_LEAST(1,4,0)
+        case K_CM_RINGBACK:                 return "CM_RINGBACK";
+#endif
+
+#if K3L_AT_LEAST(1,5,1)
+        case K_CM_USER_INFORMATION:         return "CM_USER_INFORMATION";
+#endif
+
+#if K3L_AT_LEAST(1,4,0) && !K3L_AT_LEAST(2,2,0)
+        case K_CM_VOIP_SEIZE:               return "CM_VOIP_SEIZE";
+
+#if !K3L_AT_LEAST(2,0,0)
+        /* internal commands */
+        case K_CM_VOIP_START_DEBUG:         return "CM_VOIP_START_DEBUG";
+        case K_CM_VOIP_STOP_DEBUG:          return "CM_VOIP_STOP_DEBUG";
+        case K_CM_VOIP_DUMP_STAT:           return "CM_VOIP_DUMP_STAT";
+#endif
+#endif
+
+#if K3L_AT_LEAST(1,5,2) && !K3L_AT_LEAST(2,0,0)
+        /* internal command */
+        case K_CM_ISDN_DEBUG:               return "CM_ISDN_DEBUG";
+#endif
+
+        case K_CM_LOCK_INCOMING:            return "CM_LOCK_INCOMING";
+        case K_CM_UNLOCK_INCOMING:          return "CM_UNLOCK_INCOMING";
+        case K_CM_LOCK_OUTGOING:            return "CM_LOCK_OUTGOING";
+        case K_CM_UNLOCK_OUTGOING:          return "CM_UNLOCK_OUTGOING";
+
+        case K_CM_START_SEND_FAIL:          return "CM_START_SEND_FAIL";
+        case K_CM_STOP_SEND_FAIL:           return "CM_STOP_SEND_FAIL";
+
+#if K3L_AT_LEAST(1,5,3)
+        case K_CM_END_OF_NUMBER:            return "CM_END_OF_NUMBER";
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_CM_SS_TRANSFER:              return "CM_SS_TRANSFER";
+        case K_CM_GET_SMS:                  return "CM_GET_SMS";
+        case K_CM_PREPARE_SMS:              return "CM_PREPARE_SMS";
+        case K_CM_SEND_SMS:                 return "CM_SEND_SMS";
+#endif
+#if K3L_HAS_MPTY_SUPPORT
+        case K_CM_HOLD_SWITCH:              return "CM_HOLD_SWITCH";
+        case K_CM_MPTY_CONF:                return "CM_MPTY_CONF";
+        case K_CM_MPTY_SPLIT:               return "CM_MPTY_SPLIT";
+#endif
+
+        case K_CM_ENABLE_DTMF_SUPPRESSION:  return "CM_ENABLE_DTMF_SUPPRESSION";
+        case K_CM_DISABLE_DTMF_SUPPRESSION: return "CM_DISABLE_DTMF_SUPPRESSION";
+        case K_CM_ENABLE_AUDIO_EVENTS:      return "CM_ENABLE_AUDIO_EVENTS";
+        case K_CM_DISABLE_AUDIO_EVENTS:     return "CM_DISABLE_AUDIO_EVENTS";
+        case K_CM_ENABLE_CALL_PROGRESS:     return "CM_ENABLE_CALL_PROGRESS";
+        case K_CM_DISABLE_CALL_PROGRESS:    return "CM_DISABLE_CALL_PROGRESS";
+        case K_CM_FLASH:                    return "CM_FLASH";
+        case K_CM_ENABLE_PULSE_DETECTION:   return "CM_ENABLE_PULSE_DETECTION";
+        case K_CM_DISABLE_PULSE_DETECTION:  return "CM_DISABLE_PULSE_DETECTION";
+        case K_CM_ENABLE_ECHO_CANCELLER:    return "CM_ENABLE_ECHO_CANCELLER";
+        case K_CM_DISABLE_ECHO_CANCELLER:   return "CM_DISABLE_ECHO_CANCELLER";
+        case K_CM_ENABLE_AGC:               return "CM_ENABLE_AGC";
+        case K_CM_DISABLE_AGC:              return "CM_DISABLE_AGC";
+        case K_CM_ENABLE_HIGH_IMP_EVENTS:   return "CM_ENABLE_HIGH_IMP_EVENTS";
+        case K_CM_DISABLE_HIGH_IMP_EVENTS:  return "CM_DISABLE_HIGH_IMP_EVENTS";
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_CM_ENABLE_CALL_ANSWER_INFO:  return "CM_ENABLE_CALL_ANSWER_INFO";
+        case K_CM_DISABLE_CALL_ANSWER_INFO: return "CM_DISABLE_CALL_ANSWER_INFO";
+#endif
+
+        case K_CM_RESET_LINK:               return "CM_RESET_LINK";
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_CM_CLEAR_LINK_ERROR_COUNTER: return "CM_CLEAR_LINK_ERROR_COUNTER";
+#endif
+
+        case K_CM_SEND_DTMF:                return "CM_SEND_DTMF";
+        case K_CM_STOP_AUDIO:               return "CM_STOP_AUDIO";
+        case K_CM_HARD_RESET:               return "CM_HARD_RESET";
+
+        case K_CM_SEND_TO_CTBUS:            return "CM_SEND_TO_CTBUS";
+        case K_CM_RECV_FROM_CTBUS:          return "CM_RECV_FROM_CTBUS";
+        case K_CM_SETUP_H100:               return "CM_SETUP_H100";
+
+        case K_CM_MIXER:                    return "CM_MIXER";
+        case K_CM_CLEAR_MIXER:              return "CM_CLEAR_MIXER";
+        case K_CM_PLAY_FROM_FILE:           return "CM_PLAY_FROM_FILE";
+        case K_CM_RECORD_TO_FILE:           return "CM_RECORD_TO_FILE";
+        case K_CM_PLAY_FROM_STREAM:         return "CM_PLAY_FROM_STREAM";
+        case K_CM_STOP_PLAY:                return "CM_STOP_PLAY";
+        case K_CM_STOP_RECORD:              return "CM_STOP_RECORD";
+        case K_CM_PAUSE_PLAY:               return "CM_PAUSE_PLAY";
+        case K_CM_PAUSE_RECORD:             return "CM_PAUSE_RECORD";
+        case K_CM_INCREASE_VOLUME:          return "CM_INCREASE_VOLUME";
+        case K_CM_DECREASE_VOLUME:          return "CM_DECREASE_VOLUME";
+        case K_CM_LISTEN:                   return "CM_LISTEN";
+        case K_CM_STOP_LISTEN:              return "CM_STOP_LISTEN";
+        case K_CM_PREPARE_FOR_LISTEN:       return "CM_PREPARE_FOR_LISTEN";
+
+        case K_CM_PLAY_SOUND_CARD:          return "CM_PLAY_SOUND_CARD";
+        case K_CM_STOP_SOUND_CARD:          return "CM_STOP_SOUND_CARD";
+
+        case K_CM_MIXER_CTBUS:              return "CM_MIXER_CTBUS";
+        case K_CM_PLAY_FROM_STREAM_EX:      return "CM_PLAY_FROM_STREAM_EX";
+        case K_CM_ENABLE_PLAYER_AGC:        return "CM_ENABLE_PLAYER_AGC";
+        case K_CM_DISABLE_PLAYER_AGC:       return "CM_DISABLE_PLAYER_AGC";
+        case K_CM_START_STREAM_BUFFER:      return "CM_START_STREAM_BUFFER";
+        case K_CM_ADD_STREAM_BUFFER:        return "CM_ADD_STREAM_BUFFER";
+        case K_CM_STOP_STREAM_BUFFER:       return "CM_STOP_STREAM_BUFFER";
+        case K_CM_SEND_BEEP:                return "CM_SEND_BEEP";
+        case K_CM_SEND_BEEP_CONF:           return "CM_SEND_BEEP_CONF";
+        case K_CM_ADD_TO_CONF:              return "CM_ADD_TO_CONF";
+        case K_CM_REMOVE_FROM_CONF:         return "CM_REMOVE_FROM_CONF";
+        case K_CM_RECORD_TO_FILE_EX:        return "CM_RECORD_TO_FILE_EX";
+
+#if K3L_AT_LEAST(1,5,4)
+        case K_CM_SET_VOLUME:               return "CM_SET_VOLUME";
+#endif
+        case K_CM_SET_LINE_CONDITION:       return "CM_SET_LINE_CONDITION";
+        case K_CM_SEND_LINE_CONDITION:      return "CM_SEND_LINE_CONDITION";
+        case K_CM_SET_CALLER_CATEGORY:      return "CM_SET_CALLER_CATEGORY";
+        case K_CM_DIAL_MFC:                 return "CM_DIAL_MFC";
+
+        case K_CM_INTERNAL_PLAY:            return "CM_INTERNAL_PLAY";
+        case K_CM_RESUME_PLAY:              return "CM_RESUME_PLAY";
+        case K_CM_RESUME_RECORD:            return "CM_RESUME_RECORD";
+        case K_CM_INTERNAL_PLAY_EX:         return "CM_INTERNAL_PLAY_EX";
+#if !K3L_AT_LEAST(2,0,0)
+        case K_CM_PING:                     return "CM_PING";
+#if K3L_AT_LEAST(1,6,0)
+        case K_CM_LOG_REQUEST:              return "CM_LOG_REQUEST";
+        case K_CM_LOG_CREATE_DISPATCHER:    return "CM_LOG_CREATE_DISPATCHER";
+        case K_CM_LOG_DESTROY_DISPATCHER:   return "CM_LOG_DESTROY_DISPATCHER";
+#endif
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_CM_START_CADENCE:            return "CM_START_CADENCE";
+        case K_CM_STOP_CADENCE:             return "CM_STOP_CADENCE";
+        case K_CM_CHECK_NEW_SMS:            return "CM_CHECK_NEW_SMS";
+        case K_CM_SEND_TO_MODEM:            return "CM_SEND_TO_MODEM";
+#endif
+#if K3L_AT_LEAST(2,1,0)
+        case K_CM_START_FAX_TX:             return "CM_START_FAX_TX";
+        case K_CM_STOP_FAX_TX:              return "CM_STOP_FAX_TX";
+        case K_CM_ADD_FAX_FILE:             return "CM_ADD_FAX_FILE";
+        case K_CM_ADD_FAX_PAGE_BREAK:       return "CM_ADD_FAX_PAGE_BREAK";
+        case K_CM_START_FAX_RX:             return "CM_START_FAX_RX";
+        case K_CM_STOP_FAX_RX:              return "CM_STOP_FAX_RX";
+        case K_CM_SIM_CARD_SELECT:          return "CM_SIM_CARD_SELECT";
+#endif
+
+#if K3L_AT_LEAST(2,1,0)
+       case K_CM_NOTIFY_WATCHDOG:           return "CM_NOTIFY_WATCHDOG";
+       case K_CM_STOP_WATCHDOG:             return "CM_STOP_WATCHDOG";
+       case K_CM_WATCHDOG_COUNT:            return "CM_WATCHDOG_COUNT";
+       case K_CM_START_WATCHDOG:            return "CM_START_WATCHDOG";
+#endif
+
+    }
+
+    return STG(FMT("[command='%d']") % code);
+}
+
+std::string Verbose::eventName(int32 code)
+{
+    switch ((kevent)code)
+    {
+        case K_EV_CHANNEL_FREE:         return "EV_CHANNEL_FREE";
+        case K_EV_CONNECT:              return "EV_CONNECT";
+        case K_EV_DISCONNECT:           return "EV_DISCONNECT";
+        case K_EV_CALL_SUCCESS:         return "EV_CALL_SUCCESS";
+        case K_EV_CALL_FAIL:            return "EV_CALL_FAIL";
+        case K_EV_NO_ANSWER:            return "EV_NO_ANSWER";
+        case K_EV_BILLING_PULSE:        return "EV_BILLING_PULSE";
+        case K_EV_SEIZE_SUCCESS:        return "EV_SEIZE_SUCCESS";
+        case K_EV_SEIZE_FAIL:           return "EV_SEIZE_FAIL";
+        case K_EV_SEIZURE_START:        return "EV_SEIZURE_START";
+        case K_EV_CAS_LINE_STT_CHANGED: return "EV_CAS_LINE_STT_CHANGED";
+        case K_EV_CAS_MFC_RECV:         return "EV_CAS_MFC_RECV";
+
+#if K3L_AT_LEAST(1,5,0)
+        case K_EV_NEW_CALL:             return "EV_NEW_CALL";
+#endif
+
+#if K3L_AT_LEAST(1,5,1)
+        case K_EV_USER_INFORMATION:     return "EV_USER_INFORMATION";
+#endif
+
+#if K3L_AT_LEAST(1,5,3)
+        case K_EV_DIALED_DIGIT:         return "EV_DIALED_DIGIT";
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_EV_SIP_REGISTER_INFO:    return "EV_SIP_REGISTER_INFO";
+#endif
+
+#if K3L_AT_LEAST(1,4,0)
+        case K_EV_CALL_HOLD_START:      return "EV_CALL_HOLD_START";
+        case K_EV_CALL_HOLD_STOP:       return "EV_CALL_HOLD_STOP";
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_EV_SS_TRANSFER_FAIL:     return "EV_SS_TRANSFER_FAIL";
+        case K_EV_FLASH:                return "EV_FLASH";
+#endif
+
+        case K_EV_DTMF_DETECTED:        return "EV_DTMF_DETECTED";
+        case K_EV_DTMF_SEND_FINISH:     return "EV_DTMF_SEND_FINISH";
+        case K_EV_AUDIO_STATUS:         return "EV_AUDIO_STATUS";
+        case K_EV_CADENCE_RECOGNIZED:   return "EV_CADENCE_RECOGNIZED";
+
+        case K_EV_END_OF_STREAM:        return "EV_END_OF_STREAM";
+        case K_EV_PULSE_DETECTED:       return "EV_PULSE_DETECTED";
+
+#if K3L_AT_LEAST(1,5,1)
+        case K_EV_POLARITY_REVERSAL:    return "EV_POLARITY_REVERSAL";
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_EV_ISDN_PROGRESS_INDICATOR: return "EV_ISDN_PROGRESS_INDICATOR";
+        case K_EV_CALL_ANSWER_INFO:        return "EV_CALL_ANSWER_INFO";
+        case K_EV_COLLECT_CALL:            return "EV_COLLECT_CALL";
+        case K_EV_SIP_DTMF_DETECTED:       return "EV_SIP_DTMF_DETECTED";
+
+        case K_EV_RECV_FROM_MODEM:      return "EV_RECV_FROM_MODEM";
+        case K_EV_NEW_SMS:              return "EV_NEW_SMS";
+        case K_EV_SMS_INFO:             return "EV_SMS_INFO";
+        case K_EV_SMS_DATA:             return "EV_SMS_DATA";
+        case K_EV_SMS_SEND_RESULT:      return "EV_SMS_SEND_RESULT";
+        case K_EV_RING_DETECTED:        return "EV_RING_DETECTED";
+        case K_EV_PHYSICAL_LINK_DOWN:   return "EV_PHYSICAL_LINK_DOWN";
+        case K_EV_PHYSICAL_LINK_UP:     return "EV_PHYSICAL_LINK_UP";
+#endif
+#if K3L_HAS_MPTY_SUPPORT
+        case K_EV_CALL_MPTY_START:      return "EV_CALL_MPTY_START";
+        case K_EV_CALL_MPTY_STOP:       return "EV_CALL_MPTY_STOP";
+        case K_EV_GSM_COMMAND_STATUS:   return "EV_GSM_COMMAND_STATUS";
+#endif
+#if !K3L_AT_LEAST(2,0,0)
+        case K_EV_PONG:                 return "EV_PONG";
+#endif
+        case K_EV_CHANNEL_FAIL:         return "EV_CHANNEL_FAIL";
+        case K_EV_REFERENCE_FAIL:       return "EV_REFERENCE_FAIL";
+        case K_EV_INTERNAL_FAIL:        return "EV_INTERNAL_FAIL";
+        case K_EV_HARDWARE_FAIL:        return "EV_HARDWARE_FAIL";
+        case K_EV_LINK_STATUS:          return "EV_LINK_STATUS";
+
+#if K3L_AT_LEAST(1,4,0)
+        case K_EV_CLIENT_RECONNECT:     return "EV_CLIENT_RECONNECT";
+        case K_EV_VOIP_SEIZURE:         return "EV_VOIP_SEIZURE";
+#endif
+        case K_EV_SEIZURE:              return "EV_SEIZURE";
+#if K3L_AT_LEAST(2,1,0)
+        case K_EV_FAX_CHANNEL_FREE:     return "EV_FAX_CHANNEL_FREE";
+        case K_EV_FAX_FILE_SENT:        return "EV_FAX_FILE_SENT";
+        case K_EV_FAX_FILE_FAIL:        return "EV_FAX_FILE_FAIL";
+    /*case K_EV_FAX_MESSAGE_CONFIRMATION:return "EV_FAX_MESSAGE_CONFIRMATION";*/
+        case K_EV_FAX_TX_TIMEOUT:       return "EV_FAX_TX_TIMEOUT";
+        case K_EV_FAX_PAGE_CONFIRMATION:return "EV_FAX_PAGE_CONFIRMATION";
+        case K_EV_FAX_REMOTE_INFO:      return "EV_FAX_REMOTE_INFO";
+#endif
+
+#if K3L_AT_LEAST(2,1,0)
+        case K_EV_WATCHDOG_COUNT:       return "EV_WATCHDOG_COUNT";
+#endif
+    }
+
+    return STG(FMT("[event='%d']") % code);
+}
+
+
+#if K3L_AT_LEAST(2,0,0)
+std::string Verbose::command(int32 dev, K3L_COMMAND *k3lcmd, R2CountryType r2_country, Verbose::Presentation fmt)
+#else
+std::string Verbose::command(int32 dev, K3L_COMMAND *k3lcmd, Verbose::Presentation fmt)
+#endif
+{
+#if K3L_AT_LEAST(2,0,0)
+    return command(k3lcmd->Cmd, dev, k3lcmd->Object, (const char *) k3lcmd->Params, r2_country, fmt);
+#else
+    return command(k3lcmd->Cmd, dev, k3lcmd->Object, (const char *) k3lcmd->Params, fmt);
+#endif
+}
+
+#if K3L_AT_LEAST(2,0,0)
+std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const char * params, R2CountryType r2_country, Verbose::Presentation fmt)
+#else
+std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const char * params, Verbose::Presentation fmt)
+#endif
+{
+    unsigned short int dev = (unsigned short int) dev_idx;
+    unsigned short int obj = (unsigned short int) obj_idx;
+
+    kcommand code = (kcommand) cmd_code;
+
+    std::string buf, extra;
+
+    switch (code)
+    {
+        case K_CM_SEIZE:
+        case K_CM_SYNC_SEIZE:
+        //case K_CM_VOIP_SEIZE://deprecated
+        case K_CM_DIAL_MFC:
+        case K_CM_DIAL_DTMF:
+
+        case K_CM_CONNECT:
+        case K_CM_PRE_CONNECT:
+        case K_CM_DISCONNECT:
+        case K_CM_DROP_COLLECT_CALL:
+
+        case K_CM_START_SEND_FAIL:
+        case K_CM_STOP_SEND_FAIL:
+
+        case K_CM_ENABLE_DTMF_SUPPRESSION:
+        case K_CM_DISABLE_DTMF_SUPPRESSION:
+        case K_CM_ENABLE_AUDIO_EVENTS:
+        case K_CM_DISABLE_AUDIO_EVENTS:
+        case K_CM_ENABLE_CALL_PROGRESS:
+        case K_CM_DISABLE_CALL_PROGRESS:
+        case K_CM_ENABLE_PULSE_DETECTION:
+        case K_CM_DISABLE_PULSE_DETECTION:
+        case K_CM_ENABLE_ECHO_CANCELLER:
+        case K_CM_DISABLE_ECHO_CANCELLER:
+        case K_CM_ENABLE_AGC:
+        case K_CM_DISABLE_AGC:
+        case K_CM_ENABLE_HIGH_IMP_EVENTS:
+        case K_CM_DISABLE_HIGH_IMP_EVENTS:
+
+        case K_CM_FLASH:
+        case K_CM_RESET_LINK:
+        case K_CM_CLEAR_MIXER:
+
+        case K_CM_LOCK_INCOMING:
+        case K_CM_UNLOCK_INCOMING:
+        case K_CM_LOCK_OUTGOING:
+        case K_CM_UNLOCK_OUTGOING:
+
+        case K_CM_INCREASE_VOLUME:
+        case K_CM_DECREASE_VOLUME:
+
+        case K_CM_STOP_RECORD:
+        case K_CM_PAUSE_RECORD:
+        case K_CM_RESUME_RECORD:
+
+        case K_CM_STOP_LISTEN:
+
+        case K_CM_PLAY_SOUND_CARD:
+        case K_CM_STOP_SOUND_CARD:
+        case K_CM_RINGBACK:
+#if K3L_AT_LEAST(1,4,0) && !K3L_AT_LEAST(2,0,0)
+        case K_CM_VOIP_START_DEBUG:
+        case K_CM_VOIP_STOP_DEBUG:
+        case K_CM_VOIP_DUMP_STAT:
+#endif
+
+#if K3L_AT_LEAST(1,5,3)
+        case K_CM_END_OF_NUMBER:
+#endif
+
+#if K3L_AT_LEAST(1,5,4)
+        case K_CM_SET_VOLUME:
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_CM_ENABLE_CALL_ANSWER_INFO:
+        case K_CM_DISABLE_CALL_ANSWER_INFO:
+
+        case K_CM_SS_TRANSFER:
+
+        case K_CM_CHECK_NEW_SMS:
+        case K_CM_GET_SMS:
+        case K_CM_PREPARE_SMS:
+        case K_CM_SEND_SMS:
+
+        case K_CM_START_CADENCE:
+        case K_CM_STOP_CADENCE:
+        case K_CM_SEND_TO_MODEM:
+#endif
+#if K3L_HAS_MPTY_SUPPORT
+        case K_CM_HOLD_SWITCH:
+        case K_CM_MPTY_CONF:
+        case K_CM_MPTY_SPLIT:
+#endif
+#if K3L_AT_LEAST(2,1,0)
+        case K_CM_SIM_CARD_SELECT:
+#endif
+            if (params != NULL)
+            {
+                extra += "param='";
+                extra += (params ? params : "<empty>");
+                extra += "'";
+
+                return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
+            }
+            else
+            {
+                return show(buf, commandName(code), Target(CHANNEL, dev, obj));
+            }
+
+        case K_CM_SEND_DTMF: /* ?? */
+            return show(buf, commandName(code), Target(CHANNEL, dev, obj));
+
+        /****/
+
+        case K_CM_STOP_AUDIO:
+            extra  = "stop='";
+            switch ((params ? (int)(*params) : -1))
+            {
+                case 1:   extra += "tx";
+                case 2:   extra += "rx";
+                case 3:   extra += "tx+rx";
+                default:  extra += "<unknown>";
+            }
+            extra  = "'";
+
+            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
+
+        /****/
+
+#if K3L_AT_LEAST(1,5,2) && !K3L_AT_LEAST(2,0,0)
+        case K_CM_ISDN_DEBUG:
+            extra  = "flags='";
+            extra += isdnDebug((unsigned long)params);
+            extra += "'";
+
+            return show(buf, commandName(code), Target(NONE), extra);
+#endif
+
+        /****/
+
+#if K3L_AT_LEAST(1,5,1)
+        case K_CM_USER_INFORMATION:
+#endif
+            if (params != NULL)
+            {
+                KUserInformation * userinfo = (KUserInformation *)params;
+
+                std::string tmp((const char*) userinfo->UserInfo, userinfo->UserInfoLength);
+
+                extra = STG(FMT("proto='%d',length='%d',data='%s'")
+                        % userinfo->ProtocolDescriptor % userinfo->UserInfoLength % tmp);
+
+                return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
+            }
+            else
+            {
+                return show(buf, commandName(code), Target(CHANNEL, dev, obj));
+            }
+
+        /****/
+
+
+
+        case K_CM_CAS_CHANGE_LINE_STT:
+        {
+            const char status = (params ? *params : 0x00);
+
+            extra += "status='";
+            extra += (status & 0x01 ? "1" : "0");
+            extra += (status & 0x02 ? "1" : "0");
+            extra += (status & 0x04 ? "1" : "0");
+            extra += (status & 0x08 ? "1" : "0");
+            extra += "'";
+
+            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
+        }
+
+        case K_CM_CAS_SEND_MFC:
+        {
+            char mfc = (params ? *params : 0xff);
+
+            extra = STG(FMT("mfc='%d'") % (int) mfc);
+
+            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
+        }
+
+        case K_CM_CAS_SET_MFC_DETECT_MODE:
+        {
+            int mode = (params ? *((int *)params) : -1);
+
+            extra = STG(FMT("mode='%d'") % mode);
+
+            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
+        }
+
+        case K_CM_SET_FORWARD_CHANNEL:
+        {
+            int channel = (params ? *((int*) params) : -1);
+
+            extra = STG(FMT("forward='%03d'") % channel);
+
+            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
+        }
+
+#if K3L_AT_LEAST(1,5,0)
+        case K_CM_MAKE_CALL:
+            extra  = "options='";
+            extra += (params ? params : "<empty>");
+            extra += "'";
+
+            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
+#endif
+
+        case K_CM_MIXER:
+        case K_CM_MIXER_CTBUS:
+        {
+            if (params)
+            {
+                KMixerCommand *m = (KMixerCommand*)params;
+
+                std::string src = mixerSource((KMixerSource)m->Source);
+                std::string idx("<unknown>");
+
+                switch (m->Source)
+                {
+                    case kmsChannel:
+                    case kmsPlay:
+                    case kmsCTbus:
+#if (K3L_AT_LEAST(1,4,0) && !K3L_AT_LEAST(1,6,0))
+                    case kmsVoIP:
+#endif
+#if K3L_AT_LEAST(1,6,0)
+                    case kmsNoDelayChannel:
+#endif
+                        idx = STG(FMT("%02d") % (int)m->SourceIndex);
+                        break;
+
+                    case kmsGenerator:
+                        idx = mixerTone((KMixerTone)m->SourceIndex);
+                        break;
+                };
+
+                extra = STG(FMT("track='%d',src='%s',index='%s'") % (int)m->Track % src % idx);
+            }
+            else
+            {
+                extra = "<unknown>";
+            }
+
+            return show(buf, commandName(code), Target(MIXER, dev, obj), extra);
+        };
+
+        case K_CM_PLAY_FROM_FILE:
+            extra  = "file='";
+            extra += (params ? params : "<empty>");
+            extra += "'";
+
+            return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
+
+        case K_CM_RECORD_TO_FILE:
+            extra  = "file='";
+            extra += (params ? params : "<empty>");
+            extra += "'";
+
+            return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
+
+        case K_CM_RECORD_TO_FILE_EX:
+            extra  = "params='";
+            extra += (params ? params : "<empty>");
+            extra += "'";
+
+            return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
+
+        case K_CM_PLAY_FROM_STREAM:
+        case K_CM_ADD_STREAM_BUFFER:
+        {
+            struct buffer_param
+            {
+                const void * ptr;
+                const int   size;
+            }
+            *p = (buffer_param *) params;
+
+            std::stringstream stream;
+
+            extra = STG(FMT("buffer='%p',size='%d'")
+                % (const void *) p->ptr % (const int) p->size);
+
+            return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
+        }
+
+        case K_CM_PLAY_FROM_STREAM_EX:
+        {
+            struct buffer_param
+            {
+                const void  *  ptr;
+                const int     size;
+                const char   codec;
+            }
+            *p = (buffer_param *) params;
+
+            std::string codec;
+
+            switch (p->codec)
+            {
+                case 0:  codec = "A-Law";
+                case 1:  codec = "PCM-08khz";
+                case 2:  codec = "PCM-11khz";
+                default: codec = "<unknown>";
+            }
+
+            std::stringstream stream;
+
+            extra = STG(FMT("buffer='%p',size='%d',codec='%s'")
+                % (const void *) p->ptr % (const int) p->size % codec);
+
+            return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
+        }
+
+        case K_CM_STOP_PLAY:
+        case K_CM_PAUSE_PLAY:
+        case K_CM_RESUME_PLAY:
+
+        case K_CM_START_STREAM_BUFFER:
+        case K_CM_STOP_STREAM_BUFFER:
+
+        case K_CM_ENABLE_PLAYER_AGC:
+        case K_CM_DISABLE_PLAYER_AGC:
+
+        case K_CM_SEND_BEEP:
+        case K_CM_SEND_BEEP_CONF:
+
+        case K_CM_INTERNAL_PLAY:
+        case K_CM_INTERNAL_PLAY_EX:
+            return show(buf, commandName(code), Target(PLAYER, dev, obj));
+
+        case K_CM_ADD_TO_CONF:
+            extra += "conference='";
+            extra += (params ? (int) (*params) : -1);
+            extra += "'";
+
+            return show(buf, commandName(code), Target(MIXER, dev, obj), extra);
+
+        case CM_REMOVE_FROM_CONF:
+            return show(buf, commandName(code), Target(MIXER, dev, obj));
+
+        case K_CM_LISTEN:
+        case K_CM_PREPARE_FOR_LISTEN:
+        {
+            int msecs = (params ? *((int*)params) : -1);
+
+            extra = STG(FMT("msecs='%d'") % msecs);
+
+            return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
+        }
+
+        case K_CM_SEND_TO_CTBUS:
+        case K_CM_RECV_FROM_CTBUS:
+        {
+            KCtbusCommand *p = (KCtbusCommand*)(params);
+
+            extra = STG(FMT("stream='%02d',timeslot='%02d',enable='%d'")
+                % (int)p->Stream % (int)p->TimeSlot % (int)p->Enable);
+
+            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
+        }
+
+        case K_CM_SET_LINE_CONDITION:
+        case K_CM_SEND_LINE_CONDITION:
+            extra  = "condition='";
+#if K3L_AT_LEAST(2,0,0)
+            extra += signGroupB((KSignGroupB) *((int *) params), r2_country);
+#else
+            extra += signGroupB((KSignGroupB) *((int *) params));
+#endif
+            extra += "'";
+
+            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_CM_SET_CALLER_CATEGORY:
+            extra  = "category='";
+#if K3L_AT_LEAST(2,0,0)
+            extra += signGroupII((KSignGroupII) *((int *) params), r2_country);
+#else
+            extra += signGroupII((KSignGroupII) *((int *) params));
+#endif
+            extra += "'";
+
+            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_CM_CLEAR_LINK_ERROR_COUNTER:
+            return show(buf, commandName(code), Target(LINK, dev, obj));
+
+        case K_CM_SIP_REGISTER:
+            if (params != NULL)
+            {
+                extra += "param='";
+                extra += (params ? params : "<empty>");
+                extra += "'";
+
+                return show(buf, commandName(code), Target(DEVICE, dev), extra);
+            }
+            else
+            {
+                return show(buf, commandName(code), Target(DEVICE, dev));
+            }
+#endif
+
+        case K_CM_SETUP_H100:
+            extra += "option='";
+            extra += h100configIndex((KH100ConfigIndex)obj_idx);
+            extra += "'value='";
+            extra += (params ? STG(FMT("%02d") % (int)(*params)) : "<empty>");
+            extra += "'";
+
+            return show(buf, commandName(code), Target(DEVICE, dev), extra);
+
+        case K_CM_HARD_RESET:
+            return show(buf, commandName(code), Target(LINK, dev, obj));
+
+#if !K3L_AT_LEAST(2,0,0)
+        /* como funciona? */
+        case K_CM_LOG_REQUEST:
+        case K_CM_LOG_CREATE_DISPATCHER:
+        case K_CM_LOG_DESTROY_DISPATCHER:
+
+        case K_CM_PING:
+#endif
+            return show(buf, commandName(code), Target(NONE));
+#if K3L_AT_LEAST(2,1,0)
+        case K_CM_START_FAX_TX:
+        case K_CM_START_FAX_RX:
+        case K_CM_ADD_FAX_FILE:
+            extra  = "params='";
+            extra += (params ? params : "<empty>");
+            extra += "'";
+            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
+        case K_CM_STOP_FAX_TX:
+        case K_CM_STOP_FAX_RX:
+        case K_CM_ADD_FAX_PAGE_BREAK:
+            return show(buf, commandName(code), Target(CHANNEL, dev, obj));
+#endif
+
+#if K3L_AT_LEAST(2,1,0)
+        case K_CM_NOTIFY_WATCHDOG:
+        case K_CM_STOP_WATCHDOG:
+        case K_CM_START_WATCHDOG:
+            return show(buf, commandName(code) , Target(DEVICE, obj));
+        case K_CM_WATCHDOG_COUNT:
+            return show(buf, commandName(code) , Target(NONE));
+#endif
+
+    }
+
+    /* default command handler */
+    return show(buf, commandName(code), Target(CHANNEL, dev, obj));
+}
+
+#if K3L_AT_LEAST(2,0,0)
+std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, R2CountryType r2_country, Verbose::Presentation fmt)
+#else
+std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose::Presentation fmt)
+#endif
+{
+    unsigned short int dev = (unsigned short int) ev->DeviceId;
+    unsigned short int obj = (unsigned short int) obj_idx;
+
+    kevent code = (kevent) ev->Code;
+
+    std::string buf, extra;
+
+    switch (code)
+    {
+        case K_EV_CHANNEL_FREE:
+        case K_EV_SEIZE_SUCCESS:
+        case K_EV_CALL_SUCCESS:
+        case K_EV_NO_ANSWER:
+        case K_EV_CONNECT:
+        case K_EV_DTMF_SEND_FINISH:
+        case K_EV_SEIZURE_START:
+        case K_EV_BILLING_PULSE:
+        case K_EV_REFERENCE_FAIL:
+
+#if K3L_AT_LEAST(1,4,0)
+        case K_EV_CALL_HOLD_START:
+        case K_EV_CALL_HOLD_STOP:
+#endif
+
+#if K3L_AT_LEAST(1,5,0)
+        case K_EV_NEW_CALL:
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_EV_FLASH:
+        case K_EV_POLARITY_REVERSAL:
+        case K_EV_COLLECT_CALL:
+        case K_EV_SS_TRANSFER_FAIL:
+        case K_EV_RING_DETECTED:
+#endif
+#if K3L_HAS_MPTY_SUPPORT
+        case K_EV_CALL_MPTY_START:
+        case K_EV_CALL_MPTY_STOP:
+#endif
+            break;
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_EV_RECV_FROM_MODEM:
+        case K_EV_SMS_INFO:
+        case K_EV_SMS_DATA:
+            extra  = "data='";
+            extra += (ev->Params ? (const char *)(ev->Params) : "<empty>");
+            extra += "'";
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_EV_SMS_SEND_RESULT:
+            extra  = "result='";
+#if K3L_AT_LEAST(2,0,0)
+            extra += gsmSmsCause((KGsmSmsCause)ev->AddInfo);
+#else
+            extra += gsmCallCause((KGsmCallCause)ev->AddInfo);
+#endif
+            extra += "'";
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+#if K3L_HAS_MPTY_SUPPORT
+        case K_EV_GSM_COMMAND_STATUS:
+            extra  = "result='";
+            extra += gsmMobileCause((KGsmMobileCause)ev->AddInfo);
+            extra += "'";
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+#endif
+
+        case K_EV_CALL_ANSWER_INFO:
+            extra  = "info='";
+            extra += callStartInfo((KCallStartInfo)ev->AddInfo);
+            extra += "'";
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_EV_NEW_SMS:
+            if (ev->AddInfo != 0)
+            {
+                extra  = "messages='";
+                extra += STG(FMT("%d") % ev->AddInfo);
+                extra += "'";
+                return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+            }
+            else
+            {
+                return show(buf, eventName(code), Target(CHANNEL, dev, obj));
+            }
+
+        case K_EV_ISDN_PROGRESS_INDICATOR:
+            if (ev->AddInfo != 0)
+            {
+                extra  = "indication='";
+                extra += q931ProgressIndication((KQ931ProgressIndication)ev->AddInfo);
+                extra += "'";
+                return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+            }
+            else
+            {
+                return show(buf, eventName(code), Target(CHANNEL, dev, obj));
+            }
+#endif
+
+        case K_EV_CAS_LINE_STT_CHANGED:
+            extra = STG(FMT("[a=%d,b=%d,c=%d,d=%d]")
+                % ((ev->AddInfo & 0x8) >> 3) % ((ev->AddInfo & 0x4) >> 2)
+                % ((ev->AddInfo & 0x2) >> 1) %  (ev->AddInfo & 0x1));
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_EV_CAS_MFC_RECV:
+            extra = STG(FMT("digit='%d'") % ev->AddInfo);
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_EV_CALL_FAIL:
+            extra  = "cause='";
+#if K3L_AT_LEAST(2,0,0)
+            extra += callFail(sig, r2_country, ev->AddInfo);
+#else
+            extra += callFail(sig, ev->AddInfo);
+#endif
+            extra += "'";
+
+            if (ev->Params != NULL && ev->ParamSize != 0)
+            {
+                if (!extra.empty())
+                    extra += ",";
+
+                extra += "params='";
+                extra += (const char *) ev->Params;
+                extra += "'";
+            }
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_EV_DISCONNECT:
+            switch (sig)
+            {
+#if K3L_AT_LEAST(1,5,1)
+                case ksigOpenCCS:
+                case ksigPRI_EndPoint:
+                case ksigPRI_Network:
+                case ksigPRI_Passive:
+                    extra  = "cause='";
+                    extra += isdnCause((KQ931Cause) ev->AddInfo);
+                    extra += "'";
+#endif
+                default:
+                    break;
+            }
+
+            if (ev->Params != NULL && ev->ParamSize != 0)
+            {
+                if (!extra.empty())
+                    extra += ",";
+
+                extra += "params='";
+                extra += (const char *) ev->Params;
+                extra += "'";
+            }
+
+            if (!extra.empty())
+                return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+            else
+                return show(buf, eventName(code), Target(CHANNEL, dev, obj));
+
+            break;
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_EV_SIP_DTMF_DETECTED:
+#endif
+        case K_EV_DTMF_DETECTED:
+        case K_EV_PULSE_DETECTED:
+        case K_EV_DIALED_DIGIT:
+            extra = STG(FMT("digit='%c'") % (char)ev->AddInfo);
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_EV_SEIZURE:
+        {
+            KIncomingSeizeParams *n = (KIncomingSeizeParams *)
+                ( ((char*)ev) + sizeof(K3L_EVENT) );
+
+            extra += "orig_addr='";
+            extra += n->NumberA;
+            extra += "',dest_addr='";
+            extra += n->NumberB;
+            extra += "'";
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+        }
+
+#if K3L_AT_LEAST(1,4,0)
+        case K_EV_VOIP_SEIZURE:
+        {
+            char *numB = ((char*)ev) + sizeof(K3L_EVENT);
+            char *numA = numB + 61;
+
+            extra  = "numberA='";
+            extra += numA;
+            extra += "',numberB='";
+            extra += numB;
+            extra += "'";
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+        }
+#endif
+
+
+        case K_EV_END_OF_STREAM:
+            return show(buf, eventName(code), Target(PLAYER, dev, obj));
+
+        case K_EV_AUDIO_STATUS:
+            extra  = "tone='";
+            extra += mixerTone((KMixerTone)ev->AddInfo);
+            extra += "'";
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_EV_CADENCE_RECOGNIZED:
+            extra = STG(FMT("cadence='%c'") % (char)(ev->AddInfo));
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_EV_CHANNEL_FAIL:
+            extra  = "reason='";
+            extra += channelFail(sig, ev->AddInfo);
+            extra += "'";
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_EV_SEIZE_FAIL:
+            extra  = "reason='";
+            extra += seizeFail((KSeizeFail) ev->AddInfo);
+            extra += "'";
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_EV_INTERNAL_FAIL:
+            extra  = "reason='";
+            extra += internalFail((KInternalFail) ev->AddInfo);
+            extra += "'";
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_EV_HARDWARE_FAIL:
+            extra  = "component='";
+            extra += systemObject((KSystemObject) ev->AddInfo);
+            extra += "'";
+
+            switch (ev->AddInfo)
+            {
+                case ksoChannel:
+                    return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+                case ksoLink:
+                    return show(buf, eventName(code), Target(LINK, dev, obj), extra);
+                case ksoLinkMon:
+                case ksoH100:
+                case ksoFirmware:
+                case ksoDevice:
+                    return show(buf, eventName(code), Target(DEVICE, dev), extra);
+                case ksoAPI:
+                    return show(buf, eventName(code), Target(NONE), extra);
+            }
+
+
+        case K_EV_LINK_STATUS:
+            // EV_LINK_STATUS has always zero in ObjectInfo (and AddInfo!)
+            /* fall throught... */
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_EV_PHYSICAL_LINK_UP:
+        case K_EV_PHYSICAL_LINK_DOWN:
+            return show(buf, eventName(code), Target(LINK, dev, obj));
+#endif
+
+#if K3L_AT_LEAST(1,5,1)
+        case K_EV_USER_INFORMATION:
+        {
+            KUserInformation *info = (KUserInformation *)(ev->Params);
+
+            std::string data((const char *)info->UserInfo,
+                std::min<size_t>(info->UserInfoLength, KMAX_USER_USER_LEN));
+
+            extra = STG(FMT("proto='%d',length='%d',data='%s'")
+                % info->ProtocolDescriptor % info->UserInfoLength % data);
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+        }
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+        case K_EV_SIP_REGISTER_INFO:
+            extra  = "params='";
+            extra += (ev->Params ? (const char *) (ev->Params) : "<unknown>");
+            extra += "',status='";
+            extra += sipFailures((KSIP_Failures)(ev->AddInfo));
+            extra += "'";
+
+            return show(buf, eventName(code), Target(DEVICE, dev), extra);
+#endif
+
+#if !K3L_AT_LEAST(2,0,0)
+        case K_EV_PONG:
+#endif
+
+#if K3L_AT_LEAST(1,4,0)
+        case K_EV_CLIENT_RECONNECT:
+#endif
+            return show(buf, eventName(code), Target(NONE));
+
+#if K3L_AT_LEAST(2,1,0)
+        case K_EV_FAX_CHANNEL_FREE:
+            extra  = "status='";
+            extra += faxResult((KFaxResult)ev->AddInfo);
+            extra += "'";
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_EV_FAX_FILE_SENT:
+            extra  = "filename='";
+            extra += (ev->Params ? (const char *) (ev->Params) : "<unknown>");
+            extra += "'";
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_EV_FAX_FILE_FAIL:
+            extra  = "cause='";
+            extra += faxFileErrorCause((KFaxFileErrorCause)ev->AddInfo);
+            extra += "',filename='";
+            extra += (ev->Params ? (const char *) (ev->Params) : "<unknown>");
+            extra += "'";
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        case K_EV_FAX_REMOTE_INFO:
+            extra = ((ev->Params && ev->ParamSize != 0) ? (const char *) ev->Params : "");
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+
+        /*case K_EV_FAX_MESSAGE_CONFIRMATION:*/
+        case K_EV_FAX_PAGE_CONFIRMATION:
+        case K_EV_FAX_TX_TIMEOUT:
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj));
+#endif
+
+#if K3L_AT_LEAST(2,1,0)
+        case K_EV_WATCHDOG_COUNT:
+            extra = STG(FMT("count='%d'") % (char)ev->AddInfo);
+            return show(buf , eventName(code), Target(NONE), extra);
+#endif
+
+    }
+
+    // default handler...
+    if (ev->Params != NULL && ev->ParamSize != 0)
+    {
+        extra += "params='";
+        extra.append((const char *) ev->Params, (unsigned int) std::max<int>(ev->ParamSize - 1, 0));
+        extra += "'";
+
+        return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+    }
+    else
+        return show(buf, eventName(code), Target(CHANNEL, dev, obj));
+}
+
+/********************************************/
+
+std::string Verbose::show(std::string & buf, std::string name, Target tgt, std::string & extra)
+{
+    if (tgt.type == NONE)
+    {
+        generate(buf, name, tgt, extra);
+    }
+    else
+    {
+        std::string tmp(",");
+        tmp += extra;
+
+        generate(buf, name, tgt, tmp);
+    }
+
+    return buf;
+}
+
+std::string Verbose::show(std::string & buf, std::string name, Target tgt)
+{
+    std::string tmp("");
+
+    generate(buf, name, tgt, tmp);
+    return buf;
+}
+
+void Verbose::generate(std::string &buf, std::string &name, Target tgt, std::string &extra)
+{
+    switch (tgt.type)
+    {
+        case NONE:
+            if (extra.empty())
+                buf += STG(FMT("<%s>") % name);
+            else
+                buf += STG(FMT("<%s> (%s)") % name % extra);
+            break;
+
+        case DEVICE:
+            buf += STG(FMT("<%s> (d=%02d%s)")
+                % name % tgt.device % extra);
+            break;
+
+        default:
+        {
+            const char *kind = "o";
+
+            switch (tgt.type)
+            {
+                case CHANNEL:
+                    kind = "c";
+                    break;
+                case PLAYER:
+                    kind = "p";
+                    break;
+                case MIXER:
+                    kind = "m";
+                    break;
+                case LINK:
+                    kind = "l";
+                default:
+                    break;
+            }
+
+            buf += STG(FMT("<%s> (d=%02d,%s=%03d%s)")
+                % name % tgt.device % kind % tgt.object % extra);
+            break;
+        }
+    }
+}
+
diff --git a/src/mod/endpoints/mod_khomp/commons/verbose.hpp b/src/mod/endpoints/mod_khomp/commons/verbose.hpp
new file mode 100644
index 0000000000..4668ea6a9f
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/verbose.hpp
@@ -0,0 +1,505 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <string>
+#include <sstream>
+#include <map>
+
+#include <k3l.h>
+
+// k3lApiMajorVersion
+#ifndef CM_PING
+# include <k3lVersion.h>
+# include <KTools.h>
+#endif
+
+#include <types.hpp>
+#include <k3lapi.hpp>
+#include <format.hpp>
+
+#ifndef _VERBOSE_HPP_
+#define _VERBOSE_HPP_
+
+struct Verbose
+{
+    typedef enum
+    {
+        K_CM_SEIZE                           = CM_SEIZE,
+        K_CM_SYNC_SEIZE                      = CM_SYNC_SEIZE,
+#if K3L_AT_LEAST(1,6,0)
+        K_CM_SIP_REGISTER                    = CM_SIP_REGISTER,
+#endif
+        K_CM_DIAL_DTMF                       = CM_DIAL_DTMF,
+        K_CM_DISCONNECT                      = CM_DISCONNECT,
+        K_CM_CONNECT                         = CM_CONNECT,
+        K_CM_PRE_CONNECT                     = CM_PRE_CONNECT,
+        K_CM_CAS_CHANGE_LINE_STT             = CM_CAS_CHANGE_LINE_STT,
+        K_CM_CAS_SEND_MFC                    = CM_CAS_SEND_MFC,
+        K_CM_SET_FORWARD_CHANNEL             = CM_SET_FORWARD_CHANNEL,
+        K_CM_CAS_SET_MFC_DETECT_MODE         = CM_CAS_SET_MFC_DETECT_MODE,
+        K_CM_DROP_COLLECT_CALL               = CM_DROP_COLLECT_CALL,
+        K_CM_MAKE_CALL                       = CM_MAKE_CALL,
+        K_CM_RINGBACK                        = CM_RINGBACK,
+        K_CM_USER_INFORMATION                = CM_USER_INFORMATION,
+#if !K3L_AT_LEAST(2,2,0)
+        K_CM_VOIP_SEIZE                      = CM_VOIP_SEIZE, //deprecated
+#endif
+        K_CM_LOCK_INCOMING                   = CM_LOCK_INCOMING,
+        K_CM_UNLOCK_INCOMING                 = CM_UNLOCK_INCOMING,
+        K_CM_LOCK_OUTGOING                   = CM_LOCK_OUTGOING,
+        K_CM_UNLOCK_OUTGOING                 = CM_UNLOCK_OUTGOING,
+        K_CM_START_SEND_FAIL                 = CM_START_SEND_FAIL,
+        K_CM_STOP_SEND_FAIL                  = CM_STOP_SEND_FAIL,
+        K_CM_END_OF_NUMBER                   = CM_END_OF_NUMBER,
+#if K3L_AT_LEAST(1,6,0)
+        K_CM_SS_TRANSFER                     = CM_SS_TRANSFER,
+        K_CM_GET_SMS                         = CM_GET_SMS,
+        K_CM_PREPARE_SMS                     = CM_PREPARE_SMS,
+        K_CM_SEND_SMS                        = CM_SEND_SMS,
+#endif
+#if K3L_HAS_MPTY_SUPPORT
+        K_CM_HOLD_SWITCH                     = CM_HOLD_SWITCH,
+        K_CM_MPTY_CONF                       = CM_MPTY_CONF,
+        K_CM_MPTY_SPLIT                      = CM_MPTY_SPLIT,
+#endif
+        K_CM_ENABLE_DTMF_SUPPRESSION         = CM_ENABLE_DTMF_SUPPRESSION,
+        K_CM_DISABLE_DTMF_SUPPRESSION        = CM_DISABLE_DTMF_SUPPRESSION,
+        K_CM_ENABLE_AUDIO_EVENTS             = CM_ENABLE_AUDIO_EVENTS,
+        K_CM_DISABLE_AUDIO_EVENTS            = CM_DISABLE_AUDIO_EVENTS,
+        K_CM_ENABLE_CALL_PROGRESS            = CM_ENABLE_CALL_PROGRESS,
+        K_CM_DISABLE_CALL_PROGRESS           = CM_DISABLE_CALL_PROGRESS,
+        K_CM_FLASH                           = CM_FLASH,
+        K_CM_ENABLE_PULSE_DETECTION          = CM_ENABLE_PULSE_DETECTION,
+        K_CM_DISABLE_PULSE_DETECTION         = CM_DISABLE_PULSE_DETECTION,
+        K_CM_ENABLE_ECHO_CANCELLER           = CM_ENABLE_ECHO_CANCELLER,
+        K_CM_DISABLE_ECHO_CANCELLER          = CM_DISABLE_ECHO_CANCELLER,
+        K_CM_ENABLE_AGC                      = CM_ENABLE_AGC,
+        K_CM_DISABLE_AGC                     = CM_DISABLE_AGC,
+        K_CM_ENABLE_HIGH_IMP_EVENTS          = CM_ENABLE_HIGH_IMP_EVENTS,
+        K_CM_DISABLE_HIGH_IMP_EVENTS         = CM_DISABLE_HIGH_IMP_EVENTS,
+#if K3L_AT_LEAST(1,6,0)
+        K_CM_ENABLE_CALL_ANSWER_INFO         = CM_ENABLE_CALL_ANSWER_INFO,
+        K_CM_DISABLE_CALL_ANSWER_INFO        = CM_DISABLE_CALL_ANSWER_INFO,
+#endif
+        K_CM_RESET_LINK                      = CM_RESET_LINK,
+#if K3L_AT_LEAST(1,6,0)
+        K_CM_CLEAR_LINK_ERROR_COUNTER        = CM_CLEAR_LINK_ERROR_COUNTER,
+#endif
+        K_CM_SEND_DTMF                       = CM_SEND_DTMF,
+        K_CM_STOP_AUDIO                      = CM_STOP_AUDIO,
+        K_CM_HARD_RESET                      = CM_HARD_RESET,
+        K_CM_SEND_TO_CTBUS                   = CM_SEND_TO_CTBUS,
+        K_CM_RECV_FROM_CTBUS                 = CM_RECV_FROM_CTBUS,
+        K_CM_SETUP_H100                      = CM_SETUP_H100,
+        K_CM_MIXER                           = CM_MIXER,
+        K_CM_CLEAR_MIXER                     = CM_CLEAR_MIXER,
+        K_CM_PLAY_FROM_FILE                  = CM_PLAY_FROM_FILE,
+        K_CM_RECORD_TO_FILE                  = CM_RECORD_TO_FILE,
+        K_CM_PLAY_FROM_STREAM                = CM_PLAY_FROM_STREAM,
+        K_CM_INTERNAL_PLAY                   = CM_INTERNAL_PLAY,
+        K_CM_STOP_PLAY                       = CM_STOP_PLAY,
+        K_CM_STOP_RECORD                     = CM_STOP_RECORD,
+        K_CM_PAUSE_PLAY                      = CM_PAUSE_PLAY,
+        K_CM_PAUSE_RECORD                    = CM_PAUSE_RECORD,
+        K_CM_RESUME_PLAY                     = CM_RESUME_PLAY,
+        K_CM_RESUME_RECORD                   = CM_RESUME_RECORD,
+        K_CM_INCREASE_VOLUME                 = CM_INCREASE_VOLUME,
+        K_CM_DECREASE_VOLUME                 = CM_DECREASE_VOLUME,
+        K_CM_LISTEN                          = CM_LISTEN,
+        K_CM_STOP_LISTEN                     = CM_STOP_LISTEN,
+        K_CM_PREPARE_FOR_LISTEN              = CM_PREPARE_FOR_LISTEN,
+        K_CM_PLAY_SOUND_CARD                 = CM_PLAY_SOUND_CARD,
+        K_CM_STOP_SOUND_CARD                 = CM_STOP_SOUND_CARD,
+        K_CM_MIXER_CTBUS                     = CM_MIXER_CTBUS,
+        K_CM_PLAY_FROM_STREAM_EX             = CM_PLAY_FROM_STREAM_EX,
+        K_CM_INTERNAL_PLAY_EX                = CM_INTERNAL_PLAY_EX,
+        K_CM_ENABLE_PLAYER_AGC               = CM_ENABLE_PLAYER_AGC,
+        K_CM_DISABLE_PLAYER_AGC              = CM_DISABLE_PLAYER_AGC,
+        K_CM_START_STREAM_BUFFER             = CM_START_STREAM_BUFFER,
+        K_CM_ADD_STREAM_BUFFER               = CM_ADD_STREAM_BUFFER,
+        K_CM_STOP_STREAM_BUFFER              = CM_STOP_STREAM_BUFFER,
+        K_CM_SEND_BEEP                       = CM_SEND_BEEP,
+        K_CM_SEND_BEEP_CONF                  = CM_SEND_BEEP_CONF,
+        K_CM_ADD_TO_CONF                     = CM_ADD_TO_CONF,
+        K_CM_REMOVE_FROM_CONF                = CM_REMOVE_FROM_CONF,
+        K_CM_RECORD_TO_FILE_EX               = CM_RECORD_TO_FILE_EX,
+        K_CM_SET_VOLUME                      = CM_SET_VOLUME,
+        K_CM_SET_LINE_CONDITION              = CM_SET_LINE_CONDITION,
+        K_CM_SEND_LINE_CONDITION             = CM_SEND_LINE_CONDITION,
+        K_CM_SET_CALLER_CATEGORY             = CM_SET_CALLER_CATEGORY,
+        K_CM_DIAL_MFC                        = CM_DIAL_MFC,
+#if !K3L_AT_LEAST(2,0,0)
+        K_CM_VOIP_START_DEBUG                = CM_VOIP_START_DEBUG,
+        K_CM_VOIP_STOP_DEBUG                 = CM_VOIP_STOP_DEBUG,
+        K_CM_VOIP_DUMP_STAT                  = CM_VOIP_DUMP_STAT,
+        K_CM_ISDN_DEBUG                      = CM_ISDN_DEBUG,
+        K_CM_PING                            = CM_PING,
+        K_CM_LOG_REQUEST                     = CM_LOG_REQUEST,
+        K_CM_LOG_CREATE_DISPATCHER           = CM_LOG_CREATE_DISPATCHER,
+        K_CM_LOG_DESTROY_DISPATCHER          = CM_LOG_DESTROY_DISPATCHER,
+#endif
+#if K3L_AT_LEAST(1,6,0)
+        K_CM_START_CADENCE                   = CM_START_CADENCE,
+        K_CM_STOP_CADENCE                    = CM_STOP_CADENCE,
+        K_CM_CHECK_NEW_SMS                   = CM_CHECK_NEW_SMS,
+        K_CM_SEND_TO_MODEM                   = CM_SEND_TO_MODEM,
+#endif
+#if K3L_AT_LEAST(2,1,0)
+        K_CM_START_FAX_TX                    = CM_START_FAX_TX,
+        K_CM_STOP_FAX_TX                     = CM_STOP_FAX_TX,
+        K_CM_ADD_FAX_FILE                    = CM_ADD_FAX_FILE,
+        K_CM_ADD_FAX_PAGE_BREAK              = CM_ADD_FAX_PAGE_BREAK,
+        K_CM_START_FAX_RX                    = CM_START_FAX_RX,
+        K_CM_STOP_FAX_RX                     = CM_STOP_FAX_RX,
+        K_CM_SIM_CARD_SELECT                 = CM_SIM_CARD_SELECT,
+#endif
+
+#if K3L_AT_LEAST(2,1,0)
+        K_CM_NOTIFY_WATCHDOG                = CM_NOTIFY_WATCHDOG,
+        K_CM_STOP_WATCHDOG                  = CM_STOP_WATCHDOG,
+        K_CM_WATCHDOG_COUNT                 = CM_WATCHDOG_COUNT,
+        K_CM_START_WATCHDOG                 = CM_START_WATCHDOG,
+#endif
+
+    }
+    kcommand;
+
+    typedef enum
+    {
+        K_EV_CHANNEL_FREE                    = EV_CHANNEL_FREE,
+        K_EV_CONNECT                         = EV_CONNECT,
+        K_EV_DISCONNECT                      = EV_DISCONNECT,
+        K_EV_CALL_SUCCESS                    = EV_CALL_SUCCESS,
+        K_EV_CALL_FAIL                       = EV_CALL_FAIL,
+        K_EV_NO_ANSWER                       = EV_NO_ANSWER,
+        K_EV_BILLING_PULSE                   = EV_BILLING_PULSE,
+        K_EV_SEIZE_SUCCESS                   = EV_SEIZE_SUCCESS,
+        K_EV_SEIZE_FAIL                      = EV_SEIZE_FAIL,
+        K_EV_SEIZURE_START                   = EV_SEIZURE_START,
+        K_EV_CAS_LINE_STT_CHANGED            = EV_CAS_LINE_STT_CHANGED,
+        K_EV_CAS_MFC_RECV                    = EV_CAS_MFC_RECV,
+        K_EV_NEW_CALL                        = EV_NEW_CALL,
+        K_EV_USER_INFORMATION                = EV_USER_INFORMATION,
+        K_EV_DIALED_DIGIT                    = EV_DIALED_DIGIT,
+#if K3L_AT_LEAST(1,6,0)
+        K_EV_SIP_REGISTER_INFO               = EV_SIP_REGISTER_INFO,
+        K_EV_RING_DETECTED                   = EV_RING_DETECTED,
+#endif
+        K_EV_CALL_HOLD_START                 = EV_CALL_HOLD_START,
+        K_EV_CALL_HOLD_STOP                  = EV_CALL_HOLD_STOP,
+#if K3L_AT_LEAST(1,6,0)
+        K_EV_SS_TRANSFER_FAIL                = EV_SS_TRANSFER_FAIL,
+        K_EV_FLASH                           = EV_FLASH,
+#endif
+        K_EV_DTMF_DETECTED                   = EV_DTMF_DETECTED,
+        K_EV_DTMF_SEND_FINISH                = EV_DTMF_SEND_FINISH,
+        K_EV_AUDIO_STATUS                    = EV_AUDIO_STATUS,
+        K_EV_CADENCE_RECOGNIZED              = EV_CADENCE_RECOGNIZED,
+        K_EV_END_OF_STREAM                   = EV_END_OF_STREAM,
+        K_EV_PULSE_DETECTED                  = EV_PULSE_DETECTED,
+        K_EV_POLARITY_REVERSAL               = EV_POLARITY_REVERSAL,
+#if K3L_AT_LEAST(1,6,0)
+        K_EV_ISDN_PROGRESS_INDICATOR         = EV_ISDN_PROGRESS_INDICATOR,
+        K_EV_CALL_ANSWER_INFO                = EV_CALL_ANSWER_INFO,
+        K_EV_COLLECT_CALL                    = EV_COLLECT_CALL,
+        K_EV_SIP_DTMF_DETECTED               = EV_SIP_DTMF_DETECTED,
+        K_EV_RECV_FROM_MODEM                 = EV_RECV_FROM_MODEM,
+        K_EV_NEW_SMS                         = EV_NEW_SMS,
+        K_EV_SMS_INFO                        = EV_SMS_INFO,
+        K_EV_SMS_DATA                        = EV_SMS_DATA,
+        K_EV_SMS_SEND_RESULT                 = EV_SMS_SEND_RESULT,
+#endif
+#if K3L_HAS_MPTY_SUPPORT
+        K_EV_CALL_MPTY_START                 = EV_CALL_MPTY_START,
+        K_EV_CALL_MPTY_STOP                  = EV_CALL_MPTY_STOP,
+        K_EV_GSM_COMMAND_STATUS              = EV_GSM_COMMAND_STATUS,
+#endif
+        K_EV_CHANNEL_FAIL                    = EV_CHANNEL_FAIL,
+        K_EV_REFERENCE_FAIL                  = EV_REFERENCE_FAIL,
+        K_EV_INTERNAL_FAIL                   = EV_INTERNAL_FAIL,
+        K_EV_HARDWARE_FAIL                   = EV_HARDWARE_FAIL,
+        K_EV_LINK_STATUS                     = EV_LINK_STATUS,
+#if K3L_AT_LEAST(1,6,0)
+        K_EV_PHYSICAL_LINK_UP                = EV_PHYSICAL_LINK_UP,
+        K_EV_PHYSICAL_LINK_DOWN              = EV_PHYSICAL_LINK_DOWN,
+#endif
+        K_EV_CLIENT_RECONNECT                = EV_CLIENT_RECONNECT,
+        K_EV_VOIP_SEIZURE                    = EV_VOIP_SEIZURE,
+        K_EV_SEIZURE                         = EV_SEIZURE,
+
+#if K3L_AT_LEAST(2,1,0)
+        K_EV_FAX_CHANNEL_FREE                = EV_FAX_CHANNEL_FREE,
+        K_EV_FAX_FILE_SENT                   = EV_FAX_FILE_SENT,
+        K_EV_FAX_FILE_FAIL                   = EV_FAX_FILE_FAIL,
+        K_EV_FAX_MESSAGE_CONFIRMATION        = EV_FAX_MESSAGE_CONFIRMATION,
+        K_EV_FAX_TX_TIMEOUT                  = EV_FAX_TX_TIMEOUT,
+        K_EV_FAX_PAGE_CONFIRMATION           = EV_FAX_PAGE_CONFIRMATION,
+        K_EV_FAX_REMOTE_INFO                 = EV_FAX_REMOTE_INFO,
+#endif
+
+#if K3L_AT_LEAST(2,1,0)
+        K_EV_WATCHDOG_COUNT                 = EV_WATCHDOG_COUNT,
+#endif
+
+#if !K3L_AT_LEAST(2,0,0)
+        K_EV_PONG                            = EV_PONG,
+#endif
+    }
+    kevent;
+
+    typedef enum
+    {
+        R2_COUNTRY_ARG = 1,
+        R2_COUNTRY_BRA = 2,
+        R2_COUNTRY_CHI = 3,
+        R2_COUNTRY_MEX = 4,
+        R2_COUNTRY_URY = 5,
+        R2_COUNTRY_VEN = 6
+    }
+    R2CountryType;
+
+    typedef enum
+    {
+        HUMAN,
+        EXACT
+    }
+    Presentation;
+
+    /* dynamic (object) stuff */
+
+    Verbose(K3LAPI & api): _api(api) {};
+
+#if K3L_AT_LEAST(2,0,0)
+    std::string event(int32, K3L_EVENT*, R2CountryType r2_country = R2_COUNTRY_BRA,
+        Presentation fmt = HUMAN);
+#else
+    std::string event(int32, K3L_EVENT*, Presentation fmt = HUMAN);
+#endif
+
+    std::string channelStatus(int32, int32, int32, Presentation fmt = HUMAN);
+
+    /* end of dynamic (object) stuff */
+
+ protected:
+    K3LAPI & _api;
+
+    /* used internally */
+    struct internal_not_found {};
+
+ public:
+
+    /* static (class) stuff */
+
+    static std::string echoLocation(KEchoLocation, Presentation fmt = HUMAN);
+    static std::string echoCancellerConfig(KEchoCancellerConfig, Presentation fmt = HUMAN);
+
+#if K3L_AT_LEAST(2,0,0)
+    static std::string event(KSignaling, int32, K3L_EVENT*, R2CountryType = R2_COUNTRY_BRA,
+        Presentation fmt = HUMAN);
+#else
+    static std::string event(KSignaling, int32, K3L_EVENT*, Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(2,0,0)
+    static std::string command(int32, K3L_COMMAND*, R2CountryType = R2_COUNTRY_BRA,
+         Presentation fmt = HUMAN);
+    static std::string command(int32, int32, int32, const char *, R2CountryType = R2_COUNTRY_BRA,
+         Presentation fmt = HUMAN);
+#else
+    static std::string command(int32, K3L_COMMAND*, Presentation fmt = HUMAN);
+    static std::string command(int32, int32, int32, const char *, Presentation fmt = HUMAN);
+#endif
+
+
+    static std::string deviceName(KDeviceType, int32, Presentation fmt = HUMAN);
+
+    static std::string deviceType(KDeviceType, Presentation fmt = HUMAN);
+    static std::string deviceModel(KDeviceType, int32, Presentation fmt = HUMAN);
+
+    static std::string channelFeatures(int32, Presentation fmt = HUMAN);
+    static std::string signaling(KSignaling, Presentation fmt = HUMAN);
+    static std::string systemObject(KSystemObject, Presentation fmt = HUMAN);
+    static std::string mixerTone(KMixerTone, Presentation fmt = HUMAN);
+    static std::string mixerSource(KMixerSource, Presentation fmt = HUMAN);
+
+    static std::string seizeFail(KSeizeFail, Presentation fmt = HUMAN);
+
+#if K3L_AT_LEAST(2,0,0)
+    static std::string callFail(KSignaling, R2CountryType, int32, Presentation fmt = HUMAN);
+#else
+    static std::string callFail(KSignaling, int32, Presentation fmt = HUMAN);
+#endif
+
+    static std::string channelFail(KSignaling, int32, Presentation fmt = HUMAN);
+    static std::string internalFail(KInternalFail, Presentation fmt = HUMAN);
+
+    static std::string linkErrorCounter(KLinkErrorCounter, Presentation fmt = HUMAN);
+
+    static std::string linkStatus(KSignaling, int32, Presentation fmt = HUMAN);
+    static std::string channelStatus(KSignaling, int32, Presentation fmt = HUMAN);
+    static std::string callStatus(KCallStatus, Presentation fmt = HUMAN);
+    static std::string status(KLibraryStatus, Presentation fmt = HUMAN);
+
+#if K3L_AT_LEAST(2,0,0)
+    static std::string signGroupB(KSignGroupB, R2CountryType contry = R2_COUNTRY_BRA,
+        Presentation fmt = HUMAN);
+#else
+    static std::string signGroupB(KSignGroupB, Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(2,0,0)
+    static std::string signGroupII(KSignGroupII, R2CountryType contry = R2_COUNTRY_BRA,
+        Presentation fmt = HUMAN);
+#else
+    static std::string signGroupII(KSignGroupII, Presentation fmt = HUMAN);
+#endif
+
+    static std::string h100configIndex(KH100ConfigIndex, Presentation fmt = HUMAN);
+
+    static std::string eventName(int32);
+    static std::string commandName(int32);
+
+#if K3L_AT_LEAST(1,5,0)
+    static std::string sipFailures(KSIP_Failures, Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(1,5,1)
+    static std::string isdnCause(KQ931Cause, Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(1,5,2)
+    static std::string isdnDebug(int32, Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+    static std::string callStartInfo(KCallStartInfo, Presentation fmt = HUMAN);
+
+    static std::string gsmCallCause(KGsmCallCause, Presentation fmt = HUMAN);
+    static std::string gsmMobileCause(KGsmMobileCause, Presentation fmt = HUMAN);
+    static std::string gsmSmsCause(KGsmSmsCause, Presentation fmt = HUMAN);
+
+    static std::string q931ProgressIndication(KQ931ProgressIndication,
+        Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(2,1,0)
+    static std::string faxResult(KFaxResult code, Presentation fmt = HUMAN);
+    static std::string faxFileErrorCause(KFaxFileErrorCause code, Presentation fmt = HUMAN);
+#endif
+
+    /* end of static (class) stuff */
+
+ private:
+    static std::string internal_deviceType(KDeviceType);
+    static std::string internal_deviceModel(KDeviceType, int32);
+
+#if K3L_AT_LEAST(1,5,0)
+    static std::string internal_sipFailures(KSIP_Failures, Presentation fmt = HUMAN);
+#endif
+#if K3L_AT_LEAST(1,5,1)
+    static std::string internal_isdnCause(KQ931Cause, Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(2,0,0)
+    static std::string internal_signGroupB(KSignGroupB, R2CountryType contry, Presentation fmt = HUMAN);
+    static std::string internal_signGroupII(KSignGroupII, R2CountryType contry, Presentation fmt = HUMAN);
+#else
+    static std::string internal_signGroupB(KSignGroupB, Presentation fmt = HUMAN);
+    static std::string internal_signGroupII(KSignGroupII, Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+    static std::string internal_gsmCallCause(KGsmCallCause, Presentation fmt = HUMAN);
+    static std::string internal_gsmMobileCause(KGsmMobileCause, Presentation fmt = HUMAN);
+    static std::string internal_gsmSmsCause(KGsmSmsCause, Presentation fmt = HUMAN);
+
+    static std::string internal_q931ProgressIndication(KQ931ProgressIndication, Presentation fmt = HUMAN);
+#endif
+
+ private:
+    enum Type
+    {
+        DEVICE,
+        CHANNEL,
+        PLAYER,
+        MIXER,
+        LINK,
+        NONE
+    };
+
+    struct Target
+    {
+        Target(Type _type)
+        : type(_type), device(-1), object(-1)
+        {};
+
+        Target(Type _type, int32 _device)
+        : type(_type), device(_device), object(-1)
+        {};
+
+        Target(Type _type, int32 _device, int32 _object)
+        : type(_type), device(_device), object(_object)
+        {};
+
+        Type  type;
+        int32 device;
+        int32 object;
+    };
+
+    static void generate(std::string &, std::string &, Target, std::string &);
+
+    static std::string show(std::string &, std::string, Target, std::string &);
+    static std::string show(std::string &, std::string, Target);
+
+    template < typename ReturnType >
+    static ReturnType presentation(Presentation fmt, ReturnType str_exact, ReturnType str_human)
+    {
+        switch (fmt)
+        {
+            case HUMAN: return str_human;
+            case EXACT: return str_exact;
+        };
+
+        return str_exact;
+    }
+};
+
+#endif /* _VERBOSE_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/docs/Manual.html b/src/mod/endpoints/mod_khomp/docs/Manual.html
new file mode 100644
index 0000000000..863ef76847
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/docs/Manual.html
@@ -0,0 +1,1083 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>Mod Khomp: Manual</title></head><body>
+<a name="Considera.C3.A7.C3.B5es_iniciais" id="Considera.C3.A7.C3.B5es_iniciais"></a><h1> <span class="mw-headline"> Considerações iniciais </span></h1>
+<p>Este documento aborda informações sobre o <i>Endpoint</i> da Khomp como um todo, desde opções disponíveis de configuração, os <i>applications</i> disponibilizados, os possíveis comandos de <b>CLI</b>, entre outros.
+</p><p>Para procedimentos sobre a instalação, favor consultar o <a href=".htmlMod_Khomp/README" title="Mod Khomp/README">README do Endpoint</a>.
+<br />
+</p>
+<a name="Configura.C3.A7.C3.A3o" id="Configura.C3.A7.C3.A3o"></a><h1> <span class="mw-headline"> Configuração </span></h1>
+<p>Configurar o Endpoint da Khomp é uma tarefa que consiste de três etapas:
+</p>
+<ul><li> Configuração das placas, através da K3L;
+</li><li> Configuração do Endpoint;
+</li><li> Configuração do FreeSWITCH.
+</li></ul>
+<p>Estas etapas são descritas mais detalhadamente abaixo.
+<br />
+</p>
+<a name="Configura.C3.A7.C3.A3o_da_API_K3L" id="Configura.C3.A7.C3.A3o_da_API_K3L"></a><h2> <span class="mw-headline"> Configuração da API K3L </span></h2>
+<p>Esta etapa é realizada de maneira semi-automatizada através do programa <b>khompwizard</b>, um assistente que configura os parâmetros básicos das placas do sistema. Esse assistente inicializa os arquivos de configuração através de informações obtidas do usuário, quando estas forem necessárias, inicializando as configurações menos utilizadas com os valores padrões.
+</p><p>Normalmente, este programa é executado automaticamente após a instalação do sistema. Entretanto, pode ser necessário executá-lo manualmente caso uma atualização esteja sendo realizada, ou se novas placas foram adicionadas no sistema após a instalação dos <i>drivers</i> da placa.
+</p><p>Caso seja necessária a configuração de parâmetros avançados da placa e/ou da sinalização, o programa <b>k3lconfig</b> permite acessar todas as configurações disponíveis de cada placa instalada. Para maiores informações sobre este programa, consulte a documentação do mesmo. Para soluções de problemas de sincronismo, consulte a seção <a href="#Solu.C3.A7.C3.A3o_de_problemas" title="">Solução de problemas</a> sobre o procedimento de configuração manual das placas.
+<br />
+</p>
+<a name="Configura.C3.A7.C3.A3o_do_Endpoint" id="Configura.C3.A7.C3.A3o_do_Endpoint"></a><h2> <span class="mw-headline"> Configuração do Endpoint </span></h2>
+<p>A configuração padrão do sistema costuma atender à maior parte das necessidades. Entretanto, as configurações do Endpoint da Khomp podem ser modificadas através do arquivo de configuração '<b>/usr/local/freeswitch/conf/autoload_configs/khomp.conf.xml'</b>.
+</p><p>A lista de opções é a seguinte:
+</p>
+<a name=".3Cchannels.3E" id=".3Cchannels.3E"></a><h4> <span class="mw-headline"> &lt;channels&gt; </span></h4>
+<p>Define as configurações gerais de todos os canais da Khomp.
+</p>
+<pre><b>Sintaxe:</b> &lt;param name="..." value="..."/&gt;
+</pre>
+<ul><li><b>dialplan</b>: Nome do módulo de <i>dialplan</i> em uso.
+</li><li><b>auto-fax-adjustment</b>: Ativa ("yes") ou desativa ("no") o ajuste automático do canal (desabilitar o cancelador de eco e a supressão DTMF) ao detectar tom de FAX; 
+</li><li><b>auto-gain-control</b>: Ativa ("yes") ou desativa ("no") a ativação do controle automático de ganho (AGC) pelo Endpoint; 
+</li><li><b>context-digital</b>: Contexto de entrada para ligações em placas digitais (o padrão é "khomp-DD-LL", onde "DD" será substituído, no momento da ligação, pelo número do dispositivo, "LL" pelo número do link, "CCC" pelo número do canal e "SSSS" pelo número serial do dispositivo); 
+</li><li><b>context-fxo</b>: Contexto de entrada para placas FXO (o padrão é "khomp-DD-CC", onde "DD" será substituído, no momento da ligação, pelo número do dispositivo, "CC" pelo número do canal, e "SSSS" pelo número serial do dispositivo); 
+</li><li><b>context-fxs</b>: Contexto de entrada para placas FXS (o padrão é "khomp-DD-CC", onde "DD" será substituído, no momento da ligação, pelo número do dispositivo, "CC" pelo número do canal, e "SSSS" pelo número serial do dispositivo); 
+</li><li><b>context-gsm-call</b> (ou "context-gsm"): Contexto de entrada para ligações GSM (o padrão é "khomp-DD-CC", onde "DD" será substituído no momento da ligação pelo número do dispositivo, "CC" pelo número do canal, e "SSSS" pelo número serial do dispositivo); 
+</li><li><b>context-gsm-sms</b>: Contexto de entrada para SMSs (o padrão é "khomp-sms-DD-CC", onde "DD" será substituído pelo número de dispositivo, "CC" pelo número do canal, e "SSSS" pelo número serial do dispositivo);
+</li><li><b>context-pr</b>: Contexto de entrada para ligações em placas KPR (o padrão é "khomp-DD-CC", onde "DD" será substituído, no momento da ligação, pelo número do dispositivo, "CC" pelo número do canal); 
+</li><li><b>disconnect-delay</b>: Define o tempo em milissegundos para realizar o processamento de um evento de desconexão, para ignorar situações onde outros equipamentos realizam o duplo atendimento para derrubar chamadas a cobrar;
+</li><li><b>echo-canceller</b>: Ativa ("yes") ou desativa ("no") o cancelamento de eco automático pelo Endpoint; 
+</li><li><b>fxo-send-pre-audio</b>: Quando ativada ("yes") libera canal de áudio sainte antes da conexão da chamada em placas KFXO (o valor padrão é "yes");
+</li><li><b>fxs-global-orig</b>: Número inicial para numeração seqüencial de ramais das placas <b>KFXS</b> que não estiverem listadas na seção <b>&lt;fxs-branches&gt;</b> (a numeração segue ordem crescente por número da placa e número do canal físico) (o padrão é "0"); 
+</li><li><b>fxs-co-dialtone</b>: Seqüências de números, separados por vírgula, que disparam um tom contínuo (de central pública) em ramais FXS (ex: "0,99" faz com que, ao discar "0" ou "99", o usuário receba o tom de linha contínuo) (o padrão é vazio);
+</li><li><b>fxs-bina</b>: Quando ativada ("yes"), ligações para ramais FXS enviarão os dígitos correspondentes ao telefone de origem em sinalização BINA DTMF (o valor padrão é "no");
+</li><li><b>input-volume</b>: Define o volume de entrada das ligações, varia de -10 a +10&nbsp;; 
+</li><li><b>kommuter-activation</b>: Define se a ativação de dispositivos kommuter encontrados no sistema será feita de forma automática ("auto"), ou de forma manual ("manual") pelo usuário, através do comando "khomp kommuter on/off"; 
+</li><li><b>kommuter-timeout</b>: Define o <i>timeout</i> (em segundos) com que os kommuters serão inicializados. Se chegarem a este <i>timeout</i> sem receberem notificação do channel, os dispositivos irão comutar para o estado "desligado". O valor mínimo é "0" , onde os links permanecerão sempre comutados no estado "ligado", e o valor máximo é "255"; 
+</li><li><b>language</b>: Define idioma para ligações nas placas Khomp; 
+</li><li><b>log-to-console</b>: Define mensagens de log que devem ser impressas na console; 
+</li><li><b>log-to-disk</b>: Define mensagens de log que devem ser salvar em disco; 
+</li><li><b>out-of-band-dtmfs</b>: Ativa ("yes") ou desativa ("no") a supressão DTMF e o envio destes out-of-band; 
+</li><li><b>output-volume</b>: Define o volume de saída das ligações, varia de -10 a +10&nbsp;; 
+</li><li><b>pulse-forwarding</b>: Ativa ("yes") ou desativa ("no") a detecção de pulsos e a conversão dos mesmos em DTMFs; 
+</li><li><b>r2-preconnect-wait</b>: Define o tempo de espera do envio da sinalização de ringback, no protocolo R2/MFC, para iniciar o envio de áudio de silêncio. Apenas utilizado quando "r2-strict-behaviour" estiver ajustado para "no"; 
+</li><li><b>r2-strict-behaviour</b>: Ativa ("yes") ou desativa ("no") o comportamento da sinalização R2/MFC conforme a norma define. O padrão é "no", e pode ser alterado para "yes" caso seja necessário receber/enviar dados precisos da sinalização do protocolo (condição de B, por exemplo); 
+</li><li><b>ringback-delay-co</b>: Define o tempo de <i>delay</i> para ativar a geração de tom de controle de chamada (<i>ringback</i>) pelo Endpoint da Khomp quando há uma indicação de <i>ringback</i>, e não há áudio sendo enviado por quem indicou a situação de controle da chamada;
+</li><li><b>ringback-delay-pbx</b>: Define o tempo de <i>delay</i> para ativar a geração de controle de chamada (<i>ringback</i>) pelo Endpoint da Khomp quando há uma indicação de <i>ringback</i>, e o áudio de controle enviado não possui nenhum tom (ou seja, está em silêncio);
+</li><li><b>suppression-delay</b>: Ativa ("yes") ou desativa ("no") o delay necessário para supressão DTMF. Se desativado ("no"), também desativa supressão de DTMFs; 
+</li><li><b>trace</b>: Define opções de depuração. Não deve ser utilizado em produção a não ser que estritamente necessário;
+</li><li><b>user-transfer-digits</b>: Define uma seqüência de dígitos DTMF para iniciar a transferencia entre o FreeSWITCH&reg; e um outro PABX (utilizando sinalização de usuário, como QSig ou FXO FLASH);
+</li><li><b>flash-to-digits</b>: Define os dígitos para serem enviados quando o FLASH é detectado na FXS;
+</li></ul>
+<p><br />
+</p>
+<a name=".3Cgroups.3E" id=".3Cgroups.3E"></a><h4> <span class="mw-headline"> &lt;groups&gt; </span></h4>
+<p>Define os grupos para serem usados na alocação de canal.
+</p><p>Neste caso, as opções são usadas para definir nomes para <i>strings de alocação de canais</i>. O formato segue o padrão &lt;param name="nome grupo" value="string alocação"/&gt;, onde as <i>strings de alocação de canais</i> são as mesmas utilizadas no application bridge, e <i>nome do grupo</i> é um nome arbitrário escolhido pelo usuário. 
+</p>
+<dl><dd>Por exemplo, para definir o grupo <b>pstn</b> como os canais 0 e 5 da placa 0, deveria-se utilizar a linha:
+</dd></dl>
+<pre>&lt;param name="pstn" value="b0c0 + b0c5"/&gt; 
+</pre>
+<p>Este grupo, por sua vez, poderia ser usado no <i>application bridge</i> como <b>&lt;action application="bridge" data="Khomp/Gpstn/..."/&gt;</b>.
+</p>
+<dl><dd>Pode-se também associar um determinado contexto de entrada a um grupo de canais, bastando especificar um nome de contexto após a <i>string</i> de alocação, separado por ':' da mesma.
+</dd></dl>
+<p>Por exemplo, para definir o mesmo grupo <b>pstn</b> acima como os canais 0 até 20 da placa 0, com contexto de entrada <b>from-pstn</b>, poderia-se utilizar a linha:
+</p>
+<pre>&lt;param name="pstn" value="b0c0-20:from-pstn"/&gt;
+</pre>
+<p>Este grupo, por sua vez, poderia ser usado no <i>application bridge</i> como <b>&lt;action application="bridge" data="Khomp/Gpstn/..."/&gt;</b>, e todas as ligações vindas destes canais seriam tratadas no contexto <b>from-pstn</b>.
+<br />
+</p>
+<a name=".3Ccadences.3E" id=".3Ccadences.3E"></a><h4> <span class="mw-headline"> &lt;cadences&gt; </span></h4>
+<p>Define configurações de cadências para o Endpoint. 
+</p><p>Neste caso, as opções são nomes de cadências e um ou dois pares de números, que definem os intervalos de tom e silêncio a ser utilizado nas cadências. Para maiores detalhes, favor consultar o arquivo de configuração.
+<br />
+</p>
+<a name=".3Cfxs-branches.3E" id=".3Cfxs-branches.3E"></a><h4> <span class="mw-headline"> &lt;fxs-branches&gt; </span></h4>
+<p>Define números de origem para a placa KFXS. 
+</p><p>Neste caso, as opções são seqüências de prefixos de ramais e números seriais das placas, que definem os números base dos endereços de origem, e a ordem numérica das placas. O formato das opções é:
+</p>
+<pre>&lt;param name="prefixo" value="serial1, serial2, ...."/&gt;
+</pre>
+<p>Por exemplo, para definir que as placas K0374 e K2352 devem ser numeradas seqüencialmente, partido do ramal 200, basta escrever:
+</p>
+<pre>&lt;param name="200" value="374, 2352"/&gt;
+</pre>
+<p>Para maiores detalhes, favor consultar o arquivo de configuração.
+<br />
+</p>
+<a name=".3Cfxs-hotlines.3E" id=".3Cfxs-hotlines.3E"></a><h4> <span class="mw-headline"> &lt;fxs-hotlines&gt; </span></h4>
+<p>Define hotlines para a placa KFXS.
+</p><p>Neste caso, as opções são seqüências de ramais e números de destino, definindo os ramais listados nesta seção para serem tratados como "hotlines". Para cada ramal listado, o número de destino especificado será discado quando o ramal for retirado do gancho. Exemplo:
+</p>
+<pre>&lt;param name="100" value="1234"/&gt;
+&lt;param name="200" value="4321"/&gt; 
+</pre>
+<p>No primeiro exemplo, o ramal de número 100 irá telefonar para número 1234 ao ser retirado do gancho; no segundo, o ramal de número 200 irá telefonar para o número 4321 ao ser retirado do gancho.
+</p>
+<a name=".3Cfxs-options.3E" id=".3Cfxs-options.3E"></a><h4> <span class="mw-headline"> &lt;fxs-options&gt; </span></h4>
+<p>Permite definir configurações específicas por ramal FXS.
+</p><p>Neste caso, as configurações são números de ramais (baseado nos definidos na seção &lt;fxs-branches&gt;), e as opções e seus valores. As opções disponíveis são: 
+</p>
+<ul><li>context; 
+</li><li>input-volume; 
+</li><li>output-volume; 
+</li><li>accountcode; 
+</li><li>calleridnum; 
+</li><li>calleridname;
+</li><li>mailbox;
+</li><li>flash-to-digits.
+</li></ul>
+<p>Cada opção é separada uma da outra por um pipe "|" ou uma barra "/" e definidas após dois pontos ":", exemplo:
+</p>
+<pre> &lt;param name="200" value="language:en|context:master-branch" /&gt;
+</pre>
+<p>Para maiores informações sobre a sintaxe e exemplos, favor consultar o arquivo de configuração.
+</p><p><br />
+</p><p>Para maiores informações, consultar o arquivo de configuração '<b>khomp.conf.xml'</b>.
+<br />
+</p>
+<a name="Configura.C3.A7.C3.A3o_do_FreeSWITCH" id="Configura.C3.A7.C3.A3o_do_FreeSWITCH"></a><h2> <span class="mw-headline"> Configuração do FreeSWITCH </span></h2>
+<p>Quando as ligações são recebidas nas placas e dispositivos Khomp, estas são encaminhadas pelo <i>Endpoint</i> da Khomp para contextos específicos dentro do plano de discagem do FreeSWITCH&reg;. Estes contextos podem ser alterados através do arquivo de configurações <b>khomp.conf.xml</b>, disponível no diretório de configuração do FreeSWITCH (por padrão, "<b>/usr/local/freeswitch/conf/autoload_configs</b>").
+</p><p>Para maiores detalhes sobre os contextos específicos, consultar a seção de <a href="#Configura.C3.A7.C3.A3o_do_Endpoint" title="">Configuração do Endpoint</a>.
+</p><p>Abaixo, encontram-se informações de como configurar os contextos de entrada de chamadas:
+<br />
+</p><p><br />
+</p>
+<a name="Contextos_de_entrada_em_canais_E1" id="Contextos_de_entrada_em_canais_E1"></a><h3> <span class="mw-headline"> Contextos de entrada em canais E1 </span></h3>
+<p>Para placas E1, as ligações de entrada por padrão chegam em um contexto pré-definido conforme a opção <b>context-digital</b>:
+</p>
+<pre>&lt;param name="context-digital" value="khomp-DD-LL"/&gt;
+</pre>
+<p>Este contexto padrão define que as ligações serão redirecionadas de acordo com o número da placa e número do <i>link</i>: <b>DD</b> é o número dispositivo (com dois dígitos), e <b>LL</b> é o número do <i>link</i> (também com dois dígitos).
+</p><p>Entretanto, é possível configurar outros contextos de entrada, com formatos diferenciados. Pode-se utilizar a opção <b>CCC</b>, que significa o número do canal na placa (com três dígitos), e <b>SSSS</b>, que representa o número serial da placa (com quatro dígitos).
+</p><p>Exemplos de configuração no arquivo <b>khomp.conf.xml</b>:
+</p>
+<pre>&lt;!-- número seqüencial da placa e do link (ex: khomp-01-00) --&gt;
+&lt;param name="context-digital" value="khomp-DD-LL"/&gt;
+</pre>
+<pre>&lt;!-- número serial da placa e seqüencial do link (ex: khomp-3049-00) --&gt;
+&lt;param name="context-digital" value="khomp-SSSS-LL"/&gt;
+</pre>
+<pre>&lt;!-- número seqüencial da placa e do canal (ex: khomp-00-001) --&gt;
+&lt;param name="context-digital" value="khomp-DD-CCC"/&gt;
+</pre>
+<pre>&lt;!-- recebe todas as chamadas em um só contexto (khomp-digital) --&gt;
+&lt;param name="context-digital" value="khomp-digital"/&gt;
+</pre>
+<p>Abaixo um exemplo de contexto no plano de discagem:
+<!-- NEED 6 -->
+</p>
+<pre>&lt;!-- 
+Este contexto presente em seu arquivo de dialplan, irá manipular chamadas
+de entrada no link 0 (primeiro link) da placa 0.
+--&gt;
+&lt;context name="khomp-00-00"&gt;
+             .
+             .
+             .
+&lt;/context&gt;
+</pre>
+<p>Outro exemplo, utilizando o mesmo formato:
+<!-- NEED 6 -->
+</p>
+<pre>&lt;!-- 
+Este contexto presente em seu arquivo de dialplan, irá manipular chamadas
+de entrada no link 1 (segundo link) da placa 0.
+--&gt;
+&lt;context name="khomp-00-01&gt;
+             .
+             .
+             .
+&lt;/context&gt;
+</pre>
+<p>Um exemplo completo, com algumas ações simples:
+<!-- NEED 10 -->
+</p>
+<pre>&lt;context name="khomp-00-00"&gt;
+    &lt;extension name="exemplo_1"&gt;
+        &lt;condition field="destination_number" expression="^1234$"&gt;
+            &lt;action application="bridge" data="Khomp/b0L1/2345"/&gt;
+        &lt;/condition&gt;
+    &lt;/extension&gt;
+    &lt;extension name="exemplo_2"&gt;
+        &lt;condition field="destination_number" expression="^23(\d{2})$"&gt;
+            &lt;action application="bridge" data="sofia/${use_profile}/11$1@${sip_from_host}"/&gt;
+        &lt;/condition&gt;
+    &lt;/extension&gt;
+&lt;/context&gt;
+</pre>
+<pre>&lt;context name="khomp-00-01"&gt;
+    &lt;extension name="exemplo_3"&gt;
+        &lt;condition field="destination_number" expression="^1111$"&gt;
+            &lt;action application="bridge" data="Khomp/b0L0/2345"/&gt;
+        &lt;/condition&gt;
+    &lt;/extension&gt;
+&lt;/context&gt;
+</pre>
+<p>Este plano de discagem define o recebimento de chamadas na placa <b>0</b> e no link <b>0</b>, redirecionando chamadas para o número 1234 feitas para o link <b>1</b> da placa <b>0</b>, pro ramal/telefone <b>2345</b>, e redirecionando qualquer número de quatro dígitos começado com <b>23</b> para telefones SIP de quatro dígitos começados com <b>11</b> mais os dois últimos dígitos recebidos.
+</p><p>Também há mais uma extensão definida, onde as ligações recebidas no link <b>1</b> da placa <b>0</b> para o número <b>1111</b>, são redirecionadas para o link <b>0</b> da placa <b>0</b>, para o telefone/ramal <b>2345</b>.
+<br />
+</p>
+<a name="Contextos_de_entrada_em_canais_FXS.2FFXO.2FGSM" id="Contextos_de_entrada_em_canais_FXS.2FFXO.2FGSM"></a><h3> <span class="mw-headline"> Contextos de entrada em canais FXS/FXO/GSM </span></h3>
+<p>Da mesma forma que no contexto de placas E1, as ligações de entrada são encaminhadas pelo <i>Endpoint</i> para o FreeSWITCH. 
+</p><p>O contexto é pré-definido da seguinte forma, conforme o arquivo <b>khomp.conf.xml</b>:
+</p>
+<pre>&lt;param name="context-gsm" value="khomp-DD-CC"/&gt;&nbsp;;placas GSM
+</pre>
+<pre>&lt;param name="context-fxs" value="khomp-DD-CC"/&gt;&nbsp;; placas FXS
+</pre>
+<pre>&lt;param name="context-fxo" value="khomp-DD-CC"/&gt;&nbsp;; placas FXO
+</pre>
+<p><br />
+Nestes casos, <b>DD</b> é o número dispositivo (com dois dígitos), e <b>CC</b> é o número do canal da placa. Pode-se utilizar também <b>SSSS</b>, que representa o número serial da placa. 
+</p>
+<ul><li> <b>IMPORTANTE</b>: No caso da placa <b>KGSM</b>, as ligações entrantes são <b>sempre</b> encaminhadas para o <i>extension</i> <b>"s"</b> por padrão, visto que o protocolo GSM não identifica o número de destino nas ligações entrantes, apenas o número de origem - quando não omitido.
+</li></ul>
+<a name="Prioridade_de_contextos_na_placa_FXS" id="Prioridade_de_contextos_na_placa_FXS"></a><h4> <span class="mw-headline"> Prioridade de contextos na placa FXS </span></h4>
+<p>Em ligações originadas a partir de um ramal FXS, o Endpoint driver procura uma extensão válida (dos dígitos discados) após o dígito <b>#</b> ou após o timeout (configurável pela opção <b>fxs-digit-timeout</b>, no arquivo <b>khomp.conf.xml</b>). Essa busca é realizada no contexto específico do ramal (definido na seção <b>&lt;fxs-options&gt;</b> do arquivo de configuração <b>khomp.conf.xml</b>), caso não seja configurado, a busca é realizada no contexto definido na opção <b>context-fxs</b>;
+</p><p><br />
+</p>
+<a name="Contextos_de_mensagens_SMS_.28apenas_GSM.29" id="Contextos_de_mensagens_SMS_.28apenas_GSM.29"></a><h3> <span class="mw-headline"> Contextos de mensagens SMS (apenas GSM) </span></h3>
+<p>Mensagens SMS são recebidas pelo <i>Endpoint</i> da Khomp e encaminhadas para o FreeSWITCH como uma ligação normal, mas sem áudio, que possui algumas variáveis ajustadas com informações recebidas na mensagem - para maiores informações sobre estas variáveis, consulte a documentação das variáveis do <i>Endpoint</i>. Este contexto também pode ser alterado, de mesma forma que o contextos acima.
+</p><p>Esta ligação entra no seguinte contexto, conforme o arquivo <b>khomp.conf.xml</b>:
+</p>
+<pre>&lt;param name="context-gsm-sms" value="khomp-sms-DD-CC"/&gt; 
+</pre>
+<p>Onde <b>DD</b> é o número dispositivo (com dois dígitos), e <b>CC</b> é o número do canal (também com dois dígitos). Por exemplo:
+</p>
+<pre>&lt;context name="khomp-sms-00-01"&gt;
+    &lt;extension name="sms"&gt;
+        &lt;condition field="destination_number" expression="^s$"&gt;
+            &lt;action application="log" data="DEBUG KSmsType=${KSmsType}"/&gt;
+            &lt;action application="log" data="DEBUG KSmsBody=${KSmsBody}"/&gt;
+        &lt;/condition&gt;
+    &lt;/extension&gt;
+&lt;/context&gt;
+</pre>
+<a name="Contexto_de_entrada_em_canais_Khomp_PR_.28KPR.29" id="Contexto_de_entrada_em_canais_Khomp_PR_.28KPR.29"></a><h3> <span class="mw-headline"> Contexto de entrada em canais Khomp_PR (KPR) </span></h3>
+<p>Para estas placas, as ligações de entrada possuem um contexto pré-definido, conforme exemplo abaixo:
+</p>
+<pre>&lt;param name="context-pr" value="khomp-DD-CC"/&gt; 
+</pre>
+<p>Neste caso, <b>DD</b> é o número do dispositivo (com dois dígitos), e <b>CC</b> é o número do canal da placa.
+<br />
+</p>
+<a name="Contextos_por_grupo_de_chamada" id="Contextos_por_grupo_de_chamada"></a><h3> <span class="mw-headline">Contextos por grupo de chamada </span></h3>
+<p>A seção <b>groups</b>, no arquivo de configuração <b>khomp.conf.xml</b>, pode ser utilizado para definir contextos específicos para determinados grupos de canais.
+</p><p>Esta seção é detalhada na seção <b>Configuração do Endpoint</b>.
+<br />
+</p>
+<a name="Utiliza.C3.A7.C3.A3o_do_application_bridge" id="Utiliza.C3.A7.C3.A3o_do_application_bridge"></a><h3> <span class="mw-headline">Utilização do <i>application</i> bridge </span></h3>
+<p>O aplicativo (ou <i>application</i>) <b>bridge</b> é responsável por gerar chamadas no FreeSWITCH a partir de um <i>dialplan</i>. Este aplicativo pode ser utilizado para gerar chamadas a partir de diversos tipos de <i>Endpoints</i>, sendo que cada <i>Endpoint</i> segue um formato específico para definir tanto as opções quanto os canais de comunicações a serem utilizados.
+</p>
+<a name="Campos_relativos_ao_Endpoint" id="Campos_relativos_ao_Endpoint"></a><h4> <span class="mw-headline"> Campos relativos ao <i>Endpoint</i> </span></h4>
+<p>Quando utilizado para canais da <b>Khomp</b>, a <i>string</i> de <b>bridge</b> pode ter dois, três ou quatro campos separados por uma barra (/). Algumas <i>strings</i> de exemplo:
+<!-- NEED 11 -->
+</p>
+<pre>&lt;action application="bridge" data="Khomp/B2L0/32625644"/&gt;
+&lt;action application="bridge" data="Khomp/*B2L0/32625644"/&gt;
+&lt;action application="bridge" data="Khomp/S0411/99991234"/&gt;
+&lt;action application="bridge" data="Khomp/Gpstn/99991234"/&gt;
+&lt;action application="bridge" data="Khomp/*Gpstn/99991234"/&gt;
+&lt;action application="bridge" data="Khomp/B2C58/32625644/category=4:orig=4855553232"/&gt;
+&lt;action application="bridge" data="Khomp/b0c9"/&gt;
+&lt;action application="bridge" data="Khomp/b0c1+b0c14"/&gt;
+&lt;action application="bridge" data="Khomp/r304"/&gt;
+</pre>
+<p>Nos cinco primeiros exemplos, temos três campos sendo especificados; no sexto, quatros campos são utilizados; e por fim, nos três últimos exemplos, apenas dois são utilizados.
+</p><p>Sobre os campos utilizados, segue a descrição:
+</p>
+<ul><li> <b>1° campo</b>, 'Khomp': identifica o tipo do <i>Endpoint</i> em questão;
+</li><li> <b>2° campo</b>, 'B2L0', 'S0411', 'Gpstn', etc: representa a <b>Política de Alocação de Canais</b>;
+</li><li> <b>3° campo</b>, '32625644' e '99991234': são os números de destino, para onde será efetuada a ligação (ausente em placas <b>KFXS</b>);
+</li><li> <b>4° campo</b>, 'category=4:orig=4855553232': opções adicionais não-obrigatórias, detalhadas mais à frente.
+</li></ul>
+<p>OBS: A <i>string</i> de <b>bridge</b> com somente dois campos é específica à ligações para uma placa KFXS, onde o destino está atrelado automaticamente ao canal alocado, ou ao ramal especificado.
+</p>
+<a name="Pol.C3.ADtica_de_aloca.C3.A7.C3.A3o_de_canais" id="Pol.C3.ADtica_de_aloca.C3.A7.C3.A3o_de_canais"></a><h4> <span class="mw-headline"> Política de alocação de canais </span></h4>
+<p>A política de alocação de canais, no módulo da <b>Khomp</b>, pode ser especificado na própria <i>string</i> de <i>bridge</i> ou através de grupos, no arquivo de configuração <b>khomp.conf.xml</b>. Para especificar placas, canais e links a serem alocados existe a seguinte sintaxe disponível (considerando X, Y e Z como números quaisquer):
+</p>
+<ul><li> b<b>X</b>      -- busca os canais na placa 'X', de maneira crescente.
+</li><li> b<b>X</b>L<b>Y</b>    -- busca canais no link 'Y' da placa 'X', fazendo uma procura crescente (com relação ao número dos canais).
+</li><li> b<b>X</b>c<b>Y</b>    -- utiliza apenas o canal 'Y' da placa 'X'.
+</li><li> b<b>X</b>c<b>Y</b>-<b>Z</b>  -- busca por canais, iniciando do canal 'Y' e indo até o canal 'Z' (inclusive), da placa 'X', de maneira crescente.
+</li><li> B<b>X</b>c<b>Y</b>-<b>Z</b>  -- idem ao anterior, de maneira decrescente.
+</li><li> s<b>X</b>      -- busca os canais na placa de serial 'X', de maneira crescente.
+</li><li> s<b>X</b>L<b>Y</b>    -- busca canais no link 'Y' da placa de serial 'X', fazendo uma procura crescente (com relação ao número dos canais).
+</li><li> s<b>X</b>c<b>Y</b>    -- utiliza apenas o canal 'Y' da placa de serial 'X'.
+</li><li> s<b>X</b>c<b>Y</b>-<b>Z</b>  -- busca por canais, iniciando do canal 'Y' e indo até o canal 'Z' (inclusive), da placa de serial 'X', de maneira crescente.
+</li><li> S<b>X</b>c<b>Y</b>-<b>Z</b>  -- idem ao anterior, de maneira decrescente.
+</li></ul>
+<p>Para buscar por ramais de placas <b>KFXS</b> de acordo com o número do ramal, pode ser utilizada a seguinte sintaxe (considerando X e Y números de ramais válidos):
+</p>
+<ul><li> r<b>X</b>      -- busca ramal 'X'.
+</li><li> R<b>X</b>      -- equivalente ao anterior.
+</li><li> r<b>X</b>-<b>Y</b>    -- busca de ramal 'X' a 'Y', ordem crescente.
+</li><li> R<b>X</b>-<b>Y</b>    -- busca de ramal 'X' a 'Y', ordem decrescente.
+</li></ul>
+<p>É interessante notar que apenas a capitalização da letra 'B', 'S' ou 'R' define a ordem de busca dos canais; se minúscula, crescente, e se maiúscula, decrescente.
+</p><p>Já para a alocação de canais através de grupos, existe a seguinte sintaxe disponível:
+</p>
+<ul><li> Ggroupname  -- utiliza a string de <i>bridge</i> definida ao grupo "groupname" no arquivo de configuração; já detalhado na seção de configuração do Endpoint.
+</li><li> ggroupname  -- equivalente ao anterior.
+</li></ul>
+<a name="Agrupando_aloca.C3.A7.C3.B5es_de_canais" id="Agrupando_aloca.C3.A7.C3.B5es_de_canais"></a><h4> <span class="mw-headline"> Agrupando alocações de canais  </span></h4>
+<p>Existem casos onde é necessário buscar canais mais de um determinado dispositivo, ou determinado grupo de ramais. Para isto, existe uma extensão disponível na string de alocação, que diz respeito ao uso do símbolo de soma (<b>+</b>) para concatenar várias <i>strings</i> de ligação, da seguinte forma: <!-- NEED 6 --> 
+</p>
+<pre>&lt;action application="bridge" data="Khomp/B1L0+B2L0/32332933"/&gt;
+&lt;action application="bridge" data="Khomp/*B2+B3+B4/99887766"/&gt;
+&lt;action application="bridge" data="Khomp/S0411+B1L0/99887766"/&gt;
+&lt;action application="bridge" data="Khomp/Gpstn1+Gpstn2/99991234"/&gt;
+&lt;action application="bridge" data="Khomp/*gOperadora1+gOperadora2/98891234"/&gt;
+</pre>
+<p>Esta extensão está disponível tanto no <i>application</i> <b>bridge</b> quanto na especificação de grupos, e pode ser utilizada para agrupar qualquer <i>string</i> de alocação válida à outra. O processamento das <i>strings</i> de alocação se dá da esquerda para a direita - exceto quanto utilizando a alocação cíclica, onde <b>todos</b> os canais especificados são verificados simultaneamente.
+</p>
+<a name="Escolha_c.C3.ADclica_e.2Fou_justa" id="Escolha_c.C3.ADclica_e.2Fou_justa"></a><h4> <span class="mw-headline"> Escolha cíclica e/ou <i>justa</i>  </span></h4>
+<p>Uma variação da alocação de canais é através de uma escolha cíclica e/ou <i>justa</i>, que consiste em escolher o canal que <b>completou</b> - até o momento - o menor número de ligações <b>saintes</b>. Essa forma é caracterizada por um asterisco (<b>*</b>) antes da string de alocação de canais (conforme pode ser verificado acima, no segundo e quinto exemplos). 
+</p><p>Quando iniciada com um asterisco (<b>*</b>), as outras formas de alocação subseqüentes (crescente, decrescente, etc) são utilizadas para decidir, entre os canais com menor número de ligações saintes, qual será verificado primeiro para realizar a chamada. 
+</p>
+<ul><li><b>AVISO: O uso da alocação justa e/ou cíclica é recomendável <u>somente</u> em placas analógicas (KFXO), de ramais (KFXS) e de interface celular (KGSM)</b>. Conexões E1 tendem a alocar os canais de maneira crescente ou decrescente de um lado (na operadora, por exemplo), e o inverso do outro (no PABX, por exemplo), para evitar problemas de dupla ocupação (o que pode ocorrer na sinalização R2/MFC). A alocação cíclica/justa também consome mais recursos de memória e processamento que a alocação tradicional, o que é agravado ainda mais pelo fato de placas E1 terem um número muito maior de canais (30 por link).<br /><br />Por estes motivos, alocações justas e/ou cíclicas devem ser utilizadas apenas em sinalizações onde isso pode representar alguma diferença real, como equalizar a tarifação das linhas, o uso das mesmas, ou o número de ligações recebidas por cada ponto de atendimento (PA).
+</li></ul>
+<a name="Op.C3.A7.C3.B5es_dispon.C3.ADves" id="Op.C3.A7.C3.B5es_dispon.C3.ADves"></a><h4> <span class="mw-headline"> Opções disponíves </span></h4>
+<ul><li><b>orig</b>: Define o número de origem a ser utilizado na chamada, <b>sem alterar a variável ${origination_caller_id_number}</b>. Ou seja, a opção <b>orig</b> serve <b>apenas</b> para repassar um número de origem diferente do ${origination_caller_id_number}. Caso o FreeSWITCH já tenha ajustado a variável ${origination_caller_id_number}, o que é o comportamento padrão, o Endpoint utiliza este valor automaticamente como referência do número de origem, sem ser necessário repassar nenhuma opção adicional.<br /><br />Nas placas <b>KGSM</b>, se ajustado para <b>restricted</b>, omite o número de origem. Exemplo:<br />
+</li></ul>
+<pre>
+ &lt;action application=&quot;bridge&quot; data=&quot;Khomp/b0/99887766/orig=restricted&quot;/&gt;
+</pre>
+<ul><li><b>category</b>: Quando ajustado para um valor numérico, define a categoria do número de A. Disponível apenas em sinalização R2/MFC; 
+</li><li><b>uui</b>: Quando ajustado para um número e uma string de texto, separados por cerquilha ("#"), envia uma mensagem "User-to-User" para a outra ponta, antes de realizar a chamada, utilizando o descritor como o número e a mensagem como o texto. Disponível apenas em sinalização RDSI (ISDN); 
+</li><li><b>ring_cadence</b>: Quando ajustado para um identificador, utiliza cadência definida com este nome na seção "cadences" do arquivo de configuração do Endpoint da Khomp para chamar o canal desejado. Disponível apenas em sinalização FXS; 
+</li><li><b>ring</b>: Quando ajustado para dois números, separados por ponto ("."), define as cadências de chamada de um ramal FXS para estes valores, sendo o primeiro relativo ao tempo de chamando, e o segundo, ao tempo de silêncio; 
+</li><li><b>ring_ext</b>: Quando ajustado para dois números, separados por ponto ("."), define as cadências de chamada extendidas (a serem executadas depois da cadência principal) de um ramal FXS para estes valores, sendo o primeiro relativo ao tempo de chamando, e o segundo, ao tempo de silêncio; 
+</li><li><b>usr_xfer</b>: Quando ajustado para uma seqüência de dígitos DTMF, define estes como dígitos a serem utilizados para iniciar uma transferência entre PABXes (utilizando sinalizações de usuário); 
+</li><li><b>drop_on</b>: Quando ajustado para "message_box", "human_answer", "answering_machine", "carrier_message", "unknown" ou uma lista destes (separados por mais ("+") ou ponto (".")), faz com que a chamada seja derrubada ao detectar tons de caixa postal, atendimento humano, secretária eletrônica, mensagens da operadora, ou algum atendimento desconhecido - respectivamente. Disponível em sinalizações digitais (links E1 e placas KGSM). Adicionalmente, a informação de atendimento é reportada para o usuário na variável KCallAnswerInfo; 
+</li><li><b>answer_info</b>: Opção booleana (não necessita de valor). Quando especificada, reporta informações de atendimento para o usuário através da variável KCallAnswerInfo; 
+</li><li><b>pre</b>: Quando ajustado para uma seqüência de dígitos DTMF, utiliza estes para pre-alocar um canal de saída em um PABX analógico, discando o número de B desejado a seguir. Somente disponível para sinalização analógica (FXO);
+</li><li><b>pre_answer</b>: Opção booleana (não necessita de valor). Quando especificada, "antende" o canal antes de a ligação ser completada permitindo, por exemplo, que DTMFs possam ser enviados - útil para utilizar em um <b>DISA</b>;
+</li><li><b>output_volume</b>: Define o volume de saída da ligação. Varia de -10 a +10;
+</li><li><b>input_volume</b>: Define o volume de entrada da ligação. Varia de -10 a +10;
+</li></ul>
+<p><br />
+</p>
+<a name="Lista_das_vari.C3.A1veis" id="Lista_das_vari.C3.A1veis"></a><h3> <span class="mw-headline"> Lista das variáveis </span></h3>
+<p>Segue lista de variáveis disponíveis no Endpoint:
+</p>
+<ul><li><b>KDropCollectCall</b>: Quando definida antes do atendimento (ao receber uma chamada), ativa ("yes") ou desativa ("no", padrão) o derrubamento de chamadas à cobrar baseado na sinalização recebida da central pública; através do duplo atendimento; ou através do reconhecimento por áudio de uma chamada à cobrar (pode ser definido de maneira global);
+</li><li><b>KR2SendCondition</b>: Quando definida antes do envio de ringback pelo FreeSWITCH (ao receber uma chamada), ajusta a condição de B para o valor numérico que foi ajustada. Apenas disponível para sinalização R2; 
+</li><li><b>KR2GotCategory</b>: Ajustada pelo Endpoint ao receber uma chamada entrante, e possui a categoria do número de A. Apenas disponível para sinalização R2; 
+</li><li><b>KR2GotCondition</b>: Ajustada pelo Endpoint, e disponível após o retorno de uma chamada realizada pelo FreeSWITCH. Contém a condição de B recebida ao realizar a chamada. Apenas disponível para sinalização R2;
+</li><li><b>KISDNGotCause</b>: Ajustada pelo Endpoint, e disponível após o retorno de uma chamada realizada pelo FreeSWITCH. Contém o código de <i>cause</i> do ISDN recebido ao realizar a chamada. Apenas disponível para sinalização ISDN;
+</li><li><b>KCallAnswerInfo</b>: Ajustada pelo Endpoint, e disponível após o retorno de uma chamada realizada pelo FreeSWITCH. Contém as informações de atendimento detectadas ao realizar a chamada e está disponível apenas para sinalizações digitais (E1, GSM);
+</li><li><b>KSmsDelivered</b>: Ajustada pelo Endpoint ao enviar uma mensagem SMS com o <i>application</i> <b>KSendSMS</b>, e define se a mensagem foi entregue com sucesso ("yes") ou não ("no"); 
+</li><li><b>KSmsErrorCode</b>: Ajustada pelo Endpoint ao enviar uma mensagem SMS com o <i>application</i> <b>KSendSMS</b>, e define o código de erro ao enviar a mensagem; 
+</li><li><b>KSmsErrorName</b>: Ajustada pelo Endpoint ao enviar uma mensagem SMS com o <i>application</i> <b>KSendSMS</b>, contém o nome do erro em forma textual, ou "None" caso não tenha ocorrido nenhum erro.
+</li><li><b>KSmsType</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, define o tipo da mensagem recebida (pode conter os valores "message", "confirm" ou "broadcast"; 
+</li><li><b>KSmsFrom</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, define o número de origem da mensagem recebida (disponível em tipos "message" e "confirm"); 
+</li><li><b>KSmsDate</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, define a data de envio da mensagem (disponível em tipos "message" e "confirm"); 
+</li><li><b>KSmsSize</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, contém o tamanho (em bytes) da mensagem recebida (disponível em tipos "message" e "broadcast"); 
+</li><li><b>KSmsMode</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, contém o tipo codificação da mensagem recebida (disponível em tipos "message" e "broadcast"); 
+</li><li><b>KSmsBody</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, contém o texto da mensagem recebida (disponível em tipos "message" e "broadcast");
+</li><li><b>KSmsDelivery</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, contém a data de entrega de mensagem enviada anteriormente cuja confirmação foi requisitada (disponível no tipo "confirm");
+</li><li><b>KSmsStatus</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, contém o <i>status</i> de envio de mensagem anteriormente cuja confirmação foi requisitada (disponível no tipo "confirm");
+</li><li><b>KSmsSerial</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, contém o número de série da mensagem recebida (disponível no tipo "broadcast");
+</li><li><b>KSmsPage</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, contém o número da página relativo à mensagem recebida (disponível no tipo "broadcast");
+</li><li><b>KSmsPages</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, contém o número total de páginas a serem recebidas (disponível no tipo "broadcast");
+</li><li><b>KUserInfoDescriptor</b>: Define/informa descritor do protoloco utilizado na mensagem User-to-User Information (RDSI). 
+</li><li><b>KUserInfoData</b>: Define/informa os dados na mensagem User-to-User Information (RDSI).
+</li><li><b>KFaxSent</b>: Ajustada pelo Endpoint ao enviar FAX com o application KSendFax, e define se o FAX foi enviado com sucesso ("yes") ou não ("no"); 
+</li><li><b>KFaxReceived</b>: Ajustada pelo Endpoint ao receber FAX com o application KReceiveFax, e define se o FAX foi recebido com sucesso ("yes") ou não ("no"); 
+</li><li><b>KFaxResult</b>: Ajustada pelo Endpoint ao enviar ou receber FAX com o application KSendFax ou KReceiveFax, respectivamente, e define o seu resultado.
+</li></ul>
+<p><br />
+</p>
+<a name="Descri.C3.A7.C3.A3o_das_vari.C3.A1veis" id="Descri.C3.A7.C3.A3o_das_vari.C3.A1veis"></a><h3> <span class="mw-headline"> Descrição das variáveis </span></h3>
+<p>Abaixo, segue uma explanação sobre como utilizar as variáveis do Endpoint da Khomp disponíveis no dialplan, tanto para comunicar quanto para receber informações: 
+</p><p><br />
+</p>
+<a name="KDropCollectCall" id="KDropCollectCall"></a><h4> <span class="mw-headline"> KDropCollectCall </span></h4>
+<p>Quando ativada, faz com que o Endpoint da Khomp derrube chamadas a cobrar através de duplo atendimento (disponível para sinalizações 'R2 Digital' e FXO), através da informação disponível no protocolo RDSI e R2/MFC, ou através da detecção do áudio de chamada a cobrar (disponível para qualquer sinalização digital por link E1, e para sinalização GSM).
+</p><p>Esta variável é útil para derrubar chamadas a cobrar para determinados ramais, e deve ser ajustado <b>obrigatoriamente</b> antes de realizar qualquer tipo de atendimento - aplicações como <b>playback</b> e <b>bridge</b> devem ser executadas sempre após ajustar esta variável, por exemplo.
+</p><p>Para melhor funcionalidade, é recomendado também que nenhum estado de chamada (<i>ringback</i>) seja enviado antes desta variável ser ajustada, então aplicações devem ser executadas apenas após o ajuste correto desta variável.
+</p><p>Esta variável pode ser ajustada localmente e globalmente, tanto para <b>yes</b> quanto para <b>no</b>. O ajuste da variável global para <b>yes</b> fará com que todas as chamadas a cobrar sejam derrubadas, a não ser que a chamada específica seja ajustada para <b>no</b> - isto permite a criação de um filtro global de chamadas a cobrar, com algumas poucas exceções.
+</p><p>Ativando a variável dentro do contexto <b>default</b>:
+<!-- NEED 5 --> 
+</p><p>&lt;context name="default"&gt;
+</p>
+<pre>&lt;extension name="exemplo"&gt;
+ .
+ .
+ .
+ &lt;action aplication="set" data="KDropCollectCall=yes"/&gt;
+ .
+ .
+ .
+&lt;/extension&gt;
+</pre>
+<p>&lt;/context&gt;
+</p><p>Ativando a variável no contexto global, lembrando que a mesma deve ser configurada no arquivo <b>vars.xml</b>:
+<!-- NEED 5 --> 
+</p>
+<pre>&lt;X-PRE-PROCESS cmd="set" data="KDropCollectCall=yes"/&gt;
+</pre>
+<a name="KR2SendCondition" id="KR2SendCondition"></a><h4> <span class="mw-headline"> KR2SendCondition </span></h4>
+<p>Ao receber uma chamada, pode ser definida antes do envio de ringback pelo FreeSWITCH (ou seja, antes do FreeSWITCH executar as aplicações answer, ou bridge). Quando utilizada em sinalização R2/MFC, esta variável ajusta a condição de B para o valor numérico desejado. 
+</p><p>Exemplo:
+<!-- NEED 6 --> 
+</p>
+<pre>&lt;!-- Condição "NUMBER CHANGED", avisa ao chamador que o número de B mudou. --&gt;
+&lt;action application="KR2SendCondition" data="3"/&gt;
+</pre>
+<a name="KR2GotCategory" id="KR2GotCategory"></a><h4> <span class="mw-headline"> KR2GotCategory </span></h4>
+<p>Ao receber uma chamada, é ajustada pelo Endpoint com a categoria recebida do número que originou a chamada. É ajustada na sinalização R2/MFC, e pode ser consultada em qualquer local do dialplan. 
+</p><p>Exemplo:
+<!-- NEED 3 --> 
+</p>
+<pre>&lt;action application="log" data="DEBUG KR2GotCategory [${KR2GotCategory}]"/&gt; 
+</pre>
+<a name="KR2GotCondition" id="KR2GotCondition"></a><h4> <span class="mw-headline"> KR2GotCondition </span></h4>
+<p>Variável ajustada pelo Endpoint, e disponível após o retorno de uma chamada realizada pelo FreeSWITCH. Contém a condição de B recebida ao realizar a chamada. Disponível apenas para sinalização R2/MFC. 
+</p><p>Exemplo:
+<!-- NEED 3 --> 
+</p>
+<pre>&lt;action application="log" data="DEBUG KR2GotCondition [${KR2GotCondition}]"/&gt;
+</pre>
+<a name="KUserInfoDescriptor" id="KUserInfoDescriptor"></a><h4> <span class="mw-headline"> KUserInfoDescriptor </span></h4>
+<p>Variável ajustada pelo Endpoint no contexto de entrada, a partir de informações recebidas pela rede RDSI através da funcionalidade User-to-User Information. Contém o número do descritor do protocolo utilizado pela outra ponta, e normalmente contém valor '0', mas este valor é dependente da aplicação utilizada. 
+</p><p>Maiores informações, consultar a especificação ITU-T Q931 (mais precisamente, a tabela 4-26 da especificação). 
+</p><p>Exemplo (trabalhando com o número do descritor do protocolo): <!-- NEED 3 --> 
+</p>
+<pre>&lt;action application="log" data="DEBUG KUserInfoDescriptor [${KUserInfoDescriptor}]"/&gt;
+</pre>
+<a name="KUserInfoData" id="KUserInfoData"></a><h4> <span class="mw-headline"> KUserInfoData </span></h4>
+<p>Variável ajustada pelo Endpoint no contexto de entrada, a partir de informações recebidas pela rede RDSI através da funcionalidade User-to-User Information. Contém os dados propriamente ditos, que foram recebidos, em forma de uma 'string' de texto. 
+</p><p>Maiores informações sobre este recurso, consultar a especificação ITU-T Q931. 
+</p><p>Exemplo (trabalhando com os dados recebidos): <!-- NEED 3 --> 
+</p>
+<pre>&lt;action application="log" data="DEBUG KUserInfoData [${KUserInfoData}]"/&gt;
+</pre>
+<p>É importante salientar que as variáveis são sensíveis à capitalização das letras (case sensitive).
+</p>
+<a name="KCallAnswerInfo" id="KCallAnswerInfo"></a><h4> <span class="mw-headline"> KCallAnswerInfo </span></h4>
+<p>Variável ajustada pelo Endpoint em ligações de saída, representando o tipo de atendimento realizado pela outra ponta. Pode conter os seguintes valores:
+</p>
+<dl><dd><ul><li> "MessageBox" (*): detectada caixa postal de um telefone celular;
+</li><li> "CarrierMessage": mensagem de operadora enviada antes do atendimento;
+</li><li> "AnsweringMachine" (**): atendimento por secretária eletrônica;
+</li><li> "HumanAnswer" (**): atendimento humano;
+</li><li> "Unknown": tipo de atendimento desconhecido;
+</li><li> "Fax": reportado quando um tom de fax for detectado.
+</li></ul>
+</dd></dl>
+<p><br />
+(*) Este tipo de atendimento é detectado por sinais em determinadas freqüências que são enviados antes da chamada entrar em uma caixa postal, e variam conforme a operadora. O algoritmo captura a maior parte das caixas postais, mas pode falhar se não existir um sinal claro, ou se o mesmo não estiver dentro dos padrões mais utilizados;
+</p><p>(**) A diferenciação entre estes dois tipos de atendimento depende de configuração específica utilizando o programa <b>k3lanswerinfoconfig</b>, sendo a detecção apenas baseada em heurísticas e <b>nunca</b> com precisão de 100%.
+<br />
+</p>
+<a name="Comandos_de_console" id="Comandos_de_console"></a><h1> <span class="mw-headline">Comandos de console </span></h1>
+<p>Lista de comandos disponíveis no console do FreeSWITCH para o Endpoint da Khomp:
+</p><p><br />
+</p>
+<ul><li> <b>khomp channels disconnect </b>: Desconecta um ou vários canais. Este comando envia uma mensagem diretamente para o canal físico da placa em questão, requisitando a desconexão. Use com cautela; 
+</li><li> <b>khomp channels unblock </b>: Desbloqueia canais bloqueados para entrada ou para saída. Somente disponível em sinalização digital via link E1; 
+</li><li> <b>khomp clear links</b>: Limpa os contadores de erros nos links;
+</li><li> <b>khomp clear statistics</b>: Limpa as estatísticas de ligações dos canais, ou as estatísticas de um canal específico; 
+</li><li> <b>khomp get </b>: Obtém as opções diversas do Endpoint da Khomp;
+</li><li> <b>khomp kommuter </b>: Ativa ou desativa os kommuters ligados via USB nesta máquina. Somente acessível quando a configuração "kommuter-activation" estiver setada como "manual";
+</li><li> <b>khomp kommuter count</b>: Obtém a quantidade de kommuters ligados via USB nesta máquina;
+</li><li> <b>khomp log console</b>: Ajusta opções de logs no console. 
+</li><li> <b>khomp log disk</b>:&nbsp;: Ajusta opções de log em disco. 
+<ul><li> <b>khomp log console</b> e <b>khomp log disk</b> dispõem de opções auxiliares <b>no</b>, que inverte a escolha de mensagens, e <b>just</b>, que generaliza a escolha. Exemplos:
+<ul><li> <b>khomp log disk just commands events</b> (Habilita <i>somente</i> o registro de comandos e eventos da API em disco).
+</li><li> <b>khomp log disk no commands</b> (Desabilita o registro em disco de comandos enviados à API).
+</li><li> <b>khomp log disk warnings</b> (Habilita <i>também</i> o registro em disco dos avisos do Endpoint).
+</li></ul>
+</li><li> Mais informações sobre as opções de <i>log</i> nos comando "<b>help khomp log disk</b>" ou "<b>help khomp log console</b>".
+</li></ul>
+</li><li> <b>khomp log rotate</b>: Rotaciona arquivos de log do Endpoint;
+</li><li> <b>khomp log status</b>: Mostra mensagens de log atualmente sendo escritas em disco e mostradas no console;
+</li><li> <b>khomp log trace isdn</b>: Ativa a depuração da sinalização RDSI (ISDN);
+</li><li> <b>khomp log trace k3l </b>: Ativa a depuração de baixo nível da API K3L;
+</li><li> <b>khomp log trace r2 </b>: Ativa a depuração de baixo nível da sinalização R2/MFC;
+</li><li> <b>khomp reset links</b>: Envia um comando de reset para um determinado link E1 de uma determinada placa; 
+</li><li> <b>khomp revision</b>: Mostra número da versão e revisão do Endpoint;
+</li><li> <b>khomp select sim</b>: Seleciona o SIM card, disponível nas placas KGSM;
+</li><li> <b>khomp send command </b>: Envia comando da API K3L diretamente para a placa. Apenas para depuração de problemas, pode compromenter a estabilidade do sistema se utilizado de maneira incorreta;
+</li><li> <b>khomp send raw command </b>: Envia um comando diretamente para o DSP da placa. Apenas para depuração de problemas, pode compromenter a estabilidade do sistema se utilizado de maneira incorreta;
+</li><li> <b>khomp set </b>: Ajusta opções diversas do Endpoint da Khomp;
+</li><li> <b>khomp show calls </b>: Mostra estados das chamadas Khomp, podendo listar também por placa ou canal específico;
+</li><li> <b>khomp show channels </b>: Mostra o estado dos canais Khomp, podendo listar também por placa específica; 
+</li><li> <b>khomp show links</b>: Mostra estados dos links E1 disponíveis. 
+</li><li> <b>khomp show statistics </b>: Mostra as estatísticas de ligações dos canais, ou as estatísticas de um canal específico; 
+</li><li> <b>khomp sms </b>: Envia uma mensagem SMS utilizando canais da placa KGSM para um determinado número;
+</li><li> <b>khomp summary </b>:Imprime um sumário das placas do sistema e de suas características;
+</li></ul>
+<p><br />
+</p>
+<a name="Recursos_adicionais" id="Recursos_adicionais"></a><h1> <span class="mw-headline">Recursos adicionais </span></h1>
+<p>Este capítulo trata de recursos adicionais do Endpoint, relacionados às funcionalidades especiais presentes em algumas sinalizações.
+<br />
+</p>
+<a name="Aplica.C3.A7.C3.B5es_.28applications.29_e_canais" id="Aplica.C3.A7.C3.B5es_.28applications.29_e_canais"></a><h2> <span class="mw-headline">Aplicações (applications) e canais  </span></h2>
+<p>O Endpoint da Khomp, além de registrar um tipo de canal de comunicação "Khomp", registra também os seguintes itens: 
+<br />
+</p>
+<a name="Aplica.C3.A7.C3.A3o_.22KUserTransfer.22" id="Aplica.C3.A7.C3.A3o_.22KUserTransfer.22"></a><h3> <span class="mw-headline">Aplicação "KUserTransfer"  </span></h3>
+<p>Realiza o processo de transferência do canal atual para o ramal <i>número'</i> utilizando o protocolo de sinalização QSig (Single Step Call Transfer) para placas E1 configuradas com sinalização RDSI (ISDN), ou utiliza comando de FLASH para linhas FXO, LineSide, CAS_EL7 e E1LC.
+</p><p>A sintaxe segue: 
+</p>
+<pre>&lt;action application="KUserTransfer" data="<b>número</b>[,opções])"/&gt;
+</pre>
+<p>Exemplo: 
+</p>
+<pre>&lt;action application="answer"/&gt;
+&lt;action application="KUserTransfer" data="2345"/&gt;
+</pre>
+<p>Os campos têm o seguinte significado:
+</p>
+<ul><li><b>número</b>: Número para onde a ligação deve ser transferida.
+</li><li><b>opções</b>: Define as opções de transferência a utilizar, que são: 
+<ul><li><b>n</b>: Aguarda até o canal ser desconectado.
+</li></ul>
+</li></ul>
+<p><br />
+</p><p><br />
+</p>
+<a name="Aplica.C3.A7.C3.A3o_.22KSendSMS.22" id="Aplica.C3.A7.C3.A3o_.22KSendSMS.22"></a><h3> <span class="mw-headline">Aplicação "KSendSMS"  </span></h3>
+<p>Esta aplicação tem a função de enviar mensagens SMS através das placas KGSM da Khomp, utilizando os módulos e SIM cards presentes na placa para tal. A sintaxe da aplicação é a seguinte: 
+</p>
+<pre>&lt;action application="KSendSMS" data="recurso|destino|mensagem" /&gt;
+</pre>
+<p>Podendo cada campo ser resumido em: 
+</p>
+<ul><li><b>recurso</b>: Segue uma sintaxe idêntica à alocação de canais do application Bridge, e define qual modem utilizar; 
+</li><li><b>destino</b>: Número para onde enviar a mensagem, podendo ser precedido ou sucedido por <b>!</b> para requisitar uma mensagem de confirmação de envio; 
+</li><li><b>mensagem</b>: Texto (sem aspas) que deve ser enviado para <b>destino</b>.
+</li></ul>
+<p>Após o envio da mensagem, as variáveis <b>KSmsDelivered</b> e <b>KSmsErrorCode</b> conterão o resultado do envio da mensagem. Para maiores informações sobre estas, favor consultar a seção sobre as variáveis utilizadas no Endpoint.
+</p><p>Exemplos de uso desta aplicação seguem abaixo: 
+</p>
+<ul><li>Envia "Mensagem de teste." para telefone "99887766" utilizando o modem "1" (segundo modem) da placa "0":
+</li></ul>
+<pre>&lt;action application="log" data="DEBUG Enviando SMS..." /&gt;
+&lt;action application="KSendSMS" data="b0c1|99887766|Mensagem de teste" /&gt;
+</pre>
+<ul><li>Envia "Mensagem de teste." para telefone "99887766" utilizando o primeiro modem livre da placa "0", e verifica retorno do envio:
+</li></ul>
+<pre>&lt;action application="log" data="DEBUG Enviando SMS..." /&gt;
+&lt;action application="KSendSMS" data="b0|99887766|Mensagem de teste" /&gt;
+&lt;action application="log" data="DEBUG Enviou? ${KSmsDelivered}" /&gt;
+&lt;action application="log" data="DEBUG Codigo: ${KSmsErrorCode}" /&gt;
+&lt;action application="log" data="DEBUG Descr.: ${KSmsErrorName}" /&gt;
+</pre>
+<ul><li>Envia "Mensagem de teste." para telefone "99887766" utilizando o primeiro modem livre da placa "0", ou para o primeiro canal livre da placa "1" (se não houver canal livre na primeira placa):
+</li></ul>
+<pre>&lt;action application="log" data="DEBUG Enviando SMS..." /&gt;
+&lt;action application="KSendSMS" data="b0+b1|99887766|Mensagem de teste" /&gt;
+</pre>
+<ul><li>Envia "Mensagem de teste." para telefone "99887766" utilizando o primeiro modem livre da placa "0", requisitando confirmação:
+</li></ul>
+<pre>&lt;action application="log" data="DEBUG Enviando SMS..." /&gt;
+&lt;action application="KSendSMS" data="b0|99887766!|Mensagem de teste" /&gt;
+</pre>
+<p><br />
+</p>
+<a name="Aplica.C3.A7.C3.A3o_.22KEchoCanceller.22" id="Aplica.C3.A7.C3.A3o_.22KEchoCanceller.22"></a><h3> <span class="mw-headline"> Aplicação "KEchoCanceller"  </span></h3>
+<p>Esta aplicação tem a função de habilitar ou desabilitar o cancelador de eco do canal.
+</p>
+<pre>&lt;action application="KEchoCanceller" data="<b>ação</b>[,opções])"/&gt;
+</pre>
+<p>Onde:
+</p>
+<ul><li><b>ação</b>: Pode ser <b>on</b> para habilitar o cancelador de eco, e <b>off</b> para desabilitar;
+</li></ul>
+<p>Exemplo de uso desta aplicação:
+</p>
+<pre>&lt;action application="KEchoCanceller" data="off"/&gt;
+</pre>
+<p><br />
+</p>
+<a name="Aplica.C3.A7.C3.A3o_.22KAutoGainControl.22" id="Aplica.C3.A7.C3.A3o_.22KAutoGainControl.22"></a><h3> <span class="mw-headline"> Aplicação "KAutoGainControl"  </span></h3>
+<p>Esta aplicação tem a função de habilitar ou desabilitar o controle automático de ganho no canal.
+</p>
+<pre>&lt;action application="KAutoGainControl" data="<b>ação</b>[,opções])"/&gt;
+</pre>
+<p>Onde: 
+</p>
+<ul><li><b>ação</b>: Pode ser <b>on</b> para habilitar o controle automático de ganho, e <b>off</b> para desabilitar;
+</li></ul>
+<p>Exemplo de uso desta aplicação: 
+</p>
+<pre>&lt;action application="KAutoGainControl" data="on"/&gt;
+</pre>
+<p><br />
+</p>
+<a name="Aplica.C3.A7.C3.A3o_.22KDTMFSuppression.22" id="Aplica.C3.A7.C3.A3o_.22KDTMFSuppression.22"></a><h3> <span class="mw-headline"> Aplicação "KDTMFSuppression"  </span></h3>
+<p>Esta aplicação tem a função de habilitar ou desabilitar a supressão de DTMF do canal. A sintaxe da aplicação é a seguinte: 
+</p>
+<pre>&lt;action applicatin="KDTMFSuppression" value="<b>ação</b>[,opções])"/&gt;
+</pre>
+<p>Onde: 
+</p>
+<ul><li><b>ação</b>: Pode ser <b>on</b> para habilitar a supressão DTMF, e <b>off</b> para desabilitar;
+</li></ul>
+<p>É importante notar que quando desabilitada a supressão de DTMF, os DTMFs serão passados <i>inband</i> e não serão mais reportados ao FreeSWITCH. Dessa forma o FreeSWITCH não reconhecerá os DTMFs, o que pode ocasionar em mau funcionamento de aplicações como por exemplo, URAs. 
+</p><p>Exemplo de uso desta aplicação: 
+</p>
+<pre>&lt;action applicatin="KDTMFSuppression" value="off"/&gt;
+</pre>
+<p><br />
+</p>
+<a name="Aplica.C3.A7.C3.A3o_.22KSetVolume.22" id="Aplica.C3.A7.C3.A3o_.22KSetVolume.22"></a><h3> <span class="mw-headline"> Aplicação "KSetVolume"  </span></h3>
+<p>Esta aplicação tem a função de ajustar o volume de entrade e saída de canais da Khomp, sendo a sua sintaxe a seguinte:
+</p>
+<pre>&lt;action application="KSetVolume" data="&lt;volume&gt;"/&gt;
+&lt;action application="KSetVolume" data="&lt;output-volume&gt;|&lt;input-volume&gt;"/&gt;
+</pre>
+<p>Onde os campos possuem o seguinte significado: 
+</p>
+<ul><li><b>volume</b>: Ajusta o volume de entrada e saída (-10 a +10);
+</li><li><b>output-volume</b>: Ajusta o volume de saída (-10 a +10, "none" para não alterar);
+</li><li><b>input-volume</b>: Ajusta o volume de entrada (-10 a +10, "none" para não alterar).
+</li></ul>
+<p><br />
+</p>
+<a name="Aplica.C3.A7.C3.A3o_.22KAdjustForFax.22" id="Aplica.C3.A7.C3.A3o_.22KAdjustForFax.22"></a><h3> <span class="mw-headline"> Aplicação "KAdjustForFax"  </span></h3>
+<p>Esta aplicação tem a função de ajustar um canal da Khomp para o recebimento de sinal de FAX/modem, otimizando o canal de comunicação para o tráfego de dados. Sintaxe:
+</p>
+<pre>&lt;action application="KAdjustForFax" data=""/&gt;
+</pre>
+<p>Esta aplicação não recebe parâmetros. Exemplo de utilização:
+</p>
+<pre>&lt;action application="KAdjustForFax" data=""/&gt;
+</pre>
+<p><br />
+</p>
+<a name="Aplica.C3.A7.C3.A3o_.22KSendFax.22" id="Aplica.C3.A7.C3.A3o_.22KSendFax.22"></a><h3> <span class="mw-headline"> Aplicação "KSendFax"  </span></h3>
+<p>Esta aplicação tem a função de enviar fax utilizando canais digitais ou FXO da Khomp em ligações pré-estabelecidas, sendo a sua sintaxe a seguinte:
+</p>
+<pre>&lt;action application="KSendFax" data="&lt;arquivo&gt;[:&lt;arquivo2&gt;[:...]][|&lt;faxid&gt;]"/&gt;
+</pre>
+<p><strong>Esta aplicação necessita de uma licença adquirida à parte para ser utilizada em canais digitais</strong>. Os campos possuem os seguintes significados: 
+</p>
+<ul><li><b>arquivos</b>: Arquivos a serem enviados para o fax devem estar encapsulados no formato TIFF e possuírem resolução de 98, 196 ou 392 dpi;
+</li><li><b>faxid</b>: Número do fax. Caso não seja especificado, o valor será obtido pela id da ligação, e caso esta, também não seja válida, o número do fax será o configurado como padrão na K3L.
+</li></ul>
+<p>Exemplo de uso desta aplicação: 
+</p>
+<pre>&lt;action application="KSendFax" data="/tmp/fax.tif:/home/root/fax2.tif,1234"/&gt;
+</pre>
+<p><br />
+</p>
+<a name="Aplica.C3.A7.C3.A3o_.22KReceiveFax.22" id="Aplica.C3.A7.C3.A3o_.22KReceiveFax.22"></a><h3> <span class="mw-headline"> Aplicação "KReceiveFax"  </span></h3>
+<p>Esta aplicação tem a função de receber fax utilizando canais digitais ou FXO da Khomp, sendo a sua sintaxe a seguinte:
+</p>
+<pre>&lt;action application="KReceiveFax" data="&lt;arquivo&gt;[|&lt;faxid&gt;]/&gt;
+</pre>
+<p><strong>Esta aplicação necessita de uma licença adquirida à parte para ser utilizada em canais digitais</strong>. Os campos possuem os seguintes significados:
+</p>
+<ul><li><b>arquivo</b>: Nome que será atribuído ao arquivo de fax recebido.
+</li><li><b>faxid</b>: Número do fax. Caso não seja especificado, o valor será obtido pela id da ligação, e caso esta, também não seja válida, o número do fax será o configurado como padrão na K3L.
+</li></ul>
+<p>Exemplo de uso desta aplicação: 
+</p>
+<pre>&lt;action application="answer" /&gt;
+&lt;action application="KReceiveFax" data="/tmp/fax.tif"/&gt;
+</pre>
+<p><br />
+</p>
+<a name="Canal_.22Khomp_SMS.22" id="Canal_.22Khomp_SMS.22"></a><h3> <span class="mw-headline"> Canal "Khomp_SMS"  </span></h3>
+<p>Este canal de comunicação é utilizado para receber mensagens SMS e criar ligações entrantes no FreeSWITCH para cada mensagem recebida. Este canal não possui qualquer tipo de tratamento ou processamento de áudio, e é chamado com cinco variáveis ajustadas: 
+</p>
+<ul><li><b>KSmsFrom</b>, contendo o número de origem de quem enviou a mensagem; 
+</li><li><b>KSmsDate</b>, que define a data/hora do recebimento da mensagem; 
+</li><li><b>KSmsSize</b>, representando o tamanho da mensagem (em bytes); 
+</li><li><b>KSmsMode</b>, contendo a codificação utilizada para transmitir a mensagem; 
+</li><li><b>KSmsBody</b>, que é a mensagem em si.
+</li></ul>
+<p>O processamento do dialplan do FreeSWITCH pode ser utilizado para guardar esta mensagem em um banco de dados, executar alguma aplicação, entre outros. Entretanto, a única ação aceita por este channel é desligamento (hangup) - ou seja, esta ligação entrante não pode ser considerada uma ligação comum.
+<br />
+</p>
+<a name="Canal_.22Khomp_PR.22" id="Canal_.22Khomp_PR.22"></a><h3> <span class="mw-headline"> Canal "Khomp_PR"  </span></h3>
+<p>Este canal de comunicação é utilizado para receber ligações em placas de gravação passiva (família <b>KPR</b> e <b>KFXO-HI</b>), criando ligações entrantes no FreeSWITCH para cada chamada recebida. Este canal permite apenas o recebimento de áudio capturado do <i>link</i>, não permitindo tanto o envio de mensagens de áudio quanto o de sinalizações de controle.
+</p><p>O processamento do dialplan do FreeSWITCH pode ser utilizado para gravar dados sobre esta ligação em um banco de dados, executar alguma aplicação especial e/ou algum <i>application</i> de gravação (como o <b>record</b>), entre outros. Entretanto, a única ação aceita por este channel é desligamento (hangup) - ou seja, esta ligação entrante não pode ser considerada uma ligação comum.
+<br />
+</p><p><br />
+</p>
+<a name="C.C3.B3digos_e_significados" id="C.C3.B3digos_e_significados"></a><h1> <span class="mw-headline">Códigos e significados </span></h1>
+<p>Este capítulo apresenta os códigos presentes no Endpoint da Khomp e seus significados, utilizados nos comandos de console:
+<br />
+</p>
+<a name="Estados_de_canais" id="Estados_de_canais"></a><h2> <span class="mw-headline">Estados de canais </span></h2>
+<p>Refletem o estado do canal relativo à placa. No caso de links E1, o estado pode ter uma ou mais das seguintes opções:
+</p>
+<ul><li> <b>Free</b>: o canal está livre;
+</li><li> <b>Busy</b>: o canal não está livre (ou ocupado, ou em falha);
+</li><li> <b>Outgoing</b>: o canal possui uma ligação de saída;
+</li><li> <b>Incoming</b>: o canal possui uma ligação de entrada;
+</li><li> <b>Locked</b>: o canal está bloqueado;
+</li><li> <b>Outgoing Lock</b>: o canal está bloqueado para chamadas saintes;
+</li><li> <b>Local Fail</b>: o canal possui uma falha local (nesta ponta);
+</li><li> <b>Incoming Lock</b>: o canal está bloqueado para chamadas entrantes;
+</li><li> <b>Remote Lock</b>: há um bloqueio remoto (na outra ponta) neste canal.
+</li></ul>
+<p>No caso de um canal FXS, o estado é definido por um destes valores:
+</p>
+<ul><li> <b>On Hook</b>: o telefone conectado neste canal está no gancho ou desconectado;
+</li><li> <b>Off Hook</b>: o telefone conectado neste canal está fora do gancho;
+</li><li> <b>Ringing</b>: o canal está sendo chamado;
+</li><li> <b>Failure</b>: o canal está em falha devido a problemas de comunicação entre a central e a placa.
+</li></ul>
+<p>No caso de um canal GSM, o estado também é definido por um dos valores a seguir:
+</p>
+<ul><li> <b>Idle</b>: o canal está livre e disponível para realizar chamadas;
+</li><li> <b>Call In Progress</b>: o canal está ocupado em uma ligação;
+</li><li> <b>Modem Error</b>: ocorreu um erro na comunicação com o modem do canal;
+</li><li> <b>SIM Card Error</b>: o SIM card não está presente ou não foi inserido/detectado corretamente;
+</li><li> <b>Network Error</b>: ocorreu um erro ao comunicar-se com a rede;
+</li><li> <b>Not Ready</b>: o modem está sendo inicializado no canal.
+</li></ul>
+<p>E no caso de um canal FXO, os estados serão os seguintes:
+</p>
+<ul><li> <b>Disabled</b>: o canal está desabilitado;
+</li><li> <b>Enabled</b>: o canal está habilitado.
+</li></ul>
+<p><br />
+</p>
+<a name="Estados_de_chamada" id="Estados_de_chamada"></a><h2> <span class="mw-headline"> Estados de chamada </span></h2>
+<p>Define o estado de cada canal relativo ao software, que pode ser::
+</p>
+<ul><li><b>Free</b>: o canal está livre;
+</li><li><b>Incoming</b>: o canal está recebendo uma chamada;
+</li><li><b>Outgoing</b>: o canal está realizando uma chamada;
+</li><li><b>Failure</b>: o canal está em falha.
+</li></ul>
+<p><br />
+</p>
+<a name="Estados_da_chamada_FreeSWITCH" id="Estados_da_chamada_FreeSWITCH"></a><h2> <span class="mw-headline"> Estados da chamada FreeSWITCH </span></h2>
+<p>Reflete diretamente o estado de chamada controlado pelo FreeSWITCH, que pode se
+</p>
+<ul><li> <b>new</b>: Canal é recém criado;
+</li><li> <b>init</b>: Canal foi inicializado;
+</li><li> <b>routing</b>: Canal está procurando uma extensão para executar;
+</li><li> <b>execute</b>: Canal está executando seu dialplan;
+</li><li> <b>ex_media</b>: Canal está trocando media com outro canal;
+</li><li> <b>cs_media</b>: Canal está consumindo toda media;
+</li><li> <b>hangup</b>: O canal está marcada para hangup e pronto para terminar.
+</li></ul>
+<p><br />
+</p>
+<a name="C.C3.B3digos_GSM" id="C.C3.B3digos_GSM"></a><h2> <span class="mw-headline"> Códigos GSM </span></h2>
+<p>Os seguintes códigos numéricos são reportados:
+</p>
+<a name="C.C3.B3digos_de_SMS_.28SMS_cause.29" id="C.C3.B3digos_de_SMS_.28SMS_cause.29"></a><h3> <span class="mw-headline"> Códigos de SMS (<i>SMS cause</i>) </span></h3>
+<pre>1	Unassigned number
+8	Operator determined barring
+10	Call barred
+21	SMS transfer rejected
+27	Destination out of service
+28	Unidentified subscriber
+29	Facility rejected
+30	Unknown subscriber
+38	Network out of order
+41	Temporary failure
+42	Congestion
+47	Resources unavailable
+50	Facility not subscribed
+69	Facility not implemented
+81	Invalid SMS transfer reference value
+95	Invalid message
+96	Invalid mandatory information
+97	Message type non existent
+98	Message not compatible with SMS protection state
+99	Information element non existent
+111	Protocol error
+127	Interworking
+128	Telematic interworking not supported
+129	SMS type zero not supported
+130	Cannot replace SMS
+143	Unspecified TPPID error
+144	Alphabet not supported
+145	Message class not supported
+159	Unspecified TPDCS error
+160	Command cannot be actioned
+161	Command unsupported
+175	Unspecified TP command error
+176	TPDU not supported
+192	SC busy
+193	No SC subscription
+194	SC system failure
+195	Invalid SME address
+196	Destination SME barred
+197	SM rejected duplicate SM
+198	TPVPF not supported
+199	TPVP not supported
+208	SIM SMS storage full
+209	No SMS storage capability in SIM
+210	Error in SMS
+211	Memory capatity exceeded
+213	SIM data download error
+255	Unspecified error
+300	Phone failure
+301	SMS service reserved
+302	Operation not allowed
+303	Operation not supported
+304	Invalid PDU mode parameter
+305	Invalid text mode parameter
+310	SIM not inserted
+311	SIM PIN necessary
+312	Phone SIM PIN necessary
+313	SIM failure
+314	SIM busy
+315	SIM wrong
+320	Memory failure
+321	Invalid memory index
+322	Memory full
+330	SMSC address unknown
+331	No network service
+332	Network timeout
+500	Unknown error
+512	Network busy
+513	Invalid destination address
+514	Invalid message body length
+515	Phone is not in service
+516	Invalid preferred memory storage
+517	User terminated
+</pre>
+<a name="C.C3.B3digos_de_chamada_.28call_cause.29" id="C.C3.B3digos_de_chamada_.28call_cause.29"></a><h3> <span class="mw-headline"> Códigos de chamada (<i>call cause</i>) </span></h3>
+<pre>1	Unallocated number
+3	No route to destination
+6	Channel unacceptable
+8	Operator determined barring
+16	Normal call clear
+17	User busy
+18	No user responding
+19	No answer from user
+21	Call rejected
+22	Number changed
+26	Non Selected user clear
+27	Destination out of order
+28	Invalid number format
+29	Facility rejected
+30	Response status enquiry
+31	Normal, unspecified
+34	No circuit channel available
+38	Network out of order
+41	Temporary failure
+42	Switch congestion
+43	Access information discarded
+44	Requested channel unavailable
+47	Resource unavailable
+49	QoS unavailable
+50	Request facility not subscribed
+55	Call barred with UG
+57	Bearer capability not authorized
+58	Bearer capability not available
+63	Service not available
+65	Bearer capability not implemented
+69	Request facility not implemented
+70	Only restricted bearer capability available
+79	Service not implemented
+81	Invalid call reference value
+82	User not member of UG
+88	Incompatible destination
+91	Invalid transit network selected
+95	Invalid message
+96	Missing mandatory information element
+97	Message type not implemented
+98	Message incompatible with state
+99	Information element not implemented
+100	Invalid information element
+101	Message incompatible with state (2)
+102	Recovery on timer expiry
+111	Protocol error
+127	Interworking
+</pre>
+<a name="C.C3.B3digos_gerais_.28mobile_cause.29" id="C.C3.B3digos_gerais_.28mobile_cause.29"></a><h3> <span class="mw-headline"> Códigos gerais (<i>mobile cause</i>) </span></h3>
+<pre>0	Phone failure
+1	No connection to phone
+2	Phone adaptor link reserved
+3	Operation not allowed
+4	Operation not supported
+5	Phone SIM PIN required
+6	Phone FSIM PIN required
+7	Phone FSIM PUK required
+10	SIM not inserted
+11	SIM PIN required
+12	SIM PUK required
+13	SIM failure
+14	SIM busy
+15	SIM wrong
+16	Incorrect password
+17	SIM PIN2 required
+18	SIM PUK2 required
+20	Memory full
+21	Invalid index
+22	Not found
+23	Memory failure
+24	Text string too long
+25	Invalid character in text string
+26	Dial string too long
+27	Invalid character in dial string
+30	No network service
+31	Network timeout
+32	Network not allowed
+33	Command aborted
+34	Number parameter instead of text parameter
+35	Text parameter instead of number parameter
+36	Numeric parameter out of bounds
+37	Text string too short
+40	Network PIN required
+41	Network PUK required
+42	Network subset PIN required
+43	Network subset PUK required
+44	Network service provider PIN required
+45	Network service provider PUK required
+46	Corporate PIN required
+47	Corporate PUK required
+60	SIM Service option not supported
+100	Unknown
+103	Illegal MS #3
+106	Illegal MS #6
+107	GPRS service not allowed #7
+111	PLMN not allowed #11
+112	Location area not allowed #12
+113	Roaming not allowed #13
+132	Service option not supported #32
+133	Registration service option not subscribed #33
+134	Service option temporary out of order #34
+147	Long context activation
+148	Unspecified GPRS error
+149	PDP authentication failure
+150	Invalid mobile class
+151	GPRS disconnection TMR active
+256	Too many active calls
+257	Call rejected
+258	Unanswered call pending
+259	Unknown calling error
+260	No phone number recognized
+261	Call state not idle
+262	Call in progress
+263	Dial state error
+264	Unlock code required
+265	Network busy
+266	Invalid phone number
+267	Number entry already started
+268	Cancelled by user
+269	Number entry could not be started
+280	Data lost
+281	Invalid message body length
+282	Inactive socket
+283	Socket already open
+</pre>
+<p><br />
+</p>
+<a name="Solu.C3.A7.C3.A3o_de_problemas" id="Solu.C3.A7.C3.A3o_de_problemas"></a><h1> <span class="mw-headline"> Solução de problemas </span></h1>
+<p>Nesta seção, erros e suas soluções mais comuns são apresentados.
+</p>
+<a name="Erro_durante_a_instala.C3.A7.C3.A3o_do_m.C3.B3dulo_de_kernel" id="Erro_durante_a_instala.C3.A7.C3.A3o_do_m.C3.B3dulo_de_kernel"></a><h2> <span class="mw-headline"> Erro durante a instalação do módulo de kernel </span></h2>
+<p>Durante a instalação do <i>Endpoint</i> da Khomp, podem ocorrer as seguintes mensagens:
+<!-- NEED 3 --> 
+</p>
+<pre>K3L: WARNING: Unable to find a module for [...]
+</pre>
+<p>ou
+<!-- NEED 8 --> 
+</p>
+<pre>install: ******  THE KERNEL MODULE HAS NOT BEEN INSTALLED: *******
+install: 
+install: ** Please, untar the file kpdriver*.tar.gz located in: **
+install: **                 '/usr/src/khomp/'                   **
+install: **             then check the README.txt               **
+install: **  for knowing how to proceed with the installation.  **
+</pre>
+<p>Neste caso, será necessário compilar os <i>drivers</i> manualmente para o seu sistema. Prossiga para o item abaixo para maiores informações.
+<br />
+</p>
+<a name="Compilandos_os_drivers_e_iniciando_os_servi.C3.A7os" id="Compilandos_os_drivers_e_iniciando_os_servi.C3.A7os"></a><h3> <span class="mw-headline">Compilandos os <i>drivers</i> e iniciando os serviços </span></h3>
+<p>Basta seguir ao diretório <b>/usr/src/khomp</b>, descompactar o arquivo "kpdriver_2.0.0<b>XX</b>.tar.gz", e acompanhar procedimentos descritos no arquivo <b>README.txt</b>.
+</p><p>Após realizar a compilação e a instalação do módulo, basta carregá-lo no sistema, configurar as placas, e iniciar o servidor de processos da Khomp. 
+</p><p>Para carregar o driver de kernel, é necessário executar o seguinte comando:
+<!-- NEED 3 --> 
+</p>
+<pre># /etc/init.d/khompdrv start
+</pre>
+<p>Para configurar as placas, por sua vez,  necessário executar o comando:
+<!-- NEED 3 --> 
+</p>
+<pre># khompwizard
+</pre>
+<p>Isto executará um assistente de configuração, que irá perguntar a sinalização utilizada no sistema, bem como outros parâmetros de utilização das placas.
+</p><p>Caso seja necessário configurar outros parâmetros adicionais, pode-se utilizar o seguinte comando:
+<!-- NEED 3 --> 
+</p>
+<pre># k3lconfig
+</pre>
+<p>Este configurador, por sua vez, mostra todas as opções possíveis de configuração da placa. Os parâmetros que não forem configurados assumem os valores padrão automaticamente, e são compatíveis com a maior parte dos sistemas. Maiores detalhes sobre este programa podem ser obtidos na seção de número '2'. 
+</p><p><br />
+</p>
+<ul><li> <b>IMPORTANTE</b>: Para o FreeSWITCH iniciar, é preciso que a placa da khomp esteja configurada e todos módulos estejam rodando (conforme mostrado acima). <b>Caso a placa não esteja configurada, o FreeSWITCH não iniciará</b>.<br /><br />Se você deseja rodar o sistema sem a placa da Khomp, é preciso configurar o FreeSWITCH para ele não carregar o módulo da Khomp. Para isso, abra o arquivo "<i>/usr/local/freeswitch/conf/autoload_configs/modules.conf.xml</i>", e comente a linha que carrega o módulo:<br />
+</li></ul>
+<pre>
+  &lt;!-- &lt;load module=&quot;mod_khomp&quot; /&gt; --&gt;
+</pre><br />
+<p>Quando a placa da Khomp estiver devidamente configurada e os módulos da khomp carregados (explicado acima), lembre-se de descomentar esta linha no arquivo.
+</p><p><br />
+Por fim, para carregar o servidor de processos, basta executar o seguinte comando:
+<!-- NEED 3 --> 
+</p>
+<pre># kserver start
+</pre>
+<p>Após realizar estes procedimentos, o Endpoint já estará operacional, e o FreeSWITCH já pode ser carregado.
+<br />
+</p>
+<a name="Configurando_par.C3.A2metros_especiais_de_sinaliza.C3.A7.C3.A3o_ou_.C3.A1udio" id="Configurando_par.C3.A2metros_especiais_de_sinaliza.C3.A7.C3.A3o_ou_.C3.A1udio"></a><h2> <span class="mw-headline">Configurando parâmetros especiais de sinalização ou áudio </span></h2>
+<p>Para configurar parâmetros especiais de sincronismo e/ou sinalização, é possível utilizar o programa "k3lconfig": basta selecionar a placa desejada, e as opções das placas serão apresentadas, divididas em seções e subseções para facilitar o acesso. Não é necessário efetuar a configuração de todos os parâmetros: os valores padrão são assumidos, caso não sejam configurados.
+</p><p>Para ajustar a sinalização do link, basta - depois de selecionar a placa - entrar na seção "Opções de sinalização", e em seguida, em "Sinalização da linha". Para escolher uma sinalização específica, basta utilizar as teclas de direcionamento (setas) até selecioná-la, pressionar 'espaço', e confirmar a opção pressionando 'Enter' sobre o botão "Confirmar".
+</p><p>Por fim, para salvar as configurações modificadas, basta sair do programa: ele irá mostrar uma janela, com opções para salvar ou não as alterações realizadas.
+</p><p>É importante notar que <b>não é necessário alterar/ativar as seguintes opções</b>:
+</p>
+<ul><li> Cancelamento de eco automático;
+</li><li> Supressão de DTMFs automática;
+</li><li> Controle de ganho (AGC) automático.
+</li></ul>
+<p>Estas opções <b>são controladas pelo Endpoint</b>, e devem estar <b>desabilitadas</b> no 'k3lconfig'.
+<br />
+</p>
+<a name="Inicializa.C3.A7.C3.A3o_autom.C3.A1tica_dos_servi.C3.A7os_e_m.C3.B3dulos_de_kernel" id="Inicializa.C3.A7.C3.A3o_autom.C3.A1tica_dos_servi.C3.A7os_e_m.C3.B3dulos_de_kernel"></a><h2> <span class="mw-headline">Inicialização automática dos serviços e módulos de <i>kernel</i> </span></h2>
+<p>Se a carga dos módulos de <i>kernel</i> ou a inicialização dos serviços da Khomp não for realizada automaticamente na inicialização do sistema, é possível realizar esta instalação manualmente, criando um <i>link</i> para os <i>scripts</i> <b>/etc/init.d/khompdrv</b> e <b>/etc/init.d/kserver</b> no diretório de inicialização do sistema.
+</p><p>Na caso da distribuição <b>Debian</b>, o <i>script</i> de carga dos módulos de <i>kernel</i> seria <i>linkado</i> dentro do diretório <i>/etc/rcS.d/</i>, enquanto o <i>script</i> de inicialização dos serviços seria <i>linkado</i> dentro dos diretórios <i>/etc/rc2.d</i>, <i>/etc/rc3.d</i>, <i>/etc/rc4.d</i>, <i>/etc/rc5.d</i>, da seguinte forma:
+</p><p><!-- NEED 6 -->
+</p>
+<pre># ln -s /etc/init.d/khompdrv  /etc/rcS.d/S19khompdrv
+# ln -s /etc/init.d/kserver   /etc/rc2.d/S20kserver
+# ln -s /etc/init.d/kserver   /etc/rc3.d/S20kserver
+# ln -s /etc/init.d/kserver   /etc/rc4.d/S20kserver
+# ln -s /etc/init.d/kserver   /etc/rc5.d/S20kserver
+</pre>
+<p>É interessante verificar as normas da sua distribuição para inicializar os serviços de acordo com o que é esperado pela inicialização da mesma.
+<br />
+</p>
+<a name="Ap.C3.AAndice" id="Ap.C3.AAndice"></a><h1> <span class="mw-headline"> Apêndice </span></h1>
+<p>Nesta seção, encontram-se informações úteis sobre o Endpoint e componentes relacionados.
+</p>
+<a name="Disposi.C3.A7.C3.A3o_dos_arquivos" id="Disposi.C3.A7.C3.A3o_dos_arquivos"></a><h2> <span class="mw-headline"> Disposição dos arquivos </span></h2>
+<p>Os diretórios criados/modificados nesta instalação são:
+<!-- NEED 20 -->
+</p>
+<pre>/etc/init.d/                -- Scripts de inicialização;
+
+/etc/khomp/                 -- Arquivos de firmware e configurações;
+
+/usr/local/freeswitch/conf/ -- Configurações do FreeSWITCH e Endpoint;
+
+/usr/doc/khomp/             -- Documentação das placas, do mod_khomp e dos utilitários;
+
+/usr/sbin/                  -- Utilitários e servidor de processos;
+
+/usr/lib/                   -- Bibliotecas compartilhadas da K3L;
+
+/usr/local/freeswitch/mod/  -- Módulo 'mod_khomp.so';
+ 
+/var/log/khomp2.1/          -- Diretório de logs da K3L e Endpoint
+</pre>
+<p><br />
+O <i>script</i> <b>/etc/init.d/khompdrv</b> é responsável por carregar os módulos <i>kpci9030.ko</i> e <i>kpex8311.ko</i> no <i>kernel</i>, que deve ser realizada automaticamente na inicialização do sistema. Em caso de problemas, verifique a seção <a href="#Solu.C3.A7.C3.A3o_de_problemas" title="">Solução de problemas</a>.
+<br />
+</p><p><br />
+</p></body></html>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_khomp/docs/Manual.pdf b/src/mod/endpoints/mod_khomp/docs/Manual.pdf
new file mode 100644
index 0000000000..935b299dbc
Binary files /dev/null and b/src/mod/endpoints/mod_khomp/docs/Manual.pdf differ
diff --git a/src/mod/endpoints/mod_khomp/docs/README.html b/src/mod/endpoints/mod_khomp/docs/README.html
new file mode 100644
index 0000000000..e4cae5ad3b
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/docs/README.html
@@ -0,0 +1,39 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>Mod Khomp: README</title></head><body><a name="Guia_R.C3.A1pido" id="Guia_R.C3.A1pido"></a><h1> <span class="mw-headline"> Guia Rápido  </span></h1>
+<p>Depois de instalar a placa no sistema, e executar o programa de instalação pela primeira vez, os <i>drivers</i> e serviços da Khomp serão adicionados na inicialização do sistema, e automaticamente carregados.
+</p><p>Se o sistema possuir pelo menos uma placa de tronco E1 e/ou uma placa FXO, uma tela de configuração básica deverá ser apresentada ao final do processo, questionando parâmetros de sinalização - no caso de existirem placas E1 - e/ou realizando o ajuste de cadências - no caso de existirem placas FXO.
+</p><p>Se todas estas etapas foram executadas com sucesso, prossiga para o item <b>Utilizando o <i>Endpoint</i> da Khomp</b>. Caso algum problema ocorra, consulte o <a href=".htmlMod_Khomp/Manual" title="Mod Khomp/Manual">Manual do Endpoint</a>, seguindo para a seção de <a href=".htmlMod_Khomp/Manual#Solu.C3.A7.C3.A3o_de_problemas" title="Mod Khomp/Manual">Solução de problemas</a>.
+</p>
+<a name="Utilizando_o_Endpoint_da_Khomp" id="Utilizando_o_Endpoint_da_Khomp"></a><h1> <span class="mw-headline"> Utilizando o <i>Endpoint</i> da Khomp </span></h1>
+<p>Após a instalação e inicialização dos serviços necessários pela Khomp, o FreeSWITCH já pode ser carregado ou inicializado.
+</p>
+<ul><li> <b>AVISO</b>: É imprescindível que o <b>FreeSWITCH</b> não seja executado utilizando a opção que desabilita o escalonamento em tempo real (-nort), <b>especialmente</b> se este estiver sendo executado lado-a-lado com servidores <i>web</i> ou servidores de banco de dados. Não realizar este procedimento pode resultar em perda de qualidade do áudio, gerando um sério comprometimento no andamento das ligações do sistema.
+</li></ul>
+<p>Após a inicialização do FreeSWITCH, pode-se verificar se o módulo da Khomp foi carregado através do seguinte comando:<br /> 
+</p>
+<pre> freeswitch@hostname&gt; module_exists mod_khomp
+</pre>
+<p>A próxima linha deverá responder algo tipo:
+</p>
+<pre> true
+</pre>
+<p>Para verificar se o FreeSWITCH reconheceu todas as placas, digite: 
+</p>
+<pre> freeswitch@hostname&gt; khomp summary
+</pre>
+<p>A saída desse comando mostrará detalhes de todas placas reconhecidas.
+</p><p>No caso de uma placa de tronco E1, pode-se verificar o estado dos links com o seguinte comando:
+</p>
+<pre> freeswitch@hostname&gt; khomp show links
+</pre>
+<p>O estado dos canais individuais, por sua vez, pode ser aferido com o comando:
+</p>
+<pre> freeswitch@hostname&gt; khomp show channels
+</pre>
+<p>Para mais detalhes sobre os comandos do Endpoint da khomp digite no console do FreeSWITCH: 
+</p>
+<pre> freeswitch@hostname&gt; help khomp
+</pre>
+<ul><li> <b>IMPORTANTE</b>: Para fazer completo uso da sua placa Khomp, será preciso configurar suas regras de discagem, seja através do arquivo <i>default.xml</i> ou de um aplicativo externo, definindo regras específicas para realizar ao receber ligações.<br /><br />No <a href=".htmlMod_Khomp/Manual" title="Mod Khomp/Manual">Manual do Endpoint</a>, podem ser encontradas informações sobre o formato dos contextos de entrada (responsáveis por receber as ligações) e sobre as opções disponíveis no application Bridge (responsável por realizar ligações) que podem ser utilizadas com o Endpoint da Khomp, além de outras funcionalidades especiais providas pelo mesmo.
+</li></ul>
+<p><br />
+</p></body></html>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_khomp/docs/README.pdf b/src/mod/endpoints/mod_khomp/docs/README.pdf
new file mode 100644
index 0000000000..2b95cfaad4
Binary files /dev/null and b/src/mod/endpoints/mod_khomp/docs/README.pdf differ
diff --git a/src/mod/endpoints/mod_khomp/docs/README_en.html b/src/mod/endpoints/mod_khomp/docs/README_en.html
new file mode 100644
index 0000000000..5d44b8219f
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/docs/README_en.html
@@ -0,0 +1,40 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>Mod Khomp: README: en</title></head><body><a name="Quick_guide" id="Quick_guide"></a><h1> <span class="mw-headline"> Quick guide </span></h1>
+<p>After installing the card in the system and run the installation program for the first time, the <i>drivers</i> and Khomp services will be added at system startup, and automatically loaded.
+</p><p>If your system has at least one E1 trunk card and / or an FXO card, a basic setup screen will be presented at the end of the process, questioning signaling parameters - if there are signs E1 - and/or performing the adjustment cadences - where that FXO cards.
+</p><p>If all these steps were performed successfully, proceed to the item <b>Using Khomp Endpoint</b>. If a problem occurs, see the <a href=".htmlMod_Khomp/User_Guide" title="Mod Khomp/User Guide">User Guide</a>, in the section <a href=".htmlMod_Khomp/User_Guide#Troubleshooting" title="Mod Khomp/User Guide">Troubleshooting</a>.
+</p>
+<a name="Using_the_Khomp_Endpoint" id="Using_the_Khomp_Endpoint"></a><h1> <span class="mw-headline"> Using the Khomp Endpoint </span></h1>
+<p>After installation and startup services required by Khomp, FreeSWITCH can now be loaded or initialized.
+</p>
+<ul><li><b>WARNING</b>: It is imperative that the<b>FreeSWITCH</b> is not executed using the option that disables the escalation in real time (-nort), <b>especially</b> if this is running side-by server-side with web servers or database. Failure to do so may result in loss of audio quality, causing a serious commitment on the progress of system connections.
+</li></ul>
+<p>After initialization of FreeSWITCH, you can verify that the module was loaded Khomp through the following command: <br />
+</p><p><br />
+</p>
+<pre> freeswitch@hostname&gt; module_exists mod_khomp
+</pre>
+<p>The next line should answer something like:
+</p>
+<pre> true
+</pre>
+<p>To verify that the FreeSwitch recognize all the cards, type:
+</p>
+<pre> freeswitch@hostname&gt; khomp summary
+</pre>
+<p>The output of this command will show details of all cards accepted.
+</p><p>In the case of an E1 card, you can check the status of links with the following command:
+</p>
+<pre> freeswitch@hostname&gt; khomp show links
+</pre>
+<p>The state of individual channels, in turn, can be measured with the command:
+</p>
+<pre> freeswitch@hostname&gt; khomp show channels
+</pre>
+<p>For more details on the commands of the Endpoint khomp type in the console of FreeSWITCH:
+</p>
+<pre> freeswitch@hostname&gt; help khomp
+</pre>
+<ul><li><b>IMPORTANT</b>: To make full use of your card Khomp, you must configure your dialing rules, either through the extension.conf or from an external application by setting specific rules for conduct by receiving connections. <br /> In the <a href=".htmlMod_Khomp/User_Guide" title="Mod Khomp/User Guide">User Guide</a>, information can be found on the format of input contexts (responsible for receiving calls) and on the options available on application Dial (responsible for make calls) that can be used with the Endpoint Khomp, and other special features provided by it.
+</li></ul>
+<p><br />
+</p></body></html>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_khomp/docs/README_en.pdf b/src/mod/endpoints/mod_khomp/docs/README_en.pdf
new file mode 100644
index 0000000000..25be8ab0b2
Binary files /dev/null and b/src/mod/endpoints/mod_khomp/docs/README_en.pdf differ
diff --git a/src/mod/endpoints/mod_khomp/docs/User_Guide.html b/src/mod/endpoints/mod_khomp/docs/User_Guide.html
new file mode 100644
index 0000000000..eb5cfc6c4e
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/docs/User_Guide.html
@@ -0,0 +1,1088 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>Mod Khomp: User Guide</title></head><body>
+<a name="First_considerations" id="First_considerations"></a><h1> <span class="mw-headline"> First considerations </span></h1>
+<p>This document covers information about the <i>Endpoint</i> of Khomp as a whole, include the options, <i>applications</i>, <b>CLI</b> commands, among others.
+</p><p>For first installation procedures, please see the <a href=".htmlMod_Khomp/README/en" title="Mod Khomp/README/en">README</a>.
+<br />
+</p>
+<a name="Configuration" id="Configuration"></a><h1> <span class="mw-headline"> Configuration </span></h1>
+<p>Configuring the Khomp Endpoint is a task that consists of three steps:
+</p>
+<ul><li> Configuration of the boards through the K3L;
+</li><li> Setting up the Endpoint;
+</li><li> Setting up the FreeSWITCH.
+</li></ul>
+<p>These steps are described more fully below.
+<br />
+</p>
+<a name="K3L_API_Configuration" id="K3L_API_Configuration"></a><h2> <span class="mw-headline"> K3L API Configuration </span></h2>
+<p>This step is carried out in a semi-automated way using the <b>khompwizard</b> program, a wizard that configures the basic parameters of the system boards. This wizard initializes the configuration files using information from the user when they are needed, initializing the standard settings to default values.
+</p><p>Typically, this program runs automatically after installation of the system. However, you may need to run it manually if an update is being performed, or if new cards were added to the system after installing new drivers.
+</p><p><br />
+If you need to set advanced parameters of the board and/or signaling, the program <b>k3lconfig</b> allows you to access all the available settings for each installed card. For more information about this program, check the <b><a href="http://169.254.1.3/kdevwiki/wikidocs/index.php?title=K3lconfig_-_User%27s_Guide&amp;action=edit&amp;redlink=1" class="new" title="K3lconfig - User&#39;s Guide (página não existe)">k3lconfig User's Guide</a></b>. For solving synchronization issues, check the <a href="#_Troubleshooting" title="">Troubleshooting</a> section for manual configuration of the boards.
+<br />
+</p>
+<a name="Endpoint_Configuration" id="Endpoint_Configuration"></a><h2> <span class="mw-headline"> Endpoint Configuration </span></h2>
+<p>The system's default configuration normally meet most user's needs. However, the configuration of the Endpoint Khomp can be modified through the configuration file '<b>/usr/local/freeswitch/conf/autoload_configs/khomp.conf.xml'</b>.
+</p><p>The list of options is as follows:
+</p>
+<a name=".3Cchannels.3E" id=".3Cchannels.3E"></a><h4> <span class="mw-headline"> &lt;channels&gt; </span></h4>
+<p>Define general settings of all channels of Khomp:
+</p>
+<pre><b>Sintaxe:</b> &lt;param name="..." value="..."/&gt;
+</pre>
+<ul><li><b>dialplan</b>: Name of the dialplan module in use.
+</li><li><b>auto-fax-adjustment</b>: Enable ("yes") or disables ("no") the automatic adjustment of the channel (disable the echo canceller and the suppression DTMF) tone to detect FAX (local option)&nbsp;;
+</li><li><b>auto-gain-control</b>:Enable ("yes") or disables ("no") the activation of the automatic gain control (AGC) by the Endpoint (local option);
+</li><li><b>context-digital</b>: Context for incoming connections on digital boards (the default is "khomp-DD-LL", where "DD" will be replaced at the time of connection by the device number, "LL" by the number of the link, "CCC" by channel number and "SSSS" for the device serial number);
+</li><li><b>context-fxo</b>: Context for incoming connections on FXO cards (the default is "khomp-CC-DD", where "DD" will be replaced at the time of connection by the device number, "CC" by channel number, and "SSSS" by the device serial number);
+</li><li><b>context-fxs</b>: Context for incoming connections on FXS cards (the default is "khomp-CC-DD", where "DD" will be replaced at the time of connection by the device number, "CC" by channel number, and "SSSS" by the device serial number); 
+</li><li><b>context-gsm-call</b> (or <b>context-gsm</b>): Context of entry for GSM boards (the default is "khomp-CC-DD", where "DD" will be replaced at the time of connection by the device number, "CC" by channel number, and "SSSS" by the device serial number);
+</li><li><b>context-gsm-sms</b>: Context for incoming SMSs (the default is "khomp-sms-CC-DD", where "DD" will be replaced by the number of device, "CC" by channel number and "SSSS" by the device's serial number);
+</li><li><b>context-pr</b>: Context for incoming connections on boards KPR (default is "khomp-CC-DD", where "DD" will be replaced at the time of connection by the device number, "CC "by channel number);
+</li><li><b>disconnect-delay</b>: Sets the time in milliseconds to perform processing a disconnect event, to ignore situations where other equipment performing the double service to overthrow collect calls (local option);
+</li><li><b>echo-canceller</b> (former 'echocanceller): Active ("yes") or disables ("no") echo cancellation automatic Endpoint (local option);
+</li><li><b>fxo-send-pre-audio</b>: When enabled ("yes") releases audio channel before the outgoing call connection boards KFXO (the default value is "yes");
+</li><li><b>fxs-global-orig</b>: Start number for sequencial branch numbering in FXS cards that are not listed in the <b>[fxs-branches]</b> section (the numbering follows ascending order from board number and physical channel number) (default is "0");
+</li><li><b>fxs-co-dialtone</b>: Sequences of numbers, separated by commas, which fires a continuous tone (of central office) in FXS branches (eg: "0,99" means that, when you dial "0" or "99", the user will hear a continuous dial tone) (default is empty);
+</li><li><b>fxs-bina</b>: When enabled ("yes"), calls to FXS lines will send digits corresponding to the source phone identification using BINA DTMF signaling (the default value is "no") (local option);
+</li><li><b>input-volume</b>: Sets the volume gain for incoming audio (entering the board), from -10 to +10 (local option);
+</li><li><b>kommuter-activation</b>: Sets whether to activate devices kommuter found in the system will be done automatically ("auto") by the channel, or manually ("manual") by the user through the command "khomp kommuter on/off" 
+</li><li><b>kommuter-timeout</b>: Sets the timeout (in seconds) for initializing the kommuter devices. If this timeout is reached without receiving notification of the channel, the devices will switch back to "off" condition. The minimum value is "0", where the links will always remain switched "on", and the maximum is "255";
+</li><li><b>language</b>: Set language to Khomp channel calls (local option);
+</li><li><b>log-to-console</b>: Set log messages to be printed on the console;
+</li><li><b>log-to-disk</b> (old "log"): Set log messages to be saved to disk;
+</li><li><b>out-of-band-DTMF</b> (former <b>dtmfsuppression</b>): Activate ("yes") or disables ("no") the removal and DTMF sending these out-of-band (local option);
+</li><li><b>output-volume</b>: Define o volume de saída das ligações, varia de -10 a +10&nbsp;; 
+</li><li><b>pulse-forwarding</b> (former 'pulsedetection): Active ("yes") or disables ("no") for the detection of pulses and converting them into DTMF (local option);
+</li><li><b>r2-preconnect-wait</b> (former 'r2preconnectwait): Sets the timeout sending the ringback signaling, protocol R2/MFC to start sending audio silence. Only used when "r2-strict-Behavior" is set to "no" (local option);
+</li><li><b>r2-strict-Behaviour</b>: Enable ("yes") or disables ("no") the behavior of signaling R2/MFC as the standard sets. The default is "no", and can be changed to "yes" if needed to receive / send data precise signaling protocol (condition B, for example) (local option);
+</li><li><b>ringback-delay-co</b>: Sets the delay to enable the generation of call control tone (ringback) by the Endpoint Khomp when there is an ringback indication from signaling and there is no audio being sent by the channel which indicated the situation (local option);
+</li><li><b>ringback-delay-pbx</b>: Sets the delay to enable the generation of call control tone (ringback) by the Endpoint Khomp when there is an ringback indication, and the audio has no tone (silence) (local option);
+</li><li><b>suppression-delay</b> (former <b>suppressiondelay</b>): Activate ("yes") or disables ("no") the delay necessary to suppress DTMF. If disabled ("no"), also disables suppression of DTMF (local option);
+</li><li><b>trace</b>: Set debugging options. Should not be used in production unless absolutely necessary;
+</li><li><b>user-transfer-digits</b>: Defines a sequence of DTMF digits to initiate the transfer between FreeSWITCH&reg; and another PBX (using user signaling, like QSig or FXO FLASH).
+</li><li><b>flash-to-digits</b>: Defines the digits to be sent when the FLASH is detected on FXS channels..
+</li></ul>
+<p><br />
+</p>
+<a name=".3Cgroups.3E" id=".3Cgroups.3E"></a><h4> <span class="mw-headline"> &lt;groups&gt; </span></h4>
+<p>Defines the groups to be used in channel allocation.
+</p><p>In this case, the options are used to define names for <i>strings allocation of channels</i>. The format follows the standard <b>&lt;group name&gt; = &lt;allocation string&gt;</b>, where the <b>allocation string</b> is the same string used in the bridge application, and <b>group name</b> is an arbitrary name chosen by the user.
+</p>
+<dl><dd>For example, to define the group <b>pstn</b> as the channels 0 and 5 of the board 0, the following line could be used:
+</dd></dl>
+<pre>&lt;param name="pstn" value="b0c0 + b0c5"/&gt; 
+</pre>
+<p>This group, in turn, could be used in the <i>bridge application</i> as <b>&lt;action application="bridge" data="Khomp/Gpstn/..."/&gt;</b>.
+</p>
+<dl><dd>You can associate a given input context to a channel group, simply specify a name of context string after the allocation, separated by ':'.
+</dd></dl>
+<p>For example, to define the same group <b>pstn</b> as channels 0 to 20 of card 0, and defining the incoming context to for channels in this groups to <b>from-pstn</b>, one could use the line:
+</p>
+<pre>&lt;param name="pstn" value="b0c0-20:from-pstn"/&gt;
+</pre>
+<p>This group would be used the same way as before in the <i>bridge application</i>, and all the calls coming from these channels would be treated in context <b>from-pstn</b>.
+<br />
+</p>
+<a name=".3Ccadences.3E" id=".3Ccadences.3E"></a><h4> <span class="mw-headline"> &lt;cadences&gt; </span></h4>
+<p>Defines settings for the Endpoint cadences.
+</p><p>In this case, the options are names cadences, followed by one or two pairs of numbers - that define the ranges of tone and silence to be used in cadences.
+For details, please refer to the configuration file for examples.
+<br />
+</p>
+<a name=".3Cfxs-branches.3E" id=".3Cfxs-branches.3E"></a><h4> <span class="mw-headline"> &lt;fxs-branches&gt; </span></h4>
+<p>Defines source numbers for the board KFXS.
+</p><p>In this case, the options are sequences of prefixes of branches and serial numbers of the boards, which define the basic numbers of source addresses, and the numerical order of the boards. The format of the options is:
+</p>
+<pre>&lt;param name="prefixo" value="serial1, serial2, ...."/&gt;
+</pre>
+<p>For example, if two <b>KFXS-300 SPX</b> boards with serial numbers <b>K0374</b> and <b>K2352</b> must be numbered sequentially, starting from branch 200, you may write:
+</p>
+<pre>&lt;param name="200" value="374, 2352"/&gt;
+</pre>
+<p>This will define the first branch of board '<i>K0374</i> as number 200, the second as 201, and so one. The first branch from board K2352 will have number 230 (as K0374 has 30 channels), the second will be numbered 231, and so on - until the last channel, numbered 259.
+</p><p>For more details, please refer to the configuration file for other exemples.
+<br />
+</p>
+<a name=".3Cfxs-hotlines.3E" id=".3Cfxs-hotlines.3E"></a><h4> <span class="mw-headline"> &lt;fxs-hotlines&gt; </span></h4>
+<p>Sets hotlines for the KFXS based boards
+</p><p>In this case, the options are sequences of branches and sequences of destination numbers, which define branches to be treated as "hotlines" and numbers to be dialed when they are take off hook. For instance:
+</p>
+<pre>&lt;param name="100" value="1234"/&gt;
+&lt;param name="200" value="4321"/&gt; 
+</pre>
+<p>In the first line, the branch numbered 100 will call extension 1234 when taken off hook, while in the second one, branch 200 will call number 4321 when taken off hook.
+<br />
+</p>
+<a name=".3Cfxs-options.3E" id=".3Cfxs-options.3E"></a><h4> <span class="mw-headline"> &lt;fxs-options&gt; </span></h4>
+<p>Allows you to set specific settings for FXS extension.
+</p><p>In this case, the settings are extension numbers (based on those defined in the <b>&lt;fxs-branches&gt;</b>), and the options and their values.
+</p>
+<ul><li>context; 
+</li><li>input-volume; 
+</li><li>output-volume; 
+</li><li>accountcode; 
+</li><li>calleridnum; 
+</li><li>calleridname;
+</li><li>mailbox;
+</li><li>flash-to-digits.
+</li></ul>
+<p>Each option is separated from each other by a pipe "|" or a slash "/" and defined after the colon ":". Example:
+</p>
+<pre>&lt;param name="200" value="language:en|context:master-branch" /&gt;
+</pre>
+<p>For more information on the syntax and examples, please refer to the configuration file.
+</p><p>For more information visit the configuration file '<b>khomp.conf.xml'</b>.
+<br />
+</p>
+<a name="FreeSWITCH_Configuration" id="FreeSWITCH_Configuration"></a><h2> <span class="mw-headline"> FreeSWITCH Configuration </span></h2>
+<p>When connections are received on the boards and devices Khomp, they are forwarded by the <i>Endpoint</i> to specific contexts within the dialplan of FreeSWITCH&reg;. These settings can be changed via the configuration file <b>khomp.conf.xml</b>, available on the FreeSWITCH configuration directory (by default, "<b>/usr/local/freeswitch/conf/autoload_configs</b>").
+</p><p>For details about the specific contexts, see section <a href="#Endpoint_Configuration" title="">Endpoint configuration</a>.
+</p><p>Below are details of how to configure the settings for incoming calls
+<br />
+</p><p><br />
+</p>
+<a name="Contexts_for_E1_channels" id="Contexts_for_E1_channels"></a><h3> <span class="mw-headline"> Contexts for E1 channels </span></h3>
+<p>For E1 boards, inbound contexts are predefined as option <b>context-digital</b> with default value as following:
+</p>
+<pre>&lt;param name="context-digital" value="khomp-DD-LL"/&gt;
+</pre>
+<p>This standard defines the context that links will be redirected in accordance with the number of the board and number of the link: <b>DD</b> is the device number (two digits), and <b>LL</b> is the number of the link (also with two digits).
+</p><p>However, it is possible to configure other inbound contexts, with different formats. There is format <b>CCC</b>, which means the channel number on the card (three digits), and <b>SSSS</b>, which represents the serial board number (with four digits).
+</p><p>Examples for configuration entries (<b>khomp.conf.xml</b>):
+</p>
+<pre>&lt;!-- Serial board number and sequential link (ex: khomp-01-00) --&gt;
+&lt;param name="context-digital" value="khomp-DD-LL"/&gt;
+</pre>
+<pre>&lt;!-- Serial board number and sequential link (ex: khomp-3049-00) --&gt;
+&lt;param name="context-digital" value="khomp-SSSS-LL"/&gt;
+</pre>
+<pre>&lt;!-- Sequential board number and the channel (ex: khomp-00-001) --&gt;
+&lt;param name="context-digital" value="khomp-DD-CCC"/&gt;
+</pre>
+<pre>&lt;!-- Receive all calls in one context (khomp-digital) --&gt;
+&lt;param name="context-digital" value="khomp-digital"/&gt;
+</pre>
+<p>Follows an example the context usage inside the dialplan:
+<!-- NEED 6 -->
+</p>
+<pre>&lt;!--
+The present context in 'extensions.conf' will handle calls
+that come from the link 0 (first link) of the board 0.
+--&gt;
+&lt;context name="khomp-00-00"&gt;
+             .
+             .
+             .
+&lt;/context&gt;
+</pre>
+<p>Another example, using the same format:
+<!-- NEED 6 -->
+</p>
+<pre>&lt;!-- 
+The present context in 'extensions.conf' will handle calls
+that come from the link 1 (second link) of the board 0.
+--&gt;
+&lt;context name="khomp-00-01&gt;
+             .
+             .
+             .
+&lt;/context&gt;
+</pre>
+<p>A complete example, with a few simple actions:
+<!-- NEED 10 -->
+</p>
+<pre>&lt;context name="khomp-00-00"&gt;
+    &lt;extension name="exemplo_1"&gt;
+        &lt;condition field="destination_number" expression="^1234$"&gt;
+            &lt;action application="bridge" data="Khomp/b0L1/2345"/&gt;
+        &lt;/condition&gt;
+    &lt;/extension&gt;
+    &lt;extension name="exemplo_2"&gt;
+        &lt;condition field="destination_number" expression="^23(\d{2})$"&gt;
+            &lt;action application="bridge" data="sofia/${use_profile}/11$1@${sip_from_host}"/&gt;
+        &lt;/condition&gt;
+    &lt;/extension&gt;
+&lt;/context&gt;
+</pre>
+<pre>&lt;context name="khomp-00-01"&gt;
+    &lt;extension name="exemplo_3"&gt;
+        &lt;condition field="destination_number" expression="^1111$"&gt;
+            &lt;action application="bridge" data="Khomp/b0L0/2345"/&gt;
+        &lt;/condition&gt;
+    &lt;/extension&gt;
+&lt;/context&gt;
+</pre>
+<p>This dialplan defines that:
+</p>
+<ol><li> The incoming calls on the link <b>0</b> of the board <b>0</b> will have the following handling:
+<ul><li> Calls to the extension 1234 for will be redirected to the second link on the first board (b0L1), calling number <b>2345</b>;
+</li><li> Calls to any four digit number starting with<b>23</b> will be redirected to SIP phones numbered <b>11</b> plus the last two digits of the number dialed.
+</li></ul>
+</li><li> The incoming calls on the link <b>1</b> of the board <b>0</b> for the number <b>1111</b> will be redirected to the first link of the first board (b0L0) calling number <b>2345</b>.
+</li></ol>
+<a name="Contexts_of_FXS.2FFXO.2FGSM_channels" id="Contexts_of_FXS.2FFXO.2FGSM_channels"></a><h3> <span class="mw-headline"> Contexts of FXS/FXO/GSM channels </span></h3>
+<p>Just as in the context of E1 cards, inbound links are forwarded to the Endpoint FreeSwitch. 
+</p><p>The context is pre-defined as follows, according to the file <b>khomp.conf.xml</b>:
+</p>
+<pre>&lt;param name="context-gsm" value="khomp-DD-CC"/&gt;&nbsp;;placas GSM
+</pre>
+<pre>&lt;param name="context-fxs" value="khomp-DD-CC"/&gt;&nbsp;; placas FXS
+</pre>
+<pre>&lt;param name="context-fxo" value="khomp-DD-CC"/&gt;&nbsp;; placas FXO
+</pre>
+<p>For these options, <b>DD</b> is the device number (two digits), and <b>CC</b> is the channel number (also two digits). There is also the <b>SSSS</b> format, which represents the serial number board.
+</p>
+<ul><li><b>NOTE</b>: In the <b>KGSM</b> board, incoming calls are <b>always</b> redirected to the <b>"s"</b> extension, since the GSM protocol does not identify the target number, only the originator - if not omitted.
+</li></ul>
+<a name="Priority_settings_on_the_FXS_branches" id="Priority_settings_on_the_FXS_branches"></a><h4> <span class="mw-headline"> Priority settings on the FXS branches </span></h4>
+<p>On calls originated from an FXS branch, the Endpoint searches for a valid extension (digits sent) after the DTMF <b>#</b> or after the <i>timeout</i> (option <b>fxs-digit-timeout</b>). That search is done in the context defined in section <b>&lt;fxs-options&gt;</b>, or if no context configured, the search is done in context defined in <b>context-fxs</b>.
+<br />
+</p>
+<a name="Contexts_for_SMS_messages_.28GSM_only.29" id="Contexts_for_SMS_messages_.28GSM_only.29"></a><h3> <span class="mw-headline"> Contexts for SMS messages (GSM only) </span></h3>
+<p>SMS messages are received by the Khomp <i>Endpoint</i> and forwarded to FreeSWITCH as a normal connection but no audio, which has some variables set with information received in the message - for more information on these variables, see the documentation of the variables of the <i>Endpoint</i>. This context can also be modified in the same way as the above contexts.
+</p><p>The default value for this option follows (<b>khomp.conf.xml</b>):
+</p>
+<pre>&lt;param name="context-gsm-sms" value="khomp-sms-DD-CC"/&gt; 
+</pre>
+<p>Where <b>DD</b> is the device number (two digits), and <b>CC</b> is the channel number (also with two digits). For example:
+</p>
+<pre>&lt;context name="khomp-sms-00-01"&gt;
+    &lt;extension name="sms"&gt;
+        &lt;condition field="destination_number" expression="^s$"&gt;
+            &lt;action application="log" data="DEBUG KSmsType=${KSmsType}"/&gt;
+            &lt;action application="log" data="DEBUG KSmsBody=${KSmsBody}"/&gt;
+        &lt;/condition&gt;
+    &lt;/extension&gt;
+&lt;/context&gt;
+</pre>
+<a name="Contexts_for_Khomp_PR_channels_.28KPR.29" id="Contexts_for_Khomp_PR_channels_.28KPR.29"></a><h3> <span class="mw-headline"> Contexts for Khomp_PR channels (KPR) </span></h3>
+<p>For these cards, inbound links have a pre-defined context, as shown below:
+</p>
+<pre>&lt;param name="context-pr" value="khomp-DD-CC"/&gt; 
+</pre>
+<p>In this case, <b>DD</b> is the device number (two digits), and<b>CC</b> is the channel number (also two digits). The name and format of this context can also be changed through the "context-pr" in the configuration file.
+<br />
+</p>
+<a name="Groups_contexts" id="Groups_contexts"></a><h3> <span class="mw-headline"> Groups contexts </span></h3>
+<p>The section <b>groups</b>, in the configuration file <b>khomp.conf.xml</b>, can be used to define specific settings for certain groups of channels.
+</p><p>This section is detailed in the section <b>Endpoint Configuration</b>.
+<br />
+</p>
+<a name="Using_the_bridge_application" id="Using_the_bridge_application"></a><h3> <span class="mw-headline"> Using the <i>bridge</i> application </span></h3>
+<p>The <b>bridge</b> application is responsible for generating calls from the FreeSWITCH from a dialplan. This application can be used to generate calls from different Endpoints technologies, following a specific format to define destination, dialing options and define the communication <i>Endpoint</i> to be used.
+</p>
+<a name="Fields_relating_to_the_Khomp_Endpoint" id="Fields_relating_to_the_Khomp_Endpoint"></a><h4> <span class="mw-headline"> Fields relating to the Khomp <i>Endpoint</i> </span></h4>
+<p>When used for <b>Khomp</b> channels, the <i>bridge</i> <i>string</i> can have two, three or four fields separated by slash (/). Some example strings:
+<!-- NEED 11 -->
+</p>
+<pre>&lt;action application="bridge" data="Khomp/B2L0/32625644"/&gt;
+&lt;action application="bridge" data="Khomp/*B2L0/32625644"/&gt;
+&lt;action application="bridge" data="Khomp/S0411/99991234"/&gt;
+&lt;action application="bridge" data="Khomp/Gpstn/99991234"/&gt;
+&lt;action application="bridge" data="Khomp/*Gpstn/99991234"/&gt;
+&lt;action application="bridge" data="Khomp/B2C58/32625644/category=4:orig=4855553232"/&gt;
+&lt;action application="bridge" data="Khomp/b0c9"/&gt;
+&lt;action application="bridge" data="Khomp/b0c1+b0c14"/&gt;
+&lt;action application="bridge" data="Khomp/r304"/&gt;
+</pre>
+<p>In the first five examples, three fields have been specified; in the sixth, four fields are used; in the last three examples, just two are used.
+</p><p>The fields description for the Khomp Endpoint:
+</p>
+<ul><li><b>1st</b> field: <b>Khomp</b>: identifying the type of <i>Endpoint</i> in question;
+</li><li><b>2nd</b> field: <b>B2L0</b>, <b>S0411</b>, <b>Gpstn</b>, etc: represents the <b>Policy for channel allocation</b> (detailed below);
+</li><li><b>3rd</b> field: <b>32625644</b> and <b>99991234</b>: the destination numbers (missing for calls to <b> KFXS</b> channels);
+</li><li><b>4th</b> field: <b>category=4:orig=4855553232</b>: additional options, detailed below.
+</li></ul>
+<p>NOTE: The <i>bridge</i> allocation string with only two fields is specific to the KFXS boards, where the destination is the channel itself.
+</p>
+<a name="Policy_for_channel_allocation" id="Policy_for_channel_allocation"></a><h4> <span class="mw-headline"> Policy for channel allocation </span></h4>
+<p>The policy for allocation of channels on the <b>Khomp</b> Endpoint can be specified in the <b>bridge</b> string itself or in the <b>groups</b> section (inside the configuration file <b>khomp.conx.conf</b>). To specify boards, links and channels, the following syntax is available (considering X, Y and Z as any numbers):
+</p>
+<ul><li> b<b>X</b> -- search the channels on the board <b>X</b>, ascending order;
+</li><li> b<b>X</b>L<b>Y</b> -- search channel on the link <b>Y</b> from <b>X</b> board, ascending order;
+</li><li> b<b>X</b>c<b>Y</b> -- try to allocate channel <b>Y</b> from board <b>X</b>;
+</li><li> b<b>X</b>c<b>Y</b>-<b>Z</b> -- search for channels starting from channel <b>Y</b> to channel <b>Z</b> (inclusive) of board <b>X</b>, ascending order;
+</li><li> B<b>X</b>c<b>Y</b>-<b>Z</b> -- same as above, but descending order;
+</li><li> s<b>X</b> -- search the channels on the board of serial number <b>X</b>, ascending order;
+</li><li> s<b>X</b>L<b>Y</b> -- search channel on the link <b>Y</b> from board of serial number <b>X</b>, ascending order;
+</li><li> s<b>X</b>c<b>Y</b> -- try to allocate channel <b>Y</b> from board of serial number <b>X</b>;
+</li><li> s<b>X</b>c<b>Y</b>-<b>Z</b> -- search for channels starting from channel <b>Y</b> to channel <b>Z</b> (inclusive) from board of serial number <b>X</b>, ascending order;
+</li><li> S<b>X</b>c<b>Y</b>-<b>Z</b>-- same as above, but descending order.
+</li></ul>
+<p>To search for extensions of cards<b>KFXS</b> according to the extension number, can be used the following syntax (whereas X and Y valid extension numbers):
+</p>
+<ul><li> r<b>X</b>- search branch numbered <b>X</b>;
+</li><li> R<b>X</b>- equivalent to the above;
+</li><li> r<b>X</b>-<b>Y</b>- search from branch <b>X</b> to <b>Y</b>, ascending order;
+</li><li> R<b>X</b>-<b>Y</b>- search from branch <b>X</b> to <b>Y</b>, descending order.
+</li></ul>
+<p>The capitalization of the letter 'B', 'S' or 'R' defines the search order of the channels: if capitalized, order is descending; otherwise, ascending.
+</p><p>As for the allocation of channels across groups, the following syntax is available:
+</p>
+<ul><li> ggroupname - uses the string defined the group "groupname" in the configuration file (detailed in the configuration section of the Endpoint).
+</li><li> Ggroupname - equivalent to the above.
+</li></ul>
+<a name="Grouping_channel_allocations" id="Grouping_channel_allocations"></a><h3> <span class="mw-headline"> Grouping channel allocations </span></h3>
+<p>There are cases where you need to get more channels for a particular device or particular group of extensions. For this, there is an extension available in string allocation, with respect to the use of token sum (<b>+</b>) to concatenate multiple strings<i>binding</i>, as follows:
+<!-- NEED 6 --> 
+</p>
+<pre>&lt;action application="bridge" data="Khomp/B1L0+B2L0/32332933"/&gt;
+&lt;action application="bridge" data="Khomp/*B2+B3+B4/99887766"/&gt;
+&lt;action application="bridge" data="Khomp/S0411+B1L0/99887766"/&gt;
+&lt;action application="bridge" data="Khomp/Gpstn1+Gpstn2/99991234"/&gt;
+&lt;action application="bridge" data="Khomp/*gOperadora1+gOperadora2/98891234"/&gt;
+</pre>
+<p>This grouping is available for the <i>application</i> <b>bridge</b> and on the specification of groups. The processing of allocation takes place from left to right - except when using cyclic channel allocation, where<b>all</b> the specified channels are scanned simultaneously.
+</p>
+<a name="Cyclical_and.2For_fair_allocation" id="Cyclical_and.2For_fair_allocation"></a><h4> <span class="mw-headline"> Cyclical and/or <i>fair</i> allocation </span></h4>
+<p>Another way for allocation of channels is the cyclic and/or <i>fair</i> allocation, which chooses the channel that has <b>completed</b> the the lowest number of <b>outgoing</b> calls. This mode of allocation may be used by passing an asterisk (<b>*</b>) before the allocation string of channels (as can be seen in the section above, in the second and fifth examples).
+</p><p>When started with an asterisk (<b>*</b>), other forms of allocation (increasing, decreasing, etc) are used to decide what channel will be allocated when there are two or more channels with less number of outgoing calls.
+</p>
+<ul><li><b>WARNING: The use of fair and/or cyclic is recommended <u>only</u> for analog (KFXO), branches (KFXS) and cellular interface (KGSM) boards</b>. E1 connections should allocate channels in one way (ascending/descending) from one side and the opposite on the other to avoid problems of double seizure (which may occur in R2/MFC signaling). Fair/cyclic allocation also costs more in memory and processor footprint, which tends to be a higher cost in E1 due to the higher number of channels (30 in each link).<br /><br /> For these reasons, fair/cyclic allocations should only be used on signalizations where it can represent any real difference, like equalizing the charge costs of the lines, the total usage, or the number of connections received by each branch.
+</li></ul>
+<a name="Available_options" id="Available_options"></a><h4> <span class="mw-headline"> Available options </span></h4>
+<ul><li><b>orig</b>: Sets the originator number, <b>without changing the variable ${CALLERID(num)}</b>. That is, the option <b>orig</b> serves <b>only</b> to pass a number of different source of${origination_caller_id_number}. If FreeSWITCH has already set the variable ${origination_caller_id_number}, which is the default behavior, Endpoint automatically uses this value as a reference to the number of origin, without having to pass any additional options.<br /><br />On the boards <b>KGSM</b>, is set to <b>restricted</b>, omits the number of origin. Example:<br />
+</li></ul>
+<pre>
+ &lt;action application=&quot;bridge&quot; data=&quot;Khomp/b0/99887766/orig=restricted&quot;/&gt;
+</pre>
+<ul><li><b>category</b>: When set to a numeric value, sets the category of outgoing call to this value (available only in R2/MFC signaling);
+</li><li><b>uui</b>: When adjusted for a number and a string of text, separated by hash ("#"), sends a "UserToUser" to the other end before making the call - the first value will be the descriptor and the second one will be the message as the text (available only in ISDN signaling);
+</li><li><b>ring_cadence</b>: When set to a cadence name (listed in the <b>[cadences]</b> section), uses this for ringing FXS channels;
+</li><li><b>ring</b>: When set to two numbers separated by a dot ("."), defines the cadences to be used while ringing a FXS channel - the first time is the ringing time, and the second one, the silence time;
+</li><li><b>ring_ext</b>: When set to two numbers separated by a dot ("."), defines the extended cadences to be used while ringing a FXS channel, executed after the <b>ring</b> specification - the first time 
+</li><li><b>usr_xfer</b>: Defines a group of DTMF digits to initiate a transfer between PBXes (using QSig or FXO FLASH, for instance);
+</li><li><b>drop_on</b>: When set to "message_box", "human_answer", "answering_machine", "carrier_message", "unknown" or a list them - separated by plus sign ("+") or dot ("." ) - drops the call when detect voice mail box, human answer, answering machine messages, operator messages, or unknown answer pattern - respectively. Available in digital signals (E1 links and boards KGSM). Additionally, the information service is reported to the user in the variable<b>KCallAnswerInfo</b>;
+</li><li><b>answer_info</b>: When specified (take no parameters), report answer information to the user through the variable<b>KCallAnswerInfo</b>
+</li><li><b>pre</b>: When set to a string of DTMF digits, uses these to pre-allocate an output channel in an analog PABX, dial the desired number of B below. Only available for signaling analog (FXO);
+</li><li><b>pre_answer</b>: When set (need no value), answers the channel before the connection is completed - allowing, for instance, DTMF tones to sent (useful for use in a <b>DISA</b>);
+</li><li><b>output_volume</b>: Sets the output volume of the link (ranges from -10 to +10);
+</li><li><b>input_volume</b>: Sets the volume of inbound link (ranges from -10 to +10);
+</li></ul>
+<p><br />
+</p>
+<a name="List_of_variables" id="List_of_variables"></a><h3> <span class="mw-headline"> List of variables </span></h3>
+<p>Here's a list of variables available in the Endpoint:
+</p>
+<ul><li><b>KDropCollectCall</b>: When set before ringing or answer an incoming call, enables ("yes") or disables ("no", default) the drop of collect calls based on signaling received from the central public, double answer, audio tone recognition (can be defined globally);
+</li><li><b>KR2SendCondition</b>: When set to a numeric value, before the ringing an incoming call, adjusts the condition for this Endpoint to this value (available only on R2 signaling);
+</li><li><b>KR2GotCategory</b>: Adjusted by the Endpoint when an incoming call is received, with the category number of the caller (only available on R2 signaling);
+</li><li><b>KR2GotCondition *</b>: Adjusted by the Endpoint, available after returning from a call made by FreeSWITCH (<b>bridge</b> application). Has the condition of the remote end received when making the call (available only for R2 signaling);
+</li><li><b>KISDNGotCause *</b>: Adjusted by the Endpoint, available after returning from a call made by FreeSWITCH (<b>bridge</b> application). Has the ISDN "cause" code received when making the call (available only for ISDN signaling);
+</li><li><b>KCallAnswerInfo *</b>: Adjusted by the Endpoint, available after returning from a call made by FreeSWITCH (<b>bridge</b> application). Contains the service information identified to make the call (available only for digital signaling - E1 and GSM);
+</li><li><b>KSmsDelivered</b>: Adjusted by the Endpoint when sending a SMS message with the application <b>KSendSMS</b>, saying whether the message was delivered successfully ("yes") or not ("no");
+</li><li><b>KSmsErrorCode</b>: Adjusted by the Endpoint when sending a SMS message with the application <b>KSendSMS</b>, containing the error code that happened when sending the message;
+</li><li><b>KSmsErrorName</b>: Adjusted by the Endpoint when sending a SMS message with the application <b>KSendSMS</b>, contains the name of the error or "None" if there has been no error;
+</li><li><b>KSmsType</b>: Adjusted for the input Endpoint in the context of SMS messages, defines the type of message received (can contain the values "message", "confirm" or "broadcast";
+</li><li><b>KSmsFrom</b>: Adjusted for the input Endpoint in the context of SMS messages, sets the number of origin of the received message (available on types" message "and" confirm ");
+</li><li><b>KSmsDate</b>: Adjusted for the input Endpoint in the context of SMS messages, sets the date of sending the message (available on types "message" and "confirm");
+</li><li><b>KSmsSize</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the size (in bytes) of the received message (available on types "message" and "broadcast");
+</li><li><b>KSmsMode</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the encoding type of the received message (available on types "message" and "broadcast");
+</li><li><b>KSmsBody</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the text of the received message (available in types "message" and "broadcast");
+</li><li><b>KSmsDelivery</b>: Adjusted for the input Endpoint in the context of SMS messages, containing the date of delivery of the message sent earlier (available in type "confirm");
+</li><li><b>KSmsStatus</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the status of the message sent earlier (available on the type "confirm");
+</li><li><b>KSmsSerial</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the serial number of the received message (available on the type "broadcast");
+</li><li><b>KSmsPage</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the page number of the received message (available on the type broadcast");
+</li><li><b>KSmsPages</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the total number of pages to be received (available in type "broadcast");
+</li><li><b>KUserInfoDescriptor</b>: Sets/reports protocol descriptor of the User-to-User Information message (ISDN).
+</li><li><b>KUserInfoData</b>: Sets/reports data in the User-to-User Information message (ISDN).
+</li><li><b>KFaxSent</b>: Adjusted by the Endpoint when sending FAX with <b>KSendFax</b> application, and determines whether the fax was successfully sent ("yes") or not ("No");
+</li><li><b>KFaxReceived</b>: Adjusted by channel when receiving FAX with <b>KReceiveFax</b> application, and determines whether the fax was successfully received ("yes") or not ("no");
+</li><li><b>KFaxResult</b>: Adjusted by the channel when sending or receiving FAX with the application <b>KSendFax</b> or <b>KReceiveFax</b> (respectively), and defines the result of execution.
+</li></ul>
+<p><br />
+</p>
+<a name="Description_of_variables" id="Description_of_variables"></a><h3> <span class="mw-headline"> Description of variables </span></h3>
+<p>Below, follows an explanation on how to use variables of Khomp Endpoint in the dialplan, to communicate and/or to receive information:
+</p><p><br />
+</p>
+<a name="KDropCollectCall" id="KDropCollectCall"></a><h4> <span class="mw-headline"> KDropCollectCall </span></h4>
+<p>When activated, causes the Endpoint to drop Khomp collect calls through dual service (available for signaling 'R2 Digital' and FXO), through information available on the ISDN protocol and R2/MFC, or by detecting the audio call collect (available for any digital signage for E1, and GSM signaling).
+</p><p>This variable is useful to filter collect calls to certain extensions, and <b>must</b> be set before making any type of answer - applications such as <b>playback</b> and <b>bridge</b> should always be executed after setting this variable, for example.
+</p><p>For better functionality, is also recommended that no call status (<i>ringback</i>) is sent before this variable is set, so applications should be performed only after the correct setting of this variable.
+</p><p>This variable can be set locally and globally, both to <b>yes</b> or <b>no</b>. The adjustment of global variable to <b>yes</b> will drop all the collect calls, unless the particular call is set to <b>no</b> - this allows the creation of a global filter of collect calls, with few exceptions.
+</p><p>Enabling the variable in context <b>default</b>:
+</p><p><!-- NEED 5 -->
+&lt;context name="default"&gt;
+</p>
+<pre>&lt;extension name="example"&gt;
+ .
+ .
+ .
+ &lt;action aplication="set" data="KDropCollectCall=yes"/&gt;
+ .
+ .
+ .
+&lt;/extension&gt;
+</pre>
+<p>&lt;/context&gt;
+</p><p>Enabling the variable in the global context, remembering that it must be configured in the file <b>vars.xml</b>:
+<!-- NEED 5 --> 
+</p>
+<pre>&lt;X-PRE-PROCESS cmd="set" data="KDropCollectCall=yes"/&gt;
+</pre>
+<a name="KR2SendCondition" id="KR2SendCondition"></a><h4> <span class="mw-headline"> KR2SendCondition </span></h4>
+<p>When you receive a call, can be set before sending ringback by FreeSWITCH (ie, before the run FreeSWITCH applications <b>answer</b>, <b>bridge</b>). When used in signaling R2/MFC, this variable sets the condition for B to the numeric value desired.
+</p><p>Exemplo:
+<!-- NEED 6 --> 
+</p>
+<pre>&lt;!-- Condition "NUMBER CHANGED" warns the caller that the number of B has changed. --&gt;
+&lt;action application="KR2SendCondition" data="3"/&gt;
+</pre>
+<a name="KR2GotCategory" id="KR2GotCategory"></a><h4> <span class="mw-headline"> KR2GotCategory </span></h4>
+<p>When you receive a call, is set by the Endpoint with the category received from the number that originated the call. It is set in signaling R2/MFC, and can be found anywhere in the dialplan.
+</p><p>Example:
+<!-- NEED 3 --> 
+</p>
+<pre>&lt;action application="log" data="DEBUG KR2GotCategory [${KR2GotCategory}]"/&gt;
+</pre>
+<a name="KR2GotCondition" id="KR2GotCondition"></a><h4> <span class="mw-headline"> KR2GotCondition </span></h4>
+<p>Variable adjusted by the Endpoint, and available after returning from a call made by FreeSWITCH. Has the condition of B received when making the call. Available only for signaling R2/MFC.
+</p><p>Example:
+<!-- NEED 3 --> 
+</p>
+<pre>&lt;action application="log" data="DEBUG KR2GotCondition [${KR2GotCondition}]"/&gt;
+</pre>
+<a name="KUserInfoDescriptor" id="KUserInfoDescriptor"></a><h4> <span class="mw-headline"> KUserInfoDescriptor </span></h4>
+<p>Variable adjusted by the Endpoint in the context of entry, from information received by the ISDN network functionality through user-to-User Information. Contains the descriptor number of the protocol used by the other end, and usually contains the value '0 ', but this is dependent on application.
+</p><p>For further information, consult the specification ITU-T Q931 (more precisely, the specification table 4-26).
+</p><p>Example (working with the descriptor number of the protocol):
+<!-- NEED 3 --> 
+</p>
+<pre>&lt;action application="log" data="DEBUG KUserInfoDescriptor [${KUserInfoDescriptor}]"/&gt;
+</pre>
+<a name="KUserInfoData" id="KUserInfoData"></a><h4> <span class="mw-headline"> KUserInfoData </span></h4>
+<p>Variable adjusted by the channel in the context of entry, from information received by the ISDN network functionality through user-to-User Information. Contains the actual data, which were received in the form of a string of text.
+</p><p>More information about this feature, see the specification ITU-T Q931.
+</p><p>Example (working with the data received):
+<!-- NEED 3 -->
+</p>
+<pre>&lt;action application="log" data="DEBUG KUserInfoData [${KUserInfoData}]"/&gt;
+</pre>
+<p>It is important to note that the variables are sensitive to the capitalization of letters (case sensitive).
+</p>
+<a name="KCallAnswerInfo" id="KCallAnswerInfo"></a><h4> <span class="mw-headline"> KCallAnswerInfo </span></h4>
+<p>Variable adjusted by the Endpoint. It is set in outbound connections, representing the type of answer performed by the other end. May contain the following values:
+</p>
+<dl><dd><ul><li> "MessageBox" (*): detected mailbox of a cell phone;
+</li><li> "CarrierMessage": message sent before the service provider;
+</li><li> "AnsweringMachine" (**): answering answering machine;
+</li><li> "HumanAnswer" (**): human service;
+</li><li> "Fax": reported when a fax tone is detected.
+</li><li> "Unknown": unknown type of care;
+</li></ul>
+</dd></dl>
+<p>(*) This type of service is detected by signals at certain frequencies that are sent before the call comes into a mailbox, and vary by operator. The algorithm captures most of the mailboxes, but can fail if there is not a clear signal, or if it is not within the standards most commonly used;
+</p><p>(**) The difference between these two types of care depends on the specific configuration using the program <b>k3lanswerinfoconfig</b>, with the detection only based on heuristics and <b>never</b> with an accuracy of 100%.
+<br />
+</p>
+<a name="Console_commands" id="Console_commands"></a><h1> <span class="mw-headline"> Console commands </span></h1>
+<p>List of available commands in the console for the FreeSWITCH Endpoint of Khomp:
+</p><p><br />
+</p>
+<ul><li> <b>khomp channels disconnect </b>: Disconnect one or more channels. This command sends a message directly to the physical channel of the card in question, requesting a disconnection. Use with caution;
+</li><li> <b>khomp channels unblock </b>: Unlock blocked channels for input or output. Only available in digital signage via E1;
+</li><li> <b>khomp clear links</b>: Clears error counters on the links;
+</li><li> <b>khomp clear statistics</b>: Clears the statistics of channel connections, or statistics for a particular channel;
+</li><li> <b>khomp get </b>: Gets the number of options Endpoint Khomp;
+</li><li> <b>khomp kommuter </b>: Enables or disables kommuters connected via USB on this machine. Only accessible when the configuration "kommuter-activation" is set to "manual".
+</li><li> <b>khomp kommuter count</b>: Gets the amount of kommuters connected via USB on this machine;
+</li><li> <b>khomp log console</b>: Sets options in the console logs;
+</li><li> <b>khomp log disk</b>: Sets logging options to disk;
+<ul><li> <b>khomp log console</b> and <b>khomp log disk</b> have auxiliary options <b>No</b>, which reverses the selection of messages, and <b>just</b>, which generalizes the choice. Examples:
+<ul><li> <b>khomp log disk just commands events</b> (Enables <b>only</b> logging to the disk of commands and events);
+</li><li> <b>khomp log disk no commands </b> (Disable logging to the disk of commands sent to board);
+</li><li> <b>khomp log disk warnings</b> (Enables also logging to the disk of warnings from Endpoint).
+</li></ul>
+</li><li> More information on options for the <b>log</b> command, type: "<b>help khomp log disk</b>" or "<b>help console log khomp</b>".
+</li></ul>
+</li><li> <b>khomp log rotate</b>: Rotate log files from the Endpoint;
+</li><li> <b>khomp log status</b>: Shows log messages currently being written to disk and displayed on the console;
+</li><li> <b>khomp log trace isdn</b>: Enable Debugging ISDN signaling;
+</li><li> <b>khomp log trace k3l </b>: Enables debugging low-level API K3L;
+</li><li> <b>khomp log trace r2 </b>: Enables debugging low-level signaling R2/MFC;
+</li><li> <b>khomp reset links</b>: Sends a reset command for a specific <b>E1</b> of a particular <i>card</i>; 
+</li><li> <b>khomp revision</b>: Shows version number and revision of the Endpoint;
+</li><li> <b>khomp select sim</b>: Select the SIM card, available on the boards KGSM;
+</li><li> <b>khomp send command </b>: Sends command API K3L directly to the board (only for debugging, may compromise the stability of the system if used improperly);
+</li><li> <b>khomp send raw command </b>: Sends a command directly to the DSP board (only for debugging, may compromise the stability of the system if used improperly);
+</li><li> <b>khomp set </b>: Sets various options of the Endpoint Khomp;
+</li><li> <b>khomp show calls </b>: Shows states for calls, may also listing specific channels or boards;
+</li><li> <b>khomp show channels </b>: Shows the status of the channels Khomp and may also list specific adapter; 
+</li><li> <b>khomp show links</b>: Display states of E1 links available. 
+</li><li> <b>khomp show statistics </b>: Shows the statistics of channel connections, or statistics for a particular channel;
+</li><li> <b>khomp sms </b>: Send an SMS message for a given number, using KGSM channels;
+</li><li> <b>khomp summary </b>: Prints a summary of system boards and their features;
+</li></ul>
+<p><br />
+</p>
+<a name="Additional_features" id="Additional_features"></a><h1> <span class="mw-headline"> Additional features </span></h1>
+<p>This chapter discusses additional features of the Endpoint, related to the special features present in certain signs.
+<br />
+</p>
+<a name="Aplica.C3.A7.C3.B5es_.28applications.29_e_canais" id="Aplica.C3.A7.C3.B5es_.28applications.29_e_canais"></a><h2> <span class="mw-headline">Aplicações (applications) e canais  </span></h2>
+<p>The Endpoint Khomp, and to record a type of communication channel "Khomp" also records the following items:
+<br />
+</p>
+<a name=".22KUserTransfer.22_application" id=".22KUserTransfer.22_application"></a><h3> <span class="mw-headline"> "KUserTransfer" application </span></h3>
+<p>Performs the transfer process from the current channel <i>number</i> for the extension using the signaling protocol QSig (Single Step Call Transfer) for boards configured with E1 ISDN signaling (ISDN), or use the FLASH command for FXO.
+</p><p>The syntax follows:
+</p>
+<pre> &lt;action application="KUserTransfer" data="<b>number</b>[,options])"/&gt;
+</pre>
+<p>Example:
+</p>
+<pre>&lt;action application="answer"/&gt;
+&lt;action application="KUserTransfer" data="2345"/&gt;
+</pre>
+<p>The fields have the following meanings:
+</p>
+<ul><li><b>number</b>: Number where the link should be transferred.
+</li><li><b>options</b>: Sets the transfer options to be used, which are:
+<ul><li><b> N</b>: Wait until the channel is disconnected.
+</li></ul>
+</li></ul>
+<p><br />
+</p>
+<a name="Application_.22KSendSMS.22" id="Application_.22KSendSMS.22"></a><h3> <span class="mw-headline"> Application "KSendSMS" </span></h3>
+<p>This application has the function of sending SMS messages through the boards of KGSM Khomp using modules and SIM cards in the board to do so. The syntax of the application is as follows:
+</p>
+<pre>&lt;action application="KSendSMS" data="resource | destination | message" /&gt;
+</pre>
+<p>Each field can be summarized in:
+</p>
+<ul><li><b>resource</b>: The following is a syntax identical to the allocation of channels Dial application, and defines what modem use;
+</li><li><b>destination</b>: Number where to send the message, may be preceded or succeeded by<b>!</b> to request a confirmation of transmission;
+</li><li><b>message</b>: Text (without quotes) to be sent to<b>destination</b>.
+</li></ul>
+<p>After sending the message, the variables <b>KSmsDelivered</b> and <b>KSmsErrorCode</b> will contain the result of the post. For more information about these, please consult the section on variables used in the Endpoint.
+</p><p>Examples of use of this application are as follows:
+</p>
+<ul><li> Sends "Test message." phone for "99887766" using the modem "1" (second modem) card "0":
+</li></ul>
+<pre>&lt;action application="log" data="DEBUG Sending SMS ..." /&gt;
+&lt;action application="KSendSMS" data="b0c1|99887766|Test message" /&gt;
+</pre>
+<ul><li> Sends "Test message." phone for "99887766" using the first free modem card "0", and checks the return shipment:
+</li></ul>
+<pre>&lt;action application="log" data="DEBUG  Sending SMS ..." /&gt;
+&lt;action application="KSendSMS" data="b0|99887766|Test message" /&gt;
+&lt;action application="log" data="DEBUG Sent? ${KSmsDelivered}" /&gt;
+&lt;action application="log" data="DEBUG Code: ${KSmsErrorCode}" /&gt;
+&lt;action application="log" data="DEBUG Desc: ${KSmsErrorName}" /&gt;
+</pre>
+<ul><li> Sends "Test message." phone for "99887766" using the first free modem card "0", or the first free channel board "1" (if no free channel at the first sign):
+</li></ul>
+<pre>&lt;action application="log" data="DEBUG Sending SMS ..." /&gt;
+&lt;action application="KSendSMS" data="b0+b1|99887766|Test message" /&gt;
+</pre>
+<ul><li> Sends "Test message." phone for "99887766" using the first free modem card "0", requesting confirmation:
+</li></ul>
+<pre>&lt;action application="log" data="DEBUG Sending SMS ..." /&gt;
+&lt;action application="KSendSMS" data="b0|99887766!|Test message" /&gt;
+</pre>
+<p><br />
+</p>
+<a name="Application_.22KEchoCanceller.22" id="Application_.22KEchoCanceller.22"></a><h3> <span class="mw-headline"> Application "KEchoCanceller" </span></h3>
+<p>This application has the function to enable or disable the echo canceller channel.
+</p>
+<pre>&lt;action application="KEchoCanceller" data="<b>action</b>[,options])"/&gt;
+</pre>
+<p>Where:
+</p>
+<ul><li><b>actions</b>: It is <b>on</b> to enable the echo canceller, and <b>off</b> to disable;
+</li></ul>
+<p>Example usage of this application:
+</p>
+<pre>&lt;action application="KEchoCanceller" data="off"/&gt;
+</pre>
+<p><br />
+</p>
+<a name="Application_.22KAutoGainControl.22" id="Application_.22KAutoGainControl.22"></a><h3> <span class="mw-headline"> Application "KAutoGainControl" </span></h3>
+<p>This application has the function to enable or disable the automatic gain control in the channel.
+</p>
+<pre>&lt;action application="KAutoGainControl" data="<b>action</b>[,options])"/&gt;
+</pre>
+<p>Where:
+</p>
+<ul><li><b>actions</b>: It is <b>on</b> to enable the automatic gain control, and <b>off</b> to disable;
+</li></ul>
+<p>Example usage of this application:
+</p>
+<pre>  &lt;action application="KAutoGainControl" data="on"/&gt;
+</pre>
+<p><br />
+</p>
+<a name="Application_.22KDTMFSuppression.22" id="Application_.22KDTMFSuppression.22"></a><h3> <span class="mw-headline"> Application "KDTMFSuppression" </span></h3>
+<p>This application has the function to enable or disable the suppression of DTMF channel. The syntax of the application is as follows:
+</p>
+<pre>&lt;action applicatin="KDTMFSuppression" value="<b>action</b>[,options])"/&gt;
+</pre>
+<p>Where:
+</p>
+<ul><li><b>actions</b>: It is<b>on</b> to enable DTMF suppression, and <b>off</b> to disable;
+</li></ul>
+<p>It is important to note that when disabled suppression of DTMF, DTMF tones are passed inband <i>and</i> will not be reported to FreeSWITCH. Thus FreeSWITCH does not recognize the DTMF tones, which may result in malfunction of applications such as IVR.
+</p><p>Example usage of this application:
+</p>
+<pre>&lt;action applicatin="KDTMFSuppression" value="off"/&gt;
+</pre>
+<p><br />
+</p>
+<a name="Application_.22KSetVolume.22" id="Application_.22KSetVolume.22"></a><h3> <span class="mw-headline"> Application "KSetVolume" </span></h3>
+<p>This application has the function to adjust the volume of incoming and outgoing channels Khomp, and its syntax as follows:
+</p>
+<pre>&lt;action application="KSetVolume" data="&lt;volume&gt;"/&gt;
+&lt;action application="KSetVolume" data="&lt;output-volume&gt;|&lt;input-volume&gt;"/&gt;
+</pre>
+<p>Where the fields have the following meanings:
+</p>
+<ul><li><b>volume</b>: Sets the volume of input and output (-10 to +10);
+</li><li><b>output-volume</b>: Sets the output volume (-10 to +10, "none" for no change);
+</li><li><b>input-volume</b>: Sets the input level (-10 to +10, "none" for no change).
+</li></ul>
+<p><br />
+</p>
+<a name="Application_.22KAdjustForFax.22" id="Application_.22KAdjustForFax.22"></a><h3> <span class="mw-headline"> Application "KAdjustForFax" </span></h3>
+<p>This application has the function of setting a channel for receiving Khomp signal FAX/modem, optimizing the communication channel for data traffic. Syntax:
+</p>
+<pre>&lt;action application="KAdjustForFax" data=""/&gt;
+</pre>
+<p>This application does not receive parameters. Example of use:
+</p>
+<pre>&lt;action application="KAdjustForFax" data=""/&gt;
+</pre>
+<p><br />
+</p>
+<a name="Application_.22KSendFax.22" id="Application_.22KSendFax.22"></a><h3> <span class="mw-headline"> Application "KSendFax" </span></h3>
+<p>This application has the function to send faxes using digital channels or FXO connections Khomp in pre-established, and its syntax as follows:
+</p>
+<pre>&lt;action application="KSendFax" data="&lt;file&gt;[:&lt;file2&gt;[:...]][|&lt;faxid&gt;]"/&gt;
+</pre>
+<p><strong>This application requires a license purchased separately to be used in digital (non-FXO) channels</strong>. Fields have the following meanings:
+</p>
+<ul><li><b>file</b>: Files to be sent to the fax should be encapsulated in TIFF format and have a resolution of 98, 196 or 392 dpi;
+</li><li><b>faxid</b>: the fax number. If not specified, the value is obtained by the id of the link, and if this also is not valid, the fax number will be set as default in K3L.
+</li></ul>
+<p>Example usage of this application:
+</p>
+<pre>&lt;action application="KSendFax" data="/tmp/fax.tif:/home/root/fax2.tif,1234"/&gt;
+</pre>
+<p><br />
+</p>
+<a name="Application_.22KReceiveFax.22" id="Application_.22KReceiveFax.22"></a><h3> <span class="mw-headline"> Application "KReceiveFax" </span></h3>
+<p>This application has the function of receiving digital channels or fax using the FXO Khomp, and its syntax as follows:
+</p>
+<pre>&lt;action application="KReceiveFax" data="&lt;file&gt;[|&lt;faxid&gt;]/&gt;
+</pre>
+<p><strong>This application requires a license purchased separately to be used in digital (non-FXO) channels</strong>. Fields have the following meanings:
+</p>
+<ul><li><b>file</b>: Name that file will be assigned to incoming fax.
+</li><li><b>faxid</b>: the fax number. If not specified, the value is obtained by the id of the link, and if this also is not valid, the fax number will be set as default in K3L.
+</li></ul>
+<p>Example usage of this application:
+</p>
+<pre>&lt;action application="answer" /&gt;
+&lt;action application="KReceiveFax" data="/tmp/fax.tif"/&gt;
+</pre>
+<p><br />
+</p>
+<a name="Channel_.22Khomp_SMS.22" id="Channel_.22Khomp_SMS.22"></a><h3> <span class="mw-headline"> Channel "Khomp_SMS" </span></h3>
+<p>This communication channel is used to receive SMS and create incoming links in FreeSWITCH for each message received. This channel does not have any treatment or audio processing, and is called with five variables set:
+</p>
+<ul><li><b>KSmsFrom</b>, containing the number of source who sent the message;
+</li><li><b>KSmsDate</b>, which sets the date/time of receipt of the message;
+</li><li><b>KSmsSize</b>, representing the message size (in bytes);
+</li><li><b>KSmsMode</b>, containing the encoding used to transmit the message;
+</li><li><b>KSmsBody</b>, that is the message itself.
+</li></ul>
+<p>The FreeSWITCH dialplan processing can be used to store this message in a database, run any application, among others. However, the only action accepted by this channel is shutdown (Hangup), so this incoming call should be considered a special dialplan execution without audio streams or channel allocation.
+<br />
+</p>
+<a name="Channel_.22Khomp_PR.22" id="Channel_.22Khomp_PR.22"></a><h3> <span class="mw-headline"> Channel "Khomp_PR" </span></h3>
+<p>This communication channel is used to receive calls on boards passive recording (<b>KPR family</b> and <b>KFXO-HI</b>), creating incoming links on FreeSWITCH for each incoming call. This channel allows only receiving audio captured the <i>link</i>by not allowing both the transmission of audio signalings as the control.
+</p><p>The FreeSWITCH dialplan processing can be used to record data on this link in a database, perform some special application and/or some recording application (such as <b>record</b>), among others. However, the only action accepted by this channel is shutdown (Hangup), so this should not be considered a common call.
+<br />
+</p>
+<a name="Codes_and_meanings" id="Codes_and_meanings"></a><h1> <span class="mw-headline"> Codes and meanings </span></h1>
+<p>This chapter presents the codes present in the channel Khomp and their meanings, used in both events as in the AMI console commands:
+<br />
+</p>
+<a name="Channel_state" id="Channel_state"></a><h2> <span class="mw-headline"> Channel state </span></h2>
+<p>Reflect the state of the channel on the board. In the case of E1 links, the state may have one or more of the following:
+</p>
+<ul><li><b>Free</b>: the channel is free;
+</li><li><b>Busy</b>: the channel is not free (or occupied, or failure);
+</li><li><b>Outgoing</b>: the channel has an output connection;
+</li><li><b>Incoming</b>: the channel has an input connection;
+</li><li><b>Locked</b>: the channel is blocked;
+</li><li><b>Outgoing Lock</b>: The channel is blocked for outgoing calls;
+</li><li><b>Local Fail</b>: The channel has a fault (at this point);
+</li><li><b>Incoming Lock</b>: the channel is blocked for incoming calls;
+</li><li><b>Remote Lock</b>: there is a remote lock (at the other end) in this channel.
+</li></ul>
+<p>In the case of a FXS channel, the state is defined by one of these values:
+</p>
+<ul><li><b>On Hook</b>: the phone connected to this channel is on-hook or disconnected;
+</li><li><b>Off Hook</b>: the phone connected to this channel is off the hook;
+</li><li><b>Ringing</b>: the channel is being called;
+</li><li><b>Failure</b>: the channel is in failure due to communication problems between the central and the plate.
+</li></ul>
+<p>In the case of a GSM channel, the state is defined by one of the following values:
+</p>
+<ul><li><b>Idle</b>: the channel is free and available for calls;
+</li><li><b>Call In Progress</b>: the channel is busy on a call;
+</li><li><b>SMS In Progress</b>: the channel is busy sending / receiving SMS messages;
+</li><li><b>Modem Error</b>: an error occurred communicating with the modem channel;
+</li><li><b>SIM Card Error</b>: The SIM card is not present or is not inserted / detected correctly;
+</li><li><b>Network Error</b>: an error occurred while communicating with the network;
+</li><li><b>Not Ready</b>: The modem is initializing the channel.
+</li></ul>
+<p>And in the case of an FXO channel, the states are as follows:
+</p>
+<ul><li><b>Disabled</b>: the channel is disabled;
+</li><li><b>Enabled</b>: the channel is enabled.
+</li></ul>
+<p><br />
+</p>
+<a name="Call_state" id="Call_state"></a><h2> <span class="mw-headline"> Call state </span></h2>
+<p>Defines the logical state for each channel, which can be:
+</p>
+<ul><li><b>Free</b>: the channel is free;
+</li><li><b>Incoming</b>: the channel is receiving a call;
+</li><li><b>Outgoing</b>: the channel is making a call;
+</li><li><b>Failure</b>: the channel is in fault.
+</li></ul>
+<p><br />
+</p>
+<a name="FreeSWITCH_call_states" id="FreeSWITCH_call_states"></a><h2> <span class="mw-headline"> FreeSWITCH call states </span></h2>
+<p>Directly reflects the call state controlled by FreeSWITCH, which can be:
+</p><p><br />
+</p>
+<ul><li> <b>new</b>: Channel is newly created;
+</li><li> <b>init</b>: Channel has been initialized;
+</li><li> <b>routing</b>: Channel is looking for an extension to execute;
+</li><li> <b>execute</b>: Channel is executing its dialplan;
+</li><li> <b>ex_media</b>: Channel is exchanging media with another channel;
+</li><li> <b>cs_media</b>: Channel is consuming all media;
+</li><li> <b>hangup</b>: Channel is flagged for hangup and ready to end.
+</li></ul>
+<p><br />
+</p>
+<a name="GSM_Codes" id="GSM_Codes"></a><h2> <span class="mw-headline"> GSM Codes </span></h2>
+<p>The following numeric codes are reported:
+</p>
+<a name="SMS_codes_.28SMS_causes.29" id="SMS_codes_.28SMS_causes.29"></a><h3> <span class="mw-headline"> SMS codes (SMS causes) </span></h3>
+<pre>1	Unassigned number
+8	Operator determined barring
+10	Call barred
+21	SMS transfer rejected
+27	Destination out of service
+28	Unidentified subscriber
+29	Facility rejected
+30	Unknown subscriber
+38	Network out of order
+41	Temporary failure
+42	Congestion
+47	Resources unavailable
+50	Facility not subscribed
+69	Facility not implemented
+81	Invalid SMS transfer reference value
+95	Invalid message
+96	Invalid mandatory information
+97	Message type non existent
+98	Message not compatible with SMS protection state
+99	Information element non existent
+111	Protocol error
+127	Interworking
+128	Telematic interworking not supported
+129	SMS type zero not supported
+130	Cannot replace SMS
+143	Unspecified TPPID error
+144	Alphabet not supported
+145	Message class not supported
+159	Unspecified TPDCS error
+160	Command cannot be actioned
+161	Command unsupported
+175	Unspecified TP command error
+176	TPDU not supported
+192	SC busy
+193	No SC subscription
+194	SC system failure
+195	Invalid SME address
+196	Destination SME barred
+197	SM rejected duplicate SM
+198	TPVPF not supported
+199	TPVP not supported
+208	SIM SMS storage full
+209	No SMS storage capability in SIM
+210	Error in SMS
+211	Memory capatity exceeded
+213	SIM data download error
+255	Unspecified error
+300	Phone failure
+301	SMS service reserved
+302	Operation not allowed
+303	Operation not supported
+304	Invalid PDU mode parameter
+305	Invalid text mode parameter
+310	SIM not inserted
+311	SIM PIN necessary
+312	Phone SIM PIN necessary
+313	SIM failure
+314	SIM busy
+315	SIM wrong
+320	Memory failure
+321	Invalid memory index
+322	Memory full
+330	SMSC address unknown
+331	No network service
+332	Network timeout
+500	Unknown error
+512	Network busy
+513	Invalid destination address
+514	Invalid message body length
+515	Phone is not in service
+516	Invalid preferred memory storage
+517	User terminated
+</pre>
+<a name="Call_codes_.28call_causes.29" id="Call_codes_.28call_causes.29"></a><h3> <span class="mw-headline"> Call codes (call causes) </span></h3>
+<pre>1	Unallocated number
+3	No route to destination
+6	Channel unacceptable
+8	Operator determined barring
+16	Normal call clear
+17	User busy
+18	No user responding
+19	No answer from user
+21	Call rejected
+22	Number changed
+26	Non Selected user clear
+27	Destination out of order
+28	Invalid number format
+29	Facility rejected
+30	Response status enquiry
+31	Normal, unspecified
+34	No circuit channel available
+38	Network out of order
+41	Temporary failure
+42	Switch congestion
+43	Access information discarded
+44	Requested channel unavailable
+47	Resource unavailable
+49	QoS unavailable
+50	Request facility not subscribed
+55	Call barred with UG
+57	Bearer capability not authorized
+58	Bearer capability not available
+63	Service not available
+65	Bearer capability not implemented
+69	Request facility not implemented
+70	Only restricted bearer capability available
+79	Service not implemented
+81	Invalid call reference value
+82	User not member of UG
+88	Incompatible destination
+91	Invalid transit network selected
+95	Invalid message
+96	Missing mandatory information element
+97	Message type not implemented
+98	Message incompatible with state
+99	Information element not implemented
+100	Invalid information element
+101	Message incompatible with state (2)
+102	Recovery on timer expiry
+111	Protocol error
+127	Interworking
+</pre>
+<a name="General_codes_.28mobile_causes.29" id="General_codes_.28mobile_causes.29"></a><h3> <span class="mw-headline"> General codes (mobile causes) </span></h3>
+<pre>0	Phone failure
+1	No connection to phone
+2	Phone adaptor link reserved
+3	Operation not allowed
+4	Operation not supported
+5	Phone SIM PIN required
+6	Phone FSIM PIN required
+7	Phone FSIM PUK required
+10	SIM not inserted
+11	SIM PIN required
+12	SIM PUK required
+13	SIM failure
+14	SIM busy
+15	SIM wrong
+16	Incorrect password
+17	SIM PIN2 required
+18	SIM PUK2 required
+20	Memory full
+21	Invalid index
+22	Not found
+23	Memory failure
+24	Text string too long
+25	Invalid character in text string
+26	Dial string too long
+27	Invalid character in dial string
+30	No network service
+31	Network timeout
+32	Network not allowed
+33	Command aborted
+34	Number parameter instead of text parameter
+35	Text parameter instead of number parameter
+36	Numeric parameter out of bounds
+37	Text string too short
+40	Network PIN required
+41	Network PUK required
+42	Network subset PIN required
+43	Network subset PUK required
+44	Network service provider PIN required
+45	Network service provider PUK required
+46	Corporate PIN required
+47	Corporate PUK required
+60	SIM Service option not supported
+100	Unknown
+103	Illegal MS #3
+106	Illegal MS #6
+107	GPRS service not allowed #7
+111	PLMN not allowed #11
+112	Location area not allowed #12
+113	Roaming not allowed #13
+132	Service option not supported #32
+133	Registration service option not subscribed #33
+134	Service option temporary out of order #34
+147	Long context activation
+148	Unspecified GPRS error
+149	PDP authentication failure
+150	Invalid mobile class
+151	GPRS disconnection TMR active
+256	Too many active calls
+257	Call rejected
+258	Unanswered call pending
+259	Unknown calling error
+260	No phone number recognized
+261	Call state not idle
+262	Call in progress
+263	Dial state error
+264	Unlock code required
+265	Network busy
+266	Invalid phone number
+267	Number entry already started
+268	Cancelled by user
+269	Number entry could not be started
+280	Data lost
+281	Invalid message body length
+282	Inactive socket
+283	Socket already open
+</pre>
+<p><br />
+</p>
+<a name="Troubleshooting" id="Troubleshooting"></a><h1> <span class="mw-headline"> Troubleshooting </span></h1>
+<p>In this section, errors and their most common solutions are presented.
+</p>
+<a name="Error_during_installation_of_kernel_module" id="Error_during_installation_of_kernel_module"></a><h2> <span class="mw-headline"> Error during installation of kernel module </span></h2>
+<p>During installation of the <i>Endpoint</i>of Khomp may occur the following messages:
+<!-- NEED 3 -->
+</p>
+<pre>K3L: WARNING: Unable to find a module for [...]
+</pre>
+<p>or
+<!-- NEED 8 --> 
+</p>
+<pre>install: ******  THE KERNEL MODULE HAS NOT BEEN INSTALLED: *******
+install: 
+install: ** Please, untar the file kpdriver*.tar.gz located in: **
+install: **                 '/usr/src/khomp/'                   **
+install: **             then check the README.txt               **
+install: **  for knowing how to proceed with the installation.  **
+</pre>
+<p>In this case, you must compile the drivers manually to your system. Proceed to the item below for more information.
+<br />
+</p>
+<a name="Compiling_the_drivers_and_starting_the_services" id="Compiling_the_drivers_and_starting_the_services"></a><h3> <span class="mw-headline"> Compiling the drivers and starting the services </span></h3>
+<p>Just follow to the directory <b>/usr/src/khomp</b>, unpack the file "kpdriver_2.0.0<b>XX</b>.tar.gz", and follow procedures described in the file <b>README_en.txt</b>.
+</p><p>After performing compilation and installation of the module, just load it into the system, configuring the boards and start the server processes Khomp.
+</p><p>To load the kernel driver, you must run the following command:
+<!-- NEED 3 --> 
+</p>
+<pre># /etc/init.d/khompdrv start
+</pre>
+<p>To set up the boards, in turn, must run the command:
+<!-- NEED 3 --> 
+</p>
+<pre># khompwizard
+</pre>
+<p>This will run a setup wizard that will ask the signaling used in the system, as well as other parameters of use of the boards.
+</p><p>If necessary configure other additional parameters you can use the following command:
+<!-- NEED 3 --> 
+</p>
+<pre># k3lconfig
+</pre>
+<p>This configurator, in turn, shows all possible options for card configuration. The parameters that are not configured automatically assume the default values, and are compatible with most systems. More details about this program can be obtained from the section number '2 '.
+</p>
+<ul><li> <b>ATTENTION'<i>: To start FreeSWITCH&reg;, it is necessary that the board is configured Khomp and all modules are running (as shown above). </i></b><i>If the card is not configured, FreeSWITCH will not start<b>.<br /> <br /> If you want to run the system without the board Khomp, you need to configure FreeSWITCH for it does not load the module Khomp. To do this, open the "</b></i><b>/usr/local/freeswitch/conf/autoload_configs/modules.conf.xml</b> and comment the line:<br />
+</li></ul>
+<pre> 
+&lt;!-- &lt;load module=&quot;mod_khomp&quot; /&gt; --&gt;
+</pre><br /> 
+<p>When the board Khomp is properly configured and loaded modules khomp (explained above), remember to uncomment this line in the file.
+</p><p>Finally, to load the server process, simply run the following command:
+<!-- NEED 3 -->
+</p>
+<pre># kserver start
+</pre>
+<p>After performing these procedures, the Endpoint is already operational, and FreeSWITCH can now be loaded.
+<br />
+</p>
+<a name="Setting_up_special_parameters_for_audio_or_signaling" id="Setting_up_special_parameters_for_audio_or_signaling"></a><h2> <span class="mw-headline"> Setting up special parameters for audio or signaling </span></h2>
+<p>To set specific parameters of timing and/or signaling, you can use the program "k3lconfig": simply select the card you want, and options of the boards will be presented, divided into sections and subsections for easy access. It is not necessary to effect the configuration of all parameters: default values are assumed, if not configured.
+</p><p>To adjust the signaling link, simply - after selecting the card - enter the "Options signaling, and then in" Signs of the line. " To choose a particular signaling, just use the direction keys (arrows) to select it, press 'space', and confirm the option by pressing 'Enter' on the "Confirm" button.
+</p><p>Finally, to save the modified settings, just exit the program: it will display a window with options to save the changes made or not.
+</p><p>Please not that <b>the following options are required to be unchanged from the defaults</b>:
+</p>
+<ul><li> Automatic echo cancellation;
+</li><li> DTMF suppression;
+</li><li> Automatic Gain Control (AGC).
+</li></ul>
+<p>These options are <b>controlled by Endpoint</b> and should be <b>disabled</b> in 'k3lconfig' (the default configuration).
+<br />
+</p>
+<a name="Automatic_load_of_services_and_kernel_modules" id="Automatic_load_of_services_and_kernel_modules"></a><h2> <span class="mw-headline"> Automatic load of services and kernel modules </span></h2>
+<p>If the loading of <i>kernel</i> module or Khomp services startup is not performed automatically at startup, you can perform this installation manually, creating a <i>link</i> for the <i>scripts</i> <b>/etc/init.d/khompdrv</b> and <b>/etc/init.d/kserver</b> in the system startup directory.
+</p><p>In the case of <b>Debian</b>-based distributions the <i>script</i> for loading <i>kernel</i> modules would be <i>linked</i> within the directory <i>/etc/rcS.d</i>, while the services loader would be <i>linked</i> within the directories <i>/etc/rc2.d</i>, <i>/etc/rc3.d</i>, <i>/etc/rc4.d</i>, <i>/etc/rc5.d</i> as follows:
+</p><p><!-- NEED 6 -->
+</p>
+<pre># ln -s /etc/init.d/khompdrv  /etc/rcS.d/S19khompdrv
+# ln -s /etc/init.d/kserver   /etc/rc2.d/S20kserver
+# ln -s /etc/init.d/kserver   /etc/rc3.d/S20kserver
+# ln -s /etc/init.d/kserver   /etc/rc4.d/S20kserver
+# ln -s /etc/init.d/kserver   /etc/rc5.d/S20kserver
+</pre>
+<p>Please check the rules of your distribution to initialize the services in accordance with what is expected by the start of it.
+<br />
+</p>
+<a name="Ap.C3.AAndice" id="Ap.C3.AAndice"></a><h1> <span class="mw-headline"> Apêndice </span></h1>
+<p>Nesta seção, encontram-se informações úteis sobre o Endpoint e componentes relacionados.
+</p>
+<a name="Arrangement_of_installed_files" id="Arrangement_of_installed_files"></a><h2> <span class="mw-headline"> Arrangement of installed files </span></h2>
+<p>The directories created/modified in this facility are:
+<!-- NEED 20 -->
+</p>
+<pre>/etc/init.d/                -- Startup scripts;
+
+/etc/khomp/                 -- Firmware files and settings;
+
+/usr/local/freeswitch/conf/ -- Settings for FreeSWITCH and Endpoint;
+
+/usr/doc/khomp/             -- Docs for the boards, Channel, and utilities;
+
+/usr/sbin/                  -- Utilities and server processes;
+
+/usr/lib/                   -- Shared libraries;
+
+/usr/local/freeswitch/mod/  -- Endpoint module;
+ 
+/var/log/khomp2.1/          -- Log directory for K3L and Endpoint;
+</pre>
+<p>The script <b>/etc/init.d/khompdrv</b> is responsible for loading modules <b>kpci9030.ko</b> and <b>kpex8311.ko</b> in the kernel, which should be carried out automatically at system startup. In case of problems, check the <a href="#Troubleshooting" title="">Troubleshooting</a> section. 
+</p><p><br />
+</p><p><br />
+</p></body></html>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_khomp/docs/User_Guide.pdf b/src/mod/endpoints/mod_khomp/docs/User_Guide.pdf
new file mode 100644
index 0000000000..832596bdb2
Binary files /dev/null and b/src/mod/endpoints/mod_khomp/docs/User_Guide.pdf differ
diff --git a/src/mod/endpoints/mod_khomp/include/applications.h b/src/mod/endpoints/mod_khomp/include/applications.h
new file mode 100644
index 0000000000..75f55ec5ca
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/applications.h
@@ -0,0 +1,962 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _APPLICATIONS_H_
+#define _APPLICATIONS_H_
+
+#include "lock.h"
+#include "khomp_pvt.h"
+
+struct Application 
+{
+    Application(Board::KhompPvt * pvt) : _pvt(pvt) {}
+    ~Application() {}
+
+    Statistics * statistics() { return _app_statistics; }
+
+    template <typename T>
+    T* statistics() { return static_cast<T*>(_app_statistics); }
+
+    Board::KhompPvt *_pvt;
+    Statistics      *_app_statistics;
+};
+
+/*************************** FAX **********************************************/
+struct Fax
+{
+    Fax(Board::KhompPvt * pvt) : _pvt(pvt) {}
+
+    /*
+    bool clear(Board::KhompPvt * pvt)
+    {
+        _pvt = pvt;
+        return true;
+    }
+    */
+
+    bool adjustForFax();    
+
+    bool sendFax(switch_core_session_t * session, const char *data);
+    bool receiveFax(switch_core_session_t * session, const char *data);
+
+    bool onFaxChannelRelease(K3L_EVENT *e);
+
+    bool startFaxTX(const char * orig_addr = NULL);
+    bool stopFaxTX();
+    bool startFaxRX(const char * filename, const char * orig_addr = NULL);
+    bool stopFaxRX();
+    bool addFaxFile(const char * filename, bool last = true);
+
+
+    Board::KhompPvt *_pvt;
+
+    /* used by app FAX */
+    SavedCondition _fax_cond;
+    KFaxResult     _fax_result;
+
+};
+
+/*************************** TRANSFER *****************************************/
+template <typename T, bool flash = true>
+struct Transfer
+{
+    Transfer(Board::KhompPvt * pvt) : _pvt(pvt), _is_ok(false) {}
+    
+    bool clear()
+    {
+        if(!_is_ok)
+        {
+            _call = dynamic_cast<T *>(_pvt->call());
+
+            _is_ok = true;
+
+            if(!_call)
+            {
+                DBG(FUNC, D("Error in cast"));
+                _is_ok = false;
+            }
+        }
+
+        _call->_flags.clear(Kflags::XFER_DIALING);
+
+        return true;
+    }
+
+    bool userTransfer(switch_core_session_t * session, const char *data)
+    {
+        DBG(FUNC, PVT_FMT(_pvt->target(), "c"));
+
+        std::string dest("");
+        std::string opts("");
+
+        try
+        {
+            Strings::vector_type params;
+
+            Strings::tokenize((const char *)data, params, "|,", 2);
+
+            dest = params[0];
+
+            if (params.size() > 1)
+            {
+                // other options go here...
+            }
+            
+            ScopedPvtLock lock(_pvt);
+
+            int timeout = 5;
+
+            if(!_pvt->call()->_flags.check(Kflags::REALLY_CONNECTED) && !_pvt->loopWhileFlagTimed(Kflags::REALLY_CONNECTED, timeout, false))
+                return false;
+
+            DBG(FUNC, PVT_FMT(_pvt->target(), "flashing channel!"));
+
+            _pvt->command(KHOMP_LOG, CM_FLASH);
+
+            lock.unlock();
+
+            timeout = 15; // 15 * 200000 = 3s
+
+            do
+            {
+                usleep(200000);
+                timeout--;
+
+                ScopedPvtLock lock2(_pvt);
+
+                if(!_pvt->call()->_flags.check(Kflags::IS_INCOMING) && !_pvt->call()->_flags.check(Kflags::IS_OUTGOING))
+                {
+                    DBG(FUNC, PVT_FMT(_pvt->target(), "unable to do a user transfer, channel disconnected"));
+                    return false;
+                }
+
+            }
+            while(timeout);
+
+            ScopedPvtLock lock3(_pvt);
+
+            _pvt->command(KHOMP_LOG, CM_DIAL_DTMF, dest.c_str());
+
+            _pvt->call()->_flags.set(Kflags::WAIT_SEND_DTMF);
+
+            lock3.unlock();
+
+            timeout = 300; // 300 * 200000 = 60s
+
+            do
+            {
+                usleep(200000);
+                timeout--;
+
+                ScopedPvtLock lock4(_pvt);
+
+                if(!_pvt->call()->_flags.check(Kflags::WAIT_SEND_DTMF))
+                    break;
+            }
+            while(timeout);
+
+        }
+        catch (ScopedLockFailed & err)
+        {
+            LOG(ERROR, PVT_FMT(_pvt->target(),"r (unable to lock %s!)") % err._msg.c_str() );
+            return false;
+        }
+
+
+        DBG(FUNC, PVT_FMT(_pvt->target(), "r"));
+        return true;
+    }
+
+    /* User transfer functions */
+    bool doUserXferUnlocked()
+    {
+        DBG(FUNC, PVT_FMT(_pvt->target(), "c (flashing channel!)"));
+
+        bool ret = false;
+
+        ret = _pvt->command(KHOMP_LOG, CM_FLASH);
+
+        DBG(FUNC, PVT_FMT(_pvt->target(), "r (%s)") % (ret ? "true" : "false"));
+        return ret;
+    }
+
+    bool checkUserXferUnlocked(std::string digit)
+    { 
+        DBG(FUNC, PVT_FMT(_pvt->target(), "c (CM_FLASH)"));
+
+
+        if (_call->_user_xfer_digits.empty())
+        {
+            _call->_digits_buffer += digit;
+            DBG(FUNC, PVT_FMT(_pvt->target(), "r (disabled)"));
+            return false;
+        }
+
+        _call->_user_xfer_buffer += digit;
+
+        /* temporary buffer */
+        std::string tmp = _call->_user_xfer_buffer;
+
+        unsigned int amount = tmp.size();
+        
+        try
+        {
+
+        if (amount == _call->_user_xfer_digits.size())
+        {
+            if (tmp == _call->_user_xfer_digits)
+            {
+                bool ret = doUserXferUnlocked();
+
+                _call->_user_xfer_buffer.clear();
+                _call->_digits_buffer.clear();
+
+                Board::board(_pvt->target().device)->_timers.del(_idx_xfer_dial);
+
+                DBG(FUNC, PVT_FMT(_pvt->target(), "r (ret=%s, done xfer)") % (ret ? "true" : "false"));
+                return ret;
+            }
+
+            _call->_digits_buffer += tmp[0];
+            _call->_user_xfer_buffer.erase(0, 1);
+            DBG(FUNC, PVT_FMT(_pvt->target(), "r (false, no xfer)"));
+            return false;
+        }
+
+        if (tmp == _call->_user_xfer_digits.substr(0,amount))
+        {
+            if (!(_call->_flags.check(Kflags::XFER_DIALING)))
+            {
+                _call->_flags.set(Kflags::XFER_DIALING);
+                _idx_xfer_dial = Board::board(_pvt->target().device)->_timers.add(Opt::_transferdigittimeout, &userXferTimer, _pvt, TM_VAL_CALL);
+            }
+            else
+            {
+                Board::board(_pvt->target().device)->_timers.restart(_idx_xfer_dial);
+            }
+
+            DBG(FUNC, PVT_FMT(_pvt->target(), "r (true, buffering)"));
+            return true;
+        }
+
+        }
+        catch (K3LAPI::invalid_device & err)
+        {
+            LOG(ERROR, PVT_FMT(_pvt->target(), "Unable to get device: %d!") % err.device);
+        }
+
+        _call->_digits_buffer += tmp[0];
+        _call->_user_xfer_buffer.erase(0, 1);
+        DBG(FUNC, PVT_FMT(_pvt->target(), "r (false, buffering)"));
+
+        return false;
+
+    }
+
+    static void userXferTimer(Board::KhompPvt * pvt)
+    {
+        DBG(FUNC, PVT_FMT(pvt->target(), "c"));
+        
+        T * call = static_cast<T *>(pvt->call());
+
+        try
+        {
+            ScopedPvtLock lock(pvt);
+
+            if (!call->_user_xfer_buffer.empty())
+            {
+                pvt->command(KHOMP_LOG, CM_DIAL_DTMF, call->_user_xfer_buffer.c_str());
+
+                /* clear the buffer that has been send */
+                call->_user_xfer_buffer.clear();
+            }
+
+            call->_flags.clear(Kflags::XFER_DIALING);
+        }
+        catch (ScopedLockFailed & err)
+        {
+            LOG(ERROR, PVT_FMT(pvt->target(),"r (unable to lock %s!)") % err._msg.c_str() );
+            return;
+        }
+
+        DBG(FUNC, PVT_FMT(pvt->target(), "r"));
+    }
+
+    bool                    _is_ok;
+    T *                     _call;
+    Board::KhompPvt *       _pvt;
+    Board::ChanTimer::Index _idx_xfer_dial;
+};
+
+template<typename T> 
+struct Transfer<T, false>
+{
+    Transfer(Board::KhompPvt * pvt) : _pvt(pvt), _is_ok(false) {}
+
+    bool clear()
+    {
+        if(!_is_ok)
+        {
+            _call = dynamic_cast<T *>(_pvt->call());
+
+            _is_ok = true;
+
+            if(!_call)
+            {
+                DBG(FUNC, D("Error in cast"));
+                _is_ok = false;
+            }
+        }
+
+        _call->_flags.clear(Kflags::XFER_DIALING);
+        _call->_flags.clear(Kflags::XFER_QSIG_DIALING);
+
+        return true;
+    }
+    
+    bool userTransfer(switch_core_session_t * session, const char *data)
+    {
+        DBG(FUNC, PVT_FMT(_pvt->target(), "c"));
+
+        std::string dest("");
+
+        bool opt_nowait = false;
+
+        try
+        {
+            Strings::vector_type params;
+
+            Strings::tokenize((const char *)data, params, "|,", 2);
+
+            dest = params[0];
+
+            if (params.size() > 1)
+            {
+                opt_nowait = (params[1].find('n') != std::string::npos);
+
+                // other options go here...
+            }
+            
+            ScopedPvtLock lock(_pvt);
+
+            int timeout = 5;
+            
+            if(!_pvt->call()->_flags.check(Kflags::REALLY_CONNECTED) && !_pvt->loopWhileFlagTimed(Kflags::REALLY_CONNECTED, timeout, false))
+                return false;
+
+            DBG(FUNC, PVT_FMT(_pvt->target(), "ss_transfer on channel!"));
+
+            _pvt->command(KHOMP_LOG, CM_SS_TRANSFER,
+                    STG(FMT("transferred_to=\"%s\" await_connect=\"%d\"")
+                    % dest % (opt_nowait ? 0 : 1)).c_str());
+
+        }
+        catch (ScopedLockFailed & err)
+        {
+            LOG(ERROR, PVT_FMT(_pvt->target(),"r (unable to lock %s!)") % err._msg.c_str() );
+            return false;
+        }
+
+
+        DBG(FUNC, PVT_FMT(_pvt->target(), "r"));
+        return true;
+    }
+
+    /* User transfer functions */
+    bool doUserXferUnlocked(void)
+    {
+        DBG(FUNC, PVT_FMT(_pvt->target(), "c"));
+
+        bool ret = false;
+
+        if (_call->_flags.check(Kflags::XFER_QSIG_DIALING))
+        {
+            DBG(FUNC, PVT_FMT(_pvt->target(), "ss_transfer on channel!"));
+
+            _call->_flags.clear(Kflags::XFER_DIALING);
+            _call->_flags.clear(Kflags::XFER_QSIG_DIALING);
+
+            ret = _pvt->command(KHOMP_LOG, CM_SS_TRANSFER,
+                    STG(FMT("transferred_to=\"%s\" await_connect=\"1\"") % _call->_qsig_number).c_str());
+        }
+        else
+        {
+            DBG(FUNC, PVT_FMT(_pvt->target(), "starting to store digits for ss_transfer..."));
+            _call->_flags.set(Kflags::XFER_QSIG_DIALING);
+
+            _xfer_thread = threadCreate(Transfer<T, false>::userXferPlayback,(void*) _pvt);
+            _xfer_thread->start();
+
+            ret = true;
+        }
+
+        DBG(FUNC, PVT_FMT(_pvt->target(), "r (%s)") % (ret ? "true" : "false"));
+        return ret;
+
+    }
+
+    bool checkUserXferUnlocked(std::string digit) 
+    { 
+        DBG(FUNC, PVT_FMT(_pvt->target(), "c (CM_SS_TRANSFER)"));
+
+
+        if (_call->_user_xfer_digits.empty())
+        {
+            _call->_digits_buffer += digit;
+            DBG(FUNC, PVT_FMT(_pvt->target(), "r (disabled)"));
+            return false;
+        }
+
+        _call->_user_xfer_buffer += digit;
+
+        DBG(FUNC, PVT_FMT(_pvt->target(), "c digits=[%s] buffer=[%s]") % _call->_user_xfer_digits % _call->_user_xfer_buffer );
+
+        /* temporary buffer */
+        std::string tmp = _call->_user_xfer_buffer;
+
+        unsigned int amount = tmp.size();
+        
+        try
+        {
+
+        if (amount == _call->_user_xfer_digits.size())
+        {
+            if (tmp == _call->_user_xfer_digits)
+            {
+                bool ret = doUserXferUnlocked();
+
+                _call->_user_xfer_buffer.clear();
+                _call->_qsig_number.clear();
+                _call->_digits_buffer.clear();
+
+                if(!_call->_flags.check(Kflags::XFER_QSIG_DIALING))
+                {
+                    Board::board(_pvt->target().device)->_timers.del(_idx_xfer_dial);
+
+                    DBG(FUNC, PVT_FMT(_pvt->target(), "r (ret=%s, done xfer)") % (ret ? "true" : "false"));
+                }
+                else
+                {
+                    Board::board(_pvt->target().device)->_timers.restart(_idx_xfer_dial);
+                    DBG(FUNC, PVT_FMT(_pvt->target(), "r (waiting digits for transfer)"));
+                }
+                return ret;
+            }
+
+            if (_call->_flags.check(Kflags::XFER_QSIG_DIALING))
+            {
+                DBG(FUNC, PVT_FMT(_pvt->target(), "putting digits ('%s') on transfer-to number!") % tmp);
+
+                _call->_qsig_number += tmp[0];
+                _call->_user_xfer_buffer.erase(0, 1);
+                Board::board(_pvt->target().device)->_timers.restart(_idx_xfer_dial);
+
+                DBG(FUNC, PVT_FMT(_pvt->target(), "r (true, qsig transfer)"));
+                return true;
+            }
+
+            _call->_digits_buffer += tmp[0];
+            _call->_user_xfer_buffer.erase(0, 1);
+            DBG(FUNC, PVT_FMT(_pvt->target(), "r (false, no qsig)"));
+            return false;
+        }
+
+        if (tmp == _call->_user_xfer_digits.substr(0,amount))
+        {
+            if (!(_call->_flags.check(Kflags::XFER_DIALING) || _call->_flags.check(Kflags::XFER_QSIG_DIALING)))
+            {
+                _call->_flags.set(Kflags::XFER_DIALING);
+                _idx_xfer_dial = Board::board(_pvt->target().device)->_timers.add(Opt::_transferdigittimeout, &userXferTimer, _pvt, TM_VAL_CALL);
+            }
+            else
+            {
+                Board::board(_pvt->target().device)->_timers.restart(_idx_xfer_dial);
+            }
+
+            DBG(FUNC, PVT_FMT(_pvt->target(), "r (true, buffering)"));
+            return true;
+        }
+
+        if (_call->_flags.check(Kflags::XFER_QSIG_DIALING))
+        {
+            DBG(FUNC, PVT_FMT(_pvt->target(), "putting digits ('%s') on transfer-to number!") % tmp);
+
+            _call->_qsig_number += tmp[0];
+            _call->_user_xfer_buffer.erase(0, 1);
+
+            Board::board(_pvt->target().device)->_timers.restart(_idx_xfer_dial);
+            DBG(FUNC, PVT_FMT(_pvt->target(), "r (true, qsig buffering)"));
+            return true;
+        }
+        
+        }
+        catch (K3LAPI::invalid_device & err)
+        {
+            LOG(ERROR, PVT_FMT(_pvt->target(), "Unable to get device: %d!") % err.device);
+        }
+
+        _call->_digits_buffer += tmp[0];
+        _call->_user_xfer_buffer.erase(0, 1);
+        DBG(FUNC, PVT_FMT(_pvt->target(), "r (false, buffering)"));
+
+        return false;
+    }
+
+    static void userXferTimer(Board::KhompPvt * pvt)
+    {
+        DBG(FUNC, PVT_FMT(pvt->target(), "c"));
+
+        T * call = static_cast<T *>(pvt->call());
+
+        try
+        {
+            ScopedPvtLock lock(pvt);
+
+            if (!call->_user_xfer_buffer.empty())
+            {
+                pvt->command(KHOMP_LOG, CM_DIAL_DTMF, call->_user_xfer_buffer.c_str());
+
+                /* clear the buffer that has been send */
+                call->_user_xfer_buffer.clear();
+            }
+
+            if (!call->_qsig_number.empty())
+            {
+                pvt->command(KHOMP_LOG, CM_SS_TRANSFER,
+                        STG(FMT("transferred_to=\"%s\" await_connect=\"1\"") % call->_qsig_number).c_str());
+
+                /* clear the buffer that has been send */
+                call->_qsig_number.clear();
+            }
+
+            call->_flags.clear(Kflags::XFER_DIALING);
+            call->_flags.clear(Kflags::XFER_QSIG_DIALING);
+        }
+        catch (ScopedLockFailed & err)
+        {
+            LOG(ERROR, PVT_FMT(pvt->target(),"r (unable to lock %s!)") % err._msg.c_str() );
+            return;
+        }
+
+        DBG(FUNC, PVT_FMT(pvt->target(), "r"));
+    }
+
+    static switch_status_t dtmfCallback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
+    {
+        char sbuf[3];
+
+        if(!session)
+        {
+            DBG(FUNC,D("session is NULL"))
+                return SWITCH_STATUS_FALSE;
+        }
+
+        switch_channel_t * chan = switch_core_session_get_channel(session);
+
+        if(!chan)
+        {
+            DBG(FUNC,D("channel is NULL"))
+                return SWITCH_STATUS_FALSE;
+        }
+
+        switch_core_session_t *peer_session = switch_core_session_locate(switch_channel_get_variable(chan,SWITCH_SIGNAL_BOND_VARIABLE));
+
+        if(!peer_session)
+        {
+            DBG(FUNC,D("session is NULL"))
+                return SWITCH_STATUS_FALSE;
+        }
+
+        switch (itype) 
+        {
+            case SWITCH_INPUT_TYPE_DTMF:
+            {
+                switch_dtmf_t *dtmf = (switch_dtmf_t *) input;
+
+                Board::KhompPvt * tech_pvt = static_cast< Board::KhompPvt* >(switch_core_session_get_private(peer_session));
+                if(!tech_pvt)
+                {
+                    DBG(FUNC,D("Init: pvt is NULL"))
+                    switch_core_session_rwunlock(peer_session);
+                    return SWITCH_STATUS_FALSE;
+                }
+
+                char s[] = { dtmf->digit, '\0' };
+                tech_pvt->sendDtmf(s); 
+
+                break;
+            }        
+            default: 
+                break;
+        }        
+
+        switch_core_session_rwunlock(peer_session);
+        return SWITCH_STATUS_SUCCESS;
+    }
+
+
+    static int userXferPlayback(void * pvt_ptr)
+    {
+        /* get pointer... */
+        Board::KhompPvt * pvt = static_cast < Board::KhompPvt * > (pvt_ptr);
+
+        DBG(FUNC, PVT_FMT(pvt->target(), "c"));
+
+        try
+        {
+            ScopedPvtLock lock(pvt);
+
+            /* get the owner */
+            switch_channel_t * chan = pvt->getFSChannel();
+
+            /* get other side of the bridge */
+            switch_core_session_t * peer_session = NULL;
+            switch_core_session_get_partner(pvt->session(),&peer_session);
+
+            if(!peer_session)
+            {
+                DBG(FUNC, PVT_FMT(pvt->target(), "r (session is null)"));
+                return NULL;
+            }
+
+            switch_channel_t * peer = switch_core_session_get_channel(peer_session);
+
+            /* put the channel in hold */
+            //switch_core_session_t *session = switch_core_session_locate(switch_channel_get_variable(chan,SWITCH_SIGNAL_BOND_VARIABLE));
+            //switch_channel_t *chan_core = switch_core_session_get_channel(session);
+
+            const char *stream;
+
+            if (!(stream = switch_channel_get_variable(chan, SWITCH_HOLD_MUSIC_VARIABLE)))
+            {
+                stream = "silence";
+            }
+
+            DBG(FUNC, PVT_FMT(pvt->target(), "stream=%s") % stream);
+
+            if (stream && strcasecmp(stream, "silence"))
+            {
+                /* Freeswitch not get/put frames */
+                //switch_channel_set_flag(channel, CF_HOLD);
+                switch_ivr_broadcast(switch_core_session_get_uuid(pvt->session()),stream, SMF_ECHO_ALEG | SMF_LOOP | SMF_PRIORITY);
+            }
+
+            switch_core_session_rwunlock(peer_session);
+            lock.unlock();
+
+            /* kickstart my heart */
+            switch_input_args_t args = {0};
+            args.input_callback = dtmfCallback;
+
+            /* wait while xfering... */
+            while (true)
+            {
+                switch_ivr_collect_digits_callback(peer_session,&args,1000,0);
+                ScopedPvtLock lock2(pvt);
+
+                if (!pvt->call()->_flags.check(Kflags::XFER_QSIG_DIALING))
+                {
+                    break;
+                }
+
+                lock2.unlock();
+            }
+
+            //switch_channel_clear_flag(channel, CF_HOLD);
+
+            switch_channel_stop_broadcast(chan);
+            switch_channel_wait_for_flag(chan, CF_BROADCAST, SWITCH_FALSE, 5000, NULL);
+            switch_core_session_rwunlock(pvt->session());
+            switch_core_session_rwunlock(peer_session);
+
+            //switch_ivr_unhold_uuid(switch_channel_get_variable(chan,SWITCH_SIGNAL_BOND_VARIABLE));
+        }
+        catch (ScopedLockFailed & err)
+        {
+            LOG(ERROR, PVT_FMT(pvt->target(),"r (unable to lock %s!)") % err._msg.c_str() );
+            return NULL;
+        }
+        catch (Board::KhompPvt::InvalidSwitchChannel & err)
+        {
+            LOG(ERROR, PVT_FMT(pvt->target(), "r (%s)") % err._msg.c_str() );
+            return NULL;
+        }
+
+        DBG(FUNC, PVT_FMT(pvt->target(), "r"));
+
+        return NULL;
+    }
+
+    bool                    _is_ok;
+    T *                     _call;
+    Board::KhompPvt *       _pvt;
+    Thread *                _xfer_thread;
+    Board::ChanTimer::Index _idx_xfer_dial;
+};
+
+/*************************** SMS **********************************************/
+struct SMS : public Application
+{
+    typedef std::list< switch_core_session_t *> OwnersList;
+
+    struct SMSStatistics : public Statistics
+    {
+        SMSStatistics():
+            _sms_number_incoming(0),
+            _sms_number_outgoing(0),
+            _sms_number_confirm(0),
+            _sms_number_broadcast(0) {};
+
+        void incrementIncoming()
+        {
+            _sms_number_incoming++;
+        }
+
+        void incrementOutgoing()
+        {
+            _sms_number_outgoing++;
+        }
+
+        void incrementConfirm()
+        {
+            _sms_number_confirm++;
+        }
+
+        void incrementBroadcast()
+        {
+            _sms_number_broadcast++;
+        }
+        
+        std::string getDetailed()
+        {
+            std::string tmpBuffer;
+
+            tmpBuffer.append(STG(FMT("Number of incoming SMS: \t%d\n")  % _sms_number_incoming));
+            tmpBuffer.append(STG(FMT("Number of outgoing SMS: \t%d\n")  % _sms_number_outgoing));
+            tmpBuffer.append(STG(FMT("Number of broadcast SMS: \t%d\n") % _sms_number_broadcast));
+            tmpBuffer.append(STG(FMT("Number of confirm SMS:  \t%d\n")  % _sms_number_confirm));
+
+            return tmpBuffer;
+        }
+
+        void clear()
+        {
+            _sms_number_incoming  = 0;
+            _sms_number_outgoing  = 0;
+            _sms_number_confirm   = 0;
+            _sms_number_broadcast = 0;
+        }
+
+        unsigned int _sms_number_incoming;
+        unsigned int _sms_number_outgoing;
+        unsigned int _sms_number_confirm;
+        unsigned int _sms_number_broadcast;
+    };
+
+    SMS(Board::KhompPvt * pvt) : 
+    Application(pvt),
+    _thread(NULL),
+    _shutdown(false),
+    _can_receive(false),
+    _can_send(false),
+    _result(0),
+    _mutex(Globals::module_pool),
+    _cond(Globals::module_pool),
+    _buffer(8)
+    {
+        _cond.reset();
+        _app_statistics = new SMSStatistics();
+    }
+
+    ~SMS()
+    {
+        stop();
+        delete _app_statistics;
+    }
+
+    struct ReceiveData
+    {
+        ReceiveData() {};
+
+        ReceiveData(const ReceiveData & o)
+        {
+            _type    = o._type;
+            _from    = o._from;
+            _date    = o._date;
+            _size    = o._size;
+            _coding  = o._coding;
+            _serial  = o._serial;
+            _id      = o._id;
+            _page    = o._page;
+            _pages   = o._pages;
+            _sc_date = o._sc_date;
+            _status  = o._status;
+            _body    = o._body;
+        };
+
+        void clear(void)
+        {
+            /* reset data stuff */
+            _type.clear();
+            _from.clear();
+            _date.clear();
+            _size.clear();
+            _coding.clear();
+            _serial.clear();
+            _id.clear();
+            _page.clear();
+            _pages.clear();
+            _sc_date.clear();
+            _status.clear();
+            _body.clear();
+        };
+
+        std::string _type;
+        std::string _from;
+        std::string _date;
+        std::string _size;
+        std::string _coding;
+        std::string _serial;
+        std::string _id;
+        std::string _page;
+        std::string _pages;
+        std::string _sc_date;
+        std::string _status;
+        std::string _body;
+    };
+
+    struct SendData
+    {
+        SendData(): _conf(false) {};
+
+        SendData(const SendData & o)
+        {
+            _dest    = o._dest;
+            _body    = o._body;
+            _conf    = o._conf;
+        };
+
+        void clear(void)
+        {
+            /* reset data stuff */
+            _dest.clear();
+            _body.clear();
+            _conf = false;
+        };
+
+        std::string _dest;
+        std::string _body;
+        bool        _conf;
+    };
+
+    struct Request
+    {
+        /* "empty" constructor */
+        Request(): _finished(NULL), _cause(NULL) {};
+
+        /* "real" constructor */
+        Request(SendData & send_sms, volatile bool * finished, volatile KGsmCallCause * cause)
+            : _send_sms(send_sms), _finished(finished), _cause(cause)
+        {};
+
+        SendData _send_sms;
+
+        volatile bool          * _finished;
+        volatile KGsmCallCause * _cause;
+    };
+
+    bool start()
+    {
+        _pvt->call()->_flags.clear(Kflags::SMS_DOING_UPLOAD);
+
+        _thread = threadCreate(&smsThread, (void*) this);
+        _thread->start();
+    }
+
+    bool stop()
+    {
+        if(!_thread)
+        {
+            return false;
+        }
+
+        _shutdown = true;
+        _cond.signal();
+        _thread->join();
+        delete _thread;
+        _thread = NULL;
+
+        return true;
+    }
+
+    bool justAlloc(unsigned int count = 0);
+    bool justStart();
+
+    bool sendSMS(switch_core_session_t * session, const char *data);
+    
+
+    bool onNewSMS(K3L_EVENT *e);
+    bool onSMSInfo(K3L_EVENT *e);
+    bool onSMSData(K3L_EVENT *e);
+    bool onSMSSendResult(K3L_EVENT *e);
+   
+    Thread                                             *_thread;
+    bool                                                _shutdown;
+    bool                                                _can_receive;
+    bool                                                _can_send;
+    ReceiveData                                         _got_sms;
+    SendData                                            _send_sms;
+    int                                                 _result;
+    SavedCondition                                      _cond;
+    Globals::Mutex                                      _mutex;
+    Ringbuffer < SMS::Request >                         _buffer;
+    OwnersList                                          _owners;
+
+    static int smsThread(void * sms_ptr);
+};
+
+/******************************************************************************/
+
+
+#endif /* _APPLICATIONS_H_ */
+
diff --git a/src/mod/endpoints/mod_khomp/include/cli.h b/src/mod/endpoints/mod_khomp/include/cli.h
new file mode 100644
index 0000000000..214e2aa2d5
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/cli.h
@@ -0,0 +1,1143 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _CLI_H_
+#define _CLI_H_
+
+#include "globals.h"
+#include "logger.h"
+
+struct Command 
+{
+    /* print in client the usage */
+    void printUsage(switch_stream_handle_t *stream)
+    { 
+        if(stream)
+        {
+            printBrief(stream);
+            K::Logger::Logg2(C_CLI,stream, 
+"------------------------------ Description --------------------------------"); 
+            K::Logger::Logg2(C_CLI,stream, 
+"---------------------------------------------------------------------------"); 
+            K::Logger::Logg2(C_CLI,stream,(char*) usage.c_str()); 
+            K::Logger::Logg2(C_CLI,stream, 
+"---------------------------------------------------------------------------"); 
+        }
+        else
+        {
+            LOG(ERROR,FMT("Invalid stream for commmand: %s") % complete_name);
+        }
+    }
+
+    /* print in client the brief */
+    void printBrief(switch_stream_handle_t *stream)
+    {
+        if(stream)
+        {
+            K::Logger::Logg2(C_CLI,stream, 
+"---------------------------------------------------------------------------"); 
+            K::Logger::Logg2(C_CLI,stream, 
+"-------------------------------- Brief ------------------------------------"); 
+            K::Logger::Logg2(C_CLI,stream, 
+"---------------------------------------------------------------------------"); 
+            K::Logger::Logg2(C_CLI,stream,(char*) brief.c_str()); 
+            K::Logger::Logg2(C_CLI,stream, 
+"---------------------------------------------------------------------------"); 
+        }
+        else
+        {
+            LOG(ERROR,FMT("Invalid stream for commmand: %s") % complete_name);
+        }
+    }
+
+    /* pure virtual */
+    virtual bool execute(int argc, char *argv[]) = 0;
+
+    std::string complete_name;         /* specify the command in console */
+    std::vector<std::string> options;  /* extra options for command */
+    std::string brief;                 /* brief of the command, a path */
+    std::string usage;                 /* usage of the command, a help */
+};
+
+struct Cli 
+{
+    /* Useful definitions --------------------------------------------------- */
+    typedef switch_status_t (APIFunc)(const char*, switch_core_session_t*, switch_stream_handle_t*);
+    typedef std::vector<Command*> Commands;
+
+    /* register our commands, but you must create the command function */
+    static void registerCommands(APIFunc func,switch_loadable_module_interface_t **mod_int);
+    
+    /* delete the commands */
+    static void unregisterCommands()
+    {
+        switch_console_set_complete("del khomp");
+    }
+
+    /* stream is very useful */
+    static void setStream(switch_stream_handle_t *s)
+    {
+        if(!s)
+        {
+            LOG(ERROR,"Invalid stream passed");
+            return;
+        }
+
+        stream = s;
+    }
+
+    /* gets the khomp usage */
+    static void printKhompUsage()
+    {
+        if(stream)
+        {
+            K::Logger::Logg2(C_CLI,stream,(char*) _khomp_usage.c_str());
+        }
+        else
+        {
+            LOG(ERROR,"Invalid stream for command: printKhompUsage");
+        }
+    }
+
+    /* is responsible for parse and execute all commands */
+    static bool parseCommands(int argc, char *argv[]);
+
+    /* The Commands --------------------------------------------------------- */
+
+    /* khomp summary */
+    static struct _KhompSummary : public Command
+    {
+        _KhompSummary(bool on_cli_term = true):
+        _on_cli_term(on_cli_term)
+        {
+            complete_name = "summary";
+
+            options.push_back("verbose");
+            options.push_back("concise");
+
+            brief = "Print system info.";                                            
+            usage =                                                            \
+"Prints detailed info about the system like API version and \n"                \
+"boards characteristics like DSPs version.\n\n"                                \
+"Usage: khomp summary [concise]";
+
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+        bool _on_cli_term; /* indicates if message is sent to fs_cli */
+    } KhompSummary;
+
+    /* khomp show calls */
+    static struct _KhompShowCalls : public Command
+    {
+        _KhompShowCalls()
+        {
+            complete_name = "show calls";
+            brief  =                                                           \
+"Show each Khomp channel which have more than one call state associated.";
+
+            usage =                                                            \
+"Show each Khomp channel which have more than one call state associated.\n\n"  \
+"Usage: khomp show calls [<board> [<channel>]]";
+
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+
+        /* support function for _KhompShowCalls */
+        void showCalls(unsigned int device, unsigned int object, std::string &buffer);
+    } KhompShowCalls;
+
+    /* khomp channels disconnect */
+    static struct _KhompChannelsDisconnect : public Command
+    {
+        _KhompChannelsDisconnect()
+        {
+            complete_name = "channels disconnect";
+            brief = "Disconnect a(ll) channel(s).";                                                              
+            usage =                                                            \
+"Disconnects channels in boards, or specific board/channel if parameter \n"    \
+"is supplied.\n\n"                                                             \
+"Usage: khomp channels disconnect {all | <board> all | <board> <channel>}\n"   \
+"\tboard   -- Number of the board (start from 0).\n"                           \
+"\tchannel -- Number of the channel (start from 0).\n"                         \
+"e.g. khomp channels disconnect all - Disconnect all channels of all boards.\n"\
+"e.g. khomp channels disconnect 0 5 - Disconnect channel 5 of board 0.";              
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+
+        /* support function for _KhompChannelsDisconnect */
+        bool forceDisconnect(unsigned int device, unsigned int channel);
+    } KhompChannelsDisconnect;
+
+    /* khomp channels unblock */
+    static struct _KhompChannelsUnblock : public Command
+    {   
+        _KhompChannelsUnblock()
+        {
+            complete_name = "channels unblock";
+            brief = "Unblock a(ll) channel(s).";
+
+            usage =                                                            \
+"The board will request to the PBX or network where it is connected to \n"     \
+"unblock the channel if its blocked.\n\n"                                      \
+"Usage: khomp channels unblock {all | <board> all | <board> <channel>}\n"      \
+"\tboard   -- Number of the board (start from 0).\n"                           \
+"\tchannel -- Number of the channel (start from 0).\n"                         \
+"e.g. khomp channels unblock all   - Unblock all channels of all boards.\n"    \
+"e.g. khomp channels unblock 0 all - Unblock all channels of board 0.\n"       \
+"e.g. khomp channels unblock 1 20  - Unblock channel 20 of board 1.";
+
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+    } KhompChannelsUnblock;
+
+    /* khomp show statistics */
+    static struct _KhompShowStatistics : public Command 
+    {
+        _KhompShowStatistics()
+        {
+            complete_name = "show statistics";
+
+            options.push_back("verbose");
+            options.push_back("detailed");
+
+            brief = "Shows statistics of the channels.";
+
+            usage =                                                            \
+"Shows statistics of the channels, like number of calls incoming \n"           \
+"and outgoing, status, status time.\n\n"                                       \
+"Usage: khomp show statistics [{verbose [<board> [<channel>]]} | \n"           \
+"                              {detailed <board> <channel>}]\n"                \
+"\tboard   -- Number of the board (start from 0).\n"                           \
+"\tchannel -- Number of the channel (start from 0).\n"                         \
+"e.g. khomp channels statistics              - Shows general statistics \n"    \
+"                                              of all boards.\n"               \
+"e.g. khomp channels statistics 0            - Shows general statistics \n"    \
+"                                              of board 0.\n"                  \
+"e.g. khomp channels statistics verbose      - Shows general statistics \n"    \
+"                                              of all boards.\n"               \
+"e.g. khomp channels statistics verbose  0   - Shows general statistics \n"    \
+"                                              of board 0.\n"                  \
+"e.g. khomp channels statistics detailed 0 2 - Shows detailed statistics \n"   \
+"                                              of channel 2 on board 0.";
+
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+
+        /* support functions */
+        void cliStatistics(unsigned int device);
+        void cliDetailedStatistics(unsigned int device, unsigned int channel);
+
+    } KhompShowStatistics;
+
+    /* khomp show channels */
+    static struct _KhompShowChannels: public Command
+    {
+        _KhompShowChannels()
+        {
+            complete_name = "show channels";
+
+            options.push_back("verbose");
+            options.push_back("concise");
+
+            brief = "Show all channels status.";                                                                               
+            usage =                                                            \
+"List the status of each channel, both on asterisk point of view and on \n"    \
+"khomp API point of view.\n\n"                                                 \
+"Usage: \n"                                                                    \
+"khomp show channels [{<board> [<channel>]} | \n"                              \
+                              "{{concise|verbose} [<board> [<channel>]]}]\n"   \
+"\tboard -- Number of the board (start from 0).\n"                             \
+"e.g. khomp show channels - List status of all channels of all boards.\n"      \
+"e.g. khomp show channels concise 0 - List status of all channels of \n"       \
+"                                     board 0 in a concise way.";
+
+            _commands.push_back(this);
+        };
+
+        /* support function for _KhompShowChannels */
+        void showChannel(unsigned int device, bool concise, unsigned int channel);
+        void showChannels(unsigned int device, bool concise);
+
+        bool execute(int argc, char *argv[]);
+    } KhompShowChannels;
+    
+    /* khomp show links */
+    static struct _KhompShowLinks: public Command
+    {
+        _KhompShowLinks()
+        {
+            complete_name = "show links";
+
+            options.push_back("verbose");
+            options.push_back("concise");
+            options.push_back("errors");
+            options.push_back("errors verbose");
+            options.push_back("errors concise");
+
+            brief = "Show E1 link(s) status/errors counters in a concise \n"   \
+            "way or not.";
+
+            usage =                                                            \
+"Prints information about the signaling, syncronization and general \n"        \
+"status/the error counters of each link on the board. It prints in \n"         \
+"a concise way for parsing facilities.\n\n"                                    \
+"Usage: \n"                                                                    \
+"khomp show links [[errors] [{<board>} | {{concise|verbose} [<board>]}]]\n"    \
+"e.g. khomp show links          - Show all links of all boards.\n"             \
+"e.g. khomp show links errors   - Show error counters of all links of \n"      \
+"                                 all boards.\n"                               \
+"e.g. khomp show links errors 0 - Show error counters of all links of \n"      \
+"                                 board 0.";
+
+            _commands.push_back(this);
+        };
+
+        /* support function for _KhompShowLinks */
+        void showLinks(unsigned int device, bool concise);
+        void showErrors(unsigned int device, bool concise);
+
+        bool execute(int argc, char *argv[]);
+    } KhompShowLinks;
+
+    /* khomp clear links */
+    static struct _KhompClearLinks: public Command
+    {
+        _KhompClearLinks()
+        {
+            complete_name = "clear links";
+    
+            brief = "Clear the error counters of the links.";
+
+            usage =                                                            \
+"Clear the error counters of the links.\n\n"                                   \
+"Usage: khomp clear links [<board> [<link>]]\n"                                \
+"\tboard -- Number of the board (start from 0).\n"                             \
+"\tlink  -- Number of the link (start from 0).\n"                              \
+"e.g. khomp clear links 0 -- Clear error counters of all links of board 0.";
+
+            _commands.push_back(this);
+        };
+
+        /* support function for _KhompClearLinks */
+        void clearLink(unsigned int device, unsigned int link);
+
+        bool execute(int argc, char *argv[]);
+    } KhompClearLinks;
+
+    /* khomp clear statistics */
+    static struct _KhompClearStatistics: public Command
+    {
+        _KhompClearStatistics()
+        {
+            complete_name = "clear statistics";
+    
+            brief = "Clear statistics of the channels.";
+
+            usage =                                                            \
+"Clear statistics of the channels, like number of calls incoming \n"           \
+"and outgoing, status, status time.\n\n"                                       \
+"Usage: khomp clear statistics [<board> [<channel>]]\n"                        \
+"\tboard   -- Number of the board (start from 0).\n"                           \
+"\tchannel -- Number of the channel (start from 0).\n"                         \
+"e.g. khomp clear statistics 0 -- Clear statistics of board 0."; 
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+    } KhompClearStatistics;
+
+
+    /* khomp reset links */
+    static struct _KhompResetLinks: public Command
+    {
+        _KhompResetLinks()
+        {
+            complete_name = "reset links";
+    
+            brief = "Reset the specified link.";
+
+            usage =                                                            \
+"Reset the specified link.\n\n"                                                \
+"Usage: khomp reset links [<board> [<link>]]\n"                                \
+"\tboard -- Number of the board (start from 0).\n"                             \
+"\tlink  -- Number of the link (start from 0).\n"                              \
+"e.g. khomp reset links 0 1 -- Reset link 1 of board 0.";
+
+            _commands.push_back(this);
+        };
+
+        /* support function for _KhompResetLinks */
+        void resetLink(unsigned int device, unsigned int link);
+
+        bool execute(int argc, char *argv[]);
+    } KhompResetLinks;
+   
+    /* khomp sms */
+    static struct _KhompSMS : public Command
+    {
+        _KhompSMS()
+        {
+            complete_name = "sms";
+            brief = "Send an SMS message using a Khomp KGSM board.";
+
+            usage =                                                            \
+"Send an SMS message using a Khomp KGSM board.\n\n"                            \
+"Usage: khomp sms <device> <destination> <message..>\n"                        \
+"\tdevice      -- Device to use (same string used in Dial for \n"              \
+"\t               channel allocation).\n"                                      \
+"\tdestination -- Phone number of the destination.\n"                          \
+"\tmessage     -- Message to send.\n"                                          \
+"e.g. khomp sms b0 99887766 Oi, tudo bem?";
+
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+    } KhompSMS;
+
+    /* khomp log console */
+    static struct _KhompLogConsole : public Command
+    {
+        _KhompLogConsole()
+        {
+            complete_name = "log console";
+
+            options.push_back("errors");
+            options.push_back("warnings");
+            options.push_back("messages");
+            options.push_back("events");
+            options.push_back("commands");
+            options.push_back("audio");
+            options.push_back("modem");
+            options.push_back("link");
+            options.push_back("cas");
+            options.push_back("standard");
+            options.push_back("all");
+            options.push_back("no");
+            options.push_back("just");
+
+            brief = "Enables/disables showing console messages for the channel.";
+            usage =                                                            \
+"Enables/disables showing channel messages, where <options> can be:\n"         \
+"\terrors    -- Error messages, when something goes really \n"                 \
+"\t             wrong. Enabled by default.\n"                                  \
+"\twarnings  -- Warnings, used when something might not be \n"                 \
+"\t             going as expected. Enabled by default.\n"                      \
+"\tmessages  -- Generic messages, used to indicate some \n"                    \
+"\t             information. Enabled by default.\n"                            \
+"\tevents    -- Show received K3L events as console \n"                        \
+"\t             messages. Disabled by default.\n"                              \
+"\tcommands  -- Show sent K3L commands as console \n"                          \
+"\t             messages. Disabled by default.\n"                              \
+"\taudio     -- Enable messages for K3L audio events. \n"                      \
+"\t             Disabled by default (very verbose!).\n"                        \
+"\tmodem     -- Enable messages for data received from \n"                     \
+"\t             KGSM modems. Disabled by default.\n"                           \
+"\tlink      -- Enable logging of link status changes. \n"                     \
+"\t             Enabled by default.\n"                                         \
+"\tcas       -- Enable logging of MFCs and line state \n"                      \
+"\t             changes in KPR board. Disabled by default.\n"                  \
+"\tstandard  -- Special identifier, enable default \n"                         \
+"\t             console messages.\n"                                           \
+"\tall       -- Special identifier, enable ALL console \n"                     \
+"\t             messages (should not be used naively).\n\n"                    \
+"Usage: khomp log console <options>\n"                                         \
+"e.g. khomp log console standard";
+
+            _commands.push_back(this);
+        }
+
+        bool execute(int argc, char *argv[]);
+    } KhompLogConsole;
+
+    /* khomp log disk */
+    static struct _KhompLogDisk : public Command
+    {
+        _KhompLogDisk()
+        {
+            complete_name = "log disk";
+
+            options.push_back("errors");
+            options.push_back("warnings");
+            options.push_back("messages");
+            options.push_back("events");
+            options.push_back("commands");
+            options.push_back("audio");
+            options.push_back("modem");
+            options.push_back("link");
+            options.push_back("cas");
+            options.push_back("functions");
+            options.push_back("threads");
+            options.push_back("locks");
+            options.push_back("streams");
+            options.push_back("standard");
+            options.push_back("debugging");
+            options.push_back("all");
+            options.push_back("no");
+            options.push_back("just");
+
+            brief = "Enables/disables logging to file messages for the channel.";
+            usage =                                                            \
+"Enables/disables the logging of channel messages to disk, where <options> \n" \
+"can be:\n"                                                                    \
+"\terrors    -- Error messages, when something goes really \n"                 \
+"\t             wrong. Enabled by default.\n"                                  \
+"\twarnings  -- Warnings, used when something might not be \n"                 \
+"\t             going as expected. Enabled by default.\n"                      \
+"\tmessages  -- Generic messages, used to indicate some \n"                    \
+"\t             information. Enabled by default.\n"                            \
+"\tevents    -- Record received K3L events as log messages. \n"                \
+"\t             Disabled by default.\n"                                        \
+"\tcommands  -- Record sent K3L commands as log messages. \n"                  \
+"\t             Disabled by default.\n"                                        \
+"\taudio     -- Enable messages for K3L audio events. \n"                      \
+"\t             Disabled by default (very verbose!).\n"                        \
+"\tmodem     -- Enable messages for data received from \n"                     \
+"\t             KGSM modems. Disabled by default.\n"                           \
+"\tlink      -- Enable logging of link status changes. \n"                     \
+"\t             Enabled by default.\n"                                         \
+"\tcas       -- Enable logging of MFCs and line state \n"                      \
+"\t             changes in KPR board. Disabled by default.\n"                  \
+"\tfunctions -- Enable debugging for functions. Disabled \n"                   \
+"\t             by default (should not be used naively!).\n"                   \
+"\tthreads   -- Enable debugging for threads. Disabled by \n"                  \
+"\t             default (should not be used naively!).\n"                      \
+"\tlocks     -- Enable debugging for locks. Disabled by \n"                    \
+"\t             default (should not be used naively!).\n"                      \
+"\tstreams   -- Enable debugging for streams. Disabled by \n"                  \
+"\t             default (should not be used naively!).\n"                      \
+"\tstandard  -- Special identifier, enable default messages.\n"                \
+"\tdebugging -- Special identifier, enable debugging messages \n"              \
+"\t             (should not be used naively).\n"                               \
+"\tall       -- Special identifier, enable ALL disk \n"                        \
+"\t             messages (DO NOT USE THIS!).\n\n"                              \
+"Usage: khomp log disk <options>\n"                                            \
+"e.g. khomp log disk <options>";
+
+            _commands.push_back(this);
+        }
+
+        bool execute(int argc, char *argv[]);
+    } KhompLogDisk;
+
+    /* khomp log trace k3l */
+    static struct _KhompLogTraceK3L : public Command
+    {
+        _KhompLogTraceK3L()
+        {
+            complete_name = "log trace k3l";
+
+            options.push_back("on");
+            options.push_back("off");
+
+            brief = "Set K3L tracing (debug) option.";
+
+            usage =                                                            \
+"Sets the low-level log for K3L API. Should not be set for long time \n"       \
+"periods.\n\n"                                                                 \
+"Usage: khomp log trace k3l {on|off}\n"                                        \
+"e.g. khomp log trace k3l on";
+
+            _commands.push_back(this);
+        }
+
+        bool execute(int argc, char *argv[]);
+    } KhompLogTraceK3L;
+
+    /* khomp log trace ISDN */
+    static struct _KhompLogTraceISDN : public Command
+    {
+        _KhompLogTraceISDN()
+        {
+            complete_name = "log trace isdn";
+
+            options.push_back("q931");
+            options.push_back("lapd");
+            options.push_back("system");
+            options.push_back("off");
+
+            brief = "Set ISDN signaling trace.";
+
+            usage =                                                            \
+"Sets the low-level log for ISDN signalling. Should not be set for \n"         \
+"long time periods.\n\n"                                                       \
+"Usage: khomp log trace isdn <what>[,<what2>[,..]]\n"                          \
+"\twhat -- \"q931\", \"lapd\", \"system\" or \"off\" \n"                       \
+"\t        (comma-separated values).\n"                                        \
+"e.g. khomp log trace isdn q931,system";
+
+            _commands.push_back(this);
+        }
+
+        bool execute(int argc, char *argv[]);
+    } KhompLogTraceISDN;
+
+    /* khomp log trace R2 */
+    static struct _KhompLogTraceR2 : public Command
+    {
+        _KhompLogTraceR2()
+        {
+            complete_name = "log trace r2";
+
+            options.push_back("on");
+            options.push_back("off");
+
+            brief = "Set R2 signaling trace.";
+
+            usage =                                                            \
+"Sets the low-level log monitor for R2 digital signalling. Should not \n"      \
+"be set for long time periods.\n\n"                                            \
+"Usage: khomp log trace r2 {on|off}\n"                                         \
+"e.g. khomp log trace r2 on";
+
+            _commands.push_back(this);
+        }
+
+        bool execute(int argc, char *argv[]);
+    } KhompLogTraceR2;
+
+    /* khomp get */
+    static struct _KhompGet : public Command
+    {
+        _KhompGet()
+        {
+            complete_name = "get";
+
+            options.push_back("echo-canceller");
+            options.push_back("out-of-band-dtmfs");
+            options.push_back("auto-fax-adjustment");
+            options.push_back("pulse-forwarding");
+            options.push_back("r2-strict-behaviour");
+            options.push_back("r2-preconnect-wait");
+            options.push_back("native-bridge");
+            options.push_back("suppression-delay");
+            options.push_back("context-fxo");
+            options.push_back("context-fxo-alt");
+            options.push_back("context-fxs");
+            options.push_back("context-fxs-alt");
+            options.push_back("context-gsm-call");
+            options.push_back("context-gsm-call-alt");
+            options.push_back("context-gsm-sms");
+            options.push_back("context-digital");
+            options.push_back("output-volume");
+            options.push_back("input-volume");
+
+            brief = "Get configuration options in the Khomp channel.";
+
+            usage =                                                            \
+"Usage: khomp get <option>\n"                                                  \
+"<option>  -- Shown below, with a short description each.\n\n"                 \
+"Option               Description\n"                                           \
+"echo-canceller       Gets the echo cancellation procedures if they are \n"    \
+"                     avaliable.\n"                                            \
+"out-of-band-dtmfs    Gets DTMFs to be sent out-of-band (using ast_frames) \n" \
+"                     instead of in-band (audio).\n"                           \
+"auto-fax-adjustment  Gets the automatic adjustment for FAX (mainly, \n"       \
+"                     disables the echo canceller).\n"                         \
+"pulse-forwarding     Gets the forwarding of detected pulses as DTMF tones.\n" \
+"r2-strict-behaviour  Gets the R2 protocol behavior while answering lines.\n"  \
+"r2-preconnect-wait   Sets the R2 protocol delay to pre-connect after \n"      \
+"                     sending ringback signal.\n"                              \
+"native-bridge        Enable/disable the native bridge mode for the channel.\n"\
+"suppression-delay    Enable/disable the internal buffer for DTMF \n"          \
+"                     suppression.\n"                                          \
+"context-fxo          Context (may be a template) for receiving FXO calls.\n"  \
+"context-fxo-alt      Alternative context (may be a template) for \n"          \
+"                     receiving FXO calls.\n"                                  \
+"context-fxs          Context (may be a template) for receiving FXS calls.\n"  \
+"context-fxs-alt      Alternative context (may be a template) for \n"          \
+"                     receiving FXS calls.\n"                                  \
+"context-gsm-call     Context (may be a template) for receiving GSM calls.\n"  \
+"context-gsm-call-alt Alternative context (may be a template) for \n"          \
+"                     receiving GSM calls.\n"                                  \
+"context-gsm-sms      Context (may be a template) for receiving GSM \n"        \
+"                     messages.\n"                                             \
+"context-digital      Context (may be a template) for receiving digital \n"    \
+"                     (E1) calls.\n"                                           \
+"output-volume        Gets the volume multiplier to be applied by the \n"      \
+"                     board over the output audio.\n"                          \
+"input-volume         Gets the volume multiplier to be applied by the \n"      \
+"                     board over the input audio.\n\n"                         \
+"FOR ALL COMMANDS, CHECK THE DOCUMENTATION.";
+
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+    } KhompGet;
+
+    /* khomp set */
+    static struct _KhompSet : public Command
+    {
+        _KhompSet()
+        {
+            complete_name = "set";
+
+            options.push_back("echo-canceller");
+            options.push_back("out-of-band-dtmfs");
+            options.push_back("auto-fax-adjustment");
+            options.push_back("pulse-forwarding");
+            options.push_back("r2-strict-behaviour");
+            options.push_back("r2-preconnect-wait");
+            options.push_back("native-bridge");
+            options.push_back("suppression-delay");
+            options.push_back("context-fxo");
+            options.push_back("context-fxo-alt");
+            options.push_back("context-fxs");
+            options.push_back("context-fxs-alt");
+            options.push_back("context-gsm-call");
+            options.push_back("context-gsm-call-alt");
+            options.push_back("context-gsm-sms");
+            options.push_back("context-digital");
+            options.push_back("output-volume");
+            options.push_back("input-volume");
+            brief = "Ajust configuration options in the Khomp channel.";
+
+            usage =                                                            \
+"Usage: khomp set <option> <value>\n"                                          \
+"\t<option>  -- Shown below, with a short description each.\n"                 \
+"\t<value>   -- Depends on the option. Check the documentation for \n"         \
+"\t             more info.\n\n"                                                \
+"Option               Description\n"                                           \
+"echo-canceller       Sets the echo cancellation procedures if they are \n"    \
+"                     avaliable.\n"                                            \
+"out-of-band-dtmfs    Sets DTMFs to be sent out-of-band (using ast_frames) \n" \
+"                     instead of in-band (audio).\n"                           \
+"auto-fax-adjustment  Sets the automatic adjustment for FAX (mainly, \n"       \
+"                     disables the echo canceller).\n"                         \
+"pulse-forwarding     Sets the forwarding of detected pulses as DTMF tones.\n" \
+"r2-strict-behaviour  Sets the R2 protocol behavior while answering lines.\n"  \
+"r2-preconnect-wait   Sets the R2 protocol delay to pre-connect after \n"      \
+"                     sending ringback signal.\n"                              \
+"native-bridge        Enable/disable the native bridge mode for the channel.\n"\
+"suppression-delay    Enable/disable the internal buffer for DTMF \n"          \
+"                     suppression.\n"                                          \
+"context-fxo          Context (may be a template) for receiving FXO calls.\n"  \
+"context-fxo-alt      Alternative context (may be a template) for \n"          \
+"                     receiving FXO calls.\n"                                  \
+"context-fxs          Context (may be a template) for receiving FXS calls.\n"  \
+"context-fxs-alt      Alternative context (may be a template) for \n"          \
+"                     receiving FXS calls.\n"                                  \
+"context-gsm-call     Context (may be a template) for receiving GSM calls.\n"  \
+"context-gsm-call-alt Alternative context (may be a template) for \n"          \
+"                     receiving GSM calls.\n"                                  \
+"context-gsm-sms      Context (may be a template) for receiving GSM \n"        \
+"                     messages.\n"                                             \
+"context-digital      Context (may be a template) for receiving digital \n"    \
+"                     (E1) calls.\n"                                           \
+"output-volume        Sets the volume multiplier to be applied by the \n"      \
+"                     board over the output audio.\n"                          \
+"input-volume         Sets the volume multiplier to be applied by the \n"      \
+"                     board over the input audio.\n\n"                         \
+"FOR ALL COMMANDS, CHECK THE DOCUMENTATION.";
+
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+    } KhompSet;
+
+    /* khomp log rotate */
+    static struct _KhompLogRotate : public Command 
+    {
+        _KhompLogRotate()
+        {
+            complete_name = "log rotate";
+            brief = "Rotate the files where the messages are being logged.";
+
+            usage =                                                            \
+"Rotate the files where the messages are being logged.\n\n"                    \
+"Usage: khomp log rotate";
+
+            _commands.push_back(this);
+        }
+
+        bool execute(int argc, char *argv[]);
+    } KhompLogRotate;
+
+    /* khomp log status */
+    static struct _KhompLogStatus : public Command
+    {
+        _KhompLogStatus()
+        {
+            complete_name = "log status";
+            brief = "Show the status of the messages.";
+
+            usage =                                                            \
+"Show the status of the message system (enabled/disabled messages).\n\n"       \
+"Usage: khomp log status";
+
+            _commands.push_back(this);
+        }
+
+        bool execute(int argc, char *argv[]);
+    } KhompLogStatus;
+
+    /* khomp revision */
+    static struct _KhompRevision : public Command
+    {
+        _KhompRevision()
+        {
+            complete_name = "revision";
+            brief = "Show revision number.";
+
+            usage =                                                            \
+"Show the internal revision number for this channel.\n\n"                      \
+"Usage: khomp revision";
+
+            _commands.push_back(this);
+        }
+
+        bool execute(int argc, char *argv[]);
+    } KhompRevision;
+
+    /* khomp send command */
+    static struct _KhompSendCommand : public Command
+    {
+        _KhompSendCommand()
+        {
+            complete_name = "send command";
+            brief = "Send an K3L API command directly to the board.";
+
+            usage =                                                            \
+"Send an K3L API command directly to the board.\n"                             \
+"WARNING: This command is for debugging only - just use if you know \n"        \
+"what you are doing!\n\n"                                                      \
+"Usage: khomp send command <board> <channel> <command> [argument]\n"           \
+"\tboard    -- Number of the board (start from 0).\n"                          \
+"\tchannel  -- Number of the channel (start from 0).\n"                        \
+"\tcommand  -- Number of API command (should be consulted in separate docs).\n"\
+"\targument -- Optimal string to use as parameter for the command.\n"          \
+"e.g. khomp send command 0 1 4 123456 - Send DTMFs 123456 throught \n"         \
+"                                       channel 1 on board 0.";
+
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+    } KhompSendCommand;
+
+    /* khomp send raw */
+    static struct _KhompSendRawCommand : public Command 
+    {
+        _KhompSendRawCommand()
+        {
+            complete_name = "send raw command";
+            brief = "Send an command directly to a DSP at the board.";
+
+            usage =                                                            \
+"Send an command directly to some DSP at the board.\n"                         \
+"WARNING: This command is for debugging only - just use if you know \n"        \
+"what you are doing!\n\n"                                                      \
+"Usage: khomp send raw command <board> <dsp> <c0> <c1> [...]\n"                \
+"\tboard       -- Number of the board (start from 0).\n"                       \
+"\tchannel     -- Number of the channel (start from 0).\n"                     \
+"\tdsp         -- Number of the DSP.\n"                                        \
+"\tc0, c1, ... -- Hexadecimal numbers for the command.\n"                      \
+"e.g. khomp send raw command 0 1 0x4a 0x00 0x00 - Disables the internal \n"    \
+"                                                 audio delay on board 0.";
+
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+    } KhompSendRawCommand;
+    
+    /* khomp select sim */
+    static struct _KhompSelectSim : public Command
+    {
+        _KhompSelectSim()
+        {
+            complete_name = "select sim";
+
+            brief = "Select SIM card, available to Khomp KGSM boards.";
+
+            usage =                                                            \
+"Select SIM card, available to Khomp KGSM boards.\n\n"                         \
+"Usage: khomp select sim <board> <channel> <sim_card>\n"                       \
+"\tboard    -- Number of the board (start from 0).\n"                          \
+"\tchannel  -- Number of the channel (start from 0), identifies \n"            \
+"\t            the modem inside the board.\n"                                  \
+"\tsim_card -- Number for the SIM card to select.\n"                           \
+"e.g. khomp select sim 0 0 2";
+
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+    } KhompSelectSim;
+
+    /* khomp kommuter */
+    static struct _KhompKommuterOnOff : public Command
+    {
+        _KhompKommuterOnOff()
+        {
+            complete_name = "kommuter";
+
+            options.push_back("on");
+            options.push_back("off");
+
+            brief = "Activate and deactives the Kommuter devices.";
+
+            usage =                                                            \
+"Manually activates or deactivates all kommuters connected to this machine.\n" \
+"This command will only be sent if kommuter-activation variable in \n"         \
+"khomp.conf is set to manual. All kommuter devices will be configure with \n"  \
+"the timeout defined in kommuter-timeout.\n\n"                                 \
+"Usage: khomp kommuter {on|off}\n"                                             \
+"\ton     -- Turn ON kommuter devices on this machine.\n"                      \
+"\toff    -- Turn OFF kommuter devices on this machine.";
+
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+    } KhompKommuterOnOff;
+    
+    /* khomp kommuter count */
+    static struct _KhompKommuterCount : public Command
+    {
+        _KhompKommuterCount()
+        {
+            complete_name = "kommuter count";
+
+            brief = "Prints the number of Kommuter devices.";
+
+            usage =                                                            \
+"Prints the number of Kommuter devices connected to this machine.\n\n"         \
+"Usage: khomp kommuter count";
+
+            _commands.push_back(this);
+        };
+
+        bool execute(int argc, char *argv[]);
+    } KhompKommuterCount;
+
+protected:
+    static switch_stream_handle_t* stream;
+    static switch_loadable_module_interface_t **module_interface;
+    static Commands _commands;
+    static std::string _khomp_usage;
+};
+
+/******************************************************************************/
+/******************************* Command Tree *********************************
+
+This tree is a overview for all commands in our module,
+when a command is added, deleted or modified, please, update our tree.
+
++ khomp 
+|
++ ---- channels 
+|    |
+-    + ---- disconnect
+|    |
+-    + ---- unblock
+|
++ ---- show
+|    | 
+-    + ---- calls
+|    |
+-    + ---- channels
+|    |    | 
+-    -    + ---- verbose
+|    |    |
+-    -    + ---- concise
+|    |
+-    + ---- statistics
+|    |    |  
+-    -    + ---- detailed
+|    |    |  
+-    -    + ---- verbose 
+|    |   
+-    + ---- links
+|         |
+-         + ---- errors
+|         |
+-         + ---- verbose
+|         |
+-         + ---- concise
+|    
++ ---- reset
+|    | 
+-    + ---- links
+|
++ ---- clear
+|    | 
+-    + ---- links
+|         |
+-         + ---- errors
+|         |
+-         + ---- statistics
+|
++ ---- log
+|    |
+-    + ---- console
+|    |    |
+-    -    + ---- errors
+|    |    |
+-    -    + ---- warnings
+|    |    |
+-    -    + ---- messages
+|    |    |
+-    -    + ---- events
+|    |    |
+-    -    + ---- commands
+|    |    |
+-    -    + ---- audio
+|    |    |
+-    -    + ---- link
+|    |    |
+-    -    + ---- cas
+|    |    |
+-    -    + ---- standard
+|    |    |
+-    -    + ---- all
+|    |
+-    + ---- disk
+|    |    |
+-    -    + ---- errors
+|    |    |
+-    -    + ---- warnings
+|    |    |
+-    -    + ---- messages
+|    |    |
+-    -    + ---- events
+|    |    |
+-    -    + ---- commands
+|    |    |
+-    -    + ---- audio
+|    |    |
+-    -    + ---- modem
+|    |    |
+-    -    + ---- link
+|    |    |
+-    -    + ---- cas
+|    |    |
+-    -    + ---- functions
+|    |    |
+-    -    + ---- threads
+|    |    |
+-    -    + ---- locks
+|    |    |
+-    -    + ---- streams
+|    |    |
+-    -    + ---- standard
+|    |    |
+-    -    + ---- debugging
+|    |    |
+-    -    + ---- all
+|    |     
+-    + ---- rotate
+|    |
+-    + ---- status
+|    |
+-    + ---- trace
+|         |
+-         + ---- isdn 
+|         |    |
+-         -    + ---- q931
+|         |    |
+-         -    + ---- lapd
+|         |    |
+-         -    + ---- system
+|         |    |
+-         -    + ---- off
+|         |
+-         + ---- k3l 
+|         |    |
+-         -    + ---- on
+|         |    |
+-         -    + ---- off
+|         |
+-         + ---- r2 
+|              |
+-              + ---- on
+|              |
+-              + ---- off
+|
++ ---- send
+|    |
+-    + ---- command
+|    |
+-    + ---- raw
+|
++ ---- get
+|
++ ---- set
+|
++ ---- select
+|    |
+-    + ---- sim
+|
++ ---- sms
+|
++ ---- summary
+|    |
+-    + ---- concise
+|    |
+-    + ---- verbose
+|
++ ---- revision
+|
++ ---- kommuter
+     |
+     + ---- on
+     |
+     + ---- off
+
+ ******************************************************************************/
+/******************************************************************************/
+
+#endif 
+
diff --git a/src/mod/endpoints/mod_khomp/include/defs.h b/src/mod/endpoints/mod_khomp/include/defs.h
new file mode 100644
index 0000000000..f296882572
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/defs.h
@@ -0,0 +1,211 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _DEFS_H_
+#define _DEFS_H_
+
+/* formatation macros */
+#include "switch_version.h"
+#include "revision.h"
+
+#define KHOMP_LOG __FILE__, __SWITCH_FUNC__, __LINE__
+#define KHOMP_EVENT_MAINT "khomp::maintenance"
+
+#define OBJ_FMT(dev,obj,msg) \
+    FMT("%s (d=%02d,c=%03d) " msg) % __SWITCH_FUNC__ % dev % obj
+
+#define OBJ_MSG(dev,obj,msg) \
+    "%s (d=%02d,c=%03d) " msg, __SWITCH_FUNC__, dev, obj
+
+#define PVT_FMT(tgt,msg) \
+    FMT("%s (d=%02hu,c=%03hu) " msg) % __SWITCH_FUNC__ % tgt.device % tgt.object
+
+#define PVT_MSG(tgt,msg) \
+    "%s (d=%02hu,c=%03hu) " msg, __SWITCH_FUNC__, tgt.device, tgt.object
+
+#define D(x) ( FMT( "%s: " x ) % __func__ )
+
+#define STR(fmt) \
+    STG(fmt).c_str()
+
+/* version controller macro */
+#define SWITCH_LESS_THAN(x,y,z)                                                           \
+   (FS_VERSION_MICRO != -1) &&                                                            \
+   (((FS_VERSION_MAJOR == x)  && (FS_VERSION_MINOR == y)  &&  (FS_VERSION_MICRO <= z)) || \
+   ((FS_VERSION_MAJOR == x)  && (FS_VERSION_MINOR < y)) || (FS_VERSION_MAJOR < x))
+
+/* signalling groups macro */
+#define CASE_R2_SIG         \
+    case ksigR2Digital:     \
+    case ksigContinuousEM:  \
+    case ksigPulsedEM:      \
+    case ksigUserR2Digital: \
+    case ksigOpenCAS:       \
+    case ksigOpenR2
+/*
+    case ksigLineSide:      \
+    case ksigCAS_EL7:       \
+    case ksigE1LC
+*/
+
+#define CASE_RDSI_SIG       \
+    case ksigPRI_EndPoint:  \
+    case ksigPRI_Network:   \
+    case ksigPRI_Passive:   \
+    case ksigOpenCCS
+
+#define CASE_FLASH_GRP          \
+    case ksigLineSide:          \
+    case ksigCAS_EL7:           \
+    case ksigE1LC
+
+/******************************************************************************/
+
+/* Buffering size constants */
+
+#define SILENCE_PACKS               2
+
+#define KHOMP_READ_PACKET_TIME     16                            // board sample (ms)
+
+#define KHOMP_READ_PACKET_SIZE    (KHOMP_READ_PACKET_TIME *   8) // asterisk sample size (bytes)
+
+#define KHOMP_MIN_READ_PACKET_SIZE (10 * 8)                      // min size to return on khomp_read
+#define KHOMP_MAX_READ_PACKET_SIZE (30 * 8)                      // max size to return on khomp_read
+
+#define KHOMP_AUDIO_BUFFER_SIZE   (KHOMP_READ_PACKET_SIZE  *  8) // buffer size (bytes)
+
+/* debug and log macros */
+#define DBG(x,y) \
+    { \
+        if (K::Logger::Logg.classe( C_DBG_##x ).enabled()) \
+                K::Logger::Logg( C_DBG_##x , y ); \
+    }
+
+#define LOG(x,y) \
+    { \
+        K::Logger::Logg( C_##x , y ); \
+    }
+
+#define LOGC(x,y) \
+    { \
+        if (K::Logger::Logg.classe( C_##x ).enabled()) \
+            LOG( x , y ); \
+    }
+
+/* useful to debug arguments */
+#define DEBUG_CLI_CMD() \
+{ \
+    K::Logger::Logg2(C_CLI,stream,FMT("argc: %d ") % argc); \
+    for(int i = 0;i< argc;i++)                              \
+        K::Logger::Logg2(C_CLI,stream,FMT("argv[%d]:%s ") % i % argv[i]); \
+}
+
+/* macros to cli commands */
+#define ARG_CMP(a,b) (argv[a] && !strncasecmp(argv[a],b,sizeof(b))) 
+#define EXEC_CLI_CMD(command) Cli::command.execute(argc,argv)
+
+/* macro to string treats */
+#define SAFE_sprintf(a, ...)    snprintf(a,sizeof(a), __VA_ARGS__)
+#define SAFE_strcasecmp(a,b)    strncasecmp(a, b, sizeof(b))
+
+/* tags for timers */
+#define TM_VAL_CALL    (unsigned int)0x01
+#define TM_VAL_CHANNEL (unsigned int)0x02
+
+/* macro to creating contexts */
+#define BEGIN_CONTEXT do
+#define END_CONTEXT while(false);
+
+/* Define log type */
+typedef enum
+{
+    C_CLI,      /* cli msgs    */
+
+    C_ERROR,    /* errors      */
+    C_WARNING,  /* warnings    */
+    C_MESSAGE,  /* normal msgs */
+
+    C_EVENT,    /* k3l events   */
+    C_COMMAND,  /* k3l commands */
+
+    C_AUDIO_EV, /* k3l audio events */
+    C_MODEM_EV, /* gsm modem events */
+    C_LINK_STT, /* link status msgs */
+    C_CAS_MSGS, /* cas events msgs  */
+
+    C_DBG_FUNC,
+    C_DBG_LOCK,
+    C_DBG_THRD,
+    C_DBG_STRM,
+    
+    C_DBG_CONF,
+}
+class_type;
+
+typedef enum
+{
+    O_CONSOLE,
+    O_GENERIC,
+    O_R2TRACE,
+}
+output_type;
+
+typedef enum
+{
+    SCE_SHOW_WARNING,
+    SCE_SHOW_DEBUG,
+    SCE_SHOW_SAME,
+    SCE_HIDE
+}
+send_cmd_error_type;
+
+typedef enum 
+{
+    T_UNKNOWN = 2,
+    T_TRUE = 1,
+    T_FALSE = 0,
+}
+TriState;
+    
+
+#endif
diff --git a/src/mod/endpoints/mod_khomp/include/frame.h b/src/mod/endpoints/mod_khomp/include/frame.h
new file mode 100644
index 0000000000..87b968bcba
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/frame.h
@@ -0,0 +1,160 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _FRAME_HPP_
+#define _FRAME_HPP_
+
+#include <stdlib.h>
+#include <sys/mman.h>
+
+#include <ringbuffer.hpp>
+
+#include "globals.h"
+
+struct FrameStorage
+{
+    static const unsigned int frame_count = 24;//6;
+    static const unsigned int audio_count = 24;//4;
+
+    FrameStorage(switch_codec_t * codec, int packet_size);
+    virtual ~FrameStorage();
+
+    inline switch_frame_t * next_frame(void)
+    {
+        return &(_frames[next_index()]);
+    }
+
+    inline unsigned int next_index()
+    {
+        unsigned int tmp = _index;
+
+        if (++_index >= frame_count)
+            _index = 0;
+
+        return tmp;
+    }
+
+    inline switch_frame_t * cng_frame(void)
+    {
+        return &_cng_frame;
+    }
+
+    char * audio_buffer()
+    {
+        return _buffer;
+    };
+
+ private:
+    switch_frame_t   _cng_frame;
+
+    switch_frame_t * _frames;
+    char           * _buffer;
+
+    unsigned int     _index;
+};
+
+/* Internal frame array structure. */
+template < int S >
+struct FrameManager: protected FrameStorage
+{
+    typedef char Packet[ S ];
+
+    typedef Ringbuffer < Packet >  AudioBuffer;
+
+    FrameManager(switch_codec_t * codec)
+    : FrameStorage(codec, S),
+      _audio(audio_count, (Packet*)audio_buffer())
+    {};
+
+//    ~FrameManager();
+
+    // may throw Ringbuffer::BufferEmpty
+    switch_frame_t * pick(void)
+    {
+        try
+        {
+            /* try to consume from buffer.. */
+            Packet & a = _audio.consumer_start();
+
+            switch_frame * f = next_frame();
+
+            /* adjust pointer */
+            f->data = (char *)(&a);
+
+            /* advance now */
+            _audio.consumer_commit();
+ 
+            return f;
+        }
+        catch (...) // AudioBuffer::BufferEmpty & e)
+        {
+            return NULL;
+        }
+    }
+
+    // may throw Ringbuffer::BufferFull
+    bool give(const char * buf, unsigned int size)
+    {
+        return _audio.provider_partial(buf, size);
+    }
+
+    switch_frame_t * cng(void)
+    {
+        return cng_frame();
+    }
+
+    void clear()
+    {
+        _audio.clear();
+    }
+
+ protected:
+    AudioBuffer      _audio;
+
+    unsigned int     _index;
+};
+
+typedef FrameManager < Globals::switch_packet_size > FrameSwitchManager;
+typedef FrameManager < Globals::boards_packet_size > FrameBoardsManager;
+
+#endif /* _FRAME_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/include/globals.h b/src/mod/endpoints/mod_khomp/include/globals.h
new file mode 100644
index 0000000000..f212d63742
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/globals.h
@@ -0,0 +1,119 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _GLOBALS_H_
+#define _GLOBALS_H_
+#include "k3lapi.hpp"
+
+#include <config_options.hpp>
+#include <k3lutil.hpp>
+#include <verbose.hpp>
+#include <regex.hpp>
+#include <timer.hpp>
+
+#include <vector>
+#include <string>
+#include <fstream>
+
+#include <simple_lock.hpp>
+
+extern "C"
+{
+    #include <switch.h>
+}
+
+/* As this is a static-variable-only struct, member variable *
+ * names need not to get "_" in front of the name            */
+
+struct Globals
+{
+    typedef void * global_timer_data;
+    typedef void (global_timer_func)(global_timer_data);
+    typedef TimerTemplate < global_timer_func, global_timer_data > GlobalTimer;
+    
+    typedef SimpleNonBlockLock<25,100> Mutex;
+    
+    /* FreeSWITCH variables for packets and buffer */
+    // in ms
+    static const unsigned int switch_packet_duration  = 30;
+    static const unsigned int boards_packet_duration  = 24;
+    // in bytes
+    static const unsigned int switch_packet_size = switch_packet_duration *  8;
+    static const unsigned int boards_packet_size = boards_packet_duration *  8;
+    static const unsigned int    cng_buffer_size = (switch_packet_size > boards_packet_size ? switch_packet_size : boards_packet_size);    
+
+    /* Father */
+    static K3LAPI                            k3lapi;
+
+    /* Son */
+    static K3LUtil                           k3lutil;
+
+    /* Holy Spirit */
+    static Verbose                           verbose;
+
+    /* Global timer */ 
+    static  GlobalTimer                    * global_timer;
+
+    /* Mutex to KhompPvt allocation */
+    static Mutex                             khomp_alloc_mutex;
+
+    /* Config options class */
+    static ConfigOptions                     options;
+
+    /* FreeSWITCH Articular Ligaments */ 
+    static switch_endpoint_interface_t     * khomp_endpoint_interface;
+    static switch_endpoint_interface_t     * khomp_sms_endpoint_interface;
+    static switch_endpoint_interface_t     * khomp_pr_endpoint_interface;
+    static switch_application_interface_t  * khomp_app_inteface;
+    static switch_api_interface_t          * api_interface;
+    static switch_memory_pool_t            * module_pool;
+    
+    /* Still a nice workaround */ 
+    volatile static bool                     logs_being_rotated;
+
+    /* Trace flags */
+    static bool                              flag_trace_rdsi;
+};
+
+#endif /* _GLOBALS_H_ */
+
diff --git a/src/mod/endpoints/mod_khomp/include/k3l.h b/src/mod/endpoints/mod_khomp/include/k3l.h
new file mode 100644
index 0000000000..046bd666b1
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/k3l.h
@@ -0,0 +1,1996 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file
+  under the MPL, indicate your decision by deleting the provisions above and
+  replace them with the notice and other provisions required by the LGPL
+  License. If you do not delete the provisions above, a recipient may use your
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _GENERATED_K3L_H_
+#define _GENERATED_K3L_H_
+#if !defined KLTYPEDEFS_H
+#define KLTYPEDEFS_H
+#if defined( _WINDOWS ) || defined( _Windows ) || defined( _WIN32 )
+	#ifndef KWIN32
+	#define KWIN32 1
+	#endif
+#endif
+
+#ifdef KWIN32
+	typedef __int64				int64;
+	typedef unsigned __int64	uint64;
+	#define Kstdcall __stdcall
+#else
+	typedef long long				int64;
+	typedef unsigned long long		uint64;
+	#define Kstdcall 
+#endif
+typedef int					int32;
+typedef unsigned int		uint32;
+typedef uint64			    intptr;
+typedef intptr              stackint;
+typedef short int			int16;
+typedef unsigned short int	uint16;
+typedef char				int8;
+typedef unsigned char		uint8;
+typedef unsigned char		byte;
+typedef char				sbyte;
+typedef double				float64;
+typedef float				float32;
+typedef int32				stt_code;
+
+enum KLibraryStatus 
+{
+	ksSuccess =			0,
+	ksFail =			1,
+	ksTimeOut =			2,
+	ksBusy =			3,
+	ksLocked =			4,
+	ksInvalidParams =	5,
+	ksEndOfFile =		6,
+	ksInvalidState =	7,
+	ksServerCommFail =	8,
+	ksOverflow =		9,
+    ksUnderrun =        10,
+	ksNotFound =		11,
+    ksNotAvailable =    12
+};	
+enum KTxRx
+{
+	kNoTxRx	= 0x0,
+	kTx		= 0x1,
+	kRx		= 0x2,
+	kBoth	= 0x3
+}; 
+
+#define KMAX_SERIAL_NUMBER			12 
+#define KMAX_E1_CHANNELS			30
+#define KMAX_DIAL_NUMBER	        20
+#define KMAX_ADDRESS				60
+#define KMAX_DSP_NAME		        8
+#define KMAX_STR_VERSION	        80
+#define KMAX_BUFFER_ADDRESSES		16
+#define KMAX_LOG                    1024
+#define KMAX_SIP_DATA               248
+#define KMAX_GSM_CALLS              6
+#define KMAX_GSM_OPER_NAME          32
+#define KMAX_GSM_IMEI_SIZE          16
+#endif
+#if !defined KVOIPDEFS_H
+#define KVOIPDEFS_H
+enum KRejectReason
+{
+	UserBusy = 0,
+	UserNotFound,
+	NoAnswer,
+	Decline,
+	ServiceUnavailable,
+	ServerInternalError,
+	UnknownRejectReason
+};
+enum KSIP_Failures
+{
+	kveResponse_200_OK_Success             		= 200,
+    kveRedirection_300_MultipleChoices			= 300,
+	kveRedirection_301_MovedPermanently			= 301,
+	kveRedirection_302_MovedTemporarily			= 302,
+	kveRedirection_305_UseProxy					= 305,
+	kveRedirection_380_AlternativeService		= 380,
+	kveFailure_400_BadRequest					= 400,
+	kveFailure_401_Unauthorized					= 401,
+	kveFailure_402_PaymentRequired				= 402,
+	kveFailure_403_Forbidden					= 403,
+	kveFailure_404_NotFound						= 404,
+	kveFailure_405_MethodNotAllowed				= 405,
+	kveFailure_406_NotAcceptable				= 406,
+	kveFailure_407_ProxyAuthenticationRequired	= 407,
+	kveFailure_408_RequestTimeout				= 408,
+	kveFailure_410_Gone							= 410,
+	kveFailure_413_RequestEntityTooLarge		= 413,
+	kveFailure_414_RequestURI_TooLong			= 414,
+	kveFailure_415_UnsupportedMediaType			= 415,
+	kveFailure_416_UnsupportedURI_Scheme		= 416,
+	kveFailure_420_BadExtension					= 420,
+	kveFailure_421_ExtensionRequired			= 421,
+	kveFailure_423_IntervalTooBrief				= 423,
+	kveFailure_480_TemporarilyUnavailable		= 480,
+	kveFailure_481_CallDoesNotExist				= 481,
+	kveFailure_482_LoopDetected					= 482,
+	kveFailure_483_TooManyHops					= 483,
+	kveFailure_484_AddressIncomplete			= 484,
+	kveFailure_485_Ambiguous					= 485,
+	kveFailure_486_BusyHere						= 486,
+	kveFailure_487_RequestTerminated			= 487,
+	kveFailure_488_NotAcceptableHere			= 488,
+	kveFailure_491_RequestPending				= 491,
+	kveFailure_493_Undecipherable				= 493,
+	kveServer_500_InternalError					= 500,
+	kveServer_501_NotImplemented				= 501,
+	kveServer_502_BadGateway					= 502,
+	kveServer_503_ServiceUnavailable			= 503,
+	kveServer_504_TimeOut						= 504,
+	kveServer_505_VersionNotSupported			= 505,
+	kveServer_513_MessageTooLarge				= 513,
+	kveGlobalFailure_600_BusyEverywhere			= 600,
+	kveGlobalFailure_603_Decline				= 603,
+	kveGlobalFailure_604_DoesNotExistAnywhere	= 604,
+	kveGlobalFailure_606_NotAcceptable			= 606
+};
+enum KVoIPRegTypes
+{
+   kvrtRegister    =   0,
+   kvrtUnregister  =   1
+};
+
+struct KVoIPCallParams
+{
+	sbyte ToUser[ KMAX_ADDRESS + 1 ];
+	sbyte FromUser[ KMAX_ADDRESS + 1 ];
+    sbyte FromUserIP[ KMAX_ADDRESS + 1 ];
+};
+struct KVoIPEvRegisterParams
+{
+    KVoIPRegTypes Register;
+	sbyte User[ KMAX_ADDRESS + 1 ];
+	sbyte ProxyIP[ KMAX_ADDRESS + 1 ];
+};
+struct KVoIPSeize 
+{
+	sbyte FromUser[ KMAX_ADDRESS + 1 ];
+	sbyte ToUser[ KMAX_ADDRESS + 1 ];
+    sbyte ProxyIP[ KMAX_ADDRESS + 1 ];
+};
+#endif
+#if !defined KLDEFS_H
+#define KLDEFS_H
+
+
+
+#define CM_SEIZE					0x01
+     
+#define CM_SYNC_SEIZE				0x02
+
+#define CM_SIP_REGISTER             0x03
+
+#define CM_DIAL_DTMF				0x04
+
+#define CM_DISCONNECT				0x05
+
+#define CM_CONNECT					0x06
+
+#define CM_PRE_CONNECT				0x07
+
+#define CM_CAS_CHANGE_LINE_STT		0x08
+
+#define CM_CAS_SEND_MFC				0x09
+
+#define CM_SET_FORWARD_CHANNEL		0x0A
+
+#define CM_CAS_SET_MFC_DETECT_MODE	0x0B
+
+#define CM_DROP_COLLECT_CALL		0x0C
+
+#define CM_MAKE_CALL				0x0D
+
+#define CM_RINGBACK 				0x0E
+
+#define CM_USER_INFORMATION         0x0F
+
+#define CM_VOIP_SEIZE				0x23
+
+
+#define	CM_LOCK_INCOMING			0x10
+
+#define CM_UNLOCK_INCOMING			0x11
+
+#define CM_LOCK_OUTGOING			0x12
+
+#define CM_UNLOCK_OUTGOING			0x13
+
+#define CM_START_SEND_FAIL			0x14
+
+#define CM_STOP_SEND_FAIL			0x15
+
+#define CM_END_OF_NUMBER            0x16
+
+#define CM_SEND_SIP_DATA			0x17
+
+#define CM_SS_TRANSFER              0x18
+
+#define CM_GET_SMS                  0x19
+
+#define CM_PREPARE_SMS              0x1A
+
+#define CM_SEND_SMS                 0x1B
+
+#define CM_SEND_TO_MODEM            0x1C
+
+#define CM_CHECK_NEW_SMS            0x1D
+
+#define CM_ISDN_SEND_SUBADDRESSES   0x1E
+
+#define CM_CT_TRANSFER              0x1F
+
+#define CM_ENABLE_DTMF_SUPPRESSION	0x30
+
+#define CM_DISABLE_DTMF_SUPPRESSION	0x31
+
+#define CM_ENABLE_AUDIO_EVENTS		0x32
+
+#define CM_DISABLE_AUDIO_EVENTS		0x33
+
+#define CM_ENABLE_CALL_PROGRESS		0x34
+
+#define CM_DISABLE_CALL_PROGRESS	0x35
+
+#define CM_FLASH					0x36
+
+#define CM_ENABLE_PULSE_DETECTION	0x37
+
+#define CM_DISABLE_PULSE_DETECTION	0x38
+
+#define CM_ENABLE_ECHO_CANCELLER	0x39
+
+#define CM_DISABLE_ECHO_CANCELLER	0x3A
+
+#define CM_ENABLE_AGC				0x3B
+
+#define CM_DISABLE_AGC				0x3C
+
+#define CM_ENABLE_HIGH_IMP_EVENTS	0x3D
+
+#define CM_DISABLE_HIGH_IMP_EVENTS	0x3E
+
+#define CM_ENABLE_CALL_ANSWER_INFO  0x40
+
+#define CM_DISABLE_CALL_ANSWER_INFO 0x41
+
+#define CM_START_WATCHDOG           0x45
+
+#define CM_STOP_WATCHDOG            0x46
+
+#define CM_NOTIFY_WATCHDOG          0x47
+
+#define CM_WATCHDOG_COUNT           0x48
+
+#define CM_HOLD_SWITCH             0x4A
+
+#define CM_MPTY_CONF               0x4B
+
+#define CM_MPTY_SPLIT              0x4C
+
+#define CM_SIM_CARD_SELECT         0x4D
+
+#define CM_START_FAX_TX				0x50
+
+#define CM_STOP_FAX_TX			0x51
+
+#define CM_ADD_FAX_FILE				0x52
+
+#define CM_ADD_FAX_PAGE_BREAK		0x53
+
+#define CM_START_FAX_RX				0x54
+
+#define CM_STOP_FAX_RX			    0x55
+
+#define CM_RESET_LINK				0xF1
+
+#define CM_CLEAR_LINK_ERROR_COUNTER 0xF2
+
+#define CM_SEND_DEVICE_SECURITY_KEY 0xF3
+
+#define CM_RESET_MODEM              0xF4
+
+#define CM_ISDN_DISABLE_LINK        0xF5
+
+#define CM_ISDN_ENABLE_LINK         0xF6
+
+
+#define EV_CHANNEL_FREE				0x01
+
+#define EV_CONNECT					0x03
+
+#define EV_DISCONNECT				0x04
+
+#define EV_CALL_SUCCESS				0x05
+
+#define EV_CALL_FAIL				0x06
+
+#define EV_NO_ANSWER				0x07
+
+#define EV_BILLING_PULSE			0x08
+
+#define EV_SEIZE_SUCCESS			0x09
+
+#define EV_SEIZE_FAIL				0x0A
+
+#define EV_SEIZURE_START			0x0B
+
+#define EV_CAS_LINE_STT_CHANGED		0x0C
+
+#define EV_CAS_MFC_RECV				0x0D
+
+#define EV_NEW_CALL                 0x0E
+
+#define EV_USER_INFORMATION         0x0F
+
+#define EV_DIALED_DIGIT             0x10
+
+#define EV_SIP_REGISTER_INFO        0x11
+
+#define EV_RING_DETECTED            0x12
+
+#define EV_ISDN_SUBADDRESSES        0x13
+
+#define EV_CALL_HOLD_START			0x16
+
+#define EV_CALL_HOLD_STOP			0x17
+
+#define EV_SS_TRANSFER_FAIL         0x18
+
+#define EV_FLASH                    0x19
+
+#define EV_ISDN_PROGRESS_INDICATOR	0x1A
+
+#define EV_CT_TRANSFER_SUCCESS      0x1B
+
+#define EV_CT_TRANSFER_FAIL         0x1C
+
+#define EV_DTMF_DETECTED			0x20
+
+#define EV_DTMF_SEND_FINISH			0x21
+
+#define EV_AUDIO_STATUS				0x22
+
+#define EV_CADENCE_RECOGNIZED		0x23
+#define EV_CALL_PROGRESS			EV_CADENCE_RECOGNIZED
+
+#define EV_END_OF_STREAM			0x24
+
+#define EV_PULSE_DETECTED			0x25
+
+#define EV_POLARITY_REVERSAL		0x26
+
+#define EV_CALL_ANSWER_INFO     	0x27
+
+#define EV_COLLECT_CALL          	0x28
+
+#define EV_SIP_DTMF_DETECTED        0x29
+
+#define EV_SIP_DATA			        0x2A
+
+#define EV_RECV_FROM_MODEM			0x42
+
+#define EV_NEW_SMS                  0x43
+
+#define EV_SMS_INFO                 0x44
+
+#define EV_SMS_DATA                 0x45
+
+#define EV_SMS_SEND_RESULT          0x46
+
+#define EV_CALL_MPTY_START			0x47
+
+#define EV_CALL_MPTY_STOP			0x48
+
+#define EV_GSM_COMMAND_STATUS		0x49
+
+#define EV_WATCHDOG_COUNT           0x60
+
+#define EV_CHANNEL_FAIL				0x30
+
+#define EV_REFERENCE_FAIL			0x31
+
+#define EV_INTERNAL_FAIL			0x32
+
+#define EV_HARDWARE_FAIL			0x33
+
+#define EV_LINK_STATUS				0x34
+
+#define EV_PHYSICAL_LINK_UP			0x35
+
+#define EV_PHYSICAL_LINK_DOWN		0x36
+
+#define EV_CLIENT_RECONNECT		0xF0
+
+#define EV_CLIENT_AUDIOLISTENER_TIMEOUT     0xF1
+
+#define EV_CLIENT_BUFFERED_AUDIOLISTENER_OVERFLOW   0xF2
+
+#define EV_REQUEST_DEVICE_SECURITY_KEY 0xF3
+
+#define EV_DISK_IS_FULL		0xF4
+
+
+#define CM_SEND_DTMF				0xD1
+
+#define CM_STOP_AUDIO 				0xD2
+
+#define CM_HARD_RESET				0xF0
+
+#define EV_VOIP_SEIZURE					0x40
+
+#define EV_SEIZURE					0x41
+
+#define EV_FAX_CHANNEL_FREE			0x50
+
+#define EV_FAX_FILE_SENT			0x51
+#define EV_FAX_FILE_FAIL			0x52
+#define EV_FAX_MESSAGE_CONFIRMATION 0x53
+#define EV_FAX_TX_TIMEOUT			0x54
+#define EV_FAX_PAGE_CONFIRMATION EV_FAX_MESSAGE_CONFIRMATION
+#define EV_FAX_REMOTE_INFO			0x55
+
+#endif
+
+   #define FC_REMOTE_FAIL			0x01
+   #define FC_LOCAL_FAIL			0x02
+ 
+   #define FC_REMOTE_LOCK			0x03
+  
+   #define FC_LINE_SIGNAL_FAIL		0x04
+   #define FC_ACOUSTIC_SIGNAL_FAIL	0x05
+
+enum KChannelFail
+{
+	kfcRemoteFail = FC_REMOTE_FAIL,
+	kfcLocalFail = FC_LOCAL_FAIL,
+	kfcRemoteLock = FC_REMOTE_LOCK,
+	kfcLineSignalFail = FC_LINE_SIGNAL_FAIL,
+	kfcAcousticSignalFail = FC_ACOUSTIC_SIGNAL_FAIL
+};
+
+   #define ER_INTERRUPT_CTRL		0x01
+   #define ER_COMMUNICATION_FAIL	0x02
+   #define ER_PROTOCOL_FAIL			0x03
+   #define ER_INTERNAL_BUFFER		0x04
+	#define ER_MONITOR_BUFFER		0x05
+	#define ER_INITIALIZATION		0x06
+	#define ER_INTERFACE_FAIL		0x07
+	#define ER_CLIENT_COMM_FAIL		0x08
+	#define ER_POLL_CTRL			0x09
+	#define ER_EVT_BUFFER_CTRL		0x0A
+
+	#define ER_INVALID_CONFIG_VALUE 0x0B
+
+	#define ER_INTERNAL_GENERIC_FAIL 0x0C
+
+enum KInternalFail
+{
+	kifInterruptCtrl = ER_INTERRUPT_CTRL,
+	kifCommunicationFail = ER_COMMUNICATION_FAIL,
+	kifProtocolFail = ER_PROTOCOL_FAIL,
+	kifInternalBuffer = ER_INTERNAL_BUFFER,
+	kifMonitorBuffer = ER_MONITOR_BUFFER,
+	kifInitialization = ER_INITIALIZATION,
+	kifInterfaceFail = ER_INTERFACE_FAIL,
+	kifClientCommFail = ER_CLIENT_COMM_FAIL
+};	
+
+   #define FS_CHANNEL_LOCKED		0x01
+   #define FS_INCOMING_CHANNEL		0x02
+   #define FS_CHANNEL_NOT_FREE		0x03
+   #define FS_DOUBLE_SEIZE			0x04
+   #define FS_LOCAL_CONGESTION		0x06
+   #define FS_NO_DIAL_TONE			0x07
+enum KSeizeFail
+{
+	ksfChannelLocked = FS_CHANNEL_LOCKED,
+	ksfIncomingChannel = FS_INCOMING_CHANNEL,
+	ksfChannelBusy = FS_CHANNEL_NOT_FREE,
+	ksfDoubleSeizure = FS_DOUBLE_SEIZE,
+	ksfCongestion = FS_LOCAL_CONGESTION,
+	ksfNoDialTone = FS_NO_DIAL_TONE
+};
+#if !defined KH100DEFS_H
+#define KH100DEFS_H
+
+#define CM_SEND_TO_CTBUS			0x90
+
+#define CM_RECV_FROM_CTBUS			0x91
+
+#define CM_SEND_RANGE_TO_CTBUS		0x92
+
+#define CM_SETUP_H100				0x93
+
+enum KH100ConfigIndex
+{
+	khciDeviceMode = 0,
+	khciMasterGenClock = 1,
+	khciCTNetRefEnable = 4,
+	khciSCbusEnable = 6,
+	khciHMVipEnable = 7,
+	khciMVip90Enable = 8,
+	khciCTbusDataEnable = 9,
+	khciCTbusFreq03_00 = 10,
+	khciCTbusFreq07_04 = 11,
+	khciCTbusFreq11_08 = 12,
+	khciCTbusFreq15_12 = 13,
+	khciMax = 14,
+	khciMasterDevId = 20,
+	khciSecMasterDevId = 21,
+	khciCtNetrefDevId = 22,
+    khciMaxH100ConfigIndex
+};	
+
+enum KMasterPLLClockReference
+{
+    h100_Ref_FreeRun = 0,
+    h100_Ref_holdover = 1,
+	h100_Automatic = 2,
+    h100_Ref_ctnetref = 7,
+    h100_Ref_link0 = 8,
+    h100_Ref_link1 = 9
+};
+enum KSlavePLLClockReference
+{
+    h100_PllLoc_ClkA = 0,
+    h100_PllLoc_ClkB = 1,
+    h100_PllLoc_SCBus = 2,
+    h100_PllLoc_MVIP90 = 3,
+    h100_PllLoc_Link0 = 4,
+    h100_PllLoc_Link1 = 5,
+    h100_PllLoc_Error = 6
+};
+
+#define H100_DEVICE_MODE				khciDeviceMode
+	enum KH100Mode
+	{
+		h100_Slave,
+		h100_Master,
+		h100_StandbyMaster,
+		h100_Diagnostic,
+		h100_NotConnected
+	};
+#define H100_MASTER_GEN_CLOCK			khciMasterGenClock
+	enum KH100SelectCtbusClock
+	{
+		h100_scClockA,
+		h100_scClockB
+	};
+
+#define H100_CT_NETREF_ENABLE			khciCTNetRefEnable
+	enum KH100CtNetref
+	{
+		h100_nrOff,
+		h100_nrEnable
+	};
+#define	H100_SCBUS_ENABLE				khciSCbusEnable
+	enum KH100ScbusEnable
+	{
+		h100_seOff,
+		h100_seOn2Mhz,
+		h100_seOn4Mhz,
+		h100_seOn8Mhz
+	};
+#define H100_HMVIP_ENABLE				khciHMVipEnable
+
+#define H100_MVIP90_ENABLE				khciMVip90Enable
+
+#define H100_CTBUS_DATA_ENABLE			khciCTbusDataEnable
+
+enum KH100Enable
+{
+	h100_On = 0x01,
+	h100_Off = 0x00
+};
+	
+#define H100_CTBUS_FREQ_03_00			khciCTbusFreq03_00
+#define H100_CTBUS_FREQ_07_04			khciCTbusFreq07_04
+#define H100_CTBUS_FREQ_11_08			khciCTbusFreq11_08
+#define H100_CTBUS_FREQ_15_12			khciCTbusFreq15_12
+
+enum KH100CtbusFreq
+{
+	h100_cf_2Mhz	=	0,
+	h100_cf_4Mhz	=	1,
+	h100_cf_8Mhz	=	2 
+};
+
+#endif
+
+#define CM_MIXER					0x60
+
+#define CM_CLEAR_MIXER				0x61
+
+#define CM_PLAY_FROM_FILE			0x62
+
+#define CM_RECORD_TO_FILE			0x63
+	
+#define CM_PLAY_FROM_STREAM			0x64 
+
+#define CM_INTERNAL_PLAY			0x65 
+
+#define CM_STOP_PLAY				0x66
+
+#define CM_STOP_RECORD				0x67
+
+#define CM_PAUSE_PLAY				0x68
+
+#define CM_PAUSE_RECORD				0x69
+
+#define CM_RESUME_PLAY				0x6A
+
+#define CM_RESUME_RECORD			0x6B
+
+#define CM_INCREASE_VOLUME			0x6C
+
+#define CM_DECREASE_VOLUME			0x6D
+
+#define CM_LISTEN					0x6E
+
+#define CM_STOP_LISTEN				0x6F
+
+#define CM_PREPARE_FOR_LISTEN		0x70
+
+#define CM_PLAY_SOUND_CARD			0x71
+
+#define CM_STOP_SOUND_CARD			0x72
+
+#define CM_MIXER_CTBUS				0x73
+
+#define CM_PLAY_FROM_STREAM_EX			0x74 
+
+#define CM_INTERNAL_PLAY_EX			0x75 
+
+#define CM_ENABLE_PLAYER_AGC		0x76
+
+#define CM_DISABLE_PLAYER_AGC		0x77
+
+#define CM_START_STREAM_BUFFER		0x78
+
+#define CM_ADD_STREAM_BUFFER		0x79
+
+#define CM_STOP_STREAM_BUFFER		0x7A
+
+#define CM_SEND_BEEP				0x7B
+
+#define CM_SEND_BEEP_CONF			0x7C
+
+#define CM_ADD_TO_CONF				0x7D
+
+#define CM_REMOVE_FROM_CONF			0x7E
+
+#define CM_RECORD_TO_FILE_EX		0x7F
+
+#define CM_SET_VOLUME				0xA0
+
+#define CM_START_CADENCE			0xA1
+
+#define CM_STOP_CADENCE				0xA2
+#if !defined KR2D_H
+#define KR2D_H
+
+#define CM_SET_LINE_CONDITION		0x80
+
+#define CM_SEND_LINE_CONDITION		0x81
+
+#define CM_SET_CALLER_CATEGORY		0x82
+      
+	
+#define CM_DIAL_MFC					0x83
+
+
+
+enum KSignGroupII_Brazil
+{
+	kg2BrOrdinary		        = 0x01,     
+	kg2BrPriority		        = 0x02,     
+	kg2BrMaintenance	        = 0x03,     
+	kg2BrLocalPayPhone	        = 0x04,     
+	kg2BrTrunkOperator	        = 0x05,     
+	kg2BrDataTrans	            = 0x06,     
+	kg2BrNonLocalPayPhone       = 0x07,     
+	kg2BrCollectCall	        = 0x08,     
+	kg2BrOrdinaryInter	        = 0x09,     
+	kg2BrTransfered		        = 0x0B,     
+};
+
+enum KSignGroupB_Brazil
+{
+	kgbBrLineFreeCharged		= 0x01,     
+	kgbBrBusy					= 0x02,     
+	kgbBrNumberChanged			= 0x03,     
+	kgbBrCongestion				= 0x04,     
+	kgbBrLineFreeNotCharged		= 0x05,     
+	kgbBrLineFreeChargedLPR		= 0x06,     
+	kgbBrInvalidNumber			= 0x07,     
+	kgbBrLineOutOfOrder			= 0x08,     
+	kgbBrNone					= 0xFF      
+};
+
+
+enum KSignGroupII_Argentina
+{
+	kg2ArOrdinary		        = 0x01,     
+	kg2ArPriority		        = 0x02,     
+	kg2ArMaintenance	        = 0x03,     
+	kg2ArLocalPayPhone	        = 0x04,     
+	kg2ArTrunkOperator	        = 0x05,     
+	kg2ArDataTrans	            = 0x06,     
+    kg2ArCPTP                   = 0x0B,     
+    kg2ArSpecialLine            = 0x0C,     
+    kg2ArMobileUser             = 0x0D,     
+    kg2ArPrivateRedLine         = 0x0E,     
+    kg2ArSpecialPayPhoneLine    = 0x0F,     
+};
+
+enum KSignGroupB_Argentina
+{
+	kgbArNumberChanged			= 0x02,     
+	kgbArBusy					= 0x03,     
+	kgbArCongestion				= 0x04,     
+	kgbArInvalidNumber			= 0x05,     
+	kgbArLineFreeCharged		= 0x06,     
+	kgbArLineFreeNotCharged		= 0x07,     
+	kgbArLineOutOfOrder			= 0x08,     
+	kgbArNone					= 0xFF      
+};
+
+
+enum KSignGroupII_Chile
+{
+    kg2ClOrdinary		        = 0x01,     
+	kg2ClPriority		        = 0x02,     
+	kg2ClMaintenance	        = 0x03,     
+	kg2ClTrunkOperator	        = 0x05,     
+	kg2ClDataTrans	            = 0x06,     
+    kg2ClUnidentifiedSubscriber = 0x0B,     
+};
+
+enum KSignGroupB_Chile
+{
+	kgbClNumberChanged			= 0x02,     
+	kgbClBusy					= 0x03,     
+	kgbClCongestion				= 0x04,     
+	kgbClInvalidNumber			= 0x05,     
+	kgbClLineFreeCharged		= 0x06,     
+	kgbClLineFreeNotCharged		= 0x07,     
+	kgbClLineOutOfOrder			= 0x08,     
+	kgbClNone					= 0xFF      
+};
+
+
+enum KSignGroupII_Mexico
+{
+	kg2MxTrunkOperator	        = 0x01,     
+	kg2MxOrdinary		        = 0x02,     
+	kg2MxMaintenance	        = 0x06,     
+};
+
+enum KSignGroupB_Mexico
+{
+	kgbMxLineFreeCharged		= 0x01,     
+	kgbMxBusy					= 0x02,     
+	kgbMxLineFreeNotCharged		= 0x05,     
+	kgbMxNone				    = 0xFF      
+};
+
+
+enum KSignGroupII_Uruguay
+{
+	kg2UyOrdinary		        = 0x01,     
+	kg2UyPriority		        = 0x02,     
+	kg2UyMaintenance	        = 0x03,     
+	kg2UyLocalPayPhone	        = 0x04,     
+	kg2UyTrunkOperator	        = 0x05,     
+	kg2UyDataTrans	            = 0x06,     
+    kg2UyInternSubscriber       = 0x07,     
+};
+
+enum KSignGroupB_Uruguay
+{
+	kgbUyNumberChanged			= 0x02,     
+	kgbUyBusy					= 0x03,     
+	kgbUyCongestion				= 0x04,     
+	kgbUyInvalidNumber			= 0x05,     
+	kgbUyLineFreeCharged		= 0x06,     
+	kgbUyLineFreeNotCharged		= 0x07,     
+	kgbUyLineOutOfOrder			= 0x08,     
+	kgbUyNone					= 0xFF      
+};
+
+
+enum KSignGroupII_Venezuela
+{
+	kg2VeOrdinary		        = 0x01,     
+	kg2VePriority		        = 0x02,     
+	kg2VeMaintenance	        = 0x03,     
+	kg2VeLocalPayPhone	        = 0x04,     
+	kg2VeTrunkOperator	        = 0x05,     
+	kg2VeDataTrans	            = 0x06,     
+    kg2VeNoTransferFacility     = 0x07,     
+};
+
+enum KSignGroupB_Venezuela
+{
+	kgbVeLineFreeChargedLPR		= 0x01,     
+	kgbVeNumberChanged			= 0x02,     
+	kgbVeBusy					= 0x03,     
+	kgbVeCongestion				= 0x04,     
+	kgbVeInformationTone		= 0x05,     
+	kgbVeLineFreeCharged		= 0x06,     
+	kgbVeLineFreeNotCharged		= 0x07,     
+    kgbVeLineBlocked            = 0x08,     
+    kgbVeIntercepted            = 0x09,     
+    kgbVeDataTrans              = 0x0A,     
+	kgbVeNone					= 0xFF      
+};
+
+
+
+
+
+enum KSignGroupB
+{
+	kgbLineFreeCharged			= 0x01,
+	kgbLineFreeNotCharged		= 0x05,
+	kgbLineFreeChargedLPR		= 0x06,
+	kgbBusy						= 0x02,
+	kgbNumberChanged			= 0x03,
+	kgbCongestion				= 0x04,
+	kgbInvalidNumber			= 0x07,
+	kgbLineOutOfOrder			= 0x08,
+	kgbNone						= 0xFF
+};
+#define STT_GB_LINEFREE_CHARGED				0x01
+#define STT_GB_LINEFREE_NOTCHARGED			0x05
+#define STT_GB_LINEFREE_CHARGED_LPR			0x06
+#define	STT_GB_BUSY							0x02
+#define STT_GB_NUMBER_CHANGED				0x03
+#define STT_GB_CONGESTION					0x04
+#define STT_GB_UNALLOCATED_NUMBER			0x07
+#define STT_GB_LINE_OUT_OF_ORDER			0x08
+#define STT_GB_NONE							0xFF
+
+enum KSignGroupII
+{
+	kg2Ordinary			= 0x01,
+	kg2Priority			= 0x02,
+	kg2Maintenance		= 0x03,
+	kg2LocalPayPhone	= 0x04,
+	kg2TrunkOperator	= 0x05,
+	kg2DataTrans		= 0x06,
+	kg2NonLocalPayPhone = 0x07,
+	kg2CollectCall		= 0x08,
+	kg2OrdinaryInter	= 0x09,
+	kg2Transfered		= 0x0B,
+};
+#define STT_GII_ORDINARY					0x01
+#define STT_GII_PRIORITY					0x02
+#define STT_GII_MAINTENANCE					0x03
+#define STT_GII_LOCAL_PAY_PHONE				0x04
+#define STT_GII_TRUNK_OPERATOR				0x05
+#define STT_GII_DATA_TRANS					0x06
+#define STT_GII_NON_LOCAL_PAY_PHONE			0x07		
+#define STT_GII_COLLECT_CALL				0x08
+#define STT_GII_ORDINARY_INTERNATIONAL		0x09
+#define STT_GII_TRANSFERED					0x0B
+#endif
+#ifndef _KISDN_H_
+#define _KISDN_H_
+#define KMAX_USER_USER_LEN              32
+#define KMAX_SUBADRESS_INFORMATION_LEN  20 
+
+enum KQ931Cause
+{
+    kq931cNone                    			= 0,
+    kq931cUnallocatedNumber       			= 1,
+    kq931cNoRouteToTransitNet     			= 2,
+    kq931cNoRouteToDest           			= 3,
+	kq931cSendSpecialInfoTone				= 4,
+	kq931cMisdialedTrunkPrefix				= 5,
+    kq931cChannelUnacceptable     			= 6,
+    kq931cCallAwarded             			= 7,
+	kq931cPreemption						= 8,
+	kq931cPreemptionCircuitReuse			= 9,
+	kq931cQoR_PortedNumber					= 14,
+    kq931cNormalCallClear         			= 16,
+    kq931cUserBusy                			= 17,
+    kq931cNoUserResponding        			= 18,
+    kq931cNoAnswerFromUser        			= 19,
+	kq931cSubscriberAbsent					= 20,
+    kq931cCallRejected            			= 21,
+    kq931cNumberChanged           			= 22,
+	kq931cRedirectionToNewDest				= 23,
+	kq931cCallRejectedFeatureDest			= 24,
+	kq931cExchangeRoutingError				= 25,
+    kq931cNonSelectedUserClear    			= 26,
+    kq931cDestinationOutOfOrder   			= 27,
+    kq931cInvalidNumberFormat     			= 28,
+    kq931cFacilityRejected        			= 29,
+    kq931cRespStatusEnquiry       			= 30,
+    kq931cNormalUnspecified       			= 31,
+    kq931cNoCircuitChannelAvail   			= 34,
+    kq931cNetworkOutOfOrder       			= 38,
+	kq931cPermanentFrameConnOutOfService	= 39,
+	kq931cPermanentFrameConnOperational		= 40,
+    kq931cTemporaryFailure          		= 41,
+    kq931cSwitchCongestion          		= 42,
+    kq931cAccessInfoDiscarded       		= 43,
+    kq931cRequestedChannelUnav      		= 44,
+	kq931cPrecedenceCallBlocked				= 46,
+    kq931cResourceUnavailable       		= 47,
+    kq931cQosUnavailable            		= 49,
+    kq931cReqFacilityNotSubsc       		= 50,
+	kq931cOutCallsBarredWithinCUG			= 53,
+	kq931cInCallsBarredWithinCUG			= 55,
+    kq931cBearerCapabNotAuthor      		= 57,
+    kq931cBearerCapabNotAvail       		= 58,
+	kq931cInconsistency						= 62,
+    kq931cServiceNotAvailable       		= 63,
+    kq931cBcNotImplemented          		= 65,
+    kq931cChannelTypeNotImplem      		= 66,
+    kq931cReqFacilityNotImplem      		= 69,
+    kq931cOnlyRestrictedBcAvail     		= 70,
+    kq931cServiceNotImplemented     		= 79,
+    kq931cInvalidCrv                		= 81,
+    kq931cChannelDoesNotExist       		= 82,
+    kq931cCallIdDoesNotExist        		= 83,
+    kq931cCallIdInUse               		= 84,
+    kq931cNoCallSuspended           		= 85,
+    kq931cCallIdCleared             		= 86,
+	kq931cUserNotMemberofCUG				= 87,
+    kq931cIncompatibleDestination   		= 88,
+    kq931cInvalidTransitNetSel      		= 91,
+    kq931cInvalidMessage            		= 95,
+    kq931cMissingMandatoryIe        		= 96,
+    kq931cMsgTypeNotImplemented     		= 97,
+    kq931cMsgIncompatWithState      		= 98,
+    kq931cIeNotImplemented          		= 99,
+    kq931cInvalidIe                 		= 100,
+    kq931cMsgIncompatWithState2     		= 101,
+    kq931cRecoveryOnTimerExpiry     		= 102,
+    kq931cProtocolError             		= 103,
+	kq931cMessageWithUnrecognizedParam		= 110,
+	kq931cProtocolErrorUnspecified			= 111,
+    kq931cInterworking              		= 127,
+    kq931cCallConnected             		= 128,
+    kq931cCallTimedOut              		= 129,
+    kq931cCallNotFound              		= 130,
+    kq931cCantReleaseCall           		= 131,
+    kq931cNetworkFailure            		= 132,
+    kq931cNetworkRestart            		= 133,
+    kq931cLastValidCause            		= kq931cNetworkRestart,
+};
+
+enum KQ931ProgressIndication
+{
+    kq931pTonesMaybeAvailable       = 1,
+    kq931pDestinationIsNonIsdn      = 2,
+    kq931pOriginationIsNonIsdn      = 3,
+    kq931pCallReturnedToIsdn        = 4,
+    kq931pTonesAvailable            = 8,
+};
+
+enum KQ931Hlc
+{
+    kq931hTelefony                  = 0x81,
+    k1931hFaxGroup23                = 0x84,
+    k1931hFaxGroup4                 = 0xa1,
+    kq931hTeletexF184               = 0xa4,
+    kq931hTeletexF220               = 0xa8,
+    kq931hTeletexf200               = 0xb1,
+    kq931hVideotex                  = 0xb2,
+    kq931hTelexF60                  = 0xb5,
+    kq931hMhs                       = 0xb8,
+    kq931hOsiApp                    = 0xc1,
+    kq931hMaintenance               = 0xde,
+    kq931hManagement                = 0xdf,
+};
+
+enum KQ931BearerCapability
+{
+    kq931bSpeech                    = 0x00,
+    kq931bUnrestrictedDigital       = 0x08,
+    kq931bAudio31kHz                = 0x10,
+    kq931bAudio7kHz                 = 0x11,
+    kq931bVideo                     = 0x18,
+};
+
+enum KQ931TypeOfNumber
+{
+    kq931tUnknownNumber             = 0x00,
+    kq931tInternationalNumber       = 0x10,
+    kq931tNationalNumber            = 0x20,
+    kq931tNetworkSpecificNumber     = 0x30,
+    kq931tSubscriberNumber          = 0x40,
+    kq931tAbbreviatedNumber         = 0x60,
+    kq931tReservedNumber            = 0x70,
+    kq931tDefaultNumber             = kq931tUnknownNumber,
+};
+
+enum KQ931NumberingPlan
+{
+    kq931pUnknownPlan               = 0x00,
+    kq931pIsdnPlan                  = 0x01,
+    kq931pDataPlan                  = 0x03,
+    kq931pTelexPlan                 = 0x04,
+    kq931pNationalPlan              = 0x08,
+    kq931pPrivatePlan               = 0x09,
+    kq931pReservedPlan              = 0x0F,
+    kq931pDefaultPlan               = kq931pUnknownPlan,
+};
+
+enum KQ931UserInfoProtocolDescriptor
+{
+    kq931uuUserSpecific             = 0x00,
+    kq931uuOSI_HighLayer            = 0x01,
+    kq931uuX244                     = 0x02,
+    kq931uuIA5_Chars                = 0x04,
+    kq931uuX208_X209                = 0x05,
+    kq931uuV120                     = 0x07,
+    kq931uuQ931_CallControl         = 0x08,
+    kq931uuNational                 = 0x40 
+};
+enum KQ931PresentationIndicator
+{
+	kq931piPresentationAllowed					= 0x00,
+	kq931piPresentationRestricted				= 0x01,
+	kq931piNumberNotAvailableDueToInterworking	= 0x02,
+};
+enum KQ931ScreeningIndicator
+{
+	kq931siUserProvidedNotScreened				= 0x00,
+	kq931siUserProvidedVerifiedAndPassed		= 0x01,
+	kq931siUserProvidedVerifiedAndFailed		= 0x02,
+	kq931siNetworkProvided						= 0x03,
+};
+enum KQ931TypeOfSubaddress
+{
+    kq931tsNSAP                                 = 0x00,
+    kq931tsUserSpecified                        = 0x01,
+};
+#endif 
+#ifndef KGSM_H
+#define KGSM_H
+
+enum KGsmCallCause
+{
+    kgccNone                      = 0,
+    kgccUnallocatedNumber         = 1,
+    kgccNoRouteToDest             = 3,
+    kgccChannelUnacceptable       = 6,
+    kgccOperatorDeterminedBarring = 8,
+    kgccNormalCallClear           = 16,
+    kgccUserBusy                  = 17,
+    kgccNoUserResponding          = 18,
+    kgccNoAnswerFromUser          = 19,
+    kgccCallRejected              = 21,
+    kgccNumberChanged             = 22,
+    kgccNonSelectedUserClear      = 26,
+    kgccDestinationOutOfOrder     = 27,
+    kgccInvalidNumberFormat       = 28,
+    kgccFacilityRejected          = 29,
+    kgccRespStatusEnquiry         = 30,
+    kgccNormalUnspecified         = 31,
+    kgccNoCircuitChannelAvail     = 34,
+    kgccNetworkOutOfOrder         = 38,
+    kgccTemporaryFailure          = 41,
+    kgccSwitchCongestion          = 42,
+    kgccAccessInfoDiscarded       = 43,
+    kgccRequestedChannelUnav      = 44,
+    kgccResourceUnavailable       = 47,
+    kgccQosUnavailable            = 49,
+    kgccReqFacilityNotSubsc       = 50,
+    kgccCallBarredWitchCUG        = 55,
+    kgccBearerCapabNotAuthor      = 57,
+    kgccBearerCapabNotAvail       = 58,
+    kgccServiceNotAvailable       = 63,
+    kgccBcNotImplemented          = 65,
+    kgccReqFacilityNotImplem      = 69,
+    kgccOnlyRestrictedBcAvail     = 70,
+    kgccServiceNotImplemented     = 79,
+    kgccInvalidCrv                = 81,
+    kgccUserNotMemberOfCUG        = 82,
+    kgccIncompatibleDestination   = 88,
+    kgccInvalidTransitNetSel      = 91,
+    kgccInvalidMessage            = 95,
+    kgccMissingMandatoryIe        = 96,
+    kgccMsgTypeNotImplemented     = 97,
+    kgccMsgIncompatWithState      = 98,
+    kgccIeNotImplemented          = 99,
+    kgccInvalidIe                 = 100,
+    kgccMsgIncompatWithState2     = 101,
+    kgccRecoveryOnTimerExpiry     = 102,
+    kgccProtocolError             = 111,
+    kgccInterworking              = 127,
+};
+
+enum KGsmMobileCause
+{
+    kgmcPhoneFailure                = 0,
+    kgmcNoConnectionToPhone         = 1,
+    kgmcPhoneAdaptorLinkReserved    = 2,
+    kgmcOperationNotAllowed         = 3,
+    kgmcOperationNotSupported       = 4,
+    kgmcPH_SIMPINRequired           = 5,
+    kgmcPH_FSIMPINRequired          = 6,
+    kgmcPH_FSIMPUKRequired          = 7,
+    kgmcSIMNotInserted              = 10,
+    kgmcSIMPINRequired              = 11,
+    kgmcSIMPUKRequired              = 12,
+    kgmcSIMFailure                  = 13,
+    kgmcSIMBusy                     = 14,
+    kgmcSIMWrong                    = 15,
+    kgmcIncorrectPassword           = 16,
+    kgmcSIMPIN2Required             = 17,
+    kgmcSIMPUK2Required             = 18,
+    kgmcMemoryFull                  = 20,
+    kgmcInvalidIndex                = 21,
+    kgmcNotFound                    = 22,
+    kgmcMemoryFailure               = 23,
+    kgmcTextStringTooLong           = 24,
+    kgmcInvalidCharInTextString     = 25,
+    kgmcDialStringTooLong           = 26,
+    kgmcInvalidCharInDialString     = 27,
+    kgmcNoNetworkService            = 30,  
+    kgmcNetworkTimeout              = 31,  
+    kgmcNetworkNotAllowed           = 32,
+    kgmcCommandAborted              = 33,
+    kgmcNumParamInsteadTextParam    = 34,
+    kgmcTextParamInsteadNumParam    = 35,
+    kgmcNumericParamOutOfBounds     = 36,
+    kgmcTextStringTooShort          = 37,
+    kgmcNetworkPINRequired          = 40,
+    kgmcNetworkPUKRequired          = 41,
+    kgmcNetworkSubsetPINRequired    = 42,
+    kgmcNetworkSubnetPUKRequired    = 43,
+    kgmcServiceProviderPINRequired  = 44,
+    kgmcServiceProviderPUKRequired  = 45,
+    kgmcCorporatePINRequired        = 46,
+    kgmcCorporatePUKRequired        = 47,
+    kgmcSIMServiceOptNotSupported   = 60,
+    kgmcUnknown                     = 100,
+    kgmcIllegalMS_N3                = 103,
+    kgmcIllegalME_N6                = 106,
+    kgmcGPRSServicesNotAllowed_N7   = 107,
+    kgmcPLMNNotAllowed_No11         = 111,
+    kgmcLocationAreaNotAllowed_N12  = 112,
+    kgmcRoamingNotAllowed_N13       = 113,
+    kgmcServiceOptNotSupported_N32  = 132,
+    kgmcReqServOptNotSubscribed_N33 = 133,
+    kgmcServOptTempOutOfOrder_N34   = 134,
+    kgmcLongContextActivation       = 147,
+    kgmcUnspecifiedGPRSError        = 148,
+    kgmcPDPAuthenticationFailure    = 149,
+    kgmcInvalidMobileClass          = 150,
+    kgmcGPRSDisconnectionTmrActive  = 151,
+    kgmcTooManyActiveCalls          = 256,
+    kgmcCallRejected                = 257,
+    kgmcUnansweredCallPending       = 258,
+    kgmcUnknownCallingError         = 259,
+    kgmcNoPhoneNumRecognized        = 260,
+    kgmcCallStateNotIdle            = 261,
+    kgmcCallInProgress              = 262,
+    kgmcDialStateError              = 263,
+    kgmcUnlockCodeRequired          = 264,
+    kgmcNetworkBusy                 = 265,
+    kgmcInvalidPhoneNumber          = 266,
+    kgmcNumberEntryAlreadyStarted   = 267,
+    kgmcCancelledByUser             = 268,
+    kgmcNumEntryCouldNotBeStarted   = 269,
+    kgmcDataLost                    = 280,
+    kgmcInvalidBessageBodyLength    = 281,
+    kgmcInactiveSocket              = 282,
+    kgmcSocketAlreadyOpen           = 283,
+    
+    kgmcSuccess                     = 0x7fff
+};
+
+enum KGsmSmsCause
+{
+    kgscNone                        = 0,
+    kgscUnassigned                  = 1,
+    kgscOperatorDeterminedBarring   = 8,
+    kgscCallBarred                  = 10,
+    kgscSMSTransferRejected         = 21,
+    kgscDestinationOutOfService     = 27,
+    kgscUnidentifiedSubscriber      = 28,
+    kgscFacilityRejected            = 29,
+    kgscUnknownSubscriber           = 30,
+    kgscNetworkOutOfOrder           = 38,
+    kgscTemporaryFailure            = 41,
+    kgscCongestion                  = 42,
+    kgscResourcesUnavailable        = 47,
+    kgscFacilityNotSubscribed       = 50,
+    kgscFacilityNotImplemented      = 69,
+    kgscInvalidSMSTransferRefValue  = 81,
+    kgscInvalidMessage              = 95,
+    kgscInvalidMandatoryInformation = 96,
+    kgscMessageTypeNonExistent      = 97,
+    kgscMsgNotCompatWithSMProtState = 98,
+    kgscInformationElementNonExiste = 99,
+    kgscProtocolError               = 111,
+    kgscInterworking                = 127,
+    kgscTelematicInterworkingNotSup = 128,
+    kgscSMSTypeZeroNotSupported     = 129,
+    kgscCannotReplaceSMS            = 130,
+    kgscUnspecifiedTPPIDError       = 143,
+    kgscAlphabetNotSupported        = 144,
+    kgscMessageClassNotSupported    = 145,
+    kgscUnspecifiedTPDCSError       = 159,
+    kgscCommandCannotBeActioned     = 160,
+    kgscCommandUnsupported          = 161,
+    kgscUnspecifiedTPCommandError   = 175,
+    kgscTPDUNotSupported            = 176,
+    kgscSCBusy                      = 192,
+    kgscNoSCSubscription            = 193,
+    kgscSCSystemFailure             = 194,
+    kgscInvalidSMEAddress           = 195,
+    kgscDestinationSMEBarred        = 196,
+    kgscSMRejectedDuplicateSM       = 197,
+    kgscTPVPFNotSupported           = 198,
+    kgscTPVPNotSupported            = 199,
+    kgscSIMSMSStorageFull           = 208,
+    kgscNoSMSStorageCapabilityInSIM = 209,
+    kgscErrorInMS                   = 210,
+    kgscMemoryCapacityExceeded      = 211,
+    kgscSIMDataDownloadError        = 213,
+    kgscUnspecifiedError            = 255,
+    kgscPhoneFailure                = 300,
+    kgscSmsServiceReserved          = 301,
+    kgscOperationNotAllowed         = 302,
+    kgscOperationNotSupported       = 303,
+    kgscInvalidPDUModeParameter     = 304,
+    kgscInvalidTextModeParameter    = 305,
+    kgscSIMNotInserted              = 310,
+    kgscSIMPINNecessary             = 311,
+    kgscPH_SIMPINNecessary          = 312,
+    kgscSIMFailure                  = 313,
+    kgscSIMBusy                     = 314,
+    kgscSIMWrong                    = 315,
+    kgscMemoryFailure               = 320,
+    kgscInvalidMemoryIndex          = 321,
+    kgscMemoryFull                  = 322,
+    kgscSMSCAddressUnknown          = 330,
+    kgscNoNetworkService            = 331,
+    kgscNetworkTimeout              = 332,
+    kgscUnknownError                = 500,
+    kgscNetworkBusy                 = 512,
+    kgscInvalidDestinationAddress   = 513,
+    kgscInvalidMessageBodyLength    = 514,
+    kgscPhoneIsNotInService         = 515,
+    kgscInvalidPreferredMemStorage  = 516,
+    kgscUserTerminated              = 517
+};
+
+enum KGsmRegistryStatus
+{
+	kgrsNotRegistered = 0x00,
+	kgrsRegistered    = 0x01,
+	kgrsSearching     = 0x02,
+	kgrsDenied        = 0x03,
+	kgrsUnknown       = 0x04,
+	kgrsRoaming       = 0x05,
+	kgrsInitializing  = 0xff,
+};
+enum KGsmCallStatus
+{
+	kgcstActive   = 0x0,
+	kgcstHeld     = 0x1,
+	kgcstDialing  = 0x2,
+	kgcstAlerting = 0x3,
+	kgcstIncoming = 0x4,
+	kgcstWaiting  = 0x5,
+	kgcstReleased = 0x6,
+};
+enum KGsmCallMode
+{
+	kgcmVoice   = 0x0,
+	kgcmData    = 0x1,
+	kgcmFax     = 0x2,
+	kgcmUnknown = 0x3
+};
+enum KGsmCallFlags
+{
+	kgcflMultiparty           = 0x01,
+	kgcflInternationalNumber  = 0x02,
+	kgcflMobileTerminatedCall = 0x04,
+};
+enum KGsmChannelFeatures
+{
+	kgcfMultiparty  = 0x01,
+	kgcfCallForward = 0x02, 
+};
+#endif
+#ifndef K3L_STATS_H
+#define K3L_STATS_H
+
+enum KGeneralCallStatIndex
+{
+    kcsiInbound,            
+    kcsiOutbound,           
+    kcsiOutCompleted,       
+    kcsiOutFailed,          
+    kcsiRemoteDisc,         
+    kcsiLocalDisc,          
+    kcsiLastGeneralCallStat
+};
+
+enum KFailedCallStatIndex
+{
+    kcsiFailedBusy = kcsiLastGeneralCallStat,
+    kcsiFailedNoAnswer,
+    kcsiFailedRejected,
+    kcsiFailedAddrChanged,
+    kcsiFailedInvalidAddr,
+    kcsiFailedOutOfService,
+    kcsiFailedCongestion,
+    kcsiFailedNetworkFailure,
+    kcsiFailedOther,
+    kcsiLastFailedCallStat
+};
+const uint32 kcsiMaxCallStats = kcsiLastFailedCallStat;
+typedef uint32 KStatIndex;
+
+#endif
+#ifndef k3lVersion_h
+#define k3lVersion_h
+#define k3lApiMajorVersion	2
+#define k3lApiMinorVersion	1
+#define k3lApiBuildVersion	0
+#endif
+#if !defined K3L_H
+#define K3L_H
+
+enum KDeviceType
+{
+	kdtE1           = 0,
+	kdtFXO          = 1,
+	kdtConf         = 2,
+	kdtPR           = 3,
+	kdtE1GW         = 4,
+	kdtFXOVoIP      = 5,
+	kdtE1IP	        = 6,
+	kdtE1Spx        = 7,
+    kdtGWIP         = 8,
+    kdtFXS          = 9,
+    kdtFXSSpx       = 10,
+    kdtGSM          = 11,
+    kdtGSMSpx       = 12,
+	kdtReserved1  	= 13,
+    kdtGSMUSB       = 14,
+    kdtGSMUSBSpx    = 15,
+    kdtE1FXSSpx 	= 16,
+	kdtDevTypeCount
+};
+enum KSignaling
+{
+	ksigInactive		= 0,
+	ksigR2Digital		= 1,
+	ksigContinuousEM	= 2,
+	ksigPulsedEM		= 3,
+	ksigUserR2Digital	= 4,
+	ksigAnalog			= 5,
+	ksigOpenCAS			= 6,
+	ksigOpenR2			= 7,
+	ksigSIP 			= 8,
+    ksigOpenCCS         = 9,
+    ksigPRI_EndPoint    = 10,
+    ksigAnalogTerminal  = 11,
+    ksigPRI_Network     = 12,
+    ksigPRI_Passive     = 13,
+	ksigLineSide  		= 14,
+	ksigCAS_EL7			= 15,
+    ksigGSM             = 16,
+	ksigE1LC			= 17,
+	ksigISUP			= 18,
+	ksigFax				= 19,
+};
+enum KE1DeviceModel
+{
+	kdmE1600	= 0,
+	kdmE1600E	= 1,
+	kdmE1600EX  = 2
+};
+enum KE1GWDeviceModel 
+{
+	kdmE1GW640   = 1,
+    kdmE1GW640EX = 2
+};
+enum KE1IPDeviceModel 
+{
+	kdmE1IP   = 1,
+    kdmE1IPEX = 2
+};
+enum KGWIPDeviceModel 
+{
+	kdmGWIP   = 1,
+	kdmGWIPEX = 2
+};
+enum KFXODeviceModel
+{
+	kdmFXO80    = 0,
+	kdmFXOHI    = 1,
+	kdmFXO160HI = 2,
+    kdmFXO240HI = 3
+};
+enum KFXOVoIPDeviceModel 
+{
+	kdmFXGW180 = kdmFXO80
+};
+enum KConfDeviceModel
+{
+	kdmConf240   = 0,
+	kdmConf120   = 1,
+	kdmConf240EX = 2,
+	kdmConf120EX = 3
+};
+enum KPRDeviceModel
+{
+	kdmPR300v1         = 0,
+    kdmPR300           = 1,
+	kdmPR300SpxBased   = 2,
+    kdmPR300EX         = 3
+};
+enum KFXSDeviceModel
+{
+    kdmFXS300   = 1,
+    kdmFXS300EX = 2
+};
+enum KFXSSpxDeviceModel
+{
+    kdmFXSSpx300      = 0,
+    kdmFXSSpx2E1Based = 1,
+    kdmFXSSpx300EX    = 2
+};
+enum KE1SpxDeviceModel
+{
+	kdmE1Spx    = 0,
+	kdm2E1Based = 1,
+    kdmE1SpxEX  = 2
+};
+enum KGSMDeviceModel
+{
+    kdmGSM      = 0,
+    kdmGSMEX    = 1
+};
+enum KGSMSpxDeviceModel
+{
+    kdmGSMSpx   = 0,
+    kdmGSMSpxEX = 1
+};
+enum KGSMUSBDeviceModel
+{
+    kdmGSMUSB      = 0
+};
+enum KGSMUSBSpxDeviceModel
+{
+    kdmGSMUSBSpx   = 0
+};
+enum KE1FXSDeviceModel
+{
+    kdmE1FXSSpx     = 0,
+    kdmE1FXSSpxEX   = 1
+};
+enum KSystemObject
+{
+	ksoLink       = 0x00,   
+	ksoLinkMon    = 0x20,   
+	ksoFirmware   = 0x80,   
+	ksoDevice     = 0x100,  
+	ksoAPI        = 0x150,  
+	ksoH100       = 0x200,  
+	ksoChannel	  = 0x1000,	
+	ksoGsmChannel = 0x2000, 
+};
+enum KFirmwareId
+{
+	kfiE1600A,				
+	kfiE1600B,				
+	kfiFXO80,				
+    kfiGSM40,               
+    kfiGSMUSB
+};
+enum KE1Status
+{
+	kesOk					= 0x00,		
+	kesSignalLost			= 0x01,		
+	kesNetworkAlarm			= 0x02,		
+	kesFrameSyncLost		= 0x04,		
+	kesMultiframeSyncLost	= 0x08,		
+	kesRemoteAlarm			= 0x10,		
+	kesHighErrorRate		= 0x20,		
+	kesUnknownAlarm			= 0x40,		
+	kesE1Error				= 0x80,		
+    kesNotInitialized       = 0xFF      
+};
+enum KE1ChannelStatus
+{
+	kecsFree			= 0x00,			
+	kecsBusy			= 0x01,			
+	kecsOutgoing		= 0x02,			
+	kecsIncoming		= 0x04,			
+	kecsLocked			= 0x06,			
+	kecsOutgoingLock	= 0x10,			
+	kecsLocalFail		= 0x20,			
+	kecsIncomingLock	= 0x40,			
+	kecsRemoteLock		= 0x80			
+};
+enum KVoIPChannelStatus
+{
+	kipcsFree			= kecsFree,		
+	kipcsOutgoingLock	= kecsOutgoingLock,
+	kipcsIncomingLock	= kecsIncomingLock
+};
+enum KFXOChannelStatus
+{
+	kfcsDisabled	= 0x00,		
+	kfcsEnabled		= 0x01		
+};
+enum KFXSChannelStatus
+{
+    kfxsOnHook,
+    kfxsOffHook,
+    kfxsRinging,
+    kfxsFail
+};
+enum KGsmChannelStatus
+{
+    kgsmIdle,
+    kgsmCallInProgress,
+    kgsmSMSInProgress,
+    kgsmModemError,
+    kgsmSIMCardError,
+    kgsmNetworkError,
+    kgsmNotReady
+};
+enum KCallStatus
+{
+	kcsFree		= 0x00,				
+	kcsIncoming = 0x01,				
+	kcsOutgoing = 0x02,				
+	kcsFail		= 0x04				
+};
+enum KCallStartInfo
+{
+    kcsiHumanAnswer,
+    kcsiAnsweringMachine,
+    kcsiCellPhoneMessageBox,
+    kcsiUnknown,
+    kcsiCarrierMessage
+};
+enum KChannelFeatures
+{
+	kcfDtmfSuppression	= 0x0001,
+	kcfCallProgress		= 0x0002,
+	kcfPulseDetection	= 0x0004,
+	kcfAudioNotification= 0x0008,
+	kcfEchoCanceller	= 0x0010,
+	kcfAutoGainControl	= 0x0020,
+	kcfHighImpEvents	= 0x0080,
+    kcfCallAnswerInfo   = 0x0100,
+    kcfOutputVolume     = 0x0200,
+    kcfPlayerAGC        = 0x0400
+};
+enum KMixerSource
+{
+	kmsChannel,
+	kmsPlay,
+	kmsGenerator,
+	kmsCTbus,
+    kmsNoDelayChannel
+};
+struct KMixerCommand
+{
+    int32 Track;
+    int32 Source;        
+    int32 SourceIndex;
+};
+struct KPlayFromStreamCommand
+{
+	void *Buffer;
+	uint32 BufferSize;
+	int32 CodecIndex;
+};
+struct KBufferParam
+{
+	void *Buffer;
+	uint32 BufferSize;
+};
+enum KMixerTone
+{
+	kmtSilence	= 0x00,	
+	kmtDial		= 0x01, 
+	kmtBusy		= 0x02, 
+	kmtFax		= 0x03, 
+	kmtVoice	= 0x04, 
+	kmtEndOf425 = 0x05,	
+    kmtCollect  = 0x06, 
+    kmtEndOfDtmf= 0x07, 
+};
+struct K3L_CHANNEL_STATUS
+{
+ 	KCallStatus CallStatus;
+	KMixerTone AudioStatus;
+	int32 AddInfo;			
+	int32 EnabledFeatures;	
+};
+struct K3L_GSM_CALL_STATUS
+{
+	KGsmCallStatus Status;
+	KGsmCallMode Mode;
+	char Number[ KMAX_DIAL_NUMBER ];
+	int32 Flags; 
+};
+struct K3L_GSM_CHANNEL_STATUS
+{
+	uint8 SignalStrength; 
+	uint8 ErrorRate;      
+	KGsmRegistryStatus RegistryStatus;
+	char OperName[ KMAX_GSM_OPER_NAME ];
+	K3L_GSM_CALL_STATUS CallStatus[ KMAX_GSM_CALLS ];
+	int32 UnreadSmsCount;  
+	int32 EnabledFeatures; 
+    char IMEI[ KMAX_GSM_IMEI_SIZE ];
+    unsigned char SIM; 
+    unsigned char Reserved[15]; 
+};
+struct K3L_LINK_STATUS
+{
+	int16 E1; 
+	byte Channels[ KMAX_E1_CHANNELS ];	
+};
+enum KPllErrors
+{
+	kpeClockAError    = 0x01,
+	kpeClockBError    = 0x02,
+	kpeSCbusError     = 0x04,
+	kpeMVIPError	  = 0x08,
+	kpeMasterPllError = 0x10,
+	kpeModeError      = 0x20,
+	kpeLocalRefError  = 0x40,
+	kpeInternalError  = 0x80
+};
+struct K3L_H100_STATUS
+{
+	int32 Mode;
+	int32 MasterClock;
+	int32 Enable;
+	int32 Reference;
+	int32 SCbus;
+	int32 HMVIP;
+	int32 MVIP90;
+	int32 CT_NETREF;
+	int32 PllLocalRef;
+	int32 PllErrors;		
+};
+enum KEchoLocation
+{
+	kelNetwork	= 0x0,
+	kelCtBus	= 0x1
+};
+enum KCodecIndex
+{
+	kci8kHzALAW	= 0x00,
+	kci8kHzPCM	= 0x01,  
+	kci11kHzPCM	= 0x02,  
+	kci8kHzGSM	= 0x03, 
+	kci8kHzADPCM= 0x04, 
+	kci8kHzULAW	= 0x05,
+	kciLastCodecEntryMark
+};
+enum KEchoCancellerConfig
+{
+    keccNotPresent,
+    keccOneSingleBank,
+    keccOneDoubleBank,
+    keccTwoSingleBank,
+    keccTwoDoubleBank,
+    keccFail
+};
+struct K3L_DEVICE_CONFIG
+{
+	int32 LinkCount;
+	int32 ChannelCount;
+	int32 EnabledChannelCount;
+	int32 MixerCount;
+	int32 MixerCapacity;
+	int32 WorkStatus;
+	int32 DeviceModel;		
+	int32 H100_Mode;		
+	int32 PciBus;
+	int32 PciSlot;
+	int32 PlayerCount;
+	int32 VoIPChannelCount;
+    int32 CTbusCount;
+    KEchoCancellerConfig EchoConfig;
+    KEchoLocation EchoLocation;
+	sbyte SerialNumber[ KMAX_SERIAL_NUMBER ];
+};
+
+typedef K3L_DEVICE_CONFIG K3L_E1_DEVICE_CONFIG;
+typedef K3L_DEVICE_CONFIG K3L_FX_DEVICE_CONFIG;
+struct K3L_API_CONFIG
+{
+	int32 MajorVersion;
+	int32 MinorVersion;
+	int32 BuildVersion;
+    int32 SvnRevision;
+	int32 RawCmdLogging;
+	int32 VpdVersionNeeded;
+	sbyte StrVersion[ KMAX_STR_VERSION ];
+};
+struct K3L_LINK_CONFIG
+{
+	KSignaling Signaling;
+	int32 IncomingDigitsRequest;
+	int32 IdentificationRequestPos;
+	int32 ChannelCount;
+	int32 ReceivingClock;
+	sbyte NumberA[ KMAX_DIAL_NUMBER + 1 + 3 ]; 
+};
+struct K3L_CHANNEL_CONFIG
+{
+	KSignaling Signaling;
+    int32 AutoEnableFeatures;   
+    int32 CapableFeatures;      
+};
+struct K3L_E1600A_FW_CONFIG
+{
+	int32 MfcExchangersCount;
+	int32 MonitorBufferSize;
+	sbyte FwVersion[ KMAX_STR_VERSION ];
+	sbyte DspVersion[ KMAX_DSP_NAME ];
+};
+struct K3L_E1600B_FW_CONFIG
+{
+	int32 AudioBufferSize;
+	int32 FilterCount;
+	int32 MixerCount;
+	int32 MixerCapacity;
+	sbyte FwVersion[ KMAX_STR_VERSION ];
+	sbyte DspVersion[ KMAX_DSP_NAME ];
+};
+typedef K3L_E1600B_FW_CONFIG K3L_GSM40_FW_CONFIG;
+typedef K3L_E1600B_FW_CONFIG K3L_FXO80_FW_CONFIG;
+typedef K3L_E1600B_FW_CONFIG K3L_GSMUSB_FW_CONFIG;
+struct K3L_COMMAND
+{
+	int32 Object;			
+	int32 Cmd;				
+	byte *Params;			
+};
+
+enum KEventObjectId
+{
+	koiDevice		= 0x00,
+	koiChannel		= 0x01,
+	koiPlayer		= 0x02,
+	koiLink			= 0x03,
+    koiSystem       = 0x04
+};
+
+struct K3L_EVENT
+{
+	int32 Code;				
+	int32 AddInfo;			
+	int32 DeviceId;			
+	int32 ObjectInfo;		
+	void *Params;			
+	int32 ParamSize;		
+	int32 ObjectId;			
+};
+struct KIncomingSeizeParams
+{
+	sbyte NumberB[ KMAX_DIAL_NUMBER + 1 ];
+	sbyte NumberA[ KMAX_DIAL_NUMBER + 1 ];
+	sbyte Padding[2];  
+};
+struct KCtbusCommand
+{
+	int32 Stream;
+	int32 TimeSlot;
+	int32 Enable;
+};
+struct KUserInformation
+{
+    int32 ProtocolDescriptor;
+    int32 UserInfoLength;
+    byte  UserInfo[ KMAX_USER_USER_LEN ];
+};
+struct KISDNSubaddressInformation
+{
+    KQ931TypeOfSubaddress TypeOfSubaddress;
+    bool  OddNumberOfSignals;
+    int32 InformationLength;
+    byte  Information[ KMAX_SUBADRESS_INFORMATION_LEN ];
+};
+struct KISDNSubaddresses
+{
+    KISDNSubaddressInformation Called;
+    KISDNSubaddressInformation Calling;
+};
+enum KCTTransferResult
+{
+    TransferByJoin          = 0,
+    TransferByRerouteing    = 1
+};
+enum KLinkErrorCounter
+{
+	klecChangesToLock		=  0,
+	klecLostOfSignal		=  1,
+	klecAlarmNotification   =  2,
+	klecLostOfFrame         =  3,
+	klecLostOfMultiframe    =  4,
+	klecRemoteAlarm			=  5,
+    klecSlipAlarm           =  6,
+	klecUnknowAlarm			=  klecSlipAlarm,
+	klecPRBS				=  7,
+	klecWrogrBits			=  8,
+	klecJitterVariation		=  9,
+	klecFramesWithoutSync	= 10,
+	klecMultiframeSignal	= 11,
+	klecFrameError			= 12,
+	klecBipolarViolation	= 13,
+	klecCRC4				= 14,
+	klecCount				= 15
+};
+struct K3L_LINK_ERROR_COUNTER
+{
+	int32 ErrorCounters[ klecCount ];
+};
+struct KSipData
+{
+    int32 DataLength;
+    byte  Data[ KMAX_SIP_DATA ];
+};
+
+enum KLibParams
+{
+	klpDebugFirmware,           
+    klpResetFwOnStartup,		
+    klpResetFwOnShutdown,       
+    klpSeizureEventCompat,      
+    klpDisableTDMBufferWarnings,
+    klpDisableInternalVoIP,     
+    klpLogCallControl,          
+    klpDoNotLogApiInterface,    
+	klpMaxParams
+};
+
+enum KFaxChannelStatus
+{
+	kfaxcsFree,
+	kfaxcsWaitingForFaxSignal,
+	kfaxcsSendingFax,
+	kfaxcsReceivingFax,
+	kfaxcsFail
+};
+enum KFaxResult
+{
+	kfaxrEndOfTransmission,
+	kfaxrStoppedByCommand,
+	kfaxrProtocolTimeout,
+	kfaxrProtocolError,
+	kfaxrRemoteDisconnection,
+	kfaxrFileError,
+	kfaxrUnknown,
+    kfaxrEndOfReception,
+	kfaxrCompatibilityError,
+	kfaxrQualityError,
+	kfaxrChannelReleased
+};
+enum KFaxFileErrorCause
+{
+	kfaxfecTransmissionStopped,
+	kfaxfecTransmissionError,
+	kfaxfecListCleared,
+	kfaxfecCouldNotOpen,	
+	kfaxfecInvalidHeader,
+	kfaxfecDataNotFound,
+	kfaxfecInvalidHeight,
+	kfaxfecUnsupportedWidth,
+	kfaxfecUnsupportedCompression,
+	kfaxfecUnsupportedRowsPerStrip,
+	kfaxfecUnknown
+};
+
+typedef stt_code ( Kstdcall K3L_CALLBACK )();
+typedef stt_code ( Kstdcall K3L_MONITOR_CALLBACK )( byte *, byte );
+typedef stt_code ( Kstdcall K3L_EVENT_CALLBACK )( int32 Object, K3L_EVENT * );
+typedef stt_code ( Kstdcall *K3L_THREAD_CALLBACK )( void * );
+typedef void	 ( Kstdcall K3L_AUDIO_CALLBACK )( int32 DevId, int32 Channel, byte *Buffer, int32 Size );
+#if __GNUC__ >= 4
+#pragma GCC visibility push(default)
+#endif
+extern "C"
+{
+sbyte *Kstdcall k3lStart( int32 Major, int32 Minor, int32 Build );
+void Kstdcall k3lStop();
+void Kstdcall k3lRegisterEventHandler( K3L_EVENT_CALLBACK *Function );
+void Kstdcall k3lRegisterAudioListener( K3L_AUDIO_CALLBACK *Player, K3L_AUDIO_CALLBACK *Recorder );
+int32 Kstdcall k3lSendCommand( int32 DeviceId, K3L_COMMAND *Cmd );
+int32 Kstdcall k3lSendRawCommand( int32 DeviceId, int32 IntfId, void *Command, int32 CmdSize );
+int32 Kstdcall k3lRegisterMonitor( K3L_MONITOR_CALLBACK *EventMonitor, K3L_MONITOR_CALLBACK *CommandMonitor, K3L_MONITOR_CALLBACK *BufferMonitor );
+int32 Kstdcall k3lGetDeviceConfig( int32 DeviceId, int32 Object, void *Data, int32 DataSize );
+int32 Kstdcall k3lGetDeviceStatus( int32 DeviceId, int32 Object, void *Data, int32 DataSize );
+int32 Kstdcall k3lGetDeviceCount();
+int32 Kstdcall k3lGetDeviceType( int32 DeviceId );
+int32 Kstdcall k3lGetEventParam( K3L_EVENT *Evt, const sbyte *Name, sbyte *Buffer, int32 BufferSize );
+int32 Kstdcall k3lSetGlobalParam( int32 ParamIndex, int32 ParamValue );
+int32 Kstdcall k3lGetChannelStats( int32 DevId, int32 Channel, KStatIndex si, uint32 *StatData );
+}
+#if __GNUC__ >= 4
+#pragma GCC visibility pop
+#endif
+#endif
+
+
+enum KISDNDebugFlag
+{
+    kidfQ931                        = 0x01,
+    kidfLAPD                        = 0x02,
+    kidfSystem                      = 0x04,
+    kidfInvalid                     = 0x08,
+};
+
+#define CM_VOIP_START_DEBUG      0x20
+#define CM_VOIP_STOP_DEBUG       0x21
+#define CM_VOIP_DUMP_STAT        0x22
+
+#define CM_ISDN_DEBUG            0x24
+
+#define CM_PING     0x123456
+#define EV_PONG     0x654321
+
+#define CM_LOG_UPDATE            0x100 
+#define EV_LOG_UPDATE            0x100 
+
+#endif /* _GENERATED_K3L_H_ */
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt.h
new file mode 100644
index 0000000000..bed6e1e08e
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/khomp_pvt.h
@@ -0,0 +1,1282 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _KHOMP_PVT_H_
+#define _KHOMP_PVT_H_
+
+#include <timer.hpp>
+#include "globals.h"
+#include "frame.h"
+#include "opt.h"
+#include "logger.h"
+#include "defs.h"
+
+/*!
+ \brief Callback generated from K3L API for every new event on the board.
+ \param[in] obj Object ID (could be a channel or a board, depends on device type) which generated the event.
+ \param[in] e The event itself.
+ \return ksSuccess if the event was treated
+ \see K3L_EVENT Event specification
+ */
+extern "C" int32 Kstdcall khompEventCallback (int32, K3L_EVENT *);
+
+/*!
+ \brief Callback generated from K3L API everytime audio is available on the board.
+ @param[in] deviceid Board on which we get the event
+ @param[in] objectid The channel we are getting the audio from
+ @param[out] read_buffer The audio buffer itself (RAW)
+ @param[in] read_size The buffer size, meaning the amount of data to be read
+ \return ksSuccess if the event was treated
+ */
+extern "C" void Kstdcall khompAudioListener (int32, int32, byte *, int32);
+
+/******************************************************************************/
+/********************************* Board **************************************/
+/******************************************************************************/
+struct Board
+{
+    /* Timers */
+    struct KhompPvt;
+    typedef KhompPvt *     ChanTimerData;
+    typedef                void (ChanTimerFunc)(ChanTimerData);
+    typedef TimerTemplate < ChanTimerFunc, ChanTimerData > ChanTimer;
+
+/******************************************************************************/
+/******************************** Channel *************************************/
+struct KhompPvt
+{
+    typedef SimpleNonBlockLock<25,100>      ChanLockType;
+
+    typedef enum
+    {
+        CI_MESSAGE_BOX        = 0x01,
+        CI_HUMAN_ANSWER       = 0x02,
+        CI_ANSWERING_MACHINE  = 0x04,
+        CI_CARRIER_MESSAGE    = 0x08,
+        CI_UNKNOWN            = 0x10,
+        CI_FAX                = 0x20,
+    }
+    CallInfoType;
+    
+    struct InitFailure {};
+
+    struct InvalidSwitchChannel
+    {
+        typedef enum { NULL_SWITCH_CHANNEL, NULL_SWITCH_SESSION_PASSED, NULL_SWITCH_VALUE, FAILED } FailType;
+
+        InvalidSwitchChannel(FailType fail, std::string msg)
+            : _fail(fail),_msg(msg) {};
+
+        std::string _msg;
+        FailType _fail;
+    };
+
+    typedef enum
+    {
+        PLAY_NONE = 0,
+        PLAY_VM_TONE,
+        PLAY_PBX_TONE,
+        PLAY_PUB_TONE,
+        PLAY_RINGBACK,
+        PLAY_FASTBUSY,
+    }
+    CadencesType;
+
+    typedef enum
+    {
+        INDICA_NONE = 0,
+        INDICA_RING,
+        INDICA_BUSY,
+        INDICA_FAST_BUSY,
+    }
+    IndicationType;
+    
+    typedef enum
+    {
+        CLN_HARD,
+        CLN_SOFT,
+        CLN_FAIL,
+    }
+    CleanupType;
+
+/********************************** Call **************************************/
+    struct Call
+    {
+        struct CallStatistics : public Statistics
+        {
+            CallStatistics(Call *call):
+                _call(call),
+                _total_time_incoming(0),
+                _total_time_outgoing(0),
+                _total_idle_time(0),
+                _channel_fails(0)
+            {
+                time(&_base_idle_time);            
+                time(&_base_time);            
+            }
+
+            void idle()
+            {
+                if (_call->_flags.check(Kflags::IS_INCOMING) || 
+                    _call->_flags.check(Kflags::IS_OUTGOING) ||
+                    _call->_indication == INDICA_RING ||
+                    _call->_indication == INDICA_BUSY)
+                {   
+                    return;
+                }   
+
+                time_t tmp;
+                time (&tmp);
+
+                _total_idle_time += (tmp - _base_idle_time);
+                time (&_base_idle_time);
+            }
+
+            void incrementNewCall()
+            {
+                time (&_base_time);
+            }
+
+            void incrementHangup()
+            {
+                time_t tmp;
+                time (&tmp);
+
+                if (_call->_flags.check(Kflags::IS_OUTGOING))
+                {   
+                    _total_time_outgoing += (tmp - _base_time);
+                    time (&_base_time);
+                }   
+                else if (_call->_flags.check(Kflags::IS_INCOMING))
+                {   
+                    _total_time_incoming += (tmp - _base_time);
+                    time (&_base_time);
+                }   
+
+                time(&_base_idle_time);
+            }
+
+            void incrementChannelFail()
+            {
+                _channel_fails++;
+            }
+
+            std::string getDetailed() 
+            {
+                /* buffer our data to return at the end */
+                std::string strBuffer;
+
+                /* very very important yet! */
+                idle();
+
+                std::string str_incoming_time = timeToString(_total_time_incoming);
+                std::string str_outgoing_time = timeToString(_total_time_outgoing);
+                std::string str_idle_time     = timeToString(_total_idle_time);
+
+                strBuffer.append(STG(FMT("Total Incoming Time: \t%s\n") % str_incoming_time));
+                strBuffer.append(STG(FMT("Total Outgoing Time: \t%s\n") % str_outgoing_time));
+                strBuffer.append(STG(FMT("Total Idle Time: \t%s\n") % str_idle_time));
+                strBuffer.append(STG(FMT("Number of channel fails: \t%d\n") % _channel_fails));                
+
+                return strBuffer;
+            }
+
+            void clear()
+            {   
+                time(&_base_time);
+                time(&_base_idle_time);
+
+                _total_idle_time = 0;
+                _channel_fails = 0;
+
+                _total_time_incoming = 0;
+                _total_time_outgoing = 0;
+            }
+
+            time_t _base_time;
+            time_t _total_time_incoming;
+            time_t _total_time_outgoing;
+            time_t _total_idle_time;
+            time_t _base_idle_time;     /* base time for idle time refreshing */
+            unsigned int _channel_fails;/* number of channel fails*/
+
+        protected:        
+            Call *_call;  /* associate to call, useful */
+        };
+
+        Call() 
+        {
+            clear(); 
+            _call_statistics = new CallStatistics(this);
+        }
+
+        virtual ~Call() { delete _call_statistics; }
+
+        CallStatistics * statistics() { return _call_statistics; };
+
+        virtual bool process(std::string name, std::string value = "")
+        {
+            if (name == "pre_answer")
+            {
+                _pre_answer = true;
+            }
+            else if (name == "orig")
+            {
+                DBG(FUNC, FMT("orig addr adjusted (%s).") % value.c_str());
+                _orig_addr = value;
+            }
+            else if (name == "dest")
+            {
+                _dest_addr = value;
+            }
+
+            else if (name == "input_volume" || name == "output_volume")
+            {
+                try
+                {
+                    //std::string type((name == "input_volume")?"input":"output");
+
+                    int i = Strings::tolong(value);
+    
+                    if (i < -10 || i > 10)
+                    {
+                        LOG(ERROR, FMT("Could not set '%s': '%s' is not a valid number between -10 and 10.") % name % value);
+                    }
+                    else
+                    {
+                        DBG(FUNC, FMT("Changing '%s' volume to '%s'.") % name % value);
+                        if(name == "input_volume")
+                            _input_volume = i;
+                        else
+                            _output_volume = i;
+                    }
+                }
+                catch (Strings::invalid_value & e)
+                {
+                    LOG(ERROR, D("invalid numeric value: %s") % e.value());
+                }
+            }
+
+            else
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        virtual bool clear()
+        {
+
+            _orig_addr.clear();
+            _dest_addr.clear();
+            _incoming_context.clear();
+            _queued_digits_buffer.clear();
+            _pre_answer = false;
+            _is_progress_sent = false;
+            _collect_call = false;
+            _hangup_cause = 0;
+            _cleanup_upon_hangup = false;
+            _input_volume = 999;
+            _output_volume = 999;
+
+            _var_dtmf_state = T_UNKNOWN;
+            _var_echo_state = T_UNKNOWN;
+            _var_gain_state = T_UNKNOWN;            
+            
+            _flags.clearAll();
+
+            _cadence = PLAY_NONE;
+            _indication = INDICA_NONE;
+
+            return true;
+        }
+
+        /* used while answering calls */
+        std::string _orig_addr;
+        std::string _dest_addr;
+
+        std::string _incoming_context;
+
+        std::string _queued_digits_buffer;
+
+        /* should freeswitch answer before connect event?  */
+        bool _pre_answer;
+
+        bool _is_progress_sent;
+
+        /* is a collect call? */
+        bool _collect_call;
+
+        int _hangup_cause;
+
+        bool _cleanup_upon_hangup;
+
+        int _input_volume;
+        int _output_volume;
+
+        TriState _var_dtmf_state;
+        TriState _var_echo_state;
+        TriState _var_gain_state;        
+
+        Kflags _flags;
+
+        CadencesType _cadence;
+        IndicationType _indication;
+        
+        ChanTimer::Index _idx_co_ring;
+        ChanTimer::Index _idx_pbx_ring;
+
+        CallStatistics *_call_statistics;
+    };
+/******************************************************************************/
+public:
+
+    /* KhompPvt constructor */
+    KhompPvt(K3LAPI::target & target);
+
+    /* KhompPvt destructor */
+    virtual ~KhompPvt()
+    {
+        delete _pvt_statistics;
+        _session = NULL;
+    }
+   
+    struct PvtStatistics : public Statistics
+    {
+        PvtStatistics(KhompPvt * pvt):
+            _pvt(pvt) {}
+
+        std::string getDetailedRates();
+        std::string getDetailed();
+        std::string getRow();
+
+        void clear()
+        {
+            _pvt->call()->statistics()->clear();
+        }
+        
+        KhompPvt * _pvt;
+    };
+
+    /* Virtual Methods */
+
+    /*!
+     \defgroup KhompEvents
+                Callbacks that boards can implement to produce the expected
+                particular behaviour. Refer to Khomp documentation for a
+                detailed description of each method.
+     */
+    /*@{*/
+    virtual bool onChannelRelease(K3L_EVENT *);
+    virtual bool onNewCall(K3L_EVENT *);
+    virtual bool onCallSuccess(K3L_EVENT *);
+    virtual bool onCallFail(K3L_EVENT *);
+    virtual bool onConnect(K3L_EVENT *);
+    virtual bool onDisconnect(K3L_EVENT *);
+    virtual bool onAudioStatus(K3L_EVENT *);
+    virtual bool onCollectCall(K3L_EVENT *);
+    virtual bool onSeizureStart(K3L_EVENT *);
+    virtual bool onDtmfDetected(K3L_EVENT *);
+    virtual bool onNoAnswer(K3L_EVENT *);
+    virtual bool onDtmfSendFinish(K3L_EVENT *);
+    virtual bool onEvUntreated(K3L_EVENT *);
+    virtual bool eventHandler(K3L_EVENT *);
+    /*@}*/
+    
+    virtual bool doChannelAnswer(CommandRequest &);
+    virtual bool doChannelHangup(CommandRequest &);
+    bool commandHandler(CommandRequest &);
+    
+    virtual int makeCall(std::string params = "");
+    virtual bool setupConnection();
+
+    virtual int causeFromCallFail(int fail)  { return SWITCH_CAUSE_USER_BUSY; };
+    virtual int callFailFromCause(int cause) { return -1; };
+    virtual void reportFailToReceive(int fail_code) 
+    { 
+        call()->_indication = INDICA_FAST_BUSY; 
+    }
+    virtual bool setCollectCall();
+
+    virtual bool indicateBusyUnlocked(int cause, bool sent_signaling = false);
+
+    virtual bool cleanup(CleanupType type = CLN_HARD);
+
+    virtual RingbackDefs::RingbackStType sendRingBackStatus(int rb_value = RingbackDefs::RB_SEND_DEFAULT) 
+    { 
+        return RingbackDefs::RBST_UNSUPPORTED; 
+    }
+
+    virtual bool sendPreAudio(int rb_value = RingbackDefs::RB_SEND_NOTHING) 
+    { 
+        if (rb_value != RingbackDefs::RB_SEND_NOTHING)
+        {
+            if(sendRingBackStatus(rb_value) == RingbackDefs::RBST_FAILURE)
+                return false;
+        }
+
+        return true;
+    }
+    
+    virtual bool isOK(void) { return false; }
+    virtual bool isPhysicalFree() { return false; }
+    virtual bool isFree(bool just_phy = false);
+
+    virtual bool hasNumberDial() { return true; }
+
+    virtual void getSpecialVariables()
+    {
+        try
+        {
+            const char * str_sup = getFSChannelVar("KDTMFSuppression");
+            const char * str_agc = getFSChannelVar("KAutoGainControl");
+            const char * str_eco = getFSChannelVar("KEchoCanceller");
+
+            call()->_var_dtmf_state = (str_sup ? ((!SAFE_strcasecmp(str_sup, "true") || !SAFE_strcasecmp(str_sup, "on"))? T_TRUE : T_FALSE) : T_UNKNOWN);
+            call()->_var_echo_state = (str_eco ? (!SAFE_strcasecmp(str_eco, "true") ? T_TRUE : T_FALSE) : T_UNKNOWN);
+            call()->_var_gain_state = (str_agc ? (!SAFE_strcasecmp(str_agc, "true") ? T_TRUE : T_FALSE) : T_UNKNOWN);
+        }
+        catch(Board::KhompPvt::InvalidSwitchChannel & err)
+        {
+            LOG(ERROR, PVT_FMT(_target, "%s") % err._msg.c_str());
+        }
+
+        try
+        {
+            char * volume = (char*) getFSChannelVar("KSetVolume");
+            
+            if(!volume)
+            {
+                return;
+            }
+
+            std::string datastr(volume);
+
+            Strings::trim(datastr);
+
+            Strings::vector_type params;
+            Strings::tokenize(datastr, params, "|,", 2);
+
+            int inpvol = INT_MAX;
+            int outvol = INT_MAX;
+
+            /**/ if (params.size() == 1)
+            {    
+                int vol = (params[0] != "none" ? Strings::tolong(params[0]) : INT_MAX);
+
+                inpvol = vol; 
+                outvol = vol; 
+            }    
+            else if (params.size() == 2)
+            {    
+                inpvol = (params[0] != "none" ? Strings::tolong(params[0]) : INT_MAX);
+                outvol = (params[1] != "none" ? Strings::tolong(params[1]) : INT_MAX);
+            }    
+            else 
+            {    
+                LOG(ERROR, "invalid number of arguments for KSetVolume!");
+                return;
+            }    
+
+            if (inpvol != INT_MAX)
+            {
+                if(_call->_input_volume < -10 || _call->_input_volume > 10)
+                {
+                    _call->_input_volume = inpvol;
+                }
+            }
+
+            if (outvol != INT_MAX)
+            {
+                if(_call->_output_volume < -10 || _call->_output_volume > 10)
+                {
+                    _call->_output_volume = outvol;
+                }
+            }
+
+        }
+        catch(Board::KhompPvt::InvalidSwitchChannel & err)
+        {
+            LOG(ERROR, PVT_FMT(_target, "%s") % err._msg.c_str());            
+        }
+        catch (Strings::invalid_value e)
+        {    
+            LOG(ERROR, FMT("invalid numeric value: %s") % e.value());
+        }    
+    }
+    
+    virtual void setSpecialVariables() {}
+
+    virtual bool application(ApplicationType type, switch_core_session_t * session, const char *data) 
+    {
+        switch(type)
+        {
+        case FAX_ADJUST:
+        case FAX_SEND:
+        case FAX_RECEIVE:
+            LOG(ERROR, PVT_FMT(_target, "not a digital and not "
+                    "a fxo Khomp channel, fax not supported"));
+            break;
+        default:
+            LOG(ERROR, PVT_FMT(_target, 
+                    "application not supported"));
+            break;
+        }
+
+        return false;
+    }
+
+    /* statistics functions */
+    virtual std::string getStatistics(Statistics::Type type);
+    virtual void clearStatistics()
+    {
+        _pvt_statistics->clear();   
+    }
+
+    virtual bool indicateRinging();
+    virtual bool sendDtmf(std::string digit);
+
+    /* Methods */
+
+    bool indicateProgress();
+
+    bool signalDTMF(char d);
+
+    bool loopWhileFlagTimed(Kflags::FlagType flag, int &timeout, bool clear = true)
+    {
+        bool pvt_locked = true;
+        bool quit       = false;
+
+        unsigned int sleeps = 0;
+
+        while ((timeout != 0) && !quit)
+        {
+            for (; (sleeps < 10) && !quit; sleeps++)
+            {
+                /* unlock our pvt struct */
+                if (pvt_locked)
+                {
+                    _mutex.unlock();
+                    pvt_locked = false;
+                }
+
+                /* wait a little while (100ms is good?) */
+                usleep (100000);
+                ++sleeps;
+
+                /* re-lock pvt struct */
+                switch (_mutex.lock())
+                {
+                    case SimpleLock::ISINUSE:
+                    case SimpleLock::FAILURE:
+                        LOG(ERROR, PVT_FMT(_target, "unable to lock pvt_mutex, trying again."));
+
+                        sched_yield();
+                        continue;
+
+                    default:
+                        break;
+                }
+
+                pvt_locked = true;
+
+                if(clear)
+                {
+                    if(!call()->_flags.check(flag))
+                    {
+                        quit = true;
+                        break;
+                    }
+                }
+                else
+                {
+                    if(call()->_flags.check(flag))
+                    {
+                        quit = true;
+                        break;
+                    }
+
+                }
+            }
+
+            /* decrement timeout, zero "sleeps". */
+            timeout = (timeout > 0) ? timeout - 1 : timeout;
+            sleeps = 0;
+        }
+
+        /* pvt should always be locked when retuning here. */
+        return pvt_locked;
+    }
+
+    K3LAPI::target & target()
+    {
+        return _target;
+    }
+
+    void session(switch_core_session_t * newSession)
+    {
+        _session = newSession;
+    }
+
+    switch_core_session_t * session()
+    {
+        return _session;
+    }
+
+    void owner(switch_core_session_t * owner) { _owner = owner; }
+
+    switch_core_session_t * owner() const { return _owner; }
+
+    /* 
+       Returns the FreeSWITCH channel (switch_channel_t) 
+       Can throw InvalidSwitchChannel, so must be carefull
+    */
+    switch_channel_t * getFSChannel()
+    {
+        if(!session()) 
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t");
+        switch_channel_t *c = switch_core_session_get_channel(session());
+        if(!c) 
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_CHANNEL,"null switch_channel_t obtained");
+        return c;       
+    }
+
+    /* 
+       Returns the FreeSWITCH channel (switch_channel_t) from given session 
+       Can throw InvalidSwitchChannel, so must be carefull
+    */
+    static switch_channel_t * getFSChannel(switch_core_session_t * s)
+    {
+        if(!s) 
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t passed");
+        switch_channel_t *c = switch_core_session_get_channel(s);
+        if(!c) 
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_CHANNEL,"null switch_channel_t obtained");
+        return c;       
+    }
+
+    /* 
+       Returns the FreeSWITCH partner session (switch_core_session_t) 
+       Can throw InvalidSwitchChannel, so must be carefull
+       Don't forget to unlock [unlockPartner(switch_core_session_t*)]
+    */
+    switch_core_session_t * getFSLockedPartnerSession()
+    {
+        if(!session()) 
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t");
+
+        switch_core_session_t * p_s = NULL;
+        switch_core_session_get_partner(session(), &p_s);
+
+        if(!p_s)
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t (partner)");
+        return p_s;
+    }
+
+    /* Unlock a partner session */
+    void unlockPartner(switch_core_session_t * s)
+    {
+        if(!s) 
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t passed");
+        switch_core_session_rwunlock(s);
+    }
+
+    /* Get the uuid of session */
+    char * getUUID()
+    {
+        if(!session()) 
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t");
+        return switch_core_session_get_uuid(session());        
+    }
+
+    /* Get the uuid of given session */
+    char * getUUID(switch_core_session_t * s)
+    {
+        if(!s)
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t passed");
+        return switch_core_session_get_uuid(s);        
+    }
+
+    /* 
+       Set a variable into a FS channel 
+       Can throw InvalidSwitchChannel, so must be carefull
+    */
+    void setFSChannelVar(const char * name, const char * value)
+    {
+        if(!name || !value)
+            return;
+
+        switch_channel_t *c = getFSChannel(_owner);
+        if(!c) 
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_CHANNEL,"null switch_channel_t obtained");
+        switch_channel_set_variable(c,name,value);
+    }    
+
+   /* 
+      Set a variable into a FS channel 
+      Can throw InvalidSwitchChannel, so must be carefull
+   */
+   void setFSChannelVar(switch_channel_t *c, const char * name, const char * value)
+   {
+       if(!c)
+           throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_CHANNEL,"null switch_channel_t obtained");
+      
+       if(!name || !value)
+           return;
+
+       switch_channel_set_variable(c,name,value);
+   }
+
+    /* 
+       Get a varibale from a FS channel
+       Can throw InvalidSwitchChannel, so must be carefull
+    */
+    const char * getFSChannelVar(const char * value)
+    {
+        if(!value)
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_VALUE, "value is null");
+
+        switch_channel_t *c = getFSChannel(_owner);
+        if(!c) 
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_CHANNEL,"null switch_channel_t obtained");
+        return switch_channel_get_variable(c,value);
+    }
+
+    /* 
+       Get a varibale from a FS from a given channel
+       Can throw InvalidSwitchChannel, so must be carefull
+    */
+    const char * getFSChannelVar(switch_channel_t *c, const char * value)
+    {
+        if(!c)
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_CHANNEL,"null switch_channel_t obtained");
+        if(!value)
+            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_VALUE, "value is null");
+        return switch_channel_get_variable(c,value);
+    }
+
+    /* Set a global variable  (without any throw) */
+    void setFSGlobalVar(const char * name, const char * value)
+    {
+        if(!name || !value)
+            return;
+
+        switch_core_set_variable(name,value);
+    }
+
+    /* Get a global variable (without any throw) */
+    const char * getFSGlobalVar(const char * name)
+    {
+        if(!name)
+            return NULL;
+
+        return switch_core_get_variable(name);
+    }
+
+    bool mixer(const char *file, const char *func, int line, 
+            byte track, KMixerSource src, int32 index)
+    {
+        KMixerCommand mix;
+
+        mix.Track = track;
+        mix.Source = src;
+        mix.SourceIndex = index;
+
+        return command(file, func, line, CM_MIXER, (const char *)&mix);
+    }
+
+    /* Error handling for send command */
+    bool command(const char *file, const char *func, int line, int code,
+            const char *params = NULL, bool log = true)
+    {
+        try
+        {
+            Globals::k3lapi.command(_target, code, params);
+        }
+        catch(K3LAPI::failed_command & e)
+        {
+            if(log)
+            {
+                DBG(FUNC, OBJ_FMT(e.dev,e.obj,"Command '%s' has failed with error '%s'")
+                   % Verbose::commandName(e.code).c_str()
+                   % Verbose::status((KLibraryStatus)e.rc).c_str());
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+    
+    //TODO: Unir os dois metodos
+    int commandState(const char *file, const char *func, int line, int code,
+            const char *params = NULL)
+    {
+        try
+        {
+            Globals::k3lapi.command(_target, code, params);
+        }
+        catch(K3LAPI::failed_command & e)
+        {
+            LOG(ERROR,OBJ_FMT(e.dev,e.obj,"Command '%s' has failed with error '%s'")
+               % Verbose::commandName(e.code).c_str()
+               % Verbose::status((KLibraryStatus)e.rc).c_str());
+
+            return e.rc;
+        }
+
+        return ksSuccess;
+    }
+
+    /*!
+     \brief Will init part of our private structure and setup all the read/write
+     buffers along with the proper codecs. Right now, only PCMA.
+    */
+    switch_status_t justAlloc(bool is_answering = true, switch_memory_pool_t **pool = NULL);
+    switch_status_t justStart(switch_caller_profile_t *profile = NULL);
+
+    void destroy(switch_core_session_t * s = NULL);
+    void destroyAll();
+
+    void doHangup();
+
+    void setHangupCause(int cause, bool set_now = false)
+    {
+        if(_call->_hangup_cause) 
+        { 
+
+            DBG(FUNC,PVT_FMT(_target,"cause already set to %s") % switch_channel_cause2str((switch_call_cause_t) _call->_hangup_cause));
+            return;
+        }
+
+        if(!session())
+        {
+            DBG(FUNC,PVT_FMT(_target,"session is null"));
+            return;
+        }
+
+        switch_channel_t * channel = NULL;
+        
+        try
+        {
+            channel = getFSChannel();
+        }
+        catch(Board::KhompPvt::InvalidSwitchChannel & err)
+        {
+            DBG(FUNC, PVT_FMT(_target,"%s") % err._msg.c_str());
+            return;
+        }
+
+        int cause_from_freeswitch = switch_channel_get_cause(channel);
+        if(cause_from_freeswitch != SWITCH_CAUSE_NONE)
+        {
+            DBG(FUNC,PVT_FMT(_target,"cause already set to %s from freeswitch") % switch_channel_cause2str((switch_call_cause_t)cause_from_freeswitch));
+            _call->_hangup_cause = cause_from_freeswitch;
+            return;
+        }
+        
+        if(!cause)
+        {
+            DBG(FUNC,PVT_FMT(_target,"cause not defined"));
+        }
+        else
+        {
+            DBG(FUNC,PVT_FMT(_target,"setting cause to '%s'") % switch_channel_cause2str((switch_call_cause_t) cause));
+            _call->_hangup_cause = cause;
+
+            // not set variable in channel owner
+            if(set_now)
+            {
+                switch_channel_hangup(channel, (switch_call_cause_t)_call->_hangup_cause);
+            }
+        }
+    }
+
+    bool startCadence(CadencesType type);
+    bool stopCadence()
+    {
+        if(call()->_cadence != PLAY_NONE)
+        {
+            call()->_cadence = PLAY_NONE;
+
+            command(KHOMP_LOG, CM_STOP_CADENCE);
+        }
+    }
+
+    bool startStream(bool enable_mixer = true);
+    bool stopStream(bool enable_mixer = true);
+
+    bool startListen(bool conn_rx = true);
+    bool stopListen(void);
+
+    bool obtainRX(bool with_delay = false);
+    bool obtainTX();
+
+    bool setVolume(const char * type, int volume);
+    bool setVolume()
+    {
+        bool ret = false;
+
+        if(_call->_input_volume >= -10 && _call->_input_volume <= 10)
+        {
+            setVolume("input", _call->_input_volume);
+            ret = true;
+        }
+
+        if(_call->_output_volume >= -10 && _call->_output_volume <= 10)
+        {
+            setVolume("output", _call->_output_volume);
+            ret = true;
+        }
+     
+        return ret;
+    }
+
+    KSignaling getSignaling(void)
+    {
+        return Globals::k3lapi.channel_config(_target.device,_target.object).Signaling;
+    }
+
+    std::string getStateString(void);
+
+    bool dtmfSuppression(bool enable);
+    bool echoCancellation(bool enable);
+    virtual bool autoGainControl(bool enable);    
+
+    /* Timer callbacks */
+    static void pbxRingGen(Board::KhompPvt * pvt);
+    static void coRingGen(Board::KhompPvt * pvt);
+
+    virtual int getActiveChannel(bool invalid_as_not_found);
+
+    /* Let's validate the contexts */
+    virtual bool validContexts(MatchExtension::ContextListType & contexts, 
+                               std::string extra_string = "")
+    {
+        DBG(FUNC,PVT_FMT(_target,"c"));
+
+        if(!_group_context.empty())
+        {
+            contexts.insert(contexts.begin(), _group_context);
+            //contexts.push_back(_group_context);
+        }
+    
+        for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++) 
+            replaceTemplate((*i),  "DD", _target.device);
+
+        BEGIN_CONTEXT  
+        {    
+            K3L_DEVICE_CONFIG & dev_cfg = Globals::k3lapi.device_config(_target.device);
+
+            for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++) 
+                replaceTemplate((*i), "SSSS", atoi(dev_cfg.SerialNumber));
+        }    
+        END_CONTEXT
+      
+        DBG(FUNC,PVT_FMT(_target,"r"));
+        return true;
+    }
+
+    void cleanupBuffers()
+    {
+        DBG(FUNC,PVT_FMT(_target, "Cleanup buffers"));
+
+        _reader_frames.clear();
+        _writer_frames.clear();
+
+        for(unsigned int i = 0; i < SILENCE_PACKS; i++)
+        {
+            /* add silence to the read buffer */
+            if (!_reader_frames.give((const char *)Board::_cng_buffer, Globals::switch_packet_size))
+            {
+                LOG(ERROR, PVT_FMT(target(), "Problem in Reader Buffer"));
+            }
+        
+            /* add silence to the writer buffer */
+            if (!_writer_frames.give((const char *)Board::_cng_buffer, Globals::boards_packet_size))
+            {
+                LOG(ERROR, PVT_FMT(target(), "Problem in Writer Buffer"));
+            }
+        }
+    }
+
+    bool freeState()
+    {
+        return !(_call->_flags.check(Kflags::IS_INCOMING) || _call->_flags.check(Kflags::IS_OUTGOING));
+    }
+
+    Call * call() { return _call; }
+
+    K3LAPI::target           _target;    /*!< The device/channel pair to bind this pvt to */
+    ChanLockType             _mutex;     /*!< Used for *our* internal locking */
+    Call                    *_call;
+    switch_core_session_t   *_session;   /*!< The session to which this pvt is associated with */
+    switch_core_session_t   *_owner;
+    bool                     _has_fail;
+
+    switch_caller_profile_t *_caller_profile;
+
+    switch_codec_t           _read_codec;
+    switch_codec_t           _write_codec;
+
+    FrameSwitchManager       _reader_frames;
+    FrameBoardsManager       _writer_frames;
+
+    std::string              _group_context;
+
+    PvtStatistics           *_pvt_statistics;
+};
+
+/******************************************************************************/
+/******************************************************************************/
+    typedef std::vector < Board * >    VectorBoard;
+    typedef std::vector < KhompPvt * > VectorChannel;  /*!< Collection of pointers of KhompPvts */
+
+     /*
+        these (below) are going to rule the elements ordering in our multiset
+        (used as a "ordering-save priority queue").
+     */
+    struct PvtCallCompare
+    {
+        bool operator() (KhompPvt * pvt1, KhompPvt * pvt2) const
+        {
+            /* true if pvt1 precedes pvt2 */
+            return (Board::getStats(pvt1->target().device,pvt1->target().object,kcsiOutbound) <
+                    Board::getStats(pvt2->target().device,pvt2->target().object,kcsiOutbound));
+            return true;
+        }
+    };
+
+    typedef std::multiset< KhompPvt *, PvtCallCompare > PriorityCallQueue;
+   
+public:
+    
+    /* Board constructor */
+    Board(int id) : _device_id(id) {}
+
+    /* Board destructor */    
+    virtual ~Board() {}
+
+    int id() { return _device_id; }
+
+    KhompPvt * channel(int obj)
+    {
+        try
+        {
+            KhompPvt * pvt = _channels.at(obj);
+
+            if(!pvt)
+            {
+                throw;
+            }
+
+            return pvt;
+        }
+        catch (...)
+        {
+            throw K3LAPI::invalid_channel(_device_id, obj);
+        }
+    }
+
+    ChanEventHandler * chanEventHandler() { return _event_handler; }
+    
+    ChanCommandHandler * chanCommandHandler() { return _command_handler; }
+
+    virtual void initializeChannels(void);
+    void finalizeChannels(void);
+
+    virtual bool eventHandler(const int obj, K3L_EVENT *e)
+    {
+        DBG(STRM, D("(Generic Board) c"));
+
+        bool ret = true;
+
+        switch(e->Code)
+        {
+        case EV_REQUEST_DEVICE_SECURITY_KEY:
+            break;
+        default:
+            try
+            {
+                ret = channel(obj)->eventHandler(e);
+            }
+            catch (K3LAPI::invalid_channel & invalid)
+            {
+                LOG(ERROR, OBJ_FMT(_device_id,obj,"(Generic Board) r (invalid channel on event '%s')") 
+                % Verbose::eventName(e->Code).c_str());
+
+                return false;
+            }
+
+            break;
+        }
+        
+        DBG(STRM, D("(Generic Board) r"));
+
+        return ret;
+    }
+
+public:
+    ChanTimer            _timers;
+protected:
+    const int            _device_id;
+    ChanEventHandler   * _event_handler; /* The device event handler */
+    ChanCommandHandler * _command_handler; /* The device command handler */
+    VectorChannel        _channels;
+
+public:
+    /* static stuff */
+    static bool initializeK3L(void);
+    static bool finalizeK3L(void);
+    static bool initializeHandlers(void);
+    static bool finalizeHandlers(void);
+    static void initializeBoards(void);
+    static void finalizeBoards(void);
+    static void initializeCngBuffer(void);
+    static bool initialize(void);
+    static bool finalize(void);
+
+    /* Thread Device Event Handler */
+    static int eventThread(void *);
+    
+    /* Thread Device Command Handler */
+    static int commandThread(void *);
+
+    /*!
+      \brief Lookup channels and boards when dialed.
+      \param allocation_string The dialstring as put on Dialplan. [Khomp/[a|A|0-board_high]/[a|A|0-channel_high]/dest].
+      \param new_session Session allocated for this call.
+      \param[out] cause Cause returned. Returns NULL if suceeded if not, the proper cause.
+      \return KhompPvt to be used on the call.
+      */
+    static KhompPvt * find_channel(char* allocation_string, switch_core_session_t * new_session, switch_call_cause_t * cause);
+    static void khomp_add_event_board_data(const K3LAPI::target target, switch_event_t *event);
+
+    static Board * board(int dev)
+    {
+        try
+        {
+            Board * b = _boards.at(dev);
+
+            if(!b)
+            {
+                throw;
+            }
+
+            return b;
+        }
+        catch(...)
+        {
+            throw K3LAPI::invalid_device(dev);
+        }
+    }
+
+    static KhompPvt * get(int32 device, int32 object)
+    {
+        //if (!Globals::k3lapi.valid_channel(device, object))
+        //    throw K3LAPI::invalid_channel(device, object);
+
+        try
+        {
+            return board(device)->channel(object);
+        }
+        catch(...)
+        {
+            throw K3LAPI::invalid_channel(device, object);
+        }
+    }
+
+    static KhompPvt * get(K3LAPI::target & target)
+    {
+        //if (!Globals::k3lapi.valid_channel(target.device, target.object))
+        //    throw K3LAPI::invalid_channel(target.device, target.object);
+
+        try
+        {
+            return board(target.device)->channel(target.object);
+            //return KhompPvt::_pvts[target.device][target.object];
+        }
+        catch(...)
+        {
+            return NULL;
+            //throw K3LAPI::invalid_channel(target.device, target.object);
+        }
+    }
+
+    static unsigned int getStats(int32 device, int32 object, uint32 index)
+    {
+        unsigned int stats = (unsigned int)-1;
+
+        try
+        {
+            stats = Globals::k3lapi.channel_stats(device, object, index);
+        }
+        catch(K3LAPI::invalid_channel & err)
+        {
+        //K::logger::logg(C_WARNING, B(dev,channel, "Command get_stats has failed with error '%s'.") %
+        //                          Verbose::status((KLibraryStatus) stt_res));
+        }
+
+        return stats;
+    }
+
+    static KhompPvt * queueFindFree(PriorityCallQueue &pqueue);
+    static void queueAddChannel(PriorityCallQueue &pqueue, unsigned int board, unsigned int object);
+    static KhompPvt * findFree(unsigned int board, unsigned int object, bool fully_available = true);
+    static void applyGlobalVolume(void);
+
+public:
+
+    static VectorBoard     _boards;
+    static char            _cng_buffer[Globals::cng_buffer_size];
+
+    static Kommuter        kommuter;
+
+};
+
+/******************************************************************************/
+/******************************************************************************/
+/******************************************************************************/
+
+#endif /* _KHOMP_PVT_H_*/
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt_fxo.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt_fxo.h
new file mode 100644
index 0000000000..130c3b311e
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/khomp_pvt_fxo.h
@@ -0,0 +1,377 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _KHOMP_PVT_FXO_H_
+#define _KHOMP_PVT_FXO_H_
+
+#include "khomp_pvt.h"
+#include "applications.h"
+
+/******************************************************************************/
+/********************************* FXO Board **********************************/
+/******************************************************************************/
+struct BoardFXO: public Board
+{
+/******************************************************************************/
+/******************************** FXO Channel *********************************/
+struct KhompPvtFXO: public KhompPvt 
+{
+/********************************** FXO Call **********************************/
+    struct CallFXO : public Call
+    {
+        CallFXO() {}
+
+        bool process(std::string name, std::string value = "")
+        {
+            if (name == "pre")
+            {
+                DBG(FUNC, D("pre digits adjusted (%s).") % value);
+                _pre_digits = value;
+            }
+            else if (name == "answer_info")
+            {
+                _call_info_report = true;
+            }
+            else if (name == "drop_on")
+            {
+                _call_info_report = true;
+
+                Strings::vector_type drop_item;
+                Strings::tokenize (value, drop_item, ".+");
+
+                for (Strings::vector_type::iterator i = drop_item.begin(); i != drop_item.end(); i++)
+                {
+
+                         if ((*i) == "message_box")        _call_info_drop |= CI_MESSAGE_BOX;
+                    else if ((*i) == "human_answer")       _call_info_drop |= CI_HUMAN_ANSWER;
+                    else if ((*i) == "answering_machine")  _call_info_drop |= CI_ANSWERING_MACHINE;
+                    else if ((*i) == "carrier_message")    _call_info_drop |= CI_CARRIER_MESSAGE;
+                    else if ((*i) == "unknown")            _call_info_drop |= CI_UNKNOWN;
+                    else
+                    {
+                        LOG(ERROR, FMT("unknown paramenter to 'calldrop' Dial option: '%s'.") % (*i));
+                        continue;
+                    }
+
+                    DBG(FUNC, FMT("droping call on '%s'.") % (*i));
+                }
+            }
+            else if (name == "usr_xfer")
+            {
+                _user_xfer_digits = value;
+            }
+            else
+            {            
+                return Call::process(name, value);
+            }
+
+            return true;
+        }
+        
+        bool clear()
+        {
+            _pre_digits.clear();
+            _call_info_report = false;
+            _call_info_drop = 0;
+
+            _user_xfer_digits = Opt::_user_xfer;
+            _user_xfer_buffer.clear();
+            _digits_buffer.clear();
+
+            _var_fax_adjust = T_UNKNOWN;
+ 
+            return Call::clear();
+        }
+
+        std::string  _pre_digits;
+
+        /* report what we got? */
+        bool _call_info_report;
+
+        /* what call info flags should make us drop the call? */
+        long int _call_info_drop;
+
+        /* used for xfer on user signaling */
+        std::string _user_xfer_digits;
+        std::string _user_xfer_buffer;
+        std::string _digits_buffer;
+
+        TriState _var_fax_adjust;
+
+        //ChanTimer::Index _idx_disconnect;        
+    };
+/******************************************************************************/
+    KhompPvtFXO(K3LAPI::target & target) : KhompPvt(target) 
+    {
+        _fax = new Fax(this);
+        _transfer = new Transfer<CallFXO>(this);
+        command(KHOMP_LOG, CM_ENABLE_CALL_ANSWER_INFO);
+    }
+
+    ~KhompPvtFXO() 
+    {
+        delete _fax;
+        delete _transfer;
+    }
+
+    CallFXO * callFXO()
+    {
+        return (CallFXO *)call();
+    }
+
+    int makeCall(std::string params = "");
+    bool doChannelAnswer(CommandRequest &);
+
+    bool onNewCall(K3L_EVENT *e);
+    bool onDisconnect(K3L_EVENT *e);
+    bool onChannelRelease(K3L_EVENT *e);
+    bool onCallSuccess(K3L_EVENT *e);
+    bool onCallFail(K3L_EVENT *e);
+    bool onAudioStatus(K3L_EVENT *e);
+    bool onSeizeSuccess(K3L_EVENT *e);
+    bool onDtmfDetected(K3L_EVENT *e);
+    bool onDtmfSendFinish(K3L_EVENT *);
+    bool onCallAnswerInfo(K3L_EVENT *e);
+
+    virtual bool eventHandler(K3L_EVENT *e)
+    {
+        DBG(STRM, D("(FXO) c"));
+
+        bool ret = true;
+
+        switch(e->Code)
+        {
+            case EV_NEW_CALL:
+                ret = onNewCall(e);
+                break;
+            case EV_DISCONNECT:
+                ret = onDisconnect(e);
+                break;
+            case EV_CHANNEL_FREE:
+            case EV_CHANNEL_FAIL:
+                ret = onChannelRelease(e);
+                break;
+            case EV_CALL_SUCCESS:
+                ret = onCallSuccess(e);
+                break;
+            case EV_CALL_FAIL:
+                ret = onCallFail(e);
+                break;
+            case EV_AUDIO_STATUS:
+                ret = onAudioStatus(e);
+                break;
+            case EV_SEIZE_SUCCESS:
+                ret = onSeizeSuccess(e);
+                break;
+            case EV_DTMF_DETECTED:
+            case EV_PULSE_DETECTED:
+                ret = onDtmfDetected(e);
+                break;
+            case EV_DTMF_SEND_FINISH:
+                ret = onDtmfSendFinish(e);
+                break;
+            case EV_CALL_ANSWER_INFO:
+                ret = onCallAnswerInfo(e);
+                break;
+            case EV_FAX_CHANNEL_FREE:
+                ret = _fax->onFaxChannelRelease(e);
+                break;
+            case EV_FAX_FILE_SENT:
+            case EV_FAX_FILE_FAIL:
+            case EV_FAX_TX_TIMEOUT:
+            case EV_FAX_PAGE_CONFIRMATION:
+            case EV_FAX_REMOTE_INFO:
+                break;
+            case EV_POLARITY_REVERSAL:
+                break;
+            default:
+                ret = KhompPvt::eventHandler(e);
+                break;
+        }
+
+        DBG(STRM, D("(FXO) r"));
+
+        return ret;
+    }
+
+    bool application(ApplicationType type, switch_core_session_t * session, const char *data);
+
+    bool setupConnection();
+    bool autoGainControl(bool enable);
+    void setAnswerInfo(int answer_info);
+    bool indicateBusyUnlocked(int cause, bool sent_signaling = false);
+    void reportFailToReceive(int fail_code);
+    bool validContexts(MatchExtension::ContextListType & contexts, 
+                       std::string extra_context = "");
+  
+    bool isOK(void); 
+
+    bool isPhysicalFree() 
+    {
+        K3L_CHANNEL_STATUS status;
+
+        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
+            return false; 
+
+        bool physically_free = (status.AddInfo == kfcsEnabled);
+
+        if(status.CallStatus != kcsFree || !physically_free)
+        {
+            DBG(FUNC, PVT_FMT(_target, "call status not free, or not physically free!"));
+            return false;
+        }
+
+        return true;
+    }
+
+    virtual bool cleanup(CleanupType type = CLN_HARD)
+    {
+        //Board::board(_target.device)->_timers.del(callFXO()->_idx_disconnect);
+        //callFXO()->_idx_disconnect.reset();
+        
+        call()->_flags.clear(Kflags::CALL_WAIT_SEIZE);
+        call()->_flags.clear(Kflags::EARLY_RINGBACK);
+
+        _transfer->clear();
+
+        switch (type)
+        {
+        case CLN_HARD:
+        case CLN_FAIL:
+            call()->_flags.clear(Kflags::FAX_DETECTED);
+            break;
+        case CLN_SOFT:
+            break;
+        }
+
+        return KhompPvt::cleanup(type);
+    }
+
+    virtual void getSpecialVariables()
+    {
+        try
+        {
+            const char * str_fax = getFSChannelVar("KAdjustForFax");
+
+            callFXO()->_var_fax_adjust = (str_fax ? (!SAFE_strcasecmp(str_fax, "true") ? T_TRUE : T_FALSE) : T_UNKNOWN);
+        }
+        catch(Board::KhompPvt::InvalidSwitchChannel & err)
+        {
+            LOG(ERROR, PVT_FMT(_target, "(FXO) %s") % err._msg.c_str());
+        }
+
+        KhompPvt::getSpecialVariables();
+    }
+
+    bool sendDtmf(std::string digit);
+
+    /* used by app FAX */
+    Fax * _fax;
+
+    Transfer<CallFXO> * _transfer;
+
+//    static void delayedDisconnect(Board::KhompPvt * pvt);
+
+};
+/******************************************************************************/
+/******************************************************************************/
+    BoardFXO(int id) : Board(id) {}
+
+    void initializeChannels(void)
+    {
+        LOG(MESSAGE, "(FXO) loading channels ...");
+
+        for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
+        {
+            K3LAPI::target tgt(Globals::k3lapi, K3LAPI::target::CHANNEL, _device_id, obj);
+            KhompPvt * pvt;
+
+            switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
+            {
+            case ksigAnalog:
+                pvt = new BoardFXO::KhompPvtFXO(tgt);
+                pvt->_call = new BoardFXO::KhompPvtFXO::CallFXO();
+                DBG(FUNC, "(FXO) FXO channel");
+                break;
+            default:
+                pvt = new Board::KhompPvt(tgt);
+                pvt->_call = new Board::KhompPvt::Call();
+                DBG(FUNC, FMT("(FXO) signaling %d unknown") % Globals::k3lapi.channel_config(_device_id, obj).Signaling);
+                break;
+            }
+
+            _channels.push_back(pvt);
+
+            pvt->cleanup();
+
+        }
+    }
+
+    /*
+    virtual bool eventHandler(const int obj, K3L_EVENT *e)
+    {
+        DBG(STRM, D("(FXO Board) c"));
+
+        bool ret = true;
+
+        switch(e->Code)
+        {
+        case :
+            break;
+        default:
+            ret = Board::eventHandler(obj, e);
+            break;
+        }
+
+        DBG(STRM, D("(FXO Board) r"));
+
+        return ret;
+    }
+    */
+   
+};
+/******************************************************************************/
+/******************************************************************************/
+/******************************************************************************/
+#endif /* _KHOMP_PVT_FXO_H_*/
+
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt_gsm.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt_gsm.h
new file mode 100644
index 0000000000..d31dba51cc
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/khomp_pvt_gsm.h
@@ -0,0 +1,333 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _KHOMP_PVT_GSM_H_
+#define _KHOMP_PVT_GSM_H_
+
+#include "khomp_pvt.h"
+#include "applications.h"
+
+/******************************************************************************/
+/********************************* GSM Board **********************************/
+/******************************************************************************/
+struct BoardGSM: public Board
+{
+/******************************************************************************/
+/******************************** GSM Channel *********************************/
+struct KhompPvtGSM: public KhompPvt 
+{
+/********************************** GSM Call **********************************/
+    struct CallGSM : public Call
+    {
+        CallGSM() {}
+
+        bool process(std::string name, std::string value = "")
+        {
+            if (name == "answer_info")
+            {
+                _call_info_report = true;
+            }
+            else if (name == "drop_on")
+            {
+                _call_info_report = true;
+
+                Strings::vector_type drop_item;
+                Strings::tokenize (value, drop_item, ".+");
+
+                for (Strings::vector_type::iterator i = drop_item.begin(); i != drop_item.end(); i++)
+                {
+
+                         if ((*i) == "message_box")        _call_info_drop |= CI_MESSAGE_BOX;
+                    else if ((*i) == "human_answer")       _call_info_drop |= CI_HUMAN_ANSWER;
+                    else if ((*i) == "answering_machine")  _call_info_drop |= CI_ANSWERING_MACHINE;
+                    else if ((*i) == "carrier_message")    _call_info_drop |= CI_CARRIER_MESSAGE;
+                    else if ((*i) == "unknown")            _call_info_drop |= CI_UNKNOWN;
+                    else
+                    {
+                        LOG(ERROR, FMT("unknown paramenter to 'calldrop' Dial option: '%s'.") % (*i));
+                        continue;
+                    }
+
+                    DBG(FUNC, FMT("droping call on '%s'.") % (*i));
+                }
+            }
+            else
+            {            
+                return Call::process(name, value);
+            }
+
+            return true;
+        }
+        
+        bool clear()
+        {
+            _call_info_report = false;
+            _call_info_drop = 0;
+ 
+            return Call::clear();
+        }
+
+        /* report what we got? */
+        bool _call_info_report;
+
+        /* what call info flags should make us drop the call? */
+        long int _call_info_drop;
+    };
+
+/******************************************************************************/
+    KhompPvtGSM(K3LAPI::target & target) : KhompPvt(target) 
+    {
+        _sms = new SMS(this);
+        command(KHOMP_LOG, CM_ENABLE_CALL_ANSWER_INFO);
+    }
+
+    ~KhompPvtGSM() 
+    {
+        delete _sms;
+    }
+
+    CallGSM * callGSM()
+    {
+        return (CallGSM *)call();
+    }
+
+    int makeCall(std::string params = "");
+    bool doChannelAnswer(CommandRequest &);
+    bool doChannelHangup(CommandRequest &);
+
+    //bool onNewCall(K3L_EVENT *e);
+    bool onChannelRelease(K3L_EVENT *e);
+    bool onCallFail(K3L_EVENT *e);
+    bool onCallSuccess(K3L_EVENT *e);
+    bool onCallAnswerInfo(K3L_EVENT *e);
+    bool onDisconnect(K3L_EVENT *e);
+    //bool onDtmfDetected(K3L_EVENT *e);
+
+    virtual bool eventHandler(K3L_EVENT *e)
+    {
+        DBG(STRM, D("(GSM) c"));
+
+        bool ret = true;
+
+        switch(e->Code)
+        {
+            /*
+            case EV_NEW_CALL:
+                onNewCall(e);
+                break;
+            */
+            case EV_CHANNEL_FREE:
+            case EV_CHANNEL_FAIL:
+                ret = onChannelRelease(e);
+                break;
+            case EV_CALL_SUCCESS:
+                ret = onCallSuccess(e);
+                break;
+            case EV_DISCONNECT:
+                ret = onDisconnect(e);
+                break;
+            case EV_CALL_FAIL:
+                ret = onCallFail(e);
+                break;
+            case EV_CALL_ANSWER_INFO:
+                ret = onCallAnswerInfo(e);
+                break;
+            case EV_RECV_FROM_MODEM:
+                break;
+            case EV_NEW_SMS:
+                ret = _sms->onNewSMS(e);
+                break;
+            case EV_SMS_INFO:
+                ret = _sms->onSMSInfo(e);
+                break;
+            case EV_SMS_DATA:
+                ret = _sms->onSMSData(e);
+                break;
+            case EV_SMS_SEND_RESULT:
+                ret = _sms->onSMSSendResult(e);
+                break;
+            default:
+                ret = KhompPvt::eventHandler(e);
+                break;
+        }        
+
+        DBG(STRM, D("(GSM) r"));
+
+        return ret;
+    }
+
+    bool application(ApplicationType type, switch_core_session_t * session, const char *data);    
+  
+    bool setupConnection();
+    void setAnswerInfo(int answer_info);
+    bool indicateBusyUnlocked(int cause, bool sent_signaling = false);
+    void reportFailToReceive(int fail_code);
+    int causeFromCallFail(int fail);
+    int callFailFromCause(int cause);
+    bool isOK(void); 
+
+    bool isPhysicalFree() 
+    {
+        K3L_CHANNEL_STATUS status;
+
+        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
+            return false; 
+
+        bool physically_free = (status.AddInfo == kgsmIdle);
+
+        if(status.CallStatus != kcsFree || !physically_free)
+        {
+            DBG(FUNC, PVT_FMT(_target, "call status not free, or not physically free!"));
+            return false;
+        }
+
+        return true;
+    }
+
+    bool sendPreAudio(int rb_value = RingbackDefs::RB_SEND_NOTHING)
+    {
+        return false;
+    }
+
+    bool selectSimCard(const char * sim_card)
+    {
+        return command(KHOMP_LOG, CM_SIM_CARD_SELECT, sim_card);
+    }
+
+    std::string getStatistics(Statistics::Type type)
+    {
+        switch(type)
+        {
+            case Statistics::DETAILED:
+            {
+                /* buffer our data to return at the end */
+                std::string strBuffer;
+
+                strBuffer.append(_pvt_statistics->getDetailed());
+                strBuffer.append(_sms->statistics()->getDetailed());
+                return strBuffer;
+            }
+            case Statistics::ROW:
+            {
+                return _pvt_statistics->getRow();
+            }
+            default:
+                return "";
+        }
+    }
+
+    void clearStatistics()
+    {
+        KhompPvt::clearStatistics();
+        _sms->statistics()->clear();
+    }
+
+    bool validContexts(MatchExtension::ContextListType & contexts, 
+                       std::string extra_context = "");
+        
+    SMS * _sms;
+
+};
+/******************************************************************************/
+/******************************************************************************/
+    BoardGSM(int id) : Board(id) {}
+
+    void initializeChannels(void)
+    {
+        LOG(MESSAGE, "(GSM) loading channels ...");
+
+        for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
+        {
+            K3LAPI::target tgt(Globals::k3lapi, K3LAPI::target::CHANNEL, _device_id, obj);
+            KhompPvt * pvt;
+
+            switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
+            {
+            case ksigGSM:
+                pvt = new BoardGSM::KhompPvtGSM(tgt);
+                pvt->_call = new BoardGSM::KhompPvtGSM::CallGSM();
+                ((BoardGSM::KhompPvtGSM *)pvt)->_sms->start();
+                DBG(FUNC, "(GSM) GSM channel");
+                break;
+            default:
+                pvt = new Board::KhompPvt(tgt);
+                pvt->_call = new Board::KhompPvt::Call();
+                DBG(FUNC, FMT("(GSM) signaling %d unknown") % Globals::k3lapi.channel_config(_device_id, obj).Signaling);
+                break;
+            }
+
+            _channels.push_back(pvt);
+
+            pvt->cleanup();
+
+        }
+    }
+
+/*
+    virtual bool eventHandler(const int obj, K3L_EVENT *e)
+    {
+        DBG(STRM, D("(GSM Board) c"));
+
+        bool ret = true;
+
+        switch(e->Code)
+        {
+        case :
+            break;
+        default:
+            ret = Board::eventHandler(obj, e);
+            break;
+        }
+
+        DBG(STRM, D("(GSM Board) r"));
+
+        return ret;
+    }
+*/
+   
+};
+/******************************************************************************/
+/******************************************************************************/
+/******************************************************************************/
+#endif /* _KHOMP_PVT_GSM_H_*/
+
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt_kxe1.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt_kxe1.h
new file mode 100644
index 0000000000..722bd80737
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/khomp_pvt_kxe1.h
@@ -0,0 +1,1125 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _KHOMP_PVT_E1_H_
+#define _KHOMP_PVT_E1_H_
+
+#include "khomp_pvt.h"
+
+#include "applications.h"
+
+/******************************************************************************/
+/********************************** E1 Board **********************************/
+/******************************************************************************/
+struct BoardE1: public Board
+{
+/******************************************************************************/
+/********************************* E1 Channel *********************************/
+struct KhompPvtE1: public KhompPvt 
+{
+/*********************************** E1 Call **********************************/
+    struct CallE1 : public Call
+    {
+        CallE1() {}
+
+        bool process(std::string name, std::string value = "")
+        {
+            if (name == "answer_info")
+            {
+                _call_info_report = true;
+            }
+            else if (name == "drop_on")
+            {
+                _call_info_report = true;
+
+                Strings::vector_type drop_item;
+                Strings::tokenize (value, drop_item, ".+");
+
+                for (Strings::vector_type::iterator i = drop_item.begin(); i != drop_item.end(); i++)
+                {
+
+                         if ((*i) == "message_box")        _call_info_drop |= CI_MESSAGE_BOX;
+                    else if ((*i) == "human_answer")       _call_info_drop |= CI_HUMAN_ANSWER;
+                    else if ((*i) == "answering_machine")  _call_info_drop |= CI_ANSWERING_MACHINE;
+                    else if ((*i) == "carrier_message")    _call_info_drop |= CI_CARRIER_MESSAGE;
+                    else if ((*i) == "unknown")            _call_info_drop |= CI_UNKNOWN;
+                    else
+                    {
+                        LOG(ERROR, FMT("unknown paramenter to 'calldrop' Dial option: '%s'.") % (*i));
+                        continue;
+                    }
+
+                    DBG(FUNC, FMT("droping call on '%s'.") % (*i));
+                }
+            }
+            else
+            {            
+                return Call::process(name, value);
+            }
+
+            return true;
+        }
+        
+        bool clear()
+        {
+            _call_info_report = false;
+            _call_info_drop = 0;
+
+            _var_fax_adjust = T_UNKNOWN;
+ 
+            return Call::clear();
+        }
+
+        /* report what we got? */
+        bool _call_info_report;
+
+        /* what call info flags should make us drop the call? */
+        long int _call_info_drop;
+
+        TriState _var_fax_adjust;
+
+        ChanTimer::Index _idx_disconnect;
+    
+    };
+/******************************************************************************/
+    KhompPvtE1(K3LAPI::target & target) : KhompPvt(target)
+    {
+        _fax = new Fax(this);
+        command(KHOMP_LOG,CM_ENABLE_CALL_ANSWER_INFO); 
+    }
+
+    ~KhompPvtE1() 
+    {
+        delete _fax;
+    }
+
+    CallE1 * callE1()
+    {
+        return (CallE1 *)call();
+    }
+
+    int makeCall(std::string params = "");
+
+    bool onChannelRelease(K3L_EVENT *e);
+    bool onCallSuccess(K3L_EVENT *e);
+    bool onAudioStatus(K3L_EVENT *e);
+    bool onCallAnswerInfo(K3L_EVENT *e);
+    bool onDisconnect(K3L_EVENT *e);
+    
+    virtual bool eventHandler(K3L_EVENT *e)
+    {
+        DBG(STRM, D("(E1) c"));
+
+        bool ret = true;
+
+        switch(e->Code)
+        {
+            case EV_CHANNEL_FREE:
+            case EV_CHANNEL_FAIL:
+                ret = onChannelRelease(e);
+                break;
+            case EV_CALL_ANSWER_INFO:
+                ret = onCallAnswerInfo(e);
+                break;
+            case EV_DISCONNECT:
+                ret = onDisconnect(e);
+                break;                            
+            case EV_AUDIO_STATUS:
+                ret = onAudioStatus(e);
+                break;
+            case EV_FAX_CHANNEL_FREE:
+                ret = _fax->onFaxChannelRelease(e);
+                break;
+            case EV_FAX_FILE_SENT:
+            case EV_FAX_FILE_FAIL:
+            case EV_FAX_TX_TIMEOUT:
+            case EV_FAX_PAGE_CONFIRMATION:
+            case EV_FAX_REMOTE_INFO:
+                break;
+            default:
+                ret = KhompPvt::eventHandler(e);
+                break;
+        }        
+
+        DBG(STRM, D("(E1) r"));
+
+        return ret;
+    }
+    
+    bool application(ApplicationType type, switch_core_session_t * session, const char *data);
+    
+    bool setupConnection();
+    bool indicateBusyUnlocked(int cause, bool sent_signaling = false);
+    void setAnswerInfo(int answer_info);
+    bool validContexts(MatchExtension::ContextListType & contexts, 
+                       std::string extra_context = "");
+    bool isOK(void); 
+
+    bool isPhysicalFree() 
+    {
+        K3L_CHANNEL_STATUS status;
+
+        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
+            return false; 
+
+        bool physically_free = (status.AddInfo == kecsFree);
+
+        if(status.CallStatus != kcsFree || !physically_free)
+        {
+            DBG(FUNC, PVT_FMT(_target, "call status not free, or not physically free!"));
+            return false;
+        }
+
+        return true;
+    }
+
+    virtual bool cleanup(CleanupType type = CLN_HARD)
+    {
+        try
+        {
+            Board::board(_target.device)->_timers.del(callE1()->_idx_disconnect);
+        }
+        catch (K3LAPI::invalid_device & err)
+        {
+            LOG(ERROR, PVT_FMT(target(), "Unable to get device: %d!") % err.device);
+        }
+
+        callE1()->_idx_disconnect.reset();
+
+        switch (type)
+        {
+        case CLN_HARD:
+        case CLN_FAIL:
+            call()->_flags.clear(Kflags::FAX_DETECTED);
+            break;
+        case CLN_SOFT:
+            break;
+        }
+
+        return KhompPvt::cleanup(type);
+    }
+
+    virtual void getSpecialVariables()
+    {
+        try
+        {
+            const char * str_fax = getFSChannelVar("KAdjustForFax");
+
+            callE1()->_var_fax_adjust = (str_fax ? (!SAFE_strcasecmp(str_fax, "true") ? T_TRUE : T_FALSE) : T_UNKNOWN);
+        }
+        catch(Board::KhompPvt::InvalidSwitchChannel & err)
+        {
+            LOG(ERROR, PVT_FMT(_target, "(E1) %s") % err._msg.c_str());
+        }
+
+        KhompPvt::getSpecialVariables();
+    }
+        
+    /* used by app FAX */
+    Fax * _fax;
+
+    static void delayedDisconnect(Board::KhompPvt * pvt);
+};
+/******************************************************************************/
+/********************************** ISDN Channel ******************************/
+struct KhompPvtISDN: public KhompPvtE1 
+{
+/********************************** ISDN Call *********************************/
+    struct CallISDN : public CallE1
+    {
+    
+        CallISDN() {}
+
+        bool process(std::string name, std::string value = "")
+        {
+            if (name == "uui")
+            {
+                Strings::vector_type values;
+                Strings::tokenize(value, values, "#", 2);
+
+                try
+                {
+                    std::string uui_proto_s = values[0];
+                    std::string uui_data_s = values[1];
+
+                    _uui_descriptor = Strings::toulong(uui_proto_s);
+                    _uui_information.append(uui_data_s);
+
+                    DBG(FUNC, FMT("uui adjusted (%s, '%s')!") % uui_proto_s.c_str() % uui_data_s.c_str());
+                }
+                catch (...)
+                {
+                    LOG(ERROR, FMT("invalid uui protocol descriptor: '%s' is not a number.") % value.c_str());
+                }
+            }
+            else if (name == "usr_xfer")
+            {
+                _user_xfer_digits = value;
+            }
+            else
+            {            
+                return CallE1::process(name, value);
+            }
+
+            return true;
+        }
+    
+        bool clear()
+        {
+            _uui_descriptor = -1;
+            _uui_information.clear();
+            _isdn_cause = -1;
+
+            _user_xfer_digits = Opt::_user_xfer;
+            _user_xfer_buffer.clear();
+            _digits_buffer.clear();
+            _qsig_number.clear();
+    
+            return CallE1::clear();
+        }
+        
+        /* used for isdn EV_USER_INFORMATION */
+        long int     _uui_descriptor;
+        std::string  _uui_information;
+        long int     _isdn_cause;
+
+        /* what should we dial to trigger an user-signaled transfer? */
+        /* used for xfer on user signaling */
+        std::string _user_xfer_digits;
+        std::string _user_xfer_buffer;
+        std::string _digits_buffer;
+        std::string _qsig_number;
+
+    };
+/******************************************************************************/
+    KhompPvtISDN(K3LAPI::target & target) : KhompPvtE1(target) 
+    {
+        _transfer = new Transfer<CallISDN, false>(this);
+    }
+
+    ~KhompPvtISDN() 
+    {
+        delete _transfer;
+    }
+
+    CallISDN * callISDN()
+    {
+        return (CallISDN *)call();
+    }
+    
+    int makeCall(std::string params = "");
+    bool doChannelAnswer(CommandRequest &); 
+
+    bool onSyncUserInformation(K3L_EVENT *e);
+    bool onIsdnProgressIndicator(K3L_EVENT *e);
+    bool onNewCall(K3L_EVENT *e);
+    bool onCallSuccess(K3L_EVENT *e);
+    bool onCallFail(K3L_EVENT *e);
+
+    virtual bool eventHandler(K3L_EVENT *e)
+    {
+        DBG(STRM, D("(ISDN) c"));
+
+        bool ret = true;
+        
+        switch(e->Code)
+        {
+            case EV_USER_INFORMATION:
+                ret = onSyncUserInformation(e);
+                break;
+            case EV_ISDN_PROGRESS_INDICATOR:
+                ret = onIsdnProgressIndicator(e);
+                break;
+            case EV_NEW_CALL:
+                ret = onNewCall(e);
+                break;
+            case EV_CALL_SUCCESS:
+                ret = onCallSuccess(e);
+                break;
+            case EV_CALL_FAIL:
+                ret = onCallFail(e);
+                break;
+            case EV_SS_TRANSFER_FAIL:
+                break;
+            default:
+                ret = KhompPvtE1::eventHandler(e);
+                break;
+        }        
+
+        DBG(STRM, D("(ISDN) r"));
+
+        return ret;
+    }
+    
+    bool application(ApplicationType type, switch_core_session_t * session, const char *data);
+
+    int causeFromCallFail(int fail);
+    int callFailFromCause(int cause);
+    void reportFailToReceive(int fail_code);
+    RingbackDefs::RingbackStType sendRingBackStatus(int rb_value = RingbackDefs::RB_SEND_DEFAULT); 
+    bool sendPreAudio(int rb_value = RingbackDefs::RB_SEND_NOTHING);
+    bool sendDtmf(std::string digit);
+
+    virtual bool cleanup(CleanupType type = CLN_HARD)
+    {
+        _transfer->clear();
+        
+        /*
+        switch (type)
+        {
+        case CLN_HARD:
+        case CLN_FAIL:
+            break;
+        case CLN_SOFT:
+            break;
+        }
+        */
+
+        return KhompPvtE1::cleanup(type);
+    }
+
+    virtual void setSpecialVariables()
+    {
+        try
+        {
+            /* rdsi user info */
+            if (callISDN()->_uui_descriptor != -1)
+            {
+                DBG(FUNC,"Setting ISDN descriptor");
+
+                std::string descriptor = STG(FMT("%d") % callISDN()->_uui_descriptor);
+
+                setFSChannelVar("KUserInfoDescriptor", descriptor.c_str());
+                setFSChannelVar("KUserInfoData", callISDN()->_uui_information.c_str());
+
+                callISDN()->_uui_descriptor = -1;
+                callISDN()->_uui_information.clear();
+            }
+        }
+        catch(Board::KhompPvt::InvalidSwitchChannel & err)
+        {
+            LOG(ERROR, PVT_FMT(_target, "(ISDN) %s") % err._msg.c_str());
+        }
+
+        KhompPvtE1::setSpecialVariables();
+    }
+
+    Transfer<CallISDN, false> * _transfer;
+
+};
+/******************************************************************************/
+/********************************* R2 Channel *********************************/
+struct KhompPvtR2: public KhompPvtE1
+{
+/********************************* R2 Call ************************************/
+    struct CallR2 : public CallE1
+    {
+    
+        CallR2() {}
+
+
+        bool process(std::string name, std::string value = "")
+        {
+            if (name == "category")
+            {
+                try
+                {
+                    unsigned long int category = Strings::toulong (value);
+                    DBG(FUNC, FMT("r2 category adjusted (%s)!") % value.c_str());
+                    _r2_category = category;
+                }
+                catch (...)
+                {
+                   LOG(ERROR, FMT("invalid r2 category: '%s' is not a number.") % value.c_str());
+                }
+
+            }
+            else
+            {
+                return CallE1::process(name, value);
+            }
+            return true;
+        }
+        
+        bool clear()
+        {
+            _r2_category  = -1; 
+            _r2_condition = -1;
+
+            return CallE1::clear();
+        }
+
+        long int _r2_category;
+        long int _r2_condition;
+
+        ChanTimer::Index _idx_number_dial;
+        std::string _incoming_exten;
+    };
+/******************************************************************************/
+    KhompPvtR2(K3LAPI::target & target) : KhompPvtE1(target) 
+    {
+        K3L_E1600A_FW_CONFIG dspAcfg;
+
+        if (k3lGetDeviceConfig(_target.device, ksoFirmware + kfiE1600A, &dspAcfg, sizeof(dspAcfg)) != ksSuccess)
+        {
+            DBG(FUNC, PVT_FMT(target, "unable to get signaling locality for board: assuming brazilian signaling"));
+ 
+            _r2_country = Verbose::R2_COUNTRY_BRA;
+           
+            return;
+        }
+        Regex::Expression e(".+\\((Arg|Bra|Chi|Mex|Ury|Ven)\\).+", Regex::E_EXTENDED);
+        std::string fwname(dspAcfg.FwVersion);
+
+        Regex::Match what(fwname, e);
+
+        if (!what.matched() || !what.matched(1))
+        {
+            DBG(FUNC, PVT_FMT(target, "invalid firmware string, unable to find country code: assuming brazilian signaling.\n"));
+            
+            _r2_country = Verbose::R2_COUNTRY_BRA;
+            return;
+        }
+
+        std::string country = what.submatch(1);
+    
+        /**/ if (country == "Arg")
+            _r2_country = Verbose::R2_COUNTRY_ARG;
+        else if (country == "Bra")
+            _r2_country = Verbose::R2_COUNTRY_BRA;
+        else if (country == "Chi")
+            _r2_country = Verbose::R2_COUNTRY_CHI;
+        else if (country == "Mex")
+            _r2_country = Verbose::R2_COUNTRY_MEX;
+        else if (country == "Ury")
+            _r2_country = Verbose::R2_COUNTRY_URY;
+        else if (country == "Ven")
+            _r2_country = Verbose::R2_COUNTRY_VEN;
+        else
+        {
+            DBG(FUNC, PVT_FMT(target, "invalid firmware string (%s), assuming brazilian signaling.") % country.c_str());
+
+            _r2_country = Verbose::R2_COUNTRY_BRA;
+            return;
+        }
+    
+        DBG(FUNC, PVT_FMT(target, "adjusting country signaling to code '%s'...")
+            % country.c_str());
+
+    }
+
+    ~KhompPvtR2() {}
+    
+    CallR2 * callR2()
+    {
+        return (CallR2 *)call();
+    }
+    
+    int makeCall(std::string params = "");
+    bool doChannelAnswer(CommandRequest &); 
+    bool doChannelHangup(CommandRequest &);
+
+    bool onNewCall(K3L_EVENT *e);
+    bool onCallSuccess(K3L_EVENT *e);
+    bool onCallFail(K3L_EVENT *e);
+    bool onNumberDetected(K3L_EVENT *e);
+    
+    virtual bool eventHandler(K3L_EVENT *e)
+    {
+        DBG(STRM, D("(R2) c"));
+
+        bool ret = true;
+
+        switch(e->Code)
+        {
+            case EV_NEW_CALL:
+                ret = onNewCall(e);
+                break;
+            case EV_CALL_SUCCESS:
+                ret = onCallSuccess(e);
+                break;
+            case EV_CALL_FAIL:
+                ret = onCallFail(e);
+                break;
+            case EV_DIALED_DIGIT:
+                ret = onNumberDetected(e);
+                break;
+            default:
+                ret = KhompPvtE1::eventHandler(e);
+                break;
+        }        
+
+        DBG(STRM, D("(R2) r"));
+
+        return ret;
+
+    }
+    
+    int causeFromCallFail(int fail);
+    int callFailFromCause(int cause);
+    void reportFailToReceive(int fail_code);
+    RingbackDefs::RingbackStType sendRingBackStatus(int rb_value = RingbackDefs::RB_SEND_DEFAULT); 
+    bool sendPreAudio(int rb_value = RingbackDefs::RB_SEND_NOTHING);
+    bool indicateRinging();
+
+    virtual void setSpecialVariables()
+    {
+        try
+        {
+            /* r2 caller category */
+            if (callR2()->_r2_category != -1)
+            {
+                setFSChannelVar("KR2GotCategory",Verbose::signGroupII((KSignGroupII)callR2()->_r2_category).c_str());
+            }
+
+        }
+        catch(Board::KhompPvt::InvalidSwitchChannel & err)
+        {
+            LOG(ERROR, PVT_FMT(_target, "(R2) %s") % err._msg.c_str());
+        }
+
+        KhompPvtE1::setSpecialVariables();
+    }
+
+    virtual bool cleanup(CleanupType type = CLN_HARD)
+    {
+        call()->_flags.clear(Kflags::NEEDS_RINGBACK_CMD);
+        call()->_flags.clear(Kflags::NUMBER_DIAL_ONGOING);
+        call()->_flags.clear(Kflags::NUMBER_DIAL_FINISHD);
+
+        switch (type)
+        {
+        case CLN_HARD:
+        case CLN_FAIL:
+            break;
+        case CLN_SOFT:
+            break;
+        }
+
+        return KhompPvtE1::cleanup(type);
+    }
+
+    static void numberDialTimer(Board::KhompPvt * pvt);
+
+public:
+    Verbose::R2CountryType _r2_country;
+
+};
+/******************************************************************************/
+/********************************* FLASH Channel ******************************/
+/* ksigLineSide ksigCAS_EL7 ksigE1LC */
+struct KhompPvtFlash: public KhompPvtR2 
+{
+/********************************* R2 Call ************************************/
+    struct CallFlash : public CallR2
+    {
+    
+        CallFlash() {}
+
+        bool process(std::string name, std::string value = "")
+        {
+            if (name == "usr_xfer")
+            {
+                _user_xfer_digits = value;
+            }
+            else
+            {
+                return CallR2::process(name, value);
+            }
+
+            return true;
+        }
+        
+        bool clear()
+        {
+            _user_xfer_digits = Opt::_user_xfer;
+            _user_xfer_buffer.clear();
+            _digits_buffer.clear();
+
+            return CallR2::clear();
+        }
+
+        /* used for xfer on user signaling */
+        std::string _user_xfer_digits;
+        std::string _user_xfer_buffer;
+        std::string _digits_buffer;
+
+    };
+/******************************************************************************/
+    KhompPvtFlash(K3LAPI::target & target) : KhompPvtR2(target) 
+    {
+        _transfer = new Transfer<CallFlash>(this);
+    }
+    
+    ~KhompPvtFlash() 
+    {
+        delete _transfer;
+    }
+    
+    CallFlash * callFlash()
+    {
+        return (CallFlash *)call();
+    }
+
+    bool application(ApplicationType type, switch_core_session_t * session, const char *data);
+
+    bool sendDtmf(std::string digit);
+
+    virtual bool cleanup(CleanupType type = CLN_HARD)
+    {
+        _transfer->clear();
+
+        /*
+        switch (type)
+        {
+        case CLN_HARD:
+        case CLN_FAIL:
+            break;
+        case CLN_SOFT:
+            break;
+        }
+        */
+
+        return KhompPvtR2::cleanup(type);
+    }
+
+    Transfer<CallFlash> * _transfer;
+};
+/******************************************************************************/
+/********************************* FSX Channel ********************************/
+struct KhompPvtFXS: public KhompPvt 
+{
+/********************************** FXS Call **********************************/
+    struct CallFXS : public Call
+    {
+        CallFXS() {}
+
+        bool process(std::string name, std::string value = "")
+        {
+            if (name == "ring")
+            {
+                Strings::vector_type ring_item;
+                Strings::tokenize (value, ring_item, ".");
+
+                if (ring_item.size() != 2)
+                {
+                    LOG(ERROR, FMT("invalid values on ring string: two numbers, dot separated, are needed."));
+                    return false;
+                }
+
+                try
+                {
+                    unsigned long int time_on = Strings::toulong (ring_item[0]);
+                    unsigned long int time_off = Strings::toulong (ring_item[1]);
+
+                    _ring_on = time_on;
+                    _ring_off = time_off;
+
+                    DBG(FUNC, D("ring values adjusted (%i,%i).") % time_on % time_off);
+                }
+                catch (...)
+                {
+                    LOG(ERROR, FMT("invalid number on ring string."));
+                }
+            }
+            else if (name == "ring_ext")
+            {
+                if (_ring_on == -1) // so ring was not set.
+                {
+                    LOG(ERROR, FMT("ring_ext only make sense if ring values are set."));
+                    return false;
+                }
+
+                Strings::vector_type ring_item;
+                Strings::tokenize (value, ring_item, ".");
+
+                if (ring_item.size() != 2)
+                {
+                    LOG(ERROR, FMT("invalid values on ring_ext string: two numbers, dot separated, are needed."));
+                    return false;
+                }
+
+                try
+                {
+                    unsigned long int time_on = Strings::toulong (ring_item[0]);
+                    unsigned long int time_off = Strings::toulong (ring_item[1]);
+
+                    _ring_on_ext = time_on;
+                    _ring_off_ext = time_off;
+
+                    DBG(FUNC, D("ring_ext values adjusted (%i,%i).") % time_on % time_off);
+                }
+                catch (...)
+                {
+                    LOG(ERROR, FMT("invalid number on ring_ext string."));
+                }
+            }
+            else if (name == "ring_cadence")
+            {
+                Opt::CadencesMapType::iterator i = Opt::_cadences.find(value);
+
+                if (i != Opt::_cadences.end())
+                {
+                    CadenceType cadence = (*i).second;
+
+                    _ring_on      = cadence.ring;
+                    _ring_off     = cadence.ring_s;
+                    _ring_on_ext  = cadence.ring_ext;
+                    _ring_off_ext = cadence.ring_ext_s;
+
+                    DBG(FUNC, D("cadence adjusted (%i,%i,%i,%i).") 
+                            % cadence.ring
+                            % cadence.ring_s 
+                            % cadence.ring_ext 
+                            % cadence.ring_ext_s);
+                }
+                else
+                {
+                    LOG(ERROR, FMT("unable to find cadence '%s'!") % value);
+                }
+            }
+            else
+            {            
+                return Call::process(name, value);
+            }
+
+            return true;
+        }
+        
+        bool clear()
+        {
+            _ring_on      = -1;
+            _ring_off     = -1;
+            _ring_on_ext  = -1;
+            _ring_off_ext = -1;
+
+            _incoming_exten.clear();
+            _flash_transfer.clear();
+
+            _uuid_other_session.clear();
+ 
+            return Call::clear();
+        }
+
+        long int _ring_on;
+        long int _ring_off;
+        long int _ring_on_ext;
+        long int _ring_off_ext;
+
+        ChanTimer::Index _idx_dial;
+
+        std::string _incoming_exten;
+        
+        ChanTimer::Index _idx_transfer;
+
+        std::string _flash_transfer;
+        std::string _uuid_other_session;
+        
+
+    };
+/******************************************************************************/
+    KhompPvtFXS(K3LAPI::target & target) : KhompPvt(target)
+    {
+       //command(KHOMP_LOG,CM_ENABLE_CALL_ANSWER_INFO);
+       /* sequence numbers on FXS */
+       static Opt::OrigToNseqMapType fxs_nseq = generateNseqMap();
+
+       load(fxs_nseq);
+    }
+
+    ~KhompPvtFXS() {}
+
+    CallFXS * callFXS()
+    {
+        return (CallFXS *)call();
+    }
+
+    int makeCall(std::string params = "");
+    bool doChannelAnswer(CommandRequest &);
+    bool doChannelHangup(CommandRequest &);
+   
+    bool onChannelRelease(K3L_EVENT *e);
+    bool onSeizureStart(K3L_EVENT *);
+    bool onCallSuccess(K3L_EVENT *);
+    bool onDtmfDetected(K3L_EVENT *);
+    //bool onDtmfSendFinish(K3L_EVENT *);
+    bool onFlashDetected(K3L_EVENT *);
+    
+    virtual bool eventHandler(K3L_EVENT *e)
+    {
+        DBG(STRM, D("(FXS) c"));
+
+        bool ret = true;
+
+        switch(e->Code)
+        {
+            case EV_CHANNEL_FREE:
+            case EV_CHANNEL_FAIL:
+                ret = onChannelRelease(e);
+                break;
+            case EV_SEIZURE_START:
+                ret = onSeizureStart(e);                
+                break;
+            case EV_CALL_SUCCESS:
+                ret = onCallSuccess(e);
+                break;
+            case EV_DTMF_DETECTED:
+            case EV_PULSE_DETECTED:
+                ret = onDtmfDetected(e);
+                break;
+            /*
+            case EV_DTMF_SEND_FINISH:
+                ret = onDtmfSendFinish(e);
+                break;
+            */
+            case EV_FLASH:
+                ret = onFlashDetected(e);
+                break;
+            default:
+                ret = KhompPvt::eventHandler(e);
+                break;
+        }        
+
+        DBG(STRM, D("(FXS) r"));
+
+        return ret;
+    }
+
+    bool setupConnection();
+    void load(Opt::OrigToNseqMapType & fxs_nseq);
+    void loadOptions();
+    bool parseBranchOptions(std::string options_str);
+    bool alloc();
+    bool indicateBusyUnlocked(int cause, bool sent_signaling = false);
+    void reportFailToReceive(int fail_code);
+    bool validContexts(MatchExtension::ContextListType & contexts, 
+                       std::string extra_context = "");
+    bool isOK(void);
+
+    bool startTransfer();
+    bool stopTransfer();
+    bool transfer(std::string & context, bool blind = false);
+
+    bool hasNumberDial() { return false; }
+    
+    bool isPhysicalFree() 
+    {
+        K3L_CHANNEL_STATUS status;
+
+        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
+            return false; 
+
+        bool physically_free = (status.AddInfo == kfxsOnHook);
+
+        if(status.CallStatus != kcsFree || !physically_free)
+        {
+            DBG(FUNC, PVT_FMT(_target, "call status not free, or not physically free!"));
+            return false;
+        }
+
+        return true;
+    }
+    
+    virtual bool cleanup(CleanupType type = CLN_HARD)
+    {
+        callFXS()->_flags.clear(Kflags::FXS_DIAL_ONGOING);
+        callFXS()->_flags.clear(Kflags::FXS_DIAL_FINISHD);
+        callFXS()->_flags.clear(Kflags::FXS_FLASH_TRANSFER);
+
+        switch (type)
+        {
+        case CLN_HARD:
+        case CLN_FAIL:
+            callFXS()->_flags.clear(Kflags::FXS_OFFHOOK);        
+            break;
+        case CLN_SOFT:
+            break;
+        }
+
+        return KhompPvt::cleanup(type);
+    }
+
+    
+    /* number based on fxs-global-orig */
+    std::string _fxs_fisical_addr; 
+    /* the branch number, possibly the new calleridnum */
+    std::string _fxs_orig_addr; 
+    std::string _calleridname;
+    int         _amaflags;
+    std::string _callgroup;
+    std::string _pickupgroup;
+    std::string _context;
+    int         _input_volume;
+    int         _output_volume;
+    std::string _mohclass;
+    std::string _language;
+    std::string _accountcode;
+    std::string _mailbox;
+    std::string _flash;
+
+    static Opt::OrigToNseqMapType generateNseqMap();
+    static void dialTimer(KhompPvt * pvt);
+    static void transferTimer(KhompPvt * pvt);
+
+    static std::string padOrig(std::string orig_base, unsigned int padding)
+    {
+        unsigned int orig_size = orig_base.size();
+        unsigned int orig_numb = 0;
+
+        try
+        {
+            orig_numb = Strings::toulong(orig_base);
+        }
+        catch(Strings::invalid_value & e)
+        {
+            LOG(ERROR, D("invalid numeric value: %s") % e.value());
+        }
+
+        return STG(FMT(STG(FMT("%%0%dd") % orig_size)) % (orig_numb + padding));
+    }
+
+    /*
+    virtual void getSpecialVariables()
+    {
+        try
+        {
+        }
+        catch(Board::KhompPvt::InvalidSwitchChannel & err)
+        {
+            LOG(ERROR, PVT_FMT(_target, "(FXS) %s") % err._msg.c_str());
+        }
+
+        KhompPvt::getSpecialVariables();
+    }
+    */
+
+};
+/******************************************************************************/
+/******************************************************************************/
+    BoardE1(int id) : Board(id) {}
+
+    void initializeChannels(void)
+    {
+        LOG(MESSAGE, "(E1) loading channels ...");
+
+        for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
+        {
+            K3LAPI::target tgt(Globals::k3lapi, K3LAPI::target::CHANNEL, _device_id, obj);
+            KhompPvt * pvt;
+
+            switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
+            {
+            CASE_RDSI_SIG:
+                pvt = new BoardE1::KhompPvtISDN(tgt);
+                pvt->_call = new BoardE1::KhompPvtISDN::CallISDN();
+                DBG(FUNC, "(E1) ISDN channel");
+                break;
+            CASE_R2_SIG:
+                pvt = new BoardE1::KhompPvtR2(tgt);
+                pvt->_call = new BoardE1::KhompPvtR2::CallR2();
+                pvt->command(KHOMP_LOG, CM_DISCONNECT);
+                DBG(FUNC, "(E1) R2 channel");
+                break;
+            CASE_FLASH_GRP:
+                pvt = new BoardE1::KhompPvtFlash(tgt);
+                pvt->_call = new BoardE1::KhompPvtFlash::CallFlash();
+                pvt->command(KHOMP_LOG, CM_DISCONNECT);
+                DBG(FUNC, "(E1) \"Flash\" channel");
+                break;
+            case ksigAnalogTerminal:
+                pvt = new BoardE1::KhompPvtFXS(tgt);
+                pvt->_call = new BoardE1::KhompPvtFXS::CallFXS();
+                DBG(FUNC, "(E1) FXS channel");
+                break;
+            default:
+                pvt = new Board::KhompPvt(tgt);
+                pvt->_call = new Board::KhompPvt::Call();
+                DBG(FUNC, FMT("(E1) signaling %d unknown") % Globals::k3lapi.channel_config(_device_id, obj).Signaling);
+                break;
+            }
+
+            _channels.push_back(pvt);
+
+            pvt->cleanup();
+
+        }
+    }
+
+    bool onLinkStatus(K3L_EVENT *e);
+
+    virtual bool eventHandler(const int obj, K3L_EVENT *e)
+    {
+        DBG(STRM, D("(E1 Board) c"));
+
+        int ret = true;
+
+        switch(e->Code)
+        {
+        case EV_LINK_STATUS:
+        case EV_PHYSICAL_LINK_DOWN:
+        case EV_PHYSICAL_LINK_UP:
+
+            if (K::Logger::Logg.classe(C_LINK_STT).enabled() || K::Logger::Logg.classe(C_EVENT).enabled())
+            {    
+                std::string msg = Globals::verbose.event (obj, e) + "."; 
+                LOG(LINK_STT, msg);
+            }            
+
+            ret = onLinkStatus(e);
+            break;
+        default:
+            ret = Board::eventHandler(obj, e);
+            break;
+        }
+
+        DBG(STRM, D("(E1 Board) r"));
+
+        return ret;
+    }
+   
+};
+/******************************************************************************/
+/******************************************************************************/
+/******************************************************************************/
+#endif /* _KHOMP_PVT_H_*/
+
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt_passive.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt_passive.h
new file mode 100644
index 0000000000..a0a6df0aaf
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/khomp_pvt_passive.h
@@ -0,0 +1,305 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _KHOMP_PVT_PASSIVE_H_
+#define _KHOMP_PVT_PASSIVE_H_
+
+#include "khomp_pvt.h"
+#include "applications.h"
+
+/******************************************************************************/
+/******************************** Passive Board *******************************/
+/******************************************************************************/
+struct BoardPassive: public Board
+{
+/******************************************************************************/
+/******************************** Passive Channel *****************************/
+struct KhompPvtPassive: public KhompPvt 
+{
+/******************************** Passive Call ********************************/
+/*
+    struct CallPassive : public Call
+    {
+        CallPassive() {}
+
+        bool process(std::string name, std::string value = "")
+        {
+            }
+            else
+            {            
+                return Call::process(name, value);
+            }
+
+            return true;
+        }
+        
+        bool clear()
+        {
+            return Call::clear();
+        }
+
+    };
+*/
+/******************************************************************************/
+    KhompPvtPassive(K3LAPI::target & target) : KhompPvt(target) 
+    {
+    }
+
+    ~KhompPvtPassive() 
+    {
+    }
+/*    
+    CallPassive * callPassive()
+    {
+        return (CallPassive *)call();
+    }
+*/
+    
+    virtual bool eventHandler(K3L_EVENT *e)
+    {
+        DBG(STRM, D("(Passive) c"));
+
+        bool ret = true;
+
+        switch(e->Code)
+        {
+            case EV_CHANNEL_FREE:
+            case EV_CHANNEL_FAIL:
+                ret = onChannelRelease(e);
+                break;
+/*
+            case EV_CALL_SUCCESS:
+            case EV_CALL_FAIL:
+            case EV_PULSE_DETECTED:
+*/
+            case EV_DISCONNECT:
+            case EV_DTMF_DETECTED:
+            case EV_AUDIO_STATUS:
+                break;
+            default:
+                ret = true;
+                break;
+        }
+
+        DBG(STRM, D("(Passive) r"));
+
+        return ret;
+    }
+    
+    bool validContexts(MatchExtension::ContextListType & contexts, 
+                       std::string extra_context = "");
+
+/*
+    virtual bool cleanup(CleanupType type = CLN_HARD)
+    {
+        switch (type)
+        {
+        case CLN_HARD:
+        case CLN_FAIL:
+            break;
+        case CLN_SOFT:
+            break;
+        }
+
+        return KhompPvt::cleanup(type);
+    }
+*/
+
+};
+/******************************************************************************/
+/********************************** HI Channel ********************************/
+struct KhompPvtHI: public KhompPvtPassive
+{
+    KhompPvtHI(K3LAPI::target & target) : KhompPvtPassive(target) 
+    {
+    }
+
+    ~KhompPvtHI() 
+    {
+    }
+    
+    bool onSeizureStart(K3L_EVENT *e);
+
+    virtual bool eventHandler(K3L_EVENT *e)
+    {
+        DBG(STRM, D("(HI) c"));
+
+        bool ret = true;
+
+        switch(e->Code)
+        {
+            case EV_SEIZURE_START:
+                ret = onSeizureStart(e);
+                break;
+            case EV_RING_DETECTED:
+            case EV_POLARITY_REVERSAL:
+                break;
+            default:
+                ret = KhompPvtPassive::eventHandler(e);
+                break;
+        }
+
+        DBG(STRM, D("(HI) r"));
+
+        return ret;
+    }
+
+};
+/******************************************************************************/
+/********************************* KPR Channel ********************************/
+struct KhompPvtKPR: public KhompPvtPassive
+{
+    KhompPvtKPR(K3LAPI::target & target) : KhompPvtPassive(target) 
+    {
+    }
+
+    ~KhompPvtKPR() 
+    {
+    }
+    
+    bool onNewCall(K3L_EVENT *e);
+/*
+    bool onConnect(K3L_EVENT *e);
+*/
+
+    virtual bool eventHandler(K3L_EVENT *e)
+    {
+        DBG(STRM, D("(KPR) c"));
+
+        bool ret = true;
+
+        switch(e->Code)
+        {
+            case EV_NEW_CALL:
+                ret = onNewCall(e);
+                break;
+            case EV_CONNECT:
+                break;
+            case EV_SEIZURE_START:
+            case EV_CAS_MFC_RECV:
+            case EV_CAS_LINE_STT_CHANGED:
+            case EV_LINK_STATUS:
+                break;
+            default:
+                ret = KhompPvtPassive::eventHandler(e);
+                break;
+        }
+
+        DBG(STRM, D("(KPR) r"));
+
+        return ret;
+    }
+
+    bool obtainBoth();
+
+};
+/******************************************************************************/
+/******************************************************************************/
+    BoardPassive(int id) : Board(id) {}
+
+    void initializeChannels(void)
+    {
+        LOG(MESSAGE, "(Passive) loading channels ...");
+
+        for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
+        {
+            K3LAPI::target tgt(Globals::k3lapi, K3LAPI::target::CHANNEL, _device_id, obj);
+            KhompPvt * pvt;
+
+            switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
+            {
+            case ksigAnalog:
+                pvt = new BoardPassive::KhompPvtHI(tgt);
+                pvt->_call = new BoardPassive::KhompPvtHI::Call();
+                DBG(FUNC, "(Passive) HI channel");
+                break;
+            CASE_RDSI_SIG:
+            CASE_R2_SIG:
+            CASE_FLASH_GRP:
+            case ksigAnalogTerminal:
+                pvt = new BoardPassive::KhompPvtKPR(tgt);
+                pvt->_call = new BoardPassive::KhompPvtKPR::Call();
+                DBG(FUNC, "(Passive) KPR channel");
+                break;
+            default:
+                pvt = new Board::KhompPvt(tgt);
+                pvt->_call = new Board::KhompPvt::Call();
+                DBG(FUNC, FMT("(Passive) signaling %d unknown") % Globals::k3lapi.channel_config(_device_id, obj).Signaling);
+                break;
+            }
+
+            _channels.push_back(pvt);
+
+            pvt->cleanup();
+
+        }
+    }
+
+    /*
+    virtual bool eventHandler(const int obj, K3L_EVENT *e)
+    {
+        DBG(STRM, D("(Passive Board) c"));
+
+        bool ret = true;
+
+        switch(e->Code)
+        {
+        case :
+            break;
+        default:
+            ret = Board::eventHandler(obj, e);
+            break;
+        }
+
+        DBG(STRM, D("(Passive Board) r"));
+
+        return ret;
+    }
+    */
+   
+};
+/******************************************************************************/
+/******************************************************************************/
+/******************************************************************************/
+#endif /* _KHOMP_PVT_PASSIVE_H_*/
+
diff --git a/src/mod/endpoints/mod_khomp/include/lock.h b/src/mod/endpoints/mod_khomp/include/lock.h
new file mode 100644
index 0000000000..621b724d72
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/lock.h
@@ -0,0 +1,86 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef CHAN_LOCK_H
+#define CHAN_LOCK_H
+
+#include <scoped_lock.hpp>
+#include "khomp_pvt.h"
+
+
+struct ScopedLockFailed
+{
+    typedef enum { NULL_PVT, NULL_SOFT_CHAN, FAILED, ALLOC_FAILED } FailType;
+
+    ScopedLockFailed(FailType fail, std::string msg)
+    : _fail(fail), _msg(msg) {};
+
+    FailType    _fail;
+    std::string _msg;
+};
+
+
+struct ScopedPvtLock: public ScopedLockBasic
+{
+    typedef Board::KhompPvt KhompPvt;
+
+    ScopedPvtLock(KhompPvt * pvt);
+    ~ScopedPvtLock();
+
+    void unlock();
+
+ protected:
+    KhompPvt * _pvt;
+};
+
+
+struct ScopedAllocLock : public ScopedLockBasic
+{
+    ScopedAllocLock();
+    ~ScopedAllocLock();
+
+    void unlock();
+
+};
+
+#endif /* CHAN_LOCK_H */
diff --git a/src/mod/endpoints/mod_khomp/include/logger.h b/src/mod/endpoints/mod_khomp/include/logger.h
new file mode 100644
index 0000000000..554a48de6d
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/logger.h
@@ -0,0 +1,141 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _Logger_H_
+#define _Logger_H_
+
+#include <switch.h>
+#include <string>
+#include <simple_lock.hpp>
+#include <logger.hpp>
+#include <configurator/configfile.hpp>
+#include <klog-config.hpp>
+#include "defs.h"
+#include "format.hpp"
+
+namespace K
+{
+    struct LogConfig
+    {
+        static bool set(Logfile &, const char *, const char *, bool);
+        static bool commit(Logfile &);
+    };
+
+    struct SwitchConsoleLog {}; 
+
+    struct SwitchPrinter: public Logger::DefaultPrinter
+    {
+        typedef Logger::DefaultPrinter Super;
+        typedef Tagged::Union < std::ostream *, Tagged::Union < int, Tagged::Union < SwitchConsoleLog > > > BaseType;
+
+        SwitchPrinter(std::string & msg): Super(msg) {}; 
+
+        using Super::operator();
+
+        bool operator()(const SwitchConsoleLog & ignored)
+        {   
+            switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN,SWITCH_LOG_CONSOLE,"%s",_msg.c_str());
+            return true;
+        };  
+    };
+
+    /* Log manager declaration. */
+    typedef Logger::Manager <class_type, output_type, SwitchPrinter, SimpleLock>  LogManager;
+
+    /* Forward declaration */
+    struct LogInternalManager; 
+
+    struct Logger
+    {
+        /* Logger instance. */
+        static LogManager Logg;
+
+        /* Util Logger instance. */
+        static LogInternalManager Logg2;
+
+        static bool start();
+        static void stop();
+        static bool rotate();
+        static void processLogConsole(switch_stream_handle_t *s, const std::string options, bool invert, bool unique);
+        static void processLogDisk(switch_stream_handle_t *s, const std::string options, bool invert, bool unique);
+
+    private:
+        static std::string     base_path;
+        static std::ofstream   generic_file;
+    };
+
+    /* Internal logging facility declaration */
+    struct LogInternalManager
+    {
+        bool operator()(class_type classe, switch_stream_handle_t *stream, const char *args)
+        {
+            switch (classe)
+            {
+                case C_CLI:
+                    stream->write_function(stream,"%s\n",args);
+                    return true;
+                default:
+                    return K::Logger::Logg(classe, args);
+            }
+        }
+        
+        bool operator()(class_type classe, switch_stream_handle_t *stream, Format &fmt)
+        {
+            return K::Logger::Logg2(classe,stream,(char*) STR(fmt));
+        }
+
+        bool operator()(class_type classe, switch_stream_handle_t *stream, const char *fmt, const char *args)
+        {
+            switch (classe)
+            {
+                case C_CLI:
+                    stream->write_function(stream,fmt,args); 
+                    return true;
+                default:
+                    return K::Logger::Logg(classe, FMT(fmt) % args);
+            }
+        }
+    };
+};
+
+#endif /* _Logger_H_ */
diff --git a/src/mod/endpoints/mod_khomp/include/opt.h b/src/mod/endpoints/mod_khomp/include/opt.h
new file mode 100644
index 0000000000..3458f9e9de
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/opt.h
@@ -0,0 +1,251 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _OPT_H_
+#define _OPT_H_
+
+#include <string>
+#include <map>
+#include <vector>
+#include "switch.h"
+#include "utils.h"
+
+struct CadenceType
+{
+    CadenceType(void)
+    : ring(0), ring_s(0), ring_ext(0), ring_ext_s(0) {};
+
+    CadenceType(unsigned int _ring, unsigned int _ring_s)
+    : ring(_ring), ring_s(_ring_s), ring_ext(0), ring_ext_s(0) {};
+
+    CadenceType(unsigned int _ring, unsigned int _ring_s, unsigned int _ring_ext, unsigned int _ring_ext_s)
+    : ring(_ring), ring_s(_ring_s), ring_ext(_ring_ext), ring_ext_s(_ring_ext_s) {};
+
+    unsigned int ring;
+    unsigned int ring_s;
+    unsigned int ring_ext;
+    unsigned int ring_ext_s;
+};
+
+struct CSpan {
+    std::string _dialplan;
+    std::string _context;
+    std::string _dialstring;
+};
+
+struct Opt
+{
+    typedef std::pair   < std::string, CadenceType >  CadencesPairType;
+    typedef std::map    < std::string, CadenceType >  CadencesMapType;
+
+    typedef std::map    < std::string, std::string >  OrigToDestMapType;
+    typedef std::pair   < std::string, std::string >  OrigToDestPairType;
+    typedef std::vector < std::string >               DestVectorType;
+
+    typedef std::map    < unsigned int, std::string > BoardToOrigMapType;
+    typedef std::pair   < unsigned int, std::string > BoardToOrigPairType;
+
+    typedef std::map    < std::string, unsigned int > OrigToNseqMapType;
+    typedef std::pair   < std::string, unsigned int > OrigToNseqPairType;
+
+    typedef std::pair   < unsigned int,unsigned int > ObjectIdType;
+    typedef std::pair   < std::string, ObjectIdType > BranchToObjectPairType;
+    typedef std::map    < std::string, ObjectIdType > BranchToObjectMapType;
+
+    typedef std::map    < std::string, std::string >  BranchToOptMapType;
+    typedef std::pair   < std::string, std::string >  BranchToOptPairType;
+    
+    typedef std::map    < std::string, std::string >  GroupToDestMapType;
+    typedef std::pair   < std::string, std::string >  GroupToDestPairType;
+
+    typedef std::pair   < std::string, CSpan >        SpanPairType;
+
+    typedef enum
+    {
+            GFLAG_MY_CODEC_PREFS = (1 << 0)
+    }
+    GFLAGS;
+
+    static void initialize(void);
+    static void obtain(void);
+    static void commit(void);
+    static void printConfiguration(switch_stream_handle_t*);
+
+protected:
+
+    static void loadConfiguration(const char *, const char **, bool show_errors = true);
+    static void cleanConfiguration(void);
+    
+    static switch_xml_t processSimpleXML(switch_xml_t &xml, const std::string& child_name);
+    static void processGroupXML(switch_xml_t &xml);
+    static void processCadenceXML(switch_xml_t &xml);
+    static void processFXSBranchesXML(switch_xml_t &xml);
+    static void processFXSHotlines(switch_xml_t &xml);
+    static void processFXSOptions(switch_xml_t &xml);
+
+public:
+    static bool                            _debug;
+    static std::string                     _dialplan;
+    static std::string                     _context;
+    static std::map < std::string, CSpan > _spans;
+	static GroupToDestMapType              _groups;
+	static CadencesMapType                 _cadences;
+    
+    static bool  _echo_canceller;
+    static bool  _auto_gain_control;
+    static bool  _out_of_band_dtmfs;
+    static bool  _suppression_delay;
+    static bool  _pulse_forwarding;
+    static bool  _native_bridge;
+    static bool  _recording;
+    static bool  _has_ctbus;
+    static bool  _fxs_bina;
+    static bool  _fxo_send_pre_audio;
+    static bool  _drop_collect_call;
+    static bool  _ignore_letter_dtmfs;
+    static bool  _optimize_audio_path;
+
+    static bool         _auto_fax_adjustment;
+    static unsigned int _fax_adjustment_timeout;
+
+    static bool         _r2_strict_behaviour;
+    static unsigned int _r2_preconnect_wait;
+
+    static unsigned int _fxs_digit_timeout;
+
+    static unsigned int _transferdigittimeout;
+
+    static std::string _flash;
+    static std::string _blindxfer;
+    static std::string _atxfer;
+
+    static unsigned int _ringback_co_delay;
+    static unsigned int _ringback_pbx_delay;
+
+    static unsigned int _disconnect_delay;
+
+    static int _input_volume;
+    static int _output_volume;
+
+    static DestVectorType    _fxs_co_dialtone;
+    static OrigToDestMapType _fxs_hotline;
+    static std::string       _fxs_global_orig_base;
+
+    static BoardToOrigMapType    _fxs_orig_base;
+    static BranchToObjectMapType _fxs_branch_map;
+    static BranchToOptMapType    _branch_options;
+
+    static std::string _global_mohclass;
+    static std::string _global_language;
+
+    static std::string _record_prefix;
+
+    static std::string  _context_gsm_call;
+    static std::string  _context2_gsm_call;
+    static std::string  _context_gsm_sms;
+    static std::string  _context_fxo;
+    static std::string  _context2_fxo;
+    static std::string  _context_fxs;
+    static std::string  _context2_fxs;
+    static std::string  _context_digital;
+    static std::string  _context_pr;
+    static std::string  _user_xfer;
+
+    static int                _amaflags;
+    static std::string _callgroup;
+    static std::string _pickupgroup; /* or intercept */
+
+    static std::string _accountcode;
+    
+    static unsigned int _kommuter_timeout;
+    static std::string  _kommuter_activation;
+
+    static unsigned int _audio_packet_size;
+
+protected:
+
+    struct ProcessFXSCODialtone
+    {
+        void operator()(std::string options);
+    };
+
+    struct ProcessRecordPrefix
+    {
+        void operator()(std::string path);
+    };
+
+    struct ProcessAMAFlags
+    {
+        void operator()(std::string options);
+    };
+
+    struct ProcessCallGroup
+    {
+        void operator()(std::string options);
+    };
+
+    struct ProcessPickupGroup
+    {
+        void operator()(std::string options);
+    };
+
+    struct ProcessLogOptions
+    {
+        ProcessLogOptions(output_type output): _output(output) {}; 
+
+        void operator()(std::string options); 
+
+        protected:
+            output_type _output;
+    };
+
+    struct ProcessTraceOptions
+    {
+        void operator()(std::string options);
+    };
+};
+
+
+
+#endif /* _OPT_H_ */
+
diff --git a/src/mod/endpoints/mod_khomp/include/revision.h b/src/mod/endpoints/mod_khomp/include/revision.h
new file mode 100644
index 0000000000..fe9ef9eb47
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/revision.h
@@ -0,0 +1 @@
+#define MOD_KHOMP_VERSION "1.0 - (rev: 5841)"
diff --git a/src/mod/endpoints/mod_khomp/include/spec.h b/src/mod/endpoints/mod_khomp/include/spec.h
new file mode 100644
index 0000000000..119607b02f
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/spec.h
@@ -0,0 +1,98 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _SPEC_HPP_
+#define _SPEC_HPP_
+
+#include <function.hpp>
+#include "khomp_pvt.h"
+
+typedef enum
+{
+    SPR_CONTINUE,
+    SPR_SUCCESS,
+    SPR_FAIL,
+}
+SpecRetType;
+
+typedef enum
+{
+    SPF_FIRST  = 0x01,
+    SPF_CYCLIC = 0x02,
+}
+SpecFlagType;
+
+typedef unsigned int SpecFlagsType;
+
+
+typedef Function::Function3 < bool, unsigned int, unsigned int, SpecFlagsType & > SpecFunType;
+
+
+//SpecRetType processSpecAtom(std::string &, SpecFlagsType &, SpecFunType &);
+//SpecRetType processSpecAtoms(std::string &, SpecFlagsType &, SpecFunType &);
+//bool processCallChannelString(std::string &, Board::KhompPvt *&, int *, bool need_free = true);
+
+/* Request a Board::KhompPvt based on dialplan string.
+
+-- Format of dialplan string. --
+
+Dial(Khomp/B2C58/4832625644)
+ |      |    |       |
+ |      |    |       |
+ |      |    |       |
+ |      |    |       +- Destination number.
+ |      |    |
+ |      |    +- Identifier for board 2, channel 58.
+ |      |
+ |      +- Khomp channel identifier.
+ |
+ +- Dial Application.
+*/
+
+Board::KhompPvt * processDialString(const char *, int *);
+void processGroupString();
+
+Board::KhompPvt * processSMSString(const char *, int *);
+
+#endif /* _SPEC_HPP_ */
+
diff --git a/src/mod/endpoints/mod_khomp/include/utils.h b/src/mod/endpoints/mod_khomp/include/utils.h
new file mode 100644
index 0000000000..0c71a74188
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/include/utils.h
@@ -0,0 +1,693 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#ifndef _UTILS_H_
+#define _UTILS_H_
+
+#include <bitset>
+#include <refcounter.hpp>
+#include <ringbuffer.hpp>
+#include <simple_lock.hpp>
+#include <saved_condition.hpp>
+#include <thread.hpp>
+#include "globals.h"
+#include "logger.h"
+#include "defs.h"
+
+/******************************************************************************/
+/************************** Defining applications *****************************/
+
+typedef enum
+{
+    FAX_ADJUST,
+    FAX_SEND,
+    FAX_RECEIVE,
+    USER_TRANSFER,
+    SMS_CHECK,
+    SMS_SEND,
+    SELECT_SIM_CARD,
+}
+ApplicationType;
+
+/******************************************************************************/
+/***************** Abstraction for defining channel flags *********************/
+
+struct Kflags
+{
+    typedef enum
+    {
+        CONNECTED = 0,
+        REALLY_CONNECTED,
+
+        IS_OUTGOING,
+        IS_INCOMING,
+
+        STREAM_UP,
+        LISTEN_UP,
+
+        GEN_CO_RING,
+        GEN_PBX_RING,
+
+        HAS_PRE_AUDIO,
+        HAS_CALL_FAIL,
+
+        DROP_COLLECT,
+
+        NEEDS_RINGBACK_CMD, //R2
+        EARLY_RINGBACK, //FXO
+
+        FAX_DETECTED, //Digital, FXO
+        FAX_SENDING, //Digital, FXO
+        FAX_RECEIVING, //Digital, FXO
+
+        OUT_OF_BAND_DTMFS,
+
+        KEEP_DTMF_SUPPRESSION,
+        KEEP_ECHO_CANCELLATION,
+        KEEP_AUTO_GAIN_CONTROL,
+
+        WAIT_SEND_DTMF,
+
+        CALL_WAIT_SEIZE, //FXO
+
+        NUMBER_DIAL_FINISHD, //R2
+        NUMBER_DIAL_ONGOING, //R2
+
+        FXS_OFFHOOK, //FXS
+        FXS_DIAL_FINISHD, //FXS
+        FXS_DIAL_ONGOING, //FXS
+        FXS_FLASH_TRANSFER, //FXS
+
+        XFER_QSIG_DIALING, //ISDN
+        XFER_DIALING, //ISDN, FXO
+
+        SMS_DOING_UPLOAD, //GSM
+
+        /*
+        NOW LOADING ...
+
+        BRIDGED,
+        */
+
+        /* Do not remove this last FLAG */
+        INVALID_FLAG
+    }
+    FlagType;
+
+    struct Flag
+    {        
+        const char *_name;
+        bool _value;
+    };
+
+    Kflags() { init(); };
+
+    void init();
+
+    inline const char * name(FlagType bit) { return _flags[bit]._name; }
+
+    inline bool check(FlagType bit) 
+    {
+#ifdef DEBUG_FLAGS
+        DBG(FUNC, D("Flag %s=%s") % name(bit) % 
+                (_flags[bit]._value ? "TRUE" : "FALSE"));
+#endif
+        return _flags[bit]._value;
+    }
+
+    inline void set(FlagType bit)
+    {
+#ifdef DEBUG_FLAGS
+        DBG(FUNC, D("Flag %s") % name(bit));
+#endif
+        _flags[bit]._value = true;
+    }
+
+    inline void clear(FlagType bit)
+    { 
+#ifdef DEBUG_FLAGS
+        DBG(FUNC, D("Flag %s") % name(bit));
+#endif
+        _flags[bit]._value = false;
+    }
+
+    inline void clearAll()
+    {
+        unsigned int index = 0;
+        for(; (FlagType)index < INVALID_FLAG; index++)
+        {
+            if(_flags[index]._value)
+            {
+                DBG(FUNC, D("Flag %s was not clean!") % name((FlagType)index));
+                clear((FlagType)index);
+            }
+        }
+    }
+
+ protected:
+    Flag _flags[INVALID_FLAG+1];
+};
+
+/******************************************************************************/
+/************************* Commands and Events Handler ************************/
+struct CommandRequest
+{
+    typedef enum
+    {
+        NONE = 0,
+        COMMAND,
+        ACTION
+    }
+    ReqType;
+
+    typedef enum
+    {
+        CNONE = 0,
+
+        /* Commands */
+        CMD_CALL,
+        CMD_ANSWER,
+        CMD_HANGUP,
+        
+        /* Actions */
+        FLUSH_REC_STREAM,
+        FLUSH_REC_BRIDGE,
+        START_RECORD,
+        STOP_RECORD
+
+    }
+    CodeType;
+
+    typedef enum
+    {
+        RFA_CLOSE,
+        RFA_KEEP_OPEN,
+        RFA_REMOVE
+    }
+    RecFlagType;
+
+    /* "empty" constructor */
+    CommandRequest() : 
+        _type(NONE),
+        _code(CNONE),
+        _obj(-1)
+    {}
+
+    CommandRequest(ReqType type, CodeType code, int obj) : 
+            _type(type),
+            _code(code),
+            _obj(obj)
+    {}
+
+    CommandRequest(const CommandRequest & cmd) : 
+            _type(cmd._type), 
+            _code(cmd._code), 
+            _obj(cmd._obj) 
+    {}
+
+    ~CommandRequest() {}
+
+    void operator=(const CommandRequest & cmd)
+    {
+        _type = cmd._type;
+        _code = cmd._code;
+        _obj = cmd._obj;
+    }
+
+    void mirror(const CommandRequest & cmd_request)
+    {
+        _type = cmd_request._type;
+        _code = cmd_request._code;
+        _obj = cmd_request._obj;
+    }
+
+    short type() { return _type; }
+    
+    short code() { return _code; }
+
+    int obj() { return _obj; }
+
+private:
+    short _type;
+    short _code;
+    int   _obj;
+};
+
+struct EventRequest
+{
+    /* "empty" constructor */
+    EventRequest(bool can_delete = true) : 
+        _delete(can_delete), 
+        _obj(-1)
+    {
+        if(can_delete)
+            _event = new K3L_EVENT();
+    }
+
+    /* Temporary constructor */
+    EventRequest(int obj, K3L_EVENT * ev) :
+            _delete(false),
+            _obj(obj),
+            _event(ev)
+    {}
+    
+    //EventRequest(const EventRequest & ev) : _obj(ev._obj) {}
+
+    ~EventRequest()
+    {
+
+        if(!_delete || !_event)
+            return;
+
+        if(_event->ParamSize)
+            free(_event->Params);
+
+        delete _event;
+    }
+
+    void operator=(const EventRequest & ev)
+    {
+        _delete = false;
+        _obj = ev._obj;
+        _event = ev._event;
+
+    }
+
+    void mirror(const EventRequest & ev_request)
+    {
+        //Checar o _event
+
+        if(_event->ParamSize)
+        {
+            free(_event->Params);
+        }
+
+        _event->Params = NULL;
+
+        _obj = ev_request._obj;
+
+        K3L_EVENT * ev     = ev_request._event;
+
+        if(!ev)
+        {
+            clearEvent();
+            return;
+        }
+
+        _event->Code       = ev->Code;       // API code
+        _event->AddInfo    = ev->AddInfo;    // Parameter 1
+        _event->DeviceId   = ev->DeviceId;   // Hardware information
+        _event->ObjectInfo = ev->ObjectInfo; // Additional object information
+        _event->ParamSize  = ev->ParamSize;  // Size of parameter buffer
+        _event->ObjectId   = ev->ObjectId;   // KEventObjectId: Event thrower object id
+
+        if(ev->ParamSize)
+        {
+            // Pointer to the parameter buffer
+            _event->Params = malloc(ev->ParamSize+1);
+            memcpy(_event->Params, ev->Params, ev->ParamSize);
+            ((char *)(_event->Params))[ev->ParamSize] = 0;
+        }
+    }
+
+    bool clearEvent()
+    {
+        _event->Code       = -1;
+        _event->AddInfo    = -1;
+        _event->DeviceId   = -1;
+        _event->ObjectInfo = -1;
+        _event->ParamSize  = 0;
+        _event->ObjectId   = -1;
+    }
+
+    int obj() { return _obj; }
+
+    K3L_EVENT * event() { return _event; }
+
+
+private:
+    bool        _delete;
+    int         _obj;
+    K3L_EVENT * _event;
+};
+
+template < typename R, int S >
+struct GenericFifo
+{
+    typedef R RequestType;
+    typedef SimpleNonBlockLock<25,100>  LockType;
+
+    GenericFifo(int device) : 
+            _device(device), 
+            _shutdown(false), 
+            _buffer(S), 
+            _mutex(Globals::module_pool), 
+            _cond(Globals::module_pool)
+    {};
+
+    int                         _device;
+    bool                        _shutdown;
+    Ringbuffer < RequestType >  _buffer;
+    LockType                    _mutex; /* to sync write acess to event list */
+    SavedCondition              _cond;
+    Thread                     *_thread;
+
+};
+
+typedef GenericFifo < CommandRequest, 250 > CommandFifo;
+typedef GenericFifo < EventRequest, 500 >   EventFifo;
+
+/* Used inside KhompPvt to represent an command handler */
+struct ChanCommandHandler: NEW_REFCOUNTER(ChanCommandHandler)
+{
+    typedef int (HandlerType)(void *);
+
+    ChanCommandHandler(int device, HandlerType * handler)
+    {
+        _fifo = new CommandFifo(device);
+        /* device event handler */
+        _fifo->_thread = new Thread(handler, (void *)this, Globals::module_pool);
+        if(_fifo->_thread->start())
+        {
+            DBG(FUNC,"Device command handler started");
+        }
+        else
+        {
+            LOG(ERROR, "Device command handler error");
+        }
+    }
+
+    ChanCommandHandler(const ChanCommandHandler & cmd)
+    : INC_REFCOUNTER(cmd, ChanCommandHandler),
+      _fifo(cmd._fifo)
+    {};
+
+    void unreference();
+
+    CommandFifo * fifo()
+    {
+        return _fifo;
+    }
+
+    void signal()
+    {
+        _fifo->_cond.signal();
+    };
+
+    bool writeNoSignal(const CommandRequest &);
+    bool write(const CommandRequest &);
+
+protected:
+    CommandFifo * _fifo;
+};
+
+/* Used inside KhompPvt to represent an event handler */
+struct ChanEventHandler: NEW_REFCOUNTER(ChanEventHandler)
+{
+    typedef int (HandlerType)(void *);
+
+    ChanEventHandler(int device, HandlerType * handler)
+    {
+        _fifo = new EventFifo(device);
+        /* device event handler */
+        _fifo->_thread = new Thread(handler, (void *)this, Globals::module_pool);
+        if(_fifo->_thread->start())
+        {
+            DBG(FUNC,"Device event handler started");
+        }
+        else
+        {
+            LOG(ERROR, "Device event handler error");
+        }
+    }
+
+    ChanEventHandler(const ChanEventHandler & evt)
+    : INC_REFCOUNTER(evt, ChanEventHandler),
+      _fifo(evt._fifo)
+    {};
+
+    void unreference();
+
+    EventFifo * fifo()
+    {
+        return _fifo;
+    }
+
+    void signal()
+    {
+        _fifo->_cond.signal();
+    };
+
+    bool provide(const EventRequest &);
+    bool writeNoSignal(const EventRequest &);
+    bool write(const EventRequest &);
+
+protected:
+    EventFifo * _fifo;
+};
+
+
+/******************************************************************************/
+/****************************** Internal **************************************/
+struct RingbackDefs
+{
+    enum
+    {
+        RB_SEND_DEFAULT = -1,
+        RB_SEND_NOTHING = -2,
+    };
+
+    typedef enum
+    {
+        RBST_SUCCESS,
+        RBST_UNSUPPORTED,
+        RBST_FAILURE,
+    }
+    RingbackStType;
+};
+
+/******************************************************************************/
+/******************************* Others ***************************************/
+static bool checkTrueString(const char * str)
+{   
+    if (str && *str)
+    {   
+        if (!SAFE_strcasecmp(str, "yes") || !SAFE_strcasecmp(str, "true") ||
+                !SAFE_strcasecmp(str, "enabled") || !SAFE_strcasecmp(str, "sim"))
+        {   
+            return true;
+        }   
+    }   
+
+    return false;
+}   
+
+static bool checkFalseString(const char * str)
+{   
+    if (str && *str)
+    {   
+        if (!SAFE_strcasecmp(str, "no") || !SAFE_strcasecmp(str, "false") ||
+                !SAFE_strcasecmp(str, "disabled") || !SAFE_strcasecmp(str, "não"))
+        {   
+            return true;
+        }   
+    }   
+
+    return false;
+}   
+
+static TriState getTriStateValue(const char * str)
+{
+    if (str)
+    {   
+        /**/ if (checkTrueString(str))  return T_TRUE;
+        else if (checkFalseString(str)) return T_FALSE;
+        else /***********************************/ return T_UNKNOWN;
+    }   
+
+    return T_UNKNOWN;
+}
+
+const char * answerInfoToString(int answer_info);
+
+static bool replaceTemplate(std::string & haystack, const std::string & needed, int value)
+{
+    Regex::Expression e(std::string(needed).c_str());
+    Regex::Match r(haystack,e);
+
+    if(!r.matched()) return false;
+
+    int len;
+    std::string fmt;
+    std::string tmp;
+
+    // if needed isn't "SSSS" the length of needed will give string format
+    // if needed is "SSSS" the length of value will give string format
+    std::string ssss("SSSS");
+
+    if (ssss != needed)
+    {   
+        len = needed.size();
+        fmt = STG(FMT("%%0%dd") % len);
+        tmp = STG(FMT(fmt) % value);
+    }   
+    else
+    {   
+        len = (STG(FMT("%d") % value)).size();
+        fmt = STG(FMT("%%%dd") % len);
+        tmp = STG(FMT(fmt) % value);
+    }   
+
+    haystack = r.replace(STG(FMT(fmt) % value));
+
+    DBG(FUNC,FMT("haystack: %s") % haystack);
+    return true;
+}
+
+
+static std::string timeToString (time_t time_value)
+{
+    int horas = (int)time_value / 3600;
+
+    if (horas > 0) 
+        time_value -= horas * 3600;
+
+    int minutos = (int)time_value / 60;
+
+    if (minutos > 0) 
+        time_value -= minutos * 60;
+
+    return STG(FMT("%02d:%02d:%02d") % horas % minutos % (int)time_value);
+}
+/******************************************************************************/
+/******************************* Match functions ******************************/
+struct MatchExtension
+{
+    typedef std::vector<std::string> ContextListType;
+    typedef std::vector<std::string> ExtenListType;
+
+    typedef enum
+    {
+        MATCH_NONE,
+        MATCH_EXACT,
+        MATCH_MORE
+    }
+    MatchType;
+
+    static bool canMatch(std::string & context, std::string & exten, 
+                std::string & caller_id, bool match_more = false);
+
+    static MatchType matchExtension(std::string &, std::string &, 
+                std::string &, bool match_only = false);
+
+    static MatchType findExtension(std::string &, std::string &, 
+                ContextListType &, std::string &, std::string &,
+                bool default_ctx = true, bool default_ext = true);
+
+};
+/******************************************************************************/
+/************************** Thread helper functions ***************************/
+typedef int (HandlerType)(void *);
+static Thread * threadCreate(HandlerType * handler,void * arg)
+{
+    Thread *t = new Thread(handler, (void *) arg, Globals::module_pool);
+    return t;
+}
+
+/******************************************************************************/
+/******************************** Kommuter ************************************/
+struct Kommuter
+{
+    Kommuter() : 
+        _kommuter_count(-1), 
+        _kwtd_timer_on(false)
+    {}
+    
+    bool start()
+    {
+        /* Checks for kommuter */
+        try
+        {
+            Globals::k3lapi.command(-1,-1,CM_WATCHDOG_COUNT);
+        }
+        catch(K3LAPI::failed_command & e)
+        {
+            LOG(WARNING , "libkwd.so used by Kommuter devices is not available.");
+            return false;
+        }
+
+        return true;
+    }
+
+    bool stop();
+    
+    bool initialize(K3L_EVENT *e);
+  
+    /* Index of the WatchDog timer */ 
+    TimerTraits::Index  _kwtd_timer_index;
+    int                 _kommuter_count;
+    bool                _kwtd_timer_on;
+
+    /* Timer to control our dog (totó) */
+    static void wtdKickTimer(void *);
+    
+};
+
+/******************************************************************************/
+/******************************* Statistics ***********************************/
+struct Statistics
+{
+    typedef enum
+    {
+        DETAILED = 0,
+        ROW
+    }
+    Type;
+
+    virtual std::string getDetailed() { return ""; }
+    virtual void clear() {}
+};
+
+/******************************************************************************/
+/******************************************************************************/
+#endif  /* _UTILS_H_ */
diff --git a/src/mod/endpoints/mod_khomp/install.sh b/src/mod/endpoints/mod_khomp/install.sh
new file mode 100755
index 0000000000..8cc60f2a78
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/install.sh
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+###############################################################################
+#   KHOMP generic endpoint/channel library.
+#   Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+# 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.
+
+# Alternatively, the contents of this file may be used under the terms of the
+# "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+# case the provisions of "LGPL License" are applicable instead of those above.
+
+# If you wish to allow use of your version of this file only under the terms of
+# the LGPL License and not to allow others to use your version of this file
+# under the MPL, indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by the LGPL
+# License. If you do not delete the provisions above, a recipient may use your
+# version of this file under either the MPL or the LGPL License.
+
+# The LGPL header follows below:
+
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License as published by the Free Software Foundation; either
+#   version 2.1 of the License, or (at your option) any later version.
+
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this library; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+###############################################################################
+
+
+clean()
+{
+    printf "$1"
+    exit 1
+}
+
+if [ `whoami` != 'root' ] 
+then
+     clean "Need to be root\n"
+fi  
+
+if [ "w$FREESWITCH_PATH" == "w" ]
+then
+    clean "FreeSWITCH source PATH is needed: \n\tSet \"FREESWITCH_PATH=\"\n"
+fi
+
+if ! which 'kserver' &> /dev/null
+then
+    echo "k3l will be installed"
+    K3L_FILE="k3l_2.1_client.sh"
+
+    if [ "w`uname -m | grep x86_64`" == "w" ]
+    then
+        echo "Downloading i686 package"
+        wget -t15 -c --progress=bar:force -O $K3L_FILE.gz http://www.khomp.com.br/binaries/softpbx/freeswitch/k3l_2.1_client_i686.sh.gz
+    else
+        echo "Downloading x86_64 package"
+        wget -t15 -c --progress=bar:force -O $K3L_FILE.gz http://www.khomp.com.br/binaries/softpbx/freeswitch/k3l_2.1_client_x86-64.sh.gz
+    fi
+
+    gunzip $K3L_FILE.gz
+    chmod 0755 $K3L_FILE
+
+    (./$K3L_FILE) || clean "Error on k3l install\n"
+    
+    rm $K3L_FILE
+fi
+
+if [ "w`kserver --version | grep 2.1`" == "w" ]
+then
+    clean "k3l version 2.1 must be installed: \n\tUninstall the old version of k3l and try again\n"
+fi
+
+make || clean "Error on compilation\n"
+
+make install || clean "Error on installation\n"
+
+echo "Successfully installed!"
+
diff --git a/src/mod/endpoints/mod_khomp/mod_khomp.cpp b/src/mod/endpoints/mod_khomp/mod_khomp.cpp
new file mode 100644
index 0000000000..d09a8a3f68
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/mod_khomp.cpp
@@ -0,0 +1,1509 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * 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 FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Khomp development team
+ * Geovani Ricardo Wiedenhoft <grw.freeswitch  (at) gmail.com>
+ * Leonardo Lang              <lang.freeswitch (at) gmail.com> 
+ * Eduardo Nunes              <eduardonunesp   (at) gmail.com>
+ * Joao Mesquita              <mesquita        (at) khomp.com.br>
+ * Raul Fragoso               <raulfragoso     (at) gmail.com>
+ *
+ *
+ * mod_khomp.c -- Khomp board Endpoint Module
+ *
+ */
+
+/**
+  \mainpage Khomp board Endpoint Module
+  
+  \section Introduction
+  This module has been developed to make a nice, affordable brazilian board
+  called Khomp (http://www.khomp.com.br) compatible with FreeSWITCH.
+  This module is supported by the manufacturer.
+
+  \section Contributors
+  \li Khomp development team
+  \li Geovani Ricardo Wiedenhoft <grw.freeswitch  (at) gmail.com>
+  \li Leonardo Lang              <lang.freeswitch (at) gmail.com>
+  \li Eduardo Nunes              <eduardonunesp   (at) gmail.com>
+  \li Joao Mesquita              <jmesquita       (at) gmail.com>
+  \li Raul Fragoso               <raulfragoso     (at) gmail.com>
+**/
+
+/**
+ * @file mod_khomp.cpp
+ * @brief Khomp Endpoint Module
+ * @see mod_khomp
+ */
+
+#include <string>
+#include "khomp_pvt.h"
+#include "spec.h"
+#include "lock.h"
+#include "logger.h"
+#include "opt.h"
+#include "globals.h"
+#include "cli.h"
+
+extern "C" void Kstdcall khompAudioListener(int32 deviceid, int32 objectid,
+                                          byte * read_buffer, int32 read_size);
+
+/*!
+  \brief Load the module. Expadend by a FreeSWITCH macro.
+  Things we do here:
+  \li Initialize a static structure on KhompPvt
+  \li Load the configuration
+  \li Start the K3L API, responsible for connecting to KServer
+  \li Register mod APIs and APPs
+  \li Register audio callback for KServer
+  \li Register event callback for KServer
+  \see Opt Where all the configs are handled
+  \see khompEventCallback To where we bind the event handler
+  \see khompAudioListener To where we bind the audio handlers
+  */
+SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_khomp_shutdown);
+SWITCH_MODULE_DEFINITION(mod_khomp, mod_khomp_load, mod_khomp_shutdown, NULL);
+
+/*!
+ \defgroup fs_states FreeSWITCH State Handlers
+            We get called back from FreeSWITCH core everytime we make a
+            transition to any of these states. Refer to FreeSWITCH docs for a
+            detailed explanation of each state.
+ */
+/*@{*/
+switch_status_t khompInit(switch_core_session_t *session);
+switch_status_t khompRouting(switch_core_session_t *session);
+switch_status_t khompExecute(switch_core_session_t *session);
+switch_status_t khompHangup(switch_core_session_t *session);
+switch_status_t khompExchangeMedia(switch_core_session_t *session);
+switch_status_t khompSoftExecute(switch_core_session_t *session);
+switch_status_t khompDestroy(switch_core_session_t *session);
+/*@}*/
+
+switch_state_handler_table_t khomp_state_handlers = {
+    khompInit,          /*.on_init */
+    khompRouting,       /*.on_routing */
+    khompExecute,       /*.on_execute */
+    khompHangup,        /*.on_hangup */
+    khompExchangeMedia, /*.on_exchange_media */
+    khompSoftExecute,   /*.on_soft_execute */
+    NULL,               /*.on_consume_media */
+    NULL,               /*.on_hibernate */
+    NULL,               /*.on_reset */
+    NULL,               /*.on_park*/
+    NULL,               /*.on_reporting*/
+    khompDestroy        /*.on_destroy*/
+};
+
+switch_status_t khompSMSDestroy(switch_core_session_t *session);
+
+switch_state_handler_table_t khomp_sms_state_handlers = {
+    khompInit,          /*.on_init */
+    khompRouting,       /*.on_routing */
+    khompExecute,       /*.on_execute */
+    NULL,               /*.on_hangup */
+    khompExchangeMedia, /*.on_exchange_media */
+    khompSoftExecute,   /*.on_soft_execute */
+    NULL,               /*.on_consume_media */
+    NULL,               /*.on_hibernate */
+    NULL,               /*.on_reset */
+    NULL,               /*.on_park*/
+    NULL,               /*.on_reporting*/
+    khompSMSDestroy     /*.on_destroy*/
+};
+
+switch_status_t khompPRHangup(switch_core_session_t *session);
+
+switch_state_handler_table_t khomp_pr_state_handlers = {
+    khompInit,          /*.on_init */
+    khompRouting,       /*.on_routing */
+    khompExecute,       /*.on_execute */
+    khompPRHangup,      /*.on_hangup */
+    khompExchangeMedia, /*.on_exchange_media */
+    khompSoftExecute,   /*.on_soft_execute */
+    NULL,               /*.on_consume_media */
+    NULL,               /*.on_hibernate */
+    NULL,               /*.on_reset */
+    NULL,               /*.on_park*/
+    NULL,               /*.on_reporting*/
+    khompDestroy        /*.on_destroy*/
+};
+
+/* Callbacks for FreeSWITCH */
+switch_call_cause_t khompCall(
+        switch_core_session_t *session,
+        switch_event_t *var_event,
+        switch_caller_profile_t *outbound_profile,
+        switch_core_session_t **new_session,
+        switch_memory_pool_t **pool,
+        switch_originate_flag_t flags,
+        switch_call_cause_t *cancel_cause);
+switch_status_t khompRead(switch_core_session_t *session,
+        switch_frame_t **frame,
+        switch_io_flag_t flags,
+        int stream_id);
+switch_status_t khompWrite(switch_core_session_t *session,
+        switch_frame_t *frame,
+        switch_io_flag_t flags,
+        int stream_id);
+switch_status_t khompKill(switch_core_session_t *session,
+        int sig);
+switch_status_t khompDigit(switch_core_session_t *session,
+        const switch_dtmf_t *dtmf);
+switch_status_t khompReceiveMessage(switch_core_session_t *session,
+        switch_core_session_message_t *msg);
+switch_status_t khompReceiveEvent(switch_core_session_t *session,
+        switch_event_t *event);
+
+/*!
+ \ingroup fs_states
+ */
+switch_io_routines_t khomp_io_routines = {
+    khompCall,           /*.outgoing_channel */
+    khompRead,           /*.read_frame */
+    khompWrite,          /*.write_frame */
+    khompKill,           /*.kill_channel */
+    khompDigit,          /*.send_dtmf */
+    khompReceiveMessage, /*.receive_message */
+    khompReceiveEvent    /*.receive_event */
+};
+
+switch_io_routines_t khomp_sms_io_routines = {
+    NULL,           /*.outgoing_channel */
+    NULL,           /*.read_frame */
+    NULL,           /*.write_frame */
+    khompKill,      /*.kill_channel */
+    NULL,           /*.send_dtmf */
+    NULL,           /*.receive_message */
+    NULL            /*.receive_event */
+};
+
+switch_status_t khompPRWrite(switch_core_session_t *session,
+        switch_frame_t *frame,
+        switch_io_flag_t flags,
+        int stream_id);
+
+switch_io_routines_t khomp_pr_io_routines = {
+    NULL,                /*.outgoing_channel */
+    khompRead,           /*.read_frame */
+    khompPRWrite,        /*.write_frame */
+    khompKill,           /*.kill_channel */
+    NULL,                /*.send_dtmf */
+    NULL,                /*.receive_message */
+    NULL                 /*.receive_event */
+};
+
+/* Macros to define specific API functions */
+SWITCH_STANDARD_API(apiKhomp);
+
+/*!
+ \brief Print link status. [khomp show links]
+ */
+void apiPrintLinks(switch_stream_handle_t* stream, unsigned int device,
+        unsigned int link);
+/*!
+ \brief Print board channel status. [khomp show channels]
+ */
+void apiPrintChannels(switch_stream_handle_t* stream);
+
+/*!
+   \brief State methods they get called when the state changes to the specific state
+   returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
+   so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
+*/
+switch_status_t khompInit(switch_core_session_t *session)
+{
+    DBG(FUNC, "CHANNEL INIT")
+    switch_channel_t *channel = switch_core_session_get_channel(session);
+
+    if(!channel)
+    {
+        DBG(FUNC, D("Channel is NULL"));
+        return SWITCH_STATUS_FALSE;
+    }
+
+    /* Move channel's state machine to ROUTING. This means the call is trying
+       to get from the initial start where the call because, to the point
+       where a destination has been identified. If the channel is simply
+       left in the initial state, nothing will happen. */
+    switch_channel_set_state(channel, CS_ROUTING);
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t khompRouting(switch_core_session_t *session)
+{
+    DBG(FUNC, "CHANNEL ROUTING");
+    return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t khompExecute(switch_core_session_t *session)
+{
+
+    DBG(FUNC, "CHANNEL EXECUTE");
+    return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t khompHangup(switch_core_session_t *session)
+{
+    DBG(FUNC, D("c"));
+
+    Board::KhompPvt *tech_pvt = NULL;
+
+    if(!session)
+    {
+        LOG(ERROR, D("r (Session is NULL)"));
+        return SWITCH_STATUS_SUCCESS;
+    }
+    
+    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+    if(!tech_pvt)
+    {
+        DBG(FUNC, D("r (pvt is NULL)"));
+        return SWITCH_STATUS_FALSE;
+    }
+
+    try
+    {       
+        ScopedPvtLock lock(tech_pvt);
+
+        if(tech_pvt->freeState())
+        {
+            DBG(FUNC, PVT_FMT(tech_pvt->target(), "r (Already disconnected)"));
+            return SWITCH_STATUS_SUCCESS;
+        }
+
+        tech_pvt->setHangupCause(SWITCH_CAUSE_NORMAL_CLEARING, true);
+
+        //tech_pvt->doHangup();
+
+        lock.unlock();
+
+        CommandRequest c_req(CommandRequest::COMMAND, CommandRequest::CMD_HANGUP, tech_pvt->target().object);
+
+        Board::board(tech_pvt->target().device)->chanCommandHandler()->write(c_req);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(tech_pvt->target(), "r (unable to lock: %s!)") %  err._msg.c_str());
+        return SWITCH_STATUS_FALSE;
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(tech_pvt->target(), "r (unable to get device: %d!)") % err.device);
+        return SWITCH_STATUS_FALSE;
+    }
+
+    DBG(FUNC, D("r"))
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t khompPRHangup(switch_core_session_t *session)
+{
+    DBG(FUNC, D("CHANNEL HANGUP"))
+}
+
+
+switch_status_t khompDestroy(switch_core_session_t *session)
+{
+    DBG(FUNC, D("c"))
+
+    if(!session)
+    {
+        DBG(FUNC, D("r (session is null)"))
+        return SWITCH_STATUS_SUCCESS;
+    }
+    
+    Board::KhompPvt *tech_pvt = NULL;
+
+    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+
+    if(!tech_pvt)
+    {
+        DBG(FUNC, D("r (pvt is null)"))
+        return SWITCH_STATUS_FALSE;
+    }
+    try
+    {       
+        ScopedPvtLock lock(tech_pvt);
+
+        switch_core_session_set_private(session, NULL);
+        tech_pvt->destroyAll();
+    }
+    catch (ScopedLockFailed & err)
+    {
+        DBG(FUNC, PVT_FMT(tech_pvt->target(), "r (unable to lock: %s!)") %  err._msg.c_str());
+    }
+
+    DBG(FUNC, D("r"))
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t khompSMSDestroy(switch_core_session_t *session)
+{
+    DBG(FUNC, D("c"))
+
+    if(!session)
+    {
+        DBG(FUNC, D("r (session is null)"))
+        return SWITCH_STATUS_SUCCESS;
+    }
+/*    
+    Board::KhompPvt *tech_pvt = NULL;
+
+    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+
+    if(!tech_pvt)
+    {
+        DBG(FUNC, D("r (pvt is null)"))
+        return SWITCH_STATUS_FALSE;
+    }
+    
+    try
+    {       
+        ScopedPvtLock lock(tech_pvt);
+*/
+        switch_core_session_set_private(session, NULL);
+/*
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        DBG(FUNC, PVT_FMT(tech_pvt->target(), "r (unable to lock: %s!)") %  err._msg.c_str());
+    }
+*/
+
+    DBG(FUNC, D("r"))
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t khompKill(switch_core_session_t *session, int sig)
+{
+    //DBG(FUNC,FMT("CHANNEL KILL, kill = %d") % sig) 
+    Board::KhompPvt *tech_pvt = NULL;
+
+    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+
+    if(!tech_pvt)
+    {
+        return SWITCH_STATUS_FALSE;
+    }
+
+    switch (sig) 
+    {
+    case SWITCH_SIG_NONE:
+        DBG(FUNC, PVT_FMT(tech_pvt->target(), "CHANNEL KILL,  NONE!"));
+        break;
+    case SWITCH_SIG_KILL:
+        DBG(FUNC, PVT_FMT(tech_pvt->target(), "CHANNEL KILL, SIGKILL!"));
+        //switch_thread_cond_signal(tech_pvt->_cond);
+        break;
+    case SWITCH_SIG_XFER:
+        DBG(FUNC, PVT_FMT(tech_pvt->target(), "CHANNEL KILL, SIGXFER!"));
+        break;
+    case SWITCH_SIG_BREAK:
+        DBG(FUNC, PVT_FMT(tech_pvt->target(), "CHANNEL KILL, BREAK!"));
+        break;
+    default:
+        DBG(FUNC, PVT_FMT(tech_pvt->target(), "CHANNEL KILL, WHAT?!"));
+        break;
+    }
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t khompExchangeMedia(switch_core_session_t *session)
+{
+    DBG(FUNC, "CHANNEL LOOPBACK")
+    return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t khompSoftExecute(switch_core_session_t *session)
+{
+    DBG(FUNC, "CHANNEL TRANSMIT")
+    return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t khompDigit(switch_core_session_t *session, const switch_dtmf_t *dtmf)
+{
+    Board::KhompPvt *tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+    if(!tech_pvt)
+    {
+        LOG(ERROR, D("pvt is NULL"));
+        return SWITCH_STATUS_FALSE;
+    }
+    
+    DBG(FUNC, PVT_FMT(tech_pvt->target(), "c (%c)") % dtmf->digit);
+
+    try
+    {
+        ScopedPvtLock lock(tech_pvt);
+
+        char s[] = { dtmf->digit, '\0' };
+
+        tech_pvt->sendDtmf(s);
+    }
+    catch(ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(tech_pvt->target(), "r (unable to lock: %s!)") % err._msg.c_str());
+        return SWITCH_STATUS_FALSE;
+    }
+
+    DBG(FUNC, PVT_FMT(tech_pvt->target(), "r"));
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t khompRead(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
+{
+    Board::KhompPvt *tech_pvt = NULL;
+    //switch_time_t started = switch_time_now();
+    //unsigned int elapsed;
+    //switch_byte_t *data;
+
+    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+    if(!tech_pvt)
+    {
+        DBG(FUNC, D("pvt is NULL"))
+        return SWITCH_STATUS_FALSE;
+    }
+
+    *frame = NULL;
+
+    while (true)
+    {
+        /*
+        if (switch_test_flag(tech_pvt, TFLAG_BREAK))
+        {
+            switch_clear_flag_locked(tech_pvt, TFLAG_BREAK);
+
+            *frame = tech_pvt->_reader_frames.cng();
+            return SWITCH_STATUS_SUCCESS;
+        }
+        */
+
+        if (tech_pvt->call()->_flags.check(Kflags::LISTEN_UP))
+        {
+            *frame = tech_pvt->_reader_frames.pick();
+
+            if (!*frame)
+            {
+                //Reader buffer empty, waiting...
+                switch_cond_next();
+                continue;
+            }
+        }
+        else
+        {
+            switch_yield(20000);
+            *frame = tech_pvt->_reader_frames.cng();
+        }
+/*
+#ifdef BIGENDIAN
+        if (switch_test_flag(tech_pvt, TFLAG_LINEAR))
+        {
+            switch_swap_linear((*frame)->data, (int) (*frame)->datalen / 2);
+        }
+#endif
+*/
+        return SWITCH_STATUS_SUCCESS;
+    }
+
+    return SWITCH_STATUS_FALSE;
+}
+
+switch_status_t khompWrite(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
+{
+    Board::KhompPvt *tech_pvt = NULL;
+
+    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+    if(!tech_pvt)
+    {
+        LOG(ERROR, D("pvt is NULL"));
+        return SWITCH_STATUS_FALSE;
+    }
+
+/*
+#ifdef BIGENDIAN
+    if (switch_test_flag(tech_pvt, TFLAG_LINEAR))
+    {
+        switch_swap_linear(frame->data, (int) frame->datalen / 2);
+    }
+#endif
+*/
+
+    if (frame) // && frame->flags != SFF_CNG)
+    {
+        if(frame->datalen != 0 && tech_pvt->call()->_flags.check(Kflags::GEN_CO_RING))
+        {
+            tech_pvt->call()->_flags.clear(Kflags::GEN_CO_RING);
+
+            try
+            {
+                Board::board(tech_pvt->target().device)->_timers.del(tech_pvt->call()->_idx_co_ring);
+            }
+            catch (K3LAPI::invalid_device & err)
+            {
+                LOG(ERROR, PVT_FMT(tech_pvt->target(), "Unable to get device: %d!") % err.device);
+            }
+
+            if(tech_pvt->call()->_cadence != Board::KhompPvt::PLAY_VM_TONE)
+            {    
+                tech_pvt->stopCadence();
+            } 
+        }
+
+        if (!tech_pvt->_writer_frames.give((const char *)frame->data, (size_t)frame->datalen))
+        {
+            DBG(STRM, PVT_FMT(tech_pvt->target(), "Writer buffer full!"));
+            //Writer buffer full!
+        }
+    }
+
+    return SWITCH_STATUS_SUCCESS;
+
+}
+
+switch_status_t khompPRWrite(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
+{
+    /*
+    Board::KhompPvt *tech_pvt = NULL;
+
+    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+    if(!tech_pvt)
+    {
+        DBG(FUNC, D("pvt is NULL"));
+        return SWITCH_STATUS_FALSE;
+    }
+    */
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t khompAnswer(switch_core_session_t *session)
+{
+    Board::KhompPvt *tech_pvt;
+    switch_channel_t *channel = NULL;
+
+    channel = switch_core_session_get_channel(session);
+
+    if(!channel)
+    {
+        LOG(ERROR, D("channel is NULL"));
+        return SWITCH_STATUS_FALSE;
+    }
+
+    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+    
+    if(!tech_pvt)
+    {
+        LOG(ERROR, D("pvt is NULL"));
+        return SWITCH_STATUS_FALSE;
+    }
+
+    DBG(FUNC, PVT_FMT(tech_pvt->target(), "CHANNEL ANSWER"));
+
+    try
+    {
+        ScopedPvtLock lock(tech_pvt);
+
+        if(!tech_pvt->session() || !tech_pvt->call()->_flags.check(Kflags::IS_INCOMING))
+        {
+            LOG(ERROR, PVT_FMT(tech_pvt->target(), "Channel is not connected"));
+            return SWITCH_STATUS_FALSE;
+        }
+
+        tech_pvt->getSpecialVariables();
+
+        tech_pvt->setVolume();
+
+        tech_pvt->setCollectCall();
+
+        if (!tech_pvt->call()->_flags.check(Kflags::CONNECTED))
+        {
+            /* we can unlock it now */
+            lock.unlock();
+
+            CommandRequest c_req(CommandRequest::COMMAND, CommandRequest::CMD_ANSWER, tech_pvt->target().object);
+
+            Board::board(tech_pvt->target().device)->chanCommandHandler()->write(c_req);
+
+        }
+        else
+        {
+            DBG(FUNC, PVT_FMT(tech_pvt->target(), "channel is already connected"));
+        }
+
+        //Esperar o atendimento EV_CONNECT
+        //if (!khomp_pvt::loop_while_flag_timed(pvt, c, kflags::REALLY_CONNECTED, timeout, &lock, false)) { return SWITCH_STATUS_FALSE; }
+
+
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, D("unable to get device: %d!") % err.device);
+        return SWITCH_STATUS_FALSE;
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to lock: %s!") % err._msg.c_str());
+        return SWITCH_STATUS_FALSE;
+
+    }
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t khompReceiveMessage(switch_core_session_t *session, switch_core_session_message_t *msg)
+{
+    Board::KhompPvt *tech_pvt;
+    
+    if(!session)
+    {
+        LOG(ERROR, D("session is NULL"));
+        return SWITCH_STATUS_FALSE;
+    }
+
+    if(!msg)
+    {
+        LOG(ERROR, D("msg is NULL"));
+        return SWITCH_STATUS_FALSE;
+    }
+
+    tech_pvt = (Board::KhompPvt *) switch_core_session_get_private(session);
+    if(!tech_pvt)
+    {
+        LOG(ERROR, D("pvt is NULL"));
+        return SWITCH_STATUS_FALSE;
+    }
+    
+    switch (msg->message_id) {
+        case SWITCH_MESSAGE_REDIRECT_AUDIO:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_REDIRECT_AUDIO")); 
+            break;
+        case SWITCH_MESSAGE_TRANSMIT_TEXT:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_TRANSMIT_TEXT")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_ANSWER:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_ANSWER")); 
+            return khompAnswer(session);
+            break;
+        case SWITCH_MESSAGE_INDICATE_PROGRESS:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_PROGRESS")); 
+            tech_pvt->indicateProgress();
+            break;
+        case SWITCH_MESSAGE_INDICATE_BRIDGE:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_BRIDGE")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_UNBRIDGE:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_UNBRIDGE")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_TRANSFER:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_TRANSFER")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_RINGING:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_RINGING")); 
+            tech_pvt->indicateRinging();
+            break;
+        case SWITCH_MESSAGE_INDICATE_MEDIA:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_MEDIA")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_NOMEDIA:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_NOMEDIA")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_HOLD:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_HOLD")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_UNHOLD:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_UNHOLD")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_REDIRECT:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_REDIRECT")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_RESPOND:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_RESPOND")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_BROADCAST:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_BROADCAST")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_DEFLECT:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_DEFLECT")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_DISPLAY:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_DISPLAY")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_AUDIO_SYNC")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_REQUEST_IMAGE_MEDIA:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_REQUEST_IMAGE_MEDIA")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_UUID_CHANGE:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_UUID_CHANGE")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_SIMPLIFY:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_SIMPLIFY")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_DEBUG_AUDIO:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_DEBUG_AUDIO")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_PROXY_MEDIA:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_PROXY_MEDIA")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC")); 
+            break;
+        case SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC_COMPLETE:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC_COMPLETE")); 
+            break;
+        case SWITCH_MESSAGE_INVALID:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INVALID")); 
+            break;
+        default:
+            DBG(FUNC, PVT_FMT(tech_pvt->_target, "unknown message received [%d].") % msg->message_id % (msg->from ? msg->from : 0)); 
+            break;
+    }
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+/*!
+  \brief Make sure when you have 2 sessions in the same scope that you pass
+  the appropriate one to the routines that allocate memory or you will have
+  1 channel with memory allocated from another channel's pool!
+*/
+switch_call_cause_t khompCall
+        (switch_core_session_t *session,
+         switch_event_t *var_event,
+         switch_caller_profile_t *outbound_profile,
+         switch_core_session_t **new_session,
+         switch_memory_pool_t **pool,
+         switch_originate_flag_t flags,
+         switch_call_cause_t *cancel_cause)
+{
+    if (!outbound_profile)
+    {
+        LOG(ERROR, D("No caller profile"));
+        //switch_core_session_destroy(new_session);
+        return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
+    }
+
+    Board::KhompPvt *tech_pvt;
+    int cause = (int)SWITCH_CAUSE_SUCCESS;
+    
+    try
+    {
+        ScopedAllocLock alloc_lock;
+
+        // got the pvt
+        tech_pvt = processDialString(outbound_profile->destination_number,&cause);
+
+        if(tech_pvt == NULL || cause != SWITCH_CAUSE_SUCCESS)
+        {
+            LOG(ERROR, D("unable to find free channel"));
+            return (cause == SWITCH_CAUSE_SUCCESS) ? SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER : (switch_call_cause_t) cause;
+        }
+
+        ScopedPvtLock lock(tech_pvt);
+
+        if(tech_pvt->justAlloc(false, pool) != SWITCH_STATUS_SUCCESS)
+        {
+            tech_pvt->cleanup(Board::KhompPvt::CLN_HARD);
+            LOG(ERROR, PVT_FMT(tech_pvt->target(), "Initilization Error!"));
+            return SWITCH_CAUSE_UNALLOCATED_NUMBER; 
+        }
+
+        tech_pvt->owner((session ? session : tech_pvt->session()));
+        // get the session to FS
+        *new_session = tech_pvt->session();
+
+        if(tech_pvt->justStart(outbound_profile) != SWITCH_STATUS_SUCCESS)
+        {
+            *new_session = NULL;
+            tech_pvt->cleanup(Board::KhompPvt::CLN_HARD);
+            LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to justStart"));
+            return SWITCH_CAUSE_UNALLOCATED_NUMBER;
+        }
+
+        alloc_lock.unlock();
+        
+        tech_pvt->getSpecialVariables();
+
+        tech_pvt->setVolume();
+        
+        if(tech_pvt->makeCall() != ksSuccess)
+        {
+            *new_session = NULL;
+            tech_pvt->cleanup(Board::KhompPvt::CLN_HARD);
+            LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to makeCall"));
+            return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
+        }
+
+        tech_pvt->setFSChannelVar("KCallAnswerInfo", "Unknown");
+    }
+    catch(ScopedLockFailed & err)
+    {
+        if(err._fail == ScopedLockFailed::ALLOC_FAILED)
+        {
+            LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to global alloc lock"));
+        }
+        else
+        {
+            tech_pvt->cleanup(Board::KhompPvt::CLN_HARD);
+            LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to lock: %s!") % err._msg.c_str());
+        }
+        return SWITCH_CAUSE_INTERWORKING;
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(tech_pvt->target(), "%s") % err._msg.c_str());
+    }
+
+    return SWITCH_CAUSE_SUCCESS;
+}
+
+switch_status_t khompReceiveEvent(switch_core_session_t *session, switch_event_t *event)
+{
+    struct Board::KhompPvt *tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+    char *body = switch_event_get_body(event);
+    //switch_assert(tech_pvt != NULL);
+
+    if(!tech_pvt)
+    {
+        LOG(ERROR, D("pvt is NULL"));
+        return SWITCH_STATUS_FALSE;
+    }
+    
+    DBG(FUNC, PVT_FMT(tech_pvt->target(), "Receive Event id[%d] name[%s] body=[%s]") % event->event_id % event->headers->name % body); 
+
+    if (!body) {
+        body = (char *)"";
+    }
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+/* A simple idea of app */
+SWITCH_STANDARD_APP(klogFunction)
+{
+    if (zstr(data)) 
+    {
+        LOG(ERROR, D("No data specified"));
+    } 
+    else 
+    {
+        LOG(MESSAGE, FMT("KLOG: %s") %  std::string(data));
+    }
+}
+
+void setVariable(switch_core_session_t * session, const char * variable, const char * data)
+{
+    if(!session)
+    {
+        LOG(ERROR, FMT("Session is NULL in %s") % variable);
+        return;
+    }
+
+    if (zstr(data)) 
+    {
+        LOG(ERROR, FMT("No %s specified") % variable);
+        return;
+    } 
+
+    if(strcasecmp(data, "on") && strcasecmp(data, "off"))
+    {
+        LOG(ERROR, FMT("On %s specify on or off") % variable);
+        return;
+    }
+
+    switch_channel_t *c = switch_core_session_get_channel(session);
+
+    if(!c)
+    {
+        LOG(ERROR, FMT("Channel is NULL in %s") % variable);
+        return;
+    }
+
+    switch_channel_set_variable(c, variable, (!strcasecmp(data, "on") ? "true" : "false" ));
+
+    DBG(FUNC,FMT("%s set %s") % variable % data);
+}
+
+SWITCH_STANDARD_APP(kdtmfSuppressionFunction)
+{
+    setVariable(session, "KDTMFSuppression", data);
+}
+
+SWITCH_STANDARD_APP(kechoCancellerFunction)
+{
+    setVariable(session, "KEchoCanceller", data);
+}
+
+SWITCH_STANDARD_APP(kautoGainControlFunction)
+{
+    setVariable(session, "KAutoGainControl", data);
+}
+
+SWITCH_STANDARD_APP(kr2SendConditionFunction)
+{
+    setVariable(session, "KR2SendCondition", data);
+}
+
+SWITCH_STANDARD_APP(kadjustForFaxFunction)
+{
+    if(!session)
+    {
+        LOG(ERROR, D("Session is NULL"));
+        return;
+    }
+    
+    Board::KhompPvt *tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+
+    if(!tech_pvt)
+    {
+        LOG(ERROR, D("pvt is NULL"));
+        return;
+    }
+
+    DBG(FUNC, PVT_FMT(tech_pvt->target(), "Application KAdjustForFax"));
+
+    try
+    {
+        ScopedPvtLock lock(tech_pvt);
+
+        if(tech_pvt->application(FAX_ADJUST, session, data))
+        {
+            /* adjust the flag */
+            tech_pvt->call()->_flags.set(Kflags::FAX_DETECTED);
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to lock: %s!") %  err._msg.c_str());
+        return;
+    }
+}
+
+SWITCH_STANDARD_APP(ksendFaxFunction)
+{
+    if(!session)
+    {
+        LOG(ERROR, D("Session is NULL"));
+        return;
+    }
+    
+
+    Board::KhompPvt *tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+
+    if(!tech_pvt)
+    {
+        LOG(ERROR, D("pvt is NULL"));
+        return;
+    }
+
+    DBG(FUNC, PVT_FMT(tech_pvt->target(), "Application KSendFax"));
+
+    tech_pvt->application(FAX_SEND, session, data);
+}
+
+SWITCH_STANDARD_APP(kreceiveFaxFunction)
+{
+    if(!session)
+    {
+        LOG(ERROR, D("Session is NULL"));
+        return;
+    }
+    
+
+    Board::KhompPvt *tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+
+    if(!tech_pvt)
+    {
+        LOG(ERROR, D("pvt is NULL"));
+        return;
+    }
+    
+    DBG(FUNC, PVT_FMT(tech_pvt->target(), "Application KReceiveFax"));
+
+    tech_pvt->application(FAX_RECEIVE, session, data);
+}
+
+SWITCH_STANDARD_APP(kUserTransferFunction)
+{
+    if(!session)
+    {
+        LOG(ERROR, D("Session is NULL"));
+        return;
+    }
+    
+    if (zstr(data)) 
+    {
+        LOG(ERROR, D("No number specified"));
+        return;
+    } 
+
+    Board::KhompPvt *tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
+
+    if(!tech_pvt)
+    {
+        DBG(FUNC, D("pvt is NULL"));
+        return;
+    }
+    
+    DBG(FUNC, PVT_FMT(tech_pvt->target(), "Application KUserTransfer"));
+
+    tech_pvt->application(USER_TRANSFER, session, data);
+}
+
+SWITCH_STANDARD_APP(ksetVolumeFunction)
+{
+    if(!session)
+    {
+        LOG(ERROR, D("Session is NULL"));
+        return;
+    }
+
+    if (zstr(data)) 
+    {
+        LOG(ERROR, D("No KSetVolume specified"));
+        return;
+    } 
+
+    switch_channel_t *c = switch_core_session_get_channel(session);
+
+    if(!c)
+    {
+        LOG(ERROR, D("Channel is NULL"));
+        return;
+    }
+
+    switch_channel_set_variable(c, "KSetVolume", data);
+
+    DBG(FUNC, FMT("KSetVolume set %s") % data);
+}
+
+SWITCH_STANDARD_APP(kSendSMSFunction)
+{
+    if(!session)
+    {
+        LOG(ERROR, D("Session is NULL"));
+        return;
+    }
+
+    switch_channel_t *channel = switch_core_session_get_channel(session);
+
+    if(!channel)
+    {
+        LOG(ERROR, D("Channel is NULL"));
+        return;
+    }
+
+    switch_channel_set_variable(channel, "KSmsDelivered", "no");
+    switch_channel_set_variable(channel, "KSmsErrorCode", "42");
+    switch_channel_set_variable(channel, "KSmsErrorName", Verbose::gsmSmsCause((KGsmSmsCause)42).c_str());
+
+    if (zstr(data))
+    {
+        LOG(ERROR, D("No data specified"));
+        return;
+    }
+
+    int cause = (int)SWITCH_CAUSE_SUCCESS;
+
+    try
+    {
+        ScopedAllocLock alloc_lock;
+
+        Board::KhompPvt *tech_pvt = processSMSString(data, &cause);
+
+        if(!tech_pvt)
+        {
+            DBG(FUNC, D("pvt is NULL, cause '%d'") % cause);
+            return;
+        }
+
+        DBG(FUNC, PVT_FMT(tech_pvt->target(), "Application KSendSMS"));
+
+        ScopedPvtLock lock(tech_pvt);
+
+        alloc_lock.unlock();
+        
+        tech_pvt->application(SMS_SEND, session, data);
+
+    }
+    catch(ScopedLockFailed & err)
+    {
+        if(err._fail == ScopedLockFailed::ALLOC_FAILED)
+        {
+            LOG(ERROR, D("unable to global alloc lock"));
+        }
+        else
+        {
+            LOG(ERROR, D("unable to lock: %s!") % err._msg.c_str());
+        }
+    }
+
+}
+
+SWITCH_STANDARD_APP(kSelectSimCardFunction)
+{
+    if(!session)
+    {
+        LOG(ERROR, D("Session is NULL"));
+        return;
+    }
+
+    if (zstr(data))
+    {    
+        LOG(ERROR, D("invalid number of arguments"));
+        return;
+    }    
+
+    int dev = -1;
+    int obj = -1;
+
+    try
+    {
+        std::string datastr((const char*) data);
+        Strings::trim(datastr);
+
+        Strings::vector_type params;
+        Strings::tokenize(datastr, params, "|,",3);
+
+        std::string num("0");
+
+        if (params.size() == 3)
+        {    
+            dev = Strings::tolong(params[0]);
+            obj = Strings::tolong(params[1]);
+            num = params[2];
+
+            /* just check for validity */
+            (void)Strings::tolong(params[2]);
+        }    
+        else
+        {
+            LOG(ERROR, D("Invalid number of arguments!"));
+            return;
+        }
+
+        if (!Globals::k3lapi.valid_device(dev))
+        {
+            LOG(ERROR, D("ERROR: Invalid device number '%d'!") % dev);
+            return;
+        }
+
+        if (!Globals::k3lapi.valid_channel(dev, obj))
+        {
+            LOG(ERROR, D("ERROR: Invalid channel number '%d' on device '%d'!") % obj % dev);
+            return;
+        }
+
+        if(!Board::get(dev, obj)->application(SELECT_SIM_CARD, NULL, num.c_str()))
+        {
+            LOG(ERROR, D("ERROR: Unable to select sim card"));
+        }
+    }
+    catch (Strings::invalid_value & e)
+    {
+        LOG(ERROR, D("invalid numeric value: %s") % e.value());
+    }
+    catch(...)
+    {
+        LOG(ERROR, D("ERROR: Unable to select sim card"));
+    }
+}
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load)
+{
+    /* start log early */
+    if(!K::Logger::start())
+    {
+        return SWITCH_STATUS_FALSE;
+    }
+
+    /* Two bodies can not occupy the same space at the same time */ 
+    if(switch_loadable_module_exists("mod_kommuter") == SWITCH_STATUS_SUCCESS)
+    {   
+        LOG(ERROR, D("Kommuter module for FreeSWITCH is already loaded."));
+        return SWITCH_STATUS_FALSE;
+    } 
+
+    //TODO: must put the autorevision variable here
+    LOG(MESSAGE, "loading Khomp module");
+
+    /* get a reference for the module pool */
+    Globals::module_pool = pool;
+
+    /* start config system! */
+    Opt::initialize();
+
+    if(!Board::initializeK3L())
+    {
+        return SWITCH_STATUS_TERM;
+    }
+
+    /* read configuration first */
+    Opt::obtain();
+
+    /*
+       Spawn our k3l global var that will be used along the module
+       for sending info to the boards
+    */
+
+    if(!Board::initialize())
+    {
+        LOG(ERROR, "Error while initialize Board struct");
+        return SWITCH_STATUS_TERM;
+    }
+
+    /* apply global volume now */
+    if(Opt::_input_volume != 0 || Opt::_output_volume != 0)
+        Board::applyGlobalVolume();
+
+    Opt::commit();
+
+    /* create module interface, set state handlers and give a name */
+    *module_interface = switch_loadable_module_create_module_interface(pool, "mod_khomp");
+    Globals::khomp_endpoint_interface = static_cast<switch_endpoint_interface_t*>(switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE));
+    Globals::khomp_endpoint_interface->interface_name = "khomp";
+    Globals::khomp_endpoint_interface->io_routines = &khomp_io_routines;
+    Globals::khomp_endpoint_interface->state_handler = &khomp_state_handlers;
+
+
+    Globals::khomp_sms_endpoint_interface = static_cast<switch_endpoint_interface_t*>(switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE));
+    Globals::khomp_sms_endpoint_interface->interface_name = "khomp_SMS";
+    Globals::khomp_sms_endpoint_interface->io_routines = &khomp_sms_io_routines;
+    Globals::khomp_sms_endpoint_interface->state_handler = &khomp_sms_state_handlers;
+    
+    Globals::khomp_pr_endpoint_interface = static_cast<switch_endpoint_interface_t*>(switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE));
+    Globals::khomp_pr_endpoint_interface->interface_name = "khomp_PR";
+    Globals::khomp_pr_endpoint_interface->io_routines = &khomp_pr_io_routines;
+    Globals::khomp_pr_endpoint_interface->state_handler = &khomp_pr_state_handlers;
+
+    /* Register cli commands */
+    Cli::registerCommands(apiKhomp,module_interface);
+
+    /* Add applications */
+    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KLog", "KLog", "KLog log every string to khomp log system", klogFunction, "<value>", SAF_SUPPORT_NOMEDIA);
+    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KDTMFSuppression", "KDTMFSuppression", "KDTMFSuppresion", kdtmfSuppressionFunction, "on|off", SAF_SUPPORT_NOMEDIA);
+    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KEchoCanceller", "KEchoCanceller", "KEchoCanceller", kechoCancellerFunction, "on|off", SAF_SUPPORT_NOMEDIA);
+    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KAutoGainControl", "KAutoGainControl", "KAutoGainControl", kautoGainControlFunction, "on|off", SAF_SUPPORT_NOMEDIA);
+    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KSetVolume", "KSetVolume", "KSetVolume", ksetVolumeFunction, "value|value", SAF_SUPPORT_NOMEDIA);
+    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KR2SendCondition", "KR2SendCondition", "KR2SendCondition", kr2SendConditionFunction, "value|value", SAF_SUPPORT_NOMEDIA);
+    
+    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KAdjustForFax", "KAdjustForFax", "KAdjustForFax", kadjustForFaxFunction, "", SAF_SUPPORT_NOMEDIA);
+    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KSendFax", "KSendFax", "KSendFax", ksendFaxFunction, "<infilename>[:<infilename2>[:...]][|<faxid>]", SAF_SUPPORT_NOMEDIA);
+    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KReceiveFax", "KReceiveFax", "KReceiveFax", kreceiveFaxFunction, "<outfilename>[|<faxid>]", SAF_SUPPORT_NOMEDIA);
+    
+    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KUserTransfer", "KUserTransfer", "KUserTransfer", kUserTransferFunction, "number", SAF_SUPPORT_NOMEDIA);
+    
+    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KSendSMS", "KSendSMS", "KSendSMS", kSendSMSFunction, "resource|destination|message", SAF_SUPPORT_NOMEDIA);
+
+    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KSelectSimCard", "KSelectSimCard", "KSelectSimCard", kSelectSimCardFunction, "<board>|<channel>|<sim_card>", SAF_SUPPORT_NOMEDIA);
+
+    Board::initializeHandlers();
+
+    Board::kommuter.start();
+
+    /* indicate that the module should continue to be loaded */
+    return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_khomp_shutdown)
+{
+    Board::kommuter.stop();
+
+    Cli::unregisterCommands();
+
+    /* Finnish him! */
+    DBG(FUNC, "Unloading mod_khomp...")
+
+    Board::finalizeHandlers();
+
+    Board::finalize();
+    
+    DBG(FUNC, "Successfully Unloaded mod_khomp")
+
+    K::Logger::stop();
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+/*!
+   \brief khomp API definition
+   TODO: Add as xml modifier
+*/
+SWITCH_STANDARD_API(apiKhomp)
+{
+    char *argv[10] = { 0 };
+    int argc = 0;
+    void *val;
+    char *myarg = NULL;
+    switch_status_t status = SWITCH_STATUS_SUCCESS;
+
+    /* We should not ever get a session here */
+    if (session) return SWITCH_STATUS_FALSE;
+
+    /* Set the stream for Cli class */
+    Cli::setStream(stream);
+
+    if (zstr(cmd))
+    {
+        Cli::printKhompUsage();
+        return status;
+    }
+
+    if (!(myarg = strdup(cmd))) return SWITCH_STATUS_MEMERR;
+
+
+    if ((argc = switch_separate_string(myarg, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 1) {
+        Cli::printKhompUsage();
+        goto done;
+    }
+
+    /* Parse all commands */
+    Cli::parseCommands(argc,argv);
+
+done:
+    switch_safe_free(myarg);
+    return status;
+}
+
+extern "C" void Kstdcall khompAudioListener (int32 deviceid, int32 objectid, byte * read_buffer, int32 read_size)
+{
+    try
+    {
+    
+    //If NULL get throws K3LAPI::invalid_channel exception.
+    Board::KhompPvt * pvt = Board::get(deviceid, objectid);
+
+    /* add listener audio to the read buffer */
+    if (!pvt->_reader_frames.give((const char *)read_buffer, read_size))
+    {
+        DBG(STRM, PVT_FMT(pvt->target(), "Reader buffer full (read_size: %d)") % read_size);
+    }
+
+    if (!pvt->call()->_flags.check(Kflags::STREAM_UP))
+    {
+        DBG(STRM, PVT_FMT(pvt->target(), "Stream not enabled, skipping write..."));
+        return;
+    }
+    
+    /* will be used below for CM_ADD_STREAM_BUFFER */
+    struct
+    {
+        const byte * buff;
+        size_t       size;
+    }
+    write_packet = { (const byte *)0, 0 };
+    
+    /* push audio from the write buffer */
+    switch_frame_t * fr = pvt->_writer_frames.pick();
+
+    if (!fr)
+    {
+        //Writer buffer empty!
+        DBG(STRM, PVT_FMT(pvt->target(), "Writer buffer empty (silence to board)"));
+
+        write_packet.buff = (const byte *) Board::_cng_buffer;
+        write_packet.size = (size_t)       Globals::boards_packet_size;
+
+        pvt->command(KHOMP_LOG, CM_ADD_STREAM_BUFFER,
+                (const char *)&write_packet);
+        return;
+    }
+
+
+    /* what is the frame type? */
+    switch (fr->flags)
+    {
+        case SFF_NONE:
+        {
+            write_packet.buff = (const byte *) fr->data;
+            write_packet.size = (size_t)       fr->datalen;
+
+
+            pvt->command(KHOMP_LOG, CM_ADD_STREAM_BUFFER,
+                    (const char *)&write_packet);
+
+            break;
+        }
+
+        case SFF_CNG:
+        {
+            write_packet.buff = (const byte *) Board::_cng_buffer;
+            write_packet.size = (size_t)       Globals::boards_packet_size;
+
+            pvt->command(KHOMP_LOG, CM_ADD_STREAM_BUFFER,
+                    (const char *)&write_packet);
+
+            break;
+        }
+
+        default:
+            DBG(FUNC, PVT_FMT(pvt->target(), "DROPPING AUDIO..."));
+            /* TODO: log something here... */
+            break;
+    }
+
+    }
+    catch (K3LAPI::invalid_channel & err)
+    {
+        LOG(ERROR, OBJ_FMT(deviceid, objectid, "Invalid channel..."));
+        return;
+    }
+    catch (...)
+    {
+        LOG(ERROR, OBJ_FMT(deviceid, objectid, "Unexpected error..."));
+        return;
+    }
+}
+
+/* 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 expandtab:
+ */
diff --git a/src/mod/endpoints/mod_khomp/src/applications.cpp b/src/mod/endpoints/mod_khomp/src/applications.cpp
new file mode 100644
index 0000000000..d4a50e0adb
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/applications.cpp
@@ -0,0 +1,969 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include "applications.h"
+#include "lock.h"
+
+bool Fax::adjustForFax()
+{
+    /* Don't worry, let the man work */
+    DBG(FUNC, PVT_FMT(_pvt->target(),"Channel is now being adjusted for fax!"));
+    
+    try
+    {
+        ScopedPvtLock lock(_pvt);
+
+        _pvt->echoCancellation(false);
+        _pvt->dtmfSuppression(false);
+        _pvt->autoGainControl(false);
+
+        _pvt->call()->_input_volume = 0;
+        _pvt->setVolume("input" , 0);
+        _pvt->call()->_output_volume = 0;
+        _pvt->setVolume("output", 0);
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "r (unable to lock: %s!)") %  err._msg.c_str());
+        return false;
+    }
+
+    return true;
+}
+
+bool Fax::sendFax(switch_core_session_t * session, const char *data)
+{
+    DBG(FUNC, PVT_FMT(_pvt->target(), "c (%s)") % data);
+
+    try
+    {
+        switch_channel_t *channel = _pvt->getFSChannel(session);
+
+        switch_channel_set_variable(channel, "KFaxSent", "no");
+        switch_channel_set_variable(channel, "KFaxResult", "none");
+
+        std::string           fax_string((const char *)data);
+        Strings::vector_type  fax_args;
+        Strings::vector_type  fax_files;
+
+        Strings::tokenize(fax_string, fax_args, "|,");
+
+        if(fax_args.size() != 1 && fax_args.size() != 2)
+        {
+            LOG(ERROR, PVT_FMT(_pvt->target(), "r (invalid string '%s': wrong number of separators.)") % fax_string);
+            return false;
+        }
+
+        Strings::tokenize(fax_args[0], fax_files, ":");
+
+        if(fax_files.size() <= 0)
+        {
+            LOG(ERROR, PVT_FMT(_pvt->target(), "r (invalid string '%s': wrong number of separators.)") % fax_string);
+            return false;
+        }
+
+        ScopedPvtLock lock(_pvt);
+
+        std::string id;
+        
+        if(fax_args.size() == 2)
+        {
+            id = fax_args[1];
+        }
+        else if(!_pvt->call()->_orig_addr.empty())
+        {
+            id = _pvt->call()->_orig_addr;
+        }
+
+        const char * orig_addr = id.empty() ? NULL : id.c_str();
+
+        int timeout = 5;
+
+        if(!_pvt->call()->_flags.check(Kflags::REALLY_CONNECTED) && !_pvt->loopWhileFlagTimed(Kflags::REALLY_CONNECTED, timeout, false))
+            return false;
+        
+        if(!startFaxTX(orig_addr))
+        {
+            LOG(ERROR, PVT_FMT(_pvt->target(), "r (unable to start send fax)"));
+            return false;
+        }
+
+        for(unsigned int i = 0; i < fax_files.size() ; ++i)
+        {
+            if (!addFaxFile(fax_files[i].c_str(), (i == fax_files.size()-1)? true : false))
+            {
+                DBG(FUNC, D("unable to add fax file='%s'")
+                        % fax_files[i].c_str());
+            }
+        }
+        
+        _fax_cond.reset();
+
+        lock.unlock();
+
+        _fax_cond.wait();
+        
+        switch_channel_set_variable(channel, "KFaxSent", ((_fax_result == kfaxrEndOfTransmission) ? "yes" : "no"));
+        switch_channel_set_variable(channel, "KFaxResult", (Verbose::faxResult((KFaxResult)_fax_result).c_str()));
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "r (unable to lock: %s!)") %  err._msg.c_str());
+        return false;
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "r (%s)") % err._msg.c_str());
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_pvt->target(), "r"));
+    return true;
+}
+
+
+bool Fax::receiveFax(switch_core_session_t * session, const char *data)
+{
+    DBG(FUNC, PVT_FMT(_pvt->target(), "c (%s)") % data);
+
+    try
+    {
+        switch_channel_t *channel = _pvt->getFSChannel(session);
+
+        switch_channel_set_variable(channel, "KFaxReceived", "no");
+        switch_channel_set_variable(channel, "KFaxResult", "none");
+
+        std::string          fax_string((const char *)data);
+        Strings::vector_type fax_args;
+
+        Strings::tokenize(fax_string, fax_args, "|,");
+
+        if(fax_args.size() != 1 && fax_args.size() != 2)
+        {
+            LOG(ERROR, PVT_FMT(_pvt->target(), "r (invalid string '%s': wrong number of separators.)") % fax_string);
+            return false;
+        }
+
+        ScopedPvtLock lock(_pvt);
+
+        std::string id;
+
+        if(fax_args.size() == 2)
+        {
+            id = fax_args[1];
+        }
+        else if(!_pvt->call()->_dest_addr.empty())
+        {
+            id = _pvt->call()->_dest_addr;
+        }
+
+        const char * orig_addr = id.empty() ? NULL : id.c_str();
+
+        int timeout = 5;
+
+        if(!_pvt->call()->_flags.check(Kflags::REALLY_CONNECTED) && !_pvt->loopWhileFlagTimed(Kflags::REALLY_CONNECTED, timeout, false))
+            return false;
+
+        if(!startFaxRX(fax_args[0].c_str(), orig_addr))
+        {
+            LOG(ERROR, PVT_FMT(_pvt->target(), "r (unable to start receive fax)"));
+            return false;
+        }
+        
+        _fax_cond.reset();
+
+        lock.unlock();
+
+        _fax_cond.wait();
+
+        switch_channel_set_variable(channel, "KFaxReceived", ((_fax_result == kfaxrEndOfReception) ? "yes" : "no"));
+        switch_channel_set_variable(channel, "KFaxResult", (Verbose::faxResult((KFaxResult)_fax_result).c_str()));
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "r (unable to lock: %s!)") %  err._msg.c_str());
+        return false;
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "r (%s)") % err._msg.c_str());
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_pvt->target(), "r"));
+
+    return true;
+}
+
+bool Fax::onFaxChannelRelease(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_pvt->target(), "c"));
+
+    try
+    {
+        ScopedPvtLock lock(_pvt);
+
+        if (_pvt->call()->_flags.check(Kflags::FAX_SENDING))
+        {
+            _pvt->call()->_flags.clear(Kflags::FAX_SENDING);
+
+            /* make audio come back.. */
+            _pvt->startStream(false);
+            _pvt->startListen();
+        }
+        else if (_pvt->call()->_flags.check(Kflags::FAX_RECEIVING))
+        {
+            _pvt->call()->_flags.clear(Kflags::FAX_RECEIVING);
+
+            /* make audio come back.. */
+            _pvt->startStream(false);
+            _pvt->startListen();
+        }
+
+        _fax_result = (KFaxResult)e->AddInfo;
+
+        _fax_cond.signal();
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "r (unable to lock %s!)") % err._msg.c_str());
+        return false;
+    };
+
+    DBG(FUNC, PVT_FMT(_pvt->target(), "r"));
+
+    return true;
+}
+
+bool Fax::startFaxTX(const char * orig_addr)
+{
+    /* no audio after this point, so stop streams! */
+    _pvt->stopStream(false);
+    _pvt->stopListen();
+
+    std::string id;
+
+    if(orig_addr)
+        id = STG(FMT("orig_addr=\"%s\"") % orig_addr);
+
+    const char * param = id.empty() ? NULL : id.c_str();
+
+
+    if (!_pvt->command(KHOMP_LOG, CM_START_FAX_TX, param))
+    {
+        _pvt->startStream(false);
+        _pvt->startListen();
+        return false;
+    }
+
+    _pvt->call()->_flags.set(Kflags::FAX_SENDING);
+
+    return true;
+
+}
+
+bool Fax::stopFaxTX(void)
+{
+    /* EV_FAX_CHANNEL_FREE , EV_FAX_FILE_FAIL */
+    if (!_pvt->command(KHOMP_LOG, CM_STOP_FAX_TX))
+        return false;
+
+    _pvt->call()->_flags.clear(Kflags::FAX_SENDING);
+
+    /* make audio come back.. */
+    _pvt->startStream(false);
+    _pvt->startListen();
+
+    return true;
+}
+
+
+
+bool Fax::startFaxRX(const char * filename, const char * orig_addr)
+{
+    if(!filename)
+        return false;
+
+    std::string param = STG(FMT("filename=\"%s\"") % filename);
+
+    if(orig_addr)
+        param += STG(FMT(" orig_addr=\"%s\"") % orig_addr);
+
+    /* no audio after this point, so stop streams! */
+    _pvt->stopStream(false);
+    _pvt->stopListen();
+
+    if (!_pvt->command(KHOMP_LOG, CM_START_FAX_RX, param.c_str()))
+    {
+        _pvt->startStream(false);
+        _pvt->startListen();
+        return false;
+    }
+
+    _pvt->call()->_flags.set(Kflags::FAX_RECEIVING);
+
+    return true;
+}
+
+bool Fax::stopFaxRX()
+{
+    /* Events: EV_FAX_CHANNEL_FREE */
+    if (!_pvt->command(KHOMP_LOG, CM_STOP_FAX_RX))
+        return false;
+
+    _pvt->call()->_flags.clear(Kflags::FAX_RECEIVING);
+
+    /* make audio come back.. */
+    _pvt->startStream(false);
+    _pvt->startListen();
+
+    return true;
+}
+
+bool Fax::addFaxFile(const char * filename, bool last)
+{
+    /* Events: EV_FAX_FILE_SENT , EV_FAX_FILE_FAIL , EV_FAX_TX_TIMEOUT */
+    if(!filename)
+        return false;
+
+    std::string params = STG(FMT("filename=\"%s\" last=\"%s\"") % filename
+            % (last ? "true": "false"));
+
+    if (!_pvt->command(KHOMP_LOG, CM_ADD_FAX_FILE, params.c_str()))
+        return false;
+
+    return true;
+}
+
+/******************************************************************************/
+bool SMS::justAlloc(unsigned int count)
+{
+    /* incoming contexts */
+    MatchExtension::ContextListType contexts;
+
+    contexts.push_back(Opt::_context_gsm_sms);
+
+    /* temporary variables */
+    std::string context;
+    std::string exten("s");
+
+    K3L_DEVICE_CONFIG & dev_cfg = Globals::k3lapi.device_config(_pvt->_target.device);
+
+    for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
+    {
+        replaceTemplate((*i), "DD", _pvt->_target.device);
+        replaceTemplate((*i), "CC", _pvt->_target.object);
+        replaceTemplate((*i), "SSSS", atoi(dev_cfg.SerialNumber));
+    }
+
+    //switch(_pvt->findExtension(exten, context, contexts, _got_sms._type, _got_sms._from, false, true))
+    switch(MatchExtension::findExtension(exten, context, contexts, exten, _got_sms._from, false, true))
+    {
+    case MatchExtension::MATCH_NONE:
+        if( _got_sms._type != "broadcast")
+        {
+            LOG(WARNING, PVT_FMT(_pvt->target(), "unable to find context/exten for incoming SMS (s/%s), processing disabled for this channel.")
+                    % (contexts.size() >= 1 ? contexts[0] : "default"));
+
+        }
+
+        return false;
+
+    default:
+        DBG(FUNC, PVT_FMT(_pvt->target(), "our: context '%s', exten '%s'") % context % exten);
+        break;
+    }
+
+    for(unsigned int c = 0; c < count; c++)
+    {
+
+#if SWITCH_LESS_THAN(1,0,6)
+        switch_core_session_t *session = switch_core_session_request(Globals::khomp_sms_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL);
+#else
+        switch_core_session_t *session = switch_core_session_request(Globals::khomp_sms_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL);
+#endif
+
+        if(!session)
+        {
+            LOG(ERROR, PVT_FMT(_pvt->target(), "Initilization Error, session not created!"));
+            return false;
+        }
+
+        switch_core_session_add_stream(session, NULL);
+
+        switch_core_session_set_private(session, _pvt);
+
+        switch_caller_profile_t *caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
+                "Khomp_SMS",                       //username
+                Opt::_dialplan.c_str(),            //dialplan
+                NULL,                              //caller_id_name
+                _got_sms._from.c_str(),            //caller_id_number
+                NULL,                              //network_addr
+                _got_sms._from.c_str(),            //ani
+                NULL,                              //aniii
+                NULL,                              //rdnis
+                (char *) "mod_khomp",              //source
+                context.c_str(),                   //context
+                exten.c_str());                    //destination_number
+
+        if(!caller_profile)
+        {
+            _pvt->destroy(session);        
+            LOG(ERROR, PVT_FMT(_pvt->target(), "r (Cannot create caller profile)"));
+            return false;
+        }
+
+        switch_channel_t *channel = switch_core_session_get_channel(session);
+
+        if(!channel)
+        {
+            _pvt->destroy(session);
+            LOG(ERROR, PVT_FMT(_pvt->target(), "r (Cannot get channel)"));
+            return false;
+        }
+
+        std::string name = STG(FMT("Khomp_SMS/%hu/%hu")
+                % _pvt->target().device
+                % _pvt->target().object);
+
+        switch_channel_set_name(channel, name.c_str());
+        switch_channel_set_caller_profile(channel, caller_profile);
+    
+        //DBG(FUNC, PVT_FMT(_pvt->target(), "Connect inbound SMS channel %s") % name.c_str());
+
+        switch_channel_set_state(channel, CS_INIT);
+
+
+        _owners.push_front(session);
+    }
+    
+    return true;
+}
+
+bool SMS::justStart()
+{
+    OwnersList::iterator i = _owners.begin();
+
+    if(i == _owners.end())
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "Cannot get session"));
+        return false;
+    }
+
+    switch_core_session_t *session = (*i);
+
+    _owners.pop_front();
+
+    if(!session)
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "Cannot get session"));
+        return false;
+    }
+
+    switch_channel_t *channel = switch_core_session_get_channel(session);
+
+    if(!channel)
+    {
+        _pvt->destroy(session);
+        LOG(ERROR, PVT_FMT(_pvt->target(), "r (Cannot get channel)"));
+        return false;
+    }
+
+    switch_channel_set_variable(channel, "KSmsType", _got_sms._type.c_str());
+
+    if (_got_sms._type == "message" || _got_sms._type == "confirm")
+    {
+        switch_channel_set_variable(channel, "KSmsFrom", _got_sms._from.c_str());
+        switch_channel_set_variable(channel, "KSmsDate", _got_sms._date.c_str());
+    }
+
+    if(_got_sms._type == "confirm")
+    {
+        switch_channel_set_variable(channel, "KSmsDelivery", _got_sms._sc_date.c_str());
+        switch_channel_set_variable(channel, "KSmsStatus", _got_sms._status.c_str());
+    }
+    else
+    {
+        if(_got_sms._type == "broadcast")
+        {
+            switch_channel_set_variable(channel, "KSmsSerial", _got_sms._serial.c_str());
+            switch_channel_set_variable(channel, "KSmsPage", _got_sms._page.c_str());
+            switch_channel_set_variable(channel, "KSmsPages", _got_sms._pages.c_str());
+        }
+        switch_channel_set_variable(channel, "KSmsSize", _got_sms._size.c_str());
+        switch_channel_set_variable(channel, "KSmsMode", _got_sms._coding.c_str());
+        switch_channel_set_variable(channel, "KSmsBody", _got_sms._body.c_str());
+    }
+
+
+    if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS)
+    {
+        _pvt->destroy(session);
+        LOG(ERROR, PVT_FMT(_pvt->target(), "Error spawning thread"));
+        return false;
+    }
+
+    return true;
+}
+
+bool SMS::sendSMS(switch_core_session_t * session, const char *data)
+{
+    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) c"));
+
+    volatile bool finished = false;
+    volatile KGsmCallCause result = kgccNone; 
+
+    try
+    {
+        //ScopedAllocLock alloc_lock;
+
+        if(!_can_send)
+        {
+            LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (cannot send SMS messages, modem NOT initialized!)"));
+            return false;
+        }
+
+        std::string           sms_string((const char *)data);
+        Strings::vector_type  sms_args;
+
+        Strings::tokenize(sms_string, sms_args, "/|,", 3);
+
+        if (sms_args.size() != 3)
+        {
+            LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (invalid dial string '%s': wrong number of separators.)") % sms_string);
+            return false;
+        }
+
+        std::string dest(sms_args[1]);
+
+        bool conf = false;
+
+        if (dest[0] == '!')
+        {
+            dest.erase(0,1);
+            conf = true;
+        }
+
+        if (dest[dest.size()-1] == '!')
+        {
+            dest.erase(dest.size()-1,1);
+            conf = true;
+        }
+
+        // get options/values 
+        
+        _send_sms._dest = dest;
+        _send_sms._conf = conf;
+        _send_sms._body = sms_args[2];
+
+        Request request_sms(_send_sms, &finished, &result);
+
+        _mutex.lock();
+        bool status = _buffer.provide(request_sms);
+        _mutex.unlock();
+
+        _pvt->_mutex.unlock();
+
+        if(status)
+            _cond.signal();
+    
+        while (!finished)
+        {
+            usleep(200000);
+        }
+
+        _pvt->_mutex.lock();
+
+        switch_channel_t *channel = _pvt->getFSChannel(session);
+
+        switch_channel_set_variable(channel, "KSmsDelivered", ((KGsmSmsCause)result == ((KGsmSmsCause)0) ? "yes" : "no"));
+        switch_channel_set_variable(channel, "KSmsErrorCode", STG(FMT("%d") % result).c_str());
+        switch_channel_set_variable(channel, "KSmsErrorName", ((KGsmSmsCause)result == ((KGsmSmsCause)0) ? "None" : Verbose::gsmSmsCause((KGsmSmsCause)result).c_str()));
+
+    }
+    catch(ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (unable to global alloc lock)"));
+        return false;
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) %s") % err._msg.c_str());
+        //return false;
+    }
+
+    bool ret = ((KGsmSmsCause)result == ((KGsmSmsCause)0));
+
+    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) r (%s)") % (ret ? "true" : "false"));
+
+    //return (KGsmSmsCause)result;
+    return ret;
+}
+
+bool SMS::onNewSMS(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(_pvt);
+
+        if(!_can_receive)
+        {
+            DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) received new SMS message(s), but receiving is disabled. keeping the message(s) at the SIM card."));
+            ret = false;
+        }
+        else if(!justAlloc(e->AddInfo))
+        {
+            LOG(WARNING, PVT_FMT(_pvt->target(), "(SMS) unable to allocate channel for new SMS message(s). disabling processing to prevent messages from being lost."));
+            _can_receive = false;
+            ret = false;
+        }
+        else
+        {
+
+            DBG(FUNC, PVT_FMT(_pvt->target(), "downloading %d SMS message(s) on the SIM card.") % e->AddInfo);
+
+            _pvt->command(KHOMP_LOG, CM_GET_SMS);
+        }
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) r"));
+
+    return ret;
+}
+
+bool SMS::onSMSInfo(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) c"));
+
+    try
+    {
+        ScopedPvtLock lock(_pvt);
+
+        Globals::k3lapi.get_param(e, "sms_type",    _got_sms._type);
+        Globals::k3lapi.get_param(e, "sms_from",    _got_sms._from);
+        Globals::k3lapi.get_param(e, "sms_date",    _got_sms._date);
+        Globals::k3lapi.get_param(e, "sms_size",    _got_sms._size);
+        Globals::k3lapi.get_param(e, "sms_coding",  _got_sms._coding);
+        Globals::k3lapi.get_param(e, "sms_serial",  _got_sms._serial);
+        Globals::k3lapi.get_param(e, "sms_id",      _got_sms._id);
+        Globals::k3lapi.get_param(e, "sms_page",    _got_sms._page);
+        Globals::k3lapi.get_param(e, "sms_pages",   _got_sms._pages);
+        Globals::k3lapi.get_param(e, "sms_sc_date", _got_sms._sc_date);
+        Globals::k3lapi.get_param(e, "sms_status",  _got_sms._status);
+
+        //DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) type=%s from=%s date=%s size=%s coding=%s serial=%s id=%s page=%s pages=%s sc_date=%s status=%s") % _got_sms._type % _got_sms._from % _got_sms._date % _got_sms._size % _got_sms._coding % _got_sms._serial % _got_sms._id % _got_sms._page % _got_sms._pages % _got_sms._sc_date % _got_sms._status);
+
+        if (_owners.empty() && !justAlloc(1) && (_got_sms._type.compare("broadcast") != 0))
+        {
+            // this error is fatal
+            LOG(ERROR, PVT_FMT(_pvt->target(), "unable to allocate channel, new SMS message from %s will not be sent to dialplan!") % _got_sms._from);
+            return false;
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) r"));
+
+    return true;
+}
+
+bool SMS::onSMSData(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) c"));
+
+    try
+    {
+        ScopedPvtLock lock(_pvt);
+
+        if (_owners.empty())
+        {
+            if(_got_sms._type != "broadcast")
+            {
+                LOG(WARNING, PVT_FMT(_pvt->target(), "unable to allocate channel for new SMS message(s). disabling processing to prevent messages from being lost."));
+                _can_receive = false;
+            }
+        }
+        else
+        {
+            _got_sms._body = (const char *)(e->Params ? e->Params : "");
+
+            if(!justStart())
+            {
+                if(_got_sms._type != "broadcast")
+                {
+                    LOG(ERROR, PVT_FMT(_pvt->target(), "unable to receive SMS from '%s', something wrong!") % _got_sms._from);
+                    LOG(ERROR, PVT_FMT(_pvt->target(), "disabling SMS processing to prevent messages from being lost."));
+    
+                    _can_receive = false;
+                }
+            }
+        }
+        
+        if(_can_receive)
+        {
+            /* stats update! */
+            if(_got_sms._type == "message")
+            {
+                statistics<SMSStatistics>()->incrementIncoming();
+            }
+            else if(_got_sms._type == "confirm")
+            {
+                statistics<SMSStatistics>()->incrementConfirm();
+            }
+            else
+            {
+                statistics<SMSStatistics>()->incrementBroadcast();
+            }
+        }
+   
+        /* reset data stuff */
+        _got_sms.clear();
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) r"));
+    return true;
+}
+
+bool SMS::onSMSSendResult(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) c"));
+
+    try
+    {
+        ScopedPvtLock lock(_pvt);
+
+        _result = (KGsmCallCause)e->AddInfo;
+        _pvt->call()->_flags.clear(Kflags::SMS_DOING_UPLOAD);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) r"));
+
+    return true;
+}
+
+int SMS::smsThread(void * sms_ptr)
+{
+    SMS * sms = static_cast < SMS * > (sms_ptr);
+    
+    Board::KhompPvt * pvt = static_cast < Board::KhompPvt * > (sms->_pvt);
+
+    DBG(THRD, PVT_FMT(pvt->target(), "c"));
+
+    bool loop = true;
+
+    while(loop)
+    {
+        if(sms->_cond.wait(1000))
+        {
+            if(sms->_shutdown)
+                return 0;
+        }
+
+        try
+        {
+            ScopedPvtLock lock(pvt);
+
+            K3L_CHANNEL_STATUS status;
+
+            KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus(
+                    pvt->_target.device,
+                    pvt->_target.object + ksoChannel,
+                    &status,
+                    sizeof(status));
+
+            if (ret == ksSuccess)
+            {
+                switch (status.AddInfo)
+                {
+                    case kgsmModemError:
+                    case kgsmSIMCardError:
+                        return 0;
+
+                    case kgsmIdle:
+                    {
+                        /* pede registro do canal.. */
+                        pvt->command(KHOMP_LOG, CM_SEND_TO_MODEM, "AT+COPS?");
+
+                        /* pede estado da antena.. */
+                        pvt->command(KHOMP_LOG, CM_SEND_TO_MODEM, "AT+CSQ?");
+
+                        /* forca tipo padrao a ser message... */
+                        sms->_got_sms._type = "message";
+
+                        /* pre-aloca canal para receber mensagens SMS. */
+                        if (sms->justAlloc())
+                        {
+                            /* habilita processamento de SMSs entrantes */
+                            sms->_can_receive = true;
+
+                            /* envia comando para "limpar" SMSs do SIM card */
+                            pvt->command(KHOMP_LOG, CM_CHECK_NEW_SMS);
+                        }
+
+                        sms->_got_sms.clear();
+
+                        /* sai fora do loop! */
+                        loop = false;
+                    }
+                    default:
+                        break;
+                }
+            }
+        }
+        catch (ScopedLockFailed & err)
+        {
+            DBG(FUNC, PVT_FMT(pvt->_target, "unable to obtain lock: %s") % err._msg.c_str());
+        }
+
+    }
+
+    sms->_can_send = true;
+
+    while(true)
+    {
+        Request request_sms;
+
+        DBG(THRD, PVT_FMT(pvt->_target, "begin"));
+
+        while(!sms->_buffer.consume(request_sms))
+        {
+            DBG(THRD, PVT_FMT(pvt->_target, "buffer empty"));
+
+            sms->_cond.wait();
+
+            DBG(THRD, PVT_FMT(pvt->_target, "waked up!"));
+
+            if(sms->_shutdown)
+                return 0;
+        }
+
+        DBG(THRD, PVT_FMT(pvt->_target, "processing buffer..."));
+
+        try
+        {
+            int timeout = 30;
+
+            ScopedPvtLock lock(pvt);
+
+            pvt->call()->_flags.set(Kflags::SMS_DOING_UPLOAD);
+
+            if (pvt->command(KHOMP_LOG, CM_PREPARE_SMS, request_sms._send_sms._body.c_str()))
+            {
+                std::string extra = (request_sms._send_sms._conf ? " sms_confirm=\"TRUE\"" : "");
+
+                if (pvt->command(KHOMP_LOG, CM_SEND_SMS,
+                            STG(FMT("sms_to=\"%s\"%s") % request_sms._send_sms._dest % extra).c_str()))
+                {
+                    if (!pvt->loopWhileFlagTimed(Kflags::SMS_DOING_UPLOAD, timeout))
+                        break;
+                }
+                else
+                {
+                    sms->_result = kgccResourceUnavailable;
+                }
+            }
+            else
+            {
+                sms->_result = kgccInvalidMessage;
+            }
+            
+            pvt->call()->_flags.clear(Kflags::SMS_DOING_UPLOAD);
+
+            if (request_sms._cause)
+                *(request_sms._cause) = (KGsmCallCause)sms->_result;
+
+            if (request_sms._finished)
+                *(request_sms._finished) = true;
+
+            if (sms->_result == kgccNone)
+            {
+                /* stats update if sent! */
+                sms->statistics<SMSStatistics>()->incrementOutgoing();
+            }
+
+            sms->_send_sms.clear();
+
+        }
+        catch (ScopedLockFailed & err)
+        {
+            DBG(FUNC, PVT_FMT(pvt->_target, "unable to obtain lock: %s") % err._msg.c_str());
+        }
+
+        DBG(FUNC, PVT_FMT(pvt->target(), "ok, going to loop..."));
+
+    }
+
+
+    DBG(FUNC, PVT_FMT(pvt->target(), "r"));
+
+    return 0;
+}
+
diff --git a/src/mod/endpoints/mod_khomp/src/cli.cpp b/src/mod/endpoints/mod_khomp/src/cli.cpp
new file mode 100644
index 0000000000..709abb9303
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/cli.cpp
@@ -0,0 +1,2408 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include "cli.h"
+#include "k3l.h"
+#include "lock.h"
+#include "khomp_pvt.h"
+#include "spec.h"
+
+/* our stream and interface handlers */
+switch_stream_handle_t *Cli::stream;
+switch_loadable_module_interface_t **Cli::module_interface;
+
+/* contains all commands */
+Cli::Commands Cli::_commands;
+
+/* khomp all commands usage */
+std::string Cli::_khomp_usage;
+
+/* register our commands, but you must create the command function */
+void Cli::registerCommands(APIFunc func,switch_loadable_module_interface_t **mod_int)
+{
+    if(!mod_int || !*mod_int)
+    {
+        LOG(ERROR,"Invalid module passed");
+        return;
+    }
+
+    /* the manual */
+    _khomp_usage =                                                             \
+"---------------------------------------------------------------------------\n"\
+"---------------------------------- HELP -----------------------------------\n"\
+"---------------------------------------------------------------------------\n"\
+" khomp channels disconnect {all | <board> all | <board> <channel>}\n"         \
+" khomp channels unblock {all | <board> all | <board> <channel>}\n"            \
+" khomp clear links [<board> [<link>]]\n"                                      \
+" khomp clear statistics [<board> [<channel>]]\n"                              \
+" khomp get <option>\n"                                                        \
+" khomp kommuter {on|off}\n"                                                   \
+" khomp kommuter count\n"                                                      \
+" khomp log console <options>\n"                                               \
+" khomp log disk <options>\n"                                                  \
+" khomp log rotate\n"                                                          \
+" khomp log status\n"                                                          \
+" khomp log trace isdn <what>[,<what2>[,..]]\n"                                \
+" khomp log trace k3l {on|off}\n"                                              \
+" khomp log trace r2 {on|off}\n"                                               \
+" khomp reset links [<board> [<link>]]\n"                                      \
+" khomp revision\n"                                                            \
+" khomp select sim <board> <channel> <sim_card>\n"                             \
+" khomp send command <board> <channel> <command> [argument]\n"                 \
+" khomp send raw command <board> <dsp> <c0> <c1> [...]\n"                      \
+" khomp set <option> <value>\n"                                                \
+" khomp show calls [<board> [<channel>]]\n"                                    \
+" khomp show channels [{<board> [<channel>]} | \n"                             \
+"                               {{concise|verbose} [<board> [<channel>]]}]\n"  \
+" khomp show links [[errors] [{<board>} | {{concise|verbose} [<board>]}]]\n"   \
+" khomp show statistics [{verbose [<board> [<channel>]]} | \n"                 \
+"                        {detailed <board> <channel>}]\n"                      \
+" khomp sms <device> <destination> <message..>\n"                              \
+" khomp summary [concise]\n"                                                   \
+"---------------------------------------------------------------------------\n\n";
+
+    /* we need this module_inteface, is used by SWITCH_ADD_API, there's no escape */
+    module_interface = mod_int;
+
+    /* khomp cli commands */
+    SWITCH_ADD_API(Globals::api_interface, "khomp", "Khomp Menu", func, _khomp_usage.c_str());
+
+    /* insert commands in list */
+    for(Commands::iterator itr = _commands.begin();itr != _commands.end();itr++)
+    {
+        switch_console_set_complete(STR(FMT("add khomp %s") % (*itr)->complete_name));
+
+        /* if we have options, let's insert them */
+        if((*itr)->options.size() > 0)
+        {
+            std::vector<std::string>::iterator itr_option = (*itr)->options.begin();
+            while(itr_option != (*itr)->options.end())
+            {
+                switch_console_set_complete(STR(FMT("add khomp %s %s") % (*itr)->complete_name % *itr_option));
+                itr_option++;
+            }
+        }
+    }
+}
+
+/* is responsible for parse and execute all commands */
+bool Cli::parseCommands(int argc, char *argv[])
+{
+    /* khomp summary */
+    if (ARG_CMP(0, "summary"))
+        return EXEC_CLI_CMD(Cli::KhompSummary);
+
+    /* khomp show */
+    else if(ARG_CMP(0, "show"))
+    {
+        /* khomp show calls */
+        if(ARG_CMP(1, "calls"))
+            return EXEC_CLI_CMD(Cli::KhompShowCalls);
+
+        /* khomp show channels */
+        if(ARG_CMP(1, "channels"))
+            return EXEC_CLI_CMD(Cli::KhompShowChannels);
+        
+        /* khomp show links */
+        if(ARG_CMP(1, "links"))
+            return EXEC_CLI_CMD(Cli::KhompShowLinks);
+
+        /* khomp show statistics */
+        if(ARG_CMP(1, "statistics"))
+            return EXEC_CLI_CMD(Cli::KhompShowStatistics);
+    }
+
+    /* khomp clear */
+    else if(ARG_CMP(0, "clear"))
+    {
+        /* khomp clear links */
+        if(ARG_CMP(1, "links"))
+            return EXEC_CLI_CMD(Cli::KhompClearLinks);
+
+        /* khomp clear statistics */
+        if(ARG_CMP(1, "statistics"))
+            return EXEC_CLI_CMD(Cli::KhompClearStatistics);
+    }
+    
+    /* khomp reset */
+    else if(ARG_CMP(0, "reset"))
+    {
+        /* khomp reset links */
+        if(ARG_CMP(1, "links"))
+            return EXEC_CLI_CMD(Cli::KhompResetLinks);
+
+    }
+    
+    /* khomp sms */
+    else if(ARG_CMP(0, "sms"))
+    {
+        return EXEC_CLI_CMD(Cli::KhompSMS);
+    }
+
+    /* khomp log */
+    else if(ARG_CMP(0, "log"))
+    {
+        /* khomp log console */
+        if(ARG_CMP(1, "console"))
+            return EXEC_CLI_CMD(Cli::KhompLogConsole);
+
+        /* khomp log  disk */
+        if(ARG_CMP(1, "disk"))
+            return EXEC_CLI_CMD(Cli::KhompLogDisk);
+
+        /* khomp log status */
+        if(ARG_CMP(1, "status"))
+            return EXEC_CLI_CMD(Cli::KhompLogStatus);
+
+        /* khomp log rotate */
+        if(ARG_CMP(1, "rotate"))
+            return EXEC_CLI_CMD(Cli::KhompLogRotate);
+
+        /* khomp log trace */
+        if(ARG_CMP(1, "trace"))
+        {
+            /* khomp log trace k3l */
+            if(ARG_CMP(2, "k3l"))
+                return EXEC_CLI_CMD(Cli::KhompLogTraceK3L);
+
+            /* khomp log trace isdn */
+            if(ARG_CMP(2, "isdn"))
+                return EXEC_CLI_CMD(Cli::KhompLogTraceISDN);
+
+            /* khomp log trace r2 */
+            if(ARG_CMP(2, "r2"))
+                return EXEC_CLI_CMD(Cli::KhompLogTraceR2);
+        }
+    }
+
+    /* khomp channels */
+    else if(ARG_CMP(0, "channels"))
+    {
+        /* khomp channels disconnect */
+        if(ARG_CMP(1, "disconnect"))
+            return EXEC_CLI_CMD(Cli::KhompChannelsDisconnect);
+
+        /* khomp channels unblock */
+        if(ARG_CMP(1, "unblock"))
+            return EXEC_CLI_CMD(Cli::KhompChannelsUnblock);
+    }
+
+    /* khomp get */
+    else if(ARG_CMP(0, "get"))
+        return EXEC_CLI_CMD(Cli::KhompGet);
+
+    /* khomp set */
+    else if(ARG_CMP(0, "set"))
+        return EXEC_CLI_CMD(Cli::KhompSet);
+
+    /* khomp reivision */
+    else if(ARG_CMP(0, "revision"))
+        return EXEC_CLI_CMD(Cli::KhompRevision);
+
+    /* khomp send */
+    else if(ARG_CMP(0, "send"))
+    {
+        /* khomp send command */
+        if(ARG_CMP(1, "command"))
+            return EXEC_CLI_CMD(Cli::KhompSendCommand);
+
+        /* khomp send raw */
+        if(ARG_CMP(1, "raw"))
+            return EXEC_CLI_CMD(Cli::KhompSendRawCommand);
+    }
+    
+    /* khomp select */
+    else if(ARG_CMP(0, "select"))
+    {
+        /* khomp select sim */
+        if(ARG_CMP(1, "sim"))
+            return EXEC_CLI_CMD(Cli::KhompSelectSim);
+
+    }
+
+    /* khomp kommuter */
+    else if(ARG_CMP(0, "kommuter"))
+    {
+        if(ARG_CMP(1, "on") || ARG_CMP(1, "off"))
+            return EXEC_CLI_CMD(Cli::KhompKommuterOnOff);
+        
+        if(ARG_CMP(1, "count"))
+            return EXEC_CLI_CMD(Cli::KhompKommuterCount);
+    }
+    
+    /* if everything fails, i'm here to support */
+    printKhompUsage();
+    
+    return false;
+}
+
+/******************************************************************************/
+/******************** Defining the static initialization **********************/
+
+Cli::_KhompSummary            Cli::KhompSummary;
+Cli::_KhompShowCalls          Cli::KhompShowCalls;
+Cli::_KhompShowChannels       Cli::KhompShowChannels;
+Cli::_KhompShowLinks          Cli::KhompShowLinks;
+Cli::_KhompShowStatistics     Cli::KhompShowStatistics;
+Cli::_KhompClearLinks         Cli::KhompClearLinks;
+Cli::_KhompClearStatistics    Cli::KhompClearStatistics;
+Cli::_KhompResetLinks         Cli::KhompResetLinks;
+Cli::_KhompChannelsDisconnect Cli::KhompChannelsDisconnect;
+Cli::_KhompChannelsUnblock    Cli::KhompChannelsUnblock;
+Cli::_KhompSMS                Cli::KhompSMS;
+Cli::_KhompLogConsole         Cli::KhompLogConsole;
+Cli::_KhompLogDisk            Cli::KhompLogDisk;
+Cli::_KhompLogStatus          Cli::KhompLogStatus;
+Cli::_KhompLogRotate          Cli::KhompLogRotate;
+Cli::_KhompLogTraceK3L        Cli::KhompLogTraceK3L;
+Cli::_KhompLogTraceISDN       Cli::KhompLogTraceISDN;
+Cli::_KhompLogTraceR2         Cli::KhompLogTraceR2;
+Cli::_KhompGet                Cli::KhompGet;
+Cli::_KhompSet                Cli::KhompSet;
+Cli::_KhompRevision           Cli::KhompRevision;
+Cli::_KhompSendCommand        Cli::KhompSendCommand;
+Cli::_KhompSendRawCommand     Cli::KhompSendRawCommand;
+Cli::_KhompSelectSim          Cli::KhompSelectSim;
+Cli::_KhompKommuterOnOff      Cli::KhompKommuterOnOff;
+Cli::_KhompKommuterCount      Cli::KhompKommuterCount;
+
+/******************************************************************************/
+/*************************** Defining the commands ****************************/
+/*!
+ \brief Print a system summary for all the boards. [khomp summary]
+ */
+bool Cli::_KhompSummary::execute(int argc, char *argv[])
+{
+    if(argc < 1 || argc > 2)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    /* show concise ? */
+    bool concise = ARG_CMP(1, "concise") ? true:false;
+
+    class_type classe = ( !_on_cli_term ? C_MESSAGE : C_CLI );
+    K3L_API_CONFIG apiCfg;
+
+    if (!concise)
+    {
+        K::Logger::Logg2(classe, stream, " ------------------------------------------------------------------");
+        K::Logger::Logg2(classe, stream, "|---------------------- Khomp System Summary ----------------------|");
+        K::Logger::Logg2(classe, stream, "|------------------------------------------------------------------|");
+    }
+
+    if (k3lGetDeviceConfig(-1, ksoAPI, &apiCfg, sizeof(apiCfg)) == ksSuccess)
+    {
+        if (concise)
+        {
+            K::Logger::Logg2(classe, stream, FMT("%d.%d.%d;%d;%s")
+                        % apiCfg.MajorVersion % apiCfg.MinorVersion % apiCfg.BuildVersion
+                        % apiCfg.VpdVersionNeeded % apiCfg.StrVersion);
+        }
+        else
+        {
+            K::Logger::Logg2(classe, stream, FMT("| K3L API %d.%d.%d [m.VPD %d] - %-38s |")
+                        % apiCfg.MajorVersion % apiCfg.MinorVersion % apiCfg.BuildVersion
+                        % apiCfg.VpdVersionNeeded % apiCfg.StrVersion);
+        }
+    }
+
+#ifndef MOD_KHOMP_VERSION
+#define MOD_KHOMP_VERSION "unknown"
+#endif
+
+#ifndef SWITCH_VERSION_FULL
+#define SWITCH_VERSION_FULL "unknown"
+#endif
+
+    std::string khomp_endpoint_rev(MOD_KHOMP_VERSION);
+    std::string freeswitch_rev(SWITCH_VERSION_FULL);
+
+    if (concise)
+    {
+        K::Logger::Logg2(classe, stream, FMT("%s") % khomp_endpoint_rev);
+        K::Logger::Logg2(classe, stream, FMT("%s") % freeswitch_rev);
+    }
+    else
+    {
+        K::Logger::Logg2(classe, stream, FMT("| Khomp Endpoint - %-47s |") % khomp_endpoint_rev);
+        K::Logger::Logg2(classe, stream, FMT("| FreeSWITCH - %-51s |") % freeswitch_rev);
+    }
+
+
+    for (unsigned int i = 0; i < Globals::k3lapi.device_count(); i++)
+    {
+        K3L_DEVICE_CONFIG & devCfg = Globals::k3lapi.device_config(i);
+
+        std::string tipo = Verbose::deviceName((KDeviceType)Globals::k3lapi.device_type(i), devCfg.DeviceModel);
+
+        if (!concise)
+            K::Logger::Logg2(classe, stream, " ------------------------------------------------------------------");
+
+        switch (Globals::k3lapi.device_type(i))
+        {
+            /* E1 boards */
+            case kdtE1:
+            case kdtConf:
+            case kdtPR:
+            case kdtE1GW:
+            case kdtE1IP:
+            case kdtE1Spx:
+            case kdtGWIP:
+            case kdtFXS:
+            case kdtFXSSpx:
+            case kdtE1FXSSpx:
+            {
+                K3L_E1600A_FW_CONFIG dspAcfg;
+                K3L_E1600B_FW_CONFIG dspBcfg;
+
+                if ((k3lGetDeviceConfig(i, ksoFirmware + kfiE1600A, &dspAcfg, sizeof(dspAcfg)) == ksSuccess) &&
+                    (k3lGetDeviceConfig(i, ksoFirmware + kfiE1600B, &dspBcfg, sizeof(dspBcfg)) == ksSuccess))
+                {
+                    if (concise)
+                    {
+                        K::Logger::Logg2(classe, stream, FMT("%02u;%s;%d;%d;%d;%s;%s;%02d;%02d;%s;%s;%s;%s")
+                                    % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount % devCfg.LinkCount
+                                    % dspAcfg.DspVersion % dspBcfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
+                                    % dspAcfg.FwVersion % dspBcfg.FwVersion
+                                    % Verbose::echoCancellerConfig(devCfg.EchoConfig)
+                                    % Verbose::echoLocation(devCfg.EchoLocation));
+                    }
+                    else
+                    {
+                        K::Logger::Logg2(classe, stream, FMT("| [[ %02u ]] %s, serial '%s', %02d channels, %d links.%s|")
+                                    % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount % devCfg.LinkCount
+                                    % std::string(std::max<int>(0, 22 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
+                        K::Logger::Logg2(classe, stream, FMT("| * DSP A: %s, DSP B: %s - PCI bus: %02d, PCI slot: %02d %s|")
+                                    % dspAcfg.DspVersion % dspBcfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
+                                    % std::string(18 - strlen(dspAcfg.DspVersion) - strlen(dspBcfg.DspVersion), ' '));
+                        K::Logger::Logg2(classe, stream, FMT("| * %-62s |") % dspAcfg.FwVersion);
+                        K::Logger::Logg2(classe, stream, FMT("| * %-62s |") % dspBcfg.FwVersion);
+
+                        K::Logger::Logg2(classe, stream, FMT("| * Echo Canceller: %-20s - Location: %-12s  |")
+                                    % Verbose::echoCancellerConfig(devCfg.EchoConfig)
+                                    % Verbose::echoLocation(devCfg.EchoLocation));
+                    }
+                }
+
+                break;
+            }
+
+            /* analog boards */
+            case kdtFXO:
+            case kdtFXOVoIP:
+            /*
+            TODO: This not found
+            case kdtFX:
+            case kdtFXVoIP:
+            */
+            {
+                K3L_FXO80_FW_CONFIG dspCfg;
+
+                if (k3lGetDeviceConfig(i, ksoFirmware + kfiFXO80, &dspCfg, sizeof(dspCfg)) == ksSuccess)
+                {
+                    if (concise)
+                    {
+                        K::Logger::Logg2(classe, stream, FMT("%02u;%s;%d;%d;%s;%02d;%02d;%s")
+                                    % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount
+                                    % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
+                                    % dspCfg.FwVersion);
+                    }
+                    else
+                    {
+                        K::Logger::Logg2(classe, stream, FMT("| [[ %02u ]] %s, serial '%s', %02d channels. %s|")
+                                    % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount
+                                    % std::string(std::max<int>(0, 30 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
+                        K::Logger::Logg2(classe, stream, FMT("| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|")
+                                    % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
+                                    % std::string(30 - strlen(dspCfg.DspVersion), ' '));
+                        K::Logger::Logg2(classe, stream, FMT("| * %-63s|") % dspCfg.FwVersion);
+                    }
+                }
+
+                if (Globals::k3lapi.device_type(i) == kdtFXOVoIP)
+                {
+                    if (!concise)
+                    {
+                        K::Logger::Logg2(classe, stream, FMT("| * Echo Canceller: %-20s - Location: %-12s  |")
+                            % Verbose::echoCancellerConfig(devCfg.EchoConfig)
+                            % Verbose::echoLocation(devCfg.EchoLocation));
+                    }
+                }
+
+                break;
+            }
+            case kdtGSM:
+            case kdtGSMSpx:
+            {
+                K3L_GSM40_FW_CONFIG dspCfg;
+
+                if (k3lGetDeviceConfig(i, ksoFirmware + kfiGSM40, &dspCfg, sizeof(dspCfg)) == ksSuccess)
+                {
+                    if (concise)
+                    {
+                        K::Logger::Logg2(classe, stream, FMT("%02d;%s;%d;%d;%s;%02d;%02d;%s")
+                                    % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount
+                                    % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
+                                    % dspCfg.FwVersion);
+                    }
+                    else
+                    {
+                        K::Logger::Logg2(classe, stream, FMT("| [[ %02d ]] %s, serial '%s', %02d channels. %s|")
+                            % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount
+                            % std::string(std::max<int>(0, 30 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
+
+                        K::Logger::Logg2(classe, stream, FMT("| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|")
+                                    % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
+                                    % std::string(std::max<int>(30 - strlen(dspCfg.DspVersion), 0), ' '));
+
+                        K::Logger::Logg2(classe, stream, FMT("| * %-62s |") % dspCfg.FwVersion);
+                    }
+                }
+
+                break;
+            }
+            case kdtGSMUSB:
+            case kdtGSMUSBSpx:
+            {
+                K3L_GSMUSB_FW_CONFIG dspCfg;
+
+                if (k3lGetDeviceConfig(i, ksoFirmware + kfiGSMUSB, &dspCfg, sizeof(dspCfg)) == ksSuccess)
+                {
+                    if (concise)
+                    {
+                        K::Logger::Logg2(classe, stream, FMT("%02d;%s;%d;%d;%s;%02d;%02d;%s")
+                                    % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount
+                                    % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
+                                    % dspCfg.FwVersion);
+                    }
+                    else
+                    {
+                        K::Logger::Logg2(classe, stream, FMT("| [[ %02d ]] %s, serial '%s', %02d channels. %s|")
+                            % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount
+                            % std::string(std::max<int>(0, 30 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
+
+                        int size = strlen(dspCfg.DspVersion) + strlen(dspCfg.FwVersion);
+
+                        K::Logger::Logg2(classe, stream, FMT("| * DSP: %s - %s%s|")
+                            % dspCfg.DspVersion % dspCfg.FwVersion
+                            % std::string(std::max<int>(55 - size, 0), ' '));
+                    }
+                }
+
+                break;
+            }
+
+            default:
+                K::Logger::Logg2(classe, stream, FMT("| [[ %02d ]] Unknown type '%02d'! Please contact Khomp support for help! |")
+                    % i % Globals::k3lapi.device_type(i));
+                break;
+        }
+    }
+
+    if (!concise)
+        K::Logger::Logg2(classe,stream, " ------------------------------------------------------------------");
+
+    return true;
+}
+
+/* support function for _KhompShowCalls */
+void Cli::_KhompShowCalls::showCalls(unsigned int d, unsigned int o, std::string &buffer)
+{
+    buffer += STR(FMT("| %d,%02d |   unused   | %11s | %-36s |\n")
+             % d
+             % o
+             % Globals::k3lutil.callStatus(d,o)
+             % Globals::k3lutil.channelStatus(d,o));
+}
+
+bool Cli::_KhompShowCalls::execute(int argc, char *argv[])
+{
+    if(argc > 4)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    int device = argv[2] ? atoi(argv[2]) : -1; 
+    int object = argv[3] ? atoi(argv[3]) : -1; 
+
+    int d = -1;
+    int o = -1;
+
+    if (device != -1)
+    {    
+        d = device;
+
+        if (!Globals::k3lapi.valid_device(d))
+        {    
+            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: No such device %d!") % d);
+            return false;
+        }    
+    }   
+
+    if (object != -1)
+    {    
+        o = object;
+
+        if (!Globals::k3lapi.valid_channel(d,o))
+        {    
+            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: No such chanel %d for device %d!") % o % d);
+            return false;
+        }    
+    } 
+
+    /* keep the channels reponse */
+    std::string buffer("");
+
+    try
+    {
+        /**/ if (d != -1 && o != -1)
+        {    
+            showCalls(d,o,buffer);
+        }    
+        else if (d != -1 && o == -1)
+        {    
+            for (unsigned int i = 0; i < Globals::k3lapi.channel_count(d); i++) 
+            {    
+                buffer += " ------------------------------------------------------------------------\n";
+                showCalls(d,i,buffer);
+            }    
+        }    
+        else if (d == -1 && o == -1)
+        {    
+            for (unsigned int i = 0; i < Globals::k3lapi.device_count(); i++) 
+            {    
+                buffer += " ------------------------------------------------------------------------\n";
+                for (unsigned int j = 0; j < Globals::k3lapi.channel_count(i); j++)
+                {
+                    showCalls(i,j,buffer);
+                }
+            }    
+        }
+    }
+    catch(K3LAPI::invalid_channel & err)
+    {
+        K::Logger::Logg2(C_CLI, stream, "ERROR: No such chanel");
+        return false;
+    }
+
+    //TODO: The information shown here, must be reviewed cuz is the same of show channels
+    K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
+    K::Logger::Logg2(C_CLI, stream, "|------------------------------- Khomp Calls ----------------------------|");
+    K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------ ");
+    K::Logger::Logg2(C_CLI, stream, "|  hw  | freeSWITCH |  khomp call |             khomp channel            |");
+    K::Logger::Logg2(C_CLI, stream, "|  id  |   status   |    status   |                status                |");
+    K::Logger::Logg2(C_CLI, stream, "%s", (char*) buffer.c_str());
+    K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
+
+    return true;
+}
+
+bool Cli::_KhompChannelsDisconnect::forceDisconnect(unsigned int device, unsigned int channel)
+{
+    bool ret = false;
+    Board::KhompPvt *pvt = NULL;
+
+    try
+    {
+        pvt = Board::get(device,channel);
+        ScopedPvtLock lock(pvt);
+
+        ret = pvt->command(KHOMP_LOG,CM_DISCONNECT);
+        DBG(FUNC,PVT_FMT(pvt->target(),"Command CM_DISCONNECT sent!"));
+    }
+    catch (K3LAPI::invalid_channel & err)
+    {
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.channel % err.device );
+    }
+    catch (ScopedLockFailed & err)
+    {
+        K::Logger::Logg2(C_CLI,stream,FMT("error: channel %d at device %d could not be locked: %s!")
+        % channel 
+        % device
+        % err._msg.c_str());
+    }
+
+    return ret;
+}
+
+bool Cli::_KhompChannelsDisconnect::execute(int argc, char *argv[])
+{
+    if (argc < 3 || argc > 4)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    switch (argc)
+    {    
+        case 3:
+        {    
+            if (!ARG_CMP(2, "all"))
+            {    
+                K::Logger::Logg2(C_CLI, stream, "usage: khomp channels disconnect < all | <boardid> < all | <channelid> > >");
+                return false;
+            }    
+
+            K::Logger::Logg2(C_CLI, stream, "NOTICE: Disconnecting all channels on all boards!");
+
+            for (unsigned int dev = 0; dev < Globals::k3lapi.device_count(); dev++)
+            {    
+                for (unsigned int chan = 0; chan < Globals::k3lapi.channel_count(dev); chan++)
+                    forceDisconnect(dev,chan);
+            }    
+            break;
+        }    
+        case 4:
+        {    
+            unsigned int dev = atoi(argv[2]);
+
+            if (ARG_CMP(3, "all"))
+            {    
+                K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Disconnecting all channels on board %d!") % dev);
+
+                for (unsigned int chan = 0; chan < Globals::k3lapi.channel_count(dev); chan++)
+                    forceDisconnect(dev,chan);
+            }    
+
+            unsigned int channel = atoi(argv[3]);
+
+            if (dev >= Globals::k3lapi.device_count())
+            {    
+                K::Logger::Logg2(C_CLI, stream, FMT("ERROR: No such device: %d!") % dev);
+                return false;
+            }    
+
+            
+            K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Disconnecting channel %d on board %d!") % channel % dev);
+
+            forceDisconnect(dev,channel);
+            break;
+        }    
+
+        default:
+            break;
+    }   
+
+    return true;
+}
+
+bool Cli::_KhompChannelsUnblock::execute(int argc, char *argv[])
+{
+    if (argc != 4 && argc != 3)
+    {    
+        printUsage(stream);
+        return false;
+    }    
+
+    switch (argc)
+    {    
+        case 3:
+        {    
+            K::Logger::Logg2(C_CLI, stream, "NOTICE: Unblocking all channels on all devices!");
+            for (unsigned int dev = 0; dev < Globals::k3lapi.device_count(); dev++)
+            {    
+                for (unsigned int chan = 0; chan < Globals::k3lapi.channel_count(dev); chan++)
+                {    
+                    try
+                    {
+                        Globals::k3lapi.command(dev,chan,CM_UNLOCK_INCOMING);
+                        Globals::k3lapi.command(dev,chan,CM_UNLOCK_OUTGOING);
+                    }
+                    catch(K3LAPI::failed_command &e)
+                    {
+                        if (K::Logger::Logg.classe(C_WARNING).enabled())
+                        {   
+                            LOG(WARNING, FMT("Command '%s' has failed with error '%s'.")
+                                    % Verbose::commandName(e.code) % Verbose::status((KLibraryStatus)e.rc));
+                        }   
+
+                        return false;
+                    }
+                }    
+            }    
+            break;
+        }    
+        case 4:
+        {    
+            int dev = atoi (argv[2]);
+
+            if ( !SAFE_strcasecmp(argv[3], "all") )
+            {    
+                if (!Globals::k3lapi.valid_device( dev ))
+                {    
+                    K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find device: %d!") % dev );
+                    return false;
+                }    
+
+                K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Unblocking all channels on device %d!") % dev);
+
+                for (unsigned int i = 0; i < Globals::k3lapi.channel_count(dev); i++) 
+                {
+                    try
+                    {
+                        Globals::k3lapi.command(dev,i,CM_UNLOCK_INCOMING);
+                        Globals::k3lapi.command(dev,i,CM_UNLOCK_OUTGOING);
+                    }
+                    catch(K3LAPI::failed_command &e)
+                    {
+                        if (K::Logger::Logg.classe(C_WARNING).enabled())
+                        {   
+                            LOG(WARNING, FMT("Command '%s' has failed with error '%s'.")
+                                    % Verbose::commandName(e.code) % Verbose::status((KLibraryStatus)e.rc));
+                        }   
+
+                        return false;
+                    }
+                }
+            } 
+            else 
+            {    
+                int obj = atoi (argv[3]);
+
+                if (!Globals::k3lapi.valid_channel(dev, obj))
+                {    
+                    K::Logger::Logg2(C_CLI, stream, FMT("ERROR: No such channel %d at device %d!") % obj % dev);
+                    return false;
+                }    
+
+                K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Unblocking channel %d on device %d!") % obj % dev);
+
+                try
+                {
+                    Globals::k3lapi.command(dev,obj,CM_UNLOCK_INCOMING);
+                    Globals::k3lapi.command(dev,obj,CM_UNLOCK_OUTGOING);
+                }
+                catch(K3LAPI::failed_command &e)
+                {
+                    if (K::Logger::Logg.classe(C_WARNING).enabled())
+                    {   
+                        LOG(WARNING, FMT("Command '%s' has failed with error '%s'.")
+                                % Verbose::commandName(e.code) % Verbose::status((KLibraryStatus)e.rc));
+                    }   
+
+                    return false;
+                }
+            }    
+            break;
+        }    
+        default:
+            break;
+    }    
+    
+    return true;
+}
+
+void Cli::_KhompShowStatistics::cliStatistics(unsigned int device)
+{
+    for (unsigned int channel = 0; channel < Globals::k3lapi.channel_count(device); channel++)
+    {
+        try
+        {
+            Board::KhompPvt *pvt = Board::get(device, channel);
+            K::Logger::Logg2(C_CLI,stream,pvt->getStatistics(Statistics::ROW).c_str());
+        }
+        catch (K3LAPI::invalid_channel & err)
+        {
+            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.channel % err.device );
+        }
+    }    
+}
+
+void Cli::_KhompShowStatistics::cliDetailedStatistics(unsigned int device, unsigned int channel)
+{
+    try
+    {
+        Board::KhompPvt *pvt = Board::get(device, channel);
+        K::Logger::Logg2(C_CLI,stream,"----------------------------------------------");
+        K::Logger::Logg2(C_CLI,stream,FMT("Detailed statistics of: Device %02d - Channel %02d") % pvt->target().device % pvt->target().object);
+        K::Logger::Logg2(C_CLI,stream,pvt->getStatistics(Statistics::DETAILED).c_str());
+        K::Logger::Logg2(C_CLI,stream,"----------------------------------------------");
+    }
+    catch (K3LAPI::invalid_channel & err)
+    {
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.channel % err.device );
+    }
+}
+
+bool Cli::_KhompShowStatistics::execute(int argc, char *argv[])
+{
+    if (argc < 2 || argc > 5) 
+    {
+        printUsage(stream);
+        return false;
+    }
+    unsigned int dev = UINT_MAX;
+    unsigned int obj = UINT_MAX;
+    int detailed = 0, verbose  = 0; 
+
+    detailed = ((argc > 2)  && (!strcasecmp(argv[2], "detailed")) ? 1 : 0 ); 
+    verbose  = ((argc > 2)  && (!strcasecmp(argv[2], "verbose"))  ? 1 : 0 ); 
+
+    try  
+    {   
+
+        if(argc > (2+detailed+verbose))
+        {
+            dev = Strings::tolong(argv[2+detailed+verbose]);
+            if (!Globals::k3lapi.valid_device(dev))
+            {    
+                K::Logger::Logg2(C_CLI, stream, "ERROR: No such device!");
+                return false;
+            }    
+        }
+
+        if (argc > (3+detailed+verbose))
+        {   
+            std::string object(argv[3+detailed+verbose]);
+            obj = Strings::tolong(object);
+
+            if (!Globals::k3lapi.valid_channel(dev, obj))
+            {    
+                K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % obj % dev );
+                return false;
+            }  
+        }
+    }    
+    catch (Strings::invalid_value e)
+    {    
+        K::Logger::Logg2(C_CLI, stream, "ERROR: Invalid numeric value!");
+        return false;
+    }    
+    
+    std::string header;
+    header.append( " ------------------------------------------------------------------------------------\n");
+    header.append( "|----------------------------- Khomp Endpoint Statistics ----------------------------|\n");
+    header.append( "|------------------------------------------------------------------------------------|\n");
+    header.append( "|  hw  |          total calls           | channel | FreeSWITCH | channel  |  status  |\n");
+    header.append( "|  id  | incoming | outgoing |  failed  |  fails  |   status   |  state   |   time   |\n");
+    header.append( " ------------------------------------------------------------------------------------");
+    std::string footer;
+    footer.append( " ------------------------------------------------------------------------------------");
+
+    try
+    {
+        if (obj != UINT_MAX)
+        {
+            if(detailed != 0)
+            {
+                cliDetailedStatistics (dev, obj);
+            }
+            else
+            {
+                K::Logger::Logg2(C_CLI,stream,header.c_str());
+                Board::KhompPvt *pvt = Board::get(dev, obj);
+                K::Logger::Logg2(C_CLI,stream,pvt->getStatistics(Statistics::ROW).c_str());
+                K::Logger::Logg2(C_CLI,stream,footer.c_str());
+            }
+        }
+        else
+        {
+            if(detailed != 0)
+            {
+                printUsage(stream);
+                return false;
+            }
+
+            K::Logger::Logg2(C_CLI,stream,header.c_str());
+
+            if (dev == UINT_MAX)
+            {
+                for (dev = 0; dev < Globals::k3lapi.device_count(); dev++)
+                    cliStatistics (dev);
+            }
+            else
+            {
+                cliStatistics (dev);
+            }
+        
+            K::Logger::Logg2(C_CLI,stream,footer.c_str());
+        }
+    }
+    catch(K3LAPI::invalid_channel &e)
+    {
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % obj % dev );
+    }
+
+    return true;
+}
+
+void Cli::_KhompShowChannels::showChannel(unsigned int device, bool concise, unsigned int channel)
+{
+    try
+    {
+
+        Board::KhompPvt *pvt = Board::get(device, channel);
+
+        DBG(FUNC, PVT_FMT(pvt->target(), "found channel.."));
+
+        /* skip inactive channels */
+        if (pvt->getSignaling() == ksigInactive)
+            return;
+
+        DBG(FUNC, PVT_FMT(pvt->target(), "is valid.."));
+
+        /* make sure the states wont start 'dancing' at random.. */
+        ScopedPvtLock lock(pvt);
+
+        std::string tmp_call = Globals::k3lutil.callStatus(
+                pvt->target().device, 
+                pvt->target().object, 
+                (concise ? Verbose::EXACT : Verbose::HUMAN));
+
+        std::string tmp_chan = Globals::k3lutil.channelStatus(
+                pvt->target().device, 
+                pvt->target().object, 
+                (concise ? Verbose::EXACT : Verbose::HUMAN));
+
+        if (concise)
+        {   
+            std::string state = pvt->getStateString();
+
+            if (pvt->getSignaling() == ksigGSM)
+            {    
+                K3L_GSM_CHANNEL_STATUS gsmStatus;
+
+                if (k3lGetDeviceStatus(device, channel + ksoGsmChannel, &gsmStatus, sizeof(gsmStatus)) != ksSuccess)
+                    return;
+
+                const unsigned int sign_numb = (gsmStatus.SignalStrength != 255 ? gsmStatus.SignalStrength : 0);
+
+                std::string gsm_registry = (strlen(gsmStatus.OperName) != 0 ? gsmStatus.OperName : "<none>");
+
+                K::Logger::Logg2(C_CLI, stream, FMT("B%02dC%02d:%s:%s:%s:%d%%:%s")
+                        % device % channel % state % tmp_call % tmp_chan
+                        % sign_numb % gsm_registry);
+            }    
+            else 
+            {    
+                K::Logger::Logg2(C_CLI, stream, FMT("B%02dC%02d:%s:%s:%s")
+                        % device % channel %  state % tmp_call % tmp_chan);
+            }    
+        }    
+        else 
+        {    
+            if (pvt->getSignaling() == ksigGSM)
+            {    
+                K3L_GSM_CHANNEL_STATUS gsmStatus;
+
+                if (k3lGetDeviceStatus(device, channel + ksoGsmChannel, &gsmStatus, sizeof(gsmStatus)) != ksSuccess)
+                    return;
+
+                const unsigned int sign_numb = (gsmStatus.SignalStrength != 255 ? gsmStatus.SignalStrength : 0);
+
+                const unsigned int full_size = 10;
+                const unsigned int sign_size = std::min((sign_numb * full_size) / 100, full_size);
+
+                std::string tmp_antenna_level;
+
+                for (unsigned int i = 0; i < sign_size; i++) 
+                    tmp_antenna_level += '*'; 
+
+                for (unsigned int i = sign_size; i < full_size; i++) 
+                    tmp_antenna_level += ' '; 
+
+                tmp_chan += " (";
+                tmp_chan += (strlen(gsmStatus.OperName) != 0 ? gsmStatus.OperName : "...");
+                tmp_chan += ")"; 
+
+                K::Logger::Logg2(C_CLI, stream, FMT("| %d,%02d | %8s | %8s | %-23s | %02d%% |%s|")
+                        % device % channel %  pvt->getStateString() % tmp_call % tmp_chan
+                        % sign_numb % tmp_antenna_level);
+            }    
+            else 
+            {    
+                K::Logger::Logg2(C_CLI, stream, FMT("| %d,%02d | %8s | %8s | %-40s |")
+                        % device % channel % pvt->getStateString() % tmp_call % tmp_chan);
+            }    
+        }    
+    }    
+    catch (K3LAPI::invalid_channel & err)
+    {
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.channel % err.device );
+    }
+    catch (...)
+    {    
+        K::Logger::Logg2(C_CLI, stream, "ERROR: Unexpected error..., skipping");
+    }   
+}
+
+void Cli::_KhompShowChannels::showChannels(unsigned int device, bool concise)
+{
+    for (unsigned int channel = 0; channel < Globals::k3lapi.channel_count(device); channel++)
+    {
+        showChannel(device, concise, channel);
+    }
+}
+
+bool Cli::_KhompShowChannels::execute(int argc, char *argv[])
+{
+    unsigned int dev = UINT_MAX;
+    int concise = 0, verbose = 0; 
+
+    bool onlyShowOneChannel = false;
+    unsigned int channelToShow = 0; 
+
+    if (argc > 5)
+    {
+        Cli::KhompShowChannels.printUsage(stream);
+        return false;
+    }
+
+    concise = ( ((argc == 3) || (argc == 4) || (argc == 5) ) && (ARG_CMP(2, "concise")) ? 1 : 0 ); 
+    verbose = ( ((argc == 3) || (argc == 4) || (argc == 5) ) && (ARG_CMP(2, "verbose")) ? 1 : 0 ); 
+
+    if (argc >= (3 + concise + verbose))
+    {    
+        dev = atoi (argv[2 + concise + verbose]);
+
+        if (!Globals::k3lapi.valid_device(dev))
+        {    
+            K::Logger::Logg2(C_CLI, stream, "ERROR: no such device!");
+            return false;
+        }    
+        
+        if (argc == ( 4 + concise + verbose ))
+        {
+            onlyShowOneChannel = true;
+            channelToShow = atoi (argv[3 + concise + verbose]);
+        }    
+    }    
+
+    if (concise == 0)
+    {    
+        K::Logger::Logg2(C_CLI, stream, " -----------------------------------------------------------------------");
+        K::Logger::Logg2(C_CLI, stream, "|-------------------- Khomp Channels and Connections -------------------|");
+        K::Logger::Logg2(C_CLI, stream, "|-----------------------------------------------------------------------|");
+        K::Logger::Logg2(C_CLI, stream, "|  hw  |freeSWITCH|   call   |                   channel                |");
+        K::Logger::Logg2(C_CLI, stream, "|  id  |  status  |  status  |                   status                 |");
+        K::Logger::Logg2(C_CLI, stream, " -----------------------------------------------------------------------");
+    }    
+
+    if ( onlyShowOneChannel )
+    {    
+        if ( channelToShow <  Globals::k3lapi.channel_count(dev) )
+        {    
+            showChannel (dev,(concise == 0 ? false : true), channelToShow);
+        }    
+        else 
+        {    
+            K::Logger::Logg2(C_CLI, stream, "ERROR: no such channel!");
+        }    
+    }    
+    else if (dev == UINT_MAX)
+    {    
+        for (dev = 0; dev < Globals::k3lapi.device_count(); dev++)
+        {
+            showChannels(dev, (concise == 0 ? false : true));
+        }
+    }    
+    else 
+    {    
+        showChannels ( dev, (concise == 0 ? false : true));
+    }
+
+    if (concise == 0)
+        K::Logger::Logg2(C_CLI, stream, " -----------------------------------------------------------------------");
+
+    return true;
+}
+
+void Cli::_KhompShowLinks::showLinks(unsigned int device, bool concise)
+{
+    if (!concise)
+        K::Logger::Logg2(C_CLI, stream, "|------------------------------------------------------------------------|");
+
+    switch (Globals::k3lutil.physicalLinkCount(device, true))
+    {
+        case 1:
+        {
+            std::string str_link0 = Globals::k3lutil.getLinkStatus(device, 0, (concise ? Verbose::EXACT : Verbose::HUMAN));
+
+            if (concise)
+                K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dL00:%s") % device % str_link0);
+            else
+                K::Logger::Logg2(C_CLI, stream, FMT("| Link '0' on board '%d': %-47s |") % device % str_link0);
+            break;
+        }
+
+        case 2:
+        {
+            std::string str_link0 = Globals::k3lutil.getLinkStatus(device, 0, (concise ? Verbose::EXACT : Verbose::HUMAN));
+            std::string str_link1 = Globals::k3lutil.getLinkStatus(device, 1, (concise ? Verbose::EXACT : Verbose::HUMAN));
+
+            if (concise)
+            {
+                K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dL00:%s") % device % str_link0);
+                K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dL01:%s") % device % str_link1);
+            }
+            else
+            {
+                K::Logger::Logg2(C_CLI, stream, FMT("|------ Link '0' on board '%d' ------||------ Link '1' on board '%d' ------|")
+                    % device % device);
+
+                K::Logger::Logg2(C_CLI, stream, FMT("| %-33s || %-33s |") % str_link0 % str_link1);
+            }
+
+            break;
+        }
+        default:
+        {
+            if (concise)
+                K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dLXX:NoLinksAvailable") % device);
+            else
+                K::Logger::Logg2(C_CLI, stream, FMT("| Board '%d': %-59s |") % device % "No links available.");
+            break;
+        }
+    }
+
+}
+
+void Cli::_KhompShowLinks::showErrors(unsigned int device, bool concise)
+{
+
+    if (!concise)
+        K::Logger::Logg2(C_CLI, stream, "|-----------------------------------------------------------------------|");
+
+    switch (Globals::k3lutil.physicalLinkCount(device, true))
+    {
+        case 2:
+        {
+            K3LUtil::ErrorCountType link0 = Globals::k3lutil.linkErrorCount(
+                    device, 0, (concise ? Verbose::EXACT : Verbose::HUMAN));
+            K3LUtil::ErrorCountType link1 = Globals::k3lutil.linkErrorCount(
+                    device, 1, (concise ? Verbose::EXACT : Verbose::HUMAN));
+
+            if (concise)
+            {
+                for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
+                    K::Logger::Logg2(C_CLI, stream, FMT("%d:0:%s:%d") % device % i->first % i->second);
+
+                for (K3LUtil::ErrorCountType::iterator i = link1.begin(); i != link1.end(); i++)
+                    K::Logger::Logg2(C_CLI, stream, FMT("%d:1:%s:%d") % device % i->first % i->second);
+            }
+            else
+            {
+                K::Logger::Logg2(C_CLI, stream, FMT("|----- Link '0' on board '%d' ------| |----- Link '1' on board '%d' ------|") % device % device);
+                K::Logger::Logg2(C_CLI, stream, "|----------------------------------| |----------------------------------|");
+                K::Logger::Logg2(C_CLI, stream, "|       Error type       | Number  | |       Error type       | Number  |");
+                K::Logger::Logg2(C_CLI, stream, "|----------------------------------| |----------------------------------|");
+
+                K3LUtil::ErrorCountType::iterator i = link0.begin();
+                K3LUtil::ErrorCountType::iterator j = link1.begin();
+
+                for (; i != link0.end() && j != link1.end(); i++, j++)
+                {
+                    K::Logger::Logg2(C_CLI, stream, FMT("| %22s | %-7d | | %22s | %-7d |")
+                       % i->first % i->second % j->first % j->second);
+                }
+            }
+
+            break;
+        }
+
+        case 1:
+        {
+            K3LUtil::ErrorCountType link0 = Globals::k3lutil.linkErrorCount(device, 0, (concise ? Verbose::EXACT : Verbose::HUMAN));
+
+            if (concise)
+            {
+                for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
+                    K::Logger::Logg2(C_CLI, stream, FMT("%d:0:%s:%d") % device % i->first % i->second);
+            }
+            else
+            {
+                K::Logger::Logg2(C_CLI, stream, FMT("|------------------------ Link '0' on board '%d' ------------------------|") % device);
+                K::Logger::Logg2(C_CLI, stream, "|-----------------------------------------------------------------------|");
+                K::Logger::Logg2(C_CLI, stream, "|                      Error type                      |     Number     |");
+                K::Logger::Logg2(C_CLI, stream, "|-----------------------------------------------------------------------|");
+
+                for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
+                    K::Logger::Logg2(C_CLI, stream, FMT("| %52s | %-14d |") % i->first % i->second);
+            }
+
+            break;
+        }
+
+        case 0:
+        {
+            if (!concise)
+                K::Logger::Logg2(C_CLI, stream, FMT("|                     No links detected on board %d!                     |") % device);
+
+            break;
+        }
+    }
+}
+
+bool Cli::_KhompShowLinks::execute(int argc, char *argv[])
+{
+    if(argc < 2 || argc > 5)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    unsigned int dev = UINT_MAX;
+    int concise = 0, verbose = 0, errors = 0;
+
+    errors = ( (argc > 2) && (!strcasecmp(argv[2],"errors")) ? 1 : 0 );
+
+    concise = ( (argc > (2+errors)) && (!strcasecmp(argv[(2+errors)],"concise")) ? 1 : 0 );
+    verbose = ( (argc > (2+errors)) && (!strcasecmp(argv[(2+errors)],"verbose")) ? 1 : 0 );
+
+    if(argc > (2+errors+concise+verbose))
+    {
+        dev = atoi(argv[(2+errors+concise+verbose)]);
+
+        if (!Globals::k3lapi.valid_device(dev))
+        {
+            K::Logger::Logg2(C_CLI, stream, "ERROR: no such device!");
+            return false;
+        }
+    }
+
+    if (!concise)
+    {
+        K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
+        if(!errors)
+        {
+            K::Logger::Logg2(C_CLI, stream, "|--------------------------- Khomp Links List ---------------------------|");
+        }
+        else
+        {
+            K::Logger::Logg2(C_CLI, stream, "|-------------------- Khomp Errors Counters on Links -------------------|");
+        }
+    }
+
+    if (dev == UINT_MAX)
+    {
+        for (dev = 0; dev < Globals::k3lapi.device_count(); dev++)
+        {
+            if(!errors)
+            {
+                showLinks (dev, (concise == 1));
+            }
+            else
+            {
+                showErrors(dev, (concise == 1));
+            }
+        }
+    }
+    else
+    {
+        if(!errors)
+        {
+            showLinks (dev, (concise == 1));
+        }
+        else
+        {
+            showErrors(dev, (concise == 1));
+        }
+    }
+
+    if (!concise)
+    {
+        K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
+    }
+
+    return true;
+}
+
+void Cli::_KhompClearLinks::clearLink(unsigned int device, unsigned int link)
+{
+    try
+    {
+        Globals::k3lapi.command(device, link, CM_CLEAR_LINK_ERROR_COUNTER);
+    }
+    catch(K3LAPI::failed_command & e)
+    {
+        K::Logger::Logg2(C_CLI, stream, 
+                FMT("ERROR: Command has failed with error '%s'") 
+                % Verbose::status((KLibraryStatus)e.rc).c_str());
+    }
+}
+
+bool Cli::_KhompClearLinks::execute(int argc, char *argv[])
+{
+    if(argc < 2 || argc > 4)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    unsigned int dev = UINT_MAX;
+    unsigned int obj = UINT_MAX;    
+
+    if(argc > 2)
+    {
+        dev = atoi(argv[2]);
+
+        if (!Globals::k3lapi.valid_device(dev))
+        {
+            K::Logger::Logg2(C_CLI, stream, 
+                    FMT("ERROR: no such device %d!") % dev);
+            return false;
+        }
+
+        if(argc > 3)
+        {
+            obj = atoi(argv[3]);
+
+            if(!Globals::k3lapi.valid_link(dev, obj))
+            {
+                K::Logger::Logg2(C_CLI, stream, 
+                      FMT("ERROR: No such link %d on device %d!") % obj % dev);
+                return false;
+            }
+        }
+    }
+
+    if(dev == UINT_MAX)
+    {
+        K::Logger::Logg2(C_CLI, stream, 
+                "NOTICE: Reseting error count of all links...");
+
+        for (unsigned int d = 0; d < Globals::k3lapi.device_count(); d++)
+        {
+            unsigned int link_count = Globals::k3lutil.physicalLinkCount(d, true);
+
+            for (unsigned int o = 0; o < link_count; o++)
+                clearLink(d, o);
+        }
+    }
+    else
+    {
+        if (obj == UINT_MAX)
+        {
+            K::Logger::Logg2(C_CLI, stream, 
+                FMT("NOTICE: Reseting error count of all links on device %d...")
+                % dev);
+            unsigned int link_count = Globals::k3lutil.physicalLinkCount(dev, true);
+
+            for (unsigned int o = 0; o < link_count; o++)
+                clearLink(dev, o);
+        }
+        else
+        {
+            K::Logger::Logg2(C_CLI, stream, 
+                FMT("NOTICE: Reseting error count of link %d on device %d...") 
+                % obj % dev);
+
+            clearLink(dev, obj);
+        }
+    }
+
+    return true;
+}
+
+bool Cli::_KhompClearStatistics::execute(int argc, char *argv[])
+{
+    if(argc < 2 || argc > 4)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    try
+    {
+
+    unsigned int dev = UINT_MAX;
+    unsigned int obj = UINT_MAX;    
+
+    if(argc > 2)
+    {
+        dev = atoi(argv[2]);
+
+        if (!Globals::k3lapi.valid_device(dev))
+        {
+            K::Logger::Logg2(C_CLI, stream, 
+                    FMT("ERROR: no such device %d!") % dev);
+            return false;
+        }
+
+        if(argc > 3)
+        {
+            obj = atoi(argv[3]);
+
+
+            if(!Globals::k3lapi.valid_channel(dev, obj))
+            {
+                K::Logger::Logg2(C_CLI, stream, 
+                      FMT("ERROR: No such channel %d on device %d!") % obj % dev);
+                return false;
+            }
+        }
+    }
+
+    if(dev == UINT_MAX)
+    {
+        K::Logger::Logg2(C_CLI, stream, "NOTICE: Reseting statistics of all channels...");
+
+        for (unsigned int d = 0; d < Globals::k3lapi.device_count(); d++)
+        {
+            for (unsigned int o = 0; o < Globals::k3lapi.channel_count(d); o++) 
+                Board::get(d, o)->clearStatistics();
+        }
+    }
+    else
+    {
+        if (obj == UINT_MAX)
+        {
+            K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Reseting statistics of all channels from board %d...") % dev);
+            
+            for (unsigned int o = 0; o < Globals::k3lapi.channel_count(dev); o++) 
+                Board::get(dev, o)->clearStatistics();
+        }
+        else
+        {
+            K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Reseting statistics of channel %d from board %d") % obj % dev);
+            Board::get(dev, obj)->clearStatistics();
+        }
+    }
+
+    }
+    catch (K3LAPI::invalid_channel & err)
+    {
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.channel % err.device );
+        return false;
+    }
+
+    return true;
+}
+
+void Cli::_KhompResetLinks::resetLink(unsigned int device, unsigned int link)
+{
+    try
+    {
+        Globals::k3lapi.command(device, link, CM_RESET_LINK);
+    }
+    catch(K3LAPI::failed_command & e)
+    {
+        K::Logger::Logg2(C_CLI, stream, 
+                FMT("ERROR: Command has failed with error '%s'") 
+                % Verbose::status((KLibraryStatus)e.rc).c_str());
+    }
+}
+
+bool Cli::_KhompResetLinks::execute(int argc, char *argv[])
+{
+    if(argc < 2 || argc > 4)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    unsigned int dev = UINT_MAX;
+    unsigned int obj = UINT_MAX;    
+
+    if(argc > 2)
+    {
+        dev = atoi(argv[2]);
+
+        if (!Globals::k3lapi.valid_device(dev))
+        {
+            K::Logger::Logg2(C_CLI, stream, 
+                    FMT("ERROR: no such device %d!") % dev);
+            return false;
+        }
+
+        if(argc > 3)
+        {
+            obj = atoi(argv[3]);
+
+            if(!Globals::k3lapi.valid_link(dev, obj))
+            {
+                K::Logger::Logg2(C_CLI, stream, 
+                      FMT("ERROR: No such link %d on device %d!") % obj % dev);
+                return false;
+            }
+        }
+    }
+
+    if(dev == UINT_MAX)
+    {
+        K::Logger::Logg2(C_CLI, stream, 
+                "NOTICE: Reseting all links...");
+
+        for (unsigned int d = 0; d < Globals::k3lapi.device_count(); d++)
+        {
+            unsigned int link_count = Globals::k3lutil.physicalLinkCount(d, true);
+
+            for (unsigned int o = 0; o < link_count; o++)
+                resetLink(d, o);
+        }
+    }
+    else
+    {
+        if (obj == UINT_MAX)
+        {
+            K::Logger::Logg2(C_CLI, stream, 
+                FMT("NOTICE: Reseting all links on device %d...")
+                % dev);
+            unsigned int link_count = Globals::k3lutil.physicalLinkCount(dev, true);
+
+            for (unsigned int o = 0; o < link_count; o++)
+                resetLink(dev, o);
+        }
+        else
+        {
+            K::Logger::Logg2(C_CLI, stream, 
+                FMT("NOTICE: Reseting link %d on device %d...") 
+                % obj % dev);
+
+            resetLink(dev, obj);
+        }
+    }
+
+    return true;
+}
+
+bool Cli::_KhompSMS::execute(int argc, char *argv[])
+{
+    if(argc < 4)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    std::string devs(argv[1]);
+    std::string numb(argv[2]);
+    std::string mesg(argv[3]);
+
+    for (unsigned int i = 4; i < (unsigned int)argc; i++)
+    {
+        mesg += " ";
+        mesg += argv[i];
+    }
+
+    Board::KhompPvt * pvt = NULL;
+
+    bool enable_retry = false;
+
+    size_t pos = numb.find('r');
+    if (pos != std::string::npos)
+    {
+        numb.erase(pos,1);
+        enable_retry = true;
+    }
+
+    std::string begin;
+
+    if(devs[0] != 'b' && devs[0] != 'B')
+    {
+        begin = "b";
+    }
+
+    std::string complete = begin + devs + "/" + numb + "/" + mesg;
+    int cause;
+
+    try
+    {
+        for (unsigned int ntry = 0; ntry < 15; ++ntry)
+        {
+            ScopedAllocLock alloc_lock;
+
+            pvt = processSMSString(complete.c_str(), &cause);
+
+            /* NOTE: go directly to the pvt check below! */
+            if (!enable_retry || pvt)
+                break;
+
+            alloc_lock.unlock();
+
+            K::Logger::Logg2(C_CLI, stream, FMT("WARNING: '%s': No available channel, trying again...") % devs);
+            usleep(2500000);
+        }
+
+        if (!pvt)
+        {
+            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: '%s': No available channel %s") % devs % (enable_retry ? "after 15 retries, giving up!" : ""));
+            return false;
+        }
+
+        ScopedPvtLock lock(pvt);
+
+        if(!pvt->application(SMS_SEND, NULL, complete.c_str()))
+        {
+            K::Logger::Logg2(C_CLI, stream, "ERROR: Message could not be sent");
+            return false;
+        }
+
+    }
+    catch(ScopedLockFailed & err)
+    {
+        if(err._fail == ScopedLockFailed::ALLOC_FAILED)
+        {
+            K::Logger::Logg2(C_CLI, stream, "ERROR: unable to global alloc lock");
+        }
+        else
+        {
+            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: unable to lock: %s!") % err._msg.c_str());
+        }
+        return false;
+    }
+        
+    K::Logger::Logg2(C_CLI, stream, "Message sent successfully!");
+
+    return true;
+}
+
+bool Cli::_KhompLogConsole::execute(int argc, char *argv[])
+{
+    if (argc < 3)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    bool invert = false;
+    bool unique = false;
+
+    std::string extra(argv[2]);
+
+    unsigned int total_args = argc - 2; /* remove "khomp log console" */
+
+    if (extra == "no")
+    {    
+        invert = true;
+        --total_args;
+    }    
+    else if (extra == "just")
+    {    
+        unique = true;
+        --total_args;
+    }    
+
+    unsigned int first_args = argc - total_args;
+
+    std::string options;
+
+    for (unsigned int i = first_args; i < (unsigned int)argc; i++) 
+    {    
+        options += argv[i];
+        options += ","; 
+    }    
+
+    K::Logger::processLogConsole(stream, options, invert, unique);
+    return true;
+}
+
+bool Cli::_KhompLogDisk::execute(int argc, char *argv[])
+{
+    if (argc < 3)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    bool invert = false;
+    bool unique = false;
+
+    std::string extra(argv[2]);
+
+    unsigned int total_args = argc - 2; /* remove "khomp log disk" */
+
+    if (extra == "no")
+    {
+        invert = true;
+        --total_args;
+    }
+    else if (extra == "just")
+    {
+        unique = true;
+        --total_args;
+    }
+
+    unsigned int first_args = argc - total_args;
+
+    std::string options;
+
+    for (unsigned int i = first_args; i < (unsigned int)argc; i++)
+    {
+        options += argv[i];
+        options += ",";
+    }
+
+    K::Logger::processLogDisk(stream, options, invert, unique);
+    return true;
+}
+
+bool Cli::_KhompLogStatus::execute(int argc, char *argv[])
+{
+    if(argc != 2)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    Strings::Merger m1;
+
+    bool flag1_errors   = K::Logger::Logg.classe(C_ERROR).get(O_CONSOLE, K::LogManager::Option::ENABLED);
+    bool flag1_warnings = K::Logger::Logg.classe(C_WARNING).get(O_CONSOLE, K::LogManager::Option::ENABLED);
+    bool flag1_messages = K::Logger::Logg.classe(C_MESSAGE).get(O_CONSOLE, K::LogManager::Option::ENABLED);
+    bool flag1_events   = K::Logger::Logg.classe(C_EVENT).get(O_CONSOLE, K::LogManager::Option::ENABLED);
+    bool flag1_commands = K::Logger::Logg.classe(C_COMMAND).get(O_CONSOLE, K::LogManager::Option::ENABLED);
+    bool flag1_audio    = K::Logger::Logg.classe(C_AUDIO_EV).get(O_CONSOLE, K::LogManager::Option::ENABLED);
+    bool flag1_modem    = K::Logger::Logg.classe(C_MODEM_EV).get(O_CONSOLE, K::LogManager::Option::ENABLED);
+    bool flag1_links    = K::Logger::Logg.classe(C_LINK_STT).get(O_CONSOLE, K::LogManager::Option::ENABLED);
+    bool flag1_cas      = K::Logger::Logg.classe(C_CAS_MSGS).get(O_CONSOLE, K::LogManager::Option::ENABLED);
+
+    if (flag1_errors)   m1.add("errors");
+    if (flag1_warnings) m1.add("warnings");
+    if (flag1_messages) m1.add("messages");
+    if (flag1_events)   m1.add("events");
+    if (flag1_commands) m1.add("commands");
+    if (flag1_audio)    m1.add("audio");
+    if (flag1_modem)    m1.add("modem");
+    if (flag1_links)    m1.add("link");
+    if (flag1_cas)      m1.add("cas");
+
+    K::Logger::Logg2(C_CLI, stream, "             ");
+
+    if (!m1.empty()) K::Logger::Logg2(C_CLI, stream, FMT("Enabled console messages: %s.") % m1.merge(", "));
+    else /* ----- */ K::Logger::Logg2(C_CLI, stream, "There are no console messages enabled.");
+
+    bool flag2_errors    = K::Logger::Logg.classe(C_ERROR).get(O_GENERIC, K::LogManager::Option::ENABLED);
+    bool flag2_warnings  = K::Logger::Logg.classe(C_WARNING).get(O_GENERIC, K::LogManager::Option::ENABLED);
+    bool flag2_messages  = K::Logger::Logg.classe(C_MESSAGE).get(O_GENERIC, K::LogManager::Option::ENABLED);
+    bool flag2_events    = K::Logger::Logg.classe(C_EVENT).get(O_GENERIC, K::LogManager::Option::ENABLED);
+    bool flag2_commands  = K::Logger::Logg.classe(C_COMMAND).get(O_GENERIC, K::LogManager::Option::ENABLED);
+    bool flag2_audio     = K::Logger::Logg.classe(C_AUDIO_EV).get(O_GENERIC, K::LogManager::Option::ENABLED);
+    bool flag2_modem     = K::Logger::Logg.classe(C_MODEM_EV).get(O_GENERIC, K::LogManager::Option::ENABLED);
+    bool flag2_links     = K::Logger::Logg.classe(C_LINK_STT).get(O_GENERIC, K::LogManager::Option::ENABLED);
+    bool flag2_cas       = K::Logger::Logg.classe(C_CAS_MSGS).get(O_GENERIC, K::LogManager::Option::ENABLED);
+    bool flag2_functions = K::Logger::Logg.classe(C_DBG_FUNC).enabled();
+    bool flag2_threads   = K::Logger::Logg.classe(C_DBG_THRD).enabled();
+    bool flag2_locks     = K::Logger::Logg.classe(C_DBG_LOCK).enabled();
+    bool flag2_streams   = K::Logger::Logg.classe(C_DBG_STRM).enabled();
+
+    Strings::Merger m2;
+
+    if (flag2_errors)    m2.add("errors");
+    if (flag2_warnings)  m2.add("warnings");
+    if (flag2_messages)  m2.add("messages");
+    if (flag2_events)    m2.add("events");
+    if (flag2_commands)  m2.add("commands");
+    if (flag2_audio)     m2.add("audio");
+    if (flag2_modem)     m2.add("modem");
+    if (flag2_links)     m2.add("link");
+    if (flag2_cas)       m2.add("cas");
+    if (flag2_functions) m2.add("functions");
+    if (flag2_threads)   m2.add("threads");
+    if (flag2_locks)     m2.add("locks");
+    if (flag2_streams)   m2.add("streams");
+
+    if (!m2.empty()) K::Logger::Logg2(C_CLI, stream, FMT("Enabled log-on-disk messages: %s.") % m2.merge(", "));
+    else /* ----- */ K::Logger::Logg2(C_CLI, stream, "There are no log-on-disk messages enabled.");
+   
+    if (Globals::flag_trace_rdsi) K::Logger::Logg2(C_CLI, stream, "The ISDN (RDSI) low-level tracing is enabled.");
+
+    K::Logger::Logg2(C_CLI, stream, "             ");
+
+    return true;
+}
+
+bool Cli::_KhompLogRotate::execute(int argc, char *argv[])
+{
+    if (argc != 2)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    if (!K::Logger::rotate())
+    {    
+        return false;
+    }    
+
+    return true;
+}
+
+bool Cli::_KhompLogTraceK3L::execute(int argc, char *argv[])
+{
+    if (argc != 4)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    std::string str_on("on");
+    std::string str_off("off");
+
+    bool value = false;
+
+         if (str_on  == argv[3]) value = true;
+    else if (str_off == argv[3]) value = false;
+    else 
+    {    
+        K::Logger::Logg2(C_CLI, stream, "ERROR: Please use 'on' or 'off' to enable or disable.");
+        return false;
+    }    
+
+    K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: %sbling k3l debug messages.") % (value ? "Ena" : "Disa"));
+
+    Logfile logfile;
+
+    K::LogConfig::set(logfile, "K3L", "Value",        value);
+    K::LogConfig::set(logfile, "K3L", "CallProgress", value);
+    K::LogConfig::set(logfile, "K3L", "CallAnalyzer", value);
+    K::LogConfig::set(logfile, "K3L", "CadenceRecog", value);
+    K::LogConfig::set(logfile, "K3L", "CallControl",  value);
+    K::LogConfig::set(logfile, "K3L", "Fax",          value);
+
+    if (K::LogConfig::commit(logfile))
+    {    
+        try
+        {
+            Globals::k3lapi.command(-1, -1, CM_LOG_UPDATE);
+        }
+        catch(...)
+        {
+            LOG(ERROR,"Error while send command CM_LOG_UPDATE");
+        }
+    } 
+
+    return true;
+}
+
+bool Cli::_KhompLogTraceISDN::execute(int argc, char *argv[])
+{
+    if (argc < 4)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    bool active = true;
+
+    bool change_lapd = false;
+    bool change_q931 = false;
+
+    std::string what;
+
+    for (unsigned int i = 4; i < (unsigned int)argc; i++)
+    {
+        what += argv[i];
+        what += ",";
+    }
+
+    Strings::vector_type values;
+    Strings::tokenize(what, values, ",");
+
+    for (Strings::vector_type::iterator i = values.begin(); i != values.end(); i++)
+    {
+        if ((*i) == "q931") change_q931 = true;
+        if ((*i) == "lapd") change_lapd = true;
+        if ((*i) == "off")  active = false;
+    }
+
+    Logfile logfile;
+
+    K::LogConfig::set(logfile, "ISDN", "Value", active);
+
+    if (change_lapd || !active)
+        K::LogConfig::set(logfile, "ISDN", "Lapd", active);
+
+    if (change_q931 || !active)
+        K::LogConfig::set(logfile, "ISDN", "Q931", active);
+
+    if (K::LogConfig::commit(logfile))
+    {
+        try
+        {
+            Globals::k3lapi.command(-1, -1, CM_LOG_UPDATE);
+
+            if (active)
+            {
+                K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Activating the following ISDN debug option(s): %s") % what);
+                Globals::flag_trace_rdsi = true;
+            }
+            else
+            {
+                K::Logger::Logg2(C_CLI, stream, "NOTICE: Deactivating ISDN debug options");
+                Globals::flag_trace_rdsi = false;
+            }
+        }
+        catch(...)
+        {
+            if (active)
+                K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to activate the following ISDN debug option(s): %s") % what);
+            else
+                K::Logger::Logg2(C_CLI, stream, "ERROR: Unable to deactivate ISDN debug options");
+        }
+
+        return false;
+    }
+
+    return true;
+}
+
+bool Cli::_KhompLogTraceR2::execute(int argc, char *argv[])
+{
+    if (argc != 4)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    try
+    {
+        std::string str_off("off");
+        std::string str_on("on" );
+
+        bool enable = false;
+
+        if (str_on   == argv[3]) enable = true;
+        else if (str_off  == argv[3]) enable = false;
+
+        if (enable)
+        {
+            K::Logger::Logg2(C_CLI, stream, "NOTICE: All channels of all devices will be monitored!" );
+        }
+        else
+        {
+            K::Logger::Logg2(C_CLI, stream, "NOTICE: Deactivating R2 debug options" );
+        }
+
+        Logfile logfile;
+
+        K::LogConfig::set(logfile, "R2", "Value",     enable);
+        K::LogConfig::set(logfile, "R2", "Signaling", enable);
+        K::LogConfig::set(logfile, "R2", "States",    enable);
+
+        if (K::LogConfig::commit(logfile))
+        {
+            try
+            {
+                Globals::k3lapi.command(-1, -1, CM_LOG_UPDATE);
+            }
+            catch(...)
+            {
+                LOG(ERROR,"Error while send command CM_LOG_UPDATE");
+            }
+        }
+    }
+    catch (Strings::invalid_value e)
+    {
+        K::Logger::Logg2(C_CLI, stream, "ERROR: Invalid numeric value in arguments.");
+        return false;
+    }
+
+    return true;
+}
+
+bool Cli::_KhompGet::execute(int argc, char *argv[])
+{
+    if (argc < 2) 
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    std::string arg(argv[1]);
+
+    try  
+    {    
+       std::string res = Globals::options.get((const char*) argv[1]);
+       K::Logger::Logg2(C_CLI, stream, FMT("Result for command %s is %s.") % std::string(argv[1]) % res);
+    }catch(ConfigProcessFailure &e){ 
+       K::Logger::Logg2(C_CLI, stream, (char*) e.msg.c_str());
+    }    
+
+    return true;
+}
+
+bool Cli::_KhompSet::execute(int argc, char *argv[])
+{
+    if (argc < 3) 
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    std::string args;
+
+    const unsigned int first = 2; 
+
+    for (unsigned int i = first; i < (unsigned int)argc; i++) 
+    {    
+        if (i != first) { args += " "; }
+
+        args += argv[i];
+    }    
+
+    try  
+    {    
+        Globals::options.process((const char *) argv[1], (const char *) args.c_str());
+    }    
+    catch (ConfigProcessFailure &e)
+    {    
+        K::Logger::Logg2(C_CLI,stream, FMT("config processing error: %s.") % e.msg.c_str());
+    }    
+
+    return true;
+}
+
+bool Cli::_KhompRevision::execute(int argc, char *argv[])
+{
+#ifndef MOD_KHOMP_VERSION
+#define MOD_KHOMP_VERSION "unknown"
+#endif
+
+#ifndef SWITCH_VERSION_FULL
+#define SWITCH_VERSION_FULL "unknown"
+#endif
+
+    std::string khomp_endpoint_rev(MOD_KHOMP_VERSION);
+    std::string freeswitch_rev(SWITCH_VERSION_FULL);
+
+    K::Logger::Logg2(C_CLI, stream, FMT("Khomp Endpoint - %s") % khomp_endpoint_rev);
+    K::Logger::Logg2(C_CLI, stream, FMT("FreeSWITCH - %s") % freeswitch_rev);
+    return true;
+}
+
+bool Cli::_KhompSendCommand::execute(int argc, char *argv[])
+{
+    if (argc < 5 || argc > 6)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    unsigned int dev = atoi (argv[2]);
+
+    if (dev >= Globals::k3lapi.device_count())
+    {
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: No such device: %d!") % dev);
+        return false;
+    }
+
+    unsigned int num = atoi (argv[4]);
+
+    if (num >= 256)
+    {
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Invalid command number: %d!") % num);
+        return false;
+    }
+
+    unsigned int obj = atoi (argv[3]);
+
+    try
+    {
+        switch (argc)
+        {
+            case 5:    Globals::k3lapi.command(dev,obj, num);         break;
+            case 6:    Globals::k3lapi.command(dev,obj, num,argv[5]); break;
+            default:   /*               what-a-hell ?!             */ break;
+        }
+    }
+    catch(K3LAPI::failed_command &e)
+    {
+        if (K::Logger::Logg.classe(C_WARNING).enabled())
+        {   
+            LOG(WARNING, FMT("Command '%s' has failed with error '%s'.")
+                % Verbose::commandName(e.code) % Verbose::status((KLibraryStatus)e.rc));
+        }   
+
+        return false;
+    }
+
+    return true;
+}
+
+bool Cli::_KhompSendRawCommand::execute(int argc, char *argv[])
+{
+    if (argc < 6) 
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    unsigned int dev = atoi (argv[3]);
+
+    if (dev >= Globals::k3lapi.device_count())
+    {    
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: No such device: %d!") % dev);
+        return false;
+    }    
+
+    unsigned int dsp = atoi (argv[4]);
+
+    if (dsp >= 2)
+    {    
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Invalid DSP number: %d!") % dsp);
+        return false;
+    }    
+
+    const unsigned int base = 5;
+    char commands[(argc - base)];
+
+    for (int i = base, j = 0; i < argc; i++, j++) 
+    {    
+        if (sscanf(argv[i], "%hhx", &(commands[j])) != 1)
+        {    
+            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Invalid hexadecimal sequence: '%s'!") % argv[i]);
+            return false;
+        }    
+    }    
+
+    try
+    {
+        Globals::k3lapi.raw_command(dev, dsp, commands, (argc - base));
+    }
+    catch(K3LAPI::failed_raw_command &e)
+    {
+        if (K::Logger::Logg.classe(C_WARNING).enabled())
+        {   
+            LOG(WARNING, FMT("(dev=%d,dsp=%d): Raw command '%s' has failed with error '%s'.")
+            % e.dev 
+            % e.dsp 
+            % Strings::hexadecimal(std::string((char*) commands,(argc - base))) 
+            % Verbose::status((KLibraryStatus)e.rc));
+        }   
+
+        return false;
+    }
+
+   return true; 
+}
+
+bool Cli::_KhompSelectSim::execute(int argc, char *argv[])
+{
+    if(argc != 5)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    std::string dev_str(argv[2]);
+    std::string obj_str(argv[3]);
+    std::string num_str(argv[4]);
+
+    try
+    {
+        unsigned int dev = Strings::tolong(dev_str);
+        unsigned int obj = Strings::tolong(obj_str);
+
+        if (!Globals::k3lapi.valid_device(dev))
+        {
+            K::Logger::Logg2(C_CLI, stream, 
+                    FMT("ERROR: no such device %d!") % dev);
+            return false;
+        }
+
+        if (!Globals::k3lapi.valid_channel(dev, obj))
+        {
+            K::Logger::Logg2(C_CLI, stream,
+                    FMT("ERROR: No such channel %d on device %d!") % obj % dev);
+            return false;
+        }
+
+        /* just check for validity */
+        (void)Strings::tolong(num_str);
+
+
+        if(!Board::get(dev, obj)->application(SELECT_SIM_CARD, NULL, num_str.c_str()))
+        {
+            K::Logger::Logg2(C_CLI, stream, "ERROR: Unable to select sim card"); 
+            return false;
+        }
+
+    }
+    catch (Strings::invalid_value & e)
+    {
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Invalid number '%s'!") % e.value());
+        return false;
+    }
+    catch (K3LAPI::invalid_channel & err)
+    {
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.channel % err.device );
+        return false;
+    }
+    catch(...)
+    {
+        K::Logger::Logg2(C_CLI, stream, "ERROR: Unable to select sim card"); 
+        return false;
+    }
+
+    return true;
+}
+
+bool Cli::_KhompKommuterOnOff::execute(int argc, char *argv[])
+{
+    if(argc != 2)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    switch (Board::kommuter._kommuter_count)
+    {
+        case -1: K::Logger::Logg2(C_CLI, stream, "ERROR: libkwd.so required for kommuter could not be found." ); return false;
+        case 0:  K::Logger::Logg2(C_CLI, stream, "ERROR: none Kommuter was found on the system." );              return false;
+    }
+    
+    if (Opt::_kommuter_activation == "auto")
+    {
+        K::Logger::Logg2(C_CLI, stream, "ERROR: Kommuter is set to be started automatically by kommuter-activation configuration.");
+        return false;
+    }
+    
+    bool on_off = ARG_CMP(1, "on") ? true : false;
+
+    int ret = 0;
+    if (on_off)
+    {
+        int timeout = Opt::_kommuter_timeout;
+        K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Activating Kommuters with timeout of %d seconds .") % timeout);
+        bool start_timer = false;
+
+        std::string param= STG(FMT("timeout=%d") % timeout);
+
+        for (int kommuter = 0; kommuter < Board::kommuter._kommuter_count; kommuter++)
+        {
+            try
+            {
+                Globals::k3lapi.command(-1, kommuter, CM_START_WATCHDOG, (char*) param.c_str());
+                start_timer = true;
+            }
+            catch(K3LAPI::failed_command & e)
+            {
+                switch(e.rc)
+                {
+                case ksInvalidParams:
+                    K::Logger::Logg2(C_CLI,stream,FMT("ERROR: invalid timeout '%d' for Kommuter device '%d' timeout. Mininum is 0, maximum is 255.") 
+                % timeout % kommuter);
+                    break;
+                default:
+                    K::Logger::Logg2(C_CLI,stream,FMT("ERROR: could not start the kommuter device number '%d'.") % kommuter);
+                    break;
+                }
+            } 
+            catch(...)
+            {
+                K::Logger::Logg2(C_CLI, stream, FMT("ERROR: could not start the Kommuter device number '%d'.") % kommuter);
+            }
+        }
+
+        if (timeout == 0)
+        {
+            DBG(FUNC, D("kommuter watchdog timer not created because timeout is 0."));
+            return false;
+        }        
+        
+        if (start_timer)
+        {    
+            if (!Globals::global_timer)
+            {    
+                K::Logger::Logg2(C_CLI, stream , "Error creating the timer for kommuter.");
+                return true;
+            }    
+            else if (Board::kommuter._kwtd_timer_on)
+            {    
+                Globals::global_timer->restart( Board::kommuter._kwtd_timer_index, true );
+                DBG(FUNC, D("kommuter watchdog timer restarted."));
+            }
+            else
+            {
+                Board::kommuter._kwtd_timer_index = Globals::global_timer->add(((timeout < 5) ? (timeout*500) : 2000), &Kommuter::wtdKickTimer);
+                Board::kommuter._kwtd_timer_on = true;
+                DBG(FUNC, D("kommuter watchdog timer created and started."));
+            }
+        }    
+    }    
+    else 
+    {    
+        K::Logger::Logg2(C_CLI, stream, "NOTICE: Deactivating Kommuters.");
+
+        if (Board::kommuter._kwtd_timer_on)
+        {    
+            Globals::global_timer->del( Board::kommuter._kwtd_timer_index);
+            Board::kommuter._kwtd_timer_on = false;
+        }    
+
+        for(int kommuter = 0; kommuter < Board::kommuter._kommuter_count; kommuter++)
+        {    
+            try
+            {
+                Globals::k3lapi.command(-1, kommuter, CM_STOP_WATCHDOG);
+                return true;
+            }
+            catch(K3LAPI::failed_command & e)
+            {
+                K::Logger::Logg2(C_CLI,stream,FMT("ERROR: Kommuter device '%d' was not initialized.") % kommuter);
+            } 
+            catch(...)
+            {
+                K::Logger::Logg2(C_CLI, stream,FMT("ERROR: could not disable kommuter device '%d' for some unknow reason.") % kommuter);
+            }
+        }    
+    }
+
+    return false;
+}
+
+bool Cli::_KhompKommuterCount::execute(int argc, char *argv[])
+{
+    if(argc != 2)
+    {
+        printUsage(stream);
+        return false;
+    }
+
+    if(Board::kommuter._kommuter_count == -1)
+    {
+        K::Logger::Logg2(C_CLI, stream, 
+                "ERROR: libkwd.so required for kommuter could not be found." );
+        return false;
+    }
+
+    K::Logger::Logg2(C_CLI, stream, 
+            FMT("Kommuter devices detected = [%d]") 
+            % Board::kommuter._kommuter_count);
+
+    return true;
+}
+
diff --git a/src/mod/endpoints/mod_khomp/src/frame.cpp b/src/mod/endpoints/mod_khomp/src/frame.cpp
new file mode 100644
index 0000000000..ea526366a3
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/frame.cpp
@@ -0,0 +1,124 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include "frame.h"
+
+#define ALLOC(T,s) ((T*)calloc(1,s))
+
+/* Internal frame manager structure. */
+FrameStorage::FrameStorage(switch_codec_t * codec, int packet_size)
+:  _frames(ALLOC(switch_frame_t, frame_count * sizeof(switch_frame_t))),
+   _buffer(ALLOC(          char, audio_count * packet_size)),
+   _index(0)
+{
+    for (unsigned int i = 0; i < frame_count; i++)
+    {
+        _frames[i].codec      = codec;
+        _frames[i].source     = "mod_khomp";
+
+        _frames[i].packet     = 0;
+        _frames[i].packetlen  = 0;
+        _frames[i].extra_data = 0;
+
+        _frames[i].data       = (char *)0;
+        _frames[i].datalen    = packet_size;
+        _frames[i].buflen     = packet_size;
+
+        _frames[i].samples    = packet_size; // packet_duration * 8
+        _frames[i].rate       = 8000;
+        _frames[i].payload    = 0;
+
+        _frames[i].timestamp  = 0u;
+
+        _frames[i].seq        = 0u;
+        _frames[i].ssrc       = 0u;
+        _frames[i].m          = SWITCH_FALSE;
+        _frames[i].flags      = SFF_NONE;
+    }
+
+    _cng_frame.codec      = codec;
+    _cng_frame.source     = "mod_khomp";
+    _cng_frame.packet     = 0;
+    _cng_frame.packetlen  = 0;
+    _cng_frame.extra_data = 0;
+
+    _cng_frame.data       = (void*)"A";
+    _cng_frame.datalen    = 2;
+    _cng_frame.buflen     = 2;
+
+    _cng_frame.samples    = packet_size;
+    _cng_frame.rate       = 8000;
+    _cng_frame.payload    = 0;
+
+    _cng_frame.timestamp  = 0u;
+
+    _cng_frame.seq        = 0u;
+    _cng_frame.ssrc       = 0u;
+    _cng_frame.m          = SWITCH_FALSE;
+    _cng_frame.flags      = SFF_CNG;
+
+//    if (mlock(&_frames, frames_size) < 0)
+//    {
+//        DBG(CONF, F("Unable to lock ast_frame buffer memory in RAM: %s") % strerror(errno));
+//        std::cerr << "chan_khomp: Unable to lock ast_frame buffer memory in RAM: "
+//            << strerror(errno) << ". "
+//                << "This is not a catastrophic failure, but may cause unpredictable "
+//                << "audio delay under extreme load conditions." << std::endl;
+//    }
+//
+//    if (mlock(&_buffer, buffer_size) < 0)
+//    {
+//        DBG(CONF, F("Unable to lock audio buffer memory in RAM: %s") % strerror(errno));
+//        std::cerr << "chan_khomp: Unable to lock temporary audio buffer memory in RAM: "
+//                << strerror(errno) << ". "
+//                    << "This is not a catastrophic failure, but may cause unpredictable "
+//                    << "audio delay under extreme load conditions." << std::endl;
+//    }
+};
+
+FrameStorage::~FrameStorage()
+{
+    free(_frames);
+    free(_buffer);
+}
+
diff --git a/src/mod/endpoints/mod_khomp/src/globals.cpp b/src/mod/endpoints/mod_khomp/src/globals.cpp
new file mode 100644
index 0000000000..cdc20efd4e
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/globals.cpp
@@ -0,0 +1,66 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include "globals.h"
+
+K3LAPI                           Globals::k3lapi;
+K3LUtil                          Globals::k3lutil(Globals::k3lapi);
+Verbose                          Globals::verbose(Globals::k3lapi);
+
+/* Global Timer */
+Globals::GlobalTimer           * Globals::global_timer = NULL;
+
+Globals::Mutex                   Globals::khomp_alloc_mutex;
+
+ConfigOptions                    Globals::options;
+
+switch_endpoint_interface_t    * Globals::khomp_endpoint_interface     = NULL;
+switch_endpoint_interface_t    * Globals::khomp_sms_endpoint_interface = NULL;
+switch_endpoint_interface_t    * Globals::khomp_pr_endpoint_interface  = NULL;
+switch_application_interface_t * Globals::khomp_app_inteface           = NULL;
+switch_api_interface_t         * Globals::api_interface                = NULL;
+switch_memory_pool_t           * Globals::module_pool                  = NULL;
+
+volatile bool                    Globals::logs_being_rotated = false;
+
+bool                             Globals::flag_trace_rdsi = false;
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt.cpp
new file mode 100644
index 0000000000..225312be54
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt.cpp
@@ -0,0 +1,2431 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include "khomp_pvt.h"
+#include "lock.h"
+#include "khomp_pvt_kxe1.h"
+#include "khomp_pvt_gsm.h"
+#include "khomp_pvt_fxo.h"
+#include "khomp_pvt_passive.h"
+#include "utils.h"
+
+Board::VectorBoard  Board::_boards;
+char                Board::_cng_buffer[Globals::cng_buffer_size];
+Kommuter            Board::kommuter;
+
+
+Board::KhompPvt::KhompPvt(K3LAPI::target & target) :
+  _target(target),
+  _mutex(Globals::module_pool),
+  _session(NULL),
+  _caller_profile(NULL),
+  _reader_frames(&_read_codec),
+  _writer_frames(&_write_codec) 
+{    
+    _read_codec.implementation = NULL;
+    _write_codec.implementation = NULL;
+
+    _pvt_statistics = new PvtStatistics(this);
+}
+
+bool Board::initializeK3L(void)
+{
+    LOG(MESSAGE, "starting K3L API ..."); 
+
+    /* Start the API and connect to KServer */
+    k3lSetGlobalParam (klpResetFwOnStartup, 1);
+    k3lSetGlobalParam (klpDisableInternalVoIP, 1);
+
+    try
+    {
+        Globals::k3lapi.start();
+    }
+    catch (K3LAPI::start_failed & e)
+    {
+        LOG(ERROR,FMT("loading K3L API failed: %s") % e.msg);
+        return false;
+    }
+
+    LOG(MESSAGE, "the K3L API have been started!"); 
+    
+    return true;
+}
+
+bool Board::finalizeK3L(void)
+{
+    /* Stop the API and disconnect to KServer */
+    try
+    {
+        Globals::k3lapi.stop();
+    }
+    catch(...)
+    {
+        LOG(ERROR, "K3L not stopped");
+        return false;
+    }
+    LOG(MESSAGE, "K3L stopped.."); 
+    return true;
+}
+
+bool Board::initializeHandlers(void)
+{
+    Globals::global_timer = new Globals::GlobalTimer;
+    Globals::global_timer->start();
+
+    if (Globals::k3lapi.device_count() == 0)
+        return false;
+
+    for (VectorBoard::iterator it_dev = _boards.begin();
+                               it_dev != _boards.end();
+                               it_dev++)
+    {
+        Board * device = *it_dev;
+        device->_event_handler = new ChanEventHandler(device->id(), &eventThread);
+        device->_command_handler = new ChanCommandHandler(device->id(), &commandThread);
+
+        device->_timers.start();
+    }
+
+    k3lRegisterEventHandler( khompEventCallback );
+    k3lRegisterAudioListener( NULL, khompAudioListener );
+
+    LOG(MESSAGE, "K3l event and audio handlers registered."); 
+
+    return true;
+}
+
+bool Board::finalizeHandlers(void)
+{
+    /* if timer still ticks, stop him */
+    if(Globals::global_timer != NULL)
+    {
+        Globals::global_timer->stop();
+        delete Globals::global_timer;
+        Globals::global_timer = NULL;
+    }
+
+    if (Globals::k3lapi.device_count() == 0)
+        return false;
+
+    k3lRegisterEventHandler( NULL );
+    k3lRegisterAudioListener( NULL, NULL );
+
+
+    for (VectorBoard::iterator it_dev = _boards.begin();
+                               it_dev != _boards.end();
+                               it_dev++)
+    {
+        Board * device = *it_dev;        
+        // stop event handler for device
+        ChanEventHandler * evt_handler = device->_event_handler;
+        evt_handler->fifo()->_shutdown = true;
+        evt_handler->signal();
+        delete evt_handler;
+        device->_event_handler = NULL;
+        // stop command handler for device
+        ChanCommandHandler * cmd_handler = device->_command_handler;
+        cmd_handler->fifo()->_shutdown = true;
+        cmd_handler->signal();
+        delete cmd_handler;
+        device->_command_handler = NULL;
+        // stop timer
+        device->_timers.stop();
+    }
+
+    /* wait every thread to finalize */
+    sleep(1);
+
+    LOG(MESSAGE, "K3l event and audio handlers unregistered."); 
+
+    return true;
+
+}
+
+void Board::initializeBoards(void)
+{
+
+    for (unsigned dev = 0; dev < Globals::k3lapi.device_count(); dev++)
+    {
+        LOG(MESSAGE,FMT("loading device %d..." ) % dev); 
+
+        switch(Globals::k3lapi.device_type(dev))
+        {
+            case kdtE1:
+            case kdtE1Spx:
+            case kdtE1GW:
+            case kdtE1IP:
+            case kdtE1FXSSpx:
+            case kdtFXS:
+            case kdtFXSSpx:
+                _boards.push_back(new BoardE1(dev));
+                break;
+            case kdtGSM:
+            case kdtGSMSpx:
+            case kdtGSMUSB:
+            case kdtGSMUSBSpx:
+                _boards.push_back(new BoardGSM(dev));
+                break;
+            case kdtFXO:
+            case kdtFXOVoIP:
+                switch(Globals::k3lapi.device_config(dev).DeviceModel)
+                {
+                case kdmFXO80:
+                    _boards.push_back(new BoardFXO(dev));
+                    break;
+                default:
+                    _boards.push_back(new BoardPassive(dev));
+                    break;
+                }
+                break;
+            case kdtPR:
+                    _boards.push_back(new BoardPassive(dev));
+                    break;
+            default:
+                _boards.push_back(new Board(dev));
+                LOG(ERROR,FMT("device type %d unknown" ) %  Globals::k3lapi.device_type(dev)); 
+                break;
+        }
+        
+        _boards.back()->initializeChannels();
+    }
+}
+
+void Board::initializeChannels(void)
+{
+    LOG(MESSAGE, "loading channels ..."); 
+
+    for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
+    {
+        K3LAPI::target tgt(Globals::k3lapi, K3LAPI::target::CHANNEL, _device_id, obj);
+
+        KhompPvt * pvt;
+
+		switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
+		{
+            case ksigInactive:
+            default:
+                pvt = new Board::KhompPvt(tgt);
+                pvt->_call = new Board::KhompPvt::Call();
+                DBG(FUNC, FMT("signaling %d unknown") % Globals::k3lapi.channel_config(_device_id, obj).Signaling);
+                break;
+        }
+        
+        _channels.push_back(pvt);
+
+        pvt->cleanup();
+    }
+}
+
+void Board::finalizeBoards(void)
+{
+    LOG(MESSAGE, "finalizing boards ..."); 
+
+    for (VectorBoard::iterator it_dev = _boards.begin();
+                               it_dev != _boards.end();
+                               it_dev++)
+    {
+        Board * & device_ref = *it_dev;
+        Board *   device_ptr = device_ref;
+
+        device_ptr->finalizeChannels();
+
+        device_ref = (Board *) NULL;
+
+        delete device_ptr;
+    }
+
+}
+
+void Board::finalizeChannels()
+{
+    LOG(MESSAGE, "finalizing channels ..."); 
+    for (VectorChannel::iterator it_obj = _channels.begin();
+         it_obj != _channels.end();
+         it_obj++)
+    {
+        KhompPvt * & pvt_ref = *it_obj;
+        KhompPvt *   pvt_ptr = pvt_ref;
+
+        if(!pvt_ptr)
+            continue;
+
+        try
+        {
+            ScopedPvtLock lock(pvt_ptr);
+
+            if(pvt_ptr->session())
+            {
+                //TODO: Tratamento para desconectar do canal do FreeSwitch.
+                pvt_ptr->cleanup();
+            }
+
+            delete pvt_ptr->_call;
+            pvt_ptr->_call = NULL;
+
+            pvt_ref = (KhompPvt *) NULL;
+        }
+        catch(...)
+        {
+            /* keep walking! */
+        }
+
+        delete pvt_ptr;
+    }
+}
+
+void Board::initializeCngBuffer(void)
+{
+    bool turn = true;
+
+    for (unsigned int i = 0; i < Globals::cng_buffer_size; i++)
+    {
+        _cng_buffer[i] = (turn ? 0xD5 : 0xD4);
+        turn = !turn;
+    }
+}
+
+bool Board::initialize(void)
+{
+    initializeCngBuffer();
+
+    initializeBoards();
+
+    return true;
+}
+
+bool Board::finalize(void)
+{
+    finalizeBoards();
+
+    return finalizeK3L();
+}
+
+void Board::khomp_add_event_board_data(const K3LAPI::target target, switch_event_t *event)
+{
+
+    //if (!event) {
+        //TODO: RAISE!
+    //}
+
+    try
+    {
+        if (target.type == K3LAPI::target::CHANNEL)
+        {
+            switch_core_session_t * s = get(target.device, target.object)->session();
+            switch_channel_event_set_data(Board::KhompPvt::getFSChannel(s), event);
+        }
+
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Khomp-DeviceId", "%u", target.device);
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Khomp-Object", "%u", target.object);
+    }
+    catch(K3LAPI::invalid_channel & err)
+    {
+        LOG(ERROR, PVT_FMT(target, "Invalid channel"));
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(target, "No valid channel: %s") % err._msg.c_str());
+    }
+}
+
+std::string Board::KhompPvt::getStatistics(Statistics::Type type)
+{
+    switch(type)
+    {
+        case Statistics::DETAILED:
+        {
+            return _pvt_statistics->getDetailed();
+        }
+        case Statistics::ROW:
+        {
+            return _pvt_statistics->getRow();
+        }
+        default:
+            return "";
+    }
+}
+
+std::string Board::KhompPvt::PvtStatistics::getDetailedRates()
+{
+    /* skip inactive channels */
+    //if (_pvt->getSignaling() == ksigInactive) return "";
+
+    /* buffer our data to return at the end */
+    std::string strBuffer;
+
+    /* this values come from kserver */
+    unsigned int call_incoming = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiInbound);
+    unsigned int call_outgoing = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiOutbound);
+
+    float occupation_rate = 100.0;
+
+    if (_pvt->call()->statistics()->_total_idle_time > 0)
+    {
+        occupation_rate = 100 * (
+            _pvt->call()->statistics()->_total_time_incoming + 
+            _pvt->call()->statistics()->_total_time_outgoing
+            ) / (
+            _pvt->call()->statistics()->_total_idle_time + 
+            _pvt->call()->statistics()->_total_time_incoming + 
+            _pvt->call()->statistics()->_total_time_outgoing);
+    }
+
+    strBuffer.append(STG(FMT("Occupation rate: \t\t%0.2f%%\n") % occupation_rate));
+
+    if (call_incoming > 0) 
+    {    
+        std::string str_calls_incoming_mean = timeToString ( (time_t) (_pvt->call()->statistics()->_total_time_incoming / call_incoming) );
+        strBuffer.append(STG(FMT("Mean duration time of incoming calls: %s\n") % str_calls_incoming_mean));
+    }    
+
+    if (call_outgoing > 0) 
+    {    
+        std::string str_calls_outgoing_mean = timeToString ( (time_t) (_pvt->call()->statistics()->_total_time_outgoing / call_outgoing) );
+        strBuffer.append(STG(FMT("Mean duration time of outgoing calls: %s\n") % str_calls_outgoing_mean));
+    }    
+
+    return strBuffer;
+}
+
+std::string Board::KhompPvt::PvtStatistics::getDetailed()
+{ 
+    /* skip inactive channels */
+    //if (_pvt->getSignaling() == ksigInactive) return "";
+
+    /* buffer our data to return at the end */
+    std::string strBuffer;
+            
+    strBuffer.append(_pvt->call()->statistics()->getDetailed());
+
+    /* this values come from kserver */
+    unsigned int call_incoming = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiInbound);
+    unsigned int call_outgoing = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiOutbound);
+    unsigned int call_fails    = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiOutFailed);
+
+    strBuffer.append(STG(FMT("Number of incoming calls: \t%d\n") % call_incoming));
+    strBuffer.append(STG(FMT("Number of outgoing calls: \t%d\n") % call_outgoing));
+    strBuffer.append(STG(FMT("Number of calls failed: \t%d\n") % call_fails));
+
+    strBuffer.append(getDetailedRates());
+    
+    return strBuffer;
+}
+
+std::string Board::KhompPvt::PvtStatistics::getRow() 
+{
+    /* skip inactive channels */
+    //if (_pvt->getSignaling() == ksigInactive) return "";
+
+    time_t action_time;
+    time (&action_time);
+   
+    action_time -= _pvt->call()->statistics()->_base_time;
+
+    uint32 calls_incoming = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiInbound);
+    uint32 calls_outgoing = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiOutbound);
+    uint32 call_fails     = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiOutFailed);
+    
+    std::string string_time = "  n/a  ";
+    std::string call_type   = "  none  ";
+
+    if (_pvt->call()->_flags.check(Kflags::IS_INCOMING))
+        call_type = "incoming";
+    else if (_pvt->call()->_flags.check(Kflags::IS_OUTGOING))
+        call_type = "outgoing";
+
+    if (_pvt->owner())
+    {    
+        string_time = timeToString(action_time);
+    }    
+
+    return  STG(FMT("| %d,%02d | %8d | %8d | %8d | %7d | %10s | %8s | %8s |")
+            % _pvt->target().device 
+            % _pvt->target().object 
+            % calls_incoming 
+            % calls_outgoing 
+            % _pvt->call()->statistics()->_channel_fails
+            % call_fails 
+            % _pvt->getStateString() 
+            % call_type 
+            % string_time);
+}
+
+switch_status_t Board::KhompPvt::justAlloc(bool is_answering, switch_memory_pool_t **pool)
+{
+    DBG(FUNC, PVT_FMT(target(), "c"));
+
+    if(is_answering)
+    {
+        /* Create a new session on incoming call */
+        call()->_flags.set(Kflags::IS_INCOMING);
+        if(!session())
+        {
+#if SWITCH_LESS_THAN(1,0,6)
+            session(switch_core_session_request(Globals::khomp_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL));
+#else            
+            session(switch_core_session_request(Globals::khomp_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL));
+#endif            
+        }
+        else
+        {
+            DBG(FUNC, PVT_FMT(target(), "Session already created"));
+        }
+    }
+    else
+    {
+        /* Create a new session on outgoing call */
+        call()->_flags.set(Kflags::IS_OUTGOING);
+#if SWITCH_LESS_THAN(1,0,6)        
+        session(switch_core_session_request(Globals::khomp_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool));
+#else
+        session(switch_core_session_request(Globals::khomp_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, SOF_NONE, pool));
+#endif
+    }
+
+    if(!session())
+    {
+        LOG(ERROR, PVT_FMT(target(), "r (Initilization Error, session not created!)"));
+        return SWITCH_STATUS_FALSE;
+    }
+
+    switch_core_session_add_stream(session(), NULL);
+
+    if (switch_core_codec_init(&_read_codec, "PCMA", NULL, 8000, Globals::switch_packet_duration, 1,
+            SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
+                (pool ? *pool : NULL)) != SWITCH_STATUS_SUCCESS)
+    {
+        destroy();
+        LOG(ERROR, PVT_FMT(target(), "r (Error while init read codecs)"));
+        return SWITCH_STATUS_FALSE;
+    }
+
+    if (switch_core_codec_init(&_write_codec, "PCMA", NULL, 8000, Globals::switch_packet_duration, 1,
+            SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
+                (pool ? *pool : NULL)) != SWITCH_STATUS_SUCCESS)
+    {
+        destroy();
+        LOG(ERROR, PVT_FMT(target(), "r (Error while init write codecs)"));
+        return SWITCH_STATUS_FALSE;
+    }
+
+    //TODO: Retirar daqui
+//    switch_mutex_init(&flag_mutex, SWITCH_MUTEX_NESTED,
+//                switch_core_session_get_pool(_session));
+
+    switch_core_session_set_private(_session, this);
+
+    if((switch_core_session_set_read_codec(_session, &_read_codec) !=
+                SWITCH_STATUS_SUCCESS) ||
+       (switch_core_session_set_write_codec(_session, &_write_codec) !=
+                SWITCH_STATUS_SUCCESS))
+    {
+        destroy();
+        LOG(ERROR, PVT_FMT(target(), "r (Error while set read codecs)"));
+        return SWITCH_STATUS_FALSE;
+    }
+
+    DBG(FUNC, PVT_FMT(target(), "r"));
+    return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t Board::KhompPvt::justStart(switch_caller_profile_t *profile)
+{
+    DBG(FUNC, PVT_FMT(target(), "c"));
+
+    try
+    {
+        switch_channel_t *channel = getFSChannel();
+        
+        if(call()->_flags.check(Kflags::IS_INCOMING))
+        {
+            std::string exten("s");
+
+            owner(_session);
+
+            if(call()->_incoming_context.empty())
+            {
+                MatchExtension::ContextListType contexts;
+                std::string context("default");
+
+                if(!validContexts(contexts))
+                {
+                    destroy();
+                    owner(NULL);
+                    LOG(ERROR, PVT_FMT(_target, "r (Invalid context)"));
+                    return SWITCH_STATUS_FALSE;
+                }
+
+                switch(MatchExtension::findExtension(exten, context, contexts, _call->_dest_addr, _call->_orig_addr)) 
+                {
+                    case MatchExtension::MATCH_NONE:
+                        destroy();
+                        owner(NULL);
+                        LOG(ERROR, PVT_FMT(_target, "r (unable to find exten/context on incoming call %s/%s)")
+                                % _call->_dest_addr % (contexts.size() >= 1 ? contexts[0] : "default"));
+                        return SWITCH_STATUS_FALSE; 
+                    default:
+                        DBG(FUNC, PVT_FMT(_target, "our: dialplan '%s', context '%s', exten '%s'") % Opt::_dialplan % context % exten);
+                        break;
+                }
+
+                call()->_incoming_context = context;
+            }
+            else
+            {
+                exten = call()->_dest_addr;
+                DBG(FUNC, PVT_FMT(target(), "already found our: dialplan '%s', context '%s', exten '%s'") % Opt::_dialplan % call()->_incoming_context % exten);
+            }
+            
+            _caller_profile = switch_caller_profile_new(switch_core_session_get_pool(_session),
+                    "Khomp",                           //username
+                    Opt::_dialplan.c_str(),            //dialplan
+                    NULL,                              //caller_id_name
+                    _call->_orig_addr.c_str(),         //caller_id_number
+                    NULL,                              //network_addr
+                    _call->_orig_addr.c_str(),         //ani
+                    NULL,                              //aniii
+                    NULL,                              //rdnis
+                    (char *) "mod_khomp",              //source
+                    call()->_incoming_context.c_str(), //context
+                    exten.c_str());                    //destination_number
+
+            if(!_caller_profile)
+            {
+                destroy();
+                owner(NULL);
+                LOG(ERROR, PVT_FMT(_target, "r (Cannot create caller profile)"));
+                return SWITCH_STATUS_FALSE;
+            }
+
+            std::string name = STG(FMT("Khomp/%hu/%hu/%s")
+                    % target().device
+                    % target().object
+                    % _call->_dest_addr);
+
+            DBG(FUNC, PVT_FMT(target(), "Connect inbound channel %s") % name.c_str());
+
+            switch_channel_set_name(channel, name.c_str());
+            switch_channel_set_caller_profile(channel, _caller_profile);
+
+            switch_channel_set_state(channel, CS_INIT);
+
+            setSpecialVariables();
+
+            if (switch_core_session_thread_launch(_session) != SWITCH_STATUS_SUCCESS)
+            {
+                destroy();
+                owner(NULL);
+                LOG(ERROR, PVT_FMT(target(), "r (Error spawning thread)"));
+                return SWITCH_STATUS_FALSE;
+            }
+        }
+        else if(call()->_flags.check(Kflags::IS_OUTGOING))
+        {
+            if(_call->_orig_addr.empty())
+                _call->_orig_addr = profile->caller_id_number;
+
+            switch_channel_set_name(channel, STG(FMT("Khomp/%hu/%hu/%s")
+                        % target().device
+                        % target().object
+                        % (!_call->_dest_addr.empty() ? _call->_dest_addr.c_str() : "")).c_str());
+            _caller_profile = switch_caller_profile_clone(_session, profile);
+            switch_channel_set_caller_profile(channel, _caller_profile);
+
+            switch_channel_set_flag(channel, CF_OUTBOUND);
+            switch_channel_set_state(channel, CS_INIT);
+        }
+        else
+        {
+            DBG(FUNC, PVT_FMT(target(), "r (Not INCOMING or OUTGOING)"));
+            return SWITCH_STATUS_FALSE;
+        }
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        destroy();
+        owner(NULL);
+        DBG(FUNC, PVT_FMT(target(), "r (%s)") % err._msg.c_str()); 
+        return SWITCH_STATUS_FALSE;
+    }
+
+    DBG(FUNC, PVT_FMT(target(), "r"));
+    return SWITCH_STATUS_SUCCESS;
+}
+        
+int Board::KhompPvt::makeCall(std::string params)
+{
+    DBG(FUNC, PVT_FMT(target(), "Dialing to %s from %s")
+        % _call->_dest_addr.c_str()
+        % _call->_orig_addr.c_str());
+
+    /* Lets make the call! */
+    std::string full_params;
+    
+    if(!_call->_dest_addr.empty())
+        full_params += STG(FMT(" dest_addr=\"%s\"")
+                % _call->_dest_addr);
+
+    if(!params.empty())
+        full_params += STG(FMT(" %s")
+                % params);
+
+    DBG(FUNC, PVT_FMT(target(), "We are calling with params: %s.") % full_params.c_str());
+
+    int ret = commandState(KHOMP_LOG, CM_MAKE_CALL, (full_params != "" ? full_params.c_str() : NULL));
+
+    if(ret != ksSuccess)
+    {
+        destroy();
+        cleanup(CLN_FAIL);
+    }
+
+    return ret;
+}
+
+bool Board::KhompPvt::signalDTMF(char d)
+{
+    DBG(FUNC, PVT_FMT(target(), "c (dtmf=%c)") % d);
+
+    try
+    {
+        switch_dtmf_t dtmf = { (char) d, switch_core_default_dtmf_duration(0) };
+        switch_channel_queue_dtmf(getFSChannel(), &dtmf);
+    }
+    catch (Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "r (Received a DTMF, but %s)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(target(), "r"));
+
+    return true;
+}
+
+bool Board::KhompPvt::indicateBusyUnlocked(int cause, bool sent_signaling)
+{
+    DBG(FUNC, PVT_FMT(target(), "c"));
+
+    /* already playing! */
+    if (call()->_indication != INDICA_NONE)
+    {
+        if (call()->_indication == INDICA_RING)
+        {
+            DBG(FUNC, PVT_FMT(target(), "ringback being disabled"));
+
+            if(call()->_cadence == PLAY_RINGBACK)
+                stopCadence();
+
+            try
+            {
+                call()->_flags.clear(Kflags::GEN_PBX_RING);
+                call()->_flags.clear(Kflags::GEN_CO_RING);
+
+                Board::board(_target.device)->_timers.del(call()->_idx_pbx_ring);
+                Board::board(_target.device)->_timers.del(call()->_idx_co_ring);
+            }
+            catch (K3LAPI::invalid_device & err)
+            {
+                LOG(ERROR, PVT_FMT(_target, "Unable to get device: %d!") % err.device);
+            }
+
+            mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
+            call()->_indication = INDICA_NONE;
+        }
+        else
+        {
+            DBG(FUNC, PVT_FMT(target(), "r (already playing something: %d)") 
+                    % call()->_indication);
+            return false;
+        }
+    }
+
+    setHangupCause(cause, false);
+
+    call()->_indication = INDICA_BUSY;
+        
+    DBG(FUNC, PVT_FMT(target(), "r"));
+
+    return true;
+}
+
+void Board::KhompPvt::destroy(switch_core_session_t * s)
+{
+    switch_core_session_t * tmp_session;
+
+    if(!s)
+    {
+        if(!_session)
+            return;
+    
+        tmp_session = _session;
+    }
+    else
+    {
+        tmp_session = s;
+        
+    }
+
+    switch_core_session_destroy(&tmp_session);
+}
+
+void Board::KhompPvt::destroyAll()
+{
+    if(_session)
+    {
+        switch_core_session_set_private(_session, NULL);
+        _session = NULL;
+    }
+
+    if(_caller_profile)
+    {
+        //DBG(FUNC, PVT_FMT(target(), "Profile != NULL"));
+        //TODO: Destruir
+        _caller_profile = NULL;
+    }
+
+    if (switch_core_codec_ready(&_read_codec)) {
+        //if(session())
+        //    switch_core_session_lock_codec_read(_session);
+        switch_core_codec_destroy(&_read_codec);
+        _read_codec.implementation = NULL;
+        //if(session())
+        //    switch_core_session_unlock_codec_read(_session);
+    }
+
+    if (switch_core_codec_ready(&_write_codec)) {
+        //if(session())
+        //    switch_core_session_lock_codec_write(_session);
+        switch_core_codec_destroy(&_write_codec);
+        _write_codec.implementation = NULL;
+        //if(session())
+        //    switch_core_session_unlock_codec_write(_session);
+    }
+
+}
+
+void Board::KhompPvt::doHangup()
+{
+    owner(NULL);
+
+    try
+    {
+        switch_channel_t *channel = getFSChannel();
+
+        int cause_from_freeswitch = switch_channel_get_cause(channel);
+        if(cause_from_freeswitch != SWITCH_CAUSE_NONE)
+        {
+            DBG(FUNC, PVT_FMT(_target, "cause already set to %s from freeswitch") % switch_channel_cause2str((switch_call_cause_t)cause_from_freeswitch));
+        }
+        else
+        {
+            DBG(FUNC, PVT_FMT(target(), "Hangup channel \"%s\"") % switch_channel_get_name(channel));
+
+            switch_channel_hangup(channel, (switch_call_cause_t)call()->_hangup_cause);
+        }
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        //DBG(FUNC, PVT_FMT(target(), "Hangup channel already done"));
+    }
+}
+
+bool Board::KhompPvt::cleanup(CleanupType type)
+{
+//    flags = 0;
+
+    _reader_frames.clear();
+    _writer_frames.clear();
+    
+    call()->_flags.clear(Kflags::CONNECTED);
+    
+    //call()->_flags.clear(Kflags::BRIDGED);
+    
+    call()->_flags.clear(Kflags::DROP_COLLECT);
+    
+    call()->_flags.clear(Kflags::OUT_OF_BAND_DTMFS);
+
+    call()->_flags.clear(Kflags::WAIT_SEND_DTMF);
+    
+    call()->_flags.clear(Kflags::GEN_PBX_RING);
+    call()->_flags.clear(Kflags::GEN_CO_RING);
+
+    try
+    {
+        Board::board(_target.device)->_timers.del(call()->_idx_pbx_ring);
+        Board::board(_target.device)->_timers.del(call()->_idx_co_ring);
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "Unable to get device: %d!") % err.device);
+    }
+        
+    call()->_idx_pbx_ring.reset();
+    call()->_idx_co_ring.reset();
+
+    switch (type)
+    {
+    case CLN_HARD:
+    case CLN_FAIL:
+        call()->_flags.clear(Kflags::KEEP_DTMF_SUPPRESSION);
+        call()->_flags.clear(Kflags::KEEP_ECHO_CANCELLATION);
+        call()->_flags.clear(Kflags::KEEP_AUTO_GAIN_CONTROL);
+
+        stopStream();
+        stopListen();
+        doHangup();
+        call()->_flags.clear(Kflags::IS_INCOMING);
+        call()->_flags.clear(Kflags::IS_OUTGOING);
+        call()->_flags.clear(Kflags::REALLY_CONNECTED);
+        call()->_flags.clear(Kflags::HAS_PRE_AUDIO);
+        call()->_flags.clear(Kflags::HAS_CALL_FAIL);
+
+        /* pára cadências e limpa estado das flags */
+        stopCadence();
+
+        if (call()->_indication != INDICA_NONE)
+        {
+            call()->_indication = INDICA_NONE;
+
+            mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
+        }
+
+        if(call()->_input_volume >= -10 && call()->_input_volume <= 10)
+            setVolume("input" , Opt::_input_volume);
+
+        if(call()->_output_volume >= -10 && call()->_output_volume <= 10)
+            setVolume("output", Opt::_output_volume);        
+
+        return _call->clear();
+    case CLN_SOFT:
+        if(call()->_cadence != PLAY_FASTBUSY)
+        {    
+            /* pára cadências e limpa estado das flags */
+            stopCadence();
+        }
+
+        if (call()->_indication == INDICA_RING)
+        {
+            call()->_indication = INDICA_NONE;
+
+            mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
+        }
+        break;
+    }
+
+    return true;
+}
+
+bool Board::KhompPvt::isFree(bool just_phy)
+{
+    //DBG(FUNC, DP(this, "c"));
+	try
+	{
+        bool is_physical_free = isPhysicalFree();
+
+		/* if we got here, is physically free */
+		if (!is_physical_free || just_phy)
+			return is_physical_free;
+
+        ScopedPvtLock lock(this);
+
+        if(session())
+            return false;
+
+        /*
+		if (!is_gsm())
+		{
+			if (calls.at(0).owner != NULL)
+			{
+				DBG(FUNC, DP(this, "we have owner, not free!"));
+				return false;
+			}
+		}
+		else
+		{
+			for (int i = 0; i < 6; i++)
+			{
+
+				call_data_type & data = calls.at(i);
+
+				if (data.owner != NULL)
+					return false;
+			}
+		}
+        */
+
+		bool free_state = !(_call->_flags.check(Kflags::IS_INCOMING) || _call->_flags.check(Kflags::IS_OUTGOING));
+
+		DBG(FUNC, PVT_FMT(target(), "[free = %s]") % (free_state ? "yes" : "no"));
+		return free_state;
+	}
+    catch (ScopedLockFailed & err)
+	{
+		DBG(FUNC, PVT_FMT(target(), "unable to obtain lock: %s") % err._msg.c_str());
+	}
+
+	return false;
+}
+
+Board::KhompPvt * Board::queueFindFree(PriorityCallQueue &pqueue)
+{
+    for (PriorityCallQueue::iterator i = pqueue.begin(); i != pqueue.end(); i++)
+    {
+        KhompPvt *pvt = (*i);
+        if (pvt && pvt->isFree())
+        {
+            return pvt;
+        }
+    }
+
+    DBG(FUNC, D("found no free channel for fair allocation!"));
+    return NULL;
+}
+
+void Board::queueAddChannel(PriorityCallQueue &pqueue, unsigned int board, unsigned int object)
+{
+    try
+    {
+        KhompPvt * pvt = get(board, object);
+        pqueue.insert(pvt);
+    }
+    catch(K3LAPI::invalid_channel & err)
+    {
+        //...
+    }
+}
+
+Board::KhompPvt * Board::findFree(unsigned int board, unsigned int object, bool fully_available)
+{
+    try
+    {
+        KhompPvt * pvt = get(board, object);
+        return ((fully_available ? pvt->isFree() : pvt->isOK()) ? pvt : NULL);
+    }
+    catch(K3LAPI::invalid_channel & err)
+    {
+    }
+    return NULL;
+}
+
+void Board::applyGlobalVolume(void)
+{
+    DBG(FUNC, "c");
+
+    for (unsigned int dev = 0; dev < Globals::k3lapi.device_count(); dev++)
+    {    
+        for (unsigned int obj = 0; obj < Globals::k3lapi.channel_count(dev); obj++)
+        {
+            try
+            {
+                Board::get(dev,obj)->setVolume("input", Opt::_input_volume);
+                Board::get(dev,obj)->setVolume("output",Opt::_output_volume);
+            }
+            catch(K3LAPI::invalid_channel & err)
+            {
+                DBG(FUNC, OBJ_FMT(dev, obj, "Channel not found"));
+            }
+        }    
+    }    
+    
+    DBG(FUNC, "r");
+}
+
+bool Board::KhompPvt::startCadence(CadencesType type) 
+{
+    DBG(FUNC, PVT_FMT(target(), "c"));
+
+    std::string tone("");
+
+    /**/ if (type == PLAY_VM_TONE)  tone = "vm-dialtone";
+    else if (type == PLAY_PBX_TONE) tone = "pbx-dialtone";
+    else if (type == PLAY_PUB_TONE) tone = "co-dialtone";
+    else if (type == PLAY_RINGBACK) tone = "ringback";
+    else if (type == PLAY_FASTBUSY) tone = "fast-busy";
+
+
+    if (tone != "")
+    {    
+        call()->_cadence = type;
+
+        Opt::CadencesMapType::iterator i = Opt::_cadences.find(tone);
+        std::string cmd_params;
+
+        if (i != Opt::_cadences.end())
+        {    
+            CadenceType cadence = (*i).second;
+
+            if (cadence.ring == 0 && cadence.ring_s == 0)
+            {    
+                cmd_params = "cadence_times=\"continuous\" mixer_track=1";
+            }    
+            else if (cadence.ring_ext == 0 && cadence.ring_ext_s == 0)
+            {    
+                cmd_params = STG(FMT("cadence_times=\"%d,%d\" mixer_track=1")
+                    % cadence.ring % cadence.ring_s);
+            }    
+            else 
+            {    
+                cmd_params = STG(FMT("cadence_times=\"%d,%d,%d,%d\" mixer_track=1")
+                    % cadence.ring % cadence.ring_s % cadence.ring_ext % cadence.ring_ext_s);
+            }    
+
+            command(KHOMP_LOG,CM_START_CADENCE,cmd_params.c_str());
+        }
+        else
+        {
+            LOG(ERROR, PVT_FMT(_target, "r (cadence '%s' not found)") % tone);
+            return false;
+        }
+    }
+    else
+    {
+        LOG(ERROR, PVT_FMT(_target, "r (unknown cadence requested )"));
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(target(), "r"));
+    return true;
+}
+
+/* Helper functions - based on code from chan_khomp */
+bool Board::KhompPvt::startStream(bool enable_mixer)
+{
+    if (call()->_flags.check(Kflags::STREAM_UP))
+        return true;
+
+    if(enable_mixer)
+    {
+        if(!mixer(KHOMP_LOG, 0, kmsPlay, _target.object))
+            return false;
+    }
+
+    if(!command(KHOMP_LOG, CM_START_STREAM_BUFFER))
+        return false;
+
+    call()->_flags.set(Kflags::STREAM_UP);
+
+    return true;
+}
+
+bool Board::KhompPvt::stopStream(bool enable_mixer)
+{
+    if (!call()->_flags.check(Kflags::STREAM_UP))
+        return true;
+
+    call()->_flags.clear(Kflags::STREAM_UP);
+
+    if(enable_mixer)
+    {
+        if(!mixer(KHOMP_LOG, 0, kmsGenerator, kmtSilence))
+            return false;
+    }
+
+    if(!command(KHOMP_LOG, CM_STOP_STREAM_BUFFER))
+        return false;
+
+    return true;
+}
+
+bool Board::KhompPvt::startListen(bool conn_rx)
+{
+    if(call()->_flags.check(Kflags::LISTEN_UP))
+        return true;
+
+    const size_t buffer_size = Globals::boards_packet_duration;
+
+    if(conn_rx)
+    {
+        if(!obtainRX(false)) //no delay, by default..
+            return false;
+    }
+
+    if(!command(KHOMP_LOG, CM_LISTEN, (const char *) &buffer_size))
+        return false;
+
+    call()->_flags.set(Kflags::LISTEN_UP);
+
+    return true;
+}
+
+bool Board::KhompPvt::stopListen(void)
+{
+    if(!call()->_flags.check(Kflags::LISTEN_UP))
+        return true;
+
+    call()->_flags.clear(Kflags::LISTEN_UP);
+
+    if(!command(KHOMP_LOG, CM_STOP_LISTEN))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool Board::KhompPvt::obtainRX(bool with_delay)
+{
+    try
+    {
+        Globals::k3lapi.mixerRecord(_target, 0, (with_delay ? kmsChannel : kmsNoDelayChannel), target().object);
+        Globals::k3lapi.mixerRecord(_target, 1, kmsGenerator, kmtSilence);
+    }
+    catch(K3LAPI::failed_raw_command & e)
+    {
+        LOG(ERROR, PVT_FMT(target(), "ERROR sending mixer record command!"));
+        return false;
+    }    
+    return true;
+}
+
+bool Board::KhompPvt::obtainTX()
+{
+    /* estes buffers *NAO PODEM SER ESTATICOS*! */
+    char cmd1[] = { 0x3f, 0x03, 0xff, 0x00, 0x00, 0xff };
+    char cmd2[] = { 0x3f, 0x03, 0xff, 0x01, 0x09, 0x0f };
+
+    cmd1[2] = cmd1[5] = cmd2[2] = _target.object;
+
+    try
+    {
+        int dsp = Globals::k3lapi.get_dsp(_target.device, K3LAPI::DSP_AUDIO);
+
+        Globals::k3lapi.raw_command(_target.device, dsp, cmd1, sizeof(cmd1));
+
+        Globals::k3lapi.raw_command(_target.device, dsp, cmd2, sizeof(cmd2));
+
+    }
+    catch(K3LAPI::failed_raw_command & e)
+    {
+        LOG(ERROR, PVT_FMT(target(), "ERROR sending mixer command!"));
+        return false;
+    }    
+
+    return true;
+}
+
+bool Board::KhompPvt::sendDtmf(std::string digit)
+{
+    if(!call()->_flags.check(Kflags::STREAM_UP))
+    {
+        DBG(FUNC, PVT_FMT(target(), "stream down, not sending dtmf"));
+        return false;
+    }
+
+    if(!call()->_flags.check(Kflags::OUT_OF_BAND_DTMFS))
+    {
+        DBG(FUNC, PVT_FMT(target(), "dtmf suppression disabled, not generating dtmf"));
+        return false;
+    }
+
+    if(digit.empty())
+    {
+        DBG(FUNC, PVT_FMT(target(), "not sending dtmf (there is nothing to send)"));
+        return false;
+    }
+
+    if(call()->_flags.check(Kflags::WAIT_SEND_DTMF))
+    {
+        DBG(FUNC, PVT_FMT(target(), "queueing dtmf (%s)") % digit);
+        call()->_queued_digits_buffer += digit;
+        return true;
+    }
+
+    DBG(FUNC, PVT_FMT(target(), "sending dtmf (%s)") % digit);
+    
+    call()->_flags.set(Kflags::WAIT_SEND_DTMF);
+
+    return command(KHOMP_LOG, CM_DIAL_DTMF, digit.c_str());
+}
+
+bool Board::KhompPvt::setVolume(const char * type, int volume)
+{
+    std::string arg = STG(FMT("volume=\"%d\" type=\"%s\"") % volume % type);
+    DBG(FUNC, PVT_FMT(_target, "%s") % arg);
+    return command(KHOMP_LOG,CM_SET_VOLUME,arg.c_str());
+}
+
+std::string Board::KhompPvt::getStateString(void)
+{
+    try
+    {
+        switch_channel_t *c = getFSChannel();
+        if(!c) return "unused";
+
+        switch_channel_state_t state = switch_channel_get_state(c);
+
+        /* shortcut */
+        typedef std::string S;
+
+        switch (state)
+        {    
+            case CS_NEW:               return S("new");
+            case CS_INIT:              return S("init");
+            case CS_ROUTING:           return S("routing");
+            case CS_SOFT_EXECUTE:      return S("sf_exec");
+            case CS_EXECUTE:           return S("execute");
+            case CS_EXCHANGE_MEDIA:    return S("ex_media");
+            case CS_PARK:              return S("park");
+            case CS_CONSUME_MEDIA:     return S("cs_media");
+            case CS_HIBERNATE:         return S("hibernat");
+            case CS_RESET:             return S("reset");
+            case CS_HANGUP:            return S("hangup");
+            case CS_REPORTING:         return S("reportg");
+            case CS_DESTROY:           return S("destroy");
+            case CS_NONE:              return S("none");
+            default:
+                return STG(FMT("none (%d)") % state);
+        }    
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        return "unused";
+    }
+}
+
+bool Board::KhompPvt::dtmfSuppression(bool enable)
+{
+    if (!command(KHOMP_LOG, (enable ? CM_ENABLE_DTMF_SUPPRESSION : CM_DISABLE_DTMF_SUPPRESSION)))
+        return false;
+
+    if (enable) call()->_flags.set(Kflags::OUT_OF_BAND_DTMFS);
+    else        call()->_flags.clear(Kflags::OUT_OF_BAND_DTMFS);
+
+    DBG(FUNC, PVT_FMT(_target, "flag OUT_OF_BAND_DTMFS is : %s") % 
+        (call()->_flags.check(Kflags::OUT_OF_BAND_DTMFS) ? "true" : "false"));
+    
+    return true;
+}
+
+bool Board::KhompPvt::echoCancellation(bool enable)
+{
+    K3L_DEVICE_CONFIG & devCfg = Globals::k3lapi.device_config(_target.device);
+
+    /* echo canceller should not be used for non-echo cancellable channels */
+    switch (devCfg.EchoConfig)
+    {
+        case keccFail:
+            if (!enable)
+                return true;
+
+            LOG(ERROR, PVT_FMT(_target, "unable to activate echo cancellation"));
+            return false;
+
+        case keccNotPresent:
+            DBG(FUNC, PVT_FMT(_target, "echo cancellation not present, not %s.") % (enable ? "enabling" : "disabling"));
+            return true;
+
+        default:
+            return command(KHOMP_LOG,(enable ? CM_ENABLE_ECHO_CANCELLER : CM_DISABLE_ECHO_CANCELLER));
+    }
+}
+
+bool Board::KhompPvt::autoGainControl(bool enable)
+{
+    bool ret = command(KHOMP_LOG,(enable ? CM_ENABLE_AGC : CM_DISABLE_AGC));//, SCE_SHOW_DEBUG);
+    return ret;
+}
+
+void Board::KhompPvt::pbxRingGen(Board::KhompPvt * pvt)
+{
+    DBG(FUNC, PVT_FMT(pvt->target(), "Generating pbx ring"));
+
+    try 
+    {   
+        ScopedPvtLock lock(pvt);
+
+        if (!pvt->call()->_flags.check(Kflags::GEN_PBX_RING))
+            return;
+
+        if (!pvt->obtainTX())
+            return;
+
+        pvt->startCadence(PLAY_RINGBACK);
+    }   
+    catch (...)
+    {
+        LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock!"));
+    }
+}
+
+void Board::KhompPvt::coRingGen(Board::KhompPvt * pvt)
+{
+    DBG(FUNC, PVT_FMT(pvt->target(), "Generating co ring"));
+
+    try 
+    {   
+        ScopedPvtLock lock(pvt);
+
+        if (!pvt->call()->_flags.check(Kflags::GEN_CO_RING))
+            return;
+
+        pvt->startCadence(PLAY_RINGBACK);
+    }   
+    catch (...)
+    {
+        LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock the pvt !"));
+    }  
+}
+
+int Board::KhompPvt::getActiveChannel(bool invalid_as_not_found)
+{
+    // AT CONSTRUCTION
+    return 0;
+}
+
+bool Board::KhompPvt::setCollectCall()
+{
+    DBG(FUNC, PVT_FMT(target(), "c"));
+    // NEEDS LOCK !?
+
+    std::vector< TriState > confvalues;
+ 
+    // temporary!
+    const char * tmp_var = NULL;
+
+    // get option configuration value
+    confvalues.push_back(Opt::_drop_collect_call ? T_TRUE : T_FALSE);
+    DBG(FUNC, PVT_FMT(_target, "option drop collect call is '%s'") % (Opt::_drop_collect_call ? "yes" : "no"));
+
+    // get global filter configuration value
+    tmp_var = switch_core_get_variable("KDropCollectCall");
+    confvalues.push_back(getTriStateValue(tmp_var));
+    DBG(FUNC, PVT_FMT(_target, "global KDropCollectCall was '%s'") % (tmp_var ? tmp_var : "(empty)"));
+
+    try 
+    {
+        // get local filter configuration value
+        tmp_var = switch_channel_get_variable(getFSChannel(), "KDropCollectCall");
+        confvalues.push_back(getTriStateValue(tmp_var));
+        DBG(FUNC, PVT_FMT(_target, "local KDropCollectCall was '%s'") % (tmp_var ? tmp_var : "(empty)"));
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "Cannot obtain the channel variable: %s") % err._msg.c_str()); 
+    }
+
+    // store last state assigned
+    bool last_state = false;
+
+    // validate the states
+    std::vector< TriState >::const_iterator end = confvalues.end();
+    for (std::vector< TriState >::const_iterator i = confvalues.begin(); i != end; ++i)
+    {
+        switch(*i)
+        {
+            case T_TRUE:
+                last_state = true;
+                break;
+            case T_FALSE:
+                last_state = false;
+                break;
+            case T_UNKNOWN:
+            default:
+                break;
+        }
+    }
+
+    if (last_state)
+        call()->_flags.set(Kflags::DROP_COLLECT);
+    else
+        call()->_flags.clear(Kflags::DROP_COLLECT);
+
+    DBG(FUNC, PVT_FMT(_target, "drop collect call flag: %s.") % (last_state ? "set" : "unset"));
+
+    return last_state;
+}
+
+bool Board::KhompPvt::onChannelRelease(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(target(), "c"));
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if (e->Code == EV_CHANNEL_FAIL)
+        {
+            call()->statistics()->incrementChannelFail();
+            _has_fail = true;
+            setHangupCause(SWITCH_CAUSE_NETWORK_OUT_OF_ORDER);
+            cleanup(CLN_HARD);
+        }
+        else
+        {
+            if(call()->_flags.check(Kflags::REALLY_CONNECTED))
+            {
+                call()->statistics()->incrementHangup();
+            }
+
+            setHangupCause(SWITCH_CAUSE_NORMAL_CLEARING);
+            cleanup(CLN_HARD);
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(target(), "r"));
+    return true;
+}
+
+//TODO: This method must return more information about the channel allocation
+bool Board::KhompPvt::onNewCall(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(target(), "c"));
+
+    std::string orig_addr, dest_addr;
+
+    Globals::k3lapi.get_param(e, "orig_addr", orig_addr);
+    Globals::k3lapi.get_param(e, "dest_addr", dest_addr);
+
+    if(dest_addr.empty())
+    {
+        dest_addr="s";
+    }
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        _call->_orig_addr = orig_addr;
+        _call->_dest_addr = dest_addr;
+
+        if (justAlloc(true) != SWITCH_STATUS_SUCCESS)
+        {
+            int fail_code = callFailFromCause(SWITCH_CAUSE_UNALLOCATED_NUMBER);
+            setHangupCause(SWITCH_CAUSE_UNALLOCATED_NUMBER);
+            cleanup(CLN_FAIL);
+            reportFailToReceive(fail_code);
+
+            LOG(ERROR, PVT_FMT(target(), "r (Initilization Error on alloc!)"));
+            return false;
+        }
+
+        if (justStart() != SWITCH_STATUS_SUCCESS)
+        {
+            int fail_code = callFailFromCause(SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
+            setHangupCause(SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
+            cleanup(CLN_FAIL);
+            reportFailToReceive(fail_code);
+            
+            LOG(ERROR, PVT_FMT(target(), "r (Initilization Error on start!)"));
+            return false;
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        cleanup(CLN_FAIL);
+        LOG(ERROR, PVT_FMT(target(), "r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    catch (Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        cleanup(CLN_FAIL);
+        LOG(ERROR, PVT_FMT(target(), "r (%s)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(target(), "r"));
+    return true;
+}
+
+bool Board::KhompPvt::onDisconnect(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "c"));   
+
+/*
+    try
+    {
+        ScopedPvtLock lock(this);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+*/
+
+    DBG(FUNC, PVT_FMT(_target, "r"));   
+    return true;
+}
+
+bool Board::KhompPvt::onAudioStatus(K3L_EVENT *e)
+{
+    try
+    {
+        if(e->AddInfo != kmtSilence)
+        {
+            if(call()->_flags.check(Kflags::GEN_PBX_RING))
+            {
+                DBG(FUNC, PVT_FMT(_target, "PBX ringback being disabled..."));   
+                ScopedPvtLock lock(this);
+
+                call()->_flags.clear(Kflags::GEN_PBX_RING);
+                Board::board(_target.device)->_timers.del(call()->_idx_pbx_ring);
+
+                if(call()->_cadence != PLAY_VM_TONE)
+                {    
+                    stopCadence();
+                }
+
+                if (!call()->_flags.check(Kflags::CONNECTED))
+                {
+                    obtainRX(Opt::_suppression_delay);
+            
+                    //Marcar para o Freeswitch que jah tem audio passando
+                    if (call()->_flags.check(Kflags::IS_OUTGOING))
+                        switch_channel_mark_pre_answered(getFSChannel());
+
+                }
+            }
+            
+            if (!call()->_is_progress_sent && call()->_flags.check(Kflags::HAS_CALL_FAIL))
+            {
+
+                ScopedPvtLock lock(this);
+
+                DBG(FUNC, PVT_FMT(_target, "Audio status progress"));   
+
+                call()->_is_progress_sent = true;
+                //Sinaliza para o Freeswitch PROGRESS
+
+                DBG(FUNC, PVT_FMT(_target, "Pre answer"));   
+
+                //pvt->signal_state(AST_CONTROL_PROGRESS);
+                switch_channel_pre_answer(getFSChannel());
+            }
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "unable to lock %s!") % err._msg.c_str() );
+        return false;
+
+    }
+    catch (Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        cleanup(CLN_FAIL);
+        LOG(ERROR, PVT_FMT(target(), "r (%s)") % err._msg.c_str() );
+        return false;
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "r (unable to get device: %d!)") % err.device);
+        return false;
+    }
+
+    return true;
+}
+
+bool Board::KhompPvt::onCollectCall(K3L_EVENT *e)
+{
+    try  
+    {    
+        ScopedPvtLock lock(this);
+
+        //TODO: AMI ? 
+        //K::internal::ami_event(pvt, EVENT_FLAG_CALL, "CollectCall",
+          //      STG(FMT("Channel: Khomp/B%dC%d\r\n") % pvt->boardid % pvt->objectid));
+
+        if (Opt::_drop_collect_call || _call->_flags.check(Kflags::DROP_COLLECT))
+        {     
+            /* disconnect! */
+            //TODO: SCE_HIDE !?
+            command(KHOMP_LOG,CM_DISCONNECT);
+//           command(KHOMP_LOG,CM_DISCONNECT,SCE_HIDE);
+
+        }    
+    }    
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }
+
+    return true;
+}
+
+bool Board::KhompPvt::onSeizureStart(K3L_EVENT *e)
+{
+/*
+    try
+    {
+        ScopedPvtLock lock(this);
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }
+*/
+    return true;
+}
+
+bool Board::KhompPvt::setupConnection()
+{
+    if(!call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::IS_OUTGOING))
+    {
+        DBG(FUNC, PVT_FMT(_target, "Channel already disconnected"));   
+        return false;
+    }
+
+    if(call()->_cadence != PLAY_VM_TONE)
+    {    
+        stopCadence();
+    }
+        
+    if (call()->_indication != INDICA_NONE)
+    {
+        call()->_indication = INDICA_NONE;
+
+        mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
+    }
+
+    if(call()->_flags.check(Kflags::GEN_PBX_RING))
+    {
+        call()->_flags.clear(Kflags::GEN_PBX_RING);
+        Board::board(_target.device)->_timers.del(call()->_idx_pbx_ring);
+    }
+
+    if(call()->_flags.check(Kflags::GEN_CO_RING))
+    {
+        call()->_flags.clear(Kflags::GEN_CO_RING);
+        Board::board(_target.device)->_timers.del(call()->_idx_co_ring);
+    }
+
+    if (!call()->_flags.check(Kflags::CONNECTED))
+        call()->_flags.set(Kflags::CONNECTED);
+
+    if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
+        call()->_flags.set(Kflags::REALLY_CONNECTED);
+
+    /* Sinalizar para o Freeswitch o atendimento */
+
+    DBG(FUNC, PVT_FMT(_target, "Call will be answered."));   
+
+    if(call()->_flags.check(Kflags::IS_INCOMING))
+    {
+        switch_channel_answer(getFSChannel());
+    }   
+    else if(call()->_flags.check(Kflags::IS_OUTGOING))
+    {
+        switch_channel_mark_answered(getFSChannel());
+    }
+
+    call()->statistics()->incrementNewCall();
+
+    return true;
+}
+
+
+bool Board::KhompPvt::onConnect(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "c"));
+
+    try
+    {
+        ScopedPvtLock lock(this);
+    
+        return setupConnection();
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    catch (Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "r (%s)") % err._msg.c_str() );
+        return false;
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "r (unable to get device: %d!)") % err.device);
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_target, "r"));
+
+    return true;
+}
+
+bool Board::KhompPvt::onCallSuccess(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "c"));   
+ 
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        switch_channel_mark_ring_ready(getFSChannel());
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    catch (Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "r (%s)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "r"));
+
+    return true;
+}
+
+bool Board::KhompPvt::onCallFail(K3L_EVENT *e)
+{
+   DBG(FUNC, PVT_FMT(_target, "c"));
+   try
+   {
+       ScopedPvtLock lock(this);
+
+        call()->_flags.set(Kflags::HAS_CALL_FAIL);
+    
+       //TODO: Notificar o Freeswitch: call fail
+
+        cleanup(CLN_SOFT);
+   }
+   catch (ScopedLockFailed & err)
+   {
+       LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
+       return false;
+   }
+   
+   DBG(FUNC, PVT_FMT(_target, "r"));
+
+   return true;
+}
+
+bool Board::KhompPvt::onNoAnswer(K3L_EVENT *e)
+{
+    /* TODO: Destroy sessions and channels */
+    DBG(FUNC, PVT_FMT(_target, "No one answered the call."));   
+
+    // TODO: Set channel variable if we get this event 
+    // TODO: Fire an event so ESL can get it? 
+    // Call Analyser has to be enabled on k3lconfig 
+    DBG(FUNC, PVT_FMT(_target, "Detected: \"%s\"") %  Verbose::callStartInfo((KCallStartInfo)e->AddInfo).c_str());   
+
+    // Fire a custom event about this 
+    switch_event_t * event;
+    if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, KHOMP_EVENT_MAINT) == SWITCH_STATUS_SUCCESS)
+    {
+        Board::khomp_add_event_board_data(_target, event);
+        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM,
+                "EV_CALL_ANSWER_INFO",
+                Verbose::callStartInfo((KCallStartInfo)e->AddInfo).c_str());
+
+        switch_event_fire(&event);
+    }
+    return true;
+}
+
+bool Board::KhompPvt::onDtmfDetected(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "c (dtmf=%c)") % (char) e->AddInfo);
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if (call()->_flags.check(Kflags::IS_INCOMING) || call()->_flags.check(Kflags::IS_OUTGOING)) /* is a valid call? */
+        {    
+            char digit = (char) e->AddInfo;
+
+            //TODO: WTHeck ? 
+            //if (!call()->_flags.check(Kflags::OUT_OF_BAND_DTMFS) && !call()->_flags.check(Kflags::BRIDGED))
+            if (!call()->_flags.check(Kflags::OUT_OF_BAND_DTMFS))
+            {    
+                /* we do not queue dtmfs as we do not need to resend them */
+                DBG(FUNC, PVT_FMT(_target, "r (not queueing dtmf, not needed.)"));
+                return true;
+            }    
+
+            if (Opt::_ignore_letter_dtmfs)
+            {    
+                switch (e->AddInfo)
+                {    
+                    case 'A': case 'a': 
+                    case 'B': case 'b': 
+                    case 'C': case 'c': 
+                    case 'D': case 'd': 
+                        DBG(FUNC, PVT_FMT(_target, "r (not queueing dtmf, letter digit ignored!)"));
+                        return true;
+                    default:
+                        break;
+                }    
+            }
+            
+            signalDTMF(e->AddInfo);
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "r"));
+    return true;
+}
+
+bool Board::KhompPvt::onDtmfSendFinish(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "c"));
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if (call()->_flags.check(Kflags::WAIT_SEND_DTMF))
+        {
+            if(!call()->_queued_digits_buffer.empty())
+            {
+                DBG(FUNC, PVT_FMT(target(), "sending dtmf (%s)") 
+                        % call()->_queued_digits_buffer);
+
+                command(KHOMP_LOG, CM_DIAL_DTMF, 
+                        call()->_queued_digits_buffer.c_str());
+
+                /* clear the buffer that has been send */
+                call()->_queued_digits_buffer.clear();
+            }
+            else
+            {
+                DBG(FUNC, PVT_FMT(target(), 
+                        "finished sending some digits, cleaning up!"));
+                call()->_flags.clear(Kflags::WAIT_SEND_DTMF);
+            }
+        } 
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_target, "r"));
+
+    return true;
+}
+
+bool Board::KhompPvt::onEvUntreated(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "New Event has just arrived with untreated code \"%d\" \"%s\"") % e->Code % Globals::verbose.event(_target.object, e));
+
+    return false;
+}
+
+bool Board::KhompPvt::eventHandler(K3L_EVENT *e)
+{
+    DBG(STRM, D("c"));
+
+    bool ret = true;
+
+    switch(e->Code)
+    {
+    case EV_CHANNEL_FREE:
+    case EV_CHANNEL_FAIL:
+        ret = onChannelRelease(e);
+        break;
+    
+    case EV_NEW_CALL:
+        ret = onNewCall(e);
+        break;
+
+    case EV_CALL_SUCCESS:
+        ret = onCallSuccess(e);
+        break;
+
+    case EV_CALL_FAIL:
+        ret = onCallFail(e);
+        break;
+
+    case EV_CONNECT:
+        ret = onConnect(e);
+        break;
+
+    case EV_DISCONNECT:
+        ret = onDisconnect(e);
+        break;
+    
+    case EV_AUDIO_STATUS:
+        ret = onAudioStatus(e);
+        break;
+
+    case EV_NO_ANSWER:
+        ret = onNoAnswer(e);
+        break;
+
+    case EV_DTMF_DETECTED:
+        ret = onDtmfDetected(e);
+        break;
+
+    case EV_DTMF_SEND_FINISH:
+        ret = onDtmfSendFinish(e);
+        break;
+
+    case EV_COLLECT_CALL:
+        ret = onCollectCall(e);
+        break;
+
+    case EV_SEIZURE_START:
+        ret = onSeizureStart(e);
+        break;
+
+    case EV_CADENCE_RECOGNIZED:
+        break;
+
+    default:
+        ret = onEvUntreated(e);
+        break;
+    }
+
+    DBG(STRM, D("r"));
+
+    return ret;
+}
+
+bool Board::KhompPvt::indicateProgress()
+{
+    DBG(FUNC, PVT_FMT(_target, "c")); 
+    
+    int ret = false;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if (!call()->_flags.check(Kflags::CONNECTED))
+        {
+            bool has_audio = sendPreAudio(RingbackDefs::RB_SEND_NOTHING);
+
+            if (has_audio)
+            {
+                /* start grabbing audio */
+                startListen();
+                /* start stream if it is not already */
+                startStream();
+
+                ret = true;
+            }
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_target, "r"));
+
+    return ret;
+}
+
+bool Board::KhompPvt::indicateRinging()
+{
+    DBG(FUNC, PVT_FMT(_target, "c")); 
+
+    bool ret = false;
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        /* already playing! */
+        if (call()->_indication != INDICA_NONE)
+        {    
+            DBG(FUNC, PVT_FMT(_target, "r (already playing something: %d)") 
+                    % call()->_indication);
+            return false;
+        }    
+
+        // any collect calls ?
+        setCollectCall();
+
+        call()->_indication = INDICA_RING;
+
+        bool send_ringback = true;
+
+        if (!call()->_flags.check(Kflags::CONNECTED))
+        {    
+            int ringback_value = RingbackDefs::RB_SEND_DEFAULT;
+
+            bool do_drop_call = Opt::_drop_collect_call
+                                        || call()->_flags.check(Kflags::DROP_COLLECT);
+
+            if (do_drop_call && call()->_collect_call)
+            {
+                ringback_value = kq931cCallRejected;
+                DBG(FUNC, PVT_FMT(_target, "ringback value adjusted to refuse collect call: %d") % ringback_value);
+            }
+
+            // send ringback too? 
+            send_ringback = sendPreAudio(ringback_value);
+
+            if (!send_ringback)
+            {
+                // warn the developer which may be debugging some "i do not have ringback!" issue. 
+                DBG(FUNC, PVT_FMT(_target, " not sending pre connection audio"));
+            }
+
+        }
+
+        if (send_ringback)
+        {    
+            call()->_flags.set(Kflags::GEN_CO_RING);
+            call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_ringback_co_delay, &Board::KhompPvt::coRingGen,this);
+
+            /* start grabbing audio */
+            startListen();
+
+            /* start stream if it is not already */
+            startStream();
+
+            ret = true; 
+        }   
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "r (unable to get device: %d!)") % err.device);
+        return false;
+    }
+
+    
+    DBG(FUNC, PVT_FMT(_target, "r"));
+    return ret;
+}
+
+bool Board::KhompPvt::doChannelAnswer(CommandRequest &cmd)
+{
+    DBG(FUNC, PVT_FMT(_target, "c"));
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        call()->_flags.set(Kflags::CONNECTED);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "r"));
+    return true;
+}
+
+bool Board::KhompPvt::doChannelHangup(CommandRequest &cmd)
+{
+    DBG(FUNC, PVT_FMT(_target, "c"));
+
+    bool answered     = true;
+    bool disconnected = false;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if (call()->_flags.check(Kflags::IS_INCOMING))
+        {
+            DBG(FUNC, PVT_FMT(_target, "disconnecting incoming channel"));   
+
+            //disconnected = command(KHOMP_LOG, CM_DISCONNECT);
+        }
+        else if (call()->_flags.check(Kflags::IS_OUTGOING))
+        {
+            if(call()->_cleanup_upon_hangup)
+            {
+                DBG(FUNC, PVT_FMT(_target, "disconnecting not allocated outgoing channel..."));   
+
+                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
+                cleanup(KhompPvt::CLN_HARD);
+                answered = false;
+
+            }
+            else
+            {
+                DBG(FUNC, PVT_FMT(_target, "disconnecting outgoing channel..."));   
+
+                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
+            }
+        }
+        else
+        {
+            DBG(FUNC, PVT_FMT(_target, "already disconnected"));
+            return true;
+        }
+
+        if(answered)
+        {
+            indicateBusyUnlocked(SWITCH_CAUSE_USER_BUSY, disconnected);
+        }
+
+        if (call()->_flags.check(Kflags::IS_INCOMING))
+        {
+            DBG(FUNC, PVT_FMT(_target, "disconnecting incoming channel..."));
+            disconnected = command(KHOMP_LOG, CM_DISCONNECT);
+        }
+
+        stopStream();
+
+        stopListen();
+        
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    
+
+    DBG(FUNC, PVT_FMT(_target, "r"));
+    return true;
+}
+
+bool Board::KhompPvt::commandHandler(CommandRequest &cmd)
+{
+    DBG(STRM, PVT_FMT(target(), "c"));
+
+    bool ret = true;
+
+    switch(cmd.type())
+    {
+    case CommandRequest::COMMAND:
+        switch(cmd.code())
+        {
+        case CommandRequest::CMD_CALL:
+            break;
+        case CommandRequest::CMD_ANSWER:
+            ret = doChannelAnswer(cmd);
+            break;
+        case CommandRequest::CMD_HANGUP:
+            ret = doChannelHangup(cmd);
+            break;
+        default:
+            ret = false;
+        }
+        break;
+
+    case CommandRequest::ACTION:
+        break;
+    
+    default:
+        ret = false;
+    }
+    
+    DBG(STRM, PVT_FMT(target(), "r"));
+    return ret;
+}
+
+int Board::eventThread(void *void_evt)
+{
+    EventRequest evt(false);
+    EventFifo * fifo = static_cast < ChanEventHandler * >(void_evt)->fifo();
+    int devid = fifo->_device;
+
+    for(;;)
+    {
+        DBG(THRD, D("(d=%d) c") % devid);
+        while(1)
+        {
+            try
+            {
+                evt = fifo->_buffer.consumer_start();
+                break;
+            }
+            catch(...) //BufferEmpty & e
+            {
+                DBG(THRD, D("(d=%d) buffer empty") % devid);
+
+                fifo->_cond.wait();
+
+                if (fifo->_shutdown)
+                    return 0;
+
+                DBG(THRD, D("(d=%d) waked up!") % devid);
+            }
+        }
+
+        /*while (!fifo->_buffer.consume(evt))
+        {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(d=%d) buffer empty\n", fifo->_device);
+
+            fifo->_cond.wait();
+
+            if (fifo->_shutdown)
+                return 0;
+
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(d=%d) waked up!\n", fifo->_device);
+        }*/
+
+        DBG(THRD, D("(d=%d) processing buffer...") % devid);
+
+        try
+        {
+            if(!board(devid)->eventHandler(evt.obj(), evt.event()))
+            {
+                LOG(ERROR, D("(d=%d) Error on event (%d) \"%s\"") 
+                        % devid 
+                        % evt.event()->Code
+                        % Globals::verbose.event(evt.obj(), evt.event()));
+            }
+        }
+        catch (K3LAPI::invalid_device & invalid)
+        {
+            LOG(ERROR, D("invalid device on event '%s'") 
+                % Verbose::eventName(evt.event()->Code).c_str());
+        }
+
+        fifo->_buffer.consumer_commit();
+
+    }
+
+    return 0;
+}
+
+int Board::commandThread(void *void_evt)
+{
+    CommandFifo * fifo = static_cast < ChanCommandHandler * >(void_evt)->fifo();
+    int devid = fifo->_device;
+
+    for(;;)
+    {
+        CommandRequest cmd;
+
+        DBG(THRD, D("(d=%d) Command c") % devid);
+
+        while (!fifo->_buffer.consume(cmd))
+        {
+            DBG(THRD, D("(d=%d) Command buffer empty") % devid);
+            fifo->_cond.wait();
+
+            if (fifo->_shutdown)
+                return 0;
+
+            DBG(THRD, D("(d=%d) Command waked up!") % devid);
+        }
+
+        DBG(THRD, D("(d=%d) Command processing buffer...") % devid);
+
+
+        try
+        {
+            if(!get(devid, cmd.obj())->commandHandler(cmd))
+            {
+                LOG(ERROR, D("(d=%d) Error on command(%d)") % devid % cmd.code());
+            }
+        }
+        catch (K3LAPI::invalid_channel & invalid)
+        {
+            LOG(ERROR, OBJ_FMT(devid,cmd.obj(), "invalid device on command '%d'") %  cmd.code());
+        }
+
+    }
+
+
+    return 0;
+}
+
+/* This is the callback function for API events. It selects the event *
+ * on a switch and forwards to the real implementation.               */
+extern "C" int32 Kstdcall khompEventCallback(int32 obj, K3L_EVENT * e)
+{
+    //if (K::Logger::Logg.classe(C_EVENT).enabled())
+    //    std::string msg = Globals::verbose.event (obj, e) + "."; 
+    LOGC(EVENT, FMT("%s.") % Globals::verbose.event(obj, e));
+
+    switch(e->Code)
+    {
+    case EV_WATCHDOG_COUNT: 
+        Board::kommuter.initialize(e);
+        break;
+    case EV_HARDWARE_FAIL:
+    case EV_DISK_IS_FULL:
+    case EV_CLIENT_RECONNECT:
+    case EV_CLIENT_BUFFERED_AUDIOLISTENER_OVERFLOW:
+        LOG(ERROR, D("Audio client buffered overflow"));
+        break;
+    case EV_CLIENT_AUDIOLISTENER_TIMEOUT:
+        LOG(ERROR, "Timeout on audio listener, registering audio listener again");
+        k3lRegisterAudioListener( NULL, khompAudioListener );
+        break;
+    default:
+        try
+        {
+            EventRequest e_req(obj, e);
+            Board::board(e->DeviceId)->chanEventHandler()->write(e_req);
+        }
+        catch (K3LAPI::invalid_device & err)
+        {
+            LOG(ERROR, D("Unable to get device: %d!") % err.device);
+            return ksFail;
+        }
+        break;
+    }
+
+    return ksSuccess;
+}
+
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt_fxo.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt_fxo.cpp
new file mode 100644
index 0000000000..f45638b3b4
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt_fxo.cpp
@@ -0,0 +1,792 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include "khomp_pvt_fxo.h"
+#include "lock.h"
+#include "logger.h"
+
+int BoardFXO::KhompPvtFXO::makeCall(std::string params)
+{
+    DBG(FUNC,PVT_FMT(_target, "(FXO) c"));
+
+    int ret = ksSuccess;
+
+    /* we always have audio */
+    call()->_flags.set(Kflags::HAS_PRE_AUDIO);
+    
+    if(callFXO()->_call_info_drop == 0 && !callFXO()->_call_info_report)
+    {
+        command(KHOMP_LOG, CM_DISABLE_CALL_ANSWER_INFO);
+    }
+
+    if (!callFXO()->_pre_digits.empty())
+    {
+        /* Seize the line at local PABX. */
+
+        callFXO()->_flags.set(Kflags::CALL_WAIT_SEIZE);
+
+        if (!command(KHOMP_LOG, CM_SEIZE, call()->_orig_addr.c_str()))
+            return ksFail;            
+
+        int timeout = 150;
+
+        if(!loopWhileFlagTimed(Kflags::CALL_WAIT_SEIZE, timeout))
+            return ksFail;
+
+        if (callFXO()->_flags.check(Kflags::CALL_WAIT_SEIZE) || (timeout <= 0))
+            return ksFail;
+
+        /* Grab line from local PABX. */
+
+        callFXO()->_flags.set(Kflags::WAIT_SEND_DTMF);
+
+        if (!command(KHOMP_LOG, CM_DIAL_DTMF, callFXO()->_pre_digits.c_str()))
+            return ksFail;            
+        
+        if(!loopWhileFlagTimed(Kflags::WAIT_SEND_DTMF, timeout))
+            return ksFail;
+
+        if (callFXO()->_flags.check(Kflags::WAIT_SEND_DTMF) || (timeout <= 0))
+            return ksFail;
+
+        /* Seize line from public central (works because the     *
+        * continuous cadence is always detected by the k3l api. */
+
+        callFXO()->_flags.set(Kflags::CALL_WAIT_SEIZE);
+
+        if (!command(KHOMP_LOG, CM_SEIZE, call()->_orig_addr.c_str()))
+            return ksFail;
+
+        if(!loopWhileFlagTimed(Kflags::CALL_WAIT_SEIZE, timeout))
+            return ksFail;
+
+        if (callFXO()->_flags.check(Kflags::CALL_WAIT_SEIZE) || (timeout <= 0))
+            return ksFail;
+
+        /* we want the audio as soon as dialing ends */
+        callFXO()->_flags.set(Kflags::EARLY_RINGBACK);
+    
+        if (!command(KHOMP_LOG, CM_DIAL_DTMF, call()->_dest_addr.c_str()))
+            return ksFail;
+    }
+    else
+    {
+        /* we want the audio as soon as dialing ends */
+        callFXO()->_flags.set(Kflags::EARLY_RINGBACK);
+
+
+        if(!call()->_orig_addr.empty())
+            params += STG(FMT(" orig_addr=\"%s\"") % _call->_orig_addr);
+
+
+        ret = KhompPvt::makeCall(params);
+
+        if(ret != ksSuccess)
+        {
+            LOG(ERROR, PVT_FMT(target(), "Fail on make call"));
+        }
+
+        call()->_cleanup_upon_hangup = (ret == ksInvalidParams);
+    }
+
+    DBG(FUNC,PVT_FMT(_target, "(FXO) r"));
+    return ret;
+}
+
+bool BoardFXO::KhompPvtFXO::doChannelAnswer(CommandRequest &cmd)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        // is this a collect call?
+        bool has_recv_collect_call = _call->_collect_call;
+
+        if(has_recv_collect_call)
+            DBG(FUNC, PVT_FMT(target(), "receive a collect call"));
+
+        if(call()->_flags.check(Kflags::DROP_COLLECT))
+            DBG(FUNC, PVT_FMT(target(), "flag DROP_COLLECT == true"));
+
+        // do we have to drop collect calls?
+        bool has_drop_collect_call = call()->_flags.check(Kflags::DROP_COLLECT);
+
+        // do we have to drop THIS call?
+        bool do_drop_call = has_drop_collect_call && has_recv_collect_call;
+
+        if(!do_drop_call)
+        {
+            command(KHOMP_LOG, CM_CONNECT);
+        }
+
+        if(has_drop_collect_call)
+        {
+            if(has_recv_collect_call)
+            {
+                usleep(75000);
+
+                DBG(FUNC, PVT_FMT(target(), "disconnecting collect call doChannelAnswer FXO"));
+                command(KHOMP_LOG,CM_DISCONNECT);
+
+                // thou shalt not talk anymore!
+                stopListen();
+                stopStream();
+            }
+            else
+            {
+                DBG(FUNC, PVT_FMT(target(), "dropping collect call at doChannelAnswer FXO"));
+                command(KHOMP_LOG, CM_DROP_COLLECT_CALL);
+            }
+        }
+
+        ret = KhompPvt::doChannelAnswer(cmd);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target,"(FXO) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
+
+    return ret;
+}
+
+bool BoardFXO::KhompPvtFXO::onNewCall(K3L_EVENT *e)
+{
+    DBG(FUNC,PVT_FMT(_target,"(FXO) c"));
+   
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        /* we always have audio */
+        call()->_flags.set(Kflags::HAS_PRE_AUDIO);
+
+        ret = KhompPvt::onNewCall(e);
+
+        if(!ret)
+            return false;
+
+        startListen();
+        startStream();
+
+    }
+    catch(ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
+
+    return ret;
+}
+
+bool BoardFXO::KhompPvtFXO::onDisconnect(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        command(KHOMP_LOG, CM_DISCONNECT);
+
+        ret = KhompPvt::onDisconnect(e);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
+
+    return ret;
+}
+
+bool BoardFXO::KhompPvtFXO::onChannelRelease(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if (call()->_flags.check(Kflags::FAX_SENDING))
+        {
+            DBG(FUNC, PVT_FMT(_target, "stopping fax tx"));
+            _fax->stopFaxTX();
+        }
+        else if (call()->_flags.check(Kflags::FAX_RECEIVING))
+        {
+            DBG(FUNC, PVT_FMT(_target, "stopping fax rx"));
+            _fax->stopFaxRX();
+        }
+
+        command(KHOMP_LOG, CM_ENABLE_CALL_ANSWER_INFO);
+   
+        ret = KhompPvt::onChannelRelease(e);
+    }
+    catch(ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));   
+    return ret;
+}
+
+bool BoardFXO::KhompPvtFXO::onCallSuccess(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        ret = KhompPvt::onCallSuccess(e);
+
+        if (call()->_pre_answer)
+        {
+            dtmfSuppression(Opt::_out_of_band_dtmfs && !call()->_flags.check(Kflags::FAX_DETECTED));
+
+            startListen();
+            startStream();
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+        
+    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
+
+    return ret;
+}
+
+bool BoardFXO::KhompPvtFXO::onCallFail(K3L_EVENT *e)
+{
+    bool ret = true; 
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        command(KHOMP_LOG, CM_DISCONNECT);
+
+        setHangupCause(causeFromCallFail(e->AddInfo), true);
+
+        ret = KhompPvt::onCallFail(e);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }
+
+    return ret;
+}
+
+bool BoardFXO::KhompPvtFXO::onAudioStatus(K3L_EVENT *e)
+{
+    DBG(STRM, PVT_FMT(_target, "(FXO) c"));
+
+    try
+    {
+        //ScopedPvtLock lock(this);
+
+        if(e->AddInfo == kmtFax)
+        {
+            DBG(FUNC, PVT_FMT(_target, "Fax detected"));
+
+            bool already_detected = call()->_flags.check(Kflags::FAX_DETECTED);  
+            BEGIN_CONTEXT
+            {
+                if(already_detected)
+                    break;
+
+                ScopedPvtLock lock(this);
+
+                if (callFXO()->_call_info_drop != 0 || callFXO()->_call_info_report)
+                {
+                    /* we did not detected fax yet, send answer info! */
+                    setAnswerInfo(Board::KhompPvt::CI_FAX);
+
+                    if (callFXO()->_call_info_drop & Board::KhompPvt::CI_FAX)
+                    {
+                        /* fastest way to force a disconnection */
+                        command(KHOMP_LOG,CM_DISCONNECT);//,SCE_HIDE);
+                    }
+                }
+
+                if (Opt::_auto_fax_adjustment)
+                {
+                    DBG(FUNC, PVT_FMT(_target, "communication will be adjusted for fax!"));
+                    _fax->adjustForFax();
+                }
+            }
+            END_CONTEXT
+
+            if (!already_detected)
+            {
+                ScopedPvtLock lock(this);
+
+                /* adjust the flag */
+                call()->_flags.set(Kflags::FAX_DETECTED);
+            }
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    bool ret = KhompPvt::onAudioStatus(e);
+
+    DBG(STRM, PVT_FMT(_target, "(FXO) r"));
+
+    return ret;
+}
+
+bool BoardFXO::KhompPvtFXO::onSeizeSuccess(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        callFXO()->_flags.clear(Kflags::CALL_WAIT_SEIZE);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
+
+    return true;
+}
+
+bool BoardFXO::KhompPvtFXO::onDtmfDetected(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if (callFXO()->_flags.check(Kflags::WAIT_SEND_DTMF) ||
+                callFXO()->_flags.check(Kflags::CALL_WAIT_SEIZE))
+        {
+            /* waiting digit or seize means DEADLOCK if we try to 
+             *  queue something below. */
+            DBG(FUNC, PVT_FMT(_target, "not queueing dtmf, waiting stuff!"));
+            return true;
+        }
+
+        ret = KhompPvt::onDtmfDetected(e);
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
+
+    return ret;
+}
+
+bool BoardFXO::KhompPvtFXO::onDtmfSendFinish(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        ret = KhompPvt::onDtmfSendFinish(e);
+
+        if (callFXO()->_flags.check(Kflags::EARLY_RINGBACK))
+        {
+            callFXO()->_flags.clear(Kflags::EARLY_RINGBACK);
+
+            /* start grabbing */
+            startListen();
+
+            /* activate resources early... */
+            bool fax_detected = callFXO()->_flags.check(Kflags::FAX_DETECTED);
+
+            bool res_out_of_band_dtmf = Opt::_suppression_delay && Opt::_out_of_band_dtmfs && !fax_detected;
+            bool res_echo_cancellator = Opt::_echo_canceller && !fax_detected;
+            bool res_auto_gain_cntrol = Opt::_auto_gain_control && !fax_detected;
+
+            if (!call()->_flags.check(Kflags::KEEP_DTMF_SUPPRESSION))
+                dtmfSuppression(res_out_of_band_dtmf);
+
+            if (!call()->_flags.check(Kflags::KEEP_ECHO_CANCELLATION))
+                echoCancellation(res_echo_cancellator);
+
+            if (!call()->_flags.check(Kflags::KEEP_AUTO_GAIN_CONTROL))
+                autoGainControl(res_auto_gain_cntrol);
+
+            /* start sending audio if wanted so */
+            if (Opt::_fxo_send_pre_audio)
+                startStream();
+
+            //TODO: Verificar isso aqui
+            if (call()->_pre_answer)
+            {
+                /* tell the user we are answered! */
+                switch_channel_mark_answered(getFSChannel());
+                //pvt->signal_state(AST_CONTROL_ANSWER);
+            }
+            else
+            {
+                /* are we ringing, now? lets try this way! */
+                switch_channel_mark_ring_ready(getFSChannel());
+                //pvt->signal_state(AST_CONTROL_RINGING);
+            }
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(FXO) r (no valid channel: %s)") % err._msg.c_str());
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
+
+    return ret;
+}
+
+bool BoardFXO::KhompPvtFXO::onCallAnswerInfo(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        int info_code = -1;
+
+        switch (e->AddInfo)
+        {
+            case kcsiCellPhoneMessageBox:
+                info_code = CI_MESSAGE_BOX;
+                break;
+            case kcsiHumanAnswer:
+                info_code = CI_HUMAN_ANSWER;
+                break;
+            case kcsiAnsweringMachine:
+                info_code = CI_ANSWERING_MACHINE;
+                break;
+            case kcsiCarrierMessage:
+                info_code = CI_CARRIER_MESSAGE;
+                break;
+            case kcsiUnknown:
+                info_code = CI_UNKNOWN;
+                break;
+            default:
+                DBG(FUNC, PVT_FMT(_target, "got an unknown call answer info '%d', ignoring...") % e->AddInfo);
+                break;
+        }
+
+        if (info_code != -1)
+        {
+            if (callFXO()->_call_info_report)
+            {
+                //TODO: HOW WE TREAT THAT 
+                // make the channel export this 
+                setAnswerInfo(info_code);
+            }
+
+            if (callFXO()->_call_info_drop & info_code)
+            {
+                command(KHOMP_LOG,CM_DISCONNECT);
+            }
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target,"(FXO) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
+    return true;
+}
+
+bool BoardFXO::KhompPvtFXO::application(ApplicationType type, switch_core_session_t * session, const char *data)
+{
+    switch(type)
+    {
+        case FAX_ADJUST:
+            return _fax->adjustForFax();
+        case FAX_SEND:
+            return _fax->sendFax(session, data);
+        case FAX_RECEIVE:
+            return _fax->receiveFax(session, data);
+        case USER_TRANSFER:
+            return _transfer->userTransfer(session, data);
+        default:
+            return KhompPvt::application(type, session, data);
+    }
+
+    return true;
+}
+
+bool BoardFXO::KhompPvtFXO::setupConnection()
+{
+    if(!call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::IS_OUTGOING))
+    {
+        DBG(FUNC,PVT_FMT(_target, "Channel already disconnected"));
+        return false;
+    }
+
+    callFXO()->_flags.clear(Kflags::CALL_WAIT_SEIZE);
+    callFXO()->_flags.clear(Kflags::WAIT_SEND_DTMF);
+
+    /* if received some disconnect from 'drop collect call'
+       feature of some pbx, then leave the call rock and rolling */
+    //Board::board(_target.device)->_timers.del(callFXO()->_idx_disconnect);
+
+    bool fax_detected = callFXO()->_flags.check(Kflags::FAX_DETECTED) || (callFXO()->_var_fax_adjust == T_TRUE);
+
+    bool res_out_of_band_dtmf = (call()->_var_dtmf_state == T_UNKNOWN || fax_detected ?
+        Opt::_suppression_delay && Opt::_out_of_band_dtmfs && !fax_detected : (call()->_var_dtmf_state == T_TRUE));
+
+    bool res_echo_cancellator = (call()->_var_echo_state == T_UNKNOWN || fax_detected ?
+        Opt::_echo_canceller && !fax_detected : (call()->_var_echo_state == T_TRUE));
+
+    bool res_auto_gain_cntrol = (call()->_var_gain_state == T_UNKNOWN || fax_detected ?
+        Opt::_auto_gain_control && !fax_detected : (call()->_var_gain_state == T_TRUE));
+
+    if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
+    {
+        obtainRX(res_out_of_band_dtmf);
+
+        /* esvazia buffers de leitura/escrita */
+        cleanupBuffers();
+
+        if (!call()->_flags.check(Kflags::KEEP_DTMF_SUPPRESSION))
+            dtmfSuppression(res_out_of_band_dtmf);
+
+        if (!call()->_flags.check(Kflags::KEEP_ECHO_CANCELLATION))
+            echoCancellation(res_echo_cancellator);
+
+        if (!call()->_flags.check(Kflags::KEEP_AUTO_GAIN_CONTROL))
+            autoGainControl(res_auto_gain_cntrol);
+
+        startListen(false);
+
+        startStream();
+
+        DBG(FUNC, PVT_FMT(_target, "(FXO) Audio callbacks initialized successfully"));
+    }
+
+    return KhompPvt::setupConnection();
+}
+
+bool BoardFXO::KhompPvtFXO::autoGainControl(bool enable)
+{
+    bool ret = KhompPvt::autoGainControl(enable);
+    
+    /* enable this AGC also, can be very useful */
+    ret &= command(KHOMP_LOG, (enable ? CM_ENABLE_PLAYER_AGC : CM_DISABLE_PLAYER_AGC));
+    return ret;
+}
+
+void BoardFXO::KhompPvtFXO::setAnswerInfo(int answer_info)
+{
+    const char * value = answerInfoToString(answer_info);
+
+    if (value == NULL)
+    {
+        DBG(FUNC, PVT_FMT(_target,"signaled unknown call answer info '%d', using 'Unknown'...") % answer_info);
+        value = "Unknown";
+    }
+   
+    DBG(FUNC,PVT_FMT(_target,"KCallAnswerInfo: %s") % value);
+
+    try
+    {
+        setFSChannelVar("KCallAnswerInfo", value);
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR,PVT_FMT(_target,"Cannot obtain the channel variable: %s") % err._msg.c_str());
+    }
+}
+
+bool BoardFXO::KhompPvtFXO::indicateBusyUnlocked(int cause, bool sent_signaling)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
+
+    if(!KhompPvt::indicateBusyUnlocked(cause, sent_signaling))
+    {
+        DBG(FUNC, PVT_FMT(_target, "(FXO) r (false)"));
+        return false;
+    }
+
+    if(call()->_flags.check(Kflags::IS_INCOMING))
+    {
+        if(!call()->_flags.check(Kflags::CONNECTED) && !sent_signaling)
+        {
+            //we are talking about branches, not trunks 
+            command(KHOMP_LOG, CM_CONNECT);
+            command(KHOMP_LOG, CM_DISCONNECT);
+        }
+        else
+        {
+            //already connected or sent signaling... 
+            mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+        }
+    }
+    else if(call()->_flags.check(Kflags::IS_OUTGOING))
+    {
+        //already connected or sent signaling... 
+        mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+    }
+
+    DBG(FUNC,PVT_FMT(_target, "(FXO) r"));
+    
+    return true; 
+}
+
+void BoardFXO::KhompPvtFXO::reportFailToReceive(int fail_code)
+{
+    KhompPvt::reportFailToReceive(fail_code);
+
+    command(KHOMP_LOG, CM_CONNECT);
+
+    command(KHOMP_LOG, CM_DISCONNECT);
+
+}
+
+bool BoardFXO::KhompPvtFXO::validContexts(
+        MatchExtension::ContextListType & contexts, std::string extra_context)
+{
+    DBG(FUNC,PVT_FMT(_target,"(FXO) c"));
+
+    contexts.push_back(Opt::_context_fxo);
+    contexts.push_back(Opt::_context2_fxo);
+
+    for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
+    {
+        replaceTemplate((*i), "CC", _target.object);
+    }
+
+    bool ret = Board::KhompPvt::validContexts(contexts,extra_context);
+
+    DBG(FUNC,PVT_FMT(_target,"(FXO) r"));
+
+    return ret;
+}
+
+bool BoardFXO::KhompPvtFXO::isOK()
+{
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        K3L_CHANNEL_STATUS status;
+
+        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
+            return false;
+
+        return (status.AddInfo == kfcsEnabled);
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
+    }
+
+    return false;
+}
+
+bool BoardFXO::KhompPvtFXO::sendDtmf(std::string digit)
+{
+    if(_transfer->checkUserXferUnlocked(digit))
+    {
+        DBG(FUNC, PVT_FMT(target(), "started (or waiting for) an user xfer"));
+        return true;
+    }
+
+    bool ret = KhompPvt::sendDtmf(callFXO()->_digits_buffer);
+
+    callFXO()->_digits_buffer.clear();
+
+    return ret;
+}
+
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt_gsm.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt_gsm.cpp
new file mode 100644
index 0000000000..1095c5a296
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt_gsm.cpp
@@ -0,0 +1,558 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include "khomp_pvt_gsm.h"
+#include "lock.h"
+#include "logger.h"
+
+bool BoardGSM::KhompPvtGSM::isOK()
+{
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        K3L_CHANNEL_STATUS status;
+
+        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
+            return false;
+
+        switch (status.AddInfo)
+        {
+            case kgsmModemError:
+            case kgsmSIMCardError:
+            case kgsmNetworkError:
+            case kgsmNotReady:
+                return false;
+            default:
+                return true;
+        }
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
+    }
+
+    return false;
+}
+
+bool BoardGSM::KhompPvtGSM::onChannelRelease(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(GSM) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        call()->_flags.clear(Kflags::HAS_PRE_AUDIO);
+        command(KHOMP_LOG, CM_ENABLE_CALL_ANSWER_INFO);
+   
+        ret = KhompPvt::onChannelRelease(e);
+    }
+    catch(ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(GSM) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_target, "(GSM) r"));   
+    return ret;
+}
+
+bool BoardGSM::KhompPvtGSM::onCallSuccess(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(GSM) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        ret = KhompPvt::onCallSuccess(e);
+
+        if (call()->_pre_answer)
+        {
+            dtmfSuppression(Opt::_out_of_band_dtmfs);
+
+            startListen();
+            startStream();
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(GSM) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+        
+    DBG(FUNC, PVT_FMT(_target, "(GSM) r"));
+
+    return ret;
+}
+
+void BoardGSM::KhompPvtGSM::setAnswerInfo(int answer_info)
+{
+    const char * value = answerInfoToString(answer_info);
+
+    if (value == NULL)
+    {
+        DBG(FUNC, PVT_FMT(_target,"signaled unknown call answer info '%d', using 'Unknown'...") % answer_info);
+        value = "Unknown";
+    }
+   
+    DBG(FUNC,PVT_FMT(_target,"KCallAnswerInfo: %s") % value);
+
+    try
+    {
+        setFSChannelVar("KCallAnswerInfo",value);
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR,PVT_FMT(_target,"Cannot obtain the channel variable: %s") % err._msg.c_str());
+    }
+}
+
+bool BoardGSM::KhompPvtGSM::onCallAnswerInfo(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(GSM) c"));
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        int info_code = -1;
+
+        switch (e->AddInfo)
+        {
+            case kcsiCellPhoneMessageBox:
+                info_code = CI_MESSAGE_BOX;
+                break;
+            case kcsiHumanAnswer:
+                info_code = CI_HUMAN_ANSWER;
+                break;
+            case kcsiAnsweringMachine:
+                info_code = CI_ANSWERING_MACHINE;
+                break;
+            case kcsiCarrierMessage:
+                info_code = CI_CARRIER_MESSAGE;
+                break;
+            case kcsiUnknown:
+                info_code = CI_UNKNOWN;
+                break;
+            default:
+                DBG(FUNC, PVT_FMT(_target, "got an unknown call answer info '%d', ignoring...") % e->AddInfo);
+                break;
+        }
+
+        if (info_code != -1)
+        {
+            if (callGSM()->_call_info_report)
+            {
+                //TODO: HOW WE TREAT THAT 
+                // make the channel export this 
+                setAnswerInfo(info_code);
+            }
+
+            if (callGSM()->_call_info_drop & info_code)
+            {
+                command(KHOMP_LOG, CM_SEND_TO_MODEM, "ATH");
+            }
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target,"(GSM) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(GSM) r"));
+    return true;
+}
+
+/*
+bool BoardGSM::KhompPvtGSM::onDtmfDetected(K3L_EVENT *e)
+{
+    bool ret = KhompPvt::onDtmfDetected(e);
+
+    try
+    {
+        ScopedPvtLock lock(this);
+        
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(GSM) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    return ret;
+}
+
+bool BoardGSM::KhompPvtGSM::onNewCall(K3L_EVENT *e)
+{
+    DBG(FUNC,PVT_FMT(_target,"(GSM) c"));
+    
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        bool ret = KhompPvtGSM::onNewCall(e); 
+
+    }
+    catch(ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(GSM) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(GSM) r"));
+
+    return ret;
+}
+*/
+
+
+
+bool BoardGSM::KhompPvtGSM::onCallFail(K3L_EVENT *e)
+{
+    bool ret = true; 
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        //K::internal::gsm_cleanup_and_restart(pvt, owner_nr, true);
+        setHangupCause(causeFromCallFail(e->AddInfo), true);
+
+        ret = KhompPvt::onCallFail(e);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }
+
+    return ret;
+}
+
+bool BoardGSM::KhompPvtGSM::onDisconnect(K3L_EVENT *e)
+{
+    bool ret = true;
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        //gsm_cleanup_and_restart(pvt, (int)evt.gsm_call_ref);
+
+        ret = KhompPvt::onDisconnect(e);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(GSM) unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }
+
+    return ret;
+}
+
+int BoardGSM::KhompPvtGSM::makeCall(std::string params)
+{
+    DBG(FUNC,PVT_FMT(_target, "(GSM) c"));
+    
+    if(callGSM()->_call_info_drop == 0 && !callGSM()->_call_info_report)
+    {
+        command(KHOMP_LOG, CM_DISABLE_CALL_ANSWER_INFO);
+    }
+
+    int ret = KhompPvt::makeCall(params);
+
+    if(ret != ksSuccess)
+    {
+        LOG(ERROR, PVT_FMT(target(), "Fail on make call"));
+    }
+
+    call()->_cleanup_upon_hangup = (ret == ksInvalidParams || ret == ksInvalidState);
+
+    DBG(FUNC,PVT_FMT(_target, "(GSM) r"));
+    return ret;
+}
+
+bool BoardGSM::KhompPvtGSM::doChannelAnswer(CommandRequest &cmd)
+{
+    DBG(FUNC, PVT_FMT(_target, "(GSM) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        command(KHOMP_LOG, CM_CONNECT);
+
+        ret = KhompPvt::doChannelAnswer(cmd);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target,"(GSM) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(GSM) r"));
+
+    return ret;
+}
+
+bool BoardGSM::KhompPvtGSM::doChannelHangup(CommandRequest &cmd)
+{
+    DBG(FUNC, PVT_FMT(_target, "(GSM) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        int owner_nr = 0;
+
+        command(KHOMP_LOG, CM_DISCONNECT, 
+                STG(FMT("gsm_call_ref=%d") % (int)owner_nr).c_str());
+
+
+        //ret = KhompPvt::doChannelHangup(cmd);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target,"(GSM) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(GSM) r"));
+
+    return ret;
+}
+
+bool BoardGSM::KhompPvtGSM::application(ApplicationType type, switch_core_session_t * session, const char *data)
+{
+    switch(type)
+    {
+        case SMS_CHECK:
+            return true;
+        case SMS_SEND:
+            return _sms->sendSMS(session, data);
+        case SELECT_SIM_CARD:
+            return selectSimCard(data);
+        default:
+            return KhompPvt::application(type, session, data);
+    }
+
+    return true;
+}
+
+bool BoardGSM::KhompPvtGSM::setupConnection()
+{
+    if(!call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::IS_OUTGOING))
+    {
+        DBG(FUNC,PVT_FMT(_target, "Channel already disconnected"));
+        return false;
+    }
+
+    bool res_out_of_band_dtmf = (call()->_var_dtmf_state == T_UNKNOWN ?
+        Opt::_suppression_delay && Opt::_out_of_band_dtmfs : (call()->_var_dtmf_state == T_TRUE));
+
+    bool res_echo_cancellator = (call()->_var_echo_state == T_UNKNOWN ?
+        Opt::_echo_canceller : (call()->_var_echo_state == T_TRUE));
+
+
+    bool res_auto_gain_cntrol = (call()->_var_gain_state == T_UNKNOWN ?
+        Opt::_auto_gain_control : (call()->_var_gain_state == T_TRUE));
+
+
+    if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
+    {
+        obtainRX(res_out_of_band_dtmf);
+
+        /* esvazia buffers de leitura/escrita */
+        cleanupBuffers();
+
+        if (!call()->_flags.check(Kflags::KEEP_DTMF_SUPPRESSION))
+            dtmfSuppression(res_out_of_band_dtmf);
+
+        if (!call()->_flags.check(Kflags::KEEP_ECHO_CANCELLATION))
+            echoCancellation(res_echo_cancellator);
+
+        if (!call()->_flags.check(Kflags::KEEP_AUTO_GAIN_CONTROL))
+            autoGainControl(res_auto_gain_cntrol);
+
+        startListen(false);
+
+        startStream();
+
+        DBG(FUNC, PVT_FMT(_target, "(GSM) Audio callbacks initialized successfully"));
+    }
+
+    return Board::KhompPvt::setupConnection();
+}
+
+bool BoardGSM::KhompPvtGSM::indicateBusyUnlocked(int cause, bool sent_signaling)
+{
+    DBG(FUNC, PVT_FMT(_target, "(GSM) c"));
+
+    if(!KhompPvt::indicateBusyUnlocked(cause, sent_signaling))
+    {
+        DBG(FUNC, PVT_FMT(_target, "(GSM) r (false)"));
+        return false;
+    }
+
+    if(call()->_flags.check(Kflags::IS_INCOMING))
+    {
+        if(!call()->_flags.check(Kflags::CONNECTED) && !sent_signaling)
+        {
+            /* we are talking about branches, not trunks */
+            command(KHOMP_LOG, CM_DISCONNECT);
+        }
+        else
+        {
+            /* already connected or sent signaling... */
+            mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+        }
+    }
+    else if(call()->_flags.check(Kflags::IS_OUTGOING))
+    {
+        /* already connected or sent signaling... */
+        mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+    }
+
+    DBG(FUNC,PVT_FMT(_target, "(GSM) r"));
+    
+    return true; 
+}
+
+void BoardGSM::KhompPvtGSM::reportFailToReceive(int fail_code)
+{
+    KhompPvt::reportFailToReceive(fail_code);
+
+    command(KHOMP_LOG, CM_CONNECT);
+
+    /* K3L may fail depending on its configuration (GsmModem) */
+    if (!command(KHOMP_LOG, CM_DISCONNECT))
+    {
+        int owner_nr = 0;
+        command(KHOMP_LOG, CM_DISCONNECT,
+                STG(FMT("gsm_call_ref=\"%d\"") % owner_nr).c_str());
+    }
+
+}
+
+int BoardGSM::KhompPvtGSM::causeFromCallFail(int fail)
+{
+    int switch_cause = SWITCH_CAUSE_USER_BUSY;
+
+    if (fail <= 127) 
+        switch_cause = fail;
+    else 
+        switch_cause = SWITCH_CAUSE_INTERWORKING;
+
+    return switch_cause;
+}
+
+int BoardGSM::KhompPvtGSM::callFailFromCause(int cause)
+{
+    int k3l_fail = -1; // default
+
+    if (cause <= 127) 
+        k3l_fail = cause;
+    else
+        k3l_fail = kgccInterworking; 
+
+    return k3l_fail;
+}
+
+bool BoardGSM::KhompPvtGSM::validContexts(
+        MatchExtension::ContextListType & contexts, std::string extra_context)
+{
+    DBG(FUNC,PVT_FMT(_target,"(GSM) c"));
+
+    if (!extra_context.empty())
+    {    
+        if (!_group_context.empty())
+        {    
+            std::string pvt_context(_group_context);
+            pvt_context += "-"; 
+            pvt_context += extra_context;
+            contexts.push_back(pvt_context);
+        }    
+
+        if (!Opt::_context_gsm_call.empty())
+        {    
+            std::string context(Opt::_context_gsm_call);
+            context += "-"; 
+            context += extra_context;
+            contexts.push_back(_group_context);
+        }
+
+        if (!Opt::_context2_gsm_call.empty())
+        {    
+            std::string context(Opt::_context2_gsm_call);
+            context += "-"; 
+            context += extra_context;
+            contexts.push_back(_group_context);
+        }    
+    }  
+
+    contexts.push_back(Opt::_context_gsm_call);
+    contexts.push_back(Opt::_context2_gsm_call);
+
+    for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++) 
+        replaceTemplate((*i), "CC", _target.object);
+
+    bool ret = Board::KhompPvt::validContexts(contexts,extra_context);
+
+    DBG(FUNC,PVT_FMT(_target,"(GSM) r"));
+
+    return ret;
+}
+
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt_kxe1.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt_kxe1.cpp
new file mode 100644
index 0000000000..c0eb1a3403
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt_kxe1.cpp
@@ -0,0 +1,3447 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include "khomp_pvt_kxe1.h"
+#include "lock.h"
+#include "logger.h"
+
+
+bool BoardE1::KhompPvtE1::isOK()
+{
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        K3L_CHANNEL_STATUS status;
+
+        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
+            return false;
+
+        return   ((status.AddInfo == kecsFree) ||
+                (!(status.AddInfo & kecsLocalFail) &&
+                 !(status.AddInfo & kecsRemoteLock)));
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
+    }
+
+    return false;
+}
+
+bool BoardE1::KhompPvtE1::onChannelRelease(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(E1) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if (call()->_flags.check(Kflags::FAX_SENDING))
+        {
+            DBG(FUNC, PVT_FMT(_target, "stopping fax tx"));
+            _fax->stopFaxTX();
+        }
+        else if (call()->_flags.check(Kflags::FAX_RECEIVING))
+        {
+            DBG(FUNC, PVT_FMT(_target, "stopping fax rx"));
+            _fax->stopFaxRX();
+        }
+
+        call()->_flags.clear(Kflags::HAS_PRE_AUDIO);
+
+        command(KHOMP_LOG, CM_ENABLE_CALL_ANSWER_INFO);
+
+        ret = KhompPvt::onChannelRelease(e);
+
+    }
+    catch(ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(E1) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(E1) r"));   
+    return ret;
+}
+
+bool BoardE1::KhompPvtE1::onCallSuccess(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(E1) c"));
+
+    bool ret;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        ret = KhompPvt::onCallSuccess(e);
+
+        if (call()->_pre_answer)
+        {
+            dtmfSuppression(Opt::_out_of_band_dtmfs && !call()->_flags.check(Kflags::FAX_DETECTED));     
+
+            startListen();
+            startStream();
+        }
+        else
+        {
+            call()->_flags.set(Kflags::GEN_PBX_RING);
+            call()->_idx_pbx_ring = Board::board(_target.device)->_timers.add(Opt::_ringback_pbx_delay,
+                                             &Board::KhompPvt::pbxRingGen,this, TM_VAL_CALL);
+        }
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to get device: %d!)") % err.device);
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_target, "(E1) r"));
+
+    return ret;
+}
+
+bool BoardE1::KhompPvtE1::onAudioStatus(K3L_EVENT *e)
+{
+    //DBG(FUNC, PVT_FMT(_target, "(E1) c"));
+
+    try
+    {
+        //ScopedPvtLock lock(this);
+
+        if(e->AddInfo == kmtFax)
+        {
+            DBG(FUNC, PVT_FMT(_target, "Fax detected"));
+
+            bool already_detected = call()->_flags.check(Kflags::FAX_DETECTED);            
+            BEGIN_CONTEXT
+            {
+                if(already_detected)
+                    break;
+                    
+                ScopedPvtLock lock(this);
+
+                if (callE1()->_call_info_drop != 0 || callE1()->_call_info_report)
+                {    
+                    /* we did not detected fax yet, send answer info! */
+                    setAnswerInfo(Board::KhompPvt::CI_FAX);
+
+                    if (callE1()->_call_info_drop & Board::KhompPvt::CI_FAX)
+                    {    
+                        /* fastest way to force a disconnection */
+                        command(KHOMP_LOG,CM_DISCONNECT);//,SCE_HIDE);
+                    }    
+                }
+
+                if (Opt::_auto_fax_adjustment)
+                {
+                    DBG(FUNC, PVT_FMT(_target, "communication will be adjusted for fax!"));
+                    _fax->adjustForFax();
+                }
+            }
+            END_CONTEXT
+
+            if (!already_detected)
+            {
+                ScopedPvtLock lock(this);
+
+                /* adjust the flag */
+                call()->_flags.set(Kflags::FAX_DETECTED);
+            }
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }
+
+    bool ret = KhompPvt::onAudioStatus(e);
+    
+    //DBG(FUNC, PVT_FMT(_target, "(E1) r"));
+
+    return ret;
+}
+
+bool BoardE1::KhompPvtE1::onCallAnswerInfo(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(E1) c"));
+    try  
+    {    
+        ScopedPvtLock lock(this);
+
+        int info_code = -1;
+
+        switch (e->AddInfo)
+        {    
+            case kcsiCellPhoneMessageBox:
+                info_code = CI_MESSAGE_BOX;
+                break;
+            case kcsiHumanAnswer:
+                info_code = CI_HUMAN_ANSWER;
+                break;
+            case kcsiAnsweringMachine:
+                info_code = CI_ANSWERING_MACHINE;
+                break;
+            case kcsiCarrierMessage:
+                info_code = CI_CARRIER_MESSAGE;
+                break;
+            case kcsiUnknown:
+                info_code = CI_UNKNOWN;
+                break;
+            default:
+                DBG(FUNC, PVT_FMT(_target, "got an unknown call answer info '%d', ignoring...") % e->AddInfo);
+                break;
+        }    
+
+        if (info_code != -1)
+        {    
+            if (callE1()->_call_info_report)
+            {    
+                //TODO: HOW WE TREAT THAT 
+                // make the channel export this 
+                setAnswerInfo(info_code);
+            }    
+
+            if (callE1()->_call_info_drop & info_code)
+            {    
+                // fastest way to force a disconnection 
+                //K::util::sendCmd(pvt->boardid, pvt->objectid, CM_DISCONNECT, true, false);
+                command(KHOMP_LOG,CM_DISCONNECT/*,SCE_HIDE ?*/);
+            }    
+        }    
+    }    
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(E1) r"));
+    return true;
+}
+
+bool BoardE1::KhompPvtE1::onDisconnect(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(E1) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if (call()->_flags.check(Kflags::IS_OUTGOING) ||
+            call()->_flags.check(Kflags::IS_INCOMING))
+        {
+            if(Opt::_disconnect_delay == 0)
+            {
+                DBG(FUNC, PVT_FMT(_target, "queueing disconnecting outgoing channel!"));
+                command(KHOMP_LOG, CM_DISCONNECT);       
+            }
+            else
+            {
+                callE1()->_idx_disconnect = Board::board(_target.device)->_timers.add(
+                    1000 * Opt::_disconnect_delay,&BoardE1::KhompPvtE1::delayedDisconnect,this);
+            }
+        }
+        else
+        {
+            /* in the case of a disconnect confirm is needed and a call 
+            was not started e.g. just after a ev_seizure_start */
+            command(KHOMP_LOG, CM_DISCONNECT);
+        }
+        
+        ret = KhompPvt::onDisconnect(e);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to get device: %d!)") % err.device);
+        return false;
+    }
+
+    DBG(FUNC,PVT_FMT(_target, "(E1) r"));
+    return ret;
+}
+
+void BoardE1::KhompPvtE1::delayedDisconnect(Board::KhompPvt * pvt)
+{
+    DBG(FUNC,PVT_FMT(pvt->target(), "Delayed disconnect"));
+
+    try  
+    {    
+        ScopedPvtLock lock(pvt);
+
+        DBG(FUNC, PVT_FMT(pvt->target(), "queueing disconnecting outgoing channel after delaying!"));
+
+        pvt->command(KHOMP_LOG,CM_DISCONNECT);
+        pvt->cleanup(CLN_HARD);
+    }        
+    catch (...)
+    {
+        LOG(ERROR, PVT_FMT(pvt->target(), "r (unable to lock the pvt !)"));
+    }       
+}
+
+bool BoardE1::onLinkStatus(K3L_EVENT *e)
+{
+    DBG(FUNC, D("Link %02d on board %02d changed") % e->AddInfo % e->DeviceId);
+
+    /* Fire a custom event about this */
+    /*
+    switch_event_t * event;
+    if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, KHOMP_EVENT_MAINT) == SWITCH_STATUS_SUCCESS)
+    {
+        //khomp_add_event_board_data(e->AddInfo, event);
+        Board::khomp_add_event_board_data(K3LAPI::target(Globals::k3lapi, K3LAPI::target::LINK, e->DeviceId, e->AddInfo), event);
+
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "EV_LINK_STATUS", "%d", e->AddInfo);
+        switch_event_fire(&event);
+    }
+    */
+
+    return true;
+}
+
+bool BoardE1::KhompPvtISDN::onSyncUserInformation(K3L_EVENT *e)
+{
+    KUserInformation * info = (KUserInformation *) (((char*)e) + sizeof(K3L_EVENT));
+
+    callISDN()->_uui_descriptor = info->ProtocolDescriptor;
+
+    /* clean string */
+    callISDN()->_uui_information.clear();
+
+    if (info->UserInfoLength)
+    {    
+        /* append to a clean string */
+        callISDN()->_uui_information.append((const char *)info->UserInfo, info->UserInfoLength);
+    }    
+
+    return true;
+}
+
+bool BoardE1::KhompPvtISDN::onIsdnProgressIndicator(K3L_EVENT *e)
+{
+    //TODO: Do we need return something ?
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        switch (e->AddInfo)
+        {
+            case kq931pTonesMaybeAvailable:
+            case kq931pTonesAvailable:
+                if (!call()->_is_progress_sent)
+                {
+                    call()->_is_progress_sent = true;
+
+                    //Sinaliza para o Freeswitch PROGRESS
+                    DBG(FUNC, PVT_FMT(_target, "Pre answer"));
+
+                    //pvt->signal_state(SWITCH_CONTROL_PROGRESS);
+                    //switch_channel_pre_answer(channel);
+                    switch_channel_mark_pre_answered(getFSChannel());
+
+                }
+                break;
+            case kq931pDestinationIsNonIsdn:
+            case kq931pOriginationIsNonIsdn:
+            case kq931pCallReturnedToIsdn:
+            default:
+                break;
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR,PVT_FMT(_target, "No valid channel: %s") % err._msg.c_str());
+        return false;
+    }
+
+    return true;
+}
+
+bool BoardE1::KhompPvtISDN::onNewCall(K3L_EVENT *e)
+{
+    DBG(FUNC,PVT_FMT(_target, "(ISDN) c"));   
+
+    bool isdn_reverse_charge = false;
+    std::string isdn_reverse_charge_str;
+    bool ret;
+    
+    try
+    {
+        isdn_reverse_charge_str = Globals::k3lapi.get_param(e, "isdn_reverse_charge");
+        isdn_reverse_charge = Strings::toboolean(isdn_reverse_charge_str);
+    }
+    catch(K3LAPI::get_param_failed & err)
+    {
+        /* do nothing, maybe the parameter is not sent */
+    }
+    catch (Strings::invalid_value & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "unable to get param '%s'") % err.value().c_str());
+    }
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if(session())
+        {
+            bool pvt_locked = true;
+            bool is_ok = false;
+        
+            DBG(FUNC, PVT_FMT(_target, "Session has not been destroyed yet, waiting for khompDestroy"));
+
+            for(unsigned int sleeps = 0; sleeps < 20; sleeps++)
+            {
+                /* unlock our pvt struct */
+                if(pvt_locked)
+                {
+                    _mutex.unlock();
+                    pvt_locked = false;
+                }
+
+                /* wait a little while (100ms is good?) */
+                usleep (100000);
+
+                /* re-lock pvt struct */
+                switch (_mutex.lock())
+                {
+                case SimpleLock::ISINUSE:
+                case SimpleLock::FAILURE:
+                    LOG(ERROR, PVT_FMT(_target, "unable to lock pvt_mutex, trying again."));
+                    sched_yield();
+                    continue;
+
+                default:
+                    break;
+                }
+
+                pvt_locked = true;
+            
+                if(!session())
+                {
+                    is_ok = true;
+                    break;
+                }
+            }
+
+            if(is_ok)
+            {
+                DBG(FUNC, PVT_FMT(_target, "Session destroyed properly"));
+            }
+            else
+            {
+                LOG(ERROR, PVT_FMT(target(), "(ISDN) r (Session was not destroyed, stopping to wait)"));
+                return false;
+            }
+        }
+
+        if(isdn_reverse_charge)
+        { 
+            call()->_collect_call = true;
+        }
+
+        ret = KhompPvtE1::onNewCall(e); 
+    }
+    catch(ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(ISDN) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(ISDN) r"));   
+
+    return ret;
+}
+
+bool BoardE1::KhompPvtISDN::onCallSuccess(K3L_EVENT *e)
+{
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if(e->AddInfo > 0)
+        {
+            callISDN()->_isdn_cause = e->AddInfo;
+            setFSChannelVar("KISDNGotCause", Verbose::isdnCause((KQ931Cause)callISDN()->_isdn_cause).c_str());
+        }
+
+        ret = KhompPvtE1::onCallSuccess(e);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR,PVT_FMT(_target, "%s") % err._msg.c_str());
+        return false;
+    }
+
+    return ret;
+}
+
+bool BoardE1::KhompPvtISDN::onCallFail(K3L_EVENT *e)
+{
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if(e->AddInfo > 0)
+        {
+            callISDN()->_isdn_cause = e->AddInfo;
+            setFSChannelVar("KISDNGotCause", Verbose::isdnCause((KQ931Cause)callISDN()->_isdn_cause).c_str());
+        }
+
+        setHangupCause(causeFromCallFail(e->AddInfo),true);
+
+        ret = KhompPvtE1::onCallFail(e);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR,PVT_FMT(_target, "%s") % err._msg.c_str());
+        return false;
+    }
+
+    return ret;
+}
+
+RingbackDefs::RingbackStType BoardE1::KhompPvtISDN::sendRingBackStatus(int rb_value)
+{
+    DBG(FUNC, PVT_FMT(target(), "this is the rdsi ringback procedure"));
+
+
+    std::string cause = (rb_value == -1 ? "" : STG(FMT("isdn_cause=\"%d\"") % rb_value));
+    return (command(KHOMP_LOG, CM_RINGBACK, cause.c_str()) ?
+            RingbackDefs::RBST_SUCCESS : RingbackDefs::RBST_FAILURE);
+}
+
+bool BoardE1::KhompPvtISDN::sendPreAudio(int rb_value)
+{
+    if(!KhompPvtE1::sendPreAudio(rb_value))
+        return false;
+
+
+    DBG(FUNC,PVT_FMT(_target, "doing the ISDN pre_connect"));   
+
+    if (call()->_flags.check(Kflags::HAS_PRE_AUDIO))
+    {
+        DBG(FUNC, PVT_FMT(target(), "already pre_connect"));
+        return true;
+    }
+    else
+    {
+        bool result = command(KHOMP_LOG, CM_PRE_CONNECT);
+
+        if (result)
+            call()->_flags.set(Kflags::HAS_PRE_AUDIO);
+
+        return result;
+    }
+}
+
+bool BoardE1::KhompPvtISDN::application(ApplicationType type, switch_core_session_t * session, const char *data)
+{
+    switch(type)
+    {
+        case USER_TRANSFER:
+            return _transfer->userTransfer(session, data);
+        default:
+            return KhompPvtE1::application(type, session, data);
+    }
+
+    return true;
+}
+
+bool BoardE1::KhompPvtISDN::sendDtmf(std::string digit)
+{
+    if(_transfer->checkUserXferUnlocked(digit))
+    {
+        DBG(FUNC, PVT_FMT(target(), "started (or waiting for) an user xfer"));
+        return true;
+    }
+
+    bool ret = KhompPvtE1::sendDtmf(callISDN()->_digits_buffer);
+        
+    callISDN()->_digits_buffer.clear();
+
+    return ret;
+}
+
+int BoardE1::KhompPvtE1::makeCall(std::string params)
+{
+    if(callE1()->_call_info_drop == 0 && !callE1()->_call_info_report)
+    {
+        command(KHOMP_LOG, CM_DISABLE_CALL_ANSWER_INFO);
+    }
+
+    if(!_call->_orig_addr.empty())
+        params += STG(FMT(" orig_addr=\"%s\"") % _call->_orig_addr);
+
+    int ret = KhompPvt::makeCall(params);
+
+    if(ret == ksSuccess)
+    {
+        startListen();
+    }
+    else
+    {
+        LOG(ERROR, PVT_FMT(target(), "Fail on make call"));
+    }   
+
+    return ret;
+}
+
+bool BoardE1::KhompPvtE1::indicateBusyUnlocked(int cause, bool sent_signaling)
+{
+    DBG(FUNC, PVT_FMT(_target, "(E1) c"));
+
+    if(!KhompPvt::indicateBusyUnlocked(cause, sent_signaling))
+    {
+        DBG(FUNC, PVT_FMT(_target, "(E1) r (false)"));
+        return false;
+    }
+
+    if(call()->_flags.check(Kflags::IS_INCOMING))
+    {
+        if(!call()->_flags.check(Kflags::CONNECTED) && !sent_signaling)
+        {
+            if(!call()->_flags.check(Kflags::HAS_PRE_AUDIO))
+            {
+                int rb_value = callFailFromCause(call()->_hangup_cause);
+                DBG(FUNC, PVT_FMT(target(), "sending the busy status"));
+
+                if (sendRingBackStatus(rb_value) == RingbackDefs::RBST_UNSUPPORTED)
+                {
+                    DBG(FUNC, PVT_FMT(target(), "falling back to audio indication!"));
+                    /* stop the line audio */
+                    stopStream();
+
+                    /* just pre connect, no ringback */
+                    if (!sendPreAudio())
+                        DBG(FUNC, PVT_FMT(target(), "everything else failed, just sending audio indication..."));
+
+                    /* be very specific about the situation. */
+                    mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+                }
+            }
+            else
+            {
+                DBG(FUNC, PVT_FMT(target(), "going to play busy"));
+
+                /* stop the line audio */
+                stopStream();
+
+                /* be very specific about the situation. */
+                mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+
+            }
+        }
+        else
+        {
+            /* already connected or sent signaling... */
+            mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+        }
+
+    }
+    else if(call()->_flags.check(Kflags::IS_OUTGOING))
+    {
+        /* already connected or sent signaling... */
+        mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+    }
+
+    DBG(FUNC,PVT_FMT(_target, "(E1) r"));
+    
+    return true; 
+}
+
+void BoardE1::KhompPvtE1::setAnswerInfo(int answer_info)
+{
+    const char * value = answerInfoToString(answer_info);
+
+    if (value == NULL)
+    {    
+        DBG(FUNC, PVT_FMT(_target, "signaled unknown call answer info '%d', using 'Unknown'...") % answer_info);
+        value = "Unknown";
+    }   
+    
+    DBG(FUNC,PVT_FMT(_target, "KCallAnswerInfo: %s") % value);
+
+    try
+    {
+        setFSChannelVar("KCallAnswerInfo",value);
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR,PVT_FMT(_target, "%s") % err._msg.c_str()); 
+    }
+}
+
+bool BoardE1::KhompPvtE1::setupConnection()
+{
+    if(!call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::IS_OUTGOING))
+    {
+        DBG(FUNC,PVT_FMT(_target, "Channel already disconnected"));
+        return false;
+    }
+
+    /* if received some disconnect from 'drop collect call'
+       feature of some pbx, then leave the call rock and rolling */
+    Board::board(_target.device)->_timers.del(callE1()->_idx_disconnect);
+
+    bool fax_detected = callE1()->_flags.check(Kflags::FAX_DETECTED) || (callE1()->_var_fax_adjust == T_TRUE);
+    
+    bool res_out_of_band_dtmf = (call()->_var_dtmf_state == T_UNKNOWN || fax_detected ?
+        Opt::_suppression_delay && Opt::_out_of_band_dtmfs && !fax_detected : (call()->_var_dtmf_state == T_TRUE));
+    
+    bool res_echo_cancellator = (call()->_var_echo_state == T_UNKNOWN || fax_detected ?
+        Opt::_echo_canceller && !fax_detected : (call()->_var_echo_state == T_TRUE));
+
+    bool res_auto_gain_cntrol = (call()->_var_gain_state == T_UNKNOWN || fax_detected ?
+        Opt::_auto_gain_control && !fax_detected : (call()->_var_gain_state == T_TRUE));
+
+    if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
+    {
+        obtainRX(res_out_of_band_dtmf);
+
+        /* esvazia buffers de leitura/escrita */ 
+        cleanupBuffers();
+
+        if (!call()->_flags.check(Kflags::KEEP_DTMF_SUPPRESSION))
+            dtmfSuppression(res_out_of_band_dtmf);
+
+        if (!call()->_flags.check(Kflags::KEEP_ECHO_CANCELLATION))
+            echoCancellation(res_echo_cancellator);
+
+        if (!call()->_flags.check(Kflags::KEEP_AUTO_GAIN_CONTROL))
+            autoGainControl(res_auto_gain_cntrol);
+
+        startListen(false);
+
+        startStream();
+
+        DBG(FUNC, PVT_FMT(_target, "(E1) Audio callbacks initialized successfully"));  
+    }
+
+    return Board::KhompPvt::setupConnection();
+}
+
+bool BoardE1::KhompPvtE1::application(ApplicationType type, switch_core_session_t * session, const char *data)
+{
+    switch(type)
+    {
+        case FAX_ADJUST:
+            return _fax->adjustForFax();
+        case FAX_SEND:
+            return _fax->sendFax(session, data);
+        case FAX_RECEIVE:
+            return _fax->receiveFax(session, data);
+        default:
+            return KhompPvt::application(type, session, data);
+    }
+
+    return true;
+}
+
+bool BoardE1::KhompPvtE1::validContexts(
+        MatchExtension::ContextListType & contexts, std::string extra_context)
+{
+    DBG(FUNC,PVT_FMT(_target, "(E1) c"));
+
+    contexts.push_back(Opt::_context_digital);
+
+    for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++) 
+    {    
+        replaceTemplate((*i), "LL", ((_target.object)/30));
+        replaceTemplate((*i), "CCC", _target.object);
+    }
+
+    bool ret = Board::KhompPvt::validContexts(contexts,extra_context);
+
+    DBG(FUNC,PVT_FMT(_target, "(E1) r"));
+
+    return ret;
+}
+
+int BoardE1::KhompPvtISDN::makeCall(std::string params)
+{
+    DBG(FUNC,PVT_FMT(_target, "(ISDN) c"));   
+
+    CallISDN * call = callISDN();
+
+    if(call->_uui_descriptor != -1)
+    {
+        DBG(FUNC,PVT_FMT(_target, "got userinfo"));   
+
+        /* grab this information first, avoiding latter side-effects */
+        const char * info_data = call->_uui_information.c_str();
+        size_t       info_size = std::min(call->_uui_information.size(), (size_t)KMAX_USER_USER_LEN);
+
+        KUserInformation info;
+
+        info.ProtocolDescriptor = call->_uui_descriptor;
+        info.UserInfoLength = info_size;
+
+        memcpy((void *) info.UserInfo, (const void *) info_data, info_size);
+
+        if (!command(KHOMP_LOG, CM_USER_INFORMATION, (const char *)&info))
+        {
+            LOG(ERROR,PVT_FMT(_target, "UUI could not be sent before dialing!"));   
+        }
+
+        call->_uui_descriptor = -1;
+        call->_uui_information.clear();
+    }
+
+    int ret = KhompPvtE1::makeCall(params);
+
+    call->_cleanup_upon_hangup = (ret == ksInvalidParams || ret == ksBusy);
+    
+    DBG(FUNC,PVT_FMT(_target, "(ISDN) r"));   
+
+    return ret;
+}
+
+void BoardE1::KhompPvtISDN::reportFailToReceive(int fail_code)
+{
+    KhompPvt::reportFailToReceive(fail_code);
+
+    if(fail_code != -1)
+    {
+        DBG(FUNC,PVT_FMT(_target, "sending a 'unknown number' message/audio")); 
+
+        if(sendRingBackStatus(fail_code) == RingbackDefs::RBST_UNSUPPORTED)
+        {
+            sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
+            startCadence(PLAY_FASTBUSY);
+        }
+    }
+    else
+    {
+        DBG(FUNC, PVT_FMT(_target, "sending fast busy audio directly"));
+
+        sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
+        startCadence(PLAY_FASTBUSY);
+    }
+}
+
+bool BoardE1::KhompPvtISDN::doChannelAnswer(CommandRequest &cmd)
+{
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        // is this a collect call?
+        bool has_recv_collect_call = _call->_collect_call;
+
+        if(has_recv_collect_call)
+            DBG(FUNC, PVT_FMT(target(), "receive a collect call"));
+
+        if(call()->_flags.check(Kflags::DROP_COLLECT))
+            DBG(FUNC, PVT_FMT(target(), "flag DROP_COLLECT == true"));
+
+        // do we have to drop collect calls?
+        bool has_drop_collect_call = call()->_flags.check(Kflags::DROP_COLLECT);
+
+        // do we have to drop THIS call?
+        bool do_drop_call = has_drop_collect_call && has_recv_collect_call;
+
+        if(!do_drop_call)
+        {
+            command(KHOMP_LOG, CM_CONNECT);
+        }
+        else
+        {
+            usleep(75000);
+
+            DBG(FUNC, PVT_FMT(target(), "disconnecting collect call doChannelAnswer ISDN"));
+            command(KHOMP_LOG,CM_DISCONNECT);
+
+            // thou shalt not talk anymore!
+            stopListen();
+            stopStream();
+        }
+
+        ret = KhompPvtE1::doChannelAnswer(cmd);
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }
+
+    return ret;
+}
+
+int BoardE1::KhompPvtR2::makeCall(std::string params)
+{
+    DBG(FUNC,PVT_FMT(_target, "(R2) c"));   
+
+    if (callR2()->_r2_category != -1)
+        params += STG(FMT(" r2_categ_a=\"%ld\"")
+                % callR2()->_r2_category);
+
+    int ret = KhompPvtE1::makeCall(params);
+
+    call()->_cleanup_upon_hangup = (ret == ksInvalidParams);
+    
+    DBG(FUNC,PVT_FMT(_target, "(R2) r"));   
+
+    return ret;
+}
+
+bool BoardE1::KhompPvtR2::doChannelAnswer(CommandRequest &cmd)
+{
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        // is this a collect call?
+        bool has_recv_collect_call = _call->_collect_call;
+
+        if(has_recv_collect_call)
+            DBG(FUNC, PVT_FMT(target(), "receive a collect call"));
+
+        if(call()->_flags.check(Kflags::DROP_COLLECT))
+            DBG(FUNC, PVT_FMT(target(), "flag DROP_COLLECT == true"));
+        
+        // do we have to drop collect calls?
+        bool has_drop_collect_call = call()->_flags.check(Kflags::DROP_COLLECT);
+
+        // do we have to drop THIS call?
+        bool do_drop_call = has_drop_collect_call && has_recv_collect_call;
+
+        bool do_send_ring = call()->_flags.check(Kflags::NEEDS_RINGBACK_CMD);
+
+        // do we have to send ringback? yes we need !!!
+        if(do_send_ring)
+        {       
+            call()->_flags.clear(Kflags::NEEDS_RINGBACK_CMD);
+            std::string cause = ( do_drop_call ? STG(FMT("r2_cond_b=\"%d\"") % kgbBusy) : "" );
+            command(KHOMP_LOG,CM_RINGBACK,cause.c_str());
+
+            usleep(75000);
+        }
+
+        if(!(do_drop_call && do_send_ring))
+        {
+            command(KHOMP_LOG, CM_CONNECT);
+        }
+
+        if(has_drop_collect_call && !do_send_ring) 
+        {
+            if(has_recv_collect_call)
+            {
+                usleep(75000);
+
+                DBG(FUNC, PVT_FMT(target(), "disconnecting collect call doChannelAnswer R2"));
+                command(KHOMP_LOG,CM_DISCONNECT);
+
+                // thou shalt not talk anymore!
+                stopListen();
+                stopStream();
+            }
+            else
+            {
+                DBG(FUNC, PVT_FMT(target(), "dropping collect call at doChannelAnswer"));
+                command(KHOMP_LOG, CM_DROP_COLLECT_CALL);
+            }
+        }
+
+        ret = KhompPvtE1::doChannelAnswer(cmd);
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR,PVT_FMT(_target, "unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }
+
+    return ret;
+}
+
+bool BoardE1::KhompPvtR2::doChannelHangup(CommandRequest &cmd)
+{
+    DBG(FUNC, PVT_FMT(_target, "(R2) c"));
+
+    bool answered     = true;
+    bool disconnected = false;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if (call()->_flags.check(Kflags::IS_INCOMING))
+        {
+            DBG(FUNC,PVT_FMT(_target, "disconnecting incoming channel"));
+
+            //disconnected = command(KHOMP_LOG, CM_DISCONNECT);
+        }
+        else if (call()->_flags.check(Kflags::IS_OUTGOING))
+        {
+            if(call()->_cleanup_upon_hangup)
+            {
+                DBG(FUNC,PVT_FMT(_target, "disconnecting not allocated outgoing channel..."));
+
+                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
+                cleanup(KhompPvt::CLN_HARD);
+                answered = false;
+
+            }
+            else
+            {
+                DBG(FUNC,PVT_FMT(_target, "disconnecting outgoing channel...")); 
+
+                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
+            }
+        }
+        else
+        {
+            DBG(FUNC,PVT_FMT(_target, "already disconnected"));
+            return true;
+        }
+
+        if(answered)
+        {
+            indicateBusyUnlocked(SWITCH_CAUSE_USER_BUSY, disconnected);
+        }
+
+        if (call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::NEEDS_RINGBACK_CMD))
+        {
+            DBG(FUNC,PVT_FMT(_target, "disconnecting incoming channel..."));
+            disconnected = command(KHOMP_LOG, CM_DISCONNECT);
+        }
+
+        stopStream();
+
+        stopListen();
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(R2) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+
+    DBG(FUNC, PVT_FMT(_target, "(R2) r"));
+    return true;
+}
+
+int BoardE1::KhompPvtISDN::causeFromCallFail(int fail)
+{
+    int switch_cause = SWITCH_CAUSE_USER_BUSY;
+
+    if (fail <= 127) 
+        switch_cause = fail;
+    else 
+        switch_cause = SWITCH_CAUSE_INTERWORKING;
+
+    return switch_cause;
+}
+
+void BoardE1::KhompPvtR2::reportFailToReceive(int fail_code)
+{
+    KhompPvt::reportFailToReceive(fail_code);
+
+    if (Opt::_r2_strict_behaviour && fail_code != -1)
+    {
+        DBG(FUNC,PVT_FMT(_target, "sending a 'unknown number' message/audio")); 
+
+        if(sendRingBackStatus(fail_code) == RingbackDefs::RBST_UNSUPPORTED)
+        {
+            sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
+            startCadence(PLAY_FASTBUSY);
+        }
+    }
+    else
+    {
+        DBG(FUNC, PVT_FMT(_target, "sending fast busy audio directly"));
+
+        sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
+        startCadence(PLAY_FASTBUSY);
+    }
+}
+
+int BoardE1::KhompPvtR2::causeFromCallFail(int fail)
+{
+    int switch_cause = SWITCH_CAUSE_USER_BUSY;
+
+    try
+    {
+        bool handled = false;
+
+        switch (_r2_country)
+        {
+            case Verbose::R2_COUNTRY_ARG:
+                switch (fail)
+                {
+                    case kgbArBusy:
+                        switch_cause = SWITCH_CAUSE_USER_BUSY;
+                        break;
+                    case kgbArNumberChanged:
+                        switch_cause = SWITCH_CAUSE_NUMBER_CHANGED;
+                        break;
+                    case kgbArCongestion:
+                        switch_cause = SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
+                        break;
+                    case kgbArInvalidNumber:
+                        switch_cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
+                        break;
+                    case kgbArLineOutOfOrder:
+                        switch_cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL;
+                        break;
+                }
+                handled = true;
+                break;
+
+            case Verbose::R2_COUNTRY_BRA:
+                switch (fail)
+                {
+                    case kgbBrBusy:
+                        switch_cause = SWITCH_CAUSE_USER_BUSY;
+                        break;
+                    case kgbBrNumberChanged:
+                        switch_cause = SWITCH_CAUSE_NUMBER_CHANGED;
+                        break;
+                    case kgbBrCongestion:
+                        switch_cause = SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
+                        break;
+                    case kgbBrInvalidNumber:
+                        switch_cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
+                        break;
+                    case kgbBrLineOutOfOrder:
+                        switch_cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL;
+                        break;
+                }
+                handled = true;
+                break;
+            case Verbose::R2_COUNTRY_CHI:
+                    switch (fail)
+                    {
+                        case kgbClBusy:
+                            switch_cause = SWITCH_CAUSE_USER_BUSY;
+                            break;
+                        case kgbClNumberChanged:
+                            switch_cause = SWITCH_CAUSE_NUMBER_CHANGED;
+                            break;
+                        case kgbClCongestion:
+                            switch_cause = SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
+                            break;
+                        case kgbClInvalidNumber:
+                            switch_cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
+                            break;
+                        case kgbClLineOutOfOrder:
+                            switch_cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL;
+                            break;
+                    }
+                handled = true;
+                break;
+
+            case Verbose::R2_COUNTRY_MEX:
+                switch (fail)
+                {
+                    case kgbMxBusy:
+                        switch_cause = SWITCH_CAUSE_USER_BUSY;
+                        break;
+                }
+                handled = true;
+                break;
+
+            case Verbose::R2_COUNTRY_URY:
+                switch (fail)
+                {
+                    case kgbUyBusy:
+                        switch_cause = SWITCH_CAUSE_USER_BUSY;
+                        break;
+                    case kgbUyNumberChanged:
+                        switch_cause = SWITCH_CAUSE_NUMBER_CHANGED;
+                        break;
+                    case kgbUyCongestion:
+                        switch_cause = SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
+                        break;
+                    case kgbUyInvalidNumber:
+                        switch_cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
+                        break;
+                    case kgbUyLineOutOfOrder:
+                        switch_cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL;
+                        break;
+                }
+                handled = true;
+                break;
+            case Verbose::R2_COUNTRY_VEN:
+                switch (fail)
+                {
+                    case kgbVeBusy:
+                        switch_cause = SWITCH_CAUSE_USER_BUSY;
+                        break;
+                    case kgbVeNumberChanged:
+                        switch_cause = SWITCH_CAUSE_NUMBER_CHANGED;
+                        break;
+                    case kgbVeCongestion:
+                        switch_cause = SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
+                        break;
+                    case kgbVeLineBlocked:
+                        switch_cause = SWITCH_CAUSE_OUTGOING_CALL_BARRED;
+                        break;
+                }
+                handled = true;
+                break;
+        }
+
+        if (!handled)
+            throw std::runtime_error("");
+    }
+    catch (...)
+    {
+        LOG(ERROR,
+                PVT_FMT(_target, "country signaling not found, unable to report R2 hangup code.."));
+    }
+
+    return switch_cause;
+
+}
+
+int BoardE1::KhompPvtR2::callFailFromCause(int cause)
+{
+    int k3l_fail = -1; // default
+
+    try  
+    {    
+        bool handled = false;
+
+        switch (_r2_country)
+        {    
+            case Verbose::R2_COUNTRY_ARG:
+                switch (cause)
+                {    
+                    case SWITCH_CAUSE_UNALLOCATED_NUMBER:
+                    case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET:
+                    case SWITCH_CAUSE_NO_ROUTE_DESTINATION:
+                    case SWITCH_CAUSE_INVALID_NUMBER_FORMAT:
+                    case SWITCH_CAUSE_FACILITY_NOT_SUBSCRIBED:
+                    case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION:
+
+                    case SWITCH_CAUSE_INCOMING_CALL_BARRED: /* ?? */
+                    case SWITCH_CAUSE_OUTGOING_CALL_BARRED: /* ?? */
+                        k3l_fail = kgbArInvalidNumber;
+                        break;
+
+                    case SWITCH_CAUSE_USER_BUSY:
+                    case SWITCH_CAUSE_NO_USER_RESPONSE:
+                    case SWITCH_CAUSE_CALL_REJECTED:
+                        k3l_fail = kgbArBusy;
+                        break;
+
+                    case SWITCH_CAUSE_NUMBER_CHANGED:
+                        k3l_fail = kgbArNumberChanged;
+                        break;
+
+                    case SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION:
+                    case SWITCH_CAUSE_SWITCH_CONGESTION:
+
+                    case SWITCH_CAUSE_NORMAL_CLEARING:
+                    case SWITCH_CAUSE_NORMAL_UNSPECIFIED:
+                    case SWITCH_CAUSE_CALL_AWARDED_DELIVERED: /* ?? */
+                        // this preserves semantics..
+                        k3l_fail = kgbArCongestion;
+                        break;
+
+                    case SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL:
+                    case SWITCH_CAUSE_CHANNEL_UNACCEPTABLE:
+                    case SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER:
+                    case SWITCH_CAUSE_NETWORK_OUT_OF_ORDER:
+                    case SWITCH_CAUSE_FACILITY_REJECTED:
+                    case SWITCH_CAUSE_FACILITY_NOT_IMPLEMENTED:
+                    case SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED:
+                    default:
+                        k3l_fail = kgbArLineOutOfOrder;
+                        break;
+                }    
+                handled = true;
+                break;
+
+            case Verbose::R2_COUNTRY_BRA:
+                switch (cause)
+                {    
+                    case SWITCH_CAUSE_UNALLOCATED_NUMBER:
+                    case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET:
+                    case SWITCH_CAUSE_NO_ROUTE_DESTINATION:
+                    case SWITCH_CAUSE_INVALID_NUMBER_FORMAT:
+                    case SWITCH_CAUSE_FACILITY_NOT_SUBSCRIBED:
+                    case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION:
+
+                    case SWITCH_CAUSE_INCOMING_CALL_BARRED: /* ?? */
+                    case SWITCH_CAUSE_OUTGOING_CALL_BARRED: /* ?? */
+                        k3l_fail = kgbBrInvalidNumber;
+                        break;
+
+                    case SWITCH_CAUSE_USER_BUSY:
+                    case SWITCH_CAUSE_NO_USER_RESPONSE:
+                    case SWITCH_CAUSE_CALL_REJECTED:
+                        k3l_fail = kgbBrBusy;
+                        break;
+
+                    case SWITCH_CAUSE_NUMBER_CHANGED:
+                        k3l_fail = kgbBrNumberChanged;
+                        break;
+
+                    case SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION:
+                    case SWITCH_CAUSE_SWITCH_CONGESTION:
+
+                    case SWITCH_CAUSE_NORMAL_CLEARING:
+                    case SWITCH_CAUSE_NORMAL_UNSPECIFIED:
+                    case SWITCH_CAUSE_CALL_AWARDED_DELIVERED: /* ?? */
+                        // this preserves semantics..
+                        k3l_fail = kgbBrCongestion;
+                        break;
+
+                    case SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL:
+                    case SWITCH_CAUSE_CHANNEL_UNACCEPTABLE:
+                    case SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER:
+                    case SWITCH_CAUSE_NETWORK_OUT_OF_ORDER:
+                    case SWITCH_CAUSE_FACILITY_REJECTED:
+                    case SWITCH_CAUSE_FACILITY_NOT_IMPLEMENTED:
+                    case SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED:
+                    default:
+                        k3l_fail = kgbBrLineOutOfOrder;
+                        break;
+                }
+                handled = true;
+                break;
+
+            case Verbose::R2_COUNTRY_CHI:
+                switch (cause)
+                {
+                    case SWITCH_CAUSE_UNALLOCATED_NUMBER:
+                    case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET:
+                    case SWITCH_CAUSE_NO_ROUTE_DESTINATION:
+                    case SWITCH_CAUSE_INVALID_NUMBER_FORMAT:
+                    case SWITCH_CAUSE_FACILITY_NOT_SUBSCRIBED:
+                    case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION:
+
+                    case SWITCH_CAUSE_INCOMING_CALL_BARRED: /* ?? */
+                    case SWITCH_CAUSE_OUTGOING_CALL_BARRED: /* ?? */
+                        k3l_fail = kgbClInvalidNumber;
+                        break;
+
+                    case SWITCH_CAUSE_USER_BUSY:
+                    case SWITCH_CAUSE_NO_USER_RESPONSE:
+                    case SWITCH_CAUSE_CALL_REJECTED:
+                        k3l_fail = kgbClBusy;
+                        break;
+
+                    case SWITCH_CAUSE_NUMBER_CHANGED:
+                        k3l_fail = kgbClNumberChanged;
+                        break;
+
+                    case SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION:
+                    case SWITCH_CAUSE_SWITCH_CONGESTION:
+
+                    case SWITCH_CAUSE_NORMAL_CLEARING:
+                    case SWITCH_CAUSE_NORMAL_UNSPECIFIED:
+                    case SWITCH_CAUSE_CALL_AWARDED_DELIVERED: /* ?? */
+                        // this preserves semantics..
+                        k3l_fail = kgbClCongestion;
+                        break;
+
+                    case SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL:
+                    case SWITCH_CAUSE_CHANNEL_UNACCEPTABLE:
+                    case SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER:
+                    case SWITCH_CAUSE_NETWORK_OUT_OF_ORDER:
+                    case SWITCH_CAUSE_FACILITY_REJECTED:
+                    case SWITCH_CAUSE_FACILITY_NOT_IMPLEMENTED:
+                    case SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED:
+                    default:
+                        k3l_fail = kgbClLineOutOfOrder;
+                        break;
+                }
+                handled = true;
+                break;
+
+
+            case Verbose::R2_COUNTRY_MEX:
+                k3l_fail = kgbMxBusy;
+                handled = true;
+                break;
+
+
+            case Verbose::R2_COUNTRY_URY:
+                switch (cause)
+                {
+                    case SWITCH_CAUSE_UNALLOCATED_NUMBER:
+                    case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET:
+                    case SWITCH_CAUSE_NO_ROUTE_DESTINATION:
+                    case SWITCH_CAUSE_INVALID_NUMBER_FORMAT:
+                    case SWITCH_CAUSE_FACILITY_NOT_SUBSCRIBED:
+                    case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION:
+
+                    case SWITCH_CAUSE_INCOMING_CALL_BARRED: /* ?? */
+                    case SWITCH_CAUSE_OUTGOING_CALL_BARRED: /* ?? */
+                        k3l_fail = kgbUyInvalidNumber;
+                        break;
+
+                    case SWITCH_CAUSE_USER_BUSY:
+                    case SWITCH_CAUSE_NO_USER_RESPONSE:
+                    case SWITCH_CAUSE_CALL_REJECTED:
+                        k3l_fail = kgbUyBusy;
+                        break;
+
+                    case SWITCH_CAUSE_NUMBER_CHANGED:
+                        k3l_fail = kgbUyNumberChanged;
+                        break;
+
+                    case SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION:
+                    case SWITCH_CAUSE_SWITCH_CONGESTION:
+
+                    case SWITCH_CAUSE_NORMAL_CLEARING:
+                    case SWITCH_CAUSE_NORMAL_UNSPECIFIED:
+                    case SWITCH_CAUSE_CALL_AWARDED_DELIVERED: /* ?? */
+                        // this preserves semantics..
+                        k3l_fail = kgbUyCongestion;
+                        break;
+
+                    case SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL:
+                    case SWITCH_CAUSE_CHANNEL_UNACCEPTABLE:
+                    case SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER:
+                    case SWITCH_CAUSE_NETWORK_OUT_OF_ORDER:
+                    case SWITCH_CAUSE_FACILITY_REJECTED:
+                    case SWITCH_CAUSE_FACILITY_NOT_IMPLEMENTED:
+                    case SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED:
+                    default:
+                        k3l_fail = kgbUyLineOutOfOrder;
+                        break;
+                }
+                handled = true;
+                break;
+
+
+            case Verbose::R2_COUNTRY_VEN:
+                switch (cause)
+                {
+                    case SWITCH_CAUSE_INCOMING_CALL_BARRED:
+                    case SWITCH_CAUSE_OUTGOING_CALL_BARRED:
+                        k3l_fail = kgbVeLineBlocked;
+                        break;
+
+                    case SWITCH_CAUSE_NUMBER_CHANGED:
+                        k3l_fail = kgbVeNumberChanged;
+                        break;
+
+                    case SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION:
+                    case SWITCH_CAUSE_SWITCH_CONGESTION:
+
+                    case SWITCH_CAUSE_NORMAL_CLEARING:
+                    case SWITCH_CAUSE_NORMAL_UNSPECIFIED:
+                    case SWITCH_CAUSE_CALL_AWARDED_DELIVERED: /* ?? */
+                        // this preserves semantics..
+                        k3l_fail = kgbVeCongestion;
+                        break;
+
+                    case SWITCH_CAUSE_UNALLOCATED_NUMBER:
+                    case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET:
+                    case SWITCH_CAUSE_NO_ROUTE_DESTINATION:
+                    case SWITCH_CAUSE_INVALID_NUMBER_FORMAT:
+                    case SWITCH_CAUSE_FACILITY_NOT_SUBSCRIBED:
+                    case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION:
+
+                    case SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL:
+                    case SWITCH_CAUSE_CHANNEL_UNACCEPTABLE:
+                    case SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER:
+                    case SWITCH_CAUSE_NETWORK_OUT_OF_ORDER:
+                    case SWITCH_CAUSE_FACILITY_REJECTED:
+                    case SWITCH_CAUSE_FACILITY_NOT_IMPLEMENTED:
+                    case SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED:
+
+                    case SWITCH_CAUSE_USER_BUSY:
+                    case SWITCH_CAUSE_NO_USER_RESPONSE:
+                    case SWITCH_CAUSE_CALL_REJECTED:
+                    default:
+                        k3l_fail = kgbVeBusy;
+                        break;
+                }
+
+                handled = true;
+                break;
+
+        }
+    
+        if (!handled)
+            throw std::runtime_error("");
+    }
+    catch(...)
+    {
+        LOG(ERROR,PVT_FMT(_target, "country signaling not found, unable to report R2 hangup code."));
+    }
+
+    return k3l_fail;
+}
+
+int BoardE1::KhompPvtISDN::callFailFromCause(int cause)
+{
+    int k3l_fail = -1; // default
+
+    if (cause <= 127) 
+        k3l_fail = cause;
+    else 
+        k3l_fail = kq931cInterworking;
+
+    return k3l_fail;
+}
+
+RingbackDefs::RingbackStType BoardE1::KhompPvtR2::sendRingBackStatus(int rb_value)
+{
+    DBG(FUNC,PVT_FMT(_target, "(p=%p) this is the r2 ringback procedure") % this);   
+
+    std::string cause = (rb_value == -1 ? "" : STG(FMT("r2_cond_b=\"%d\"") % rb_value));
+    return (command(KHOMP_LOG, CM_RINGBACK, cause.c_str()) ?
+            RingbackDefs::RBST_SUCCESS : RingbackDefs::RBST_FAILURE);
+}
+
+bool BoardE1::KhompPvtR2::sendPreAudio(int rb_value)
+{
+    DBG(FUNC,PVT_FMT(_target, "must send R2 preaudio ?"));   
+    if(!KhompPvtE1::sendPreAudio(rb_value))
+        return false;
+
+
+    DBG(FUNC,PVT_FMT(_target, "doing the R2 pre_connect wait..."));   
+
+    /* wait some ms, just to be sure the command has been sent. */
+    usleep(Opt::_r2_preconnect_wait * 1000);
+
+    if (call()->_flags.check(Kflags::HAS_PRE_AUDIO))
+    {
+        DBG(FUNC, PVT_FMT(target(), "(p=%p) already pre_connect") % this);
+        return true;
+    }
+    else
+    {
+        bool result = command(KHOMP_LOG, CM_PRE_CONNECT);
+
+        if (result)
+            call()->_flags.set(Kflags::HAS_PRE_AUDIO);
+
+        return result;
+    }
+}
+
+void BoardE1::KhompPvtR2::numberDialTimer(Board::KhompPvt * pvt)
+{
+    try 
+    {   
+        ScopedPvtLock lock(pvt);
+
+        if (!pvt->call()->_flags.check(Kflags::NUMBER_DIAL_ONGOING) ||
+             pvt->call()->_flags.check(Kflags::NUMBER_DIAL_FINISHD))
+        {   
+            return;
+        }   
+
+        pvt->call()->_flags.set(Kflags::NUMBER_DIAL_FINISHD);
+
+        static_cast<BoardE1::KhompPvtR2*>(pvt)->callR2()->_incoming_exten.clear();
+        pvt->command(KHOMP_LOG, CM_END_OF_NUMBER);
+    }   
+    catch (...)
+    {   
+        // TODO: log something.
+    }   
+}
+
+bool BoardE1::KhompPvtR2::indicateRinging()
+{
+    DBG(FUNC, PVT_FMT(_target, "(R2) c")); 
+
+    bool ret = false;
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        /* already playing! */
+        if (call()->_indication != INDICA_NONE)
+        {    
+            DBG(FUNC, PVT_FMT(_target, "(R2) r (already playing something: %d)") % call()->_indication);
+            return false;
+        }    
+
+        // any collect calls ?
+        setCollectCall();
+
+        call()->_indication = INDICA_RING;
+
+        bool send_ringback = true;
+
+        if (!call()->_flags.check(Kflags::CONNECTED))
+        {    
+            int ringback_value = RingbackDefs::RB_SEND_DEFAULT;
+
+            bool do_drop_call = Opt::_drop_collect_call
+                                        || call()->_flags.check(Kflags::DROP_COLLECT);
+
+            if (do_drop_call && call()->_collect_call)
+            {
+                ringback_value = kgbBusy;
+                DBG(FUNC, PVT_FMT(_target, "ringback value adjusted to refuse collect call: %d") % ringback_value);
+            }
+
+            const char *condition_string = getFSChannelVar("KR2SendCondition");
+
+            try  
+            {    
+                if (condition_string)
+                {    
+                    ringback_value = Strings::toulong(condition_string);
+                    DBG(FUNC, PVT_FMT(_target, "KR2SendCondition adjusted ringback value to %d") % ringback_value);
+                }    
+            }    
+            catch (Strings::invalid_value e)
+            {    
+                LOG(ERROR, PVT_FMT(_target, "invalid value '%s', adjusted in KR2SendCondition: not a valid number.")
+                        % condition_string);
+            }    
+
+            if (Opt::_r2_strict_behaviour)
+            {
+                /* send ringback too? */
+                send_ringback = sendPreAudio(ringback_value);
+
+                if (!send_ringback)
+                {
+                    /* warn the developer which may be debugging some "i do not have ringback!" issue. */
+                    DBG(FUNC, PVT_FMT(_target, "not sending pre connection audio"));
+                }
+
+                call()->_flags.clear(Kflags::NEEDS_RINGBACK_CMD);
+            }
+
+        }
+
+        if (send_ringback)
+        {             
+            DBG(FUNC, PVT_FMT(_target, "Send ringback!"));
+
+            call()->_flags.set(Kflags::GEN_CO_RING);
+            call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_ringback_co_delay, &Board::KhompPvt::coRingGen,this);
+
+            /* start grabbing audio */
+            startListen();
+
+            /* start stream if it is not already */
+            startStream();
+
+            ret = true; 
+        }   
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(R2) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR,PVT_FMT(_target, "(R2) r (%s)") % err._msg.c_str());
+        return false;
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(R2) r (unable to get device: %d!)") % err.device);
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_target, "(R2) r"));
+    return ret;
+}
+
+bool BoardE1::KhompPvtR2::onNewCall(K3L_EVENT *e)
+{
+    DBG(FUNC,PVT_FMT(_target, "(R2) c"));   
+
+    std::string r2_categ_a;
+
+    int status = Globals::k3lapi.get_param(e, "r2_categ_a", r2_categ_a);
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if (status == ksSuccess && !r2_categ_a.empty())
+        {
+
+            try 
+            { 
+                callR2()->_r2_category = Strings::toulong(r2_categ_a); 
+            }
+            catch (Strings::invalid_value e) 
+            { 
+                /* do nothing */ 
+            };
+
+            /* channel will know if is a collect call or not */
+            if (callR2()->_r2_category == kg2CollectCall)
+            {
+                call()->_collect_call = true;
+            }
+        }
+
+        bool ret = KhompPvtE1::onNewCall(e);
+
+        if(!ret)
+            return false;
+
+        if (!Opt::_r2_strict_behaviour)
+        {
+            bool do_drop_collect = Opt::_drop_collect_call;
+            const char* drop_str = getFSGlobalVar("KDropCollectCall");
+
+            if(checkTrueString(drop_str))
+            {
+                do_drop_collect = true;
+                call()->_flags.set(Kflags::DROP_COLLECT);
+                DBG(FUNC,PVT_FMT(_target, "Setting DROP_COLLECT flag"));
+            }
+
+            // keeping the hardcore mode
+            if (do_drop_collect && call()->_collect_call)
+            {
+                // kill, kill, kill!!!
+                DBG(FUNC,PVT_FMT(_target, "dropping collect call at onNewCall"));
+                sendRingBackStatus(callFailFromCause(SWITCH_CAUSE_CALL_REJECTED));
+                usleep(75000);
+            }
+            else
+            {
+                // send ringback too! 
+                sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
+                startStream();
+            }
+        }
+        else
+        {
+            _call->_flags.set(Kflags::NEEDS_RINGBACK_CMD);
+        }
+    }
+    catch(ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(R2) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC,PVT_FMT(_target, "(R2) r"));   
+
+    return true;
+}
+
+bool BoardE1::KhompPvtR2::onCallSuccess(K3L_EVENT *e)
+{
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if(e->AddInfo > 0)
+        {
+            callR2()->_r2_condition = e->AddInfo;
+            setFSChannelVar("KR2GotCondition", Verbose::signGroupB((KSignGroupB)callR2()->_r2_condition).c_str());
+        }
+
+        KhompPvtE1::onCallSuccess(e);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR,PVT_FMT(_target, "%s") % err._msg.c_str()); 
+        return false;
+    }
+
+    return true;
+}
+
+bool BoardE1::KhompPvtR2::onCallFail(K3L_EVENT *e)
+{
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if(e->AddInfo > 0)
+        {
+            callR2()->_r2_condition = e->AddInfo;
+            setFSChannelVar("KR2GotCondition", Verbose::signGroupB((KSignGroupB)callR2()->_r2_condition).c_str());
+        }
+
+        setHangupCause(causeFromCallFail(e->AddInfo),true);
+
+        ret = KhompPvtE1::onCallFail(e);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR,PVT_FMT(_target, "%s") % err._msg.c_str());
+        return false;
+    }
+
+    return ret;
+}
+
+bool BoardE1::KhompPvtR2::onNumberDetected(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(digit=%d) c") % e->AddInfo);
+
+    try  
+    {    
+        ScopedPvtLock lock(this);
+
+        if (call()->_flags.check(Kflags::NUMBER_DIAL_FINISHD))
+            return false;
+
+        if (!call()->_flags.check(Kflags::NUMBER_DIAL_ONGOING))
+        {    
+            DBG(FUNC, PVT_FMT(_target, "incoming number start..."));
+
+            call()->_flags.set(Kflags::NUMBER_DIAL_ONGOING);
+            callR2()->_incoming_exten.clear();
+
+            callR2()->_idx_number_dial = Board::board(_target.device)->_timers.add(4000,
+                &BoardE1::KhompPvtR2::numberDialTimer, this, TM_VAL_CALL);
+        }    
+        else 
+        {    
+            Board::board(_target.device)->_timers.restart(callR2()->_idx_number_dial);
+        }    
+
+        callR2()->_incoming_exten += e->AddInfo;
+
+        DBG(FUNC, PVT_FMT(_target, "incoming exten %s") % callR2()->_incoming_exten);
+
+        /* begin context adjusting + processing */
+        MatchExtension::ContextListType contexts;
+
+        validContexts(contexts);
+
+        /* temporary */
+        std::string tmp_exten;
+        std::string tmp_context;
+        std::string tmp_orig("");
+
+        switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, callR2()->_incoming_exten,tmp_orig, false, false))
+        {    
+            case MatchExtension::MATCH_EXACT:
+            case MatchExtension::MATCH_NONE:
+                call()->_flags.set(Kflags::NUMBER_DIAL_FINISHD);
+
+                DBG(FUNC,FMT("incoming exten matched: %s") % callR2()->_incoming_exten);
+
+                callR2()->_incoming_exten.clear();
+                command(KHOMP_LOG,CM_END_OF_NUMBER);
+                break;
+
+            case MatchExtension::MATCH_MORE:
+                DBG(FUNC, "didn't match exact extension, waiting...");
+                // cannot say anything exact about the number, do nothing...
+                break;
+        }    
+    }    
+    catch (ScopedLockFailed & err)
+    {    
+        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
+        return false;
+    }    
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
+        return false;
+    }
+
+    return true;
+}
+
+bool BoardE1::KhompPvtFlash::application(ApplicationType type, switch_core_session_t * session, const char *data)
+{
+    switch(type)
+    {
+        case USER_TRANSFER:
+            return _transfer->userTransfer(session, data);
+        default:
+            return KhompPvtR2::application(type, session, data);
+    }
+
+    return true;
+}
+
+bool BoardE1::KhompPvtFlash::sendDtmf(std::string digit)
+{
+    if(_transfer->checkUserXferUnlocked(digit))
+    {
+        DBG(FUNC, PVT_FMT(target(), "started (or waiting for) an user xfer"));
+        return true;
+    }
+
+    bool ret = KhompPvtR2::sendDtmf(callFlash()->_digits_buffer);
+
+    callFlash()->_digits_buffer.clear();
+
+    return ret;
+}
+
+Opt::OrigToNseqMapType BoardE1::KhompPvtFXS::generateNseqMap()
+{
+    Opt::OrigToNseqMapType fxs_nseq; /* sequence numbers on FXS */
+
+    fxs_nseq.insert(Opt::OrigToNseqPairType("", 0)); /* global sequence */
+
+    for (Opt::BoardToOrigMapType::iterator i = Opt::_fxs_orig_base.begin(); i != Opt::_fxs_orig_base.end(); i++)
+    {
+        fxs_nseq.insert(Opt::OrigToNseqPairType((*i).second, 0));
+    }
+
+    return fxs_nseq;
+}
+
+
+void BoardE1::KhompPvtFXS::load(Opt::OrigToNseqMapType & fxs_nseq)
+{
+    Opt::BoardToOrigMapType::iterator it1 = Opt::_fxs_orig_base.find(_target.device);
+    Opt::OrigToNseqMapType::iterator  it2;
+
+    std::string orig_base("invalid"); /* will have orig base */
+
+    if (it1 == Opt::_fxs_orig_base.end())
+    {
+        it2 = fxs_nseq.find("");
+        orig_base = Opt::_fxs_global_orig_base;
+    }
+    else
+    {
+        it2 = fxs_nseq.find((*it1).second);
+        orig_base = (*it1).second;
+    }
+
+    if (it2 == fxs_nseq.end())
+    {
+        LOG(ERROR, PVT_FMT(_target, "could not find sequence number for FXS channel"));
+
+        /* Ok, load the default options */
+        loadOptions();
+    }
+    else
+    {
+        try
+        {
+            /* generate orig_addr, padding to the original size (adding zeros at left) */
+            _fxs_fisical_addr = padOrig(orig_base, (*it2).second);
+
+            /* Set this branch options to get right callerid before mapping */
+            loadOptions();
+
+            /* makes a "reverse mapping" for Dial using 'r' identifiers */
+            Opt::_fxs_branch_map.insert(Opt::BranchToObjectPairType(_fxs_orig_addr,
+                Opt::ObjectIdType(_target.device, _target.object)));
+
+            /* increment sequence number */
+            ++((*it2).second);
+        }
+        catch (Strings::invalid_value e)
+        {
+            LOG(ERROR, PVT_FMT(_target, "expected an integer, got string '%s'")
+                % e.value() );
+        }
+    }
+}
+
+void BoardE1::KhompPvtFXS::loadOptions()
+{
+    /* the fxs_orig_addr can be reset on parse_branch_options */
+    _fxs_orig_addr = _fxs_fisical_addr;
+
+    /* Initialize fxs default options */
+    _calleridname.clear();
+    _amaflags = Opt::_amaflags;
+    _callgroup = Opt::_callgroup;
+    _pickupgroup = Opt::_pickupgroup;
+    _context.clear();
+    _input_volume = Opt::_input_volume;
+    _output_volume = Opt::_output_volume;
+    _mohclass = Opt::_global_mohclass;
+    _language = Opt::_global_language;
+    _accountcode = Opt::_accountcode;
+    _mailbox.clear();
+    _flash = Opt::_flash;
+
+    Opt::BranchToOptMapType::iterator it3 = Opt::_branch_options.find(_fxs_orig_addr);
+
+    if (it3 != Opt::_branch_options.end())
+    {
+        parseBranchOptions(it3->second);
+    }
+
+    //TODO: Implementar o setVolume para levar em consideracao que o 
+    //       padrao pode ser o da FXS
+    if (_input_volume != Opt::_input_volume)
+        setVolume("input", _input_volume);
+    if (_output_volume != Opt::_output_volume)
+        setVolume("output", _output_volume);
+}
+
+bool BoardE1::KhompPvtFXS::parseBranchOptions(std::string options_str)
+{
+    Strings::vector_type options;
+    Strings::tokenize(options_str, options, "|/");
+
+    if (options.size() < 1)
+    {
+        DBG(FUNC, PVT_FMT(_target, "[fxs-options] no options are set for branch %s.") %
+                _fxs_orig_addr.c_str());
+        return false;
+    }
+
+    try
+    {
+        for (Strings::vector_type::iterator it = options.begin(); it != options.end(); it++)
+        {
+            Strings::vector_type par;
+            Strings::tokenize(Strings::trim(*it), par, ":");
+
+            if ( par.size() != 2 )
+            {
+                LOG(WARNING, PVT_FMT(_target, "[fxs-options] error on parsing options for branch %s.") % _fxs_orig_addr.c_str());
+                return false;
+            }
+
+            std::string opt_name = Strings::trim(par.at(0));
+            std::string opt_value = Strings::trim(par.at(1));
+
+            if (opt_name == "pickupgroup")
+            {
+               _pickupgroup = opt_value;//ast_get_group(opt_value.c_str());
+            }
+            else if (opt_name == "callgroup")
+            {
+               _callgroup = opt_value;//ast_get_group(opt_value.c_str());
+            }
+            /*
+               else if (opt_name == "amaflags")
+               {
+               int amaflags = ast_cdr_amaflags2int(opt_value.c_str());
+
+               if (amaflags < 0)
+               DBG(FUNC, PVT_FMT(_target, "[fxs-options] invalid AMA flags on branch %s.") % _fxs_orig_addr.c_str());
+               else
+               _amaflags = amaflags;
+               }
+            */
+            else if (opt_name == "context")
+            {
+                _context = opt_value;
+            }
+            else if (opt_name == "input-volume")
+            {
+                long long volume = Strings::tolong(opt_value);
+
+                if ( (volume < -10) || (volume > 10) )
+                {
+                    DBG(FUNC, PVT_FMT(_target, "[fxs-options] input-volume on branch %s.") % _fxs_orig_addr.c_str());
+                }
+                else
+                {
+                    _input_volume = volume;
+                }
+            }
+            else if (opt_name == "output-volume")
+            {
+                long long volume = Strings::tolong(opt_value);
+
+                if ( (volume < -10) || (volume > 10) )
+                {
+                    DBG(FUNC, PVT_FMT(_target, "[fxs-options] ouput-volume on branch %s.") % _fxs_orig_addr.c_str());
+                }
+                else
+                {
+                    _output_volume = volume;
+                }
+            }
+            else if (opt_name == "language")
+            {
+                _language = opt_value;
+            }
+            else if (opt_name == "mohclass")
+            {
+                _mohclass = opt_value;
+            }
+            else if (opt_name == "accountcode")
+            {
+                _accountcode = opt_value;
+            }
+            else if (opt_name == "calleridnum") // conscious ultra chuncho!
+            {
+                Opt::BranchToOptMapType::iterator it3 = Opt::_branch_options.find(_fxs_orig_addr);
+
+                if (it3 != Opt::_branch_options.end())
+                {
+                    Opt::_branch_options.insert(Opt::BranchToOptPairType(opt_value, it3->second));
+
+                    Opt::_branch_options.erase(it3);
+                }
+
+                _fxs_orig_addr = opt_value;
+            }
+            else if (opt_name == "calleridname")
+            {
+                _calleridname = opt_value;
+            }
+            else if (opt_name == "mailbox")
+            {
+                _mailbox = opt_value;
+            }
+            else if (opt_name == "flash-to-digits")
+            {
+                _flash = opt_value;
+            }
+            else
+            {
+                DBG(FUNC, PVT_FMT(_target, "[fxs-options] invalid option on branch %s: \"%s\".") % _fxs_orig_addr.c_str() % opt_name.c_str());
+            }
+        }
+    }
+    catch (Strings::invalid_value e)
+    {
+        LOG(WARNING, PVT_FMT(_target, "[fxs-options] number expected on Khomp configuration file, got '%s'.") % e.value().c_str());
+        return false;
+    }
+
+    return true;
+}
+
+bool BoardE1::KhompPvtFXS::alloc()
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
+
+    callFXS()->_flags.set(Kflags::FXS_DIAL_FINISHD);
+
+    if(justStart(/*need_context*/) != SWITCH_STATUS_SUCCESS)
+    {
+        int fail_code = callFailFromCause(SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
+        setHangupCause(SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
+        cleanup(CLN_FAIL);
+        reportFailToReceive(fail_code);
+        LOG(ERROR, PVT_FMT(target(), "(FXS) r (Initilization Error on start!)"));
+        return false;
+    }
+
+    startListen();
+    startStream();
+
+    /* do this procedures early (as audio is already being heard) */
+    dtmfSuppression(Opt::_out_of_band_dtmfs && !callFXS()->_flags.check(Kflags::FAX_DETECTED));
+    echoCancellation(Opt::_echo_canceller && !callFXS()->_flags.check(Kflags::FAX_DETECTED));
+    autoGainControl(Opt::_auto_gain_control && !callFXS()->_flags.check(Kflags::FAX_DETECTED));
+
+    /* if it does not need context, probably it's a pickupcall and will
+       not pass throw setup_connection, so we start recording here*/
+    //if (!need_context && K::opt::recording && !pvt->is_recording)
+    //startRecord();
+
+    DBG(FUNC, "(FXS) r");
+    return true;
+}
+
+
+bool BoardE1::KhompPvtFXS::onSeizureStart(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+    
+        /* we always have audio */
+        call()->_flags.set(Kflags::HAS_PRE_AUDIO);
+
+        ret = KhompPvt::onSeizureStart(e);
+
+        if (justAlloc(true) != SWITCH_STATUS_SUCCESS)
+        {
+            int fail_code = callFailFromCause(SWITCH_CAUSE_UNALLOCATED_NUMBER);
+            setHangupCause(SWITCH_CAUSE_UNALLOCATED_NUMBER);            
+            cleanup(CLN_FAIL);
+            reportFailToReceive(fail_code);
+            LOG(ERROR,PVT_FMT(_target, "(FXS) r (Initilization Error on alloc!)"));
+            return false;
+        }
+
+        /* desabilita para evitar problemas de detecção de DTMF */
+        echoCancellation(false);
+        autoGainControl(false);
+
+        call()->_orig_addr = _fxs_orig_addr;
+
+        Opt::OrigToDestMapType::iterator i = Opt::_fxs_hotline.find(_fxs_orig_addr);
+
+        if (i != Opt::_fxs_hotline.end())
+        {
+            /* make it burn! */
+            call()->_dest_addr = (*i).second;
+            alloc();
+        }
+        else
+        {
+            /* normal line */
+            if (!_mailbox.empty() /*&& (ast_app_has_voicemail(pvt->fxs_opt.mailbox.c_str(), NULL) == 1)*/)
+                startCadence(PLAY_VM_TONE);
+            else
+                startCadence(PLAY_PBX_TONE);
+
+            call()->_flags.clear(Kflags::FXS_DIAL_ONGOING);
+            call()->_flags.set(Kflags::FXS_OFFHOOK);
+        }
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR,PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
+
+    return ret;
+}
+
+bool BoardE1::KhompPvtFXS::onCallSuccess(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
+
+    bool ret;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        ret = KhompPvt::onCallSuccess(e);
+
+        if (call()->_pre_answer)
+        {
+            dtmfSuppression(Opt::_out_of_band_dtmfs);     
+
+            startListen();
+            startStream();
+        }
+        else
+        {
+            call()->_flags.set(Kflags::GEN_PBX_RING);
+            call()->_idx_pbx_ring = Board::board(_target.device)->_timers.add(
+                    Opt::_ringback_pbx_delay,
+                    &Board::KhompPvt::pbxRingGen, 
+                    this, 
+                    TM_VAL_CALL);
+        }
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to get device: %d!)") % err.device);
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
+
+    return ret;
+}
+
+void BoardE1::KhompPvtFXS::dialTimer(KhompPvt * pvt)
+{
+    DBG(FUNC, PVT_FMT(pvt->target(), "FXS Dial timer"));
+
+    try
+    {
+        ScopedPvtLock lock(pvt);
+    
+        KhompPvtFXS * pvt_fxs = static_cast<BoardE1::KhompPvtFXS*>(pvt);
+
+        if(!pvt_fxs->callFXS()->_flags.check(Kflags::FXS_DIAL_ONGOING) 
+            || pvt_fxs->callFXS()->_flags.check(Kflags::FXS_DIAL_FINISHD))
+            return;
+
+        pvt_fxs->call()->_dest_addr = pvt_fxs->callFXS()->_incoming_exten;
+        pvt_fxs->alloc();
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock %s!") % err._msg.c_str());
+    }
+
+}
+
+void BoardE1::KhompPvtFXS::transferTimer(KhompPvt * pvt)
+{
+    DBG(FUNC, PVT_FMT(pvt->target(), "c"));
+
+    try
+    {
+        ScopedPvtLock lock(pvt);
+
+        KhompPvtFXS * pvt_fxs = static_cast<BoardE1::KhompPvtFXS*>(pvt);
+
+        if(!pvt_fxs->callFXS()->_flags.check(Kflags::FXS_FLASH_TRANSFER))
+        {
+            DBG(FUNC, PVT_FMT(pvt->target(), "r (Flag not set)"));
+            return;
+        }
+
+        pvt_fxs->callFXS()->_flags.clear(Kflags::FXS_FLASH_TRANSFER);
+
+        if(pvt_fxs->callFXS()->_flash_transfer.empty())
+        {
+            DBG(FUNC, PVT_FMT(pvt->target(), "r (Number is empty)"));
+            
+            if(!pvt_fxs->stopTransfer())
+            {
+                pvt_fxs->cleanup(KhompPvt::CLN_HARD);
+                DBG(FUNC, PVT_FMT(pvt_fxs->target(), "r (unable to stop transfer)"));
+                return;
+            }
+
+            return;
+        }
+
+        /* begin context adjusting + processing */
+        MatchExtension::ContextListType contexts;
+
+        pvt_fxs->validContexts(contexts);
+
+        std::string tmp_exten;
+        std::string tmp_context;
+
+        switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, pvt_fxs->callFXS()->_flash_transfer, pvt_fxs->call()->_orig_addr, false, false))
+        {
+            case MatchExtension::MATCH_EXACT:
+            case MatchExtension::MATCH_MORE:
+            {
+                pvt_fxs->callFXS()->_flash_transfer = tmp_exten;
+                DBG(FUNC,FMT("incoming exten matched: %s") % pvt_fxs->callFXS()->_flash_transfer);
+
+                if(!pvt_fxs->transfer(tmp_context))
+                {
+                    pvt_fxs->cleanup(KhompPvt::CLN_HARD);
+                    DBG(FUNC, PVT_FMT(pvt_fxs->target(), "r (unable to transfer)"));
+                    return;
+                }
+
+                break;
+            }
+            case MatchExtension::MATCH_NONE:
+            {
+                DBG(FUNC, PVT_FMT(pvt_fxs->target(), "match none!"));
+                
+                if(!pvt_fxs->stopTransfer())
+                {
+                    pvt_fxs->cleanup(KhompPvt::CLN_HARD);
+                    DBG(FUNC, PVT_FMT(pvt_fxs->target(), "r (unable to stop transfer)"));
+                    return;
+                }
+
+                break;
+            }
+        }
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(pvt->target(), "r (unable to lock %s!)") % err._msg.c_str());
+        return;
+    }
+    
+    DBG(FUNC, PVT_FMT(pvt->target(), "r"));
+
+}
+
+bool BoardE1::KhompPvtFXS::onChannelRelease(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if(!callFXS()->_uuid_other_session.empty() && session())
+        {
+            /*
+            switch_core_session_t *hold_session;
+
+            if ((hold_session = switch_core_session_locate(callFXS()->_uuid_other_session.c_str()))) 
+            {
+                switch_channel_t * hold = switch_core_session_get_channel(hold_session);
+                switch_channel_stop_broadcast(hold);
+                switch_channel_wait_for_flag(hold, CF_BROADCAST, SWITCH_FALSE, 5000, NULL);
+                switch_core_session_rwunlock(hold_session);
+            }
+            */
+            try
+            {
+                /* get other side of the bridge */
+                switch_core_session_t * peer_session = getFSLockedPartnerSession();
+                unlockPartner(peer_session);
+                DBG(FUNC, PVT_FMT(target(), "bridge with the new session"));
+                switch_ivr_uuid_bridge(getUUID(peer_session), callFXS()->_uuid_other_session.c_str());
+
+            }
+            catch(Board::KhompPvt::InvalidSwitchChannel & err)
+            {
+                DBG(FUNC, PVT_FMT(target(), "no partner: %s!") % err._msg.c_str());
+            }
+
+            callFXS()->_uuid_other_session.clear();
+        }
+
+        ret = KhompPvt::onChannelRelease(e);
+
+    }
+    catch(ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
+    return ret;
+ 
+}
+
+bool BoardE1::KhompPvtFXS::startTransfer()
+{
+    DBG(FUNC, PVT_FMT(target(), "c"));
+
+    try
+    {
+        switch_core_session_t *peer_session = getFSLockedPartnerSession();
+        switch_channel_t *peer_channel = getFSChannel(peer_session);
+
+        const char *stream = NULL;
+
+        if (!(stream = getFSChannelVar(peer_channel, SWITCH_HOLD_MUSIC_VARIABLE)))
+        {
+            stream = "silence";
+        }
+        
+        unlockPartner(peer_session);
+
+        DBG(FUNC, PVT_FMT(target(), "stream=%s") % stream);
+
+        if (stream && strcasecmp(stream, "silence"))
+        {
+            // Freeswitch not get/put frames 
+            //switch_channel_set_flag(channel, CF_HOLD);
+            switch_ivr_broadcast(getUUID(peer_session), stream, SMF_ECHO_ALEG | SMF_LOOP);
+        }
+
+        callFXS()->_flags.set(Kflags::FXS_FLASH_TRANSFER);
+    
+        startCadence(PLAY_PBX_TONE);
+
+        callFXS()->_idx_transfer = Board::board(_target.device)->_timers.add(Opt::_fxs_digit_timeout * 1000, &BoardE1::KhompPvtFXS::transferTimer, this, TM_VAL_CALL);        
+
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        //cleanup(KhompPvt::CLN_HARD);
+        LOG(ERROR, PVT_FMT(target(), "r (no valid partner %s!)") % err._msg.c_str());
+        return false;
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
+    }
+
+    //switch_ivr_hold_uuid(switch_core_session_get_uuid(session()), NULL, SWITCH_TRUE);
+    DBG(FUNC, PVT_FMT(target(), "r"));
+
+    return true;
+}
+
+bool BoardE1::KhompPvtFXS::stopTransfer()
+{
+    DBG(FUNC, PVT_FMT(target(), "c"));
+
+    callFXS()->_flags.clear(Kflags::FXS_FLASH_TRANSFER);
+    
+    callFXS()->_flash_transfer.clear();
+
+    stopCadence();
+
+    try
+    {
+        Board::board(_target.device)->_timers.del(callFXS()->_idx_transfer);
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
+    }
+
+    try
+    {
+        /* get other side of the bridge */
+        switch_core_session_t * peer_session = getFSLockedPartnerSession();
+        switch_channel_t * peer_channel = getFSChannel(peer_session);
+
+        switch_channel_stop_broadcast(peer_channel);
+        switch_channel_wait_for_flag(peer_channel, CF_BROADCAST, SWITCH_FALSE, 5000, NULL);
+
+        unlockPartner(peer_session);
+
+        //switch_ivr_unhold_uuid(switch_core_session_get_uuid(session()));
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "r (no valid partner %s!)") % err._msg.c_str());
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(target(), "r"));
+    return true;
+}
+
+static switch_status_t xferHook(switch_core_session_t *session)
+{
+    switch_channel_t *channel = switch_core_session_get_channel(session);
+    switch_channel_state_t state = switch_channel_get_state(channel);
+
+    DBG(FUNC, D("state change=%d") % state);
+
+    if (state == CS_PARK) 
+    {
+        switch_core_event_hook_remove_state_change(session, xferHook);
+
+        BoardE1::KhompPvtFXS * pvt = static_cast<BoardE1::KhompPvtFXS*>(switch_core_session_get_private(session));
+        
+        if(!pvt)
+        {
+            DBG(FUNC, D("pvt is NULL"));
+            return SWITCH_STATUS_FALSE;
+        }
+
+        try
+        {
+            ScopedPvtLock lock(pvt);
+
+            if(!pvt->callFXS()->_uuid_other_session.empty())
+            {
+                DBG(FUNC, D("bridge after park"));
+                std::string number = pvt->callFXS()->_uuid_other_session;
+                pvt->callFXS()->_uuid_other_session.clear();
+
+                switch_ivr_uuid_bridge(pvt->getUUID(), number.c_str());
+            }
+        }
+        catch(ScopedLockFailed & err)
+        {
+            LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock: %s!") %  err._msg.c_str());            
+            return SWITCH_STATUS_FALSE;
+        }
+        catch(Board::KhompPvt::InvalidSwitchChannel & err)
+        {
+            LOG(ERROR, PVT_FMT(pvt->target(), "%s!") %  err._msg.c_str());            
+            return SWITCH_STATUS_FALSE;
+        }
+
+    }
+    else if (state == CS_HANGUP) 
+    {
+        switch_core_event_hook_remove_state_change(session, xferHook);
+/*
+        BoardE1::KhompPvtFXS * pvt = static_cast<BoardE1::KhompPvtFXS*>(switch_core_session_get_private(session));
+        
+        if(!pvt)
+        {
+            DBG(FUNC, D("pvt is NULL"));
+            return SWITCH_STATUS_FALSE;
+        }
+
+        try
+        {
+            ScopedPvtLock lock(pvt);
+
+            if(!pvt->callFXS()->_uuid_other_session.empty())
+            {
+                DBG(FUNC, D("bridge after hangup"));
+                std::string number = pvt->callFXS()->_uuid_other_session;
+                pvt->callFXS()->_uuid_other_session.clear();
+
+                switch_ivr_uuid_bridge(switch_core_session_get_uuid(session), number.c_str());
+            }
+        }
+        catch(ScopedLockFailed & err)
+        {
+            LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock: %s!") %  err._msg.c_str());            
+        }
+*/
+    }
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+bool BoardE1::KhompPvtFXS::transfer(std::string & context, bool blind)
+{
+    DBG(FUNC, PVT_FMT(target(), "c"));
+
+    callFXS()->_flags.clear(Kflags::FXS_FLASH_TRANSFER);
+
+    std::string number = callFXS()->_flash_transfer;
+    callFXS()->_flash_transfer.clear();
+
+    try
+    {
+        Board::board(_target.device)->_timers.del(callFXS()->_idx_transfer);
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
+    }
+
+    try
+    {
+        /* get other side of the bridge */
+        switch_core_session_t * peer_session = getFSLockedPartnerSession();
+        switch_channel_t * peer_channel = getFSChannel(peer_session);
+
+        switch_channel_stop_broadcast(peer_channel);
+        switch_channel_wait_for_flag(peer_channel, CF_BROADCAST, SWITCH_FALSE, 5000, NULL);
+
+        unlockPartner(peer_session);
+
+        if(blind)
+        {
+            DBG(FUNC, PVT_FMT(_target, "Blind Transfer"));
+            switch_ivr_session_transfer(peer_session, number.c_str(), Opt::_dialplan.c_str(), context.c_str());
+        }
+        else
+        {
+            DBG(FUNC, PVT_FMT(_target, "Attended Transfer"));
+
+            if(!callFXS()->_uuid_other_session.empty())
+            {
+                DBG(FUNC, PVT_FMT(target(), "second transfer, hang up session"));
+            }
+            else
+            {
+                DBG(FUNC, PVT_FMT(target(), "first transfer"));
+                callFXS()->_uuid_other_session = getUUID(peer_session);    
+                const char *stream = NULL;
+
+                if (!(stream = switch_channel_get_variable(peer_channel, SWITCH_HOLD_MUSIC_VARIABLE)))
+                {
+                    stream = "silence";
+                }
+
+                DBG(FUNC, PVT_FMT(target(), "transfer stream=%s") % stream);
+
+                if (stream && strcasecmp(stream, "silence"))
+                {
+                    std::string moh = STR(FMT("endless_playback:%s,park") % stream);
+                    switch_ivr_session_transfer(peer_session, moh.c_str(), "inline", NULL);
+                }
+                else
+                {
+                    switch_ivr_session_transfer(peer_session, "endless_playback:local_stream://moh,park", "inline", NULL);
+                    //switch_ivr_session_transfer(peer_session, "park", "inline", NULL);                
+                }
+            }
+
+            switch_channel_t * channel = getFSChannel();
+            switch_channel_set_variable(channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE, "true");
+            switch_core_event_hook_add_state_change(session(), xferHook);
+
+            switch_ivr_session_transfer(session(), number.c_str(), Opt::_dialplan.c_str(), context.c_str());
+
+            DBG(FUNC, PVT_FMT(target(), "Generating ring"));
+            call()->_indication = INDICA_RING;
+            call()->_flags.set(Kflags::GEN_CO_RING);
+            startCadence(PLAY_RINGBACK);
+
+            /*
+            try
+            {
+                call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_ringback_co_delay, &Board::KhompPvt::coRingGen,this);
+            }
+            catch (K3LAPI::invalid_device & err)
+            {
+                LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
+            }
+            */
+        }
+    }
+    catch(Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "r (no valid partner %s!)") % err._msg.c_str());
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(target(), "r"));
+
+    return true;
+}
+
+bool BoardE1::KhompPvtFXS::onDtmfDetected(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXS) c (dtmf=%c)") % (char) e->AddInfo);
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        if (call()->_flags.check(Kflags::IS_INCOMING) && 
+                callFXS()->_flags.check(Kflags::FXS_OFFHOOK) &&
+                !callFXS()->_flags.check(Kflags::FXS_DIAL_FINISHD))
+        {
+            DBG(FUNC, PVT_FMT(_target, "dialing"));
+
+            if (call()->_cadence == PLAY_PBX_TONE)
+            {
+                stopCadence();
+            }
+
+            if (call()->_cadence == PLAY_PUB_TONE)
+            {
+                stopCadence();
+                //call()->_cadence = PLAY_NONE;
+                //mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
+            }
+
+            if (!callFXS()->_flags.check(Kflags::FXS_DIAL_ONGOING))
+            {
+                DBG(FUNC, PVT_FMT(_target, "dialing started now, clearing stuff.."));
+
+                callFXS()->_flags.set(Kflags::FXS_DIAL_ONGOING);
+
+                callFXS()->_incoming_exten.clear();
+
+                mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
+
+                callFXS()->_idx_dial = Board::board(_target.device)->_timers.add(Opt::_fxs_digit_timeout * 1000, &BoardE1::KhompPvtFXS::dialTimer, this, TM_VAL_CALL);
+            }
+            else
+            {
+                Board::board(_target.device)->_timers.restart(callFXS()->_idx_dial);
+            }
+
+            callFXS()->_incoming_exten += e->AddInfo;
+
+            /* begin context adjusting + processing */
+            MatchExtension::ContextListType contexts;
+
+            validContexts(contexts);
+
+            std::string tmp_exten;
+            std::string tmp_context;
+
+            switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, callFXS()->_incoming_exten, call()->_orig_addr, false, false))
+            {
+                case MatchExtension::MATCH_EXACT:
+                    callFXS()->_incoming_exten = tmp_exten;
+                    DBG(FUNC,FMT("incoming exten matched: %s") % callFXS()->_incoming_exten);
+                    Board::board(_target.device)->_timers.del(callFXS()->_idx_dial);
+                    call()->_dest_addr = callFXS()->_incoming_exten;
+                    call()->_incoming_context = tmp_context;
+
+                    alloc();
+                    break;
+
+                case MatchExtension::MATCH_MORE:
+                    DBG(FUNC, PVT_FMT(target(), "match more..."));
+
+                    /* can match, will match more, and it's an external call? */
+                    for (Opt::DestVectorType::iterator i = Opt::_fxs_co_dialtone.begin(); i != Opt::_fxs_co_dialtone.end(); i++)
+                    {
+                        if (callFXS()->_incoming_exten == (*i))
+                        {
+                            startCadence(PLAY_PUB_TONE);
+                            break;
+                        }
+                    }
+
+                    break;
+                case MatchExtension::MATCH_NONE:
+                    DBG(FUNC, PVT_FMT(target(), "match none!"));
+
+                    std::string invalid = "i";
+                    
+                    Board::board(_target.device)->_timers.del(callFXS()->_idx_dial);
+
+                    switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, invalid, call()->_orig_addr, true, false))
+                    {
+                        case MatchExtension::MATCH_EXACT:
+                            // this dialing is invalid, and we can handle it...
+                            call()->_dest_addr = invalid;
+                            call()->_incoming_context = tmp_context;
+                            alloc();
+                            break;
+                        case MatchExtension::MATCH_MORE:
+                        case MatchExtension::MATCH_NONE:
+                            callFXS()->_flags.set(Kflags::FXS_DIAL_FINISHD);
+                            startCadence(PLAY_FASTBUSY);
+                            break;
+                    }
+                    break;
+            }
+        }
+        else if(callFXS()->_flags.check(Kflags::FXS_OFFHOOK) &&
+                callFXS()->_flags.check(Kflags::FXS_FLASH_TRANSFER))
+        {
+            Board::board(_target.device)->_timers.restart(callFXS()->_idx_transfer);
+            DBG(FUNC, PVT_FMT(target(), "Flash Transfer"));
+
+            if (call()->_cadence == PLAY_PBX_TONE)
+            {
+                stopCadence();
+            }
+
+            if (call()->_cadence == PLAY_PUB_TONE)
+            {
+                stopCadence();
+                //call()->_cadence = PLAY_NONE;
+                //mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
+            }
+
+            callFXS()->_flash_transfer += e->AddInfo;
+    
+            /* begin context adjusting + processing */
+            MatchExtension::ContextListType contexts;
+
+            validContexts(contexts);
+
+            std::string tmp_exten;
+            std::string tmp_context;
+            
+            switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, callFXS()->_flash_transfer, call()->_orig_addr, false, false))
+            {
+                case MatchExtension::MATCH_EXACT:
+                {
+                    callFXS()->_flash_transfer = tmp_exten;
+                    DBG(FUNC,FMT("incoming exten matched: %s") % callFXS()->_flash_transfer);
+
+                    if(!transfer(tmp_context))
+                    {
+                        cleanup(KhompPvt::CLN_HARD);
+                        DBG(FUNC, PVT_FMT(target(), "(FXS) r (unable to transfer)"));
+                        return false;
+                    }
+
+                    break;
+                }
+                case MatchExtension::MATCH_MORE:
+                    DBG(FUNC, PVT_FMT(target(), "match more..."));
+
+                    /* can match, will match more, and it's an external call? */
+                    for (Opt::DestVectorType::iterator i = Opt::_fxs_co_dialtone.begin(); i != Opt::_fxs_co_dialtone.end(); i++)
+                    {
+                        if (callFXS()->_flash_transfer == (*i))
+                        {
+                            startCadence(PLAY_PUB_TONE);
+                            break;
+                        }
+                    }
+
+                    break;
+                case MatchExtension::MATCH_NONE:
+                {
+                    DBG(FUNC, PVT_FMT(target(), "match none!"));
+
+                    if(!stopTransfer())
+                    {
+                        cleanup(KhompPvt::CLN_HARD);
+                        DBG(FUNC, PVT_FMT(target(), "(FXS) r (unable to stop transfer)"));
+                        return false;
+                    }
+
+                    break;
+                }
+            }
+        }
+        else
+        {
+            ret = KhompPvt::onDtmfDetected(e);
+        }
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    catch (K3LAPI::invalid_device & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to get device: %d!)") % err.device);
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
+
+    return ret;
+}
+
+/*
+bool BoardE1::KhompPvtFXS::onDtmfSendFinish(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
+
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        ret = KhompPvt::onDtmfSendFinish(e);
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
+
+    return ret;
+}
+*/
+
+bool BoardE1::KhompPvtFXS::onFlashDetected(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXS) c (%s)") % _flash);
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        for(std::string::const_iterator it = _flash.begin(); it != _flash.end(); it++)
+        {
+            signalDTMF(*it);
+        }
+
+        DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
+
+        return true;
+
+/******************************************************************************/
+        //Old implementation, not used
+        if(callFXS()->_flags.check(Kflags::FXS_FLASH_TRANSFER))
+        {
+            DBG(FUNC, PVT_FMT(_target, "(FXS) transfer canceled"));
+
+            if(!stopTransfer())
+            {
+                cleanup(KhompPvt::CLN_HARD);
+                DBG(FUNC, PVT_FMT(target(), "(FXS) r (unable to stop transfer)"));
+                return false;
+            }
+
+            DBG(FUNC, PVT_FMT(target(), "(FXS) r"));
+            return true;
+        }
+
+        if(call()->_flags.check(Kflags::IS_INCOMING))
+        {
+            DBG(FUNC, PVT_FMT(_target, "incoming call"));
+        }
+        else if(call()->_flags.check(Kflags::IS_OUTGOING))
+        {
+            DBG(FUNC, PVT_FMT(_target, "outgoing call"));
+        }
+        else
+        {
+            DBG(FUNC, PVT_FMT(_target, "(FXS) r (!incoming and !outgoing call)"));
+            return true;
+        }
+
+        echoCancellation(false);
+
+        if(!startTransfer())
+        {
+            DBG(FUNC, PVT_FMT(target(), "(FXS) r (unable to start transfer)"));
+            return false;
+        }
+/******************************************************************************/
+
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
+
+    return true;
+}
+
+int BoardE1::KhompPvtFXS::makeCall(std::string params)
+{
+    DBG(FUNC,PVT_FMT(_target, "(FXS) c"));
+
+    /* we always have audio */
+    call()->_flags.set(Kflags::HAS_PRE_AUDIO);
+    
+    if (Opt::_fxs_bina && !call()->_orig_addr.empty())
+    {
+        /* Sending Bina DTMF*/
+        callFXS()->_flags.set(Kflags::WAIT_SEND_DTMF);
+
+        std::stringstream dial_bina;
+
+        dial_bina << "A1" << call()->_orig_addr << "C";
+
+        if (!command(KHOMP_LOG, CM_DIAL_DTMF, dial_bina.str().c_str()))
+        {
+            return ksFail;
+            //throw call_error("something went while sending BINA digits to FXS branch");
+        }
+
+        int timeout = 150;
+
+        if(!loopWhileFlagTimed(Kflags::WAIT_SEND_DTMF, timeout))
+            return ksFail;
+        //throw call_error("call has been dropped while sending digits");
+
+        if(timeout <= 0)
+            return ksFail;
+        //throw call_error("sending number of A caused timeout of this call");
+    }
+
+    if(!call()->_orig_addr.empty())
+        params += STG(FMT(" orig_addr=\"%s\"") % _call->_orig_addr);
+
+    if (callFXS()->_ring_on != -1)
+        params += STG(FMT(" ring_on=\"%ld\"") % callFXS()->_ring_on);
+
+    if (callFXS()->_ring_off != -1)
+        params += STG(FMT(" ring_off=\"%ld\"") % callFXS()->_ring_off);
+
+    if (callFXS()->_ring_on_ext != -1)
+        params += STG(FMT(" ring_on_ext=\"%ld\"") % callFXS()->_ring_on_ext);
+
+    if (callFXS()->_ring_off_ext != -1)
+        params += STG(FMT(" ring_off_ext=\"%ld\"") % callFXS()->_ring_off_ext);
+
+    int ret = KhompPvt::makeCall(params);
+
+    if(ret == ksSuccess)
+    {
+        try
+        {
+            switch_channel_mark_ring_ready(getFSChannel());
+        //signal_state(AST_CONTROL_RINGING);
+        }
+        catch(Board::KhompPvt::InvalidSwitchChannel & err)
+        {
+            LOG(ERROR, PVT_FMT(_target, "No valid channel: %s") % err._msg.c_str());
+        }
+    }
+    else
+    {
+        LOG(ERROR, PVT_FMT(target(), "Fail on make call"));
+    }
+
+    call()->_cleanup_upon_hangup = (ret == ksInvalidParams || ret == ksInvalidState);
+
+    DBG(FUNC,PVT_FMT(_target, "(FXS) r"));
+    return ret;
+}
+
+bool BoardE1::KhompPvtFXS::doChannelAnswer(CommandRequest &cmd)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
+    
+    bool ret = true;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        setupConnection();
+
+        ret = KhompPvt::doChannelAnswer(cmd);
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR,PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
+
+    return ret;
+}
+
+bool BoardE1::KhompPvtFXS::doChannelHangup(CommandRequest &cmd)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
+    
+    bool ret = true;
+
+    bool answered     = true;
+    bool disconnected = false;
+
+    try
+    {
+        ScopedPvtLock lock(this);
+        
+        if(!callFXS()->_uuid_other_session.empty())
+        {
+            DBG(FUNC,PVT_FMT(_target, "unable to transfer"));
+            
+            switch_core_session_t *hold_session;
+
+            if ((hold_session = switch_core_session_locate(callFXS()->_uuid_other_session.c_str()))) 
+            {
+                switch_channel_t *hold_channel = switch_core_session_get_channel(hold_session);
+                switch_core_session_rwunlock(hold_session);
+
+                if(hold_channel)
+                    switch_channel_hangup(hold_channel, (switch_call_cause_t)call()->_hangup_cause);
+                //switch_channel_hangup(hold_channel, SWITCH_CAUSE_ATTENDED_TRANSFER);
+            }
+            callFXS()->_uuid_other_session.clear();            
+        }
+
+        if (call()->_flags.check(Kflags::IS_INCOMING))
+        {
+            DBG(FUNC,PVT_FMT(_target, "disconnecting incoming channel"));
+
+        }
+        else if (call()->_flags.check(Kflags::IS_OUTGOING))
+        {
+            if (!call()->_flags.check(Kflags::FXS_OFFHOOK))
+            {
+                DBG(FUNC, PVT_FMT(_target, "disconnecting not answered outgoing FXS channel..."));
+                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
+                cleanup(KhompPvt::CLN_HARD);
+                answered = false;
+
+            }
+            else if(call()->_cleanup_upon_hangup)
+            {
+                DBG(FUNC,PVT_FMT(_target, "disconnecting not allocated outgoing channel..."));
+
+                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
+                cleanup(KhompPvt::CLN_HARD);
+                answered = false;
+
+            }
+            else
+            {
+                DBG(FUNC,PVT_FMT(_target, "disconnecting outgoing channel...")); 
+
+                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
+            }
+        }
+        else
+        {
+            DBG(FUNC,PVT_FMT(_target, "already disconnected"));
+            return true;
+        }
+
+        if(answered)
+        {
+            indicateBusyUnlocked(SWITCH_CAUSE_USER_BUSY, disconnected);
+        }
+
+        if (call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::NEEDS_RINGBACK_CMD))
+        {
+            DBG(FUNC,PVT_FMT(_target, "disconnecting incoming channel..."));
+            disconnected = command(KHOMP_LOG, CM_DISCONNECT);
+        }
+
+        stopStream();
+
+        stopListen();
+
+        //ret = KhompPvt::doChannelHangup(cmd);
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR,PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
+
+    return ret;
+}
+
+bool BoardE1::KhompPvtFXS::setupConnection()
+{
+    if(!call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::IS_OUTGOING))
+    {
+        DBG(FUNC,PVT_FMT(_target, "Channel already disconnected"));
+        return false;
+    }
+
+    bool res_out_of_band_dtmf = (call()->_var_dtmf_state == T_UNKNOWN ?
+        Opt::_suppression_delay && Opt::_out_of_band_dtmfs : (call()->_var_dtmf_state == T_TRUE));
+
+    bool res_echo_cancellator = (call()->_var_echo_state == T_UNKNOWN ?
+        Opt::_echo_canceller : (call()->_var_echo_state == T_TRUE));
+
+
+    bool res_auto_gain_cntrol = (call()->_var_gain_state == T_UNKNOWN ?
+        Opt::_auto_gain_control : (call()->_var_gain_state == T_TRUE));
+
+
+    if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
+    {
+        obtainRX(res_out_of_band_dtmf);
+
+        /* esvazia buffers de leitura/escrita */
+        cleanupBuffers();
+
+        if (!call()->_flags.check(Kflags::KEEP_DTMF_SUPPRESSION))
+            dtmfSuppression(res_out_of_band_dtmf);
+
+        if (!call()->_flags.check(Kflags::KEEP_ECHO_CANCELLATION))
+            echoCancellation(res_echo_cancellator);
+
+        if (!call()->_flags.check(Kflags::KEEP_AUTO_GAIN_CONTROL))
+            autoGainControl(res_auto_gain_cntrol);
+
+        startListen(false);
+
+        startStream();
+
+        DBG(FUNC, PVT_FMT(_target, "(FXS) Audio callbacks initialized successfully"));
+    }
+
+    call()->_flags.set(Kflags::FXS_OFFHOOK);
+
+    return KhompPvt::setupConnection();
+}
+
+bool BoardE1::KhompPvtFXS::indicateBusyUnlocked(int cause, bool sent_signaling)
+{
+    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
+
+    if(!KhompPvt::indicateBusyUnlocked(cause, sent_signaling))
+    {
+        DBG(FUNC, PVT_FMT(_target, "(FXS) r (false)"));
+        return false;
+    }
+
+    if(call()->_flags.check(Kflags::IS_INCOMING))
+    {
+        if(!call()->_flags.check(Kflags::CONNECTED) && !sent_signaling)
+        {
+            if(!call()->_flags.check(Kflags::HAS_PRE_AUDIO))
+            {
+                int rb_value = callFailFromCause(call()->_hangup_cause);
+                DBG(FUNC, PVT_FMT(target(), "sending the busy status"));
+
+                if (sendRingBackStatus(rb_value) == RingbackDefs::RBST_UNSUPPORTED)
+                {
+                    DBG(FUNC, PVT_FMT(target(), "falling back to audio indication!"));
+                    /* stop the line audio */
+                    stopStream();
+
+                    /* just pre connect, no ringback */
+                    if (!sendPreAudio())
+                        DBG(FUNC, PVT_FMT(target(), "everything else failed, just sending audio indication..."));
+
+                    /* be very specific about the situation. */
+                    mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+                }
+            }
+            else
+            {
+                DBG(FUNC, PVT_FMT(target(), "going to play busy"));
+
+                /* stop the line audio */
+                stopStream();
+
+                /* be very specific about the situation. */
+                mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+
+            }
+        }
+        else
+        {
+            /* already connected or sent signaling... */
+            mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+        }
+
+    }
+    else if(call()->_flags.check(Kflags::IS_OUTGOING))
+    {
+        /* already connected or sent signaling... */
+        mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
+    }
+
+    DBG(FUNC,PVT_FMT(_target, "(FXS) r"));
+
+    return true;
+}
+
+void BoardE1::KhompPvtFXS::reportFailToReceive(int fail_code)
+{
+    KhompPvt::reportFailToReceive(fail_code);
+
+    if(fail_code != -1)
+    {
+        DBG(FUNC,PVT_FMT(_target, "sending a 'unknown number' message/audio")); 
+
+        if(sendRingBackStatus(fail_code) == RingbackDefs::RBST_UNSUPPORTED)
+        {
+            sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
+            startCadence(PLAY_FASTBUSY);
+        }
+    }
+    else
+    {
+        DBG(FUNC, PVT_FMT(_target, "sending fast busy audio directly"));
+
+        sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
+        startCadence(PLAY_FASTBUSY);
+    }
+}
+
+bool BoardE1::KhompPvtFXS::validContexts(
+        MatchExtension::ContextListType & contexts, std::string extra_context)
+{
+    DBG(FUNC,PVT_FMT(_target, "(FXS) c"));
+    
+    if(!_context.empty())
+        contexts.push_back(_context);
+
+    contexts.push_back(Opt::_context_fxs);
+    contexts.push_back(Opt::_context2_fxs);
+
+    for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
+    {
+        replaceTemplate((*i), "CC", _target.object);
+    }
+
+    bool ret = Board::KhompPvt::validContexts(contexts,extra_context);
+
+    DBG(FUNC,PVT_FMT(_target, "(FXS) r"));
+
+    return ret;
+}
+
+bool BoardE1::KhompPvtFXS::isOK()
+{
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        K3L_CHANNEL_STATUS status;
+
+        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
+            return false;
+
+        return (status.AddInfo != kfxsFail);
+    }
+    catch (ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
+    }
+
+    return false;
+}
+
+
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt_passive.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt_passive.cpp
new file mode 100644
index 0000000000..28ccb99cfb
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt_passive.cpp
@@ -0,0 +1,290 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include "khomp_pvt_passive.h"
+#include "lock.h"
+#include "logger.h"
+
+bool BoardPassive::KhompPvtPassive::validContexts(
+        MatchExtension::ContextListType & contexts, std::string extra_context)
+{
+    DBG(FUNC,PVT_FMT(_target,"(Passive) c"));
+
+    contexts.push_back(Opt::_context_pr);
+
+    for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
+    {
+        replaceTemplate((*i), "CC", _target.object);
+    }
+
+    bool ret = Board::KhompPvt::validContexts(contexts,extra_context);
+
+    DBG(FUNC,PVT_FMT(_target,"(Passive) r"));
+
+    return ret;
+}
+
+bool BoardPassive::KhompPvtHI::onSeizureStart(K3L_EVENT *e)
+{
+    DBG(FUNC,PVT_FMT(_target,"(HI) c"));
+   
+    try
+    {
+        ScopedPvtLock lock(this);
+
+        _call->_orig_addr.clear();
+        _call->_dest_addr = "s";
+
+#if SWITCH_LESS_THAN(1,0,6)
+        session(switch_core_session_request(Globals::khomp_pr_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL));
+#else
+        session(switch_core_session_request(Globals::khomp_pr_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL));
+#endif
+
+        if (justAlloc(true) != SWITCH_STATUS_SUCCESS)
+        {
+            setHangupCause(SWITCH_CAUSE_UNALLOCATED_NUMBER);
+            cleanup(CLN_FAIL);
+            LOG(ERROR, PVT_FMT(target(), "(HI) r (Initilization Error on alloc!)"));
+            return false;
+        }
+
+        /* begin context adjusting + processing */
+        MatchExtension::ContextListType contexts;
+
+        validContexts(contexts);
+
+        std::string tmp_exten;
+        std::string tmp_context;
+
+        switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, call()->_dest_addr, call()->_orig_addr, false))
+        {
+        case MatchExtension::MATCH_NONE:
+            destroy();
+            owner(NULL);
+            LOG(WARNING, PVT_FMT(_target, "(HI) r (unable to find exten/context on incoming call %s/%s)")
+                    % _call->_dest_addr % (contexts.size() >= 1 ? contexts[0] : "default"));
+            return false;
+        default:
+            DBG(FUNC, PVT_FMT(_target, "(HI) our: context '%s', exten '%s'") % tmp_context % tmp_exten);
+            break;
+
+        }
+
+        call()->_incoming_context = tmp_context;
+        _call->_dest_addr = tmp_exten;
+
+        startListen();
+
+        if (justStart() != SWITCH_STATUS_SUCCESS)
+        {
+            setHangupCause(SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
+            cleanup(CLN_FAIL);
+            LOG(ERROR, PVT_FMT(target(), "(HI) r (Initilization Error on start!)"));
+            return false;
+        }
+
+        call()->_flags.set(Kflags::REALLY_CONNECTED);
+        call()->statistics()->incrementNewCall();
+
+    }
+    catch(ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(HI) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+
+    DBG(FUNC, PVT_FMT(_target, "(HI) r"));
+
+    return true;
+}
+
+bool BoardPassive::KhompPvtKPR::onNewCall(K3L_EVENT *e)
+{
+    DBG(FUNC, PVT_FMT(_target, "(KPR) c"));
+
+    try
+    {
+        std::string orig_addr, dest_addr;
+
+        Globals::k3lapi.get_param(e, "orig_addr", orig_addr);
+        Globals::k3lapi.get_param(e, "dest_addr", dest_addr);
+        
+        if(dest_addr.empty())
+        {
+            dest_addr="s";
+        }
+
+        bool isdn_reverse_charge = false;        
+        std::string isdn_reverse_charge_str;
+        int isdn_status = Globals::k3lapi.get_param(e, "isdn_reverse_charge", isdn_reverse_charge_str);        
+
+        if (isdn_status == ksSuccess && !isdn_reverse_charge_str.empty())
+        {
+            try
+            {
+                isdn_reverse_charge = Strings::toboolean(isdn_reverse_charge_str);
+            }
+            catch (Strings::invalid_value & err)
+            {
+            }
+        }
+
+        long int r2_category = -1;
+        std::string r2_categ_a;
+        int r2_status = Globals::k3lapi.get_param(e, "r2_categ_a", r2_categ_a);
+
+        if (r2_status == ksSuccess && !r2_categ_a.empty())
+        {
+            try
+            {
+                r2_category = Strings::toulong(r2_categ_a);
+            }
+            catch (Strings::invalid_value e)
+            {
+            }
+
+        }
+
+        ScopedPvtLock lock(this);
+
+        _call->_orig_addr = orig_addr;
+        _call->_dest_addr = dest_addr;
+
+        if(isdn_reverse_charge || r2_category == kg2CollectCall)
+        {
+            call()->_collect_call = true;            
+        }
+
+#if SWITCH_LESS_THAN(1,0,6)
+        session(switch_core_session_request(Globals::khomp_pr_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL));
+#else
+        session(switch_core_session_request(Globals::khomp_pr_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL));
+#endif
+
+        if (justAlloc(true) != SWITCH_STATUS_SUCCESS)
+        {
+            setHangupCause(SWITCH_CAUSE_UNALLOCATED_NUMBER);
+            cleanup(CLN_FAIL);
+            LOG(ERROR, PVT_FMT(target(), "(KPR) r (Initilization Error on alloc!)"));
+            return false;
+        }
+
+        /* begin context adjusting + processing */
+        MatchExtension::ContextListType contexts;
+
+        validContexts(contexts);
+
+        std::string tmp_exten;
+        std::string tmp_context;
+
+        switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, call()->_dest_addr, call()->_orig_addr, false))
+        {
+            case MatchExtension::MATCH_NONE:
+                destroy();
+                owner(NULL);
+                LOG(WARNING, PVT_FMT(_target, "(KPR) r (unable to find exten/context on incoming call %s/%s)")
+                        % _call->_dest_addr % (contexts.size() >= 1 ? contexts[0] : "default"));
+                return false;
+            default:
+                DBG(FUNC, PVT_FMT(_target, "(KPR) our: context '%s', exten '%s'") % tmp_context % tmp_exten);
+                break;
+
+        }
+
+        call()->_incoming_context = tmp_context;
+        _call->_dest_addr = tmp_exten;
+
+        obtainBoth();
+
+        startListen(false);
+
+        if (justStart() != SWITCH_STATUS_SUCCESS)
+        {
+            setHangupCause(SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
+            cleanup(CLN_FAIL);
+            LOG(ERROR, PVT_FMT(target(), "(KPR) r (Initilization Error on start!)"));
+            return false;
+        }
+
+        call()->_flags.set(Kflags::REALLY_CONNECTED);
+        call()->statistics()->incrementNewCall();
+
+    }
+    catch(ScopedLockFailed & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(KPR) r (unable to lock %s!)") % err._msg.c_str() );
+        return false;
+    }
+    
+    DBG(FUNC, PVT_FMT(_target, "(KPR) r"));   
+    return true;
+}
+
+bool BoardPassive::KhompPvtKPR::obtainBoth()
+{
+    /* estes buffers *NAO PODEM SER ESTATICOS*! */
+    char cmd1[] = { 0x3f, 0x03, 0xff, 0x00, 0x05, 0xff };
+    char cmd2[] = { 0x3f, 0x03, 0xff, 0x01, 0x05, 0xff };
+
+    cmd1[2] = cmd1[5] = cmd2[2] = _target.object;
+    cmd2[5] = _target.object + 30;
+
+    try
+    {
+        int dsp = Globals::k3lapi.get_dsp(_target.device, K3LAPI::DSP_AUDIO);
+
+        Globals::k3lapi.raw_command(_target.device, dsp, cmd1, sizeof(cmd1));
+
+        Globals::k3lapi.raw_command(_target.device, dsp, cmd2, sizeof(cmd2));
+
+    }
+    catch(K3LAPI::failed_raw_command & e)
+    {
+        LOG(ERROR, PVT_FMT(target(), "ERROR sending mixer command!"));
+        return false;
+    }
+
+    return true;
+}
+
diff --git a/src/mod/endpoints/mod_khomp/src/lock.cpp b/src/mod/endpoints/mod_khomp/src/lock.cpp
new file mode 100644
index 0000000000..01d168948c
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/lock.cpp
@@ -0,0 +1,138 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include "lock.h"
+
+/* ScopedPvtLock */
+
+ScopedPvtLock::ScopedPvtLock(KhompPvt * pvt)
+: ScopedLockBasic(false), _pvt(pvt)
+{
+    //DBG(LOCK, DP(_pvt, "c"));
+
+    if (! _pvt)
+        throw ScopedLockFailed(ScopedLockFailed::NULL_PVT, "null KhompPvt");
+
+    switch(_pvt->_mutex.lock())
+    {
+        case SimpleLock::FAILURE:
+            throw ScopedLockFailed(ScopedLockFailed::FAILED, "Failure");
+            break;
+        case SimpleLock::ISINUSE:
+            throw ScopedLockFailed(ScopedLockFailed::FAILED, "In use");
+            break;
+        default:
+            break;
+    }
+
+    _locked = true;
+
+    //DBG(LOCK, DP(_pvt, "r"));
+}
+
+ScopedPvtLock::~ScopedPvtLock()
+{
+    //DBG(LOCK, DP(_pvt, "c"));
+    unlock();
+    //DBG(LOCK, DP(_pvt, "r"));
+}
+
+void ScopedPvtLock::unlock()
+{
+    //DBG(LOCK, DP(_pvt, "c"));
+
+    if (_locked)
+    {
+        //DBG(LOCK, DP(_pvt, "unlocking!"));
+
+        _locked = false;
+        _pvt->_mutex.unlock();
+    }
+
+    //DBG(LOCK, DP(_pvt, "r"));
+}
+
+ScopedAllocLock::ScopedAllocLock()
+: ScopedLockBasic(false)
+{
+    //DBG(LOCK, DP(_pvt, "c"));
+
+    switch(Globals::khomp_alloc_mutex.lock())
+    {
+        case SimpleLock::FAILURE:
+            throw ScopedLockFailed(ScopedLockFailed::ALLOC_FAILED, "Failure");
+            break;
+        case SimpleLock::ISINUSE:
+            throw ScopedLockFailed(ScopedLockFailed::ALLOC_FAILED, "In use");
+            break;
+        default:
+            break;
+    }
+
+    _locked = true;
+
+    //DBG(LOCK, DP(_pvt, "r"));
+}
+
+ScopedAllocLock::~ScopedAllocLock()
+{
+    //DBG(LOCK, DP(_pvt, "c"));
+    unlock();
+    //DBG(LOCK, DP(_pvt, "r"));
+}
+
+void ScopedAllocLock::unlock()
+{
+    //DBG(LOCK, DP(_pvt, "c"));
+
+    if (_locked)
+    {
+        //DBG(LOCK, DP(_pvt, "unlocking!"));
+
+        _locked = false;
+        Globals::khomp_alloc_mutex.unlock();
+    }
+
+    //DBG(LOCK, DP(_pvt, "r"));
+}
+
diff --git a/src/mod/endpoints/mod_khomp/src/logger.cpp b/src/mod/endpoints/mod_khomp/src/logger.cpp
new file mode 100644
index 0000000000..c68518a81c
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/logger.cpp
@@ -0,0 +1,437 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include "logger.h"
+#include "globals.h"
+
+namespace K
+{
+    LogManager Logger::Logg;
+    LogInternalManager Logger::Logg2;
+
+    std::string     Logger::base_path;
+    std::ofstream   Logger::generic_file;
+
+    bool LogConfig::set(Logfile & file, const char * section, const char * option, bool value)
+    {
+        Section * sec = file.root().section_find(section);
+
+        if (!sec)
+            return false;
+
+        Option * opt = sec->option_find(option);
+
+        if (!opt)
+            return false;
+
+        opt->set( value ? "Ativado" : "Desativado" );
+
+        return true;
+    }
+
+    bool LogConfig::commit(Logfile & file)
+    {
+        return file.provide();
+    }
+        
+    bool Logger::start()
+    {
+        /* we love shortcuts! */
+        typedef LogManager::Option LogOpt; 
+
+        typedef LogOpt::Flags     Flags;
+        typedef LogOpt::InitFlags FL;  
+
+        /* configures default log levels */
+        Logger::Logg.classe(C_ERROR)
+            & LogOpt(O_CONSOLE, "ERROR: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::ENABLED)))
+            & LogOpt(O_GENERIC, "E: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
+
+        Logger::Logg.classe(C_WARNING)
+            & LogOpt(O_CONSOLE, "WARNING: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::ENABLED)))
+            & LogOpt(O_GENERIC, "W: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
+
+        Logger::Logg.classe(C_MESSAGE)
+            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::ENABLED)))
+            & LogOpt(O_GENERIC, "M: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
+
+        /* k3l messages */
+        Logger::Logg.classe(C_COMMAND)
+            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::DATETIME)))
+            & LogOpt(O_GENERIC, "c: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID)));
+
+        Logger::Logg.classe(C_EVENT)
+            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::DATETIME)))
+            & LogOpt(O_GENERIC, "e: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID)));
+
+        Logger::Logg.classe(C_AUDIO_EV)
+            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::DATETIME)))
+            & LogOpt(O_GENERIC, "a: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID)));
+
+        Logger::Logg.classe(C_MODEM_EV)
+            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::DATETIME)))
+            & LogOpt(O_GENERIC, "m: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
+
+        Logger::Logg.classe(C_LINK_STT)
+            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::DATETIME) & FL(LogOpt::ENABLED)))
+            & LogOpt(O_GENERIC, "s: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
+
+        Logger::Logg.classe(C_CAS_MSGS)
+            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::DATETIME) & FL(LogOpt::ENABLED)))
+            & LogOpt(O_GENERIC, "p: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
+
+        /* channel debug */
+        Logger::Logg.classe(C_DBG_FUNC)
+            & LogOpt(O_GENERIC, "F: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
+
+        Logger::Logg.classe(C_DBG_LOCK)
+            & LogOpt(O_GENERIC, "L: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
+
+        Logger::Logg.classe(C_DBG_THRD)
+            & LogOpt(O_GENERIC, "T: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
+
+        Logger::Logg.classe(C_DBG_STRM)
+            & LogOpt(O_GENERIC, "S: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
+
+        Logger::Logg.classe(C_DBG_CONF)
+            & LogOpt(O_GENERIC, "C: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
+
+        Logger::Logg.classe(C_DBG_FUNC).enabled(false);
+        Logger::Logg.classe(C_DBG_LOCK).enabled(false);
+        Logger::Logg.classe(C_DBG_THRD).enabled(false);
+        Logger::Logg.classe(C_DBG_STRM).enabled(false);
+
+        /* we debug config file loading, by default */
+        Logger::Logg.classe(C_DBG_CONF).enabled(true);
+
+        /* adds a prefix to the cli messages */
+        Logger::Logg.classe(C_CLI).prefix("<K> ");
+
+        /* inserts default console log before opening files */
+        Logger::Logg.add(O_CONSOLE,SwitchConsoleLog(), "mod_khomp: ");
+
+        time_t      tv;
+        struct tm   lt;
+
+        /* get local time! */
+        time (&tv);
+        localtime_r (&tv, &lt);
+
+        base_path = STG(FMT("/var/log/khomp%d.%d/mod_khomp-%04d%02d%02d_%02d%02d%02d/")
+                % k3lApiMajorVersion % k3lApiMinorVersion % (lt.tm_year + 1900) % (lt.tm_mon + 1)
+                % lt.tm_mday % lt.tm_hour % lt.tm_min % lt.tm_sec );
+
+        // NOTE: ALWAYS unlink, as we may have a dangling symlink lying around...
+        std::string link_path = STG(FMT("/var/log/khomp%d.%d/current") % k3lApiMajorVersion % k3lApiMinorVersion );
+        unlink(link_path.c_str());
+
+        if (mkdir(base_path.c_str(), 493 /*755*/) < 0 && errno != EEXIST)
+        {
+            Logger::Logg(C_ERROR, D("unable to create log directory '%s': %s!") % base_path % strerror(errno));
+            return false;
+        }
+
+        if (symlink(base_path.c_str(), link_path.c_str()))
+        {
+            Logger::Logg(C_ERROR, D("unable to create symlink to latest log directory '%s': %s!") % base_path % strerror(errno));
+        }
+
+        std::string gen_tmp = base_path + std::string("generic.log");
+        generic_file.open(gen_tmp.c_str());
+
+        if (!generic_file.good())
+        {
+            Logger::Logg(C_ERROR, D("could not open file '%s': %s") % gen_tmp % strerror(errno));
+            return false;
+        }
+
+        /* inserts other file descriptors (TODO: delete this when stopping logs) */
+        Logger::Logg.add(O_GENERIC, &generic_file);
+        return true;
+    }
+
+    void Logger::stop()
+    {
+        if(generic_file.is_open())
+        {
+            generic_file.close();
+        }
+    }
+
+    bool Logger::rotate()
+    {
+        std::string new_gen;
+
+        for (unsigned int i = 0;; i++)
+        {   
+            std::string tmp = base_path + STG(FMT("generic.%d.log") % i); 
+
+            if (access(tmp.c_str(), R_OK|W_OK) != 0 && errno == ENOENT)
+            {   
+                new_gen = tmp;
+                break;
+            }   
+        }   
+
+        std::string old_gen = base_path + "generic.log";
+
+        if (rename(old_gen.c_str(), new_gen.c_str()) != 0)
+        {   
+            Logger::Logg(C_ERROR, FMT("unable to move generic log file: %s.") % strerror(errno));
+            return false;
+        }   
+
+        Globals::logs_being_rotated = true;
+
+        generic_file.close();
+        generic_file.open(old_gen.c_str());
+
+        Globals::logs_being_rotated = false;
+
+        return true;
+    }
+
+    void Logger::processLogConsole(switch_stream_handle_t *s, const std::string options, bool invert, bool unique)
+    {
+        class_type classe = ( !s ? C_MESSAGE : C_CLI );
+
+        Strings::vector_type tokens;
+        Strings::tokenize(options, tokens, ",");
+
+        bool flag_errors   = false;
+        bool flag_warnings = false;
+        bool flag_messages = false;
+        bool flag_events   = false;
+        bool flag_commands = false;
+        bool flag_audio    = false;
+        bool flag_modem    = false;
+        bool flag_link     = false;
+        bool flag_cas      = false;
+
+        Strings::Merger strs;
+
+        for (Strings::vector_type::iterator i = tokens.begin(); i != tokens.end(); i++) 
+        {    
+            std::string tok = Strings::trim(*i);
+
+            /**/ if ((tok) == "errors")     flag_errors   = true;
+            else if ((tok) == "warnings")   flag_warnings = true;
+            else if ((tok) == "messages")   flag_messages = true;
+            else if ((tok) == "events")     flag_events   = true;
+            else if ((tok) == "commands")   flag_commands = true;
+            else if ((tok) == "audio")      flag_audio    = true;
+            else if ((tok) == "modem")      flag_modem    = true;
+            else if ((tok) == "link")       flag_link     = true;
+            else if ((tok) == "cas")        flag_cas      = true;
+            else if ((tok) == "standard")
+            {    
+                flag_errors   = true;
+                flag_warnings = true;
+                flag_messages = true;
+                flag_link     = true;
+            }    
+            else if ((tok) == "all")
+            {    
+                flag_errors   = true;
+                flag_warnings = true;
+                flag_messages = true;
+                flag_events   = true;
+                flag_commands = true;
+                flag_audio    = true;
+                flag_modem    = true;
+                flag_link     = true;
+                flag_cas      = true;
+            }    
+            else 
+            {    
+                K::Logger::Logg2(classe, s, FMT("WARNING: The following console message option is not valid and will be ignored: %s.") % (tok) );
+                continue;
+            }    
+
+            strs.add(tok);
+        }
+
+        if ((unique && !flag_errors)    || flag_errors)    K::Logger::Logg.classe(C_ERROR)   .set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_errors));
+        if ((unique && !flag_warnings)  || flag_warnings)  K::Logger::Logg.classe(C_WARNING) .set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_warnings));
+        if ((unique && !flag_messages)  || flag_messages)  K::Logger::Logg.classe(C_MESSAGE) .set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_messages));
+        if ((unique && !flag_events)    || flag_events)    K::Logger::Logg.classe(C_EVENT)   .set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_events));
+        if ((unique && !flag_commands)  || flag_commands)  K::Logger::Logg.classe(C_COMMAND) .set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_commands));
+        if ((unique && !flag_audio)     || flag_audio)     K::Logger::Logg.classe(C_AUDIO_EV).set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_audio));
+        if ((unique && !flag_modem)     || flag_modem)     K::Logger::Logg.classe(C_MODEM_EV).set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_modem));
+        if ((unique && !flag_link)      || flag_link)      K::Logger::Logg.classe(C_LINK_STT).set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_link));
+        if ((unique && !flag_cas)       || flag_cas)       K::Logger::Logg.classe(C_CAS_MSGS).set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_cas));
+
+        if (!strs.empty())
+        {
+            K::Logger::Logg2(classe, s, FMT("NOTICE: %s %sthe following console messages: %s.")
+                    % (invert ? "Disabling" : "Enabling")
+                    % (unique ? "just " : "") % strs.merge(", "));
+        }
+        else
+        {
+            K::Logger::Logg2(classe, s, "WARNING: No valid console messages have been specified, doing nothing.");
+        }
+    }
+
+    void Logger::processLogDisk(switch_stream_handle_t *s, const std::string options, bool invert, bool unique)
+    {
+        class_type classe = ( !s ? C_MESSAGE : C_CLI );
+
+        Strings::vector_type tokens;
+        Strings::tokenize(options, tokens, ",");
+
+        bool flag_errors    = false;
+        bool flag_warnings  = false;
+        bool flag_messages  = false;
+        bool flag_events    = false;
+        bool flag_commands  = false;
+        bool flag_audio     = false;
+        bool flag_modem     = false;
+        bool flag_link      = false;
+        bool flag_cas       = false;
+        bool flag_functions = false;
+        bool flag_threads   = false;
+        bool flag_locks     = false;
+        bool flag_streams   = false;
+
+        Strings::Merger strs;
+        
+        for (Strings::vector_type::iterator i = tokens.begin(); i != tokens.end(); i++) 
+        {    
+            std::string tok = Strings::trim(*i);
+
+            /**/ if ((tok) == "errors")     flag_errors    = true;
+            else if ((tok) == "warnings")   flag_warnings  = true;
+            else if ((tok) == "messages")   flag_messages  = true;
+            else if ((tok) == "events")     flag_events    = true;
+            else if ((tok) == "commands")   flag_commands  = true;
+            else if ((tok) == "audio")      flag_audio     = true;
+            else if ((tok) == "modem")      flag_modem     = true;
+            else if ((tok) == "link")       flag_link      = true;
+            else if ((tok) == "cas")        flag_cas       = true;
+            else if ((tok) == "functions")  flag_functions = true;
+            else if ((tok) == "threads")    flag_threads   = true;
+            else if ((tok) == "locks")      flag_locks     = true;
+            else if ((tok) == "streams")    flag_streams   = true;
+            else if ((tok) == "standard")
+            {    
+                flag_errors   = true;
+                flag_warnings = true;
+                flag_messages = true;
+                flag_link     = true;
+            }    
+            else if ((tok) == "debugging")
+            {    
+                flag_errors    = true;
+                flag_warnings  = true;
+                flag_messages  = true;
+                flag_commands  = true;
+                flag_events    = true;
+                flag_audio     = true;
+                flag_modem     = true;
+                flag_link      = true;
+                flag_cas       = true;
+                flag_functions = true;
+            }    
+            else if ((tok) == "all")
+            {    
+                flag_errors    = true;
+                flag_warnings  = true;
+                flag_messages  = true;
+                flag_events    = true;
+                flag_commands  = true;
+                flag_audio     = true;
+                flag_modem     = true;
+                flag_link      = true;
+                flag_cas       = true;
+                flag_functions = true;
+                flag_threads   = true;
+                flag_locks     = true;
+                flag_streams   = true;
+            }
+            else
+            {
+                /* do not show! */
+                continue;
+            }
+
+            strs.add(tok);
+        }
+
+        if ((unique && !flag_errors)    || flag_errors)    K::Logger::Logg.classe(C_ERROR)   .set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_errors));
+        if ((unique && !flag_warnings)  || flag_warnings)  K::Logger::Logg.classe(C_WARNING) .set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_warnings));
+        if ((unique && !flag_messages)  || flag_messages)  K::Logger::Logg.classe(C_MESSAGE) .set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_messages));
+        if ((unique && !flag_events)    || flag_events)    K::Logger::Logg.classe(C_EVENT)   .set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_events));
+        if ((unique && !flag_commands)  || flag_commands)  K::Logger::Logg.classe(C_COMMAND) .set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_commands));
+        if ((unique && !flag_audio)     || flag_audio)     K::Logger::Logg.classe(C_AUDIO_EV).set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_audio));
+        if ((unique && !flag_modem)     || flag_modem)     K::Logger::Logg.classe(C_MODEM_EV).set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_modem));
+        if ((unique && !flag_link)      || flag_link)      K::Logger::Logg.classe(C_LINK_STT).set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_link));
+        if ((unique && !flag_cas)       || flag_cas)       K::Logger::Logg.classe(C_CAS_MSGS).set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_cas));
+        if ((unique && !flag_functions) || flag_functions) K::Logger::Logg.classe(C_DBG_FUNC).enabled(!invert && flag_functions);
+        if ((unique && !flag_threads)   || flag_threads)   K::Logger::Logg.classe(C_DBG_THRD).enabled(!invert && flag_threads);
+        if ((unique && !flag_locks)     || flag_locks)     K::Logger::Logg.classe(C_DBG_LOCK).enabled(!invert && flag_locks);
+        if ((unique && !flag_streams)   || flag_streams)   K::Logger::Logg.classe(C_DBG_STRM).enabled(!invert && flag_streams);
+
+        if (!strs.empty())
+        {
+            K::Logger::Logg2(classe, s, FMT("NOTICE: %s %sthe logging of the following messages: %s.")
+                    % (invert ? "Disabling" : "Enabling")
+                    % (unique ? "just " : "") % strs.merge(", "));
+
+            if ((flag_streams || flag_locks) && !invert)
+            {
+                K::Logger::Logg2(classe, s, "WARNING: You have enabled *INTENSIVE* debug messages for the Khomp channel!");
+                K::Logger::Logg2(classe, s, "WARNING: Don't *EVER* use these options on production systems, unless you *REALLY* know what you are doing!");
+            }
+            else if ((flag_functions || flag_threads) && !invert)
+            {
+                K::Logger::Logg2(classe, s, "WARNING: You have enabled some debug messages for the Khomp channel.");
+                K::Logger::Logg2(classe, s, "WARNING: Do not use these options on production systems unless you really know what you are doing!");
+            }
+        }
+        else
+        {
+            K::Logger::Logg2(classe, s, "WARNING: No valid log messages have been specified, doing nothing.");
+        }
+    }
+}
diff --git a/src/mod/endpoints/mod_khomp/src/opt.cpp b/src/mod/endpoints/mod_khomp/src/opt.cpp
new file mode 100644
index 0000000000..8a08023b37
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/opt.cpp
@@ -0,0 +1,775 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include "opt.h"
+#include "globals.h"
+#include "defs.h"
+#include "logger.h"
+#include "spec.h"
+
+bool                            Opt::_debug;
+std::string                     Opt::_dialplan;
+std::string                     Opt::_context;
+std::string                     Opt::_user_xfer;
+std::map < std::string, CSpan > Opt::_spans;
+Opt::GroupToDestMapType         Opt::_groups;
+Opt::CadencesMapType            Opt::_cadences;
+
+bool Opt::_echo_canceller;
+bool Opt::_auto_gain_control;
+bool Opt::_out_of_band_dtmfs;
+bool Opt::_suppression_delay;
+bool Opt::_pulse_forwarding;
+bool Opt::_native_bridge;
+bool Opt::_recording;
+bool Opt::_has_ctbus;
+bool Opt::_fxs_bina;
+bool Opt::_fxo_send_pre_audio;
+bool Opt::_drop_collect_call;
+bool Opt::_ignore_letter_dtmfs;
+bool Opt::_optimize_audio_path;
+
+bool         Opt::_auto_fax_adjustment;
+unsigned int Opt::_fax_adjustment_timeout;
+
+bool         Opt::_r2_strict_behaviour;
+unsigned int Opt::_r2_preconnect_wait;
+
+unsigned int Opt::_fxs_digit_timeout;
+
+unsigned int Opt::_transferdigittimeout;
+
+std::string Opt::_flash;
+std::string Opt::_atxfer;
+std::string Opt::_blindxfer;
+
+unsigned int Opt::_ringback_co_delay;
+unsigned int Opt::_ringback_pbx_delay;
+
+unsigned int Opt::_disconnect_delay;
+
+int Opt::_input_volume;
+int Opt::_output_volume;
+
+Opt::DestVectorType     Opt::_fxs_co_dialtone;
+Opt::OrigToDestMapType  Opt::_fxs_hotline;
+std::string             Opt::_fxs_global_orig_base;
+
+Opt::BoardToOrigMapType    Opt::_fxs_orig_base;
+Opt::BranchToObjectMapType Opt::_fxs_branch_map;
+Opt::BranchToOptMapType    Opt::_branch_options;
+
+std::string Opt::_global_mohclass;
+std::string Opt::_global_language;
+
+std::string Opt::_record_prefix;
+
+std::string Opt::_context_gsm_call;
+std::string Opt::_context2_gsm_call;
+std::string Opt::_context_gsm_sms;
+std::string Opt::_context_fxo;
+std::string Opt::_context2_fxo;
+std::string Opt::_context_fxs;
+std::string Opt::_context2_fxs;
+std::string Opt::_context_digital;
+std::string Opt::_context_pr;
+
+int Opt::_amaflags;
+std::string Opt::_callgroup;
+std::string Opt::_pickupgroup;
+
+std::string Opt::_accountcode;
+
+unsigned int Opt::_kommuter_timeout;
+std::string  Opt::_kommuter_activation;
+
+unsigned int Opt::_audio_packet_size;
+
+void Opt::initialize(void) 
+{ 
+    Globals::options.add(ConfigOption("debug",    _debug,    false));
+    Globals::options.add(ConfigOption("dialplan", _dialplan, "XML"));
+    Globals::options.add(ConfigOption("context",  _context,  "default"));
+
+	Globals::options.add(ConfigOption("echo-canceller",       _echo_canceller,       true));
+	Globals::options.add(ConfigOption("auto-gain-control",    _auto_gain_control,    true));
+	Globals::options.add(ConfigOption("out-of-band-dtmfs",    _out_of_band_dtmfs,    true));
+	Globals::options.add(ConfigOption("suppression-delay",    _suppression_delay,    true));
+	Globals::options.add(ConfigOption("pulse-forwarding",     _pulse_forwarding,     false));
+	Globals::options.add(ConfigOption("native-bridge",        _native_bridge,        true));
+	Globals::options.add(ConfigOption("recording",            _recording,            true));
+	Globals::options.add(ConfigOption("has-ctbus",            _has_ctbus,            false));
+	Globals::options.add(ConfigOption("fxs-bina",             _fxs_bina,             true));
+	Globals::options.add(ConfigOption("fxo-send-pre-audio",   _fxo_send_pre_audio,   true));
+	Globals::options.add(ConfigOption("drop-collect-call",    _drop_collect_call,    false));
+	Globals::options.add(ConfigOption("ignore-letter-dtmfs", _ignore_letter_dtmfs,  false));
+	Globals::options.add(ConfigOption("optimize-audio-path",  _optimize_audio_path,  false));
+
+    Globals::options.add(ConfigOption("auto-fax-adjustment",    _auto_fax_adjustment,    true));
+    Globals::options.add(ConfigOption("fax-adjustment-timeout", _fax_adjustment_timeout, 30u, 3u, 9999u));
+
+    Globals::options.add(ConfigOption("r2-strict-behaviour", _r2_strict_behaviour, false));
+    Globals::options.add(ConfigOption("r2-preconnect-wait",  _r2_preconnect_wait,  250u, 25u, 500u));
+
+    Globals::options.add(ConfigOption("fxs-digit-timeout",   _fxs_digit_timeout,   7u,  1u, 30u));
+
+    Globals::options.add(ConfigOption("transferdigittimeout", _transferdigittimeout, 3000u, 0u, 90000u));
+
+    Globals::options.add(ConfigOption("flash-to-digits", _flash,  "*1"));
+
+    Globals::options.add(ConfigOption("atxfer",    _atxfer, ""));
+    Globals::options.add(ConfigOption("blindxfer", _blindxfer, ""));
+
+    Globals::options.add(ConfigOption("delay-ringback-co",  _ringback_co_delay,  1500u, 0u, 999000u)); 
+    Globals::options.add(ConfigOption("delay-ringback-pbx", _ringback_pbx_delay, 2500u, 0u, 999000u));
+    
+    Globals::options.add(ConfigOption("disconnect-delay", _disconnect_delay, 0u, 0u, 100000u)); 
+
+    Globals::options.add(ConfigOption("input-volume",  _input_volume, 0, -10, 10));
+    Globals::options.add(ConfigOption("output-volume", _output_volume, 0, -10, 10));
+
+
+    Globals::options.add(ConfigOption("fxs-co-dialtone", ProcessFXSCODialtone(), ""));
+    Globals::options.add(ConfigOption("fxs-global-orig", _fxs_global_orig_base,  "0"));
+
+    Globals::options.add(ConfigOption("language", _global_language, ""));
+    Globals::options.add(ConfigOption("mohclass", _global_mohclass, ""));
+
+    Globals::options.add(ConfigOption("record-prefix", ProcessRecordPrefix(), "/var/spool/freeswitch/monitor/"));
+
+    Globals::options.add(ConfigOption("context-fxo",          _context_fxo,       "khomp-DD-CC"));
+    Globals::options.add(ConfigOption("context-fxo-alt",      _context2_fxo,      "khomp-DD"));
+    Globals::options.add(ConfigOption("context-fxs",          _context_fxs,       "khomp-DD-CC"));
+    Globals::options.add(ConfigOption("context-fxs-alt",      _context2_fxs,      "khomp-DD"));
+    Globals::options.add(ConfigOption("context-gsm-call",     _context_gsm_call,  "khomp-DD-CC"));
+    Globals::options.add(ConfigOption("context-gsm-call-alt", _context2_gsm_call, "khomp-DD"));
+    Globals::options.add(ConfigOption("context-gsm-sms",      _context_gsm_sms,   "khomp-sms-DD-CC"));
+    Globals::options.add(ConfigOption("context-digital",      _context_digital,   "khomp-DD-LL"));
+    Globals::options.add(ConfigOption("context-pr",           _context_pr,        "khomp-DD-CC"));
+
+    Globals::options.add(ConfigOption("amaflags",    ProcessAMAFlags(),    "default"));
+    Globals::options.add(ConfigOption("callgroup",   _callgroup,   "0"));
+    Globals::options.add(ConfigOption("pickupgroup", _pickupgroup, "0"));
+    //Globals::options.add(ConfigOption("callgroup",   ProcessCallGroup(),   "0"));
+    //Globals::options.add(ConfigOption("pickupgroup", ProcessPickupGroup(), "0"));
+
+    Globals::options.add(ConfigOption("accountcode", _accountcode, ""));
+
+    ConfigOption::string_allowed_type kommuter_allowed;
+    kommuter_allowed.insert("auto");
+    kommuter_allowed.insert("manual");
+
+    Globals::options.add(ConfigOption("kommuter-activation", _kommuter_activation , "auto", kommuter_allowed));
+    Globals::options.add(ConfigOption("kommuter-timeout",    _kommuter_timeout ,(unsigned int) 10 , (unsigned int) 0 , (unsigned int) 255));
+
+    Globals::options.add(ConfigOption("audio-packet-length", _audio_packet_size,
+         (unsigned int)KHOMP_READ_PACKET_SIZE, (unsigned int)KHOMP_MIN_READ_PACKET_SIZE, (unsigned int)KHOMP_MAX_READ_PACKET_SIZE, 8u));
+
+    Globals::options.add(ConfigOption("log-to-disk",    ProcessLogOptions(O_GENERIC), "standard", false));
+    Globals::options.add(ConfigOption("log-to-console", ProcessLogOptions(O_CONSOLE), "standard", false));
+
+    Globals::options.add(ConfigOption("trace",          ProcessTraceOptions(), "", false));
+    Globals::options.add(ConfigOption("user-transfer-digits", _user_xfer, ""));
+
+    /* aliases */
+    Globals::options.synonym("context-gsm", "context-gsm-call");
+    Globals::options.synonym("context-gsm-alt", "context-gsm-call-alt");
+    Globals::options.synonym("echocanceller", "echo-canceller");
+    Globals::options.synonym("dtmfsuppression", "out-of-band-dtmfs");
+    Globals::options.synonym("dtmfsupression", "out-of-band-dtmfs");
+    Globals::options.synonym("pulsedetection", "pulse-forwarding");
+    Globals::options.synonym("r2preconnectwait", "r2-preconnect-wait");
+    Globals::options.synonym("bridge", "native-bridge");
+    Globals::options.synonym("suppressiondelay", "suppression-delay");
+    Globals::options.synonym("log", "log-to-disk");
+    Globals::options.synonym("volume", "output-volume");
+    Globals::options.synonym("disconnectdelay", "disconnect-delay");
+
+}
+
+void Opt::obtain(void)
+{
+    /* everything should start clean! */
+    cleanConfiguration();        
+
+    /* reset loaded options */
+    Globals::options.reset();
+
+    loadConfiguration("khomp.conf", NULL);
+
+    /* commit, loading defaults where needed */
+    ConfigOptions::messages_type msgs = Globals::options.commit();
+
+    /* config already full loaded at this point, so we can use our own log system... */
+    for (ConfigOptions::messages_type::iterator i = msgs.begin(); i != msgs.end(); i++)
+    {
+        DBG(FUNC,FMT("%s") % (*i).c_str());
+    }
+}
+
+void Opt::commit(void)
+{
+    processGroupString();
+
+    /* Check FXS hotlines correcteness */
+    OrigToDestMapType::const_iterator endOfHotlines = _fxs_hotline.end();
+
+    for (OrigToDestMapType::const_iterator i = _fxs_hotline.begin(); i != endOfHotlines; i++)
+    {  
+        BranchToObjectMapType::const_iterator j = _fxs_branch_map.find(i->first);
+
+        if (j == _fxs_branch_map.end())
+        {   
+            LOG(ERROR, FMT("unable to find branch '%s': hotline '%s' to '%s' is invalid!")
+                % i->first % i->first % i->second);
+        } 
+    }   
+
+    /* Check FXS options correcteness */
+    BranchToOptMapType::const_iterator endOfOptions = _branch_options.end();
+        
+    for (BranchToOptMapType::const_iterator i = _branch_options.begin(); i != endOfOptions; i++)
+    {   
+        BranchToObjectMapType::const_iterator j = _fxs_branch_map.find(i->first);        
+        if (j == _fxs_branch_map.end())
+        {   
+            LOG(ERROR, FMT("unable to find branch '%s' for options '%s'")
+                % i->first % i->second);
+        } 
+    }   
+}
+
+void Opt::loadConfiguration(const char *file_name, const char **section, bool show_errors)
+{
+    switch_xml_t cfg, xml, settings;
+
+    if (!(xml = switch_xml_open_cfg(file_name, &cfg, NULL))) {
+        LOG(ERROR,FMT("Open of %s failed") % file_name);
+        return;
+    }
+
+    /* Load all the global settings pertinent to all boards */
+    settings = processSimpleXML(cfg,"settings");
+    
+    /* Process channel settings */
+    processSimpleXML(settings,"channels");
+
+    /* Process groups settings */
+    processGroupXML(settings);
+
+    /* Process cadence settings */
+    processCadenceXML(settings);
+
+    /* Process fxs branches settings */
+    processFXSBranchesXML(settings);
+
+    /* Process hotlines settings */
+    processFXSHotlines(settings);
+
+    /* Process fxs options settings */
+    processFXSOptions(settings);
+    
+    switch_xml_free(xml);
+}
+
+void Opt::printConfiguration(switch_stream_handle_t* stream)
+{
+    for( std::map<std::string, CSpan>::iterator ii=_spans.begin(); ii!=_spans.end(); ++ii )
+    {
+        stream->write_function(stream,
+                               "Span: %s.\nDialplan: %s.\nContext: %s.\nDialstring: %s.\n\n",
+                               (*ii).first.c_str(),
+                               (*ii).second._dialplan.c_str(),
+                               (*ii).second._context.c_str(),
+                               (*ii).second._dialstring.c_str());
+    }
+}
+
+void Opt::cleanConfiguration(void)
+{
+    _fxs_orig_base.clear();
+    _fxs_hotline.clear();
+    _fxs_co_dialtone.clear();
+    _fxs_branch_map.clear();
+    _branch_options.clear();
+
+    _groups.clear();
+    _cadences.clear();
+
+    _cadences.insert(CadencesPairType("fast-busy", CadenceType(100,100)));
+    _cadences.insert(CadencesPairType("ringback", CadenceType(1000,4000)));
+    _cadences.insert(CadencesPairType("pbx-dialtone", CadenceType(1000,100)));
+    _cadences.insert(CadencesPairType("co-dialtone", CadenceType(0,0)));
+    _cadences.insert(CadencesPairType("vm-dialtone", CadenceType(1000,100,100,100)));
+}
+
+void Opt::ProcessFXSCODialtone::operator()(std::string options) // const
+{
+    Strings::vector_type tokens;
+    Strings::tokenize(options, tokens, ",");
+
+    for (Strings::vector_type::iterator i = tokens.begin(); i != tokens.end(); i++)
+        _fxs_co_dialtone.push_back(*i);
+}
+
+void Opt::ProcessRecordPrefix::operator()(std::string path) // const
+{
+    if (mkdir(path.c_str(), 493 /* 0755 */) < 0 && errno != EEXIST)
+    {
+        throw ConfigProcessFailure("the default recording directory could not be created.");
+    }
+    else
+    {
+        _record_prefix = path;
+    }
+}
+
+void Opt::ProcessAMAFlags::operator()(std::string options)
+{
+/*
+    //TODO: Do we need this ?
+    amaflags = ast_cdr_amaflags2int(options.c_str());
+
+    if (amaflags < 0)
+        throw ConfigProcessFailure(STG(FMT("invalid AMA flags: %s") % options));
+*/
+}
+
+//TODO: Check this
+void Opt::ProcessCallGroup::operator()(std::string options)
+{
+//    _callgroup = options.c_str();
+}
+
+//TODO: Check this
+void Opt::ProcessPickupGroup::operator()(std::string options)
+{
+//    _pickupgroup = options.c_str();
+}
+
+void Opt::ProcessLogOptions::operator()(std::string options)
+{
+    switch (_output)
+    {   
+        case O_GENERIC:
+            K::Logger::processLogDisk(NULL, options, false, true);
+            break;
+
+        case O_CONSOLE:
+            K::Logger::processLogConsole(NULL, options, false, true);
+            break;
+
+        default:
+            throw ConfigProcessFailure("attempt to process unknown log file configuration");
+            break;
+    }   
+}
+
+void Opt::ProcessTraceOptions::operator()(std::string options)
+{
+    Strings::vector_type tokens;
+    Strings::tokenize(options, tokens, ",");
+
+    bool         enable_k3l_tracing  = false;
+    bool         enable_r2_tracing   = false;
+    bool         enable_rdsi_tracing = false;
+
+    for (Strings::vector_type::iterator i = tokens.begin(); i != tokens.end(); i++)
+    {
+        std::string tok = Strings::trim(*i);
+
+        if (tok == "k3l")
+        {
+            enable_k3l_tracing = true;
+        }
+        else if (tok == "r2")
+        {
+            enable_r2_tracing = true;
+        }
+        else if (tok == "rdsi")
+        {
+            enable_rdsi_tracing = true;
+        }
+    }
+
+    Logfile logfile;
+
+    /* k3l tracing */
+    if (enable_k3l_tracing)
+    {
+        K::LogConfig::set(logfile, "K3L", "Value",        enable_k3l_tracing);
+        K::LogConfig::set(logfile, "K3L", "CallProgress", enable_k3l_tracing);
+        K::LogConfig::set(logfile, "K3L", "CallAnalyzer", enable_k3l_tracing);
+        K::LogConfig::set(logfile, "K3L", "CadenceRecog", enable_k3l_tracing);
+        K::LogConfig::set(logfile, "K3L", "CallControl",  enable_k3l_tracing);
+        K::LogConfig::set(logfile, "K3L", "Fax",          enable_k3l_tracing);
+    }
+
+    /* r2 tracing */
+    K::LogConfig::set(logfile, "R2", "Value",     enable_r2_tracing);
+    K::LogConfig::set(logfile, "R2", "Signaling", enable_r2_tracing);
+    K::LogConfig::set(logfile, "R2", "States",    enable_r2_tracing);
+
+    /* ISDN tracing */
+    if (enable_rdsi_tracing ^ Globals::flag_trace_rdsi)
+    {
+        K::LogConfig::set(logfile, "ISDN", "Value", enable_rdsi_tracing);
+        K::LogConfig::set(logfile, "ISDN", "Lapd",  enable_rdsi_tracing);
+        K::LogConfig::set(logfile, "ISDN", "Q931",  enable_rdsi_tracing);
+    }
+
+    try
+    {
+        Globals::k3lapi.command(-1, -1, CM_LOG_UPDATE);
+    }
+    catch(...)
+    {
+        LOG(ERROR,"Error while send command CM_LOG_UPDATE");
+    }
+}
+
+switch_xml_t Opt::processSimpleXML(switch_xml_t &xml, const std::string& child_name)
+{
+    switch_xml_t param, child;
+
+    if ((child = switch_xml_child(xml, child_name.c_str())))
+    {
+        for (param = switch_xml_child(child, "param"); param; param = param->next)
+        {
+            char *var = (char *) switch_xml_attr_soft(param, "name");
+            char *val = (char *) switch_xml_attr_soft(param, "value");
+
+            try
+            {
+                DBG(FUNC,FMT("loading '%s' options: '%s'...")
+                    % var
+                    % val);
+
+                Globals::options.process(var, val);
+            }
+            catch (ConfigProcessFailure e)
+            {
+                LOG(ERROR,FMT("config processing error: %s. [%s=%s]")  
+                    % e.msg.c_str()
+                    % var
+                    % val);
+
+            }
+        }
+    }
+
+    return child;
+}
+
+void Opt::processGroupXML(switch_xml_t &xml)
+{
+    switch_xml_t param, child;
+
+    if ((child = switch_xml_child(xml,"groups")))
+    {
+        for (param = switch_xml_child(child, "param"); param; param = param->next)
+        {
+            char *var = (char *) switch_xml_attr_soft(param, "name");
+            char *val = (char *) switch_xml_attr_soft(param, "value");
+
+            try
+            {
+                DBG(FUNC,FMT("loading group '%s' options: '%s'...")
+                    % var
+                    % val);
+
+                _groups.insert(GroupToDestPairType(var,val));
+
+            }
+            catch (ConfigProcessFailure e)
+            {
+                LOG(ERROR,FMT("config processing error: %s. [%s=%s]")  
+                    % e.msg.c_str()
+                    % var
+                    % val);
+            }
+        }
+    }
+}
+
+void Opt::processCadenceXML(switch_xml_t &xml)
+{
+    switch_xml_t param, child;
+
+    if ((child = switch_xml_child(xml,"cadences")))
+    {
+        for (param = switch_xml_child(child, "param"); param; param = param->next)
+        {
+            char *var = (char *) switch_xml_attr_soft(param, "name");
+            char *val = (char *) switch_xml_attr_soft(param, "value");
+
+            try
+            {
+                DBG(FUNC,FMT("loading cadences '%s' options: '%s'...")
+                    % var
+                    % val);
+
+                Strings::vector_type values;
+                Strings::tokenize(val, values, " :,.");
+
+                if (values.size() != 2 && values.size() != 4)
+                {
+                    LOG(WARNING, FMT("file '%s': wrong number of arguments at cadence '%s'!")
+                        % "khomp.conf.xml"
+                        % var);
+                }
+                else
+                {
+                    CadenceType cadence;
+
+                    cadence.ring       = Strings::toulong(Strings::trim(values[0]));
+                    cadence.ring_s     = Strings::toulong(Strings::trim(values[1]));
+
+                    if (values.size() == 4)
+                    {   
+                        cadence.ring_ext   = Strings::toulong(Strings::trim(values[2]));
+                        cadence.ring_ext_s = Strings::toulong(Strings::trim(values[3]));
+                    }   
+
+                    _cadences.erase(var); /* erases previous (possibly predefined) cadence */
+                    _cadences.insert(CadencesPairType(var, cadence));
+                } 
+            }
+            catch (ConfigProcessFailure e)
+            {
+                LOG(ERROR,FMT("config processing error: %s. [%s=%s]")  
+                    % e.msg.c_str()
+                    % var
+                    % val);
+
+            }                  
+            catch (Strings::invalid_value e)
+            {   
+               LOG(ERROR,FMT("file '%s': number expected at cadence '%s', got '%s'.") 
+                    % "khomp.conf.xml"
+                    % var
+                    % e.value().c_str());
+            }   
+        }
+    }
+}
+
+void Opt::processFXSBranchesXML(switch_xml_t &xml)
+{
+    switch_xml_t param, child;
+
+    if ((child = switch_xml_child(xml,"fxs-branches")))
+    {
+        for (param = switch_xml_child(child, "param"); param; param = param->next)
+        {
+            char *var = (char *) switch_xml_attr_soft(param, "name");
+            char *val = (char *) switch_xml_attr_soft(param, "value");
+
+
+            DBG(FUNC,FMT("loading fxs-branches '%s' options: '%s'...")
+                    % var
+                    % val);
+
+            try
+            {
+                unsigned long orig_number = Strings::toulong(var);
+
+                /* gcc! stop complaining! */
+                (void)orig_number;
+
+                Strings::vector_type boards;
+                Strings::tokenize(val, boards, " :,");
+
+                if (boards.size() < 1)
+                {
+                    DBG(FUNC,FMT("file '%s': orig number '%s' without any board!")
+                        % "khomp.conf.xml"
+                        % var);
+                    continue;
+                }
+
+                for (Strings::vector_type::iterator iter = boards.begin(); iter != boards.end(); iter++)
+                {
+                    /* quebrar em strings por vírgula/espaço */
+                    unsigned long serial_number = Strings::toulong(Strings::trim(*iter));
+
+                    bool found = false;
+
+                    for (unsigned int device = 0; device < Globals::k3lapi.device_count(); device++)
+                    {
+                        K3L_DEVICE_CONFIG & conf = Globals::k3lapi.device_config(device);
+
+                        std::string str_serial(conf.SerialNumber);
+
+                        if (Strings::toulong(str_serial) == serial_number)
+                        {
+                            found = true;
+
+                            _fxs_orig_base.insert(BoardToOrigPairType(device, var));
+                            break;
+                        }
+                    }
+
+                    if (!found)
+                    {
+                        LOG(WARNING, FMT("file 'khomp.conf.xml': board with serial number '%u' not found!") 
+                        % serial_number);
+
+                        break;
+                    }
+                }
+            }
+            catch (ConfigProcessFailure e)
+            {
+                LOG(ERROR,FMT("config processing error: %s. [%s=%s]")  
+                    % e.msg.c_str()
+                    % var
+                    % val);
+            }
+            catch (Strings::invalid_value & e)
+            {
+                LOG(ERROR, D("invalid numeric value: %s") % e.value());
+            }
+            catch (...)
+            {
+                LOG(ERROR, D("config processing error..."));
+            }
+        }
+    }
+}
+
+void Opt::processFXSHotlines(switch_xml_t &xml)
+{
+    switch_xml_t param, child;
+
+    if ((child = switch_xml_child(xml,"fxs-hotlines")))
+    {
+        for (param = switch_xml_child(child, "param"); param; param = param->next)
+        {
+            char *var = (char *) switch_xml_attr_soft(param, "name");
+            char *val = (char *) switch_xml_attr_soft(param, "value");
+
+            try
+            {
+                DBG(FUNC,FMT("loading fxs-hotlines '%s' options: '%s'...")
+                    % var
+                    % val);
+
+                unsigned long orig_number = Strings::toulong(var);
+
+                (void)orig_number; /* stop complaining! */
+
+                _fxs_hotline.insert(OrigToDestPairType(var, val));
+
+            }
+            catch (ConfigProcessFailure e)
+            {
+                LOG(ERROR,FMT("config processing error: %s. [%s=%s]")  
+                    % e.msg.c_str()
+                    % var
+                    % val);        
+            }
+            catch (Strings::invalid_value e)
+            {
+                LOG(WARNING, FMT("file '%s': number expected, got '%s'!") 
+                    % "khomp.conf.xml" % e.value().c_str());
+            }  
+        }
+    }
+}
+
+void Opt::processFXSOptions(switch_xml_t &xml)
+{
+    switch_xml_t param, child;
+
+    if ((child = switch_xml_child(xml,"fxs-options")))
+    {
+        for (param = switch_xml_child(child, "param"); param; param = param->next)
+        {
+            char *var = (char *) switch_xml_attr_soft(param, "name");
+            char *val = (char *) switch_xml_attr_soft(param, "value");
+
+            try
+            {
+                DBG(FUNC,FMT("loading fxs-options '%s' options: '%s'...")
+                    % var
+                    % val);
+
+                Strings::vector_type branches;
+                Strings::tokenize(var, branches, " ,");
+
+                if (branches.size() < 1)
+                {   
+                    //TODO: Get linenumber
+                    LOG(WARNING, FMT("file '%s': no branches specified in line %d!") 
+                    % "khomp.conf.xml" % 0);
+                }           
+                else
+                {   
+                    for (Strings::vector_type::iterator iter = branches.begin();
+                            iter != branches.end(); iter++)
+                    {                   
+                        std::string tmp_branch = Strings::trim(*iter);
+
+                        unsigned long branch_number = Strings::toulong(tmp_branch);
+                        (void) branch_number;
+
+                        _branch_options.insert(BranchToOptPairType(tmp_branch, val));
+                    }
+                }
+            }
+            catch (ConfigProcessFailure e)
+            {
+                LOG(ERROR,FMT("config processing error: %s. [%s=%s]")  
+                    % e.msg.c_str()
+                    % var
+                    % val);      
+            }
+            catch (Strings::invalid_value e)
+            {
+                LOG(WARNING, FMT("file '%s': number expected, got '%s'!") 
+                    % "khomp.conf.xml" % e.value().c_str());
+            }
+        }
+    }
+}
diff --git a/src/mod/endpoints/mod_khomp/src/spec.cpp b/src/mod/endpoints/mod_khomp/src/spec.cpp
new file mode 100644
index 0000000000..5af02634ac
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/spec.cpp
@@ -0,0 +1,885 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include <regex.hpp>
+#include "spec.h"
+#include "logger.h"
+#include "khomp_pvt.h"
+#include "khomp_pvt_kxe1.h"
+
+/************************** Forward declaration *******************************/
+static SpecRetType processSpecAtom(std::string &, SpecFlagsType &, SpecFunType &);
+static SpecRetType processSpecAtoms(std::string &, SpecFlagsType &, SpecFunType &);
+
+static bool processCallChannelString(std::string &, Board::KhompPvt *&, int *, bool need_free = true);
+
+/******************************************************************************/
+
+static SpecRetType processSpecAtom(std::string & atom, SpecFlagsType & flags, SpecFunType & fun)
+{
+	std::string allocstr = Strings::trim(atom);
+
+	DBG(FUNC, D("allocation string 'atom': %s") % allocstr.c_str());
+
+    /* check if is a group */
+   	if (allocstr.size() >= 1 && (allocstr[0] == 'g' || allocstr[0] == 'G'))
+    {
+   		std::string group_name = allocstr.substr(1);
+
+		Opt::GroupToDestMapType::iterator it = Opt::_groups.find(group_name);
+
+		if (it == Opt::_groups.end())
+		{
+			LOG(ERROR, FMT("invalid dial string '%s': no valid group found!") % allocstr.c_str());
+        	return SPR_FAIL;
+		}
+
+		allocstr = it->second;
+		return processSpecAtoms(allocstr, flags, fun);
+    }
+
+    Regex::Expression e("(((([bB])[ ]*([0-9]+))|(([sS])[ ]*([0-9]+)))[ ]*(([cClL])[ ]*([0-9]+)[ ]*([-][ ]*([0-9]+))?)?)|(([rR])[ ]*([0-9]+)[ ]*([-][ ]*([0-9]+))?)", Regex::E_EXTENDED);
+
+	Regex::Match what(allocstr, e);
+
+	if (!what.matched())
+	{
+		LOG(ERROR, FMT("invalid dial string '%s': this is not a valid expression.") % allocstr.c_str());
+		return SPR_FAIL;
+	}
+
+	bool reverse = true;
+
+	try
+	{
+
+		unsigned long int board_id = UINT_MAX;
+
+		if (what.matched(3)) //matched [bB]
+		{
+			board_id = Strings::toulong(what.submatch(5));
+
+			DBG(FUNC, D("board matched: %d") % board_id);
+
+
+			if (board_id >= Globals::k3lapi.device_count())
+			{
+            	LOG(ERROR, FMT("invalid dial string '%s': no such board '%d'.") % allocstr.c_str() % board_id);
+				return SPR_FAIL;
+			}
+
+			switch ((what.submatch(4))[0])
+			{
+				case 'b': reverse = false; break;
+				case 'B': reverse = true;  break;
+			}
+		}
+
+		else if (what.matched(6)) //matched [sS]
+		{
+			unsigned int serial_id = Strings::toulong(what.submatch(8));
+
+			DBG(FUNC, D("serial matched: %d") % serial_id);
+
+			for (unsigned int i = 0; i < Globals::k3lapi.device_count(); i++)
+			{
+
+				K3L_DEVICE_CONFIG conf = Globals::k3lapi.device_config(i);
+
+				unsigned int tmp = Strings::toulong((const char *)conf.SerialNumber);
+
+				if (tmp == serial_id)
+				{
+					board_id = i;
+					break;
+				}
+			}
+
+			if (board_id == UINT_MAX)
+			{
+   	        	LOG(ERROR, FMT("invalid dial string '%s': there is no board with serial '%04d'.") % allocstr.c_str() % serial_id);
+				return SPR_FAIL;
+			}
+
+			switch ((what.submatch(7))[0])
+			{
+				case 's': reverse = false; break;
+				case 'S': reverse = true;  break;
+			}
+		}
+		else if (what.matched(14)) //matched [rR]
+		{
+			std::string base_addr = what.submatch(16);
+
+			unsigned int branch_id = Strings::toulong(base_addr);
+
+			if (what.matched(17))
+			{
+				unsigned int branch2_id = Strings::toulong(what.submatch(18));
+
+				DBG(FUNC, D("branch range matched (%d to %d)") % branch_id % branch2_id);
+
+				switch ((what.submatch(15))[0])
+				{
+					case 'r': reverse = false; break;
+					case 'R': reverse = true;  break;
+				}
+
+				if (!reverse)
+				{
+					for (unsigned int i = branch_id; i <= branch2_id; i++)
+					{
+						std::string call_addr = BoardE1::KhompPvtFXS::padOrig(base_addr, i - branch_id);
+						Opt::BranchToObjectMapType::iterator i = Opt::_fxs_branch_map.find(call_addr);
+
+						if (i == Opt::_fxs_branch_map.end())
+						{
+   	    			    	LOG(WARNING, FMT("invalid value '%s': there is no such branch number.") % call_addr);
+							return SPR_FAIL;
+						}
+
+						if (!fun(i->second.first, i->second.second, flags))
+							return SPR_SUCCESS;
+					}
+				}
+				else
+				{
+					for (unsigned int i = branch2_id; i >= branch_id; i--)
+					{
+						std::string call_addr = BoardE1::KhompPvtFXS::padOrig(base_addr, i - branch_id);
+
+						Opt::BranchToObjectMapType::iterator i = Opt::_fxs_branch_map.find(call_addr);
+
+						if (i == Opt::_fxs_branch_map.end())
+						{
+   	    			    	LOG(WARNING, FMT("invalid value '%s': there is no such branch number.") % call_addr);
+							return SPR_FAIL;
+						}
+
+						if (!fun(i->second.first, i->second.second, flags))
+							return SPR_SUCCESS;
+					}
+				}
+			}
+			else
+			{
+				DBG(FUNC, D("branch matched: %s") % base_addr);
+
+				Opt::BranchToObjectMapType::iterator i = Opt::_fxs_branch_map.find(base_addr);
+
+				if (i == Opt::_fxs_branch_map.end())
+				{
+   	    	    	LOG(WARNING, FMT("invalid value '%s': there is no such branch number.") % base_addr);
+					return SPR_FAIL;
+				}
+
+				if (!fun(i->second.first, i->second.second, flags))
+					return SPR_SUCCESS;
+			}
+		}
+
+		else
+		{
+           	LOG(ERROR, FMT("invalid dial string '%s': unknown allocation method.") % allocstr.c_str());
+			return SPR_FAIL;
+		}
+
+		if (what.matched(9)) // matched something about links/channels [cClL]n|[cC]n-m
+		{
+			DBG(FUNC, D("channel/link matched"));
+			unsigned long int object_id = Strings::toulong(what.submatch(11));
+
+			if (what.matched(12))
+			{
+
+				DBG(FUNC, D("channel range matched")); // matched [cC]n-m
+
+				if ((what.submatch(10))[0] != 'c' && (what.submatch(10))[0] != 'C')
+				{
+					LOG(ERROR, FMT("invalid dial string '%s': range just allowed for channels.") % allocstr.c_str());
+					return SPR_FAIL;
+				}
+
+				unsigned long int object2_id = Strings::toulong(what.submatch(13));
+
+				DBG(FUNC, D("(d=%d,lo=%d,up=%d,r=%s) c") % board_id % object_id % object2_id % (reverse ? "true" : "false"));
+
+				if (reverse)
+				{
+					for (unsigned int obj = std::min<unsigned int>(object2_id + 1, Globals::k3lapi.channel_count(board_id)); obj > 0 && obj > object_id; obj--)
+					{
+						if (!fun(board_id, obj-1, flags))
+							return SPR_SUCCESS;
+					}
+				}
+				else
+				{
+					for (unsigned int obj = object_id; obj < std::min<unsigned int>(Globals::k3lapi.channel_count(board_id), object2_id + 1); obj++)
+					{
+						if (!fun(board_id, obj, flags))
+							return SPR_SUCCESS;
+					}
+				}
+
+			}
+
+			else // matched [cClL]n
+			{
+				DBG(FUNC, D("individual channel/link matched"));
+
+				switch ((what.submatch(10))[0])
+				{
+					case 'C':
+					case 'c':
+						DBG(FUNC, D("individual channel matched"));
+
+						if (!fun(board_id, object_id, flags))
+							return SPR_SUCCESS;
+
+                        return SPR_CONTINUE;
+
+					case 'l':
+					case 'L':
+						DBG(FUNC, D("individual link matched"));
+
+						switch (Globals::k3lapi.device_type(board_id))
+						{
+							case kdtE1:
+							case kdtPR:
+							case kdtE1GW:
+							case kdtE1IP:
+							case kdtE1Spx:
+#if K3L_AT_LEAST(2,1,0)
+							case kdtE1FXSSpx:
+#endif
+							{
+								unsigned int link_first = object_id * 30;
+								unsigned int link_final = ((object_id + 1) * 30);
+
+								if (reverse)
+								{
+									for (unsigned int obj = std::min(link_final, Globals::k3lapi.channel_count(board_id)); obj > 0 && obj > link_first; obj--)
+									{
+										if (!fun(board_id, obj-1, flags))
+											return SPR_SUCCESS;
+									}
+								}
+								else
+								{
+									for (unsigned int obj = link_first; obj < std::min(Globals::k3lapi.channel_count(board_id), link_final); obj++)
+									{
+										if (!fun(board_id, obj, flags))
+											return SPR_SUCCESS;
+									}
+								}
+                                return SPR_CONTINUE;
+
+							}
+
+							default:
+								LOG(ERROR, FMT("invalid dial string '%s': board '%d' does not have links.")
+									% allocstr.c_str() % board_id);
+								return SPR_FAIL;
+						}
+
+					default:
+						LOG(ERROR, FMT("invalid dial string '%s': invalid object specification.") % allocstr.c_str());
+						return SPR_FAIL;
+				}
+			}
+		}
+		else if (what.matched(3) || what.matched(6)) // matched something about boards [bBsS]
+		{
+			if (reverse)
+			{
+				for (unsigned int obj = Globals::k3lapi.channel_count(board_id); obj > 0; obj--)
+				{
+					if (!fun(board_id, obj-1, flags))
+						return SPR_SUCCESS;
+		        }
+	        }
+			else
+			{
+				for (unsigned int obj = 0; obj < Globals::k3lapi.channel_count(board_id); obj++)
+				{
+					if (!fun(board_id, obj, flags))
+						return SPR_SUCCESS;
+				}
+			}
+		}
+
+	}
+	catch (Strings::invalid_value e)
+	{
+		LOG(ERROR, FMT("invalid dial string '%s': invalid numeric value specified.") % allocstr.c_str());
+		return SPR_FAIL;
+	}
+    catch (Function::EmptyFunction & e)
+    {
+		LOG(ERROR, FMT("invalid function."));
+		return SPR_FAIL;
+    }
+
+	return SPR_CONTINUE;
+}
+
+static SpecRetType processSpecAtoms(std::string & gotatoms, SpecFlagsType & flags, SpecFunType & fun)
+{
+	std::string atoms(gotatoms);
+
+	DBG(FUNC, D("allocation string 'atoms': %s") % atoms);
+
+
+	if (!atoms.empty() && (atoms.at(0) == '*'))  //so it is a "cyclical" allocation
+	{
+		atoms.erase(0, 1);
+
+		if (flags & SPF_FIRST)
+		{
+			if (!(flags & SPF_CYCLIC))
+			{
+				DBG(FUNC, D("got a cyclic/fair allocation (%s), priorizing less used channels...") % atoms);
+				flags |= SPF_CYCLIC;
+			}
+		}
+		else
+		{
+			DBG(FUNC, D("cyclic/fair allocation NOT at first string, ignoring..."));
+		}
+	}
+
+
+	Strings::vector_type boundaries;
+	Strings::tokenize(atoms, boundaries, "+");
+
+    if (boundaries.size() < 1)
+    {
+        LOG(ERROR, FMT("invalid dial string '%s': no allocation string found!") % atoms);
+        return SPR_FAIL;
+    }
+
+	for (Strings::vector_type::iterator iter = boundaries.begin(); iter != boundaries.end(); iter++)
+	{
+		switch (processSpecAtom(*iter, flags, fun))
+		{
+			// if had some error processing dialstring, bail out..
+			case SPR_FAIL:
+				return SPR_FAIL;
+
+			// found someone? return ASAP!
+			case SPR_SUCCESS:
+				return SPR_SUCCESS;
+
+			// else, keep going..
+			case SPR_CONTINUE:
+				break;
+		}
+
+		flags &= ~SPF_FIRST;
+	}
+
+	/* found nothing, but this is NOT an error */
+	return SPR_CONTINUE;
+}
+
+struct funProcessCallChannelString
+{
+	funProcessCallChannelString(int *cause, bool need_free)
+	: _cause(cause), _need_free(need_free),
+	  _all_fail(true), //_fxs_only(true),
+	  _pvt(NULL)
+	{};
+
+	bool operator()(unsigned int dev, unsigned int obj, SpecFlagsType & flags)
+	{
+        try
+        {
+    	    Board::KhompPvt *tmp = Board::get(dev, obj);
+
+	    	// used for cause definition
+		    if (_all_fail)
+			    _all_fail = (tmp ? !tmp->isOK() : true);
+        }
+        catch (K3LAPI::invalid_channel & err)
+        {
+            _all_fail = true;
+        }
+
+		//used for precise cause definition
+        //if (_fxs_only)
+		//	_fxs_only = (tmp ? tmp->is_fxs() : false);
+
+		if (flags & SPF_CYCLIC)
+		{
+			Board::queueAddChannel(_channels, dev, obj);
+			return true;
+		}
+		else
+		{
+			_pvt = Board::findFree(dev, obj, _need_free);
+			return (_pvt == NULL);
+		}
+		return true;
+	}
+
+	Board::KhompPvt * pvt(SpecFlagsType & flags)
+	{
+
+		if ((flags & SPF_CYCLIC) && !_pvt)
+		{
+			 //we have no pvt 'till now, lets find a suitable one..
+			_pvt = Board::queueFindFree(_channels);
+		}
+
+		if (!_pvt && _cause && !(*_cause))
+		{
+
+			if (_all_fail)
+			{
+				// all channels are in fail
+				*_cause = SWITCH_CAUSE_NETWORK_OUT_OF_ORDER;
+			}
+			else
+			{
+				//if (_fxs_only)
+				//	*_cause = SWITCH_CAUSE_USER_BUSY;
+				//else
+					*_cause = SWITCH_CAUSE_SWITCH_CONGESTION;
+			}
+		}
+
+		return _pvt;
+	}
+
+	int   * _cause;
+
+	bool    _need_free;
+
+	bool    _all_fail;
+	//bool    _fxs_only; //TODO: futuro implementar a parte de FXS
+
+	Board::KhompPvt          * _pvt;
+	Board::PriorityCallQueue   _channels;
+};
+
+struct funProcessSMSChannelString
+{
+
+    funProcessSMSChannelString(int *cause)
+    : _cause(cause), _all_fail(true), _pvt(NULL)
+    {};  
+
+    bool operator()(unsigned int dev, unsigned int obj, SpecFlagsType & flags)
+    {    
+        Board::KhompPvt *pvt = Board::findFree(dev, obj);
+
+        if (pvt)
+        {
+            // found something? check if its GSM 
+            if (pvt->application(SMS_CHECK, NULL, NULL))
+            {    
+                // used for cause definition 
+                if (_all_fail)
+                    _all_fail = (pvt ? !pvt->isOK() : true);
+
+                if (flags & SPF_CYCLIC)
+                {    
+                    Board::queueAddChannel(_channels, dev, obj);
+                    return true;
+                }    
+                else 
+                {    
+                    _pvt = pvt; 
+                    return false;
+                }    
+            }    
+            else 
+            {    
+                // not gsm, return ASAP and stop search 
+                LOG(ERROR, PVT_FMT(pvt->target(), "channel is NOT a GSM channel! unable to send message!"));
+                return false;
+            }
+        }
+
+        // keep searching 
+        return true;
+    }
+
+    Board::KhompPvt * pvt(SpecFlagsType & flags)
+    {    
+        if ((flags & SPF_CYCLIC) && !_pvt)
+        {    
+            // we have no pvt 'till now, lets find a suitable one.. 
+            _pvt = Board::queueFindFree(_channels);
+        }
+
+        if (!_pvt && _cause && !(*_cause))
+        {    
+            if (_all_fail)
+            {    
+                // all channels are in fail 
+                *_cause = SWITCH_CAUSE_NETWORK_OUT_OF_ORDER;
+            }    
+            else 
+            {    
+                // otherwise, congestion..
+                *_cause = SWITCH_CAUSE_SWITCH_CONGESTION;
+            }
+        }
+
+        return _pvt;
+    }
+
+    int                            * _cause;
+
+    bool                             _need_free;
+
+    bool                             _all_fail;
+
+	Board::KhompPvt          * _pvt;
+	Board::PriorityCallQueue   _channels;
+};
+
+struct FunProcessGroupString
+{
+    /* used for group processing */
+    FunProcessGroupString(std::string ctx)
+        : _ctx(ctx) {};
+
+    FunProcessGroupString(const FunProcessGroupString &o)
+        : _ctx(o._ctx) {};
+
+    bool operator()(unsigned int dev, unsigned int obj, SpecFlagsType & flags) const
+    {
+        try
+        {
+            Board::KhompPvt * pvt = Board::get(dev,obj);
+
+            DBG(CONF, FMT("loading context %s for channel %d,%d") % _ctx % dev % obj);
+
+            if (pvt) pvt->_group_context = _ctx;
+        }
+        catch (K3LAPI::invalid_channel & err)
+        {
+        }
+
+        return true;
+    }
+
+
+    std::string _ctx;
+};
+
+static bool processCallChannelString(std::string & str, Board::KhompPvt *& pvt, int * cause, bool need_free)
+{
+	funProcessCallChannelString  proc(cause, need_free);
+
+	SpecFlagsType   flags = SPF_FIRST;
+	SpecFunType     fun(proc, false); //   = ReferenceWrapper < SpecFunType > (proc);
+
+    bool ret = true;
+
+	switch (processSpecAtoms(str, flags, fun))
+	{
+		case SPR_FAIL:
+			DBG(FUNC, D("SPR_FAIL: %p") % cause);
+
+			if (cause)
+				*cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT;
+
+			ret = false;
+            break;
+		case SPR_SUCCESS:
+		case SPR_CONTINUE:
+            pvt = proc.pvt(flags);
+			DBG(FUNC, D("pvt = %p") % pvt);
+
+			if (!pvt && cause && !(*cause))
+				*cause = SWITCH_CAUSE_INTERWORKING;
+
+			ret = true;
+            break;
+	}
+
+	return ret;
+}
+
+bool processSMSChannelString(std::string & str, Board::KhompPvt *& pvt, int *cause)
+{
+    funProcessSMSChannelString proc(cause);
+
+    SpecFlagsType flags = SPF_FIRST;
+    SpecFunType   fun(proc, false); 
+
+    switch (processSpecAtoms(str, flags, fun)) 
+    {    
+        case SPR_FAIL:
+            DBG(FUNC, FMT("SPR_FAIL: %p") % cause);
+            if (cause)
+                *cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT;
+            return false;
+
+        case SPR_SUCCESS:
+        case SPR_CONTINUE:
+            pvt = proc.pvt(flags);
+            DBG(FUNC, FMT("pvt = %p") % pvt);
+
+            if (!pvt && cause && !(*cause))
+                *cause = SWITCH_CAUSE_INTERWORKING;
+
+            return true;
+    }    
+
+    return true;
+}
+
+Board::KhompPvt * processDialString (const char *dial_charv, int *cause)
+{
+	DBG(FUNC, D("c (%p, %p)") % dial_charv % cause);
+	std::string           dial_string(dial_charv);
+	Strings::vector_type  dial_args;
+
+	Strings::tokenize(dial_string, dial_args, "/");
+
+	Board::KhompPvt *pvt = NULL;
+
+    DBG(FUNC, FMT("processing dial string [%d] : '%s'") % dial_args.size() % dial_string);
+
+	if ((dial_args.size() < 1 && dial_args.size() > 3))
+	{
+		LOG(ERROR, FMT("invalid dial string '%s': wrong number of separators ('/').") % dial_string);
+		return NULL;
+	}
+
+	bool dial_string_ok = processCallChannelString(dial_args[0], pvt, cause, true);
+
+	if (pvt == NULL)
+	{
+		if (dial_string_ok)
+            LOG(WARNING, "unable to allocate channel -- no free channel found!");
+		return NULL;
+    }
+
+    DBG(FUNC, PVT_FMT(pvt->target(), "pvt %p") % pvt);
+
+	unsigned int opt_size = (pvt->hasNumberDial() ? 3 : 2);
+	unsigned int opt_arg  = opt_size - 1;
+    
+	if (dial_args.size() == opt_size)
+	{
+        Strings::vector_type options_args;
+        Strings::tokenize (dial_args[opt_arg], options_args, ":");
+
+		for (Strings::vector_type::iterator opt_arg = options_args.begin();
+		     opt_arg != options_args.end(); opt_arg++)
+		{
+			std::string str = (*opt_arg);
+
+			Strings::vector_type option_item;
+			Strings::tokenize (str, option_item, "=");
+
+			switch (option_item.size())
+			{
+				case 2:
+				{
+					std::string index (option_item[0]);
+					std::string value (option_item[1]);
+
+                    if(pvt->call()->process(index, value))
+						continue;
+
+					break;
+				}
+
+				case 1:
+				{
+		            std::string index (option_item[0]);
+
+                    if(pvt->call()->process(index))
+						continue;
+
+					break;
+				}
+
+				default:
+	            {
+					LOG(ERROR, FMT("invalid option specification '%s'.") % str);
+	                continue;
+	            }
+			}
+            LOG(ERROR, FMT("unknown option name '%s', ignoring...") % str);
+        }
+	}
+
+    if(pvt->hasNumberDial())
+    {
+		if (dial_args.size() <= 1)
+		{
+            LOG(ERROR, FMT("invalid dial string '%s': missing destination number!") % dial_string);
+			return NULL;
+		}
+
+        std::string name ("dest");
+        std::string value (dial_args[1]);
+
+        pvt->call()->process(name, value);
+
+		//pvt->call()->dest_addr = dial_args[1];
+	}
+
+    return pvt;
+};
+
+Board::KhompPvt * processSMSString (const char *sms_charv, int *cause)
+{
+    std::string           sms_string(sms_charv);
+    Strings::vector_type  sms_args;
+
+    Strings::tokenize(sms_string, sms_args, "/|,", 3); // '/' is a backward compatibility feature! 
+
+    DBG(FUNC, FMT("processing SMS string [%d] : '%s'") % sms_args.size() % sms_string);
+
+    if (sms_args.size () != 3)
+    {
+        LOG(ERROR, FMT("invalid dial string '%s': wrong number of separators.") % sms_string);
+        return NULL;
+    }
+
+    Board::KhompPvt *pvt = NULL;
+
+    bool dial_string_ok = processSMSChannelString(sms_args[0], pvt, cause);
+
+    if (pvt == NULL)
+    {
+        if (dial_string_ok)
+        {
+            LOG(WARNING, "unable to allocate channel -- no free channel found!");
+        }
+
+        return NULL;
+    }
+    else
+    {
+        if (!pvt->application(SMS_CHECK, NULL, NULL))
+        {
+            LOG(ERROR, PVT_FMT(pvt->target(), "allocated channel is NOT a GSM channel! unable to send message!"));
+
+            return NULL;
+        }
+    }
+
+
+/*
+    std::string dest(sms_args[1]);
+
+    bool conf = false;
+
+    if (dest[0] == '!')
+    {
+        dest.erase(0,1);
+        conf = true;
+    }
+
+    if (dest[dest.size()-1] == '!')
+    {
+        dest.erase(dest.size()-1,1);
+        conf = true;
+    }
+
+    // get options/values 
+    pvt->send_sms.sms_dest = dest;
+    pvt->send_sms.sms_conf = conf;
+    pvt->send_sms.sms_body = sms_args[2];
+*/
+
+    return pvt;
+};
+
+void processGroupString()
+{
+    for (Opt::GroupToDestMapType::iterator i = Opt::_groups.begin(); i != Opt::_groups.end(); i++)
+    {
+        const std::string & name = (*i).first;
+        std::string & opts = (*i).second;
+
+        Strings::vector_type tokens;
+        Strings::tokenize(opts, tokens, ",:", 2);
+
+        if (tokens.size() != 2 && tokens.size() != 1)
+        {
+            LOG(WARNING, FMT("wrong number of arguments at group '%s', ignoring group!\n") % name.c_str());
+            opts.clear();
+            continue;
+        }
+
+        if (tokens.size() < 2)
+            continue;
+        FunProcessGroupString    proc(tokens[1]);
+
+        SpecFlagsType   flags = SPF_FIRST;
+        SpecFunType     fun(proc, false);
+
+        switch (processSpecAtoms(tokens[0], flags, fun))
+        {
+            case SPR_CONTINUE:
+                // remove context from spec 
+                opts = tokens[0];
+
+                // log this! 
+                DBG(CONF, FMT("group '%s' is now '%s', with context '%s'...")
+                        % name % tokens[0] % tokens[1]);
+                break;
+
+            default:
+                LOG(WARNING, FMT("skipping group '%s', bad configuration!\n") % name.c_str());
+
+                // "zero" group 
+                opts.clear();
+
+                // log this! 
+                DBG(CONF, FMT("group '%s' have misconfigured options, ignoring...") % name);
+                break;
+        }
+    }
+}
+
diff --git a/src/mod/endpoints/mod_khomp/src/utils.cpp b/src/mod/endpoints/mod_khomp/src/utils.cpp
new file mode 100644
index 0000000000..cc6eaef082
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/src/utils.cpp
@@ -0,0 +1,607 @@
+/*******************************************************************************
+
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file 
+  under the MPL, indicate your decision by deleting the provisions above and 
+  replace them with the notice and other provisions required by the LGPL 
+  License. If you do not delete the provisions above, a recipient may use your 
+  version of this file under either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, 
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*******************************************************************************/
+
+#include <utils.h>
+#include "khomp_pvt.h"
+
+
+void Kflags::init()
+{
+    _flags[CONNECTED]._name = "CONNECTED";
+    _flags[CONNECTED]._value = false;
+    _flags[REALLY_CONNECTED]._name = "REALLY_CONNECTED";
+    _flags[REALLY_CONNECTED]._value = false;
+    _flags[IS_OUTGOING]._name = "IS_OUTGOING";
+    _flags[IS_OUTGOING]._value = false;
+    _flags[IS_INCOMING]._name = "IS_INCOMING";
+    _flags[IS_INCOMING]._value = false;
+    _flags[STREAM_UP]._name = "STREAM_UP";
+    _flags[STREAM_UP]._value = false;
+    _flags[LISTEN_UP]._name = "LISTEN_UP";
+    _flags[LISTEN_UP]._value = false;
+    _flags[GEN_CO_RING]._name = "GEN_CO_RING";
+    _flags[GEN_CO_RING]._value = false;
+    _flags[GEN_PBX_RING]._name = "GEN_PBX_RING";
+    _flags[GEN_PBX_RING]._value = false;
+    _flags[HAS_PRE_AUDIO]._name = "HAS_PRE_AUDIO";
+    _flags[HAS_PRE_AUDIO]._value = false;
+    _flags[HAS_CALL_FAIL]._name = "HAS_CALL_FAIL";
+    _flags[HAS_CALL_FAIL]._value = false;
+    _flags[DROP_COLLECT]._name = "DROP_COLLECT";
+    _flags[DROP_COLLECT]._value = false;
+    _flags[NEEDS_RINGBACK_CMD]._name = "NEEDS_RINGBACK_CMD";
+    _flags[NEEDS_RINGBACK_CMD]._value = false;
+    _flags[EARLY_RINGBACK]._name = "EARLY_RINGBACK";
+    _flags[EARLY_RINGBACK]._value = false;
+    _flags[FAX_DETECTED]._name = "FAX_DETECTED";
+    _flags[FAX_DETECTED]._value = false;
+    _flags[FAX_SENDING]._name = "FAX_SENDING";
+    _flags[FAX_SENDING]._value = false;
+    _flags[FAX_RECEIVING]._name = "FAX_RECEIVING";
+    _flags[FAX_RECEIVING]._value = false;
+    _flags[OUT_OF_BAND_DTMFS]._name = "OUT_OF_BAND_DTMFS";
+    _flags[OUT_OF_BAND_DTMFS]._value = false;
+    _flags[KEEP_DTMF_SUPPRESSION]._name = "KEEP_DTMF_SUPPRESSION";
+    _flags[KEEP_DTMF_SUPPRESSION]._value = false;
+    _flags[KEEP_ECHO_CANCELLATION]._name = "KEEP_ECHO_CANCELLATION";
+    _flags[KEEP_ECHO_CANCELLATION]._value = false;
+    _flags[KEEP_AUTO_GAIN_CONTROL]._name = "KEEP_AUTO_GAIN_CONTROL";
+    _flags[KEEP_AUTO_GAIN_CONTROL]._value = false;
+    _flags[WAIT_SEND_DTMF]._name = "WAIT_SEND_DTMF";
+    _flags[WAIT_SEND_DTMF]._value = false;
+    _flags[CALL_WAIT_SEIZE]._name = "CALL_WAIT_SEIZE";
+    _flags[CALL_WAIT_SEIZE]._value = false;
+    _flags[NUMBER_DIAL_FINISHD]._name = "NUMBER_DIAL_FINISHD";
+    _flags[NUMBER_DIAL_FINISHD]._value = false;
+    _flags[NUMBER_DIAL_ONGOING]._name = "NUMBER_DIAL_ONGOING";
+    _flags[NUMBER_DIAL_ONGOING]._value = false;
+
+    _flags[FXS_OFFHOOK]._name = "FXS_OFFHOOK";
+    _flags[FXS_OFFHOOK]._value = false;
+    _flags[FXS_DIAL_FINISHD]._name = "FXS_DIAL_FINISHD";
+    _flags[FXS_DIAL_FINISHD]._value = false;
+    _flags[FXS_DIAL_ONGOING]._name = "FXS_DIAL_ONGOING";
+    _flags[FXS_DIAL_ONGOING]._value = false;
+    _flags[FXS_FLASH_TRANSFER]._name = "FXS_FLASH_TRANSFER";
+    _flags[FXS_FLASH_TRANSFER]._value = false;
+    _flags[XFER_QSIG_DIALING]._name = "XFER_QSIG_DIALING";
+    _flags[XFER_QSIG_DIALING]._value = false;
+    _flags[XFER_DIALING]._name = "XFER_DIALING";
+    _flags[XFER_DIALING]._value = false;
+
+    _flags[SMS_DOING_UPLOAD]._name = "SMS_DOING_UPLOAD";
+    _flags[SMS_DOING_UPLOAD]._value = false;
+
+    /*
+    NOW LOADING ... 
+
+    _flags[BRIDGED]._name = "BRIDGED";
+    _flags[BRIDGED]._value = false;
+    */
+
+    _flags[INVALID_FLAG]._name = "INVALID_FLAG";
+    _flags[INVALID_FLAG]._value = false;
+}
+
+
+/* Command */
+
+bool ChanCommandHandler::writeNoSignal(const CommandRequest & cmd)
+{
+    _fifo->_mutex.lock();
+    bool status = _fifo->_buffer.provide(cmd);
+    _fifo->_mutex.unlock();
+    return status;
+};
+
+bool ChanCommandHandler::write(const CommandRequest & cmd)
+{
+    bool status = writeNoSignal(cmd);
+
+    if (status) signal();
+
+    return status;
+};
+
+void ChanCommandHandler::unreference()
+{
+    
+    if (!_fifo)
+        return;
+    
+    if(_fifo->_thread)
+    {
+        _fifo->_thread->join();
+        delete _fifo->_thread;
+        _fifo->_thread = NULL;
+    }
+
+    delete _fifo;
+    _fifo = NULL;
+};
+
+
+/* Event */
+
+bool ChanEventHandler::provide(const EventRequest & evt)
+{
+    _fifo->_mutex.lock();
+    bool status = _fifo->_buffer.provide(evt);
+    _fifo->_mutex.unlock();
+    return status;
+};
+
+bool ChanEventHandler::writeNoSignal(const EventRequest & evt)
+{
+    bool status = true;
+    _fifo->_mutex.lock();
+
+    try
+    {
+        _fifo->_buffer.provider_start().mirror(evt);
+        _fifo->_buffer.provider_commit();
+    }
+    catch(...) //BufferFull & e
+    {
+        status = false;
+    }
+
+    _fifo->_mutex.unlock();
+    return status;
+};
+
+bool ChanEventHandler::write(const EventRequest & evt)
+{
+    bool status = writeNoSignal(evt);
+
+    if (status) signal();
+
+    return status;
+};
+
+void ChanEventHandler::unreference()
+{
+    
+    if (!_fifo)
+        return;
+    
+    if(_fifo->_thread)
+    {
+        _fifo->_thread->join();
+        delete _fifo->_thread;
+        _fifo->_thread = NULL;
+    }
+
+    delete _fifo;
+    _fifo = NULL;
+};
+
+const char * answerInfoToString(int answer_info)
+{
+    switch (answer_info)
+    {    
+        case Board::KhompPvt::CI_MESSAGE_BOX:
+            return "MessageBox";
+        case Board::KhompPvt::CI_HUMAN_ANSWER:
+            return "HumanAnswer";
+        case Board::KhompPvt::CI_ANSWERING_MACHINE:
+            return "AnsweringMachine";
+        case Board::KhompPvt::CI_CARRIER_MESSAGE:
+            return "CarrierMessage";
+        case Board::KhompPvt::CI_UNKNOWN:
+            return "Unknown";
+        case Board::KhompPvt::CI_FAX:
+            return "Fax";
+    }    
+
+    return NULL;
+}
+/******************************* Match functions ******************************/
+bool MatchExtension::canMatch(std::string & context, std::string & exten, 
+                              std::string & caller_id, bool match_more)
+{
+    if(!match_more)
+    {
+        return true;
+    }
+
+    size_t finished = exten.find('#');
+
+    if(finished != std::string::npos)
+    {
+        if(exten.size() <= 1)
+        {
+            DBG(FUNC, FMT("exten=%s size=%d") % exten % exten.size());
+            return true;
+        }
+
+        exten.erase(finished);
+        DBG(FUNC, FMT("match exact!!! exten=%s") % exten);
+        return false;
+    }
+
+    return true;
+
+/*
+    switch_xml_t xml = NULL;
+    switch_xml_t xcontext = NULL;
+    switch_regex_t *re;
+    int ovector[30];
+
+    if (switch_xml_locate("dialplan","context","name",context.c_str(),&xml,&xcontext, NULL,SWITCH_FALSE) == SWITCH_STATUS_SUCCESS)
+    {
+        switch_xml_t xexten = NULL;
+
+        if(!(xexten = switch_xml_child(xcontext,"extension")))
+        {
+            DBG(FUNC,"extension cannot match, returning");
+
+            if(xml)
+                switch_xml_free(xml); 
+
+            return false;
+        }
+
+        while(xexten)
+        {
+            switch_xml_t xcond = NULL;
+
+            for (xcond = switch_xml_child(xexten, "condition"); xcond; xcond = xcond->next)
+            {
+                std::string expression;
+
+                if (switch_xml_child(xcond, "condition")) 
+                { 
+                    LOG(ERROR,"Nested conditions are not allowed");
+                }  
+
+                switch_xml_t xexpression = switch_xml_child(xcond, "expression");
+
+                if ((xexpression = switch_xml_child(xcond, "expression"))) 
+                {
+                    expression = switch_str_nil(xexpression->txt);
+                }
+                else 
+                {
+                    expression =  switch_xml_attr_soft(xcond, "expression");
+                }  
+
+                if(expression.empty() || expression == "^(.*)$")
+                {                    
+                    //We're not gonna take it
+                    //No, we ain't gonna take it
+                    // We're not gonna take it anymore
+                    //
+                    continue;
+                }
+
+                int pm = -1; 
+                switch_status_t is_match = SWITCH_STATUS_FALSE;
+                is_match =  switch_regex_match_partial(exten.c_str(),expression.c_str(),&pm);
+
+                if(is_match == SWITCH_STATUS_SUCCESS)
+                {
+                    if(match_more)
+                    {
+                        if(pm == 1)
+                        {
+                            switch_xml_free(xml);
+                            return true;
+                        }
+                    }
+                    else
+                    {
+                        switch_xml_free(xml);
+                        return true;
+                    }
+                }
+                else
+                {
+                    // not match
+                }
+            }            
+
+            xexten = xexten->next;
+        }
+    }
+    else
+    {
+        DBG(FUNC,"context cannot match, returning");
+    }
+
+    if(xml)
+        switch_xml_free(xml); 
+
+    return false;
+*/
+}
+
+
+MatchExtension::MatchType MatchExtension::matchExtension(
+                                        std::string & context, 
+                                        std::string & exten,
+                                        std::string & callerid, 
+                                        bool match_only)
+{
+    if(!canMatch(context,exten,callerid))
+    {
+        DBG(FUNC, "context/extension cannot match");
+        return MATCH_NONE;
+    }
+
+    if(match_only)
+    {
+        DBG(FUNC, "for now we want know if it matches...");
+        return MATCH_MORE;
+    }
+
+    if(!canMatch(context,exten,callerid,true))
+    {
+        DBG(FUNC, "it match exact!");
+        return MATCH_EXACT;
+    }
+
+    return MATCH_MORE;
+}
+
+MatchExtension::MatchType MatchExtension::findExtension(
+                                        std::string & ref_extension,
+                                        std::string & ref_context,
+                                        ContextListType & contexts,
+                                        std::string & extension,
+                                        std::string & caller_id,
+                                        bool default_ctx,
+                                        bool default_ext)
+{
+    ExtenListType extens;
+
+    if(!extension.empty())
+    {
+        extens.push_back(extension);
+    }
+
+    if(default_ext)
+    {
+        if (extension != "s")
+        {
+            extens.push_back("s");
+        }
+
+        extens.push_back("i");
+    }
+
+    if(default_ctx)
+    {
+        contexts.push_back("default");
+    }
+
+    for(ContextListType::iterator itc = contexts.begin(); itc != contexts.end(); itc++)
+    {
+        for(ExtenListType::iterator ite = extens.begin(); ite != extens.end(); ite++)
+        {
+            DBG(FUNC, FMT("trying context '%s' with exten '%s'...") % *itc % *ite);
+            ref_context   = *itc;
+            ref_extension = *ite;
+
+            MatchType m = matchExtension(ref_context, ref_extension, caller_id, false);
+
+            switch (m)
+            {
+                case MATCH_NONE:
+                    continue;
+
+                case MATCH_MORE:
+                case MATCH_EXACT:
+                {
+                    //ref_context = *itc;
+                    //ref_extension = *ite;
+
+                    DBG(FUNC, ".... can match context/extension (some way)!");
+
+                    return m;
+                }
+            }
+        }
+    }
+            
+    ref_context.clear();
+    ref_extension.clear();
+
+    DBG(FUNC, D("... no context/extension found!"));
+    return MATCH_NONE;
+}
+
+/******************************** Kommuter ************************************/
+bool Kommuter::stop()
+{
+    if(_kwtd_timer_on)
+    {
+        Globals::global_timer->del(_kwtd_timer_index);
+        _kwtd_timer_on = false;
+    }
+
+    /* stop all watches */
+    if (Opt::_kommuter_activation == "auto")
+    {
+        for (int kommuter = 0 ; kommuter < _kommuter_count ; kommuter++)
+        {
+            try
+            {
+                Globals::k3lapi.command(-1, kommuter, CM_STOP_WATCHDOG);
+                LOG(MESSAGE, FMT("kommuter device (%d) was stoped at finalize_module().") % kommuter);
+            }
+            catch(K3LAPI::failed_command & e)
+            {
+                LOG(ERROR, FMT("could not stop the Kommuter device (%d) at finalize_module().") % kommuter);
+            }
+
+        }
+    }
+
+    return true;
+}
+
+bool Kommuter::initialize(K3L_EVENT *e)
+{
+    /* get total of kommuter devices */
+    _kommuter_count = e->AddInfo;
+   
+    if(Opt::_kommuter_activation == "manual")
+    {
+        if (_kommuter_count > 0)
+        {
+            LOG(WARNING, "Kommuter devices were found on your system, but activation is set to manual. To activate this devices use the command 'khomp kommuter on'.");
+        }
+
+        return true;
+    }
+
+    if (_kommuter_count > 0) 
+    {    
+        bool start_timer = false;
+        int timeout = Opt::_kommuter_timeout;
+
+        std::string param = STG(FMT("timeout=%d") % timeout);
+
+        for (int kommuter = 0; kommuter < _kommuter_count; kommuter++)
+        {   
+            try
+            {
+                Globals::k3lapi.command(-1, kommuter, CM_START_WATCHDOG, param.c_str());
+                start_timer = true;
+            }
+            catch(K3LAPI::failed_command & e)
+            {
+                switch(e.rc)
+                {
+                case ksInvalidParams:
+                    LOG(ERROR, FMT("invalid timeout '%d' for Kommuter device '%d' timeout. Mininum is 0, maximum is 255.")
+                                % timeout % kommuter);
+                    break;
+                default:
+                    LOG(ERROR, FMT("could not start the kommuter device number '%d'.") % kommuter);
+                    break;
+
+                }
+            }
+            catch(...)
+            {
+                LOG(ERROR, FMT("could not start the kommuter device number '%d'.") % kommuter);
+            }
+        }
+
+        if(timeout == 0)
+        {    
+            DBG(FUNC, D("kommuter watchdog timer not created because timeout is 0."));
+            return true;
+        }    
+
+        if (start_timer)
+        {    
+            if (!Globals::global_timer)
+            {    
+                LOG(ERROR, D("error creating the timer for kommuter."));
+            }
+            else
+            {
+                _kwtd_timer_index = Globals::global_timer->add((timeout < 5 ? (timeout*500) : 2000), &wtdKickTimer);
+                _kwtd_timer_on = true;
+
+                DBG(FUNC, D("kommuter watchdog timer created and started."));
+            }
+        }
+    }
+    else
+    {
+        DBG(FUNC, D("no kommuter devices were found on system."));
+    }
+ 
+    return true;
+}
+
+void Kommuter::wtdKickTimer(void *)
+{
+    try
+    {
+        bool restart_timer = false;
+
+        for (int kommuter = 0; kommuter < Board::kommuter._kommuter_count; kommuter++)
+        {
+            try
+            {
+                Globals::k3lapi.command(-1, kommuter, CM_NOTIFY_WATCHDOG);
+                restart_timer = true;
+                DBG(FUNC, D("Kommuter device (%d) notified.") % kommuter);
+            }
+            catch(K3LAPI::failed_command & e)
+            {
+                switch(e.rc)
+                {
+                    case ksInvalidState:
+                        LOG(ERROR, FMT("Kommuter device '%d' was not initialized.") % kommuter);
+                        break;
+                    case ksNotAvailable:
+                        LOG(ERROR, FMT("Kommuter device '%d' not found.") % kommuter);
+                        break;
+                    case ksFail:
+                        LOG(ERROR, FMT("Kommuter notify command has failed for device '%d'.") % kommuter);
+                        break;
+                    default:
+                        LOG(ERROR, FMT("Kommuter device '%d' could not be notified for some unknow reason.") % kommuter);
+                        break;
+                }
+            }
+        }
+
+        if(restart_timer)
+        {
+            Globals::global_timer->restart( Board::kommuter._kwtd_timer_index, true );
+            DBG(FUNC, D("Kommuter timer restarted."));
+        }
+    }
+    catch (...)
+    {
+        return;
+    }
+}
+
diff --git a/src/mod/endpoints/mod_khomp/support/config_defaults.cpp b/src/mod/endpoints/mod_khomp/support/config_defaults.cpp
new file mode 100644
index 0000000000..9cf809eee2
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/support/config_defaults.cpp
@@ -0,0 +1,50 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <config_defaults.hpp>
+
+/* boolean value */
+Restriction::Pair booleanValue[3] =
+{
+    {    "Ativado",  "true" },
+    { "Desativado", "false" },
+    {        NULL ,   NULL  },
+};
diff --git a/src/mod/endpoints/mod_khomp/support/config_defaults.hpp b/src/mod/endpoints/mod_khomp/support/config_defaults.hpp
new file mode 100644
index 0000000000..b3b77cfe8d
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/support/config_defaults.hpp
@@ -0,0 +1,75 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <configurator/restriction.hpp>
+
+#ifndef _CONFIG_DEFAULTS_HPP_
+#define _CONFIG_DEFAULTS_HPP_
+
+/* default khomp config directory */
+#define KHOMP_CONFIG_DIR "/etc/khomp/config"
+
+/* define util macro for text conversion */
+#define CONV(s) \
+    encoder::recode_env(encoder::C_ISO88591, s)
+
+/* define another util macro for text conversion */
+#define CONVU(s) \
+    encoder::recode_env(encoder::C_UTF8, s)
+
+/* shortcut */
+#define K(x) Restriction::K_##x
+#define N(x) Restriction::N_##x
+#define B(x) Restriction::B_##x
+
+/* boolean value */
+extern Restriction::Pair booleanValue[3];
+
+/* nasty shortcuts */
+#define BOOLEAN_VALUE        booleanValue[0], booleanValue[1], booleanValue[2]
+
+#define BOOLEAN_ALWAYS_TRUE  booleanValue[0], booleanValue[2]
+#define BOOLEAN_ALWAYS_FALSE booleanValue[1], booleanValue[2]
+
+#define BOOLEAN_TRUE         booleanValue[0].pretty
+#define BOOLEAN_FALSE        booleanValue[1].pretty
+
+#endif /* _CONFIG_DEFAULTS_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/support/klog-config.cpp b/src/mod/endpoints/mod_khomp/support/klog-config.cpp
new file mode 100644
index 0000000000..d2d743a126
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/support/klog-config.cpp
@@ -0,0 +1,122 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <config_defaults.hpp>
+
+#include <support/klog-config.hpp>
+
+Logfile::Logfile()
+: Configfile("Options", "Log Options")
+{
+    _filename = STG(FMT("%s/klog.cfg") % KHOMP_CONFIG_DIR);
+
+    // necessario?
+    add(&_logoptions);
+
+    /* Obtain configuration, if file exists. */
+    _good = obtain();
+}
+
+Logfile::~Logfile()
+{
+    /* nothing for now */
+};
+
+bool Logfile::select(Section ** ptr, std::string str)
+{
+    // default section, needed for API compliance.
+    if (str == "")
+        *ptr = &_logoptions;
+    else
+    {
+        try
+        {
+            *ptr = _logoptions.section_find(str);
+        }
+        catch (Section::not_found e)
+        {
+            _errors.push_back(STG(FMT("unsupported section '%s', ignoring!") % str));
+        }
+    }
+
+    return (*ptr != 0);
+};
+
+bool Logfile::serialize(std::ofstream &fd)
+{
+    typedef std::vector < std::string > StrList;
+
+    StrList vec;
+
+    vec.push_back("KLogger");
+    vec.push_back("K3L");
+    vec.push_back("IntfK3L");
+    vec.push_back("IntfK3L_C");
+    vec.push_back("ISDN");
+    vec.push_back("R2");
+    vec.push_back("Firmware");
+    vec.push_back("Audio");
+    vec.push_back("SS7");
+    vec.push_back("SIP");
+    vec.push_back("GSM");
+    vec.push_back("Timer");
+
+    for (StrList::iterator i = vec.begin(); i != vec.end(); i++)
+    {
+        fd << "[" << (*i) << "]" << std::endl;
+
+        try
+        {
+            Section * sec = _logoptions.section_find(*i);
+            recurse(fd, sec);
+        }
+        catch (Section::not_found e)
+        {
+            _errors.push_back(STG(FMT("unable to find section '%s' in memory, ignoring!") % (*i)));
+        }
+
+        fd << std::endl;
+    }
+
+    fd << "# precisa ter um caracter sobrando no final!" << std::endl;
+
+    return true;
+}
diff --git a/src/mod/endpoints/mod_khomp/support/klog-config.hpp b/src/mod/endpoints/mod_khomp/support/klog-config.hpp
new file mode 100644
index 0000000000..6e3e75a092
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/support/klog-config.hpp
@@ -0,0 +1,69 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#pragma GCC visibility push(default)
+#include <stdexcept>
+#pragma GCC visibility pop
+
+#include <format.hpp>
+
+#include <configurator/configfile.hpp>
+
+#include <support/klog-options.hpp>
+
+#ifndef _KLOG_CONFIG_HPP_
+#define _KLOG_CONFIG_HPP_
+
+struct Logfile: public Configfile
+{
+    Logfile();
+    ~Logfile();
+
+    bool select(Section **, std::string str = "");
+    bool serialize(std::ofstream &);
+
+    Section & root() { return _logoptions; };
+
+  protected:
+    LogOptions _logoptions;
+};
+
+#endif /* _KLOG_CONFIG_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/support/klog-options.cpp b/src/mod/endpoints/mod_khomp/support/klog-options.cpp
new file mode 100644
index 0000000000..3cb7e3e6fd
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/support/klog-options.cpp
@@ -0,0 +1,158 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <config_defaults.hpp>
+
+#include <support/klog-options.hpp>
+
+LogOptions::KLogger::KLogger()
+: Section("KLogger", "KLogger", false)
+{
+    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("FullLog", "Log everything", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+};
+
+LogOptions::K3L::K3L()
+: Section("K3L", "K3L", false)
+{
+    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("CallProgress", "Call Progress events", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("CallAnalyzer", "Call Analyzer events", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("CadenceRecog", "Cadences recognized", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("CallControl",  "Call control", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("Fax",          "Fax stack", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+};
+
+LogOptions::IntfK3L::IntfK3L()
+: Section("IntfK3L", "IntfK3L", false)
+{
+    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("AudioEvent", "Audio events", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+};
+
+LogOptions::IntfK3L_C::IntfK3L_C()
+: Section("IntfK3L_C", "IntfK3L_C", false)
+{
+    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("AudioEvent", "Audio events", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+};
+
+LogOptions::ISDN::ISDN()
+: Section("ISDN", "ISDN", false)
+{
+    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("Lapd", "LAPD layer log", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("Q931", "Q.931 layer log", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+};
+
+LogOptions::R2::R2()
+: Section("R2", "R2", false)
+{
+    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("Signaling", "R2 Signaling log", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("States", "R2 States Log", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+};
+
+LogOptions::Firmware::Firmware()
+: Section("Firmware", "Firmware", false)
+{
+    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("FwHdlcMsg", "HDLC messages", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("FwLinkErrors", "Link errors", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("FwModemChar", "MODEM char TX/RX", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+};
+
+LogOptions::Audio::Audio()
+: Section("Audio", "Audio", false)
+{
+    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("DSP", "DSP audio messages", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("K3L", "K3L audio messages", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+};
+
+LogOptions::SS7::SS7()
+: Section("SS7", "SS7", false)
+{
+    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("MTP2States", "MTP2 States", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("MTP2Debug", "MTP2 Debug", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("MTP3Management", "MTP3 Management", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("MTP3Test", "MTP3 Test", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("MTP3Debug", "MTP3 Debug", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("ISUPStates", "ISUP States", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("ISUPDebug", "ISUP Debug", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+    add(Option("ISUPMessages", "ISUP Messages", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+};
+
+LogOptions::SIP::SIP()
+: Section("SIP", "SIP", false)
+{
+    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+};
+
+LogOptions::GSM::GSM()
+: Section("GSM", "GSM", false)
+{
+    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+};
+
+LogOptions::Timer::Timer()
+: Section("Timer", "Timer", false)
+{
+    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
+};
+
+LogOptions::LogOptions()
+: Section("Options", "KLog Options", false)
+{
+    add(&_klogger);
+    add(&_k3l);
+    add(&_intfk3l);
+    add(&_intfk3lc);
+    add(&_isdn);
+    add(&_r2);
+    add(&_firmware);
+    add(&_audio);
+    add(&_ss7);
+    add(&_sip);
+    add(&_gsm);
+    add(&_timer);
+};
diff --git a/src/mod/endpoints/mod_khomp/support/klog-options.hpp b/src/mod/endpoints/mod_khomp/support/klog-options.hpp
new file mode 100644
index 0000000000..b700947ea4
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/support/klog-options.hpp
@@ -0,0 +1,81 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  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.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <types.hpp>
+
+#include <configurator/option.hpp>
+#include <configurator/section.hpp>
+
+#ifndef _KLOG_OPTIONS_HPP_
+#define _KLOG_OPTIONS_HPP_
+
+struct LogOptions: public Section
+{
+    struct KLogger:   public Section { KLogger();   };
+    struct K3L:       public Section { K3L();       };
+    struct IntfK3L:   public Section { IntfK3L();   };
+    struct IntfK3L_C: public Section { IntfK3L_C(); };
+    struct ISDN:      public Section { ISDN();      };
+    struct R2:        public Section { R2();        };
+    struct Firmware:  public Section { Firmware();  };
+    struct Audio:     public Section { Audio();     };
+    struct SS7:       public Section { SS7();       };
+    struct SIP:       public Section { SIP();       };
+    struct GSM:       public Section { GSM();     };
+    struct Timer:     public Section { Timer();     };
+
+    LogOptions();
+
+    KLogger     _klogger;
+    K3L         _k3l;
+    IntfK3L     _intfk3l;
+    IntfK3L_C   _intfk3lc;
+    ISDN        _isdn;
+    R2          _r2;
+    Firmware    _firmware;
+    Audio       _audio;
+    SS7         _ss7;
+    SIP         _sip;
+    GSM         _gsm;
+    Timer       _timer;
+};
+
+#endif /* _KLOG_OPTIONS_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/tools/getversion.sh b/src/mod/endpoints/mod_khomp/tools/getversion.sh
new file mode 100755
index 0000000000..d22bf2b231
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/tools/getversion.sh
@@ -0,0 +1,51 @@
+#/bin/bash
+
+###############################################################################
+#   KHOMP generic endpoint/channel library.
+#   Copyright (C) 2007-2010 Khomp Ind. & Com.
+
+# 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.
+
+# Alternatively, the contents of this file may be used under the terms of the
+# "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+# case the provisions of "LGPL License" are applicable instead of those above.
+
+# If you wish to allow use of your version of this file only under the terms of
+# the LGPL License and not to allow others to use your version of this file
+# under the MPL, indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by the LGPL
+# License. If you do not delete the provisions above, a recipient may use your
+# version of this file under either the MPL or the LGPL License.
+
+# The LGPL header follows below:
+
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License as published by the Free Software Foundation; either
+#   version 2.1 of the License, or (at your option) any later version.
+
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this library; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+###############################################################################
+
+version=`grep "#define $1" $2/src/include/switch_version.h | sed -r "s/#define\s+$1.*\"(.*)\"/\1/g"`
+
+if [ "$version" == "head" ]
+then
+    echo -1
+else
+    echo $version
+fi
diff --git a/src/mod/endpoints/mod_loopback/mod_loopback.c b/src/mod/endpoints/mod_loopback/mod_loopback.c
index ab4db6a1b0..7c69ff252e 100644
--- a/src/mod/endpoints/mod_loopback/mod_loopback.c
+++ b/src/mod/endpoints/mod_loopback/mod_loopback.c
@@ -53,7 +53,8 @@ typedef enum {
 	TFLAG_BOWOUT = (1 << 5),
 	TFLAG_BLEG = (1 << 6),
 	TFLAG_APP = (1 << 7),
-	TFLAG_BOWOUT_USED = (1 << 8)
+	TFLAG_RUNNING_APP = (1 << 8),
+	TFLAG_BOWOUT_USED = (1 << 9)
 } TFLAGS;
 
 struct private_object {
@@ -321,11 +322,16 @@ static switch_status_t channel_on_routing(switch_core_session_t *session)
 
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
 	
+	if (switch_test_flag(tech_pvt, TFLAG_RUNNING_APP)) {
+		switch_clear_flag(tech_pvt, TFLAG_RUNNING_APP);
+	}
+
 	if (switch_test_flag(tech_pvt, TFLAG_APP) && !switch_test_flag(tech_pvt, TFLAG_OUTBOUND) && 
 		(app = switch_channel_get_variable(channel, "loopback_app"))) {
 		switch_caller_extension_t *extension = NULL;
 
 		switch_clear_flag(tech_pvt, TFLAG_APP);
+		switch_set_flag(tech_pvt, TFLAG_RUNNING_APP);
 
 		arg = switch_channel_get_variable(channel, "loopback_app_arg");
 		extension = switch_caller_extension_new(session, app, app);
@@ -711,7 +717,8 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
 {
 	switch_channel_t *channel;
 	private_t *tech_pvt;
-
+	int done = 1;
+	
 	channel = switch_core_session_get_channel(session);
 	switch_assert(channel != NULL);
 
@@ -729,6 +736,11 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
 			switch_channel_mark_pre_answered(tech_pvt->other_channel);
 		}
 		break;
+	case SWITCH_MESSAGE_INDICATE_RINGING:
+		if (tech_pvt->other_channel && !switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) {
+			switch_channel_mark_ring_ready(tech_pvt->other_channel);
+		}
+		break;
 	case SWITCH_MESSAGE_INDICATE_BRIDGE:
 		{
 			switch_set_flag_locked(tech_pvt, TFLAG_BRIDGE);
@@ -740,6 +752,7 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
 		}
 		break;
 	default:
+		done = 0;
 		break;
 	}
 
@@ -750,6 +763,8 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
 		{
 			void *pop;
 
+			done = 1;
+
 			while (switch_queue_trypop(tech_pvt->frame_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
 				switch_frame_t *frame = (switch_frame_t *) pop;
 				switch_frame_free(&frame);
@@ -769,6 +784,18 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
 	}
 
 
+	if (!done && tech_pvt->other_session && switch_test_flag(tech_pvt, TFLAG_RUNNING_APP)) {
+		switch_status_t r = SWITCH_STATUS_FALSE;
+		switch_core_session_t *other_session;
+		
+		if (switch_core_session_get_partner(tech_pvt->other_session, &other_session) == SWITCH_STATUS_SUCCESS) {
+			r = switch_core_session_receive_message(other_session, msg);
+			switch_core_session_rwunlock(other_session);
+		}
+		
+		return r;
+	}
+	
 	return SWITCH_STATUS_SUCCESS;
 }
 
diff --git a/src/mod/endpoints/mod_skypopen/Makefile.am b/src/mod/endpoints/mod_skypopen/Makefile.am
index d696fae783..b572b58e20 100644
--- a/src/mod/endpoints/mod_skypopen/Makefile.am
+++ b/src/mod/endpoints/mod_skypopen/Makefile.am
@@ -2,6 +2,6 @@ include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_skypopen
 mod_LTLIBRARIES = mod_skypopen.la
 mod_skypopen_la_SOURCES  = mod_skypopen.c skypopen_protocol.c
-mod_skypopen_la_CFLAGS   = $(AM_CFLAGS) -DSKYPOPEN_SVN_VERSION=\"`git describe`\" -I../../../../libs/spandsp/src -I../../../..//libs/tiff-3.8.2/libtiff
+mod_skypopen_la_CFLAGS   = $(AM_CFLAGS) -DSKYPOPEN_C_VER=\"`git log -1 --format="%h" skypopen_protocol.c`\" -DMODSKYPOPEN_C_VER=\"`git log -1 --format="%h" mod_skypopen.c`\" -I../../../../libs/spandsp/src -I../../../..//libs/tiff-3.8.2/libtiff
 mod_skypopen_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_skypopen_la_LDFLAGS  = -L../../../../libs/spandsp/src -avoid-version -module -no-undefined -shared -lX11 -lspandsp
diff --git a/src/mod/endpoints/mod_skypopen/alsa/dummy.c b/src/mod/endpoints/mod_skypopen/alsa/dummy.c
index 6b8c86f245..1a369dcc4f 100644
--- a/src/mod/endpoints/mod_skypopen/alsa/dummy.c
+++ b/src/mod/endpoints/mod_skypopen/alsa/dummy.c
@@ -18,7 +18,6 @@
  *
  */
 
-//#include <sound/driver.h>		//giova
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
@@ -67,7 +66,7 @@ MODULE_SUPPORTED_DEVICE("{{ALSA,Dummy soundcard}}");
 #define USE_CHANNELS_MAX 	2
 #endif
 #ifndef USE_PERIODS_MIN
-#define USE_PERIODS_MIN 	1
+#define USE_PERIODS_MIN 	10
 #endif
 #ifndef USE_PERIODS_MAX
 #define USE_PERIODS_MAX 	1024
@@ -98,17 +97,17 @@ module_param_array(pcm_substreams, int, NULL, 0444);
 MODULE_PARM_DESC(pcm_substreams, "PCM substreams # (1-64) for dummy driver.");
 
 static struct platform_device *devices[SNDRV_CARDS];
-static struct timer_list giovatimer;
-static int giovastarted = 0;
-static int giovaindex = 0;
-static spinlock_t giovalock;
-struct giovadpcm {
+static struct timer_list dummytimer;
+static int dummystarted = 0;
+static int dummyindex = 0;
+static spinlock_t dummylock;
+struct dummydpcm {
 	struct snd_pcm_substream *substream;
 	struct snd_dummy_pcm *dpcm;
 	int started;
 	int elapsed;
 };
-static struct giovadpcm giovadpcms[MAX_PCM_SUBSTREAMS];
+static struct dummydpcm dummydpcms[MAX_PCM_SUBSTREAMS];
 
 #define MIXER_ADDR_MASTER	0
 #define MIXER_ADDR_LINE		1
@@ -145,19 +144,19 @@ static inline void snd_card_dummy_pcm_timer_start(struct snd_dummy_pcm *dpcm)
 	int i;
 	int found = 0;
 
-	for (i = 0; i < giovaindex + 1; i++) {
-		if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
-			printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm);
-		}
+	for (i = 0; i < dummyindex + 1; i++) {
+		//if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
+			//printk("dummy, %s:%d, i=%d, dummyindex=%d dpcm=%p\n", __FILE__, __LINE__, i, dummyindex, dpcm);
+		//}
 
-		if (giovadpcms[i].dpcm == dpcm) {
-			giovadpcms[i].started = 1;
+		if (dummydpcms[i].dpcm == dpcm) {
+			dummydpcms[i].started = 1;
 			found = 1;
 		}
 	}
-	if (!found) {
-		printk("skypopen: start, NOT found?\n");
-	}
+	//if (!found) {
+		//printk("skypopen: start, NOT found?\n");
+	//}
 }
 
 static inline void snd_card_dummy_pcm_timer_stop(struct snd_dummy_pcm *dpcm)
@@ -165,14 +164,14 @@ static inline void snd_card_dummy_pcm_timer_stop(struct snd_dummy_pcm *dpcm)
 	int i;
 	int found = 0;
 
-	for (i = 0; i < giovaindex + 1; i++) {
+	for (i = 0; i < dummyindex + 1; i++) {
 
-		if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
-			printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm);
-		}
-		if (giovadpcms[i].dpcm == dpcm) {
-			giovadpcms[i].started = 0;
-			giovadpcms[i].elapsed = 0;
+		//if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
+			//printk("dummy, %s:%d, i=%d, dummyindex=%d dpcm=%p\n", __FILE__, __LINE__, i, dummyindex, dpcm);
+		//}
+		if (dummydpcms[i].dpcm == dpcm) {
+			dummydpcms[i].started = 0;
+			dummydpcms[i].elapsed = 0;
 			found = 1;
 		}
 	}
@@ -187,7 +186,7 @@ static int snd_card_dummy_pcm_trigger(struct snd_pcm_substream *substream, int c
 	struct snd_dummy_pcm *dpcm = runtime->private_data;
 	int err = 0;
 
-	spin_lock_bh(&giovalock);
+	spin_lock_bh(&dummylock);
 	switch (cmd) {
 	case SNDRV_PCM_TRIGGER_START:
 	case SNDRV_PCM_TRIGGER_RESUME:
@@ -201,7 +200,7 @@ static int snd_card_dummy_pcm_trigger(struct snd_pcm_substream *substream, int c
 		err = -EINVAL;
 		break;
 	}
-	spin_unlock_bh(&giovalock);
+	spin_unlock_bh(&dummylock);
 	return 0;
 }
 
@@ -233,22 +232,26 @@ static void snd_card_dummy_pcm_timer_function(unsigned long data)
 	int i;
 
 
-	giovatimer.expires = 1 + jiffies;
-	add_timer(&giovatimer);
+	dummytimer.expires = 1 + jiffies;
+	add_timer(&dummytimer);
 
-	//spin_lock_bh(&giovalock);
-	for (i = 0; i < giovaindex + 1; i++) {
+	//spin_lock_bh(&dummylock);
+	for (i = 0; i < dummyindex + 1; i++) {
 
-		if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
-			printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm);
+#if 0
+		if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
+			printk("dummy, %s:%d, i=%d, dummyindex=%d dpcm=%p\n", __FILE__, __LINE__, i, dummyindex, dpcm);
 		}
-		if (giovadpcms[i].started != 1)
+#endif
+		if (dummydpcms[i].started != 1)
 			continue;
-		dpcm = giovadpcms[i].dpcm;
+		dpcm = dummydpcms[i].dpcm;
+#if 0
 		if (dpcm == NULL) {
-			printk("giova: timer_func %d %d NULL: continue\n", __LINE__, i);
+			printk("dummy: timer_func %d %d NULL: continue\n", __LINE__, i);
 			continue;
 		}
+#endif
 		//spin_lock_bh(&dpcm->lock);
 		dpcm->pcm_irq_pos += dpcm->pcm_bps * 1;
 		dpcm->pcm_buf_pos += dpcm->pcm_bps * 1;
@@ -257,27 +260,31 @@ static void snd_card_dummy_pcm_timer_function(unsigned long data)
 			dpcm->pcm_irq_pos %= dpcm->pcm_period_size * dpcm->pcm_hz;
 			//spin_unlock_bh(&dpcm->lock);
 			//snd_pcm_period_elapsed(dpcm->substream);
-			giovadpcms[i].elapsed = 1;
+			dummydpcms[i].elapsed = 1;
 		} else {
 			//spin_unlock_bh(&dpcm->lock);
 		}
 	}
-	//spin_unlock_bh(&giovalock);
-	for (i = 0; i < giovaindex + 1; i++) {
+	//spin_unlock_bh(&dummylock);
+	for (i = 0; i < dummyindex + 1; i++) {
 
-		if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
-			printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm);
+#if 0
+		if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
+			printk("dummy, %s:%d, i=%d, dummyindex=%d dpcm=%p\n", __FILE__, __LINE__, i, dummyindex, dpcm);
 		}
-		if (giovadpcms[i].started != 1)
+#endif
+		if (dummydpcms[i].started != 1)
 			continue;
-		dpcm = giovadpcms[i].dpcm;
+		dpcm = dummydpcms[i].dpcm;
+#if 0
 		if (dpcm == NULL) {
-			printk("giova: timer_func %d %d NULL: continue\n", __LINE__, i);
+			printk("dummy: timer_func %d %d NULL: continue\n", __LINE__, i);
 			continue;
 		}
-		if (giovadpcms[i].elapsed){
+#endif
+		if (dummydpcms[i].elapsed){
 			snd_pcm_period_elapsed(dpcm->substream);
-			giovadpcms[i].elapsed = 0;
+			dummydpcms[i].elapsed = 0;
 		}
 	}
 
@@ -294,6 +301,7 @@ static snd_pcm_uframes_t snd_card_dummy_pcm_pointer(struct snd_pcm_substream *su
 
 static struct snd_pcm_hardware snd_card_dummy_playback = {
 	.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_MMAP_VALID),
+	//.info = (SNDRV_PCM_INFO_INTERLEAVED),
 	.formats = USE_FORMATS,
 	.rates = USE_RATE,
 	.rate_min = USE_RATE_MIN,
@@ -301,7 +309,8 @@ static struct snd_pcm_hardware snd_card_dummy_playback = {
 	.channels_min = USE_CHANNELS_MIN,
 	.channels_max = USE_CHANNELS_MAX,
 	.buffer_bytes_max = MAX_BUFFER_SIZE,
-	.period_bytes_min = 256,
+	//.period_bytes_min = 256,
+	.period_bytes_min = 2048,
 	.period_bytes_max = MAX_PERIOD_SIZE,
 	.periods_min = USE_PERIODS_MIN,
 	.periods_max = USE_PERIODS_MAX,
@@ -310,6 +319,7 @@ static struct snd_pcm_hardware snd_card_dummy_playback = {
 
 static struct snd_pcm_hardware snd_card_dummy_capture = {
 	.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_MMAP_VALID),
+	//.info = (SNDRV_PCM_INFO_INTERLEAVED),
 	.formats = USE_FORMATS,
 	.rates = USE_RATE,
 	.rate_min = USE_RATE_MIN,
@@ -317,7 +327,8 @@ static struct snd_pcm_hardware snd_card_dummy_capture = {
 	.channels_min = USE_CHANNELS_MIN,
 	.channels_max = USE_CHANNELS_MAX,
 	.buffer_bytes_max = MAX_BUFFER_SIZE,
-	.period_bytes_min = 256,
+	//.period_bytes_min = 256,
+	.period_bytes_min = 2048,
 	.period_bytes_max = MAX_PERIOD_SIZE,
 	.periods_min = USE_PERIODS_MIN,
 	.periods_max = USE_PERIODS_MAX,
@@ -328,21 +339,21 @@ static void snd_card_dummy_runtime_free(struct snd_pcm_runtime *runtime)
 {
 	int i;
 
-	spin_lock_bh(&giovalock);
+	spin_lock_bh(&dummylock);
 
-	for (i = 0; i < giovaindex; i++) {
+	for (i = 0; i < dummyindex; i++) {
 
-		if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
-			printk("giova, %s:%d, i=%d, giovaindex=%d \n", __FILE__, __LINE__, i, giovaindex);
+		if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
+			printk("dummy, %s:%d, i=%d, dummyindex=%d \n", __FILE__, __LINE__, i, dummyindex);
 		}
-		if ((giovadpcms[i].dpcm == runtime->private_data)) {
-			giovadpcms[i].started = 0;
-			giovadpcms[i].elapsed = 0;
+		if ((dummydpcms[i].dpcm == runtime->private_data)) {
+			dummydpcms[i].started = 0;
+			dummydpcms[i].elapsed = 0;
 		} else {
 		}
 	}
 
-	spin_unlock_bh(&giovalock);
+	spin_unlock_bh(&dummylock);
 	kfree(runtime->private_data);
 }
 
@@ -364,20 +375,20 @@ static struct snd_dummy_pcm *new_pcm_stream(struct snd_pcm_substream *substream)
 
 	dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);
 	if (!dpcm) {
-		printk("giova, %s:%d, giovaindex=%d NO MEMORY!!!!\n", __FILE__, __LINE__, giovaindex);
+		printk("dummy, %s:%d, dummyindex=%d NO MEMORY!!!!\n", __FILE__, __LINE__, dummyindex);
 		return dpcm;
 	}
 	//init_timer(&dpcm->timer);
 	//spin_lock_init(&dpcm->lock);
 	dpcm->substream = substream;
 
-	spin_lock_bh(&giovalock);
-	for (i = 0; i < giovaindex; i++) {
+	spin_lock_bh(&dummylock);
+	for (i = 0; i < dummyindex; i++) {
 
-		if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
-			printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm);
-		}
-		if ((giovadpcms[i].substream == substream)) {
+		//if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
+			//printk("dummy, %s:%d, i=%d, dummyindex=%d dpcm=%p\n", __FILE__, __LINE__, i, dummyindex, dpcm);
+		//}
+		if ((dummydpcms[i].substream == substream)) {
 			found = 1;
 			break;
 		}
@@ -386,32 +397,32 @@ static struct snd_dummy_pcm *new_pcm_stream(struct snd_pcm_substream *substream)
 
 	if (!found) {
 
-		giovadpcms[giovaindex].substream = substream;
-		giovaindex++;
+		dummydpcms[dummyindex].substream = substream;
+		dummyindex++;
 	}
 
 
 
 	found = 0;
-	for (i = 0; i < giovaindex; i++) {
+	for (i = 0; i < dummyindex; i++) {
 
-		if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
-			printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm);
-		}
-		if (giovadpcms[i].substream == substream) {
-			giovadpcms[i].dpcm = dpcm;
-			giovadpcms[i].started = 0;
-			giovadpcms[i].elapsed = 0;
+		//if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
+			//printk("dummy, %s:%d, i=%d, dummyindex=%d dpcm=%p\n", __FILE__, __LINE__, i, dummyindex, dpcm);
+		//}
+		if (dummydpcms[i].substream == substream) {
+			dummydpcms[i].dpcm = dpcm;
+			dummydpcms[i].started = 0;
+			dummydpcms[i].elapsed = 0;
 			found = 1;
 			break;
 		}
 
 	}
 
-	spin_unlock_bh(&giovalock);
-	if (!found) {
-		printk("skypopen giovaindex=%d NOT found????\n", giovaindex);
-	}
+	spin_unlock_bh(&dummylock);
+	//if (!found) {
+		//printk("skypopen dummyindex=%d NOT found????\n", dummyindex);
+	//}
 	return dpcm;
 }
 
@@ -542,7 +553,7 @@ static int snd_dummy_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_el
 	int addr = kcontrol->private_value;
 
 	if (in_irq())
-		printk("giova: line %d we are in HARDWARE IRQ\n", __LINE__);
+		printk("dummy: line %d we are in HARDWARE IRQ\n", __LINE__);
 	spin_lock_bh(&dummy->mixer_lock);
 	ucontrol->value.integer.value[0] = dummy->mixer_volume[addr][0];
 	ucontrol->value.integer.value[1] = dummy->mixer_volume[addr][1];
@@ -557,7 +568,7 @@ static int snd_dummy_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el
 	int left, right;
 
 	if (in_irq())
-		printk("giova: line %d we are in HARDWARE IRQ\n", __LINE__);
+		printk("dummy: line %d we are in HARDWARE IRQ\n", __LINE__);
 	left = ucontrol->value.integer.value[0];
 	if (left < -50)
 		left = -50;
@@ -592,7 +603,7 @@ static int snd_dummy_capsrc_get(struct snd_kcontrol *kcontrol, struct snd_ctl_el
 	int addr = kcontrol->private_value;
 
 	if (in_irq())
-		printk("giova: line %d we are in HARDWARE IRQ\n", __LINE__);
+		printk("dummy: line %d we are in HARDWARE IRQ\n", __LINE__);
 	spin_lock_bh(&dummy->mixer_lock);
 	ucontrol->value.integer.value[0] = dummy->capture_source[addr][0];
 	ucontrol->value.integer.value[1] = dummy->capture_source[addr][1];
@@ -607,7 +618,7 @@ static int snd_dummy_capsrc_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el
 	int left, right;
 
 	if (in_irq())
-		printk("giova: line %d we are in HARDWARE IRQ\n", __LINE__);
+		printk("dummy: line %d we are in HARDWARE IRQ\n", __LINE__);
 	left = ucontrol->value.integer.value[0] & 1;
 	right = ucontrol->value.integer.value[1] & 1;
 	spin_lock_bh(&dummy->mixer_lock);
@@ -637,9 +648,9 @@ static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy)
 	unsigned int idx;
 	int err;
 
+	return 0;					//XXX no mixer
 	spin_lock_init(&dummy->mixer_lock);
 	strcpy(card->mixername, "Dummy Mixer");
-	return 0;					//giova no mixer
 
 	for (idx = 0; idx < ARRAY_SIZE(snd_dummy_controls); idx++) {
 		err = snd_ctl_add(card, snd_ctl_new1(&snd_dummy_controls[idx], dummy));
@@ -656,10 +667,6 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr)
 	int idx, err;
 	int dev = devptr->id;
 
-	//card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(struct snd_dummy)); //giova if this gives you problems, comment it out and remove comment from the 4 lines commented below
-	//if (card == NULL) //giova if this gives you problems, comment it out and remove comment from the 4 lines commented below
-		//return -ENOMEM; //giova if this gives you problems, comment it out and remove comment from the 4 lines commented below
-
 	err = snd_card_create(index[dev], id[dev], THIS_MODULE,
 	sizeof(struct snd_dummy), &card);
 	if (err < 0)
@@ -676,9 +683,9 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr)
 		if (err < 0)
 			goto __nodev;
 	}
-	err = snd_card_dummy_new_mixer(dummy);
-	if (err < 0)
-		goto __nodev;
+	//err = snd_card_dummy_new_mixer(dummy);
+	//if (err < 0)
+		//goto __nodev;
 	strcpy(card->driver, "Dummy");
 	strcpy(card->shortname, "Dummy");
 	sprintf(card->longname, "Dummy %i", dev + 1);
@@ -698,7 +705,7 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr)
 static int __devexit snd_dummy_remove(struct platform_device *devptr)
 {
 
-	del_timer(&giovatimer);
+	del_timer(&dummytimer);
 	snd_card_free(platform_get_drvdata(devptr));
 	platform_set_drvdata(devptr, NULL);
 	return 0;
@@ -754,28 +761,28 @@ static int __init alsa_card_dummy_init(void)
 	if (err < 0)
 		return err;
 
-	if (!giovastarted) {
-		giovastarted = 1;
-		spin_lock_init(&giovalock);
+	if (!dummystarted) {
+		dummystarted = 1;
+		spin_lock_init(&dummylock);
 
-		spin_lock_bh(&giovalock);
+		spin_lock_bh(&dummylock);
 		for (i = 0; i < MAX_PCM_SUBSTREAMS; i++) {
 
-			if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
-				printk("giova, %s:%d, i=%d, giovaindex=%d \n", __FILE__, __LINE__, i, giovaindex);
-			}
-			giovadpcms[i].substream = NULL;
-			giovadpcms[i].dpcm = NULL;
-			giovadpcms[i].started = 0;
-			giovadpcms[i].elapsed = 0;
+			//if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
+				//printk("dummy, %s:%d, i=%d, dummyindex=%d \n", __FILE__, __LINE__, i, dummyindex);
+			//}
+			dummydpcms[i].substream = NULL;
+			dummydpcms[i].dpcm = NULL;
+			dummydpcms[i].started = 0;
+			dummydpcms[i].elapsed = 0;
 		}
-		init_timer(&giovatimer);
-		giovatimer.data = (unsigned long) &giovadpcms;
-		giovatimer.function = snd_card_dummy_pcm_timer_function;
-		giovatimer.expires = 1 + jiffies;
-		add_timer(&giovatimer);
-		printk("snd-dummy skypopen driver version: 6, %s:%d working on a machine with %dHZ kernel\n", __FILE__, __LINE__, HZ);
-		spin_unlock_bh(&giovalock);
+		init_timer(&dummytimer);
+		dummytimer.data = (unsigned long) &dummydpcms;
+		dummytimer.function = snd_card_dummy_pcm_timer_function;
+		dummytimer.expires = 1 + jiffies;
+		add_timer(&dummytimer);
+		printk("snd-dummy skypopen driver version: 9, %s:%d working on a machine with %dHZ kernel\n", __FILE__, __LINE__, HZ);
+		spin_unlock_bh(&dummylock);
 	}
 
 
@@ -806,7 +813,7 @@ static int __init alsa_card_dummy_init(void)
 
 static void __exit alsa_card_dummy_exit(void)
 {
-	del_timer(&giovatimer);
+	del_timer(&dummytimer);
 	snd_dummy_unregister_all();
 }
 
diff --git a/src/mod/endpoints/mod_skypopen/alsa/pcm_lib.c b/src/mod/endpoints/mod_skypopen/alsa/pcm_lib.c
new file mode 100644
index 0000000000..597a3a6c9e
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/alsa/pcm_lib.c
@@ -0,0 +1,2182 @@
+/*
+ *  Digital Audio (PCM) abstract layer
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
+ *                   Abramo Bagnara <abramo@alsa-project.org>
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <linux/slab.h>
+#include <linux/time.h>
+#include <linux/math64.h>
+#include <sound/core.h>
+#include <sound/control.h>
+#include <sound/info.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/timer.h>
+
+/*
+ * fill ring buffer with silence
+ * runtime->silence_start: starting pointer to silence area
+ * runtime->silence_filled: size filled with silence
+ * runtime->silence_threshold: threshold from application
+ * runtime->silence_size: maximal size from application
+ *
+ * when runtime->silence_size >= runtime->boundary - fill processed area with silence immediately
+ */
+void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_uframes_t new_hw_ptr)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	snd_pcm_uframes_t frames, ofs, transfer;
+
+	if (runtime->silence_size < runtime->boundary) {
+		snd_pcm_sframes_t noise_dist, n;
+		if (runtime->silence_start != runtime->control->appl_ptr) {
+			n = runtime->control->appl_ptr - runtime->silence_start;
+			if (n < 0)
+				n += runtime->boundary;
+			if ((snd_pcm_uframes_t)n < runtime->silence_filled)
+				runtime->silence_filled -= n;
+			else
+				runtime->silence_filled = 0;
+			runtime->silence_start = runtime->control->appl_ptr;
+		}
+		if (runtime->silence_filled >= runtime->buffer_size)
+			return;
+		noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime->silence_filled;
+		if (noise_dist >= (snd_pcm_sframes_t) runtime->silence_threshold)
+			return;
+		frames = runtime->silence_threshold - noise_dist;
+		if (frames > runtime->silence_size)
+			frames = runtime->silence_size;
+	} else {
+		if (new_hw_ptr == ULONG_MAX) {	/* initialization */
+			snd_pcm_sframes_t avail = snd_pcm_playback_hw_avail(runtime);
+			runtime->silence_filled = avail > 0 ? avail : 0;
+			runtime->silence_start = (runtime->status->hw_ptr +
+						  runtime->silence_filled) %
+						 runtime->boundary;
+		} else {
+			ofs = runtime->status->hw_ptr;
+			frames = new_hw_ptr - ofs;
+			if ((snd_pcm_sframes_t)frames < 0)
+				frames += runtime->boundary;
+			runtime->silence_filled -= frames;
+			if ((snd_pcm_sframes_t)runtime->silence_filled < 0) {
+				runtime->silence_filled = 0;
+				runtime->silence_start = new_hw_ptr;
+			} else {
+				runtime->silence_start = ofs;
+			}
+		}
+		frames = runtime->buffer_size - runtime->silence_filled;
+	}
+	if (snd_BUG_ON(frames > runtime->buffer_size))
+		return;
+	if (frames == 0)
+		return;
+	ofs = runtime->silence_start % runtime->buffer_size;
+	while (frames > 0) {
+		transfer = ofs + frames > runtime->buffer_size ? runtime->buffer_size - ofs : frames;
+		if (runtime->access == SNDRV_PCM_ACCESS_RW_INTERLEAVED ||
+		    runtime->access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED) {
+			if (substream->ops->silence) {
+				int err;
+				err = substream->ops->silence(substream, -1, ofs, transfer);
+				snd_BUG_ON(err < 0);
+			} else {
+				char *hwbuf = runtime->dma_area + frames_to_bytes(runtime, ofs);
+				snd_pcm_format_set_silence(runtime->format, hwbuf, transfer * runtime->channels);
+			}
+		} else {
+			unsigned int c;
+			unsigned int channels = runtime->channels;
+			if (substream->ops->silence) {
+				for (c = 0; c < channels; ++c) {
+					int err;
+					err = substream->ops->silence(substream, c, ofs, transfer);
+					snd_BUG_ON(err < 0);
+				}
+			} else {
+				size_t dma_csize = runtime->dma_bytes / channels;
+				for (c = 0; c < channels; ++c) {
+					char *hwbuf = runtime->dma_area + (c * dma_csize) + samples_to_bytes(runtime, ofs);
+					snd_pcm_format_set_silence(runtime->format, hwbuf, transfer);
+				}
+			}
+		}
+		runtime->silence_filled += transfer;
+		frames -= transfer;
+		ofs = 0;
+	}
+}
+
+static void pcm_debug_name(struct snd_pcm_substream *substream,
+			   char *name, size_t len)
+{
+	snprintf(name, len, "pcmC%dD%d%c:%d",
+		 substream->pcm->card->number,
+		 substream->pcm->device,
+		 substream->stream ? 'c' : 'p',
+		 substream->number);
+}
+
+#define XRUN_DEBUG_BASIC	(1<<0)
+#define XRUN_DEBUG_STACK	(1<<1)	/* dump also stack */
+#define XRUN_DEBUG_JIFFIESCHECK	(1<<2)	/* do jiffies check */
+#define XRUN_DEBUG_PERIODUPDATE	(1<<3)	/* full period update info */
+#define XRUN_DEBUG_HWPTRUPDATE	(1<<4)	/* full hwptr update info */
+#define XRUN_DEBUG_LOG		(1<<5)	/* show last 10 positions on err */
+#define XRUN_DEBUG_LOGONCE	(1<<6)	/* do above only once */
+
+#ifdef CONFIG_SND_PCM_XRUN_DEBUG
+
+#define xrun_debug(substream, mask) \
+			((substream)->pstr->xrun_debug & (mask))
+#else
+#define xrun_debug(substream, mask)	0
+#endif
+
+#define dump_stack_on_xrun(substream) do {			\
+		if (xrun_debug(substream, XRUN_DEBUG_STACK))	\
+			dump_stack();				\
+	} while (0)
+
+static void xrun(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+
+	if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)
+		snd_pcm_gettime(runtime, (struct timespec *)&runtime->status->tstamp);
+	snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
+	if (xrun_debug(substream, XRUN_DEBUG_BASIC)) {
+		char name[16];
+		pcm_debug_name(substream, name, sizeof(name));
+		snd_printd(KERN_DEBUG "XRUN: %s\n", name);
+		dump_stack_on_xrun(substream);
+	}
+}
+
+#ifdef CONFIG_SND_PCM_XRUN_DEBUG
+#define hw_ptr_error(substream, fmt, args...)				\
+	do {								\
+		if (xrun_debug(substream, XRUN_DEBUG_BASIC)) {		\
+			xrun_log_show(substream);			\
+			if (printk_ratelimit()) {			\
+				snd_printd("PCM: " fmt, ##args);	\
+			}						\
+			dump_stack_on_xrun(substream);			\
+		}							\
+	} while (0)
+
+#define XRUN_LOG_CNT	10
+
+struct hwptr_log_entry {
+	unsigned long jiffies;
+	snd_pcm_uframes_t pos;
+	snd_pcm_uframes_t period_size;
+	snd_pcm_uframes_t buffer_size;
+	snd_pcm_uframes_t old_hw_ptr;
+	snd_pcm_uframes_t hw_ptr_base;
+};
+
+struct snd_pcm_hwptr_log {
+	unsigned int idx;
+	unsigned int hit: 1;
+	struct hwptr_log_entry entries[XRUN_LOG_CNT];
+};
+
+static void xrun_log(struct snd_pcm_substream *substream,
+		     snd_pcm_uframes_t pos)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	struct snd_pcm_hwptr_log *log = runtime->hwptr_log;
+	struct hwptr_log_entry *entry;
+
+	if (log == NULL) {
+		log = kzalloc(sizeof(*log), GFP_ATOMIC);
+		if (log == NULL)
+			return;
+		runtime->hwptr_log = log;
+	} else {
+		if (xrun_debug(substream, XRUN_DEBUG_LOGONCE) && log->hit)
+			return;
+	}
+	entry = &log->entries[log->idx];
+	entry->jiffies = jiffies;
+	entry->pos = pos;
+	entry->period_size = runtime->period_size;
+	entry->buffer_size = runtime->buffer_size;;
+	entry->old_hw_ptr = runtime->status->hw_ptr;
+	entry->hw_ptr_base = runtime->hw_ptr_base;
+	log->idx = (log->idx + 1) % XRUN_LOG_CNT;
+}
+
+static void xrun_log_show(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_hwptr_log *log = substream->runtime->hwptr_log;
+	struct hwptr_log_entry *entry;
+	char name[16];
+	unsigned int idx;
+	int cnt;
+
+	if (log == NULL)
+		return;
+	if (xrun_debug(substream, XRUN_DEBUG_LOGONCE) && log->hit)
+		return;
+	pcm_debug_name(substream, name, sizeof(name));
+	for (cnt = 0, idx = log->idx; cnt < XRUN_LOG_CNT; cnt++) {
+		entry = &log->entries[idx];
+		if (entry->period_size == 0)
+			break;
+		snd_printd("hwptr log: %s: j=%lu, pos=%ld/%ld/%ld, "
+			   "hwptr=%ld/%ld\n",
+			   name, entry->jiffies, (unsigned long)entry->pos,
+			   (unsigned long)entry->period_size,
+			   (unsigned long)entry->buffer_size,
+			   (unsigned long)entry->old_hw_ptr,
+			   (unsigned long)entry->hw_ptr_base);
+		idx++;
+		idx %= XRUN_LOG_CNT;
+	}
+	log->hit = 1;
+}
+
+#else /* ! CONFIG_SND_PCM_XRUN_DEBUG */
+
+#define hw_ptr_error(substream, fmt, args...) do { } while (0)
+#define xrun_log(substream, pos)	do { } while (0)
+#define xrun_log_show(substream)	do { } while (0)
+
+#endif
+
+int snd_pcm_update_state(struct snd_pcm_substream *substream,
+			 struct snd_pcm_runtime *runtime)
+{
+	snd_pcm_uframes_t avail;
+
+	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+		avail = snd_pcm_playback_avail(runtime);
+	else
+		avail = snd_pcm_capture_avail(runtime);
+	if (avail > runtime->avail_max)
+		runtime->avail_max = avail;
+	if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
+		if (avail >= runtime->buffer_size) {
+			snd_pcm_drain_done(substream);
+			return -EPIPE;
+		}
+	} else {
+		if (avail >= runtime->stop_threshold) {
+			xrun(substream);
+			return -EPIPE;
+		}
+	}
+	if (avail >= runtime->control->avail_min)
+		wake_up(runtime->twake ? &runtime->tsleep : &runtime->sleep);
+	return 0;
+}
+
+static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
+				  unsigned int in_interrupt)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	snd_pcm_uframes_t pos;
+	snd_pcm_uframes_t old_hw_ptr, new_hw_ptr, hw_base;
+	snd_pcm_sframes_t hdelta, delta;
+	unsigned long jdelta;
+
+	old_hw_ptr = runtime->status->hw_ptr;
+	pos = substream->ops->pointer(substream);
+	if (pos == SNDRV_PCM_POS_XRUN) {
+		xrun(substream);
+		return -EPIPE;
+	}
+	if (pos >= runtime->buffer_size) {
+		if (printk_ratelimit()) {
+			char name[16];
+			pcm_debug_name(substream, name, sizeof(name));
+			xrun_log_show(substream);
+			snd_printd(KERN_ERR  "BUG: %s, pos = %ld, "
+				   "buffer size = %ld, period size = %ld\n",
+				   name, pos, runtime->buffer_size,
+				   runtime->period_size);
+		}
+		pos = 0;
+	}
+	pos -= pos % runtime->min_align;
+	if (xrun_debug(substream, XRUN_DEBUG_LOG))
+		xrun_log(substream, pos);
+	hw_base = runtime->hw_ptr_base;
+	new_hw_ptr = hw_base + pos;
+	if (in_interrupt) {
+		/* we know that one period was processed */
+		/* delta = "expected next hw_ptr" for in_interrupt != 0 */
+		delta = runtime->hw_ptr_interrupt + runtime->period_size;
+		if (delta > new_hw_ptr) {
+			hw_base += runtime->buffer_size;
+			if (hw_base >= runtime->boundary)
+				hw_base = 0;
+			new_hw_ptr = hw_base + pos;
+			goto __delta;
+		}
+	}
+	/* new_hw_ptr might be lower than old_hw_ptr in case when */
+	/* pointer crosses the end of the ring buffer */
+	if (new_hw_ptr < old_hw_ptr) {
+		hw_base += runtime->buffer_size;
+		if (hw_base >= runtime->boundary)
+			hw_base = 0;
+		new_hw_ptr = hw_base + pos;
+	}
+      __delta:
+	delta = (new_hw_ptr - old_hw_ptr) % runtime->boundary;
+	if (xrun_debug(substream, in_interrupt ?
+			XRUN_DEBUG_PERIODUPDATE : XRUN_DEBUG_HWPTRUPDATE)) {
+		char name[16];
+		pcm_debug_name(substream, name, sizeof(name));
+		snd_printd("%s_update: %s: pos=%u/%u/%u, "
+			   "hwptr=%ld/%ld/%ld/%ld\n",
+			   in_interrupt ? "period" : "hwptr",
+			   name,
+			   (unsigned int)pos,
+			   (unsigned int)runtime->period_size,
+			   (unsigned int)runtime->buffer_size,
+			   (unsigned long)delta,
+			   (unsigned long)old_hw_ptr,
+			   (unsigned long)new_hw_ptr,
+			   (unsigned long)runtime->hw_ptr_base);
+	}
+	/* something must be really wrong */
+	if (delta >= runtime->buffer_size + runtime->period_size) {
+		hw_ptr_error(substream,
+			       "Unexpected hw_pointer value %s"
+			       "(stream=%i, pos=%ld, new_hw_ptr=%ld, "
+			       "old_hw_ptr=%ld)\n",
+				     in_interrupt ? "[Q] " : "[P]",
+				     substream->stream, (long)pos,
+				     (long)new_hw_ptr, (long)old_hw_ptr);
+		return 0;
+	}
+
+	/* Do jiffies check only in xrun_debug mode */
+	if (!xrun_debug(substream, XRUN_DEBUG_JIFFIESCHECK))
+		goto no_jiffies_check;
+
+	/* Skip the jiffies check for hardwares with BATCH flag.
+	 * Such hardware usually just increases the position at each IRQ,
+	 * thus it can't give any strange position.
+	 */
+	if (runtime->hw.info & SNDRV_PCM_INFO_BATCH)
+		goto no_jiffies_check;
+	hdelta = delta;
+	if (hdelta < runtime->delay)
+		goto no_jiffies_check;
+	hdelta -= runtime->delay;
+	jdelta = jiffies - runtime->hw_ptr_jiffies;
+	if (((hdelta * HZ) / runtime->rate) > jdelta + HZ/100) {
+		delta = jdelta /
+			(((runtime->period_size * HZ) / runtime->rate)
+								+ HZ/100);
+		/* move new_hw_ptr according jiffies not pos variable */
+		new_hw_ptr = old_hw_ptr;
+		hw_base = delta;
+		/* use loop to avoid checks for delta overflows */
+		/* the delta value is small or zero in most cases */
+		while (delta > 0) {
+			new_hw_ptr += runtime->period_size;
+			if (new_hw_ptr >= runtime->boundary)
+				new_hw_ptr -= runtime->boundary;
+			delta--;
+		}
+		/* align hw_base to buffer_size */
+		hw_ptr_error(substream,
+			     "hw_ptr skipping! %s"
+			     "(pos=%ld, delta=%ld, period=%ld, "
+			     "jdelta=%lu/%lu/%lu, hw_ptr=%ld/%ld)\n",
+			     in_interrupt ? "[Q] " : "",
+			     (long)pos, (long)hdelta,
+			     (long)runtime->period_size, jdelta,
+			     ((hdelta * HZ) / runtime->rate), hw_base,
+			     (unsigned long)old_hw_ptr,
+			     (unsigned long)new_hw_ptr);
+		/* reset values to proper state */
+		delta = 0;
+		hw_base = new_hw_ptr - (new_hw_ptr % runtime->buffer_size);
+	}
+ no_jiffies_check:
+	if (delta > runtime->period_size + runtime->period_size / 2) {
+		hw_ptr_error(substream,
+			     "Lost interrupts? %s"
+			     "(stream=%i, delta=%ld, new_hw_ptr=%ld, "
+			     "old_hw_ptr=%ld)\n",
+			     in_interrupt ? "[Q] " : "",
+			     substream->stream, (long)delta,
+			     (long)new_hw_ptr,
+			     (long)old_hw_ptr);
+	}
+
+	if (runtime->status->hw_ptr == new_hw_ptr)
+		return 0;
+
+	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
+	    runtime->silence_size > 0)
+		snd_pcm_playback_silence(substream, new_hw_ptr);
+
+	if (in_interrupt) {
+		runtime->hw_ptr_interrupt = new_hw_ptr -
+				(new_hw_ptr % runtime->period_size);
+	}
+	runtime->hw_ptr_base = hw_base;
+	runtime->status->hw_ptr = new_hw_ptr;
+	runtime->hw_ptr_jiffies = jiffies;
+	if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)
+		snd_pcm_gettime(runtime, (struct timespec *)&runtime->status->tstamp);
+
+	return snd_pcm_update_state(substream, runtime);
+}
+
+/* CAUTION: call it with irq disabled */
+int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
+{
+	return snd_pcm_update_hw_ptr0(substream, 0);
+}
+
+/**
+ * snd_pcm_set_ops - set the PCM operators
+ * @pcm: the pcm instance
+ * @direction: stream direction, SNDRV_PCM_STREAM_XXX
+ * @ops: the operator table
+ *
+ * Sets the given PCM operators to the pcm instance.
+ */
+void snd_pcm_set_ops(struct snd_pcm *pcm, int direction, struct snd_pcm_ops *ops)
+{
+	struct snd_pcm_str *stream = &pcm->streams[direction];
+	struct snd_pcm_substream *substream;
+	
+	for (substream = stream->substream; substream != NULL; substream = substream->next)
+		substream->ops = ops;
+}
+
+EXPORT_SYMBOL(snd_pcm_set_ops);
+
+/**
+ * snd_pcm_sync - set the PCM sync id
+ * @substream: the pcm substream
+ *
+ * Sets the PCM sync identifier for the card.
+ */
+void snd_pcm_set_sync(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	
+	runtime->sync.id32[0] = substream->pcm->card->number;
+	runtime->sync.id32[1] = -1;
+	runtime->sync.id32[2] = -1;
+	runtime->sync.id32[3] = -1;
+}
+
+EXPORT_SYMBOL(snd_pcm_set_sync);
+
+/*
+ *  Standard ioctl routine
+ */
+
+static inline unsigned int div32(unsigned int a, unsigned int b, 
+				 unsigned int *r)
+{
+	if (b == 0) {
+		*r = 0;
+		return UINT_MAX;
+	}
+	*r = a % b;
+	return a / b;
+}
+
+static inline unsigned int div_down(unsigned int a, unsigned int b)
+{
+	if (b == 0)
+		return UINT_MAX;
+	return a / b;
+}
+
+static inline unsigned int div_up(unsigned int a, unsigned int b)
+{
+	unsigned int r;
+	unsigned int q;
+	if (b == 0)
+		return UINT_MAX;
+	q = div32(a, b, &r);
+	if (r)
+		++q;
+	return q;
+}
+
+static inline unsigned int mul(unsigned int a, unsigned int b)
+{
+	if (a == 0)
+		return 0;
+	if (div_down(UINT_MAX, a) < b)
+		return UINT_MAX;
+	return a * b;
+}
+
+static inline unsigned int muldiv32(unsigned int a, unsigned int b,
+				    unsigned int c, unsigned int *r)
+{
+	u_int64_t n = (u_int64_t) a * b;
+	if (c == 0) {
+		snd_BUG_ON(!n);
+		*r = 0;
+		return UINT_MAX;
+	}
+	n = div_u64_rem(n, c, r);
+	if (n >= UINT_MAX) {
+		*r = 0;
+		return UINT_MAX;
+	}
+	return n;
+}
+
+/**
+ * snd_interval_refine - refine the interval value of configurator
+ * @i: the interval value to refine
+ * @v: the interval value to refer to
+ *
+ * Refines the interval value with the reference value.
+ * The interval is changed to the range satisfying both intervals.
+ * The interval status (min, max, integer, etc.) are evaluated.
+ *
+ * Returns non-zero if the value is changed, zero if not changed.
+ */
+int snd_interval_refine(struct snd_interval *i, const struct snd_interval *v)
+{
+	int changed = 0;
+	if (snd_BUG_ON(snd_interval_empty(i)))
+		return -EINVAL;
+	if (i->min < v->min) {
+		i->min = v->min;
+		i->openmin = v->openmin;
+		changed = 1;
+	} else if (i->min == v->min && !i->openmin && v->openmin) {
+		i->openmin = 1;
+		changed = 1;
+	}
+	if (i->max > v->max) {
+		i->max = v->max;
+		i->openmax = v->openmax;
+		changed = 1;
+	} else if (i->max == v->max && !i->openmax && v->openmax) {
+		i->openmax = 1;
+		changed = 1;
+	}
+	if (!i->integer && v->integer) {
+		i->integer = 1;
+		changed = 1;
+	}
+	if (i->integer) {
+		if (i->openmin) {
+			i->min++;
+			i->openmin = 0;
+		}
+		if (i->openmax) {
+			i->max--;
+			i->openmax = 0;
+		}
+	} else if (!i->openmin && !i->openmax && i->min == i->max)
+		i->integer = 1;
+	if (snd_interval_checkempty(i)) {
+		snd_interval_none(i);
+		return -EINVAL;
+	}
+	return changed;
+}
+
+EXPORT_SYMBOL(snd_interval_refine);
+
+static int snd_interval_refine_first(struct snd_interval *i)
+{
+	if (snd_BUG_ON(snd_interval_empty(i)))
+		return -EINVAL;
+	if (snd_interval_single(i))
+		return 0;
+	i->max = i->min;
+	i->openmax = i->openmin;
+	if (i->openmax)
+		i->max++;
+	return 1;
+}
+
+static int snd_interval_refine_last(struct snd_interval *i)
+{
+	if (snd_BUG_ON(snd_interval_empty(i)))
+		return -EINVAL;
+	if (snd_interval_single(i))
+		return 0;
+	i->min = i->max;
+	i->openmin = i->openmax;
+	if (i->openmin)
+		i->min--;
+	return 1;
+}
+
+void snd_interval_mul(const struct snd_interval *a, const struct snd_interval *b, struct snd_interval *c)
+{
+	if (a->empty || b->empty) {
+		snd_interval_none(c);
+		return;
+	}
+	c->empty = 0;
+	c->min = mul(a->min, b->min);
+	c->openmin = (a->openmin || b->openmin);
+	c->max = mul(a->max,  b->max);
+	c->openmax = (a->openmax || b->openmax);
+	c->integer = (a->integer && b->integer);
+}
+
+/**
+ * snd_interval_div - refine the interval value with division
+ * @a: dividend
+ * @b: divisor
+ * @c: quotient
+ *
+ * c = a / b
+ *
+ * Returns non-zero if the value is changed, zero if not changed.
+ */
+void snd_interval_div(const struct snd_interval *a, const struct snd_interval *b, struct snd_interval *c)
+{
+	unsigned int r;
+	if (a->empty || b->empty) {
+		snd_interval_none(c);
+		return;
+	}
+	c->empty = 0;
+	c->min = div32(a->min, b->max, &r);
+	c->openmin = (r || a->openmin || b->openmax);
+	if (b->min > 0) {
+		c->max = div32(a->max, b->min, &r);
+		if (r) {
+			c->max++;
+			c->openmax = 1;
+		} else
+			c->openmax = (a->openmax || b->openmin);
+	} else {
+		c->max = UINT_MAX;
+		c->openmax = 0;
+	}
+	c->integer = 0;
+}
+
+/**
+ * snd_interval_muldivk - refine the interval value
+ * @a: dividend 1
+ * @b: dividend 2
+ * @k: divisor (as integer)
+ * @c: result
+  *
+ * c = a * b / k
+ *
+ * Returns non-zero if the value is changed, zero if not changed.
+ */
+void snd_interval_muldivk(const struct snd_interval *a, const struct snd_interval *b,
+		      unsigned int k, struct snd_interval *c)
+{
+	unsigned int r;
+	if (a->empty || b->empty) {
+		snd_interval_none(c);
+		return;
+	}
+	c->empty = 0;
+	c->min = muldiv32(a->min, b->min, k, &r);
+	c->openmin = (r || a->openmin || b->openmin);
+	c->max = muldiv32(a->max, b->max, k, &r);
+	if (r) {
+		c->max++;
+		c->openmax = 1;
+	} else
+		c->openmax = (a->openmax || b->openmax);
+	c->integer = 0;
+}
+
+/**
+ * snd_interval_mulkdiv - refine the interval value
+ * @a: dividend 1
+ * @k: dividend 2 (as integer)
+ * @b: divisor
+ * @c: result
+ *
+ * c = a * k / b
+ *
+ * Returns non-zero if the value is changed, zero if not changed.
+ */
+void snd_interval_mulkdiv(const struct snd_interval *a, unsigned int k,
+		      const struct snd_interval *b, struct snd_interval *c)
+{
+	unsigned int r;
+	if (a->empty || b->empty) {
+		snd_interval_none(c);
+		return;
+	}
+	c->empty = 0;
+	c->min = muldiv32(a->min, k, b->max, &r);
+	c->openmin = (r || a->openmin || b->openmax);
+	if (b->min > 0) {
+		c->max = muldiv32(a->max, k, b->min, &r);
+		if (r) {
+			c->max++;
+			c->openmax = 1;
+		} else
+			c->openmax = (a->openmax || b->openmin);
+	} else {
+		c->max = UINT_MAX;
+		c->openmax = 0;
+	}
+	c->integer = 0;
+}
+
+/* ---- */
+
+
+/**
+ * snd_interval_ratnum - refine the interval value
+ * @i: interval to refine
+ * @rats_count: number of ratnum_t 
+ * @rats: ratnum_t array
+ * @nump: pointer to store the resultant numerator
+ * @denp: pointer to store the resultant denominator
+ *
+ * Returns non-zero if the value is changed, zero if not changed.
+ */
+int snd_interval_ratnum(struct snd_interval *i,
+			unsigned int rats_count, struct snd_ratnum *rats,
+			unsigned int *nump, unsigned int *denp)
+{
+	unsigned int best_num, best_den;
+	int best_diff;
+	unsigned int k;
+	struct snd_interval t;
+	int err;
+	unsigned int result_num, result_den;
+	int result_diff;
+
+	best_num = best_den = best_diff = 0;
+	for (k = 0; k < rats_count; ++k) {
+		unsigned int num = rats[k].num;
+		unsigned int den;
+		unsigned int q = i->min;
+		int diff;
+		if (q == 0)
+			q = 1;
+		den = div_up(num, q);
+		if (den < rats[k].den_min)
+			continue;
+		if (den > rats[k].den_max)
+			den = rats[k].den_max;
+		else {
+			unsigned int r;
+			r = (den - rats[k].den_min) % rats[k].den_step;
+			if (r != 0)
+				den -= r;
+		}
+		diff = num - q * den;
+		if (diff < 0)
+			diff = -diff;
+		if (best_num == 0 ||
+		    diff * best_den < best_diff * den) {
+			best_diff = diff;
+			best_den = den;
+			best_num = num;
+		}
+	}
+	if (best_den == 0) {
+		i->empty = 1;
+		return -EINVAL;
+	}
+	t.min = div_down(best_num, best_den);
+	t.openmin = !!(best_num % best_den);
+	
+	result_num = best_num;
+	result_diff = best_diff;
+	result_den = best_den;
+	best_num = best_den = best_diff = 0;
+	for (k = 0; k < rats_count; ++k) {
+		unsigned int num = rats[k].num;
+		unsigned int den;
+		unsigned int q = i->max;
+		int diff;
+		if (q == 0) {
+			i->empty = 1;
+			return -EINVAL;
+		}
+		den = div_down(num, q);
+		if (den > rats[k].den_max)
+			continue;
+		if (den < rats[k].den_min)
+			den = rats[k].den_min;
+		else {
+			unsigned int r;
+			r = (den - rats[k].den_min) % rats[k].den_step;
+			if (r != 0)
+				den += rats[k].den_step - r;
+		}
+		diff = q * den - num;
+		if (diff < 0)
+			diff = -diff;
+		if (best_num == 0 ||
+		    diff * best_den < best_diff * den) {
+			best_diff = diff;
+			best_den = den;
+			best_num = num;
+		}
+	}
+	if (best_den == 0) {
+		i->empty = 1;
+		return -EINVAL;
+	}
+	t.max = div_up(best_num, best_den);
+	t.openmax = !!(best_num % best_den);
+	t.integer = 0;
+	err = snd_interval_refine(i, &t);
+	if (err < 0)
+		return err;
+
+	if (snd_interval_single(i)) {
+		if (best_diff * result_den < result_diff * best_den) {
+			result_num = best_num;
+			result_den = best_den;
+		}
+		if (nump)
+			*nump = result_num;
+		if (denp)
+			*denp = result_den;
+	}
+	return err;
+}
+
+EXPORT_SYMBOL(snd_interval_ratnum);
+
+/**
+ * snd_interval_ratden - refine the interval value
+ * @i: interval to refine
+ * @rats_count: number of struct ratden
+ * @rats: struct ratden array
+ * @nump: pointer to store the resultant numerator
+ * @denp: pointer to store the resultant denominator
+ *
+ * Returns non-zero if the value is changed, zero if not changed.
+ */
+static int snd_interval_ratden(struct snd_interval *i,
+			       unsigned int rats_count, struct snd_ratden *rats,
+			       unsigned int *nump, unsigned int *denp)
+{
+	unsigned int best_num, best_diff, best_den;
+	unsigned int k;
+	struct snd_interval t;
+	int err;
+
+	best_num = best_den = best_diff = 0;
+	for (k = 0; k < rats_count; ++k) {
+		unsigned int num;
+		unsigned int den = rats[k].den;
+		unsigned int q = i->min;
+		int diff;
+		num = mul(q, den);
+		if (num > rats[k].num_max)
+			continue;
+		if (num < rats[k].num_min)
+			num = rats[k].num_max;
+		else {
+			unsigned int r;
+			r = (num - rats[k].num_min) % rats[k].num_step;
+			if (r != 0)
+				num += rats[k].num_step - r;
+		}
+		diff = num - q * den;
+		if (best_num == 0 ||
+		    diff * best_den < best_diff * den) {
+			best_diff = diff;
+			best_den = den;
+			best_num = num;
+		}
+	}
+	if (best_den == 0) {
+		i->empty = 1;
+		return -EINVAL;
+	}
+	t.min = div_down(best_num, best_den);
+	t.openmin = !!(best_num % best_den);
+	
+	best_num = best_den = best_diff = 0;
+	for (k = 0; k < rats_count; ++k) {
+		unsigned int num;
+		unsigned int den = rats[k].den;
+		unsigned int q = i->max;
+		int diff;
+		num = mul(q, den);
+		if (num < rats[k].num_min)
+			continue;
+		if (num > rats[k].num_max)
+			num = rats[k].num_max;
+		else {
+			unsigned int r;
+			r = (num - rats[k].num_min) % rats[k].num_step;
+			if (r != 0)
+				num -= r;
+		}
+		diff = q * den - num;
+		if (best_num == 0 ||
+		    diff * best_den < best_diff * den) {
+			best_diff = diff;
+			best_den = den;
+			best_num = num;
+		}
+	}
+	if (best_den == 0) {
+		i->empty = 1;
+		return -EINVAL;
+	}
+	t.max = div_up(best_num, best_den);
+	t.openmax = !!(best_num % best_den);
+	t.integer = 0;
+	err = snd_interval_refine(i, &t);
+	if (err < 0)
+		return err;
+
+	if (snd_interval_single(i)) {
+		if (nump)
+			*nump = best_num;
+		if (denp)
+			*denp = best_den;
+	}
+	return err;
+}
+
+/**
+ * snd_interval_list - refine the interval value from the list
+ * @i: the interval value to refine
+ * @count: the number of elements in the list
+ * @list: the value list
+ * @mask: the bit-mask to evaluate
+ *
+ * Refines the interval value from the list.
+ * When mask is non-zero, only the elements corresponding to bit 1 are
+ * evaluated.
+ *
+ * Returns non-zero if the value is changed, zero if not changed.
+ */
+int snd_interval_list(struct snd_interval *i, unsigned int count, unsigned int *list, unsigned int mask)
+{
+        unsigned int k;
+	struct snd_interval list_range;
+
+	if (!count) {
+		i->empty = 1;
+		return -EINVAL;
+	}
+	snd_interval_any(&list_range);
+	list_range.min = UINT_MAX;
+	list_range.max = 0;
+        for (k = 0; k < count; k++) {
+		if (mask && !(mask & (1 << k)))
+			continue;
+		if (!snd_interval_test(i, list[k]))
+			continue;
+		list_range.min = min(list_range.min, list[k]);
+		list_range.max = max(list_range.max, list[k]);
+        }
+	return snd_interval_refine(i, &list_range);
+}
+
+EXPORT_SYMBOL(snd_interval_list);
+
+static int snd_interval_step(struct snd_interval *i, unsigned int min, unsigned int step)
+{
+	unsigned int n;
+	int changed = 0;
+	n = (i->min - min) % step;
+	if (n != 0 || i->openmin) {
+		i->min += step - n;
+		changed = 1;
+	}
+	n = (i->max - min) % step;
+	if (n != 0 || i->openmax) {
+		i->max -= n;
+		changed = 1;
+	}
+	if (snd_interval_checkempty(i)) {
+		i->empty = 1;
+		return -EINVAL;
+	}
+	return changed;
+}
+
+/* Info constraints helpers */
+
+/**
+ * snd_pcm_hw_rule_add - add the hw-constraint rule
+ * @runtime: the pcm runtime instance
+ * @cond: condition bits
+ * @var: the variable to evaluate
+ * @func: the evaluation function
+ * @private: the private data pointer passed to function
+ * @dep: the dependent variables
+ *
+ * Returns zero if successful, or a negative error code on failure.
+ */
+int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,
+			int var,
+			snd_pcm_hw_rule_func_t func, void *private,
+			int dep, ...)
+{
+	struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
+	struct snd_pcm_hw_rule *c;
+	unsigned int k;
+	va_list args;
+	va_start(args, dep);
+	if (constrs->rules_num >= constrs->rules_all) {
+		struct snd_pcm_hw_rule *new;
+		unsigned int new_rules = constrs->rules_all + 16;
+		new = kcalloc(new_rules, sizeof(*c), GFP_KERNEL);
+		if (!new)
+			return -ENOMEM;
+		if (constrs->rules) {
+			memcpy(new, constrs->rules,
+			       constrs->rules_num * sizeof(*c));
+			kfree(constrs->rules);
+		}
+		constrs->rules = new;
+		constrs->rules_all = new_rules;
+	}
+	c = &constrs->rules[constrs->rules_num];
+	c->cond = cond;
+	c->func = func;
+	c->var = var;
+	c->private = private;
+	k = 0;
+	while (1) {
+		if (snd_BUG_ON(k >= ARRAY_SIZE(c->deps)))
+			return -EINVAL;
+		c->deps[k++] = dep;
+		if (dep < 0)
+			break;
+		dep = va_arg(args, int);
+	}
+	constrs->rules_num++;
+	va_end(args);
+	return 0;
+}				    
+
+EXPORT_SYMBOL(snd_pcm_hw_rule_add);
+
+/**
+ * snd_pcm_hw_constraint_mask - apply the given bitmap mask constraint
+ * @runtime: PCM runtime instance
+ * @var: hw_params variable to apply the mask
+ * @mask: the bitmap mask
+ *
+ * Apply the constraint of the given bitmap mask to a 32-bit mask parameter.
+ */
+int snd_pcm_hw_constraint_mask(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,
+			       u_int32_t mask)
+{
+	struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
+	struct snd_mask *maskp = constrs_mask(constrs, var);
+	*maskp->bits &= mask;
+	memset(maskp->bits + 1, 0, (SNDRV_MASK_MAX-32) / 8); /* clear rest */
+	if (*maskp->bits == 0)
+		return -EINVAL;
+	return 0;
+}
+
+/**
+ * snd_pcm_hw_constraint_mask64 - apply the given bitmap mask constraint
+ * @runtime: PCM runtime instance
+ * @var: hw_params variable to apply the mask
+ * @mask: the 64bit bitmap mask
+ *
+ * Apply the constraint of the given bitmap mask to a 64-bit mask parameter.
+ */
+int snd_pcm_hw_constraint_mask64(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,
+				 u_int64_t mask)
+{
+	struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
+	struct snd_mask *maskp = constrs_mask(constrs, var);
+	maskp->bits[0] &= (u_int32_t)mask;
+	maskp->bits[1] &= (u_int32_t)(mask >> 32);
+	memset(maskp->bits + 2, 0, (SNDRV_MASK_MAX-64) / 8); /* clear rest */
+	if (! maskp->bits[0] && ! maskp->bits[1])
+		return -EINVAL;
+	return 0;
+}
+
+/**
+ * snd_pcm_hw_constraint_integer - apply an integer constraint to an interval
+ * @runtime: PCM runtime instance
+ * @var: hw_params variable to apply the integer constraint
+ *
+ * Apply the constraint of integer to an interval parameter.
+ */
+int snd_pcm_hw_constraint_integer(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var)
+{
+	struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
+	return snd_interval_setinteger(constrs_interval(constrs, var));
+}
+
+EXPORT_SYMBOL(snd_pcm_hw_constraint_integer);
+
+/**
+ * snd_pcm_hw_constraint_minmax - apply a min/max range constraint to an interval
+ * @runtime: PCM runtime instance
+ * @var: hw_params variable to apply the range
+ * @min: the minimal value
+ * @max: the maximal value
+ * 
+ * Apply the min/max range constraint to an interval parameter.
+ */
+int snd_pcm_hw_constraint_minmax(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,
+				 unsigned int min, unsigned int max)
+{
+	struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
+	struct snd_interval t;
+	t.min = min;
+	t.max = max;
+	t.openmin = t.openmax = 0;
+	t.integer = 0;
+	return snd_interval_refine(constrs_interval(constrs, var), &t);
+}
+
+EXPORT_SYMBOL(snd_pcm_hw_constraint_minmax);
+
+static int snd_pcm_hw_rule_list(struct snd_pcm_hw_params *params,
+				struct snd_pcm_hw_rule *rule)
+{
+	struct snd_pcm_hw_constraint_list *list = rule->private;
+	return snd_interval_list(hw_param_interval(params, rule->var), list->count, list->list, list->mask);
+}		
+
+
+/**
+ * snd_pcm_hw_constraint_list - apply a list of constraints to a parameter
+ * @runtime: PCM runtime instance
+ * @cond: condition bits
+ * @var: hw_params variable to apply the list constraint
+ * @l: list
+ * 
+ * Apply the list of constraints to an interval parameter.
+ */
+int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime,
+			       unsigned int cond,
+			       snd_pcm_hw_param_t var,
+			       struct snd_pcm_hw_constraint_list *l)
+{
+	return snd_pcm_hw_rule_add(runtime, cond, var,
+				   snd_pcm_hw_rule_list, l,
+				   var, -1);
+}
+
+EXPORT_SYMBOL(snd_pcm_hw_constraint_list);
+
+static int snd_pcm_hw_rule_ratnums(struct snd_pcm_hw_params *params,
+				   struct snd_pcm_hw_rule *rule)
+{
+	struct snd_pcm_hw_constraint_ratnums *r = rule->private;
+	unsigned int num = 0, den = 0;
+	int err;
+	err = snd_interval_ratnum(hw_param_interval(params, rule->var),
+				  r->nrats, r->rats, &num, &den);
+	if (err >= 0 && den && rule->var == SNDRV_PCM_HW_PARAM_RATE) {
+		params->rate_num = num;
+		params->rate_den = den;
+	}
+	return err;
+}
+
+/**
+ * snd_pcm_hw_constraint_ratnums - apply ratnums constraint to a parameter
+ * @runtime: PCM runtime instance
+ * @cond: condition bits
+ * @var: hw_params variable to apply the ratnums constraint
+ * @r: struct snd_ratnums constriants
+ */
+int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime, 
+				  unsigned int cond,
+				  snd_pcm_hw_param_t var,
+				  struct snd_pcm_hw_constraint_ratnums *r)
+{
+	return snd_pcm_hw_rule_add(runtime, cond, var,
+				   snd_pcm_hw_rule_ratnums, r,
+				   var, -1);
+}
+
+EXPORT_SYMBOL(snd_pcm_hw_constraint_ratnums);
+
+static int snd_pcm_hw_rule_ratdens(struct snd_pcm_hw_params *params,
+				   struct snd_pcm_hw_rule *rule)
+{
+	struct snd_pcm_hw_constraint_ratdens *r = rule->private;
+	unsigned int num = 0, den = 0;
+	int err = snd_interval_ratden(hw_param_interval(params, rule->var),
+				  r->nrats, r->rats, &num, &den);
+	if (err >= 0 && den && rule->var == SNDRV_PCM_HW_PARAM_RATE) {
+		params->rate_num = num;
+		params->rate_den = den;
+	}
+	return err;
+}
+
+/**
+ * snd_pcm_hw_constraint_ratdens - apply ratdens constraint to a parameter
+ * @runtime: PCM runtime instance
+ * @cond: condition bits
+ * @var: hw_params variable to apply the ratdens constraint
+ * @r: struct snd_ratdens constriants
+ */
+int snd_pcm_hw_constraint_ratdens(struct snd_pcm_runtime *runtime, 
+				  unsigned int cond,
+				  snd_pcm_hw_param_t var,
+				  struct snd_pcm_hw_constraint_ratdens *r)
+{
+	return snd_pcm_hw_rule_add(runtime, cond, var,
+				   snd_pcm_hw_rule_ratdens, r,
+				   var, -1);
+}
+
+EXPORT_SYMBOL(snd_pcm_hw_constraint_ratdens);
+
+static int snd_pcm_hw_rule_msbits(struct snd_pcm_hw_params *params,
+				  struct snd_pcm_hw_rule *rule)
+{
+	unsigned int l = (unsigned long) rule->private;
+	int width = l & 0xffff;
+	unsigned int msbits = l >> 16;
+	struct snd_interval *i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);
+	if (snd_interval_single(i) && snd_interval_value(i) == width)
+		params->msbits = msbits;
+	return 0;
+}
+
+/**
+ * snd_pcm_hw_constraint_msbits - add a hw constraint msbits rule
+ * @runtime: PCM runtime instance
+ * @cond: condition bits
+ * @width: sample bits width
+ * @msbits: msbits width
+ */
+int snd_pcm_hw_constraint_msbits(struct snd_pcm_runtime *runtime, 
+				 unsigned int cond,
+				 unsigned int width,
+				 unsigned int msbits)
+{
+	unsigned long l = (msbits << 16) | width;
+	return snd_pcm_hw_rule_add(runtime, cond, -1,
+				    snd_pcm_hw_rule_msbits,
+				    (void*) l,
+				    SNDRV_PCM_HW_PARAM_SAMPLE_BITS, -1);
+}
+
+EXPORT_SYMBOL(snd_pcm_hw_constraint_msbits);
+
+static int snd_pcm_hw_rule_step(struct snd_pcm_hw_params *params,
+				struct snd_pcm_hw_rule *rule)
+{
+	unsigned long step = (unsigned long) rule->private;
+	return snd_interval_step(hw_param_interval(params, rule->var), 0, step);
+}
+
+/**
+ * snd_pcm_hw_constraint_step - add a hw constraint step rule
+ * @runtime: PCM runtime instance
+ * @cond: condition bits
+ * @var: hw_params variable to apply the step constraint
+ * @step: step size
+ */
+int snd_pcm_hw_constraint_step(struct snd_pcm_runtime *runtime,
+			       unsigned int cond,
+			       snd_pcm_hw_param_t var,
+			       unsigned long step)
+{
+	return snd_pcm_hw_rule_add(runtime, cond, var, 
+				   snd_pcm_hw_rule_step, (void *) step,
+				   var, -1);
+}
+
+EXPORT_SYMBOL(snd_pcm_hw_constraint_step);
+
+static int snd_pcm_hw_rule_pow2(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule *rule)
+{
+	static unsigned int pow2_sizes[] = {
+		1<<0, 1<<1, 1<<2, 1<<3, 1<<4, 1<<5, 1<<6, 1<<7,
+		1<<8, 1<<9, 1<<10, 1<<11, 1<<12, 1<<13, 1<<14, 1<<15,
+		1<<16, 1<<17, 1<<18, 1<<19, 1<<20, 1<<21, 1<<22, 1<<23,
+		1<<24, 1<<25, 1<<26, 1<<27, 1<<28, 1<<29, 1<<30
+	};
+	return snd_interval_list(hw_param_interval(params, rule->var),
+				 ARRAY_SIZE(pow2_sizes), pow2_sizes, 0);
+}		
+
+/**
+ * snd_pcm_hw_constraint_pow2 - add a hw constraint power-of-2 rule
+ * @runtime: PCM runtime instance
+ * @cond: condition bits
+ * @var: hw_params variable to apply the power-of-2 constraint
+ */
+int snd_pcm_hw_constraint_pow2(struct snd_pcm_runtime *runtime,
+			       unsigned int cond,
+			       snd_pcm_hw_param_t var)
+{
+	return snd_pcm_hw_rule_add(runtime, cond, var, 
+				   snd_pcm_hw_rule_pow2, NULL,
+				   var, -1);
+}
+
+EXPORT_SYMBOL(snd_pcm_hw_constraint_pow2);
+
+static void _snd_pcm_hw_param_any(struct snd_pcm_hw_params *params,
+				  snd_pcm_hw_param_t var)
+{
+	if (hw_is_mask(var)) {
+		snd_mask_any(hw_param_mask(params, var));
+		params->cmask |= 1 << var;
+		params->rmask |= 1 << var;
+		return;
+	}
+	if (hw_is_interval(var)) {
+		snd_interval_any(hw_param_interval(params, var));
+		params->cmask |= 1 << var;
+		params->rmask |= 1 << var;
+		return;
+	}
+	snd_BUG();
+}
+
+void _snd_pcm_hw_params_any(struct snd_pcm_hw_params *params)
+{
+	unsigned int k;
+	memset(params, 0, sizeof(*params));
+	for (k = SNDRV_PCM_HW_PARAM_FIRST_MASK; k <= SNDRV_PCM_HW_PARAM_LAST_MASK; k++)
+		_snd_pcm_hw_param_any(params, k);
+	for (k = SNDRV_PCM_HW_PARAM_FIRST_INTERVAL; k <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++)
+		_snd_pcm_hw_param_any(params, k);
+	params->info = ~0U;
+}
+
+EXPORT_SYMBOL(_snd_pcm_hw_params_any);
+
+/**
+ * snd_pcm_hw_param_value - return @params field @var value
+ * @params: the hw_params instance
+ * @var: parameter to retrieve
+ * @dir: pointer to the direction (-1,0,1) or %NULL
+ *
+ * Return the value for field @var if it's fixed in configuration space
+ * defined by @params. Return -%EINVAL otherwise.
+ */
+int snd_pcm_hw_param_value(const struct snd_pcm_hw_params *params,
+			   snd_pcm_hw_param_t var, int *dir)
+{
+	if (hw_is_mask(var)) {
+		const struct snd_mask *mask = hw_param_mask_c(params, var);
+		if (!snd_mask_single(mask))
+			return -EINVAL;
+		if (dir)
+			*dir = 0;
+		return snd_mask_value(mask);
+	}
+	if (hw_is_interval(var)) {
+		const struct snd_interval *i = hw_param_interval_c(params, var);
+		if (!snd_interval_single(i))
+			return -EINVAL;
+		if (dir)
+			*dir = i->openmin;
+		return snd_interval_value(i);
+	}
+	return -EINVAL;
+}
+
+EXPORT_SYMBOL(snd_pcm_hw_param_value);
+
+void _snd_pcm_hw_param_setempty(struct snd_pcm_hw_params *params,
+				snd_pcm_hw_param_t var)
+{
+	if (hw_is_mask(var)) {
+		snd_mask_none(hw_param_mask(params, var));
+		params->cmask |= 1 << var;
+		params->rmask |= 1 << var;
+	} else if (hw_is_interval(var)) {
+		snd_interval_none(hw_param_interval(params, var));
+		params->cmask |= 1 << var;
+		params->rmask |= 1 << var;
+	} else {
+		snd_BUG();
+	}
+}
+
+EXPORT_SYMBOL(_snd_pcm_hw_param_setempty);
+
+static int _snd_pcm_hw_param_first(struct snd_pcm_hw_params *params,
+				   snd_pcm_hw_param_t var)
+{
+	int changed;
+	if (hw_is_mask(var))
+		changed = snd_mask_refine_first(hw_param_mask(params, var));
+	else if (hw_is_interval(var))
+		changed = snd_interval_refine_first(hw_param_interval(params, var));
+	else
+		return -EINVAL;
+	if (changed) {
+		params->cmask |= 1 << var;
+		params->rmask |= 1 << var;
+	}
+	return changed;
+}
+
+
+/**
+ * snd_pcm_hw_param_first - refine config space and return minimum value
+ * @pcm: PCM instance
+ * @params: the hw_params instance
+ * @var: parameter to retrieve
+ * @dir: pointer to the direction (-1,0,1) or %NULL
+ *
+ * Inside configuration space defined by @params remove from @var all
+ * values > minimum. Reduce configuration space accordingly.
+ * Return the minimum.
+ */
+int snd_pcm_hw_param_first(struct snd_pcm_substream *pcm, 
+			   struct snd_pcm_hw_params *params, 
+			   snd_pcm_hw_param_t var, int *dir)
+{
+	int changed = _snd_pcm_hw_param_first(params, var);
+	if (changed < 0)
+		return changed;
+	if (params->rmask) {
+		int err = snd_pcm_hw_refine(pcm, params);
+		if (snd_BUG_ON(err < 0))
+			return err;
+	}
+	return snd_pcm_hw_param_value(params, var, dir);
+}
+
+EXPORT_SYMBOL(snd_pcm_hw_param_first);
+
+static int _snd_pcm_hw_param_last(struct snd_pcm_hw_params *params,
+				  snd_pcm_hw_param_t var)
+{
+	int changed;
+	if (hw_is_mask(var))
+		changed = snd_mask_refine_last(hw_param_mask(params, var));
+	else if (hw_is_interval(var))
+		changed = snd_interval_refine_last(hw_param_interval(params, var));
+	else
+		return -EINVAL;
+	if (changed) {
+		params->cmask |= 1 << var;
+		params->rmask |= 1 << var;
+	}
+	return changed;
+}
+
+
+/**
+ * snd_pcm_hw_param_last - refine config space and return maximum value
+ * @pcm: PCM instance
+ * @params: the hw_params instance
+ * @var: parameter to retrieve
+ * @dir: pointer to the direction (-1,0,1) or %NULL
+ *
+ * Inside configuration space defined by @params remove from @var all
+ * values < maximum. Reduce configuration space accordingly.
+ * Return the maximum.
+ */
+int snd_pcm_hw_param_last(struct snd_pcm_substream *pcm, 
+			  struct snd_pcm_hw_params *params,
+			  snd_pcm_hw_param_t var, int *dir)
+{
+	int changed = _snd_pcm_hw_param_last(params, var);
+	if (changed < 0)
+		return changed;
+	if (params->rmask) {
+		int err = snd_pcm_hw_refine(pcm, params);
+		if (snd_BUG_ON(err < 0))
+			return err;
+	}
+	return snd_pcm_hw_param_value(params, var, dir);
+}
+
+EXPORT_SYMBOL(snd_pcm_hw_param_last);
+
+/**
+ * snd_pcm_hw_param_choose - choose a configuration defined by @params
+ * @pcm: PCM instance
+ * @params: the hw_params instance
+ *
+ * Choose one configuration from configuration space defined by @params.
+ * The configuration chosen is that obtained fixing in this order:
+ * first access, first format, first subformat, min channels,
+ * min rate, min period time, max buffer size, min tick time
+ */
+int snd_pcm_hw_params_choose(struct snd_pcm_substream *pcm,
+			     struct snd_pcm_hw_params *params)
+{
+	static int vars[] = {
+		SNDRV_PCM_HW_PARAM_ACCESS,
+		SNDRV_PCM_HW_PARAM_FORMAT,
+		SNDRV_PCM_HW_PARAM_SUBFORMAT,
+		SNDRV_PCM_HW_PARAM_CHANNELS,
+		SNDRV_PCM_HW_PARAM_RATE,
+		SNDRV_PCM_HW_PARAM_PERIOD_TIME,
+		SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
+		SNDRV_PCM_HW_PARAM_TICK_TIME,
+		-1
+	};
+	int err, *v;
+
+	for (v = vars; *v != -1; v++) {
+		if (*v != SNDRV_PCM_HW_PARAM_BUFFER_SIZE)
+			err = snd_pcm_hw_param_first(pcm, params, *v, NULL);
+		else
+			err = snd_pcm_hw_param_last(pcm, params, *v, NULL);
+		if (snd_BUG_ON(err < 0))
+			return err;
+	}
+	return 0;
+}
+
+static int snd_pcm_lib_ioctl_reset(struct snd_pcm_substream *substream,
+				   void *arg)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	unsigned long flags;
+	snd_pcm_stream_lock_irqsave(substream, flags);
+	if (snd_pcm_running(substream) &&
+	    snd_pcm_update_hw_ptr(substream) >= 0)
+		runtime->status->hw_ptr %= runtime->buffer_size;
+	else
+		runtime->status->hw_ptr = 0;
+	snd_pcm_stream_unlock_irqrestore(substream, flags);
+	return 0;
+}
+
+static int snd_pcm_lib_ioctl_channel_info(struct snd_pcm_substream *substream,
+					  void *arg)
+{
+	struct snd_pcm_channel_info *info = arg;
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	int width;
+	if (!(runtime->info & SNDRV_PCM_INFO_MMAP)) {
+		info->offset = -1;
+		return 0;
+	}
+	width = snd_pcm_format_physical_width(runtime->format);
+	if (width < 0)
+		return width;
+	info->offset = 0;
+	switch (runtime->access) {
+	case SNDRV_PCM_ACCESS_MMAP_INTERLEAVED:
+	case SNDRV_PCM_ACCESS_RW_INTERLEAVED:
+		info->first = info->channel * width;
+		info->step = runtime->channels * width;
+		break;
+	case SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED:
+	case SNDRV_PCM_ACCESS_RW_NONINTERLEAVED:
+	{
+		size_t size = runtime->dma_bytes / runtime->channels;
+		info->first = info->channel * size * 8;
+		info->step = width;
+		break;
+	}
+	default:
+		snd_BUG();
+		break;
+	}
+	return 0;
+}
+
+static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream,
+				       void *arg)
+{
+	struct snd_pcm_hw_params *params = arg;
+	snd_pcm_format_t format;
+	int channels, width;
+
+	params->fifo_size = substream->runtime->hw.fifo_size;
+	if (!(substream->runtime->hw.info & SNDRV_PCM_INFO_FIFO_IN_FRAMES)) {
+		format = params_format(params);
+		channels = params_channels(params);
+		width = snd_pcm_format_physical_width(format);
+		params->fifo_size /= width * channels;
+	}
+	return 0;
+}
+
+/**
+ * snd_pcm_lib_ioctl - a generic PCM ioctl callback
+ * @substream: the pcm substream instance
+ * @cmd: ioctl command
+ * @arg: ioctl argument
+ *
+ * Processes the generic ioctl commands for PCM.
+ * Can be passed as the ioctl callback for PCM ops.
+ *
+ * Returns zero if successful, or a negative error code on failure.
+ */
+int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream,
+		      unsigned int cmd, void *arg)
+{
+	switch (cmd) {
+	case SNDRV_PCM_IOCTL1_INFO:
+		return 0;
+	case SNDRV_PCM_IOCTL1_RESET:
+		return snd_pcm_lib_ioctl_reset(substream, arg);
+	case SNDRV_PCM_IOCTL1_CHANNEL_INFO:
+		return snd_pcm_lib_ioctl_channel_info(substream, arg);
+	case SNDRV_PCM_IOCTL1_FIFO_SIZE:
+		return snd_pcm_lib_ioctl_fifo_size(substream, arg);
+	}
+	return -ENXIO;
+}
+
+EXPORT_SYMBOL(snd_pcm_lib_ioctl);
+
+/**
+ * snd_pcm_period_elapsed - update the pcm status for the next period
+ * @substream: the pcm substream instance
+ *
+ * This function is called from the interrupt handler when the
+ * PCM has processed the period size.  It will update the current
+ * pointer, wake up sleepers, etc.
+ *
+ * Even if more than one periods have elapsed since the last call, you
+ * have to call this only once.
+ */
+void snd_pcm_period_elapsed(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_runtime *runtime;
+	unsigned long flags;
+
+	if (PCM_RUNTIME_CHECK(substream))
+		return;
+	runtime = substream->runtime;
+
+	if (runtime->transfer_ack_begin)
+		runtime->transfer_ack_begin(substream);
+
+	//giovanni snd_pcm_stream_lock_irqsave(substream, flags); //giovanni
+	if (!snd_pcm_running(substream) ||
+	    snd_pcm_update_hw_ptr0(substream, 1) < 0)
+		goto _end;
+
+	if (substream->timer_running)
+		snd_timer_interrupt(substream->timer, 1);
+ _end:
+	//giovanni snd_pcm_stream_unlock_irqrestore(substream, flags); //giovanni
+	if (runtime->transfer_ack_end)
+		runtime->transfer_ack_end(substream);
+	kill_fasync(&runtime->fasync, SIGIO, POLL_IN);
+}
+
+EXPORT_SYMBOL(snd_pcm_period_elapsed);
+
+/*
+ * Wait until avail_min data becomes available
+ * Returns a negative error code if any error occurs during operation.
+ * The available space is stored on availp.  When err = 0 and avail = 0
+ * on the capture stream, it indicates the stream is in DRAINING state.
+ */
+static int wait_for_avail_min(struct snd_pcm_substream *substream,
+			      snd_pcm_uframes_t *availp)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	int is_playback = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
+	wait_queue_t wait;
+	int err = 0;
+	snd_pcm_uframes_t avail = 0;
+	long tout;
+
+	init_waitqueue_entry(&wait, current);
+	add_wait_queue(&runtime->tsleep, &wait);
+	for (;;) {
+		if (signal_pending(current)) {
+			err = -ERESTARTSYS;
+			break;
+		}
+		set_current_state(TASK_INTERRUPTIBLE);
+		//giovanni snd_pcm_stream_unlock_irq(substream);
+		tout = schedule_timeout(msecs_to_jiffies(10000));
+		//giovanni snd_pcm_stream_lock_irq(substream);
+		switch (runtime->status->state) {
+		case SNDRV_PCM_STATE_SUSPENDED:
+			err = -ESTRPIPE;
+			goto _endloop;
+		case SNDRV_PCM_STATE_XRUN:
+			err = -EPIPE;
+			goto _endloop;
+		case SNDRV_PCM_STATE_DRAINING:
+			if (is_playback)
+				err = -EPIPE;
+			else 
+				avail = 0; /* indicate draining */
+			goto _endloop;
+		case SNDRV_PCM_STATE_OPEN:
+		case SNDRV_PCM_STATE_SETUP:
+		case SNDRV_PCM_STATE_DISCONNECTED:
+			err = -EBADFD;
+			goto _endloop;
+		}
+		if (!tout) {
+			snd_printd("%s write error (DMA or IRQ trouble?)\n",
+				   is_playback ? "playback" : "capture");
+			err = -EIO;
+			break;
+		}
+		if (is_playback)
+			avail = snd_pcm_playback_avail(runtime);
+		else
+			avail = snd_pcm_capture_avail(runtime);
+		if (avail >= runtime->control->avail_min)
+			break;
+	}
+ _endloop:
+	remove_wait_queue(&runtime->tsleep, &wait);
+	*availp = avail;
+	return err;
+}
+	
+static int snd_pcm_lib_write_transfer(struct snd_pcm_substream *substream,
+				      unsigned int hwoff,
+				      unsigned long data, unsigned int off,
+				      snd_pcm_uframes_t frames)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	int err;
+	char __user *buf = (char __user *) data + frames_to_bytes(runtime, off);
+	if (substream->ops->copy) {
+		if ((err = substream->ops->copy(substream, -1, hwoff, buf, frames)) < 0)
+			return err;
+	} else {
+		char *hwbuf = runtime->dma_area + frames_to_bytes(runtime, hwoff);
+		if (copy_from_user(hwbuf, buf, frames_to_bytes(runtime, frames)))
+			return -EFAULT;
+	}
+	return 0;
+}
+ 
+typedef int (*transfer_f)(struct snd_pcm_substream *substream, unsigned int hwoff,
+			  unsigned long data, unsigned int off,
+			  snd_pcm_uframes_t size);
+
+static snd_pcm_sframes_t snd_pcm_lib_write1(struct snd_pcm_substream *substream, 
+					    unsigned long data,
+					    snd_pcm_uframes_t size,
+					    int nonblock,
+					    transfer_f transfer)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	snd_pcm_uframes_t xfer = 0;
+	snd_pcm_uframes_t offset = 0;
+	int err = 0;
+
+	if (size == 0)
+		return 0;
+
+	//giovanni snd_pcm_stream_lock_irq(substream);
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_PREPARED:
+	case SNDRV_PCM_STATE_RUNNING:
+	case SNDRV_PCM_STATE_PAUSED:
+		break;
+	case SNDRV_PCM_STATE_XRUN:
+		err = -EPIPE;
+		goto _end_unlock;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		err = -ESTRPIPE;
+		goto _end_unlock;
+	default:
+		err = -EBADFD;
+		goto _end_unlock;
+	}
+
+	runtime->twake = 1;
+	while (size > 0) {
+		snd_pcm_uframes_t frames, appl_ptr, appl_ofs;
+		snd_pcm_uframes_t avail;
+		snd_pcm_uframes_t cont;
+		if (runtime->status->state == SNDRV_PCM_STATE_RUNNING)
+			snd_pcm_update_hw_ptr(substream);
+		avail = snd_pcm_playback_avail(runtime);
+		if (!avail) {
+			if (nonblock) {
+				err = -EAGAIN;
+				goto _end_unlock;
+			}
+			err = wait_for_avail_min(substream, &avail);
+			if (err < 0)
+				goto _end_unlock;
+		}
+		frames = size > avail ? avail : size;
+		cont = runtime->buffer_size - runtime->control->appl_ptr % runtime->buffer_size;
+		if (frames > cont)
+			frames = cont;
+		if (snd_BUG_ON(!frames)) {
+			runtime->twake = 0;
+			//giovanni snd_pcm_stream_unlock_irq(substream);
+			return -EINVAL;
+		}
+		appl_ptr = runtime->control->appl_ptr;
+		appl_ofs = appl_ptr % runtime->buffer_size;
+		//giovanni snd_pcm_stream_unlock_irq(substream);
+		err = transfer(substream, appl_ofs, data, offset, frames);
+		//giovanni snd_pcm_stream_lock_irq(substream);
+		if (err < 0)
+			goto _end_unlock;
+		switch (runtime->status->state) {
+		case SNDRV_PCM_STATE_XRUN:
+			err = -EPIPE;
+			goto _end_unlock;
+		case SNDRV_PCM_STATE_SUSPENDED:
+			err = -ESTRPIPE;
+			goto _end_unlock;
+		default:
+			break;
+		}
+		appl_ptr += frames;
+		if (appl_ptr >= runtime->boundary)
+			appl_ptr -= runtime->boundary;
+		runtime->control->appl_ptr = appl_ptr;
+		if (substream->ops->ack)
+			substream->ops->ack(substream);
+
+		offset += frames;
+		size -= frames;
+		xfer += frames;
+		if (runtime->status->state == SNDRV_PCM_STATE_PREPARED &&
+		    snd_pcm_playback_hw_avail(runtime) >= (snd_pcm_sframes_t)runtime->start_threshold) {
+			err = snd_pcm_start(substream);
+			if (err < 0)
+				goto _end_unlock;
+		}
+	}
+ _end_unlock:
+	runtime->twake = 0;
+	if (xfer > 0 && err >= 0)
+		snd_pcm_update_state(substream, runtime);
+	//giovanni snd_pcm_stream_unlock_irq(substream);
+	return xfer > 0 ? (snd_pcm_sframes_t)xfer : err;
+}
+
+/* sanity-check for read/write methods */
+static int pcm_sanity_check(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_runtime *runtime;
+	if (PCM_RUNTIME_CHECK(substream))
+		return -ENXIO;
+	runtime = substream->runtime;
+	if (snd_BUG_ON(!substream->ops->copy && !runtime->dma_area))
+		return -EINVAL;
+	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
+		return -EBADFD;
+	return 0;
+}
+
+snd_pcm_sframes_t snd_pcm_lib_write(struct snd_pcm_substream *substream, const void __user *buf, snd_pcm_uframes_t size)
+{
+	struct snd_pcm_runtime *runtime;
+	int nonblock;
+	int err;
+
+	err = pcm_sanity_check(substream);
+	if (err < 0)
+		return err;
+	runtime = substream->runtime;
+	nonblock = !!(substream->f_flags & O_NONBLOCK);
+
+	if (runtime->access != SNDRV_PCM_ACCESS_RW_INTERLEAVED &&
+	    runtime->channels > 1)
+		return -EINVAL;
+	return snd_pcm_lib_write1(substream, (unsigned long)buf, size, nonblock,
+				  snd_pcm_lib_write_transfer);
+}
+
+EXPORT_SYMBOL(snd_pcm_lib_write);
+
+static int snd_pcm_lib_writev_transfer(struct snd_pcm_substream *substream,
+				       unsigned int hwoff,
+				       unsigned long data, unsigned int off,
+				       snd_pcm_uframes_t frames)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	int err;
+	void __user **bufs = (void __user **)data;
+	int channels = runtime->channels;
+	int c;
+	if (substream->ops->copy) {
+		if (snd_BUG_ON(!substream->ops->silence))
+			return -EINVAL;
+		for (c = 0; c < channels; ++c, ++bufs) {
+			if (*bufs == NULL) {
+				if ((err = substream->ops->silence(substream, c, hwoff, frames)) < 0)
+					return err;
+			} else {
+				char __user *buf = *bufs + samples_to_bytes(runtime, off);
+				if ((err = substream->ops->copy(substream, c, hwoff, buf, frames)) < 0)
+					return err;
+			}
+		}
+	} else {
+		/* default transfer behaviour */
+		size_t dma_csize = runtime->dma_bytes / channels;
+		for (c = 0; c < channels; ++c, ++bufs) {
+			char *hwbuf = runtime->dma_area + (c * dma_csize) + samples_to_bytes(runtime, hwoff);
+			if (*bufs == NULL) {
+				snd_pcm_format_set_silence(runtime->format, hwbuf, frames);
+			} else {
+				char __user *buf = *bufs + samples_to_bytes(runtime, off);
+				if (copy_from_user(hwbuf, buf, samples_to_bytes(runtime, frames)))
+					return -EFAULT;
+			}
+		}
+	}
+	return 0;
+}
+ 
+snd_pcm_sframes_t snd_pcm_lib_writev(struct snd_pcm_substream *substream,
+				     void __user **bufs,
+				     snd_pcm_uframes_t frames)
+{
+	struct snd_pcm_runtime *runtime;
+	int nonblock;
+	int err;
+
+	err = pcm_sanity_check(substream);
+	if (err < 0)
+		return err;
+	runtime = substream->runtime;
+	nonblock = !!(substream->f_flags & O_NONBLOCK);
+
+	if (runtime->access != SNDRV_PCM_ACCESS_RW_NONINTERLEAVED)
+		return -EINVAL;
+	return snd_pcm_lib_write1(substream, (unsigned long)bufs, frames,
+				  nonblock, snd_pcm_lib_writev_transfer);
+}
+
+EXPORT_SYMBOL(snd_pcm_lib_writev);
+
+static int snd_pcm_lib_read_transfer(struct snd_pcm_substream *substream, 
+				     unsigned int hwoff,
+				     unsigned long data, unsigned int off,
+				     snd_pcm_uframes_t frames)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	int err;
+	char __user *buf = (char __user *) data + frames_to_bytes(runtime, off);
+	if (substream->ops->copy) {
+		if ((err = substream->ops->copy(substream, -1, hwoff, buf, frames)) < 0)
+			return err;
+	} else {
+		char *hwbuf = runtime->dma_area + frames_to_bytes(runtime, hwoff);
+		if (copy_to_user(buf, hwbuf, frames_to_bytes(runtime, frames)))
+			return -EFAULT;
+	}
+	return 0;
+}
+
+static snd_pcm_sframes_t snd_pcm_lib_read1(struct snd_pcm_substream *substream,
+					   unsigned long data,
+					   snd_pcm_uframes_t size,
+					   int nonblock,
+					   transfer_f transfer)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	snd_pcm_uframes_t xfer = 0;
+	snd_pcm_uframes_t offset = 0;
+	int err = 0;
+
+	if (size == 0)
+		return 0;
+
+	//giovanni snd_pcm_stream_lock_irq(substream);
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_PREPARED:
+		if (size >= runtime->start_threshold) {
+			err = snd_pcm_start(substream);
+			if (err < 0)
+				goto _end_unlock;
+		}
+		break;
+	case SNDRV_PCM_STATE_DRAINING:
+	case SNDRV_PCM_STATE_RUNNING:
+	case SNDRV_PCM_STATE_PAUSED:
+		break;
+	case SNDRV_PCM_STATE_XRUN:
+		err = -EPIPE;
+		goto _end_unlock;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		err = -ESTRPIPE;
+		goto _end_unlock;
+	default:
+		err = -EBADFD;
+		goto _end_unlock;
+	}
+
+	runtime->twake = 1;
+	while (size > 0) {
+		snd_pcm_uframes_t frames, appl_ptr, appl_ofs;
+		snd_pcm_uframes_t avail;
+		snd_pcm_uframes_t cont;
+		if (runtime->status->state == SNDRV_PCM_STATE_RUNNING)
+			snd_pcm_update_hw_ptr(substream);
+		avail = snd_pcm_capture_avail(runtime);
+		if (!avail) {
+			if (runtime->status->state ==
+			    SNDRV_PCM_STATE_DRAINING) {
+				snd_pcm_stop(substream, SNDRV_PCM_STATE_SETUP);
+				goto _end_unlock;
+			}
+			if (nonblock) {
+				err = -EAGAIN;
+				goto _end_unlock;
+			}
+			err = wait_for_avail_min(substream, &avail);
+			if (err < 0)
+				goto _end_unlock;
+			if (!avail)
+				continue; /* draining */
+		}
+		frames = size > avail ? avail : size;
+		cont = runtime->buffer_size - runtime->control->appl_ptr % runtime->buffer_size;
+		if (frames > cont)
+			frames = cont;
+		if (snd_BUG_ON(!frames)) {
+			runtime->twake = 0;
+			//giovanni snd_pcm_stream_unlock_irq(substream);
+			return -EINVAL;
+		}
+		appl_ptr = runtime->control->appl_ptr;
+		appl_ofs = appl_ptr % runtime->buffer_size;
+		//giovanni snd_pcm_stream_unlock_irq(substream);
+		err = transfer(substream, appl_ofs, data, offset, frames);
+		//giovanni snd_pcm_stream_lock_irq(substream);
+		if (err < 0)
+			goto _end_unlock;
+		switch (runtime->status->state) {
+		case SNDRV_PCM_STATE_XRUN:
+			err = -EPIPE;
+			goto _end_unlock;
+		case SNDRV_PCM_STATE_SUSPENDED:
+			err = -ESTRPIPE;
+			goto _end_unlock;
+		default:
+			break;
+		}
+		appl_ptr += frames;
+		if (appl_ptr >= runtime->boundary)
+			appl_ptr -= runtime->boundary;
+		runtime->control->appl_ptr = appl_ptr;
+		if (substream->ops->ack)
+			substream->ops->ack(substream);
+
+		offset += frames;
+		size -= frames;
+		xfer += frames;
+	}
+ _end_unlock:
+	runtime->twake = 0;
+	if (xfer > 0 && err >= 0)
+		snd_pcm_update_state(substream, runtime);
+	//giovanni snd_pcm_stream_unlock_irq(substream);
+	return xfer > 0 ? (snd_pcm_sframes_t)xfer : err;
+}
+
+snd_pcm_sframes_t snd_pcm_lib_read(struct snd_pcm_substream *substream, void __user *buf, snd_pcm_uframes_t size)
+{
+	struct snd_pcm_runtime *runtime;
+	int nonblock;
+	int err;
+	
+	err = pcm_sanity_check(substream);
+	if (err < 0)
+		return err;
+	runtime = substream->runtime;
+	nonblock = !!(substream->f_flags & O_NONBLOCK);
+	if (runtime->access != SNDRV_PCM_ACCESS_RW_INTERLEAVED)
+		return -EINVAL;
+	return snd_pcm_lib_read1(substream, (unsigned long)buf, size, nonblock, snd_pcm_lib_read_transfer);
+}
+
+EXPORT_SYMBOL(snd_pcm_lib_read);
+
+static int snd_pcm_lib_readv_transfer(struct snd_pcm_substream *substream,
+				      unsigned int hwoff,
+				      unsigned long data, unsigned int off,
+				      snd_pcm_uframes_t frames)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	int err;
+	void __user **bufs = (void __user **)data;
+	int channels = runtime->channels;
+	int c;
+	if (substream->ops->copy) {
+		for (c = 0; c < channels; ++c, ++bufs) {
+			char __user *buf;
+			if (*bufs == NULL)
+				continue;
+			buf = *bufs + samples_to_bytes(runtime, off);
+			if ((err = substream->ops->copy(substream, c, hwoff, buf, frames)) < 0)
+				return err;
+		}
+	} else {
+		snd_pcm_uframes_t dma_csize = runtime->dma_bytes / channels;
+		for (c = 0; c < channels; ++c, ++bufs) {
+			char *hwbuf;
+			char __user *buf;
+			if (*bufs == NULL)
+				continue;
+
+			hwbuf = runtime->dma_area + (c * dma_csize) + samples_to_bytes(runtime, hwoff);
+			buf = *bufs + samples_to_bytes(runtime, off);
+			if (copy_to_user(buf, hwbuf, samples_to_bytes(runtime, frames)))
+				return -EFAULT;
+		}
+	}
+	return 0;
+}
+ 
+snd_pcm_sframes_t snd_pcm_lib_readv(struct snd_pcm_substream *substream,
+				    void __user **bufs,
+				    snd_pcm_uframes_t frames)
+{
+	struct snd_pcm_runtime *runtime;
+	int nonblock;
+	int err;
+
+	err = pcm_sanity_check(substream);
+	if (err < 0)
+		return err;
+	runtime = substream->runtime;
+	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
+		return -EBADFD;
+
+	nonblock = !!(substream->f_flags & O_NONBLOCK);
+	if (runtime->access != SNDRV_PCM_ACCESS_RW_NONINTERLEAVED)
+		return -EINVAL;
+	return snd_pcm_lib_read1(substream, (unsigned long)bufs, frames, nonblock, snd_pcm_lib_readv_transfer);
+}
+
+EXPORT_SYMBOL(snd_pcm_lib_readv);
diff --git a/src/mod/endpoints/mod_skypopen/alsa/pcm_native.c b/src/mod/endpoints/mod_skypopen/alsa/pcm_native.c
new file mode 100644
index 0000000000..fe9d42ed42
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/alsa/pcm_native.c
@@ -0,0 +1,3493 @@
+/*
+ *  Digital Audio (PCM) abstract layer
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <linux/mm.h>
+#include <linux/file.h>
+#include <linux/slab.h>
+#include <linux/smp_lock.h>
+#include <linux/time.h>
+#include <linux/pm_qos_params.h>
+#include <linux/uio.h>
+#include <linux/dma-mapping.h>
+#include <linux/math64.h>
+#include <sound/core.h>
+#include <sound/control.h>
+#include <sound/info.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/timer.h>
+#include <sound/minors.h>
+#include <asm/io.h>
+
+/*
+ *  Compatibility
+ */
+
+struct snd_pcm_hw_params_old {
+	unsigned int flags;
+	unsigned int masks[SNDRV_PCM_HW_PARAM_SUBFORMAT -
+			   SNDRV_PCM_HW_PARAM_ACCESS + 1];
+	struct snd_interval intervals[SNDRV_PCM_HW_PARAM_TICK_TIME -
+					SNDRV_PCM_HW_PARAM_SAMPLE_BITS + 1];
+	unsigned int rmask;
+	unsigned int cmask;
+	unsigned int info;
+	unsigned int msbits;
+	unsigned int rate_num;
+	unsigned int rate_den;
+	snd_pcm_uframes_t fifo_size;
+	unsigned char reserved[64];
+};
+
+#ifdef CONFIG_SND_SUPPORT_OLD_API
+#define SNDRV_PCM_IOCTL_HW_REFINE_OLD _IOWR('A', 0x10, struct snd_pcm_hw_params_old)
+#define SNDRV_PCM_IOCTL_HW_PARAMS_OLD _IOWR('A', 0x11, struct snd_pcm_hw_params_old)
+
+static int snd_pcm_hw_refine_old_user(struct snd_pcm_substream *substream,
+				      struct snd_pcm_hw_params_old __user * _oparams);
+static int snd_pcm_hw_params_old_user(struct snd_pcm_substream *substream,
+				      struct snd_pcm_hw_params_old __user * _oparams);
+#endif
+static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream);
+
+/*
+ *
+ */
+
+DEFINE_RWLOCK(snd_pcm_link_rwlock);
+EXPORT_SYMBOL(snd_pcm_link_rwlock);
+
+static DECLARE_RWSEM(snd_pcm_link_rwsem);
+
+static inline mm_segment_t snd_enter_user(void)
+{
+	mm_segment_t fs = get_fs();
+	set_fs(get_ds());
+	return fs;
+}
+
+static inline void snd_leave_user(mm_segment_t fs)
+{
+	set_fs(fs);
+}
+
+
+
+int snd_pcm_info(struct snd_pcm_substream *substream, struct snd_pcm_info *info)
+{
+	struct snd_pcm_runtime *runtime;
+	struct snd_pcm *pcm = substream->pcm;
+	struct snd_pcm_str *pstr = substream->pstr;
+
+	memset(info, 0, sizeof(*info));
+	info->card = pcm->card->number;
+	info->device = pcm->device;
+	info->stream = substream->stream;
+	info->subdevice = substream->number;
+	strlcpy(info->id, pcm->id, sizeof(info->id));
+	strlcpy(info->name, pcm->name, sizeof(info->name));
+	info->dev_class = pcm->dev_class;
+	info->dev_subclass = pcm->dev_subclass;
+	info->subdevices_count = pstr->substream_count;
+	info->subdevices_avail = pstr->substream_count - pstr->substream_opened;
+	strlcpy(info->subname, substream->name, sizeof(info->subname));
+	runtime = substream->runtime;
+	/* AB: FIXME!!! This is definitely nonsense */
+	if (runtime) {
+		info->sync = runtime->sync;
+		substream->ops->ioctl(substream, SNDRV_PCM_IOCTL1_INFO, info);
+	}
+	return 0;
+}
+
+int snd_pcm_info_user(struct snd_pcm_substream *substream,
+		      struct snd_pcm_info __user * _info)
+{
+	struct snd_pcm_info *info;
+	int err;
+
+	info = kmalloc(sizeof(*info), GFP_KERNEL);
+	if (! info)
+		return -ENOMEM;
+	err = snd_pcm_info(substream, info);
+	if (err >= 0) {
+		if (copy_to_user(_info, info, sizeof(*info)))
+			err = -EFAULT;
+	}
+	kfree(info);
+	return err;
+}
+
+#undef RULES_DEBUG
+
+#ifdef RULES_DEBUG
+#define HW_PARAM(v) [SNDRV_PCM_HW_PARAM_##v] = #v
+char *snd_pcm_hw_param_names[] = {
+	HW_PARAM(ACCESS),
+	HW_PARAM(FORMAT),
+	HW_PARAM(SUBFORMAT),
+	HW_PARAM(SAMPLE_BITS),
+	HW_PARAM(FRAME_BITS),
+	HW_PARAM(CHANNELS),
+	HW_PARAM(RATE),
+	HW_PARAM(PERIOD_TIME),
+	HW_PARAM(PERIOD_SIZE),
+	HW_PARAM(PERIOD_BYTES),
+	HW_PARAM(PERIODS),
+	HW_PARAM(BUFFER_TIME),
+	HW_PARAM(BUFFER_SIZE),
+	HW_PARAM(BUFFER_BYTES),
+	HW_PARAM(TICK_TIME),
+};
+#endif
+
+int snd_pcm_hw_refine(struct snd_pcm_substream *substream, 
+		      struct snd_pcm_hw_params *params)
+{
+	unsigned int k;
+	struct snd_pcm_hardware *hw;
+	struct snd_interval *i = NULL;
+	struct snd_mask *m = NULL;
+	struct snd_pcm_hw_constraints *constrs = &substream->runtime->hw_constraints;
+	unsigned int rstamps[constrs->rules_num];
+	unsigned int vstamps[SNDRV_PCM_HW_PARAM_LAST_INTERVAL + 1];
+	unsigned int stamp = 2;
+	int changed, again;
+
+	params->info = 0;
+	params->fifo_size = 0;
+	if (params->rmask & (1 << SNDRV_PCM_HW_PARAM_SAMPLE_BITS))
+		params->msbits = 0;
+	if (params->rmask & (1 << SNDRV_PCM_HW_PARAM_RATE)) {
+		params->rate_num = 0;
+		params->rate_den = 0;
+	}
+
+	for (k = SNDRV_PCM_HW_PARAM_FIRST_MASK; k <= SNDRV_PCM_HW_PARAM_LAST_MASK; k++) {
+		m = hw_param_mask(params, k);
+		if (snd_mask_empty(m))
+			return -EINVAL;
+		if (!(params->rmask & (1 << k)))
+			continue;
+#ifdef RULES_DEBUG
+		printk(KERN_DEBUG "%s = ", snd_pcm_hw_param_names[k]);
+		printk("%04x%04x%04x%04x -> ", m->bits[3], m->bits[2], m->bits[1], m->bits[0]);
+#endif
+		changed = snd_mask_refine(m, constrs_mask(constrs, k));
+#ifdef RULES_DEBUG
+		printk("%04x%04x%04x%04x\n", m->bits[3], m->bits[2], m->bits[1], m->bits[0]);
+#endif
+		if (changed)
+			params->cmask |= 1 << k;
+		if (changed < 0)
+			return changed;
+	}
+
+	for (k = SNDRV_PCM_HW_PARAM_FIRST_INTERVAL; k <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++) {
+		i = hw_param_interval(params, k);
+		if (snd_interval_empty(i))
+			return -EINVAL;
+		if (!(params->rmask & (1 << k)))
+			continue;
+#ifdef RULES_DEBUG
+		printk(KERN_DEBUG "%s = ", snd_pcm_hw_param_names[k]);
+		if (i->empty)
+			printk("empty");
+		else
+			printk("%c%u %u%c", 
+			       i->openmin ? '(' : '[', i->min,
+			       i->max, i->openmax ? ')' : ']');
+		printk(" -> ");
+#endif
+		changed = snd_interval_refine(i, constrs_interval(constrs, k));
+#ifdef RULES_DEBUG
+		if (i->empty)
+			printk("empty\n");
+		else 
+			printk("%c%u %u%c\n", 
+			       i->openmin ? '(' : '[', i->min,
+			       i->max, i->openmax ? ')' : ']');
+#endif
+		if (changed)
+			params->cmask |= 1 << k;
+		if (changed < 0)
+			return changed;
+	}
+
+	for (k = 0; k < constrs->rules_num; k++)
+		rstamps[k] = 0;
+	for (k = 0; k <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++) 
+		vstamps[k] = (params->rmask & (1 << k)) ? 1 : 0;
+	do {
+		again = 0;
+		for (k = 0; k < constrs->rules_num; k++) {
+			struct snd_pcm_hw_rule *r = &constrs->rules[k];
+			unsigned int d;
+			int doit = 0;
+			if (r->cond && !(r->cond & params->flags))
+				continue;
+			for (d = 0; r->deps[d] >= 0; d++) {
+				if (vstamps[r->deps[d]] > rstamps[k]) {
+					doit = 1;
+					break;
+				}
+			}
+			if (!doit)
+				continue;
+#ifdef RULES_DEBUG
+			printk(KERN_DEBUG "Rule %d [%p]: ", k, r->func);
+			if (r->var >= 0) {
+				printk("%s = ", snd_pcm_hw_param_names[r->var]);
+				if (hw_is_mask(r->var)) {
+					m = hw_param_mask(params, r->var);
+					printk("%x", *m->bits);
+				} else {
+					i = hw_param_interval(params, r->var);
+					if (i->empty)
+						printk("empty");
+					else
+						printk("%c%u %u%c", 
+						       i->openmin ? '(' : '[', i->min,
+						       i->max, i->openmax ? ')' : ']');
+				}
+			}
+#endif
+			changed = r->func(params, r);
+#ifdef RULES_DEBUG
+			if (r->var >= 0) {
+				printk(" -> ");
+				if (hw_is_mask(r->var))
+					printk("%x", *m->bits);
+				else {
+					if (i->empty)
+						printk("empty");
+					else
+						printk("%c%u %u%c", 
+						       i->openmin ? '(' : '[', i->min,
+						       i->max, i->openmax ? ')' : ']');
+				}
+			}
+			printk("\n");
+#endif
+			rstamps[k] = stamp;
+			if (changed && r->var >= 0) {
+				params->cmask |= (1 << r->var);
+				vstamps[r->var] = stamp;
+				again = 1;
+			}
+			if (changed < 0)
+				return changed;
+			stamp++;
+		}
+	} while (again);
+	if (!params->msbits) {
+		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);
+		if (snd_interval_single(i))
+			params->msbits = snd_interval_value(i);
+	}
+
+	if (!params->rate_den) {
+		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
+		if (snd_interval_single(i)) {
+			params->rate_num = snd_interval_value(i);
+			params->rate_den = 1;
+		}
+	}
+
+	hw = &substream->runtime->hw;
+	if (!params->info)
+		params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES;
+	if (!params->fifo_size) {
+		m = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
+		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
+		if (snd_mask_min(m) == snd_mask_max(m) &&
+                    snd_interval_min(i) == snd_interval_max(i)) {
+			changed = substream->ops->ioctl(substream,
+					SNDRV_PCM_IOCTL1_FIFO_SIZE, params);
+			if (changed < 0)
+				return changed;
+		}
+	}
+	params->rmask = 0;
+	return 0;
+}
+
+EXPORT_SYMBOL(snd_pcm_hw_refine);
+
+static int snd_pcm_hw_refine_user(struct snd_pcm_substream *substream,
+				  struct snd_pcm_hw_params __user * _params)
+{
+	struct snd_pcm_hw_params *params;
+	int err;
+
+	params = memdup_user(_params, sizeof(*params));
+	if (IS_ERR(params))
+		return PTR_ERR(params);
+
+	err = snd_pcm_hw_refine(substream, params);
+	if (copy_to_user(_params, params, sizeof(*params))) {
+		if (!err)
+			err = -EFAULT;
+	}
+
+	kfree(params);
+	return err;
+}
+
+static int period_to_usecs(struct snd_pcm_runtime *runtime)
+{
+	int usecs;
+
+	if (! runtime->rate)
+		return -1; /* invalid */
+
+	/* take 75% of period time as the deadline */
+	usecs = (750000 / runtime->rate) * runtime->period_size;
+	usecs += ((750000 % runtime->rate) * runtime->period_size) /
+		runtime->rate;
+
+	return usecs;
+}
+
+static int calc_boundary(struct snd_pcm_runtime *runtime)
+{
+	u_int64_t boundary;
+
+	boundary = (u_int64_t)runtime->buffer_size *
+		   (u_int64_t)runtime->period_size;
+#if BITS_PER_LONG < 64
+	/* try to find lowest common multiple for buffer and period */
+	if (boundary > LONG_MAX - runtime->buffer_size) {
+		u_int32_t remainder = -1;
+		u_int32_t divident = runtime->buffer_size;
+		u_int32_t divisor = runtime->period_size;
+		while (remainder) {
+			remainder = divident % divisor;
+			if (remainder) {
+				divident = divisor;
+				divisor = remainder;
+			}
+		}
+		boundary = div_u64(boundary, divisor);
+		if (boundary > LONG_MAX - runtime->buffer_size)
+			return -ERANGE;
+	}
+#endif
+	if (boundary == 0)
+		return -ERANGE;
+	runtime->boundary = boundary;
+	while (runtime->boundary * 2 <= LONG_MAX - runtime->buffer_size)
+		runtime->boundary *= 2;
+	return 0;
+}
+
+static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
+			     struct snd_pcm_hw_params *params)
+{
+	struct snd_pcm_runtime *runtime;
+	int err, usecs;
+	unsigned int bits;
+	snd_pcm_uframes_t frames;
+
+	if (PCM_RUNTIME_CHECK(substream))
+		return -ENXIO;
+	runtime = substream->runtime;
+	snd_pcm_stream_lock_irq(substream);
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_OPEN:
+	case SNDRV_PCM_STATE_SETUP:
+	case SNDRV_PCM_STATE_PREPARED:
+		break;
+	default:
+		snd_pcm_stream_unlock_irq(substream);
+		return -EBADFD;
+	}
+	snd_pcm_stream_unlock_irq(substream);
+#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
+	if (!substream->oss.oss)
+#endif
+		if (atomic_read(&substream->mmap_count))
+			return -EBADFD;
+
+	params->rmask = ~0U;
+	err = snd_pcm_hw_refine(substream, params);
+	if (err < 0)
+		goto _error;
+
+	err = snd_pcm_hw_params_choose(substream, params);
+	if (err < 0)
+		goto _error;
+
+	if (substream->ops->hw_params != NULL) {
+		err = substream->ops->hw_params(substream, params);
+		if (err < 0)
+			goto _error;
+	}
+
+	runtime->access = params_access(params);
+	runtime->format = params_format(params);
+	runtime->subformat = params_subformat(params);
+	runtime->channels = params_channels(params);
+	runtime->rate = params_rate(params);
+	runtime->period_size = params_period_size(params);
+	runtime->periods = params_periods(params);
+	runtime->buffer_size = params_buffer_size(params);
+	runtime->info = params->info;
+	runtime->rate_num = params->rate_num;
+	runtime->rate_den = params->rate_den;
+
+	bits = snd_pcm_format_physical_width(runtime->format);
+	runtime->sample_bits = bits;
+	bits *= runtime->channels;
+	runtime->frame_bits = bits;
+	frames = 1;
+	while (bits % 8 != 0) {
+		bits *= 2;
+		frames *= 2;
+	}
+	runtime->byte_align = bits / 8;
+	runtime->min_align = frames;
+
+	/* Default sw params */
+	runtime->tstamp_mode = SNDRV_PCM_TSTAMP_NONE;
+	runtime->period_step = 1;
+	runtime->control->avail_min = runtime->period_size;
+	runtime->start_threshold = 1;
+	runtime->stop_threshold = runtime->buffer_size;
+	runtime->silence_threshold = 0;
+	runtime->silence_size = 0;
+	err = calc_boundary(runtime);
+	if (err < 0)
+		goto _error;
+
+	snd_pcm_timer_resolution_change(substream);
+	runtime->status->state = SNDRV_PCM_STATE_SETUP;
+
+	pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY,
+				substream->latency_id);
+	if ((usecs = period_to_usecs(runtime)) >= 0)
+		pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY,
+					substream->latency_id, usecs);
+	return 0;
+ _error:
+	/* hardware might be unuseable from this time,
+	   so we force application to retry to set
+	   the correct hardware parameter settings */
+	runtime->status->state = SNDRV_PCM_STATE_OPEN;
+	if (substream->ops->hw_free != NULL)
+		substream->ops->hw_free(substream);
+	return err;
+}
+
+static int snd_pcm_hw_params_user(struct snd_pcm_substream *substream,
+				  struct snd_pcm_hw_params __user * _params)
+{
+	struct snd_pcm_hw_params *params;
+	int err;
+
+	params = memdup_user(_params, sizeof(*params));
+	if (IS_ERR(params))
+		return PTR_ERR(params);
+
+	err = snd_pcm_hw_params(substream, params);
+	if (copy_to_user(_params, params, sizeof(*params))) {
+		if (!err)
+			err = -EFAULT;
+	}
+
+	kfree(params);
+	return err;
+}
+
+static int snd_pcm_hw_free(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_runtime *runtime;
+	int result = 0;
+
+	if (PCM_RUNTIME_CHECK(substream))
+		return -ENXIO;
+	runtime = substream->runtime;
+	snd_pcm_stream_lock_irq(substream);
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_SETUP:
+	case SNDRV_PCM_STATE_PREPARED:
+		break;
+	default:
+		snd_pcm_stream_unlock_irq(substream);
+		return -EBADFD;
+	}
+	snd_pcm_stream_unlock_irq(substream);
+	if (atomic_read(&substream->mmap_count))
+		return -EBADFD;
+	if (substream->ops->hw_free)
+		result = substream->ops->hw_free(substream);
+	runtime->status->state = SNDRV_PCM_STATE_OPEN;
+	pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY,
+		substream->latency_id);
+	return result;
+}
+
+static int snd_pcm_sw_params(struct snd_pcm_substream *substream,
+			     struct snd_pcm_sw_params *params)
+{
+	struct snd_pcm_runtime *runtime;
+	int err;
+
+	if (PCM_RUNTIME_CHECK(substream))
+		return -ENXIO;
+	runtime = substream->runtime;
+	snd_pcm_stream_lock_irq(substream);
+	if (runtime->status->state == SNDRV_PCM_STATE_OPEN) {
+		snd_pcm_stream_unlock_irq(substream);
+		return -EBADFD;
+	}
+	snd_pcm_stream_unlock_irq(substream);
+
+	if (params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST)
+		return -EINVAL;
+	if (params->avail_min == 0)
+		return -EINVAL;
+	if (params->silence_size >= runtime->boundary) {
+		if (params->silence_threshold != 0)
+			return -EINVAL;
+	} else {
+		if (params->silence_size > params->silence_threshold)
+			return -EINVAL;
+		if (params->silence_threshold > runtime->buffer_size)
+			return -EINVAL;
+	}
+	err = 0;
+	snd_pcm_stream_lock_irq(substream);
+	runtime->tstamp_mode = params->tstamp_mode;
+	runtime->period_step = params->period_step;
+	runtime->control->avail_min = params->avail_min;
+	runtime->start_threshold = params->start_threshold;
+	runtime->stop_threshold = params->stop_threshold;
+	runtime->silence_threshold = params->silence_threshold;
+	runtime->silence_size = params->silence_size;
+        params->boundary = runtime->boundary;
+	if (snd_pcm_running(substream)) {
+		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
+		    runtime->silence_size > 0)
+			snd_pcm_playback_silence(substream, ULONG_MAX);
+		err = snd_pcm_update_state(substream, runtime);
+	}
+	snd_pcm_stream_unlock_irq(substream);
+	return err;
+}
+
+static int snd_pcm_sw_params_user(struct snd_pcm_substream *substream,
+				  struct snd_pcm_sw_params __user * _params)
+{
+	struct snd_pcm_sw_params params;
+	int err;
+	if (copy_from_user(&params, _params, sizeof(params)))
+		return -EFAULT;
+	err = snd_pcm_sw_params(substream, &params);
+	if (copy_to_user(_params, &params, sizeof(params)))
+		return -EFAULT;
+	return err;
+}
+
+int snd_pcm_status(struct snd_pcm_substream *substream,
+		   struct snd_pcm_status *status)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+
+	//giovanni snd_pcm_stream_lock_irq(substream);
+	status->state = runtime->status->state;
+	status->suspended_state = runtime->status->suspended_state;
+	if (status->state == SNDRV_PCM_STATE_OPEN)
+		goto _end;
+	status->trigger_tstamp = runtime->trigger_tstamp;
+	if (snd_pcm_running(substream)) {
+		snd_pcm_update_hw_ptr(substream);
+		if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) {
+			status->tstamp = runtime->status->tstamp;
+			goto _tstamp_end;
+		}
+	}
+	snd_pcm_gettime(runtime, &status->tstamp);
+ _tstamp_end:
+	status->appl_ptr = runtime->control->appl_ptr;
+	status->hw_ptr = runtime->status->hw_ptr;
+	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+		status->avail = snd_pcm_playback_avail(runtime);
+		if (runtime->status->state == SNDRV_PCM_STATE_RUNNING ||
+		    runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
+			status->delay = runtime->buffer_size - status->avail;
+			status->delay += runtime->delay;
+		} else
+			status->delay = 0;
+	} else {
+		status->avail = snd_pcm_capture_avail(runtime);
+		if (runtime->status->state == SNDRV_PCM_STATE_RUNNING)
+			status->delay = status->avail + runtime->delay;
+		else
+			status->delay = 0;
+	}
+	status->avail_max = runtime->avail_max;
+	status->overrange = runtime->overrange;
+	runtime->avail_max = 0;
+	runtime->overrange = 0;
+ _end:
+ 	//giovanni snd_pcm_stream_unlock_irq(substream);
+	return 0;
+}
+
+static int snd_pcm_status_user(struct snd_pcm_substream *substream,
+			       struct snd_pcm_status __user * _status)
+{
+	struct snd_pcm_status status;
+	int res;
+	
+	memset(&status, 0, sizeof(status));
+	res = snd_pcm_status(substream, &status);
+	if (res < 0)
+		return res;
+	if (copy_to_user(_status, &status, sizeof(status)))
+		return -EFAULT;
+	return 0;
+}
+
+static int snd_pcm_channel_info(struct snd_pcm_substream *substream,
+				struct snd_pcm_channel_info * info)
+{
+	struct snd_pcm_runtime *runtime;
+	unsigned int channel;
+	
+	channel = info->channel;
+	runtime = substream->runtime;
+	//giovanni snd_pcm_stream_lock_irq(substream);
+	if (runtime->status->state == SNDRV_PCM_STATE_OPEN) {
+		//giovanni snd_pcm_stream_unlock_irq(substream);
+		return -EBADFD;
+	}
+	//giovanni snd_pcm_stream_unlock_irq(substream);
+	if (channel >= runtime->channels)
+		return -EINVAL;
+	memset(info, 0, sizeof(*info));
+	info->channel = channel;
+	return substream->ops->ioctl(substream, SNDRV_PCM_IOCTL1_CHANNEL_INFO, info);
+}
+
+static int snd_pcm_channel_info_user(struct snd_pcm_substream *substream,
+				     struct snd_pcm_channel_info __user * _info)
+{
+	struct snd_pcm_channel_info info;
+	int res;
+	
+	if (copy_from_user(&info, _info, sizeof(info)))
+		return -EFAULT;
+	res = snd_pcm_channel_info(substream, &info);
+	if (res < 0)
+		return res;
+	if (copy_to_user(_info, &info, sizeof(info)))
+		return -EFAULT;
+	return 0;
+}
+
+static void snd_pcm_trigger_tstamp(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	if (runtime->trigger_master == NULL)
+		return;
+	if (runtime->trigger_master == substream) {
+		snd_pcm_gettime(runtime, &runtime->trigger_tstamp);
+	} else {
+		snd_pcm_trigger_tstamp(runtime->trigger_master);
+		runtime->trigger_tstamp = runtime->trigger_master->runtime->trigger_tstamp;
+	}
+	runtime->trigger_master = NULL;
+}
+
+struct action_ops {
+	int (*pre_action)(struct snd_pcm_substream *substream, int state);
+	int (*do_action)(struct snd_pcm_substream *substream, int state);
+	void (*undo_action)(struct snd_pcm_substream *substream, int state);
+	void (*post_action)(struct snd_pcm_substream *substream, int state);
+};
+
+/*
+ *  this functions is core for handling of linked stream
+ *  Note: the stream state might be changed also on failure
+ *  Note2: call with calling stream lock + link lock
+ */
+static int snd_pcm_action_group(struct action_ops *ops,
+				struct snd_pcm_substream *substream,
+				int state, int do_lock)
+{
+	struct snd_pcm_substream *s = NULL;
+	struct snd_pcm_substream *s1;
+	int res = 0;
+
+	snd_pcm_group_for_each_entry(s, substream) {
+		if (do_lock && s != substream)
+			spin_lock_nested(&s->self_group.lock,
+					 SINGLE_DEPTH_NESTING);
+		res = ops->pre_action(s, state);
+		if (res < 0)
+			goto _unlock;
+	}
+	snd_pcm_group_for_each_entry(s, substream) {
+		res = ops->do_action(s, state);
+		if (res < 0) {
+			if (ops->undo_action) {
+				snd_pcm_group_for_each_entry(s1, substream) {
+					if (s1 == s) /* failed stream */
+						break;
+					ops->undo_action(s1, state);
+				}
+			}
+			s = NULL; /* unlock all */
+			goto _unlock;
+		}
+	}
+	snd_pcm_group_for_each_entry(s, substream) {
+		ops->post_action(s, state);
+	}
+ _unlock:
+	if (do_lock) {
+		/* unlock streams */
+		snd_pcm_group_for_each_entry(s1, substream) {
+			if (s1 != substream)
+				spin_unlock(&s1->self_group.lock);
+			if (s1 == s)	/* end */
+				break;
+		}
+	}
+	return res;
+}
+
+/*
+ *  Note: call with stream lock
+ */
+static int snd_pcm_action_single(struct action_ops *ops,
+				 struct snd_pcm_substream *substream,
+				 int state)
+{
+	int res;
+	
+	res = ops->pre_action(substream, state);
+	if (res < 0)
+		return res;
+	res = ops->do_action(substream, state);
+	if (res == 0)
+		ops->post_action(substream, state);
+	else if (ops->undo_action)
+		ops->undo_action(substream, state);
+	return res;
+}
+
+/*
+ *  Note: call with stream lock
+ */
+static int snd_pcm_action(struct action_ops *ops,
+			  struct snd_pcm_substream *substream,
+			  int state)
+{
+	int res;
+
+	if (snd_pcm_stream_linked(substream)) {
+		if (!spin_trylock(&substream->group->lock)) {
+			spin_unlock(&substream->self_group.lock);
+			spin_lock(&substream->group->lock);
+			spin_lock(&substream->self_group.lock);
+		}
+		res = snd_pcm_action_group(ops, substream, state, 1);
+		spin_unlock(&substream->group->lock);
+	} else {
+		res = snd_pcm_action_single(ops, substream, state);
+	}
+	return res;
+}
+
+/*
+ *  Note: don't use any locks before
+ */
+static int snd_pcm_action_lock_irq(struct action_ops *ops,
+				   struct snd_pcm_substream *substream,
+				   int state)
+{
+	int res;
+
+	read_lock_irq(&snd_pcm_link_rwlock);
+	if (snd_pcm_stream_linked(substream)) {
+		spin_lock(&substream->group->lock);
+		spin_lock(&substream->self_group.lock);
+		res = snd_pcm_action_group(ops, substream, state, 1);
+		spin_unlock(&substream->self_group.lock);
+		spin_unlock(&substream->group->lock);
+	} else {
+		spin_lock(&substream->self_group.lock);
+		res = snd_pcm_action_single(ops, substream, state);
+		spin_unlock(&substream->self_group.lock);
+	}
+	read_unlock_irq(&snd_pcm_link_rwlock);
+	return res;
+}
+
+/*
+ */
+static int snd_pcm_action_nonatomic(struct action_ops *ops,
+				    struct snd_pcm_substream *substream,
+				    int state)
+{
+	int res;
+
+	down_read(&snd_pcm_link_rwsem);
+	if (snd_pcm_stream_linked(substream))
+		res = snd_pcm_action_group(ops, substream, state, 0);
+	else
+		res = snd_pcm_action_single(ops, substream, state);
+	up_read(&snd_pcm_link_rwsem);
+	return res;
+}
+
+/*
+ * start callbacks
+ */
+static int snd_pcm_pre_start(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	if (runtime->status->state != SNDRV_PCM_STATE_PREPARED)
+		return -EBADFD;
+	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
+	    !snd_pcm_playback_data(substream))
+		return -EPIPE;
+	runtime->trigger_master = substream;
+	return 0;
+}
+
+static int snd_pcm_do_start(struct snd_pcm_substream *substream, int state)
+{
+	if (substream->runtime->trigger_master != substream)
+		return 0;
+	return substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_START);
+}
+
+static void snd_pcm_undo_start(struct snd_pcm_substream *substream, int state)
+{
+	if (substream->runtime->trigger_master == substream)
+		substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_STOP);
+}
+
+static void snd_pcm_post_start(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	snd_pcm_trigger_tstamp(substream);
+	runtime->hw_ptr_jiffies = jiffies;
+	runtime->status->state = state;
+	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
+	    runtime->silence_size > 0)
+		snd_pcm_playback_silence(substream, ULONG_MAX);
+	if (substream->timer)
+		snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MSTART,
+				 &runtime->trigger_tstamp);
+}
+
+static struct action_ops snd_pcm_action_start = {
+	.pre_action = snd_pcm_pre_start,
+	.do_action = snd_pcm_do_start,
+	.undo_action = snd_pcm_undo_start,
+	.post_action = snd_pcm_post_start
+};
+
+/**
+ * snd_pcm_start - start all linked streams
+ * @substream: the PCM substream instance
+ */
+int snd_pcm_start(struct snd_pcm_substream *substream)
+{
+	return snd_pcm_action(&snd_pcm_action_start, substream,
+			      SNDRV_PCM_STATE_RUNNING);
+}
+
+/*
+ * stop callbacks
+ */
+static int snd_pcm_pre_stop(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
+		return -EBADFD;
+	runtime->trigger_master = substream;
+	return 0;
+}
+
+static int snd_pcm_do_stop(struct snd_pcm_substream *substream, int state)
+{
+	if (substream->runtime->trigger_master == substream &&
+	    snd_pcm_running(substream))
+		substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_STOP);
+	return 0; /* unconditonally stop all substreams */
+}
+
+static void snd_pcm_post_stop(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	if (runtime->status->state != state) {
+		snd_pcm_trigger_tstamp(substream);
+		if (substream->timer)
+			snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MSTOP,
+					 &runtime->trigger_tstamp);
+		runtime->status->state = state;
+	}
+	wake_up(&runtime->sleep);
+	wake_up(&runtime->tsleep);
+}
+
+static struct action_ops snd_pcm_action_stop = {
+	.pre_action = snd_pcm_pre_stop,
+	.do_action = snd_pcm_do_stop,
+	.post_action = snd_pcm_post_stop
+};
+
+/**
+ * snd_pcm_stop - try to stop all running streams in the substream group
+ * @substream: the PCM substream instance
+ * @state: PCM state after stopping the stream
+ *
+ * The state of each stream is then changed to the given state unconditionally.
+ */
+int snd_pcm_stop(struct snd_pcm_substream *substream, int state)
+{
+	return snd_pcm_action(&snd_pcm_action_stop, substream, state);
+}
+
+EXPORT_SYMBOL(snd_pcm_stop);
+
+/**
+ * snd_pcm_drain_done - stop the DMA only when the given stream is playback
+ * @substream: the PCM substream
+ *
+ * After stopping, the state is changed to SETUP.
+ * Unlike snd_pcm_stop(), this affects only the given stream.
+ */
+int snd_pcm_drain_done(struct snd_pcm_substream *substream)
+{
+	return snd_pcm_action_single(&snd_pcm_action_stop, substream,
+				     SNDRV_PCM_STATE_SETUP);
+}
+
+/*
+ * pause callbacks
+ */
+static int snd_pcm_pre_pause(struct snd_pcm_substream *substream, int push)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	if (!(runtime->info & SNDRV_PCM_INFO_PAUSE))
+		return -ENOSYS;
+	if (push) {
+		if (runtime->status->state != SNDRV_PCM_STATE_RUNNING)
+			return -EBADFD;
+	} else if (runtime->status->state != SNDRV_PCM_STATE_PAUSED)
+		return -EBADFD;
+	runtime->trigger_master = substream;
+	return 0;
+}
+
+static int snd_pcm_do_pause(struct snd_pcm_substream *substream, int push)
+{
+	if (substream->runtime->trigger_master != substream)
+		return 0;
+	/* The jiffies check in snd_pcm_update_hw_ptr*() is done by
+	 * a delta betwen the current jiffies, this gives a large enough
+	 * delta, effectively to skip the check once.
+	 */
+	substream->runtime->hw_ptr_jiffies = jiffies - HZ * 1000;
+	return substream->ops->trigger(substream,
+				       push ? SNDRV_PCM_TRIGGER_PAUSE_PUSH :
+					      SNDRV_PCM_TRIGGER_PAUSE_RELEASE);
+}
+
+static void snd_pcm_undo_pause(struct snd_pcm_substream *substream, int push)
+{
+	if (substream->runtime->trigger_master == substream)
+		substream->ops->trigger(substream,
+					push ? SNDRV_PCM_TRIGGER_PAUSE_RELEASE :
+					SNDRV_PCM_TRIGGER_PAUSE_PUSH);
+}
+
+static void snd_pcm_post_pause(struct snd_pcm_substream *substream, int push)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	snd_pcm_trigger_tstamp(substream);
+	if (push) {
+		runtime->status->state = SNDRV_PCM_STATE_PAUSED;
+		if (substream->timer)
+			snd_timer_notify(substream->timer,
+					 SNDRV_TIMER_EVENT_MPAUSE,
+					 &runtime->trigger_tstamp);
+		wake_up(&runtime->sleep);
+		wake_up(&runtime->tsleep);
+	} else {
+		runtime->status->state = SNDRV_PCM_STATE_RUNNING;
+		if (substream->timer)
+			snd_timer_notify(substream->timer,
+					 SNDRV_TIMER_EVENT_MCONTINUE,
+					 &runtime->trigger_tstamp);
+	}
+}
+
+static struct action_ops snd_pcm_action_pause = {
+	.pre_action = snd_pcm_pre_pause,
+	.do_action = snd_pcm_do_pause,
+	.undo_action = snd_pcm_undo_pause,
+	.post_action = snd_pcm_post_pause
+};
+
+/*
+ * Push/release the pause for all linked streams.
+ */
+static int snd_pcm_pause(struct snd_pcm_substream *substream, int push)
+{
+	return snd_pcm_action(&snd_pcm_action_pause, substream, push);
+}
+
+#ifdef CONFIG_PM
+/* suspend */
+
+static int snd_pcm_pre_suspend(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED)
+		return -EBUSY;
+	runtime->trigger_master = substream;
+	return 0;
+}
+
+static int snd_pcm_do_suspend(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	if (runtime->trigger_master != substream)
+		return 0;
+	if (! snd_pcm_running(substream))
+		return 0;
+	substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_SUSPEND);
+	return 0; /* suspend unconditionally */
+}
+
+static void snd_pcm_post_suspend(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	snd_pcm_trigger_tstamp(substream);
+	if (substream->timer)
+		snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MSUSPEND,
+				 &runtime->trigger_tstamp);
+	runtime->status->suspended_state = runtime->status->state;
+	runtime->status->state = SNDRV_PCM_STATE_SUSPENDED;
+	wake_up(&runtime->sleep);
+	wake_up(&runtime->tsleep);
+}
+
+static struct action_ops snd_pcm_action_suspend = {
+	.pre_action = snd_pcm_pre_suspend,
+	.do_action = snd_pcm_do_suspend,
+	.post_action = snd_pcm_post_suspend
+};
+
+/**
+ * snd_pcm_suspend - trigger SUSPEND to all linked streams
+ * @substream: the PCM substream
+ *
+ * After this call, all streams are changed to SUSPENDED state.
+ */
+int snd_pcm_suspend(struct snd_pcm_substream *substream)
+{
+	int err;
+	unsigned long flags;
+
+	if (! substream)
+		return 0;
+
+	snd_pcm_stream_lock_irqsave(substream, flags);
+	err = snd_pcm_action(&snd_pcm_action_suspend, substream, 0);
+	snd_pcm_stream_unlock_irqrestore(substream, flags);
+	return err;
+}
+
+EXPORT_SYMBOL(snd_pcm_suspend);
+
+/**
+ * snd_pcm_suspend_all - trigger SUSPEND to all substreams in the given pcm
+ * @pcm: the PCM instance
+ *
+ * After this call, all streams are changed to SUSPENDED state.
+ */
+int snd_pcm_suspend_all(struct snd_pcm *pcm)
+{
+	struct snd_pcm_substream *substream;
+	int stream, err = 0;
+
+	if (! pcm)
+		return 0;
+
+	for (stream = 0; stream < 2; stream++) {
+		for (substream = pcm->streams[stream].substream;
+		     substream; substream = substream->next) {
+			/* FIXME: the open/close code should lock this as well */
+			if (substream->runtime == NULL)
+				continue;
+			err = snd_pcm_suspend(substream);
+			if (err < 0 && err != -EBUSY)
+				return err;
+		}
+	}
+	return 0;
+}
+
+EXPORT_SYMBOL(snd_pcm_suspend_all);
+
+/* resume */
+
+static int snd_pcm_pre_resume(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	if (!(runtime->info & SNDRV_PCM_INFO_RESUME))
+		return -ENOSYS;
+	runtime->trigger_master = substream;
+	return 0;
+}
+
+static int snd_pcm_do_resume(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	if (runtime->trigger_master != substream)
+		return 0;
+	/* DMA not running previously? */
+	if (runtime->status->suspended_state != SNDRV_PCM_STATE_RUNNING &&
+	    (runtime->status->suspended_state != SNDRV_PCM_STATE_DRAINING ||
+	     substream->stream != SNDRV_PCM_STREAM_PLAYBACK))
+		return 0;
+	return substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_RESUME);
+}
+
+static void snd_pcm_undo_resume(struct snd_pcm_substream *substream, int state)
+{
+	if (substream->runtime->trigger_master == substream &&
+	    snd_pcm_running(substream))
+		substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_SUSPEND);
+}
+
+static void snd_pcm_post_resume(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	snd_pcm_trigger_tstamp(substream);
+	if (substream->timer)
+		snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MRESUME,
+				 &runtime->trigger_tstamp);
+	runtime->status->state = runtime->status->suspended_state;
+}
+
+static struct action_ops snd_pcm_action_resume = {
+	.pre_action = snd_pcm_pre_resume,
+	.do_action = snd_pcm_do_resume,
+	.undo_action = snd_pcm_undo_resume,
+	.post_action = snd_pcm_post_resume
+};
+
+static int snd_pcm_resume(struct snd_pcm_substream *substream)
+{
+	struct snd_card *card = substream->pcm->card;
+	int res;
+
+	snd_power_lock(card);
+	if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0)) >= 0)
+		res = snd_pcm_action_lock_irq(&snd_pcm_action_resume, substream, 0);
+	snd_power_unlock(card);
+	return res;
+}
+
+#else
+
+static int snd_pcm_resume(struct snd_pcm_substream *substream)
+{
+	return -ENOSYS;
+}
+
+#endif /* CONFIG_PM */
+
+/*
+ * xrun ioctl
+ *
+ * Change the RUNNING stream(s) to XRUN state.
+ */
+static int snd_pcm_xrun(struct snd_pcm_substream *substream)
+{
+	struct snd_card *card = substream->pcm->card;
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	int result;
+
+	snd_power_lock(card);
+	if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {
+		result = snd_power_wait(card, SNDRV_CTL_POWER_D0);
+		if (result < 0)
+			goto _unlock;
+	}
+
+	snd_pcm_stream_lock_irq(substream);
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_XRUN:
+		result = 0;	/* already there */
+		break;
+	case SNDRV_PCM_STATE_RUNNING:
+		result = snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
+		break;
+	default:
+		result = -EBADFD;
+	}
+	snd_pcm_stream_unlock_irq(substream);
+ _unlock:
+	snd_power_unlock(card);
+	return result;
+}
+
+/*
+ * reset ioctl
+ */
+static int snd_pcm_pre_reset(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_RUNNING:
+	case SNDRV_PCM_STATE_PREPARED:
+	case SNDRV_PCM_STATE_PAUSED:
+	case SNDRV_PCM_STATE_SUSPENDED:
+		return 0;
+	default:
+		return -EBADFD;
+	}
+}
+
+static int snd_pcm_do_reset(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	int err = substream->ops->ioctl(substream, SNDRV_PCM_IOCTL1_RESET, NULL);
+	if (err < 0)
+		return err;
+	runtime->hw_ptr_base = 0;
+	runtime->hw_ptr_interrupt = runtime->status->hw_ptr -
+		runtime->status->hw_ptr % runtime->period_size;
+	runtime->silence_start = runtime->status->hw_ptr;
+	runtime->silence_filled = 0;
+	return 0;
+}
+
+static void snd_pcm_post_reset(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	runtime->control->appl_ptr = runtime->status->hw_ptr;
+	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
+	    runtime->silence_size > 0)
+		snd_pcm_playback_silence(substream, ULONG_MAX);
+}
+
+static struct action_ops snd_pcm_action_reset = {
+	.pre_action = snd_pcm_pre_reset,
+	.do_action = snd_pcm_do_reset,
+	.post_action = snd_pcm_post_reset
+};
+
+static int snd_pcm_reset(struct snd_pcm_substream *substream)
+{
+	return snd_pcm_action_nonatomic(&snd_pcm_action_reset, substream, 0);
+}
+
+/*
+ * prepare ioctl
+ */
+/* we use the second argument for updating f_flags */
+static int snd_pcm_pre_prepare(struct snd_pcm_substream *substream,
+			       int f_flags)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	if (runtime->status->state == SNDRV_PCM_STATE_OPEN ||
+	    runtime->status->state == SNDRV_PCM_STATE_DISCONNECTED)
+		return -EBADFD;
+	if (snd_pcm_running(substream))
+		return -EBUSY;
+	substream->f_flags = f_flags;
+	return 0;
+}
+
+static int snd_pcm_do_prepare(struct snd_pcm_substream *substream, int state)
+{
+	int err;
+	err = substream->ops->prepare(substream);
+	if (err < 0)
+		return err;
+	return snd_pcm_do_reset(substream, 0);
+}
+
+static void snd_pcm_post_prepare(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	runtime->control->appl_ptr = runtime->status->hw_ptr;
+	runtime->status->state = SNDRV_PCM_STATE_PREPARED;
+}
+
+static struct action_ops snd_pcm_action_prepare = {
+	.pre_action = snd_pcm_pre_prepare,
+	.do_action = snd_pcm_do_prepare,
+	.post_action = snd_pcm_post_prepare
+};
+
+/**
+ * snd_pcm_prepare - prepare the PCM substream to be triggerable
+ * @substream: the PCM substream instance
+ * @file: file to refer f_flags
+ */
+static int snd_pcm_prepare(struct snd_pcm_substream *substream,
+			   struct file *file)
+{
+	int res;
+	struct snd_card *card = substream->pcm->card;
+	int f_flags;
+
+	if (file)
+		f_flags = file->f_flags;
+	else
+		f_flags = substream->f_flags;
+
+	snd_power_lock(card);
+	if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0)) >= 0)
+		res = snd_pcm_action_nonatomic(&snd_pcm_action_prepare,
+					       substream, f_flags);
+	snd_power_unlock(card);
+	return res;
+}
+
+/*
+ * drain ioctl
+ */
+
+static int snd_pcm_pre_drain_init(struct snd_pcm_substream *substream, int state)
+{
+	substream->runtime->trigger_master = substream;
+	return 0;
+}
+
+static int snd_pcm_do_drain_init(struct snd_pcm_substream *substream, int state)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+		switch (runtime->status->state) {
+		case SNDRV_PCM_STATE_PREPARED:
+			/* start playback stream if possible */
+			if (! snd_pcm_playback_empty(substream)) {
+				snd_pcm_do_start(substream, SNDRV_PCM_STATE_DRAINING);
+				snd_pcm_post_start(substream, SNDRV_PCM_STATE_DRAINING);
+			}
+			break;
+		case SNDRV_PCM_STATE_RUNNING:
+			runtime->status->state = SNDRV_PCM_STATE_DRAINING;
+			break;
+		default:
+			break;
+		}
+	} else {
+		/* stop running stream */
+		if (runtime->status->state == SNDRV_PCM_STATE_RUNNING) {
+			int new_state = snd_pcm_capture_avail(runtime) > 0 ?
+				SNDRV_PCM_STATE_DRAINING : SNDRV_PCM_STATE_SETUP;
+			snd_pcm_do_stop(substream, new_state);
+			snd_pcm_post_stop(substream, new_state);
+		}
+	}
+	return 0;
+}
+
+static void snd_pcm_post_drain_init(struct snd_pcm_substream *substream, int state)
+{
+}
+
+static struct action_ops snd_pcm_action_drain_init = {
+	.pre_action = snd_pcm_pre_drain_init,
+	.do_action = snd_pcm_do_drain_init,
+	.post_action = snd_pcm_post_drain_init
+};
+
+static int snd_pcm_drop(struct snd_pcm_substream *substream);
+
+/*
+ * Drain the stream(s).
+ * When the substream is linked, sync until the draining of all playback streams
+ * is finished.
+ * After this call, all streams are supposed to be either SETUP or DRAINING
+ * (capture only) state.
+ */
+static int snd_pcm_drain(struct snd_pcm_substream *substream,
+			 struct file *file)
+{
+	struct snd_card *card;
+	struct snd_pcm_runtime *runtime;
+	struct snd_pcm_substream *s;
+	wait_queue_t wait;
+	int result = 0;
+	int nonblock = 0;
+
+	card = substream->pcm->card;
+	runtime = substream->runtime;
+
+	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
+		return -EBADFD;
+
+	snd_power_lock(card);
+	if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {
+		result = snd_power_wait(card, SNDRV_CTL_POWER_D0);
+		if (result < 0) {
+			snd_power_unlock(card);
+			return result;
+		}
+	}
+
+	if (file) {
+		if (file->f_flags & O_NONBLOCK)
+			nonblock = 1;
+	} else if (substream->f_flags & O_NONBLOCK)
+		nonblock = 1;
+
+	down_read(&snd_pcm_link_rwsem);
+	snd_pcm_stream_lock_irq(substream);
+	/* resume pause */
+	if (runtime->status->state == SNDRV_PCM_STATE_PAUSED)
+		snd_pcm_pause(substream, 0);
+
+	/* pre-start/stop - all running streams are changed to DRAINING state */
+	result = snd_pcm_action(&snd_pcm_action_drain_init, substream, 0);
+	if (result < 0)
+		goto unlock;
+	/* in non-blocking, we don't wait in ioctl but let caller poll */
+	if (nonblock) {
+		result = -EAGAIN;
+		goto unlock;
+	}
+
+	for (;;) {
+		long tout;
+		struct snd_pcm_runtime *to_check;
+		if (signal_pending(current)) {
+			result = -ERESTARTSYS;
+			break;
+		}
+		/* find a substream to drain */
+		to_check = NULL;
+		snd_pcm_group_for_each_entry(s, substream) {
+			if (s->stream != SNDRV_PCM_STREAM_PLAYBACK)
+				continue;
+			runtime = s->runtime;
+			if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
+				to_check = runtime;
+				break;
+			}
+		}
+		if (!to_check)
+			break; /* all drained */
+		init_waitqueue_entry(&wait, current);
+		add_wait_queue(&to_check->sleep, &wait);
+		set_current_state(TASK_INTERRUPTIBLE);
+		snd_pcm_stream_unlock_irq(substream);
+		up_read(&snd_pcm_link_rwsem);
+		snd_power_unlock(card);
+		tout = schedule_timeout(10 * HZ);
+		snd_power_lock(card);
+		down_read(&snd_pcm_link_rwsem);
+		snd_pcm_stream_lock_irq(substream);
+		remove_wait_queue(&to_check->sleep, &wait);
+		if (tout == 0) {
+			if (substream->runtime->status->state == SNDRV_PCM_STATE_SUSPENDED)
+				result = -ESTRPIPE;
+			else {
+				snd_printd("playback drain error (DMA or IRQ trouble?)\n");
+				snd_pcm_stop(substream, SNDRV_PCM_STATE_SETUP);
+				result = -EIO;
+			}
+			break;
+		}
+	}
+
+ unlock:
+	snd_pcm_stream_unlock_irq(substream);
+	up_read(&snd_pcm_link_rwsem);
+	snd_power_unlock(card);
+
+	return result;
+}
+
+/*
+ * drop ioctl
+ *
+ * Immediately put all linked substreams into SETUP state.
+ */
+static int snd_pcm_drop(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_runtime *runtime;
+	struct snd_card *card;
+	int result = 0;
+	
+	if (PCM_RUNTIME_CHECK(substream))
+		return -ENXIO;
+	runtime = substream->runtime;
+	card = substream->pcm->card;
+
+	if (runtime->status->state == SNDRV_PCM_STATE_OPEN ||
+	    runtime->status->state == SNDRV_PCM_STATE_DISCONNECTED ||
+	    runtime->status->state == SNDRV_PCM_STATE_SUSPENDED)
+		return -EBADFD;
+
+	snd_pcm_stream_lock_irq(substream);
+	/* resume pause */
+	if (runtime->status->state == SNDRV_PCM_STATE_PAUSED)
+		snd_pcm_pause(substream, 0);
+
+	snd_pcm_stop(substream, SNDRV_PCM_STATE_SETUP);
+	/* runtime->control->appl_ptr = runtime->status->hw_ptr; */
+	snd_pcm_stream_unlock_irq(substream);
+
+	return result;
+}
+
+
+/* WARNING: Don't forget to fput back the file */
+static struct file *snd_pcm_file_fd(int fd)
+{
+	struct file *file;
+	struct inode *inode;
+	unsigned int minor;
+
+	file = fget(fd);
+	if (!file)
+		return NULL;
+	inode = file->f_path.dentry->d_inode;
+	if (!S_ISCHR(inode->i_mode) ||
+	    imajor(inode) != snd_major) {
+		fput(file);
+		return NULL;
+	}
+	minor = iminor(inode);
+	if (!snd_lookup_minor_data(minor, SNDRV_DEVICE_TYPE_PCM_PLAYBACK) &&
+	    !snd_lookup_minor_data(minor, SNDRV_DEVICE_TYPE_PCM_CAPTURE)) {
+		fput(file);
+		return NULL;
+	}
+	return file;
+}
+
+/*
+ * PCM link handling
+ */
+static int snd_pcm_link(struct snd_pcm_substream *substream, int fd)
+{
+	int res = 0;
+	struct file *file;
+	struct snd_pcm_file *pcm_file;
+	struct snd_pcm_substream *substream1;
+
+	file = snd_pcm_file_fd(fd);
+	if (!file)
+		return -EBADFD;
+	pcm_file = file->private_data;
+	substream1 = pcm_file->substream;
+	down_write(&snd_pcm_link_rwsem);
+	write_lock_irq(&snd_pcm_link_rwlock);
+	if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN ||
+	    substream->runtime->status->state != substream1->runtime->status->state) {
+		res = -EBADFD;
+		goto _end;
+	}
+	if (snd_pcm_stream_linked(substream1)) {
+		res = -EALREADY;
+		goto _end;
+	}
+	if (!snd_pcm_stream_linked(substream)) {
+		substream->group = kmalloc(sizeof(struct snd_pcm_group), GFP_ATOMIC);
+		if (substream->group == NULL) {
+			res = -ENOMEM;
+			goto _end;
+		}
+		spin_lock_init(&substream->group->lock);
+		INIT_LIST_HEAD(&substream->group->substreams);
+		list_add_tail(&substream->link_list, &substream->group->substreams);
+		substream->group->count = 1;
+	}
+	list_add_tail(&substream1->link_list, &substream->group->substreams);
+	substream->group->count++;
+	substream1->group = substream->group;
+ _end:
+	write_unlock_irq(&snd_pcm_link_rwlock);
+	up_write(&snd_pcm_link_rwsem);
+	fput(file);
+	return res;
+}
+
+static void relink_to_local(struct snd_pcm_substream *substream)
+{
+	substream->group = &substream->self_group;
+	INIT_LIST_HEAD(&substream->self_group.substreams);
+	list_add_tail(&substream->link_list, &substream->self_group.substreams);
+}
+
+static int snd_pcm_unlink(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_substream *s;
+	int res = 0;
+
+	down_write(&snd_pcm_link_rwsem);
+	write_lock_irq(&snd_pcm_link_rwlock);
+	if (!snd_pcm_stream_linked(substream)) {
+		res = -EALREADY;
+		goto _end;
+	}
+	list_del(&substream->link_list);
+	substream->group->count--;
+	if (substream->group->count == 1) {	/* detach the last stream, too */
+		snd_pcm_group_for_each_entry(s, substream) {
+			relink_to_local(s);
+			break;
+		}
+		kfree(substream->group);
+	}
+	relink_to_local(substream);
+       _end:
+	write_unlock_irq(&snd_pcm_link_rwlock);
+	up_write(&snd_pcm_link_rwsem);
+	return res;
+}
+
+/*
+ * hw configurator
+ */
+static int snd_pcm_hw_rule_mul(struct snd_pcm_hw_params *params,
+			       struct snd_pcm_hw_rule *rule)
+{
+	struct snd_interval t;
+	snd_interval_mul(hw_param_interval_c(params, rule->deps[0]),
+		     hw_param_interval_c(params, rule->deps[1]), &t);
+	return snd_interval_refine(hw_param_interval(params, rule->var), &t);
+}
+
+static int snd_pcm_hw_rule_div(struct snd_pcm_hw_params *params,
+			       struct snd_pcm_hw_rule *rule)
+{
+	struct snd_interval t;
+	snd_interval_div(hw_param_interval_c(params, rule->deps[0]),
+		     hw_param_interval_c(params, rule->deps[1]), &t);
+	return snd_interval_refine(hw_param_interval(params, rule->var), &t);
+}
+
+static int snd_pcm_hw_rule_muldivk(struct snd_pcm_hw_params *params,
+				   struct snd_pcm_hw_rule *rule)
+{
+	struct snd_interval t;
+	snd_interval_muldivk(hw_param_interval_c(params, rule->deps[0]),
+			 hw_param_interval_c(params, rule->deps[1]),
+			 (unsigned long) rule->private, &t);
+	return snd_interval_refine(hw_param_interval(params, rule->var), &t);
+}
+
+static int snd_pcm_hw_rule_mulkdiv(struct snd_pcm_hw_params *params,
+				   struct snd_pcm_hw_rule *rule)
+{
+	struct snd_interval t;
+	snd_interval_mulkdiv(hw_param_interval_c(params, rule->deps[0]),
+			 (unsigned long) rule->private,
+			 hw_param_interval_c(params, rule->deps[1]), &t);
+	return snd_interval_refine(hw_param_interval(params, rule->var), &t);
+}
+
+static int snd_pcm_hw_rule_format(struct snd_pcm_hw_params *params,
+				  struct snd_pcm_hw_rule *rule)
+{
+	unsigned int k;
+	struct snd_interval *i = hw_param_interval(params, rule->deps[0]);
+	struct snd_mask m;
+	struct snd_mask *mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
+	snd_mask_any(&m);
+	for (k = 0; k <= SNDRV_PCM_FORMAT_LAST; ++k) {
+		int bits;
+		if (! snd_mask_test(mask, k))
+			continue;
+		bits = snd_pcm_format_physical_width(k);
+		if (bits <= 0)
+			continue; /* ignore invalid formats */
+		if ((unsigned)bits < i->min || (unsigned)bits > i->max)
+			snd_mask_reset(&m, k);
+	}
+	return snd_mask_refine(mask, &m);
+}
+
+static int snd_pcm_hw_rule_sample_bits(struct snd_pcm_hw_params *params,
+				       struct snd_pcm_hw_rule *rule)
+{
+	struct snd_interval t;
+	unsigned int k;
+	t.min = UINT_MAX;
+	t.max = 0;
+	t.openmin = 0;
+	t.openmax = 0;
+	for (k = 0; k <= SNDRV_PCM_FORMAT_LAST; ++k) {
+		int bits;
+		if (! snd_mask_test(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), k))
+			continue;
+		bits = snd_pcm_format_physical_width(k);
+		if (bits <= 0)
+			continue; /* ignore invalid formats */
+		if (t.min > (unsigned)bits)
+			t.min = bits;
+		if (t.max < (unsigned)bits)
+			t.max = bits;
+	}
+	t.integer = 1;
+	return snd_interval_refine(hw_param_interval(params, rule->var), &t);
+}
+
+#if SNDRV_PCM_RATE_5512 != 1 << 0 || SNDRV_PCM_RATE_192000 != 1 << 12
+#error "Change this table"
+#endif
+
+static unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100,
+                                 48000, 64000, 88200, 96000, 176400, 192000 };
+
+const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = {
+	.count = ARRAY_SIZE(rates),
+	.list = rates,
+};
+
+static int snd_pcm_hw_rule_rate(struct snd_pcm_hw_params *params,
+				struct snd_pcm_hw_rule *rule)
+{
+	struct snd_pcm_hardware *hw = rule->private;
+	return snd_interval_list(hw_param_interval(params, rule->var),
+				 snd_pcm_known_rates.count,
+				 snd_pcm_known_rates.list, hw->rates);
+}		
+
+static int snd_pcm_hw_rule_buffer_bytes_max(struct snd_pcm_hw_params *params,
+					    struct snd_pcm_hw_rule *rule)
+{
+	struct snd_interval t;
+	struct snd_pcm_substream *substream = rule->private;
+	t.min = 0;
+	t.max = substream->buffer_bytes_max;
+	t.openmin = 0;
+	t.openmax = 0;
+	t.integer = 1;
+	return snd_interval_refine(hw_param_interval(params, rule->var), &t);
+}		
+
+int snd_pcm_hw_constraints_init(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
+	int k, err;
+
+	for (k = SNDRV_PCM_HW_PARAM_FIRST_MASK; k <= SNDRV_PCM_HW_PARAM_LAST_MASK; k++) {
+		snd_mask_any(constrs_mask(constrs, k));
+	}
+
+	for (k = SNDRV_PCM_HW_PARAM_FIRST_INTERVAL; k <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++) {
+		snd_interval_any(constrs_interval(constrs, k));
+	}
+
+	snd_interval_setinteger(constrs_interval(constrs, SNDRV_PCM_HW_PARAM_CHANNELS));
+	snd_interval_setinteger(constrs_interval(constrs, SNDRV_PCM_HW_PARAM_BUFFER_SIZE));
+	snd_interval_setinteger(constrs_interval(constrs, SNDRV_PCM_HW_PARAM_BUFFER_BYTES));
+	snd_interval_setinteger(constrs_interval(constrs, SNDRV_PCM_HW_PARAM_SAMPLE_BITS));
+	snd_interval_setinteger(constrs_interval(constrs, SNDRV_PCM_HW_PARAM_FRAME_BITS));
+
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FORMAT,
+				   snd_pcm_hw_rule_format, NULL,
+				   SNDRV_PCM_HW_PARAM_SAMPLE_BITS, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_SAMPLE_BITS, 
+				  snd_pcm_hw_rule_sample_bits, NULL,
+				  SNDRV_PCM_HW_PARAM_FORMAT, 
+				  SNDRV_PCM_HW_PARAM_SAMPLE_BITS, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_SAMPLE_BITS, 
+				  snd_pcm_hw_rule_div, NULL,
+				  SNDRV_PCM_HW_PARAM_FRAME_BITS, SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FRAME_BITS, 
+				  snd_pcm_hw_rule_mul, NULL,
+				  SNDRV_PCM_HW_PARAM_SAMPLE_BITS, SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FRAME_BITS, 
+				  snd_pcm_hw_rule_mulkdiv, (void*) 8,
+				  SNDRV_PCM_HW_PARAM_PERIOD_BYTES, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FRAME_BITS, 
+				  snd_pcm_hw_rule_mulkdiv, (void*) 8,
+				  SNDRV_PCM_HW_PARAM_BUFFER_BYTES, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, 
+				  snd_pcm_hw_rule_div, NULL,
+				  SNDRV_PCM_HW_PARAM_FRAME_BITS, SNDRV_PCM_HW_PARAM_SAMPLE_BITS, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, 
+				  snd_pcm_hw_rule_mulkdiv, (void*) 1000000,
+				  SNDRV_PCM_HW_PARAM_PERIOD_SIZE, SNDRV_PCM_HW_PARAM_PERIOD_TIME, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, 
+				  snd_pcm_hw_rule_mulkdiv, (void*) 1000000,
+				  SNDRV_PCM_HW_PARAM_BUFFER_SIZE, SNDRV_PCM_HW_PARAM_BUFFER_TIME, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIODS, 
+				  snd_pcm_hw_rule_div, NULL,
+				  SNDRV_PCM_HW_PARAM_BUFFER_SIZE, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 
+				  snd_pcm_hw_rule_div, NULL,
+				  SNDRV_PCM_HW_PARAM_BUFFER_SIZE, SNDRV_PCM_HW_PARAM_PERIODS, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 
+				  snd_pcm_hw_rule_mulkdiv, (void*) 8,
+				  SNDRV_PCM_HW_PARAM_PERIOD_BYTES, SNDRV_PCM_HW_PARAM_FRAME_BITS, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 
+				  snd_pcm_hw_rule_muldivk, (void*) 1000000,
+				  SNDRV_PCM_HW_PARAM_PERIOD_TIME, SNDRV_PCM_HW_PARAM_RATE, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 
+				  snd_pcm_hw_rule_mul, NULL,
+				  SNDRV_PCM_HW_PARAM_PERIOD_SIZE, SNDRV_PCM_HW_PARAM_PERIODS, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 
+				  snd_pcm_hw_rule_mulkdiv, (void*) 8,
+				  SNDRV_PCM_HW_PARAM_BUFFER_BYTES, SNDRV_PCM_HW_PARAM_FRAME_BITS, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 
+				  snd_pcm_hw_rule_muldivk, (void*) 1000000,
+				  SNDRV_PCM_HW_PARAM_BUFFER_TIME, SNDRV_PCM_HW_PARAM_RATE, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 
+				  snd_pcm_hw_rule_muldivk, (void*) 8,
+				  SNDRV_PCM_HW_PARAM_PERIOD_SIZE, SNDRV_PCM_HW_PARAM_FRAME_BITS, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 
+				  snd_pcm_hw_rule_muldivk, (void*) 8,
+				  SNDRV_PCM_HW_PARAM_BUFFER_SIZE, SNDRV_PCM_HW_PARAM_FRAME_BITS, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_TIME, 
+				  snd_pcm_hw_rule_mulkdiv, (void*) 1000000,
+				  SNDRV_PCM_HW_PARAM_PERIOD_SIZE, SNDRV_PCM_HW_PARAM_RATE, -1);
+	if (err < 0)
+		return err;
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_TIME, 
+				  snd_pcm_hw_rule_mulkdiv, (void*) 1000000,
+				  SNDRV_PCM_HW_PARAM_BUFFER_SIZE, SNDRV_PCM_HW_PARAM_RATE, -1);
+	if (err < 0)
+		return err;
+	return 0;
+}
+
+int snd_pcm_hw_constraints_complete(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	struct snd_pcm_hardware *hw = &runtime->hw;
+	int err;
+	unsigned int mask = 0;
+
+        if (hw->info & SNDRV_PCM_INFO_INTERLEAVED)
+		mask |= 1 << SNDRV_PCM_ACCESS_RW_INTERLEAVED;
+        if (hw->info & SNDRV_PCM_INFO_NONINTERLEAVED)
+		mask |= 1 << SNDRV_PCM_ACCESS_RW_NONINTERLEAVED;
+	if (hw->info & SNDRV_PCM_INFO_MMAP) {
+		if (hw->info & SNDRV_PCM_INFO_INTERLEAVED)
+			mask |= 1 << SNDRV_PCM_ACCESS_MMAP_INTERLEAVED;
+		if (hw->info & SNDRV_PCM_INFO_NONINTERLEAVED)
+			mask |= 1 << SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED;
+		if (hw->info & SNDRV_PCM_INFO_COMPLEX)
+			mask |= 1 << SNDRV_PCM_ACCESS_MMAP_COMPLEX;
+	}
+	err = snd_pcm_hw_constraint_mask(runtime, SNDRV_PCM_HW_PARAM_ACCESS, mask);
+	if (err < 0)
+		return err;
+
+	err = snd_pcm_hw_constraint_mask64(runtime, SNDRV_PCM_HW_PARAM_FORMAT, hw->formats);
+	if (err < 0)
+		return err;
+
+	err = snd_pcm_hw_constraint_mask(runtime, SNDRV_PCM_HW_PARAM_SUBFORMAT, 1 << SNDRV_PCM_SUBFORMAT_STD);
+	if (err < 0)
+		return err;
+
+	err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_CHANNELS,
+					   hw->channels_min, hw->channels_max);
+	if (err < 0)
+		return err;
+
+	err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_RATE,
+					   hw->rate_min, hw->rate_max);
+	if (err < 0)
+		return err;
+
+	err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
+					   hw->period_bytes_min, hw->period_bytes_max);
+	if (err < 0)
+		return err;
+
+	err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIODS,
+					   hw->periods_min, hw->periods_max);
+	if (err < 0)
+		return err;
+
+	err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
+					   hw->period_bytes_min, hw->buffer_bytes_max);
+	if (err < 0)
+		return err;
+
+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 
+				  snd_pcm_hw_rule_buffer_bytes_max, substream,
+				  SNDRV_PCM_HW_PARAM_BUFFER_BYTES, -1);
+	if (err < 0)
+		return err;
+
+	/* FIXME: remove */
+	if (runtime->dma_bytes) {
+		err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 0, runtime->dma_bytes);
+		if (err < 0)
+			return -EINVAL;
+	}
+
+	if (!(hw->rates & (SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_CONTINUOUS))) {
+		err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, 
+					  snd_pcm_hw_rule_rate, hw,
+					  SNDRV_PCM_HW_PARAM_RATE, -1);
+		if (err < 0)
+			return err;
+	}
+
+	/* FIXME: this belong to lowlevel */
+	snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
+
+	return 0;
+}
+
+static void pcm_release_private(struct snd_pcm_substream *substream)
+{
+	snd_pcm_unlink(substream);
+}
+
+void snd_pcm_release_substream(struct snd_pcm_substream *substream)
+{
+	substream->ref_count--;
+	if (substream->ref_count > 0)
+		return;
+
+	snd_pcm_drop(substream);
+	if (substream->hw_opened) {
+		if (substream->ops->hw_free != NULL)
+			substream->ops->hw_free(substream);
+		substream->ops->close(substream);
+		substream->hw_opened = 0;
+	}
+	if (substream->pcm_release) {
+		substream->pcm_release(substream);
+		substream->pcm_release = NULL;
+	}
+	snd_pcm_detach_substream(substream);
+}
+
+EXPORT_SYMBOL(snd_pcm_release_substream);
+
+int snd_pcm_open_substream(struct snd_pcm *pcm, int stream,
+			   struct file *file,
+			   struct snd_pcm_substream **rsubstream)
+{
+	struct snd_pcm_substream *substream;
+	int err;
+
+	err = snd_pcm_attach_substream(pcm, stream, file, &substream);
+	if (err < 0)
+		return err;
+	if (substream->ref_count > 1) {
+		*rsubstream = substream;
+		return 0;
+	}
+
+	err = snd_pcm_hw_constraints_init(substream);
+	if (err < 0) {
+		snd_printd("snd_pcm_hw_constraints_init failed\n");
+		goto error;
+	}
+
+	if ((err = substream->ops->open(substream)) < 0)
+		goto error;
+
+	substream->hw_opened = 1;
+
+	err = snd_pcm_hw_constraints_complete(substream);
+	if (err < 0) {
+		snd_printd("snd_pcm_hw_constraints_complete failed\n");
+		goto error;
+	}
+
+	*rsubstream = substream;
+	return 0;
+
+ error:
+	snd_pcm_release_substream(substream);
+	return err;
+}
+
+EXPORT_SYMBOL(snd_pcm_open_substream);
+
+static int snd_pcm_open_file(struct file *file,
+			     struct snd_pcm *pcm,
+			     int stream,
+			     struct snd_pcm_file **rpcm_file)
+{
+	struct snd_pcm_file *pcm_file;
+	struct snd_pcm_substream *substream;
+	struct snd_pcm_str *str;
+	int err;
+
+	if (rpcm_file)
+		*rpcm_file = NULL;
+
+	err = snd_pcm_open_substream(pcm, stream, file, &substream);
+	if (err < 0)
+		return err;
+
+	pcm_file = kzalloc(sizeof(*pcm_file), GFP_KERNEL);
+	if (pcm_file == NULL) {
+		snd_pcm_release_substream(substream);
+		return -ENOMEM;
+	}
+	pcm_file->substream = substream;
+	if (substream->ref_count == 1) {
+		str = substream->pstr;
+		substream->file = pcm_file;
+		substream->pcm_release = pcm_release_private;
+	}
+	file->private_data = pcm_file;
+	if (rpcm_file)
+		*rpcm_file = pcm_file;
+	return 0;
+}
+
+static int snd_pcm_playback_open(struct inode *inode, struct file *file)
+{
+	struct snd_pcm *pcm;
+	int err = nonseekable_open(inode, file);
+	if (err < 0)
+		return err;
+	pcm = snd_lookup_minor_data(iminor(inode),
+				    SNDRV_DEVICE_TYPE_PCM_PLAYBACK);
+	return snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_PLAYBACK);
+}
+
+static int snd_pcm_capture_open(struct inode *inode, struct file *file)
+{
+	struct snd_pcm *pcm;
+	int err = nonseekable_open(inode, file);
+	if (err < 0)
+		return err;
+	pcm = snd_lookup_minor_data(iminor(inode),
+				    SNDRV_DEVICE_TYPE_PCM_CAPTURE);
+	return snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_CAPTURE);
+}
+
+static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream)
+{
+	int err;
+	struct snd_pcm_file *pcm_file;
+	wait_queue_t wait;
+
+	if (pcm == NULL) {
+		err = -ENODEV;
+		goto __error1;
+	}
+	err = snd_card_file_add(pcm->card, file);
+	if (err < 0)
+		goto __error1;
+	if (!try_module_get(pcm->card->module)) {
+		err = -EFAULT;
+		goto __error2;
+	}
+	init_waitqueue_entry(&wait, current);
+	add_wait_queue(&pcm->open_wait, &wait);
+	mutex_lock(&pcm->open_mutex);
+	while (1) {
+		err = snd_pcm_open_file(file, pcm, stream, &pcm_file);
+		if (err >= 0)
+			break;
+		if (err == -EAGAIN) {
+			if (file->f_flags & O_NONBLOCK) {
+				err = -EBUSY;
+				break;
+			}
+		} else
+			break;
+		set_current_state(TASK_INTERRUPTIBLE);
+		mutex_unlock(&pcm->open_mutex);
+		schedule();
+		mutex_lock(&pcm->open_mutex);
+		if (signal_pending(current)) {
+			err = -ERESTARTSYS;
+			break;
+		}
+	}
+	remove_wait_queue(&pcm->open_wait, &wait);
+	mutex_unlock(&pcm->open_mutex);
+	if (err < 0)
+		goto __error;
+	return err;
+
+      __error:
+	module_put(pcm->card->module);
+      __error2:
+      	snd_card_file_remove(pcm->card, file);
+      __error1:
+      	return err;
+}
+
+static int snd_pcm_release(struct inode *inode, struct file *file)
+{
+	struct snd_pcm *pcm;
+	struct snd_pcm_substream *substream;
+	struct snd_pcm_file *pcm_file;
+
+	pcm_file = file->private_data;
+	substream = pcm_file->substream;
+	if (snd_BUG_ON(!substream))
+		return -ENXIO;
+	pcm = substream->pcm;
+	mutex_lock(&pcm->open_mutex);
+	snd_pcm_release_substream(substream);
+	kfree(pcm_file);
+	mutex_unlock(&pcm->open_mutex);
+	wake_up(&pcm->open_wait);
+	module_put(pcm->card->module);
+	snd_card_file_remove(pcm->card, file);
+	return 0;
+}
+
+static snd_pcm_sframes_t snd_pcm_playback_rewind(struct snd_pcm_substream *substream,
+						 snd_pcm_uframes_t frames)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	snd_pcm_sframes_t appl_ptr;
+	snd_pcm_sframes_t ret;
+	snd_pcm_sframes_t hw_avail;
+
+	if (frames == 0)
+		return 0;
+
+	snd_pcm_stream_lock_irq(substream);
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_PREPARED:
+		break;
+	case SNDRV_PCM_STATE_DRAINING:
+	case SNDRV_PCM_STATE_RUNNING:
+		if (snd_pcm_update_hw_ptr(substream) >= 0)
+			break;
+		/* Fall through */
+	case SNDRV_PCM_STATE_XRUN:
+		ret = -EPIPE;
+		goto __end;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		ret = -ESTRPIPE;
+		goto __end;
+	default:
+		ret = -EBADFD;
+		goto __end;
+	}
+
+	hw_avail = snd_pcm_playback_hw_avail(runtime);
+	if (hw_avail <= 0) {
+		ret = 0;
+		goto __end;
+	}
+	if (frames > (snd_pcm_uframes_t)hw_avail)
+		frames = hw_avail;
+	appl_ptr = runtime->control->appl_ptr - frames;
+	if (appl_ptr < 0)
+		appl_ptr += runtime->boundary;
+	runtime->control->appl_ptr = appl_ptr;
+	ret = frames;
+ __end:
+	snd_pcm_stream_unlock_irq(substream);
+	return ret;
+}
+
+static snd_pcm_sframes_t snd_pcm_capture_rewind(struct snd_pcm_substream *substream,
+						snd_pcm_uframes_t frames)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	snd_pcm_sframes_t appl_ptr;
+	snd_pcm_sframes_t ret;
+	snd_pcm_sframes_t hw_avail;
+
+	if (frames == 0)
+		return 0;
+
+	snd_pcm_stream_lock_irq(substream);
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_PREPARED:
+	case SNDRV_PCM_STATE_DRAINING:
+		break;
+	case SNDRV_PCM_STATE_RUNNING:
+		if (snd_pcm_update_hw_ptr(substream) >= 0)
+			break;
+		/* Fall through */
+	case SNDRV_PCM_STATE_XRUN:
+		ret = -EPIPE;
+		goto __end;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		ret = -ESTRPIPE;
+		goto __end;
+	default:
+		ret = -EBADFD;
+		goto __end;
+	}
+
+	hw_avail = snd_pcm_capture_hw_avail(runtime);
+	if (hw_avail <= 0) {
+		ret = 0;
+		goto __end;
+	}
+	if (frames > (snd_pcm_uframes_t)hw_avail)
+		frames = hw_avail;
+	appl_ptr = runtime->control->appl_ptr - frames;
+	if (appl_ptr < 0)
+		appl_ptr += runtime->boundary;
+	runtime->control->appl_ptr = appl_ptr;
+	ret = frames;
+ __end:
+	snd_pcm_stream_unlock_irq(substream);
+	return ret;
+}
+
+static snd_pcm_sframes_t snd_pcm_playback_forward(struct snd_pcm_substream *substream,
+						  snd_pcm_uframes_t frames)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	snd_pcm_sframes_t appl_ptr;
+	snd_pcm_sframes_t ret;
+	snd_pcm_sframes_t avail;
+
+	if (frames == 0)
+		return 0;
+
+	snd_pcm_stream_lock_irq(substream);
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_PREPARED:
+	case SNDRV_PCM_STATE_PAUSED:
+		break;
+	case SNDRV_PCM_STATE_DRAINING:
+	case SNDRV_PCM_STATE_RUNNING:
+		if (snd_pcm_update_hw_ptr(substream) >= 0)
+			break;
+		/* Fall through */
+	case SNDRV_PCM_STATE_XRUN:
+		ret = -EPIPE;
+		goto __end;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		ret = -ESTRPIPE;
+		goto __end;
+	default:
+		ret = -EBADFD;
+		goto __end;
+	}
+
+	avail = snd_pcm_playback_avail(runtime);
+	if (avail <= 0) {
+		ret = 0;
+		goto __end;
+	}
+	if (frames > (snd_pcm_uframes_t)avail)
+		frames = avail;
+	appl_ptr = runtime->control->appl_ptr + frames;
+	if (appl_ptr >= (snd_pcm_sframes_t)runtime->boundary)
+		appl_ptr -= runtime->boundary;
+	runtime->control->appl_ptr = appl_ptr;
+	ret = frames;
+ __end:
+	snd_pcm_stream_unlock_irq(substream);
+	return ret;
+}
+
+static snd_pcm_sframes_t snd_pcm_capture_forward(struct snd_pcm_substream *substream,
+						 snd_pcm_uframes_t frames)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	snd_pcm_sframes_t appl_ptr;
+	snd_pcm_sframes_t ret;
+	snd_pcm_sframes_t avail;
+
+	if (frames == 0)
+		return 0;
+
+	snd_pcm_stream_lock_irq(substream);
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_PREPARED:
+	case SNDRV_PCM_STATE_DRAINING:
+	case SNDRV_PCM_STATE_PAUSED:
+		break;
+	case SNDRV_PCM_STATE_RUNNING:
+		if (snd_pcm_update_hw_ptr(substream) >= 0)
+			break;
+		/* Fall through */
+	case SNDRV_PCM_STATE_XRUN:
+		ret = -EPIPE;
+		goto __end;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		ret = -ESTRPIPE;
+		goto __end;
+	default:
+		ret = -EBADFD;
+		goto __end;
+	}
+
+	avail = snd_pcm_capture_avail(runtime);
+	if (avail <= 0) {
+		ret = 0;
+		goto __end;
+	}
+	if (frames > (snd_pcm_uframes_t)avail)
+		frames = avail;
+	appl_ptr = runtime->control->appl_ptr + frames;
+	if (appl_ptr >= (snd_pcm_sframes_t)runtime->boundary)
+		appl_ptr -= runtime->boundary;
+	runtime->control->appl_ptr = appl_ptr;
+	ret = frames;
+ __end:
+	snd_pcm_stream_unlock_irq(substream);
+	return ret;
+}
+
+static int snd_pcm_hwsync(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	int err;
+
+	snd_pcm_stream_lock_irq(substream);
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_DRAINING:
+		if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
+			goto __badfd;
+	case SNDRV_PCM_STATE_RUNNING:
+		if ((err = snd_pcm_update_hw_ptr(substream)) < 0)
+			break;
+		/* Fall through */
+	case SNDRV_PCM_STATE_PREPARED:
+	case SNDRV_PCM_STATE_SUSPENDED:
+		err = 0;
+		break;
+	case SNDRV_PCM_STATE_XRUN:
+		err = -EPIPE;
+		break;
+	default:
+	      __badfd:
+		err = -EBADFD;
+		break;
+	}
+	snd_pcm_stream_unlock_irq(substream);
+	return err;
+}
+		
+static int snd_pcm_delay(struct snd_pcm_substream *substream,
+			 snd_pcm_sframes_t __user *res)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	int err;
+	snd_pcm_sframes_t n = 0;
+
+	//giovanni snd_pcm_stream_lock_irq(substream);
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_DRAINING:
+		if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
+			goto __badfd;
+	case SNDRV_PCM_STATE_RUNNING:
+		if ((err = snd_pcm_update_hw_ptr(substream)) < 0)
+			break;
+		/* Fall through */
+	case SNDRV_PCM_STATE_PREPARED:
+	case SNDRV_PCM_STATE_SUSPENDED:
+		err = 0;
+		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+			n = snd_pcm_playback_hw_avail(runtime);
+		else
+			n = snd_pcm_capture_avail(runtime);
+		n += runtime->delay;
+		break;
+	case SNDRV_PCM_STATE_XRUN:
+		err = -EPIPE;
+		break;
+	default:
+	      __badfd:
+		err = -EBADFD;
+		break;
+	}
+	//giovanni snd_pcm_stream_unlock_irq(substream);
+	if (!err)
+		if (put_user(n, res))
+			err = -EFAULT;
+	return err;
+}
+		
+static int snd_pcm_sync_ptr(struct snd_pcm_substream *substream,
+			    struct snd_pcm_sync_ptr __user *_sync_ptr)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	struct snd_pcm_sync_ptr sync_ptr;
+	volatile struct snd_pcm_mmap_status *status;
+	volatile struct snd_pcm_mmap_control *control;
+	int err;
+
+	memset(&sync_ptr, 0, sizeof(sync_ptr));
+	if (get_user(sync_ptr.flags, (unsigned __user *)&(_sync_ptr->flags)))
+		return -EFAULT;
+	if (copy_from_user(&sync_ptr.c.control, &(_sync_ptr->c.control), sizeof(struct snd_pcm_mmap_control)))
+		return -EFAULT;	
+	status = runtime->status;
+	control = runtime->control;
+	if (sync_ptr.flags & SNDRV_PCM_SYNC_PTR_HWSYNC) {
+		err = snd_pcm_hwsync(substream);
+		if (err < 0)
+			return err;
+	}
+	//giovanni snd_pcm_stream_lock_irq(substream);
+	if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_APPL))
+		control->appl_ptr = sync_ptr.c.control.appl_ptr;
+	else
+		sync_ptr.c.control.appl_ptr = control->appl_ptr;
+	if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_AVAIL_MIN))
+		control->avail_min = sync_ptr.c.control.avail_min;
+	else
+		sync_ptr.c.control.avail_min = control->avail_min;
+	sync_ptr.s.status.state = status->state;
+	sync_ptr.s.status.hw_ptr = status->hw_ptr;
+	sync_ptr.s.status.tstamp = status->tstamp;
+	sync_ptr.s.status.suspended_state = status->suspended_state;
+	//giovanni snd_pcm_stream_unlock_irq(substream);
+	if (copy_to_user(_sync_ptr, &sync_ptr, sizeof(sync_ptr)))
+		return -EFAULT;
+	return 0;
+}
+
+static int snd_pcm_tstamp(struct snd_pcm_substream *substream, int __user *_arg)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	int arg;
+	
+	if (get_user(arg, _arg))
+		return -EFAULT;
+	if (arg < 0 || arg > SNDRV_PCM_TSTAMP_TYPE_LAST)
+		return -EINVAL;
+	runtime->tstamp_type = SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY;
+	if (arg == SNDRV_PCM_TSTAMP_TYPE_MONOTONIC)
+		runtime->tstamp_type = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC;
+	return 0;
+}
+		
+static int snd_pcm_common_ioctl1(struct file *file,
+				 struct snd_pcm_substream *substream,
+				 unsigned int cmd, void __user *arg)
+{
+	switch (cmd) {
+	case SNDRV_PCM_IOCTL_PVERSION:
+		return put_user(SNDRV_PCM_VERSION, (int __user *)arg) ? -EFAULT : 0;
+	case SNDRV_PCM_IOCTL_INFO:
+		return snd_pcm_info_user(substream, arg);
+	case SNDRV_PCM_IOCTL_TSTAMP:	/* just for compatibility */
+		return 0;
+	case SNDRV_PCM_IOCTL_TTSTAMP:
+		return snd_pcm_tstamp(substream, arg);
+	case SNDRV_PCM_IOCTL_HW_REFINE:
+		return snd_pcm_hw_refine_user(substream, arg);
+	case SNDRV_PCM_IOCTL_HW_PARAMS:
+		return snd_pcm_hw_params_user(substream, arg);
+	case SNDRV_PCM_IOCTL_HW_FREE:
+		return snd_pcm_hw_free(substream);
+	case SNDRV_PCM_IOCTL_SW_PARAMS:
+		return snd_pcm_sw_params_user(substream, arg);
+	case SNDRV_PCM_IOCTL_STATUS:
+		return snd_pcm_status_user(substream, arg);
+	case SNDRV_PCM_IOCTL_CHANNEL_INFO:
+		return snd_pcm_channel_info_user(substream, arg);
+	case SNDRV_PCM_IOCTL_PREPARE:
+		return snd_pcm_prepare(substream, file);
+	case SNDRV_PCM_IOCTL_RESET:
+		return snd_pcm_reset(substream);
+	case SNDRV_PCM_IOCTL_START:
+		return snd_pcm_action_lock_irq(&snd_pcm_action_start, substream, SNDRV_PCM_STATE_RUNNING);
+	case SNDRV_PCM_IOCTL_LINK:
+		return snd_pcm_link(substream, (int)(unsigned long) arg);
+	case SNDRV_PCM_IOCTL_UNLINK:
+		return snd_pcm_unlink(substream);
+	case SNDRV_PCM_IOCTL_RESUME:
+		return snd_pcm_resume(substream);
+	case SNDRV_PCM_IOCTL_XRUN:
+		return snd_pcm_xrun(substream);
+	case SNDRV_PCM_IOCTL_HWSYNC:
+		return snd_pcm_hwsync(substream);
+	case SNDRV_PCM_IOCTL_DELAY:
+		return snd_pcm_delay(substream, arg);
+	case SNDRV_PCM_IOCTL_SYNC_PTR:
+		return snd_pcm_sync_ptr(substream, arg);
+#ifdef CONFIG_SND_SUPPORT_OLD_API
+	case SNDRV_PCM_IOCTL_HW_REFINE_OLD:
+		return snd_pcm_hw_refine_old_user(substream, arg);
+	case SNDRV_PCM_IOCTL_HW_PARAMS_OLD:
+		return snd_pcm_hw_params_old_user(substream, arg);
+#endif
+	case SNDRV_PCM_IOCTL_DRAIN:
+		return snd_pcm_drain(substream, file);
+	case SNDRV_PCM_IOCTL_DROP:
+		return snd_pcm_drop(substream);
+	case SNDRV_PCM_IOCTL_PAUSE:
+	{
+		int res;
+		snd_pcm_stream_lock_irq(substream);
+		res = snd_pcm_pause(substream, (int)(unsigned long)arg);
+		snd_pcm_stream_unlock_irq(substream);
+		return res;
+	}
+	}
+	snd_printd("unknown ioctl = 0x%x\n", cmd);
+	return -ENOTTY;
+}
+
+static int snd_pcm_playback_ioctl1(struct file *file,
+				   struct snd_pcm_substream *substream,
+				   unsigned int cmd, void __user *arg)
+{
+	if (snd_BUG_ON(!substream))
+		return -ENXIO;
+	if (snd_BUG_ON(substream->stream != SNDRV_PCM_STREAM_PLAYBACK))
+		return -EINVAL;
+	switch (cmd) {
+	case SNDRV_PCM_IOCTL_WRITEI_FRAMES:
+	{
+		struct snd_xferi xferi;
+		struct snd_xferi __user *_xferi = arg;
+		struct snd_pcm_runtime *runtime = substream->runtime;
+		snd_pcm_sframes_t result;
+		if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
+			return -EBADFD;
+		if (put_user(0, &_xferi->result))
+			return -EFAULT;
+		if (copy_from_user(&xferi, _xferi, sizeof(xferi)))
+			return -EFAULT;
+		result = snd_pcm_lib_write(substream, xferi.buf, xferi.frames);
+		__put_user(result, &_xferi->result);
+		return result < 0 ? result : 0;
+	}
+	case SNDRV_PCM_IOCTL_WRITEN_FRAMES:
+	{
+		struct snd_xfern xfern;
+		struct snd_xfern __user *_xfern = arg;
+		struct snd_pcm_runtime *runtime = substream->runtime;
+		void __user **bufs;
+		snd_pcm_sframes_t result;
+		if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
+			return -EBADFD;
+		if (runtime->channels > 128)
+			return -EINVAL;
+		if (put_user(0, &_xfern->result))
+			return -EFAULT;
+		if (copy_from_user(&xfern, _xfern, sizeof(xfern)))
+			return -EFAULT;
+
+		bufs = memdup_user(xfern.bufs,
+				   sizeof(void *) * runtime->channels);
+		if (IS_ERR(bufs))
+			return PTR_ERR(bufs);
+		result = snd_pcm_lib_writev(substream, bufs, xfern.frames);
+		kfree(bufs);
+		__put_user(result, &_xfern->result);
+		return result < 0 ? result : 0;
+	}
+	case SNDRV_PCM_IOCTL_REWIND:
+	{
+		snd_pcm_uframes_t frames;
+		snd_pcm_uframes_t __user *_frames = arg;
+		snd_pcm_sframes_t result;
+		if (get_user(frames, _frames))
+			return -EFAULT;
+		if (put_user(0, _frames))
+			return -EFAULT;
+		result = snd_pcm_playback_rewind(substream, frames);
+		__put_user(result, _frames);
+		return result < 0 ? result : 0;
+	}
+	case SNDRV_PCM_IOCTL_FORWARD:
+	{
+		snd_pcm_uframes_t frames;
+		snd_pcm_uframes_t __user *_frames = arg;
+		snd_pcm_sframes_t result;
+		if (get_user(frames, _frames))
+			return -EFAULT;
+		if (put_user(0, _frames))
+			return -EFAULT;
+		result = snd_pcm_playback_forward(substream, frames);
+		__put_user(result, _frames);
+		return result < 0 ? result : 0;
+	}
+	}
+	return snd_pcm_common_ioctl1(file, substream, cmd, arg);
+}
+
+static int snd_pcm_capture_ioctl1(struct file *file,
+				  struct snd_pcm_substream *substream,
+				  unsigned int cmd, void __user *arg)
+{
+	if (snd_BUG_ON(!substream))
+		return -ENXIO;
+	if (snd_BUG_ON(substream->stream != SNDRV_PCM_STREAM_CAPTURE))
+		return -EINVAL;
+	switch (cmd) {
+	case SNDRV_PCM_IOCTL_READI_FRAMES:
+	{
+		struct snd_xferi xferi;
+		struct snd_xferi __user *_xferi = arg;
+		struct snd_pcm_runtime *runtime = substream->runtime;
+		snd_pcm_sframes_t result;
+		if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
+			return -EBADFD;
+		if (put_user(0, &_xferi->result))
+			return -EFAULT;
+		if (copy_from_user(&xferi, _xferi, sizeof(xferi)))
+			return -EFAULT;
+		result = snd_pcm_lib_read(substream, xferi.buf, xferi.frames);
+		__put_user(result, &_xferi->result);
+		return result < 0 ? result : 0;
+	}
+	case SNDRV_PCM_IOCTL_READN_FRAMES:
+	{
+		struct snd_xfern xfern;
+		struct snd_xfern __user *_xfern = arg;
+		struct snd_pcm_runtime *runtime = substream->runtime;
+		void *bufs;
+		snd_pcm_sframes_t result;
+		if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
+			return -EBADFD;
+		if (runtime->channels > 128)
+			return -EINVAL;
+		if (put_user(0, &_xfern->result))
+			return -EFAULT;
+		if (copy_from_user(&xfern, _xfern, sizeof(xfern)))
+			return -EFAULT;
+
+		bufs = memdup_user(xfern.bufs,
+				   sizeof(void *) * runtime->channels);
+		if (IS_ERR(bufs))
+			return PTR_ERR(bufs);
+		result = snd_pcm_lib_readv(substream, bufs, xfern.frames);
+		kfree(bufs);
+		__put_user(result, &_xfern->result);
+		return result < 0 ? result : 0;
+	}
+	case SNDRV_PCM_IOCTL_REWIND:
+	{
+		snd_pcm_uframes_t frames;
+		snd_pcm_uframes_t __user *_frames = arg;
+		snd_pcm_sframes_t result;
+		if (get_user(frames, _frames))
+			return -EFAULT;
+		if (put_user(0, _frames))
+			return -EFAULT;
+		result = snd_pcm_capture_rewind(substream, frames);
+		__put_user(result, _frames);
+		return result < 0 ? result : 0;
+	}
+	case SNDRV_PCM_IOCTL_FORWARD:
+	{
+		snd_pcm_uframes_t frames;
+		snd_pcm_uframes_t __user *_frames = arg;
+		snd_pcm_sframes_t result;
+		if (get_user(frames, _frames))
+			return -EFAULT;
+		if (put_user(0, _frames))
+			return -EFAULT;
+		result = snd_pcm_capture_forward(substream, frames);
+		__put_user(result, _frames);
+		return result < 0 ? result : 0;
+	}
+	}
+	return snd_pcm_common_ioctl1(file, substream, cmd, arg);
+}
+
+static long snd_pcm_playback_ioctl(struct file *file, unsigned int cmd,
+				   unsigned long arg)
+{
+	struct snd_pcm_file *pcm_file;
+
+	pcm_file = file->private_data;
+
+	if (((cmd >> 8) & 0xff) != 'A')
+		return -ENOTTY;
+
+	return snd_pcm_playback_ioctl1(file, pcm_file->substream, cmd,
+				       (void __user *)arg);
+}
+
+static long snd_pcm_capture_ioctl(struct file *file, unsigned int cmd,
+				  unsigned long arg)
+{
+	struct snd_pcm_file *pcm_file;
+
+	pcm_file = file->private_data;
+
+	if (((cmd >> 8) & 0xff) != 'A')
+		return -ENOTTY;
+
+	return snd_pcm_capture_ioctl1(file, pcm_file->substream, cmd,
+				      (void __user *)arg);
+}
+
+int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
+			 unsigned int cmd, void *arg)
+{
+	mm_segment_t fs;
+	int result;
+	
+	fs = snd_enter_user();
+	switch (substream->stream) {
+	case SNDRV_PCM_STREAM_PLAYBACK:
+		result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
+						 (void __user *)arg);
+		break;
+	case SNDRV_PCM_STREAM_CAPTURE:
+		result = snd_pcm_capture_ioctl1(NULL, substream, cmd,
+						(void __user *)arg);
+		break;
+	default:
+		result = -EINVAL;
+		break;
+	}
+	snd_leave_user(fs);
+	return result;
+}
+
+EXPORT_SYMBOL(snd_pcm_kernel_ioctl);
+
+static ssize_t snd_pcm_read(struct file *file, char __user *buf, size_t count,
+			    loff_t * offset)
+{
+	struct snd_pcm_file *pcm_file;
+	struct snd_pcm_substream *substream;
+	struct snd_pcm_runtime *runtime;
+	snd_pcm_sframes_t result;
+
+	pcm_file = file->private_data;
+	substream = pcm_file->substream;
+	if (PCM_RUNTIME_CHECK(substream))
+		return -ENXIO;
+	runtime = substream->runtime;
+	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
+		return -EBADFD;
+	if (!frame_aligned(runtime, count))
+		return -EINVAL;
+	count = bytes_to_frames(runtime, count);
+	result = snd_pcm_lib_read(substream, buf, count);
+	if (result > 0)
+		result = frames_to_bytes(runtime, result);
+	return result;
+}
+
+static ssize_t snd_pcm_write(struct file *file, const char __user *buf,
+			     size_t count, loff_t * offset)
+{
+	struct snd_pcm_file *pcm_file;
+	struct snd_pcm_substream *substream;
+	struct snd_pcm_runtime *runtime;
+	snd_pcm_sframes_t result;
+
+	pcm_file = file->private_data;
+	substream = pcm_file->substream;
+	if (PCM_RUNTIME_CHECK(substream))
+		return -ENXIO;
+	runtime = substream->runtime;
+	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
+		return -EBADFD;
+	if (!frame_aligned(runtime, count))
+		return -EINVAL;
+	count = bytes_to_frames(runtime, count);
+	result = snd_pcm_lib_write(substream, buf, count);
+	if (result > 0)
+		result = frames_to_bytes(runtime, result);
+	return result;
+}
+
+static ssize_t snd_pcm_aio_read(struct kiocb *iocb, const struct iovec *iov,
+			     unsigned long nr_segs, loff_t pos)
+
+{
+	struct snd_pcm_file *pcm_file;
+	struct snd_pcm_substream *substream;
+	struct snd_pcm_runtime *runtime;
+	snd_pcm_sframes_t result;
+	unsigned long i;
+	void __user **bufs;
+	snd_pcm_uframes_t frames;
+
+	pcm_file = iocb->ki_filp->private_data;
+	substream = pcm_file->substream;
+	if (PCM_RUNTIME_CHECK(substream))
+		return -ENXIO;
+	runtime = substream->runtime;
+	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
+		return -EBADFD;
+	if (nr_segs > 1024 || nr_segs != runtime->channels)
+		return -EINVAL;
+	if (!frame_aligned(runtime, iov->iov_len))
+		return -EINVAL;
+	frames = bytes_to_samples(runtime, iov->iov_len);
+	bufs = kmalloc(sizeof(void *) * nr_segs, GFP_KERNEL);
+	if (bufs == NULL)
+		return -ENOMEM;
+	for (i = 0; i < nr_segs; ++i)
+		bufs[i] = iov[i].iov_base;
+	result = snd_pcm_lib_readv(substream, bufs, frames);
+	if (result > 0)
+		result = frames_to_bytes(runtime, result);
+	kfree(bufs);
+	return result;
+}
+
+static ssize_t snd_pcm_aio_write(struct kiocb *iocb, const struct iovec *iov,
+			      unsigned long nr_segs, loff_t pos)
+{
+	struct snd_pcm_file *pcm_file;
+	struct snd_pcm_substream *substream;
+	struct snd_pcm_runtime *runtime;
+	snd_pcm_sframes_t result;
+	unsigned long i;
+	void __user **bufs;
+	snd_pcm_uframes_t frames;
+
+	pcm_file = iocb->ki_filp->private_data;
+	substream = pcm_file->substream;
+	if (PCM_RUNTIME_CHECK(substream))
+		return -ENXIO;
+	runtime = substream->runtime;
+	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
+		return -EBADFD;
+	if (nr_segs > 128 || nr_segs != runtime->channels ||
+	    !frame_aligned(runtime, iov->iov_len))
+		return -EINVAL;
+	frames = bytes_to_samples(runtime, iov->iov_len);
+	bufs = kmalloc(sizeof(void *) * nr_segs, GFP_KERNEL);
+	if (bufs == NULL)
+		return -ENOMEM;
+	for (i = 0; i < nr_segs; ++i)
+		bufs[i] = iov[i].iov_base;
+	result = snd_pcm_lib_writev(substream, bufs, frames);
+	if (result > 0)
+		result = frames_to_bytes(runtime, result);
+	kfree(bufs);
+	return result;
+}
+
+static unsigned int snd_pcm_playback_poll(struct file *file, poll_table * wait)
+{
+	struct snd_pcm_file *pcm_file;
+	struct snd_pcm_substream *substream;
+	struct snd_pcm_runtime *runtime;
+        unsigned int mask;
+	snd_pcm_uframes_t avail;
+
+	pcm_file = file->private_data;
+
+	substream = pcm_file->substream;
+	if (PCM_RUNTIME_CHECK(substream))
+		return -ENXIO;
+	runtime = substream->runtime;
+
+	poll_wait(file, &runtime->sleep, wait);
+
+	//giovanni snd_pcm_stream_lock_irq(substream);
+	avail = snd_pcm_playback_avail(runtime);
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_RUNNING:
+	case SNDRV_PCM_STATE_PREPARED:
+	case SNDRV_PCM_STATE_PAUSED:
+		if (avail >= runtime->control->avail_min) {
+			mask = POLLOUT | POLLWRNORM;
+			break;
+		}
+		/* Fall through */
+	case SNDRV_PCM_STATE_DRAINING:
+		mask = 0;
+		break;
+	default:
+		mask = POLLOUT | POLLWRNORM | POLLERR;
+		break;
+	}
+	//giovanni snd_pcm_stream_unlock_irq(substream);
+	return mask;
+}
+
+static unsigned int snd_pcm_capture_poll(struct file *file, poll_table * wait)
+{
+	struct snd_pcm_file *pcm_file;
+	struct snd_pcm_substream *substream;
+	struct snd_pcm_runtime *runtime;
+        unsigned int mask;
+	snd_pcm_uframes_t avail;
+
+	pcm_file = file->private_data;
+
+	substream = pcm_file->substream;
+	if (PCM_RUNTIME_CHECK(substream))
+		return -ENXIO;
+	runtime = substream->runtime;
+
+	poll_wait(file, &runtime->sleep, wait);
+
+	//giovanni snd_pcm_stream_lock_irq(substream);
+	avail = snd_pcm_capture_avail(runtime);
+	switch (runtime->status->state) {
+	case SNDRV_PCM_STATE_RUNNING:
+	case SNDRV_PCM_STATE_PREPARED:
+	case SNDRV_PCM_STATE_PAUSED:
+		if (avail >= runtime->control->avail_min) {
+			mask = POLLIN | POLLRDNORM;
+			break;
+		}
+		mask = 0;
+		break;
+	case SNDRV_PCM_STATE_DRAINING:
+		if (avail > 0) {
+			mask = POLLIN | POLLRDNORM;
+			break;
+		}
+		/* Fall through */
+	default:
+		mask = POLLIN | POLLRDNORM | POLLERR;
+		break;
+	}
+	//giovanni snd_pcm_stream_unlock_irq(substream);
+	return mask;
+}
+
+/*
+ * mmap support
+ */
+
+/*
+ * Only on coherent architectures, we can mmap the status and the control records
+ * for effcient data transfer.  On others, we have to use HWSYNC ioctl...
+ */
+#if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_ALPHA)
+/*
+ * mmap status record
+ */
+static int snd_pcm_mmap_status_fault(struct vm_area_struct *area,
+						struct vm_fault *vmf)
+{
+	struct snd_pcm_substream *substream = area->vm_private_data;
+	struct snd_pcm_runtime *runtime;
+	
+	if (substream == NULL)
+		return VM_FAULT_SIGBUS;
+	runtime = substream->runtime;
+	vmf->page = virt_to_page(runtime->status);
+	get_page(vmf->page);
+	return 0;
+}
+
+static const struct vm_operations_struct snd_pcm_vm_ops_status =
+{
+	.fault =	snd_pcm_mmap_status_fault,
+};
+
+static int snd_pcm_mmap_status(struct snd_pcm_substream *substream, struct file *file,
+			       struct vm_area_struct *area)
+{
+	struct snd_pcm_runtime *runtime;
+	long size;
+	if (!(area->vm_flags & VM_READ))
+		return -EINVAL;
+	runtime = substream->runtime;
+	size = area->vm_end - area->vm_start;
+	if (size != PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status)))
+		return -EINVAL;
+	area->vm_ops = &snd_pcm_vm_ops_status;
+	area->vm_private_data = substream;
+	area->vm_flags |= VM_RESERVED;
+	return 0;
+}
+
+/*
+ * mmap control record
+ */
+static int snd_pcm_mmap_control_fault(struct vm_area_struct *area,
+						struct vm_fault *vmf)
+{
+	struct snd_pcm_substream *substream = area->vm_private_data;
+	struct snd_pcm_runtime *runtime;
+	
+	if (substream == NULL)
+		return VM_FAULT_SIGBUS;
+	runtime = substream->runtime;
+	vmf->page = virt_to_page(runtime->control);
+	get_page(vmf->page);
+	return 0;
+}
+
+static const struct vm_operations_struct snd_pcm_vm_ops_control =
+{
+	.fault =	snd_pcm_mmap_control_fault,
+};
+
+static int snd_pcm_mmap_control(struct snd_pcm_substream *substream, struct file *file,
+				struct vm_area_struct *area)
+{
+	struct snd_pcm_runtime *runtime;
+	long size;
+	if (!(area->vm_flags & VM_READ))
+		return -EINVAL;
+	runtime = substream->runtime;
+	size = area->vm_end - area->vm_start;
+	if (size != PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control)))
+		return -EINVAL;
+	area->vm_ops = &snd_pcm_vm_ops_control;
+	area->vm_private_data = substream;
+	area->vm_flags |= VM_RESERVED;
+	return 0;
+}
+#else /* ! coherent mmap */
+/*
+ * don't support mmap for status and control records.
+ */
+static int snd_pcm_mmap_status(struct snd_pcm_substream *substream, struct file *file,
+			       struct vm_area_struct *area)
+{
+	return -ENXIO;
+}
+static int snd_pcm_mmap_control(struct snd_pcm_substream *substream, struct file *file,
+				struct vm_area_struct *area)
+{
+	return -ENXIO;
+}
+#endif /* coherent mmap */
+
+static inline struct page *
+snd_pcm_default_page_ops(struct snd_pcm_substream *substream, unsigned long ofs)
+{
+	void *vaddr = substream->runtime->dma_area + ofs;
+#if defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT)
+	if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)
+		return virt_to_page(CAC_ADDR(vaddr));
+#endif
+#if defined(CONFIG_PPC32) && defined(CONFIG_NOT_COHERENT_CACHE)
+	if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) {
+		dma_addr_t addr = substream->runtime->dma_addr + ofs;
+		addr -= get_dma_offset(substream->dma_buffer.dev.dev);
+		/* assume dma_handle set via pfn_to_phys() in
+		 * mm/dma-noncoherent.c
+		 */
+		return pfn_to_page(addr >> PAGE_SHIFT);
+	}
+#endif
+	return virt_to_page(vaddr);
+}
+
+/*
+ * fault callback for mmapping a RAM page
+ */
+static int snd_pcm_mmap_data_fault(struct vm_area_struct *area,
+						struct vm_fault *vmf)
+{
+	struct snd_pcm_substream *substream = area->vm_private_data;
+	struct snd_pcm_runtime *runtime;
+	unsigned long offset;
+	struct page * page;
+	size_t dma_bytes;
+	
+	if (substream == NULL)
+		return VM_FAULT_SIGBUS;
+	runtime = substream->runtime;
+	offset = vmf->pgoff << PAGE_SHIFT;
+	dma_bytes = PAGE_ALIGN(runtime->dma_bytes);
+	if (offset > dma_bytes - PAGE_SIZE)
+		return VM_FAULT_SIGBUS;
+	if (substream->ops->page)
+		page = substream->ops->page(substream, offset);
+	else
+		page = snd_pcm_default_page_ops(substream, offset);
+	if (!page)
+		return VM_FAULT_SIGBUS;
+	get_page(page);
+	vmf->page = page;
+	return 0;
+}
+
+static const struct vm_operations_struct snd_pcm_vm_ops_data = {
+	.open =		snd_pcm_mmap_data_open,
+	.close =	snd_pcm_mmap_data_close,
+};
+
+static const struct vm_operations_struct snd_pcm_vm_ops_data_fault = {
+	.open =		snd_pcm_mmap_data_open,
+	.close =	snd_pcm_mmap_data_close,
+	.fault =	snd_pcm_mmap_data_fault,
+};
+
+#ifndef ARCH_HAS_DMA_MMAP_COHERENT
+/* This should be defined / handled globally! */
+#ifdef CONFIG_ARM
+#define ARCH_HAS_DMA_MMAP_COHERENT
+#endif
+#endif
+
+/*
+ * mmap the DMA buffer on RAM
+ */
+static int snd_pcm_default_mmap(struct snd_pcm_substream *substream,
+				struct vm_area_struct *area)
+{
+	area->vm_flags |= VM_RESERVED;
+#ifdef ARCH_HAS_DMA_MMAP_COHERENT
+	if (!substream->ops->page &&
+	    substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)
+		return dma_mmap_coherent(substream->dma_buffer.dev.dev,
+					 area,
+					 substream->runtime->dma_area,
+					 substream->runtime->dma_addr,
+					 area->vm_end - area->vm_start);
+#endif /* ARCH_HAS_DMA_MMAP_COHERENT */
+	/* mmap with fault handler */
+	area->vm_ops = &snd_pcm_vm_ops_data_fault;
+	return 0;
+}
+
+/*
+ * mmap the DMA buffer on I/O memory area
+ */
+#if SNDRV_PCM_INFO_MMAP_IOMEM
+int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream,
+			   struct vm_area_struct *area)
+{
+	long size;
+	unsigned long offset;
+
+	area->vm_page_prot = pgprot_noncached(area->vm_page_prot);
+	area->vm_flags |= VM_IO;
+	size = area->vm_end - area->vm_start;
+	offset = area->vm_pgoff << PAGE_SHIFT;
+	if (io_remap_pfn_range(area, area->vm_start,
+				(substream->runtime->dma_addr + offset) >> PAGE_SHIFT,
+				size, area->vm_page_prot))
+		return -EAGAIN;
+	return 0;
+}
+
+EXPORT_SYMBOL(snd_pcm_lib_mmap_iomem);
+#endif /* SNDRV_PCM_INFO_MMAP */
+
+/* mmap callback with pgprot_noncached */
+int snd_pcm_lib_mmap_noncached(struct snd_pcm_substream *substream,
+			       struct vm_area_struct *area)
+{
+	area->vm_page_prot = pgprot_noncached(area->vm_page_prot);
+	return snd_pcm_default_mmap(substream, area);
+}
+EXPORT_SYMBOL(snd_pcm_lib_mmap_noncached);
+
+/*
+ * mmap DMA buffer
+ */
+int snd_pcm_mmap_data(struct snd_pcm_substream *substream, struct file *file,
+		      struct vm_area_struct *area)
+{
+	struct snd_pcm_runtime *runtime;
+	long size;
+	unsigned long offset;
+	size_t dma_bytes;
+	int err;
+
+	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+		if (!(area->vm_flags & (VM_WRITE|VM_READ)))
+			return -EINVAL;
+	} else {
+		if (!(area->vm_flags & VM_READ))
+			return -EINVAL;
+	}
+	runtime = substream->runtime;
+	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
+		return -EBADFD;
+	if (!(runtime->info & SNDRV_PCM_INFO_MMAP))
+		return -ENXIO;
+	if (runtime->access == SNDRV_PCM_ACCESS_RW_INTERLEAVED ||
+	    runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED)
+		return -EINVAL;
+	size = area->vm_end - area->vm_start;
+	offset = area->vm_pgoff << PAGE_SHIFT;
+	dma_bytes = PAGE_ALIGN(runtime->dma_bytes);
+	if ((size_t)size > dma_bytes)
+		return -EINVAL;
+	if (offset > dma_bytes - size)
+		return -EINVAL;
+
+	area->vm_ops = &snd_pcm_vm_ops_data;
+	area->vm_private_data = substream;
+	if (substream->ops->mmap)
+		err = substream->ops->mmap(substream, area);
+	else
+		err = snd_pcm_default_mmap(substream, area);
+	if (!err)
+		atomic_inc(&substream->mmap_count);
+	return err;
+}
+
+EXPORT_SYMBOL(snd_pcm_mmap_data);
+
+static int snd_pcm_mmap(struct file *file, struct vm_area_struct *area)
+{
+	struct snd_pcm_file * pcm_file;
+	struct snd_pcm_substream *substream;	
+	unsigned long offset;
+	
+	pcm_file = file->private_data;
+	substream = pcm_file->substream;
+	if (PCM_RUNTIME_CHECK(substream))
+		return -ENXIO;
+
+	offset = area->vm_pgoff << PAGE_SHIFT;
+	switch (offset) {
+	case SNDRV_PCM_MMAP_OFFSET_STATUS:
+		if (pcm_file->no_compat_mmap)
+			return -ENXIO;
+		return snd_pcm_mmap_status(substream, file, area);
+	case SNDRV_PCM_MMAP_OFFSET_CONTROL:
+		if (pcm_file->no_compat_mmap)
+			return -ENXIO;
+		return snd_pcm_mmap_control(substream, file, area);
+	default:
+		return snd_pcm_mmap_data(substream, file, area);
+	}
+	return 0;
+}
+
+static int snd_pcm_fasync(int fd, struct file * file, int on)
+{
+	struct snd_pcm_file * pcm_file;
+	struct snd_pcm_substream *substream;
+	struct snd_pcm_runtime *runtime;
+
+	pcm_file = file->private_data;
+	substream = pcm_file->substream;
+	if (PCM_RUNTIME_CHECK(substream))
+		return -ENXIO;
+	runtime = substream->runtime;
+	return fasync_helper(fd, file, on, &runtime->fasync);
+}
+
+/*
+ * ioctl32 compat
+ */
+#ifdef CONFIG_COMPAT
+#include "pcm_compat.c"
+#else
+#define snd_pcm_ioctl_compat	NULL
+#endif
+
+/*
+ *  To be removed helpers to keep binary compatibility
+ */
+
+#ifdef CONFIG_SND_SUPPORT_OLD_API
+#define __OLD_TO_NEW_MASK(x) ((x&7)|((x&0x07fffff8)<<5))
+#define __NEW_TO_OLD_MASK(x) ((x&7)|((x&0xffffff00)>>5))
+
+static void snd_pcm_hw_convert_from_old_params(struct snd_pcm_hw_params *params,
+					       struct snd_pcm_hw_params_old *oparams)
+{
+	unsigned int i;
+
+	memset(params, 0, sizeof(*params));
+	params->flags = oparams->flags;
+	for (i = 0; i < ARRAY_SIZE(oparams->masks); i++)
+		params->masks[i].bits[0] = oparams->masks[i];
+	memcpy(params->intervals, oparams->intervals, sizeof(oparams->intervals));
+	params->rmask = __OLD_TO_NEW_MASK(oparams->rmask);
+	params->cmask = __OLD_TO_NEW_MASK(oparams->cmask);
+	params->info = oparams->info;
+	params->msbits = oparams->msbits;
+	params->rate_num = oparams->rate_num;
+	params->rate_den = oparams->rate_den;
+	params->fifo_size = oparams->fifo_size;
+}
+
+static void snd_pcm_hw_convert_to_old_params(struct snd_pcm_hw_params_old *oparams,
+					     struct snd_pcm_hw_params *params)
+{
+	unsigned int i;
+
+	memset(oparams, 0, sizeof(*oparams));
+	oparams->flags = params->flags;
+	for (i = 0; i < ARRAY_SIZE(oparams->masks); i++)
+		oparams->masks[i] = params->masks[i].bits[0];
+	memcpy(oparams->intervals, params->intervals, sizeof(oparams->intervals));
+	oparams->rmask = __NEW_TO_OLD_MASK(params->rmask);
+	oparams->cmask = __NEW_TO_OLD_MASK(params->cmask);
+	oparams->info = params->info;
+	oparams->msbits = params->msbits;
+	oparams->rate_num = params->rate_num;
+	oparams->rate_den = params->rate_den;
+	oparams->fifo_size = params->fifo_size;
+}
+
+static int snd_pcm_hw_refine_old_user(struct snd_pcm_substream *substream,
+				      struct snd_pcm_hw_params_old __user * _oparams)
+{
+	struct snd_pcm_hw_params *params;
+	struct snd_pcm_hw_params_old *oparams = NULL;
+	int err;
+
+	params = kmalloc(sizeof(*params), GFP_KERNEL);
+	if (!params)
+		return -ENOMEM;
+
+	oparams = memdup_user(_oparams, sizeof(*oparams));
+	if (IS_ERR(oparams)) {
+		err = PTR_ERR(oparams);
+		goto out;
+	}
+	snd_pcm_hw_convert_from_old_params(params, oparams);
+	err = snd_pcm_hw_refine(substream, params);
+	snd_pcm_hw_convert_to_old_params(oparams, params);
+	if (copy_to_user(_oparams, oparams, sizeof(*oparams))) {
+		if (!err)
+			err = -EFAULT;
+	}
+
+	kfree(oparams);
+out:
+	kfree(params);
+	return err;
+}
+
+static int snd_pcm_hw_params_old_user(struct snd_pcm_substream *substream,
+				      struct snd_pcm_hw_params_old __user * _oparams)
+{
+	struct snd_pcm_hw_params *params;
+	struct snd_pcm_hw_params_old *oparams = NULL;
+	int err;
+
+	params = kmalloc(sizeof(*params), GFP_KERNEL);
+	if (!params)
+		return -ENOMEM;
+
+	oparams = memdup_user(_oparams, sizeof(*oparams));
+	if (IS_ERR(oparams)) {
+		err = PTR_ERR(oparams);
+		goto out;
+	}
+	snd_pcm_hw_convert_from_old_params(params, oparams);
+	err = snd_pcm_hw_params(substream, params);
+	snd_pcm_hw_convert_to_old_params(oparams, params);
+	if (copy_to_user(_oparams, oparams, sizeof(*oparams))) {
+		if (!err)
+			err = -EFAULT;
+	}
+
+	kfree(oparams);
+out:
+	kfree(params);
+	return err;
+}
+#endif /* CONFIG_SND_SUPPORT_OLD_API */
+
+#ifndef CONFIG_MMU
+static unsigned long snd_pcm_get_unmapped_area(struct file *file,
+					       unsigned long addr,
+					       unsigned long len,
+					       unsigned long pgoff,
+					       unsigned long flags)
+{
+	struct snd_pcm_file *pcm_file = file->private_data;
+	struct snd_pcm_substream *substream = pcm_file->substream;
+	struct snd_pcm_runtime *runtime = substream->runtime;
+	unsigned long offset = pgoff << PAGE_SHIFT;
+
+	switch (offset) {
+	case SNDRV_PCM_MMAP_OFFSET_STATUS:
+		return (unsigned long)runtime->status;
+	case SNDRV_PCM_MMAP_OFFSET_CONTROL:
+		return (unsigned long)runtime->control;
+	default:
+		return (unsigned long)runtime->dma_area + offset;
+	}
+}
+#else
+# define snd_pcm_get_unmapped_area NULL
+#endif
+
+/*
+ *  Register section
+ */
+
+const struct file_operations snd_pcm_f_ops[2] = {
+	{
+		.owner =		THIS_MODULE,
+		.write =		snd_pcm_write,
+		.aio_write =		snd_pcm_aio_write,
+		.open =			snd_pcm_playback_open,
+		.release =		snd_pcm_release,
+		.llseek =		no_llseek,
+		.poll =			snd_pcm_playback_poll,
+		.unlocked_ioctl =	snd_pcm_playback_ioctl,
+		.compat_ioctl = 	snd_pcm_ioctl_compat,
+		.mmap =			snd_pcm_mmap,
+		.fasync =		snd_pcm_fasync,
+		.get_unmapped_area =	snd_pcm_get_unmapped_area,
+	},
+	{
+		.owner =		THIS_MODULE,
+		.read =			snd_pcm_read,
+		.aio_read =		snd_pcm_aio_read,
+		.open =			snd_pcm_capture_open,
+		.release =		snd_pcm_release,
+		.llseek =		no_llseek,
+		.poll =			snd_pcm_capture_poll,
+		.unlocked_ioctl =	snd_pcm_capture_ioctl,
+		.compat_ioctl = 	snd_pcm_ioctl_compat,
+		.mmap =			snd_pcm_mmap,
+		.fasync =		snd_pcm_fasync,
+		.get_unmapped_area =	snd_pcm_get_unmapped_area,
+	}
+};
diff --git a/src/mod/endpoints/mod_skypopen/mod_skypopen.c b/src/mod/endpoints/mod_skypopen/mod_skypopen.c
index e83288770b..83c409c3f6 100644
--- a/src/mod/endpoints/mod_skypopen/mod_skypopen.c
+++ b/src/mod/endpoints/mod_skypopen/mod_skypopen.c
@@ -109,16 +109,17 @@ char *interface_status[] = {	/* should match SKYPOPEN_STATE_xxx in skypopen.h */
 	"DOUBLE",
 	"SELECTD",
 	"HANG_RQ",
-	"PREANSW"
+	"PREANSW",
+	"DEAD"
 };
 char *skype_callflow[] = {		/* should match CALLFLOW_XXX in skypopen.h */
-	"CALL_IDLE",
-	"CALL_DOWN",
-	"INCOMING_RNG",
+	"IDLE",
+	"DOWN",
+	"INC_RNG",
 	"CALL_DIALING",
 	"CALL_LINEBUSY",
 	"CALL_ACTIVE",
-	"INCOMING_HNG",
+	"INC_HNG",
 	"CALL_RLEASD",
 	"CALL_NOCARR",
 	"CALL_INFLUX",
@@ -128,17 +129,17 @@ char *skype_callflow[] = {		/* should match CALLFLOW_XXX in skypopen.h */
 	"CALL_OUTRESTR",
 	"CALL_SECFAIL",
 	"CALL_NOANSWER",
-	"STATUS_FNSHED",
-	"STATUS_CANCLED",
-	"STATUS_FAILED",
-	"STATUS_REFUSED",
-	"STATUS_RINGING",
-	"STATUS_INPROGRS",
-	"STATUS_UNPLACD",
-	"STATUS_ROUTING",
-	"STATUS_EARLYMD",
-	"INCOMING_CLID",
-	"STATUS_RMTEHOLD"
+	"FNSHED",
+	"CANCLED",
+	"FAILED",
+	"REFUSED",
+	"RINGING",
+	"INPROGRS",
+	"UNPLACD",
+	"ROUTING",
+	"EARLYMD",
+	"INC_CLID",
+	"RMTEHOLD"
 };
 
 
@@ -159,12 +160,24 @@ static struct {
 	switch_mutex_t *mutex;
 	private_t *sk_console;
 	int start_port;
+
+	// CLOUDTREE (THomas Hazel)
+	switch_mutex_t *list_mutex;
+
 } globals;
 
 switch_endpoint_interface_t *skypopen_endpoint_interface;
 switch_memory_pool_t *skypopen_module_pool = NULL;
 int running = 0;
 
+// CLOUDTREE (THomas Hazel)
+#ifndef WIN32
+struct SkypopenList global_handles_list;
+extern int xio_error_handler(Display * dpy);
+extern int X11_errors_handler(Display * dpy, XErrorEvent * err);
+extern int xio_error_handler2(Display * dpy, XErrorEvent * err);
+#endif
+
 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_context, globals.context);
 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan);
 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_destination, globals.destination);
@@ -175,7 +188,7 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_write_silence_when_idle, globals.wr
 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_setsockopt, globals.setsockopt);
 
 static switch_status_t interface_exists(char *the_interface);
-static switch_status_t remove_interface(char *the_interface);
+/* CLOUDTREE (Thomas Hazel) static*/ switch_status_t remove_interface(char *the_interface, /* CLOUDTREE (Thomas Hazel */ switch_bool_t force);
 
 static switch_status_t channel_on_init(switch_core_session_t *session);
 static switch_status_t channel_on_hangup(switch_core_session_t *session);
@@ -193,23 +206,23 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
 static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
 static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
-static switch_status_t skypopen_tech_init(private_t * tech_pvt, switch_core_session_t *session);
+static switch_status_t skypopen_tech_init(private_t *tech_pvt, switch_core_session_t *session);
 
-static switch_status_t skypopen_codec(private_t * tech_pvt, int sample_rate, int codec_ms)
+static switch_status_t skypopen_codec(private_t *tech_pvt, int sample_rate, int codec_ms)
 {
 	switch_core_session_t *session = NULL;
 
 	if (switch_core_codec_init
 		(&tech_pvt->read_codec, "L16", NULL, sample_rate, codec_ms, 1,
 		 SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("Can't load codec?\n", SKYPOPEN_P_LOG);
+		ERRORA("skypopen_codec: Can't load codec?\n", SKYPOPEN_P_LOG);
 		return SWITCH_STATUS_FALSE;
 	}
 
 	if (switch_core_codec_init
 		(&tech_pvt->write_codec, "L16", NULL, sample_rate, codec_ms, 1,
 		 SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("Can't load codec?\n", SKYPOPEN_P_LOG);
+		ERRORA("skypopen_codec: Can't load codec?\n", SKYPOPEN_P_LOG);
 		switch_core_codec_destroy(&tech_pvt->read_codec);
 		return SWITCH_STATUS_FALSE;
 	}
@@ -224,15 +237,16 @@ static switch_status_t skypopen_codec(private_t * tech_pvt, int sample_rate, int
 		switch_core_session_set_write_codec(session, &tech_pvt->write_codec);
 		switch_core_session_rwunlock(session);
 	} else {
-		ERRORA("no session\n", SKYPOPEN_P_LOG);
+		ERRORA("skypopen_codec: no session\n", SKYPOPEN_P_LOG);
 		return SWITCH_STATUS_FALSE;
 	}
 
+	DEBUGA_SKYPE("codecs UP\n", SKYPOPEN_P_LOG);
 	return SWITCH_STATUS_SUCCESS;
 
 }
 
-switch_status_t skypopen_tech_init(private_t * tech_pvt, switch_core_session_t *session)
+switch_status_t skypopen_tech_init(private_t *tech_pvt, switch_core_session_t *session)
 {
 
 	switch_assert(tech_pvt != NULL);
@@ -244,11 +258,11 @@ switch_status_t skypopen_tech_init(private_t * tech_pvt, switch_core_session_t *
 	switch_core_session_set_private(session, tech_pvt);
 	switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(session), sizeof(tech_pvt->session_uuid_str));
 	if (!strlen(tech_pvt->session_uuid_str)) {
-		ERRORA("no tech_pvt->session_uuid_str\n", SKYPOPEN_P_LOG);
+		ERRORA("skypopen_tech_init: no tech_pvt->session_uuid_str\n", SKYPOPEN_P_LOG);
 		return SWITCH_STATUS_FALSE;
 	}
 	if (skypopen_codec(tech_pvt, SAMPLERATE_SKYPOPEN, 20) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("skypopen_codec FAILED\n", SKYPOPEN_P_LOG);
+		ERRORA("skypopen_tech_init: skypopen_codec FAILED\n", SKYPOPEN_P_LOG);
 		return SWITCH_STATUS_FALSE;
 	}
 
@@ -298,7 +312,7 @@ static switch_status_t interface_exists(char *the_interface)
 	return SWITCH_STATUS_FALSE;
 }
 
-static switch_status_t remove_interface(char *the_interface)
+/* CLOUDTREE (Thomas Hazel) static */ switch_status_t remove_interface(char *the_interface, /* CLOUDTREE (Thomas Hazel) */ switch_bool_t force)
 {
 	int x = 10;
 	unsigned int howmany = 8;
@@ -338,13 +352,15 @@ static switch_status_t remove_interface(char *the_interface)
 		goto end;
 	}
 
-	if (strlen(globals.SKYPOPEN_INTERFACES[interface_id].session_uuid_str)) {
+	if ( /* CLOUDTREE (Thomas Hazel) */ (force == FALSE) && strlen(globals.SKYPOPEN_INTERFACES[interface_id].session_uuid_str)) {
 		DEBUGA_SKYPE("interface '%s' is busy\n", SKYPOPEN_P_LOG, the_interface);
 		goto end;
 	}
 
 	globals.SKYPOPEN_INTERFACES[interface_id].running = 0;
 
+	tech_pvt->interface_state = SKYPOPEN_STATE_DEAD;
+
 	if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread) {
 #ifdef WIN32
 		skypopen_signaling_write(tech_pvt, "DIE");
@@ -365,8 +381,8 @@ static switch_status_t remove_interface(char *the_interface)
 		if (tech_pvt->running && tech_pvt->SkypopenHandles.disp) {
 			XEvent e;
 			Atom atom1 = XInternAtom(tech_pvt->SkypopenHandles.disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False);
-			switch_sleep(1000);//giovanni
-			XFlush(tech_pvt->SkypopenHandles.disp); //giovanni
+			switch_sleep(1000);
+			XFlush(tech_pvt->SkypopenHandles.disp);
 			memset(&e, 0, sizeof(e));
 			e.xclient.type = ClientMessage;
 			e.xclient.message_type = atom1;	/*  leading message */
@@ -375,8 +391,7 @@ static switch_status_t remove_interface(char *the_interface)
 			e.xclient.format = 8;
 
 			XSendEvent(tech_pvt->SkypopenHandles.disp, tech_pvt->SkypopenHandles.win, False, 0, &e);
-			//giovanni XSync(tech_pvt->SkypopenHandles.disp, False);
-			XFlush(tech_pvt->SkypopenHandles.disp); //giovanni
+			XFlush(tech_pvt->SkypopenHandles.disp);
 		}
 #endif
 	}
@@ -386,6 +401,11 @@ static switch_status_t remove_interface(char *the_interface)
 		switch_yield(50000);
 	}
 
+#ifndef WIN32
+	if (tech_pvt->SkypopenHandles.disp) {
+	}
+#endif
+
 	if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread) {
 		switch_thread_join(&status, globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread);
 	}
@@ -401,7 +421,11 @@ static switch_status_t remove_interface(char *the_interface)
 	} else {
 		DEBUGA_SKYPE("interface '%s' STILL console\n", SKYPOPEN_P_LOG, the_interface);
 	}
-	memset(&globals.SKYPOPEN_INTERFACES[interface_id], '\0', sizeof(private_t));
+	if (strlen(tech_pvt->session_uuid_str)) {
+
+	} else {
+		memset(&globals.SKYPOPEN_INTERFACES[interface_id], '\0', sizeof(private_t));
+	}
 	globals.real_interfaces--;
 	switch_mutex_unlock(globals.mutex);
 
@@ -428,7 +452,9 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
 	channel = switch_core_session_get_channel(session);
 	switch_assert(channel != NULL);
 	switch_channel_set_variable(channel, "skype_user", tech_pvt->skype_user);
+	switch_mutex_lock(tech_pvt->flag_mutex);
 	switch_set_flag(tech_pvt, TFLAG_IO);
+	switch_mutex_unlock(tech_pvt->flag_mutex);
 
 	/* Move channel's state machine to ROUTING. This means the call is trying
 	   to get from the initial start where the call because, to the point
@@ -443,6 +469,8 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
 static switch_status_t channel_on_destroy(switch_core_session_t *session)
 {
 	private_t *tech_pvt = NULL;
+	switch_status_t status;
+	int conta;
 
 	tech_pvt = switch_core_session_get_private(session);
 
@@ -450,6 +478,41 @@ static switch_status_t channel_on_destroy(switch_core_session_t *session)
 	if (tech_pvt) {
 		DEBUGA_SKYPE("%s CHANNEL DESTROY %s\n", SKYPOPEN_P_LOG, tech_pvt->name, switch_core_session_get_uuid(session));
 
+		if (tech_pvt->interface_state != SKYPOPEN_STATE_DEAD) {
+			tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
+		}
+
+		switch_mutex_lock(tech_pvt->flag_mutex);
+		switch_clear_flag(tech_pvt, TFLAG_IO);
+		switch_clear_flag(tech_pvt, TFLAG_VOICE);
+		if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
+			switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
+		}
+		switch_mutex_unlock(tech_pvt->flag_mutex);
+
+		DEBUGA_SKYPE("audio tcp threads to DIE\n", SKYPOPEN_P_LOG);
+		conta = 0;
+		while (tech_pvt->tcp_srv_thread) {
+			switch_sleep(5000);
+			conta++;
+			if (conta == 200) {
+				ERRORA("tcp_srv_thread is NOT dead, this can LEAK MEMORY\n", SKYPOPEN_P_LOG);
+				break;
+			}
+		}
+		DEBUGA_SKYPE("audio tcp srv thread DEAD %d\n", SKYPOPEN_P_LOG, conta);
+		conta = 0;
+		while (tech_pvt->tcp_cli_thread) {
+			switch_sleep(5000);
+			conta++;
+			if (conta == 200) {
+				ERRORA("tcp_cli_thread is NOT dead, this can LEAK MEMORY\n", SKYPOPEN_P_LOG);
+				break;
+			}
+		}
+		DEBUGA_SKYPE("audio tcp cli thread DEAD %d\n", SKYPOPEN_P_LOG, conta);
+
+
 		if (switch_core_codec_ready(&tech_pvt->read_codec)) {
 			switch_core_codec_destroy(&tech_pvt->read_codec);
 		}
@@ -458,31 +521,58 @@ static switch_status_t channel_on_destroy(switch_core_session_t *session)
 			switch_core_codec_destroy(&tech_pvt->write_codec);
 		}
 
-		if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next){
+		DEBUGA_SKYPE("codecs DOWN\n", SKYPOPEN_P_LOG);
+		if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
 			switch_core_timer_destroy(&tech_pvt->timer_read);
 		}
 
-		if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next){
+		if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next) {
 			switch_core_timer_destroy(&tech_pvt->timer_write);
 		}
 
-		if(tech_pvt->read_buffer){
+		if (tech_pvt->read_buffer) {
 			switch_buffer_destroy(&tech_pvt->read_buffer);
 		}
-		if(tech_pvt->write_buffer){
+		if (tech_pvt->write_buffer) {
 			switch_buffer_destroy(&tech_pvt->write_buffer);
 		}
+		//DEBUGA_SKYPE("debugging_hangup 13\n", SKYPOPEN_P_LOG);
+		switch_mutex_lock(tech_pvt->mutex_thread_audio_cli);
+		//DEBUGA_SKYPE("debugging_hangup cli lock\n", SKYPOPEN_P_LOG);
+		if (tech_pvt->tcp_cli_thread) {
+			//DEBUGA_SKYPE("debugging_hangup 14\n", SKYPOPEN_P_LOG);
+			switch_thread_join(&status, tech_pvt->tcp_cli_thread);
+			tech_pvt->tcp_cli_thread = NULL;
+			//DEBUGA_SKYPE("debugging_hangup 15\n", SKYPOPEN_P_LOG);
+		}
+		switch_mutex_unlock(tech_pvt->mutex_thread_audio_cli);
+		//DEBUGA_SKYPE("debugging_hangup cli unlock\n", SKYPOPEN_P_LOG);
+		switch_mutex_lock(tech_pvt->mutex_thread_audio_srv);
+		//DEBUGA_SKYPE("debugging_hangup srv lock\n", SKYPOPEN_P_LOG);
+		if (tech_pvt->tcp_srv_thread) {
+			//DEBUGA_SKYPE("debugging_hangup 16\n", SKYPOPEN_P_LOG);
+			switch_thread_join(&status, tech_pvt->tcp_srv_thread);
+			tech_pvt->tcp_srv_thread = NULL;
+			//DEBUGA_SKYPE("debugging_hangup 17\n", SKYPOPEN_P_LOG);
+		}
+		switch_mutex_unlock(tech_pvt->mutex_thread_audio_srv);
+		//DEBUGA_SKYPE("debugging_hangup srv unlock\n", SKYPOPEN_P_LOG);
+		//DEBUGA_SKYPE("debugging_hangup 18\n", SKYPOPEN_P_LOG);
 
 		*tech_pvt->session_uuid_str = '\0';
-		tech_pvt->interface_state = SKYPOPEN_STATE_IDLE;
-		if (tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED) {
+
+		if (tech_pvt->interface_state != SKYPOPEN_STATE_DEAD) {
+			tech_pvt->interface_state = SKYPOPEN_STATE_IDLE;
 			tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
+		} else {
+			memset(tech_pvt, '\0', sizeof(private_t));
 		}
 		switch_core_session_set_private(session, NULL);
 	} else {
 		DEBUGA_SKYPE("!!!!!!NO tech_pvt!!!! CHANNEL DESTROY %s\n", SKYPOPEN_P_LOG, switch_core_session_get_uuid(session));
 	}
 
+	DEBUGA_SKYPE("CHANNEL DESTROYED %s\n", SKYPOPEN_P_LOG, switch_core_session_get_uuid(session));
 	return SWITCH_STATUS_SUCCESS;
 }
 
@@ -491,52 +581,67 @@ static switch_status_t channel_on_hangup(switch_core_session_t *session)
 	switch_channel_t *channel = NULL;
 	private_t *tech_pvt = NULL;
 	char msg_to_skype[256];
-	switch_status_t status;
+	//switch_status_t status;
 
 
 	channel = switch_core_session_get_channel(session);
 	switch_assert(channel != NULL);
 
 	tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
 
-	if (!switch_channel_test_flag(channel, CF_ANSWERED)) {
-		if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
-			tech_pvt->ob_failed_calls++;
-		} else {
-			tech_pvt->ib_failed_calls++;
+	//DEBUGA_SKYPE("debugging_hangup 1\n", SKYPOPEN_P_LOG);
+
+	if (tech_pvt) {
+		if (tech_pvt->interface_state == SKYPOPEN_STATE_DEAD) {
+			return SWITCH_STATUS_SUCCESS;
+		}
+		if (!switch_channel_test_flag(channel, CF_ANSWERED)) {
+			if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+				tech_pvt->ob_failed_calls++;
+			} else {
+				tech_pvt->ib_failed_calls++;
+			}
 		}
-	}
 
-	switch_clear_flag(tech_pvt, TFLAG_IO);
-	switch_clear_flag(tech_pvt, TFLAG_VOICE);
+		tech_pvt->interface_state = SKYPOPEN_STATE_HANGUP_REQUESTED;
+		switch_mutex_lock(tech_pvt->flag_mutex);
+		switch_clear_flag(tech_pvt, TFLAG_IO);
+		switch_clear_flag(tech_pvt, TFLAG_VOICE);
+		if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
+			switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
+		}
+		switch_mutex_unlock(tech_pvt->flag_mutex);
 
-	tech_pvt->interface_state = SKYPOPEN_STATE_HANGUP_REQUESTED;
 
-	if (strlen(tech_pvt->skype_call_id)) {
-		DEBUGA_SKYPE("hanging up skype call: %s\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id);
-		sprintf(msg_to_skype, "ALTER CALL %s HANGUP", tech_pvt->skype_call_id);
-		skypopen_signaling_write(tech_pvt, msg_to_skype);
-	}
+		//DEBUGA_SKYPE("debugging_hangup 2\n", SKYPOPEN_P_LOG);
 
-	if (tech_pvt->tcp_cli_thread) {
-		switch_thread_join(&status, tech_pvt->tcp_cli_thread);
-	}
-	if (tech_pvt->tcp_srv_thread) {
-		switch_thread_join(&status, tech_pvt->tcp_srv_thread);
-	}
-	DEBUGA_SKYPE("%s CHANNEL HANGUP\n", SKYPOPEN_P_LOG, tech_pvt->name);
-	switch_mutex_lock(globals.mutex);
-	globals.calls--;
-	if (globals.calls < 0) {
-		globals.calls = 0;
+		if (strlen(tech_pvt->skype_call_id)) {
+			DEBUGA_SKYPE("hanging up skype call: %s\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id);
+			sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", tech_pvt->skype_call_id);
+			skypopen_signaling_write(tech_pvt, msg_to_skype);
+			sprintf(msg_to_skype, "ALTER CALL %s HANGUP", tech_pvt->skype_call_id);
+			skypopen_signaling_write(tech_pvt, msg_to_skype);
+		}
+		DEBUGA_SKYPE("%s CHANNEL HANGUP\n", SKYPOPEN_P_LOG, tech_pvt->name);
+		switch_mutex_lock(globals.mutex);
+		globals.calls--;
+		if (globals.calls < 0) {
+			globals.calls = 0;
+		}
+		//DEBUGA_SKYPE("debugging_hangup 9\n", SKYPOPEN_P_LOG);
+		tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
+		if (tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED) {
+			tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
+		}
+		//DEBUGA_SKYPE("debugging_hangup 10\n", SKYPOPEN_P_LOG);
+		switch_mutex_unlock(globals.mutex);
+	} else {
+		WARNINGA("FYI %s CHANNEL has no tech_pvt in his private\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
+		//DEBUGA_SKYPE("debugging_hangup 11\n", SKYPOPEN_P_LOG);
 	}
+	//DEBUGA_SKYPE("debugging_hangup 12\n", SKYPOPEN_P_LOG);
 
-	tech_pvt->interface_state = SKYPOPEN_STATE_IDLE;
-	if (tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED) {
-		tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
-	}
-	switch_mutex_unlock(globals.mutex);
+	switch_channel_set_state(channel, CS_DESTROY);
 
 	return SWITCH_STATUS_SUCCESS;
 }
@@ -578,46 +683,53 @@ static switch_status_t channel_kill_channel(switch_core_session_t *session, int
 {
 	switch_channel_t *channel = NULL;
 	private_t *tech_pvt = NULL;
-	char msg_to_skype[256];
 
 	channel = switch_core_session_get_channel(session);
 	switch_assert(channel != NULL);
 
 	tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
 
 	//DEBUGA_SKYPE("%s CHANNEL KILL_CHANNEL\n", SKYPOPEN_P_LOG, tech_pvt->name);
-	switch (sig) {
-	case SWITCH_SIG_KILL:
-		switch_mutex_lock(tech_pvt->flag_mutex);
-		DEBUGA_SKYPE("%s CHANNEL got SWITCH_SIG_KILL\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-		if (tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD) {
-			DEBUGA_SKYPE("FYI %s CHANNEL in CALLFLOW_STATUS_REMOTEHOLD got SWITCH_SIG_KILL\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
+	if (tech_pvt) {
+		switch (sig) {
+		case SWITCH_SIG_KILL:
+			DEBUGA_SKYPE("%s CHANNEL got SWITCH_SIG_KILL\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
+			if (tech_pvt->interface_state == SKYPOPEN_STATE_DEAD) {
+				switch_channel_set_state(channel, CS_HANGUP);
+				return SWITCH_STATUS_SUCCESS;
+			}
+			tech_pvt->interface_state = SKYPOPEN_STATE_HANGUP_REQUESTED;
+			if (tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD) {
+				DEBUGA_SKYPE("FYI %s CHANNEL in CALLFLOW_STATUS_REMOTEHOLD got SWITCH_SIG_KILL\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
+			}
+			if (switch_channel_get_state(channel) == CS_NEW) {
+				WARNINGA("FYI %s CHANNEL in CS_NEW state got SWITCH_SIG_KILL\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
+			}
+			if (switch_channel_get_state(channel) != CS_NEW && switch_channel_get_state(channel) < CS_EXECUTE) {
+				WARNINGA("FYI %s CHANNEL in %d state got SWITCH_SIG_KILL\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel),
+						 switch_channel_get_state(channel));
+			}
+
+			switch_mutex_lock(tech_pvt->flag_mutex);
+			switch_clear_flag(tech_pvt, TFLAG_IO);
+			switch_clear_flag(tech_pvt, TFLAG_VOICE);
+			switch_set_flag(tech_pvt, TFLAG_HANGUP);
+			if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
+				switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
+			}
+			switch_mutex_unlock(tech_pvt->flag_mutex);
+			break;
+		case SWITCH_SIG_BREAK:
+			DEBUGA_SKYPE("%s CHANNEL got SWITCH_SIG_BREAK\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
+			switch_mutex_lock(tech_pvt->flag_mutex);
+			switch_set_flag(tech_pvt, TFLAG_BREAK);
+			switch_mutex_unlock(tech_pvt->flag_mutex);
+			break;
+		default:
+			break;
 		}
-		if (switch_channel_get_state(channel) == CS_NEW) {
-			ERRORA("FYI %s CHANNEL in CS_NEW state got SWITCH_SIG_KILL\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-		}
-		if (switch_channel_get_state(channel) != CS_NEW && switch_channel_get_state(channel) < CS_EXECUTE) {
-			ERRORA("FYI %s CHANNEL in %d state got SWITCH_SIG_KILL\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel), switch_channel_get_state(channel));
-		}
-		switch_clear_flag(tech_pvt, TFLAG_IO);
-		switch_clear_flag(tech_pvt, TFLAG_VOICE);
-		switch_set_flag(tech_pvt, TFLAG_HANGUP);
-		if(switch_test_flag(tech_pvt, TFLAG_PROGRESS)){
-			switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
-		}
-		switch_mutex_unlock(tech_pvt->flag_mutex);
-		sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", tech_pvt->ring_id);
-		skypopen_signaling_write(tech_pvt, msg_to_skype);
-		break;
-	case SWITCH_SIG_BREAK:
-		DEBUGA_SKYPE("%s CHANNEL got SWITCH_SIG_BREAK\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-		switch_mutex_lock(tech_pvt->flag_mutex);
-		switch_set_flag(tech_pvt, TFLAG_BREAK);
-		switch_mutex_unlock(tech_pvt->flag_mutex);
-		break;
-	default:
-		break;
+	} else {
+		WARNINGA("FYI %s CHANNEL has no tech_pvt in his private\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
 	}
 
 	return SWITCH_STATUS_SUCCESS;
@@ -662,7 +774,7 @@ static switch_status_t channel_on_reset(switch_core_session_t *session)
 		ERRORA("No session???\n", SKYPOPEN_P_LOG);
 	}
 	if (channel) {
-	switch_channel_set_state(channel, CS_HANGUP);
+		switch_channel_set_state(channel, CS_HANGUP);
 	} else {
 		ERRORA("No channel???\n", SKYPOPEN_P_LOG);
 	}
@@ -696,7 +808,7 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
 	unsigned int i;
 	unsigned int a;
 	size_t bytes_read = 0;
-	int try=0;
+	int try = 0;
 
 
 	*frame = NULL;
@@ -709,8 +821,13 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
 
 	tech_pvt->read_frame.flags = SFF_NONE;
 
-	if (!switch_channel_ready(channel) || !switch_test_flag(tech_pvt, TFLAG_IO)) {
+	if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
+		switch_sleep(20000);
+		return SWITCH_STATUS_FALSE;
+	}
+	if (!switch_channel_ready(channel)) {
 		ERRORA("channel not ready \n", SKYPOPEN_P_LOG);
+		switch_sleep(20000);
 		return SWITCH_STATUS_FALSE;
 	}
 
@@ -731,29 +848,29 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
 
 
 
-	if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next){
+	if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
 		switch_core_timer_next(&tech_pvt->timer_read);
 	}
 
-read:
+  read:
 
 
 	if (tech_pvt && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN
-			&& (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
-				|| tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
-				|| tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPOPEN_STATE_UP)) {
+		&& (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
+			|| tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
+			|| tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPOPEN_STATE_UP)) {
 		switch_mutex_lock(tech_pvt->mutex_audio_srv);
-		if (switch_buffer_inuse(tech_pvt->read_buffer)) {
+		if (tech_pvt->read_buffer && switch_buffer_inuse(tech_pvt->read_buffer)) {
 			bytes_read = switch_buffer_read(tech_pvt->read_buffer, tech_pvt->read_frame.data, 640);
 			tech_pvt->read_frame.datalen = bytes_read;
 		}
 		switch_mutex_unlock(tech_pvt->mutex_audio_srv);
 
-		try=0;
+		try = 0;
 		if (!bytes_read) {
 			switch_sleep(1000);
 			try++;
-			if(try < 5)
+			if (try < 5)
 				goto read;
 			DEBUGA_SKYPE("skypopen_audio_read Silence\n", SKYPOPEN_P_LOG);
 			memset(tech_pvt->read_frame.data, 255, SAMPLES_PER_FRAME * sizeof(short));
@@ -765,10 +882,15 @@ read:
 		tech_pvt->read_frame.datalen = 640;
 	}
 
+	switch_mutex_lock(tech_pvt->flag_mutex);
 	switch_set_flag(tech_pvt, TFLAG_VOICE);
+	switch_mutex_unlock(tech_pvt->flag_mutex);
+
 	while (switch_test_flag(tech_pvt, TFLAG_IO)) {
 		if (switch_test_flag(tech_pvt, TFLAG_BREAK)) {
+			switch_mutex_lock(tech_pvt->flag_mutex);
 			switch_clear_flag(tech_pvt, TFLAG_BREAK);
+			switch_mutex_unlock(tech_pvt->flag_mutex);
 			DEBUGA_SKYPE("CHANNEL READ FRAME goto CNG\n", SKYPOPEN_P_LOG);
 			goto cng;
 		}
@@ -779,7 +901,9 @@ read:
 		}
 
 		if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) {
+			switch_mutex_lock(tech_pvt->flag_mutex);
 			switch_clear_flag(tech_pvt, TFLAG_VOICE);
+			switch_mutex_unlock(tech_pvt->flag_mutex);
 			if (!tech_pvt->read_frame.datalen) {
 				DEBUGA_SKYPE("CHANNEL READ CONTINUE\n", SKYPOPEN_P_LOG);
 				continue;
@@ -805,7 +929,7 @@ read:
 
 				if (digit_str[0]) {
 					switch_time_t new_dtmf_timestamp = switch_time_now();
-					if ((new_dtmf_timestamp - tech_pvt->old_dtmf_timestamp) > 350000) {	//FIXME: make it configurable
+					if ((new_dtmf_timestamp - tech_pvt->old_dtmf_timestamp) > 350000) {
 						char *p = digit_str;
 						switch_channel_t *channel = switch_core_session_get_channel(session);
 
@@ -851,7 +975,7 @@ static switch_status_t channel_write_frame(switch_core_session_t *session, switc
 {
 	switch_channel_t *channel = NULL;
 	private_t *tech_pvt = NULL;
-	int no_space=0;
+	int no_space = 0;
 
 	channel = switch_core_session_get_channel(session);
 	switch_assert(channel != NULL);
@@ -887,15 +1011,14 @@ static switch_status_t channel_write_frame(switch_core_session_t *session, switc
 	switch_mutex_lock(tech_pvt->mutex_audio_cli);
 	if (switch_buffer_freespace(tech_pvt->write_buffer) < frame->datalen) {
 		DEBUGA_SKYPE("NO SPACE WRITE: %d\n", SKYPOPEN_P_LOG, frame->datalen);
-		//switch_buffer_toss(tech_pvt->write_buffer, frame->datalen);
 		switch_buffer_zero(tech_pvt->write_buffer);
-		no_space=1;
+		no_space = 1;
 	}
 	switch_buffer_write(tech_pvt->write_buffer, frame->data, frame->datalen);
 	switch_mutex_unlock(tech_pvt->mutex_audio_cli);
-	if(no_space){
+	if (no_space) {
 		switch_sleep(20000);
-	}else{
+	} else {
 		tech_pvt->begin_to_write = 1;
 	}
 
@@ -906,6 +1029,7 @@ static switch_status_t channel_answer_channel(switch_core_session_t *session)
 {
 	private_t *tech_pvt;
 	switch_channel_t *channel = NULL;
+	int conta = 0;
 
 	channel = switch_core_session_get_channel(session);
 	switch_assert(channel != NULL);
@@ -913,14 +1037,20 @@ static switch_status_t channel_answer_channel(switch_core_session_t *session)
 	tech_pvt = switch_core_session_get_private(session);
 	switch_assert(tech_pvt != NULL);
 
+	switch_mutex_lock(tech_pvt->flag_mutex);
 	switch_clear_flag(tech_pvt, TFLAG_IO);
+	switch_mutex_unlock(tech_pvt->flag_mutex);
 	skypopen_answer(tech_pvt);
 
-	while(!switch_test_flag(tech_pvt, TFLAG_IO)){ //FIXME that would be better with a timeout
-		if(switch_channel_get_state(channel) == CS_RESET){
+	while (!switch_test_flag(tech_pvt, TFLAG_IO)) {
+		if (switch_channel_get_state(channel) == CS_RESET) {
 			return SWITCH_STATUS_FALSE;
 		}
 		switch_sleep(5000);
+		conta++;
+		if (conta == 100) {		//0.5 seconds
+			return SWITCH_STATUS_FALSE;
+		}
 	}
 	switch_mutex_lock(globals.mutex);
 	globals.calls++;
@@ -936,12 +1066,11 @@ static switch_status_t channel_answer_channel(switch_core_session_t *session)
 	return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
+static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t * msg)
 {
 	switch_channel_t *channel;
 	private_t *tech_pvt;
 	char msg_to_skype[256];
-	//int i;
 
 	channel = switch_core_session_get_channel(session);
 	switch_assert(channel != NULL);
@@ -953,41 +1082,52 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
 	case SWITCH_MESSAGE_INDICATE_PROGRESS:
 		{
 			DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_PROGRESS\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
+			switch_mutex_lock(tech_pvt->flag_mutex);
 			switch_set_flag(tech_pvt, TFLAG_PROGRESS);
+			switch_mutex_unlock(tech_pvt->flag_mutex);
 		}
 		break;
 	case SWITCH_MESSAGE_INDICATE_CLEAR_PROGRESS:
 		{
 			DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_CLEAR_PROGRESS\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-			if(switch_set_flag(tech_pvt, TFLAG_PROGRESS)){
+			if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
 				sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", tech_pvt->ring_id);
 				skypopen_signaling_write(tech_pvt, msg_to_skype);
+				sprintf(msg_to_skype, "ALTER CALL %s HANGUP", tech_pvt->ring_id);
+				skypopen_signaling_write(tech_pvt, msg_to_skype);
+				sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", tech_pvt->skype_call_id);
+				skypopen_signaling_write(tech_pvt, msg_to_skype);
+				sprintf(msg_to_skype, "ALTER CALL %s HANGUP", tech_pvt->skype_call_id);
+				skypopen_signaling_write(tech_pvt, msg_to_skype);
+				switch_mutex_lock(tech_pvt->flag_mutex);
 				switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
+				switch_mutex_unlock(tech_pvt->flag_mutex);
 			}
 		}
 		break;
 
 	case SWITCH_MESSAGE_INDICATE_ANSWER:
 		{
-		DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_ANSWER\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
+			DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_ANSWER\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
 
-			//switch_set_flag(tech_pvt, TFLAG_IO);
 			channel_answer_channel(session);
+			switch_mutex_lock(tech_pvt->flag_mutex);
 			switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
+			switch_mutex_unlock(tech_pvt->flag_mutex);
 
-			if(tech_pvt->read_buffer){
+			if (tech_pvt->read_buffer) {
 				switch_mutex_lock(tech_pvt->mutex_audio_srv);
 				switch_buffer_zero(tech_pvt->read_buffer);
-				if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next){
+				if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
 					switch_core_timer_sync(&tech_pvt->timer_read);
 				}
 				switch_mutex_unlock(tech_pvt->mutex_audio_srv);
 			}
 
-			if(tech_pvt->write_buffer){
+			if (tech_pvt->write_buffer) {
 				switch_mutex_lock(tech_pvt->mutex_audio_cli);
 				switch_buffer_zero(tech_pvt->write_buffer);
-				if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next){
+				if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next) {
 					switch_core_timer_sync(&tech_pvt->timer_write);
 				}
 				switch_mutex_unlock(tech_pvt->mutex_audio_cli);
@@ -1000,46 +1140,46 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
 
 		DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_AUDIO_SYNC\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
 
-			if(tech_pvt->read_buffer){
-				switch_mutex_lock(tech_pvt->mutex_audio_srv);
-				switch_buffer_zero(tech_pvt->read_buffer);
-				if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next){
-					switch_core_timer_sync(&tech_pvt->timer_read);
-				}
-				switch_mutex_unlock(tech_pvt->mutex_audio_srv);
+		if (tech_pvt->read_buffer) {
+			switch_mutex_lock(tech_pvt->mutex_audio_srv);
+			switch_buffer_zero(tech_pvt->read_buffer);
+			if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
+				switch_core_timer_sync(&tech_pvt->timer_read);
 			}
+			switch_mutex_unlock(tech_pvt->mutex_audio_srv);
+		}
 
-			if(tech_pvt->write_buffer){
-				switch_mutex_lock(tech_pvt->mutex_audio_cli);
-				switch_buffer_zero(tech_pvt->write_buffer);
-				if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next){
-					switch_core_timer_sync(&tech_pvt->timer_write);
-				}
-				switch_mutex_unlock(tech_pvt->mutex_audio_cli);
+		if (tech_pvt->write_buffer) {
+			switch_mutex_lock(tech_pvt->mutex_audio_cli);
+			switch_buffer_zero(tech_pvt->write_buffer);
+			if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next) {
+				switch_core_timer_sync(&tech_pvt->timer_write);
 			}
-			DEBUGA_SKYPE("Synching audio\n", SKYPOPEN_P_LOG);
+			switch_mutex_unlock(tech_pvt->mutex_audio_cli);
+		}
+		DEBUGA_SKYPE("Synching audio\n", SKYPOPEN_P_LOG);
 		break;
 	case SWITCH_MESSAGE_INDICATE_BRIDGE:
 		DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_BRIDGE\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
 
-			if(tech_pvt->read_buffer){
-				switch_mutex_lock(tech_pvt->mutex_audio_srv);
-				switch_buffer_zero(tech_pvt->read_buffer);
-				if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next){
-					switch_core_timer_sync(&tech_pvt->timer_read);
-				}
-				switch_mutex_unlock(tech_pvt->mutex_audio_srv);
+		if (tech_pvt->read_buffer) {
+			switch_mutex_lock(tech_pvt->mutex_audio_srv);
+			switch_buffer_zero(tech_pvt->read_buffer);
+			if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
+				switch_core_timer_sync(&tech_pvt->timer_read);
 			}
+			switch_mutex_unlock(tech_pvt->mutex_audio_srv);
+		}
 
-			if(tech_pvt->write_buffer){
-				switch_mutex_lock(tech_pvt->mutex_audio_cli);
-				switch_buffer_zero(tech_pvt->write_buffer);
-				if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next){
-					switch_core_timer_sync(&tech_pvt->timer_write);
-				}
-				switch_mutex_unlock(tech_pvt->mutex_audio_cli);
+		if (tech_pvt->write_buffer) {
+			switch_mutex_lock(tech_pvt->mutex_audio_cli);
+			switch_buffer_zero(tech_pvt->write_buffer);
+			if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next) {
+				switch_core_timer_sync(&tech_pvt->timer_write);
 			}
-			DEBUGA_SKYPE("Synching audio\n", SKYPOPEN_P_LOG);
+			switch_mutex_unlock(tech_pvt->mutex_audio_cli);
+		}
+		DEBUGA_SKYPE("Synching audio\n", SKYPOPEN_P_LOG);
 		break;
 
 	default:
@@ -1212,7 +1352,9 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 		caller_profile->destination_number = rdest;
 
 		switch_channel_set_flag(channel, CF_OUTBOUND);
+		switch_mutex_lock(tech_pvt->flag_mutex);
 		switch_set_flag(tech_pvt, TFLAG_OUTBOUND);
+		switch_mutex_unlock(tech_pvt->flag_mutex);
 		switch_channel_set_state(channel, CS_INIT);
 		skypopen_call(tech_pvt, rdest, 30);
 		switch_mutex_unlock(globals.mutex);
@@ -1227,11 +1369,12 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
  * \brief This thread runs during a call, and monitor the interface for signaling, like hangup, caller id, etc most of signaling is handled inside the skypopen_signaling_read function
  *
  */
-static void *SWITCH_THREAD_FUNC skypopen_signaling_thread_func(switch_thread_t * thread, void *obj)
+static void *SWITCH_THREAD_FUNC skypopen_signaling_thread_func(switch_thread_t *thread, void *obj)
 {
 	private_t *tech_pvt = obj;
 	int res;
 	int forever = 1;
+	switch_event_t *event;
 
 	if (!tech_pvt)
 		return NULL;
@@ -1242,13 +1385,25 @@ static void *SWITCH_THREAD_FUNC skypopen_signaling_thread_func(switch_thread_t *
 		if (!(running && tech_pvt->running))
 			break;
 		res = skypopen_signaling_read(tech_pvt);
+
+		if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_INCOMING_RAW) == SWITCH_STATUS_SUCCESS) {
+			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "X-Skype-Response-Code", "%d", res);
+			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "X-Skype-Interface", "%s", tech_pvt->interface_id);
+			switch_event_add_body(event, "%s", tech_pvt->message);
+			switch_event_fire(&event);
+		}
+
 		if (res == CALLFLOW_INCOMING_HANGUP || tech_pvt->skype_callflow == CALLFLOW_INCOMING_HANGUP) {
 			switch_core_session_t *session = NULL;
 			switch_channel_t *channel = NULL;
+			int conta;
 
 			DEBUGA_SKYPE("skype call ended\n", SKYPOPEN_P_LOG);
 
 			if (tech_pvt) {
+				if (tech_pvt->interface_state == SKYPOPEN_STATE_DEAD) {
+					break;
+				}
 				session = switch_core_session_locate(tech_pvt->session_uuid_str);
 				if (session) {
 					channel = switch_core_session_get_channel(session);
@@ -1264,11 +1419,33 @@ static void *SWITCH_THREAD_FUNC skypopen_signaling_thread_func(switch_thread_t *
 					switch_core_session_rwunlock(session);
 				} else {
 					DEBUGA_SKYPE("no session\n", SKYPOPEN_P_LOG);
+
+					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
+					DEBUGA_SKYPE("audio tcp threads to DIE\n", SKYPOPEN_P_LOG);
+					conta = 0;
+					while (tech_pvt->tcp_srv_thread) {
+						switch_sleep(5000);
+						conta++;
+						if (conta == 200) {
+							ERRORA("tcp_srv_thread is NOT dead, this can LEAK MEMORY\n", SKYPOPEN_P_LOG);
+							break;
+						}
+					}
+					DEBUGA_SKYPE("audio tcp srv thread DEAD %d\n", SKYPOPEN_P_LOG, conta);
+					conta = 0;
+					while (tech_pvt->tcp_cli_thread) {
+						switch_sleep(5000);
+						conta++;
+						if (conta == 200) {
+							ERRORA("tcp_cli_thread is NOT dead, this can LEAK MEMORY\n", SKYPOPEN_P_LOG);
+							break;
+						}
+					}
+					DEBUGA_SKYPE("audio tcp cli thread DEAD %d\n", SKYPOPEN_P_LOG, conta);
 				}
 				switch_mutex_lock(globals.mutex);
-				tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
+				tech_pvt->ringing_state = SKYPOPEN_RINGING_INIT;
 				*tech_pvt->session_uuid_str = '\0';
-				*tech_pvt->skype_call_id = '\0';
 				*tech_pvt->initial_skype_user = '\0';
 				*tech_pvt->answer_id = '\0';
 				*tech_pvt->answer_value = '\0';
@@ -1276,10 +1453,7 @@ static void *SWITCH_THREAD_FUNC skypopen_signaling_thread_func(switch_thread_t *
 				*tech_pvt->ring_value = '\0';
 				*tech_pvt->callid_number = '\0';
 				*tech_pvt->callid_name = '\0';
-				switch_mutex_unlock(globals.mutex);
 
-				switch_sleep(300000);	//0.3 sec
-				switch_mutex_lock(globals.mutex);
 				tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
 				tech_pvt->interface_state = SKYPOPEN_STATE_IDLE;
 				switch_mutex_unlock(globals.mutex);
@@ -1288,7 +1462,7 @@ static void *SWITCH_THREAD_FUNC skypopen_signaling_thread_func(switch_thread_t *
 			}
 		}
 	}
-	tech_pvt->skypopen_signaling_thread=NULL;
+	tech_pvt->skypopen_signaling_thread = NULL;
 	DEBUGA_SKYPE("EXITING\n", SKYPOPEN_P_LOG);
 	return NULL;
 }
@@ -1299,6 +1473,9 @@ static switch_status_t load_config(int reload_type)
 	switch_xml_t cfg, xml, global_settings, param, interfaces, myinterface;
 	private_t *tech_pvt = NULL;
 
+	// CLOUDTREE (Thomas Hazel) - always try to load configuration
+	running = 1;
+
 	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, skypopen_module_pool);
 	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
 		ERRORA("open of %s failed\n", SKYPOPEN_P_LOG, cf);
@@ -1364,22 +1541,22 @@ static switch_status_t load_config(int reload_type)
 			char *setsockopt = "false";
 			uint32_t interface_id = 0;
 
-			if(globals.context)
-				context=globals.context;
-			if(globals.dialplan)
-				dialplan=globals.dialplan;
-			if(globals.destination)
-				destination=globals.destination;
-			if(globals.skype_user)
-				skype_user=globals.skype_user;
-			if(globals.report_incoming_chatmessages)
-				report_incoming_chatmessages=globals.report_incoming_chatmessages;
-			if(globals.silent_mode)
-				silent_mode=globals.silent_mode;
-			if(globals.write_silence_when_idle)
-				write_silence_when_idle=globals.write_silence_when_idle;
-			if(globals.setsockopt)
-				setsockopt=globals.setsockopt;
+			if (globals.context)
+				context = globals.context;
+			if (globals.dialplan)
+				dialplan = globals.dialplan;
+			if (globals.destination)
+				destination = globals.destination;
+			if (globals.skype_user)
+				skype_user = globals.skype_user;
+			if (globals.report_incoming_chatmessages)
+				report_incoming_chatmessages = globals.report_incoming_chatmessages;
+			if (globals.silent_mode)
+				silent_mode = globals.silent_mode;
+			if (globals.write_silence_when_idle)
+				write_silence_when_idle = globals.write_silence_when_idle;
+			if (globals.setsockopt)
+				setsockopt = globals.setsockopt;
 
 			tech_pvt = NULL;
 
@@ -1545,7 +1722,8 @@ static switch_status_t load_config(int reload_type)
 				switch_threadattr_detach_set(skypopen_api_thread_attr, 0);
 				switch_threadattr_stacksize_set(skypopen_api_thread_attr, SWITCH_THREAD_STACKSIZE);
 				switch_thread_create(&globals.SKYPOPEN_INTERFACES[interface_id].skypopen_api_thread,
-									 skypopen_api_thread_attr, skypopen_do_skypeapi_thread, &globals.SKYPOPEN_INTERFACES[interface_id], skypopen_module_pool);
+									 skypopen_api_thread_attr, skypopen_do_skypeapi_thread, &globals.SKYPOPEN_INTERFACES[interface_id],
+									 skypopen_module_pool);
 
 				switch_sleep(100000);
 
@@ -1561,6 +1739,8 @@ static switch_status_t load_config(int reload_type)
 				skypopen_audio_init(&globals.SKYPOPEN_INTERFACES[interface_id]);
 				switch_mutex_init(&globals.SKYPOPEN_INTERFACES[interface_id].mutex_audio_srv, SWITCH_MUTEX_NESTED, skypopen_module_pool);
 				switch_mutex_init(&globals.SKYPOPEN_INTERFACES[interface_id].mutex_audio_cli, SWITCH_MUTEX_NESTED, skypopen_module_pool);
+				switch_mutex_init(&globals.SKYPOPEN_INTERFACES[interface_id].mutex_thread_audio_srv, SWITCH_MUTEX_NESTED, skypopen_module_pool);
+				switch_mutex_init(&globals.SKYPOPEN_INTERFACES[interface_id].mutex_thread_audio_cli, SWITCH_MUTEX_NESTED, skypopen_module_pool);
 
 				NOTICA
 					("WAITING roughly 10 seconds to find a running Skype client and connect to its SKYPE API for interface_id=%d\n",
@@ -1594,8 +1774,6 @@ static switch_status_t load_config(int reload_type)
 						("Interface_id=%d is now STARTED, the Skype client to which we are connected gave us the correct CURRENTUSERHANDLE (%s)\n",
 						 SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].skype_user);
 
-
-/* giovanni*/
 					skypopen_signaling_write(&globals.SKYPOPEN_INTERFACES[interface_id], "PROTOCOL 7");
 					switch_sleep(10000);
 					skypopen_signaling_write(&globals.SKYPOPEN_INTERFACES[interface_id], "SET AUTOAWAY OFF");
@@ -1612,7 +1790,6 @@ static switch_status_t load_config(int reload_type)
 						skypopen_signaling_write(&globals.SKYPOPEN_INTERFACES[interface_id], "SET SILENT_MODE ON");
 						switch_sleep(10000);
 					}
-/*  giovanni */
 				} else {
 					ERRORA
 						("The Skype client to which we are connected FAILED to gave us CURRENTUSERHANDLE=%s, interface_id=%d FAILED to start. No Skype client logged in as '%s' has been found. Please (re)launch a Skype client logged in as '%s'. Skypopen exiting now\n",
@@ -1648,7 +1825,8 @@ static switch_status_t load_config(int reload_type)
 				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].report_incoming_chatmessages=%d\n", SKYPOPEN_P_LOG, i, i,
 							 globals.SKYPOPEN_INTERFACES[i].report_incoming_chatmessages);
 				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].silent_mode=%d\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].silent_mode);
-				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].write_silence_when_idle=%d\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].write_silence_when_idle);
+				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].write_silence_when_idle=%d\n", SKYPOPEN_P_LOG, i, i,
+							 globals.SKYPOPEN_INTERFACES[i].write_silence_when_idle);
 				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].setsockopt=%d\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].setsockopt);
 			}
 		}
@@ -1704,7 +1882,8 @@ static switch_status_t chat_send(const char *proto, const char *from, const char
 				if (strlen(globals.SKYPOPEN_INTERFACES[i].name)
 					&& (strncmp(globals.SKYPOPEN_INTERFACES[i].name, hint, strlen(hint)) == 0)) {
 					tech_pvt = &globals.SKYPOPEN_INTERFACES[i];
-					DEBUGA_SKYPE("Using interface: globals.SKYPOPEN_INTERFACES[%d].name=|||%s|||\n", SKYPOPEN_P_LOG, i, globals.SKYPOPEN_INTERFACES[i].name);
+					DEBUGA_SKYPE("Using interface: globals.SKYPOPEN_INTERFACES[%d].name=|||%s|||\n", SKYPOPEN_P_LOG, i,
+								 globals.SKYPOPEN_INTERFACES[i].name);
 					found = 1;
 					break;
 				}
@@ -1715,7 +1894,8 @@ static switch_status_t chat_send(const char *proto, const char *from, const char
 				if (strlen(globals.SKYPOPEN_INTERFACES[i].name)
 					&& (strncmp(globals.SKYPOPEN_INTERFACES[i].skype_user, from, strlen(from)) == 0)) {
 					tech_pvt = &globals.SKYPOPEN_INTERFACES[i];
-					DEBUGA_SKYPE("Using interface: globals.SKYPOPEN_INTERFACES[%d].name=|||%s|||\n", SKYPOPEN_P_LOG, i, globals.SKYPOPEN_INTERFACES[i].name);
+					DEBUGA_SKYPE("Using interface: globals.SKYPOPEN_INTERFACES[%d].name=|||%s|||\n", SKYPOPEN_P_LOG, i,
+								 globals.SKYPOPEN_INTERFACES[i].name);
 					found = 1;
 					break;
 				}
@@ -1769,17 +1949,20 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypopen_load)
 	skypopen_module_pool = pool;
 	memset(&globals, '\0', sizeof(globals));
 
+	// CLOUDTREE (Thomas Hazel)
+#ifndef WIN32
+	// XXX: these assumes no one will override
+	//XSetErrorHandler(X11_errors_handler);
+	//XXX giovanni: seems that if Xserver is up, but skype client is crashed, the error is non fatal. Let's use Thomas handler in this case too
+	XSetErrorHandler(xio_error_handler2);
+	XSetIOErrorHandler(xio_error_handler);
+
+	memset(&global_handles_list, 0, sizeof(global_handles_list));
+	switch_mutex_init(&globals.list_mutex, SWITCH_MUTEX_NESTED, skypopen_module_pool);
+#endif
+
 	running = 1;
-
-	if (load_config(FULL_RELOAD) != SWITCH_STATUS_SUCCESS) {
-		running = 0;
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (switch_event_reserve_subclass(MY_EVENT_INCOMING_CHATMESSAGE) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-		return SWITCH_STATUS_GENERR;
-	}
+	load_config(FULL_RELOAD);
 
 	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
 	skypopen_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
@@ -1791,14 +1974,24 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypopen_load)
 
 		SWITCH_ADD_API(commands_api_interface, "sk", "Skypopen console commands", sk_function, SK_SYNTAX);
 		SWITCH_ADD_API(commands_api_interface, "skypopen", "Skypopen interface commands", skypopen_function, SKYPOPEN_SYNTAX);
-		SWITCH_ADD_API(commands_api_interface, "skypopen_chat", "Skypopen_chat interface remote_skypename TEXT", skypopen_chat_function, SKYPOPEN_CHAT_SYNTAX);
+		SWITCH_ADD_API(commands_api_interface, "skypopen_chat", "Skypopen_chat interface remote_skypename TEXT", skypopen_chat_function,
+					   SKYPOPEN_CHAT_SYNTAX);
 		SWITCH_ADD_CHAT(chat_interface, MDL_CHAT_PROTO, chat_send);
 
+		if (switch_event_reserve_subclass(MY_EVENT_INCOMING_CHATMESSAGE) != SWITCH_STATUS_SUCCESS) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
+			return SWITCH_STATUS_FALSE;
+		}
+
+		if (switch_event_reserve_subclass(MY_EVENT_INCOMING_RAW) != SWITCH_STATUS_SUCCESS) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
+			return SWITCH_STATUS_FALSE;
+		}
 
 		/* indicate that the module should continue to be loaded */
 		return SWITCH_STATUS_SUCCESS;
-	} else
-		return SWITCH_STATUS_FALSE;
+	}
+	return SWITCH_STATUS_FALSE;
 }
 
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypopen_shutdown)
@@ -1814,6 +2007,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypopen_shutdown)
 	for (interface_id = 0; interface_id < SKYPOPEN_MAX_INTERFACES; interface_id++) {
 		tech_pvt = &globals.SKYPOPEN_INTERFACES[interface_id];
 
+
 		if (strlen(globals.SKYPOPEN_INTERFACES[interface_id].name)) {
 			if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread) {
 #ifdef WIN32
@@ -1832,15 +2026,15 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypopen_shutdown)
 #ifdef WIN32
 				if (SendMessage(tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle, WM_DESTROY, 0, 0) == FALSE) {	// let's the skypopen_api_thread_func die
 					DEBUGA_SKYPE("got FALSE here, thread probably was already dead. GetLastError returned: %d\n", SKYPOPEN_P_LOG, GetLastError());
-					tech_pvt->skypopen_api_thread=NULL;
+					tech_pvt->skypopen_api_thread = NULL;
 				}
 #else
 				if (tech_pvt->SkypopenHandles.disp) {
 					XEvent e;
 					Atom atom1 = XInternAtom(tech_pvt->SkypopenHandles.disp, "SKYPECONTROLAPI_MESSAGE_BEGIN",
 											 False);
-			switch_sleep(1000);//giovanni
-			XFlush(tech_pvt->SkypopenHandles.disp); //giovanni
+					switch_sleep(1000);
+					XFlush(tech_pvt->SkypopenHandles.disp);
 					memset(&e, 0, sizeof(e));
 					e.xclient.type = ClientMessage;
 					e.xclient.message_type = atom1;	/*  leading message */
@@ -1849,16 +2043,22 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypopen_shutdown)
 					e.xclient.format = 8;
 
 					XSendEvent(tech_pvt->SkypopenHandles.disp, tech_pvt->SkypopenHandles.win, False, 0, &e);
-					//giovanni XSync(tech_pvt->SkypopenHandles.disp, False);
-			XFlush(tech_pvt->SkypopenHandles.disp); //giovanni
+					XFlush(tech_pvt->SkypopenHandles.disp);
 				}
 #endif
 			}
 			x = 10;
-			while (x) {			//FIXME 0.5 seconds?
+			while (x) {
 				x--;
 				switch_yield(50000);
 			}
+#ifndef WIN32
+			if (tech_pvt->SkypopenHandles.disp) {
+				DEBUGA_SKYPE("CLOSIN X\n", SKYPOPEN_P_LOG);
+				XCloseDisplay(tech_pvt->SkypopenHandles.disp);
+				DEBUGA_SKYPE("CLOSIN X END\n", SKYPOPEN_P_LOG);
+			}
+#endif
 			if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread) {
 				switch_thread_join(&status, globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread);
 			}
@@ -1888,6 +2088,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypopen_shutdown)
 
 	}
 	switch_event_free_subclass(MY_EVENT_INCOMING_CHATMESSAGE);
+	switch_event_free_subclass(MY_EVENT_INCOMING_RAW);
 
 	switch_safe_free(globals.context);
 	switch_safe_free(globals.dialplan);
@@ -1901,22 +2102,22 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypopen_shutdown)
 	return SWITCH_STATUS_SUCCESS;
 }
 
-void *SWITCH_THREAD_FUNC skypopen_do_tcp_srv_thread(switch_thread_t * thread, void *obj)
+void *SWITCH_THREAD_FUNC skypopen_do_tcp_srv_thread(switch_thread_t *thread, void *obj)
 {
 	return skypopen_do_tcp_srv_thread_func(obj);
 }
 
-void *SWITCH_THREAD_FUNC skypopen_do_tcp_cli_thread(switch_thread_t * thread, void *obj)
+void *SWITCH_THREAD_FUNC skypopen_do_tcp_cli_thread(switch_thread_t *thread, void *obj)
 {
 	return skypopen_do_tcp_cli_thread_func(obj);
 }
 
-void *SWITCH_THREAD_FUNC skypopen_do_skypeapi_thread(switch_thread_t * thread, void *obj)
+void *SWITCH_THREAD_FUNC skypopen_do_skypeapi_thread(switch_thread_t *thread, void *obj)
 {
 	return skypopen_do_skypeapi_thread_func(obj);
 }
 
-int dtmf_received(private_t * tech_pvt, char *value)
+int dtmf_received(private_t *tech_pvt, char *value)
 {
 	switch_core_session_t *session = NULL;
 	switch_channel_t *channel = NULL;
@@ -1953,7 +2154,7 @@ int dtmf_received(private_t * tech_pvt, char *value)
 	return 0;
 }
 
-int start_audio_threads(private_t * tech_pvt)
+int start_audio_threads(private_t *tech_pvt)
 {
 	switch_threadattr_t *thd_attr = NULL;
 
@@ -1977,33 +2178,45 @@ int start_audio_threads(private_t * tech_pvt)
 	switch_threadattr_create(&thd_attr, skypopen_module_pool);
 	switch_threadattr_detach_set(thd_attr, 0);
 	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
+	switch_mutex_lock(tech_pvt->mutex_thread_audio_srv);
+	//DEBUGA_SKYPE("debugging_hangup srv lock\n", SKYPOPEN_P_LOG);
 	if (switch_thread_create(&tech_pvt->tcp_srv_thread, thd_attr, skypopen_do_tcp_srv_thread, tech_pvt, skypopen_module_pool) == SWITCH_STATUS_SUCCESS) {
 		DEBUGA_SKYPE("started tcp_srv_thread thread.\n", SKYPOPEN_P_LOG);
 	} else {
 		ERRORA("failed to start tcp_srv_thread thread.\n", SKYPOPEN_P_LOG);
+		switch_mutex_unlock(tech_pvt->mutex_thread_audio_srv);
+		//DEBUGA_SKYPE("debugging_hangup srv unlock\n", SKYPOPEN_P_LOG);
 		return -1;
 	}
+	switch_mutex_unlock(tech_pvt->mutex_thread_audio_srv);
+	//DEBUGA_SKYPE("debugging_hangup srv unlock\n", SKYPOPEN_P_LOG);
 
 	switch_threadattr_create(&thd_attr, skypopen_module_pool);
 	switch_threadattr_detach_set(thd_attr, 0);
 	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
+	switch_mutex_lock(tech_pvt->mutex_thread_audio_cli);
+	//DEBUGA_SKYPE("debugging_hangup cli lock\n", SKYPOPEN_P_LOG);
 	if (switch_thread_create(&tech_pvt->tcp_cli_thread, thd_attr, skypopen_do_tcp_cli_thread, tech_pvt, skypopen_module_pool) == SWITCH_STATUS_SUCCESS) {
 		DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPOPEN_P_LOG);
 	} else {
 		ERRORA("failed to start tcp_cli_thread thread.\n", SKYPOPEN_P_LOG);
+		switch_mutex_unlock(tech_pvt->mutex_thread_audio_cli);
+		//DEBUGA_SKYPE("debugging_hangup cli unlock\n", SKYPOPEN_P_LOG);
 		return -1;
 	}
+	switch_mutex_unlock(tech_pvt->mutex_thread_audio_cli);
+	//DEBUGA_SKYPE("debugging_hangup cli unlock\n", SKYPOPEN_P_LOG);
 	switch_sleep(100000);
 
 	if (tech_pvt->tcp_cli_thread == NULL || tech_pvt->tcp_srv_thread == NULL) {
-		ERRORA("tcp_cli_thread or tcp_srv_thread exited\n", SKYPOPEN_P_LOG);
+		WARNINGA("tcp_cli_thread or tcp_srv_thread exited\n", SKYPOPEN_P_LOG);
 		return -1;
 	}
 
 	return 0;
 }
 
-int new_inbound_channel(private_t * tech_pvt)
+int new_inbound_channel(private_t *tech_pvt)
 {
 	switch_core_session_t *session = NULL;
 	switch_channel_t *channel = NULL;
@@ -2050,7 +2263,7 @@ int new_inbound_channel(private_t * tech_pvt)
 	return 0;
 }
 
-int remote_party_is_ringing(private_t * tech_pvt)
+int remote_party_is_ringing(private_t *tech_pvt)
 {
 	switch_core_session_t *session = NULL;
 	switch_channel_t *channel = NULL;
@@ -2058,14 +2271,14 @@ int remote_party_is_ringing(private_t * tech_pvt)
 	if (!zstr(tech_pvt->session_uuid_str)) {
 		session = switch_core_session_locate(tech_pvt->session_uuid_str);
 	} else {
-		ERRORA("No session???\n", SKYPOPEN_P_LOG);
-		goto done;
+		ERRORA("No session_uuid_str???\n", SKYPOPEN_P_LOG);
+		return SWITCH_STATUS_FALSE;
 	}
 	if (session) {
 		channel = switch_core_session_get_channel(session);
 	} else {
 		ERRORA("No session???\n", SKYPOPEN_P_LOG);
-		goto done;
+		return SWITCH_STATUS_FALSE;
 	}
 	if (channel) {
 		switch_channel_mark_ring_ready(channel);
@@ -2076,11 +2289,10 @@ int remote_party_is_ringing(private_t * tech_pvt)
 
 	switch_core_session_rwunlock(session);
 
-  done:
-	return 0;
+	return SWITCH_STATUS_SUCCESS;
 }
 
-int remote_party_is_early_media(private_t * tech_pvt)
+int remote_party_is_early_media(private_t *tech_pvt)
 {
 	switch_core_session_t *session = NULL;
 	switch_channel_t *channel = NULL;
@@ -2088,7 +2300,7 @@ int remote_party_is_early_media(private_t * tech_pvt)
 	if (!zstr(tech_pvt->session_uuid_str)) {
 		session = switch_core_session_locate(tech_pvt->session_uuid_str);
 	} else {
-		ERRORA("No session???\n\n\n", SKYPOPEN_P_LOG);
+		ERRORA("No session_uuid_str???\n\n\n", SKYPOPEN_P_LOG);
 		goto done;
 	}
 	if (session) {
@@ -2111,7 +2323,7 @@ int remote_party_is_early_media(private_t * tech_pvt)
 	return 0;
 }
 
-int outbound_channel_answered(private_t * tech_pvt)
+int outbound_channel_answered(private_t *tech_pvt)
 {
 	switch_core_session_t *session = NULL;
 	switch_channel_t *channel = NULL;
@@ -2142,7 +2354,7 @@ int outbound_channel_answered(private_t * tech_pvt)
 	return 0;
 }
 
-private_t *find_available_skypopen_interface_rr(private_t * tech_pvt_calling)
+private_t *find_available_skypopen_interface_rr(private_t *tech_pvt_calling)
 {
 	private_t *tech_pvt = NULL;
 	int i;
@@ -2151,7 +2363,6 @@ private_t *find_available_skypopen_interface_rr(private_t * tech_pvt_calling)
 
 	/* Fact is the real interface start from 1 */
 	//XXX no, is just a convention, but you can have it start from 0. I do not, for aestetic reasons :-)  
-	//if (globals.next_interface == 0) globals.next_interface = 1;
 
 	for (i = 0; i < SKYPOPEN_MAX_INTERFACES; i++) {
 		int interface_id;
@@ -2164,10 +2375,8 @@ private_t *find_available_skypopen_interface_rr(private_t * tech_pvt_calling)
 
 			tech_pvt = &globals.SKYPOPEN_INTERFACES[interface_id];
 			skype_state = tech_pvt->interface_state;
-			//DEBUGA_SKYPE("skype interface: %d, name: %s, state: %d\n", SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].name, skype_state);
 			if ((tech_pvt_calling ? strcmp(tech_pvt->skype_user, tech_pvt_calling->skype_user) : 1)
-				&& (SKYPOPEN_STATE_DOWN == skype_state || 0 == skype_state) && (tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED
-																			   || 0 == tech_pvt->skype_callflow)) {
+				&& (SKYPOPEN_STATE_IDLE == skype_state)) {
 				DEBUGA_SKYPE("returning as available skype interface name: %s, state: %d callflow: %d\n", SKYPOPEN_P_LOG, tech_pvt->name, skype_state,
 							 tech_pvt->skype_callflow);
 				if (tech_pvt_calling == NULL) {
@@ -2266,8 +2475,6 @@ SWITCH_STANDARD_API(sk_function)
 			goto end;
 		}
 
-	} else if (!strcasecmp(argv[0], "ciapalino")) {
-
 	} else if (!strcasecmp(argv[0], "reload")) {
 		if (load_config(SOFT_RELOAD) != SWITCH_STATUS_SUCCESS) {
 			stream->write_function(stream, "sk reload failed\n");
@@ -2276,7 +2483,7 @@ SWITCH_STANDARD_API(sk_function)
 		}
 	} else if (!strcasecmp(argv[0], "remove")) {
 		if (argc == 2) {
-			if (remove_interface(argv[1]) == SWITCH_STATUS_SUCCESS) {
+			if (remove_interface(argv[1], FALSE) == SWITCH_STATUS_SUCCESS) {
 				if (interface_exists(argv[1]) == SWITCH_STATUS_SUCCESS) {
 					stream->write_function(stream, "sk remove '%s' failed\n", argv[1]);
 				} else {
@@ -2353,7 +2560,7 @@ SWITCH_STANDARD_API(skypopen_function)
 }
 
 
-int skypopen_partner_handle_ring(private_t * tech_pvt)
+int skypopen_partner_handle_ring(private_t *tech_pvt)
 {
 	char msg_to_skype[1024];
 	int i;
@@ -2363,20 +2570,20 @@ int skypopen_partner_handle_ring(private_t * tech_pvt)
 	char *id = tech_pvt->ring_id;
 	char *value = tech_pvt->ring_value;
 	switch_core_session_t *session = NULL;
-	//switch_channel_t *channel = NULL;
 
 	switch_mutex_lock(globals.mutex);
 
-	//WARNINGA("PARTNER_HANDLE tech_pvt->skype_call_id=%s, tech_pvt->skype_callflow=%d, tech_pvt->interface_state=%d, tech_pvt->skype_user=%s, tech_pvt->callid_number=%s, tech_pvt->ring_value=%s, tech_pvt->ring_id=%s, tech_pvt->answer_value=%s, tech_pvt->answer_id=%s\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id, tech_pvt->skype_callflow, tech_pvt->interface_state, tech_pvt->skype_user, tech_pvt->callid_number, tech_pvt->ring_value, tech_pvt->ring_id, tech_pvt->answer_value, tech_pvt->answer_id);
-
 	gettimeofday(&timenow, NULL);
 	for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
 		if (strlen(globals.SKYPOPEN_INTERFACES[i].name)) {
 
 			giovatech = &globals.SKYPOPEN_INTERFACES[i];
-			if ((giovatech->interface_state != SKYPOPEN_STATE_DOWN) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user)) && (!strcmp(giovatech->ring_value, value)) && ((((timenow.tv_sec - giovatech->ring_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->ring_time.tv_usec)) < 1000000)) {	//XXX 1.0sec - can have a max of 1 call coming from the same skypename to the same skypename each 1.0 seconds
+			if ((giovatech->interface_state != SKYPOPEN_STATE_DEAD) && (giovatech->interface_state != SKYPOPEN_STATE_DOWN) && (giovatech->interface_state != SKYPOPEN_STATE_IDLE) && (strcmp(giovatech->name, tech_pvt->name)) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user)) && (!strcmp(giovatech->ring_value, value)) && ((((timenow.tv_sec - giovatech->ring_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->ring_time.tv_usec)) < 1000000)) {	//XXX 1.0sec - can have a max of 1 call coming from the same skypename to the same skypename each 1.0 seconds
 				found = 1;
-				DEBUGA_SKYPE ("FOUND  (name=%s, giovatech->interface_state=%d != SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n", SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state, giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number, value);
+				DEBUGA_SKYPE
+					("FOUND  (name=%s, giovatech->interface_state=%d != SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n",
+					 SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state, giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number,
+					 value);
 				if (tech_pvt->interface_state == SKYPOPEN_STATE_PRERING) {
 					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
 				} else if (tech_pvt->interface_state != 0 && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN) {
@@ -2399,16 +2606,14 @@ int skypopen_partner_handle_ring(private_t * tech_pvt)
 	}
 	DEBUGA_SKYPE("NOT FOUND\n", SKYPOPEN_P_LOG);
 
-	if (tech_pvt && tech_pvt->skype_call_id && !strlen(tech_pvt->skype_call_id)) {
+	// CLOUDTREE (Thomas Hazel)
+	if (tech_pvt && tech_pvt->ringing_state == SKYPOPEN_RINGING_INIT) {
 		/* we are not inside an active call */
 
 		tech_pvt->interface_state = SKYPOPEN_STATE_PRERING;
 		gettimeofday(&tech_pvt->ring_time, NULL);
 		switch_copy_string(tech_pvt->callid_number, value, sizeof(tech_pvt->callid_number) - 1);
 
-
-		//WARNINGA("PARTNER_HANDLE_RING tech_pvt->skype_call_id=%s, tech_pvt->skype_callflow=%d, tech_pvt->interface_state=%d, tech_pvt->skype_user=%s, tech_pvt->callid_number=%s, tech_pvt->ring_value=%s, tech_pvt->ring_id=%s, tech_pvt->answer_value=%s, tech_pvt->answer_id=%s\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id, tech_pvt->skype_callflow, tech_pvt->interface_state, tech_pvt->skype_user, tech_pvt->callid_number, tech_pvt->ring_value, tech_pvt->ring_id, tech_pvt->answer_value, tech_pvt->answer_id);
-
 		session = switch_core_session_locate(tech_pvt->session_uuid_str);
 		if (session) {
 			switch_core_session_rwunlock(session);
@@ -2417,37 +2622,21 @@ int skypopen_partner_handle_ring(private_t * tech_pvt)
 
 		new_inbound_channel(tech_pvt);
 
-#if 0
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-		if (session) {
-			channel = switch_core_session_get_channel(session);
-
-			switch_core_session_queue_indication(session, SWITCH_MESSAGE_INDICATE_RINGING);
-			if (channel) {
-				switch_channel_mark_ring_ready(channel);
-			} else {
-				ERRORA("no channel\n", SKYPOPEN_P_LOG);
-			}
-			switch_core_session_rwunlock(session);
-		} else {
-			ERRORA("no session\n", SKYPOPEN_P_LOG);
-
-		}
-#endif //0
-
 	} else if (!tech_pvt || !tech_pvt->skype_call_id) {
 		ERRORA("No Call ID?\n", SKYPOPEN_P_LOG);
 	} else {
 		DEBUGA_SKYPE("We're in a call now (%s), let's refuse this one (%s)\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id, id);
 		sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
 		skypopen_signaling_write(tech_pvt, msg_to_skype);
+		sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
+		skypopen_signaling_write(tech_pvt, msg_to_skype);
 	}
 
 	switch_mutex_unlock(globals.mutex);
 	return 0;
 }
 
-int skypopen_answer(private_t * tech_pvt)
+int skypopen_answer(private_t *tech_pvt)
 {
 	char msg_to_skype[1024];
 	int i;
@@ -2461,16 +2650,17 @@ int skypopen_answer(private_t * tech_pvt)
 
 	switch_mutex_lock(globals.mutex);
 
-	//WARNINGA("ANSWER tech_pvt->skype_call_id=%s, tech_pvt->skype_callflow=%d, tech_pvt->interface_state=%d, tech_pvt->skype_user=%s, tech_pvt->callid_number=%s, tech_pvt->ring_value=%s, tech_pvt->ring_id=%s, tech_pvt->answer_value=%s, tech_pvt->answer_id=%s\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id, tech_pvt->skype_callflow, tech_pvt->interface_state, tech_pvt->skype_user, tech_pvt->callid_number, tech_pvt->ring_value, tech_pvt->ring_id, tech_pvt->answer_value, tech_pvt->answer_id);
-
 	gettimeofday(&timenow, NULL);
 	for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
 		if (strlen(globals.SKYPOPEN_INTERFACES[i].name)) {
 
 			giovatech = &globals.SKYPOPEN_INTERFACES[i];
-			if (strlen(giovatech->skype_call_id) && (giovatech->interface_state != SKYPOPEN_STATE_DOWN) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user)) && (!strcmp(giovatech->callid_number, value)) && ((((timenow.tv_sec - giovatech->answer_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->answer_time.tv_usec)) < 1000000)) {	//XXX 1.0sec - can have a max of 1 call coming from the same skypename to the same skypename each 1.0 seconds
+			if (strlen(giovatech->skype_call_id) && (giovatech->interface_state != SKYPOPEN_STATE_DEAD) && (giovatech->interface_state != SKYPOPEN_STATE_DOWN) && (giovatech->interface_state != SKYPOPEN_STATE_IDLE) && (strcmp(giovatech->name, tech_pvt->name)) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user)) && (!strcmp(giovatech->callid_number, value)) && ((((timenow.tv_sec - giovatech->answer_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->answer_time.tv_usec)) < 1000000)) {	//XXX 1.0sec - can have a max of 1 call coming from the same skypename to the same skypename each 1.0 seconds
 				found = 1;
-				DEBUGA_SKYPE ("FOUND  (name=%s, giovatech->interface_state=%d != SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n", SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state, giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number, value);
+				DEBUGA_SKYPE
+					("FOUND  (name=%s, giovatech->interface_state=%d != SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n",
+					 SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state, giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number,
+					 value);
 				if (tech_pvt->interface_state == SKYPOPEN_STATE_PRERING) {
 					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
 				} else if (tech_pvt->interface_state != 0 && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN) {
@@ -2482,17 +2672,22 @@ int skypopen_answer(private_t * tech_pvt)
 				if (!zstr(tech_pvt->session_uuid_str)) {
 					session = switch_core_session_locate(tech_pvt->session_uuid_str);
 				} else {
-					ERRORA("No session???\n", SKYPOPEN_P_LOG);
+					ERRORA("No session_uuid_str???\n", SKYPOPEN_P_LOG);
+					break;
 				}
 				if (session) {
 					channel = switch_core_session_get_channel(session);
 				} else {
 					ERRORA("No session???\n", SKYPOPEN_P_LOG);
+					switch_core_session_rwunlock(session);
+					break;
 				}
 				if (channel) {
 					switch_channel_set_state(channel, CS_RESET);
 				} else {
 					ERRORA("No channel???\n", SKYPOPEN_P_LOG);
+					switch_core_session_rwunlock(session);
+					break;
 				}
 
 				switch_core_session_rwunlock(session);
@@ -2508,7 +2703,8 @@ int skypopen_answer(private_t * tech_pvt)
 	}
 	DEBUGA_SKYPE("NOT FOUND\n", SKYPOPEN_P_LOG);
 
-	if (tech_pvt && tech_pvt->skype_call_id && !strlen(tech_pvt->skype_call_id)) {
+	// CLOUDTREE (Thomas Hazel)
+	if (tech_pvt && tech_pvt->ringing_state == SKYPOPEN_RINGING_INIT) {
 		/* we are not inside an active call */
 
 		tech_pvt->ib_calls++;
@@ -2531,13 +2727,15 @@ int skypopen_answer(private_t * tech_pvt)
 		DEBUGA_SKYPE("We're in a call now (%s), let's refuse this one (%s)\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id, id);
 		sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
 		skypopen_signaling_write(tech_pvt, msg_to_skype);
+		sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
+		skypopen_signaling_write(tech_pvt, msg_to_skype);
 	}
 
 	switch_mutex_unlock(globals.mutex);
 	return 0;
 }
-//int skypopen_transfer(private_t * tech_pvt, char *id, char *value)
-int skypopen_transfer(private_t * tech_pvt)
+
+int skypopen_transfer(private_t *tech_pvt)
 {
 	char msg_to_skype[1024];
 	int i;
@@ -2555,77 +2753,34 @@ int skypopen_transfer(private_t * tech_pvt)
 
 			giovatech = &globals.SKYPOPEN_INTERFACES[i];
 			/* let's look for a RINGING one */
-			if ((giovatech->interface_state != SKYPOPEN_STATE_DOWN) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user)) && (!strcmp(giovatech->ring_value, value)) && ((((timenow.tv_sec - giovatech->ring_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->ring_time.tv_usec)) < 1000000)) {	//XXX 1.0sec - can have a max of 1 call coming from the same skypename to the same skypename each 1.0 seconds
+			if ((giovatech->interface_state != SKYPOPEN_STATE_DEAD) && (giovatech->interface_state != SKYPOPEN_STATE_DOWN) && (giovatech->interface_state != SKYPOPEN_STATE_IDLE) && (strcmp(giovatech->name, tech_pvt->name)) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user)) && (!strcmp(giovatech->ring_value, value)) && ((((timenow.tv_sec - giovatech->ring_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->ring_time.tv_usec)) < 1000000)) {	//XXX 1.0sec - can have a max of 1 call coming from the same skypename to the same skypename each 1.0 seconds
 				found = 1;
-				DEBUGA_SKYPE ("FOUND  (name=%s, giovatech->interface_state=%d != SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n", SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state, giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number, value);
+				DEBUGA_SKYPE
+					("FOUND  (name=%s, giovatech->interface_state=%d != SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n",
+					 SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state, giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number,
+					 value);
 				if (tech_pvt->interface_state == SKYPOPEN_STATE_PRERING) {
 					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-				} 
-				
-				
-#if 0	
-				
-				
-				else if (tech_pvt->interface_state != 0 && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN) {
-					WARNINGA("Why an interface_state %d HERE?\n", SKYPOPEN_P_LOG, tech_pvt->interface_state);
-					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
 				}
-
-				*tech_pvt->answer_id = '\0';
-				*tech_pvt->answer_value = '\0';
-				*tech_pvt->ring_id = '\0';
-				*tech_pvt->ring_value = '\0';
-#endif //0
 				break;
 			}
 		}
 	}
 
-
-	/*****************************************/
-#if 0
-	gettimeofday(&timenow, NULL);
 	for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
 		if (strlen(globals.SKYPOPEN_INTERFACES[i].name)) {
 
 			giovatech = &globals.SKYPOPEN_INTERFACES[i];
-			if (strlen(giovatech->skype_call_id) && (giovatech->interface_state != SKYPOPEN_STATE_DOWN) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user)) && (!strcmp(giovatech->callid_number, value)) && ((((timenow.tv_sec - giovatech->answer_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->answer_time.tv_usec)) < 500000)) {	//0.5sec
+			/* let's look for a IDLE one */
+			if ((giovatech->interface_state == SKYPOPEN_STATE_IDLE) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user))) {
 				found = 1;
 				DEBUGA_SKYPE
-					("FOUND  (name=%s, giovatech->interface_state=%d != SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n",
-					 SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state,
-					 giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number, value)
-					break;
-			}
-		}
-	}
-#endif //0
-	for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
-		if (strlen(globals.SKYPOPEN_INTERFACES[i].name)) {
-
-			giovatech = &globals.SKYPOPEN_INTERFACES[i];
-			/* let's look for a DOWN one */
-			if ((giovatech->interface_state == SKYPOPEN_STATE_DOWN || giovatech->interface_state == 0) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user))) {	//XXX 1.0sec - can have a max of 1 call coming from the same skypename to the same skypename each 1.0 seconds
-				found = 1;
-				DEBUGA_SKYPE ("FOUND  (name=%s, giovatech->interface_state=%d == SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n", SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state, giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number, value);
+					("FOUND  (name=%s, giovatech->interface_state=%d == SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n",
+					 SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state, giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number,
+					 value);
 				if (tech_pvt->interface_state == SKYPOPEN_STATE_PRERING) {
 					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-				} 
-				
-				
-#if 0	
-				
-				
-				else if (tech_pvt->interface_state != 0 && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN) {
-					WARNINGA("Why an interface_state %d HERE?\n", SKYPOPEN_P_LOG, tech_pvt->interface_state);
-					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
 				}
-
-				*tech_pvt->answer_id = '\0';
-				*tech_pvt->answer_value = '\0';
-				*tech_pvt->ring_id = '\0';
-				*tech_pvt->ring_value = '\0';
-#endif //0
 				break;
 			}
 		}
@@ -2659,7 +2814,7 @@ int skypopen_transfer(private_t * tech_pvt)
 			if (strlen(globals.SKYPOPEN_INTERFACES[i].name)) {
 
 				giovatech = &globals.SKYPOPEN_INTERFACES[i];
-				if (strlen(giovatech->skype_transfer_call_id) && (giovatech->interface_state != SKYPOPEN_STATE_DOWN) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user)) && (!strcmp(giovatech->transfer_callid_number, value)) && ((((timenow.tv_sec - giovatech->transfer_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->transfer_time.tv_usec)) < 1000000)) {	//1.0 sec
+				if (strlen(giovatech->skype_transfer_call_id) && (giovatech->interface_state != SKYPOPEN_STATE_DOWN) && (giovatech->interface_state != SKYPOPEN_STATE_DEAD) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user)) && (!strcmp(giovatech->transfer_callid_number, value)) && ((((timenow.tv_sec - giovatech->transfer_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->transfer_time.tv_usec)) < 1000000)) {	//1.0 sec
 					found = 1;
 					DEBUGA_SKYPE
 						("FOUND  (name=%s, giovatech->interface_state=%d != SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->transfer_callid_number=%s == value=%s)\n",
@@ -2694,16 +2849,15 @@ int skypopen_transfer(private_t * tech_pvt)
 
 			sprintf(msg_to_skype, "ALTER CALL %s TRANSFER %s", id, available_skypopen_interface->skype_user);
 			skypopen_signaling_write(tech_pvt, msg_to_skype);
-			if (tech_pvt->interface_state == SKYPOPEN_STATE_SELECTED) {
-				tech_pvt->interface_state = SKYPOPEN_STATE_IDLE;	//we marked it SKYPOPEN_STATE_SELECTED just in case it has to make an outbound call
-			}
 		} else {
-			/* no skypopen interfaces idle, do nothing */
+			/* no skypopen interfaces idle, do hangup */
 			DEBUGA_SKYPE
 				("Not answering the skype_call %s, because we are already in a skypopen call(%s) and not transferring, because no other skypopen interfaces are available\n",
 				 SKYPOPEN_P_LOG, id, tech_pvt->skype_call_id);
 			sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
 			skypopen_signaling_write(tech_pvt, msg_to_skype);
+			sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
+			skypopen_signaling_write(tech_pvt, msg_to_skype);
 		}
 		switch_sleep(10000);
 		DEBUGA_SKYPE
@@ -2715,7 +2869,7 @@ int skypopen_transfer(private_t * tech_pvt)
 	return 0;
 }
 
-int incoming_chatmessage(private_t * tech_pvt, int which)
+int incoming_chatmessage(private_t *tech_pvt, int which)
 {
 	switch_event_t *event;
 	switch_core_session_t *session = NULL;
@@ -2853,6 +3007,156 @@ int next_port(void)
 	return (globals.start_port - 1);
 }
 
+#ifndef WIN32
+// CLOUDTREE (THomas Hazel) - is there a capable freeswitch list?
+struct SkypopenHandles *skypopen_list_add(struct SkypopenList *list, struct SkypopenHandles *handle)
+{
+	switch_mutex_lock(globals.list_mutex);
+
+	if (handle->managed == SWITCH_TRUE) {
+		// already added
+		switch_mutex_unlock(globals.list_mutex);
+		return 0;
+	}
+
+	if (list->head == 0) {
+		list->head = handle;
+		handle->prev = 0;
+
+	} else {
+		((struct SkypopenHandles *) list->tail)->next = handle;
+		((struct SkypopenHandles *) handle)->prev = list->tail;
+	}
+
+	list->tail = handle;
+	handle->next = 0;
+
+	handle->managed = SWITCH_TRUE;
+
+	list->entries++;
+
+	switch_mutex_unlock(globals.list_mutex);
+
+	return handle;
+}
+
+// CLOUDTREE (THomas Hazel) - is there a capable freeswitch list?
+struct SkypopenHandles *skypopen_list_remove_by_value(struct SkypopenList *list, Display * display)
+{
+	struct SkypopenHandles *iter;
+	struct SkypopenHandles *handle = 0;
+
+	switch_mutex_lock(globals.list_mutex);
+
+	iter = (struct SkypopenHandles *) list->head;
+	while (iter != 0) {
+		if (iter->disp == display) {
+			handle = iter;
+			break;
+		}
+
+		iter = (struct SkypopenHandles *) iter->next;
+	}
+
+	if ((handle != 0) && (handle->managed == SWITCH_TRUE)) {
+		if (handle->prev == 0) {
+			list->head = ((struct SkypopenHandles *) handle)->next;
+
+		} else {
+			((struct SkypopenHandles *) handle->prev)->next = ((struct SkypopenHandles *) handle)->next;
+		}
+
+		if (handle->next == 0) {
+			list->tail = ((struct SkypopenHandles *) handle)->prev;
+
+		} else {
+			((struct SkypopenHandles *) handle->next)->prev = ((struct SkypopenHandles *) handle)->prev;
+		}
+
+		handle->managed = SWITCH_FALSE;
+		handle->next = 0;
+		handle->prev = 0;
+
+		list->entries--;
+	}
+
+	switch_mutex_unlock(globals.list_mutex);
+
+	return handle;
+}
+
+// CLOUDTREE (THomas Hazel) - is there a capable freeswitch list?
+struct SkypopenHandles *skypopen_list_remove_by_reference(struct SkypopenList *list, struct SkypopenHandles *handle)
+{
+	private_t *tech_pvt = NULL;
+
+	switch_mutex_lock(globals.list_mutex);
+
+	DEBUGA_SKYPE("BEGIN REMOVE\n", SKYPOPEN_P_LOG);
+	if (handle->managed == SWITCH_FALSE) {
+		// already removed
+		switch_mutex_unlock(globals.list_mutex);
+		DEBUGA_SKYPE("EXIT REMOVE\n", SKYPOPEN_P_LOG);
+		return 0;
+	}
+
+	if (handle->prev == 0) {
+		list->head = ((struct SkypopenHandles *) handle)->next;
+
+	} else {
+		((struct SkypopenHandles *) handle->prev)->next = ((struct SkypopenHandles *) handle)->next;
+	}
+
+	if (handle->next == 0) {
+		list->tail = ((struct SkypopenHandles *) handle)->prev;
+
+	} else {
+		((struct SkypopenHandles *) handle->next)->prev = ((struct SkypopenHandles *) handle)->prev;
+	}
+
+	handle->managed = SWITCH_FALSE;
+	handle->next = 0;
+	handle->prev = 0;
+
+	list->entries--;
+
+	switch_mutex_unlock(globals.list_mutex);
+	DEBUGA_SKYPE("EXIT REMOVE\n", SKYPOPEN_P_LOG);
+
+	return handle;
+}
+
+// CLOUDTREE (THomas Hazel) - is there a capable freeswitch list?
+#ifdef XIO_ERROR_BY_UCONTEXT
+struct SkypopenHandles *skypopen_list_find(struct SkypopenList *list, struct SkypopenHandles *find)
+{
+	struct SkypopenHandles *iter;
+	struct SkypopenHandles *handle = NULL;
+
+	switch_mutex_lock(globals.list_mutex);
+
+	iter = (struct SkypopenHandles *) list->head;
+	while (iter != NULL) {
+		if (iter == find) {
+			handle = iter;
+			break;
+		}
+
+		iter = (struct SkypopenHandles *) iter->next;
+	}
+
+	switch_mutex_unlock(globals.list_mutex);
+
+	return handle;
+}
+#endif
+
+// CLOUDTREE (THomas Hazel) - is there a capable freeswitch list? 
+int skypopen_list_size(struct SkypopenList *list)
+{
+	return list->entries;
+}
+#endif /* NOT WIN32 */
 
 /* For Emacs:
  * Local Variables:
diff --git a/src/mod/endpoints/mod_skypopen/skypopen.h b/src/mod/endpoints/mod_skypopen/skypopen.h
index 77e00dace5..f24eacbb46 100644
--- a/src/mod/endpoints/mod_skypopen/skypopen.h
+++ b/src/mod/endpoints/mod_skypopen/skypopen.h
@@ -41,6 +41,20 @@
 #include <X11/Xlib.h>
 #include <X11/Xlibint.h>
 #include <X11/Xatom.h>
+
+// CLOUDTREE (Thomas Hazel)
+#define XIO_ERROR_BY_SETJMP
+//#define XIO_ERROR_BY_UCONTEXT
+
+// CLOUDTREE (Thomas Hazel)
+#ifdef XIO_ERROR_BY_SETJMP
+#include "setjmp.h"
+#endif
+// CLOUDTREE (Thomas Hazel)
+#ifdef XIO_ERROR_BY_UCONTEXT
+#include "ucontext.h"
+#endif
+
 #endif //WIN32
 
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -58,10 +72,17 @@
 #endif
 
 #define MY_EVENT_INCOMING_CHATMESSAGE "skypopen::incoming_chatmessage"
+#define MY_EVENT_INCOMING_RAW "skypopen::incoming_raw"
 
 #define SAMPLERATE_SKYPOPEN 16000
 #define SAMPLES_PER_FRAME SAMPLERATE_SKYPOPEN/50
 
+#ifdef SKYPOPEN_C_VER
+#ifdef MODSKYPOPEN_C_VER
+#define SKYPOPEN_SVN_VERSION MODSKYPOPEN_C_VER"|"SKYPOPEN_C_VER
+#endif
+#endif
+
 #ifndef SKYPOPEN_SVN_VERSION
 #define SKYPOPEN_SVN_VERSION SWITCH_VERSION_REVISION
 #endif /* SKYPOPEN_SVN_VERSION */
@@ -82,14 +103,14 @@ typedef enum {
 	GFLAG_MY_CODEC_PREFS = (1 << 0)
 } GFLAGS;
 
-#define DEBUGA_SKYPE(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"rev "SKYPOPEN_SVN_VERSION "[%p|%-7lx][DEBUG_SKYPE  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_CALL(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"rev "SKYPOPEN_SVN_VERSION "[%p|%-7lx][DEBUG_CALL  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_PBX(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"rev "SKYPOPEN_SVN_VERSION "[%p|%-7lx][DEBUG_PBX  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define ERRORA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, 		"rev "SKYPOPEN_SVN_VERSION "[%p|%-7lx][ERRORA  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define WARNINGA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, 		"rev "SKYPOPEN_SVN_VERSION "[%p|%-7lx][WARNINGA  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define NOTICA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, 		"rev "SKYPOPEN_SVN_VERSION "[%p|%-7lx][NOTICA  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
+#define DEBUGA_SKYPE(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"%-*s  ["SKYPOPEN_SVN_VERSION "] [DEBUG_SKYPE  %-5d][%-15s][%s,%s] " __VA_ARGS__ );
+#define DEBUGA_CALL(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"%-*s  ["SKYPOPEN_SVN_VERSION "] [DEBUG_CALL  %-5d][%-15s][%s,%s] " __VA_ARGS__ );
+#define DEBUGA_PBX(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"%-*s  ["SKYPOPEN_SVN_VERSION "] [DEBUG_PBX  %-5d][%-15s][%s,%s] " __VA_ARGS__ );
+#define ERRORA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, 		"%-*s   ["SKYPOPEN_SVN_VERSION "] [ERRORA       %-5d][%-15s][%s,%s] " __VA_ARGS__ );
+#define WARNINGA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, 		"%-*s["SKYPOPEN_SVN_VERSION "] [WARNINGA     %-5d][%-15s][%s,%s] " __VA_ARGS__ );
+#define NOTICA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, 		"%-*s ["SKYPOPEN_SVN_VERSION "] [NOTICA       %-5d][%-15s][%s,%s] " __VA_ARGS__ );
 
-#define SKYPOPEN_P_LOG NULL, (unsigned long)55, __LINE__, tech_pvt ? tech_pvt->name ? tech_pvt->name : "none" : "none", -1, tech_pvt ? tech_pvt->interface_state : -1, tech_pvt ? tech_pvt->skype_callflow : -1
+#define SKYPOPEN_P_LOG (int)((20 - (strlen(__FILE__))) + ((__LINE__ - 1000) < 0) + ((__LINE__ - 100) < 0)), " ", __LINE__, tech_pvt ? tech_pvt->name ? tech_pvt->name : "none" : "none", tech_pvt ? interface_status[tech_pvt->interface_state] : "N/A", tech_pvt ? skype_callflow[tech_pvt->skype_callflow] : "N/A" 
 
 /*********************************/
 #define SKYPOPEN_CAUSE_NORMAL		1
@@ -99,6 +120,11 @@ typedef enum {
 #define SKYPOPEN_CONTROL_RINGING		1
 #define SKYPOPEN_CONTROL_ANSWER		2
 
+/*********************************/
+// CLOUDTREE (Thomas Hazel)
+#define SKYPOPEN_RINGING_INIT		0
+#define SKYPOPEN_RINGING_PRE		1
+
 /*********************************/
 #define		SKYPOPEN_STATE_IDLE					0
 #define		SKYPOPEN_STATE_DOWN					1
@@ -112,6 +138,7 @@ typedef enum {
 #define		SKYPOPEN_STATE_SELECTED				9
 #define 	SKYPOPEN_STATE_HANGUP_REQUESTED		10
 #define		SKYPOPEN_STATE_PREANSWER				11
+#define		SKYPOPEN_STATE_DEAD				12
 /*********************************/
 /* call flow from the device */
 #define 	CALLFLOW_CALL_IDLE					0
@@ -154,7 +181,35 @@ struct SkypopenHandles {
 	int currentuserhandle;
 	int api_connected;
 	int fdesc[2];
+
+	// CLOUDTREE (Thomas Hazel)
+#ifdef XIO_ERROR_BY_SETJMP
+	jmp_buf ioerror_context;
+#endif
+#ifdef XIO_ERROR_BY_UCONTEXT
+	ucontext_t ioerror_context;
+#endif
+
+	// CLOUDTREE (Thomas Hazel) - is there a capable freeswitch list?
+	switch_bool_t managed;
+	void *prev;
+	void *next;
 };
+
+// CLOUDTREE (Thomas Hazel) - is there a capable freeswitch list?
+struct SkypopenList {
+	int entries;
+	void *head;
+	void *tail;
+};
+
+// CLOUDTREE (Thomas Hazel) - is there a capable freeswitch list?
+struct SkypopenHandles *skypopen_list_add(struct SkypopenList *list, struct SkypopenHandles *x);
+struct SkypopenHandles *skypopen_list_find(struct SkypopenList *list, struct SkypopenHandles *x);
+struct SkypopenHandles *skypopen_list_remove_by_value(struct SkypopenList *list, Display * display);
+struct SkypopenHandles *skypopen_list_remove_by_reference(struct SkypopenList *list, struct SkypopenHandles *x);
+int skypopen_list_size(struct SkypopenList *list);
+
 #else //WIN32
 
 struct SkypopenHandles {
@@ -218,6 +273,9 @@ struct private_object {
 #endif
 	struct SkypopenHandles SkypopenHandles;
 
+	// CLOUDTREE (Thomas Hazel)
+	char ringing_state;
+
 	int interface_state;
 	char language[80];
 	char exten[80];
@@ -256,6 +314,8 @@ struct private_object {
 	short audiobuf_srv[SAMPLES_PER_FRAME];
 	switch_mutex_t *mutex_audio_srv;
 	int flag_audio_srv;
+	switch_mutex_t *mutex_thread_audio_cli;
+	switch_mutex_t *mutex_thread_audio_srv;
 
 	FILE *phonebook_writing_fp;
 	int skypopen_dir_entry_extension_prefix;
@@ -294,35 +354,36 @@ struct private_object {
 	char ring_id[256];
 	char ring_value[256];
 
+	char message[4096];
 };
 
 typedef struct private_object private_t;
 
-void *SWITCH_THREAD_FUNC skypopen_api_thread_func(switch_thread_t * thread, void *obj);
-int skypopen_audio_read(private_t * tech_pvt);
-int skypopen_audio_init(private_t * tech_pvt);
-int skypopen_signaling_write(private_t * tech_pvt, char *msg_to_skype);
-int skypopen_signaling_read(private_t * tech_pvt);
+void *SWITCH_THREAD_FUNC skypopen_api_thread_func(switch_thread_t *thread, void *obj);
+int skypopen_audio_read(private_t *tech_pvt);
+int skypopen_audio_init(private_t *tech_pvt);
+int skypopen_signaling_write(private_t *tech_pvt, char *msg_to_skype);
+int skypopen_signaling_read(private_t *tech_pvt);
 
-int skypopen_call(private_t * tech_pvt, char *idest, int timeout);
-int skypopen_senddigit(private_t * tech_pvt, char digit);
+int skypopen_call(private_t *tech_pvt, char *idest, int timeout);
+int skypopen_senddigit(private_t *tech_pvt, char digit);
 
 void *skypopen_do_tcp_srv_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC skypopen_do_tcp_srv_thread(switch_thread_t * thread, void *obj);
+void *SWITCH_THREAD_FUNC skypopen_do_tcp_srv_thread(switch_thread_t *thread, void *obj);
 
 void *skypopen_do_tcp_cli_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC skypopen_do_tcp_cli_thread(switch_thread_t * thread, void *obj);
+void *SWITCH_THREAD_FUNC skypopen_do_tcp_cli_thread(switch_thread_t *thread, void *obj);
 
 void *skypopen_do_skypeapi_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC skypopen_do_skypeapi_thread(switch_thread_t * thread, void *obj);
-int dtmf_received(private_t * tech_pvt, char *value);
-int start_audio_threads(private_t * tech_pvt);
-int new_inbound_channel(private_t * tech_pvt);
-int outbound_channel_answered(private_t * tech_pvt);
-int skypopen_signaling_write(private_t * tech_pvt, char *msg_to_skype);
+void *SWITCH_THREAD_FUNC skypopen_do_skypeapi_thread(switch_thread_t *thread, void *obj);
+int dtmf_received(private_t *tech_pvt, char *value);
+int start_audio_threads(private_t *tech_pvt);
+int new_inbound_channel(private_t *tech_pvt);
+int outbound_channel_answered(private_t *tech_pvt);
+int skypopen_signaling_write(private_t *tech_pvt, char *msg_to_skype);
 #if defined(WIN32) && !defined(__CYGWIN__)
-int skypopen_pipe_read(switch_file_t * pipe, short *buf, int howmany);
-int skypopen_pipe_write(switch_file_t * pipe, short *buf, int howmany);
+int skypopen_pipe_read(switch_file_t *pipe, short *buf, int howmany);
+int skypopen_pipe_write(switch_file_t *pipe, short *buf, int howmany);
 /* Visual C do not have strsep ? */
 char *strsep(char **stringp, const char *delim);
 #else
@@ -330,20 +391,18 @@ int skypopen_pipe_read(int pipe, short *buf, int howmany);
 int skypopen_pipe_write(int pipe, short *buf, int howmany);
 #endif /* WIN32 */
 int skypopen_close_socket(unsigned int fd);
-private_t *find_available_skypopen_interface_rr(private_t * tech_pvt_calling);
-int remote_party_is_ringing(private_t * tech_pvt);
-int remote_party_is_early_media(private_t * tech_pvt);
-//int skypopen_answer(private_t * tech_pvt, char *id, char *value);
-int skypopen_answer(private_t * tech_pvt);
-//int skypopen_transfer(private_t * tech_pvt, char *id, char *value);
-int skypopen_transfer(private_t * tech_pvt);
+private_t *find_available_skypopen_interface_rr(private_t *tech_pvt_calling);
+int remote_party_is_ringing(private_t *tech_pvt);
+int remote_party_is_early_media(private_t *tech_pvt);
+int skypopen_answer(private_t *tech_pvt);
+int skypopen_transfer(private_t *tech_pvt);
 #ifndef WIN32
-int skypopen_socket_create_and_bind(private_t * tech_pvt, int *which_port);
+int skypopen_socket_create_and_bind(private_t *tech_pvt, int *which_port);
 #else
-int skypopen_socket_create_and_bind(private_t * tech_pvt, unsigned short *which_port);
+int skypopen_socket_create_and_bind(private_t *tech_pvt, unsigned short *which_port);
 #endif //WIN32
-int incoming_chatmessage(private_t * tech_pvt, int which);
+int incoming_chatmessage(private_t *tech_pvt, int which);
 int next_port(void);
-int skypopen_partner_handle_ring(private_t * tech_pvt);
-int skypopen_answered(private_t * tech_pvt);
-int inbound_channel_answered(private_t * tech_pvt);
+int skypopen_partner_handle_ring(private_t *tech_pvt);
+int skypopen_answered(private_t *tech_pvt);
+int inbound_channel_answered(private_t *tech_pvt);
diff --git a/src/mod/endpoints/mod_skypopen/skypopen_protocol.c b/src/mod/endpoints/mod_skypopen/skypopen_protocol.c
index ad69980388..5c61ee6cec 100644
--- a/src/mod/endpoints/mod_skypopen/skypopen_protocol.c
+++ b/src/mod/endpoints/mod_skypopen/skypopen_protocol.c
@@ -15,20 +15,26 @@ extern switch_endpoint_interface_t *skypopen_endpoint_interface;
 int samplerate_skypopen = SAMPLERATE_SKYPOPEN;
 
 extern int running;
+extern char *interface_status[];
+extern char *skype_callflow[];
 
 /*************************************/
 /* suspicious globals FIXME */
 #ifdef WIN32
 DWORD win32_dwThreadId;
 #else
-XErrorHandler old_handler = 0;
-int xerror = 0;
+
+// CLOUDTREE (Thomas Hazel)
+static int global_x_error = Success;
+extern struct SkypopenList global_handles_list;
+extern switch_status_t remove_interface(char *the_interface, switch_bool_t force);
+
 #endif /* WIN32 */
 /*************************************/
 #ifndef WIN32
-int skypopen_socket_create_and_bind(private_t * tech_pvt, int *which_port)
+int skypopen_socket_create_and_bind(private_t *tech_pvt, int *which_port)
 #else
-int skypopen_socket_create_and_bind(private_t * tech_pvt, unsigned short *which_port)
+int skypopen_socket_create_and_bind(private_t *tech_pvt, unsigned short *which_port)
 #endif							//WIN32
 {
 	int s = -1;
@@ -93,17 +99,13 @@ int skypopen_socket_create_and_bind(private_t * tech_pvt, unsigned short *which_
 
 
 
-/* for virtual machines, eg: Linux domU-12-31-39-02-68-28 2.6.18-xenU-ec2-v1.0 #2 SMP Tue Feb 19 10:51:53 EST 2008 i686 athlon i386 GNU/Linux
- * use:
- * sockbufsize=SAMPLES_PER_FRAME * 8;
- */
 #ifdef WIN32
 	sockbufsize = SAMPLES_PER_FRAME * 8;
 #else
 	sockbufsize = SAMPLES_PER_FRAME * 8;
 #endif //WIN32
 	size = sizeof(int);
-	if(tech_pvt->setsockopt){
+	if (tech_pvt->setsockopt) {
 		setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *) &sockbufsize, size);
 	}
 
@@ -112,17 +114,13 @@ int skypopen_socket_create_and_bind(private_t * tech_pvt, unsigned short *which_
 	getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *) &sockbufsize, &size);
 	DEBUGA_SKYPE("2 SO_RCVBUF is %d, size is %d\n", SKYPOPEN_P_LOG, sockbufsize, size);
 
-/* for virtual machines, eg: Linux domU-12-31-39-02-68-28 2.6.18-xenU-ec2-v1.0 #2 SMP Tue Feb 19 10:51:53 EST 2008 i686 athlon i386 GNU/Linux
- * use:
- * sockbufsize=SAMPLES_PER_FRAME * 8;
- */
 #ifdef WIN32
 	sockbufsize = SAMPLES_PER_FRAME * 8;
 #else
 	sockbufsize = SAMPLES_PER_FRAME * 8;
 #endif //WIN32
 	size = sizeof(int);
-	if(tech_pvt->setsockopt){
+	if (tech_pvt->setsockopt) {
 		setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *) &sockbufsize, size);
 	}
 
@@ -131,16 +129,16 @@ int skypopen_socket_create_and_bind(private_t * tech_pvt, unsigned short *which_
 	getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *) &sockbufsize, &size);
 	DEBUGA_SKYPE("2 SO_SNDBUF is %d, size is %d\n", SKYPOPEN_P_LOG, sockbufsize, size);
 
-        flag = 0;
-        getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, &size);
-        DEBUGA_SKYPE("TCP_NODELAY is %d\n", SKYPOPEN_P_LOG, flag);
-        flag = 1;
-	if(tech_pvt->setsockopt){
-        	setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, size);
+	flag = 0;
+	getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, &size);
+	DEBUGA_SKYPE("TCP_NODELAY is %d\n", SKYPOPEN_P_LOG, flag);
+	flag = 1;
+	if (tech_pvt->setsockopt) {
+		setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, size);
 	}
-        flag = 0;
-        getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, &size);
-        DEBUGA_SKYPE("TCP_NODELAY is %d\n", SKYPOPEN_P_LOG, flag);
+	flag = 0;
+	getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, &size);
+	DEBUGA_SKYPE("TCP_NODELAY is %d\n", SKYPOPEN_P_LOG, flag);
 
 
 
@@ -148,7 +146,7 @@ int skypopen_socket_create_and_bind(private_t * tech_pvt, unsigned short *which_
 	return s;
 }
 
-int skypopen_signaling_read(private_t * tech_pvt)
+int skypopen_signaling_read(private_t *tech_pvt)
 {
 	char read_from_pipe[4096];
 	char message[4096];
@@ -171,15 +169,15 @@ int skypopen_signaling_read(private_t * tech_pvt)
 		a++;
 
 		if (read_from_pipe[i] == '\0') {
-
 			//if (!strstr(message, "DURATION")) {
 			DEBUGA_SKYPE("READING: |||%s||| \n", SKYPOPEN_P_LOG, message);
+			strncpy(tech_pvt->message, message, sizeof(tech_pvt->message));
 			//}
 			if (!strcasecmp(message, "SILENT_MODE OFF")) {
 				if (tech_pvt->silent_mode) {
 					DEBUGA_SKYPE("Resetting SILENT_MODE on skype_call: %s.\n", SKYPOPEN_P_LOG, id);
 					skypopen_signaling_write(tech_pvt, "SET SILENT_MODE ON");
-					switch_sleep(1000);
+					//switch_sleep(1000);
 				}
 			}
 			if (!strcasecmp(message, "ERROR 68")) {
@@ -211,7 +209,7 @@ int skypopen_signaling_read(private_t * tech_pvt)
 						("Skype got ERROR: |||%s|||, we are trying to use this interface to make or receive a call, but another call is half-active on this interface. Let's the previous one to continue.\n",
 						 SKYPOPEN_P_LOG, message);
 				} else if (!strncasecmp(message, "ERROR 99 CALL", 12)) {
-					ERRORA("Skype got ERROR: |||%s|||, another call is active on this interface\n\n\n", SKYPOPEN_P_LOG, message);
+					DEBUGA_SKYPE("Skype got ERROR: |||%s|||, another call is active on this interface\n\n\n", SKYPOPEN_P_LOG, message);
 					tech_pvt->interface_state = SKYPOPEN_STATE_ERROR_DOUBLE_CALL;
 				} else if (!strncasecmp(message, "ERROR 592 ALTER CALL", 19)) {
 					NOTICA("Skype got ERROR about TRANSFERRING, no problem: |||%s|||\n", SKYPOPEN_P_LOG, message);
@@ -229,6 +227,34 @@ int skypopen_signaling_read(private_t * tech_pvt)
 						DEBUGA_SKYPE("Skype got ERROR about a failed action (probably TRYING to HANGUP A CALL), no problem: |||%s|||\n", SKYPOPEN_P_LOG,
 									 message);
 					}
+				} else if (!strncasecmp(message, "ERROR 36 Not online", 18)) {
+					char msg_to_skype[256];
+					ERRORA("Skype client is not online, eg: not connected to Skype network, probably got a temporary net outage: |||%s|||\n",
+						   SKYPOPEN_P_LOG, message);
+					if (strlen(tech_pvt->skype_call_id)) {
+						sprintf(msg_to_skype, "ALTER CALL %s HANGUP", tech_pvt->skype_call_id);
+						skypopen_signaling_write(tech_pvt, msg_to_skype);
+					}
+					if (strlen(tech_pvt->ring_id)) {
+						sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", tech_pvt->ring_id);
+						skypopen_signaling_write(tech_pvt, msg_to_skype);
+					}
+					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
+					return CALLFLOW_INCOMING_HANGUP;
+				} else if (!strncasecmp(message, "ERROR 589 ALTER CALL", 19)) {
+					char msg_to_skype[256];
+					DEBUGA_SKYPE("Skype client was not able to correctly manage tcp audio sockets, probably got a local or remote hangup: |||%s|||\n",
+								 SKYPOPEN_P_LOG, message);
+					if (strlen(tech_pvt->skype_call_id)) {
+						sprintf(msg_to_skype, "ALTER CALL %s HANGUP", tech_pvt->skype_call_id);
+						skypopen_signaling_write(tech_pvt, msg_to_skype);
+					}
+					if (strlen(tech_pvt->ring_id)) {
+						sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", tech_pvt->ring_id);
+						skypopen_signaling_write(tech_pvt, msg_to_skype);
+					}
+					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
+					return CALLFLOW_INCOMING_HANGUP;
 				} else {
 					ERRORA("Skype got ERROR: |||%s|||\n", SKYPOPEN_P_LOG, message);
 					tech_pvt->skype_callflow = CALLFLOW_STATUS_FINISHED;
@@ -272,7 +298,6 @@ int skypopen_signaling_read(private_t * tech_pvt)
 				if (!strcasecmp(prop, "RECEIVEDAUTHREQUEST")) {
 					char msg_to_skype[256];
 					DEBUGA_SKYPE("Skype MSG: message: %s, obj: %s, id: %s, prop: %s!\n", SKYPOPEN_P_LOG, message, obj, id, prop);
-					//TODO: allow authorization based on config param
 					sprintf(msg_to_skype, "SET USER %s ISAUTHORIZED TRUE", id);
 					skypopen_signaling_write(tech_pvt, msg_to_skype);
 				}
@@ -378,13 +403,13 @@ int skypopen_signaling_read(private_t * tech_pvt)
 									 tech_pvt->chatmessages[i].type, tech_pvt->chatmessages[i].id);
 						sprintf(msg_to_skype, "GET CHATMESSAGE %s CHATNAME", id);
 						skypopen_signaling_write(tech_pvt, msg_to_skype);
-						skypopen_sleep(1000);
+						//skypopen_sleep(1000);
 						sprintf(msg_to_skype, "GET CHATMESSAGE %s FROM_HANDLE", id);
 						skypopen_signaling_write(tech_pvt, msg_to_skype);
-						skypopen_sleep(1000);
+						//skypopen_sleep(1000);
 						sprintf(msg_to_skype, "GET CHATMESSAGE %s FROM_DISPNAME", id);
 						skypopen_signaling_write(tech_pvt, msg_to_skype);
-						skypopen_sleep(1000);
+						//skypopen_sleep(1000);
 						sprintf(msg_to_skype, "GET CHATMESSAGE %s BODY", id);
 						skypopen_signaling_write(tech_pvt, msg_to_skype);
 					}
@@ -476,7 +501,7 @@ int skypopen_signaling_read(private_t * tech_pvt)
 				//SKYPOPEN_P_LOG, message, obj, id, prop, value, where ? where : "NULL");
 
 				if (!strcasecmp(prop, "PARTNER_HANDLE")) {
-					if (tech_pvt->interface_state != SKYPOPEN_STATE_SELECTED && (!strlen(tech_pvt->skype_call_id) || !strlen(tech_pvt->session_uuid_str))) {
+					if (tech_pvt->interface_state == SKYPOPEN_STATE_IDLE) {
 						/* we are NOT inside an active call */
 						DEBUGA_SKYPE("Call %s go to skypopen_partner_handle_ring\n", SKYPOPEN_P_LOG, id);
 						skypopen_strncpy(tech_pvt->ring_id, id, sizeof(tech_pvt->ring_id));
@@ -495,7 +520,6 @@ int skypopen_signaling_read(private_t * tech_pvt)
 							skypopen_strncpy(tech_pvt->ring_value, value, sizeof(tech_pvt->ring_value));
 							skypopen_strncpy(tech_pvt->answer_id, id, sizeof(tech_pvt->answer_id));
 							skypopen_strncpy(tech_pvt->answer_value, value, sizeof(tech_pvt->answer_value));
-							//skypopen_transfer(tech_pvt, id, value);
 							skypopen_transfer(tech_pvt);
 						}
 					}
@@ -517,19 +541,19 @@ int skypopen_signaling_read(private_t * tech_pvt)
 				}
 				if (!strcasecmp(prop, "DURATION")) {	/* each 20 seconds, we zero the buffers and sync the timers */
 					if (!((atoi(value) % 20))) {
-						if(tech_pvt->read_buffer){
+						if (tech_pvt->read_buffer) {
 							switch_mutex_lock(tech_pvt->mutex_audio_srv);
 							switch_buffer_zero(tech_pvt->read_buffer);
-							if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next){
+							if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
 								switch_core_timer_sync(&tech_pvt->timer_read);
 							}
 							switch_mutex_unlock(tech_pvt->mutex_audio_srv);
 						}
 
-						if(tech_pvt->write_buffer){
+						if (tech_pvt->write_buffer) {
 							switch_mutex_lock(tech_pvt->mutex_audio_cli);
 							switch_buffer_zero(tech_pvt->write_buffer);
-							if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next){
+							if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next) {
 								switch_core_timer_sync(&tech_pvt->timer_write);
 							}
 							switch_mutex_unlock(tech_pvt->mutex_audio_cli);
@@ -547,43 +571,66 @@ int skypopen_signaling_read(private_t * tech_pvt)
 				if (!strcasecmp(prop, "DURATION") && (tech_pvt->interface_state == SKYPOPEN_STATE_ERROR_DOUBLE_CALL)) {
 					char msg_to_skype[1024];
 					skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-					ERRORA("We are in a double call situation, trying to get out hanging up call id: %s.\n", SKYPOPEN_P_LOG, id);
+					WARNINGA("We are in a double call situation, trying to get out hanging up call id: %s.\n", SKYPOPEN_P_LOG, id);
+					sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
+					skypopen_signaling_write(tech_pvt, msg_to_skype);
 					sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
 					skypopen_signaling_write(tech_pvt, msg_to_skype);
-					skypopen_sleep(10000);
+					//skypopen_sleep(10000);
 				}
 
 				if (!strcasecmp(prop, "STATUS")) {
 
 					if (!strcasecmp(value, "RINGING")) {
 						char msg_to_skype[1024];
-						if ((tech_pvt->interface_state != SKYPOPEN_STATE_SELECTED && tech_pvt->interface_state != SKYPOPEN_STATE_DIALING)
-							&& (!strlen(tech_pvt->skype_call_id) || !strlen(tech_pvt->session_uuid_str))) {
-							/* we are NOT inside an active call */
+						if (tech_pvt->interface_state == SKYPOPEN_STATE_IDLE) {
+							// CLOUDTREE (Thomas Hazel)
+							skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
 
-							DEBUGA_SKYPE("NO ACTIVE calls in this moment, skype_call %s is RINGING, to ask PARTNER_DISPNAME and PARTNER_HANDLE\n", SKYPOPEN_P_LOG, id);
+							/* we are NOT inside an active call */
+							DEBUGA_SKYPE("NO ACTIVE calls in this moment, skype_call %s is RINGING, to ask PARTNER_DISPNAME and PARTNER_HANDLE\n",
+										 SKYPOPEN_P_LOG, id);
 							sprintf(msg_to_skype, "GET CALL %s PARTNER_DISPNAME", id);
 							skypopen_signaling_write(tech_pvt, msg_to_skype);
-							skypopen_sleep(100);
+							//skypopen_sleep(100);
 							sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id);
 							skypopen_signaling_write(tech_pvt, msg_to_skype);
-							skypopen_sleep(10000);
+							//skypopen_sleep(10000);
 						} else {
 							/* we are inside an active call */
 							if (!strcasecmp(tech_pvt->skype_call_id, id)) {
+								// CLOUDTREE (Thomas Hazel)
+								tech_pvt->ringing_state = SKYPOPEN_RINGING_PRE;
+
 								/* this is the call in which we are calling out */
 								tech_pvt->skype_callflow = CALLFLOW_STATUS_RINGING;
 								tech_pvt->interface_state = SKYPOPEN_STATE_RINGING;
 								skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
 								DEBUGA_SKYPE("Our remote party in skype_call %s is RINGING\n", SKYPOPEN_P_LOG, id);
-								remote_party_is_ringing(tech_pvt);
+								if (remote_party_is_ringing(tech_pvt) != SWITCH_STATUS_SUCCESS) {
+									DEBUGA_SKYPE
+										("We are getting the RINGING from a call we probably canceled, trying to get out hanging up call id: %s.\n",
+										 SKYPOPEN_P_LOG, id);
+									sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
+									skypopen_signaling_write(tech_pvt, msg_to_skype);
+									sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
+									skypopen_signaling_write(tech_pvt, msg_to_skype);
+									tech_pvt->skype_call_id[0] = '\0';
+									// CLOUDTREE (Thomas Hazel)
+									tech_pvt->ringing_state = SKYPOPEN_RINGING_INIT;
+									tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
+									tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
+									DEBUGA_SKYPE("we're now DOWN\n", SKYPOPEN_P_LOG);
+									return CALLFLOW_INCOMING_HANGUP;
+
+								}
 							} else {
 								DEBUGA_SKYPE
 									("We are in another call, but skype_call %s is RINGING on us, let's ask PARTNER_HANDLE, so maybe we'll TRANSFER\n",
 									 SKYPOPEN_P_LOG, id);
 								sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id);
 								skypopen_signaling_write(tech_pvt, msg_to_skype);
-								skypopen_sleep(10000);
+								//skypopen_sleep(10000);
 							}
 						}
 					} else if (!strcasecmp(value, "EARLYMEDIA")) {
@@ -598,17 +645,15 @@ int skypopen_signaling_read(private_t * tech_pvt)
 								return CALLFLOW_INCOMING_HANGUP;
 							}
 						}
-						skypopen_sleep(1000);
+						//skypopen_sleep(1000);
 						sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id, tech_pvt->tcp_cli_port);
 						skypopen_signaling_write(tech_pvt, msg_to_skype);
-						skypopen_sleep(1000);
+						//skypopen_sleep(1000);
 						sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, tech_pvt->tcp_srv_port);
 						skypopen_signaling_write(tech_pvt, msg_to_skype);
 
 						remote_party_is_early_media(tech_pvt);
-					} else if (!strcasecmp(value, "MISSED")) {
-						DEBUGA_SKYPE("We missed skype_call %s\n", SKYPOPEN_P_LOG, id);
-					} else if (!strcasecmp(value, "FINISHED")) {
+					} else if (!strcasecmp(value, "MISSED") || !strcasecmp(value, "FINISHED")) {
 						if (!strcasecmp(tech_pvt->skype_call_id, id)) {
 							DEBUGA_SKYPE("skype_call %s is MY call, now I'm going DOWN\n", SKYPOPEN_P_LOG, id);
 							if (tech_pvt->interface_state != SKYPOPEN_STATE_HANGUP_REQUESTED) {
@@ -683,19 +728,22 @@ int skypopen_signaling_read(private_t * tech_pvt)
 									if (tech_pvt->tcp_cli_thread == NULL) {
 										DEBUGA_SKYPE("START start_audio_threads\n", SKYPOPEN_P_LOG);
 										if (start_audio_threads(tech_pvt)) {
-											ERRORA("start_audio_threads FAILED\n", SKYPOPEN_P_LOG);
+											WARNINGA("start_audio_threads FAILED\n", SKYPOPEN_P_LOG);
 											return CALLFLOW_INCOMING_HANGUP;
 										}
 									}
-									skypopen_sleep(1000);
+									//skypopen_sleep(1000);
 									sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id, tech_pvt->tcp_cli_port);
 									skypopen_signaling_write(tech_pvt, msg_to_skype);
-									skypopen_sleep(1000);
+									//skypopen_sleep(1000);
 									sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, tech_pvt->tcp_srv_port);
 									skypopen_signaling_write(tech_pvt, msg_to_skype);
 								}
 								tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS;
-								skypopen_answered(tech_pvt);
+								if (skypopen_answered(tech_pvt) != SWITCH_STATUS_SUCCESS) {
+									sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
+									skypopen_signaling_write(tech_pvt, msg_to_skype);
+								}
 							} else {
 								DEBUGA_SKYPE("I'm on %s, skype_call %s is NOT MY call, ignoring\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id, id);
 							}
@@ -704,6 +752,11 @@ int skypopen_signaling_read(private_t * tech_pvt)
 							DEBUGA_SKYPE("Back from REMOTEHOLD!\n", SKYPOPEN_P_LOG);
 						}
 
+					} else if (!strcasecmp(value, "LOCALHOLD")) {
+						char msg_to_skype[256];
+						DEBUGA_SKYPE("skype_call: %s is now LOCALHOLD, let's hangup\n", SKYPOPEN_P_LOG, id);
+						sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
+						skypopen_signaling_write(tech_pvt, msg_to_skype);
 					} else if (!strcasecmp(value, "REMOTEHOLD")) {
 						tech_pvt->skype_callflow = CALLFLOW_STATUS_REMOTEHOLD;
 						DEBUGA_SKYPE("skype_call: %s is now REMOTEHOLD\n", SKYPOPEN_P_LOG, id);
@@ -716,7 +769,7 @@ int skypopen_signaling_read(private_t * tech_pvt)
 						skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
 						tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
 						tech_pvt->skype_call_id[0] = '\0';
-						skypopen_sleep(1000);
+						//skypopen_sleep(1000);
 						return CALLFLOW_INCOMING_HANGUP;
 					} else if (!strcasecmp(value, "WAITING_REDIAL_COMMAND")) {
 						tech_pvt->skype_callflow = CALLFLOW_STATUS_FAILED;
@@ -726,7 +779,7 @@ int skypopen_signaling_read(private_t * tech_pvt)
 						skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
 						tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
 						tech_pvt->skype_call_id[0] = '\0';
-						skypopen_sleep(1000);
+						//skypopen_sleep(1000);
 						return CALLFLOW_INCOMING_HANGUP;
 					} else {
 						WARNINGA("skype_call: %s, STATUS: %s is not recognized\n", SKYPOPEN_P_LOG, id, value);
@@ -818,6 +871,8 @@ void *skypopen_do_tcp_srv_thread_func(void *obj)
 				if (!(running && tech_pvt->running))
 					break;
 				while (tech_pvt && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN
+					   && tech_pvt->interface_state != SKYPOPEN_STATE_IDLE
+					   && tech_pvt->interface_state != SKYPOPEN_STATE_HANGUP_REQUESTED
 					   && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
 						   || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
 						   || tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPOPEN_STATE_UP)) {
@@ -858,12 +913,13 @@ void *skypopen_do_tcp_srv_thread_func(void *obj)
 						nospace = 0;
 						if (len > 0) {
 							switch_mutex_lock(tech_pvt->mutex_audio_srv);
-							if (switch_buffer_freespace(tech_pvt->read_buffer) < len) {
-								switch_buffer_zero(tech_pvt->read_buffer);
-								nospace = 1;
-								//switch_buffer_toss(tech_pvt->read_buffer, len);
+							if (tech_pvt->read_buffer) {
+								if (switch_buffer_freespace(tech_pvt->read_buffer) < len) {
+									switch_buffer_zero(tech_pvt->read_buffer);
+									nospace = 1;
+								}
+								switch_buffer_write(tech_pvt->read_buffer, srv_in, len);
 							}
-							switch_buffer_write(tech_pvt->read_buffer, srv_in, len);
 							switch_mutex_unlock(tech_pvt->mutex_audio_srv);
 							if (nospace) {
 								DEBUGA_SKYPE("NO SPACE READ: there was no space for: %d\n", SKYPOPEN_P_LOG, len);
@@ -896,7 +952,12 @@ void *skypopen_do_tcp_srv_thread_func(void *obj)
 	DEBUGA_SKYPE("incoming audio (read) server (I am it) EXITING\n", SKYPOPEN_P_LOG);
 	skypopen_close_socket(s);
 	s = -1;
+	//DEBUGA_SKYPE("debugging_hangup PRE srv lock\n", SKYPOPEN_P_LOG);
+	switch_mutex_lock(tech_pvt->mutex_thread_audio_srv);
+	//DEBUGA_SKYPE("debugging_hangup srv lock\n", SKYPOPEN_P_LOG);
 	tech_pvt->tcp_srv_thread = NULL;
+	switch_mutex_unlock(tech_pvt->mutex_thread_audio_srv);
+	//DEBUGA_SKYPE("debugging_hangup srv unlock\n", SKYPOPEN_P_LOG);
 	return NULL;
 }
 
@@ -944,7 +1005,7 @@ void *skypopen_do_tcp_cli_thread_func(void *obj)
 		if (!(running && tech_pvt->running))
 			break;
 		FD_ZERO(&fsgio);
-		togio.tv_usec = 60000;	//20msec
+		togio.tv_usec = 60000;	//60msec
 		togio.tv_sec = 0;
 		fdselectgio = s;
 		FD_SET(fdselectgio, &fsgio);
@@ -970,6 +1031,8 @@ void *skypopen_do_tcp_cli_thread_func(void *obj)
 				if (!(running && tech_pvt->running))
 					break;
 				while (tech_pvt && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN
+					   && tech_pvt->interface_state != SKYPOPEN_STATE_IDLE
+					   && tech_pvt->interface_state != SKYPOPEN_STATE_HANGUP_REQUESTED
 					   && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
 						   || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
 						   || tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPOPEN_STATE_UP)) {
@@ -1001,17 +1064,17 @@ void *skypopen_do_tcp_cli_thread_func(void *obj)
 							break;
 						}
 						switch_mutex_lock(tech_pvt->mutex_audio_cli);
-						if (switch_buffer_inuse(tech_pvt->write_buffer)) {
+						if (tech_pvt->write_buffer && switch_buffer_inuse(tech_pvt->write_buffer)) {
 							bytes_to_write = switch_buffer_read(tech_pvt->write_buffer, cli_out, 640);
 						}
 						switch_mutex_unlock(tech_pvt->mutex_audio_cli);
 
 						if (!bytes_to_write) {
-							if(tech_pvt->write_silence_when_idle){
+							if (tech_pvt->write_silence_when_idle) {
 								memset(cli_out, 255, sizeof(cli_out));
 								bytes_to_write = 640;
 								//DEBUGA_SKYPE("WRITE Silence!\n", SKYPOPEN_P_LOG);
-							}else{
+							} else {
 								continue;
 							}
 						}
@@ -1041,11 +1104,16 @@ void *skypopen_do_tcp_cli_thread_func(void *obj)
 	DEBUGA_SKYPE("outbound audio server (I am it) EXITING\n", SKYPOPEN_P_LOG);
 	skypopen_close_socket(s);
 	s = -1;
+	//DEBUGA_SKYPE("debugging_hangup PRE cli lock\n", SKYPOPEN_P_LOG);
+	switch_mutex_lock(tech_pvt->mutex_thread_audio_cli);
+	//DEBUGA_SKYPE("debugging_hangup cli lock\n", SKYPOPEN_P_LOG);
 	tech_pvt->tcp_cli_thread = NULL;
+	switch_mutex_unlock(tech_pvt->mutex_thread_audio_cli);
+	//DEBUGA_SKYPE("debugging_hangup cli unlock\n", SKYPOPEN_P_LOG);
 	return NULL;
 }
 
-int skypopen_senddigit(private_t * tech_pvt, char digit)
+int skypopen_senddigit(private_t *tech_pvt, char digit)
 {
 	char msg_to_skype[1024];
 
@@ -1056,7 +1124,7 @@ int skypopen_senddigit(private_t * tech_pvt, char digit)
 	return 0;
 }
 
-int skypopen_call(private_t * tech_pvt, char *rdest, int timeout)
+int skypopen_call(private_t *tech_pvt, char *rdest, int timeout)
 {
 	char msg_to_skype[1024];
 
@@ -1074,7 +1142,7 @@ int skypopen_call(private_t * tech_pvt, char *rdest, int timeout)
 /* PLATFORM SPECIFIC */
 /***************************/
 #if defined(WIN32) && !defined(__CYGWIN__)
-int skypopen_pipe_read(switch_file_t * pipe, short *buf, int howmany)
+int skypopen_pipe_read(switch_file_t *pipe, short *buf, int howmany)
 {
 	switch_size_t quantity;
 
@@ -1087,7 +1155,7 @@ int skypopen_pipe_read(switch_file_t * pipe, short *buf, int howmany)
 	return howmany;
 }
 
-int skypopen_pipe_write(switch_file_t * pipe, short *buf, int howmany)
+int skypopen_pipe_write(switch_file_t *pipe, short *buf, int howmany)
 {
 	switch_size_t quantity;
 
@@ -1109,7 +1177,7 @@ int skypopen_close_socket(unsigned int fd)
 	return res;
 }
 
-int skypopen_audio_init(private_t * tech_pvt)
+int skypopen_audio_init(private_t *tech_pvt)
 {
 	switch_status_t rv;
 	rv = switch_file_pipe_create(&tech_pvt->audiopipe_srv[0], &tech_pvt->audiopipe_srv[1], skypopen_module_pool);
@@ -1142,7 +1210,7 @@ int skypopen_close_socket(unsigned int fd)
 	return res;
 }
 
-int skypopen_audio_init(private_t * tech_pvt)
+int skypopen_audio_init(private_t *tech_pvt)
 {
 	if (pipe(tech_pvt->audiopipe_srv)) {
 		fcntl(tech_pvt->audiopipe_srv[0], F_SETFL, O_NONBLOCK);
@@ -1205,7 +1273,7 @@ char
 	return res;
 }
 
-int skypopen_signaling_write(private_t * tech_pvt, char *msg_to_skype)
+int skypopen_signaling_write(private_t *tech_pvt, char *msg_to_skype)
 {
 	static char acInputRow[1024];
 	COPYDATASTRUCT oCopyData;
@@ -1312,7 +1380,7 @@ LRESULT APIENTRY skypopen_present(HWND hWindow, UINT uiMessage, WPARAM uiParam,
 	return (lReturnCode);
 }
 
-int win32_Initialize_CreateWindowClass(private_t * tech_pvt)
+int win32_Initialize_CreateWindowClass(private_t *tech_pvt)
 {
 	unsigned char *paucUUIDString;
 	RPC_STATUS lUUIDResult;
@@ -1352,14 +1420,14 @@ int win32_Initialize_CreateWindowClass(private_t * tech_pvt)
 	return (fReturnStatus);
 }
 
-void win32_DeInitialize_DestroyWindowClass(private_t * tech_pvt)
+void win32_DeInitialize_DestroyWindowClass(private_t *tech_pvt)
 {
 	UnregisterClass(tech_pvt->SkypopenHandles.win32_acInit_WindowClassName, tech_pvt->SkypopenHandles.win32_hInit_ProcessHandle);
 	CloseHandle(tech_pvt->SkypopenHandles.win32_hInit_ProcessHandle);
 	tech_pvt->SkypopenHandles.win32_hInit_ProcessHandle = NULL;
 }
 
-int win32_Initialize_CreateMainWindow(private_t * tech_pvt)
+int win32_Initialize_CreateMainWindow(private_t *tech_pvt)
 {
 	tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle =
 		CreateWindowEx(WS_EX_APPWINDOW | WS_EX_WINDOWEDGE,
@@ -1369,7 +1437,7 @@ int win32_Initialize_CreateMainWindow(private_t * tech_pvt)
 	return (tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle != NULL ? 1 : 0);
 }
 
-void win32_DeInitialize_DestroyMainWindow(private_t * tech_pvt)
+void win32_DeInitialize_DestroyMainWindow(private_t *tech_pvt)
 {
 	if (tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle != NULL)
 		DestroyWindow(tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle), tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle = NULL;
@@ -1419,41 +1487,77 @@ void *skypopen_do_skypeapi_thread_func(void *obj)
 			win32_DeInitialize_DestroyWindowClass(tech_pvt);
 		}
 	}
-	tech_pvt->skypopen_api_thread=NULL;
+	tech_pvt->skypopen_api_thread = NULL;
 	DEBUGA_SKYPE("EXITING\n", SKYPOPEN_P_LOG);
 	return NULL;
 }
 
 #else /* NOT WIN32 */
+
+// CLOUDTREE (Thomas Hazel)
+int xio_error_handler(Display * dpy)
+{
+	private_t *tech_pvt = NULL;
+	struct SkypopenHandles *handle;
+
+	ERRORA("Fatal display error for %d, %s\n", SKYPOPEN_P_LOG, skypopen_list_size(&global_handles_list), dpy->display_name);
+
+	handle = skypopen_list_remove_by_value(&global_handles_list, dpy);
+	if (handle != NULL) {
+#ifdef XIO_ERROR_BY_SETJMP
+		siglongjmp(handle->ioerror_context, 1);
+#endif
+#ifdef XIO_ERROR_BY_UCONTEXT
+		setcontext(&handle->ioerror_context);
+#endif
+	}
+
+	ERRORA("Fatal display error for %p, %s - failed to siglongjmp\n", SKYPOPEN_P_LOG, (void *) handle, dpy->display_name);
+
+	return 0;
+}
+
+int xio_error_handler2(Display * dpy, XErrorEvent * err)
+{
+	private_t *tech_pvt = NULL;
+	struct SkypopenHandles *handle;
+	global_x_error = err->error_code;
+
+	ERRORA("Received error code %d from X Server\n\n", SKYPOPEN_P_LOG, global_x_error);
+	ERRORA("Display error for %d, %s\n", SKYPOPEN_P_LOG, skypopen_list_size(&global_handles_list), dpy->display_name);
+
+	handle = skypopen_list_remove_by_value(&global_handles_list, dpy);
+	if (handle != NULL) {
+#ifdef XIO_ERROR_BY_SETJMP
+		siglongjmp(handle->ioerror_context, 1);
+#endif
+#ifdef XIO_ERROR_BY_UCONTEXT
+		setcontext(&handle->ioerror_context);
+#endif
+	}
+
+	ERRORA("Fatal display error for %p, %s - failed to siglongjmp\n", SKYPOPEN_P_LOG, (void *) handle, dpy->display_name);
+
+	return 0;
+}
+
+
 int X11_errors_handler(Display * dpy, XErrorEvent * err)
 {
 	private_t *tech_pvt = NULL;
 	(void) dpy;
 
-	xerror = err->error_code;
-	ERRORA("Received error code %d from X Server\n\n", SKYPOPEN_P_LOG, xerror);
+	global_x_error = err->error_code;
+	ERRORA("Received error code %d from X Server\n\n", SKYPOPEN_P_LOG, global_x_error);
 	return 0;					/*  ignore the error */
 }
 
-static void X11_errors_trap(void)
-{
-	xerror = 0;
-	old_handler = XSetErrorHandler(X11_errors_handler);
-}
-
-static int X11_errors_untrap(void)
-{
-	XSetErrorHandler(old_handler);
-	return (xerror != BadValue) && (xerror != BadWindow);
-}
-
-int skypopen_send_message(private_t * tech_pvt, const char *message_P)
+int skypopen_send_message(private_t *tech_pvt, const char *message_P)
 {
 	struct SkypopenHandles *SkypopenHandles = &tech_pvt->SkypopenHandles;
 	Window w_P = SkypopenHandles->skype_win;
 	Display *disp = SkypopenHandles->disp;
 	Window handle_P = SkypopenHandles->win;
-	int ok;
 
 
 	Atom atom1 = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False);
@@ -1462,8 +1566,8 @@ int skypopen_send_message(private_t * tech_pvt, const char *message_P)
 	unsigned int len = strlen(message_P);
 	XEvent e;
 
-skypopen_sleep(1000);//giovanni
-	XFlush(disp);//giovanni
+	//skypopen_sleep(1000);
+	//XFlush(disp);
 
 	memset(&e, 0, sizeof(e));
 	e.xclient.type = ClientMessage;
@@ -1472,7 +1576,9 @@ skypopen_sleep(1000);//giovanni
 	e.xclient.window = handle_P;
 	e.xclient.format = 8;
 
-	X11_errors_trap();
+	// CLOUDTREE (Thomas Hazel)
+	global_x_error = Success;
+
 	do {
 		unsigned int i;
 		for (i = 0; i < 20 && i + pos <= len; ++i)
@@ -1483,12 +1589,11 @@ skypopen_sleep(1000);//giovanni
 		pos += i;
 	} while (pos <= len);
 
-	//giovanni XSync(disp, False);
 	XFlush(disp);
-	ok = X11_errors_untrap();
 
-	if (!ok) {
-		ERRORA("Sending message failed with status %d\n", SKYPOPEN_P_LOG, xerror);
+	// CLOUDTREE (Thomas Hazel)
+	if (global_x_error != Success) {
+		ERRORA("Sending message failed with status %d\n", SKYPOPEN_P_LOG, global_x_error);
 		tech_pvt->running = 0;
 		return 0;
 	}
@@ -1496,7 +1601,7 @@ skypopen_sleep(1000);//giovanni
 	return 1;
 }
 
-int skypopen_signaling_write(private_t * tech_pvt, char *msg_to_skype)
+int skypopen_signaling_write(private_t *tech_pvt, char *msg_to_skype)
 {
 
 	DEBUGA_SKYPE("SENDING: |||%s||||\n", SKYPOPEN_P_LOG, msg_to_skype);
@@ -1525,11 +1630,9 @@ int skypopen_present(struct SkypopenHandles *SkypopenHandles)
 	int status;
 	private_t *tech_pvt = NULL;
 
-	X11_errors_trap();
 	status =
 		XGetWindowProperty(SkypopenHandles->disp, DefaultRootWindow(SkypopenHandles->disp),
 						   skype_inst, 0, 1, False, XA_WINDOW, &type_ret, &format_ret, &nitems_ret, &bytes_after_ret, &prop);
-	X11_errors_untrap();
 
 	/*  sanity check */
 	if (status != Success || format_ret != 32 || nitems_ret != 1) {
@@ -1597,11 +1700,92 @@ void *skypopen_do_skypeapi_thread_func(void *obj)
 	if (!disp) {
 		ERRORA("Cannot open X Display '%s', exiting skype thread\n", SKYPOPEN_P_LOG, tech_pvt->X11_display);
 		running = 0;
+
+		// CLOUDTREE (Thomas Hazel)
+		tech_pvt->skypopen_api_thread = NULL;
+		remove_interface(tech_pvt->skype_user, FALSE);
 		return NULL;
 	} else {
 		DEBUGA_SKYPE("X Display '%s' opened\n", SKYPOPEN_P_LOG, tech_pvt->X11_display);
 	}
 
+	// CLOUDTREE (Thomas Hazel)
+#ifndef WIN32
+	{
+		char interfacename[256];
+
+		skypopen_list_add(&global_handles_list, SkypopenHandles);
+		sprintf(interfacename, "#%s", tech_pvt->name);
+
+#ifdef XIO_ERROR_BY_SETJMP
+		if (sigsetjmp(SkypopenHandles->ioerror_context, 1) != 0) {
+			switch_core_session_t *session = NULL;
+			tech_pvt->interface_state = SKYPOPEN_STATE_DEAD;
+			ERRORA("Fatal display error for %s - successed to jump\n", SKYPOPEN_P_LOG, tech_pvt->X11_display);
+
+			session = switch_core_session_locate(tech_pvt->session_uuid_str);
+			if (session) {
+				switch_channel_t *channel = switch_core_session_get_channel(session);
+
+
+				switch_mutex_lock(tech_pvt->flag_mutex);
+				switch_clear_flag(tech_pvt, TFLAG_IO);
+				switch_clear_flag(tech_pvt, TFLAG_VOICE);
+				if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
+					switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
+				}
+				switch_mutex_unlock(tech_pvt->flag_mutex);
+
+
+				switch_core_session_rwunlock(session);
+				WARNINGA("Closing session for %s\n", SKYPOPEN_P_LOG, interfacename);
+				switch_channel_hangup(channel, SWITCH_CAUSE_CRASH);
+			}
+
+			WARNINGA("Removing skype interface %s\n", SKYPOPEN_P_LOG, interfacename);
+			remove_interface(interfacename, TRUE);
+			return NULL;
+		}
+#endif
+#ifdef XIO_ERROR_BY_UCONTEXT
+		getcontext(&SkypopenHandles->ioerror_context);
+
+		if (skypopen_list_find(&global_handles_list, SkypopenHandles) == NULL) {
+			switch_core_session_t *session = NULL;
+			tech_pvt->interface_state = SKYPOPEN_STATE_DEAD;
+			ERRORA("Fatal display error for %s - successed to jump\n", SKYPOPEN_P_LOG, tech_pvt->X11_display);
+
+			session = switch_core_session_locate(tech_pvt->session_uuid_str);
+			if (session) {
+				switch_channel_t *channel = switch_core_session_get_channel(session);
+
+
+				switch_mutex_lock(tech_pvt->flag_mutex);
+				switch_clear_flag(tech_pvt, TFLAG_IO);
+				switch_clear_flag(tech_pvt, TFLAG_VOICE);
+				if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
+					switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
+				}
+				switch_mutex_unlock(tech_pvt->flag_mutex);
+
+
+				switch_core_session_rwunlock(session);
+				WARNINGA("Closing session for %s\n", SKYPOPEN_P_LOG, interfacename);
+				switch_channel_hangup(channel, SWITCH_CAUSE_CRASH);
+
+				//skypopen_sleep(500000);
+			}
+
+			WARNINGA("Removing skype interface %s\n", SKYPOPEN_P_LOG, interfacename);
+			//tech_pvt->skypopen_api_thread = NULL;
+			remove_interface(interfacename, TRUE);
+			//XCloseDisplay(disp);
+			return NULL;
+		}
+#endif
+	}
+#endif /* NOT WIN32 */
+
 	xfd = XConnectionNumber(disp);
 	fcntl(xfd, F_SETFD, FD_CLOEXEC);
 
@@ -1617,6 +1801,13 @@ void *skypopen_do_skypeapi_thread_func(void *obj)
 
 		if (!skypopen_send_message(tech_pvt, buf)) {
 			ERRORA("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypopen again\n", SKYPOPEN_P_LOG);
+
+			// CLOUDTREE (Thomas Hazel)
+#ifndef WIN32
+			skypopen_list_remove_by_reference(&global_handles_list, SkypopenHandles);
+#endif
+
+			XCloseDisplay(disp);
 			running = 0;
 			return NULL;
 		}
@@ -1624,6 +1815,13 @@ void *skypopen_do_skypeapi_thread_func(void *obj)
 		snprintf(buf, 512, "PROTOCOL 7");
 		if (!skypopen_send_message(tech_pvt, buf)) {
 			ERRORA("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypopen again\n", SKYPOPEN_P_LOG);
+
+			// CLOUDTREE (Thomas Hazel)
+#ifndef WIN32
+			skypopen_list_remove_by_reference(&global_handles_list, SkypopenHandles);
+#endif
+
+			XCloseDisplay(disp);
 			running = 0;
 			return NULL;
 		}
@@ -1649,97 +1847,98 @@ void *skypopen_do_skypeapi_thread_func(void *obj)
 			while (running && tech_pvt->running) {
 
 
-        FD_ZERO(&xfds);
-        FD_SET(xfd, &xfds);
+				FD_ZERO(&xfds);
+				FD_SET(xfd, &xfds);
 
-        tv.tv_usec = 100000;
-        tv.tv_sec = 0;
+				tv.tv_usec = 100000;
+				tv.tv_sec = 0;
 
 
 
-if (select(xfd+1, &xfds, 0, 0, &tv)){
+				if (select(xfd + 1, &xfds, 0, 0, &tv)) {
 
-while(XPending(disp)){
+					while (XPending(disp)) {
 
 
 
-				XNextEvent(disp, &an_event);
-				if (!(running && tech_pvt->running))
-					break;
-				switch (an_event.type) {
-				case ClientMessage:
-
-					if (an_event.xclient.format != 8) {
-						skypopen_sleep(1000);	//0.1 msec
-						break;
-					}
-
-					for (i = 0; i < 20 && an_event.xclient.data.b[i] != '\0'; ++i)
-						buf[i] = an_event.xclient.data.b[i];
-
-					buf[i] = '\0';
-
-					if (an_event.xclient.message_type == atom_begin) {
-						if (strlen(buffer)) {
-							unsigned int howmany;
-							howmany = strlen(b) + 1;
-							howmany = write(SkypopenHandles->fdesc[1], b, howmany);
-							WARNINGA
-								("A begin atom while the previous message is not closed???? value of previous message (between vertical bars) is=|||%s|||, will be lost\n",
-								 SKYPOPEN_P_LOG, buffer);
-							memset(buffer, '\0', 17000);
-						}
-						if (continue_is_broken) {
-							continue_is_broken = 0;
-							there_were_continues = 1;
-						}
-					}
-					if (an_event.xclient.message_type == atom_continue) {
-						if (!strlen(buffer)) {
-							WARNINGA
-								("Got a 'continue' XAtom without a previous 'begin'. It's value (between vertical bars) is=|||%s|||, let's store it and hope next 'begin' will be the good one\n",
-								 SKYPOPEN_P_LOG, buf);
-							strcat(continuebuffer, buf);
-							continue_is_broken = 1;
-							if (!strncmp(buf, "ognised identity", 15)) {
-								WARNINGA
-									("Got a 'continue' XAtom without a previous 'begin'. It's value (between vertical bars) is=|||%s|||. Let's introduce a 1 second delay.\n",
-									 SKYPOPEN_P_LOG, buf);
-								skypopen_sleep(1000000);	//1 sec
-							}
-							skypopen_sleep(1000);	//0.1 msec
+						XNextEvent(disp, &an_event);
+						if (!(running && tech_pvt->running))
 							break;
-						}
-					}
-					if (continue_is_broken) {
-						XFlush(disp);
-						skypopen_sleep(1000);	//0.1 msec
-						continue;
-					}
-					strcat(buffer, buf);
-					strcat(buffer, continuebuffer);
-					memset(continuebuffer, '\0', 17000);
+						switch (an_event.type) {
+						case ClientMessage:
 
-					if (i < 20 || there_were_continues) {	/* last fragment */
-						unsigned int howmany;
+							if (an_event.xclient.format != 8) {
+								//skypopen_sleep(1000);	//0.1 msec
+								break;
+							}
 
-						howmany = strlen(b) + 1;
-						howmany = write(SkypopenHandles->fdesc[1], b, howmany);
-						memset(buffer, '\0', 17000);
-						XFlush(disp);
-						there_were_continues = 0;
-					}
+							for (i = 0; i < 20 && an_event.xclient.data.b[i] != '\0'; ++i)
+								buf[i] = an_event.xclient.data.b[i];
 
-					skypopen_sleep(1000);	//0.1 msec
-					break;
-				default:
-					skypopen_sleep(1000);	//0.1 msec
-					break;
-				} //switch event.type
-			} //while XPending
+							buf[i] = '\0';
 
-} // if select
-} //while running
+							if (an_event.xclient.message_type == atom_begin) {
+								if (strlen(buffer)) {
+									unsigned int howmany;
+									howmany = strlen(b) + 1;
+									howmany = write(SkypopenHandles->fdesc[1], b, howmany);
+									WARNINGA
+										("A begin atom while the previous message is not closed???? value of previous message (between vertical bars) is=|||%s|||, will be lost\n",
+										 SKYPOPEN_P_LOG, buffer);
+									memset(buffer, '\0', 17000);
+								}
+								if (continue_is_broken) {
+									continue_is_broken = 0;
+									there_were_continues = 1;
+								}
+							}
+							if (an_event.xclient.message_type == atom_continue) {
+								if (!strlen(buffer)) {
+									WARNINGA
+										("Got a 'continue' XAtom without a previous 'begin'. It's value (between vertical bars) is=|||%s|||, let's store it and hope next 'begin' will be the good one\n",
+										 SKYPOPEN_P_LOG, buf);
+									strcat(continuebuffer, buf);
+									continue_is_broken = 1;
+									if (!strncmp(buf, "ognised identity", 15)) {
+										WARNINGA
+											("Got a 'continue' XAtom without a previous 'begin'. It's value (between vertical bars) is=|||%s|||. Let's introduce a 1 second delay.\n",
+											 SKYPOPEN_P_LOG, buf);
+										skypopen_sleep(1000000);	//1 sec
+									}
+									skypopen_sleep(1000);	//0.1 msec
+									break;
+								}
+							}
+							if (continue_is_broken) {
+								XFlush(disp);
+								skypopen_sleep(1000);	//0.1 msec
+								continue;
+							}
+							strcat(buffer, buf);
+							strcat(buffer, continuebuffer);
+							memset(continuebuffer, '\0', 17000);
+
+							if (i < 20 || there_were_continues) {	/* last fragment */
+								unsigned int howmany;
+
+								howmany = strlen(b) + 1;
+								howmany = write(SkypopenHandles->fdesc[1], b, howmany);
+								memset(buffer, '\0', 17000);
+								//XFlush(disp);
+								there_were_continues = 0;
+							}
+
+							//skypopen_sleep(1000);	//0.1 msec
+							break;
+						default:
+							//skypopen_sleep(1000);	//0.1 msec
+							break;
+						}		//switch event.type
+					}			//while XPending
+					XFlush(disp);
+
+				}				// if select
+			}					//while running
 
 
 
@@ -1750,14 +1949,21 @@ while(XPending(disp)){
 		ERRORA("Skype is not running, maybe crashed. Please run/restart Skype and relaunch Skypopen\n", SKYPOPEN_P_LOG);
 		running = 0;
 	}
-	tech_pvt->skypopen_api_thread=NULL;
-	NOTICA("EXITING\n", SKYPOPEN_P_LOG);
+
+	DEBUGA_SKYPE("EXITING\n", SKYPOPEN_P_LOG);
+
+	// CLOUDTREE (Thomas Hazel)
+#ifndef WIN32
+	skypopen_list_remove_by_reference(&global_handles_list, SkypopenHandles);
+#endif
+
+	tech_pvt->skypopen_api_thread = NULL;
 	return NULL;
 
 }
 #endif // WIN32
 
-int inbound_channel_answered(private_t * tech_pvt)
+int inbound_channel_answered(private_t *tech_pvt)
 {
 	int res = 0;
 	switch_core_session_t *session = NULL;
@@ -1768,7 +1974,9 @@ int inbound_channel_answered(private_t * tech_pvt)
 		channel = switch_core_session_get_channel(session);
 
 		if (channel) {
+			switch_mutex_lock(tech_pvt->flag_mutex);
 			switch_set_flag(tech_pvt, TFLAG_IO);
+			switch_mutex_unlock(tech_pvt->flag_mutex);
 		} else {
 			ERRORA("no channel\n", SKYPOPEN_P_LOG);
 		}
@@ -1781,36 +1989,40 @@ int inbound_channel_answered(private_t * tech_pvt)
 }
 
 
-int skypopen_answered(private_t * tech_pvt)
+int skypopen_answered(private_t *tech_pvt)
 {
 
-	int res = 0;
+	int res = SWITCH_STATUS_SUCCESS;
 	switch_core_session_t *session = NULL;
 	switch_channel_t *channel = NULL;
 
-	 //WARNINGA("ANSWERED tech_pvt->skype_call_id=%s, tech_pvt->skype_callflow=%d, tech_pvt->interface_state=%d, tech_pvt->skype_user=%s, tech_pvt->callid_number=%s, tech_pvt->ring_value=%s, tech_pvt->ring_id=%s, tech_pvt->answer_value=%s, tech_pvt->answer_id=%s\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id, tech_pvt->skype_callflow, tech_pvt->interface_state, tech_pvt->skype_user, tech_pvt->callid_number, tech_pvt->ring_value, tech_pvt->ring_id, tech_pvt->answer_value, tech_pvt->answer_id);
+	if (strlen(tech_pvt->session_uuid_str)) {
+		session = switch_core_session_locate(tech_pvt->session_uuid_str);
+		if (session) {
+			channel = switch_core_session_get_channel(session);
 
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	if (session) {
-		channel = switch_core_session_get_channel(session);
+			if (channel) {
+				if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+					tech_pvt->interface_state = SKYPOPEN_STATE_UP;
+					DEBUGA_SKYPE("Outbound Channel Answered! session_uuid_str=%s\n", SKYPOPEN_P_LOG, tech_pvt->session_uuid_str);
+					outbound_channel_answered(tech_pvt);
+				} else {
+					DEBUGA_SKYPE("answered Inbound Channel!\n\n\n\n", SKYPOPEN_P_LOG);
+					inbound_channel_answered(tech_pvt);
+				}
 
-		if (channel) {
-			if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
-				tech_pvt->interface_state = SKYPOPEN_STATE_UP;
-				DEBUGA_SKYPE("Outbound Channel Answered! session_uuid_str=%s\n", SKYPOPEN_P_LOG, tech_pvt->session_uuid_str);
-				outbound_channel_answered(tech_pvt);
 			} else {
-				DEBUGA_SKYPE("answered Inbound Channel!\n\n\n\n", SKYPOPEN_P_LOG);
-				inbound_channel_answered(tech_pvt);
+				ERRORA("no channel after INPROGRESS?\n", SKYPOPEN_P_LOG);
+				return SWITCH_STATUS_FALSE;
 			}
-
+			switch_core_session_rwunlock(session);
 		} else {
-			ERRORA("no channel\n", SKYPOPEN_P_LOG);
+			WARNINGA("no session after INPROGRESS, let's hangup\n", SKYPOPEN_P_LOG);
+			return SWITCH_STATUS_FALSE;
 		}
-		switch_core_session_rwunlock(session);
 	} else {
-		ERRORA("no session\n", SKYPOPEN_P_LOG);
-
+		WARNINGA("no tech_pvt->session_uuid_str after INPROGRESS, let's hangup\n", SKYPOPEN_P_LOG);
+		return SWITCH_STATUS_FALSE;
 	}
 	return res;
 }
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 36954d2904..3c8404dd6b 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -80,6 +80,9 @@ static switch_status_t sofia_on_init(switch_core_session_t *session)
 	tech_pvt->read_frame.buflen = SWITCH_RTP_MAX_BUF_LEN;
 	switch_mutex_lock(tech_pvt->sofia_mutex);
 
+
+	sofia_glue_check_dtmf_type(tech_pvt);
+
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s SOFIA INIT\n", switch_channel_get_name(channel));
 	if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) {
 		sofia_glue_tech_absorb_sdp(tech_pvt);
@@ -1031,13 +1034,10 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
 
 									if (codec_ms != tech_pvt->codec_ms) {
 										switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
-														  "We were told to use ptime %d but what they meant to say was %d\n"
-														  "This issue has so far been identified to happen on the following broken platforms/devices:\n"
-														  "Linksys/Sipura aka Cisco\n"
-														  "ShoreTel\n"
-														  "Sonus/L3\n"
-														  "We will try to fix it but some of the devices on this list are so broken,\n"
-														  "who knows what will happen..\n", (int) tech_pvt->codec_ms, (int) codec_ms);
+														  "Asynchronous PTIME not supported, changing our end from %d to %d\n",
+														  (int) tech_pvt->codec_ms,
+														  (int) codec_ms
+														  );
 
 										switch_channel_set_variable_printf(channel, "sip_h_X-Broken-PTIME", "Adv=%d;Sent=%d",
 																		   (int) tech_pvt->codec_ms, (int) codec_ms);
@@ -2208,6 +2208,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 									SIPTAG_CONTACT_STR(tech_pvt->reply_contact),
 									SOATAG_REUSE_REJECTED(1),
 									SOATAG_ORDERED_USER(1),
+									SOATAG_RTP_SELECT(1),
 									SOATAG_ADDRESS(tech_pvt->adv_sdp_audio_ip),
 									SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"),
 									TAG_IF(call_info, SIPTAG_CALL_INFO_STR(call_info)),
@@ -2293,11 +2294,14 @@ static const char *sofia_state_names[] = {
 	"FAIL_WAIT",
 	"EXPIRED",
 	"NOREG",
+	"TIMEOUT",
 	NULL
 };
 
 const char *sofia_state_string(int state)
 {
+	if (state >= REG_STATE_LAST) return "";
+
 	return sofia_state_names[state];
 }
 
@@ -2442,8 +2446,8 @@ static switch_status_t cmd_status(char **argv, int argc, switch_stream_handle_t
 
 							if (gp->state == REG_STATE_FAILED || gp->state == REG_STATE_TRYING) {
 								time_t now = switch_epoch_time_now(NULL);
-								if (gp->retry > now) {
-									stream->write_function(stream, " (retry: %ds)", gp->retry - now);
+								if (gp->reg_timeout > now) {
+									stream->write_function(stream, " (retry: %ds)", gp->reg_timeout - now);
 								} else {
 									stream->write_function(stream, " (retry: NEVER)");
 								}
@@ -4092,8 +4096,9 @@ static int notify_callback(void *pArg, int argc, char **argv, char **columnNames
 	char *es = argv[5];
 	char *body = argv[6];
 	char *id = NULL;
-	char *p, *contact;
-
+	char *contact;
+	sofia_destination_t *dst = NULL;
+	char *route_uri = NULL;
 
 	if (profile_name && strcasecmp(profile_name, profile->name)) {
 		if ((ext_profile = sofia_glue_find_profile(profile_name))) {
@@ -4105,16 +4110,24 @@ static int notify_callback(void *pArg, int argc, char **argv, char **columnNames
 	switch_assert(id);
 	contact = sofia_glue_get_url_from_contact(contact_in, 1);
 
-	if ((p = strstr(contact, ";fs_"))) {
-		*p = '\0';
+
+	dst = sofia_glue_get_destination((char *) contact);
+	
+	if (dst->route_uri) {
+		route_uri = sofia_glue_strip_uri(dst->route_uri);
 	}
 
-	nh = nua_handle(profile->nua, NULL, NUTAG_URL(contact), SIPTAG_FROM_STR(id), SIPTAG_TO_STR(id), SIPTAG_CONTACT_STR(profile->url), TAG_END());
-
+	nh = nua_handle(profile->nua, NULL, NUTAG_URL(dst->contact), SIPTAG_FROM_STR(id), SIPTAG_TO_STR(id), SIPTAG_CONTACT_STR(profile->url), TAG_END());
+	
 	nua_handle_bind(nh, &mod_sofia_globals.destroy_private);
 
-	nua_notify(nh, NUTAG_NEWSUB(1), SIPTAG_EVENT_STR(es), SIPTAG_CONTENT_TYPE_STR(ct), TAG_IF(!zstr(body), SIPTAG_PAYLOAD_STR(body)), TAG_END());
+	nua_notify(nh, NUTAG_NEWSUB(1), 
+			   TAG_IF(dst->route_uri, NUTAG_PROXY(route_uri)), TAG_IF(dst->route, SIPTAG_ROUTE_STR(dst->route)),
+			   SIPTAG_EVENT_STR(es), SIPTAG_CONTENT_TYPE_STR(ct), TAG_IF(!zstr(body), SIPTAG_PAYLOAD_STR(body)), TAG_END());
+	
 
+	switch_safe_free(route_uri);
+	sofia_glue_free_destination(dst);
 
 	free(id);
 	free(contact);
@@ -4175,21 +4188,37 @@ static void general_event_handler(switch_event_t *event)
 
 
 				if (to_uri && from_uri && ct && es && profile_name && (profile = sofia_glue_find_profile(profile_name))) {
-					nua_handle_t *nh = nua_handle(profile->nua,
-												  NULL,
-												  NUTAG_URL(to_uri),
-												  SIPTAG_FROM_STR(from_uri),
-												  SIPTAG_TO_STR(to_uri),
-												  SIPTAG_CONTACT_STR(profile->url),
-												  TAG_END());
+					sofia_destination_t *dst = NULL;
+					nua_handle_t *nh;
+					char *route_uri = NULL;
+
+					dst = sofia_glue_get_destination((char *) to_uri);
+					
+					if (dst->route_uri) {
+						route_uri = sofia_glue_strip_uri(dst->route_uri);
+					}
+					
+					
+					nh = nua_handle(profile->nua,
+									NULL,
+									NUTAG_URL(to_uri), 
+									SIPTAG_FROM_STR(from_uri),
+									SIPTAG_TO_STR(to_uri),
+									SIPTAG_CONTACT_STR(profile->url),
+									TAG_END());
 
 					nua_handle_bind(nh, &mod_sofia_globals.destroy_private);
-
+					
 					nua_notify(nh,
 							   NUTAG_NEWSUB(1),
 							   NUTAG_WITH_THIS(profile->nua),
+							   TAG_IF(dst->route_uri, NUTAG_PROXY(dst->contact)), TAG_IF(dst->route, SIPTAG_ROUTE_STR(dst->route)),
 							   SIPTAG_EVENT_STR(es), TAG_IF(ct, SIPTAG_CONTENT_TYPE_STR(ct)), TAG_IF(!zstr(body), SIPTAG_PAYLOAD_STR(body)), TAG_END());
+					
 
+					switch_safe_free(route_uri);
+					sofia_glue_free_destination(dst);
+					
 					sofia_glue_release_profile(profile);
 				}
 
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index cf4b9a3759..6978e34ffc 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -76,6 +76,8 @@ typedef struct private_object private_object_t;
 
 #define SOFIA_SESSION_TIMEOUT "sofia_session_timeout"
 #define MY_EVENT_REGISTER "sofia::register"
+#define MY_EVENT_PRE_REGISTER "sofia::pre_register"
+#define MY_EVENT_REGISTER_ATTEMPT "sofia::register_attempt"
 #define MY_EVENT_UNREGISTER "sofia::unregister"
 #define MY_EVENT_EXPIRE "sofia::expire"
 #define MY_EVENT_GATEWAY_STATE "sofia::gateway_state"
@@ -221,6 +223,7 @@ typedef enum {
 	PFLAG_CID_IN_1XX,
 	PFLAG_IN_DIALOG_CHAT,
 	PFLAG_DEL_SUBS_ON_REG,
+	PFLAG_IGNORE_183NOSDP,
 	/* No new flags below this line */
 	PFLAG_MAX
 } PFLAGS;
@@ -340,6 +343,7 @@ typedef enum {
 	REG_STATE_FAIL_WAIT,
 	REG_STATE_EXPIRED,
 	REG_STATE_NOREG,
+	REG_STATE_TIMEOUT,
 	REG_STATE_LAST
 } reg_state_t;
 
@@ -410,6 +414,7 @@ struct sofia_gateway {
 	time_t expires;
 	time_t retry;
 	time_t ping;
+	time_t reg_timeout;
 	int pinging;
 	sofia_gateway_status_t status;
 	uint32_t ping_freq;
@@ -418,6 +423,7 @@ struct sofia_gateway {
 	int ping_min;
 	uint8_t flags[REG_FLAG_MAX];
 	int32_t retry_seconds;
+	int32_t reg_timeout_seconds;
 	int32_t failure_status;
 	reg_state_t state;
 	switch_memory_pool_t *pool;
@@ -548,6 +554,7 @@ struct sofia_profile {
 	sofia_presence_type_t pres_type;
 	sofia_media_options_t media_options;
 	uint32_t force_subscription_expires;
+	uint32_t force_publish_expires;
 	char *user_agent_filter;
 	uint32_t max_registrations_perext;
 	switch_rtp_bug_flag_t auto_rtp_bugs;
@@ -705,6 +712,8 @@ struct private_object {
 	char *user_via;
 	char *redirected;
 	sofia_cid_type_t cid_type;
+	switch_payload_t payload_space;
+	switch_payload_t ianacodes[SWITCH_MAX_CODECS];
 };
 
 struct callback_t {
@@ -1025,3 +1034,4 @@ void sofia_glue_global_watchdog(switch_bool_t on);
 void sofia_glue_proxy_codec(switch_core_session_t *session, const char *r_sdp);
 switch_status_t sofia_glue_sdp_map(const char *r_sdp, switch_event_t **fmtp, switch_event_t **pt);
 void sofia_glue_build_vid_refresh_message(switch_core_session_t *session, const char *pl);
+void sofia_glue_check_dtmf_type(private_object_t *tech_pvt);
diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 0d69bdb4bb..7cb4c5b528 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -1874,6 +1874,7 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag)
 				*context = profile->context,
 				*expire_seconds = "3600",
 				*retry_seconds = "30",
+				*timeout_seconds = "60",
 				*from_user = "", *from_domain = NULL, *outbound_proxy = NULL, *register_proxy = NULL, *contact_host = NULL,
 				*contact_params = NULL, *params = NULL, *register_transport = NULL;
 
@@ -1982,6 +1983,8 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag)
 					expire_seconds = val;
 				} else if (!strcmp(var, "retry-seconds")) {
 					retry_seconds = val;
+				} else if (!strcmp(var, "timeout-seconds")) {
+					timeout_seconds = val;
 				} else if (!strcmp(var, "retry_seconds")) {	// support typo for back compat
 					retry_seconds = val;
 				} else if (!strcmp(var, "from-user")) {
@@ -2081,13 +2084,22 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag)
 			}
 
 			gateway->retry_seconds = atoi(retry_seconds);
-
+			
 			if (gateway->retry_seconds < 5) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid retry-seconds of %d on gateway %s, using the value of 30 instead.\n",
 								  gateway->retry_seconds, name);
 				gateway->retry_seconds = 30;
 			}
 
+			gateway->reg_timeout_seconds = atoi(timeout_seconds);
+
+			if (gateway->reg_timeout_seconds < 5) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid timeout-seconds of %d on gateway %s, using the value of 60 instead.\n",
+								  gateway->reg_timeout_seconds, name);
+				gateway->reg_timeout_seconds = 60;
+			}
+
+
 			gateway->register_scheme = switch_core_strdup(gateway->pool, scheme);
 			gateway->register_context = switch_core_strdup(gateway->pool, context);
 			gateway->register_realm = switch_core_strdup(gateway->pool, realm);
@@ -2393,6 +2405,12 @@ switch_status_t reconfig_sofia(sofia_profile_t *profile)
 						} else {
 							sofia_clear_pflag(profile, PFLAG_T38_PASSTHRU);
 						}
+					} else if (!strcasecmp(var, "ignore-183nosdp")) {
+						if (switch_true(val)) {
+							sofia_set_pflag(profile, PFLAG_IGNORE_183NOSDP);
+						} else {
+							sofia_clear_pflag(profile, PFLAG_IGNORE_183NOSDP);
+						}
 					} else if (!strcasecmp(var, "cid-in-1xx")) {
 						if (switch_true(val)) {
 							sofia_set_pflag(profile, PFLAG_CID_IN_1XX);
@@ -2408,7 +2426,9 @@ switch_status_t reconfig_sofia(sofia_profile_t *profile)
 							profile->dtmf_type = DTMF_NONE;
 						}
 					} else if (!strcasecmp(var, "NDLB-force-rport")) {
-						if (switch_true(val)) {
+						if (val && !strcasecmp(val, "safe")) {
+							profile->rport_level = 3;
+						} else if (switch_true(val)) {
 							profile->rport_level = 2;
 						}
 					} else if (!strcasecmp(var, "caller-id-type")) {
@@ -2428,6 +2448,11 @@ switch_status_t reconfig_sofia(sofia_profile_t *profile)
 						if (tmp > 0) {
 							profile->force_subscription_expires = tmp;
 						}
+					} else if (!strcasecmp(var, "force-publish-expires")) {
+						int tmp = atoi(val);
+						if (tmp > 0) {
+							profile->force_publish_expires = tmp;
+						}
 					} else if (!strcasecmp(var, "inbound-late-negotiation")) {
 						if (switch_true(val)) {
 							sofia_set_flag(profile, TFLAG_LATE_NEGOTIATION);
@@ -3045,6 +3070,12 @@ switch_status_t config_sofia(int reload, char *profile_name)
 						} else {
 							sofia_clear_pflag(profile, PFLAG_T38_PASSTHRU);
 						}
+					} else if (!strcasecmp(var, "ignore-183nosdp")) {
+						if (switch_true(val)) {
+							sofia_set_pflag(profile, PFLAG_IGNORE_183NOSDP);
+						} else {
+							sofia_clear_pflag(profile, PFLAG_IGNORE_183NOSDP);
+						}
 					} else if (!strcasecmp(var, "cid-in-1xx")) {
 						if (switch_true(val)) {
 							sofia_set_pflag(profile, PFLAG_CID_IN_1XX);
@@ -3066,7 +3097,9 @@ switch_status_t config_sofia(int reload, char *profile_name)
 							profile->dtmf_type = DTMF_NONE;
 						}
 					} else if (!strcasecmp(var, "NDLB-force-rport")) {
-						if (switch_true(val)) {
+						if (val && !strcasecmp(val, "safe")) {
+							profile->rport_level = 3;
+						} else if (switch_true(val)) {
 							profile->rport_level = 2;
 						}
 					} else if (!strcasecmp(var, "auto-rtp-bugs")) {
@@ -3104,6 +3137,11 @@ switch_status_t config_sofia(int reload, char *profile_name)
 						if (tmp > 0) {
 							profile->force_subscription_expires = tmp;
 						}
+					} else if (!strcasecmp(var, "force-publish-expires")) {
+						int tmp = atoi(val);
+						if (tmp > 0) {
+							profile->force_publish_expires = tmp;
+						}
 					} else if (!strcasecmp(var, "send-message-query-on-register")) {
 						if (switch_true(val)) {
 							sofia_set_pflag(profile, PFLAG_MESSAGE_QUERY_ON_REGISTER);
@@ -3406,7 +3444,7 @@ switch_status_t config_sofia(int reload, char *profile_name)
 						} else {
 							sofia_clear_pflag(profile, PFLAG_NAT_OPTIONS_PING);
 						}
-					} else if (!strcasecmp(var, "all-options-ping")) {
+ } else if (!strcasecmp(var, "all-reg-options-ping")) { 
 						if (switch_true(val)) {
 							sofia_set_pflag(profile, PFLAG_ALL_REG_OPTIONS_PING);
 						} else {
@@ -4587,6 +4625,10 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 	}
 
 	if (status == 183 && !r_sdp) {
+		if ((channel && switch_true(switch_channel_get_variable(channel, "sip_ignore_183nosdp"))) || sofia_test_pflag(profile, PFLAG_IGNORE_183NOSDP)) {
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Ignoring 183 w/o sdp\n", switch_channel_get_name(channel));
+			goto done;
+		}
 		status = 180;
 	}
 
@@ -4658,7 +4700,9 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 					if (!switch_channel_get_variable(other_channel, SWITCH_B_SDP_VARIABLE)) {
 						switch_channel_set_variable(other_channel, SWITCH_B_SDP_VARIABLE, r_sdp);
 					}
+					switch_mutex_unlock(tech_pvt->sofia_mutex);
 					switch_channel_pre_answer(other_channel);
+					switch_mutex_lock(tech_pvt->sofia_mutex);
 					switch_core_session_rwunlock(other_session);
 				}
 				goto done;
@@ -5086,7 +5130,9 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 					if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))
 						&& (other_session = switch_core_session_locate(uuid))) {
 						other_channel = switch_core_session_get_channel(other_session);
+						switch_mutex_unlock(tech_pvt->sofia_mutex);
 						switch_channel_answer(other_channel);
+						switch_mutex_lock(tech_pvt->sofia_mutex);
 						switch_core_session_rwunlock(other_session);
 					}
 				}
@@ -5115,7 +5161,9 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 						if (!switch_channel_get_variable(other_channel, SWITCH_B_SDP_VARIABLE)) {
 							switch_channel_set_variable(other_channel, SWITCH_B_SDP_VARIABLE, r_sdp);
 						}
+						switch_mutex_unlock(tech_pvt->sofia_mutex);
 						switch_channel_answer(other_channel);
+						switch_mutex_lock(tech_pvt->sofia_mutex);
 						switch_core_session_rwunlock(other_session);
 					}
 					goto done;
diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index cb8b257e58..fbd270d41b 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -185,6 +185,175 @@ void sofia_glue_set_image_sdp(private_object_t *tech_pvt, switch_t38_options_t *
 
 }
 
+static void generate_m(private_object_t *tech_pvt, char *buf, size_t buflen, 
+					   switch_port_t port,
+					   int cur_ptime, const char *append_audio, const char *sr, int use_cng, int cng_type, switch_event_t *map)
+{
+	int i = 0;
+	int rate;
+	int already_did[128] = { 0 };
+	int ptime = 0, noptime = 0;
+	
+	switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "m=audio %d RTP/%sAVP", 
+					port, (!zstr(tech_pvt->local_crypto_key) && sofia_test_flag(tech_pvt, TFLAG_SECURE)) ? "S" : "");
+				
+	
+
+	for (i = 0; i < tech_pvt->num_codecs; i++) {
+		const switch_codec_implementation_t *imp = tech_pvt->codecs[i];
+	
+		if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO) {
+			continue;
+		}
+
+		if (!noptime) {
+			if (!cur_ptime) {
+				if (ptime) {
+					if (ptime != imp->microseconds_per_packet / 1000) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
+										  "Codec %s payload %d added to sdp wanting ptime %d but it's already %d (%s:%d:%d), disabling ptime.\n", 
+										  imp->iananame,
+										  tech_pvt->ianacodes[i],
+										  imp->microseconds_per_packet / 1000,
+										  ptime,
+										  tech_pvt->codecs[0]->iananame,
+										  tech_pvt->codecs[0]->ianacode,
+										  ptime);
+						ptime = 0;
+						noptime = 1;
+					}
+				} else {
+					ptime = imp->microseconds_per_packet / 1000;
+				}
+			} else {
+				if ((imp->microseconds_per_packet / 1000) != cur_ptime) {
+					continue;
+				}
+			}
+		}
+
+		if (tech_pvt->ianacodes[i] < 128) {
+			if (already_did[tech_pvt->ianacodes[i]]) {
+				continue;
+			}
+
+			already_did[tech_pvt->ianacodes[i]] = 1;
+		}
+
+		
+		switch_snprintf(buf + strlen(buf), buflen - strlen(buf), " %d", tech_pvt->ianacodes[i]);
+	}
+
+	if (tech_pvt->dtmf_type == DTMF_2833 && tech_pvt->te > 95) {
+		switch_snprintf(buf + strlen(buf), buflen - strlen(buf), " %d", tech_pvt->te);
+	}
+		
+	if (!sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG) && cng_type && use_cng) {
+		switch_snprintf(buf + strlen(buf), buflen - strlen(buf), " %d", cng_type);
+	}
+		
+	switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "\n");
+
+
+	memset(already_did, 0, sizeof(already_did));
+		
+	for (i = 0; i < tech_pvt->num_codecs; i++) {
+		const switch_codec_implementation_t *imp = tech_pvt->codecs[i];
+		char *fmtp = imp->fmtp;
+			
+		if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO) {
+			continue;
+		}
+
+		if (!noptime) {
+			if (!cur_ptime) {
+				if (!ptime) {
+					ptime = imp->microseconds_per_packet / 1000;
+				}
+			} else {
+				if ((imp->microseconds_per_packet / 1000) != cur_ptime) {
+					continue;
+				}
+			}
+		}
+		
+		if (tech_pvt->ianacodes[i] < 128) {
+			if (already_did[tech_pvt->ianacodes[i]]) {
+				continue;
+			}
+			
+			already_did[tech_pvt->ianacodes[i]] = 1;
+		}
+
+		
+		rate = imp->samples_per_second;
+
+		if (map) {
+			char key[128] = "";
+			char *check = NULL;
+			switch_snprintf(key, sizeof(key), "%s:%u", imp->iananame, imp->bits_per_second);
+
+			if ((check = switch_event_get_header(map, key)) || (check = switch_event_get_header(map, imp->iananame))) {
+				fmtp = check;
+			}
+		}
+		
+		if (tech_pvt->ianacodes[i] > 95) {
+			switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "a=rtpmap:%d %s/%d\n", tech_pvt->ianacodes[i], imp->iananame, rate);
+		}
+
+		if (fmtp) {
+			switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->ianacodes[i], fmtp);
+		}
+	}
+
+
+	if (tech_pvt->dtmf_type == DTMF_2833 && tech_pvt->te > 95) {
+		switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "a=rtpmap:%d telephone-event/8000\na=fmtp:%d 0-16\n", tech_pvt->te, tech_pvt->te);
+	}
+
+	if (!cng_type) {
+		//switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "a=rtpmap:%d CN/8000\n", cng_type);
+		//} else {
+		switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "a=silenceSupp:off - - - -\n");
+	}
+
+	if (append_audio) {
+		switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "%s%s", append_audio, end_of(append_audio) == '\n' ? "" : "\n");
+	}
+
+	if (!cur_ptime) {
+		cur_ptime = ptime;
+	}
+	
+	if (!noptime && cur_ptime) {
+		switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "a=ptime:%d\n", cur_ptime);
+	}
+
+	if (sr) {
+		switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "a=%s\n", sr);
+	}
+
+}
+
+void sofia_glue_check_dtmf_type(private_object_t *tech_pvt) 
+{
+	const char *val;
+
+	if ((val = switch_channel_get_variable(tech_pvt->channel, "dtmf_type"))) {
+		if (!strcasecmp(val, "rfc2833")) {
+			tech_pvt->dtmf_type = DTMF_2833;
+		} else if (!strcasecmp(val, "info")) {
+			tech_pvt->dtmf_type = DTMF_INFO;
+		} else if (!strcasecmp(val, "none")) {
+			tech_pvt->dtmf_type = DTMF_NONE;
+		} else {
+			tech_pvt->dtmf_type = tech_pvt->profile->dtmf_type;
+		}
+	}
+}
+
+
 void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32_t port, const char *sr, int force)
 {
 	char buf[2048];
@@ -205,10 +374,23 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
 	switch_event_t *map = NULL, *ptmap = NULL;
 	const char *b_sdp = NULL;
 
-	if (!tech_pvt->rm_encoding && (b_sdp = switch_channel_get_variable(tech_pvt->channel, SWITCH_B_SDP_VARIABLE))) {
-		sofia_glue_sdp_map(b_sdp, &map, &ptmap);
-	}
+	sofia_glue_check_dtmf_type(tech_pvt);
 
+	if (!tech_pvt->payload_space) {
+		int i;
+
+		tech_pvt->payload_space = 98;
+
+		for (i = 0; i < tech_pvt->num_codecs; i++) {
+			const switch_codec_implementation_t *imp = tech_pvt->codecs[i];
+
+			tech_pvt->ianacodes[i] = imp->ianacode;
+			
+			if (tech_pvt->ianacodes[i] > 64) {
+				tech_pvt->ianacodes[i] = tech_pvt->payload_space++;
+			}
+		}
+	}
 
 	if (fmtp_out_var) {
 		fmtp_out = fmtp_out_var;
@@ -248,6 +430,10 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
 		return;
 	}
 
+	if (!tech_pvt->rm_encoding && (b_sdp = switch_channel_get_variable(tech_pvt->channel, SWITCH_B_SDP_VARIABLE))) {
+		sofia_glue_sdp_map(b_sdp, &map, &ptmap);
+	}
+
 	if (!sr) {
 		if ((var_val = switch_channel_get_variable(tech_pvt->channel, "media_audio_mode"))) {
 			sr = var_val;
@@ -278,155 +464,100 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
 					"o=%s %010u %010u IN %s %s\n"
 					"s=%s\n"
 					"c=IN %s %s\n" "t=0 0\n"
-					"%sm=audio %d RTP/%sAVP",
-					username, tech_pvt->owner_id, tech_pvt->session_id, family, ip, username, family, ip, srbuf, port, (!zstr(tech_pvt->local_crypto_key)
-																														&& sofia_test_flag(tech_pvt,
-																																		   TFLAG_SECURE)) ?
-					"S" : "");
+					"%s",
+					username, tech_pvt->owner_id, tech_pvt->session_id, family, ip, username, family, ip, srbuf);
 
 	if (tech_pvt->rm_encoding) {
+		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "m=audio %d RTP/%sAVP", 
+						port, (!zstr(tech_pvt->local_crypto_key) && sofia_test_flag(tech_pvt, TFLAG_SECURE)) ? "S" : "");
+
 		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->pt);
-	} else if (tech_pvt->num_codecs) {
-		int i;
-		int already_did[128] = { 0 };
-		for (i = 0; i < tech_pvt->num_codecs; i++) {
-			const switch_codec_implementation_t *imp = tech_pvt->codecs[i];
 
-			if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO) {
-				continue;
-			}
-
-			if (imp->ianacode < 128) {
-				if (already_did[imp->ianacode]) {
-					continue;
-				}
-
-				already_did[imp->ianacode] = 1;
-			}
-
-			switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode);
-			if (!ptime) {
-				ptime = imp->microseconds_per_packet / 1000;
-			}
+		if (tech_pvt->dtmf_type == DTMF_2833 && tech_pvt->te > 95) {
+			switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->te);
 		}
-	}
+		
+		if (!sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG) && tech_pvt->cng_pt && use_cng) {
+			switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->cng_pt);
+		}
+		
+		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "\n");
 
-	if (tech_pvt->dtmf_type == DTMF_2833 && tech_pvt->te > 95) {
-		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->te);
-	}
-
-	if (!sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG) && tech_pvt->cng_pt && use_cng) {
-		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->cng_pt);
-	}
-
-	switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "\n");
-
-
-	if (tech_pvt->rm_encoding) {
 		rate = tech_pvt->rm_rate;
 		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", tech_pvt->agreed_pt, tech_pvt->rm_encoding, rate);
 		if (fmtp_out) {
 			switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->agreed_pt, fmtp_out);
 		}
+
 		if (tech_pvt->read_codec.implementation && !ptime) {
 			ptime = tech_pvt->read_codec.implementation->microseconds_per_packet / 1000;
 		}
 
+		
+		if (tech_pvt->dtmf_type == DTMF_2833 && tech_pvt->te > 95) {
+			switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d telephone-event/8000\na=fmtp:%d 0-16\n", tech_pvt->te, tech_pvt->te);
+		}
+		if (!sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG) && tech_pvt->cng_pt && use_cng) {
+			switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/8000\n", tech_pvt->cng_pt);
+			if (!tech_pvt->rm_encoding) {
+				tech_pvt->cng_pt = 0;
+			}
+		} else {
+			switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=silenceSupp:off - - - -\n");
+		}
+
+		if (append_audio) {
+			switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s%s", append_audio, end_of(append_audio) == '\n' ? "" : "\n");
+		}
+
+		if (ptime) {
+			switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime);
+		}
+
+		if (sr) {
+			switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=%s\n", sr);
+		}
+		
+
 	} else if (tech_pvt->num_codecs) {
 		int i;
-		int already_did[128] = { 0 };
-		for (i = 0; i < tech_pvt->num_codecs; i++) {
-			const switch_codec_implementation_t *imp = tech_pvt->codecs[i];
-			char *fmtp = imp->fmtp;
-			
-			if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO) {
-				continue;
-			}
+		int cur_ptime = 0, this_ptime = 0, cng_type = 0;
 
-			if (imp->ianacode < 128) {
-				if (already_did[imp->ianacode]) {
-					continue;
-				}
 
-				already_did[imp->ianacode] = 1;
-			}
+		if (!sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG) && tech_pvt->cng_pt && use_cng) {
+			cng_type = tech_pvt->cng_pt;
 
-			rate = imp->samples_per_second;
-
-			if (map) {
-				char key[128] = "";
-				char *check = NULL;
-				switch_snprintf(key, sizeof(key), "%s:%u", imp->iananame, imp->bits_per_second);
-
-				if ((check = switch_event_get_header(map, key)) || (check = switch_event_get_header(map, imp->iananame))) {
-					fmtp = check;
-				}
-			}
-			
-			switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, rate);
-
-			if (fmtp) {
-				switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, fmtp);
+			if (!tech_pvt->rm_encoding) {
+				tech_pvt->cng_pt = 0;
 			}
 		}
-	}
 
-	if (tech_pvt->dtmf_type == DTMF_2833 && tech_pvt->te > 95) {
-		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d telephone-event/8000\na=fmtp:%d 0-16\n", tech_pvt->te, tech_pvt->te);
-	}
-	if (!sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG) && tech_pvt->cng_pt && use_cng) {
-		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/8000\n", tech_pvt->cng_pt);
-		if (!tech_pvt->rm_encoding) {
-			tech_pvt->cng_pt = 0;
-		}
-	} else {
-		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=silenceSupp:off - - - -\n");
-	}
+		if (!switch_true(switch_channel_get_variable(tech_pvt->channel, "sdp_m_per_ptime"))) {
+			generate_m(tech_pvt, buf, sizeof(buf), port, 0, append_audio, sr, use_cng, cng_type, map);
+		} else {
 
-	if (append_audio) {
-		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s%s", append_audio, end_of(append_audio) == '\n' ? "" : "\n");
-	}
-
-	if (ptime) {
-		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime);
-	}
-
-	if (sr) {
-		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=%s\n", sr);
-	}
-
-	if (!zstr(tech_pvt->local_crypto_key) && sofia_test_flag(tech_pvt, TFLAG_SECURE)) {
-		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=crypto:%s\n", tech_pvt->local_crypto_key);
-		//switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=encryption:optional\n");
-#if 0
-		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "m=audio %d RTP/AVP", port);
-
-		if (tech_pvt->rm_encoding) {
-			switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->pt);
-		} else if (tech_pvt->num_codecs) {
-			int i;
-			int already_did[128] = { 0 };
 			for (i = 0; i < tech_pvt->num_codecs; i++) {
 				const switch_codec_implementation_t *imp = tech_pvt->codecs[i];
-
+				
 				if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO) {
 					continue;
 				}
-
-				if (imp->ianacode < 128) {
-					if (already_did[imp->ianacode]) {
-						continue;
-					}
-
-					already_did[imp->ianacode] = 1;
+				
+				this_ptime = imp->microseconds_per_packet / 1000;
+				
+				if (cur_ptime != this_ptime) {
+					cur_ptime = this_ptime;
+					generate_m(tech_pvt, buf, sizeof(buf), port, cur_ptime, append_audio, sr, use_cng, cng_type, map);
 				}
-
-				switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode);
+				
 			}
 		}
 
-		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "\na=crypto:%s\n", tech_pvt->local_crypto_key);
-#endif
+	}
+	
+	if (!zstr(tech_pvt->local_crypto_key) && sofia_test_flag(tech_pvt, TFLAG_SECURE)) {
+		switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=crypto:%s\n", tech_pvt->local_crypto_key);
+		//switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=encryption:optional\n");
 	}
 
 	if (sofia_test_flag(tech_pvt, TFLAG_VIDEO)) {
@@ -451,14 +582,14 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
 						continue;
 					}
 
-					if (imp->ianacode < 128) {
-						if (already_did[imp->ianacode]) {
+					if (tech_pvt->ianacodes[i] < 128) {
+						if (already_did[tech_pvt->ianacodes[i]]) {
 							continue;
 						}
-						already_did[imp->ianacode] = 1;
+						already_did[tech_pvt->ianacodes[i]] = 1;
 					}
 
-					switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode);
+					switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->ianacodes[i]);
 					if (!ptime) {
 						ptime = imp->microseconds_per_packet / 1000;
 					}
@@ -498,37 +629,11 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
 				int i;
 				int already_did[128] = { 0 };
 
-#if 0				
-				switch_event_t *event;
-				char *buf;
-				int level = SWITCH_LOG_INFO;
-				
-				if (switch_event_create_plain(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) {
-					switch_channel_event_set_data(switch_core_session_get_channel(tech_pvt->session), event);
-					switch_event_serialize(event, &buf, SWITCH_FALSE);
-					switch_assert(buf);
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), level, "CHANNEL_DATA:\n%s\n", buf);
-					switch_event_destroy(&event);
-					free(buf);
-				}
-#endif
-		
 				for (i = 0; i < tech_pvt->num_codecs; i++) {
 					const switch_codec_implementation_t *imp = tech_pvt->codecs[i];
 					char *fmtp = NULL;
-					uint32_t ianacode = imp->ianacode;
-#if 0
-					const char *str;
+					uint32_t ianacode = tech_pvt->ianacodes[i];
 
-
-
-					if ((str = switch_event_get_header(ptmap, imp->iananame))) {
-						int tmp = atoi(str);
-						if (tmp > 0) {
-							ianacode = tmp;
-						}
-					}
-#endif			
 					if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) {
 						continue;
 					}
@@ -562,7 +667,7 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
 					}
 					
 					if (!zstr(fmtp) && strcasecmp(fmtp, "_blank_")) {
-						switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, fmtp);
+						switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", ianacode, fmtp);
 					}
 				}
 				
@@ -578,7 +683,7 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
 	if (ptmap) {
 		switch_event_destroy(&ptmap);
 	}
-	
+
 	sofia_glue_tech_set_local_sdp(tech_pvt, buf, SWITCH_TRUE);
 }
 
@@ -709,8 +814,6 @@ void sofia_glue_attach_private(switch_core_session_t *session, sofia_profile_t *
 		tech_pvt->recv_te = tech_pvt->te = profile->te;
 	}
 
-	tech_pvt->dtmf_type = profile->dtmf_type;
-
 	if (!sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG)) {
 		if (tech_pvt->bcng_pt) {
 			tech_pvt->cng_pt = tech_pvt->bcng_pt;
@@ -2554,8 +2657,13 @@ switch_status_t sofia_glue_tech_set_codec(private_object_t *tech_pvt, int force)
 			tech_pvt->read_impl.samples_per_second != tech_pvt->rm_rate ||
 			tech_pvt->codec_ms != (uint32_t) tech_pvt->read_impl.microseconds_per_packet / 1000) {
 
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Changing Codec from %s@%dms to %s@%dms\n",
-							  tech_pvt->read_impl.iananame, tech_pvt->read_impl.microseconds_per_packet / 1000, tech_pvt->rm_encoding, tech_pvt->codec_ms);
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, 
+							  "Changing Codec from %s@%dms@%dhz to %s@%dms@%luhz\n",
+							  tech_pvt->read_impl.iananame, tech_pvt->read_impl.microseconds_per_packet / 1000,
+							  tech_pvt->read_impl.samples_per_second,
+							  tech_pvt->rm_encoding, 
+							  tech_pvt->codec_ms,
+							  tech_pvt->rm_rate);
 
 			switch_core_session_lock_codec_write(tech_pvt->session);
 			switch_core_session_lock_codec_read(tech_pvt->session);
@@ -2579,6 +2687,7 @@ switch_status_t sofia_glue_tech_set_codec(private_object_t *tech_pvt, int force)
 							   NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Can't load codec?\n");
 		switch_goto_status(SWITCH_STATUS_FALSE, end);
+		switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION);
 	}
 
 	if (switch_core_codec_init_with_bitrate(&tech_pvt->write_codec,
@@ -2591,6 +2700,7 @@ switch_status_t sofia_glue_tech_set_codec(private_object_t *tech_pvt, int force)
 							   SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE | tech_pvt->profile->codec_flags,
 							   NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Can't load codec?\n");
+		switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION);
 		switch_goto_status(SWITCH_STATUS_FALSE, end);
 	}
 
@@ -2814,16 +2924,6 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f
 		flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_DATAWAIT);
 	}
 
-	if ((val = switch_channel_get_variable(tech_pvt->channel, "dtmf_type"))) {
-		if (!strcasecmp(val, "rfc2833")) {
-			tech_pvt->dtmf_type = DTMF_2833;
-		} else if (!strcasecmp(val, "info")) {
-			tech_pvt->dtmf_type = DTMF_INFO;
-		} else {
-			tech_pvt->dtmf_type = tech_pvt->profile->dtmf_type;
-		}
-	}
-
 	if (sofia_test_pflag(tech_pvt->profile, PFLAG_PASS_RFC2833)
 		|| ((val = switch_channel_get_variable(tech_pvt->channel, "pass_rfc2833")) && switch_true(val))) {
 		sofia_set_flag(tech_pvt, TFLAG_PASS_RFC2833);
@@ -4219,28 +4319,38 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
 					last = tech_pvt->num_codecs;
 				}
 
-				if (maxptime && (!ptime || ptime > maxptime)) {
-					ptime = maxptime;
+				codec_ms = ptime;
+
+				if (maxptime && (!codec_ms || codec_ms > maxptime)) {
+					codec_ms = maxptime;
 				}
 
-				if (!ptime) {
-					ptime = switch_default_ptime(rm_encoding, map->rm_pt);
+				if (!codec_ms) {
+					codec_ms = switch_default_ptime(rm_encoding, map->rm_pt);
 				}
 
 				map_bit_rate = switch_known_bitrate(map->rm_pt);
-
-				if (!zstr(map->rm_fmtp)) {
+				
+				if (!ptime && !strcasecmp(map->rm_encoding, "g723")) {
+					ptime = codec_ms = 30;
+				}
+				
+				if (zstr(map->rm_fmtp)) {
+					if (!strcasecmp(map->rm_encoding, "ilbc")) {
+						ptime = codec_ms = 30;
+					}
+				} else {
 					if ((switch_core_codec_parse_fmtp(map->rm_encoding, map->rm_fmtp, map->rm_rate, &codec_fmtp)) == SWITCH_STATUS_SUCCESS) {
 						if (codec_fmtp.bits_per_second) {
 							map_bit_rate = codec_fmtp.bits_per_second;
 						}
 						if (codec_fmtp.microseconds_per_packet) {
-							ptime = (codec_fmtp.microseconds_per_packet / 1000);
+							codec_ms = (codec_fmtp.microseconds_per_packet / 1000);
 						}
 					}
 				}
 				
-				codec_ms = ptime;
+				
 
 				for (i = first; i < last && i < tech_pvt->num_codecs; i++) {
 					const switch_codec_implementation_t *imp = tech_pvt->codecs[i];
@@ -4251,7 +4361,7 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
 					}
 
 					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Compare [%s:%d:%u:%d:%u]/[%s:%d:%u:%d:%u]\n",
-									  rm_encoding, map->rm_pt, (int) map->rm_rate, codec_ms, map_bit_rate,
+									  rm_encoding, map->rm_pt, (int) map->rm_rate, ptime, map_bit_rate,
 									  imp->iananame, imp->ianacode, codec_rate, imp->microseconds_per_packet / 1000, bit_rate);
 					if ((zstr(map->rm_encoding) || (tech_pvt->profile->ndlb & PFLAG_NDLB_ALLOW_BAD_IANANAME)) && map->rm_pt < 96) {
 						match = (map->rm_pt == imp->ianacode) ? 1 : 0;
@@ -4270,7 +4380,7 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
 											  "Bah HUMBUG! Sticking with %s@%uh@%ui\n",
 											  imp->iananame, imp->samples_per_second, imp->microseconds_per_packet / 1000);
 						} else {
-							if ((codec_ms && codec_ms * 1000 != imp->microseconds_per_packet) || map->rm_rate != codec_rate) {
+							if ((ptime && codec_ms && codec_ms * 1000 != imp->microseconds_per_packet) || map->rm_rate != codec_rate) {
 								near_rate = map->rm_rate;
 								near_match = imp;
 								match = 0;
@@ -4323,7 +4433,7 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
 					tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *) map->rm_encoding);
 					tech_pvt->iananame = switch_core_session_strdup(session, (char *) mimp->iananame);
 					tech_pvt->pt = (switch_payload_t) map->rm_pt;
-					tech_pvt->rm_rate = map->rm_rate;
+					tech_pvt->rm_rate = mimp->samples_per_second;
 					tech_pvt->codec_ms = mimp->microseconds_per_packet / 1000;
 					tech_pvt->bitrate = mimp->bits_per_second;
 					tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *) connection->c_address);
@@ -4337,7 +4447,9 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
 				}
 
 				if (match) {
-					if (sofia_glue_tech_set_codec(tech_pvt, 1) != SWITCH_STATUS_SUCCESS) {
+					if (sofia_glue_tech_set_codec(tech_pvt, 1) == SWITCH_STATUS_SUCCESS) {
+						got_audio = 1;
+					} else {
 						match = 0;
 					}
 				}
@@ -4999,7 +5111,10 @@ static int recover_callback(void *pArg, int argc, char **argv, char **columnName
 				for (param = switch_xml_child(x_extension, "application"); param; param = param->next) {
 					const char *var = switch_xml_attr_soft(param, "app_name");
 					const char *val = switch_xml_attr_soft(param, "app_data");
-					switch_caller_extension_add_application(session, extension, var, val);
+					/* skip announcement type apps */
+					if (strcasecmp(var, "speak") && strcasecmp(var, "playback") && strcasecmp(var, "gentones") && strcasecmp(var, "say")) {
+						switch_caller_extension_add_application(session, extension, var, val);
+					}
 				}
 			}
 
diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 55b0c5c5ca..71a827f80b 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -61,6 +61,7 @@ struct resub_helper {
 	sofia_profile_t *profile;
 	switch_event_t *event;
 	int rowcount;
+	int noreg;
 };
 
 struct presence_helper {
@@ -568,27 +569,39 @@ static void actual_sofia_presence_event_handler(switch_event_t *event)
 			if (probe_euser && probe_host && (profile = sofia_glue_find_profile(probe_host))) {
 				sql = switch_mprintf("select status,rpid from sip_dialogs where sip_from_user='%q' and sip_from_host='%q'", probe_euser, probe_host);
 				sofia_glue_execute_sql_callback(profile, profile->ireg_mutex, sql, sofia_presence_dialog_callback, &dh);
+
+				h.profile = profile;
+
 				switch_safe_free(sql);
 
-
-				sql = switch_mprintf("select sip_registrations.sip_user, sip_registrations.sip_host, sip_registrations.status, "
-									 "sip_registrations.rpid,'', sip_dialogs.uuid, sip_dialogs.state, sip_dialogs.direction, "
-									 "sip_dialogs.sip_to_user, sip_dialogs.sip_to_host, sip_presence.status,sip_presence.rpid,sip_presence.open_closed,"
+				sql = switch_mprintf("select sip_registrations.sip_user, "
+									 "sip_registrations.sip_host, "
+									 "sip_registrations.status, "
+									 "sip_registrations.rpid, "
+									 "'', "
+									 "sip_dialogs.uuid, "
+									 "sip_dialogs.state, "
+									 "sip_dialogs.direction, "
+									 "sip_dialogs.sip_to_user, "
+									 "sip_dialogs.sip_to_host, "
+									 "sip_presence.status,"
+									 "sip_presence.rpid,"
+									 "sip_dialogs.presence_id, "
+									 "sip_presence.open_closed,"
 									 "'%q','%q' "
 
 									 "from sip_registrations left join sip_dialogs on "
 									 "(sip_dialogs.sip_from_user = sip_registrations.sip_user "
 									 "and (sip_dialogs.sip_from_host = sip_registrations.orig_server_host or "
 									 "sip_dialogs.sip_from_host = sip_registrations.sip_host) ) "
-
-									 
+ 
 									 "left join sip_presence on "
 									 "(sip_registrations.sip_user=sip_presence.sip_user and sip_registrations.orig_server_host=sip_presence.sip_host and "
 									 "sip_registrations.profile_name=sip_presence.profile_name) "
-									 "where sip_registrations.sip_user='%q' and "
+									 "where sip_dialogs.presence_id='%q@%q' or (sip_registrations.sip_user='%q' and "
 									 "(sip_registrations.orig_server_host='%q' or sip_registrations.sip_host='%q' "
-									 "or sip_registrations.presence_hosts like '%%%q%%')",
-									 dh.status, dh.rpid, probe_euser, probe_host, probe_host, probe_host);
+									 "or sip_registrations.presence_hosts like '%%%q%%'))",
+									 dh.status, dh.rpid, probe_euser, probe_host,  probe_euser, probe_host, probe_host, probe_host);
 				switch_assert(sql);
 				
 				if (mod_sofia_globals.debug_presence > 0) {
@@ -599,10 +612,38 @@ static void actual_sofia_presence_event_handler(switch_event_t *event)
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s DUMP PRESENCE_PROBE_SQL:\n%s\n", profile->name, sql);
 				}
 
-				h.profile = profile;
 				sofia_glue_execute_sql_callback(profile, profile->ireg_mutex, sql, sofia_presence_resub_callback, &h);
-				if (mod_sofia_globals.debug_presence > 0) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s END_PRESENCE_PROBE_SQL\n\n", profile->name);
+
+
+				if (!h.rowcount) {
+					h.noreg++;
+					switch_safe_free(sql);
+					/* find ones with presence_id defined that are not registred */
+					sql = switch_mprintf("select sip_from_user, sip_from_host, 'Registered', '', '', "
+										 "uuid, state, direction, "
+										 "sip_to_user, sip_to_host,"
+										 "'%q','%q',presence_id, '','','' "
+										 
+										 "from sip_dialogs "
+										 
+										 "where (presence_id='%q@%q' or "
+										 "(sip_from_user='%q' and (sip_from_host='%q' or sip_to_host='%q')))",
+										 
+										 dh.status, dh.rpid, probe_euser, probe_host,  probe_euser, probe_host, probe_host);
+
+					if (mod_sofia_globals.debug_presence > 0) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s START_PRESENCE_PROBE_SQL\n", profile->name);
+					}
+
+					if (mod_sofia_globals.debug_presence > 1) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s DUMP PRESENCE_PROBE_SQL:\n%s\n", profile->name, sql);
+					}
+
+					sofia_glue_execute_sql_callback(profile, profile->ireg_mutex, sql, sofia_presence_resub_callback, &h);
+
+					if (mod_sofia_globals.debug_presence > 0) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s END_PRESENCE_PROBE_SQL\n\n", profile->name);
+					}
 				}
 
 				if (!h.rowcount) {
@@ -689,7 +730,12 @@ static void actual_sofia_presence_event_handler(switch_event_t *event)
 
 			sync_sla(profile, euser, host, SWITCH_TRUE, SWITCH_TRUE);
 		}
-
+		
+		if (!strcmp(proto, "dp")) {
+			sql = switch_mprintf("update sip_presence set rpid='%q',status='%q' where sip_user='%q' and sip_host='%q'",
+								 rpid, status, euser, host);
+			sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE);
+		}
 
 		sql = switch_mprintf("select status,rpid from sip_dialogs where sip_from_user='%q' and sip_from_host='%q'", euser, host);
 		sofia_glue_execute_sql_callback(profile, profile->ireg_mutex, sql, sofia_presence_dialog_callback, &dh);
@@ -700,7 +746,8 @@ static void actual_sofia_presence_event_handler(switch_event_t *event)
 								  "sip_subscriptions.contact,sip_subscriptions.call_id,sip_subscriptions.full_from,"
 								  "sip_subscriptions.full_via,sip_subscriptions.expires,sip_subscriptions.user_agent,"
 								  "sip_subscriptions.accept,sip_subscriptions.profile_name"
-								  ",'%q','%q','%q',sip_presence.status,sip_presence.rpid,sip_presence.open_closed,'%q','%q',sip_subscriptions.version "
+								  ",'%q','%q','%q',sip_presence.status,sip_presence.rpid,sip_presence.open_closed,'%q','%q',"
+								  "sip_subscriptions.version, sip_dialogs.presence_id "
 								  "from sip_subscriptions "
 								  "left join sip_presence on "
 								  "(sip_subscriptions.sub_to_user=sip_presence.sip_user and sip_subscriptions.sub_to_host=sip_presence.sip_host and "
@@ -710,12 +757,13 @@ static void actual_sofia_presence_event_handler(switch_event_t *event)
 								  "(sip_dialogs.sip_from_user = sip_subscriptions.sub_to_user "
 								  "and sip_dialogs.sip_from_host = sip_subscriptions.sub_to_host) "
 								  
-								  "where sip_subscriptions.expires > -1 and (event='%q' or event='%q') and sub_to_user='%q' "
+								  "where sip_subscriptions.expires > -1 and "
+								  "(event='%q' or event='%q') and (sub_to_user='%q' or sip_dialogs.presence_id like '%q@%%') "
 								  "and (sub_to_host='%q' or presence_hosts like '%%%q%%') "
 								  "and (sip_subscriptions.profile_name = '%q' or sip_subscriptions.presence_hosts != sip_subscriptions.sub_to_host)",
 								  switch_str_nil(status), switch_str_nil(rpid), host, 
 								  dh.status,dh.rpid,
-								  event_type, alt_event_type, euser, host, host, profile->name))) {
+								  event_type, alt_event_type, euser, euser, host, host, profile->name))) {
 			
 			struct presence_helper helper = { 0 };			
 
@@ -958,6 +1006,7 @@ static int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char
 	char *rpid = argv[3];
 	char *proto = argv[4];
 
+	char *presence_id = NULL;
 	char *to_user = NULL;
 	char *uuid = NULL;
 	char *state = NULL;
@@ -965,6 +1014,7 @@ static int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char
 	switch_event_t *event;
 	char to_buf[128] = "";
 	switch_event_header_t *hp;
+	char *free_me = NULL;
 
 	if (argc > 5) {
 		uuid = argv[5];
@@ -979,6 +1029,15 @@ static int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char
 			status = argv[10];
 			rpid = argv[11];
 		}
+
+		if (argc > 12 && !zstr(argv[12]) && strchr(argv[12], '@')) {
+			char *p;
+
+			presence_id = argv[12];
+			free_me = strdup(presence_id);
+			if ((p = strchr(free_me, '@'))) *p = '\0';
+			user = free_me;
+		}
 	}
 
 	if (zstr(proto)) {
@@ -992,7 +1051,13 @@ static int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char
 	if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", proto ? proto : SOFIA_CHAT_PROTO);
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", profile->url);
+
 		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", user, host);
+
+		if (h->noreg) {
+			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Force-Direction", "inbound");
+		}
+
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", status);
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", rpid);
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
@@ -1028,6 +1093,8 @@ static int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char
 		switch_event_fire(&event);
 	}
 
+	switch_safe_free(free_me);
+
 	h->rowcount++;
 	return 0;
 }
@@ -1201,7 +1268,9 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
 	char expires_str[10] = "";
 	char status_line[256] = "";
 	char *version = "0";
-	
+	char *presence_id = NULL;
+	char *free_me = NULL;
+
 	//int i;
 	
 	//for(i = 0; i < argc; i++) {
@@ -1222,8 +1291,22 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
 		dialog_status = argv[20];
 		dialog_rpid = argv[21];
 		version = argv[22];
+		presence_id = argv[23];
 	}
 
+	if (!zstr(presence_id) && strchr(presence_id, '@')) {
+		char *p;
+		 
+		free_me = strdup(presence_id);
+
+		if ((p = strchr(free_me, '@'))) {
+			*p = '\0';
+		}
+
+		user = free_me;
+	}
+	
+
 	in = helper->event && helper->event->event_id == SWITCH_EVENT_PRESENCE_IN;
 
 	if (zstr(rpid)) {
@@ -1294,6 +1377,7 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
 	if (helper->event) {
 		switch_stream_handle_t stream = { 0 };
 		const char *direction = switch_str_nil(switch_event_get_header(helper->event, "presence-call-direction"));
+		const char *force_direction = switch_str_nil(switch_event_get_header(helper->event, "force-direction"));
 		const char *uuid = switch_str_nil(switch_event_get_header(helper->event, "unique-id"));
 		const char *event_status = switch_str_nil(switch_event_get_header(helper->event, "status"));
 		const char *astate = switch_str_nil(switch_event_get_header(helper->event, "astate"));
@@ -1316,6 +1400,10 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
 		if (is_dialog) {
 			SWITCH_STANDARD_STREAM(stream);
 		}
+		
+		if (!zstr(force_direction)) {
+			direction = force_direction;
+		}
 
 		if (!strcasecmp(direction, "outbound")) {
 			direction = "recipient";
@@ -1437,7 +1525,7 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
 		}
 
 
-		if (!is_dialog) {
+		if (!is_dialog && (zstr(astate) || strcasecmp(astate, "hangup"))) {
 			switch_set_string(status_line, status);
 
 			if (in) {
@@ -1567,6 +1655,8 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
 
   end:
 
+	switch_safe_free(free_me);
+
 	if (ext_profile) {
 		sofia_glue_release_profile(ext_profile);
 	}
@@ -2251,24 +2341,9 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 				su_free(profile->home, full_call_info);
 
 			}
-
+			
 		} else {
-			if (!strcasecmp(event, "dialog")) {
-				switch_event_t *pevent;
-				if (switch_event_create(&pevent, SWITCH_EVENT_PRESENCE_PROBE) == SWITCH_STATUS_SUCCESS) {
-					switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "proto", SOFIA_CHAT_PROTO);
-					switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "login", profile->url);
-					//switch_event_add_header(pevent, SWITCH_STACK_BOTTOM, "from", "%s@%s", to_user, to_host);
-					switch_event_add_header(pevent, SWITCH_STACK_BOTTOM, "from", "%s@%s", from_user, from_host);
-					switch_event_add_header(pevent, SWITCH_STACK_BOTTOM, "to", "%s@%s", to_user, to_host);
-					switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "event_type", "presence");
-					switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
-					switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "event_subtype", "probe");
-					switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "proto-specific-event-name", event);
-					switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "expires", exp_delta_str);
-					switch_event_fire(&pevent);
-				}
-			} else if (!strcasecmp(event, "line-seize")) {
+			if (!strcasecmp(event, "line-seize")) {
 				char *full_call_info = NULL;
 				char *p;
 
@@ -2356,6 +2431,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 				switch_event_add_header_string(sevent, SWITCH_STACK_BOTTOM, "expires", exp_delta_str);
 				switch_event_add_header_string(sevent, SWITCH_STACK_BOTTOM, "event_type", "presence");
 				switch_event_add_header_string(sevent, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
+				switch_event_add_header_string(sevent, SWITCH_STACK_BOTTOM, "expires", exp_delta_str);
 				switch_event_fire(&sevent);
 			}
 		}
@@ -2476,7 +2552,7 @@ void sofia_presence_handle_sip_i_publish(nua_t *nua, sofia_profile_t *profile, n
 		char *from_host = NULL;
 		char *rpid = "";
 		sip_payload_t *payload = sip->sip_payload;
-		char *event_type;
+		char *event_type = NULL;
 		char etag[9] = "";
 		char expstr[30] = "";
 		long exp = 0, exp_delta = 3600;
@@ -2498,13 +2574,22 @@ void sofia_presence_handle_sip_i_publish(nua_t *nua, sofia_profile_t *profile, n
 		
 		
 		exp_delta = (sip->sip_expires ? sip->sip_expires->ex_delta : 3600);
-		exp = (long) switch_epoch_time_now(NULL) + exp_delta;
+		if (profile->force_publish_expires) {
+			exp_delta = profile->force_publish_expires;
+		}
+
+		if (exp_delta < 0) {
+			exp = exp_delta;
+		} else {
+			exp = (long) switch_epoch_time_now(NULL) + exp_delta;
+		}
 
 		if (payload) {
 			switch_xml_t xml, note, person, tuple, status, basic, act;
 			switch_event_t *event;
 			char *sql;
 			char *full_agent = NULL;
+			int count = 1;
 
 			pd_dup = strdup(payload->pl_data);
 
@@ -2532,34 +2617,47 @@ void sofia_presence_handle_sip_i_publish(nua_t *nua, sofia_profile_t *profile, n
 					}
 				}
 
-				
-				if ((sql =
-					 switch_mprintf("delete from sip_presence where sip_user='%q' and sip_host='%q' "
-									" and profile_name='%q' and hostname='%q'", from_user, from_host, profile->name, mod_sofia_globals.hostname))) {
-					sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE);
-				}
+				if (sofia_test_pflag(profile, PFLAG_MULTIREG) && !strcasecmp(open_closed, "closed")) {
+					char buf[32] = "";
 					
-				if ((sql =
-					 switch_mprintf("insert into sip_presence (sip_user, sip_host, status, rpid, expires, user_agent,"
-									" profile_name, hostname, open_closed) "
-									"values ('%q','%q','%q','%q',%ld,'%q','%q','%q','%q')",
-									from_user, from_host, note_txt, rpid, exp, full_agent, profile->name, mod_sofia_globals.hostname, open_closed))) {
-						
-					sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE);
+					sql = switch_mprintf("select count(*) from sip_registrations where sip_user='%q' and orig_server_host='%q'", from_user, from_host);
+					sofia_glue_execute_sql2str(profile, profile->ireg_mutex, sql, buf, sizeof(buf));
+					switch_safe_free(sql);
+					count = atoi(buf);										
 				}
 				
 
-				event_type = sip_header_as_string(profile->home, (void *) sip->sip_event);
+				/* if (count > 1) let's not and say we did or all the clients who subscribe to their own presence will think they selves is offline */
+
+				if (count < 2) {
+					if ((sql =
+						 switch_mprintf("delete from sip_presence where sip_user='%q' and sip_host='%q' "
+										" and profile_name='%q' and hostname='%q'", from_user, from_host, profile->name, mod_sofia_globals.hostname))) {
+						sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE);
+					}
+					
+					if ((sql =
+						 switch_mprintf("insert into sip_presence (sip_user, sip_host, status, rpid, expires, user_agent,"
+										" profile_name, hostname, open_closed) "
+										"values ('%q','%q','%q','%q',%ld,'%q','%q','%q','%q')",
+										from_user, from_host, note_txt, rpid, exp, full_agent, profile->name, mod_sofia_globals.hostname, open_closed))) {
+						
+						sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE);
+					}
 				
-				if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", SOFIA_CHAT_PROTO);
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", rpid);
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", profile->url);
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "user-agent", full_agent);
-					switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", from_user, from_host);
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", note_txt);
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", event_type);
-					switch_event_fire(&event);
+
+					event_type = sip_header_as_string(profile->home, (void *) sip->sip_event);
+				
+					if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
+						switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", SOFIA_CHAT_PROTO);
+						switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", rpid);
+						switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", profile->url);
+						switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "user-agent", full_agent);
+						switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", from_user, from_host);
+						switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", note_txt);
+						switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", event_type);
+						switch_event_fire(&event);
+					}
 				}
 
 				if (event_type) {
diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index 285dc8ae3a..67641ae616 100644
--- a/src/mod/endpoints/mod_sofia/sofia_reg.c
+++ b/src/mod/endpoints/mod_sofia/sofia_reg.c
@@ -363,17 +363,30 @@ void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now)
 							   NUTAG_REGISTRAR(gateway_ptr->register_proxy),
 							   NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL());
 			}
-			gateway_ptr->retry = now + gateway_ptr->retry_seconds;
+			gateway_ptr->reg_timeout = now + gateway_ptr->reg_timeout_seconds;
 			gateway_ptr->state = REG_STATE_TRYING;
 			switch_safe_free(user_via);
 			user_via = NULL;
 			break;
 
+		case REG_STATE_TIMEOUT:
+			{
+				nua_handle_t *nh = gateway_ptr->nh;
+				
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timeout Registering %s\n", gateway_ptr->name);
+
+				gateway_ptr->nh = NULL;
+				nua_handle_destroy(nh);
+				gateway_ptr->state = REG_STATE_FAILED;
+				gateway_ptr->failures++;
+				gateway_ptr->failure_status = 908;
+			}
+			break;
 		case REG_STATE_FAILED:
 			{
 				int sec;
 
-				if (gateway_ptr->failure_status == 503) {
+				if (gateway_ptr->failure_status == 503 || gateway_ptr->failure_status == 908) {
 					sec = gateway_ptr->retry_seconds;
 				} else {
 					sec = gateway_ptr->retry_seconds * (gateway_ptr->failures + 1);
@@ -384,8 +397,8 @@ void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now)
 				gateway_ptr->state = REG_STATE_FAIL_WAIT;
 				gateway_ptr->failure_status = 0;
 
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s Failed Registration, setting retry to %d seconds.\n",
-								  gateway_ptr->name, sec);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s Failed Registration [%d], setting retry to %d seconds.\n",
+								  gateway_ptr->name, gateway_ptr->failure_status, sec);
 
 			}
 			break;
@@ -395,8 +408,8 @@ void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now)
 			}
 			break;
 		case REG_STATE_TRYING:
-			if (!gateway_ptr->retry || now >= gateway_ptr->retry) {
-				gateway_ptr->state = REG_STATE_FAILED;
+			if (now >= gateway_ptr->reg_timeout) {
+				gateway_ptr->state = REG_STATE_TIMEOUT;
 			}
 			break;
 		default:
@@ -676,14 +689,16 @@ void sofia_reg_check_expire(sofia_profile_t *profile, time_t now, int reboot)
 		if (sofia_test_pflag(profile, PFLAG_ALL_REG_OPTIONS_PING)) {
 			switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid,"
 							"expires,user_agent,server_user,server_host,profile_name"
-							" from sip_registrations where hostname='%s'", mod_sofia_globals.hostname);
+ " from sip_registrations where hostname='%s' and " 
+ "profile_name='%s'", mod_sofia_globals.hostname, profile->name); 
 			
 			sofia_glue_execute_sql_callback(profile, NULL, sql, sofia_reg_nat_callback, profile);
 		} else if (sofia_test_pflag(profile, PFLAG_NAT_OPTIONS_PING)) {
 			switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid,"
 							"expires,user_agent,server_user,server_host,profile_name"
 							" from sip_registrations where (status like '%%NAT%%' "
-							"or contact like '%%fs_nat=yes%%') and hostname='%s'", mod_sofia_globals.hostname);
+ "or contact like '%%fs_nat=yes%%') and hostname='%s' " 
+ "and profile_name='%s'", mod_sofia_globals.hostname, profile->name); 
 			
 			sofia_glue_execute_sql_callback(profile, NULL, sql, sofia_reg_nat_callback, profile);
 		}
@@ -991,11 +1006,37 @@ uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_hand
 
 	if (authorization) {
 		char *v_contact_str;
+		const char *username = "unknown";
+		const char *realm = reg_host;
 		if ((auth_res = sofia_reg_parse_auth(profile, authorization, sip, sip->sip_request->rq_method_name,
 											 key, keylen, network_ip, v_event, exptime, regtype, to_user, &auth_params, &reg_count)) == AUTH_STALE) {
 			stale = 1;
 		}
 
+
+		if (auth_params) {
+			username = switch_event_get_header(auth_params, "sip_auth_username");
+			realm = switch_event_get_header(auth_params, "sip_auth_realm");
+		}
+		if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_REGISTER_ATTEMPT) == SWITCH_STATUS_SUCCESS) {
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "profile-name", profile->name);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "from-user", to_user);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "from-host", reg_host);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "contact", contact_str);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "call-id", call_id);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "rpid", rpid);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "status", reg_desc);
+			switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%ld", (long) exptime);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "to-user", from_user);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "to-host", from_host);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "network-ip", network_ip);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "network-port", network_port_c);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "username", username);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "realm", realm);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "user-agent", agent);
+			switch_event_fire(&s_event);
+		}
+
 		if (exptime && v_event && *v_event) {
 			char *exp_var;
 			char *allow_multireg = NULL;
@@ -1099,6 +1140,23 @@ uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_hand
 	if (!authorization || stale) {
 		const char *realm = profile->challenge_realm;
 
+		if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_PRE_REGISTER) == SWITCH_STATUS_SUCCESS) {
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "profile-name", profile->name);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "from-user", to_user);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "from-host", reg_host);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "contact", contact_str);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "call-id", call_id);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "rpid", rpid);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "status", reg_desc);
+			switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%ld", (long) exptime);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "to-user", from_user);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "to-host", from_host);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "network-ip", network_ip);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "network-port", network_port_c);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "user-agent", agent);
+			switch_event_fire(&s_event);
+		}
+
 		if (zstr(realm) || !strcasecmp(realm, "auto_to")) {
 			realm = to_host;
 		} else if (!strcasecmp(realm, "auto_from")) {
@@ -1468,12 +1526,12 @@ void sofia_reg_handle_sip_i_register(nua_t *nua, sofia_profile_t *profile, nua_h
 			} else if (port && atoi(port) != network_port) {
 				is_nat = "via port";
 			}
-		}
-	}
 
-	if (!is_nat && sip && sip->sip_via && sip->sip_via->v_port &&
-		atoi(sip->sip_via->v_port) == 5060 && network_port != 5060 ) {
-		is_nat = "via port";
+			if (!is_nat && sip->sip_via->v_port &&
+				atoi(sip->sip_via->v_port) == 5060 && network_port != 5060 ) {
+				is_nat = "via port";
+			}
+		}
 	}
 
 	if (!is_nat && profile->nat_acl_count) {
@@ -1632,7 +1690,9 @@ void sofia_reg_handle_sip_r_challenge(int status,
 	switch_channel_t *channel = NULL;
 	const char *sip_auth_username = NULL;
 	const char *sip_auth_password = NULL;
-
+	char *dup_user = NULL;
+	char *dup_pass = NULL;
+	
 	if (session && (channel = switch_core_session_get_channel(session))) {
 		sip_auth_username = switch_channel_get_variable(channel, "sip_auth_username");
 		sip_auth_password = switch_channel_get_variable(channel, "sip_auth_password");
@@ -1702,8 +1762,37 @@ void sofia_reg_handle_sip_r_challenge(int status,
 		}
 	}
 
+	if (!gateway && !sip_auth_username && sip && sip->sip_to && sip->sip_to->a_url && sip->sip_to->a_url->url_user && sip->sip_to->a_url->url_host) {
+		switch_xml_t x_user, x_param, x_params;
+		switch_event_t *locate_params;
 
+		switch_event_create(&locate_params, SWITCH_EVENT_REQUEST_PARAMS);
+		switch_assert(locate_params);
 
+		switch_event_add_header_string(locate_params, SWITCH_STACK_BOTTOM, "Action", "reverse-auth-lookup");
+
+		if (switch_xml_locate_user_merged("id", sip->sip_to->a_url->url_user, sip->sip_to->a_url->url_host, NULL,
+										  &x_user, locate_params) == SWITCH_STATUS_SUCCESS) {
+			if ((x_params = switch_xml_child(x_user, "params"))) {
+				for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) {
+					const char *var = switch_xml_attr_soft(x_param, "name");
+					const char *val = switch_xml_attr_soft(x_param, "value");
+					
+					if (!strcasecmp(var, "reverse-auth-user")) {
+						dup_user = strdup(val);
+						sip_auth_username = dup_user;
+					} else if (!strcasecmp(var, "reverse-auth-pass")) {
+						dup_pass = strdup(val);
+						sip_auth_password = dup_pass;
+					}
+				}
+
+				switch_xml_free(x_user);
+			}
+		}
+
+		switch_event_destroy(&locate_params);
+	}
 
 	if (!(scheme && realm)) {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No scheme and realm!\n");
@@ -1742,6 +1831,10 @@ void sofia_reg_handle_sip_r_challenge(int status,
 
   end:
 
+
+	switch_safe_free(dup_user);
+	switch_safe_free(dup_pass);
+
 	if (var_gateway) {
 		sofia_reg_release_gateway(var_gateway);
 	}
diff --git a/src/mod/event_handlers/mod_erlang_event/ei_helpers.c b/src/mod/event_handlers/mod_erlang_event/ei_helpers.c
index 9935aff075..aca2497052 100644
--- a/src/mod/event_handlers/mod_erlang_event/ei_helpers.c
+++ b/src/mod/event_handlers/mod_erlang_event/ei_helpers.c
@@ -377,10 +377,11 @@ switch_status_t initialise_ei(struct ei_cnode_s *ec)
 				// init the resolver
 				res_init();
 			}
-			if (!zstr_buf(_res.dnsrch[0])) {
+			if (_res.dnsrch[0] && !zstr_buf(_res.dnsrch[0])) {
 				strncat(thishostname, ".", 1);
 				strncat(thishostname, _res.dnsrch[0], EI_MAXHOSTNAMELEN - strlen(thishostname));
 			}
+
 		}
 		snprintf(thisnodename, MAXNODELEN + 1, "%s@%s", prefs.nodename, thishostname);
 	}
diff --git a/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c b/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
index 848a2c58ea..8565e1afa7 100644
--- a/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
+++ b/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
@@ -1015,6 +1015,53 @@ static void launch_listener_thread(listener_t *listener)
 
 }
 
+static int read_cookie_from_file(char *filename) {
+	int fd;
+	char cookie[MAXATOMLEN+1];
+	char *end;
+	struct stat buf;
+	ssize_t res;
+
+	if (!stat(filename, &buf)) {
+		if ((buf.st_mode & S_IRWXG) || (buf.st_mode & S_IRWXO)) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s must only be accessible by owner only.\n", filename);
+			return 2;
+		}
+		if (buf.st_size > MAXATOMLEN) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s contains a cookie larger than the maximum atom size of %d.\n", filename, MAXATOMLEN);
+			return 2;
+		}
+		fd = open(filename, O_RDONLY);
+		if (fd < 1) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to open cookie file %s : %d.\n", filename, errno);
+			return 2;
+		}
+
+		if ((res = read(fd, cookie, MAXATOMLEN)) < 1) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to read cookie file %s : %d.\n", filename, errno);
+		}
+
+		cookie[MAXATOMLEN] = '\0';
+
+		/* replace any end of line characters with a null */
+		if ((end = strchr(cookie, '\n'))) {
+			*end = '\0';
+		}
+
+		if ((end = strchr(cookie, '\r'))) {
+			*end = '\0';
+		}
+
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Read %d bytes from cookie file %s.\n", (int)res, filename);
+
+		set_pref_cookie(cookie);
+		return 0;
+	} else {
+		/* don't error here, because we might be blindly trying to read $HOME/.erlang.cookie, and that can fail silently */
+		return 1;
+	}
+}
+
 
 static int config(void)
 {
@@ -1041,6 +1088,10 @@ static int config(void)
 					prefs.port = (uint16_t) atoi(val);
 				} else if (!strcmp(var, "cookie")) {
 					set_pref_cookie(val);
+				} else if (!strcmp(var, "cookie-file")) {
+					if (read_cookie_from_file(val) == 1) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to read cookie from %s\n", val);
+					}
 				} else if (!strcmp(var, "nodename")) {
 					set_pref_nodename(val);
 				} else if (!strcmp(var, "compat-rel")) {
@@ -1075,7 +1126,21 @@ static int config(void)
 	}
 
 	if (zstr(prefs.cookie)) {
-		set_pref_cookie("ClueCon");
+		int res;
+		char* home_dir = getenv("HOME");
+		char path_buf[1024];
+
+		if (!zstr(home_dir)) {
+			/* $HOME/.erlang.cookie */
+			switch_snprintf(path_buf, sizeof(path_buf), "%s%s%s", home_dir, SWITCH_PATH_SEPARATOR, ".erlang.cookie");
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking for cookie at path: %s\n", path_buf);
+
+			res = read_cookie_from_file(path_buf);
+			if (res) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No cookie or valid cookie file specified, using default cookie\n");
+				set_pref_cookie("ClueCon");
+			}
+		}
 	}
 
 	if (!prefs.port) {
diff --git a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
index be417600a2..941db22c84 100644
--- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
+++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
@@ -1363,7 +1363,7 @@ static void *SWITCH_THREAD_FUNC api_exec(switch_thread_t *thread, void *obj)
 
 	if (acs->console_execute) {
 		if ((status = switch_console_execute(acs->api_cmd, 0, &stream)) != SWITCH_STATUS_SUCCESS) {
-			stream.write_function(&stream, "%s: Command not found!\n", acs->api_cmd);
+			stream.write_function(&stream, "-ERR %s Command not found!\n", acs->api_cmd);
 		}
 	} else {
 		status = switch_api_execute(acs->api_cmd, acs->arg, NULL, &stream);
@@ -1372,7 +1372,7 @@ static void *SWITCH_THREAD_FUNC api_exec(switch_thread_t *thread, void *obj)
 	if (status == SWITCH_STATUS_SUCCESS) {
 		reply = stream.data;
 	} else {
-		freply = switch_mprintf("%s: Command not found!\n", acs->api_cmd);
+		freply = switch_mprintf("-ERR %s Command not found!\n", acs->api_cmd);
 		reply = freply;
 	}
 
diff --git a/src/mod/formats/mod_native_file/mod_native_file.c b/src/mod/formats/mod_native_file/mod_native_file.c
index c72743fa90..272fc5d504 100644
--- a/src/mod/formats/mod_native_file/mod_native_file.c
+++ b/src/mod/formats/mod_native_file/mod_native_file.c
@@ -58,7 +58,7 @@ static switch_status_t native_file_file_open(switch_file_handle_t *handle, const
 
 	if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
 		flags |= SWITCH_FOPEN_WRITE | SWITCH_FOPEN_CREATE;
-		if (switch_test_flag(handle, SWITCH_FILE_WRITE_APPEND)) {
+		if (switch_test_flag(handle, SWITCH_FILE_WRITE_APPEND) || switch_test_flag(handle, SWITCH_FILE_WRITE_OVER)) {
 			flags |= SWITCH_FOPEN_READ;
 		} else {
 			flags |= SWITCH_FOPEN_TRUNCATE;
diff --git a/src/mod/formats/mod_shout/Makefile b/src/mod/formats/mod_shout/Makefile
index 6a6c858454..0ff6fc6525 100644
--- a/src/mod/formats/mod_shout/Makefile
+++ b/src/mod/formats/mod_shout/Makefile
@@ -51,6 +51,7 @@ $(LAMELA): $(LAME_BUILDDIR)/Makefile
 
 $(SHOUT_DIR):
 	$(GETLIB) $(SHOUT).tar.gz
+	patch -p0 -i hack_out_ogg.diff
 
 $(SHOUT_BUILDDIR)/Makefile: $(SHOUT_DIR)
 	mkdir -p $(SHOUT_BUILDDIR)
diff --git a/src/mod/formats/mod_shout/hack_out_ogg.diff b/src/mod/formats/mod_shout/hack_out_ogg.diff
new file mode 100644
index 0000000000..3e9b12fa91
--- /dev/null
+++ b/src/mod/formats/mod_shout/hack_out_ogg.diff
@@ -0,0 +1,247 @@
+diff -r -u ../../../../libs/libshout-2.2.2/Makefile.am ../../../../libs/libshout-2.2.2a/Makefile.am
+--- ../../../../libs/libshout-2.2.2/Makefile.am	2006-01-30 19:42:43.000000000 -0600
++++ ../../../../libs/libshout-2.2.2a/Makefile.am	2010-10-22 12:07:22.000000000 -0500
+@@ -3,16 +3,14 @@
+ AUTOMAKE_OPTIONS = 1.6 foreign
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = include src examples debian doc win32
++SUBDIRS = include src #examples debian doc win32
+ 
+-EXTRA_DIST = INSTALL m4/shout.m4 m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \
+-	m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
+-	m4/xiph_types.m4
++EXTRA_DIST = INSTALL m4/shout.m4 m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4
+ 
+ DISTCLEANFILES = shout-config.in
+ 
+ docdir = $(datadir)/doc/$(PACKAGE)
+-doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c
++#doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c
+ 
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = m4/shout.m4
+diff -r -u ../../../../libs/libshout-2.2.2/Makefile.in ../../../../libs/libshout-2.2.2a/Makefile.in
+--- ../../../../libs/libshout-2.2.2/Makefile.in	2006-06-19 15:36:36.000000000 -0500
++++ ../../../../libs/libshout-2.2.2a/Makefile.in	2010-10-22 12:09:46.000000000 -0500
+@@ -246,14 +246,14 @@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = 1.6 foreign
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = include src examples debian doc win32
++SUBDIRS = include src 
+ EXTRA_DIST = INSTALL m4/shout.m4 m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \
+ 	m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
+ 	m4/xiph_types.m4
+ 
+ DISTCLEANFILES = shout-config.in
+ docdir = $(datadir)/doc/$(PACKAGE)
+-doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c
++
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = m4/shout.m4
+ @HAVE_PKGCONFIG_TRUE@pkgconfigdir = $(libdir)/pkgconfig
+diff -r -u ../../../../libs/libshout-2.2.2/configure ../../../../libs/libshout-2.2.2a/configure
+--- ../../../../libs/libshout-2.2.2/configure	2006-06-19 15:36:37.000000000 -0500
++++ ../../../../libs/libshout-2.2.2a/configure	2010-10-22 12:08:39.000000000 -0500
+@@ -22911,7 +22911,7 @@
+ 
+ fi
+ 
+-SHOUT_REQUIRES="ogg"
++#SHOUT_REQUIRES="ogg"
+ 
+ 
+ 
+@@ -23380,10 +23380,6 @@
+ 
+ fi
+ 
+-VORBIS_LIBS="-lvorbis"
+-VORBISFILE_LIBS="-lvorbisfile"
+-VORBISENC_LIBS="-lvorbisenc"
+-
+ xt_save_LIBS="$LIBS"
+ xt_save_LDFLAGS="$LDFLAGS"
+ xt_save_CPPFLAGS="$CPPFLAGS"
+@@ -23580,18 +23576,18 @@
+ LIBS="$xt_save_LIBS"
+ LDFLAGS="$xt_save_LDFLAGS"
+ 
+-if test "x$xt_lib_vorbis" = "xok"; then
+-    :
+-else
+-    VORBIS_CFLAGS=""
+-    VORBIS_LDFLAGS=""
+-    VORBIS_LIBS=""
+-    VORBISFILE_LIBS=""
+-    VORBISENC_LIBS=""
+-    { { echo "$as_me:$LINENO: error: requisite Ogg Vorbis library not found" >&5
+-echo "$as_me: error: requisite Ogg Vorbis library not found" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
++# if test "x$xt_lib_vorbis" = "xok"; then
++#     :
++# else
++#     VORBIS_CFLAGS=""
++#     VORBIS_LDFLAGS=""
++#     VORBIS_LIBS=""
++#     VORBISFILE_LIBS=""
++#     VORBISENC_LIBS=""
++#     { { echo "$as_me:$LINENO: error: requisite Ogg Vorbis library not found" >&5
++# echo "$as_me: error: requisite Ogg Vorbis library not found" >&2;}
++#    { (exit 1); exit 1; }; }
++# fi
+ 
+ 
+ 
+@@ -23687,10 +23683,6 @@
+ 
+ fi
+ 
+-VORBIS_LIBS="-lvorbis"
+-VORBISFILE_LIBS="-lvorbisfile"
+-VORBISENC_LIBS="-lvorbisenc"
+-
+ xt_save_LIBS="$LIBS"
+ xt_save_LDFLAGS="$LDFLAGS"
+ xt_save_CPPFLAGS="$CPPFLAGS"
+@@ -23887,18 +23879,18 @@
+ LIBS="$xt_save_LIBS"
+ LDFLAGS="$xt_save_LDFLAGS"
+ 
+-if test "x$xt_lib_vorbis" = "xok"; then
+-    :
+-else
+-    VORBIS_CFLAGS=""
+-    VORBIS_LDFLAGS=""
+-    VORBIS_LIBS=""
+-    VORBISFILE_LIBS=""
+-    VORBISENC_LIBS=""
+-    { { echo "$as_me:$LINENO: error: requisite Ogg Vorbis library not found" >&5
+-echo "$as_me: error: requisite Ogg Vorbis library not found" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
++# if test "x$xt_lib_vorbis" = "xok"; then
++#     :
++# else
++#     VORBIS_CFLAGS=""
++#     VORBIS_LDFLAGS=""
++#     VORBIS_LIBS=""
++#     VORBISFILE_LIBS=""
++#     VORBISENC_LIBS=""
++#     { { echo "$as_me:$LINENO: error: requisite Ogg Vorbis library not found" >&5
++# echo "$as_me: error: requisite Ogg Vorbis library not found" >&2;}
++#    { (exit 1); exit 1; }; }
++# fi
+ 
+ 
+ 
+@@ -25819,7 +25811,7 @@
+ 
+ 
+ 
+-                                                                                                                                                                ac_config_files="$ac_config_files Makefile debian/Makefile include/Makefile include/shout/Makefile include/shout/shout.h src/Makefile src/net/Makefile src/timing/Makefile src/thread/Makefile src/avl/Makefile src/httpp/Makefile doc/Makefile examples/Makefile win32/Makefile shout-config shout.pc"
++                                                                                                                                                                ac_config_files="$ac_config_files Makefile debian/Makefile include/Makefile include/shout/Makefile include/shout/shout.h src/Makefile src/net/Makefile src/timing/Makefile src/thread/Makefile src/avl/Makefile src/httpp/Makefile doc/Makefile win32/Makefile shout-config shout.pc"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -26423,7 +26415,6 @@
+   "src/avl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/avl/Makefile" ;;
+   "src/httpp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/httpp/Makefile" ;;
+   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+-  "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
+   "win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
+   "shout-config" ) CONFIG_FILES="$CONFIG_FILES shout-config" ;;
+   "shout.pc" ) CONFIG_FILES="$CONFIG_FILES shout.pc" ;;
+diff -r -u ../../../../libs/libshout-2.2.2/src/Makefile.am ../../../../libs/libshout-2.2.2a/src/Makefile.am
+--- ../../../../libs/libshout-2.2.2/src/Makefile.am	2006-01-30 19:42:42.000000000 -0600
++++ ../../../../libs/libshout-2.2.2a/src/Makefile.am	2010-10-22 11:59:57.000000000 -0500
+@@ -20,9 +20,9 @@
+ lib_LTLIBRARIES = libshout.la
+ libshout_la_LDFLAGS = -version-info 5:0:2
+ 
+-EXTRA_DIST = theora.c speex.c
+-noinst_HEADERS = shout_ogg.h shout_private.h util.h
+-libshout_la_SOURCES = shout.c util.c ogg.c vorbis.c mp3.c $(MAYBE_THEORA) $(MAYBE_SPEEX)
++EXTRA_DIST = 
++noinst_HEADERS = shout_private.h util.h
++libshout_la_SOURCES = shout.c util.c mp3.c $(MAYBE_THEORA) $(MAYBE_SPEEX)
+ AM_CFLAGS = @XIPH_CFLAGS@
+ 
+ libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
+diff -r -u ../../../../libs/libshout-2.2.2/src/Makefile.in ../../../../libs/libshout-2.2.2a/src/Makefile.in
+--- ../../../../libs/libshout-2.2.2/src/Makefile.in	2006-06-19 15:36:32.000000000 -0500
++++ ../../../../libs/libshout-2.2.2a/src/Makefile.in	2010-10-22 12:04:24.000000000 -0500
+@@ -42,10 +42,7 @@
+ 	$(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_config_libconfig_in.m4 \
+-	$(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/ogg.m4 \
+-	$(top_srcdir)/m4/speex.m4 $(top_srcdir)/m4/theora.m4 \
+-	$(top_srcdir)/m4/vorbis.m4 $(top_srcdir)/m4/xiph_compiler.m4 \
+-	$(top_srcdir)/m4/xiph_net.m4 $(top_srcdir)/m4/xiph_types.m4 \
++	$(top_srcdir)/m4/acx_pthread.m4 \
+ 	$(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -66,11 +63,11 @@
+ libshout_la_DEPENDENCIES = net/libicenet.la timing/libicetiming.la \
+ 	avl/libiceavl.la httpp/libicehttpp.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
+-am__libshout_la_SOURCES_DIST = shout.c util.c ogg.c vorbis.c mp3.c \
++am__libshout_la_SOURCES_DIST = shout.c util.c mp3.c \
+ 	theora.c speex.c
+ @HAVE_THEORA_TRUE@am__objects_1 = theora.lo
+ @HAVE_SPEEX_TRUE@am__objects_2 = speex.lo
+-am_libshout_la_OBJECTS = shout.lo util.lo ogg.lo vorbis.lo mp3.lo \
++am_libshout_la_OBJECTS = shout.lo util.lo mp3.lo \
+ 	$(am__objects_1) $(am__objects_2)
+ libshout_la_OBJECTS = $(am_libshout_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -152,10 +149,6 @@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ OBJEXT = @OBJEXT@
+-OGG_CFLAGS = @OGG_CFLAGS@
+-OGG_LDFLAGS = @OGG_LDFLAGS@
+-OGG_LIBS = @OGG_LIBS@
+-OGG_PREFIX = @OGG_PREFIX@
+ OPT = @OPT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -257,8 +250,8 @@
+ lib_LTLIBRARIES = libshout.la
+ libshout_la_LDFLAGS = -version-info 5:0:2
+ EXTRA_DIST = theora.c speex.c
+-noinst_HEADERS = shout_ogg.h shout_private.h util.h
+-libshout_la_SOURCES = shout.c util.c ogg.c vorbis.c mp3.c $(MAYBE_THEORA) $(MAYBE_SPEEX)
++noinst_HEADERS = shout_private.h util.h
++libshout_la_SOURCES = shout.c util.c mp3.c $(MAYBE_THEORA) $(MAYBE_SPEEX)
+ AM_CFLAGS = @XIPH_CFLAGS@
+ libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
+ 		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS)
+@@ -334,7 +327,7 @@
+ 	-rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp3.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg.Plo@am__quote@
++#@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shout.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/speex.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/theora.Plo@am__quote@
+diff -r -u ../../../../libs/libshout-2.2.2/src/shout.c ../../../../libs/libshout-2.2.2a/src/shout.c
+--- ../../../../libs/libshout-2.2.2/src/shout.c	2008-07-28 11:33:56.000000000 -0500
++++ ../../../../libs/libshout-2.2.2a/src/shout.c	2010-10-22 12:12:46.000000000 -0500
+@@ -994,10 +994,7 @@
+ 		if ((rc = parse_response(self)) != SHOUTERR_SUCCESS)
+                         goto failure;
+ 
+-		if (self->format == SHOUT_FORMAT_OGG) {
+-			if ((rc = self->error = shout_open_ogg(self)) != SHOUTERR_SUCCESS)
+-                                goto failure;
+-		} else if (self->format == SHOUT_FORMAT_MP3) {
++		if (self->format == SHOUT_FORMAT_MP3) {
+ 			if ((rc = self->error = shout_open_mp3(self)) != SHOUTERR_SUCCESS)
+                                 goto failure;
+ 		} else {
diff --git a/src/mod/formats/mod_sndfile/mod_sndfile.c b/src/mod/formats/mod_sndfile/mod_sndfile.c
index a99759fc3b..2b661ed2c2 100644
--- a/src/mod/formats/mod_sndfile/mod_sndfile.c
+++ b/src/mod/formats/mod_sndfile/mod_sndfile.c
@@ -82,7 +82,7 @@ static switch_status_t sndfile_file_open(switch_file_handle_t *handle, const cha
 	}
 
 	if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
-		if (switch_test_flag(handle, SWITCH_FILE_WRITE_APPEND)) {
+		if (switch_test_flag(handle, SWITCH_FILE_WRITE_APPEND) || switch_test_flag(handle, SWITCH_FILE_WRITE_OVER)) {
 			mode += SFM_RDWR;
 		} else {
 			mode += SFM_WRITE;
@@ -208,6 +208,8 @@ static switch_status_t sndfile_file_open(switch_file_handle_t *handle, const cha
 
 	if (switch_test_flag(handle, SWITCH_FILE_WRITE_APPEND)) {
 		handle->pos = sf_seek(context->handle, 0, SEEK_END);
+	} else if (switch_test_flag(handle, SWITCH_FILE_WRITE_OVER)) {
+		handle->pos = sf_seek(context->handle, 0, SEEK_SET);
 	} else {
 		sf_count_t frames = 0;
 		sf_command(context->handle, SFC_FILE_TRUNCATE, &frames, sizeof(frames));
@@ -242,16 +244,23 @@ static switch_status_t sndfile_file_close(switch_file_handle_t *handle)
 static switch_status_t sndfile_file_seek(switch_file_handle_t *handle, unsigned int *cur_sample, int64_t samples, int whence)
 {
 	sndfile_context *context = handle->private_info;
-
+	sf_count_t count;
+	switch_status_t r = SWITCH_STATUS_SUCCESS;
+	
 	if (!handle->seekable) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "File is not seekable\n");
 		return SWITCH_STATUS_NOTIMPL;
 	}
 
-	*cur_sample = (unsigned int) sf_seek(context->handle, samples, whence);
-	handle->pos = *cur_sample;
-
-	return SWITCH_STATUS_SUCCESS;
+	if ((count = sf_seek(context->handle, samples, whence)) == ((sf_count_t) -1)) {
+		r = SWITCH_STATUS_BREAK;
+		count = sf_seek(context->handle, -1, SEEK_END);
+	}
+	
+	*cur_sample = (unsigned int) count;
+	handle->pos = *cur_sample;	
+	
+	return r;
 }
 
 static switch_status_t sndfile_file_read(switch_file_handle_t *handle, void *data, size_t *len)
diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
index 5a2a757e57..c55a6d63ed 100644
Binary files a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx and b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx differ
diff --git a/src/mod/languages/mod_managed/managed/swig.2010.cs b/src/mod/languages/mod_managed/managed/swig.2010.cs
index 682b3bd0c5..8c307fc679 100644
Binary files a/src/mod/languages/mod_managed/managed/swig.2010.cs and b/src/mod/languages/mod_managed/managed/swig.2010.cs differ
diff --git a/src/switch.c b/src/switch.c
index a28baba6f0..b04243d59f 100644
--- a/src/switch.c
+++ b/src/switch.c
@@ -50,7 +50,7 @@
 /* pid filename: Stores the process id of the freeswitch process */
 #define PIDFILE "freeswitch.pid"
 static char *pfile = PIDFILE;
-
+static int system_ready = 0;
 
 /* Picky compiler */
 #ifdef __ICC
@@ -82,6 +82,33 @@ static void handle_SIGILL(int sig)
 	return;
 }
 
+#ifndef WIN32
+static void handle_SIGUSR2(int sig)
+{
+	if (sig);
+
+	system_ready = 1;
+
+	return;
+}
+
+static void handle_SIGCHLD(int sig)
+{
+	int status = 0;
+	int pid = 0;
+
+	if (sig);
+
+	pid = wait(&status);
+	
+	if (pid > 0) {
+		system_ready = -1;
+	}
+
+	return;
+}
+#endif
+
 /* kill a freeswitch process running in background mode */
 static int freeswitch_kill_background()
 {
@@ -209,27 +236,31 @@ void WINAPI service_main(DWORD numArgs, char **args)
 
 #else
 
-void daemonize(void)
+void daemonize(int do_wait)
 {
 	int fd;
 	pid_t pid;
 
-	switch (fork()) {
-	case 0:
-		break;
-	case -1:
-		fprintf(stderr, "Error Backgrounding (fork)! %d - %s\n", errno, strerror(errno));
-		exit(0);
-		break;
-	default:
-		exit(0);
+	if (!do_wait) {
+		switch (fork()) {
+		case 0:
+			break;
+		case -1:
+			fprintf(stderr, "Error Backgrounding (fork)! %d - %s\n", errno, strerror(errno));
+			exit(0);
+			break;
+		default:
+			exit(0);
+		}
+
+		if (setsid() < 0) {
+			fprintf(stderr, "Error Backgrounding (setsid)! %d - %s\n", errno, strerror(errno));
+			exit(0);
+		}
 	}
 
-	if (setsid() < 0) {
-		fprintf(stderr, "Error Backgrounding (setsid)! %d - %s\n", errno, strerror(errno));
-		exit(0);
-	}
 	pid = fork();
+
 	switch (pid) {
 	case 0:
 		break;
@@ -238,10 +269,48 @@ void daemonize(void)
 		exit(0);
 		break;
 	default:
-		fprintf(stderr, "%d Backgrounding.\n", (int) pid);
+		{
+			fprintf(stderr, "%d Backgrounding.\n", (int) pid);
+
+
+			if (do_wait) {
+				unsigned int sanity = 60;
+				char *o;
+
+				if ((o = getenv("FREESWITCH_BG_TIMEOUT"))) {
+					int tmp = atoi(o);
+					if (tmp > 0) {
+						sanity = tmp;
+					}
+				}
+
+				while(--sanity && !system_ready) {
+				
+					if (sanity % 2 == 0) {
+						printf("FreeSWITCH[%d] Waiting for background process pid:%d to be ready.....\n", getpid(), (int) pid);
+					}
+					sleep(1);
+				}
+
+				if (system_ready == 1) {
+					printf("FreeSWITCH[%d] System Ready pid:%d\n", (int) getpid(), (int) pid);
+				} else {
+					printf("FreeSWITCH[%d] Error starting system! pid:%d\n", (int)getpid(), (int) pid);
+					kill(pid, 9);
+					exit(-1);
+				}
+			
+			}
+
+		}
+
 		exit(0);
 	}
 
+	if (do_wait) {
+		setsid();
+	}
+
 	/* redirect std* to null */
 	fd = open("/dev/null", O_RDONLY);
 	if (fd != 0) {
@@ -286,9 +355,12 @@ int main(int argc, char *argv[])
 	int local_argc = argc;
 	char *arg_argv[128] = { 0 };
 	char *usageDesc;
-	int alt_dirs = 0, log_set = 0, run_set = 0, kill = 0;
+	int alt_dirs = 0, log_set = 0, run_set = 0, do_kill = 0;
 	int known_opt;
 	int high_prio = 0;
+#ifndef WIN32
+	int do_wait = 0;
+#endif
 #ifdef __sun
 	switch_core_flag_t flags = SCF_USE_SQL;
 #else
@@ -343,6 +415,9 @@ int main(int argc, char *argv[])
 		"\t-nort                  -- disable clock clock_realtime\n"
 		"\t-stop                  -- stop freeswitch\n"
 		"\t-nc                    -- do not output to a console and background\n"
+#ifndef WIN32
+		"\t-ncwait                -- do not output to a console and background but wait until the system is ready before exiting (implies -nc)\n"
+#endif
 		"\t-c                     -- output to a console and stay in the foreground\n"
 		"\t-conf [confdir]        -- specify an alternate config dir\n"
 		"\t-log [logdir]          -- specify an alternate log dir\n"
@@ -518,7 +593,7 @@ int main(int argc, char *argv[])
 		}
 
 		if (local_argv[x] && !strcmp(local_argv[x], "-stop")) {
-			kill++;
+			do_kill++;
 			known_opt++;
 		}
 
@@ -526,7 +601,13 @@ int main(int argc, char *argv[])
 			nc++;
 			known_opt++;
 		}
-
+#ifndef WIN32
+		if (local_argv[x] && !strcmp(local_argv[x], "-ncwait")) {
+			nc++;
+			do_wait++;
+			known_opt++;
+		}
+#endif
 		if (local_argv[x] && !strcmp(local_argv[x], "-c")) {
 			nc = 0;
 			known_opt++;
@@ -664,7 +745,7 @@ int main(int argc, char *argv[])
 		strcpy(SWITCH_GLOBAL_dirs.run_dir, SWITCH_GLOBAL_dirs.log_dir);
 	}
 
-	if (kill) {
+	if (do_kill) {
 		return freeswitch_kill_background();
 	}
 
@@ -678,41 +759,33 @@ int main(int argc, char *argv[])
 		return 255;
 	}
 
-	signal(SIGILL, handle_SIGILL);
-	signal(SIGTERM, handle_SIGILL);
 
-	if (nc) {
-#ifdef WIN32
-		FreeConsole();
-#else
-		if (!nf) {
-			daemonize();
-		}
-#endif
-	}
 #if defined(HAVE_SETRLIMIT) && !defined(__sun)
 	if (!waste && !(flags & SCF_VG)) {
+		int x;
+
 		memset(&rlp, 0, sizeof(rlp));
-		getrlimit(RLIMIT_STACK, &rlp);
+		x = getrlimit(RLIMIT_STACK, &rlp);
+
 		if (rlp.rlim_max > SWITCH_THREAD_STACKSIZE) {
 			char buf[1024] = "";
 			int i = 0;
 
 			fprintf(stderr, "Error: stacksize %d is too large: run ulimit -s %d or run %s -waste.\nauto-adjusting stack size for optimal performance...\n",
 					(int) (rlp.rlim_max / 1024), SWITCH_THREAD_STACKSIZE / 1024, local_argv[0]);
-
+			
 			memset(&rlp, 0, sizeof(rlp));
 			rlp.rlim_cur = SWITCH_THREAD_STACKSIZE;
 			rlp.rlim_max = SWITCH_THREAD_STACKSIZE;
 			setrlimit(RLIMIT_STACK, &rlp);
-
+			
 			apr_terminate();
 			ret = (int) execv(argv[0], argv);
-
+			
 			for (i = 0; i < argc; i++) {
 				switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s ", argv[i]);
 			}
-
+			
 			return system(buf);
 
 		}
@@ -720,6 +793,25 @@ int main(int argc, char *argv[])
 #endif
 
 
+	signal(SIGILL, handle_SIGILL);
+	signal(SIGTERM, handle_SIGILL);
+#ifndef WIN32
+	if (do_wait) {
+		signal(SIGUSR2, handle_SIGUSR2);
+		signal(SIGCHLD, handle_SIGCHLD);
+	}
+#endif
+	
+	if (nc) {
+#ifdef WIN32
+		FreeConsole();
+#else
+		if (!nf) {
+			daemonize(do_wait);
+		}
+#endif
+	}
+
 
 
 	if (high_prio) {
@@ -800,6 +892,12 @@ int main(int argc, char *argv[])
 		return 255;
 	}
 
+#ifndef WIN32
+	if (do_wait) {
+		kill(getppid(), SIGUSR2);
+	}
+#endif
+
 	switch_core_runtime_loop(nc);
 
 	destroy_status = switch_core_destroy();
diff --git a/src/switch_channel.c b/src/switch_channel.c
index 9e76b46a5a..0b1b6e8f82 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1335,6 +1335,10 @@ SWITCH_DECLARE(void) switch_channel_set_flag_value(switch_channel_t *channel, sw
 		switch_channel_set_variable(channel, "is_outbound", "true");
 	}
 
+	if (flag == CF_RECOVERED) {
+		switch_channel_set_variable(channel, "recovered", "true");
+	}
+
 }
 
 SWITCH_DECLARE(void) switch_channel_set_flag_recursive(switch_channel_t *channel, switch_channel_flag_t flag)
@@ -1349,6 +1353,10 @@ SWITCH_DECLARE(void) switch_channel_set_flag_recursive(switch_channel_t *channel
 	if (flag == CF_OUTBOUND) {
 		switch_channel_set_variable(channel, "is_outbound", "true");
 	}
+
+	if (flag == CF_RECOVERED) {
+		switch_channel_set_variable(channel, "recovered", "true");
+	}
 }
 
 
@@ -1461,6 +1469,10 @@ SWITCH_DECLARE(void) switch_channel_clear_flag(switch_channel_t *channel, switch
 	if (flag == CF_OUTBOUND) {
 		switch_channel_set_variable(channel, "is_outbound", NULL);
 	}
+
+	if (flag == CF_RECOVERED) {
+		switch_channel_set_variable(channel, "recovered", NULL);
+	}
 }
 
 
diff --git a/src/switch_console.c b/src/switch_console.c
index 9f13823198..fdfb09bd80 100644
--- a/src/switch_console.c
+++ b/src/switch_console.c
@@ -238,9 +238,14 @@ SWITCH_DECLARE(char *) switch_console_expand_alias(char *cmd, char *arg)
 	char *sql = NULL;
 	char *exp = NULL;
 	switch_cache_db_handle_t *db = NULL;
+	switch_core_flag_t cflags = switch_core_flags();
 	int full = 0;
 
 	
+	if (!(cflags & SCF_USE_SQL)) {
+		return NULL;
+	}
+
 	if (switch_core_db_handle(&db) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database Error\n");
 		return NULL;
diff --git a/src/switch_core.c b/src/switch_core.c
index 1275b906e7..bd4b00d2ed 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -1237,6 +1237,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
 	runtime.max_dtmf_duration = SWITCH_MAX_DTMF_DURATION;
 	runtime.default_dtmf_duration = SWITCH_DEFAULT_DTMF_DURATION;
 	runtime.min_dtmf_duration = SWITCH_MIN_DTMF_DURATION;
+	runtime.odbc_dbtype = DBTYPE_DEFAULT;
 
 	/* INIT APR and Create the pool context */
 	if (apr_initialize() != SWITCH_STATUS_SUCCESS) {
@@ -1423,7 +1424,7 @@ static void switch_load_core_config(const char *file)
 {
 	switch_xml_t xml = NULL, cfg = NULL;
 
-	switch_core_hash_insert(runtime.ptimes, "ilbc", &d_30);
+	//switch_core_hash_insert(runtime.ptimes, "ilbc", &d_30);
 	switch_core_hash_insert(runtime.ptimes, "G723", &d_30);
 
 	if ((xml = switch_xml_open_cfg(file, &cfg, NULL))) {
@@ -1590,6 +1591,12 @@ static void switch_load_core_config(const char *file)
 					} else {
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n");
 					}
+				} else if (!strcasecmp(var, "core-dbtype") && !zstr(val)) {
+					if (!strcasecmp(val, "MSSQL")) {
+						runtime.odbc_dbtype = DBTYPE_MSSQL;
+					} else {
+						runtime.odbc_dbtype = DBTYPE_DEFAULT;
+					}
 #ifdef ENABLE_ZRTP
 				} else if (!strcasecmp(var, "rtp-enable-zrtp")) {
 					switch_core_set_variable("zrtp_enabled", val);
diff --git a/src/switch_core_event_hook.c b/src/switch_core_event_hook.c
index 63420f6f4f..102ea20776 100644
--- a/src/switch_core_event_hook.c
+++ b/src/switch_core_event_hook.c
@@ -35,6 +35,7 @@ NEW_HOOK_DECL(outgoing_channel)
 	NEW_HOOK_DECL(receive_message)
 	NEW_HOOK_DECL(receive_event)
 	NEW_HOOK_DECL(state_change)
+	NEW_HOOK_DECL(state_run)
 	NEW_HOOK_DECL(read_frame)
 	NEW_HOOK_DECL(write_frame)
 	NEW_HOOK_DECL(video_read_frame)
diff --git a/src/switch_core_file.c b/src/switch_core_file.c
index 7d5df8882a..af3897e48c 100644
--- a/src/switch_core_file.c
+++ b/src/switch_core_file.c
@@ -407,39 +407,56 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_write(switch_file_handle_t *fh,
 
 SWITCH_DECLARE(switch_status_t) switch_core_file_seek(switch_file_handle_t *fh, unsigned int *cur_pos, int64_t samples, int whence)
 {
-	size_t bytes = 0;
 	switch_status_t status;
-
+	int ok = 1;
+	
 	switch_assert(fh != NULL);
 	switch_assert(fh->file_interface != NULL);
 
-	if (!switch_test_flag(fh, SWITCH_FILE_OPEN) || !switch_test_flag(fh, SWITCH_FILE_FLAG_READ)) {
+	if (!switch_test_flag(fh, SWITCH_FILE_OPEN) || !fh->file_interface->file_seek) {
+		ok = 0;
+	} else if (switch_test_flag(fh, SWITCH_FILE_FLAG_WRITE)) {
+		if (!(switch_test_flag(fh, SWITCH_FILE_WRITE_APPEND) || switch_test_flag(fh, SWITCH_FILE_WRITE_OVER))) {
+			ok = 0;
+		}
+	} else if (!switch_test_flag(fh, SWITCH_FILE_FLAG_READ)) {
+		ok = 0;
+	}
+	
+	if (!ok) {
 		return SWITCH_STATUS_FALSE;
 	}
-
-	if (!fh->file_interface->file_seek) {
-		return SWITCH_STATUS_FALSE;
-	}
-
+	
 	if (fh->buffer) {
-		bytes += switch_buffer_inuse(fh->buffer);
 		switch_buffer_zero(fh->buffer);
 	}
 
 	if (fh->pre_buffer) {
-		bytes += switch_buffer_inuse(fh->pre_buffer);
 		switch_buffer_zero(fh->pre_buffer);
 	}
 
 	if (whence == SWITCH_SEEK_CUR) {
-		samples -= bytes / sizeof(int16_t);
+		unsigned int cur = 0;
+
+		if (switch_test_flag(fh, SWITCH_FILE_FLAG_WRITE)) {
+			fh->file_interface->file_seek(fh, &cur, fh->samples_out, SEEK_SET);
+		} else {
+			fh->file_interface->file_seek(fh, &cur, fh->offset_pos, SEEK_SET);
+		}
 	}
 
 	switch_set_flag(fh, SWITCH_FILE_SEEK);
 	status = fh->file_interface->file_seek(fh, cur_pos, samples, whence);
+
 	if (samples) {
 		fh->offset_pos = *cur_pos;
+
+		if (switch_test_flag(fh, SWITCH_FILE_FLAG_WRITE)) {
+			fh->samples_out = *cur_pos;
+		}
 	}
+
+
 	return status;
 }
 
diff --git a/src/switch_core_io.c b/src/switch_core_io.c
index 4e6d2fc6a2..cd25622b5d 100644
--- a/src/switch_core_io.c
+++ b/src/switch_core_io.c
@@ -105,8 +105,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
 	switch_io_event_hook_read_frame_t *ptr;
 	switch_status_t status = SWITCH_STATUS_FALSE;
 	int need_codec, perfect, do_bugs = 0, do_resample = 0, is_cng = 0;
-	unsigned int flag = 0;
 	switch_codec_implementation_t codec_impl;
+	unsigned int flag = 0;
 
 	switch_assert(session != NULL);
 
@@ -119,10 +119,20 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
 			return SWITCH_STATUS_SUCCESS;
 		}
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s has no read codec.\n", switch_channel_get_name(session->channel));
+		switch_channel_hangup(session->channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION);
 		return SWITCH_STATUS_FALSE;
 	}
 
 	switch_mutex_lock(session->codec_read_mutex);
+
+	if (!switch_core_codec_ready(session->read_codec)) {
+		switch_mutex_unlock(session->codec_read_mutex);
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s has no read codec.\n", switch_channel_get_name(session->channel));
+		switch_channel_hangup(session->channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION);
+		*frame = &runtime.dummy_cng_frame;
+        return SWITCH_STATUS_FALSE;
+	}
+
 	switch_mutex_lock(session->read_codec->mutex);
 
   top:
@@ -180,6 +190,15 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
 		}
 
 		switch_mutex_lock(session->codec_read_mutex);
+
+		if (!switch_core_codec_ready(session->read_codec)) {
+			switch_mutex_unlock(session->codec_read_mutex);
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s has no read codec.\n", switch_channel_get_name(session->channel));
+			switch_channel_hangup(session->channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION);
+			*frame = &runtime.dummy_cng_frame;
+			return SWITCH_STATUS_FALSE;
+		}
+
 		switch_mutex_lock(session->read_codec->mutex);
 		if (!switch_core_codec_ready(session->read_codec)) {
 			*frame = NULL;
@@ -296,7 +315,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
 												  read_frame->data,
 												  read_frame->datalen,
 												  session->read_impl.actual_samples_per_second,
-												  session->raw_read_frame.data, &session->raw_read_frame.datalen, &session->raw_read_frame.rate, &flag);
+												  session->raw_read_frame.data, &session->raw_read_frame.datalen, &session->raw_read_frame.rate, 
+												  &read_frame->flags);
 			}
 
 			if (do_resample && ((status == SWITCH_STATUS_SUCCESS) || is_cng)) {
@@ -367,13 +387,17 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
 			}
 		}
 
-		if (session->bugs && !switch_channel_test_flag(session->channel, CF_PAUSE_BUGS)) {
+		if (session->bugs) {
 			switch_media_bug_t *bp;
 			switch_bool_t ok = SWITCH_TRUE;
 			int prune = 0;
 			switch_thread_rwlock_rdlock(session->bug_rwlock);
 
 			for (bp = session->bugs; bp; bp = bp->next) {
+				if (switch_channel_test_flag(session->channel, CF_PAUSE_BUGS) && !switch_core_media_bug_test_flag(bp, SMBF_NO_PAUSE)) {
+					continue;
+				}
+
 				if (!switch_channel_test_flag(session->channel, CF_ANSWERED) && switch_core_media_bug_test_flag(bp, SMBF_ANSWER_REQ)) {
 					continue;
 				}
@@ -528,12 +552,16 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
 		if (flag & SFF_CNG) {
 			switch_set_flag((*frame), SFF_CNG);
 		}
-		if (session->bugs && !switch_channel_test_flag(session->channel, CF_PAUSE_BUGS)) {
+		if (session->bugs) {
 			switch_media_bug_t *bp;
 			switch_bool_t ok = SWITCH_TRUE;
 			int prune = 0;
 			switch_thread_rwlock_rdlock(session->bug_rwlock);
 			for (bp = session->bugs; bp; bp = bp->next) {
+				if (switch_channel_test_flag(session->channel, CF_PAUSE_BUGS) && !switch_core_media_bug_test_flag(bp, SMBF_NO_PAUSE)) {
+					continue;
+				}
+
 				if (!switch_channel_test_flag(session->channel, CF_ANSWERED) && switch_core_media_bug_test_flag(bp, SMBF_ANSWER_REQ)) {
 					continue;
 				}
@@ -622,6 +650,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
 
 	if (!(session->write_codec && switch_core_codec_ready(session->write_codec)) && !pass_cng) {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s has no write codec.\n", switch_channel_get_name(session->channel));
+		switch_channel_hangup(session->channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION);
 		return SWITCH_STATUS_FALSE;
 	}
 
@@ -637,11 +666,19 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
 		return status;
 	}
 
+	switch_mutex_lock(session->codec_write_mutex);
+
+	if (!(frame->codec && frame->codec->implementation)) {
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s has received a bad frame with no codec!\n", 
+						  switch_channel_get_name(session->channel));
+		switch_channel_hangup(session->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
+		switch_mutex_unlock(session->codec_write_mutex);
+		return SWITCH_STATUS_FALSE;
+	}
+
 	switch_assert(frame->codec != NULL);
 	switch_assert(frame->codec->implementation != NULL);
 
-	switch_mutex_lock(session->codec_write_mutex);
-
 	if (!(switch_core_codec_ready(session->write_codec) && frame->codec) ||
 		!switch_channel_ready(session->channel) || !switch_channel_media_ready(session->channel)) {
 		switch_mutex_unlock(session->codec_write_mutex);
@@ -721,7 +758,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
 										  frame->data,
 										  frame->datalen,
 										  session->write_impl.actual_samples_per_second,
-										  session->raw_write_frame.data, &session->raw_write_frame.datalen, &session->raw_write_frame.rate, &flag);
+										  session->raw_write_frame.data, &session->raw_write_frame.datalen, &session->raw_write_frame.rate, &frame->flags);
 
 
 
@@ -814,7 +851,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
 
 
 
-	if (session->bugs && !switch_channel_test_flag(session->channel, CF_PAUSE_BUGS)) {
+	if (session->bugs) {
 		switch_media_bug_t *bp;
 		int prune = 0;
 
@@ -825,6 +862,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
 				continue;
 			}
 
+			if (switch_channel_test_flag(session->channel, CF_PAUSE_BUGS) && !switch_core_media_bug_test_flag(bp, SMBF_NO_PAUSE)) {
+				continue;
+			}
+
 			if (!switch_channel_test_flag(session->channel, CF_ANSWERED) && switch_core_media_bug_test_flag(bp, SMBF_ANSWER_REQ)) {
 				continue;
 			}
diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index c8aca7dbc6..b3bb638c76 100644
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -790,10 +790,17 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_dequeue_message(switch_core_
 
 SWITCH_DECLARE(switch_status_t) switch_core_session_flush_message(switch_core_session_t *session)
 {
+	switch_status_t status = SWITCH_STATUS_FALSE;
+	void *pop;
 	switch_core_session_message_t *message;
 
-	while (switch_core_session_dequeue_message(session, &message) == SWITCH_STATUS_SUCCESS) {
-		switch_core_session_free_message(&message);
+	switch_assert(session != NULL);
+
+	if (session->message_queue) {
+		while ((status = (switch_status_t) switch_queue_trypop(session->message_queue, &pop)) == SWITCH_STATUS_SUCCESS) {
+			message = (switch_core_session_message_t *) pop;
+			switch_core_session_free_message(&message);
+		}
 	}
 
 	return SWITCH_STATUS_SUCCESS;
@@ -1437,7 +1444,7 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_xml(switch_e
 			}
 		}
 	}
-
+	
 	if ((callflow = switch_xml_child(xml, "callflow"))) {
 		if ((tag2 = switch_xml_child(callflow, "caller_profile"))) {
 			switch_caller_profile_t *caller_profile;
@@ -1528,6 +1535,8 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_xml(switch_e
 
 		}
 
+
+		switch_channel_set_flag(channel, CF_RECOVERED);
 	}
 
 
diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index c467a23a62..509d989581 100644
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -62,6 +62,10 @@ SWITCH_DECLARE(switch_status_t) _switch_core_db_handle(switch_cache_db_handle_t
 {
 	switch_cache_db_connection_options_t options = { {0} };
 	switch_status_t r;
+	
+	if (!sql_manager.manage) {
+		return SWITCH_STATUS_FALSE;
+	}
 
 	if (!zstr(runtime.odbc_dsn)) {
 		options.odbc_options.dsn = runtime.odbc_dsn;
@@ -695,7 +699,16 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_persistant_execute_trans(switch_
 	while (begin_retries > 0) {
 		again = 0;
 
-		switch_cache_db_execute_sql_real(dbh, "BEGIN", &errmsg);
+		if (runtime.odbc_dbtype == DBTYPE_DEFAULT) {
+			switch_cache_db_execute_sql_real(dbh, "BEGIN", &errmsg);
+		} else {
+			switch_odbc_status_t result;
+			if ((result = switch_odbc_SQLSetAutoCommitAttr(dbh->native_handle.odbc_dbh, 0)) != SWITCH_ODBC_SUCCESS) {
+				char tmp[100];
+				switch_snprintf(tmp, sizeof(tmp), "%s-%i", "Unable to Set AutoCommit Off", result);
+				errmsg = strdup(tmp);
+			}
+		}
 
 		if (errmsg) {
 			begin_retries--;
@@ -708,7 +721,13 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_persistant_execute_trans(switch_
 			errmsg = NULL;
 
 			if (again) {
-				switch_cache_db_execute_sql_real(dbh, "COMMIT", NULL);
+				if (runtime.odbc_dbtype == DBTYPE_DEFAULT) {
+					switch_cache_db_execute_sql_real(dbh, "COMMIT", NULL);
+				} else  {
+					switch_odbc_SQLEndTran(dbh->native_handle.odbc_dbh, 1);
+					switch_odbc_SQLSetAutoCommitAttr(dbh->native_handle.odbc_dbh, 1);
+				}
+
 				goto again;
 			}
 
@@ -746,7 +765,12 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_persistant_execute_trans(switch_
 
  done:
 
-	switch_cache_db_execute_sql_real(dbh, "COMMIT", NULL);
+	if (runtime.odbc_dbtype == DBTYPE_DEFAULT) {
+		switch_cache_db_execute_sql_real(dbh, "COMMIT", NULL);
+	} else {
+		switch_odbc_SQLEndTran(dbh->native_handle.odbc_dbh, 1);
+		switch_odbc_SQLSetAutoCommitAttr(dbh->native_handle.odbc_dbh, 1);
+	}
 
 	if (dbh->io_mutex) {
 		switch_mutex_unlock(dbh->io_mutex);
@@ -1300,6 +1324,7 @@ static void core_event_handler(switch_event_t *event)
 	case SWITCH_EVENT_CHANNEL_BRIDGE:
 		{
 			const char *callee_cid_name, *callee_cid_num, *direction;
+			char *func_name;
 
 			direction = switch_event_get_header(event, "other-leg-direction");
 
@@ -1315,10 +1340,19 @@ static void core_event_handler(switch_event_t *event)
 			new_sql() = switch_mprintf("update channels set call_uuid='%q' where uuid='%s' and hostname='%q'",
 									   switch_event_get_header_nil(event, "channel-call-uuid"),
 									   switch_event_get_header_nil(event, "unique-id"), switch_core_get_variable("hostname"));
-			new_sql() = switch_mprintf("insert into calls (call_uuid,call_created,call_created_epoch,function,caller_cid_name,"
+
+			if (runtime.odbc_dbtype == DBTYPE_DEFAULT) {
+				func_name = "function";
+			}
+			else {
+				func_name = "call_function";
+			}
+
+			new_sql() = switch_mprintf("insert into calls (call_uuid,call_created,call_created_epoch,%s,caller_cid_name,"
 									   "caller_cid_num,caller_dest_num,caller_chan_name,caller_uuid,callee_cid_name,"
 									   "callee_cid_num,callee_dest_num,callee_chan_name,callee_uuid,hostname) "
 									   "values ('%s', '%s', '%ld', '%s','%q','%q','%q','%q','%s','%q','%q','%q','%q','%s','%q')",
+									   func_name,
 									   switch_event_get_header_nil(event, "channel-call-uuid"),
 									   switch_event_get_header_nil(event, "event-date-local"),
 									   (long) switch_epoch_time_now(NULL),
@@ -1559,6 +1593,8 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
 
  top:
 
+	if (!sql_manager.manage) goto skip;
+
 	/* Activate SQL database */
 	if (switch_core_db_handle(&dbh) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB!\n");
@@ -1618,11 +1654,21 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
 		{
 			char *err;
 			switch_cache_db_test_reactive(dbh, "select call_uuid, read_bit_rate from channels", "DROP TABLE channels", create_channels_sql);
-			switch_cache_db_test_reactive(dbh, "select call_uuid from calls", "DROP TABLE calls", create_calls_sql);
+			if (runtime.odbc_dbtype == DBTYPE_DEFAULT) {
+				switch_cache_db_test_reactive(dbh, "select call_uuid from calls", "DROP TABLE calls", create_calls_sql);
+			} else {
+				char *tmp = switch_string_replace(create_calls_sql, "function", "call_function");
+				switch_cache_db_test_reactive(dbh, "select call_uuid from calls", "DROP TABLE calls", tmp);
+				free(tmp);
+			}
 			switch_cache_db_test_reactive(dbh, "select ikey from interfaces", "DROP TABLE interfaces", create_interfaces_sql);
 			switch_cache_db_test_reactive(dbh, "select hostname from tasks", "DROP TABLE tasks", create_tasks_sql);
 
-			switch_cache_db_execute_sql(dbh, "begin;delete from channels where hostname='';delete from channels where hostname='';commit;", &err);
+			if (runtime.odbc_dbtype == DBTYPE_DEFAULT) {
+				switch_cache_db_execute_sql(dbh, "begin;delete from channels where hostname='';delete from channels where hostname='';commit;", &err);
+			} else {
+				switch_cache_db_execute_sql(dbh, "delete from channels where hostname='';delete from channels where hostname='';", &err);
+			}
 
 			if (err) {
 				runtime.odbc_dsn = NULL;
@@ -1666,6 +1712,7 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
 	switch_cache_db_execute_sql(dbh, "create index channels1 on channels(hostname)", NULL);
 	switch_cache_db_execute_sql(dbh, "create index calls1 on calls(hostname)", NULL);
 
+ skip:
 
 	if (sql_manager.manage) {
 		if (switch_event_bind_removable("core_db", SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY,
@@ -1688,7 +1735,7 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
 		switch_yield(10000);
 	}
 
-	switch_cache_db_release_db_handle(&dbh);
+	if (sql_manager.manage) switch_cache_db_release_db_handle(&dbh);
 
 	return SWITCH_STATUS_SUCCESS;
 }
diff --git a/src/switch_core_state_machine.c b/src/switch_core_state_machine.c
index 2b8a6ced16..c77f3f1a68 100644
--- a/src/switch_core_state_machine.c
+++ b/src/switch_core_state_machine.c
@@ -156,9 +156,13 @@ static void switch_core_standard_on_execute(switch_core_session_t *session)
 
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard EXECUTE\n", switch_channel_get_name(session->channel));
 
+	if (switch_channel_get_variable(session->channel, "recovered") && !switch_channel_test_flag(session->channel, CF_RECOVERED)) {
+		switch_channel_set_flag(session->channel, CF_RECOVERED);
+	}
+
   top:
 	switch_channel_clear_flag(session->channel, CF_RESET);
-
+	
 	if ((extension = switch_channel_get_caller_extension(session->channel)) == 0) {
 		switch_channel_hangup(session->channel, SWITCH_CAUSE_NORMAL_CLEARING);
 		return;
@@ -310,11 +314,25 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
 			int proceed = 1;
 			int global_proceed = 1;
 			int do_extra_handlers = 1;
+			switch_io_event_hook_state_run_t *ptr;
+			switch_status_t rstatus = SWITCH_STATUS_SUCCESS;
 
 			switch_channel_set_running_state(session->channel, state);
 			switch_channel_clear_flag(session->channel, CF_TRANSFER);
 			switch_channel_clear_flag(session->channel, CF_REDIRECT);
-
+			
+			if (session->endpoint_interface->io_routines->state_run) {
+				rstatus = session->endpoint_interface->io_routines->state_run(session);
+			}
+			
+			if (rstatus == SWITCH_STATUS_SUCCESS) {
+				for (ptr = session->event_hooks.state_run; ptr; ptr = ptr->next) {
+					if ((rstatus = ptr->state_run(session)) != SWITCH_STATUS_SUCCESS) {
+						break;
+					}
+				}
+			}
+			
 			switch (state) {
 			case CS_NEW:		/* Just created, Waiting for first instructions */
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "(%s) State NEW\n", switch_channel_get_name(session->channel));
@@ -391,6 +409,8 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
 					message = NULL;
 				}
 
+				switch_ivr_parse_all_events(session);
+
 				if (switch_channel_get_state(session->channel) == switch_channel_get_running_state(session->channel)) {
 					switch_channel_set_flag(session->channel, CF_THREAD_SLEEPING);
 					if (switch_channel_get_state(session->channel) == switch_channel_get_running_state(session->channel)) {
@@ -399,6 +419,8 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
 					switch_channel_clear_flag(session->channel, CF_THREAD_SLEEPING);
 				}
 
+				switch_ivr_parse_all_events(session);
+
 				while (switch_core_session_dequeue_message(session, &message) == SWITCH_STATUS_SUCCESS) {
 					switch_core_session_receive_message(session, message);
 					message = NULL;
diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c
index 9bfa27eae7..afd0fdbb70 100644
--- a/src/switch_ivr_async.c
+++ b/src/switch_ivr_async.c
@@ -72,6 +72,21 @@ struct switch_ivr_dmachine {
 	void *user_data;
 };
 
+
+SWITCH_DECLARE(void) switch_ivr_dmachine_set_match_callback(switch_ivr_dmachine_t *dmachine, switch_ivr_dmachine_callback_t match_callback)
+{
+
+	dmachine->match_callback = match_callback;
+
+}
+
+SWITCH_DECLARE(void) switch_ivr_dmachine_set_nonmatch_callback(switch_ivr_dmachine_t *dmachine, switch_ivr_dmachine_callback_t nonmatch_callback)
+{
+
+	dmachine->nonmatch_callback = nonmatch_callback;
+
+}
+
 SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_create(switch_ivr_dmachine_t **dmachine_p, 
 														   const char *name,
 														   switch_memory_pool_t *pool,
@@ -223,11 +238,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_bind(switch_ivr_dmachine_t *
 	}
 	
 	if (binding->is_regex) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Digit parser %s: binding realm: %s regex: %s key: %.4d callback: %p data: %p\n", 
-						  dmachine->name, realm, digits, key, (void *)(intptr_t) callback, user_data);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Digit parser %s: binding %s/%s/%d callback: %p data: %p\n", 
+						  dmachine->name, digits, realm, key, (void *)(intptr_t) callback, user_data);
 	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Digit parser %s: binding realm %s digits: %4s key: %.4d callback: %p data: %p\n", 
-						  dmachine->name, realm, digits, key, (void *)(intptr_t) callback, user_data);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Digit parser %s: binding %s/%s/%d callback: %p data: %p\n", 
+						  dmachine->name, digits, realm, key, (void *)(intptr_t) callback, user_data);
 	}
 
 	return SWITCH_STATUS_SUCCESS;
@@ -244,60 +259,62 @@ typedef enum {
 static dm_match_t switch_ivr_dmachine_check_match(switch_ivr_dmachine_t *dmachine, switch_bool_t is_timeout)
 {
 	dm_match_t best = DM_MATCH_NONE;
-	switch_ivr_dmachine_binding_t *bp, *exact_bp = NULL;
-	int exact_count = 0, partial_count = 0, both_count = 0;
+	switch_ivr_dmachine_binding_t *bp, *exact_bp = NULL, *partial_bp = NULL, *both_bp = NULL, *r_bp = NULL;
 	
-
 	if (!dmachine->cur_digit_len || !dmachine->realm) goto end;
 
 	for(bp = dmachine->realm->binding_list; bp; bp = bp->next) {
-
 		if (bp->is_regex) {
 			switch_status_t r_status = switch_regex_match(dmachine->digits, bp->digits);
 
 			if (r_status == SWITCH_STATUS_SUCCESS) {
 				if (is_timeout) {
 					best = DM_MATCH_EXACT;
-					exact_count++;
 					exact_bp = bp;
 					break;
 				}
 
 				best = DM_MATCH_PARTIAL;
-				partial_count++;
-				continue;
 			}
 		} else {
+
 			if (!exact_bp && !strcmp(bp->digits, dmachine->digits)) {
-				exact_bp = bp;				
 				best = DM_MATCH_EXACT;
-				exact_count++;
-				continue;
+				exact_bp = bp;
+				if (dmachine->cur_digit_len == dmachine->max_digit_len) break;
 			}
 
-			if (!strncmp(dmachine->digits, bp->digits, strlen(dmachine->digits))) {
-				if (best == DM_MATCH_EXACT) {
-					if (is_timeout) {
-						best = DM_MATCH_EXACT;
-						exact_count++;
-						exact_bp = bp;
-					} else {
-						best = DM_MATCH_BOTH;
-						both_count++;
-					}
+			if (!(both_bp && partial_bp) && !strncmp(dmachine->digits, bp->digits, strlen(dmachine->digits))) {
+				if (exact_bp) {
+					best = DM_MATCH_BOTH;
+					both_bp = bp;
 				} else {
 					best = DM_MATCH_PARTIAL;
-					partial_count++;
+					partial_bp = bp;
 				}
-				break;
 			}
+
+			if (both_bp && exact_bp && partial_bp) break;
 		}
 	}
 	
  end:
+
+	if (is_timeout) {
+		if (both_bp) {
+			r_bp = exact_bp ? exact_bp : both_bp;
+		} else if (partial_bp) {
+			r_bp = partial_bp;
+		}
+	} 
+
+	if (best == DM_MATCH_EXACT && exact_bp) {
+		r_bp = exact_bp;
+	}
 	
-	if (!both_count && exact_bp) {
-		dmachine->last_matching_binding = exact_bp;
+	
+	if (r_bp) {
+		dmachine->last_matching_binding = r_bp;
 		switch_set_string(dmachine->last_matching_digits, dmachine->digits);
 		best = DM_MATCH_EXACT;
 	}
@@ -342,8 +359,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_ping(switch_ivr_dmachine_t *
 {
 	switch_bool_t is_timeout = switch_ivr_dmachine_check_timeout(dmachine);
 	dm_match_t is_match = switch_ivr_dmachine_check_match(dmachine, is_timeout);
-	switch_status_t r;
-
+	switch_status_t r, s;
+	int clear = 0;
+	
 	if (zstr(dmachine->digits) && !is_timeout) {
 		r = SWITCH_STATUS_SUCCESS;
 	} else if (dmachine->cur_digit_len > dmachine->max_digit_len) {
@@ -362,25 +380,49 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_ping(switch_ivr_dmachine_t *
 		dmachine->is_match = 1;
 
 		dmachine->match.type = DM_MATCH_POSITIVE;
-
+		
 		if (dmachine->last_matching_binding->callback) {
-			dmachine->last_matching_binding->callback(&dmachine->match);
+			s = dmachine->last_matching_binding->callback(&dmachine->match);
+			
+			switch(s) {
+			case SWITCH_STATUS_CONTINUE:
+				r = SWITCH_STATUS_SUCCESS;
+				break;
+			case SWITCH_STATUS_SUCCESS:
+				break;
+			default:
+				r = SWITCH_STATUS_BREAK;
+				break;
+			}
 		}
 
 		if (dmachine->match_callback) {
 			dmachine->match.user_data = dmachine->user_data;
-			dmachine->match_callback(&dmachine->match);
+			s = dmachine->match_callback(&dmachine->match);
+
+			switch(s) {
+			case SWITCH_STATUS_CONTINUE:
+				r = SWITCH_STATUS_SUCCESS;
+				break;
+			case SWITCH_STATUS_SUCCESS:
+				break;
+			default:
+				r = SWITCH_STATUS_BREAK;
+				break;
+			}
+
 		}
-		
+
+		clear++;
 	} else if (is_timeout) {
 		r = SWITCH_STATUS_TIMEOUT;
-	} else if (dmachine->cur_digit_len == dmachine->max_digit_len) {
+	} else if (is_match == DM_MATCH_NONE && dmachine->cur_digit_len == dmachine->max_digit_len) {
 		r = SWITCH_STATUS_NOTFOUND;
 	} else {
 		r = SWITCH_STATUS_SUCCESS;
 	}
 	
-	if (r != SWITCH_STATUS_FOUND && r != SWITCH_STATUS_SUCCESS) {
+	if (r != SWITCH_STATUS_FOUND && r != SWITCH_STATUS_SUCCESS && r != SWITCH_STATUS_BREAK) {
 		switch_set_string(dmachine->last_failed_digits, dmachine->digits);
 		dmachine->match.match_digits = dmachine->last_failed_digits;
 		
@@ -388,11 +430,25 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_ping(switch_ivr_dmachine_t *
 		
 		if (dmachine->nonmatch_callback) {
 			dmachine->match.user_data = dmachine->user_data;
-			dmachine->nonmatch_callback(&dmachine->match);
+			s = dmachine->nonmatch_callback(&dmachine->match);
+
+			switch(s) {
+			case SWITCH_STATUS_CONTINUE:
+				r = SWITCH_STATUS_SUCCESS;
+				break;
+			case SWITCH_STATUS_SUCCESS:
+				break;
+			default:
+				r = SWITCH_STATUS_BREAK;
+				break;
+			}
+
 		}
+		
+		clear++;
 	}
 	
-	if (r != SWITCH_STATUS_SUCCESS) {
+	if (clear) {
 		switch_ivr_dmachine_clear(dmachine);
 	}
 
@@ -414,6 +470,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_feed(switch_ivr_dmachine_t *
 
 SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_clear(switch_ivr_dmachine_t *dmachine)
 {
+
 	memset(dmachine->digits, 0, sizeof(dmachine->digits));
 	dmachine->cur_digit_len = 0;
 	dmachine->last_digit_time = 0;
@@ -827,10 +884,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_displace_session(switch_core_session_
 
 	if (flags && strchr(flags, 'r')) {
 		status = switch_core_media_bug_add(session, "displace", file,
-										   read_displace_callback, dh, to, SMBF_WRITE_REPLACE | SMBF_READ_REPLACE, &bug);
+										   read_displace_callback, dh, to, SMBF_WRITE_REPLACE | SMBF_READ_REPLACE | SMBF_NO_PAUSE, &bug);
 	} else {
 		status = switch_core_media_bug_add(session, "displace", file,
-										   write_displace_callback, dh, to, SMBF_WRITE_REPLACE | SMBF_READ_REPLACE, &bug);
+										   write_displace_callback, dh, to, SMBF_WRITE_REPLACE | SMBF_READ_REPLACE | SMBF_NO_PAUSE, &bug);
 	}
 
 	if (status != SWITCH_STATUS_SUCCESS) {
@@ -871,6 +928,8 @@ static switch_bool_t record_callback(switch_media_bug_t *bug, void *user_data, s
 		break;
 	case SWITCH_ABC_TYPE_CLOSE:
 		{
+			const char *var;
+
 			switch_codec_implementation_t read_impl = { 0 };
 			switch_core_session_get_read_impl(session, &read_impl);
 
@@ -906,9 +965,45 @@ static switch_bool_t record_callback(switch_media_bug_t *bug, void *user_data, s
 				switch_core_file_close(rh->fh);
 				if (rh->fh->samples_out < rh->fh->samplerate * rh->min_sec) {
 					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Discarding short file %s\n", rh->file);
+					switch_channel_set_variable(channel, "RECORD_DISCARDED", "true");
 					switch_file_remove(rh->file, switch_core_session_get_pool(session));
 				}
 			}
+
+			if ((var = switch_channel_get_variable(channel, "record_post_process_exec_app"))) {
+				char *app = switch_core_session_strdup(session, var);
+				char *data;
+
+				if ((data = strchr(app, ':'))) {
+					*data++ = '\0';
+				}
+
+				switch_core_session_execute_application(session, app, data);
+			}
+
+			if ((var = switch_channel_get_variable(channel, "record_post_process_exec_api"))) {
+				char *cmd = switch_core_session_strdup(session, var);
+				char *data, *expanded = NULL;
+				switch_stream_handle_t stream = { 0 };
+
+				SWITCH_STANDARD_STREAM(stream);
+
+				if ((data = strchr(cmd, ':'))) {
+					*data++ = '\0';
+					expanded = switch_channel_expand_variables(channel, data);
+				}
+
+				switch_api_execute(cmd, expanded, session, &stream);
+
+				if (expanded && expanded != data) {
+					free(expanded);
+				}
+
+				switch_safe_free(stream.data);
+
+			}
+
+
 		}
 
 		break;
@@ -1066,11 +1161,17 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
 		switch_core_session_message_t msg = { 0 };
 		char cid_buf[1024] = "";
 		switch_caller_profile_t *cp = NULL;
+		uint32_t sanity = 600;
 
 		if (!switch_channel_media_ready(channel)) {
 			goto end;
 		}
 
+		while(switch_channel_state_change_pending(tchannel)) {
+			switch_yield(10000);
+			if (!--sanity) break;
+		}
+
 		if (!switch_channel_media_ready(tchannel)) {
 			goto end;
 		}
@@ -1166,7 +1267,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
 
 		if (switch_core_media_bug_add(tsession, "eavesdrop", uuid,
 									  eavesdrop_callback, ep, 0,
-									  SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_REPLACE | SMBF_WRITE_REPLACE | SMBF_READ_PING | SMBF_THREAD_LOCK,
+									  SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_REPLACE | SMBF_WRITE_REPLACE | 
+									  SMBF_READ_PING | SMBF_THREAD_LOCK | SMBF_NO_PAUSE,
 									  &bug) != SWITCH_STATUS_SUCCESS) {
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot attach bug\n");
 			goto end;
@@ -1622,7 +1724,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_preprocess_session(switch_core_sessio
 	switch_media_bug_t *bug;
 	switch_status_t status;
 	time_t to = 0;
-	switch_media_bug_flag_t flags = 0;
+	switch_media_bug_flag_t flags = SMBF_NO_PAUSE;
 	switch_codec_implementation_t read_impl = { 0 };
 	pp_cb_t *cb;
 	int update = 0;
@@ -1885,7 +1987,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_session_audio(switch_core_session_t *
 	switch_status_t status;
 	switch_session_audio_t *pvt;
 	switch_codec_implementation_t read_impl = { 0 };
-	int existing = 0, c_read = 0, c_write = 0, flags = 0;
+	int existing = 0, c_read = 0, c_write = 0, flags = SMBF_NO_PAUSE;
 
 	if (switch_channel_pre_answer(channel) != SWITCH_STATUS_SUCCESS) {
 		return SWITCH_STATUS_FALSE;
@@ -2035,7 +2137,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_inband_dtmf_session(switch_core_sessi
 	}
 
 	if ((status = switch_core_media_bug_add(session, "inband_dtmf", NULL,
-											inband_dtmf_callback, pvt, 0, SMBF_READ_REPLACE, &bug)) != SWITCH_STATUS_SUCCESS) {
+											inband_dtmf_callback, pvt, 0, SMBF_READ_REPLACE | SMBF_NO_PAUSE, &bug)) != SWITCH_STATUS_SUCCESS) {
 		return status;
 	}
 
@@ -2085,6 +2187,20 @@ static switch_status_t generate_on_dtmf(switch_core_session_t *session, const sw
 				switch_zmalloc(dt, sizeof(*dt));
 				*dt = *dtmf;
 				if (switch_queue_trypush(pvt->digit_queue, dt) == SWITCH_STATUS_SUCCESS) {
+					switch_event_t *event;
+					
+					if (switch_event_create(&event, SWITCH_EVENT_DTMF) == SWITCH_STATUS_SUCCESS) {
+						switch_channel_event_set_data(channel, event);
+						switch_event_add_header(event, SWITCH_STACK_BOTTOM, "DTMF-Digit", "%c", dtmf->digit);
+						switch_event_add_header(event, SWITCH_STACK_BOTTOM, "DTMF-Duration", "%u", dtmf->duration);
+						switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "DTMF-Conversion", "native:inband");
+						if (switch_channel_test_flag(channel, CF_DIVERT_EVENTS)) {
+							switch_core_session_queue_event(session, &event);
+						} else {
+							switch_event_fire(&event);
+						}
+					}
+					
 					dt = NULL;
 					/* 
 					   SWITCH_STATUS_FALSE indicates pretend there never was a DTMF
@@ -2236,7 +2352,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_inband_dtmf_generate_session(switch_c
 
 	if ((status = switch_core_media_bug_add(session, "inband_dtmf_generate", NULL,
 											inband_dtmf_generate_callback, pvt, 0,
-											pvt->read ? SMBF_READ_REPLACE : SMBF_WRITE_REPLACE, &bug)) != SWITCH_STATUS_SUCCESS) {
+											SMBF_NO_PAUSE | pvt->read ? SMBF_READ_REPLACE : SMBF_WRITE_REPLACE , &bug)) != SWITCH_STATUS_SUCCESS) {
 		return status;
 	}
 
@@ -2269,8 +2385,39 @@ typedef struct {
 	switch_media_bug_t *bug;
 	switch_core_session_t *session;
 	int bug_running;
+	int detect_fax;
 } switch_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);
+	switch_tone_container_t *cont = switch_channel_get_private(channel, "_tone_detect_");
+	switch_event_t *event;
+	int i;
+
+	if (!cont || !cont->detect_fax || dtmf->digit != 'f') {
+		return SWITCH_STATUS_SUCCESS;
+	}
+
+	i = cont->detect_fax;
+
+	if (cont->list[i].callback) {
+		cont->list[i].callback(cont->session, cont->list[i].app, cont->list[i].data);
+	} else if (cont->list[i].app) {
+		if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
+			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute");
+			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", cont->list[i].app);
+			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", cont->list[i].data);
+			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5);
+			switch_core_session_queue_private_event(cont->session, &event, SWITCH_FALSE);
+		}
+	}
+		
+	return SWITCH_STATUS_SUCCESS;
+
+}
+
+
 static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
 {
 	switch_tone_container_t *cont = (switch_tone_container_t *) user_data;
@@ -2402,6 +2549,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_tone_detect_session(switch_core_
 			cont->list[i].up = 0;
 		}
 		switch_core_media_bug_remove(session, &cont->bug);
+		if (cont->detect_fax) {
+			cont->detect_fax = 0;
+		}
 		return SWITCH_STATUS_SUCCESS;
 	}
 	return SWITCH_STATUS_FALSE;
@@ -2416,7 +2566,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_sessi
 	switch_status_t status;
 	switch_tone_container_t *cont = switch_channel_get_private(channel, "_tone_detect_");
 	char *p, *next;
-	int i = 0, ok = 0;
+	int i = 0, ok = 0, detect_fax = 0;
 	switch_media_bug_flag_t bflags = 0;
 	const char *var;
 	switch_codec_implementation_t read_impl = { 0 };
@@ -2469,6 +2619,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_sessi
 			ok++;
 			cont->list[cont->index].map.freqs[i++] = this;
 		}
+		if (!strncasecmp(p, "1100", 4)) {
+			detect_fax = cont->index;
+		}
+
 		if (next) {
 			p = next + 1;
 		}
@@ -2480,6 +2634,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_sessi
 		return SWITCH_STATUS_FALSE;
 	}
 
+	cont->detect_fax = detect_fax;
+
 	cont->list[cont->index].key = switch_core_session_strdup(session, key);
 
 	if (app) {
@@ -2540,11 +2696,18 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_sessi
 		}
 	}
 
+	bflags |= SMBF_NO_PAUSE;
+
 	if (cont->bug_running) {
 		status = SWITCH_STATUS_SUCCESS;
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s bug already running\n", switch_channel_get_name(channel));
 	} else {
 		cont->bug_running = 1;
+		if (cont->detect_fax) {
+			switch_core_event_hook_add_send_dtmf(session, tone_on_dtmf);
+			switch_core_event_hook_add_recv_dtmf(session, tone_on_dtmf);
+		}
+
 		if ((status = switch_core_media_bug_add(session, "tone_detect", key,
 												tone_detect_callback, cont, timeout, bflags, &cont->bug)) != SWITCH_STATUS_SUCCESS) {
 			cont->bug_running = 0;
@@ -3192,7 +3355,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_detect_speech(switch_core_session_t *
 	}
 
 	if ((status = switch_core_media_bug_add(session, "detect_speech", key,
-											speech_callback, sth, 0, SMBF_READ_STREAM, &sth->bug)) != SWITCH_STATUS_SUCCESS) {
+											speech_callback, sth, 0, SMBF_READ_STREAM | SMBF_NO_PAUSE, &sth->bug)) != SWITCH_STATUS_SUCCESS) {
 		switch_core_asr_close(ah, &flags);
 		return status;
 	}
diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index 165df886fd..2549554005 100644
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -853,15 +853,15 @@ static switch_status_t hanguphook(switch_core_session_t *session)
 	msg.from = __FILE__;
 	msg.string_arg = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE);
 
-	if (state == CS_ROUTING) {
-		if (switch_channel_test_flag(channel, CF_BRIDGE_ORIGINATOR)) {
-			switch_channel_clear_flag_recursive(channel, CF_BRIDGE_ORIGINATOR);
-			if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNBRIDGE) == SWITCH_STATUS_SUCCESS) {
-				switch_channel_event_set_data(channel, event);
-				switch_event_fire(&event);
-			}
+	
+	if (switch_channel_test_flag(channel, CF_BRIDGE_ORIGINATOR)) {
+		switch_channel_clear_flag_recursive(channel, CF_BRIDGE_ORIGINATOR);
+		if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNBRIDGE) == SWITCH_STATUS_SUCCESS) {
+			switch_channel_event_set_data(channel, event);
+			switch_event_fire(&event);
 		}
 	}
+
 	
 	switch_core_session_receive_message(session, &msg);
 	switch_core_event_hook_remove_state_change(session, hanguphook);
diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 0b5ab77ffd..007d7d9fc1 100644
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -1038,7 +1038,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_wait_for_answer(switch_core_session_t
 	return status;
 }
 
-SWITCH_DECLARE(void) switch_process_import(switch_core_session_t *session, switch_channel_t *peer_channel, const char *varname)
+SWITCH_DECLARE(void) switch_process_import(switch_core_session_t *session, switch_channel_t *peer_channel, const char *varname, const char *prefix)
 {
 	const char *import, *val;
 	switch_channel_t *caller_channel;
@@ -1054,7 +1054,13 @@ SWITCH_DECLARE(void) switch_process_import(switch_core_session_t *session, switc
 		if ((argc = switch_separate_string(mydata, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) {
 			for (i = 0; i < argc; i++) {
 				if ((val = switch_channel_get_variable(peer_channel, argv[i]))) {
-					switch_channel_set_variable(caller_channel, argv[i], val);
+					if (prefix) {
+						char *var = switch_mprintf("%s%s", prefix, argv[i]);
+						switch_channel_set_variable(caller_channel, var, val);
+						free(var);
+					} else {
+						switch_channel_set_variable(caller_channel, argv[i], val);
+					}
 				}
 			}
 		}
@@ -1722,7 +1728,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 	char *e = NULL;
 	const char *ringback_data = NULL;
 	switch_event_t *var_event = NULL;
-	uint8_t fail_on_single_reject = 0;
+	int8_t fail_on_single_reject = 0;
 	char *fail_on_single_reject_var = NULL;
 	char *loop_data = NULL;
 	uint32_t progress_timelimit_sec = 0;
@@ -1735,6 +1741,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 	const char *soft_holding = NULL;
 	early_state_t early_state = { 0 };
 	int read_packet = 0;
+	int check_reject = 1;
 	
 	if (strstr(bridgeto, SWITCH_ENT_ORIGINATE_DELIM)) {
 		return switch_ivr_enterprise_originate(session, bleg, cause, bridgeto, timelimit_sec, table, cid_name_override, cid_num_override,
@@ -2081,9 +2088,13 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 	   If the value is set to 'true' any fail cause will end the attempt otherwise it can contain a comma (,) separated
 	   list of cause names which should be considered fatal
 	 */
-	if ((var = switch_event_get_header(var_event, "fail_on_single_reject")) && switch_true(var)) {
+	if ((var = switch_event_get_header(var_event, "fail_on_single_reject"))) {
 		fail_on_single_reject_var = strdup(var);
-		fail_on_single_reject = 1;
+		if (switch_true(var)) {
+			fail_on_single_reject = 1;
+		} else {
+			fail_on_single_reject = -1;
+		}
 	}
 
 	if ((*oglobals.file != '\0') && (!strcmp(oglobals.file, "undef"))) {
@@ -2232,6 +2243,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 			char *p, *end = NULL;
 			const char *var_begin, *var_end;
 			int q = 0;
+			check_reject = 1;
+
 			oglobals.hups = 0;
 
 			reason = SWITCH_CAUSE_NONE;
@@ -2605,6 +2618,16 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot create outgoing channel of type [%s] cause: [%s]\n",
 									  chan_type, switch_channel_cause2str(reason));
 					if (local_var_event) switch_event_destroy(&local_var_event);
+					
+					if (fail_on_single_reject_var) {
+						const char *cause_str = switch_channel_cause2str(reason);
+						check_reject = 0;
+
+						if (fail_on_single_reject == 1 || switch_stristr(cause_str, fail_on_single_reject_var)) {
+							force_reason = reason;
+							goto outer_for;
+						}
+					}
 					continue;
 				}
 
@@ -2848,26 +2871,29 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 					}
 					goto notready;
 				}
-
+				
 				if ((to = (uint8_t) (elapsed >= (time_t) timelimit_sec)) || (fail_on_single_reject && oglobals.hups)) {
 					int ok = 0;
 
-					if (fail_on_single_reject_var && !switch_true(fail_on_single_reject_var)) {
-						ok = 1;
-						for (i = 0; i < and_argc; i++) {
-							switch_channel_t *pchannel;
-							const char *cause_str;
+					if (fail_on_single_reject_var) {
+						if (!switch_true(fail_on_single_reject_var)) {
+							ok = 1;
 
-							if (!originate_status[i].peer_session) {
-								goto do_continue;
-							}
-							pchannel = switch_core_session_get_channel(originate_status[i].peer_session);
+							for (i = 0; i < and_argc; i++) {
+								switch_channel_t *pchannel;
+								const char *cause_str;
+								
+								if (!originate_status[i].peer_session) {
+									continue;
+								}
+								pchannel = switch_core_session_get_channel(originate_status[i].peer_session);
 
-							if (switch_channel_down(pchannel)) {
-								cause_str = switch_channel_cause2str(switch_channel_get_cause(pchannel));
-								if (switch_stristr(cause_str, fail_on_single_reject_var)) {
-									ok = 0;
-									break;
+								if (switch_channel_down(pchannel)) {
+									cause_str = switch_channel_cause2str(switch_channel_get_cause(pchannel));
+									if (switch_stristr(cause_str, fail_on_single_reject_var)) {
+										ok = 0;
+										break;
+									}
 								}
 							}
 						}
@@ -3276,7 +3302,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 			} else {
 				status = SWITCH_STATUS_FALSE;
 				if (caller_channel && peer_channel) {
-					switch_process_import(oglobals.session, peer_channel, "import");
+					switch_process_import(oglobals.session, peer_channel, "import", NULL);
 				}
 				peer_channel = NULL;
 				goto done;
@@ -3327,7 +3353,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 				if (caller_channel) {
 					switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted");
 					if (peer_channel) {
-						switch_process_import(oglobals.session, peer_channel, "import");
+						switch_process_import(oglobals.session, peer_channel, "import", NULL);
 					}
 				}
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(oglobals.session), SWITCH_LOG_DEBUG, "Originate Resulted in Success: [%s]\n",
@@ -3476,26 +3502,31 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 			} else {
 				int ok = 0;
 
-				if (fail_on_single_reject_var && !switch_true(fail_on_single_reject_var)) {
-					ok = 1;
-					for (i = 0; i < and_argc; i++) {
-						switch_channel_t *pchannel;
-						const char *cause_str;
+				if (fail_on_single_reject && check_reject) {
 
-						if (!originate_status[i].peer_session) {
-							continue;
-						}
-						pchannel = switch_core_session_get_channel(originate_status[i].peer_session);
+					if (!switch_true(fail_on_single_reject_var)) {
+						ok = 1;
 
-						if (switch_channel_down(pchannel)) {
-							cause_str = switch_channel_cause2str(switch_channel_get_cause(pchannel));
-							if (switch_stristr(cause_str, fail_on_single_reject_var)) {
-								ok = 0;
-								break;
+						for (i = 0; i < and_argc; i++) {
+							switch_channel_t *pchannel;
+							const char *cause_str;
+							
+							if (!originate_status[i].peer_session) {
+								continue;
+							}
+							pchannel = switch_core_session_get_channel(originate_status[i].peer_session);
+							
+							if (switch_channel_down(pchannel)) {
+								cause_str = switch_channel_cause2str(switch_channel_get_cause(pchannel));
+								if (switch_stristr(cause_str, fail_on_single_reject_var)) {
+									ok = 0;
+									break;
+								}
 							}
 						}
 					}
 				}
+
 				if (ok) {
 					goto outer_for;
 				}
diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index c99745d57c..7285b894ea 100644
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -364,6 +364,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *se
 	time_t start = 0;
 	uint32_t org_silence_hits = 0;
 	int asis = 0;
+	int32_t sample_start = 0;
 	int waste_resources = 0, fill_cng = 0;
 	switch_codec_implementation_t read_impl = { 0 };
 	switch_frame_t write_frame = { 0 };
@@ -405,6 +406,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *se
 	fh->channels = read_impl.number_of_channels;
 	fh->native_rate = read_impl.actual_samples_per_second;
 
+	if (fh->samples > 0) {
+		sample_start = fh->samples;
+		fh->samples = 0;
+	}
+
 	if ((vval = switch_channel_get_variable(channel, "record_sample_rate"))) {
 		int tmp = 0;
 
@@ -497,6 +503,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *se
 		file_flags |= SWITCH_FILE_WRITE_APPEND;
 	}
 
+	if (switch_test_flag(fh, SWITCH_FILE_WRITE_OVER) || ((p = switch_channel_get_variable(channel, "RECORD_WRITE_OVER")) && switch_true(p))) {
+		file_flags |= SWITCH_FILE_WRITE_OVER;
+	}
+
 	if (!fh->prefix) {
 		fh->prefix = prefix;
 	}
@@ -507,6 +517,14 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *se
 		return SWITCH_STATUS_GENERR;
 	}
 
+	if (sample_start > 0) {
+		uint32_t pos = 0;
+		switch_core_file_seek(fh, &pos, sample_start, SEEK_SET);
+		switch_clear_flag(fh, SWITCH_FILE_SEEK);	
+		fh->samples = 0;
+	}
+
+
 	if (switch_test_flag(fh, SWITCH_FILE_NATIVE)) {
 		asis = 1;
 	}
@@ -1130,6 +1148,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 			uint32_t pos = 0;
 			switch_core_file_seek(fh, &pos, 0, SEEK_SET);
 			switch_core_file_seek(fh, &pos, sample_start, SEEK_CUR);
+			switch_clear_flag(fh, SWITCH_FILE_SEEK);
 		}
 
 		if (switch_core_file_get_string(fh, SWITCH_AUDIO_COL_STR_TITLE, &p) == SWITCH_STATUS_SUCCESS) {
@@ -1319,6 +1338,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 					}
 				}
 
+				fh->offset_pos += asis ? bread : bread / 2;
+
 				if (bread < framelen) {
 					memset(abuf + bread, 255, framelen - bread);
 				}
@@ -1338,9 +1359,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 				}
 				switch_buffer_write(fh->audio_buffer, abuf, asis ? olen : olen * 2);
 				olen = switch_buffer_read(fh->audio_buffer, abuf, framelen);
+				fh->offset_pos += olen / 2;
+
 				if (!asis) {
 					olen /= 2;
 				}
+
 			}
 
 			if (done || olen <= 0) {
@@ -1455,7 +1479,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 			}
 
 			more_data = 0;
-
 			write_frame.samples = (uint32_t) olen;
 
 			if (asis) {
@@ -1480,7 +1503,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 				switch_change_sln_volume(write_frame.data, write_frame.datalen / 2, fh->vol);
 			}
 
-			fh->offset_pos += write_frame.samples / 2;
 			status = switch_core_session_write_frame(session, &write_frame, SWITCH_IO_FLAG_NONE, 0);
 
 			if (timeout_samples) {
diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index 7e08f71472..7aee9a769b 100644
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -1270,11 +1270,11 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init(switch_bool_t autolo
 	switch_core_hash_init_nocase(&loadable_modules.dialplan_hash, loadable_modules.pool);
 	switch_mutex_init(&loadable_modules.mutex, SWITCH_MUTEX_NESTED, loadable_modules.pool);
 
-	if (!autoload) return SWITCH_STATUS_SUCCESS;
-
 	switch_loadable_module_load_module("", "CORE_SOFTTIMER_MODULE", SWITCH_FALSE, &err);
 	switch_loadable_module_load_module("", "CORE_PCM_MODULE", SWITCH_FALSE, &err);
 
+	if (!autoload) return SWITCH_STATUS_SUCCESS;
+
 	if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
 		switch_xml_t mods, ld;
 		if ((mods = switch_xml_child(cfg, "modules"))) {
@@ -1547,12 +1547,91 @@ SWITCH_DECLARE(switch_management_interface_t *) switch_loadable_module_get_manag
 	return switch_core_hash_find_locked(loadable_modules.management_hash, relative_oid, loadable_modules.mutex);
 }
 
+#ifdef DEBUG_CODEC_SORTING
+static void do_print(const switch_codec_implementation_t **array, int arraylen)
+{
+	int i;
+
+	for(i = 0; i < arraylen; i++) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, 
+						  "DEBUG %d %s:%d %d\n", i, array[i]->iananame, array[i]->ianacode, array[i]->microseconds_per_packet / 1000);
+	}
+
+}
+#endif
+
+/* helper only -- bounds checking enforced by caller */
+static void do_swap(const switch_codec_implementation_t **array, int a, int b)
+{
+	const switch_codec_implementation_t *tmp = array[b];
+	array[b] = array[a];
+	array[a] = tmp;
+}
+
+static void switch_loadable_module_sort_codecs(const switch_codec_implementation_t **array, int arraylen)
+{
+	int i = 0, sorted_ptime = 0;
+
+#ifdef DEBUG_CODEC_SORTING
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "--BEFORE\n");
+	do_print(array, arraylen);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "--BEFORE\n");
+#endif
+
+	for (i = 0; i < arraylen; i++) {
+		int this_ptime = array[i]->microseconds_per_packet / 1000;
+
+		if (!sorted_ptime) {
+			sorted_ptime = this_ptime;
+#ifdef DEBUG_CODEC_SORTING
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "sorted1 = %d\n", sorted_ptime);
+#endif
+		}
+
+		if (this_ptime != sorted_ptime) {
+			int j;
+			int swapped = 0;
+
+#ifdef DEBUG_CODEC_SORTING
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%d != %d\n", this_ptime, sorted_ptime);
+#endif
+			for(j = i; j < arraylen; j++) {
+				int check_ptime = array[j]->microseconds_per_packet / 1000;
+
+				if (check_ptime == sorted_ptime) {
+#ifdef DEBUG_CODEC_SORTING
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "swap %d %d ptime %d\n", i, j, check_ptime);
+#endif
+					do_swap(array, i, j);
+					swapped = 1;
+					break;
+				}
+			}
+
+			if (!swapped) {
+				sorted_ptime = this_ptime;
+#ifdef DEBUG_CODEC_SORTING
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "sorted2 = %d\n", sorted_ptime);
+#endif
+			}
+		}
+	}
+
+#ifdef DEBUG_CODEC_SORTING
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "--AFTER\n");
+	do_print(array, arraylen);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "--AFTER\n");
+#endif
+
+}
+
+
 SWITCH_DECLARE(int) switch_loadable_module_get_codecs(const switch_codec_implementation_t **array, int arraylen)
 {
 	switch_hash_index_t *hi;
 	void *val;
 	switch_codec_interface_t *codec_interface;
-	int i = 0, lock = 0;
+	int i = 0;
 	const switch_codec_implementation_t *imp;
 
 	switch_mutex_lock(loadable_modules.mutex);
@@ -1564,10 +1643,6 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs(const switch_codec_impleme
 		for (imp = codec_interface->implementations; imp; imp = imp->next) {
 			uint32_t default_ptime = switch_default_ptime(imp->iananame, imp->ianacode);
 
-			if (lock && imp->microseconds_per_packet != lock) {
-				continue;
-			}
-
 			if (imp->microseconds_per_packet / 1000 == (int)default_ptime) {
 				array[i++] = imp;
 				goto found;
@@ -1578,9 +1653,6 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs(const switch_codec_impleme
 
 	  found:
 
-		if (!lock && i > 0)
-			lock = array[i - 1]->microseconds_per_packet;
-
 		if (i > arraylen) {
 			break;
 		}
@@ -1588,13 +1660,15 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs(const switch_codec_impleme
 
 	switch_mutex_unlock(loadable_modules.mutex);
 
+	switch_loadable_module_sort_codecs(array, i);
+
 	return i;
 
 }
 
 SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(const switch_codec_implementation_t **array, int arraylen, char **prefs, int preflen)
 {
-	int x, i = 0, lock = 0;
+	int x, i = 0;
 	switch_codec_interface_t *codec_interface;
 	const switch_codec_implementation_t *imp;
 
@@ -1635,9 +1709,6 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(const switch_codec_
 				uint32_t default_ptime = switch_default_ptime(imp->iananame, imp->ianacode);
 				
 				if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) {
-					if (lock && imp->microseconds_per_packet != lock) {
-						continue;
-					}
 					
 					if ((!interval && (uint32_t) (imp->microseconds_per_packet / 1000) != default_ptime) ||
 						(interval && (uint32_t) (imp->microseconds_per_packet / 1000) != interval)) {
@@ -1664,10 +1735,6 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(const switch_codec_
 			for (imp = codec_interface->implementations; imp; imp = imp->next) {
 				if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) {
 
-					if (lock && imp->microseconds_per_packet != lock) {
-						continue;
-					}
-
 					if (interval && (uint32_t) (imp->microseconds_per_packet / 1000) != interval) {
 						continue;
 					}
@@ -1689,10 +1756,6 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(const switch_codec_
 
 		  found:
 
-			if (!lock && i > 0) {
-				lock = array[i - 1]->microseconds_per_packet;
-			}
-
 			UNPROTECT_INTERFACE(codec_interface);
 
 			if (i > arraylen) {
@@ -1704,6 +1767,7 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(const switch_codec_
 
 	switch_mutex_unlock(loadable_modules.mutex);
 
+	switch_loadable_module_sort_codecs(array, i);
 
 	return i;
 }
diff --git a/src/switch_odbc.c b/src/switch_odbc.c
index c853e14c4c..36c3c996e8 100644
--- a/src/switch_odbc.c
+++ b/src/switch_odbc.c
@@ -629,6 +629,32 @@ SWITCH_DECLARE(switch_bool_t) switch_odbc_available(void)
 #endif
 }
 
+SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_SQLSetAutoCommitAttr(switch_odbc_handle_t *handle, switch_bool_t on)
+{
+#ifdef SWITCH_HAVE_ODBC
+	if (on) {
+		return SQLSetConnectAttr(handle->con, SQL_ATTR_AUTOCOMMIT, (SQLPOINTER *) SQL_AUTOCOMMIT_ON, 0 );
+	} else {
+		return SQLSetConnectAttr(handle->con, SQL_ATTR_AUTOCOMMIT, (SQLPOINTER *) SQL_AUTOCOMMIT_OFF, 0 );
+	}
+#else
+	return SWITCH_FALSE;
+#endif
+}
+
+SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_SQLEndTran(switch_odbc_handle_t *handle, switch_bool_t commit)
+{
+#ifdef SWITCH_HAVE_ODBC
+	if (commit) {
+		return SQLEndTran(SQL_HANDLE_DBC, handle->con, SQL_COMMIT);
+	} else {
+		return SQLEndTran(SQL_HANDLE_DBC, handle->con, SQL_ROLLBACK);
+	}
+#else
+	return SWITCH_FALSE;
+#endif
+}
+
 
 /* For Emacs:
  * Local Variables:
diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 66fc4cc7f3..6a2fa51910 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -1881,7 +1881,7 @@ SWITCH_DECLARE(void) switch_rtp_clear_flag(switch_rtp_t *rtp_session, switch_rtp
 	switch_clear_flag_locked(rtp_session, flags);
 }
 
-static void do_2833(switch_rtp_t *rtp_session)
+static void do_2833(switch_rtp_t *rtp_session, switch_core_session_t *session)
 {
 	switch_frame_flag_t flags = 0;
 	uint32_t samples = rtp_session->samples_per_interval;
@@ -1913,7 +1913,7 @@ static void do_2833(switch_rtp_t *rtp_session)
 			rtp_session->stats.outbound.dtmf_packet_count++;
 
 
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s packet for [%c] ts=%u dur=%d/%d/%d seq=%d\n",
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Send %s packet for [%c] ts=%u dur=%d/%d/%d seq=%d\n",
 							  loops == 1 ? "middle" : "end", rtp_session->dtmf_data.out_digit,
 							  rtp_session->dtmf_data.timestamp_dtmf,
 							  rtp_session->dtmf_data.out_digit_sofar,
@@ -1977,7 +1977,7 @@ static void do_2833(switch_rtp_t *rtp_session)
 			rtp_session->stats.outbound.raw_bytes += wrote;
 			rtp_session->stats.outbound.dtmf_packet_count++;
 
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send start packet for [%c] ts=%u dur=%d/%d/%d seq=%d\n",
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Send start packet for [%c] ts=%u dur=%d/%d/%d seq=%d\n",
 							  rtp_session->dtmf_data.out_digit,
 							  rtp_session->dtmf_data.timestamp_dtmf,
 							  rtp_session->dtmf_data.out_digit_sofar,
@@ -2319,7 +2319,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 
 			poll_status = switch_poll(rtp_session->read_pollfd, 1, &fdr, pt);
 			if (rtp_session->dtmf_data.out_digit_dur > 0) {
-				do_2833(rtp_session);
+				do_2833(rtp_session, session);
 			}
 		}
 
@@ -2443,7 +2443,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 
 		if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK) || (bytes && bytes == 4 && *((int *) &rtp_session->recv_msg) == UINT_MAX)) {
 			switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK);
-			do_2833(rtp_session);
+			do_2833(rtp_session, session);
 			bytes = 0;
 			return_cng_frame();
 		}
@@ -2590,7 +2590,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 		}
 
 		if (check || bytes) {
-			do_2833(rtp_session);
+			do_2833(rtp_session, session);
 		}
 #ifdef ENABLE_ZRTP
 		/* ZRTP Recv */
@@ -2914,9 +2914,10 @@ SWITCH_DECLARE(switch_size_t) switch_rtp_dequeue_dtmf(switch_rtp_t *rtp_session,
 
 	switch_mutex_lock(rtp_session->dtmf_data.dtmf_mutex);
 	if (switch_queue_trypop(rtp_session->dtmf_data.dtmf_inqueue, &pop) == SWITCH_STATUS_SUCCESS) {
+		switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
 		_dtmf = (switch_dtmf_t *) pop;
 		*dtmf = *_dtmf;
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "RTP RECV DTMF %c:%d\n", dtmf->digit, dtmf->duration);
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "RTP RECV DTMF %c:%d\n", dtmf->digit, dtmf->duration);
 		bytes++;
 		free(pop);
 	}
diff --git a/src/switch_utils.c b/src/switch_utils.c
index b887904960..2872f10a6e 100644
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -1071,10 +1071,12 @@ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int *ma
 	case AF_INET:
 		if (force_local_ip_v4) {
 			switch_copy_string(buf, force_local_ip_v4, len);
+			return SWITCH_STATUS_SUCCESS;
 		}
 	case AF_INET6:
 		if (force_local_ip_v6) {
 			switch_copy_string(buf, force_local_ip_v6, len);
+			return SWITCH_STATUS_SUCCESS;
 		}
 	default:
 		break;
@@ -1515,9 +1517,9 @@ SWITCH_DECLARE(char *) get_addr6(char *buf, switch_size_t len, struct sockaddr_i
 
 	if (sa) {
 #if defined(NTDDI_VERSION)
-			switch_inet_ntop6((unsigned char*)sa, buf, len);
+			switch_inet_ntop6((unsigned char*)&(sa->sin6_addr), buf, len);
 #else
-		inet_ntop(AF_INET6, sa, buf, len);
+		inet_ntop(AF_INET6, &(sa->sin6_addr), buf, len);
 #endif
 	}
 
@@ -2465,7 +2467,6 @@ SWITCH_DECLARE(int) switch_isxdigit(int c)
 {
 	return (c < 0 ? 0 : c > 255 ? 0 : ((_switch_ctype_ + 1)[(unsigned char) c] & (_N | _X)));
 }
-
 static const char *DOW[] = {
 	"sat",
 	"sun",
@@ -2473,73 +2474,104 @@ static const char *DOW[] = {
 	"tue",
 	"wed",
 	"thu",
-	"fri",
-	"sat",
-	"sun",
-	NULL
+	"fri"
 };
 
 SWITCH_DECLARE(const char *) switch_dow_int2str(int val) {
-	if (val >= sizeof(DOW) / sizeof (const char*)) {
-		return NULL;
+	if (val >= switch_arraylen(DOW)) {
+		val = val % switch_arraylen(DOW);
 	}
 	return DOW[val];
 }
 
 SWITCH_DECLARE(int) switch_dow_str2int(const char *exp) {
 	int ret = -1;
-	int x = -1;
-	for (x = 0;; x++) {
-		if (!DOW[x]) {
-			break;  
-		}
-
-		if (!strcasecmp(DOW[x], exp)) {
-			ret =  x;
+	int x;
+	
+	for (x = 0; x < switch_arraylen(DOW); x++) {
+		if (!strncasecmp(DOW[x], exp, 3)) {
+			ret = x;
 			break;
 		}
 	}
 	return ret;
 }
 
-SWITCH_DECLARE(int) switch_dow_cmp(const char *exp, int val)
+typedef enum {
+	DOW_ERR = -2,
+	DOW_EOF = -1,
+	DOW_SAT = 0,
+	DOW_SUN,
+	DOW_MON,
+	DOW_TUE,
+	DOW_WED,
+	DOW_THU,
+	DOW_FRI,
+	DOW_HYPHEN = '-',
+	DOW_COMA = ','
+} dow_t;
+
+static inline dow_t _dow_read_token(const char **s) 
 {
-	char *dup = strdup(exp);
-	char *p_start;
-	char *p_end;
-	int ret = 0;
-	int start, end;
-
-	switch_assert(dup);
-
-	p_start = dup;
-
-	if ((p_end=strchr(dup, '-'))) {
-		*p_end++ = '\0';
+	int i;
+	
+	if (**s == '-') {
+		(*s)++;
+		return DOW_HYPHEN;
+	} else if (**s == ',') {
+		(*s)++;
+		return DOW_COMA;
+	} else if (**s >= '0' && **s <= '9') {
+		dow_t r = **s - '0';
+		(*s)++;
+		return r;
+	} else if ((i = switch_dow_str2int(*s)) && i != -1) {
+		(*s) += 3;
+		return i;
+	} else if (!**s) {
+		return DOW_EOF;
 	} else {
-		p_end = p_start;
+		return DOW_ERR;
 	}
-	if (strlen(p_start) == 3) {
-		start = switch_dow_str2int(p_start);
-	} else {
-		start = atol(p_start);
-	}
-	if (strlen(p_end) == 3) {
-		end = switch_dow_str2int(p_end);
-	} else {
-		end = atol(p_end);
-	}
-	/* Following used for this example : mon-sat = 2-0, so we need to make 0(sat) + 7 */
-	if (end < start) {
-		end += 7;
-	}
-	if (start != -1 && end != -1 && val >= start && val <= end) {
-		ret = 1;
+}
+
+SWITCH_DECLARE(switch_bool_t) switch_dow_cmp(const char *exp, int val)
+{
+	dow_t cur, prev = DOW_EOF, range_start = DOW_EOF;
+	const char *p = exp;
+		
+	while ((cur = _dow_read_token(&p)) != DOW_EOF) {
+		if (cur == DOW_COMA) {
+			/* Reset state */
+			cur = prev = DOW_EOF;	
+		} else if (cur == DOW_HYPHEN) {
+			/* Save the previous token and move to the next one */
+			range_start = prev;
+		} else if (cur == DOW_ERR) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse error for [%s] at position %td (%.6s)\n", exp, p - exp, p);
+			break;
+		} else {
+			/* Valid day found */
+			if (range_start != DOW_EOF) { /* Evaluating a range */
+				if (range_start < cur) {
+					if (val >= range_start && val <= cur) {
+						return SWITCH_TRUE;
+					}
+				} else {
+					if (val >= cur && val <= range_start) {
+						return SWITCH_TRUE;
+					}
+				}
+				range_start = DOW_EOF;
+			} else if (val == cur) {
+				return SWITCH_TRUE;
+			}
+		}
+		
+		prev = cur;
 	}
 
-	switch_safe_free(dup);
-
-	return ret;	
+	return SWITCH_FALSE;
 }
 
 SWITCH_DECLARE(int) switch_number_cmp(const char *exp, int val)
diff --git a/src/switch_xml.c b/src/switch_xml.c
index 95b82cb20d..a7bfe413d0 100644
--- a/src/switch_xml.c
+++ b/src/switch_xml.c
@@ -2761,7 +2761,7 @@ SWITCH_DECLARE(int) switch_xml_std_datetime_check(switch_xml_t xcond) {
 	if (time_match && xtod) {
 		int test = (tm.tm_hour * 60 * 60) + (tm.tm_min * 60) + tm.tm_sec;
 		char tmpdate[10];
-		switch_snprintf(tmpdate, 6, "%d:%d:%d", tm.tm_hour, tm.tm_min, tm.tm_sec);
+		switch_snprintf(tmpdate, 10, "%d:%d:%d", tm.tm_hour, tm.tm_min, tm.tm_sec);
 		time_match = switch_tod_cmp(xtod, test);
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
 				"XML DateTime Check: time of day[%s] =~ %s (%s)\n", tmpdate, xtod, time_match ? "PASS" : "FAIL");
diff --git a/support-d/.screenrc b/support-d/.screenrc
index 927df8672c..f04baa03d7 100644
--- a/support-d/.screenrc
+++ b/support-d/.screenrc
@@ -1,3 +1,4 @@
+hardstatus alwaysignore
 startup_message off
 escape ^\b
 defscrollback 8000
diff --git a/w32/Library/FreeSwitchCore.2008.vcproj b/w32/Library/FreeSwitchCore.2008.vcproj
index 0f85d44c69..ca15da8b52 100644
--- a/w32/Library/FreeSwitchCore.2008.vcproj
+++ b/w32/Library/FreeSwitchCore.2008.vcproj
@@ -297,7 +297,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\winlibs.vsprops"
@@ -382,7 +382,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if not exist &quot;$(OutDir)\conf&quot; xcopy &quot;$(SolutionDir)conf\*.*&quot; &quot;$(SolutionDir)$(OutDir)\conf\&quot; /C /D /Y /S&#x0D;&#x0A;if not exist &quot;$(OutDir)\db&quot; md  &quot;$(SolutionDir)$(OutDir)\db&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\log&quot; md  &quot;$(SolutionDir)$(OutDir)\log&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\htdocs&quot; md  &quot;$(SolutionDir)$(OutDir)\htdocs&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\htdocs&quot; xcopy &quot;$(SolutionDir)htdocs\*.*&quot; &quot;$(SolutionDir)$(OutDir)\htdocs\&quot; /C /D /Y /S&#x0D;&#x0A;&#x0D;&#x0A;"
+				CommandLine="if not exist &quot;$(SolutionDir)$(OutDir)\conf&quot; xcopy &quot;$(SolutionDir)conf\*.*&quot; &quot;$(SolutionDir)$(OutDir)\conf\&quot; /C /D /Y /S&#x0D;&#x0A;if not exist &quot;$(SolutionDir)$(OutDir)\db&quot; md  &quot;$(SolutionDir)$(OutDir)\db&quot;&#x0D;&#x0A;if not exist &quot;$(SolutionDir)$(OutDir)\log&quot; md  &quot;$(SolutionDir)$(OutDir)\log&quot;&#x0D;&#x0A;if not exist &quot;$(SolutionDir)$(OutDir)\htdocs&quot; md  &quot;$(SolutionDir)$(OutDir)\htdocs&quot;&#x0D;&#x0A;if not exist &quot;$(SolutionDir)$(OutDir)\htdocs&quot; xcopy &quot;$(SolutionDir)htdocs\*.*&quot; &quot;$(SolutionDir)$(OutDir)\htdocs\&quot; /C /D /Y /S&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/w32/Setup/Product.wxs b/w32/Setup/Product.wxs
new file mode 100644
index 0000000000..2f072aa8ca
--- /dev/null
+++ b/w32/Setup/Product.wxs
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Platform specific variables -->
+<?if $(var.Platform) = x64 ?>
+<?define Win64 = "yes" ?>
+<?define ProductName = "FreeSWITCH (64 bit)" ?>
+<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+<?else ?>
+<?define Win64 = "no" ?>
+<?define ProductName = "FreeSWITCH" ?>
+<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+<?endif ?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Product Id="b004a325-1272-47e5-a415-a74e9fc99865" Name="$(var.ProductName)" Language="1033" Version="1.0.0.0" Manufacturer="FreeSWITCH" UpgradeCode="3af7020b-1348-45e8-a0cf-80909d4eb421">
+		<Package InstallerVersion="300" Compressed="yes" />
+
+		<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
+
+		<Directory Id="TARGETDIR" Name="SourceDir">
+			<Directory Id="$(var.PlatformProgramFilesFolder)">
+				<Directory Id="INSTALLLOCATION" Name="FreeSWITCH">
+					 <Directory Id="MODLOCATION" Name="mod">
+					 </Directory>
+					 <Directory Id="CONFLOCATION" Name="conf">
+					 </Directory>
+					 <Directory Id="SOUNDLOCATION" Name="sounds">
+					 </Directory>
+					<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
+					<!-- <Component Id="ProductComponent" Guid="6f1498a7-d029-430b-b9d9-fe12e17bdbab"> -->
+						<!-- TODO: Insert files, registry keys, and other resources here. -->
+					<!-- </Component> -->
+					<?if $(var.Platform) != x64 ?>
+						<Merge Id="CrtFiles_x86"
+						SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm"
+						DiskId="1"
+						Language="1033"/>
+					<?endif ?>
+					<?if $(var.Platform) = x64 ?>
+						<Merge Id="CrtFiles_x64"
+						SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x64.msm"
+						DiskId="1"
+						Language="1033"/>
+					<?endif ?>
+				</Directory>
+			</Directory>
+			<Directory Id="ProgramMenuFolder">
+				<Directory Id="ApplicationProgramsFolder" Name="FreeSWITCH"/>
+			</Directory>
+		</Directory>
+
+		<DirectoryRef Id="ApplicationProgramsFolder">
+			<Component Id="ApplicationShortcut" Guid="B554D1D1-C8C6-4d46-A3E7-4BA836EF929B">
+				<Shortcut Id="ApplicationStartMenuShortcut"
+							 Name="FreeSWITCH"
+							 Description="FreeSWITCH Telephony SoftSwitch"
+							 Target="[INSTALLLOCATION]FreeSwitchConsole.exe"
+							 WorkingDirectory="INSTALLLOCATION"/>
+				<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
+				<RegistryValue Root="HKCU" Key="Software\FreeSWITCH\FreeSWITCH" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+			</Component>
+			<Component Id="FSCliShortcut" Guid="D209546C-C728-4d8f-BDB2-29AED8824282">
+				<Shortcut Id="FSCliStartMenuShortcut"
+							 Name="FS_Cli"
+							 Description="FreeSWITCH Command Line Interface"
+							 Target="[INSTALLLOCATION]fs_cli.exe"
+							 WorkingDirectory="INSTALLLOCATION"/>
+				<RegistryValue Root="HKCU" Key="Software\FreeSWITCH\FS_CLI" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+			</Component>
+		</DirectoryRef>
+
+		<Feature Id="ProductFeature" Title="FreeSWITCH Core" Level="1">
+			<!-- TODO: Remove the comments around this ComponentRef element and the Component above in order to add resources to this installer. -->
+			<!-- <ComponentRef Id="ProductComponent" /> -->
+			
+			<!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. -->
+			<ComponentGroupRef Id="Product.Generated" />
+			<?if $(var.Platform) != x64 ?>
+			  <MergeRef Id="CrtFiles_x86"/>
+			<?endif ?>
+			<?if $(var.Platform) = x64 ?>
+			  <MergeRef Id="CrtFiles_x64"/>
+			<?endif ?>
+		</Feature>
+		<Feature Id="ProductFeatureFreeSWITCH" Title="FreeSWITCH" Level="1">
+			<ComponentRef Id="ApplicationShortcut" />
+		</Feature>
+		<Feature Id="ProductFeatureFSCli" Title="FreeSWITCH Command Line Interface" Level="1">
+			<ComponentRef Id="FSCliShortcut" />
+		</Feature>
+    <Feature Id="ProductFeatureConf" Title="FreeSWITCH Configuration Sample" Level="1">
+      <ComponentGroupRef Id="FreeSWITCHConfFiles" />
+    </Feature>
+    <Feature Id="ProductFeatureSounds" Title="FreeSWITCH Sounds 8Khz" Level="1">
+      <ComponentGroupRef Id="FreeSWITCHSoundFiles8" />
+    </Feature>
+    <UIRef Id="WixUI_Mondo" />
+  </Product>
+</Wix>
diff --git a/w32/Setup/Setup.wixproj b/w32/Setup/Setup.wixproj
new file mode 100644
index 0000000000..9aba3a1d34
--- /dev/null
+++ b/w32/Setup/Setup.wixproj
@@ -0,0 +1,758 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProductVersion>3.5</ProductVersion>
+    <ProjectGuid>{47213370-b933-487d-9f45-bca26d7e2b6f}</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>FreeSWITCH</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <IntermediateOutputPath>obj\X86\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\Win32\debug\sounds;</DefineConstants>
+    <WixVariables>
+    </WixVariables>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\x86\release\</OutputPath>
+    <IntermediateOutputPath>obj\X86\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\Win32\release\sounds;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <IntermediateOutputPath>obj\X64\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\x64\debug\sounds;</DefineConstants>
+    <WixVariables>
+    </WixVariables>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <IntermediateOutputPath>obj\X64\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\x64\release\sounds;</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Fragments\FreeSWITCHConfFiles.wxs" />
+    <Compile Include="Fragments\FreeSWITCHSoundFiles8.wxs" />
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\libs\broadvoice\src\libbroadvoice.2010.vcxproj">
+      <Name>libbroadvoice</Name>
+      <Project>{cf70f278-3364-4395-a2e1-23501c9b8ad2}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\libs\esl\fs_cli.2010.vcxproj">
+      <Name>fs_cli</Name>
+      <Project>{d2fb8043-d208-4aee-8f18-3b5857c871b9}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\libs\libteletone\libteletone.2010.vcxproj">
+      <Name>libteletone</Name>
+      <Project>{89385c74-5860-4174-9caf-a39e7c48909c}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\libs\spandsp\src\libspandsp.2010.vcxproj">
+      <Name>libspandsp</Name>
+      <Project>{1cbb0077-18c5-455f-801c-0a0ce7b0bbf5}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\libs\win32\apr-util\libaprutil.2010.vcxproj">
+      <Name>libaprutil</Name>
+      <Project>{f057da7f-79e5-4b00-845c-ef446ef055e3}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\libs\win32\apr\libapr.2010.vcxproj">
+      <Name>libapr</Name>
+      <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\libs\win32\js\js.2010.vcxproj">
+      <Name>js</Name>
+      <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\libs\win32\openssl\libeay32.2010.vcxproj">
+      <Name>libeay32</Name>
+      <Project>{d331904d-a00a-4694-a5a3-fcff64ab5dbe}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\libs\win32\openssl\openssl.2010.vcxproj">
+      <Name>openssl __Libraries\openssl\openssl_</Name>
+      <Project>{25bd39b1-c8bf-4676-a738-9cabd9c6bc79}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\libs\win32\openssl\ssleay32.2010.vcxproj">
+      <Name>ssleay32</Name>
+      <Project>{b4b62169-5ad4-4559-8707-3d933ac5db39}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\libs\win32\pocketsphinx\pocketsphinx.2010.vcxproj">
+      <Name>pocketsphinx</Name>
+      <Project>{94001a0e-a837-445c-8004-f918f10d0226}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\libs\win32\pthread\pthread.2010.vcxproj">
+      <Name>pthread</Name>
+      <Project>{df018947-0fff-4eb3-bdee-441dc81da7a4}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\libs\win32\sphinxbase\sphinxbase.2010.vcxproj">
+      <Name>sphinxbase</Name>
+      <Project>{2f025ead-99bd-40f5-b2cc-f0a28cad7f2d}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_avmd\mod_avmd.2010.vcxproj">
+      <Name>mod_avmd</Name>
+      <Project>{990baa76-89d3-4e38-8479-c7b28784efc8}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_commands\mod_commands.2010.vcxproj">
+      <Name>mod_commands</Name>
+      <Project>{30a5b29c-983e-4580-9fd0-d647ccdcc7eb}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_conference\mod_conference.2010.vcxproj">
+      <Name>mod_conference</Name>
+      <Project>{c24fb505-05d7-4319-8485-7540b44c8603}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_curl\mod_curl.2010.vcxproj">
+      <Name>mod_curl</Name>
+      <Project>{ef300386-a8df-4372-b6d8-fb9bffca9aed}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_db\mod_db.2010.vcxproj">
+      <Name>mod_db</Name>
+      <Project>{f6a33240-8f29-48bd-98f0-826995911799}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_dptools\mod_dptools.2010.vcxproj">
+      <Name>mod_dptools</Name>
+      <Project>{b5881a85-fe70-4f64-8607-2caae52669c6}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_enum\mod_enum.2010.vcxproj">
+      <Name>mod_enum</Name>
+      <Project>{71a967d5-0e99-4cef-a587-98836ee6f2ef}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_esf\mod_esf.2010.vcxproj">
+      <Name>mod_esf</Name>
+      <Project>{3850d93a-5f24-4922-bc1c-74d08c37c256}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_expr\mod_expr.2010.vcxproj">
+      <Name>mod_expr</Name>
+      <Project>{65a6273d-fcab-4c55-b09e-65100141a5d4}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_fifo\mod_fifo.2010.vcxproj">
+      <Name>mod_fifo</Name>
+      <Project>{75df7f29-2fbf-47f7-b5af-5b4952dc1abd}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_fsv\mod_fsv.2010.vcxproj">
+      <Name>mod_fsv</Name>
+      <Project>{e3246d17-e29b-4ab5-962a-c69b0c5837bb}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_hash\mod_hash.2010.vcxproj">
+      <Name>mod_hash</Name>
+      <Project>{2e250296-0c08-4342-9c8a-bcbdd0e7df65}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_lcr\mod_lcr.2010.vcxproj">
+      <Name>mod_lcr</Name>
+      <Project>{1a3793d1-05d1-4b57-9b0f-5af3e79dc439}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_nibblebill\mod_nibblebill.2010.vcxproj">
+      <Name>mod_nibblebill</Name>
+      <Project>{3c977801-fe88-48f2-83d3-fa2ebff6688e}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_rss\mod_rss.2010.vcxproj">
+      <Name>mod_rss</Name>
+      <Project>{b69247fa-ecd6-40ed-8e44-5ca6c3baf9a4}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_snom\mod_snom.2010.vcxproj">
+      <Name>mod_snom</Name>
+      <Project>{2a3d00c6-588d-4e86-81ac-9ef5ede86e03}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_spandsp\mod_spandsp.2010.vcxproj">
+      <Name>mod_spandsp</Name>
+      <Project>{1e21afe0-6fdb-41d2-942d-863607c24b91}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_valet_parking\mod_valet_parking.2010.vcxproj">
+      <Name>mod_valet_parking</Name>
+      <Project>{432db165-1eb2-4781-a9c0-71e62610b20a}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_vmd\mod_vmd.2010.vcxproj">
+      <Name>mod_vmd</Name>
+      <Project>{14e4a972-9cfb-436d-b0a5-4943f3f80d47}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\applications\mod_voicemail\mod_voicemail.2010.vcxproj">
+      <Name>mod_voicemail</Name>
+      <Project>{d7f1e3f2-a3f4-474c-8555-15122571af52}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\asr_tts\mod_pocketsphinx\mod_pocketsphinx.2010.vcxproj">
+      <Name>mod_pocketsphinx</Name>
+      <Project>{2286da73-9fc5-45bc-a508-85994c3317ab}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\asr_tts\mod_unimrcp\mod_unimrcp.2010.vcxproj">
+      <Name>mod_unimrcp</Name>
+      <Project>{d07c378a-f5f7-438f-adf3-4ac4fb1883cd}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\codecs\mod_amr\mod_amr.2010.vcxproj">
+      <Name>mod_amr</Name>
+      <Project>{8deb383c-4091-4f42-a56f-c9e46d552d79}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\codecs\mod_celt\mod_celt.vcxproj">
+      <Name>mod_celt</Name>
+      <Project>{4d418176-3b33-47e6-a63e-01ba34add21c}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\codecs\mod_g723_1\mod_g723_1.2010.vcxproj">
+      <Name>mod_g723_1</Name>
+      <Project>{fea1eef7-876f-48de-88bf-c0e3e606d758}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\codecs\mod_g729\mod_g729.2010.vcxproj">
+      <Name>mod_g729</Name>
+      <Project>{1d95cd95-0de2-48c3-ac23-d5c7d1c9c0f0}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\codecs\mod_h26x\mod_h26x.2010.vcxproj">
+      <Name>mod_h26x</Name>
+      <Project>{2c3c2423-234b-4772-8899-d3b137e5ca35}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\codecs\mod_ilbc\mod_ilbc.2010.vcxproj">
+      <Name>mod_ilbc</Name>
+      <Project>{d3ec0aff-76fc-4210-a825-9a17410660a3}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\codecs\mod_silk\mod_silk.2010.vcxproj">
+      <Name>mod_silk</Name>
+      <Project>{afa983d6-4569-4f88-ba94-555ed00fd9a8}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\codecs\mod_siren\mod_siren.2010.vcxproj">
+      <Name>mod_siren</Name>
+      <Project>{0b6c905b-142e-4999-b39d-92ff7951e921}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\codecs\mod_speex\mod_speex.2010.vcxproj">
+      <Name>mod_speex</Name>
+      <Project>{5580d60e-0f77-4716-9cd4-b8e5986fa375}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\dialplans\mod_dialplan_asterisk\mod_dialplan_asterisk.2010.vcxproj">
+      <Name>mod_dialplan_asterisk</Name>
+      <Project>{e7bc026c-7cc5-45a3-bc7c-3b88eef01f24}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\dialplans\mod_dialplan_directory\mod_dialplan_directory.2010.vcxproj">
+      <Name>mod_dialplan_directory</Name>
+      <Project>{a27cca23-1541-4337-81a4-f0a6413078a0}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.2010.vcxproj">
+      <Name>mod_dialplan_xml</Name>
+      <Project>{07113b25-d3af-4e04-ba77-4cd1171f022c}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\endpoints\mod_loopback\mod_loopback.2010.vcxproj">
+      <Name>mod_loopback</Name>
+      <Project>{b3f424ec-3d8f-417c-b244-3919d5e1a577}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\endpoints\mod_portaudio\mod_PortAudio.2010.vcxproj">
+      <Name>mod_PortAudio</Name>
+      <Project>{5fd31a25-5d83-4794-8bee-904dad84ce71}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\endpoints\mod_sofia\mod_sofia.2010.vcxproj">
+      <Name>mod_sofia</Name>
+      <Project>{0df3abd0-ddc0-4265-b778-07c66780979b}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\event_handlers\mod_cdr_csv\mod_cdr_csv.2010.vcxproj">
+      <Name>mod_cdr_csv</Name>
+      <Project>{44d7deaf-fda5-495e-8b9d-1439e4f4c21e}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\event_handlers\mod_event_multicast\mod_event_multicast.2010.vcxproj">
+      <Name>mod_event_multicast</Name>
+      <Project>{784113ef-44d9-4949-835d-7065d3c7ad08}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\event_handlers\mod_event_socket\mod_event_socket.2010.vcxproj">
+      <Name>mod_event_socket</Name>
+      <Project>{05515420-16de-4e63-be73-85be85ba5142}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\formats\mod_file_string\mod_file_string.2010.vcxproj">
+      <Name>mod_file_string</Name>
+      <Project>{70564d74-199a-4452-9c60-19ed5f242f0d}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\formats\mod_local_stream\mod_local_stream.2010.vcxproj">
+      <Name>mod_local_stream</Name>
+      <Project>{2ca40887-1622-46a1-a7f9-17fd7e7e545b}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\formats\mod_native_file\mod_native_file.2010.vcxproj">
+      <Name>mod_native_file</Name>
+      <Project>{9254c4b0-6f60-42b6-bb3a-36d63fc001c7}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\formats\mod_sndfile\mod_sndfile.2010.vcxproj">
+      <Name>mod_sndfile</Name>
+      <Project>{afac0568-7548-42d5-9f6a-8d3400a1e4f6}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\formats\mod_tone_stream\mod_tone_stream.2010.vcxproj">
+      <Name>mod_tone_stream</Name>
+      <Project>{6ff941ac-82c5-429f-aa4c-ad2fb9e5da52}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\languages\mod_lua\lua\lua.2010.vcxproj">
+      <Name>lua51</Name>
+      <Project>{d0b36172-cd76-454a-9b89-990025266c2a}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\languages\mod_lua\mod_lua.2010.vcxproj">
+      <Name>mod_lua</Name>
+      <Project>{7b077e7f-1be7-4291-ab86-55e527b25cac}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\languages\mod_managed\managed\FreeSWITCH.Managed.2010.csproj">
+      <Name>FreeSWITCH.Managed.2010</Name>
+      <Project>{834e2b2f-5483-4b80-8fe3-fe48ff76e5c0}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\languages\mod_managed\mod_managed.2010.vcxproj">
+      <Name>mod_managed</Name>
+      <Project>{7b42bda1-72c0-4378-a9b6-5c530f8cd61e}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\loggers\mod_console\mod_console.2010.vcxproj">
+      <Name>mod_console</Name>
+      <Project>{1c453396-d912-4213-89fd-9b489162b7b5}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\loggers\mod_logfile\mod_logfile.2010.vcxproj">
+      <Name>mod_logfile</Name>
+      <Project>{d0bcac02-d94b-46b8-9b49-cddcc2bd7909}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\say\mod_say_de\mod_say_de.2010.vcxproj">
+      <Name>mod_say_de</Name>
+      <Project>{5bc072db-3826-48ea-af34-fe32aa01e83b}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\say\mod_say_en\mod_say_en.2010.vcxproj">
+      <Name>mod_say_en</Name>
+      <Project>{988cacf7-3fcb-4992-be69-77872ae67dc8}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\say\mod_say_es\mod_say_es.2010.vcxproj">
+      <Name>mod_say_es</Name>
+      <Project>{fa429e98-8b03-45e6-a096-a4bc5e821de4}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\say\mod_say_fr\mod_say_fr.2010.vcxproj">
+      <Name>mod_say_fr</Name>
+      <Project>{06e3a538-ab32-44f2-b477-755ff9cb5d37}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\say\mod_say_it\mod_say_it.2010.vcxproj">
+      <Name>mod_say_it</Name>
+      <Project>{6d1bec70-4dcd-4fe9-adbd-4a43a67e4d05}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\say\mod_say_nl\mod_say_nl.2010.vcxproj">
+      <Name>mod_say_nl</Name>
+      <Project>{a4b122cf-5196-476b-8c0e-d8bd59ac3c14}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\say\mod_say_ru\mod_say_ru.2010.vcxproj">
+      <Name>mod_say_ru</Name>
+      <Project>{0382e8fd-cfdc-41c0-8b03-792c7c84fc31}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\say\mod_say_zh\mod_say_zh.2010.vcxproj">
+      <Name>mod_say_zh</Name>
+      <Project>{b6a9fb7a-1cc4-442b-812d-ec33e4e4a36e}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\xml_int\mod_xml_cdr\mod_xml_cdr.2010.vcxproj">
+      <Name>mod_xml_cdr</Name>
+      <Project>{08dad348-9e0a-4a2e-97f1-f1e7e24a7836}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\xml_int\mod_xml_curl\mod_xml_curl.2010.vcxproj">
+      <Name>mod_xml_curl</Name>
+      <Project>{ab91a099-7690-4ecf-8994-e458f4ea1ed4}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.2010.vcxproj">
+      <Name>mod_xml_rpc</Name>
+      <Project>{cbec7225-0c21-4da8-978e-1f158f8ad950}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\w32\Console\FreeSwitchConsole.2010.vcxproj">
+      <Name>FreeSwitchConsole</Name>
+      <Project>{1af3a893-f7be-43dd-b697-8ab2397c0d67}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\w32\Library\FreeSwitchCore.2010.vcxproj">
+      <Name>FreeSwitchCoreLib</Name>
+      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Fragments" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <PropertyGroup>
+    <PreBuildEvent>"$(WIX)bin\heat.exe" dir "$(ProjectDir)..\..\conf" -cg FreeSWITCHConfFiles -gg -scom -sreg -sfrag -srd -dr CONFLOCATION -var var.FreeSWITCHConfFilesDir -out "$(ProjectDir)Fragments\FreeSWITCHConfFiles.wxs"
+"$(WIX)bin\heat.exe" dir "$(ProjectDir)..\..\Win32\Release\sounds" -cg FreeSWITCHSoundFiles8 -gg -scom -sreg -sfrag -srd -dr SOUNDLOCATION -var var.FreeSWITCHSoundFilesDir -out "$(ProjectDir)Fragments\FreeSWITCHSoundFiles8.wxs"</PreBuildEvent>
+  </PropertyGroup>
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
\ No newline at end of file