skypiax: beginning to avoid crashes when Skype clients die, XWindows related

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14610 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_skypiax/mod_skypiax.c b/src/mod/endpoints/mod_skypiax/mod_skypiax.c
index 66766adae05812e5cb90bd8137f5c10d9d47309f..6919c613f72dd46f5a48aa0ffd7739e5cf23c300 100644 (file)
--- a/src/mod/endpoints/mod_skypiax/mod_skypiax.c
+++ b/src/mod/endpoints/mod_skypiax/mod_skypiax.c
@@ -359,17 +359,19 @@ static switch_status_t remove_interface(char *the_interface)
                        globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread = NULL;
                }
 #else
-               XEvent e;
-               Atom atom1 = XInternAtom(tech_pvt->SkypiaxHandles.disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False);
-               memset(&e, 0, sizeof(e));
-               e.xclient.type = ClientMessage;
-               e.xclient.message_type = atom1; /*  leading message */
-               e.xclient.display = tech_pvt->SkypiaxHandles.disp;
-               e.xclient.window = tech_pvt->SkypiaxHandles.skype_win;
-               e.xclient.format = 8;
-
-               XSendEvent(tech_pvt->SkypiaxHandles.disp, tech_pvt->SkypiaxHandles.win, False, 0, &e);
-               XSync(tech_pvt->SkypiaxHandles.disp, False);
+               if(tech_pvt->running && tech_pvt->SkypiaxHandles.disp){
+                       XEvent e;
+                       Atom atom1 = XInternAtom(tech_pvt->SkypiaxHandles.disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False);
+                       memset(&e, 0, sizeof(e));
+                       e.xclient.type = ClientMessage;
+                       e.xclient.message_type = atom1; /*  leading message */
+                       e.xclient.display = tech_pvt->SkypiaxHandles.disp;
+                       e.xclient.window = tech_pvt->SkypiaxHandles.skype_win;
+                       e.xclient.format = 8;
+
+                       XSendEvent(tech_pvt->SkypiaxHandles.disp, tech_pvt->SkypiaxHandles.win, False, 0, &e);
+                       XSync(tech_pvt->SkypiaxHandles.disp, False);
+               }
 #endif
        }
 
@@ -1441,18 +1443,20 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown)
                                        globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread = NULL;
                                }
 #else
-                               XEvent e;
-                               Atom atom1 = XInternAtom(tech_pvt->SkypiaxHandles.disp, "SKYPECONTROLAPI_MESSAGE_BEGIN",
-                                                                                False);
-                               memset(&e, 0, sizeof(e));
-                               e.xclient.type = ClientMessage;
-                               e.xclient.message_type = atom1; /*  leading message */
-                               e.xclient.display = tech_pvt->SkypiaxHandles.disp;
-                               e.xclient.window = tech_pvt->SkypiaxHandles.skype_win;
-                               e.xclient.format = 8;
-
-                               XSendEvent(tech_pvt->SkypiaxHandles.disp, tech_pvt->SkypiaxHandles.win, False, 0, &e);
-                               XSync(tech_pvt->SkypiaxHandles.disp, False);
+                               if(tech_pvt->SkypiaxHandles.disp){
+                                       XEvent e;
+                                       Atom atom1 = XInternAtom(tech_pvt->SkypiaxHandles.disp, "SKYPECONTROLAPI_MESSAGE_BEGIN",
+                                                       False);
+                                       memset(&e, 0, sizeof(e));
+                                       e.xclient.type = ClientMessage;
+                                       e.xclient.message_type = atom1; /*  leading message */
+                                       e.xclient.display = tech_pvt->SkypiaxHandles.disp;
+                                       e.xclient.window = tech_pvt->SkypiaxHandles.skype_win;
+                                       e.xclient.format = 8;
+
+                                       XSendEvent(tech_pvt->SkypiaxHandles.disp, tech_pvt->SkypiaxHandles.win, False, 0, &e);
+                                       XSync(tech_pvt->SkypiaxHandles.disp, False);
+                               }
 #endif
                        }
                        x = 10;

diff --git a/src/mod/endpoints/mod_skypiax/skypiax_protocol.c b/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
index 31812a0d65a5c7e446e1f02b6090eb2796763210..e0298fe5a201cbe00fa3bcda42900553fbd08dc7 100644 (file)
--- a/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
+++ b/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
@@ -1271,7 +1271,7 @@ int X11_errors_handler(Display * dpy, XErrorEvent * err)
 
        xerror = err->error_code;
        ERRORA("Received error code %d from X Server\n\n", SKYPIAX_P_LOG, xerror);      ///FIXME why crash the entire skypiax? just crash the interface, instead
-       running = 0;
+       //running = 0;
        return 0;                                       /*  ignore the error */
 }
 
@@ -1287,15 +1287,16 @@ static int X11_errors_untrap(void)
        return (xerror != BadValue) && (xerror != BadWindow);
 }
 
-int skypiax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P)
+int skypiax_send_message(private_t * tech_pvt, const char *message_P)
 {
-
+       struct SkypiaxHandles *SkypiaxHandles;
        Window w_P;
        Display *disp;
        Window handle_P;
        int ok;
-       private_t *tech_pvt = NULL;
+       //private_t *tech_pvt = NULL;
 
+       SkypiaxHandles = &tech_pvt->SkypiaxHandles;
        w_P = SkypiaxHandles->skype_win;
        disp = SkypiaxHandles->disp;
        handle_P = SkypiaxHandles->win;
@@ -1328,8 +1329,11 @@ int skypiax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *mess
        XSync(disp, False);
        ok = X11_errors_untrap();
 
-       if (!ok)
+       if (!ok){
                ERRORA("Sending message failed with status %d\n", SKYPIAX_P_LOG, xerror);
+               tech_pvt->running = 0;
+               return 0;
+       }
        //XUnlockDisplay(disp);
 
        return 1;
@@ -1337,13 +1341,11 @@ int skypiax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *mess
 
 int skypiax_signaling_write(private_t * tech_pvt, char *msg_to_skype)
 {
-       struct SkypiaxHandles *SkypiaxHandles;
 
        DEBUGA_SKYPE("SENDING: |||%s||||\n", SKYPIAX_P_LOG, msg_to_skype);
 
-       SkypiaxHandles = &tech_pvt->SkypiaxHandles;
 
-       if (!skypiax_send_message(SkypiaxHandles, msg_to_skype)) {
+       if (!skypiax_send_message(tech_pvt, msg_to_skype)) {
                ERRORA
                        ("Sending message failed - probably Skype crashed.\n\nPlease shutdown Skypiax, then restart Skype, then launch Skypiax and try again.\n",
                         SKYPIAX_P_LOG);
@@ -1457,7 +1459,7 @@ void *skypiax_do_skypeapi_thread_func(void *obj)
 
                snprintf(buf, 512, "NAME skypiax");
 
-               if (!skypiax_send_message(SkypiaxHandles, buf)) {
+               if (!skypiax_send_message(tech_pvt, buf)) {
                        ERRORA("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n", SKYPIAX_P_LOG);
                        running = 0;
                        if(disp)
@@ -1466,7 +1468,7 @@ void *skypiax_do_skypeapi_thread_func(void *obj)
                }
 
                snprintf(buf, 512, "PROTOCOL 7");
-               if (!skypiax_send_message(SkypiaxHandles, buf)) {
+               if (!skypiax_send_message(tech_pvt, buf)) {
                        ERRORA("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n", SKYPIAX_P_LOG);
                        running = 0;
                        if(disp)
@@ -1487,7 +1489,7 @@ void *skypiax_do_skypeapi_thread_func(void *obj)
                memset(buffer, '\0', 17000);
                b = buffer;
 
-               while (1) {
+               while (running && tech_pvt->running) {
                        XNextEvent(disp, &an_event);
                        if (!(running && tech_pvt->running))
                                break;