Changeset c8791f2

Timestamp:

2010-07-24T13:29:48Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

03f3828

Parents:

938c305 (diff), c495217 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging libyahoo2 fixes. Now completely up-to-date with libyahoo2 svn
again, should try to keep it up a little bit better and submit my fixes
upstream.

This also adds code for Yahoo! file transfers but BitlBee isn't using it
yet. (It doesn't seem to support flow control which makes this complicated.)

Location:

protocols/yahoo

Files:

• Makefile (modified) (1 diff)
• libyahoo2.c (modified) (176 diffs)
• yahoo.c (modified) (22 diffs)
• yahoo2.h (modified) (6 diffs)
• yahoo2_callbacks.h (modified) (51 diffs)
• yahoo2_types.h (modified) (2 diffs)
• yahoo_fn.h (modified) (1 diff)
• yahoo_httplib.c (modified) (18 diffs)
• yahoo_httplib.h (modified) (1 diff)
• yahoo_list.h (modified) (1 diff)
• yahoo_util.c (modified) (1 diff)
• yahoo_util.h (modified) (2 diffs)

protocols/yahoo/Makefile

@@ -15 +15 @@
 objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_util.o
 
-CFLAGS += -Wall -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB
+CFLAGS += -Wall -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB -Wno-pointer-to-int-cast
 LFLAGS += -r
 

protocols/yahoo/libyahoo2.c

@@ -3 +3 @@
  *
  * Some code copyright (C) 2002-2004, Philip S Tellis <philip.tellis AT gmx.net>
+ * YMSG16 code copyright (C) 2009, 
+ *              Siddhesh Poyarekar <siddhesh dot poyarekar at gmail dot com>
  *
  * Yahoo Search copyright (C) 2003, Konstantin Klyagin <konst AT konst.org.ua>
@@ -27 +29 @@
  *     <hiro-y@kcn.ne.jp>
  *
+ * YMSG16 authentication code based mostly on write-up at:
+ *      http://www.carbonize.co.uk/ymsg16.html
  *
  * This program is free software; you can redistribute it and/or modify
@@ -92 +96 @@
 
 #ifdef USE_STRUCT_CALLBACKS
-struct yahoo_callbacks *yc=NULL;
-
-void yahoo_register_callbacks(struct yahoo_callbacks * tyc)
+struct yahoo_callbacks *yc = NULL;
+
+void yahoo_register_callbacks(struct yahoo_callbacks *tyc)
 {
         yc = tyc;
@@ -104 +108 @@
 #endif
 
-static int yahoo_send_data(int fd, void *data, int len);
-
-int yahoo_log_message(char * fmt, ...)
+static int yahoo_send_data(void *fd, void *data, int len);
+static void _yahoo_http_connected(int id, void *fd, int error, void *data);
+static void yahoo_connected(void *fd, int error, void *data);
+
+int yahoo_log_message(char *fmt, ...)
 {
         char out[1024];
@@ -113 +119 @@
         vsnprintf(out, sizeof(out), fmt, ap);
         va_end(ap);
-        return YAHOO_CALLBACK(ext_yahoo_log)("%s", out);
-}
-
-int yahoo_connect(char * host, int port)
-{
-        return YAHOO_CALLBACK(ext_yahoo_connect)(host, port);
+        return YAHOO_CALLBACK(ext_yahoo_log) ("%s", out);
+}
+
+int yahoo_connect(char *host, int port)
+{
+        return YAHOO_CALLBACK(ext_yahoo_connect) (host, port);
 }
 
@@ -136 +142 @@
 
 /* default values for servers */
-static char pager_host[] = "scs.msg.yahoo.com"; 
+static char *default_pager_hosts[] = {  "scs.msg.yahoo.com",
+                                        "scsa.msg.yahoo.com",
+                                        "scsb.msg.yahoo.com",
+                                        "scsc.msg.yahoo.com",
+                                        NULL};
+
 static int pager_port = 5050;
-static int fallback_ports[]={23, 25, 80, 20, 119, 8001, 8002, 5050, 0};
-static char filetransfer_host[]="filetransfer.msg.yahoo.com";
-static int filetransfer_port=80;
-static char webcam_host[]="webcam.yahoo.com";
-static int webcam_port=5100;
-static char webcam_description[]="";
-static char local_host[]="";
-static int conn_type=Y_WCM_DSL;
+static int fallback_ports[] = { 23, 25, 80, 20, 119, 8001, 8002, 5050, 0 };
+
+static char filetransfer_host[] = "filetransfer.msg.yahoo.com";
+static int filetransfer_port = 80;
+static char webcam_host[] = "webcam.yahoo.com";
+static int webcam_port = 5100;
+static char webcam_description[] = "";
+static char local_host[] = "";
+static int conn_type = Y_WCM_DSL;
 
 static char profile_url[] = "http://profiles.yahoo.com/";
 
-enum yahoo_service { /* these are easier to see in hex */
-        YAHOO_SERVICE_LOGON = 1,
-        YAHOO_SERVICE_LOGOFF,
-        YAHOO_SERVICE_ISAWAY,
-        YAHOO_SERVICE_ISBACK,
-        YAHOO_SERVICE_IDLE, /* 5 (placemarker) */
-        YAHOO_SERVICE_MESSAGE,
-        YAHOO_SERVICE_IDACT,
-        YAHOO_SERVICE_IDDEACT,
-        YAHOO_SERVICE_MAILSTAT,
-        YAHOO_SERVICE_USERSTAT, /* 0xa */
-        YAHOO_SERVICE_NEWMAIL,
-        YAHOO_SERVICE_CHATINVITE,
-        YAHOO_SERVICE_CALENDAR,
-        YAHOO_SERVICE_NEWPERSONALMAIL,
-        YAHOO_SERVICE_NEWCONTACT,
-        YAHOO_SERVICE_ADDIDENT, /* 0x10 */
-        YAHOO_SERVICE_ADDIGNORE,
-        YAHOO_SERVICE_PING,
-        YAHOO_SERVICE_GOTGROUPRENAME, /* < 1, 36(old), 37(new) */
-        YAHOO_SERVICE_SYSMESSAGE = 0x14,
-        YAHOO_SERVICE_SKINNAME = 0x15,
-        YAHOO_SERVICE_PASSTHROUGH2 = 0x16,
-        YAHOO_SERVICE_CONFINVITE = 0x18,
-        YAHOO_SERVICE_CONFLOGON,
-        YAHOO_SERVICE_CONFDECLINE,
-        YAHOO_SERVICE_CONFLOGOFF,
-        YAHOO_SERVICE_CONFADDINVITE,
-        YAHOO_SERVICE_CONFMSG,
-        YAHOO_SERVICE_CHATLOGON,
-        YAHOO_SERVICE_CHATLOGOFF,
-        YAHOO_SERVICE_CHATMSG = 0x20,
-        YAHOO_SERVICE_GAMELOGON = 0x28,
-        YAHOO_SERVICE_GAMELOGOFF,
-        YAHOO_SERVICE_GAMEMSG = 0x2a,
-        YAHOO_SERVICE_FILETRANSFER = 0x46,
-        YAHOO_SERVICE_VOICECHAT = 0x4A,
-        YAHOO_SERVICE_NOTIFY,
-        YAHOO_SERVICE_VERIFY,
-        YAHOO_SERVICE_P2PFILEXFER,
-        YAHOO_SERVICE_PEERTOPEER = 0x4F,        /* Checks if P2P possible */
-        YAHOO_SERVICE_WEBCAM,
-        YAHOO_SERVICE_AUTHRESP = 0x54,
-        YAHOO_SERVICE_LIST,
-        YAHOO_SERVICE_AUTH = 0x57,
-        YAHOO_SERVICE_AUTHBUDDY = 0x6d,
-        YAHOO_SERVICE_ADDBUDDY = 0x83,
-        YAHOO_SERVICE_REMBUDDY,
-        YAHOO_SERVICE_IGNORECONTACT,    /* > 1, 7, 13 < 1, 66, 13, 0*/
-        YAHOO_SERVICE_REJECTCONTACT,
-        YAHOO_SERVICE_GROUPRENAME = 0x89, /* > 1, 65(new), 66(0), 67(old) */
-        YAHOO_SERVICE_Y7_PING = 0x8A, /* 0 - id and that's it?? */
-        YAHOO_SERVICE_CHATONLINE = 0x96, /* > 109(id), 1, 6(abcde) < 0,1*/
-        YAHOO_SERVICE_CHATGOTO,
-        YAHOO_SERVICE_CHATJOIN, /* > 1 104-room 129-1600326591 62-2 */
-        YAHOO_SERVICE_CHATLEAVE,
-        YAHOO_SERVICE_CHATEXIT = 0x9b,
-        YAHOO_SERVICE_CHATADDINVITE = 0x9d,
-        YAHOO_SERVICE_CHATLOGOUT = 0xa0,
-        YAHOO_SERVICE_CHATPING,
-        YAHOO_SERVICE_COMMENT = 0xa8,
-        YAHOO_SERVICE_STEALTH = 0xb9,
-        YAHOO_SERVICE_PICTURE_CHECKSUM = 0xbd,
-        YAHOO_SERVICE_PICTURE = 0xbe,
-        YAHOO_SERVICE_PICTURE_UPDATE = 0xc1,
-        YAHOO_SERVICE_PICTURE_UPLOAD = 0xc2,
-        YAHOO_SERVICE_Y6_VISIBILITY=0xc5,
-        YAHOO_SERVICE_Y6_STATUS_UPDATE=0xc6,
-        YAHOO_PHOTOSHARE_INIT=0xd2,     
-        YAHOO_SERVICE_CONTACT_YMSG13=0xd6,
-        YAHOO_PHOTOSHARE_PREV=0xd7,
-        YAHOO_PHOTOSHARE_KEY=0xd8,
-        YAHOO_PHOTOSHARE_TRANS=0xda,
-        YAHOO_FILE_TRANSFER_INIT_YMSG13=0xdc,
-        YAHOO_FILE_TRANSFER_GET_YMSG13=0xdd,
-        YAHOO_FILE_TRANSFER_PUT_YMSG13=0xde,
-        YAHOO_SERVICE_YMSG15_STATUS=0xf0,
-        YAHOO_SERVICE_YMSG15_BUDDY_LIST=0xf1,
+struct connect_callback_data {
+        struct yahoo_data *yd;
+        int tag;
+        int i;
+        int server_i;
 };
 
@@ -242 +181 @@
 
 struct yahoo_search_state {
-        int   lsearch_type;
-        char  *lsearch_text;
-        int   lsearch_gender;
-        int   lsearch_agerange;
-        int   lsearch_photo;
-        int   lsearch_yahoo_only;
-        int   lsearch_nstart;
-        int   lsearch_nfound;
-        int   lsearch_ntotal;
+        int lsearch_type;
+        char *lsearch_text;
+        int lsearch_gender;
+        int lsearch_agerange;
+        int lsearch_photo;
+        int lsearch_yahoo_only;
+        int lsearch_nstart;
+        int lsearch_nfound;
+        int lsearch_ntotal;
 };
 
@@ -264 +203 @@
         struct yahoo_search_state *ys;
 
-        int   fd;
+        void *fd;
         enum yahoo_connection_type type;
-        
-        unsigned char   *rxqueue;
-        int   rxlen;
-        int   read_tag;
+
+        unsigned char *rxqueue;
+        int rxlen;
+        int read_tag;
 
         YList *txqueues;
-        int   write_tag;
+        int write_tag;
 };
 
 struct yahoo_server_settings {
         char *pager_host;
-        int   pager_port;
+        int pager_port;
         char *filetransfer_host;
-        int   filetransfer_port;
+        int filetransfer_port;
         char *webcam_host;
-        int   webcam_port;
+        int webcam_port;
         char *webcam_description;
         char *local_host;
-        int   conn_type;
+        int conn_type;
+        char **pager_host_list;
 };
 
-static void * _yahoo_default_server_settings()
-{
-        struct yahoo_server_settings *yss = y_new0(struct yahoo_server_settings, 1);
-
-        yss->pager_host = strdup(pager_host);
+static void yahoo_process_ft_connection(struct yahoo_input_data *yid, int over);
+
+static void yahoo_process_filetransfer(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt);
+static void yahoo_process_filetransferinfo(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt);
+static void yahoo_process_filetransferaccept(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt);
+
+static void yahoo_https_auth(struct yahoo_input_data *yid, const char *seed, const char *sn);
+
+static void *_yahoo_default_server_settings()
+{
+        struct yahoo_server_settings *yss =
+                y_new0(struct yahoo_server_settings, 1);
+
+        /* Give preference to the default host list
+         * Make sure that only one of the two is set at any time 
+         */
+        yss->pager_host = NULL;
+        yss->pager_host_list = default_pager_hosts;
+
         yss->pager_port = pager_port;
         yss->filetransfer_host = strdup(filetransfer_host);
@@ -304 +261 @@
 }
 
-static void * _yahoo_assign_server_settings(va_list ap)
+static void *_yahoo_assign_server_settings(va_list ap)
 {
         struct yahoo_server_settings *yss = _yahoo_default_server_settings();
         char *key;
         char *svalue;
-        int   nvalue;
-
-        while(1) {
+        int nvalue;
+        char **pvalue;
+
+        while (1) {
                 key = va_arg(ap, char *);
-                if(key == NULL)
-                        break;
-
-                if(!strcmp(key, "pager_host")) {
+                if (key == NULL)
+                        break;
+
+                if (!strcmp(key, "pager_host")) {
                         svalue = va_arg(ap, char *);
                         free(yss->pager_host);
                         yss->pager_host = strdup(svalue);
-                } else if(!strcmp(key, "pager_port")) {
+                        yss->pager_host_list = NULL;
+                } else if (!strcmp(key, "pager_host_list")) {
+                        pvalue = va_arg(ap, char **);
+                        yss->pager_host_list = pvalue;
+                        free(yss->pager_host);
+                        yss->pager_host = NULL;
+                } else if (!strcmp(key, "pager_port")) {
                         nvalue = va_arg(ap, int);
                         yss->pager_port = nvalue;
-                } else if(!strcmp(key, "filetransfer_host")) {
+                } else if (!strcmp(key, "filetransfer_host")) {
                         svalue = va_arg(ap, char *);
                         free(yss->filetransfer_host);
                         yss->filetransfer_host = strdup(svalue);
-                } else if(!strcmp(key, "filetransfer_port")) {
+                } else if (!strcmp(key, "filetransfer_port")) {
                         nvalue = va_arg(ap, int);
                         yss->filetransfer_port = nvalue;
-                } else if(!strcmp(key, "webcam_host")) {
+                } else if (!strcmp(key, "webcam_host")) {
                         svalue = va_arg(ap, char *);
                         free(yss->webcam_host);
                         yss->webcam_host = strdup(svalue);
-                } else if(!strcmp(key, "webcam_port")) {
+                } else if (!strcmp(key, "webcam_port")) {
                         nvalue = va_arg(ap, int);
                         yss->webcam_port = nvalue;
-                } else if(!strcmp(key, "webcam_description")) {
+                } else if (!strcmp(key, "webcam_description")) {
                         svalue = va_arg(ap, char *);
                         free(yss->webcam_description);
                         yss->webcam_description = strdup(svalue);
-                } else if(!strcmp(key, "local_host")) {
+                } else if (!strcmp(key, "local_host")) {
                         svalue = va_arg(ap, char *);
                         free(yss->local_host);
                         yss->local_host = strdup(svalue);
-                } else if(!strcmp(key, "conn_type")) {
+                } else if (!strcmp(key, "conn_type")) {
                         nvalue = va_arg(ap, int);
                         yss->conn_type = nvalue;
                 } else {
                         WARNING(("Unknown key passed to yahoo_init, "
-                                "perhaps you didn't terminate the list "
-                                "with NULL"));
+                                        "perhaps you didn't terminate the list "
+                                        "with NULL"));
                 }
         }
@@ -360 +324 @@
 static void yahoo_free_server_settings(struct yahoo_server_settings *yss)
 {
-        if(!yss)
+        if (!yss)
                 return;
 
@@ -372 +336 @@
 }
 
-static YList *conns=NULL;
-static YList *inputs=NULL;
-static int last_id=0;
+static YList *conns = NULL;
+static YList *inputs = NULL;
+static int last_id = 0;
 
 static void add_to_list(struct yahoo_data *yd)
@@ -380 +344 @@
         conns = y_list_prepend(conns, yd);
 }
-static struct yahoo_data * find_conn_by_id(int id)
+
+static struct yahoo_data *find_conn_by_id(int id)
 {
         YList *l;
-        for(l = conns; l; l = y_list_next(l)) {
+        for (l = conns; l; l = y_list_next(l)) {
                 struct yahoo_data *yd = l->data;
-                if(yd->client_id == id)
+                if (yd->client_id == id)
                         return yd;
         }
         return NULL;
 }
+
 static void del_from_list(struct yahoo_data *yd)
 {
@@ -396 +362 @@
 
 /* call repeatedly to get the next one */
+/*
 static struct yahoo_input_data * find_input_by_id(int id)
 {
@@ -406 +373 @@
         return NULL;
 }
-
-static struct yahoo_input_data * find_input_by_id_and_webcam_user(int id, const char * who)
+*/
+
+static struct yahoo_input_data *find_input_by_id_and_webcam_user(int id,
+        const char *who)
 {
         YList *l;
         LOG(("find_input_by_id_and_webcam_user"));
-        for(l = inputs; l; l = y_list_next(l)) {
+        for (l = inputs; l; l = y_list_next(l)) {
                 struct yahoo_input_data *yid = l->data;
-                if(yid->type == YAHOO_CONNECTION_WEBCAM && yid->yd->client_id == id 
-                                && yid->wcm && 
-                                ((who && yid->wcm->user && !strcmp(who, yid->wcm->user)) ||
-                                 !(yid->wcm->user && !who)))
+                if (yid->type == YAHOO_CONNECTION_WEBCAM
+                        && yid->yd->client_id == id && yid->wcm && ((who
+                                        && yid->wcm->user
+                                        && !strcmp(who, yid->wcm->user))
+                                || !(yid->wcm->user && !who)))
                         return yid;
         }
@@ -422 +392 @@
 }
 
-static struct yahoo_input_data * find_input_by_id_and_type(int id, enum yahoo_connection_type type)
+static struct yahoo_input_data *find_input_by_id_and_type(int id,
+        enum yahoo_connection_type type)
 {
         YList *l;
         LOG(("find_input_by_id_and_type"));
-        for(l = inputs; l; l = y_list_next(l)) {
+        for (l = inputs; l; l = y_list_next(l)) {
                 struct yahoo_input_data *yid = l->data;
-                if(yid->type == type && yid->yd->client_id == id)
+                if (yid->type == type && yid->yd->client_id == id)
                         return yid;
         }
@@ -434 +405 @@
 }
 
-static struct yahoo_input_data * find_input_by_id_and_fd(int id, int fd)
+static struct yahoo_input_data *find_input_by_id_and_fd(int id, void *fd)
 {
         YList *l;
         LOG(("find_input_by_id_and_fd"));
-        for(l = inputs; l; l = y_list_next(l)) {
+        for (l = inputs; l; l = y_list_next(l)) {
                 struct yahoo_input_data *yid = l->data;
-                if(yid->fd == fd && yid->yd->client_id == id)
+                if (yid->fd == fd && yid->yd->client_id == id)
                         return yid;
         }
@@ -448 +419 @@
 static int count_inputs_with_id(int id)
 {
-        int c=0;
+        int c = 0;
         YList *l;
         LOG(("counting %d", id));
-        for(l = inputs; l; l = y_list_next(l)) {
+        for (l = inputs; l; l = y_list_next(l)) {
                 struct yahoo_input_data *yid = l->data;
-                if(yid->yd->client_id == id)
+                if (yid->yd->client_id == id)
                         c++;
         }
@@ -460 +431 @@
 }
 
-
 extern char *yahoo_crypt(char *, char *);
 
 /* Free a buddy list */
-static void yahoo_free_buddies(YList * list)
+static void yahoo_free_buddies(YList *list)
 {
         YList *l;
 
-        for(l = list; l; l = l->next)
-        {
+        for (l = list; l; l = l->next) {
                 struct yahoo_buddy *bud = l->data;
-                if(!bud)
+                if (!bud)
                         continue;
 
@@ -477 +446 @@
                 FREE(bud->id);
                 FREE(bud->real_name);
-                if(bud->yab_entry) {
+                if (bud->yab_entry) {
                         FREE(bud->yab_entry->fname);
                         FREE(bud->yab_entry->lname);
@@ -496 +465 @@
 
 /* Free an identities list */
-static void yahoo_free_identities(YList * list)
+static void yahoo_free_identities(YList *list)
 {
         while (list) {
@@ -525 +494 @@
         FREE(yd->cookie_y);
         FREE(yd->cookie_t);
+        FREE(yd->cookie_b);
         FREE(yd->cookie_c);
         FREE(yd->login_cookie);
@@ -540 +510 @@
 #define YAHOO_PACKET_HDRLEN (4 + 2 + 2 + 2 + 2 + 4 + 4)
 
-static struct yahoo_packet *yahoo_packet_new(enum yahoo_service service, 
-                enum yahoo_status status, int id)
+static struct yahoo_packet *yahoo_packet_new(enum yahoo_service service,
+        enum ypacket_status status, int id)
 {
         struct yahoo_packet *pkt = y_new0(struct yahoo_packet, 1);
@@ -552 +522 @@
 }
 
-static void yahoo_packet_hash(struct yahoo_packet *pkt, int key, const char *value)
+static void yahoo_packet_hash(struct yahoo_packet *pkt, int key,
+        const char *value)
 {
         struct yahoo_pair *pair = y_new0(struct yahoo_pair, 1);
@@ -597 +568 @@
                          (((*((buf)+3))&0xff)))
 
-static void yahoo_packet_read(struct yahoo_packet *pkt, unsigned char *data, int len)
+static void yahoo_packet_read(struct yahoo_packet *pkt, unsigned char *data,
+        int len)
 {
         int pos = 0;
@@ -650 +622 @@
                         FREE(value);
                         pkt->hash = y_list_append(pkt->hash, pair);
-                        DEBUG_MSG(("Key: %d  \tValue: %s", pair->key, pair->value));
+                        DEBUG_MSG(("Key: %d  \tValue: %s", pair->key,
+                                        pair->value));
                 } else {
                         FREE(pair);
@@ -690 +663 @@
 }
 
-
 static void yahoo_packet_dump(unsigned char *data, int len)
 {
-        if(yahoo_get_log_level() >= YAHOO_LOG_DEBUG) {
+        if (yahoo_get_log_level() >= YAHOO_LOG_DEBUG) {
                 int i;
                 for (i = 0; i < len; i++) {
                         if ((i % 8 == 0) && i)
-                                YAHOO_CALLBACK(ext_yahoo_log)(" ");
+                                YAHOO_CALLBACK(ext_yahoo_log) (" ");
                         if ((i % 16 == 0) && i)
-                                YAHOO_CALLBACK(ext_yahoo_log)("\n");
-                        YAHOO_CALLBACK(ext_yahoo_log)("%02x ", data[i]);
-                }
-                YAHOO_CALLBACK(ext_yahoo_log)("\n");
+                                YAHOO_CALLBACK(ext_yahoo_log) ("\n");
+                        YAHOO_CALLBACK(ext_yahoo_log) ("%02x ", data[i]);
+                }
+                YAHOO_CALLBACK(ext_yahoo_log) ("\n");
                 for (i = 0; i < len; i++) {
                         if ((i % 8 == 0) && i)
-                                YAHOO_CALLBACK(ext_yahoo_log)(" ");
+                                YAHOO_CALLBACK(ext_yahoo_log) (" ");
                         if ((i % 16 == 0) && i)
-                                YAHOO_CALLBACK(ext_yahoo_log)("\n");
+                                YAHOO_CALLBACK(ext_yahoo_log) ("\n");
                         if (isprint(data[i]))
-                                YAHOO_CALLBACK(ext_yahoo_log)(" %c ", data[i]);
+                                YAHOO_CALLBACK(ext_yahoo_log) (" %c ", data[i]);
                         else
-                                YAHOO_CALLBACK(ext_yahoo_log)(" . ");
-                }
-                YAHOO_CALLBACK(ext_yahoo_log)("\n");
+                                YAHOO_CALLBACK(ext_yahoo_log) (" . ");
+                }
+                YAHOO_CALLBACK(ext_yahoo_log) ("\n");
         }
 }
@@ -723 +695 @@
 }
 
-static void yahoo_add_to_send_queue(struct yahoo_input_data *yid, void *data, int length)
+static void yahoo_add_to_send_queue(struct yahoo_input_data *yid, void *data,
+        int length)
 {
         struct data_queue *tx = y_new0(struct data_queue, 1);
@@ -732 +705 @@
         yid->txqueues = y_list_append(yid->txqueues, tx);
 
-        if(!yid->write_tag)
-                yid->write_tag=YAHOO_CALLBACK(ext_yahoo_add_handler)(yid->yd->client_id, yid->fd, YAHOO_INPUT_WRITE, yid);
-}
-
-static void yahoo_send_packet(struct yahoo_input_data *yid, struct yahoo_packet *pkt, int extra_pad)
+        if (!yid->write_tag)
+                yid->write_tag =
+                        YAHOO_CALLBACK(ext_yahoo_add_handler) (yid->yd->
+                        client_id, yid->fd, YAHOO_INPUT_WRITE, yid);
+}
+
+static void yahoo_send_packet(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt, int extra_pad)
 {
         int pktlen = yahoo_packet_length(pkt);
         int len = YAHOO_PACKET_HDRLEN + pktlen;
-
         unsigned char *data;
         int pos = 0;
@@ -749 +724 @@
         data = y_new0(unsigned char, len + 1);
 
-        memcpy(data + pos, "YMSG", 4); pos += 4;
-        pos += yahoo_put16(data + pos, YAHOO_PROTO_VER);
-        pos += yahoo_put16(data + pos, 0x0000);
-        pos += yahoo_put16(data + pos, pktlen + extra_pad);
-        pos += yahoo_put16(data + pos, pkt->service);
-        pos += yahoo_put32(data + pos, pkt->status);
-        pos += yahoo_put32(data + pos, pkt->id);
+        memcpy(data + pos, "YMSG", 4);
+        pos += 4;
+        pos += yahoo_put16(data + pos, YAHOO_PROTO_VER);        /* version [latest 12 0x000c] */
+        pos += yahoo_put16(data + pos, 0x0000); /* HIWORD pkt length??? */
+        pos += yahoo_put16(data + pos, pktlen + extra_pad);     /* LOWORD pkt length? */
+        pos += yahoo_put16(data + pos, pkt->service);   /* service */
+        pos += yahoo_put32(data + pos, pkt->status);    /* status [4bytes] */
+        pos += yahoo_put32(data + pos, pkt->id);        /* session [4bytes] */
 
         yahoo_packet_write(pkt, data + pos);
 
         yahoo_packet_dump(data, len);
-        
-        if( yid->type == YAHOO_CONNECTION_FT )
+
+        if (yid->type == YAHOO_CONNECTION_FT)
                 yahoo_send_data(yid->fd, data, len);
         else
@@ -782 +758 @@
 }
 
-static int yahoo_send_data(int fd, void *data, int len)
+static int yahoo_send_data(void *fd, void *data, int len)
 {
         int ret;
         int e;
 
-        if (fd < 0)
+        if (fd == NULL)
                 return -1;
 
@@ -793 +769 @@
 
         do {
-                ret = write(fd, data, len);
-        } while(ret == -1 && errno==EINTR);
-        e=errno;
-
-        if (ret == -1)  {
+                ret = YAHOO_CALLBACK(ext_yahoo_write) (fd, data, len);
+        } while (ret == -1 && errno == EINTR);
+        e = errno;
+
+        if (ret == -1) {
                 LOG(("wrote data: ERR %s", strerror(errno)));
         } else {
@@ -803 +779 @@
         }
 
-        errno=e;
+        errno = e;
         return ret;
 }
 
-void yahoo_close(int id) 
+void yahoo_close(int id)
 {
         struct yahoo_data *yd = find_conn_by_id(id);
-        
-        if(!yd)
+        if (!yd)
                 return;
 
@@ -817 +792 @@
 
         yahoo_free_data(yd);
-        if(id == last_id)
+        if (id == last_id)
                 last_id--;
 }
 
-static void yahoo_input_close(struct yahoo_input_data *yid) 
+static void yahoo_input_close(struct yahoo_input_data *yid)
 {
         inputs = y_list_remove(inputs, yid);
 
-        LOG(("yahoo_input_close(read)")); 
-        YAHOO_CALLBACK(ext_yahoo_remove_handler)(yid->yd->client_id, yid->read_tag);
-        LOG(("yahoo_input_close(write)")); 
-        YAHOO_CALLBACK(ext_yahoo_remove_handler)(yid->yd->client_id, yid->write_tag);
+        LOG(("yahoo_input_close(read)"));
+        YAHOO_CALLBACK(ext_yahoo_remove_handler) (yid->yd->client_id,
+                yid->read_tag);
+        LOG(("yahoo_input_close(write)"));
+        YAHOO_CALLBACK(ext_yahoo_remove_handler) (yid->yd->client_id,
+                yid->write_tag);
         yid->read_tag = yid->write_tag = 0;
-        if(yid->fd)
-                close(yid->fd);
+        if (yid->fd)
+                YAHOO_CALLBACK(ext_yahoo_close) (yid->fd);
         yid->fd = 0;
         FREE(yid->rxqueue);
-        if(count_inputs_with_id(yid->yd->client_id) == 0) {
+        if (count_inputs_with_id(yid->yd->client_id) == 0) {
                 LOG(("closing %d", yid->yd->client_id));
                 yahoo_close(yid->yd->client_id);
         }
         yahoo_free_webcam(yid->wcm);
-        if(yid->wcd)
+        if (yid->wcd)
                 FREE(yid->wcd);
-        if(yid->ys) {
+        if (yid->ys) {
                 FREE(yid->ys->lsearch_text);
                 FREE(yid->ys);
@@ -848 +825 @@
 }
 
-static int is_same_bud(const void * a, const void * b) {
+static int is_same_bud(const void *a, const void *b)
+{
         const struct yahoo_buddy *subject = a;
         const struct yahoo_buddy *object = b;
@@ -855 +833 @@
 }
 
-static char * getcookie(char *rawcookie)
-{
-        char * cookie=NULL;
-        char * tmpcookie; 
-        char * cookieend;
-
-        if (strlen(rawcookie) < 2) 
+static char *getcookie(char *rawcookie)
+{
+        char *cookie = NULL;
+        char *tmpcookie;
+        char *cookieend;
+
+        if (strlen(rawcookie) < 2)
                 return NULL;
 
-        tmpcookie = strdup(rawcookie+2);
+        tmpcookie = strdup(rawcookie + 2);
         cookieend = strchr(tmpcookie, ';');
 
-        if(cookieend)
+        if (cookieend)
                 *cookieend = '\0';
 
@@ -877 +855 @@
 }
 
-static char * getlcookie(char *cookie)
+static char *getlcookie(char *cookie)
 {
         char *tmp;
@@ -884 +862 @@
 
         tmpend = strstr(cookie, "n=");
-        if(tmpend) {
-                tmp = strdup(tmpend+2);
+        if (tmpend) {
+                tmp = strdup(tmpend + 2);
                 tmpend = strchr(tmp, '&');
-                if(tmpend)
-                        *tmpend='\0';
+                if (tmpend)
+                        *tmpend = '\0';
                 login_cookie = strdup(tmp);
                 FREE(tmp);
@@ -896 +874 @@
 }
 
-static void yahoo_process_notify(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+static void yahoo_process_notify(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
@@ -927 +906 @@
         if (!msg)
                 return;
-        
-        if (!strncasecmp(msg, "TYPING", strlen("TYPING"))) 
-                YAHOO_CALLBACK(ext_yahoo_typing_notify)(yd->client_id, to, from, stat);
-        else if (!strncasecmp(msg, "GAME", strlen("GAME"))) 
-                YAHOO_CALLBACK(ext_yahoo_game_notify)(yd->client_id, to, from, stat);
-        else if (!strncasecmp(msg, "WEBCAMINVITE", strlen("WEBCAMINVITE"))) 
-        {
+
+        if (!strncasecmp(msg, "TYPING", strlen("TYPING")))
+                YAHOO_CALLBACK(ext_yahoo_typing_notify) (yd->client_id, to,
+                        from, stat);
+        else if (!strncasecmp(msg, "GAME", strlen("GAME")))
+                YAHOO_CALLBACK(ext_yahoo_game_notify) (yd->client_id, to, from,
+                        stat, ind);
+        else if (!strncasecmp(msg, "WEBCAMINVITE", strlen("WEBCAMINVITE"))) {
                 if (!strcmp(ind, " ")) {
-                        YAHOO_CALLBACK(ext_yahoo_webcam_invite)(yd->client_id, to, from);
+                        YAHOO_CALLBACK(ext_yahoo_webcam_invite) (yd->client_id,
+                                to, from);
                 } else {
                         accept = atoi(ind);
@@ -941 +922 @@
                         if (accept < 0)
                                 accept = 0;
-                        YAHOO_CALLBACK(ext_yahoo_webcam_invite_reply)(yd->client_id, to, from, accept);
-                }
-        }
-        else
+                        YAHOO_CALLBACK(ext_yahoo_webcam_invite_reply) (yd->
+                                client_id, to, from, accept);
+                }
+        } else
                 LOG(("Got unknown notification: %s", msg));
 }
 
-static void yahoo_process_filetransfer(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
-{
-        struct yahoo_data *yd = yid->yd;
-        char *from=NULL;
-        char *to=NULL;
-        char *msg=NULL;
-        char *url=NULL;
-        long expires=0;
-
-        char *service=NULL;
-
-        char *filename=NULL;
-        unsigned long filesize=0L;
-
-        YList *l;
-        for (l = pkt->hash; l; l = l->next) {
-                struct yahoo_pair *pair = l->data;
-                if (pair->key == 4)
-                        from = pair->value;
-                if (pair->key == 5)
-                        to = pair->value;
-                if (pair->key == 14)
-                        msg = pair->value;
-                if (pair->key == 20)
-                        url = pair->value;
-                if (pair->key == 38)
-                        expires = atol(pair->value);
-
-                if (pair->key == 27)
-                        filename = pair->value;
-                if (pair->key == 28)
-                        filesize = atol(pair->value);
-
-                if (pair->key == 49)
-                        service = pair->value;
-        }
-
-        if(pkt->service == YAHOO_SERVICE_P2PFILEXFER) {
-                if(strcmp("FILEXFER", service) != 0) {
-                        WARNING(("unhandled service 0x%02x", pkt->service));
-                        yahoo_dump_unhandled(pkt);
-                        return;
-                }
-        }
-
-        if(msg) {
-                char *tmp;
-                tmp = strchr(msg, '\006');
-                if(tmp)
-                        *tmp = '\0';
-        }
-        if(url && from)
-                YAHOO_CALLBACK(ext_yahoo_got_file)(yd->client_id, to, from, url, expires, msg, filename, filesize);
-
-}
-
-static void yahoo_process_conference(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+static void yahoo_process_conference(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
@@ -1012 +938 @@
         char *room = NULL;
         char *id = NULL;
-        int  utf8 = 0;
+        int utf8 = 0;
         YList *members = NULL;
         YList *l;
-        
+
         for (l = pkt->hash; l; l = l->next) {
                 struct yahoo_pair *pair = l->data;
                 if (pair->key == 50)
                         host = pair->value;
-                
-                if (pair->key == 52) {          /* invite */
+
+                if (pair->key == 52) {  /* invite */
                         members = y_list_append(members, strdup(pair->value));
                 }
-                if (pair->key == 53)            /* logon */
+                if (pair->key == 53)    /* logon */
                         who = pair->value;
-                if (pair->key == 54)            /* decline */
+                if (pair->key == 54)    /* decline */
                         who = pair->value;
-                if (pair->key == 55)            /* unavailable (status == 2) */
+                if (pair->key == 55)    /* unavailable (status == 2) */
                         who = pair->value;
-                if (pair->key == 56)            /* logoff */
+                if (pair->key == 56)    /* logoff */
                         who = pair->value;
 
@@ -1036 +962 @@
                         room = pair->value;
 
-                if (pair->key == 58)            /* join message */
+                if (pair->key == 58)    /* join message */
                         msg = pair->value;
-                if (pair->key == 14)            /* decline/conf message */
+                if (pair->key == 14)    /* decline/conf message */
                         msg = pair->value;
 
-                if (pair->key == 13)
-                        ;
-                if (pair->key == 16)            /* error */
+                if (pair->key == 13) ;
+                if (pair->key == 16)    /* error */
                         msg = pair->value;
 
-                if (pair->key == 1)             /* my id */
+                if (pair->key == 1)     /* my id */
                         id = pair->value;
-                if (pair->key == 3)             /* message sender */
+                if (pair->key == 3)     /* message sender */
                         who = pair->value;
 
@@ -1055 +980 @@
         }
 
-        if(!room)
-                return;
-
-        if(host) {
-                for(l = members; l; l = l->next) {
-                        char * w = l->data;
-                        if(!strcmp(w, host))
+        if (!room)
+                return;
+
+        if (host) {
+                for (l = members; l; l = l->next) {
+                        char *w = l->data;
+                        if (!strcmp(w, host))
                                 break;
                 }
-                if(!l)
+                if (!l)
                         members = y_list_append(members, strdup(host));
         }
         /* invite, decline, join, left, message -> status == 1 */
 
-        switch(pkt->service) {
+        switch (pkt->service) {
         case YAHOO_SERVICE_CONFINVITE:
-                if(pkt->status == 2)
-                        ;
-                else if(members)
-                        YAHOO_CALLBACK(ext_yahoo_got_conf_invite)(yd->client_id, id, host, room, msg, members);
-                else if(msg)
-                        YAHOO_CALLBACK(ext_yahoo_error)(yd->client_id, msg, 0, E_CONFNOTAVAIL);
+                if (pkt->status == 2) ;
+                else if (members)
+                        YAHOO_CALLBACK(ext_yahoo_got_conf_invite) (yd->
+                                client_id, id, host, room, msg, members);
+                else if (msg)
+                        YAHOO_CALLBACK(ext_yahoo_error) (yd->client_id, msg, 0,
+                                E_CONFNOTAVAIL);
                 break;
         case YAHOO_SERVICE_CONFADDINVITE:
-                if(pkt->status == 2)
-                        ;
-                else
-                        YAHOO_CALLBACK(ext_yahoo_got_conf_invite)(yd->client_id, id, host, room, msg, members);
+                if (pkt->status == 1)
+                        YAHOO_CALLBACK(ext_yahoo_got_conf_invite) (yd->
+                                client_id, id, host, room, msg, members);
                 break;
         case YAHOO_SERVICE_CONFDECLINE:
-                if(who)
-                        YAHOO_CALLBACK(ext_yahoo_conf_userdecline)(yd->client_id, id, who, room, msg);
+                if (who)
+                        YAHOO_CALLBACK(ext_yahoo_conf_userdecline) (yd->
+                                client_id, id, who, room, msg);
                 break;
         case YAHOO_SERVICE_CONFLOGON:
-                if(who)
-                        YAHOO_CALLBACK(ext_yahoo_conf_userjoin)(yd->client_id, id, who, room);
+                if (who)
+                        YAHOO_CALLBACK(ext_yahoo_conf_userjoin) (yd->client_id,
+                                id, who, room);
                 break;
         case YAHOO_SERVICE_CONFLOGOFF:
-                if(who)
-                        YAHOO_CALLBACK(ext_yahoo_conf_userleave)(yd->client_id, id, who, room);
+                if (who)
+                        YAHOO_CALLBACK(ext_yahoo_conf_userleave) (yd->client_id,
+                                id, who, room);
                 break;
         case YAHOO_SERVICE_CONFMSG:
-                if(who)
-                        YAHOO_CALLBACK(ext_yahoo_conf_message)(yd->client_id, id, who, room, msg, utf8);
+                if (who)
+                        YAHOO_CALLBACK(ext_yahoo_conf_message) (yd->client_id,
+                                id, who, room, msg, utf8);
                 break;
         }
 }
 
-static void yahoo_process_chat(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+static void yahoo_process_chat(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         char *msg = NULL;
@@ -1112 +1042 @@
         YList *members = NULL;
         struct yahoo_chat_member *currentmember = NULL;
-        int  msgtype = 1;
-        int  utf8 = 0;
-        int  firstjoin = 0;
-        int  membercount = 0;
-        int  chaterr=0;
+        int msgtype = 1;
+        int utf8 = 0;
+        int firstjoin = 0;
+        int membercount = 0;
+        int chaterr = 0;
         YList *l;
-        
+
         yahoo_dump_unhandled(pkt);
         for (l = pkt->hash; l; l = l->next) {
@@ -1148 +1078 @@
 
                         if (pkt->service == YAHOO_SERVICE_CHATJOIN) {
-                                currentmember = y_new0(struct yahoo_chat_member, 1);
+                                currentmember =
+                                        y_new0(struct yahoo_chat_member, 1);
                                 currentmember->id = strdup(pair->value);
                                 members = y_list_append(members, currentmember);
@@ -1178 +1109 @@
                 }
 
-
                 if (pair->key == 130) {
                         /* first join */
@@ -1196 +1126 @@
                         /* message error not sure what all the pair values mean */
                         /* but -1 means no session in room */
-                        chaterr= atoi(pair->value);
-                }
-        }
-
-        if(!room) {
-                if (pkt->service == YAHOO_SERVICE_CHATLOGOUT) { /* yahoo originated chat logout */
-                        YAHOO_CALLBACK(ext_yahoo_chat_yahoologout)(yid->yd->client_id, id);
-                        return ;
-                }
-                if (pkt->service == YAHOO_SERVICE_COMMENT && chaterr)  {
-                        YAHOO_CALLBACK(ext_yahoo_chat_yahooerror)(yid->yd->client_id, id);
+                        chaterr = atoi(pair->value);
+                }
+        }
+
+        if (!room) {
+                if (pkt->service == YAHOO_SERVICE_CHATLOGOUT) { /* yahoo originated chat logout */
+                        YAHOO_CALLBACK(ext_yahoo_chat_yahoologout) (yid->yd->
+                                client_id, id);
                         return;
                 }
+                if (pkt->service == YAHOO_SERVICE_COMMENT && chaterr) {
+                        YAHOO_CALLBACK(ext_yahoo_chat_yahooerror) (yid->yd->
+                                client_id, id);
+                        return;
+                }
 
                 WARNING(("We didn't get a room name, ignoring packet"));
@@ -1214 +1146 @@
         }
 
-        switch(pkt->service) {
+        switch (pkt->service) {
         case YAHOO_SERVICE_CHATJOIN:
-                if(y_list_length(members) != membercount) {
+                if (y_list_length(members) != membercount) {
                         WARNING(("Count of members doesn't match No. of members we got"));
                 }
-                if(firstjoin && members) {
-                        YAHOO_CALLBACK(ext_yahoo_chat_join)(yid->yd->client_id, id, room, topic, members, yid->fd);
-                } else if(who) {
-                        if(y_list_length(members) != 1) {
+                if (firstjoin && members) {
+                        YAHOO_CALLBACK(ext_yahoo_chat_join) (yid->yd->client_id,
+                                id, room, topic, members, yid->fd);
+                } else if (who) {
+                        if (y_list_length(members) != 1) {
                                 WARNING(("Got more than 1 member on a normal join"));
                         }
                         /* this should only ever have one, but just in case */
-                        while(members) {
+                        while (members) {
                                 YList *n = members->next;
                                 currentmember = members->data;
-                                YAHOO_CALLBACK(ext_yahoo_chat_userjoin)(yid->yd->client_id, id, room, currentmember);
+                                YAHOO_CALLBACK(ext_yahoo_chat_userjoin) (yid->
+                                        yd->client_id, id, room, currentmember);
                                 y_list_free_1(members);
-                                members=n;
+                                members = n;
                         }
                 }
                 break;
         case YAHOO_SERVICE_CHATEXIT:
-                if(who) {
-                        YAHOO_CALLBACK(ext_yahoo_chat_userleave)(yid->yd->client_id, id, room, who);
+                if (who) {
+                        YAHOO_CALLBACK(ext_yahoo_chat_userleave) (yid->yd->
+                                client_id, id, room, who);
                 }
                 break;
         case YAHOO_SERVICE_COMMENT:
-                if(who) {
-                        YAHOO_CALLBACK(ext_yahoo_chat_message)(yid->yd->client_id, id, who, room, msg, msgtype, utf8);
+                if (who) {
+                        YAHOO_CALLBACK(ext_yahoo_chat_message) (yid->yd->
+                                client_id, id, who, room, msg, msgtype, utf8);
                 }
                 break;
@@ -1248 +1184 @@
 }
 
-static void yahoo_process_message(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+static void yahoo_process_message(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
         YList *l;
-        YList * messages = NULL;
+        YList *messages = NULL;
 
         struct m {
-                int  i_31;
-                int  i_32;
+                int i_31;
+                int i_32;
                 char *to;
                 char *from;
                 long tm;
                 char *msg;
-                int  utf8;
+                int utf8;
+                char *gunk;
         } *message = y_new0(struct m, 1);
 
         for (l = pkt->hash; l; l = l->next) {
                 struct yahoo_pair *pair = l->data;
-                if (pair->key == 1 || pair->key == 4)
-                {
-                        if(!message->from)
+                if (pair->key == 1 || pair->key == 4) {
+                        if (!message->from)
                                 message->from = pair->value;
-                }
-                else if (pair->key == 5)
+                } else if (pair->key == 5)
                         message->to = pair->value;
                 else if (pair->key == 15)
@@ -1277 +1213 @@
                 else if (pair->key == 97)
                         message->utf8 = atoi(pair->value);
-                        /* user message */  /* sys message */
+                /* This comes when the official client sends us a message */
+                else if (pair->key == 429)
+                        message->gunk = pair->value;
+                /* user message *//* sys message */
                 else if (pair->key == 14 || pair->key == 16)
                         message->msg = pair->value;
                 else if (pair->key == 31) {
-                        if(message->i_31) {
+                        if (message->i_31) {
                                 messages = y_list_append(messages, message);
                                 message = y_new0(struct m, 1);
                         }
                         message->i_31 = atoi(pair->value);
-                }
-                else if (pair->key == 32)
+                } else if (pair->key == 32)
                         message->i_32 = atoi(pair->value);
                 else
-                        LOG(("yahoo_process_message: status: %d, key: %d, value: %s",
-                                        pkt->status, pair->key, pair->value));
+                        LOG(("yahoo_process_message: status: %d, key: %d, value: %s", pkt->status, pair->key, pair->value));
         }
 
         messages = y_list_append(messages, message);
 
-        for (l = messages; l; l=l->next) {
+        for (l = messages; l; l = l->next) {
                 message = l->data;
                 if (pkt->service == YAHOO_SERVICE_SYSMESSAGE) {
-                        YAHOO_CALLBACK(ext_yahoo_system_message)(yd->client_id, message->msg);
+                        YAHOO_CALLBACK(ext_yahoo_system_message) (yd->client_id,
+                                message->to, message->from, message->msg);
                 } else if (pkt->status <= 2 || pkt->status == 5) {
-                        YAHOO_CALLBACK(ext_yahoo_got_im)(yd->client_id, message->to, message->from, message->msg, message->tm, pkt->status, message->utf8);
+                        /* Confirm message receipt if we got the gunk */
+                        if(message->gunk) {
+                                struct yahoo_packet *outpkt;
+                        
+                                outpkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE_CONFIRM,
+                                        YPACKET_STATUS_DEFAULT, 0);
+                                yahoo_packet_hash(outpkt, 1, yd->user);
+                                yahoo_packet_hash(outpkt, 5, message->from);
+                                yahoo_packet_hash(outpkt, 302, "430");
+                                yahoo_packet_hash(outpkt, 430, message->gunk);
+                                yahoo_packet_hash(outpkt, 303, "430");
+                                yahoo_packet_hash(outpkt, 450, "0");
+                                yahoo_send_packet(yid, outpkt, 0);
+                        
+                                yahoo_packet_free(outpkt);
+                        }
+
+                        if (!strcmp(message->msg, "<ding>"))
+                                YAHOO_CALLBACK(ext_yahoo_got_buzz) (yd->client_id,
+                                        message->to, message->from, message->tm);
+                        else
+                                YAHOO_CALLBACK(ext_yahoo_got_im) (yd->client_id,
+                                        message->to, message->from, message->msg,
+                                        message->tm, pkt->status, message->utf8);
                 } else if (pkt->status == 0xffffffff) {
-                        YAHOO_CALLBACK(ext_yahoo_error)(yd->client_id, message->msg, 0, E_SYSTEM);
-                }
-                free(message);
+                        YAHOO_CALLBACK(ext_yahoo_error) (yd->client_id,
+                                message->msg, 0, E_SYSTEM);
+                }
+                FREE(message);
         }
 
@@ -1311 +1273 @@
 }
 
+/*
+ * Here's what multi-level packets look like. Data in brackets is the value.
+ *
+ * 3 level:
+ * =======
+ * 
+ * 302 (318) - Beginning level 1
+ *      300 (318) - Begin level 2
+ *      302 (319) - End level 2 header
+ *              300 (319) - Begin level 3
+ *              301 (319) - End level 3
+ *      303 (319) - End level 2
+ * 303 (318) - End level 1
+ *
+ * 2 level:
+ * =======
+ *
+ * 302 (315) - Beginning level 1
+ *      300 (315) - Begin level 2
+ *      301 (315) - End level 2
+ * 303 (315) - End level 1
+ *
+ */
 static void yahoo_process_status(struct yahoo_input_data *yid,
         struct yahoo_packet *pkt)
@@ -1327 +1312 @@
         }
 
-        /* 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). */
+        /* 
+         * 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;
 
@@ -1594 +1581 @@
 }
 
-static void yahoo_process_verify(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+static void yahoo_process_verify(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
 
-        if(pkt->status != 0x01) {
+        if (pkt->status != 0x01) {
                 DEBUG_MSG(("expected status: 0x01, got: %d", pkt->status));
-                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, YAHOO_LOGIN_LOCK, "");
-                return;
-        }
-
-        pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH, YAHOO_STATUS_AVAILABLE, yd->session_id);
+                YAHOO_CALLBACK(ext_yahoo_login_response) (yd->client_id,
+                        YAHOO_LOGIN_LOCK, "");
+                return;
+        }
+
+        pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH, YPACKET_STATUS_DEFAULT,
+                yd->session_id);
 
         yahoo_packet_hash(pkt, 1, yd->user);
@@ -1613 +1603 @@
 }
 
-static void yahoo_process_picture_checksum( struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+static void yahoo_process_picture_checksum(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
@@ -1621 +1612 @@
         YList *l;
 
-        for(l = pkt->hash; l; l = l->next)
-        {
+        for (l = pkt->hash; l; l = l->next) {
                 struct yahoo_pair *pair = l->data;
 
-                switch(pair->key)
-                {
-                        case 1:
-                        case 4:
-                                from = pair->value;
-                        case 5:
-                                to = pair->value;
-                                break;
-                        case 212:
-                                break;
-                        case 192:
-                                checksum = atoi( pair->value );
-                                break;
-                }
-        }
-
-        YAHOO_CALLBACK(ext_yahoo_got_buddyicon_checksum)(yd->client_id,to,from,checksum);
-}
-
-static void yahoo_process_picture(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+                switch (pair->key) {
+                case 1:
+                case 4:
+                        from = pair->value;
+                case 5:
+                        to = pair->value;
+                        break;
+                case 212:
+                        break;
+                case 192:
+                        checksum = atoi(pair->value);
+                        break;
+                }
+        }
+
+        YAHOO_CALLBACK(ext_yahoo_got_buddyicon_checksum) (yd->client_id, to,
+                from, checksum);
+}
+
+static void yahoo_process_picture(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
@@ -1653 +1644 @@
         int checksum = 0;
         YList *l;
-        
-        for(l = pkt->hash; l; l = l->next)
-        {
+
+        for (l = pkt->hash; l; l = l->next) {
                 struct yahoo_pair *pair = l->data;
 
-                switch(pair->key)
-                {
+                switch (pair->key) {
                 case 1:
-                case 4:         /* sender */
+                case 4: /* sender */
                         from = pair->value;
                         break;
-                case 5:         /* we */
+                case 5: /* we */
                         to = pair->value;
                         break;
-                case 13:                /* request / sending */
-                        status = atoi( pair->value );
-                        break;
-                case 20:                /* url */
+                case 13:        /* request / sending */
+                        status = atoi(pair->value);
+                        break;
+                case 20:        /* url */
                         url = pair->value;
                         break;
                 case 192:       /*checksum */
-                        checksum = atoi( pair->value );
-                        break;
-                }
-        }
-
-        switch( status )
-        {
-                case 1: /* this is a request, ignore for now */
-                        YAHOO_CALLBACK(ext_yahoo_got_buddyicon_request)(yd->client_id, to, from);
-                        break;
-                case 2: /* this is cool - we get a picture :) */
-                        YAHOO_CALLBACK(ext_yahoo_got_buddyicon)(yd->client_id,to, from, url, checksum);
-                        break;
-        }
-}
-
-static void yahoo_process_picture_upload(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+                        checksum = atoi(pair->value);
+                        break;
+                }
+        }
+
+        switch (status) {
+        case 1:         /* this is a request, ignore for now */
+                YAHOO_CALLBACK(ext_yahoo_got_buddyicon_request) (yd->client_id,
+                        to, from);
+                break;
+        case 2:         /* this is cool - we get a picture :) */
+                YAHOO_CALLBACK(ext_yahoo_got_buddyicon) (yd->client_id, to,
+                        from, url, checksum);
+                break;
+        }
+}
+
+static void yahoo_process_picture_upload(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
@@ -1696 +1687 @@
         char *url = NULL;
 
-        if ( pkt->status != 1 )
+        if (pkt->status != 1)
                 return;         /* something went wrong */
-        
-        for(l = pkt->hash; l; l = l->next)
-        {
+
+        for (l = pkt->hash; l; l = l->next) {
                 struct yahoo_pair *pair = l->data;
 
-                switch(pair->key)
-                {
-                        case 5:         /* we */
-                                break;
-                        case 20:                /* url */
-                                url = pair->value;
-                                break;
-                        case 27:                /* local filename */
-                                break;
-                        case 38:                /* time */
-                                break;
-                }
-        }
-
-        YAHOO_CALLBACK(ext_yahoo_buddyicon_uploaded)(yd->client_id, url);
-}
-
-static void yahoo_process_auth_pre_0x0b(struct yahoo_input_data *yid, 
-                const char *seed, const char *sn)
-{
-        struct yahoo_data *yd = yid->yd;
-        
-        /* So, Yahoo has stopped supporting its older clients in India, and 
-         * undoubtedly will soon do so in the rest of the world.
-         * 
-         * The new clients use this authentication method.  I warn you in 
-         * advance, it's bizzare, convoluted, inordinately complicated.  
-         * It's also no more secure than crypt() was.  The only purpose this 
-         * scheme could serve is to prevent third part clients from connecting 
-         * to their servers.
-         *
-         * Sorry, Yahoo.
+                switch (pair->key) {
+                case 5: /* we */
+                        break;
+                case 20:        /* url */
+                        url = pair->value;
+                        break;
+                case 27:        /* local filename */
+                        break;
+                case 38:        /* time */
+                        break;
+                }
+        }
+
+        YAHOO_CALLBACK(ext_yahoo_buddyicon_uploaded) (yd->client_id, url);
+}
+
+void yahoo_login(int id, int initial)
+{
+        struct yahoo_data *yd = find_conn_by_id(id);
+        struct connect_callback_data *ccd;
+        struct yahoo_server_settings *yss;
+        int tag;
+
+        char *host;
+
+        struct yahoo_input_data *yid = y_new0(struct yahoo_input_data, 1);
+        yid->yd = yd;
+        yid->type = YAHOO_CONNECTION_PAGER;
+        inputs = y_list_prepend(inputs, yid);
+
+        yd->initial_status = initial;
+        yss = yd->server_settings;
+
+        ccd = y_new0(struct connect_callback_data, 1);
+        ccd->yd = yd;
+
+        host = yss->pager_host;
+
+        if (!host)
+                host = yss->pager_host_list[0];
+
+        tag = YAHOO_CALLBACK(ext_yahoo_connect_async) (yd->client_id,
+                host, yss->pager_port, yahoo_connected, ccd, 0);
+
+        /*
+         * if tag <= 0, then callback has already been called
+         * so ccd will have been freed
          */
-
-        struct yahoo_packet *pack;
-        
-        md5_byte_t result[16];
-        md5_state_t ctx;
-        char *crypt_result;
-        unsigned char *password_hash = malloc(25);
-        unsigned char *crypt_hash = malloc(25);
-        unsigned char *hash_string_p = malloc(50 + strlen(sn));
-        unsigned char *hash_string_c = malloc(50 + strlen(sn));
-        
-        char checksum;
-        
-        int sv;
-        
-        unsigned char *result6 = malloc(25);
-        unsigned char *result96 = malloc(25);
-
-        sv = seed[15];
-        sv = (sv % 8) % 5;
-
-        md5_init(&ctx);
-        md5_append(&ctx, (md5_byte_t *)yd->password, strlen(yd->password));
-        md5_finish(&ctx, result);
-        to_y64(password_hash, result, 16);
-        
-        md5_init(&ctx);
-        crypt_result = yahoo_crypt(yd->password, "$1$_2S43d5f$");  
-        md5_append(&ctx, (md5_byte_t *)crypt_result, strlen(crypt_result));
-        md5_finish(&ctx, result);
-        to_y64(crypt_hash, result, 16);
-        free(crypt_result);
-
-        switch (sv) {
-        case 0:
-                checksum = seed[seed[7] % 16];
-                snprintf((char *)hash_string_p, strlen(sn) + 50,
-                        "%c%s%s%s", checksum, password_hash, yd->user, seed);
-                snprintf((char *)hash_string_c, strlen(sn) + 50,
-                        "%c%s%s%s", checksum, crypt_hash, yd->user, seed);
-                break;
-        case 1:
-                checksum = seed[seed[9] % 16];
-                snprintf((char *)hash_string_p, strlen(sn) + 50,
-                        "%c%s%s%s", checksum, yd->user, seed, password_hash);
-                snprintf((char *)hash_string_c, strlen(sn) + 50,
-                        "%c%s%s%s", checksum, yd->user, seed, crypt_hash);
-                break;
-        case 2:
-                checksum = seed[seed[15] % 16];
-                snprintf((char *)hash_string_p, strlen(sn) + 50,
-                        "%c%s%s%s", checksum, seed, password_hash, yd->user);
-                snprintf((char *)hash_string_c, strlen(sn) + 50,
-                        "%c%s%s%s", checksum, seed, crypt_hash, yd->user);
-                break;
-        case 3:
-                checksum = seed[seed[1] % 16];
-                snprintf((char *)hash_string_p, strlen(sn) + 50,
-                        "%c%s%s%s", checksum, yd->user, password_hash, seed);
-                snprintf((char *)hash_string_c, strlen(sn) + 50,
-                        "%c%s%s%s", checksum, yd->user, crypt_hash, seed);
-                break;
-        case 4:
-                checksum = seed[seed[3] % 16];
-                snprintf((char *)hash_string_p, strlen(sn) + 50,
-                        "%c%s%s%s", checksum, password_hash, seed, yd->user);
-                snprintf((char *)hash_string_c, strlen(sn) + 50,
-                        "%c%s%s%s", checksum, crypt_hash, seed, yd->user);
-                break;
-        }
-                
-        md5_init(&ctx);  
-        md5_append(&ctx, (md5_byte_t *)hash_string_p, strlen((char *)hash_string_p));
-        md5_finish(&ctx, result);
-        to_y64(result6, result, 16);
-
-        md5_init(&ctx);  
-        md5_append(&ctx, (md5_byte_t *)hash_string_c, strlen((char *)hash_string_c));
-        md5_finish(&ctx, result);
-        to_y64(result96, result, 16);
-
-        pack = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, yd->initial_status, yd->session_id);
-        yahoo_packet_hash(pack, 0, yd->user);
-        yahoo_packet_hash(pack, 6, (char *)result6);
-        yahoo_packet_hash(pack, 96, (char *)result96);
-        yahoo_packet_hash(pack, 1, yd->user);
-                
-        yahoo_send_packet(yid, pack, 0);
-                
-        FREE(result6);
-        FREE(result96);
-        FREE(password_hash);
-        FREE(crypt_hash);
-        FREE(hash_string_p);
-        FREE(hash_string_c);
-
-        yahoo_packet_free(pack);
-
-}
-
-/*
- * New auth protocol cracked by Cerulean Studios and sent in to Gaim
- */
-static void yahoo_process_auth_0x0b(struct yahoo_input_data *yid, const char *seed, const char *sn)
-{
-        struct yahoo_packet *pack = NULL;
-        struct yahoo_data *yd = yid->yd;
-
-        md5_byte_t         result[16];
-        md5_state_t        ctx;
-
-        sha1_state_t       ctx1;
-        sha1_state_t       ctx2;
-
-        char *alphabet1 = "FBZDWAGHrJTLMNOPpRSKUVEXYChImkwQ";
-        char *alphabet2 = "F0E1D2C3B4A59687abcdefghijklmnop";
-
-        char *challenge_lookup = "qzec2tb3um1olpar8whx4dfgijknsvy5";
-        char *operand_lookup = "+|&%/*^-";
-        char *delimit_lookup = ",;";
-
-        unsigned char *password_hash = malloc(25);
-        unsigned char *crypt_hash = malloc(25);
-        char *crypt_result = NULL;
-        unsigned char pass_hash_xor1[64];
-        unsigned char pass_hash_xor2[64];
-        unsigned char crypt_hash_xor1[64];
-        unsigned char crypt_hash_xor2[64];
-        unsigned char chal[7];
-        char resp_6[100];
-        char resp_96[100];
-
-        unsigned char digest1[20];
-        unsigned char digest2[20];
-        unsigned char magic_key_char[4];
-        const unsigned char *magic_ptr;
-
-        unsigned int  magic[64];
-        unsigned int  magic_work=0;
-
-        char comparison_src[20];
-
-        int x, j, i;
-        int cnt = 0;
-        int magic_cnt = 0;
-        int magic_len;
-        int depth =0, table =0;
-
-        memset(&pass_hash_xor1, 0, 64);
-        memset(&pass_hash_xor2, 0, 64);
-        memset(&crypt_hash_xor1, 0, 64);
-        memset(&crypt_hash_xor2, 0, 64);
-        memset(&digest1, 0, 20);
-        memset(&digest2, 0, 20);
-        memset(&magic, 0, 64);
-        memset(&resp_6, 0, 100);
-        memset(&resp_96, 0, 100);
-        memset(&magic_key_char, 0, 4);
-
-        /* 
-         * Magic: Phase 1.  Generate what seems to be a 30 
-         * byte value (could change if base64
-         * ends up differently?  I don't remember and I'm 
-         * tired, so use a 64 byte buffer.
-         */
-
-        magic_ptr = (unsigned char *)seed;
-
-        while (*magic_ptr != 0) {
-                char *loc;
-
-                /* Ignore parentheses.  */
-
-                if (*magic_ptr == '(' || *magic_ptr == ')') {
-                        magic_ptr++;
-                        continue;
-                }
-
-                /* Characters and digits verify against 
-                   the challenge lookup.
-                */
-
-                if (isalpha(*magic_ptr) || isdigit(*magic_ptr)) {
-                        loc = strchr(challenge_lookup, *magic_ptr);
-                        if (!loc) {
-                                /* This isn't good */
-                                continue;
-                        }
-
-                        /* Get offset into lookup table and lsh 3. */
-
-                        magic_work = loc - challenge_lookup;
-                        magic_work <<= 3;
-
-                        magic_ptr++;
-                        continue;
-                } else {
-                        unsigned int local_store;
-
-                        loc = strchr(operand_lookup, *magic_ptr);
-                        if (!loc) {
-                                /* Also not good. */
-                                continue;
-                        }
-
-                        local_store = loc - operand_lookup;
-
-                        /* Oops; how did this happen? */
-                        if (magic_cnt >= 64) 
-                                break;
-
-                        magic[magic_cnt++] = magic_work | local_store;
-                        magic_ptr++;
-                        continue;
-                }
-        }
-
-        magic_len = magic_cnt;
-        magic_cnt = 0;
-
-        /* Magic: Phase 2.  Take generated magic value and 
-         * sprinkle fairy dust on the values. */
-
-        for (magic_cnt = magic_len-2; magic_cnt >= 0; magic_cnt--) {
-                unsigned char byte1;
-                unsigned char byte2;
-
-                /* Bad.  Abort.
-                 */
-                if (magic_cnt >= magic_len) {
-                        WARNING(("magic_cnt(%d)  magic_len(%d)", magic_cnt, magic_len))
-                        break;
-                }
-
-                byte1 = magic[magic_cnt];
-                byte2 = magic[magic_cnt+1];
-
-                byte1 *= 0xcd;
-                byte1 ^= byte2;
-
-                magic[magic_cnt+1] = byte1;
-        }
-
-        /* Magic: Phase 3.  This computes 20 bytes.  The first 4 bytes are used as our magic 
-         * key (and may be changed later); the next 16 bytes are an MD5 sum of the magic key 
-         * plus 3 bytes.  The 3 bytes are found by looping, and they represent the offsets 
-         * into particular functions we'll later call to potentially alter the magic key. 
-         * 
-         * %-) 
-         */ 
-        
-        magic_cnt = 1; 
-        x = 0; 
-        
-        do { 
-                unsigned int     bl = 0;  
-                unsigned int     cl = magic[magic_cnt++]; 
-                
-                if (magic_cnt >= magic_len) 
-                        break; 
-                
-                if (cl > 0x7F) { 
-                        if (cl < 0xe0)  
-                                bl = cl = (cl & 0x1f) << 6;  
-                        else { 
-                                bl = magic[magic_cnt++];  
-                              cl = (cl & 0x0f) << 6;  
-                              bl = ((bl & 0x3f) + cl) << 6;  
-                        }  
-                        
-                        cl = magic[magic_cnt++];  
-                        bl = (cl & 0x3f) + bl;  
-                } else 
-                        bl = cl;  
-                
-                comparison_src[x++] = (bl & 0xff00) >> 8;  
-                comparison_src[x++] = bl & 0xff;  
-        } while (x < 20); 
-
-        /* Dump magic key into a char for SHA1 action. */
-        
-                
-        for(x = 0; x < 4; x++) 
-                magic_key_char[x] = comparison_src[x];
-
-        /* Compute values for recursive function table! */
-        memcpy( chal, magic_key_char, 4 );
-        x = 1;
-        for( i = 0; i < 0xFFFF && x; i++ )
-        {
-                for( j = 0; j < 5 && x; j++ )
-                {
-                        chal[4] = i;
-                        chal[5] = i >> 8;
-                        chal[6] = j;
-                        md5_init( &ctx );
-                        md5_append( &ctx, chal, 7 );
-                        md5_finish( &ctx, result );
-                        if( memcmp( comparison_src + 4, result, 16 ) == 0 )
-                        {
-                                depth = i;
-                                table = j;
-                                x = 0;
-                        }
-                }
-        }
-
-        /* Transform magic_key_char using transform table */
-        x = magic_key_char[3] << 24  | magic_key_char[2] << 16 
-                | magic_key_char[1] << 8 | magic_key_char[0];
-        x = yahoo_xfrm( table, depth, x );
-        x = yahoo_xfrm( table, depth, x );
-        magic_key_char[0] = x & 0xFF;
-        magic_key_char[1] = x >> 8 & 0xFF;
-        magic_key_char[2] = x >> 16 & 0xFF;
-        magic_key_char[3] = x >> 24 & 0xFF;
-
-        /* Get password and crypt hashes as per usual. */
-        md5_init(&ctx);
-        md5_append(&ctx, (md5_byte_t *)yd->password,  strlen(yd->password));
-        md5_finish(&ctx, result);
-        to_y64(password_hash, result, 16);
-
-        md5_init(&ctx);
-        crypt_result = yahoo_crypt(yd->password, "$1$_2S43d5f$");  
-        md5_append(&ctx, (md5_byte_t *)crypt_result, strlen(crypt_result));
-        md5_finish(&ctx, result);
-        to_y64(crypt_hash, result, 16);
-        free(crypt_result);
-
-        /* Our first authentication response is based off 
-         * of the password hash. */
-
-        for (x = 0; x < (int)strlen((char *)password_hash); x++) 
-                pass_hash_xor1[cnt++] = password_hash[x] ^ 0x36;
-
-        if (cnt < 64) 
-                memset(&(pass_hash_xor1[cnt]), 0x36, 64-cnt);
-
-        cnt = 0;
-
-        for (x = 0; x < (int)strlen((char *)password_hash); x++) 
-                pass_hash_xor2[cnt++] = password_hash[x] ^ 0x5c;
-
-        if (cnt < 64) 
-                memset(&(pass_hash_xor2[cnt]), 0x5c, 64-cnt);
-
-        sha1_init(&ctx1);
-        sha1_init(&ctx2);
-
-        /* The first context gets the password hash XORed 
-         * with 0x36 plus a magic value
-         * which we previously extrapolated from our 
-         * challenge. */
-
-        sha1_append(&ctx1, pass_hash_xor1, 64);
-        if (j >= 3 )
-                ctx1.Length_Low = 0x1ff;
-        sha1_append(&ctx1, magic_key_char, 4);
-        sha1_finish(&ctx1, digest1);
-
-         /* The second context gets the password hash XORed 
-          * with 0x5c plus the SHA-1 digest
-          * of the first context. */
-
-        sha1_append(&ctx2, pass_hash_xor2, 64);
-        sha1_append(&ctx2, digest1, 20);
-        sha1_finish(&ctx2, digest2);
-
-        /* Now that we have digest2, use it to fetch 
-         * characters from an alphabet to construct
-         * our first authentication response. */
-
-        for (x = 0; x < 20; x += 2) {
-                unsigned int    val = 0;
-                unsigned int    lookup = 0;
-                char            byte[6];
-
-                memset(&byte, 0, 6);
-
-                /* First two bytes of digest stuffed 
-                 *  together.
-                 */
-
-                val = digest2[x];
-                val <<= 8;
-                val += digest2[x+1];
-
-                lookup = (val >> 0x0b);
-                lookup &= 0x1f;
-                if (lookup >= strlen(alphabet1))
-                        break;
-                sprintf(byte, "%c", alphabet1[lookup]);
-                strcat(resp_6, byte);
-                strcat(resp_6, "=");
-
-                lookup = (val >> 0x06);
-                lookup &= 0x1f;
-                if (lookup >= strlen(alphabet2))
-                        break;
-                sprintf(byte, "%c", alphabet2[lookup]);
-                strcat(resp_6, byte);
-
-                lookup = (val >> 0x01);
-                lookup &= 0x1f;
-                if (lookup >= strlen(alphabet2))
-                        break;
-                sprintf(byte, "%c", alphabet2[lookup]);
-                strcat(resp_6, byte);
-
-                lookup = (val & 0x01);
-                if (lookup >= strlen(delimit_lookup))
-                        break;
-                sprintf(byte, "%c", delimit_lookup[lookup]);
-                strcat(resp_6, byte);
-        }
-
-        /* Our second authentication response is based off 
-         * of the crypto hash. */
-
-        cnt = 0;
-        memset(&digest1, 0, 20);
-        memset(&digest2, 0, 20);
-
-        for (x = 0; x < (int)strlen((char *)crypt_hash); x++) 
-                crypt_hash_xor1[cnt++] = crypt_hash[x] ^ 0x36;
-
-        if (cnt < 64) 
-                memset(&(crypt_hash_xor1[cnt]), 0x36, 64-cnt);
-
-        cnt = 0;
-
-        for (x = 0; x < (int)strlen((char *)crypt_hash); x++) 
-                crypt_hash_xor2[cnt++] = crypt_hash[x] ^ 0x5c;
-
-        if (cnt < 64) 
-                memset(&(crypt_hash_xor2[cnt]), 0x5c, 64-cnt);
-
-        sha1_init(&ctx1);
-        sha1_init(&ctx2);
-
-        /* The first context gets the password hash XORed 
-         * with 0x36 plus a magic value
-         * which we previously extrapolated from our 
-         * challenge. */
-
-        sha1_append(&ctx1, crypt_hash_xor1, 64);
-        if (j >= 3 )
-                ctx1.Length_Low = 0x1ff;
-        sha1_append(&ctx1, magic_key_char, 4);
-        sha1_finish(&ctx1, digest1);
-
-        /* The second context gets the password hash XORed 
-         * with 0x5c plus the SHA-1 digest
-         * of the first context. */
-
-        sha1_append(&ctx2, crypt_hash_xor2, 64);
-        sha1_append(&ctx2, digest1, 20);
-        sha1_finish(&ctx2, digest2);
-
-        /* Now that we have digest2, use it to fetch 
-         * characters from an alphabet to construct
-         * our first authentication response.  */
-
-        for (x = 0; x < 20; x += 2) {
-                unsigned int val = 0;
-                unsigned int lookup = 0;
-
-                char byte[6];
-
-                memset(&byte, 0, 6);
-
-                /* First two bytes of digest stuffed 
-                 *  together. */
-
-                val = digest2[x];
-                val <<= 8;
-                val += digest2[x+1];
-
-                lookup = (val >> 0x0b);
-                lookup &= 0x1f;
-                if (lookup >= strlen(alphabet1))
-                        break;
-                sprintf(byte, "%c", alphabet1[lookup]);
-                strcat(resp_96, byte);
-                strcat(resp_96, "=");
-
-                lookup = (val >> 0x06);
-                lookup &= 0x1f;
-                if (lookup >= strlen(alphabet2))
-                        break;
-                sprintf(byte, "%c", alphabet2[lookup]);
-                strcat(resp_96, byte);
-
-                lookup = (val >> 0x01);
-                lookup &= 0x1f;
-                if (lookup >= strlen(alphabet2))
-                        break;
-                sprintf(byte, "%c", alphabet2[lookup]);
-                strcat(resp_96, byte);
-
-                lookup = (val & 0x01);
-                if (lookup >= strlen(delimit_lookup))
-                        break;
-                sprintf(byte, "%c", delimit_lookup[lookup]);
-                strcat(resp_96, byte);
-        }
-
-        pack = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, yd->initial_status, yd->session_id);
-        yahoo_packet_hash(pack, 0, sn);
-        yahoo_packet_hash(pack, 6, resp_6);
-        yahoo_packet_hash(pack, 96, resp_96);
-        yahoo_packet_hash(pack, 1, sn);
-        yahoo_send_packet(yid, pack, 0);
-        yahoo_packet_free(pack);
-
-        free(password_hash);
-        free(crypt_hash);
+        if (tag > 0)
+                ccd->tag = tag;
+        else if (tag < 0)
+                YAHOO_CALLBACK(ext_yahoo_login_response) (yd->client_id,
+                        YAHOO_LOGIN_SOCK, NULL);
 }
 
@@ -2303 +1795 @@
 }
 
-static void yahoo_process_auth_0x10(struct yahoo_input_data *yid, const char *seed, const char *sn)
+static void yahoo_https_auth(struct yahoo_input_data *yid, const char *seed, const char *sn)
 {
         struct yahoo_https_auth_data *had = g_new0(struct yahoo_https_auth_data, 1);
@@ -2353 +1845 @@
         
         if (req->status_code != 200) {
-                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, 2000 + req->status_code, NULL);
+                YAHOO_CALLBACK(ext_yahoo_login_response) (yd->client_id, 2000 + req->status_code, NULL);
                 goto fail;
         }
         
         if (sscanf(req->reply_body, "%d", &st) != 1 || st != 0) {
-                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, yahoo_https_status_parse(st), NULL);
+                YAHOO_CALLBACK(ext_yahoo_login_response) (yd->client_id, yahoo_https_status_parse(st), NULL);
                 goto fail;
         }
         
         if ((had->token = yahoo_ha_find_key(req->reply_body, "ymsgr")) == NULL) {
-                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, 3001, NULL);
+                YAHOO_CALLBACK(ext_yahoo_login_response) (yd->client_id, 3001, NULL);
                 goto fail;
         }
@@ -2409 +1901 @@
 
         if (req->status_code != 200) {
-                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, 2000 + req->status_code, NULL);
+                YAHOO_CALLBACK(ext_yahoo_login_response) (yd->client_id, 2000 + req->status_code, NULL);
                 goto fail;
         }
         
         if (sscanf(req->reply_body, "%d", &st) != 1 || st != 0) {
-                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, yahoo_https_status_parse(st), NULL);
+                YAHOO_CALLBACK(ext_yahoo_login_response) (yd->client_id, yahoo_https_status_parse(st), NULL);
                 goto fail;
         }
@@ -2421 +1913 @@
             (yd->cookie_t = yahoo_ha_find_key(req->reply_body, "T")) == NULL ||
             (crumb = yahoo_ha_find_key(req->reply_body, "crumb")) == NULL) {
-                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, 3002, NULL);
+                YAHOO_CALLBACK(ext_yahoo_login_response) (yd->client_id, 3002, NULL);
                 goto fail;
         }
@@ -2454 +1946 @@
 }
 
-static void yahoo_process_auth(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+static void yahoo_process_auth(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         char *seed = NULL;
-        char *sn   = NULL;
+        char *sn = NULL;
         YList *l = pkt->hash;
         int m = 0;
+        struct yahoo_data *yd = yid->yd;
 
         while (l) {
                 struct yahoo_pair *pair = l->data;
-                if (pair->key == 94)
+
+                switch (pair->key) {
+                case 94:
                         seed = pair->value;
-                if (pair->key == 1)
+                        break;
+                case 1:
                         sn = pair->value;
-                if (pair->key == 13)
+                        break;
+                case 13:
                         m = atoi(pair->value);
+                        break;
+                }
                 l = l->next;
         }
 
-        if (!seed) 
-                return;
-
-        switch (m) {
-                case 0:
-                        yahoo_process_auth_pre_0x0b(yid, seed, sn);
-                        break;
-                case 1:
-                        yahoo_process_auth_0x0b(yid, seed, sn);
-                        break;
-                case 2:
-                        yahoo_process_auth_0x10(yid, seed, sn);
-                        break;
-                default:
-                        /* call error */
-                        WARNING(("unknown auth type %d", m));
-                        yahoo_process_auth_0x0b(yid, seed, sn);
-                        break;
-        }
-}
-
-static void yahoo_process_auth_resp(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+        if (!seed)
+                return;
+
+        if (m==2)
+                yahoo_https_auth(yid, seed, sn);
+        else {
+                /* call error */
+                WARNING(("unknown auth type %d", m));
+                YAHOO_CALLBACK(ext_yahoo_login_response) (yd->client_id,
+                        YAHOO_LOGIN_UNKNOWN, NULL);
+        }
+}
+
+static void yahoo_process_auth_resp(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
         char *login_id;
         char *handle;
-        char *url=NULL;
-        int  login_status=0;
+        char *url = NULL;
+        int login_status = -1;
 
         YList *l;
@@ -2515 +2008 @@
         }
 
-        if(pkt->status == 0xffffffff) {
-                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, login_status, url);
-        /*      yahoo_logoff(yd->client_id);*/
-        }
-}
-
-static void yahoo_process_mail(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+        if (pkt->status == YPACKET_STATUS_DISCONNECTED) {
+                YAHOO_CALLBACK(ext_yahoo_login_response) (yd->client_id,
+                        login_status, url);
+                /*      yahoo_logoff(yd->client_id); */
+        }
+}
+
+static void yahoo_process_mail(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
@@ -2547 +2042 @@
                 char from[1024];
                 snprintf(from, sizeof(from), "%s (%s)", who, email);
-                YAHOO_CALLBACK(ext_yahoo_mail_notify)(yd->client_id, from, subj, count);
-        } else if(count > 0)
-                YAHOO_CALLBACK(ext_yahoo_mail_notify)(yd->client_id, NULL, NULL, count);
-}
-
-static void yahoo_process_contact(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+                YAHOO_CALLBACK(ext_yahoo_mail_notify) (yd->client_id, from,
+                        subj, count);
+        } else if (count > 0)
+                YAHOO_CALLBACK(ext_yahoo_mail_notify) (yd->client_id, NULL,
+                        NULL, count);
+}
+
+static void yahoo_process_new_contact(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
+{
+        struct yahoo_data *yd = yid->yd;
+        char *me = NULL;
+        char *who = NULL;
+        char *msg = NULL;
+        int online = -1;
+
+        YList *l;
+
+        for (l = pkt->hash; l; l = l->next) {
+                struct yahoo_pair *pair = l->data;
+                if (pair->key == 4)
+                        who = pair->value;
+                else if (pair->key == 5)
+                        me = pair->value;
+                else if (pair->key == 14)
+                        msg = pair->value;
+                else if (pair->key == 13)
+                        online = strtol(pair->value, NULL, 10);
+        }
+
+        if (who && online < 0)
+                YAHOO_CALLBACK(ext_yahoo_contact_added) (yd->client_id, me, who,
+                        msg);
+        else if (online == 2)
+                YAHOO_CALLBACK(ext_yahoo_rejected) (yd->client_id, who, msg);
+}
+
+/* UNUSED? */
+static void yahoo_process_contact(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
@@ -2561 +2090 @@
         long tm = 0L;
         int state = YAHOO_STATUS_AVAILABLE;
-        int online = FALSE;
+        int online = 0;
         int away = 0;
         int idle = 0;
@@ -2590 +2119 @@
                 else if (pair->key == 60)
                         mobile = strtol(pair->value, NULL, 10);
-                
+
         }
 
         if (id)
-                YAHOO_CALLBACK(ext_yahoo_contact_added)(yd->client_id, id, who, msg);
+                YAHOO_CALLBACK(ext_yahoo_contact_added) (yd->client_id, id, who,
+                        msg);
         else if (name)
-                YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, name, state, msg, away, idle, mobile);
-        else if(pkt->status == 0x07)
-                YAHOO_CALLBACK(ext_yahoo_rejected)(yd->client_id, who, msg);
-}
-
-static void yahoo_process_buddyadd(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+                YAHOO_CALLBACK(ext_yahoo_status_changed) (yd->client_id, name,
+                        state, msg, away, idle, mobile);
+        else if (pkt->status == 0x07)
+                YAHOO_CALLBACK(ext_yahoo_rejected) (yd->client_id, who, msg);
+}
+
+static void yahoo_process_buddyadd(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
@@ -2609 +2141 @@
         char *me = NULL;
 
-        struct yahoo_buddy *bud=NULL;
+        struct yahoo_buddy *bud = NULL;
 
         YList *l;
@@ -2624 +2156 @@
         }
 
-        yahoo_dump_unhandled(pkt);
-
-        if(!who)
-                return;
-        if(!where)
+        if (!who)
+                return;
+        if (!where)
                 where = "Unknown";
 
-        /* status: 0 == Successful, 1 == Error (does not exist), 2 == Already in list */
-        if( status == 0 ) {
-                bud = y_new0(struct yahoo_buddy, 1);
-                bud->id = strdup(who);
-                bud->group = strdup(where);
-                bud->real_name = NULL;
-                
-                yd->buddies = y_list_append(yd->buddies, bud);
-        
-                /* Possibly called already, but at least the call above doesn't
-                   seem to happen every time (not anytime I tried). */
-                YAHOO_CALLBACK(ext_yahoo_contact_added)(yd->client_id, me, who, NULL);
-        }
-
-/*      YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, who, status, NULL, (status==YAHOO_STATUS_AVAILABLE?0:1)); */
-}
-
-static void yahoo_process_contact_ymsg13(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
-{
-        char* who=NULL;
-        char* me=NULL;  
-        char* msg=NULL;
-        YList *l;
-        for (l = pkt->hash; l; l = l->next) {
-                struct yahoo_pair *pair = l->data;
-                if (pair->key == 4)
-                        who = pair->value;
-                else if (pair->key == 5)
-                        me = pair->value;
-                else
-                        DEBUG_MSG(("unknown key: %d = %s", pair->key, pair->value));
-        }
-
-        if(pkt->status==3)
-                YAHOO_CALLBACK(ext_yahoo_contact_auth_request)(yid->yd->client_id, me, who, msg);
-}
-
-static void yahoo_process_buddydel(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+        bud = y_new0(struct yahoo_buddy, 1);
+        bud->id = strdup(who);
+        bud->group = strdup(where);
+        bud->real_name = NULL;
+
+        yd->buddies = y_list_append(yd->buddies, bud);
+
+        /* A non-zero status (i've seen 2) seems to mean the buddy is already 
+         * added and is online */
+        if (status) {
+                LOG(("Setting online see packet for info"));
+                yahoo_dump_unhandled(pkt);
+                YAHOO_CALLBACK(ext_yahoo_status_changed) (yd->client_id, who,
+                        YAHOO_STATUS_AVAILABLE, NULL, 0, 0, 0);
+        }
+}
+
+static void yahoo_process_buddydel(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
@@ -2691 +2202 @@
                         unk_66 = strtol(pair->value, NULL, 10);
                 else
-                        DEBUG_MSG(("unknown key: %d = %s", pair->key, pair->value));
-        }
-
-        if(!who || !where)
-                return;
-        
+                        DEBUG_MSG(("unknown key: %d = %s", pair->key,
+                                        pair->value));
+        }
+
+        if (!who || !where)
+                return;
+
         bud = y_new0(struct yahoo_buddy, 1);
         bud->id = strdup(who);
@@ -2707 +2219 @@
         FREE(bud);
 
-        if(buddy) {
+        if (buddy) {
                 bud = buddy->data;
                 yd->buddies = y_list_remove_link(yd->buddies, buddy);
@@ -2717 +2229 @@
                 FREE(bud);
 
-                bud=NULL;
-        }
-}
-
-static void yahoo_process_ignore(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+                bud = NULL;
+        }
+}
+
+static void yahoo_process_ignore(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         char *who = NULL;
-        int  status = 0;
+        int status = 0;
         char *me = NULL;
-        int  un_ignore = 0;
+        int un_ignore = 0;
 
         YList *l;
@@ -2735 +2248 @@
                 if (pair->key == 1)
                         me = pair->value;
-                if (pair->key == 13) /* 1 == ignore, 2 == unignore */ 
+                if (pair->key == 13)    /* 1 == ignore, 2 == unignore */
                         un_ignore = strtol(pair->value, NULL, 10);
-                if (pair->key == 66) 
+                if (pair->key == 66)
                         status = strtol(pair->value, NULL, 10);
         }
-
 
         /*
          * status
-         *      0  - ok
-         *      2  - already in ignore list, could not add
-         *      3  - not in ignore list, could not delete
-         *      12 - is a buddy, could not add
+         *      0  - ok
+         *      2  - already in ignore list, could not add
+         *      3  - not in ignore list, could not delete
+         *      12 - is a buddy, could not add
          */
 
 /*      if(status)
                 YAHOO_CALLBACK(ext_yahoo_error)(yd->client_id, who, 0, status);
-*/      
-}
-
-static void yahoo_process_voicechat(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+*/
+}
+
+static void yahoo_process_voicechat(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         char *who = NULL;
@@ -2770 +2283 @@
                         me = pair->value;
                 if (pair->key == 13)
-                        voice_room=pair->value;
-                if (pair->key == 57) 
-                        room=pair->value;
-        }
-
-        NOTICE(("got voice chat invite from %s in %s to identity %s", who, room, me));
+                        voice_room = pair->value;
+                if (pair->key == 57)
+                        room = pair->value;
+        }
+
+        NOTICE(("got voice chat invite from %s in %s to identity %s", who, room,
+                        me));
         /* 
          * send: s:0 1:me 5:who 57:room 13:1
@@ -2787 +2301 @@
 }
 
-static void yahoo_process_ping(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+static void yahoo_process_ping(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         char *errormsg = NULL;
-        
+
         YList *l;
         for (l = pkt->hash; l; l = l->next) {
@@ -2797 +2312 @@
                         errormsg = pair->value;
         }
-        
+
         NOTICE(("got ping packet"));
-        YAHOO_CALLBACK(ext_yahoo_got_ping)(yid->yd->client_id, errormsg);
-}
-
-static void _yahoo_webcam_get_server_connected(int fd, int error, void *d)
+        YAHOO_CALLBACK(ext_yahoo_got_ping) (yid->yd->client_id, errormsg);
+}
+
+static void yahoo_process_buddy_change_group(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
+{
+        YList *l;
+        char *me = NULL;
+        char *who = NULL;
+        char *old_group = NULL;
+        char *new_group = NULL;
+
+        for (l = pkt->hash; l; l = l->next) {
+                struct yahoo_pair *pair = l->data;
+                if (pair->key == 1)
+                        me = pair->value;
+                if (pair->key == 7)
+                        who = pair->value;
+                if (pair->key == 224)
+                        old_group = pair->value;
+                if (pair->key == 264)
+                        new_group = pair->value;
+        }
+
+        YAHOO_CALLBACK(ext_yahoo_got_buddy_change_group) (yid->yd->client_id,
+                me, who, old_group, new_group);
+}
+
+static void _yahoo_webcam_get_server_connected(void *fd, int error, void *d)
 {
         struct yahoo_input_data *yid = d;
@@ -2808 +2348 @@
         char *data = NULL;
         char *packet = NULL;
-        unsigned char magic_nr[] = {0, 1, 0};
+        unsigned char magic_nr[] = { 0, 1, 0 };
         unsigned char header_len = 8;
         unsigned int len = 0;
         unsigned int pos = 0;
 
-        if(error || fd <= 0) {
+        if (error || !fd) {
                 FREE(who);
                 FREE(yid);
@@ -2821 +2361 @@
         yid->fd = fd;
         inputs = y_list_prepend(inputs, yid);
-        
+
         /* send initial packet */
         if (who)
@@ -2831 +2371 @@
 
         /* send data */
-        if (who)
-        {
+        if (who) {
                 data = strdup("g=");
                 data = y_string_append(data, who);
@@ -2851 +2390 @@
         FREE(data);
 
-        yid->read_tag=YAHOO_CALLBACK(ext_yahoo_add_handler)(yid->yd->client_id, fd, YAHOO_INPUT_READ, yid);
-}
-
-static void yahoo_webcam_get_server(struct yahoo_input_data *y, char *who, char *key)
+        yid->read_tag =
+                YAHOO_CALLBACK(ext_yahoo_add_handler) (yid->yd->client_id, fd,
+                YAHOO_INPUT_READ, yid);
+}
+
+static void yahoo_webcam_get_server(struct yahoo_input_data *y, char *who,
+        char *key)
 {
         struct yahoo_input_data *yid = y_new0(struct yahoo_input_data, 1);
@@ -2862 +2404 @@
         yid->yd = y->yd;
         yid->wcm = y_new0(struct yahoo_webcam, 1);
-        yid->wcm->user = who?strdup(who):NULL;
-        yid->wcm->direction = who?YAHOO_WEBCAM_DOWNLOAD:YAHOO_WEBCAM_UPLOAD;
+        yid->wcm->user = who ? strdup(who) : NULL;
+        yid->wcm->direction = who ? YAHOO_WEBCAM_DOWNLOAD : YAHOO_WEBCAM_UPLOAD;
         yid->wcm->key = strdup(key);
 
-        YAHOO_CALLBACK(ext_yahoo_connect_async)(yid->yd->client_id, yss->webcam_host, yss->webcam_port, 
-                        _yahoo_webcam_get_server_connected, yid);
-
-}
-
-static YList *webcam_queue=NULL;
-static void yahoo_process_webcam_key(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+        YAHOO_CALLBACK(ext_yahoo_connect_async) (yid->yd->client_id,
+                yss->webcam_host, yss->webcam_port,
+                _yahoo_webcam_get_server_connected, yid, 0);
+
+}
+
+static YList *webcam_queue = NULL;
+static void yahoo_process_webcam_key(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         char *me = NULL;
@@ -2879 +2423 @@
 
         YList *l;
-        // yahoo_dump_unhandled(pkt);
+        yahoo_dump_unhandled(pkt);
         for (l = pkt->hash; l; l = l->next) {
                 struct yahoo_pair *pair = l->data;
                 if (pair->key == 5)
                         me = pair->value;
-                if (pair->key == 61) 
-                        key=pair->value;
+                if (pair->key == 61)
+                        key = pair->value;
         }
 
         l = webcam_queue;
-        if(!l)
+        if (!l)
                 return;
         who = l->data;
@@ -2898 +2442 @@
 }
 
-static void yahoo_packet_process(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+static void yahoo_packet_process(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         DEBUG_MSG(("yahoo_packet_process: 0x%02x", pkt->service));
-        yahoo_dump_unhandled(pkt);
-        switch (pkt->service)
-        {
+        switch (pkt->service) {
         case YAHOO_SERVICE_USERSTAT:
         case YAHOO_SERVICE_LOGON:
@@ -2914 +2457 @@
         case YAHOO_SERVICE_IDDEACT:
         case YAHOO_SERVICE_Y6_STATUS_UPDATE:
-        case YAHOO_SERVICE_YMSG15_STATUS:
+        case YAHOO_SERVICE_Y8_STATUS:
                 yahoo_process_status(yid, pkt);
                 break;
@@ -2928 +2471 @@
                 yahoo_process_mail(yid, pkt);
                 break;
-        case YAHOO_SERVICE_REJECTCONTACT:
+        case YAHOO_SERVICE_Y7_AUTHORIZATION:
+                yahoo_process_new_contact(yid, pkt);
+                break;
         case YAHOO_SERVICE_NEWCONTACT:
                 yahoo_process_contact(yid, pkt);
@@ -2963 +2508 @@
                 break;
         case YAHOO_SERVICE_P2PFILEXFER:
-        case YAHOO_SERVICE_FILETRANSFER:
+        case YAHOO_SERVICE_Y7_FILETRANSFER:
                 yahoo_process_filetransfer(yid, pkt);
+                break;
+        case YAHOO_SERVICE_Y7_FILETRANSFERINFO:
+                yahoo_process_filetransferinfo(yid, pkt);
+                break;
+        case YAHOO_SERVICE_Y7_FILETRANSFERACCEPT:
+                yahoo_process_filetransferaccept(yid, pkt);
                 break;
         case YAHOO_SERVICE_ADDBUDDY:
                 yahoo_process_buddyadd(yid, pkt);
-                break;
-        case YAHOO_SERVICE_CONTACT_YMSG13:
-                yahoo_process_contact_ymsg13(yid,pkt);
                 break;
         case YAHOO_SERVICE_REMBUDDY:
@@ -2987 +2535 @@
                 yahoo_process_ping(yid, pkt);
                 break;
+        case YAHOO_SERVICE_Y7_CHANGE_GROUP:
+                yahoo_process_buddy_change_group(yid, pkt);
+                break;
         case YAHOO_SERVICE_IDLE:
         case YAHOO_SERVICE_MAILSTAT:
@@ -3000 +2551 @@
         case YAHOO_SERVICE_CHATLOGOFF:
         case YAHOO_SERVICE_CHATMSG:
+        case YAHOO_SERVICE_REJECTCONTACT:
         case YAHOO_SERVICE_PEERTOPEER:
                 WARNING(("unhandled service 0x%02x", pkt->service));
@@ -3012 +2564 @@
         case YAHOO_SERVICE_PICTURE_UPLOAD:
                 yahoo_process_picture_upload(yid, pkt);
-                break;  
-        case YAHOO_SERVICE_YMSG15_BUDDY_LIST:   /* Buddy List */
+                break;
+        case YAHOO_SERVICE_Y8_LIST:     /* Buddy List */
                 yahoo_process_buddy_list(yid, pkt);
+                break;
         default:
                 WARNING(("unknown service 0x%02x", pkt->service));
@@ -3022 +2575 @@
 }
 
-static struct yahoo_packet * yahoo_getdata(struct yahoo_input_data * yid)
+static struct yahoo_packet *yahoo_getdata(struct yahoo_input_data *yid)
 {
         struct yahoo_packet *pkt;
@@ -3029 +2582 @@
         int pktlen;
 
-        if(!yd)
+        if (!yd)
                 return NULL;
 
@@ -3038 +2591 @@
         }
 
-        pos += 4; /* YMSG */
+        pos += 4;               /* YMSG */
         pos += 2;
         pos += 2;
 
-        pktlen = yahoo_get16(yid->rxqueue + pos); pos += 2;
-        DEBUG_MSG(("%d bytes to read, rxlen is %d", 
-                        pktlen, yid->rxlen));
+        pktlen = yahoo_get16(yid->rxqueue + pos);
+        pos += 2;
+        DEBUG_MSG(("%d bytes to read, rxlen is %d", pktlen, yid->rxlen));
 
         if (yid->rxlen < (YAHOO_PACKET_HDRLEN + pktlen)) {
@@ -3056 +2609 @@
         pkt = yahoo_packet_new(0, 0, 0);
 
-        pkt->service = yahoo_get16(yid->rxqueue + pos); pos += 2;
-        pkt->status = yahoo_get32(yid->rxqueue + pos); pos += 4;
+        pkt->service = yahoo_get16(yid->rxqueue + pos);
+        pos += 2;
+        pkt->status = yahoo_get32(yid->rxqueue + pos);
+        pos += 4;
         DEBUG_MSG(("Yahoo Service: 0x%02x Status: %d", pkt->service,
-                                pkt->status));
-        pkt->id = yahoo_get32(yid->rxqueue + pos); pos += 4;
+                        pkt->status));
+        pkt->id = yahoo_get32(yid->rxqueue + pos);
+        pos += 4;
 
         yd->session_id = pkt->id;
@@ -3068 +2624 @@
         yid->rxlen -= YAHOO_PACKET_HDRLEN + pktlen;
         DEBUG_MSG(("rxlen == %d, rxqueue == %p", yid->rxlen, yid->rxqueue));
-        if (yid->rxlen>0) {
-                unsigned char *tmp = y_memdup(yid->rxqueue + YAHOO_PACKET_HDRLEN 
-                                + pktlen, yid->rxlen);
+        if (yid->rxlen > 0) {
+                unsigned char *tmp = y_memdup(yid->rxqueue + YAHOO_PACKET_HDRLEN
+                        + pktlen, yid->rxlen);
                 FREE(yid->rxqueue);
                 yid->rxqueue = tmp;
-                DEBUG_MSG(("new rxlen == %d, rxqueue == %p", yid->rxlen, yid->rxqueue));
+                DEBUG_MSG(("new rxlen == %d, rxqueue == %p", yid->rxlen,
+                                yid->rxqueue));
         } else {
                 DEBUG_MSG(("freed rxqueue == %p", yid->rxqueue));
@@ -3082 +2639 @@
 }
 
-static void yahoo_yab_read(struct yab *yab, unsigned char *d, int len)
+static struct yab *yahoo_yab_read(unsigned char *d, int len)
 {
         char *st, *en;
         char *data = (char *)d;
-        data[len]='\0';
+        struct yab *yab = NULL;
+
+        data[len] = '\0';
 
         DEBUG_MSG(("Got yab: %s", data));
-        st = en = strstr(data, "userid=\"");
-        if(st) {
-                st += strlen("userid=\"");
-                en = strchr(st, '"'); *en++ = '\0';
+        st = en = strstr(data, "e0=\"");
+        if (st) {
+                yab = y_new0(struct yab, 1);
+
+                st += strlen("e0=\"");
+                en = strchr(st, '"');
+                *en++ = '\0';
+                yab->email = yahoo_xmldecode(st);
+        }
+
+        if (!en)
+                return NULL;
+
+        st = strstr(en, "id=\"");
+        if (st) {
+                st += strlen("id=\"");
+                en = strchr(st, '"');
+                *en++ = '\0';
+                yab->yid = atoi(yahoo_xmldecode(st));
+        }
+
+        st = strstr(en, "fn=\"");
+        if (st) {
+                st += strlen("fn=\"");
+                en = strchr(st, '"');
+                *en++ = '\0';
+                yab->fname = yahoo_xmldecode(st);
+        }
+
+        st = strstr(en, "ln=\"");
+        if (st) {
+                st += strlen("ln=\"");
+                en = strchr(st, '"');
+                *en++ = '\0';
+                yab->lname = yahoo_xmldecode(st);
+        }
+
+        st = strstr(en, "nn=\"");
+        if (st) {
+                st += strlen("nn=\"");
+                en = strchr(st, '"');
+                *en++ = '\0';
+                yab->nname = yahoo_xmldecode(st);
+        }
+
+        st = strstr(en, "yi=\"");
+        if (st) {
+                st += strlen("yi=\"");
+                en = strchr(st, '"');
+                *en++ = '\0';
                 yab->id = yahoo_xmldecode(st);
         }
 
-        st = strstr(en, "fname=\"");
-        if(st) {
-                st += strlen("fname=\"");
-                en = strchr(st, '"'); *en++ = '\0';
-                yab->fname = yahoo_xmldecode(st);
-        }
-
-        st = strstr(en, "lname=\"");
-        if(st) {
-                st += strlen("lname=\"");
-                en = strchr(st, '"'); *en++ = '\0';
-                yab->lname = yahoo_xmldecode(st);
-        }
-
-        st = strstr(en, "nname=\"");
-        if(st) {
-                st += strlen("nname=\"");
-                en = strchr(st, '"'); *en++ = '\0';
-                yab->nname = yahoo_xmldecode(st);
-        }
-
-        st = strstr(en, "email=\"");
-        if(st) {
-                st += strlen("email=\"");
-                en = strchr(st, '"'); *en++ = '\0';
-                yab->email = yahoo_xmldecode(st);
-        }
-
         st = strstr(en, "hphone=\"");
-        if(st) {
+        if (st) {
                 st += strlen("hphone=\"");
-                en = strchr(st, '"'); *en++ = '\0';
+                en = strchr(st, '"');
+                *en++ = '\0';
                 yab->hphone = yahoo_xmldecode(st);
         }
 
         st = strstr(en, "wphone=\"");
-        if(st) {
+        if (st) {
                 st += strlen("wphone=\"");
-                en = strchr(st, '"'); *en++ = '\0';
+                en = strchr(st, '"');
+                *en++ = '\0';
                 yab->wphone = yahoo_xmldecode(st);
         }
 
         st = strstr(en, "mphone=\"");
-        if(st) {
+        if (st) {
                 st += strlen("mphone=\"");
-                en = strchr(st, '"'); *en++ = '\0';
+                en = strchr(st, '"');
+                *en++ = '\0';
                 yab->mphone = yahoo_xmldecode(st);
         }
 
         st = strstr(en, "dbid=\"");
-        if(st) {
+        if (st) {
                 st += strlen("dbid=\"");
-                en = strchr(st, '"'); *en++ = '\0';
+                en = strchr(st, '"');
+                *en++ = '\0';
                 yab->dbid = atoi(st);
         }
-}
-
-static struct yab * yahoo_getyab(struct yahoo_input_data *yid)
+
+        return yab;
+}
+
+static struct yab *yahoo_getyab(struct yahoo_input_data *yid)
 {
         struct yab *yab = NULL;
-        int pos = 0, end=0;
+        int pos = 0, end = 0;
         struct yahoo_data *yd = yid->yd;
 
-        if(!yd)
+        if (!yd)
                 return NULL;
 
+        do {
+                DEBUG_MSG(("rxlen is %d", yid->rxlen));
+
+                if (yid->rxlen <= strlen("<ct"))
+                        return NULL;
+
+                /* start with <ct */
+                while (pos < yid->rxlen - strlen("<ct") + 1
+                        && memcmp(yid->rxqueue + pos, "<ct", strlen("<ct")))
+                        pos++;
+
+                if (pos >= yid->rxlen - 1)
+                        return NULL;
+
+                end = pos + 2;
+                /* end with > */
+                while (end < yid->rxlen - strlen(">")
+                        && memcmp(yid->rxqueue + end, ">", strlen(">")))
+                        end++;
+
+                if (end >= yid->rxlen - 1)
+                        return NULL;
+
+                yab = yahoo_yab_read(yid->rxqueue + pos, end + 2 - pos);
+
+                yid->rxlen -= end + 1;
+                DEBUG_MSG(("rxlen == %d, rxqueue == %p", yid->rxlen,
+                                yid->rxqueue));
+                if (yid->rxlen > 0) {
+                        unsigned char *tmp =
+                                y_memdup(yid->rxqueue + end + 1, yid->rxlen);
+                        FREE(yid->rxqueue);
+                        yid->rxqueue = tmp;
+                        DEBUG_MSG(("new rxlen == %d, rxqueue == %p", yid->rxlen,
+                                        yid->rxqueue));
+                } else {
+                        DEBUG_MSG(("freed rxqueue == %p", yid->rxqueue));
+                        FREE(yid->rxqueue);
+                }
+
+        } while (!yab && end < yid->rxlen - 1);
+
+        return yab;
+}
+
+static char *yahoo_getwebcam_master(struct yahoo_input_data *yid)
+{
+        unsigned int pos = 0;
+        unsigned int len = 0;
+        unsigned int status = 0;
+        char *server = NULL;
+        struct yahoo_data *yd = yid->yd;
+
+        if (!yid || !yd)
+                return NULL;
+
         DEBUG_MSG(("rxlen is %d", yid->rxlen));
 
-        if(yid->rxlen <= strlen("<record"))
+        len = yid->rxqueue[pos++];
+        if (yid->rxlen < len)
                 return NULL;
 
-        /* start with <record */
-        while(pos < yid->rxlen-strlen("<record")+1 
-                        && memcmp(yid->rxqueue + pos, "<record", strlen("<record")))
-                pos++;
-
-        if(pos >= yid->rxlen-1)
-                return NULL;
-
-        end = pos+2;
-        /* end with /> */
-        while(end < yid->rxlen-strlen("/>")+1 && memcmp(yid->rxqueue + end, "/>", strlen("/>")))
-                end++;
-
-        if(end >= yid->rxlen-1)
-                return NULL;
-
-        yab = y_new0(struct yab, 1);
-        yahoo_yab_read(yab, yid->rxqueue + pos, end+2-pos);
-        
-
-        yid->rxlen -= end+1;
+        /* extract status (0 = ok, 6 = webcam not online) */
+        status = yid->rxqueue[pos++];
+
+        if (status == 0) {
+                pos += 2;       /* skip next 2 bytes */
+                server = y_memdup(yid->rxqueue + pos, 16);
+                pos += 16;
+        } else if (status == 6) {
+                YAHOO_CALLBACK(ext_yahoo_webcam_closed)
+                        (yd->client_id, yid->wcm->user, 4);
+        }
+
+        /* skip rest of the data */
+
+        yid->rxlen -= len;
         DEBUG_MSG(("rxlen == %d, rxqueue == %p", yid->rxlen, yid->rxqueue));
-        if (yid->rxlen>0) {
-                unsigned char *tmp = y_memdup(yid->rxqueue + end + 1, yid->rxlen);
+        if (yid->rxlen > 0) {
+                unsigned char *tmp = y_memdup(yid->rxqueue + pos, yid->rxlen);
                 FREE(yid->rxqueue);
                 yid->rxqueue = tmp;
-                DEBUG_MSG(("new rxlen == %d, rxqueue == %p", yid->rxlen, yid->rxqueue));
+                DEBUG_MSG(("new rxlen == %d, rxqueue == %p", yid->rxlen,
+                                yid->rxqueue));
         } else {
                 DEBUG_MSG(("freed rxqueue == %p", yid->rxqueue));
@@ -3199 +2834 @@
         }
 
-
-        return yab;
-}
-
-static char * yahoo_getwebcam_master(struct yahoo_input_data *yid)
-{
-        unsigned int pos=0;
-        unsigned int len=0;
-        unsigned int status=0;
-        char *server=NULL;
+        return server;
+}
+
+static int yahoo_get_webcam_data(struct yahoo_input_data *yid)
+{
+        unsigned char reason = 0;
+        unsigned int pos = 0;
+        unsigned int begin = 0;
+        unsigned int end = 0;
+        unsigned int closed = 0;
+        unsigned char header_len = 0;
+        char *who;
+        int connect = 0;
         struct yahoo_data *yd = yid->yd;
 
-        if(!yid || !yd)
-                return NULL;
+        if (!yd)
+                return -1;
+
+        if (!yid->wcm || !yid->wcd || !yid->rxlen)
+                return -1;
 
         DEBUG_MSG(("rxlen is %d", yid->rxlen));
 
-        len = yid->rxqueue[pos++];
-        if (yid->rxlen < len)
-                return NULL;
-
-        /* extract status (0 = ok, 6 = webcam not online) */
-        status = yid->rxqueue[pos++];
-
-        if (status == 0)
-        {
-                pos += 2; /* skip next 2 bytes */
-                server =  y_memdup(yid->rxqueue+pos, 16);
-                pos += 16;
-        }
-        else if (status == 6)
-        {
-                YAHOO_CALLBACK(ext_yahoo_webcam_closed)
-                        (yd->client_id, yid->wcm->user, 4);
-        }
-
-        /* skip rest of the data */
-
-        yid->rxlen -= len;
-        DEBUG_MSG(("rxlen == %d, rxqueue == %p", yid->rxlen, yid->rxqueue));
-        if (yid->rxlen>0) {
-                unsigned char *tmp = y_memdup(yid->rxqueue + pos, yid->rxlen);
-                FREE(yid->rxqueue);
-                yid->rxqueue = tmp;
-                DEBUG_MSG(("new rxlen == %d, rxqueue == %p", yid->rxlen, yid->rxqueue));
-        } else {
-                DEBUG_MSG(("freed rxqueue == %p", yid->rxqueue));
-                FREE(yid->rxqueue);
-        }
-
-        return server;
-}
-
-static int yahoo_get_webcam_data(struct yahoo_input_data *yid)
-{
-        unsigned char reason=0;
-        unsigned int pos=0;
-        unsigned int begin=0;
-        unsigned int end=0;
-        unsigned int closed=0;
-        unsigned char header_len=0;
-        char *who;
-        int connect=0;
-        struct yahoo_data *yd = yid->yd;
-
-        if(!yd)
-                return -1;
-
-        if(!yid->wcm || !yid->wcd || !yid->rxlen)
-                return -1;
-
-        DEBUG_MSG(("rxlen is %d", yid->rxlen));
-
         /* if we are not reading part of image then read header */
-        if (!yid->wcd->to_read)
-        {
-                header_len=yid->rxqueue[pos++];
-                yid->wcd->packet_type=0;
+        if (!yid->wcd->to_read) {
+                header_len = yid->rxqueue[pos++];
+                yid->wcd->packet_type = 0;
 
                 if (yid->rxlen < header_len)
                         return 0;
 
-                if (header_len >= 8)
-                {
+                if (header_len >= 8) {
                         reason = yid->rxqueue[pos++];
                         /* next 2 bytes should always be 05 00 */
@@ -3290 +2873 @@
                         yid->wcd->to_read = yid->wcd->data_size;
                 }
-                if (header_len >= 13)
-                {
+                if (header_len >= 13) {
                         yid->wcd->packet_type = yid->rxqueue[pos++];
                         yid->wcd->timestamp = yahoo_get32(yid->rxqueue + pos);
@@ -3303 +2885 @@
         begin = pos;
         pos += yid->wcd->to_read;
-        if (pos > yid->rxlen) pos = yid->rxlen;
+        if (pos > yid->rxlen)
+                pos = yid->rxlen;
 
         /* if it is not an image then make sure we have the whole packet */
@@ -3316 +2899 @@
 
         DEBUG_MSG(("packet type %.2X, data length %d", yid->wcd->packet_type,
-                yid->wcd->data_size));
+                        yid->wcd->data_size));
 
         /* find out what kind of packet we got */
-        switch (yid->wcd->packet_type)
-        {
-                case 0x00:
-                        /* user requests to view webcam (uploading) */
-                        if (yid->wcd->data_size &&
-                                yid->wcm->direction == YAHOO_WEBCAM_UPLOAD) {
-                                end = begin;
-                                while (end <= yid->rxlen &&
-                                        yid->rxqueue[end++] != 13);
-                                if (end > begin)
-                                {
-                                        who = y_memdup(yid->rxqueue + begin, end - begin);
-                                        who[end - begin - 1] = 0;
-                                        YAHOO_CALLBACK(ext_yahoo_webcam_viewer)(yd->client_id, who + 2, 2);
-                                        FREE(who);
-                                }
-                        }
-
-                        if (yid->wcm->direction == YAHOO_WEBCAM_DOWNLOAD) {
-                                /* timestamp/status field */
-                                /* 0 = declined viewing permission */
-                                /* 1 = accepted viewing permission */
-                                if (yid->wcd->timestamp == 0) {
-                                        YAHOO_CALLBACK(ext_yahoo_webcam_closed)(yd->client_id, yid->wcm->user, 3);
-                                }
-                        }
-                        break;
-                case 0x01: /* status packets?? */
-                        /* timestamp contains status info */
-                        /* 00 00 00 01 = we have data?? */
-                        break;
-                case 0x02: /* image data */
-                        YAHOO_CALLBACK(ext_yahoo_got_webcam_image)(yd->client_id, 
-                                        yid->wcm->user, yid->rxqueue + begin,
-                                        yid->wcd->data_size, pos - begin,
-                                        yid->wcd->timestamp);
-                        break;
-                case 0x05: /* response packets when uploading */
-                        if (!yid->wcd->data_size) {
-                                YAHOO_CALLBACK(ext_yahoo_webcam_data_request)(yd->client_id, yid->wcd->timestamp);
-                        }
-                        break;
-                case 0x07: /* connection is closing */
-                        switch(reason)
-                        {
-                                case 0x01: /* user closed connection */
-                                        closed = 1;
-                                        break;
-                                case 0x0F: /* user cancelled permission */
-                                        closed = 2;
-                                        break;
-                        }
-                        YAHOO_CALLBACK(ext_yahoo_webcam_closed)(yd->client_id, yid->wcm->user, closed);
-                        break;
-                case 0x0C: /* user connected */
-                case 0x0D: /* user disconnected */
-                        if (yid->wcd->data_size) {
-                                who = y_memdup(yid->rxqueue + begin, pos - begin + 1);
-                                who[pos - begin] = 0;
-                                if (yid->wcd->packet_type == 0x0C)
-                                        connect=1;
-                                else
-                                        connect=0;
-                                YAHOO_CALLBACK(ext_yahoo_webcam_viewer)(yd->client_id, who, connect);
+        switch (yid->wcd->packet_type) {
+        case 0x00:
+                /* user requests to view webcam (uploading) */
+                if (yid->wcd->data_size &&
+                        yid->wcm->direction == YAHOO_WEBCAM_UPLOAD) {
+                        end = begin;
+                        while (end <= yid->rxlen && yid->rxqueue[end++] != 13) ;
+                        if (end > begin) {
+                                who = y_memdup(yid->rxqueue + begin,
+                                        end - begin);
+                                who[end - begin - 1] = 0;
+                                YAHOO_CALLBACK(ext_yahoo_webcam_viewer) (yd->
+                                        client_id, who + 2, 2);
                                 FREE(who);
                         }
-                        break;
-                case 0x13: /* user data */
-                        /* i=user_ip (ip of the user we are viewing) */
-                        /* j=user_ext_ip (external ip of the user we */
-                        /*                are viewing) */
-                        break;
-                case 0x17: /* ?? */
-                        break;
+                }
+
+                if (yid->wcm->direction == YAHOO_WEBCAM_DOWNLOAD) {
+                        /* timestamp/status field */
+                        /* 0 = declined viewing permission */
+                        /* 1 = accepted viewing permission */
+                        if (yid->wcd->timestamp == 0) {
+                                YAHOO_CALLBACK(ext_yahoo_webcam_closed) (yd->
+                                        client_id, yid->wcm->user, 3);
+                        }
+                }
+                break;
+        case 0x01:              /* status packets?? */
+                /* timestamp contains status info */
+                /* 00 00 00 01 = we have data?? */
+                break;
+        case 0x02:              /* image data */
+                YAHOO_CALLBACK(ext_yahoo_got_webcam_image) (yd->client_id,
+                        yid->wcm->user, yid->rxqueue + begin,
+                        yid->wcd->data_size, pos - begin, yid->wcd->timestamp);
+                break;
+        case 0x05:              /* response packets when uploading */
+                if (!yid->wcd->data_size) {
+                        YAHOO_CALLBACK(ext_yahoo_webcam_data_request) (yd->
+                                client_id, yid->wcd->timestamp);
+                }
+                break;
+        case 0x07:              /* connection is closing */
+                switch (reason) {
+                case 0x01:      /* user closed connection */
+                        closed = 1;
+                        break;
+                case 0x0F:      /* user cancelled permission */
+                        closed = 2;
+                        break;
+                }
+                YAHOO_CALLBACK(ext_yahoo_webcam_closed) (yd->client_id,
+                        yid->wcm->user, closed);
+                break;
+        case 0x0C:              /* user connected */
+        case 0x0D:              /* user disconnected */
+                if (yid->wcd->data_size) {
+                        who = y_memdup(yid->rxqueue + begin, pos - begin + 1);
+                        who[pos - begin] = 0;
+                        if (yid->wcd->packet_type == 0x0C)
+                                connect = 1;
+                        else
+                                connect = 0;
+                        YAHOO_CALLBACK(ext_yahoo_webcam_viewer) (yd->client_id,
+                                who, connect);
+                        FREE(who);
+                }
+                break;
+        case 0x13:              /* user data */
+                /* i=user_ip (ip of the user we are viewing) */
+                /* j=user_ext_ip (external ip of the user we */
+                /*                are viewing) */
+                break;
+        case 0x17:              /* ?? */
+                break;
         }
         yid->wcd->to_read -= pos - begin;
@@ -3398 +2982 @@
         yid->rxlen -= pos;
         DEBUG_MSG(("rxlen == %d, rxqueue == %p", yid->rxlen, yid->rxqueue));
-        if (yid->rxlen>0) {
+        if (yid->rxlen > 0) {
                 unsigned char *tmp = y_memdup(yid->rxqueue + pos, yid->rxlen);
                 FREE(yid->rxqueue);
                 yid->rxqueue = tmp;
-                DEBUG_MSG(("new rxlen == %d, rxqueue == %p", yid->rxlen, yid->rxqueue));
+                DEBUG_MSG(("new rxlen == %d, rxqueue == %p", yid->rxlen,
+                                yid->rxqueue));
         } else {
                 DEBUG_MSG(("freed rxqueue == %p", yid->rxqueue));
@@ -3415 +3000 @@
 }
 
-int yahoo_write_ready(int id, int fd, void *data)
+int yahoo_write_ready(int id, void *fd, void *data)
 {
         struct yahoo_input_data *yid = data;
@@ -3421 +3006 @@
         struct data_queue *tx;
 
-        LOG(("write callback: id=%d fd=%d data=%p", id, fd, data));
-        if(!yid || !yid->txqueues || !find_conn_by_id(id))
+        LOG(("write callback: id=%d fd=%p data=%p", id, fd, data));
+        if (!yid || !yid->txqueues)
                 return -2;
-        
+
         tx = yid->txqueues->data;
         LOG(("writing %d bytes", tx->len));
         len = yahoo_send_data(fd, tx->queue, MIN(1024, tx->len));
 
-        if(len == -1 && errno == EAGAIN)
+        if (len == -1 && errno == EAGAIN)
                 return 1;
 
-        if(len <= 0) {
+        if (len <= 0) {
                 int e = errno;
                 DEBUG_MSG(("len == %d (<= 0)", len));
-                while(yid->txqueues) {
-                        YList *l=yid->txqueues;
+                while (yid->txqueues) {
+                        YList *l = yid->txqueues;
                         tx = l->data;
                         free(tx->queue);
                         free(tx);
-                        yid->txqueues = y_list_remove_link(yid->txqueues, yid->txqueues);
+                        yid->txqueues =
+                                y_list_remove_link(yid->txqueues,
+                                yid->txqueues);
                         y_list_free_1(l);
                 }
-                LOG(("yahoo_write_ready(%d, %d) len < 0", id, fd));
-                YAHOO_CALLBACK(ext_yahoo_remove_handler)(id, yid->write_tag);
+                LOG(("yahoo_write_ready(%d, %p) len < 0", id, fd));
+                YAHOO_CALLBACK(ext_yahoo_remove_handler) (id, yid->write_tag);
                 yid->write_tag = 0;
-                errno=e;
+                errno = e;
                 return 0;
         }
@@ -3452 +3039 @@
 
         tx->len -= len;
-        if(tx->len > 0) {
+        if (tx->len > 0) {
                 unsigned char *tmp = y_memdup(tx->queue + len, tx->len);
                 FREE(tx->queue);
                 tx->queue = tmp;
         } else {
-                YList *l=yid->txqueues;
+                YList *l = yid->txqueues;
                 free(tx->queue);
                 free(tx);
-                yid->txqueues = y_list_remove_link(yid->txqueues, yid->txqueues);
+                yid->txqueues =
+                        y_list_remove_link(yid->txqueues, yid->txqueues);
                 y_list_free_1(l);
                 /*
-                if(!yid->txqueues) 
-                        LOG(("yahoo_write_ready(%d, %d) !yxqueues", id, fd));
-                */
-                if(!yid->txqueues) {
-                        LOG(("yahoo_write_ready(%d, %d) !yxqueues", id, fd));
-                        YAHOO_CALLBACK(ext_yahoo_remove_handler)(id, yid->write_tag);
+                   if(!yid->txqueues) 
+                   LOG(("yahoo_write_ready(%d, %d) !yxqueues", id, fd));
+                 */
+                if (!yid->txqueues) {
+                        LOG(("yahoo_write_ready(%d, %p) !txqueues", id, fd));
+                        YAHOO_CALLBACK(ext_yahoo_remove_handler) (id,
+                                yid->write_tag);
                         yid->write_tag = 0;
                 }
@@ -3476 +3065 @@
 }
 
-static void yahoo_process_pager_connection(struct yahoo_input_data *yid, int over)
+static void yahoo_process_pager_connection(struct yahoo_input_data *yid,
+        int over)
 {
         struct yahoo_packet *pkt;
@@ -3482 +3072 @@
         int id = yd->client_id;
 
-        if(over)
-                return;
-
-        while (find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER) 
-                        && (pkt = yahoo_getdata(yid)) != NULL) {
+        if (over)
+                return;
+
+        while (find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER)
+                && (pkt = yahoo_getdata(yid)) != NULL) {
 
                 yahoo_packet_process(yid, pkt);
@@ -3494 +3084 @@
 }
 
-static void yahoo_process_ft_connection(struct yahoo_input_data *yid, int over)
-{
-}
-
-static void yahoo_process_chatcat_connection(struct yahoo_input_data *yid, int over)
-{
-        if(over)
-                return;
-
-        if (strstr((char*)yid->rxqueue+(yid->rxlen-20), "</content>")) {
-                YAHOO_CALLBACK(ext_yahoo_chat_cat_xml)(yid->yd->client_id, (char*)yid->rxqueue);
+static void yahoo_process_chatcat_connection(struct yahoo_input_data *yid,
+        int over)
+{
+        if (over)
+                return;
+
+        if (strstr((char *)yid->rxqueue + (yid->rxlen - 20), "</content>")) {
+                YAHOO_CALLBACK(ext_yahoo_chat_cat_xml) (yid->yd->client_id,
+                        (char *)yid->rxqueue);
         }
 }
@@ -3513 +3101 @@
         struct yab *yab;
         YList *buds;
-        int changed=0;
+        int changed = 0;
         int id = yd->client_id;
-
-        if(over)
-                return;
-
-        while(find_input_by_id_and_type(id, YAHOO_CONNECTION_YAB) 
-                        && (yab = yahoo_getyab(yid)) != NULL) {
-                if(!yab->id)
+        int yab_used = 0;
+
+        LOG(("Got data for YAB"));
+
+        if (over)
+                return;
+
+        while (find_input_by_id_and_type(id, YAHOO_CONNECTION_YAB)
+                && (yab = yahoo_getyab(yid)) != NULL) {
+                if (!yab->id)
                         continue;
-                changed=1;
-                for(buds = yd->buddies; buds; buds=buds->next) {
-                        struct yahoo_buddy * bud = buds->data;
-                        if(!strcmp(bud->id, yab->id)) {
+
+                changed = 1;
+                yab_used = 0;
+                for (buds = yd->buddies; buds; buds = buds->next) {
+                        struct yahoo_buddy *bud = buds->data;
+                        if (!strcmp(bud->id, yab->id)) {
+                                yab_used = 1;
                                 bud->yab_entry = yab;
-                                if(yab->nname) {
+                                if (yab->nname) {
                                         bud->real_name = strdup(yab->nname);
-                                } else if(yab->fname && yab->lname) {
-                                        bud->real_name = y_new0(char, 
-                                                        strlen(yab->fname)+
-                                                        strlen(yab->lname)+2
-                                                        );
+                                } else if (yab->fname && yab->lname) {
+                                        bud->real_name = y_new0(char,
+                                                strlen(yab->fname) +
+                                                strlen(yab->lname) + 2);
                                         sprintf(bud->real_name, "%s %s",
-                                                        yab->fname, yab->lname);
-                                } else if(yab->fname) {
+                                                yab->fname, yab->lname);
+                                } else if (yab->fname) {
                                         bud->real_name = strdup(yab->fname);
                                 }
-                                break; /* for */
+                                break;  /* for */
                         }
                 }
-        }
-
-        if(changed)
-                YAHOO_CALLBACK(ext_yahoo_got_buddies)(yd->client_id, yd->buddies);
-}
-
-static void yahoo_process_search_connection(struct yahoo_input_data *yid, int over)
-{
-        struct yahoo_found_contact *yct=NULL;
+
+                if (!yab_used) {
+                        FREE(yab->fname);
+                        FREE(yab->lname);
+                        FREE(yab->nname);
+                        FREE(yab->id);
+                        FREE(yab->email);
+                        FREE(yab->hphone);
+                        FREE(yab->wphone);
+                        FREE(yab->mphone);
+                        FREE(yab);
+                }
+
+        }
+
+        if (changed)
+                YAHOO_CALLBACK(ext_yahoo_got_buddies) (yd->client_id,
+                        yd->buddies);
+}
+
+static void yahoo_process_search_connection(struct yahoo_input_data *yid,
+        int over)
+{
+        struct yahoo_found_contact *yct = NULL;
         char *p = (char *)yid->rxqueue, *np, *cp;
         int k, n;
-        int start=0, found=0, total=0;
-        YList *contacts=NULL;
-        struct yahoo_input_data *pyid = find_input_by_id_and_type(yid->yd->client_id, YAHOO_CONNECTION_PAGER);
-
-        if(!over || !pyid)
-                return;
-
-        if(p && (p=strstr(p, "\r\n\r\n"))) {
+        int start = 0, found = 0, total = 0;
+        YList *contacts = NULL;
+        struct yahoo_input_data *pyid =
+                find_input_by_id_and_type(yid->yd->client_id,
+                YAHOO_CONNECTION_PAGER);
+
+        if (!over || !pyid)
+                return;
+
+        if (p && (p = strstr(p, "\r\n\r\n"))) {
                 p += 4;
 
-                for(k = 0; (p = strchr(p, 4)) && (k < 4); k++) {
+                for (k = 0; (p = strchr(p, 4)) && (k < 4); k++) {
                         p++;
                         n = atoi(p);
-                        switch(k) {
-                                case 0: found = pyid->ys->lsearch_nfound = n; break;
-                                case 2: start = pyid->ys->lsearch_nstart = n; break;
-                                case 3: total = pyid->ys->lsearch_ntotal = n; break;
+                        switch (k) {
+                        case 0:
+                                found = pyid->ys->lsearch_nfound = n;
+                                break;
+                        case 2:
+                                start = pyid->ys->lsearch_nstart = n;
+                                break;
+                        case 3:
+                                total = pyid->ys->lsearch_ntotal = n;
+                                break;
                         }
                 }
 
-                if(p)
+                if (p)
                         p++;
 
-                k=0;
-                while(p && *p) {
+                k = 0;
+                while (p && *p) {
                         cp = p;
                         np = strchr(p, 4);
 
-                        if(!np)
+                        if (!np)
                                 break;
                         *np = 0;
-                        p = np+1;
-
-                        switch(k++) {
-                                case 1:
-                                        if(strlen(cp) > 2 && y_list_length(contacts) < total) {
-                                                yct = y_new0(struct yahoo_found_contact, 1);
-                                                contacts = y_list_append(contacts, yct);
-                                                yct->id = cp+2;
-                                        } else {
-                                                *p = 0;
-                                        }
-                                        break;
-                                case 2: 
-                                        yct->online = !strcmp(cp, "2") ? 1 : 0;
-                                        break;
-                                case 3: 
-                                        yct->gender = cp;
-                                        break;
-                                case 4: 
-                                        yct->age = atoi(cp);
-                                        break;
-                                case 5: 
-                                        if(strcmp(cp, "5") != 0)
-                                                yct->location = cp;
-                                        k = 0;
-                                        break;
+                        p = np + 1;
+
+                        switch (k++) {
+                        case 1:
+                                if (strlen(cp) > 2
+                                        && y_list_length(contacts) < total) {
+                                        yct = y_new0(struct yahoo_found_contact,
+                                                1);
+                                        contacts = y_list_append(contacts, yct);
+                                        yct->id = cp + 2;
+                                } else {
+                                        *p = 0;
+                                }
+                                break;
+                        case 2:
+                                yct->online = !strcmp(cp, "2") ? 1 : 0;
+                                break;
+                        case 3:
+                                yct->gender = cp;
+                                break;
+                        case 4:
+                                yct->age = atoi(cp);
+                                break;
+                        case 5:
+                                /* not worth the context switch for strcmp */
+                                if (cp[0] != '\005' || cp[1] != '\000')
+                                        yct->location = cp;
+                                k = 0;
+                                break;
                         }
                 }
         }
 
-        YAHOO_CALLBACK(ext_yahoo_got_search_result)(yid->yd->client_id, found, start, total, contacts);
-
-        while(contacts) {
+        YAHOO_CALLBACK(ext_yahoo_got_search_result) (yid->yd->client_id, found,
+                start, total, contacts);
+
+        while (contacts) {
                 YList *node = contacts;
                 contacts = y_list_remove_link(contacts, node);
@@ -3625 +3245 @@
 }
 
-static void _yahoo_webcam_connected(int fd, int error, void *d)
+static void _yahoo_webcam_connected(void *fd, int error, void *d)
 {
         struct yahoo_input_data *yid = d;
@@ -3631 +3251 @@
         struct yahoo_data *yd = yid->yd;
         char conn_type[100];
-        char *data=NULL;
-        char *packet=NULL;
-        unsigned char magic_nr[] = {1, 0, 0, 0, 1};
-        unsigned header_len=0;
-        unsigned int len=0;
-        unsigned int pos=0;
-
-        if(error || fd <= 0) {
+        char *data = NULL;
+        char *packet = NULL;
+        unsigned char magic_nr[] = { 1, 0, 0, 0, 1 };
+        unsigned header_len = 0;
+        unsigned int len = 0;
+        unsigned int pos = 0;
+
+        if (error || !fd) {
                 FREE(yid);
                 return;
@@ -3648 +3268 @@
         LOG(("Connected"));
         /* send initial packet */
-        switch (wcm->direction)
-        {
-                case YAHOO_WEBCAM_DOWNLOAD:
-                        data = strdup("<REQIMG>");
-                        break;
-                case YAHOO_WEBCAM_UPLOAD:       
-                        data = strdup("<SNDIMG>");
-                        break;
-                default:
-                        return;
+        switch (wcm->direction) {
+        case YAHOO_WEBCAM_DOWNLOAD:
+                data = strdup("<REQIMG>");
+                break;
+        case YAHOO_WEBCAM_UPLOAD:
+                data = strdup("<SNDIMG>");
+                break;
+        default:
+                return;
         }
         yahoo_add_to_send_queue(yid, data, strlen(data));
@@ -3663 +3282 @@
 
         /* send data */
-        switch (wcm->direction)
-        {
-                case YAHOO_WEBCAM_DOWNLOAD:
-                        header_len = 8;
-                        data = strdup("a=2\r\nc=us\r\ne=21\r\nu=");
-                        data = y_string_append(data, yd->user);
-                        data = y_string_append(data, "\r\nt=");
-                        data = y_string_append(data, wcm->key);
-                        data = y_string_append(data, "\r\ni=");
-                        data = y_string_append(data, wcm->my_ip);
-                        data = y_string_append(data, "\r\ng=");
-                        data = y_string_append(data, wcm->user);
-                        data = y_string_append(data, "\r\no=w-2-5-1\r\np=");
-                        snprintf(conn_type, sizeof(conn_type), "%d", wcm->conn_type);
-                        data = y_string_append(data, conn_type);
-                        data = y_string_append(data, "\r\n");
-                        break;
-                case YAHOO_WEBCAM_UPLOAD:
-                        header_len = 13;
-                        data = strdup("a=2\r\nc=us\r\nu=");
-                        data = y_string_append(data, yd->user);
-                        data = y_string_append(data, "\r\nt=");
-                        data = y_string_append(data, wcm->key);
-                        data = y_string_append(data, "\r\ni=");
-                        data = y_string_append(data, wcm->my_ip);
-                        data = y_string_append(data, "\r\no=w-2-5-1\r\np=");
-                        snprintf(conn_type, sizeof(conn_type), "%d", wcm->conn_type);
-                        data = y_string_append(data, conn_type);
-                        data = y_string_append(data, "\r\nb=");
-                        data = y_string_append(data, wcm->description);
-                        data = y_string_append(data, "\r\n");
-                        break;
+        switch (wcm->direction) {
+        case YAHOO_WEBCAM_DOWNLOAD:
+                header_len = 8;
+                data = strdup("a=2\r\nc=us\r\ne=21\r\nu=");
+                data = y_string_append(data, yd->user);
+                data = y_string_append(data, "\r\nt=");
+                data = y_string_append(data, wcm->key);
+                data = y_string_append(data, "\r\ni=");
+                data = y_string_append(data, wcm->my_ip);
+                data = y_string_append(data, "\r\ng=");
+                data = y_string_append(data, wcm->user);
+                data = y_string_append(data, "\r\no=w-2-5-1\r\np=");
+                snprintf(conn_type, sizeof(conn_type), "%d", wcm->conn_type);
+                data = y_string_append(data, conn_type);
+                data = y_string_append(data, "\r\n");
+                break;
+        case YAHOO_WEBCAM_UPLOAD:
+                header_len = 13;
+                data = strdup("a=2\r\nc=us\r\nu=");
+                data = y_string_append(data, yd->user);
+                data = y_string_append(data, "\r\nt=");
+                data = y_string_append(data, wcm->key);
+                data = y_string_append(data, "\r\ni=");
+                data = y_string_append(data, wcm->my_ip);
+                data = y_string_append(data, "\r\no=w-2-5-1\r\np=");
+                snprintf(conn_type, sizeof(conn_type), "%d", wcm->conn_type);
+                data = y_string_append(data, conn_type);
+                data = y_string_append(data, "\r\nb=");
+                data = y_string_append(data, wcm->description);
+                data = y_string_append(data, "\r\n");
+                break;
         }
 
@@ -3701 +3319 @@
         packet[pos++] = header_len;
         packet[pos++] = 0;
-        switch (wcm->direction)
-        {
-                case YAHOO_WEBCAM_DOWNLOAD:
-                        packet[pos++] = 1;
-                        packet[pos++] = 0;
-                        break;
-                case YAHOO_WEBCAM_UPLOAD:
-                        packet[pos++] = 5;
-                        packet[pos++] = 0;
-                        break;
+        switch (wcm->direction) {
+        case YAHOO_WEBCAM_DOWNLOAD:
+                packet[pos++] = 1;
+                packet[pos++] = 0;
+                break;
+        case YAHOO_WEBCAM_UPLOAD:
+                packet[pos++] = 5;
+                packet[pos++] = 0;
+                break;
         }
 
         pos += yahoo_put32(packet + pos, len);
-        if (wcm->direction == YAHOO_WEBCAM_UPLOAD)
-        {
+        if (wcm->direction == YAHOO_WEBCAM_UPLOAD) {
                 memcpy(packet + pos, magic_nr, sizeof(magic_nr));
                 pos += sizeof(magic_nr);
@@ -3724 +3340 @@
         FREE(data);
 
-        yid->read_tag=YAHOO_CALLBACK(ext_yahoo_add_handler)(yid->yd->client_id, yid->fd, YAHOO_INPUT_READ, yid);
+        yid->read_tag =
+                YAHOO_CALLBACK(ext_yahoo_add_handler) (yid->yd->client_id,
+                yid->fd, YAHOO_INPUT_READ, yid);
 }
 
@@ -3749 +3367 @@
 
         LOG(("Connecting to: %s:%d", wcm->server, wcm->port));
-        YAHOO_CALLBACK(ext_yahoo_connect_async)(y->yd->client_id, wcm->server, wcm->port,
-                        _yahoo_webcam_connected, yid);
-
-}
-
-static void yahoo_process_webcam_master_connection(struct yahoo_input_data *yid, int over)
-{
-        char* server;
+        YAHOO_CALLBACK(ext_yahoo_connect_async) (y->yd->client_id, wcm->server,
+                wcm->port, _yahoo_webcam_connected, yid, 0);
+
+}
+
+static void yahoo_process_webcam_master_connection(struct yahoo_input_data *yid,
+        int over)
+{
+        char *server;
         struct yahoo_server_settings *yss;
 
-        if(over)
+        if (over)
                 return;
 
         server = yahoo_getwebcam_master(yid);
 
-        if (server)
-        {
+        if (server) {
                 yss = yid->yd->server_settings;
                 yid->wcm->server = strdup(server);
@@ -3778 +3396 @@
 }
 
-static void yahoo_process_webcam_connection(struct yahoo_input_data *yid, int over)
+static void yahoo_process_webcam_connection(struct yahoo_input_data *yid,
+        int over)
 {
         int id = yid->yd->client_id;
-        int fd = yid->fd;
-
-        if(over)
+        void *fd = yid->fd;
+
+        if (over)
                 return;
 
         /* as long as we still have packets available keep processing them */
-        while (find_input_by_id_and_fd(id, fd) 
-                        && yahoo_get_webcam_data(yid) == 1);
-}
-
-static void (*yahoo_process_connection[])(struct yahoo_input_data *, int over) = {
-        yahoo_process_pager_connection,
-        yahoo_process_ft_connection,
-        yahoo_process_yab_connection,
-        yahoo_process_webcam_master_connection,
-        yahoo_process_webcam_connection,
-        yahoo_process_chatcat_connection,
-        yahoo_process_search_connection,
-};
-
-int yahoo_read_ready(int id, int fd, void *data)
+        while (find_input_by_id_and_fd(id, fd)
+                && yahoo_get_webcam_data(yid) == 1) ;
+}
+
+static void (*yahoo_process_connection[]) (struct yahoo_input_data *,
+        int over) = {
+yahoo_process_pager_connection, yahoo_process_ft_connection,
+                yahoo_process_yab_connection,
+                yahoo_process_webcam_master_connection,
+                yahoo_process_webcam_connection,
+                yahoo_process_chatcat_connection,
+                yahoo_process_search_connection};
+
+int yahoo_read_ready(int id, void *fd, void *data)
 {
         struct yahoo_input_data *yid = data;
@@ -3807 +3425 @@
         int len;
 
-        LOG(("read callback: id=%d fd=%d data=%p", id, fd, data));
-        if(!yid)
+        LOG(("read callback: id=%d fd=%p data=%p", id, fd, data));
+        if (!yid)
                 return -2;
 
-        
         do {
-                len = read(fd, buf, sizeof(buf));
-        } while(len == -1 && errno == EINTR);
-
-        if(len == -1 && (errno == EAGAIN||errno == EINTR))      /* we'll try again later */
+                len = YAHOO_CALLBACK(ext_yahoo_read) (fd, buf, sizeof(buf));
+        } while (len == -1 && errno == EINTR);
+
+        if (len == -1 && (errno == EAGAIN || errno == EINTR))   /* we'll try again later */
                 return 1;
 
@@ -3823 +3440 @@
                 DEBUG_MSG(("len == %d (<= 0)", len));
 
-                if(yid->type == YAHOO_CONNECTION_PAGER) {
-                        YAHOO_CALLBACK(ext_yahoo_error)(yid->yd->client_id, "Connection closed by server", 1, E_CONNECTION);
-                }
-
-                yahoo_process_connection[yid->type](yid, 1);
+                if (yid->type == YAHOO_CONNECTION_PAGER) {
+                        YAHOO_CALLBACK(ext_yahoo_login_response) (yid->yd->
+                                client_id, YAHOO_LOGIN_SOCK, NULL);
+                }
+
+                yahoo_process_connection[yid->type] (yid, 1);
                 yahoo_input_close(yid);
 
                 /* no need to return an error, because we've already fixed it */
-                if(len == 0)
+                if (len == 0)
                         return 1;
 
-                errno=e;
+                errno = e;
                 LOG(("read error: %s", strerror(errno)));
                 return -1;
         }
 
-        yid->rxqueue = y_renew(unsigned char, yid->rxqueue, len + yid->rxlen);
+        yid->rxqueue =
+                y_renew(unsigned char, yid->rxqueue, len + yid->rxlen + 1);
         memcpy(yid->rxqueue + yid->rxlen, buf, len);
         yid->rxlen += len;
-
-        yahoo_process_connection[yid->type](yid, 0);
+        yid->rxqueue[yid->rxlen] = 0;
+
+        yahoo_process_connection[yid->type] (yid, 0);
 
         return len;
@@ -3855 +3475 @@
         yd = y_new0(struct yahoo_data, 1);
 
-        if(!yd)
+        if (!yd)
                 return 0;
 
@@ -3880 +3500 @@
 }
 
-struct connect_callback_data {
-        struct yahoo_data *yd;
-        int tag;
-        int i;
-};
-
-static void yahoo_connected(int fd, int error, void *data)
+static void yahoo_connected(void *fd, int error, void *data)
 {
         struct connect_callback_data *ccd = data;
@@ -3894 +3508 @@
         struct yahoo_server_settings *yss = yd->server_settings;
 
-        if(error) {
-                if(fallback_ports[ccd->i]) {
-                        int tag;
+        if (error) {
+                int tag;
+                if (fallback_ports[ccd->i]) {
+                        char *host = yss->pager_host;
+
+                        if (!host)
+                                host = yss->pager_host_list[ccd->server_i];
+
                         yss->pager_port = fallback_ports[ccd->i++];
-                        tag = YAHOO_CALLBACK(ext_yahoo_connect_async)(yd->client_id, yss->pager_host,
-                                        yss->pager_port, yahoo_connected, ccd);
-
-                        if(tag > 0)
-                                ccd->tag=tag;
+                        tag = YAHOO_CALLBACK(ext_yahoo_connect_async) (yd->
+                                client_id, host, yss->pager_port,
+                                yahoo_connected, ccd, 0);
+
+                        if (tag > 0)
+                                ccd->tag = tag;
+                } else if (yss->pager_host_list
+                                && yss->pager_host_list[ccd->server_i]) {
+
+                        /* Get back to the default port */
+                        yss->pager_port = pager_port;
+                        ccd->server_i++;
+                        LOG(("Fallback: Connecting to %s:%d", yss->pager_host_list[ccd->server_i], yss->pager_port));
+
+                        ccd->i = 0;
+                        tag = YAHOO_CALLBACK(ext_yahoo_connect_async) (yd->client_id,
+                                yss->pager_host_list[ccd->server_i], yss->pager_port,
+                                yahoo_connected, ccd, 0);
                 } else {
                         FREE(ccd);
-                        YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, YAHOO_LOGIN_SOCK, NULL);
+                        YAHOO_CALLBACK(ext_yahoo_login_response) (yd->client_id,
+                                YAHOO_LOGIN_SOCK, NULL);
                 }
                 return;
@@ -3912 +3545 @@
         FREE(ccd);
 
-        /* fd < 0 && error == 0 means connect was cancelled */
-        if(fd < 0)
-                return;
-
-        pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH, YAHOO_STATUS_AVAILABLE, yd->session_id);
+        /* fd == NULL && error == 0 means connect was cancelled */
+        if (!fd)
+                return;
+
+        pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH, YPACKET_STATUS_DEFAULT,
+                yd->session_id);
         NOTICE(("Sending initial packet"));
 
         yahoo_packet_hash(pkt, 1, yd->user);
 
-        yid = y_new0(struct yahoo_input_data, 1);
-        yid->yd = yd;
+        yid = find_input_by_id_and_type(yd->client_id, YAHOO_CONNECTION_PAGER);
         yid->fd = fd;
-        inputs = y_list_prepend(inputs, yid);
 
         yahoo_send_packet(yid, pkt, 0);
@@ -3930 +3562 @@
         yahoo_packet_free(pkt);
 
-        yid->read_tag=YAHOO_CALLBACK(ext_yahoo_add_handler)(yid->yd->client_id, yid->fd, YAHOO_INPUT_READ, yid);
-}
-
-void yahoo_login(int id, int initial)
-{
-        struct yahoo_data *yd = find_conn_by_id(id);
-        struct connect_callback_data *ccd;
-        struct yahoo_server_settings *yss;
-        int tag;
-
-        if(!yd)
-                return;
-
-        yss = yd->server_settings;
-
-        yd->initial_status = initial;
-
-        ccd = y_new0(struct connect_callback_data, 1);
-        ccd->yd = yd;
-        tag = YAHOO_CALLBACK(ext_yahoo_connect_async)(yd->client_id, yss->pager_host, yss->pager_port, 
-                        yahoo_connected, ccd);
-
-        /*
-         * if tag <= 0, then callback has already been called
-         * so ccd will have been freed
-         */
-        if(tag > 0)
-                ccd->tag = tag;
-        else if(tag < 0)
-                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, YAHOO_LOGIN_SOCK, NULL);
-}
-
-
-int yahoo_get_fd(int id)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
-        if(!yid)
+        yid->read_tag =
+                YAHOO_CALLBACK(ext_yahoo_add_handler) (yid->yd->client_id,
+                yid->fd, YAHOO_INPUT_READ, yid);
+}
+
+void *yahoo_get_fd(int id)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        if (!yid)
                 return 0;
         else
@@ -3972 +3577 @@
 }
 
-void yahoo_send_im(int id, const char *from, const char *who, const char *what, int utf8, int picture)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+void yahoo_send_buzz(int id, const char *from, const char *who)
+{
+        yahoo_send_im(id, from, who, "<ding>", 1, 0);
+}
+
+void yahoo_send_im(int id, const char *from, const char *who, const char *what,
+        int utf8, int picture)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_packet *pkt = NULL;
         struct yahoo_data *yd;
         char pic_str[10];
 
-        if(!yid)
+        if (!yid)
                 return;
 
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE, yd->session_id);
+        pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE,
+                yd->session_id);
 
         snprintf(pic_str, sizeof(pic_str), "%d", picture);
-        
-        if(from && strcmp(from, yd->user))
+
+        if (from && strcmp(from, yd->user))
                 yahoo_packet_hash(pkt, 0, yd->user);
-        yahoo_packet_hash(pkt, 1, from?from:yd->user);
+        yahoo_packet_hash(pkt, 1, from ? from : yd->user);
         yahoo_packet_hash(pkt, 5, who);
         yahoo_packet_hash(pkt, 14, what);
 
-        if(utf8)
+        if (utf8)
                 yahoo_packet_hash(pkt, 97, "1");
 
@@ -4001 +3614 @@
         yahoo_packet_hash(pkt, 206, pic_str);
 
-
         yahoo_send_packet(yid, pkt, 0);
 
@@ -4009 +3621 @@
 void yahoo_send_typing(int id, const char *from, const char *who, int typ)
 {
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt = NULL;
-        if(!yid)
+        if (!yid)
                 return;
 
         yd = yid->yd;
-        pkt = yahoo_packet_new(YAHOO_SERVICE_NOTIFY, YAHOO_STATUS_NOTIFY, yd->session_id);
+        pkt = yahoo_packet_new(YAHOO_SERVICE_NOTIFY, YPACKET_STATUS_NOTIFY,
+                yd->session_id);
 
         yahoo_packet_hash(pkt, 5, who);
-        yahoo_packet_hash(pkt, 1, from?from:yd->user);
+        yahoo_packet_hash(pkt, 1, from ? from : yd->user);
         yahoo_packet_hash(pkt, 14, " ");
         yahoo_packet_hash(pkt, 13, typ ? "1" : "0");
@@ -4031 +3645 @@
 void yahoo_set_away(int id, enum yahoo_status state, const char *msg, int away)
 {
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt = NULL;
@@ -4037 +3652 @@
         char s[4];
 
-        if(!yid)
+        if (!yid)
                 return;
 
         yd = yid->yd;
+
         old_status = yd->current_status;
         yd->current_status = state;
@@ -4046 +3662 @@
         /* Thank you libpurple :) */
         if (yd->current_status == YAHOO_STATUS_INVISIBLE) {
-                pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBILITY, YAHOO_STATUS_AVAILABLE, 0);
+                pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE,
+                        YAHOO_STATUS_AVAILABLE, 0);
                 yahoo_packet_hash(pkt, 13, "2");
                 yahoo_send_packet(yid, pkt, 0);
@@ -4054 +3671 @@
         }
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_STATUS_UPDATE, yd->current_status, yd->session_id);
+        pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_STATUS_UPDATE,
+                yd->current_status, yd->session_id);
         snprintf(s, sizeof(s), "%d", yd->current_status);
         yahoo_packet_hash(pkt, 10, s);
@@ -4062 +3680 @@
         yahoo_packet_free(pkt);
 
-        if(old_status == YAHOO_STATUS_INVISIBLE) {
-                pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBILITY, YAHOO_STATUS_AVAILABLE, 0);
+        if (old_status == YAHOO_STATUS_INVISIBLE) {
+                pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE,
+                        YAHOO_STATUS_AVAILABLE, 0);
                 yahoo_packet_hash(pkt, 13, "1");
                 yahoo_send_packet(yid, pkt, 0);
@@ -4072 +3691 @@
 void yahoo_logoff(int id)
 {
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt = NULL;
 
-        if(!yid)
+        if (!yid)
                 return;
         yd = yid->yd;
@@ -4082 +3702 @@
         LOG(("yahoo_logoff: current status: %d", yd->current_status));
 
-        if(yd->current_status != -1 && 0) {
+        if (yd->current_status != -1 && 0) {
                 /* Meh. Don't send this. The event handlers are not going to
                    get to do this so it'll just leak memory. And the TCP
                    connection reset will hopefully be clear enough. */
-                pkt = yahoo_packet_new(YAHOO_SERVICE_LOGOFF, YAHOO_STATUS_AVAILABLE, yd->session_id);
+                pkt = yahoo_packet_new(YAHOO_SERVICE_LOGOFF,
+                        YPACKET_STATUS_DEFAULT, yd->session_id);
                 yd->current_status = -1;
 
@@ -4095 +3716 @@
         }
 
-        do {
+/*      do {
                 yahoo_input_close(yid);
-        } while((yid = find_input_by_id(id)));
+        } while((yid = find_input_by_id(id)));*/
+
 }
 
 void yahoo_get_list(int id)
 {
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt = NULL;
 
-        if(!yid)
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_LIST, YAHOO_STATUS_AVAILABLE, yd->session_id);
+        pkt = yahoo_packet_new(YAHOO_SERVICE_LIST, YPACKET_STATUS_DEFAULT,
+                yd->session_id);
         yahoo_packet_hash(pkt, 1, yd->user);
         if (pkt) {
@@ -4118 +3742 @@
 }
 
-static void _yahoo_http_connected(int id, int fd, int error, void *data)
+static void _yahoo_http_connected(int id, void *fd, int error, void *data)
 {
         struct yahoo_input_data *yid = data;
-        if(fd <= 0) {
+        if (fd == NULL || error) {
                 inputs = y_list_remove(inputs, yid);
                 FREE(yid);
@@ -4128 +3752 @@
 
         yid->fd = fd;
-        yid->read_tag=YAHOO_CALLBACK(ext_yahoo_add_handler)(yid->yd->client_id, fd, YAHOO_INPUT_READ, yid);
-}
-
+        yid->read_tag =
+                YAHOO_CALLBACK(ext_yahoo_add_handler) (yid->yd->client_id, fd,
+                YAHOO_INPUT_READ, yid);
+}
+
+/* FIXME Get address book from address.yahoo.com instead */
 void yahoo_get_yab(int id)
 {
+        struct yahoo_data *yd = find_conn_by_id(id);
+        struct yahoo_input_data *yid;
+        char url[1024];
+        char buff[2048];
+
+        if (!yd)
+                return;
+
+        yid = y_new0(struct yahoo_input_data, 1);
+        yid->yd = yd;
+        yid->type = YAHOO_CONNECTION_YAB;
+
+        LOG(("Sending request for Address Book"));
+
+        snprintf(url, 1024,
+                "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us"
+                "&diffs=1&t=0&tags=short&rt=0&prog-ver=8.1.0.249&useutf8=1&legenc=codepage-1252");
+
+        snprintf(buff, sizeof(buff), "Y=%s; T=%s", yd->cookie_y, yd->cookie_t);
+
+        inputs = y_list_prepend(inputs, yid);
+
+        yahoo_http_get(yid->yd->client_id, url, buff, 0, 0,
+                _yahoo_http_connected, yid);
+}
+
+struct yahoo_post_data {
+        struct yahoo_input_data *yid;
+        char *data;
+};
+
+static void _yahoo_http_post_connected(int id, void *fd, int error, void *data)
+{
+        struct yahoo_post_data *yad = data;
+        struct yahoo_input_data *yid = yad->yid;
+        char *buff = yad->data;
+
+        if (!fd) {
+                inputs = y_list_remove(inputs, yid);
+                FREE(yid);
+                return;
+        }
+
+        YAHOO_CALLBACK(ext_yahoo_write) (fd, buff, strlen(buff));
+
+        yid->fd = fd;
+        yid->read_tag =
+                YAHOO_CALLBACK(ext_yahoo_add_handler) (yid->yd->client_id, fd,
+                YAHOO_INPUT_READ, yid);
+
+        FREE(buff);
+        FREE(yad);
+}
+
+/* FIXME This is also likely affected */
+void yahoo_set_yab(int id, struct yab *yab)
+{
+        struct yahoo_post_data *yad = y_new0(struct yahoo_post_data, 1);
         struct yahoo_data *yd = find_conn_by_id(id);
         struct yahoo_input_data *yid;
         char url[1024];
         char buff[1024];
-
-        if(!yd)
-                return;
-
-        yid = y_new0(struct yahoo_input_data, 1);
-        yid->yd = yd;
-        yid->type = YAHOO_CONNECTION_YAB;
-
-        snprintf(url, 1024, "http://insider.msg.yahoo.com/ycontent/?ab2=0");
-
-        snprintf(buff, sizeof(buff), "Y=%s; T=%s",
-                        yd->cookie_y, yd->cookie_t);
-
-        inputs = y_list_prepend(inputs, yid);
-
-        yahoo_http_get(yid->yd->client_id, url, buff, 
-                        _yahoo_http_connected, yid);
-}
-
-void yahoo_set_yab(int id, struct yab * yab)
-{
-        struct yahoo_data *yd = find_conn_by_id(id);
-        struct yahoo_input_data *yid;
-        char url[1024];
-        char buff[1024];
-        char *temp;
-        int size = sizeof(url)-1;
-
-        if(!yd)
+        char post[1024];
+        int size = 0;
+
+        if (!yd)
                 return;
 
@@ -4172 +3832 @@
         yid->yd = yd;
 
-        strncpy(url, "http://insider.msg.yahoo.com/ycontent/?addab2=0", size);
-
-        if(yab->dbid) {
-                /* change existing yab */
-                char tmp[32];
-                strncat(url, "&ee=1&ow=1&id=", size - strlen(url));
-                snprintf(tmp, sizeof(tmp), "%d", yab->dbid);
-                strncat(url, tmp, size - strlen(url));
-        }
-
-        if(yab->fname) {
-                strncat(url, "&fn=", size - strlen(url));
-                temp = yahoo_urlencode(yab->fname);
-                strncat(url, temp, size - strlen(url));
-                free(temp);
-        }
-        if(yab->lname) {
-                strncat(url, "&ln=", size - strlen(url));
-                temp = yahoo_urlencode(yab->lname);
-                strncat(url, temp, size - strlen(url));
-                free(temp);
-        }
-        strncat(url, "&yid=", size - strlen(url));
-        temp = yahoo_urlencode(yab->id);
-        strncat(url, temp, size - strlen(url));
-        free(temp);
-        if(yab->nname) {
-                strncat(url, "&nn=", size - strlen(url));
-                temp = yahoo_urlencode(yab->nname);
-                strncat(url, temp, size - strlen(url));
-                free(temp);
-        }
-        if(yab->email) {
-                strncat(url, "&e=", size - strlen(url));
-                temp = yahoo_urlencode(yab->email);
-                strncat(url, temp, size - strlen(url));
-                free(temp);
-        }
-        if(yab->hphone) {
-                strncat(url, "&hp=", size - strlen(url));
-                temp = yahoo_urlencode(yab->hphone);
-                strncat(url, temp, size - strlen(url));
-                free(temp);
-        }
-        if(yab->wphone) {
-                strncat(url, "&wp=", size - strlen(url));
-                temp = yahoo_urlencode(yab->wphone);
-                strncat(url, temp, size - strlen(url));
-                free(temp);
-        }
-        if(yab->mphone) {
-                strncat(url, "&mp=", size - strlen(url));
-                temp = yahoo_urlencode(yab->mphone);
-                strncat(url, temp, size - strlen(url));
-                free(temp);
-        }
-        strncat(url, "&pp=0", size - strlen(url));
-
-        snprintf(buff, sizeof(buff), "Y=%s; T=%s",
-                        yd->cookie_y, yd->cookie_t);
+        if(yab->yid)
+                size = snprintf(post, sizeof(post), "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+                        "<ab k=\"%s\" cc=\"%d\">"
+                        "<ct id=\"%d\" e=\"1\" yi=\"%s\" nn=\"%s\" />"
+                        "</ab>", yd->user, 9, yab->yid, /* Don't know why */
+                        yab->id, yab->nname?yab->nname:"");
+        else
+                size = snprintf(post, sizeof(post), "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+                        "<ab k=\"%s\" cc=\"%d\">"
+                        "<ct a=\"1\" yi=\"%s\" nn=\"%s\" />"
+                        "</ab>", yd->user, 1,   /* Don't know why */
+                        yab->id, yab->nname?yab->nname:"");
+
+        yad->yid = yid;
+        yad->data = strdup(post);
+
+        strcpy(url, "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us"
+                "&sync=1&tags=short&noclear=1&useutf8=1&legenc=codepage-1252");
+
+        snprintf(buff, sizeof(buff), "Y=%s; T=%s", yd->cookie_y, yd->cookie_t);
 
         inputs = y_list_prepend(inputs, yid);
 
-        yahoo_http_get(yid->yd->client_id, url, buff, 
-                        _yahoo_http_connected, yid);
-}
-
-void yahoo_set_identity_status(int id, const char * identity, int active)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        yahoo_http_post(yid->yd->client_id, url, buff, size,
+                _yahoo_http_post_connected, yad);
+}
+
+void yahoo_set_identity_status(int id, const char *identity, int active)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt = NULL;
 
-        if(!yid)
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(active?YAHOO_SERVICE_IDACT:YAHOO_SERVICE_IDDEACT,
-                        YAHOO_STATUS_AVAILABLE, yd->session_id);
+        pkt = yahoo_packet_new(active ? YAHOO_SERVICE_IDACT :
+                YAHOO_SERVICE_IDDEACT, YPACKET_STATUS_DEFAULT, yd->session_id);
         yahoo_packet_hash(pkt, 3, identity);
         if (pkt) {
@@ -4260 +3881 @@
 void yahoo_refresh(int id)
 {
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt = NULL;
 
-        if(!yid)
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_USERSTAT, YAHOO_STATUS_AVAILABLE, yd->session_id);
+        pkt = yahoo_packet_new(YAHOO_SERVICE_USERSTAT, YPACKET_STATUS_DEFAULT,
+                yd->session_id);
         if (pkt) {
                 yahoo_send_packet(yid, pkt, 0);
@@ -4277 +3900 @@
 void yahoo_keepalive(int id)
 {
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
-        struct yahoo_packet *pkt=NULL;
-        if(!yid)
+        struct yahoo_packet *pkt = NULL;
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_PING, YAHOO_STATUS_AVAILABLE, yd->session_id);
+        pkt = yahoo_packet_new(YAHOO_SERVICE_PING, YPACKET_STATUS_DEFAULT,
+                yd->session_id);
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);
 }
 
-void yahoo_chat_keepalive (int id)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type (id, YAHOO_CONNECTION_PAGER);
+void yahoo_chat_keepalive(int id)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt = NULL;
 
         if (!yid)
-            return;
+                return;
 
         yd = yid->yd;
 
-        pkt = yahoo_packet_new (YAHOO_SERVICE_CHATPING, YAHOO_STATUS_AVAILABLE, yd->session_id);
-        yahoo_send_packet (yid, pkt, 0);
-        yahoo_packet_free (pkt);
-}
-
-void yahoo_add_buddy(int id, const char *who, const char *group, const char *msg)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        pkt = yahoo_packet_new(YAHOO_SERVICE_CHATPING, YPACKET_STATUS_DEFAULT,
+                yd->session_id);
+        yahoo_send_packet(yid, pkt, 0);
+        yahoo_packet_free(pkt);
+}
+
+void yahoo_add_buddy(int id, const char *who, const char *group,
+        const char *msg)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt;
 
-        if(!yid)
+        if (!yid)
                 return;
         yd = yid->yd;
@@ -4318 +3947 @@
                 return;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_ADDBUDDY, YPACKET_STATUS_DEFAULT, yd->session_id);
-
-        if (msg != NULL) /* add message/request "it's me add me" */
+        pkt = yahoo_packet_new(YAHOO_SERVICE_ADDBUDDY, YPACKET_STATUS_DEFAULT,
+                yd->session_id);
+        if (msg != NULL)        /* add message/request "it's me add me" */
                 yahoo_packet_hash(pkt, 14, msg);
         else
-                yahoo_packet_hash(pkt,14,"");
-
+                yahoo_packet_hash(pkt, 14, "");
         yahoo_packet_hash(pkt, 65, group);
         yahoo_packet_hash(pkt, 97, "1");
@@ -4334 +3962 @@
         yahoo_packet_hash(pkt, 301, "319");
         yahoo_packet_hash(pkt, 303, "319");
-
-
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);
@@ -4342 +3968 @@
 void yahoo_remove_buddy(int id, const char *who, const char *group)
 {
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt = NULL;
 
-        if(!yid)
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_REMBUDDY, YAHOO_STATUS_AVAILABLE, yd->session_id);
+        pkt = yahoo_packet_new(YAHOO_SERVICE_REMBUDDY, YPACKET_STATUS_DEFAULT,
+                yd->session_id);
 
         yahoo_packet_hash(pkt, 1, yd->user);
@@ -4359 +3987 @@
 }
 
-void yahoo_accept_buddy_ymsg13(int id,const char* me,const char* who){
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+void yahoo_confirm_buddy(int id, const char *who, int reject, const char *msg)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
-
-        if(!yid)
+        struct yahoo_packet *pkt;
+
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        struct yahoo_packet* pkt=NULL;
-        pkt= yahoo_packet_new(YAHOO_SERVICE_CONTACT_YMSG13,YAHOO_STATUS_AVAILABLE,0);
-
-        yahoo_packet_hash(pkt,1,me ?: yd->user);        
-        yahoo_packet_hash(pkt,5,who);
-        yahoo_packet_hash(pkt,13,"1");
-        yahoo_packet_hash(pkt,334,"0");
+        if (!yd->logged_in)
+                return;
+
+        pkt = yahoo_packet_new(YAHOO_SERVICE_Y7_AUTHORIZATION,
+                YPACKET_STATUS_DEFAULT, yd->session_id);
+        yahoo_packet_hash(pkt, 1, yd->user);
+        yahoo_packet_hash(pkt, 5, who);
+        if (reject)
+                yahoo_packet_hash(pkt, 13, "2");
+        else {
+                yahoo_packet_hash(pkt, 241, "0");
+                yahoo_packet_hash(pkt, 13, "1");
+        }
+
+        yahoo_packet_hash(pkt, 334, "0");
+
+        if (reject) {
+                yahoo_packet_hash(pkt, 14, msg ? msg : "");
+                yahoo_packet_hash(pkt, 97, "1");
+        }
+
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);
 }
 
-void yahoo_reject_buddy_ymsg13(int id,const char* me,const char* who,const char* msg){
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+void yahoo_ignore_buddy(int id, const char *who, int unignore)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
-
-        if(!yid)
+        struct yahoo_packet *pkt;
+
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        struct yahoo_packet* pkt=NULL;
-        pkt= yahoo_packet_new(YAHOO_SERVICE_CONTACT_YMSG13,YAHOO_STATUS_AVAILABLE,0);
-
-        yahoo_packet_hash(pkt,1,me ?: yd->user);        
-        yahoo_packet_hash(pkt,5,who);
-//      yahoo_packet_hash(pkt,241,YAHOO_PROTO_VER);
-        yahoo_packet_hash(pkt,13,"2");
-        yahoo_packet_hash(pkt,334,"0");
-        yahoo_packet_hash(pkt,97,"1");
-        yahoo_packet_hash(pkt,14,msg?:"");
-
+        if (!yd->logged_in)
+                return;
+
+        pkt = yahoo_packet_new(YAHOO_SERVICE_IGNORECONTACT,
+                YPACKET_STATUS_DEFAULT, yd->session_id);
+        yahoo_packet_hash(pkt, 1, yd->user);
+        yahoo_packet_hash(pkt, 7, who);
+        yahoo_packet_hash(pkt, 13, unignore ? "2" : "1");
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);
-
-}
-
-void yahoo_reject_buddy(int id, const char *who, const char *msg)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+}
+
+void yahoo_stealth_buddy(int id, const char *who, int unstealth)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt;
 
-        if(!yid)
+        if (!yid)
                 return;
         yd = yid->yd;
@@ -4415 +4060 @@
                 return;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_REJECTCONTACT, YAHOO_STATUS_AVAILABLE, yd->session_id);
+        pkt = yahoo_packet_new(YAHOO_SERVICE_STEALTH_PERM,
+                YPACKET_STATUS_DEFAULT, yd->session_id);
         yahoo_packet_hash(pkt, 1, yd->user);
         yahoo_packet_hash(pkt, 7, who);
-        yahoo_packet_hash(pkt, 14, msg);
-        yahoo_send_packet(yid, pkt, 0);
-        yahoo_packet_free(pkt);
-}
-
-void yahoo_ignore_buddy(int id, const char *who, int unignore)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
-        struct yahoo_data *yd;
-        struct yahoo_packet *pkt;
-
-        if(!yid)
-                return;
-        yd = yid->yd;
-
-        if (!yd->logged_in)
-                return;
-
-        pkt = yahoo_packet_new(YAHOO_SERVICE_IGNORECONTACT, YAHOO_STATUS_AVAILABLE, yd->session_id);
-        yahoo_packet_hash(pkt, 1, yd->user);
-        yahoo_packet_hash(pkt, 7, who);
-        yahoo_packet_hash(pkt, 13, unignore?"2":"1");
-        yahoo_send_packet(yid, pkt, 0);
-        yahoo_packet_free(pkt);
-}
-
-void yahoo_stealth_buddy(int id, const char *who, int unstealth)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
-        struct yahoo_data *yd;
-        struct yahoo_packet *pkt;
-
-        if(!yid)
-                return;
-        yd = yid->yd;
-
-        if (!yd->logged_in)
-                return;
-
-        pkt = yahoo_packet_new(YAHOO_SERVICE_STEALTH, YAHOO_STATUS_AVAILABLE, yd->session_id);
-        yahoo_packet_hash(pkt, 1, yd->user);
-        yahoo_packet_hash(pkt, 7, who);
-        yahoo_packet_hash(pkt, 31, unstealth?"2":"1");
+        yahoo_packet_hash(pkt, 31, unstealth ? "2" : "1");
         yahoo_packet_hash(pkt, 13, "2");
         yahoo_send_packet(yid, pkt, 0);
@@ -4466 +4070 @@
 }
 
-void yahoo_change_buddy_group(int id, const char *who, const char *old_group, const char *new_group)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+void yahoo_change_buddy_group(int id, const char *who, const char *old_group,
+        const char *new_group)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt = NULL;
 
-        if(!yid)
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_ADDBUDDY, YAHOO_STATUS_AVAILABLE, yd->session_id);
+        pkt = yahoo_packet_new(YAHOO_SERVICE_Y7_CHANGE_GROUP,
+                YPACKET_STATUS_DEFAULT, yd->session_id);
         yahoo_packet_hash(pkt, 1, yd->user);
+        yahoo_packet_hash(pkt, 302, "240");
+        yahoo_packet_hash(pkt, 300, "240");
         yahoo_packet_hash(pkt, 7, who);
-        yahoo_packet_hash(pkt, 65, new_group);
-        yahoo_packet_hash(pkt, 14, " ");
+        yahoo_packet_hash(pkt, 224, old_group);
+        yahoo_packet_hash(pkt, 264, new_group);
+        yahoo_packet_hash(pkt, 301, "240");
+        yahoo_packet_hash(pkt, 303, "240");
 
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);
-
-        pkt = yahoo_packet_new(YAHOO_SERVICE_REMBUDDY, YAHOO_STATUS_AVAILABLE, yd->session_id);
-        yahoo_packet_hash(pkt, 1, yd->user);
-        yahoo_packet_hash(pkt, 7, who);
-        yahoo_packet_hash(pkt, 65, old_group);
-        yahoo_send_packet(yid, pkt, 0);
-        yahoo_packet_free(pkt);
 }
 
 void yahoo_group_rename(int id, const char *old_group, const char *new_group)
 {
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt = NULL;
 
-        if(!yid)
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_GROUPRENAME, YAHOO_STATUS_AVAILABLE, yd->session_id);
+        pkt = yahoo_packet_new(YAHOO_SERVICE_GROUPRENAME,
+                YPACKET_STATUS_DEFAULT, yd->session_id);
         yahoo_packet_hash(pkt, 1, yd->user);
         yahoo_packet_hash(pkt, 65, old_group);
@@ -4512 +4118 @@
 }
 
-void yahoo_conference_addinvite(int id, const char * from, const char *who, const char *room, const YList * members, const char *msg)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+void yahoo_conference_addinvite(int id, const char *from, const char *who,
+        const char *room, const YList *members, const char *msg)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt;
-                
-        if(!yid)
+
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_CONFADDINVITE, YAHOO_STATUS_AVAILABLE, yd->session_id);
-
-        yahoo_packet_hash(pkt, 1, (from?from:yd->user));
+        pkt = yahoo_packet_new(YAHOO_SERVICE_CONFADDINVITE,
+                YPACKET_STATUS_DEFAULT, yd->session_id);
+
+        yahoo_packet_hash(pkt, 1, (from ? from : yd->user));
         yahoo_packet_hash(pkt, 51, who);
         yahoo_packet_hash(pkt, 57, room);
         yahoo_packet_hash(pkt, 58, msg);
         yahoo_packet_hash(pkt, 13, "0");
-        for(; members; members = members->next) {
+        for (; members; members = members->next) {
                 yahoo_packet_hash(pkt, 52, (char *)members->data);
                 yahoo_packet_hash(pkt, 53, (char *)members->data);
@@ -4540 +4149 @@
 }
 
-void yahoo_conference_invite(int id, const char * from, YList *who, const char *room, const char *msg)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+void yahoo_conference_invite(int id, const char *from, YList *who,
+        const char *room, const char *msg)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt;
-                
-        if(!yid)
+
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_CONFINVITE, YAHOO_STATUS_AVAILABLE, yd->session_id);
-
-        yahoo_packet_hash(pkt, 1, (from?from:yd->user));
+        pkt = yahoo_packet_new(YAHOO_SERVICE_CONFINVITE, YPACKET_STATUS_DEFAULT,
+                yd->session_id);
+
+        yahoo_packet_hash(pkt, 1, (from ? from : yd->user));
         yahoo_packet_hash(pkt, 50, yd->user);
-        for(; who; who = who->next) {
+        for (; who; who = who->next) {
                 yahoo_packet_hash(pkt, 52, (char *)who->data);
         }
@@ -4566 +4178 @@
 }
 
-void yahoo_conference_logon(int id, const char *from, YList *who, const char *room)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+void yahoo_conference_logon(int id, const char *from, YList *who,
+        const char *room)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt;
-                
-        if(!yid)
+
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_CONFLOGON, YAHOO_STATUS_AVAILABLE, yd->session_id);
-
-        yahoo_packet_hash(pkt, 1, (from?from:yd->user));
-        for(; who; who = who->next) {
+        pkt = yahoo_packet_new(YAHOO_SERVICE_CONFLOGON, YPACKET_STATUS_DEFAULT,
+                yd->session_id);
+
+        yahoo_packet_hash(pkt, 1, (from ? from : yd->user));
+        yahoo_packet_hash(pkt, 3, (from ? from : yd->user));
+        yahoo_packet_hash(pkt, 57, room);
+        for (; who; who = who->next)
                 yahoo_packet_hash(pkt, 3, (char *)who->data);
-        }
-        yahoo_packet_hash(pkt, 57, room);
 
         yahoo_send_packet(yid, pkt, 0);
@@ -4589 +4204 @@
 }
 
-void yahoo_conference_decline(int id, const char * from, YList *who, const char *room, const char *msg)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+void yahoo_conference_decline(int id, const char *from, YList *who,
+        const char *room, const char *msg)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt;
-                
-        if(!yid)
+
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_CONFDECLINE, YAHOO_STATUS_AVAILABLE, yd->session_id);
-
-        yahoo_packet_hash(pkt, 1, (from?from:yd->user));
-        for(; who; who = who->next) {
+        pkt = yahoo_packet_new(YAHOO_SERVICE_CONFDECLINE,
+                YPACKET_STATUS_DEFAULT, yd->session_id);
+
+        yahoo_packet_hash(pkt, 1, (from ? from : yd->user));
+        yahoo_packet_hash(pkt, 3, (from ? from : yd->user));
+        for (; who; who = who->next)
                 yahoo_packet_hash(pkt, 3, (char *)who->data);
-        }
         yahoo_packet_hash(pkt, 57, room);
         yahoo_packet_hash(pkt, 14, msg);
@@ -4613 +4231 @@
 }
 
-void yahoo_conference_logoff(int id, const char * from, YList *who, const char *room)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+void yahoo_conference_logoff(int id, const char *from, YList *who,
+        const char *room)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt;
-                
-        if(!yid)
+
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_CONFLOGOFF, YAHOO_STATUS_AVAILABLE, yd->session_id);
-
-        yahoo_packet_hash(pkt, 1, (from?from:yd->user));
-        for(; who; who = who->next) {
+        pkt = yahoo_packet_new(YAHOO_SERVICE_CONFLOGOFF, YPACKET_STATUS_DEFAULT,
+                yd->session_id);
+
+        yahoo_packet_hash(pkt, 1, (from ? from : yd->user));
+        yahoo_packet_hash(pkt, 3, (from ? from : yd->user));
+        for (; who; who = who->next)
                 yahoo_packet_hash(pkt, 3, (char *)who->data);
-        }
+
         yahoo_packet_hash(pkt, 57, room);
 
@@ -4636 +4258 @@
 }
 
-void yahoo_conference_message(int id, const char * from, YList *who, const char *room, const char *msg, int utf8)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+void yahoo_conference_message(int id, const char *from, YList *who,
+        const char *room, const char *msg, int utf8)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt;
-                
-        if(!yid)
+
+        if (!yid)
                 return;
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_CONFMSG, YAHOO_STATUS_AVAILABLE, yd->session_id);
-
-        yahoo_packet_hash(pkt, 1, (from?from:yd->user));
-        for(; who; who = who->next) {
+        pkt = yahoo_packet_new(YAHOO_SERVICE_CONFMSG, YPACKET_STATUS_DEFAULT,
+                yd->session_id);
+
+        yahoo_packet_hash(pkt, 1, (from ? from : yd->user));
+        yahoo_packet_hash(pkt, 53, (from ? from : yd->user));
+        for (; who; who = who->next)
                 yahoo_packet_hash(pkt, 53, (char *)who->data);
-        }
+
         yahoo_packet_hash(pkt, 57, room);
         yahoo_packet_hash(pkt, 14, msg);
 
-        if(utf8)
+        if (utf8)
                 yahoo_packet_hash(pkt, 97, "1");
 
@@ -4670 +4296 @@
         char buff[1024];
 
-        if(!yd)
+        if (!yd)
                 return;
 
@@ -4678 +4304 @@
 
         if (chatroomid == 0) {
-                snprintf(url, 1024, "http://insider.msg.yahoo.com/ycontent/?chatcat=0");
+                snprintf(url, 1024,
+                        "http://insider.msg.yahoo.com/ycontent/?chatcat=0");
         } else {
-                snprintf(url, 1024, "http://insider.msg.yahoo.com/ycontent/?chatroom_%d=0",chatroomid);
+                snprintf(url, 1024,
+                        "http://insider.msg.yahoo.com/ycontent/?chatroom_%d=0",
+                        chatroomid);
         }
 
@@ -4687 +4316 @@
         inputs = y_list_prepend(inputs, yid);
 
-        yahoo_http_get(yid->yd->client_id, url, buff, _yahoo_http_connected, yid);
-}
-
-void yahoo_chat_logon(int id, const char *from, const char *room, const char *roomid)
-{
-        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        yahoo_http_get(yid->yd->client_id, url, buff, 0, 0,
+                _yahoo_http_connected, yid);
+}
+
+void yahoo_chat_logon(int id, const char *from, const char *room,
+        const char *roomid)
+{
+        struct yahoo_input_data *yid =
+                find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_data *yd;
         struct yahoo_packet *pkt;
-                
-        if(!yid)
+
+        if (!yid)
                 return;
 
         yd = yid->yd;