Changeset 287 for trunk/instant_messenger/webjabber

Timestamp:

05/26/08 11:45:16 (16 years ago)

Author:

niltonneto

Message:

Verificar Wiki/Trac? do módulo.

Location:

trunk/instant_messenger/webjabber

Files:

• bkp.webjabber.c (added)
• webjabber (modified) (previous)
• webjabber.c (modified) (4 diffs)

trunk/instant_messenger/webjabber/webjabber.c

@@ -817 +817 @@
                 bytes_rcvd_client = (int) NULL,
                 bytes_sent_client = (int) NULL,
-                i;
-
-        //syslog (LOG_INFO, "Reading(fd%d, fd%d)", in_fd, out_fd);
+                i,
+                do_auth = 0;
 
         // @TODO: verificar alocacao buffer
@@ -828 +827 @@
         {
                 bzero(buf_2_jabber, BUF_SIZE);
-                if ( (bytes_rcvd_client = recv (client_fd, buf_2_jabber, BUF_SIZE, 0)) != 0 && strlen(buf_2_client) > 0 )
-                {
-                        // descomentar para ver oq esta passado de informacao
-                        //printf("(jabber/client[#%d])[%d]:\n{\n%s.......\n}\n", client_fd, strlen(buf_2_client), buf_2_client);
+                bytes_rcvd_client = recv (client_fd, buf_2_jabber, BUF_SIZE, 0);
+                if ( (bytes_rcvd_client != 0) && (strlen(buf_2_client) > 0) )
+                {
                         for ( i = 0; i < bytes_rcvd_jabber; i += bytes_sent_client )
                         {
@@ -840 +838 @@
                         }
                 }
+                if ( strlen(buf_2_jabber) > 0 )
+                {
+                        //printf("(client/jabber[#%d])[%d]:\n{\n%s.......\n}\n", jabber_fd, strlen(buf_2_jabber), buf_2_jabber);
+                        if ( strstr(buf_2_jabber, "<?xml") != NULL )
+                                do_auth = 1;
+                }
 
                 bzero(buf_2_client, BUF_SIZE);
-                if ( (bytes_rcvd_jabber = recv (jabber_fd, buf_2_client, BUF_SIZE, 0)) != 0 && strlen(buf_2_jabber) > 0 )
-                {
-                        // descomentar para ver oq esta passado de informacao
-                        //printf("(client/jabber[#%d])[%d]:\n{\n%s.......\n}\n", jabber_fd, strlen(buf_2_jabber), buf_2_jabber);
+                if ( do_auth || read->type == 1 )
+                        bytes_rcvd_jabber = recv (jabber_fd, buf_2_client, BUF_SIZE, 0);
+                else
+                        bytes_rcvd_jabber = -1;
+                if ( (bytes_rcvd_jabber != 0) && (strlen(buf_2_jabber) > 0) )
+                {
                         for ( i = 0; i < bytes_rcvd_client; i += bytes_sent_jabber )
                         {
@@ -854 +860 @@
                         }
                 }
+                if ( strlen(buf_2_client) > 0 )
+                {
+                        //printf("(jabber/client[#%d])[%d]:\n{\n%s.......\n}\n", client_fd, strlen(buf_2_client), buf_2_client);
+                        if ( do_auth && strstr(buf_2_jabber, "<iq xmlns='jabber:client'") != NULL )
+                                do_auth = 0;
+                }
 
                 usleep(500);
-                //sleep(2);
         }
         while ( (bytes_rcvd_client != 0) && (bytes_rcvd_jabber != 0) );