January 2009 - Freeswitch-branches - FreeSWITCH Mailing Lists

[commit] r11144 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: gmaruzz Date: Mon Jan 12 13:03:06 2009 New Revision: 11144 Log: docs Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README Mon Jan 12 13:03:06 2009 @@ -17,7 +17,9 @@ If your server's Skype client(s) has got the Skype credits, Skypiax works for SkypeOut calls too. -You can use it from the dialplan, eg with the provided modified "default.xml" dialplan, you can call "sip:skype/remote_skypename__OR__skypeout_phonenumber" for calling via the Skype network from a SIP softphone to remote_skypename or to a phone number via SkypeOut, or you can call the "2908" extension from any phone to be bridged to the Skype Test Call). +You can use it from the dialplan, eg with the provided modified "default.xml" dialplan, you can call a "skype uri" that's the word 'skype' followed by a slash and a destination: "skype/remote_skypename__OR__skypeout_phonenumber" for calling via the Skype network. Eg "skype/echo123" or "skype/+18007844444". + +You can use the "skype uri" of the provided dialplan also directly for a SIP softphone, eg X-Lite. With the provided skypiax.conf.xml all incoming Skype calls will be routed to the "5000" extension, the IVR in default FreeSWITCH installation. @@ -25,7 +27,7 @@ On a Linux machine with 3GB ram and a quad core intel6600, we got no problem with 20 concurrent calls, and plenty of room for adding more Skypiax channels (100? not tested). -On Windows, no need to do anything special, the Skype client is lighter on CPU. +On Windows, no need to do anything special, the Skype client is lighter on CPU. ''Skypiax is now pre-beta, but usable for testing and finding bugs :-).''

1 0

[commit] r11142 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: gmaruzz Date: Mon Jan 12 11:50:34 2009 New Revision: 11142 Log: skypiax: implemented anthm suggested changes, fixed switch_core_session_rwunlock(session), indented again Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c 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 Mon Jan 12 11:50:34 2009 @@ -590,8 +590,10 @@ channel = switch_core_session_get_channel(session); if (channel) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + switch_core_session_rwunlock(session); } else { ERRORA("no channel?\n", SKYPIAX_P_LOG); + switch_core_session_rwunlock(session); } } else { DEBUGA_SKYPE("no session\n", SKYPIAX_P_LOG); 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 Mon Jan 12 11:50:34 2009 @@ -1364,6 +1364,7 @@ switch_set_flag(tech_pvt, TFLAG_DTMF); switch_mutex_unlock(tech_pvt->flag_mutex); } + switch_core_session_rwunlock(session); } if (!strcasecmp(prop, "FAILUREREASON")) { @@ -1634,6 +1635,7 @@ ERRORA("No channel???\n", SKYPIAX_P_LOG); } + switch_core_session_rwunlock(session); } } else {

1 0

[commit] r11141 - freeswitch/branches/ctrix/mod_airpe
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: ctrix Date: Mon Jan 12 11:48:43 2009 New Revision: 11141 Log: Initial empty dir for mod_airpe Added: freeswitch/branches/ctrix/mod_airpe/

1 0

[commit] r11140 - freeswitch/branches/ctrix
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: intralanman Date: Mon Jan 12 11:41:26 2009 New Revision: 11140 Log: Added: freeswitch/branches/ctrix/

1 0

[commit] r11139 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: gmaruzz Date: Mon Jan 12 11:30:42 2009 New Revision: 11139 Log: skypiax: indent -gnu -ts4 -br -brs -cdw -lp -ce -nbfda -npcs -nprs -npsl -nbbo -saf -sai -saw -cs -bbo -nhnl -nut -sob -l90 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 Mon Jan 12 11:30:42 2009 @@ -59,7 +59,7 @@ static switch_status_t skypiax_codec(private_t * tech_pvt, int sample_rate, int codec_ms) { -switch_core_session_t *session=NULL; + switch_core_session_t *session = NULL; if (switch_core_codec_init (&tech_pvt->read_codec, "L16", NULL, sample_rate, codec_ms, 1, @@ -103,7 +103,8 @@ switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); - switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(session), sizeof(tech_pvt->session_uuid_str)); + switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(session), + sizeof(tech_pvt->session_uuid_str)); if (skypiax_codec(tech_pvt, SAMPLERATE_SKYPIAX, 20) != SWITCH_STATUS_SUCCESS) { ERRORA("skypiax_codec FAILED\n", SKYPIAX_P_LOG); } else { @@ -583,7 +584,7 @@ DEBUGA_SKYPE("skype call ended\n", SKYPIAX_P_LOG); if (tech_pvt) { - session = switch_core_session_locate(tech_pvt->session_uuid_str); + session = switch_core_session_locate(tech_pvt->session_uuid_str); if (session) { channel = switch_core_session_get_channel(session); @@ -814,7 +815,8 @@ skype_user); switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].context, context); switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].dialplan, dialplan); - switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].destination, destination); + switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].destination, + destination); switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].context, context); DEBUGA_SKYPE @@ -849,8 +851,7 @@ globals.SKYPIAX_INTERFACES[interface_id].destination); DEBUGA_SKYPE ("interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].context=%s\n", - SKYPIAX_P_LOG, interface_id, - globals.SKYPIAX_INTERFACES[interface_id].context); + SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].context); NOTICA("STARTING interface_id=%d\n", SKYPIAX_P_LOG, interface_id); switch_threadattr_create(&skypiax_skypeapi_thread_attr, skypiax_module_pool); @@ -902,10 +903,10 @@ i, globals.SKYPIAX_INTERFACES[i].context); DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].dialplan=%s\n", SKYPIAX_P_LOG, i, i, globals.SKYPIAX_INTERFACES[i].dialplan); - DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].destination=%s\n", SKYPIAX_P_LOG, - i, i, globals.SKYPIAX_INTERFACES[i].destination); - DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].context=%s\n", SKYPIAX_P_LOG, - i, i, globals.SKYPIAX_INTERFACES[i].context); + DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].destination=%s\n", + SKYPIAX_P_LOG, i, i, globals.SKYPIAX_INTERFACES[i].destination); + DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].context=%s\n", SKYPIAX_P_LOG, i, + i, globals.SKYPIAX_INTERFACES[i].context); } } } 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 Mon Jan 12 11:30:42 2009 @@ -157,7 +157,7 @@ switch_codec_t write_codec; switch_frame_t read_frame; unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; - char session_uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1]; + char session_uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; switch_caller_profile_t *caller_profile; switch_mutex_t *mutex; switch_mutex_t *flag_mutex; 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 Mon Jan 12 11:30:42 2009 @@ -506,7 +506,7 @@ //ERRORA("tech_pvt->audiopipe[1] = %d\n", SKYPIAX_P_LOG, tech_pvt->audiopipe[1]); if (samples != SAMPLES_PER_FRAME * sizeof(short)) { //if (samples) - //ERRORA("SRV PIPE READ=====> NOT GOOD samples=%u expected=%lu\n", SKYPIAX_P_LOG, samples, SAMPLES_PER_FRAME * sizeof(short)); + //ERRORA("SRV PIPE READ=====> NOT GOOD samples=%u expected=%lu\n", SKYPIAX_P_LOG, samples, SAMPLES_PER_FRAME * sizeof(short)); assert(samples == SAMPLES_PER_FRAME * sizeof(short)); //do a crash, please //do nothing } else { @@ -808,8 +808,6 @@ return (xerror != BadValue) && (xerror != BadWindow); } - - int skypiax_skype_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P) { @@ -1353,7 +1351,7 @@ DEBUGA_SKYPE("Call %s received a DTMF: %s\n", SKYPIAX_P_LOG, id, value); - session = switch_core_session_locate(tech_pvt->session_uuid_str); + session = switch_core_session_locate(tech_pvt->session_uuid_str); channel = switch_core_session_get_channel(session); if (channel) { @@ -1565,7 +1563,7 @@ //FIXME *new_session=switch_loadable_module_create_interface(skypiax_endpoint_interface, pool); - if (!strlen(tech_pvt->session_uuid_str)) { + if (!strlen(tech_pvt->session_uuid_str)) { switch_core_session_t *session = NULL; //private_t *tech_pvt = NULL; switch_channel_t *channel = NULL; @@ -1596,9 +1594,9 @@ switch_caller_profile_new(switch_core_session_get_pool(session), "skypiax", tech_pvt->dialplan, tech_pvt->callid_name, - tech_pvt->callid_number, NULL, - NULL, NULL, NULL, - "mod_skypiax", tech_pvt->context, + tech_pvt->callid_number, NULL, NULL, + NULL, NULL, "mod_skypiax", + tech_pvt->context, tech_pvt->destination)) != 0) { char name[128]; //switch_snprintf(name, sizeof(name), "skypiax/%s/%s", tech_pvt->name, tech_pvt->caller_profile->destination_number); @@ -1620,7 +1618,7 @@ switch_channel_t *channel = NULL; if (strlen(tech_pvt->session_uuid_str)) { - session = switch_core_session_locate(tech_pvt->session_uuid_str); + session = switch_core_session_locate(tech_pvt->session_uuid_str); } else { ERRORA("No session???\n", SKYPIAX_P_LOG); } @@ -1713,7 +1711,8 @@ } return -1; } - switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(session), sizeof(tech_pvt->session_uuid_str)); + switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(session), + sizeof(tech_pvt->session_uuid_str)); caller_profile = tech_pvt->caller_profile; caller_profile->destination_number = rdest;

1 0

[commit] r11138 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: gmaruzz Date: Mon Jan 12 11:29:26 2009 New Revision: 11138 Log: skypiax: implemented anthm suggested changes, no more pointer to session in pvt, use uuid instead 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 Mon Jan 12 11:29:26 2009 @@ -59,6 +59,8 @@ static switch_status_t skypiax_codec(private_t * tech_pvt, int sample_rate, int codec_ms) { +switch_core_session_t *session=NULL; + if (switch_core_codec_init (&tech_pvt->read_codec, "L16", NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, @@ -79,8 +81,12 @@ tech_pvt->read_frame.rate = sample_rate; tech_pvt->read_frame.codec = &tech_pvt->read_codec; - switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec); - switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); + session = switch_core_session_locate(tech_pvt->session_uuid_str); + + switch_core_session_set_read_codec(session, &tech_pvt->read_codec); + switch_core_session_set_write_codec(session, &tech_pvt->write_codec); + + switch_core_session_rwunlock(session); return SWITCH_STATUS_SUCCESS; @@ -97,7 +103,7 @@ switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); - tech_pvt->session = session; + switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(session), sizeof(tech_pvt->session_uuid_str)); if (skypiax_codec(tech_pvt, SAMPLERATE_SKYPIAX, 20) != SWITCH_STATUS_SUCCESS) { ERRORA("skypiax_codec FAILED\n", SKYPIAX_P_LOG); } else { @@ -577,7 +583,7 @@ DEBUGA_SKYPE("skype call ended\n", SKYPIAX_P_LOG); if (tech_pvt) { - session = tech_pvt->session; + session = switch_core_session_locate(tech_pvt->session_uuid_str); if (session) { channel = switch_core_session_get_channel(session); @@ -587,13 +593,13 @@ ERRORA("no channel?\n", SKYPIAX_P_LOG); } } else { - ERRORA("no session?\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("no session\n", SKYPIAX_P_LOG); } } else { ERRORA("no tech_pvt?\n", SKYPIAX_P_LOG); } tech_pvt->interface_state = SKYPIAX_STATE_DOWN; - tech_pvt->session = NULL; //FIXME + memset(tech_pvt->session_uuid_str, '\0', sizeof(tech_pvt->session_uuid_str)); } } DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); 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 Mon Jan 12 11:29:26 2009 @@ -157,7 +157,7 @@ switch_codec_t write_codec; switch_frame_t read_frame; unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; - switch_core_session_t *session; + char session_uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1]; switch_caller_profile_t *caller_profile; switch_mutex_t *mutex; switch_mutex_t *flag_mutex; 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 Mon Jan 12 11:29:26 2009 @@ -1353,8 +1353,7 @@ DEBUGA_SKYPE("Call %s received a DTMF: %s\n", SKYPIAX_P_LOG, id, value); - //tech_pvt = p; - session = tech_pvt->session; + session = switch_core_session_locate(tech_pvt->session_uuid_str); channel = switch_core_session_get_channel(session); if (channel) { @@ -1566,7 +1565,7 @@ //FIXME *new_session=switch_loadable_module_create_interface(skypiax_endpoint_interface, pool); - if (!tech_pvt->session) { //FIXME FIXME FIXME + if (!strlen(tech_pvt->session_uuid_str)) { switch_core_session_t *session = NULL; //private_t *tech_pvt = NULL; switch_channel_t *channel = NULL; @@ -1620,10 +1619,10 @@ switch_core_session_t *session = NULL; switch_channel_t *channel = NULL; - if (tech_pvt->session) { - session = tech_pvt->session; + if (strlen(tech_pvt->session_uuid_str)) { + session = switch_core_session_locate(tech_pvt->session_uuid_str); } else { - ERRORA("No tech_pvt->session???\n", SKYPIAX_P_LOG); + ERRORA("No session???\n", SKYPIAX_P_LOG); } if (session) { channel = switch_core_session_get_channel(session); @@ -1714,7 +1713,7 @@ } return -1; } - tech_pvt->session = session; + switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(session), sizeof(tech_pvt->session_uuid_str)); caller_profile = tech_pvt->caller_profile; caller_profile->destination_number = rdest;

1 0

[commit] r11136 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: gmaruzz Date: Mon Jan 12 06:12:05 2009 New Revision: 11136 Log: docs Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README Mon Jan 12 06:12:05 2009 @@ -11,22 +11,38 @@ ######################################################### ######################################################### -Skypiax is an endpoint (channel driver) that use the Skype client as an interface to the Skype network, and allows incoming and outgoing Skype calls from/to FreeSWITCH. +Skypiax is an endpoint (channel driver) that use the Skype client as an interface to the Skype network, and allows incoming and outgoing Skype calls from/to FreeSWITCH (that can be bridged, originated, answered, etc. as in all other endpoints, eg sofia/SIP). -Think at Skypiax as similar to OpenZAP for analog lines: for each channel you need an interface (a Skype client). So, for eg, for two concurrent calls, you will need two channels, and two Skype clients running on your machine. +Think at Skypiax as similar to OpenZAP for analog lines: for each channel you need an interface (a Skype client). So, for eg, for two concurrent calls, you will need two channels, two Skype clients running on server. -On Linux the Skype client uses a lot of CPU. To lower its CPU consumption, you can use the Xvfb "fake" X server and (more important) the snd-dummy ALSA "fake" sound driver. +If your server's Skype client(s) has got the Skype credits, Skypiax works for SkypeOut calls too. -On a Linux machine with 3GB ram and a quad core intel6600, we got no problem with 20 concurrent calls, and plenty of room for adding more Skypiax channels. +You can use it from the dialplan, eg with the provided modified "default.xml" dialplan, you can call "sip:skype/remote_skypename__OR__skypeout_phonenumber" for calling via the Skype network from a SIP softphone to remote_skypename or to a phone number via SkypeOut, or you can call the "2908" extension from any phone to be bridged to the Skype Test Call). + +With the provided skypiax.conf.xml all incoming Skype calls will be routed to the "5000" extension, the IVR in default FreeSWITCH installation. + +On Linux the Skype client uses a lot of CPU. To lower its CPU consumption, you can use the Xvfb "fake" X server and (more important) the snd-dummy ALSA "fake" sound driver. Scripts are provided for this. But for a low number of channels it would works with regular X servers and ALSA drivers. + +On a Linux machine with 3GB ram and a quad core intel6600, we got no problem with 20 concurrent calls, and plenty of room for adding more Skypiax channels (100? not tested). On Windows, no need to do anything special, the Skype client is lighter on CPU. -More info on skypiax: http://wiki.freeswitch.org/wiki/Skypiax - http://www.celliax.org + +''Skypiax is now pre-beta, but usable for testing and finding bugs :-).'' + + +'''You can download Skypiax source code with subversion with the command:''' + +svn co http://svn.freeswitch.org/svn/freeswitch/branches/gmaruzz/src/mod/endpoints… mod_skypiax +then, follow the README file in the mod_skypiax directory. + +More info on skypiax: +http://wiki.freeswitch.org/wiki/Skypiax +http://www.celliax.org Skypiax has been contributed to the community by: - Giovanni Maruzzelli - (gmaruzz at gmail dot com) +Giovanni Maruzzelli (gmaruzz at gmail dot com) + ######################################################### ######################################################### #########################################################

1 0

[commit] r11135 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: gmaruzz Date: Mon Jan 12 05:50:49 2009 New Revision: 11135 Log: removed mod_skypiax_stuff.c Removed: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax_stuff.c

1 0

[commit] r11134 - in freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax: . configs
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: gmaruzz Date: Mon Jan 12 05:07:47 2009 New Revision: 11134 Log: docs Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/README.skypiax_auth freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.bat freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README Mon Jan 12 05:07:47 2009 @@ -2,7 +2,36 @@ ######################################################### ######################################################### - An example of installation +WHAT IS SKYPIAX + +This software (Skypiax) uses the Skype API but is not endorsed, + certified or otherwise approved in any way by Skype. + +######################################################### +######################################################### +######################################################### + +Skypiax is an endpoint (channel driver) that use the Skype client as an interface to the Skype network, and allows incoming and outgoing Skype calls from/to FreeSWITCH. + +Think at Skypiax as similar to OpenZAP for analog lines: for each channel you need an interface (a Skype client). So, for eg, for two concurrent calls, you will need two channels, and two Skype clients running on your machine. + +On Linux the Skype client uses a lot of CPU. To lower its CPU consumption, you can use the Xvfb "fake" X server and (more important) the snd-dummy ALSA "fake" sound driver. + +On a Linux machine with 3GB ram and a quad core intel6600, we got no problem with 20 concurrent calls, and plenty of room for adding more Skypiax channels. + +On Windows, no need to do anything special, the Skype client is lighter on CPU. + +More info on skypiax: http://wiki.freeswitch.org/wiki/Skypiax + http://www.celliax.org + +Skypiax has been contributed to the community by: + Giovanni Maruzzelli + (gmaruzz at gmail dot com) +######################################################### +######################################################### +######################################################### + + An example of Skypiax installation on FreeSWITCH Linux ######################################################### ######################################################### @@ -57,6 +86,9 @@ *** copy the skypiax configuration file root@8-04-srv:~/freeswitch_gmaruzz# cp src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml /usr/local/freeswitch/conf/autoload_configs/ +*** optionally, copy the dialplan configuration file that contains the "skypiax" modifications (eg: you can call "sip:skype/remote_skypename__OR__skypeout_phonenumber" for calling via the Skype network from a SIP softphone to remote_skypename or to a phone number via SkypeOut, or you can call the "2908" extension from any phone to be bridged to the Skype Test Call) +root@8-04-srv:~/freeswitch_gmaruzz# cp src/mod/endpoints/mod_skypiax/configs/default.xml /usr/local/freeswitch/conf/dialplan/ + *** now, let's get and install the Skype client root@8-04-srv:~/freeswitch_gmaruzz# cd .. root@8-04-srv:~# @@ -65,7 +97,7 @@ root@8-04-srv:~# dpkg -i skype_ubuntu-2.0.0.72-1_amd64.deb *** now, let's get the skype configuration directory we prepared on another (desktop) machine -*** on "How to prepare the configuration directory of Skype clients", see configs/README.skypiax_auth +*** on "How to prepare the configuration directory of Skype clients on Linux", see configs/README.skypiax_auth root@8-04-srv:~# cp /mnt/root/configskypenew.tgz ./ root@8-04-srv:~# tar xzf configskypenew.tgz root@8-04-srv:~# chown root.root .Skype @@ -102,6 +134,7 @@ ============================================= +20 idle skypiax channels: top - 18:14:26 up 2:02, 2 users, load average: 0.03, 0.08, 0.04 Tasks: 111 total, 1 running, 110 sleeping, 0 stopped, 0 zombie Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/README.skypiax_auth ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/README.skypiax_auth (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/README.skypiax_auth Mon Jan 12 05:07:47 2009 @@ -1,18 +1,34 @@ -How to use skypiax_auth +####################################### +HOW TO USE SKYPIAX_AUTH +####################################### -You will use skypiax_auth only at the setup moment, to make the Skype client asking you to authorize "skypiax" to connect to the same Skype client. +You will use skypiax_auth only at the setup moment, to force the Skype client to ask you to authorize "skypiax" to connect to it. Then you copy the .Skype configuration directory of the user that has launched Skype (eg: /home/maruzz/.Skype if you are maruzz) on the home directory of the user that will start Skype on the server (eg: root). Compile skypiax_auth: $ gcc -Wall -ggdb skypiax_auth.c -o skypiax_auth -lX11 -Start the Skype client on a desktop linux machine, logout from your autologin username if any, and login with the username and password you want to use for skypiax +Then: -Configure the Skype client to use the right audio devices, to not update, to not make "events", etc etc... +1) Start the Skype client on a desktop linux machine, logout from your autologin username if any, and login with the username and password you want to use for skypiax -Then, when satisfied, use skypiax_auth (that simulates FS-skypiax connecting to the Skype client). The Skype client will ask you to be authorized to let "skypiax" connect. +2) Configure the Skype client to use the right audio devices, to not update, to not make "events", etc etc... +3) Then, when satisfied, use skypiax_auth (that simulates FS-skypiax connecting to the Skype client). The Skype client will ask you to be authorized to let "skypiax" connect. + +4) Give the authorization and check the "not ask me again" option. + +5) Close (Quit) the Skype client from the tray icon, so it saves its config. + +6) Then, relaunch the Skype client and use skypiax_auth again, just to be sure it now succeed. + +7) Close (Quit) the Skype client from the tray icon, so it saves its config. + +*** Do the steps 1-7 for all Skype usernames you will want to use on the server (eg: one Skype username per channel) + +When finished wityh all the Skype usernames: +Copy or targzip the .Skype directory and all its content on the home directory of the server user that will launch the Skype client(s). ############################ first time you use skypiax_auth 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 Mon Jan 12 05:07:47 2009 @@ -29,6 +29,7 @@ <param name="tcp_srv_port" value="15559"/> <param name="skype_user" value="skypiax2"/> </interface> +  </per_interface_settings> </configuration> Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.bat ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.bat (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.bat Mon Jan 12 05:07:47 2009 @@ -12,38 +12,41 @@ call wait 7 start Skype.exe /secondary /username:skypiax2 /password:xxx call wait 7 -start Skype.exe /secondary /username:skypiax3 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax4 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax5 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax6 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax7 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax8 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax9 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax10 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax11 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax12 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax13 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax14 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax15 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax16 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax17 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax18 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax19 /password:xxx -call wait 7 -start Skype.exe /secondary /username:skypiax20 /password:xxx +REM +REM Following Skype client instances are commented out +REM +REM start Skype.exe /secondary /username:skypiax3 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax4 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax5 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax6 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax7 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax8 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax9 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax10 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax11 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax12 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax13 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax14 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax15 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax16 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax17 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax18 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax19 /password:xxx +REM call wait 7 +REM start Skype.exe /secondary /username:skypiax20 /password:xxx Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh Mon Jan 12 05:07:47 2009 @@ -21,112 +21,116 @@ echo "skypiax2 xxx"| DISPLAY=:102 /usr/bin/skype --pipelogin & sleep 7 -/usr/bin/Xvfb :103 & -sleep 3 - -echo "skypiax3 xxx"| DISPLAY=:103 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :104 & -sleep 3 - -echo "skypiax4 xxx"| DISPLAY=:104 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :105 & -sleep 3 - -echo "skypiax5 xxx"| DISPLAY=:105 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :106 & -sleep 3 - -echo "skypiax6 xxx"| DISPLAY=:106 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :107 & -sleep 3 - -echo "skypiax7 xxx"| DISPLAY=:107 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :108 & -sleep 3 - -echo "skypiax8 xxx"| DISPLAY=:108 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :109 & -sleep 3 - -echo "skypiax9 xxx"| DISPLAY=:109 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :110 & -sleep 3 - -echo "skypiax10 xxx"| DISPLAY=:110 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :111 & -sleep 3 - -echo "skypiax11 xxx"| DISPLAY=:111 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :112 & -sleep 3 - -echo "skypiax12 xxx"| DISPLAY=:112 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :113 & -sleep 3 - -echo "skypiax13 xxx"| DISPLAY=:113 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :114 & -sleep 3 - -echo "skypiax14 xxx"| DISPLAY=:114 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :115 & -sleep 3 - -echo "skypiax15 xxx"| DISPLAY=:115 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :116 & -sleep 3 - -echo "skypiax16 xxx"| DISPLAY=:116 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :117 & -sleep 3 - -echo "skypiax17 xxx"| DISPLAY=:117 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :118 & -sleep 3 - -echo "skypiax18 xxx"| DISPLAY=:118 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :119 & -sleep 3 - -echo "skypiax19 xxx"| DISPLAY=:119 /usr/bin/skype --pipelogin & - -sleep 7 -/usr/bin/Xvfb :120 & -sleep 3 - -echo "skypiax20 xxx"| DISPLAY=:120 /usr/bin/skype --pipelogin & - -sleep 7 +################################################################# +# Following X server Skype client instances are commented out +################################################################# +###/usr/bin/Xvfb :103 & +###sleep 3 +### +###echo "skypiax3 xxx"| DISPLAY=:103 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :104 & +###sleep 3 +### +###echo "skypiax4 xxx"| DISPLAY=:104 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :105 & +###sleep 3 +### +###echo "skypiax5 xxx"| DISPLAY=:105 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :106 & +###sleep 3 +### +###echo "skypiax6 xxx"| DISPLAY=:106 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :107 & +###sleep 3 +### +###echo "skypiax7 xxx"| DISPLAY=:107 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :108 & +###sleep 3 +### +###echo "skypiax8 xxx"| DISPLAY=:108 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :109 & +###sleep 3 +### +###echo "skypiax9 xxx"| DISPLAY=:109 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :110 & +###sleep 3 +### +###echo "skypiax10 xxx"| DISPLAY=:110 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :111 & +###sleep 3 +### +###echo "skypiax11 xxx"| DISPLAY=:111 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :112 & +###sleep 3 +### +###echo "skypiax12 xxx"| DISPLAY=:112 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :113 & +###sleep 3 +### +###echo "skypiax13 xxx"| DISPLAY=:113 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :114 & +###sleep 3 +### +###echo "skypiax14 xxx"| DISPLAY=:114 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :115 & +###sleep 3 +### +###echo "skypiax15 xxx"| DISPLAY=:115 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :116 & +###sleep 3 +### +###echo "skypiax16 xxx"| DISPLAY=:116 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :117 & +###sleep 3 +### +###echo "skypiax17 xxx"| DISPLAY=:117 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :118 & +###sleep 3 +### +###echo "skypiax18 xxx"| DISPLAY=:118 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :119 & +###sleep 3 +### +###echo "skypiax19 xxx"| DISPLAY=:119 /usr/bin/skype --pipelogin & +### +###sleep 7 +###/usr/bin/Xvfb :120 & +###sleep 3 +### +###echo "skypiax20 xxx"| DISPLAY=:120 /usr/bin/skype --pipelogin & +### +###sleep 7 +###

1 0

[commit] r11133 - in freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax: . configs
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: gmaruzz Date: Mon Jan 12 03:59:35 2009 New Revision: 11133 Log: skypiax: X11_errors_trap() X11_errors_untrap() Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax_auth.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax_auth.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax_auth.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax_auth.c Mon Jan 12 03:59:35 2009 @@ -13,6 +13,32 @@ int fdesc[2]; }; +XErrorHandler old_handler = 0; +int xerror = 0; + char *dispname; + +int X11_errors_handler(Display * dpy, XErrorEvent * err) +{ + (void) dpy; + + xerror = err->error_code; + printf("\n\nReceived error code %d from X Server on display '%s'\n\n", xerror, dispname); + return 0; /* ignore the error */ +} + +static void X11_errors_trap(void) +{ + xerror = 0; + old_handler = XSetErrorHandler(X11_errors_handler); +} + +static int X11_errors_untrap(void) +{ + XSetErrorHandler(old_handler); + return (xerror != BadValue) && (xerror != BadWindow); +} + + int skypiax_skype_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P) { @@ -20,6 +46,7 @@ Window w_P; Display *disp; Window handle_P; + int ok; w_P = SkypiaxHandles->skype_win; disp = SkypiaxHandles->disp; @@ -31,6 +58,7 @@ unsigned int len = strlen(message_P); XEvent e; + memset(&e, 0, sizeof(e)); e.xclient.type = ClientMessage; e.xclient.message_type = atom1; /* leading message */ @@ -38,6 +66,7 @@ e.xclient.window = handle_P; e.xclient.format = 8; + X11_errors_trap(); do { unsigned int i; for (i = 0; i < 20 && i + pos <= len; ++i) @@ -49,6 +78,11 @@ } while (pos <= len); XSync(disp, False); + ok = X11_errors_untrap(); + + if (!ok) + printf("Sending message failed with status %d\n", xerror); + return 1; } @@ -64,20 +98,22 @@ unsigned char *prop; int status; + X11_errors_trap(); status = XGetWindowProperty(SkypiaxHandles->disp, DefaultRootWindow(SkypiaxHandles->disp), skype_inst, 0, 1, False, XA_WINDOW, &type_ret, &format_ret, &nitems_ret, &bytes_after_ret, &prop); + X11_errors_untrap(); /* sanity check */ if (status != Success || format_ret != 32 || nitems_ret != 1) { SkypiaxHandles->skype_win = (Window) - 1; - printf("Skype instance not found\n"); + printf("Skype instance not found on display '%s'\n", dispname); return 0; } SkypiaxHandles->skype_win = *(const unsigned long *) prop & 0xffffffff; - printf("Skype instance found with id #%d\n", + printf("Skype instance found on display '%s', with id #%d\n", dispname, (unsigned int) SkypiaxHandles->skype_win); return 1; } @@ -106,7 +142,6 @@ Display *disp = NULL; Window root = -1; Window win = -1; - char *dispname; if(argc==2) dispname=argv[1]; @@ -137,13 +172,13 @@ snprintf(buf, 512, "NAME skypiax"); if (!skypiax_skype_send_message(&SkypiaxHandles, buf)) { - printf ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n"); + printf ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypiax_auth again\n"); return -1; } snprintf(buf, 512, "PROTOCOL 6"); if (!skypiax_skype_send_message(&SkypiaxHandles, buf)) { - printf ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n"); + printf ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypiax_auth again\n"); return -1; } @@ -186,8 +221,7 @@ } } } else { - - printf ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n"); + printf ("Skype client not found on display '%s'. Please run/restart Skype manually and launch skypiax_auth again\n\n\n", dispname); return -1; } return 0; 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 Mon Jan 12 03:59:35 2009 @@ -5,6 +5,13 @@ extern switch_endpoint_interface_t *skypiax_endpoint_interface; extern int running; +/*************************************/ +#ifndef WIN32 +XErrorHandler old_handler = 0; +int xerror = 0; +#endif /* WIN32 */ +/*************************************/ + static void *SWITCH_THREAD_FUNC skypiax_do_tcp_srv_thread(switch_thread_t * thread, void *obj) { @@ -778,6 +785,31 @@ } #else /* NOT WIN32 */ + +int X11_errors_handler(Display * dpy, XErrorEvent * err) +{ + (void) dpy; + private_t *tech_pvt = NULL; + + xerror = err->error_code; + ERRORA("Received error code %d from X Server\n\n", SKYPIAX_P_LOG, xerror); + return 0; /* ignore the error */ +} + +static void X11_errors_trap(void) +{ + xerror = 0; + old_handler = XSetErrorHandler(X11_errors_handler); +} + +static int X11_errors_untrap(void) +{ + XSetErrorHandler(old_handler); + return (xerror != BadValue) && (xerror != BadWindow); +} + + + int skypiax_skype_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P) { @@ -785,6 +817,8 @@ Window w_P; Display *disp; Window handle_P; + int ok; + private_t *tech_pvt = NULL; w_P = SkypiaxHandles->skype_win; disp = SkypiaxHandles->disp; @@ -803,6 +837,7 @@ e.xclient.window = handle_P; e.xclient.format = 8; + X11_errors_trap(); //XLockDisplay(disp); do { unsigned int i; @@ -815,6 +850,10 @@ } while (pos <= len); XSync(disp, False); + ok = X11_errors_untrap(); + + if (!ok) + ERRORA("Sending message failed with status %d\n", SKYPIAX_P_LOG, xerror); //XUnlockDisplay(disp); return 1; @@ -832,12 +871,14 @@ int status; private_t *tech_pvt = NULL; + X11_errors_trap(); //XLockDisplay(disp); status = XGetWindowProperty(SkypiaxHandles->disp, DefaultRootWindow(SkypiaxHandles->disp), skype_inst, 0, 1, False, XA_WINDOW, &type_ret, &format_ret, &nitems_ret, &bytes_after_ret, &prop); //XUnlockDisplay(disp); + X11_errors_untrap(); /* sanity check */ if (status != Success || format_ret != 32 || nitems_ret != 1) {

1 0