Changeset 238

Timestamp:

03/20/08 09:46:58 (16 years ago)

Author:

niltonneto

Message:

 

Location:

trunk/instant_messenger

Files:

• js/client.js (modified) (1 diff)
• webjabber/webjabber.c (modified) (3 diffs)
• webjabber/webjabber.cfg (modified) (1 diff)

trunk/instant_messenger/js/client.js

@@ -80 +80 @@
         setTimeout("con.go('$this.Ujabber.getContacts', {'request':"+contacts+"})", 3000);
 }
-window.onbeforeunload = function(){con.__HTTP__['$this.Ujabber.listen'].abort();}
-/*window.onbeforeunload = function(){con.__HTTP__['$this.Ujabber.getContacts'].abort();}
-window.onbeforeunload = function(){con.__HTTP__['$this.Ujabber.getVcard'].abort();}
-window.onbeforeunload = function(){con.__HTTP__['$this.ldap_im.photo_ldap'].abort();}
-window.onbeforeunload = function(){con.__HTTP__['$this.Ujabber.setStatus'].abort();}
-window.onbeforeunload = function(){con.__HTTP__['$this.Ujabber.setPresence'].abort();}*/
+
+window.onbeforeunload = function()
+{
+        disconnected = true;
+        var i;
+        for ( i in con.__HTTP__ )
+                con.__HTTP__[i].abort();
+};
+//window.onbeforeunload = function(){con.__HTTP__['$this.Ujabber.listen'].abort();}

trunk/instant_messenger/webjabber/webjabber.c

@@ -54 +54 @@
                  * pass;
         int * jabber_fd,
-                * read;
+                * read_fd;
         time_t last_access;
 };
@@ -632 +632 @@
                 //puts("\n\n:::::::::::::::: INFO #0 :::::::::::::::::::::\n");
                 bzero(buf, 5);
+
+                //if ( *(client->read_fd) != (int)NULL )
+                //{
+                //      shutdown(*(client->read_fd), SHUT_RDWR);
+                //      close(*(client->read_fd));
+                //}
+                //*(client->read_fd) = *(accept->fd);
+
                 //puts("\n\n:::::::::::::::: INFO #1 :::::::::::::::::::::\n");
                 if ( *(client->jabber_fd) == (int)NULL )
@@ -716 +724 @@
                 connections->client->user = user;
                 connections->client->pass = pass;
+
+                connections->client->read_fd = (int *) malloc(sizeof(int));
+                if ( connections->client->read_fd == NULL )
+                        syslog (LOG_ERR, "malloc(): %m"), exit (EXIT_FAILURE);
+
                 connections->client->jabber_fd = (int *) malloc(sizeof(int));
                 if ( connections->client->jabber_fd == NULL )
                         syslog (LOG_ERR, "malloc(): %m"), exit (EXIT_FAILURE);
 
+                *(connections->client->read_fd) = (int)NULL;
                 *(connections->client->jabber_fd) = (int)NULL;
+
                 connections->client->last_access = time(NULL);
 

trunk/instant_messenger/webjabber/webjabber.cfg

@@ -2 +2 @@
 10.15.20.205
 10.15.20.42
+10.15.20.6
 127.0.0.1