June 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5429 - freeswitch/trunk/w32/Setup
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: mikej Date: Wed Jun 20 14:53:49 2007 New Revision: 5429 Modified: freeswitch/trunk/w32/Setup/Setup.vdproj Log: make msi work for now. Modified: freeswitch/trunk/w32/Setup/Setup.vdproj ============================================================================== --- freeswitch/trunk/w32/Setup/Setup.vdproj (original) +++ freeswitch/trunk/w32/Setup/Setup.vdproj Wed Jun 20 14:53:49 2007 @@ -15,12 +15,6 @@ { "Entry" { - "MsmKey" = "8:_0A2A2813738E4157B2CC6A4EF2A303BB" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_0F091427EEA0245FBA87474748D35ABD" "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" "MsmSig" = "8:_UNDEFINED" @@ -45,199 +39,199 @@ } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_FB1B9FBDC3294F1C96DAC4246C013C22" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_F84240319757424DB1C58AD0AD420127" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_EF14CB99F3414BB689D0CB0E6D6B8AB8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_E763C699DF0948B6984DDEB96A2DFD06" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_D6F0F5845FAD4707975CE012A33CD607" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_D0BB09AFB8D94B76918F0EE85BCCAD0A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_C105055EE271471A999CE7022E617EB7" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_B20769E090034897B32E3EA4EC1BA8A0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_AD2EB44FE6D548F2A8DA4F9F2CE817AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_87768631363249B2B301143C193612F7" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_83C1B93AD71B4F8F9E074F9607B60DF1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_7358123D2D064AD1BC517911A8B23D1B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_6E5C001E7A314DCEA0A4BF52BF74BCAD" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_684D96FA2BDD46909367E651099D8C4E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_5A636BB90F7F4B86ACB8839EA2C899AA" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_3E37631016BC45B2B672FE23257D542B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_2F2FEC549F02436EB87961BD1B9E5783" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_2D09AB81AB8D45FF97E9DFA4DAC3465D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_2814E641538B42EFA83525986A9D5AC1" "MsmSig" = "8:_UNDEFINED" } @@ -273,14 +267,14 @@ } "Entry" { - "MsmKey" = "8:_329D8DAE6C01FCF026E9DFB48B932203" - "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" + "MsmKey" = "8:_326CFBAF7BA54A989CB1BF8A9CF959D8" + "OwnerKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_35FACDFFDDB943568B7588D14D0513A7" - "OwnerKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_329D8DAE6C01FCF026E9DFB48B932203" + "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -303,18 +297,6 @@ } "Entry" { - "MsmKey" = "8:_525E8ED430D44113995AB8FBF1945569" - "OwnerKey" = "8:_548996CD77304E3598846F122E79431A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_548996CD77304E3598846F122E79431A" - "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -417,12 +399,6 @@ } "Entry" { - "MsmKey" = "8:_A40E3F2045F44C60A8509FDFE47E6C45" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A944ADCEDF884574A23F7BA5420A6BA1" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -742,26 +718,6 @@ } "File" { - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0A2A2813738E4157B2CC6A4EF2A303BB" - { - "SourcePath" = "8:..\\..\\AUTHORS" - "TargetName" = "8:AUTHORS" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0F091427EEA0245FBA87474748D35ABD" { "SourcePath" = "8:js32.dll" @@ -962,26 +918,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A40E3F2045F44C60A8509FDFE47E6C45" - { - "SourcePath" = "8:..\\..\\COPYING" - "TargetName" = "8:COPYING" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ADA22D44BCDEBA509E09A5D4C155AA41" { "SourcePath" = "8:ODBC32.dll" @@ -1173,7 +1109,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Freeswitch" "ProductCode" = "8:{317A9CC0-40DC-4803-A13E-5937F05F9D2E}" - "PackageCode" = "8:{35A30F10-964D-4C59-A882-360D2CAC47EC}" + "PackageCode" = "8:{F98461BC-9B50-4BEA-A554-74A6F557BECF}" "UpgradeCode" = "8:{8080E3A5-7ADD-4173-8913-BDA439D1C8DD}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" @@ -1447,53 +1383,6 @@ } } } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E8A0FD168FA4401FBF582E01DA819A71" - { - "Sequence" = "3:210" - "DisplayName" = "8:License Agreement" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:<VsdDialogDir>\\VsdAdminLicenseDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "EulaText" - { - "Name" = "8:EulaText" - "DisplayName" = "8:#1008" - "Description" = "8:#1108" - "Type" = "3:6" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:2" - "Value" = "8:_A40E3F2045F44C60A8509FDFE47E6C45" - "UsePlugInResources" = "11:TRUE" - } - "Sunken" - { - "Name" = "8:Sunken" - "DisplayName" = "8:#1007" - "Description" = "8:#1107" - "Type" = "3:5" - "ContextData" = "8:4;True=4;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:4" - "DefaultValue" = "3:4" - "UsePlugInResources" = "11:TRUE" - } - } - } } } "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_9237AC900FC7421096FC1C1F479A57D9" @@ -1595,53 +1484,6 @@ } } } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1229F6668E004795AE90C753D37CA881" - { - "Sequence" = "3:300" - "DisplayName" = "8:License Agreement" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:<VsdDialogDir>\\VsdLicenseDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "EulaText" - { - "Name" = "8:EulaText" - "DisplayName" = "8:#1008" - "Description" = "8:#1108" - "Type" = "3:6" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:2" - "Value" = "8:_A40E3F2045F44C60A8509FDFE47E6C45" - "UsePlugInResources" = "11:TRUE" - } - "Sunken" - { - "Name" = "8:Sunken" - "DisplayName" = "8:#1007" - "Description" = "8:#1107" - "Type" = "3:5" - "ContextData" = "8:4;True=4;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:4" - "DefaultValue" = "3:4" - "UsePlugInResources" = "11:TRUE" - } - } - } "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E4748A502E1E4F89B72F6B70E40E6954" { "Sequence" = "3:400" @@ -1804,7 +1646,7 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_27200676A75147D0BB7FA5500BB31A6D" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_245904E3D36D4A86B2FB963505EB83D2" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -1818,7 +1660,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_35FACDFFDDB943568B7588D14D0513A7" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_326CFBAF7BA54A989CB1BF8A9CF959D8" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -1832,34 +1674,6 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_525E8ED430D44113995AB8FBF1945569" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_548996CD77304E3598846F122E79431A" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } } "ProjectOutput" {

1 0

[commit] r5428 - in freeswitch/trunk/src/mod/endpoints: mod_dingaling mod_iax mod_portaudio mod_woomera
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: mikej Date: Wed Jun 20 14:53:26 2007 New Revision: 5428 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: whoops Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Wed Jun 20 14:53:26 2007 @@ -1817,7 +1817,7 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); channel_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); - channel_endpoint_interface->interface_name = modname; + channel_endpoint_interface->interface_name = "digngaling"; channel_endpoint_interface->io_routines = &channel_io_routines; channel_endpoint_interface->state_handler = &channel_event_handlers; Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Wed Jun 20 14:53:26 2007 @@ -868,7 +868,7 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); channel_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); - channel_endpoint_interface->interface_name = modname; + channel_endpoint_interface->interface_name = "iax"; channel_endpoint_interface->io_routines = &channel_io_routines; channel_endpoint_interface->state_handler = &channel_state_handlers; Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Wed Jun 20 14:53:26 2007 @@ -852,7 +852,7 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); channel_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); - channel_endpoint_interface->interface_name = modname; + channel_endpoint_interface->interface_name = "portaudio"; channel_endpoint_interface->io_routines = &channel_io_routines; channel_endpoint_interface->state_handler = &channel_event_handlers; Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Wed Jun 20 14:53:26 2007 @@ -1353,7 +1353,7 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); woomera_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); - woomera_endpoint_interface->interface_name = modname; + woomera_endpoint_interface->interface_name = "woomera"; woomera_endpoint_interface->io_routines = &woomera_io_routines; woomera_endpoint_interface->state_handler = &woomera_event_handlers;

1 0

[commit] r5426 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: mikej Date: Wed Jun 20 14:45:35 2007 New Revision: 5426 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: whoops Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Jun 20 14:45:35 2007 @@ -1529,7 +1529,7 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); sofia_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); - sofia_endpoint_interface->interface_name = modname; + sofia_endpoint_interface->interface_name = "sofia"; sofia_endpoint_interface->io_routines = &sofia_io_routines; sofia_endpoint_interface->state_handler = &sofia_event_handlers;

1 0

[commit] r5424 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: mikej Date: Wed Jun 20 11:13:46 2007 New Revision: 5424 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c Log: fix windows build. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c Wed Jun 20 11:13:46 2007 @@ -1271,7 +1271,7 @@ } } - nta_agent_bind_tport_update(nua->nua_nta, nua, nua_stack_tport_update); + nta_agent_bind_tport_update(nua->nua_nta, (nta_update_magic_t *)nua, nua_stack_tport_update); return 0; }

1 0

[commit] r5423 - freeswitch/trunk/src
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: anthm Date: Wed Jun 20 10:50:02 2007 New Revision: 5423 Modified: freeswitch/trunk/src/switch_channel.c Log: avoiding deadlock Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Jun 20 10:50:02 2007 @@ -319,9 +319,10 @@ if (!(v = switch_core_hash_find(channel->variables, varname))) { if (!channel->caller_profile || !(v = switch_caller_get_field_by_name(channel->caller_profile, varname))) { if (!strcmp(varname, "base_dir")) { - return SWITCH_GLOBAL_dirs.base_dir; + v = SWITCH_GLOBAL_dirs.base_dir; + } else { + v = switch_core_get_variable(varname); } - v = switch_core_get_variable(varname); } } switch_mutex_unlock(channel->profile_mutex);

1 0

[commit] r5422 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: cparker Date: Wed Jun 20 10:45:28 2007 New Revision: 5422 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: Remove uneeded module_pool declaration Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Wed Jun 20 10:45:28 2007 @@ -40,8 +40,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load); SWITCH_MODULE_DEFINITION(mod_radius_cdr, mod_radius_cdr_load, NULL, NULL); -static switch_memory_pool_t *module_pool = NULL; - static char cf[] = "mod_radius_cdr.conf"; static char my_dictionary[PATH_MAX]; static char * my_timeout; /* 5 */ @@ -471,8 +469,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load) { - module_pool = pool; - if (load_config() != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_TERM; }

1 0

[commit] r5421 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: cparker Date: Wed Jun 20 10:41:55 2007 New Revision: 5421 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: Changes to new macro initialzation Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Wed Jun 20 10:41:55 2007 @@ -37,7 +37,10 @@ #include <freeradius-client.h> #include "mod_radius_cdr.h" -static const char modname[] = "mod_radius_cdr"; +SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load); +SWITCH_MODULE_DEFINITION(mod_radius_cdr, mod_radius_cdr_load, NULL, NULL); + +static switch_memory_pool_t *module_pool = NULL; static char cf[] = "mod_radius_cdr.conf"; static char my_dictionary[PATH_MAX]; @@ -466,18 +469,10 @@ /*.on_transmit */ NULL }; - -static const switch_loadable_module_interface_t mod_radius_cdr_module_interface = { - /*.module_name = */ modname, - /*.endpoint_interface = */ NULL, - /*.timer_interface = */ NULL, - /*.dialplan_interface = */ NULL, - /*.codec_interface = */ NULL, - /*.application_interface */ NULL -}; - -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load) { + module_pool = pool; + if (load_config() != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_TERM; } @@ -485,7 +480,7 @@ /* test global state handlers */ switch_core_add_state_handler(&state_handlers); - *module_interface = &mod_radius_cdr_module_interface; + *module_interface = switch_loadable_module_create_module_interface(pool, modname); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r5420 - in freeswitch/trunk/src: . include mod/languages/mod_python
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: mikej Date: Wed Jun 20 10:35:22 2007 New Revision: 5420 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/trunk/src/switch_cpp.cpp Log: Add recordFile method. merge svn r5149 from branch. Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Wed Jun 20 10:35:22 2007 @@ -68,6 +68,17 @@ void setVariable(char *var, char *val); char *getVariable(char *var); + + /** \brief Record to a file + * \param filename + * \param <[max_len]> maximum length of the recording in seconds + * \param <[silence_threshold]> energy level audio must fall below + * to be considered silence (500 is a good starting point). + * \param <[silence_secs]> seconds of silence to interrupt the record. + */ + int recordFile(char *file_name, int max_len=0, int silence_threshold=0, int silence_secs=0); + + /** \brief Set attributes of caller data for purposes of outgoing calls * \param var - the variable name, eg, "caller_id_name" * \param val - the data to set, eg, "bob" Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py Wed Jun 20 10:35:22 2007 @@ -106,6 +106,7 @@ def hangup(*args): return _freeswitch.CoreSession_hangup(*args) def setVariable(*args): return _freeswitch.CoreSession_setVariable(*args) def getVariable(*args): return _freeswitch.CoreSession_getVariable(*args) + def recordFile(*args): return _freeswitch.CoreSession_recordFile(*args) def setCallerData(*args): return _freeswitch.CoreSession_setCallerData(*args) def originate(*args): return _freeswitch.CoreSession_originate(*args) def playFile(*args): return _freeswitch.CoreSession_playFile(*args) Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Wed Jun 20 10:35:22 2007 @@ -3745,6 +3745,73 @@ } +SWIGINTERN PyObject *_wrap_CoreSession_recordFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + char *arg2 = (char *) 0 ; + int arg3 = (int) 0 ; + int arg4 = (int) 0 ; + int arg5 = (int) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int val3 ; + int ecode3 = 0 ; + int val4 ; + int ecode4 = 0 ; + int val5 ; + int ecode5 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO|OOO:CoreSession_recordFile",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_recordFile" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_recordFile" "', argument " "2"" of type '" "char *""'"); + } + arg2 = reinterpret_cast< char * >(buf2); + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CoreSession_recordFile" "', argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CoreSession_recordFile" "', argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } + if (obj4) { + ecode5 = SWIG_AsVal_int(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CoreSession_recordFile" "', argument " "5"" of type '" "int""'"); + } + arg5 = static_cast< int >(val5); + } + result = (int)(arg1)->recordFile(arg2,arg3,arg4,arg5); + resultobj = SWIG_From_int(static_cast< int >(result)); + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return resultobj; +fail: + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return NULL; +} + + SWIGINTERN PyObject *_wrap_CoreSession_setCallerData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; @@ -4821,6 +4888,7 @@ { (char *)"CoreSession_hangup", _wrap_CoreSession_hangup, METH_VARARGS, NULL}, { (char *)"CoreSession_setVariable", _wrap_CoreSession_setVariable, METH_VARARGS, NULL}, { (char *)"CoreSession_getVariable", _wrap_CoreSession_getVariable, METH_VARARGS, NULL}, + { (char *)"CoreSession_recordFile", _wrap_CoreSession_recordFile, METH_VARARGS, NULL}, { (char *)"CoreSession_setCallerData", _wrap_CoreSession_setCallerData, METH_VARARGS, NULL}, { (char *)"CoreSession_originate", _wrap_CoreSession_originate, METH_VARARGS, NULL}, { (char *)"CoreSession_playFile", _wrap_CoreSession_playFile, METH_VARARGS, NULL}, Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Wed Jun 20 10:35:22 2007 @@ -303,6 +303,20 @@ return SWITCH_STATUS_FALSE; } +int CoreSession::recordFile(char *file_name, int max_len, int silence_threshold, int silence_secs) +{ + switch_file_handle_t fh = { 0 }; + switch_status_t status; + + fh.thresh = silence_threshold; + fh.silence_hits = silence_secs; + store_file_handle(&fh); + begin_allow_threads(); + status = switch_ivr_record_file(session, &fh, file_name, &args, max_len); + end_allow_threads(); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; + +} void CoreSession::setCallerData(char *var, char *val) {

1 0

[commit] r5418 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: mikej Date: Wed Jun 20 07:02:45 2007 New Revision: 5418 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Log: fix for new switch_log_printf prototype Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Wed Jun 20 07:02:45 2007 @@ -222,7 +222,7 @@ va_start(ap, fmt); if ((ret = switch_vasprintf(&data, fmt, ap)) != -1) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, level, "%s", data); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, level, "%s", data); } va_end(ap); }

1 0

[commit] r5417 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: mikej Date: Wed Jun 20 06:50:56 2007 New Revision: 5417 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix for new switch_log_printf prototype Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Jun 20 06:50:56 2007 @@ -629,7 +629,7 @@ message = "(N/A)"; } - switch_log_printf(SWITCH_CHANNEL_ID_LOG, filename, modname, line, SWITCH_LOG_ERROR, "%s %s%s\n", ex, message, text); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, filename, modname, line, NULL, SWITCH_LOG_ERROR, "%s %s%s\n", ex, message, text); } @@ -2588,12 +2588,12 @@ } if ((msg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])))) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "console_log", line, level, "%s", msg); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "console_log", line, NULL, level, "%s", msg); return JS_TRUE; } } else if (argc > 0) { if ((msg = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "console_log", line, level, "%s", msg); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "console_log", line, NULL, level, "%s", msg); return JS_TRUE; } }

1 0