- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r1894 - freeswitch/branches/isicom
by Freeswitch SVN 17 Jul '06

17 Jul '06

Author: sphere Date: Mon Jul 17 04:02:50 2006 New Revision: 1894 Added: freeswitch/branches/isicom/ Log: Creating empty folder for isicom

1 0

[commit] r1893 - freeswitch/branches/govoip
by Freeswitch SVN 16 Jul '06

16 Jul '06

Author: sphere Date: Sun Jul 16 14:28:46 2006 New Revision: 1893 Added: freeswitch/branches/govoip/ Log: Creating empty folder for govoip

1 0

[commit] r1892 - freeswitch/branches/dra_phantom
by Freeswitch SVN 16 Jul '06

16 Jul '06

Author: sphere Date: Sun Jul 16 13:25:49 2006 New Revision: 1892 Added: freeswitch/branches/dra_phantom/ Log: Creating empty folder for dra_phantom

1 0

[commit] r1891 - freeswitch/branches/islam
by Freeswitch SVN 16 Jul '06

16 Jul '06

Author: sphere Date: Sat Jul 15 22:54:52 2006 New Revision: 1891 Added: freeswitch/branches/islam/ Log: Creating empty folder for islam

1 0

[commit] r1890 - in freeswitch/trunk/w32: Setup vsnet
by Freeswitch SVN 15 Jul '06

15 Jul '06

Author: mikej Date: Sat Jul 15 14:40:16 2006 New Revision: 1890 Modified: freeswitch/trunk/w32/Setup/Setup.vdproj freeswitch/trunk/w32/vsnet/Freeswitch.sln Log: update freeswitch setup. Modified: freeswitch/trunk/w32/Setup/Setup.vdproj ============================================================================== --- freeswitch/trunk/w32/Setup/Setup.vdproj (original) +++ freeswitch/trunk/w32/Setup/Setup.vdproj Sat Jul 15 14:40:16 2006 @@ -21,6 +21,12 @@ } "Entry" { + "MsmKey" = "8:_0A2A2813738E4157B2CC6A4EF2A303BB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_10A983E896C14286A47AAB6A8570EE6D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -153,12 +159,6 @@ } "Entry" { - "MsmKey" = "8:_2BF556351045DED0C85B527171346CCD" - "OwnerKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_2D09AB81AB8D45FF97E9DFA4DAC3465D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -291,6 +291,12 @@ } "Entry" { + "MsmKey" = "8:_A40E3F2045F44C60A8509FDFE47E6C45" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_A55F680EDBCDA3F18A46EF6CFC14A1D5" "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E" "MsmSig" = "8:_UNDEFINED" @@ -550,12 +556,12 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1273F63008CF585CA0E063E436B4646F" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0A2A2813738E4157B2CC6A4EF2A303BB" { - "SourcePath" = "8:iphlpapi.dll" - "TargetName" = "8:iphlpapi.dll" + "SourcePath" = "8:..\\..\\AUTHORS" + "TargetName" = "8:AUTHORS" "Tag" = "8:" - "Folder" = "8:_06036160035041E38F4179E6DB6380C5" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -566,16 +572,16 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1BD78CCD666E4BB5BE1168302E9613A2" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1273F63008CF585CA0E063E436B4646F" { - "SourcePath" = "8:..\\..\\libs\\apr-iconv\\Release\\libapriconv-1.dll" - "TargetName" = "8:libapriconv-1.dll" + "SourcePath" = "8:iphlpapi.dll" + "TargetName" = "8:iphlpapi.dll" "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Folder" = "8:_06036160035041E38F4179E6DB6380C5" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -586,14 +592,14 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2BF556351045DED0C85B527171346CCD" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1BD78CCD666E4BB5BE1168302E9613A2" { - "SourcePath" = "8:libpcre.dll" - "TargetName" = "8:libpcre.dll" + "SourcePath" = "8:..\\..\\libs\\apr-iconv\\Release\\libapriconv-1.dll" + "TargetName" = "8:libapriconv-1.dll" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" "Condition" = "8:" @@ -607,7 +613,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_36D88C9590054DCA8F6ABAE6F05C2FD6" @@ -730,6 +736,26 @@ "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}:_A55F680EDBCDA3F18A46EF6CFC14A1D5" { "SourcePath" = "8:sqlite.dll" @@ -901,14 +927,14 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Freeswitch" "ProductCode" = "8:{317A9CC0-40DC-4803-A13E-5937F05F9D2E}" - "PackageCode" = "8:{5010843A-818C-4EA9-8C62-3433E128CC5D}" + "PackageCode" = "8:{F5FFEAA8-6C32-4FFC-9DA5-FC799FDB8B8F}" "UpgradeCode" = "8:{8080E3A5-7ADD-4173-8913-BDA439D1C8DD}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" "ProductVersion" = "8:1.0.0" - "Manufacturer" = "8:Freeswitch" + "Manufacturer" = "8:Freeswitch.org" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" "Title" = "8:Freeswitch" @@ -916,7 +942,7 @@ "ARPCONTACT" = "8:" "Keywords" = "8:" "ARPCOMMENTS" = "8:" - "ARPURLINFOABOUT" = "8:" + "ARPURLINFOABOUT" = "8:http://www.freeswitch.org" "ARPPRODUCTICON" = "8:" "ARPIconIndex" = "3:0" "SearchPath" = "8:" @@ -953,6 +979,14 @@ } "Values" { + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_C59781825E5B4A9AA93BDAA5A88B7390" + { + "Name" = "8:[ProductName]" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:" + } } } } @@ -1167,6 +1201,53 @@ } } } + "{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" @@ -1268,9 +1349,56 @@ } } } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_3106DA132FA54E148478AB6CBA658548" + "{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" "DisplayName" = "8:Confirm Installation" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" @@ -1439,7 +1567,7 @@ { } "LanguageId" = "3:0" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "Folder" = "8:" "Feature" = "8:" "IsolateTo" = "8:" @@ -1453,7 +1581,7 @@ { } "LanguageId" = "3:0" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "Folder" = "8:" "Feature" = "8:" "IsolateTo" = "8:" Modified: freeswitch/trunk/w32/vsnet/Freeswitch.sln ============================================================================== --- freeswitch/trunk/w32/vsnet/Freeswitch.sln (original) +++ freeswitch/trunk/w32/vsnet/Freeswitch.sln Sat Jul 15 14:40:16 2006 @@ -201,8 +201,6 @@ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{99D6D74B-32A8-4441-A417-551B0E0A4510}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "..\..\src\mod\applications\mod_rss\mod_rss.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}" ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}

1 0

[commit] r1889 - freeswitch/branches/zhongdao
by Freeswitch SVN 15 Jul '06

15 Jul '06

Author: sphere Date: Sat Jul 15 13:05:45 2006 New Revision: 1889 Added: freeswitch/branches/zhongdao/ Log: Creating empty folder for zhongdao

1 0

[commit] r1888 - freeswitch/branches/magicye
by Freeswitch SVN 15 Jul '06

15 Jul '06

Author: sphere Date: Sat Jul 15 05:49:42 2006 New Revision: 1888 Added: freeswitch/branches/magicye/ Log: Creating empty folder for magicye

1 0

[commit] r1887 - freeswitch/branches/jagdish
by Freeswitch SVN 15 Jul '06

15 Jul '06

Author: sphere Date: Sat Jul 15 03:44:46 2006 New Revision: 1887 Added: freeswitch/branches/jagdish/ Log: Creating empty folder for jagdish

1 0

[commit] r1886 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 14 Jul '06

14 Jul '06

Author: anthm Date: Fri Jul 14 17:16:01 2006 New Revision: 1886 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix printf args Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Jul 14 17:16:01 2006 @@ -208,10 +208,10 @@ sprintf (sql, "select * from interfaces where type = '%s'", cmd); } else if ( !strcmp(cmd,"calls")) { - sprintf (sql, "select * from calls", cmd); + sprintf (sql, "select * from calls"); } else if ( !strcmp(cmd,"channels")) { - sprintf (sql, "select * from channels", cmd); + sprintf (sql, "select * from channels"); } else { stream->write_function(stream, "Invalid interfaces type!\n");

1 0

[commit] r1885 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 14 Jul '06

14 Jul '06

Author: anthm Date: Fri Jul 14 17:15:26 2006 New Revision: 1885 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix command parser Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Jul 14 17:15:26 2006 @@ -1423,14 +1423,29 @@ } } else if (!strcasecmp(argv[1], "saymember")) { char *tbuf = NULL, *text, *name; - uint32_t id = atoi(argv[3]); + uint32_t id; conference_member_t *member; + if (argc > 3) { + id = atoi(argv[3]); + } else { + stream->write_function(stream, "(saymember) Syntax Error!"); + goto done; + } + if ((tbuf = strdup(buf))) { if ((name = strstr(tbuf, "saymember "))) { name += 10; - text = strchr(name, ' '); - id = atoi(name); + + if (*name) { + text = strchr(name, ' '); + id = atoi(name); + } else { + stream->write_function(stream, "(saymember) Syntax Error!"); + goto done; + } + + if ((member = conference_member_get(conference, id))) { if (text && conference_member_say(conference, member, text, 0) == SWITCH_STATUS_SUCCESS) {

1 0