Changeset 9fd4241

Timestamp:

2007-08-19T15:43:14Z (17 years ago)

Author:

VMiklos <vmiklos@…>

Branches:

master

Children:

be975f8

Parents:

1323e36

Message:

download buddies from the server
also remove write queues. i took them from the jabber module and they seem to
be a bit unnecessary for skype

Location:

skype

Files:

• Makefile (modified) (1 diff)
• skype.c (modified) (8 diffs)

skype/Makefile

@@ -1 @@
-CFLAGS += $(shell pkg-config --cflags bitlbee) -g
+CFLAGS += $(shell pkg-config --cflags bitlbee) -g -Wall
+LDFLAGS += $(shell pkg-config --libs bitlbee)
 
 skype.so: skype.c

skype/skype.c

@@ -20 +20 @@
 };
 
-static gboolean skype_write_callback( gpointer data, gint fd, b_input_condition cond );
-static gboolean skype_write_queue( struct im_connection *ic );
-
 static void skype_init( account_t *acc )
 {
@@ -37 +34 @@
 {
         struct skype_data *sd = ic->proto_data;
-        gboolean ret;
-
-        if( sd->tx_len == 0 )
-        {
-                sd->tx_len = len;
-                sd->txq = g_memdup( buf, len );
-                if( ( ret = skype_write_queue( ic ) ) && sd->tx_len > 0 )
-                        sd->w_inpa = b_input_add( sd->fd, GAIM_INPUT_WRITE, skype_write_callback, ic );
-        }
-        else
-        {
-                sd->txq = g_renew( char, sd->txq, sd->tx_len + len );
-                memcpy( sd->txq + sd->tx_len, buf, len );
-                sd->tx_len += len;
-                ret = TRUE;
-        }
-        return ret;
-}
-
-static gboolean skype_write_callback( gpointer data, gint fd, b_input_condition cond )
-{
-        struct skype_data *sd = ((struct im_connection *)data)->proto_data;
-
-        return sd->fd != -1 &&
-                skype_write_queue( data ) &&
-                sd->tx_len > 0;
+
+        printf("write(): %s", buf);
+        write( sd->fd, buf, len );
+
+        // TODO: error handling
+
+        return TRUE;
 }
 
@@ -71 +49 @@
         char buf[1024];
         int st;
+        char **lines, **lineptr, *line, *ptr;
 
         if( sd->fd == -1 )
@@ -79 +58 @@
                 buf[st] = '\0';
                 printf("read(): '%s'\n", buf);
+                lines = g_strsplit(buf, "\n", 0);
+                lineptr = lines;
+                while((line = *lineptr))
+                {
+                        if(!strlen(line))
+                                break;
+                        printf("skype_read_callback() new line: '%s'\n", line);
+                        if(!strncmp(line, "USERS ", 6))
+                        {
+                                char **i;
+                                char **nicks;
+
+                                nicks = g_strsplit(line + 6, ", ", 0);
+                                i = nicks;
+                                while(*i)
+                                {
+                                        g_snprintf(buf, 1024, "GET USER %s ONLINESTATUS\n", *i);
+                                        skype_write( ic, buf, strlen( buf ) );
+                                        i++;
+                                }
+                                g_strfreev(nicks);
+                        }
+                        else if(!strncmp(line, "USER ", 5))
+                        {
+                                // TODO we should add the buddy even if the status is offline
+                                if((ptr = strrchr(line, ' ')) && strcmp(++ptr, "OFFLINE") != 0)
+                                {
+                                        char *user = strchr(line, ' ');
+                                        ptr = strchr(++user, ' ');
+                                        *ptr = '\0';
+                                        ptr = g_strdup_printf("%s@skype.com", user);
+                                        imcb_add_buddy(ic, ptr, NULL);
+                                        imcb_buddy_status(ic, ptr, OPT_LOGGED_IN, NULL, NULL);
+                                }
+                        }
+                        lineptr++;
+                }
+                g_strfreev(lines);
         }
         else if( st == 0 || ( st < 0 && !sockerr_again() ) )
@@ -94 +111 @@
 }
 
-static gboolean skype_write_queue( struct im_connection *ic )
-{
-        struct skype_data *sd = ic->proto_data;
-        int st;
-
-        printf("sd->fd: %d\n", sd->fd);
-        st = write( sd->fd, sd->txq, sd->tx_len );
-
-        if( st == sd->tx_len )
-        {
-                /* We wrote everything, clear the buffer. */
-                g_free( sd->txq );
-                sd->txq = NULL;
-                sd->tx_len = 0;
-
-                return TRUE;
-        }
-        else if( st == 0 || ( st < 0 && !sockerr_again() ) )
-        {
-                /* Set fd to -1 to make sure we won't write to it anymore. */
-                closesocket( sd->fd );  /* Shouldn't be necessary after errors? */
-                sd->fd = -1;
-
-                imcb_error( ic, "Short write() to server" );
-                imc_logout( ic, TRUE );
-                return FALSE;
-        }
-        else if( st > 0 )
-        {
-                char *s;
-
-                s = g_memdup( sd->txq + st, sd->tx_len - st );
-                sd->tx_len -= st;
-                g_free( sd->txq );
-                sd->txq = s;
-
-                return TRUE;
-        }
-        else
-        {
-                return TRUE;
-        }
-}
-
 gboolean skype_start_stream( struct im_connection *ic )
 {
@@ -147 +120 @@
                 sd->r_inpa = b_input_add( sd->fd, GAIM_INPUT_READ, skype_read_callback, ic );
 
-        buf = g_strdup_printf("SEARCH FRIENDS");
+        // download buddies
+        buf = g_strdup_printf("SEARCH FRIENDS\n");
         st = skype_write( ic, buf, strlen( buf ) );
         g_free(buf);
@@ -163 +137 @@
                 imcb_error( ic, "Could not connect to server" );
                 imc_logout( ic, TRUE );
-                return;
+                return FALSE;
         }
-        //imcb_add_buddy(ic, "vmiklos_dsd@skype.com", NULL);
-        //imcb_buddy_status(ic, "vmiklos_dsd@skype.com", OPT_LOGGED_IN, NULL, NULL);
         return skype_start_stream(ic);
 }
@@ -198 +170 @@
 {
         static GList *l = NULL;
-        int i;
 
         l = g_list_append( l, (void*)"Online" );