Changeset 7053379

Timestamp:

2010-03-12T23:02:29Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1be0d26

Parents:

547c94c

Message:

Yahoo! status updates (at least initial ones, I assume) can be too long to
fit into one packet. Yahoo! servers will split them up, and not necessarily
on buddy boundaries. Trying to handle this a little bit better now. (Sadly
I can't test this myself, I can only see this causing troubles on testing
sometimes.)

Location:

protocols/yahoo

Files:

• libyahoo2.c (modified) (6 diffs)
• yahoo2_types.h (modified) (2 diffs)

protocols/yahoo/libyahoo2.c

@@ -1317 +1317 @@
         struct yahoo_data *yd = yid->yd;
 
-        struct user {
-                char *name;     /* 7      name */
-                int state;      /* 10     state */
-                int flags;      /* 13     flags, bit 0 = pager, bit 1 = chat, bit 2 = game */
-                int mobile;     /* 60     mobile */
-                char *msg;      /* 19     custom status message */
-                int away;       /* 47     away (or invisible) */
-                int buddy_session; /* 11  state */
-                int f17;        /* 17     in chat? then what about flags? */
-                int idle;       /* 137    seconds idle */
-                int f138;       /* 138    state */
-                char *f184;     /* 184    state */
-                int f192;       /* 192    state */
-                int f10001;     /* 10001  state */
-                int f10002;     /* 10002  state */
-                int f198;       /* 198    state */
-                char *f197;     /* 197    state */
-                char *f205;     /* 205    state */
-                int f213;       /* 213    state */
-        } *u;
+        struct yahoo_process_status_entry *u;
 
         YList *users = 0;
@@ -1346 +1327 @@
         }
 
-        u = NULL;
+        /* Status updates may be spread accross multiple packets and not
+           even on buddy boundaries, so keeping some state is important.
+           So, continue where we left off, and only add a user entry to
+           the list once it's complete (301-315 End buddy). */
+        u = yd->half_user;
 
         for (l = pkt->hash; l; l = l->next) {
@@ -1354 +1339 @@
                 case 300:       /* Begin buddy */
                         if (!strcmp(pair->value, "315") && !u) {
-                                u = y_new0(struct user, 1);
+                                u = yd->half_user = y_new0(struct yahoo_process_status_entry, 1);
                         }
                         break;
@@ -1360 +1345 @@
                         if (!strcmp(pair->value, "315") && u) {
                                 users = y_list_prepend(users, u);
-                                u = NULL;
+                                u = yd->half_user = NULL;
                         }
                         break;
@@ -1381 +1366 @@
                         if (!u) {
                                 /* This will only happen in case of a single level message */
-                                u = y_new0(struct user, 1);
+                                u = y_new0(struct yahoo_process_status_entry, 1);
                                 users = y_list_prepend(users, u);
                         }
@@ -1451 +1436 @@
         while (users) {
                 YList *t = users;
-                struct user *u = users->data;
+                struct yahoo_process_status_entry *u = users->data;
 
                 if (u->name != NULL) {

protocols/yahoo/yahoo2_types.h

@@ -196 +196 @@
 
         void  *server_settings;
+        
+        struct yahoo_process_status_entry *half_user;
 };
 
@@ -261 +263 @@
 };
 
+struct yahoo_process_status_entry {
+        char *name;     /* 7      name */
+        int state;      /* 10     state */
+        int flags;      /* 13     flags, bit 0 = pager, bit 1 = chat, bit 2 = game */
+        int mobile;     /* 60     mobile */
+        char *msg;      /* 19     custom status message */
+        int away;       /* 47     away (or invisible) */
+        int buddy_session; /* 11  state */
+        int f17;        /* 17     in chat? then what about flags? */
+        int idle;       /* 137    seconds idle */
+        int f138;       /* 138    state */
+        char *f184;     /* 184    state */
+        int f192;       /* 192    state */
+        int f10001;     /* 10001  state */
+        int f10002;     /* 10002  state */
+        int f198;       /* 198    state */
+        char *f197;     /* 197    state */
+        char *f205;     /* 205    state */
+        int f213;       /* 213    state */
+};
+
 #ifdef __cplusplus
 }