- Freeswitch-branches - FreeSWITCH Mailing Lists

[commit] r10975 - freeswitch/branches/gmaruzz
by FreeSWITCH SVN 27 Dec '08

27 Dec '08

Author: gmaruzz Date: Sat Dec 27 16:40:05 2008 New Revision: 10975 Log: updated windows Makefile Modified: freeswitch/branches/gmaruzz/Freeswitch.2008.sln Modified: freeswitch/branches/gmaruzz/Freeswitch.2008.sln ============================================================================== --- freeswitch/branches/gmaruzz/Freeswitch.2008.sln (original) +++ freeswitch/branches/gmaruzz/Freeswitch.2008.sln Sat Dec 27 16:40:05 2008 @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +# Visual C++ Express 2008 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Codecs", "Codecs", "{F881ADA2-2F1A-4046-9FEB-191D9422D781}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Endpoints", "Endpoints", "{9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}" @@ -160,28 +160,28 @@ conf\lang\de\vm\tts.xml = conf\lang\de\vm\tts.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{765EF1B9-5027-4820-BC37-A44466A51631}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo (2)", "demo (2)", "{765EF1B9-5027-4820-BC37-A44466A51631}" ProjectSection(SolutionItems) = preProject conf\lang\en\demo\demo.xml = conf\lang\en\demo\demo.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{713E4747-1126-40B1-BD84-58F9A7745423}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm (2)", "vm (2)", "{713E4747-1126-40B1-BD84-58F9A7745423}" ProjectSection(SolutionItems) = preProject conf\lang\en\vm\sounds.xml = conf\lang\en\vm\sounds.xml conf\lang\en\vm\tts.xml = conf\lang\en\vm\tts.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{F1B71990-EB04-4EB5-B28A-BC3EB6F7E843}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo (3)", "demo (3)", "{F1B71990-EB04-4EB5-B28A-BC3EB6F7E843}" ProjectSection(SolutionItems) = preProject conf\lang\fr\demo\demo.xml = conf\lang\fr\demo\demo.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{3DAF028C-AB5B-4183-A01B-DCC43F5A87F0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm (3)", "vm (3)", "{3DAF028C-AB5B-4183-A01B-DCC43F5A87F0}" ProjectSection(SolutionItems) = preProject conf\lang\fr\vm\sounds.xml = conf\lang\fr\vm\sounds.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoload_configs", "{4833F8E3-ABBF-4260-9DB1-B34015676CFC}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs (2)", "autoload_configs (2)", "{4833F8E3-ABBF-4260-9DB1-B34015676CFC}" ProjectSection(SolutionItems) = preProject debug\conf\autoload_configs\alsa.conf.xml = debug\conf\autoload_configs\alsa.conf.xml debug\conf\autoload_configs\conference.conf.xml = debug\conf\autoload_configs\conference.conf.xml @@ -214,26 +214,26 @@ debug\conf\autoload_configs\zeroconf.conf.xml = debug\conf\autoload_configs\zeroconf.conf.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dialplan", "dialplan", "{D44DD429-FE98-42AA-B5B7-4B4EBE33AEFD}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dialplan (2)", "dialplan (2)", "{D44DD429-FE98-42AA-B5B7-4B4EBE33AEFD}" ProjectSection(SolutionItems) = preProject debug\conf\dialplan\default.xml = debug\conf\dialplan\default.xml debug\conf\dialplan\US.conf.xml = debug\conf\dialplan\US.conf.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "directory", "directory", "{471110C9-A7ED-4966-98E1-8EA667BF0EEA}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "directory (2)", "directory (2)", "{471110C9-A7ED-4966-98E1-8EA667BF0EEA}" ProjectSection(SolutionItems) = preProject debug\conf\directory\default.xml = debug\conf\directory\default.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sip_profiles", "sip_profiles", "{4DF5199E-F7F5-4347-97DD-22078FCDB371}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sip_profiles (2)", "sip_profiles (2)", "{4DF5199E-F7F5-4347-97DD-22078FCDB371}" ProjectSection(SolutionItems) = preProject debug\conf\sip_profiles\default.xml = debug\conf\sip_profiles\default.xml debug\conf\sip_profiles\nat.xml = debug\conf\sip_profiles\nat.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lang", "lang", "{B487BEBE-4A5C-434F-8D30-39465412F84F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lang (2)", "lang (2)", "{B487BEBE-4A5C-434F-8D30-39465412F84F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "de", "de", "{2003189F-0E69-4FF7-A11D-3BFB3F03D558}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "de (2)", "de (2)", "{2003189F-0E69-4FF7-A11D-3BFB3F03D558}" ProjectSection(SolutionItems) = preProject debug\conf\lang\de\de.xml = debug\conf\lang\de\de.xml EndProjectSection @@ -243,43 +243,43 @@ debug\conf\lang\en\en.xml = debug\conf\lang\en\en.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fr", "fr", "{1240C217-6674-43C1-B099-B0290D84F28B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fr (2)", "fr (2)", "{1240C217-6674-43C1-B099-B0290D84F28B}" ProjectSection(SolutionItems) = preProject debug\conf\lang\fr\fr.xml = debug\conf\lang\fr\fr.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{03517B06-98A1-46DD-9347-BFFFED7DD8A4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo (4)", "demo (4)", "{03517B06-98A1-46DD-9347-BFFFED7DD8A4}" ProjectSection(SolutionItems) = preProject debug\conf\lang\de\demo\demo.xml = debug\conf\lang\de\demo\demo.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{1D339A14-FFC2-4F6E-BEF2-D5D6DF14AC88}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm (4)", "vm (4)", "{1D339A14-FFC2-4F6E-BEF2-D5D6DF14AC88}" ProjectSection(SolutionItems) = preProject debug\conf\lang\de\vm\tts.xml = debug\conf\lang\de\vm\tts.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{B4C6D0B5-5F39-4546-820D-4BCAA6C3E301}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo (5)", "demo (5)", "{B4C6D0B5-5F39-4546-820D-4BCAA6C3E301}" ProjectSection(SolutionItems) = preProject debug\conf\lang\en\demo\demo.xml = debug\conf\lang\en\demo\demo.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{3041F86C-51D4-4D9E-8A00-91BA4B7C51D4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm (5)", "vm (5)", "{3041F86C-51D4-4D9E-8A00-91BA4B7C51D4}" ProjectSection(SolutionItems) = preProject debug\conf\lang\en\vm\sounds.xml = debug\conf\lang\en\vm\sounds.xml debug\conf\lang\en\vm\tts.xml = debug\conf\lang\en\vm\tts.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{DFE96A6E-5C9A-4C74-959A-9C485A7AD95C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo (6)", "demo (6)", "{DFE96A6E-5C9A-4C74-959A-9C485A7AD95C}" ProjectSection(SolutionItems) = preProject debug\conf\lang\fr\demo\demo.xml = debug\conf\lang\fr\demo\demo.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{80A4CA5C-7208-4134-8EFD-C147B03C8AA1}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm (6)", "vm (6)", "{80A4CA5C-7208-4134-8EFD-C147B03C8AA1}" ProjectSection(SolutionItems) = preProject debug\conf\lang\fr\vm\sounds.xml = debug\conf\lang\fr\vm\sounds.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoload_configs", "{8D29085B-952D-4594-9BB9-5781CE552D0A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs (3)", "autoload_configs (3)", "{8D29085B-952D-4594-9BB9-5781CE552D0A}" ProjectSection(SolutionItems) = preProject release\conf\autoload_configs\alsa.conf.xml = release\conf\autoload_configs\alsa.conf.xml release\conf\autoload_configs\conference.conf.xml = release\conf\autoload_configs\conference.conf.xml @@ -312,25 +312,25 @@ release\conf\autoload_configs\zeroconf.conf.xml = release\conf\autoload_configs\zeroconf.conf.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dialplan", "dialplan", "{23874F4B-C0AF-4587-9F7E-DB0F06DE8CB4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dialplan (3)", "dialplan (3)", "{23874F4B-C0AF-4587-9F7E-DB0F06DE8CB4}" ProjectSection(SolutionItems) = preProject conf\dialplan\default.xml = conf\dialplan\default.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "directory", "directory", "{19ED97F6-30D8-4FCE-AE1D-8B7FCB170D40}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "directory (3)", "directory (3)", "{19ED97F6-30D8-4FCE-AE1D-8B7FCB170D40}" ProjectSection(SolutionItems) = preProject release\conf\directory\default.xml = release\conf\directory\default.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sip_profiles", "sip_profiles", "{99E79D76-FCFC-466B-965B-273CCACF99B0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sip_profiles (3)", "sip_profiles (3)", "{99E79D76-FCFC-466B-965B-273CCACF99B0}" ProjectSection(SolutionItems) = preProject release\conf\sip_profiles\default.xml = release\conf\sip_profiles\default.xml release\conf\sip_profiles\nat.xml = release\conf\sip_profiles\nat.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lang", "lang", "{8FADAC7F-CA9E-49D9-B957-A5F5605D238C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lang (3)", "lang (3)", "{8FADAC7F-CA9E-49D9-B957-A5F5605D238C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "de", "de", "{58A56014-DEA7-4172-8C26-BAD8D499A1E8}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "de (3)", "de (3)", "{58A56014-DEA7-4172-8C26-BAD8D499A1E8}" ProjectSection(SolutionItems) = preProject release\conf\lang\de\de.xml = release\conf\lang\de\de.xml EndProjectSection @@ -340,38 +340,38 @@ release\conf\lang\en\en.xml = release\conf\lang\en\en.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fr", "fr", "{89A94241-1DA6-44E8-A685-AED1E665C2AD}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fr (3)", "fr (3)", "{89A94241-1DA6-44E8-A685-AED1E665C2AD}" ProjectSection(SolutionItems) = preProject release\conf\lang\fr\fr.xml = release\conf\lang\fr\fr.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{2D74F635-AB18-43B3-A87E-A71F3EA24DDB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo (7)", "demo (7)", "{2D74F635-AB18-43B3-A87E-A71F3EA24DDB}" ProjectSection(SolutionItems) = preProject release\conf\lang\de\demo\demo.xml = release\conf\lang\de\demo\demo.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{A721E646-07E9-4E16-A92D-B97F654B2BAC}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm (7)", "vm (7)", "{A721E646-07E9-4E16-A92D-B97F654B2BAC}" ProjectSection(SolutionItems) = preProject release\conf\lang\de\vm\tts.xml = release\conf\lang\de\vm\tts.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{50331CA0-7038-4341-B92D-C34E1601EFF0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo (8)", "demo (8)", "{50331CA0-7038-4341-B92D-C34E1601EFF0}" ProjectSection(SolutionItems) = preProject release\conf\lang\en\demo\demo.xml = release\conf\lang\en\demo\demo.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{FC0DB2A2-B1A3-426E-9E37-BE28FE8FE01B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm (8)", "vm (8)", "{FC0DB2A2-B1A3-426E-9E37-BE28FE8FE01B}" ProjectSection(SolutionItems) = preProject release\conf\lang\en\vm\sounds.xml = release\conf\lang\en\vm\sounds.xml release\conf\lang\en\vm\tts.xml = release\conf\lang\en\vm\tts.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{91C6DEDE-CE4A-47D1-A84B-3E828F82E2B0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo (9)", "demo (9)", "{91C6DEDE-CE4A-47D1-A84B-3E828F82E2B0}" ProjectSection(SolutionItems) = preProject release\conf\lang\fr\demo\demo.xml = release\conf\lang\fr\demo\demo.xml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{8F5A511B-F716-4D07-9657-55B9E4F1D3E9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm (9)", "vm (9)", "{8F5A511B-F716-4D07-9657-55B9E4F1D3E9}" ProjectSection(SolutionItems) = preProject release\conf\lang\fr\vm\sounds.xml = release\conf\lang\fr\vm\sounds.xml EndProjectSection @@ -1005,6 +1005,8 @@ {CF405366-9558-4AE8-90EF-5E21B51CCB4E} = {CF405366-9558-4AE8-90EF-5E21B51CCB4E} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skypiax", "src\mod\endpoints\mod_skypiax\mod_skypiax.2008.vcproj", "{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1771,6 +1773,12 @@ {D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Debug|x64.ActiveCfg = Debug|Win32 {D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Release|Win32.ActiveCfg = Release|Win32 {D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Release|x64.ActiveCfg = Release|Win32 + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|Win32.ActiveCfg = Debug|Win32 + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|Win32.Build.0 = Debug|Win32 + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|x64.ActiveCfg = Debug|Win32 + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|Win32.ActiveCfg = Release|Win32 + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|Win32.Build.0 = Release|Win32 + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE

1 0

[commit] r10974 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 27 Dec '08

27 Dec '08

Author: gmaruzz Date: Sat Dec 27 16:39:13 2008 New Revision: 10974 Log: skypiax: select on write fd_set on tcp_cli Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Sat Dec 27 16:39:13 2008 @@ -349,15 +349,16 @@ if (!running) break; - fdselect = 1; + fdselect = fd; FD_ZERO(&fs); FD_SET(fdselect, &fs); - to.tv_usec = 100000; //100ms + to.tv_usec = 50000; //50msec to.tv_sec = 0; - //FIXME rt = select(fdselect + 1, &fs, NULL, NULL, &to); + + rt = select(fdselect + 1, NULL, &fs, NULL, &to); //switch_sleep(1000);//FIXME memset(cli_in, '\0', sizeof(cli_in)); - rt = 1; + //rt = 1; if (rt > 0) { /*********************************************/ if ((SAMPLERATE_SKYPIAX - 8000) == 0) {

1 0

[commit] r10969 - in freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax: . configs
by FreeSWITCH SVN 27 Dec '08

27 Dec '08

Author: gmaruzz Date: Sat Dec 27 05:36:41 2008 New Revision: 10969 Log: skypiax: updated config file, works on linux multiline Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml Sat Dec 27 05:36:41 2008 @@ -15,7 +15,7 @@ <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> <param name="context" value="default"/> - <param name="X11-display" value=":99"/> + <param name="X11-display" value=":101"/> <param name="tcp_cli_port" value="5556"/> <param name="tcp_srv_port" value="5557"/> <param name="skype_user" value="skypiax1"/> @@ -25,7 +25,7 @@ <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> <param name="context" value="default"/> - <param name="X11-display" value=":99"/> + <param name="X11-display" value=":102"/> <param name="tcp_cli_port" value="5558"/> <param name="tcp_srv_port" value="5559"/> <param name="skype_user" value="skypiax2"/> @@ -36,7 +36,7 @@ <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> <param name="context" value="default"/> - <param name="X11-display" value=":99"/> + <param name="X11-display" value=":103"/> <param name="tcp_cli_port" value="5560"/> <param name="tcp_srv_port" value="5561"/> <param name="skype_user" value="skypiax3"/> @@ -47,7 +47,7 @@ <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> <param name="context" value="default"/> - <param name="X11-display" value=":99"/> + <param name="X11-display" value=":104"/> <param name="tcp_cli_port" value="5562"/> <param name="tcp_srv_port" value="5563"/> <param name="skype_user" value="skypiax4"/> @@ -58,7 +58,7 @@ <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> <param name="context" value="default"/> - <param name="X11-display" value=":99"/> + <param name="X11-display" value=":105"/> <param name="tcp_cli_port" value="5564"/> <param name="tcp_srv_port" value="5565"/> <param name="skype_user" value="skypiax5"/> Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h Sat Dec 27 05:36:41 2008 @@ -136,6 +136,7 @@ Window skype_win; Display *disp; Window win; +int api_connected; switch_file_t *fdesc[2]; }; #else //WIN32

1 0

[commit] r10968 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 27 Dec '08

27 Dec '08

Author: gmaruzz Date: Sat Dec 27 04:47:22 2008 New Revision: 10968 Log: skypiax: updated config file Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml Sat Dec 27 04:47:22 2008 @@ -11,47 +11,60 @@ </global_settings>  <per_interface_settings> - <interface id="2" name="testing"> - <param name="hold-music" value="$${moh_uri}"/> - <param name="tonegroup" value="us"/> - <param name="digit-timeout" value="2000"/> - <param name="max-digits" value="11"/> - <param name="dialplan" value="XML"/> - <param name="context" value="default"/> - <param name="enable-callerid" value="true"/> - <param name="dial-regex" value="9996"/> - <param name="dial-regex-fail" value="9996"/> - <param name="X11-display" value=":99"/> - <param name="tcp_cli_port" value="5556"/> - <param name="tcp_srv_port" value="5557"/> - </interface> - <interface id="3" name="testing3"> - <param name="hold-music" value="$${moh_uri}"/> - <param name="tonegroup" value="us"/> - <param name="digit-timeout" value="2000"/> - <param name="max-digits" value="11"/> - <param name="dialplan" value="XML"/> - <param name="context" value="default"/> - <param name="enable-callerid" value="true"/> - <param name="dial-regex" value="9996"/> - <param name="dial-regex-fail" value="9996"/> - <param name="X11-display" value=":98"/> - <param name="tcp_cli_port" value="5558"/> - <param name="tcp_srv_port" value="5559"/> - </interface> -  - <interface name="ciapalo"> - <param name="hold-music" value="$${moh_uri}"/> - <param name="tonegroup" value="us"/> - <param name="digit-timeout" value="2000"/> - <param name="max-digits" value="11"/> - <param name="dialplan" value="XML"/> - <param name="context" value="default"/> - <param name="enable-callerid" value="true"/> - <param name="dial-regex" value="9996"/> - <param name="dial-regex-fail" value="9996"/> - <param name="X11-display" value=":991"/> + <interface id="1" name="skypiax1"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":99"/> + <param name="tcp_cli_port" value="5556"/> + <param name="tcp_srv_port" value="5557"/> + <param name="skype_user" value="skypiax1"/> + <param name="skype_password" value="xxxx"/> + </interface> + <interface id="2" name="skypiax2"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":99"/> + <param name="tcp_cli_port" value="5558"/> + <param name="tcp_srv_port" value="5559"/> + <param name="skype_user" value="skypiax2"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="3" name="skypiax3"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":99"/> + <param name="tcp_cli_port" value="5560"/> + <param name="tcp_srv_port" value="5561"/> + <param name="skype_user" value="skypiax3"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="4" name="skypiax4"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":99"/> + <param name="tcp_cli_port" value="5562"/> + <param name="tcp_srv_port" value="5563"/> + <param name="skype_user" value="skypiax4"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="5" name="skypiax5"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":99"/> + <param name="tcp_cli_port" value="5564"/> + <param name="tcp_srv_port" value="5565"/> + <param name="skype_user" value="skypiax5"/> + <param name="skype_password" value="xxxx"/> </interface> +  <interface> <param name="hold-music" value="$${moh_uri}"/>

1 0

[commit] r10967 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 27 Dec '08

27 Dec '08

Author: gmaruzz Date: Sat Dec 27 04:43:44 2008 New Revision: 10967 Log: skypiax: windows, no more warnings Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Sat Dec 27 04:43:44 2008 @@ -576,11 +576,11 @@ if (session) { channel = switch_core_session_get_channel(session); - DEBUGA_SKYPE("before channel_on_hangup\n", SKYPIAX_P_LOG); + //DEBUGA_SKYPE("before channel_on_hangup\n", SKYPIAX_P_LOG); if (channel) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - DEBUGA_SKYPE("after channel_on_hangup\n", SKYPIAX_P_LOG); + //DEBUGA_SKYPE("after channel_on_hangup\n", SKYPIAX_P_LOG); } } } @@ -604,7 +604,7 @@ switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, skypiax_module_pool); if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + ERRORA("open of %s failed\n", SKYPIAX_P_LOG, cf); return SWITCH_STATUS_TERM; } @@ -809,8 +809,13 @@ } else { switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].name, "N/A"); } +#ifdef WIN32 + globals.SKYPIAX_INTERFACES[interface_id].tcp_cli_port = (unsigned short)atoi(tcp_cli_port); + globals.SKYPIAX_INTERFACES[interface_id].tcp_srv_port = (unsigned short)atoi(tcp_srv_port); +#else /* WIN32 */ globals.SKYPIAX_INTERFACES[interface_id].tcp_cli_port = atoi(tcp_cli_port); globals.SKYPIAX_INTERFACES[interface_id].tcp_srv_port = atoi(tcp_srv_port); +#endif /* WIN32 */ //switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].tcp_cli_port, tcp_cli_port); //switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].tcp_srv_port, tcp_srv_port); switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].X11_display, X11_display); Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h Sat Dec 27 04:43:44 2008 @@ -45,8 +45,14 @@ //FIXME include? #endif //WIN32 -#define SAMPLES_PER_FRAME 320 +#ifdef _MSC_VER +//Windows macro for FD_SET includes a warning C4127: conditional expression is constant +#pragma warning(push) +#pragma warning(disable:4127) +#endif + #define SAMPLERATE_SKYPIAX 16000 +#define SAMPLES_PER_FRAME SAMPLERATE_SKYPIAX/50 //#define SKYPIAX_SVN_VERSION "SVN 123456" #define SKYPIAX_SVN_VERSION SWITCH_VERSION_REVISION @@ -157,8 +163,13 @@ char hold_music[256]; char type[256]; char X11_display[256]; +#ifdef WIN32 + unsigned short tcp_cli_port; + unsigned short tcp_srv_port; +#else int tcp_cli_port; int tcp_srv_port; +#endif struct AsteriskHandles AsteriskHandlesAst; int interface_state; /*!< \brief 'state' of the interface (channel) */ Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Sat Dec 27 04:43:44 2008 @@ -30,7 +30,6 @@ void *obj) { struct skypiax_interface *p = obj; - short srv_out[SAMPLES_PER_FRAME / 2]; int s; #ifdef WIN32 unsigned int len; @@ -38,14 +37,17 @@ unsigned int a; int sin_size; unsigned int fd; + short srv_in[SAMPLES_PER_FRAME]; + short srv_out[SAMPLES_PER_FRAME / 2]; #else int len; int i; int a; unsigned int sin_size; int fd; -#endif /* WIN32 */ short srv_in[SAMPLES_PER_FRAME]; + short srv_out[SAMPLES_PER_FRAME / 2]; +#endif /* WIN32 */ struct sockaddr_in my_addr; struct sockaddr_in remote_addr; int exit = 0; @@ -58,7 +60,7 @@ memset(&my_addr, 0, sizeof(my_addr)); my_addr.sin_family = AF_INET; my_addr.sin_addr.s_addr = htonl(0x7f000001); /* use the localhost */ - my_addr.sin_port = htons(p->tcp_srv_port); //FIXME configurable! + my_addr.sin_port = htons(p->tcp_srv_port); if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) { ERRORA("socket Error\n", SKYPIAX_P_LOG); @@ -76,6 +78,7 @@ return NULL; } DEBUGA_SKYPE("started tcp_srv_thread thread.\n", SKYPIAX_P_LOG); + ERRORA("sizeof(short)=%d, sizeof(char)=%d\n", SKYPIAX_P_LOG, sizeof(short), sizeof(char)); listen(s, 6); @@ -111,8 +114,11 @@ //rt=0; if (rt > 0) { - //len = recv(fd, srv_in, sizeof(short) * SAMPLES_PER_FRAME, 0); - len = recv(fd, srv_in, 320, 0); //seems that Skype only sends 320 bytes at time +#ifdef WIN32 + len = recv(fd, (char *)srv_in, 320, 0); //seems that Skype only sends 320 bytes at time +#else /* WIN32 */ + len = recv(fd, (char *)srv_in, 320, 0); //seems that Skype only sends 320 bytes at time +#endif /* WIN32 */ if ((SAMPLERATE_SKYPIAX - 8000) == 0) { @@ -254,7 +260,7 @@ break; } - WARNINGA("server (I am it) GONE\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("server (I am it) GONE\n", SKYPIAX_P_LOG); #ifndef WIN32 close(s); #else @@ -274,20 +280,22 @@ struct sockaddr_in my_addr; struct sockaddr_in remote_addr; unsigned int got; - short cli_in[SAMPLES_PER_FRAME]; - short cli_out[SAMPLES_PER_FRAME * 2]; #ifdef WIN32 unsigned int len; unsigned int i; unsigned int a; int sin_size; unsigned int fd; + short cli_out[SAMPLES_PER_FRAME * 2]; + short cli_in[SAMPLES_PER_FRAME]; #else int len; int i; int a; unsigned int sin_size; int fd; + short cli_out[SAMPLES_PER_FRAME * 2]; + short cli_in[SAMPLES_PER_FRAME]; #endif /* WIN32 */ if (option_debug > 10) { @@ -357,7 +365,7 @@ switch_file_read(p->audioskypepipe[0], cli_in, &got); if (got > 0) { - DEBUGA_SKYPE("CLI PIPE read %d\n", SKYPIAX_P_LOG, got); + //DEBUGA_SKYPE("CLI PIPE read %d\n", SKYPIAX_P_LOG, got); a = 0; for (i = 0; i < got / sizeof(short); i++) { cli_out[a] = cli_in[i]; @@ -366,8 +374,12 @@ a++; } +#ifdef WIN32 + len = send(fd, (char *)cli_out, got * 2, 0); +#else /* WIN32 */ len = send(fd, cli_out, got * 2, 0); - DEBUGA_SKYPE("CLI PIPE send %d\n", SKYPIAX_P_LOG, len); +#endif /* WIN32 */ + //DEBUGA_SKYPE("CLI PIPE send %d\n", SKYPIAX_P_LOG, len); if (len == 0) { ERRORA("Skype server GONE\n", SKYPIAX_P_LOG); @@ -389,7 +401,11 @@ if(got != SAMPLES_PER_FRAME * sizeof(short) ) ERRORA("CLI PIPE read %d\n", SKYPIAX_P_LOG, got); +#ifdef WIN32 + len = send(fd, (char *)cli_in, got, 0); +#else /* WIN32 */ len = send(fd, cli_in, got, 0); +#endif /* WIN32 */ if(len != got ) ERRORA("CLI PIPE send %d\n", SKYPIAX_P_LOG, len); @@ -408,7 +424,7 @@ } } - ERRORA("Skype server GONE\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("Skype server GONE\n", SKYPIAX_P_LOG); #ifndef WIN32 close(fd); #else @@ -417,7 +433,7 @@ break; } - WARNINGA("client (I am it) GONE\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("client (I am it) GONE\n", SKYPIAX_P_LOG); #ifndef WIN32 close(s); #else @@ -575,10 +591,9 @@ p = ( struct skypiax_interface *)GetWindowLong(hWindow, GWL_USERDATA); switch (uiMessage) { case WM_CREATE: - NOTICA("got CREATE\n", SKYPIAX_P_LOG); p=( struct skypiax_interface *)((LPCREATESTRUCT)ulParam)->lpCreateParams; SetWindowLong(hWindow, GWL_USERDATA, (LONG)p); - NOTICA("got CREATE\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("got CREATE\n", SKYPIAX_P_LOG); break; case WM_DESTROY: NOTICA("got DESTROY\n", SKYPIAX_P_LOG); @@ -598,7 +613,7 @@ howmany = strlen(msg_from_skype) + 1; switch_file_write(p->AsteriskHandlesAst.fdesc[1], msg_from_skype, &howmany); - NOTICA("From Skype API: %s\n", SKYPIAX_P_LOG, (const char *) poCopyData->lpData); + //NOTICA("From Skype API: %s\n", SKYPIAX_P_LOG, (const char *) poCopyData->lpData); lReturnCode = 1; } break; @@ -610,25 +625,31 @@ if(!p->AsteriskHandlesAst.api_connected){ NOTICA("\n\n\tConnected to Skype API!\n", SKYPIAX_P_LOG); p->AsteriskHandlesAst.win32_hGlobal_SkypeAPIWindowHandle = (HWND) uiParam; - switch_sleep(5000); + //switch_sleep(5000); p->AsteriskHandlesAst.win32_hGlobal_SkypeAPIWindowHandle = p->AsteriskHandlesAst.win32_hGlobal_SkypeAPIWindowHandle; } break; case SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION: WARNINGA - ("\n\n\tIf I do not immediately connect to Skype API,\n\tplease give the Skype client authorization to be connected \n\tby Asterisk and to not ask you again.\n\n", + ("\n\n\tIf I do not (almost) immediately connect to Skype API,\n\tplease give the Skype client authorization to be connected \n\tby Asterisk and to not ask you again.\n\n", SKYPIAX_P_LOG); + switch_sleep(5000); + if(!p->AsteriskHandlesAst.api_connected){ + SendMessage + (HWND_BROADCAST, p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIDiscover, + (WPARAM) p->AsteriskHandlesAst.win32_hInit_MainWindowHandle, 0); + } break; case SKYPECONTROLAPI_ATTACH_REFUSED: ERRORA("Skype client refused to be connected by Skypiax!\n", SKYPIAX_P_LOG); break; case SKYPECONTROLAPI_ATTACH_NOT_AVAILABLE: - ERRORA("Skype API not available\n", SKYPIAX_P_LOG); + ERRORA("Skype API not (yet?) available\n", SKYPIAX_P_LOG); break; case SKYPECONTROLAPI_ATTACH_API_AVAILABLE: DEBUGA_SKYPE("Skype API available\n", SKYPIAX_P_LOG); - + switch_sleep(5000); if(!p->AsteriskHandlesAst.api_connected){ SendMessage (HWND_BROADCAST, p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIDiscover, @@ -741,7 +762,7 @@ RegisterWindowMessage("SkypeControlAPIDiscover"); LaunchSkype(p); - switch_sleep(1000000); + switch_sleep(2000000); if (p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIAttach != 0 && p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIDiscover != 0) { @@ -1044,6 +1065,13 @@ #ifdef WIN32 static char acInputRow[1024]; COPYDATASTRUCT oCopyData; +#else /* WIN32 */ + struct AsteriskHandles *AsteriskHandlesAst; +#endif /* WIN32 */ + + DEBUGA_SKYPE("SENDING: |||%s||||\n", SKYPIAX_P_LOG, msg_to_skype); + +#ifdef WIN32 if (option_debug > 100) { DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -1073,16 +1101,12 @@ } } #else /* WIN32 */ - struct AsteriskHandles *AsteriskHandlesAst; if (option_debug > 100) { DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); } AsteriskHandlesAst = &p->AsteriskHandlesAst; - if (option_debug > 101) { - DEBUGA_SKYPE("SENDING: |||%s||||\n", SKYPIAX_P_LOG, msg_to_skype); - } if (!skypiax_skype_send_message(AsteriskHandlesAst, msg_to_skype)) { ERRORA @@ -1216,7 +1240,7 @@ if (!strcasecmp(id, p->skype_user)) { p->AsteriskHandlesAst.api_connected = 1; - DEBUGA_SKYPE ("Skype MSG: messaggio: %s, currentuserhandle: %s, cuh: %s, skype_user: %s!\n", SKYPIAX_P_LOG, messaggio, obj, id, p->skype_user); + //DEBUGA_SKYPE ("Skype MSG: messaggio: %s, currentuserhandle: %s, cuh: %s, skype_user: %s!\n", SKYPIAX_P_LOG, messaggio, obj, id, p->skype_user); } }

1 0

[commit] r10945 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: gmaruzz Date: Fri Dec 26 11:27:39 2008 New Revision: 10945 Log: skypiax: continuing multiline on windows, refuse call when yet in a call Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Fri Dec 26 11:27:39 2008 @@ -1317,7 +1317,7 @@ if (p->interface_state != SKYPIAX_STATE_DIALING) { /* we are not calling out */ - if (1) { //FIXME + if (!strlen(p->skype_call_id)) { //FIXME /* we are not inside an active call */ p->skype_callflow = CALLFLOW_STATUS_RINGING; p->interface_state = SKYPIAX_STATE_RING; @@ -1340,7 +1340,8 @@ strncpy(p->skype_call_id, id, sizeof(p->skype_call_id) - 1); } else { /* we're owned, we're in a call, let's refuse */ - sprintf(msg_to_skype, "SET CALL %s STATUS FINISHED", id); + //sprintf(msg_to_skype, "SET CALL %s STATUS REFUSED", id); + sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id); skypiax_skype_write(p, msg_to_skype); switch_sleep(10000); DEBUGA_SKYPE

1 0

[commit] r10944 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: gmaruzz Date: Fri Dec 26 08:40:28 2008 New Revision: 10944 Log: skypiax: continuing multiline on windows, api_connected when currentuserhandle == skype_user Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h Fri Dec 26 08:40:28 2008 @@ -141,6 +141,7 @@ char win32_acInit_WindowClassName[128]; UINT win32_uiGlobal_MsgID_SkypeControlAPIAttach; UINT win32_uiGlobal_MsgID_SkypeControlAPIDiscover; +int api_connected; switch_file_t *fdesc[2]; }; Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Fri Dec 26 08:40:28 2008 @@ -607,11 +607,13 @@ if (uiMessage == p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIAttach) { switch (ulParam) { case SKYPECONTROLAPI_ATTACH_SUCCESS: + if(!p->AsteriskHandlesAst.api_connected){ NOTICA("\n\n\tConnected to Skype API!\n", SKYPIAX_P_LOG); p->AsteriskHandlesAst.win32_hGlobal_SkypeAPIWindowHandle = (HWND) uiParam; switch_sleep(5000); p->AsteriskHandlesAst.win32_hGlobal_SkypeAPIWindowHandle = p->AsteriskHandlesAst.win32_hGlobal_SkypeAPIWindowHandle; + } break; case SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION: WARNINGA @@ -627,9 +629,11 @@ case SKYPECONTROLAPI_ATTACH_API_AVAILABLE: DEBUGA_SKYPE("Skype API available\n", SKYPIAX_P_LOG); + if(!p->AsteriskHandlesAst.api_connected){ SendMessage (HWND_BROADCAST, p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIDiscover, (WPARAM) p->AsteriskHandlesAst.win32_hInit_MainWindowHandle, 0); + } break; default: WARNINGA("GOT AN UNKNOWN SKYPE WINDOWS MSG\n", SKYPIAX_P_LOG); @@ -1202,6 +1206,20 @@ p->interface_state = SKYPIAX_STATE_DOWN; } } + if (!strcasecmp(messaggio, "CURRENTUSERHANDLE") ) { + strncpy(obj, where, sizeof(obj) - 1); + + where = strsep(stringp, " "); + + strncpy(id, where, sizeof(id) - 1); + + + if (!strcasecmp(id, p->skype_user)) { + p->AsteriskHandlesAst.api_connected = 1; + DEBUGA_SKYPE ("Skype MSG: messaggio: %s, currentuserhandle: %s, cuh: %s, skype_user: %s!\n", SKYPIAX_P_LOG, messaggio, obj, id, p->skype_user); + } + } + if (!strcasecmp(messaggio, "CALL")) { strncpy(obj, where, sizeof(obj) - 1); @@ -1225,6 +1243,7 @@ ("Skype MSG: messaggio: %s, obj: %s, id: %s, prop: %s, value: %s,where: %s!\n", SKYPIAX_P_LOG, messaggio, obj, id, prop, value, where ? where : "NULL"); + if (!strcasecmp(prop, "PARTNER_HANDLE")) { strncpy(p->callid_number, value, sizeof(p->callid_number) - 1); WARNINGA

1 0

[commit] r10943 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: gmaruzz Date: Fri Dec 26 08:05:11 2008 New Revision: 10943 Log: skypiax: continuing multiline on windows, skype_name and skype_password from config Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Fri Dec 26 08:05:11 2008 @@ -680,6 +680,8 @@ char *X11_display = NULL; char *tcp_cli_port = NULL; char *tcp_srv_port = NULL; + char *skype_user = NULL; + char *skype_password = NULL; uint32_t interface_id = 0, to = 0, max = 0; @@ -703,6 +705,10 @@ fail_dial_regex = val; } else if (!strcasecmp(var, "hold-music")) { hold_music = val; + } else if (!strcasecmp(var, "skype_user")) { + skype_user = val; + } else if (!strcasecmp(var, "skype_password")) { + skype_password = val; } else if (!strcasecmp(var, "tcp_cli_port")) { tcp_cli_port = val; } else if (!strcasecmp(var, "tcp_srv_port")) { @@ -716,7 +722,17 @@ } } + if (!skype_user) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "interface missing REQUIRED param 'skype_user'\n"); + continue; + } + if (!skype_password) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "interface missing REQUIRED param 'skype_password'\n"); + continue; + } if (!X11_display) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "interface missing REQUIRED param 'X11_display'\n"); @@ -798,6 +814,8 @@ //switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].tcp_cli_port, tcp_cli_port); //switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].tcp_srv_port, tcp_srv_port); switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].X11_display, X11_display); + switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].skype_user, skype_user); + switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].skype_password, skype_password); switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].context, context); switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].dialplan, dialplan); @@ -806,6 +824,12 @@ "interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].X11_display=%s\n", interface_id, globals.SKYPIAX_INTERFACES[interface_id].X11_display); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].skype_user=%s\n", + interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].skype_password=%s\n", + interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_password); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].tcp_cli_port=%d\n", interface_id, globals.SKYPIAX_INTERFACES[interface_id].tcp_cli_port); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h Fri Dec 26 08:05:11 2008 @@ -199,6 +199,8 @@ FILE *phonebook_writing_fp; int skypiax_dir_entry_extension_prefix; void *tech_pvt; + char skype_user[256]; + char skype_password[256]; }; typedef struct skypiax_interface skypiax_interface_t; Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Fri Dec 26 08:05:11 2008 @@ -16,19 +16,8 @@ #ifdef WIN32 -//HWND win32_hInit_MainWindowHandle; -//HINSTANCE win32_hInit_ProcessHandle; -//char win32_acInit_WindowClassName[128]; -//UINT win32_uiGlobal_MsgID_SkypeControlAPIAttach; -//UINT win32_uiGlobal_MsgID_SkypeControlAPIDiscover; -//HWND win32_hGlobal_SkypeAPIWindowHandle = NULL; -//DWORD win32_ulGlobal_PromptConsoleMode = 0; -//HANDLE volatile win32_hGlobal_PromptConsoleHandle = NULL; #else /* NOT WIN32 */ #define SKYPE_X11_BUF_SIZE 512 -//Window skype_win = (Window) - 1; -//static XErrorHandler old_handler = 0; -//static int xerror = 0; #endif /* WIN32 */ @@ -505,9 +494,13 @@ { LPTSTR pszMessage; DWORD dwLastError; + char skypelogin[256]; + memset(skypelogin, '\0', sizeof(skypelogin)); + sprintf(skypelogin, "/secondary /username:%s /password:%s", p->skype_user, p->skype_password); - ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax5 /password:ciapalo", ".", SW_SHOWNORMAL); + + ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", skypelogin, ".", SW_SHOWNORMAL); dwLastError = GetLastError(); @@ -521,7 +514,7 @@ (LPTSTR)&pszMessage, 0, NULL ); - NOTICA("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA %s\n", SKYPIAX_P_LOG,pszMessage); + NOTICA("ShellExecute gave: %s\n", SKYPIAX_P_LOG,pszMessage); LocalFree(pszMessage); return 1;

1 0

[commit] r10942 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: gmaruzz Date: Fri Dec 26 07:36:18 2008 New Revision: 10942 Log: skypiax: continuing multiline on windows, no more global HANDLEs Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h Fri Dec 26 07:36:18 2008 @@ -137,6 +137,10 @@ struct AsteriskHandles { HWND win32_hInit_MainWindowHandle; HWND win32_hGlobal_SkypeAPIWindowHandle; +HINSTANCE win32_hInit_ProcessHandle; +char win32_acInit_WindowClassName[128]; +UINT win32_uiGlobal_MsgID_SkypeControlAPIAttach; +UINT win32_uiGlobal_MsgID_SkypeControlAPIDiscover; switch_file_t *fdesc[2]; }; Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Fri Dec 26 07:36:18 2008 @@ -16,15 +16,14 @@ #ifdef WIN32 -HWND win32_hInit_MainWindowHandle; -struct AsteriskHandles *win32_AsteriskHandlesSkype; -HINSTANCE win32_hInit_ProcessHandle; -char win32_acInit_WindowClassName[128]; -UINT win32_uiGlobal_MsgID_SkypeControlAPIAttach; -UINT win32_uiGlobal_MsgID_SkypeControlAPIDiscover; -HWND win32_hGlobal_SkypeAPIWindowHandle = NULL; -DWORD win32_ulGlobal_PromptConsoleMode = 0; -HANDLE volatile win32_hGlobal_PromptConsoleHandle = NULL; +//HWND win32_hInit_MainWindowHandle; +//HINSTANCE win32_hInit_ProcessHandle; +//char win32_acInit_WindowClassName[128]; +//UINT win32_uiGlobal_MsgID_SkypeControlAPIAttach; +//UINT win32_uiGlobal_MsgID_SkypeControlAPIDiscover; +//HWND win32_hGlobal_SkypeAPIWindowHandle = NULL; +//DWORD win32_ulGlobal_PromptConsoleMode = 0; +//HANDLE volatile win32_hGlobal_PromptConsoleHandle = NULL; #else /* NOT WIN32 */ #define SKYPE_X11_BUF_SIZE 512 //Window skype_win = (Window) - 1; @@ -502,67 +501,14 @@ #ifdef WIN32 -#if 1 -/*******************************************************/ -int CALLBACK EnumWindowsProc(HWND hwnd, LPARAM param) -{ DWORD pID; - DWORD TpID; - struct skypiax_interface *p = NULL; - - TpID = GetWindowThreadProcessId(hwnd, &pID); - - if (TpID == (DWORD)param) - { - NOTICA("HWND=%p\n", SKYPIAX_P_LOG, hwnd); - win32_hGlobal_SkypeAPIWindowHandle = hwnd; - return 0; - }else{ - DEBUGA_SKYPE("HWND=%p\n", SKYPIAX_P_LOG, hwnd); - return 1; - } -} - -int LaunchSkype(void) -{ - PROCESS_INFORMATION pi; - STARTUPINFO si = {0}; - struct skypiax_interface *p = NULL; - int ret=1; - int times=0; +int LaunchSkype(struct skypiax_interface *p) +{ LPTSTR pszMessage; DWORD dwLastError; - ZeroMemory( &si, sizeof(si) ); - si.cb = sizeof(si); - ZeroMemory( &pi, sizeof(pi) ); - - - //ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax1 /password:ciapalo", ".", SW_SHOWNORMAL); - //switch_sleep(1000000); - //ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax2 /password:ciapalo", ".", SW_SHOWNORMAL); - //switch_sleep(1000000); - //ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax3 /password:ciapalo", ".", SW_SHOWNORMAL); - //switch_sleep(1000000); - //ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax4 /password:ciapalo", ".", SW_SHOWNORMAL); - //switch_sleep(1000000); ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax5 /password:ciapalo", ".", SW_SHOWNORMAL); -#if 0 - - CreateProcess( "C:\\Program Files\\Skype\\Phone\\Skype.exe", - "/secondary /username:skypiax4 /password:xxx", // Command line. - NULL, // Process handle not inheritable. - NULL, // Thread handle not inheritable. - FALSE, // Set handle inheritance to FALSE. - NORMAL_PRIORITY_CLASS, // No creation flags. - NULL, // Use parent's environment block. - NULL, // Use parent's starting directory. - &si, // Pointer to STARTUPINFO structure. - &pi // Pointer to PROCESS_INFORMATION structure. - ); -#endif - dwLastError = GetLastError(); FormatMessage( @@ -577,23 +523,9 @@ NOTICA("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA %s\n", SKYPIAX_P_LOG,pszMessage); LocalFree(pszMessage); -#if 0 - switch_sleep(10000000); - - while(ret){ - ret = EnumWindows(&EnumWindowsProc, pi.dwThreadId); - switch_sleep(10000); - times++; - if (times == 1000) - break; - } - NOTICA("HWND=%p\n", SKYPIAX_P_LOG, win32_hGlobal_SkypeAPIWindowHandle); -#endif return 1; } -/*******************************************************/ -#endif //NOTDEF enum { @@ -657,11 +589,11 @@ break; case WM_DESTROY: NOTICA("got DESTROY\n", SKYPIAX_P_LOG); - win32_hInit_MainWindowHandle = NULL; + p->AsteriskHandlesAst.win32_hInit_MainWindowHandle = NULL; PostQuitMessage(0); break; case WM_COPYDATA: - if (win32_hGlobal_SkypeAPIWindowHandle == (HWND) uiParam) { + if (p->AsteriskHandlesAst.win32_hGlobal_SkypeAPIWindowHandle == (HWND) uiParam) { unsigned int howmany; char msg_from_skype[2048]; @@ -672,20 +604,21 @@ sizeof(msg_from_skype) - 2); howmany = strlen(msg_from_skype) + 1; - switch_file_write(win32_AsteriskHandlesSkype->fdesc[1], msg_from_skype, &howmany); + switch_file_write(p->AsteriskHandlesAst.fdesc[1], msg_from_skype, &howmany); NOTICA("From Skype API: %s\n", SKYPIAX_P_LOG, (const char *) poCopyData->lpData); lReturnCode = 1; } break; default: - if (uiMessage == win32_uiGlobal_MsgID_SkypeControlAPIAttach) { + if(p && p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIAttach) { + if (uiMessage == p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIAttach) { switch (ulParam) { case SKYPECONTROLAPI_ATTACH_SUCCESS: NOTICA("\n\n\tConnected to Skype API!\n", SKYPIAX_P_LOG); - win32_hGlobal_SkypeAPIWindowHandle = (HWND) uiParam; + p->AsteriskHandlesAst.win32_hGlobal_SkypeAPIWindowHandle = (HWND) uiParam; switch_sleep(5000); - win32_AsteriskHandlesSkype->win32_hGlobal_SkypeAPIWindowHandle = - win32_hGlobal_SkypeAPIWindowHandle; + p->AsteriskHandlesAst.win32_hGlobal_SkypeAPIWindowHandle = + p->AsteriskHandlesAst.win32_hGlobal_SkypeAPIWindowHandle; break; case SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION: WARNINGA @@ -702,8 +635,8 @@ DEBUGA_SKYPE("Skype API available\n", SKYPIAX_P_LOG); SendMessage - (HWND_BROADCAST, win32_uiGlobal_MsgID_SkypeControlAPIDiscover, - (WPARAM) win32_hInit_MainWindowHandle, 0); + (HWND_BROADCAST, p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIDiscover, + (WPARAM) p->AsteriskHandlesAst.win32_hInit_MainWindowHandle, 0); break; default: WARNINGA("GOT AN UNKNOWN SKYPE WINDOWS MSG\n", SKYPIAX_P_LOG); @@ -711,6 +644,7 @@ lReturnCode = 1; break; } + } fIssueDefProc = 1; break; } @@ -719,7 +653,7 @@ return (lReturnCode); } -int win32_Initialize_CreateWindowClass(void) +int win32_Initialize_CreateWindowClass(struct skypiax_interface *p) { unsigned char *paucUUIDString; RPC_STATUS lUUIDResult; @@ -728,26 +662,26 @@ fReturnStatus = 0; lUUIDResult = UuidCreate(&oUUID); - win32_hInit_ProcessHandle = + p->AsteriskHandlesAst.win32_hInit_ProcessHandle = (HINSTANCE) OpenProcess(PROCESS_DUP_HANDLE, FALSE, GetCurrentProcessId()); - if (win32_hInit_ProcessHandle != NULL + if (p->AsteriskHandlesAst.win32_hInit_ProcessHandle != NULL && (lUUIDResult == RPC_S_OK || lUUIDResult == RPC_S_UUID_LOCAL_ONLY)) { if (UuidToString(&oUUID, &paucUUIDString) == RPC_S_OK) { WNDCLASS oWindowClass; - strcpy(win32_acInit_WindowClassName, "Skype-API-Skypiax-"); - strcat(win32_acInit_WindowClassName, (char *) paucUUIDString); + strcpy(p->AsteriskHandlesAst.win32_acInit_WindowClassName, "Skype-API-Skypiax-"); + strcat(p->AsteriskHandlesAst.win32_acInit_WindowClassName, (char *) paucUUIDString); oWindowClass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; oWindowClass.lpfnWndProc = (WNDPROC) & skypiax_skype_present; oWindowClass.cbClsExtra = 0; oWindowClass.cbWndExtra = 0; - oWindowClass.hInstance = win32_hInit_ProcessHandle; + oWindowClass.hInstance = p->AsteriskHandlesAst.win32_hInit_ProcessHandle; oWindowClass.hIcon = NULL; oWindowClass.hCursor = NULL; oWindowClass.hbrBackground = NULL; oWindowClass.lpszMenuName = NULL; - oWindowClass.lpszClassName = win32_acInit_WindowClassName; + oWindowClass.lpszClassName = p->AsteriskHandlesAst.win32_acInit_WindowClassName; if (RegisterClass(&oWindowClass) != 0) fReturnStatus = 1; @@ -756,29 +690,29 @@ } } if (fReturnStatus == 0) - CloseHandle(win32_hInit_ProcessHandle), win32_hInit_ProcessHandle = NULL; + CloseHandle(p->AsteriskHandlesAst.win32_hInit_ProcessHandle), p->AsteriskHandlesAst.win32_hInit_ProcessHandle = NULL; return (fReturnStatus); } -void win32_DeInitialize_DestroyWindowClass(void) +void win32_DeInitialize_DestroyWindowClass(struct skypiax_interface *p) { - UnregisterClass(win32_acInit_WindowClassName, win32_hInit_ProcessHandle); - CloseHandle(win32_hInit_ProcessHandle), win32_hInit_ProcessHandle = NULL; + UnregisterClass(p->AsteriskHandlesAst.win32_acInit_WindowClassName, p->AsteriskHandlesAst.win32_hInit_ProcessHandle); + CloseHandle(p->AsteriskHandlesAst.win32_hInit_ProcessHandle), p->AsteriskHandlesAst.win32_hInit_ProcessHandle = NULL; } int win32_Initialize_CreateMainWindow(struct skypiax_interface *p) { - win32_hInit_MainWindowHandle = - CreateWindowEx(WS_EX_APPWINDOW | WS_EX_WINDOWEDGE, win32_acInit_WindowClassName, "", + p->AsteriskHandlesAst.win32_hInit_MainWindowHandle = + CreateWindowEx(WS_EX_APPWINDOW | WS_EX_WINDOWEDGE, p->AsteriskHandlesAst.win32_acInit_WindowClassName, "", WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, - 128, 128, NULL, 0, win32_hInit_ProcessHandle, p); - return (win32_hInit_MainWindowHandle != NULL ? 1 : 0); + 128, 128, NULL, 0, p->AsteriskHandlesAst.win32_hInit_ProcessHandle, p); + return (p->AsteriskHandlesAst.win32_hInit_MainWindowHandle != NULL ? 1 : 0); } -void win32_DeInitialize_DestroyMainWindow(void) +void win32_DeInitialize_DestroyMainWindow(struct skypiax_interface *p) { - if (win32_hInit_MainWindowHandle != NULL) - DestroyWindow(win32_hInit_MainWindowHandle), win32_hInit_MainWindowHandle = NULL; + if (p->AsteriskHandlesAst.win32_hInit_MainWindowHandle != NULL) + DestroyWindow(p->AsteriskHandlesAst.win32_hInit_MainWindowHandle), p->AsteriskHandlesAst.win32_hInit_MainWindowHandle = NULL; } DWORD win32_dwThreadId; @@ -803,30 +737,29 @@ switch_file_pipe_create(&p->AsteriskHandlesAst.fdesc[0], &p->AsteriskHandlesAst.fdesc[1], skypiax_module_pool); //switch_file_pipe_timeout_set(p->AsteriskHandlesAst.fdesc[0], 100); - win32_AsteriskHandlesSkype = &p->AsteriskHandlesAst; - win32_uiGlobal_MsgID_SkypeControlAPIAttach = + p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIAttach = RegisterWindowMessage("SkypeControlAPIAttach"); - win32_uiGlobal_MsgID_SkypeControlAPIDiscover = + p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIDiscover = RegisterWindowMessage("SkypeControlAPIDiscover"); - LaunchSkype(); + LaunchSkype(p); switch_sleep(1000000); - if (win32_uiGlobal_MsgID_SkypeControlAPIAttach != 0 - && win32_uiGlobal_MsgID_SkypeControlAPIDiscover != 0) { - if (win32_Initialize_CreateWindowClass()) { + if (p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIAttach != 0 + && p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIDiscover != 0) { + if (win32_Initialize_CreateWindowClass(p)) { if (win32_Initialize_CreateMainWindow(p)) { #if 1 if (SendMessage - (HWND_BROADCAST, win32_uiGlobal_MsgID_SkypeControlAPIDiscover, - (WPARAM) win32_hInit_MainWindowHandle, 0) != 0) { + (HWND_BROADCAST, p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIDiscover, + (WPARAM) p->AsteriskHandlesAst.win32_hInit_MainWindowHandle, 0) != 0) { #else if (1) { #endif - win32_AsteriskHandlesSkype->win32_hInit_MainWindowHandle = - win32_hInit_MainWindowHandle; + p->AsteriskHandlesAst.win32_hInit_MainWindowHandle = + p->AsteriskHandlesAst.win32_hInit_MainWindowHandle; while (1) { MSG oMessage; if (!running) @@ -838,9 +771,9 @@ } } } - win32_DeInitialize_DestroyMainWindow(); + win32_DeInitialize_DestroyMainWindow(p); } - win32_DeInitialize_DestroyWindowClass(); + win32_DeInitialize_DestroyWindowClass(p); } }

1 0

[commit] r10941 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: gmaruzz Date: Fri Dec 26 06:29:01 2008 New Revision: 10941 Log: skypiax: continuing multiline on windows, skype_present now got pointer to channel instance Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Fri Dec 26 06:29:01 2008 @@ -522,7 +522,7 @@ } } -int LaunchSkype2(void) +int LaunchSkype(void) { PROCESS_INFORMATION pi; STARTUPINFO si = {0}; @@ -538,9 +538,15 @@ ZeroMemory( &pi, sizeof(pi) ); - ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax3 /password:xxx", ".", SW_SHOWNORMAL); - switch_sleep(1000000); - ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax4 /password:xxx", ".", SW_SHOWNORMAL); + //ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax1 /password:ciapalo", ".", SW_SHOWNORMAL); + //switch_sleep(1000000); + //ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax2 /password:ciapalo", ".", SW_SHOWNORMAL); + //switch_sleep(1000000); + //ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax3 /password:ciapalo", ".", SW_SHOWNORMAL); + //switch_sleep(1000000); + //ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax4 /password:ciapalo", ".", SW_SHOWNORMAL); + //switch_sleep(1000000); + ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax5 /password:ciapalo", ".", SW_SHOWNORMAL); #if 0 @@ -586,71 +592,6 @@ return 1; } - -int LaunchSkype(void) -{ - PROCESS_INFORMATION pi; - STARTUPINFO si = {0}; - struct skypiax_interface *p = NULL; - int ret=1; - int times=0; - LPTSTR pszMessage; - DWORD dwLastError; - - ZeroMemory( &si, sizeof(si) ); - si.cb = sizeof(si); - ZeroMemory( &pi, sizeof(pi) ); - - - ShellExecute(NULL, "open", "C:\\Program Files\\Skype\\Phone\\Skype.exe", "/secondary /username:skypiax5 /password:xxx", ".", SW_SHOWNORMAL); - -#if 0 - CreateProcess( "C:\\Program Files\\Skype\\Phone\\Skype.exe", - "/secondary /username:skypiax5 /password:xxx", // Command line. - NULL, // Process handle not inheritable. - NULL, // Thread handle not inheritable. - FALSE, // Set handle inheritance to FALSE. - 0, // No creation flags. - NULL, // Use parent's environment block. - NULL, // Use parent's starting directory. - &si, // Pointer to STARTUPINFO structure. - &pi // Pointer to PROCESS_INFORMATION structure. - ); -#endif - - dwLastError = GetLastError(); - - FormatMessage( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - dwLastError, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&pszMessage, - 0, NULL ); - - // Display the error message and exit the process - - - - NOTICA("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA %s\n", SKYPIAX_P_LOG,pszMessage); - LocalFree(pszMessage); -#if 0 - switch_sleep(10000000); - - while(ret){ - ret = EnumWindows(&EnumWindowsProc, pi.dwThreadId); - switch_sleep(10000); - times++; - if (times == 1000) - break; - } - NOTICA("HWND=%p\n", SKYPIAX_P_LOG, win32_hGlobal_SkypeAPIWindowHandle); -#endif - return 1; - -} /*******************************************************/ #endif //NOTDEF @@ -706,7 +647,14 @@ lReturnCode = 0; fIssueDefProc = 0; + p = ( struct skypiax_interface *)GetWindowLong(hWindow, GWL_USERDATA); switch (uiMessage) { + case WM_CREATE: + NOTICA("got CREATE\n", SKYPIAX_P_LOG); + p=( struct skypiax_interface *)((LPCREATESTRUCT)ulParam)->lpCreateParams; + SetWindowLong(hWindow, GWL_USERDATA, (LONG)p); + NOTICA("got CREATE\n", SKYPIAX_P_LOG); + break; case WM_DESTROY: NOTICA("got DESTROY\n", SKYPIAX_P_LOG); win32_hInit_MainWindowHandle = NULL; @@ -725,7 +673,7 @@ howmany = strlen(msg_from_skype) + 1; switch_file_write(win32_AsteriskHandlesSkype->fdesc[1], msg_from_skype, &howmany); - //NOTICA("From Skype API: %s\n", SKYPIAX_P_LOG, (const char *) poCopyData->lpData); + NOTICA("From Skype API: %s\n", SKYPIAX_P_LOG, (const char *) poCopyData->lpData); lReturnCode = 1; } break; @@ -818,12 +766,12 @@ CloseHandle(win32_hInit_ProcessHandle), win32_hInit_ProcessHandle = NULL; } -int win32_Initialize_CreateMainWindow(void) +int win32_Initialize_CreateMainWindow(struct skypiax_interface *p) { win32_hInit_MainWindowHandle = CreateWindowEx(WS_EX_APPWINDOW | WS_EX_WINDOWEDGE, win32_acInit_WindowClassName, "", WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, - 128, 128, NULL, 0, win32_hInit_ProcessHandle, 0); + 128, 128, NULL, 0, win32_hInit_ProcessHandle, p); return (win32_hInit_MainWindowHandle != NULL ? 1 : 0); } @@ -864,13 +812,11 @@ LaunchSkype(); switch_sleep(1000000); - LaunchSkype2(); - switch_sleep(1000000); if (win32_uiGlobal_MsgID_SkypeControlAPIAttach != 0 && win32_uiGlobal_MsgID_SkypeControlAPIDiscover != 0) { if (win32_Initialize_CreateWindowClass()) { - if (win32_Initialize_CreateMainWindow()) { + if (win32_Initialize_CreateMainWindow(p)) { #if 1 if (SendMessage (HWND_BROADCAST, win32_uiGlobal_MsgID_SkypeControlAPIDiscover,

1 0