Changes in protocols/oscar/oscar.c [5a673f3:7ee07c3]

File:

• protocols/oscar/oscar.c (modified) (13 diffs)

protocols/oscar/oscar.c

@@ -205 +205 @@
 static int gaim_icbm_param_info  (aim_session_t *, aim_frame_t *, ...);
 static int gaim_parse_genericerr (aim_session_t *, aim_frame_t *, ...);
-static int gaim_memrequest       (aim_session_t *, aim_frame_t *, ...);
 static int gaim_selfinfo         (aim_session_t *, aim_frame_t *, ...);
 static int gaim_offlinemsg       (aim_session_t *, aim_frame_t *, ...);
@@ -255 +254 @@
 
         u = t = g_strdup(s);
+
+        strcpy(t, s);
         g_strdown(t);
 
@@ -568 +569 @@
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_ERROR, gaim_parse_genericerr, 0);
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BOS, AIM_CB_BOS_ERROR, gaim_parse_genericerr, 0);
-        aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, 0x1f, gaim_memrequest, 0);
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_SELFINFO, gaim_selfinfo, 0);
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ICQ, AIM_CB_ICQ_OFFLINEMSG, gaim_offlinemsg, 0);
@@ -602 +602 @@
 }
 
-struct pieceofcrap {
-        struct im_connection *ic;
-        unsigned long offset;
-        unsigned long len;
-        char *modname;
-        int fd;
-        aim_conn_t *conn;
-        unsigned int inpa;
-};
-
-static gboolean damn_you(gpointer data, gint source, b_input_condition c)
-{
-        struct pieceofcrap *pos = data;
-        struct oscar_data *od = pos->ic->proto_data;
-        char in = '\0';
-        int x = 0;
-        unsigned char m[17];
-
-        while (read(pos->fd, &in, 1) == 1) {
-                if (in == '\n')
-                        x++;
-                else if (in != '\r')
-                        x = 0;
-                if (x == 2)
-                        break;
-                in = '\0';
-        }
-        if (in != '\n') {
-                imcb_error(pos->ic, "Gaim was unable to get a valid hash for logging into AIM."
-                                " You may be disconnected shortly.");
-                b_event_remove(pos->inpa);
-                closesocket(pos->fd);
-                g_free(pos);
-                return FALSE;
-        }
-        /* [WvG] Wheeeee! Who needs error checking anyway? ;-) */
-        read(pos->fd, m, 16);
-        m[16] = '\0';
-        b_event_remove(pos->inpa);
-        closesocket(pos->fd);
-        aim_sendmemblock(od->sess, pos->conn, 0, 16, m, AIM_SENDMEMBLOCK_FLAG_ISHASH);
-        g_free(pos);
-        
-        return FALSE;
-}
-
-static gboolean straight_to_hell(gpointer data, gint source, b_input_condition cond) {
-        struct pieceofcrap *pos = data;
-        char buf[BUF_LONG];
-
-        if (source < 0) {
-                imcb_error(pos->ic, "Gaim was unable to get a valid hash for logging into AIM."
-                                " You may be disconnected shortly.");
-                if (pos->modname)
-                        g_free(pos->modname);
-                g_free(pos);
-                return FALSE;
-        }
-
-        g_snprintf(buf, sizeof(buf), "GET " AIMHASHDATA
-                        "?offset=%ld&len=%ld&modname=%s HTTP/1.0\n\n",
-                        pos->offset, pos->len, pos->modname ? pos->modname : "");
-        write(pos->fd, buf, strlen(buf));
-        if (pos->modname)
-                g_free(pos->modname);
-        pos->inpa = b_input_add(pos->fd, GAIM_INPUT_READ, damn_you, pos);
-        return FALSE;
-}
-
 /* size of icbmui.ocm, the largest module in AIM 3.5 */
 #define AIM_MAX_FILE_SIZE 98304
-
-int gaim_memrequest(aim_session_t *sess, aim_frame_t *fr, ...) {
-        va_list ap;
-        struct pieceofcrap *pos;
-        guint32 offset, len;
-        char *modname;
-        int fd;
-
-        va_start(ap, fr);
-        offset = (guint32)va_arg(ap, unsigned long);
-        len = (guint32)va_arg(ap, unsigned long);
-        modname = va_arg(ap, char *);
-        va_end(ap);
-
-        if (len == 0) {
-                aim_sendmemblock(sess, fr->conn, offset, len, NULL,
-                                AIM_SENDMEMBLOCK_FLAG_ISREQUEST);
-                return 1;
-        }
-        /* uncomment this when you're convinced it's right. remember, it's been wrong before.
-        if (offset > AIM_MAX_FILE_SIZE || len > AIM_MAX_FILE_SIZE) {
-                char *buf;
-                int i = 8;
-                if (modname)
-                        i += strlen(modname);
-                buf = g_malloc(i);
-                i = 0;
-                if (modname) {
-                        memcpy(buf, modname, strlen(modname));
-                        i += strlen(modname);
-                }
-                buf[i++] = offset & 0xff;
-                buf[i++] = (offset >> 8) & 0xff;
-                buf[i++] = (offset >> 16) & 0xff;
-                buf[i++] = (offset >> 24) & 0xff;
-                buf[i++] = len & 0xff;
-                buf[i++] = (len >> 8) & 0xff;
-                buf[i++] = (len >> 16) & 0xff;
-                buf[i++] = (len >> 24) & 0xff;
-                aim_sendmemblock(sess, command->conn, offset, i, buf, AIM_SENDMEMBLOCK_FLAG_ISREQUEST);
-                g_free(buf);
-                return 1;
-        }
-        */
-
-        pos = g_new0(struct pieceofcrap, 1);
-        pos->ic = sess->aux_data;
-        pos->conn = fr->conn;
-
-        pos->offset = offset;
-        pos->len = len;
-        pos->modname = modname ? g_strdup(modname) : NULL;
-
-        fd = proxy_connect("gaim.sourceforge.net", 80, straight_to_hell, pos);
-        if (fd < 0) {
-                if (pos->modname)
-                        g_free(pos->modname);
-                g_free(pos);
-                imcb_error(sess->aux_data, "Gaim was unable to get a valid hash for logging into AIM."
-                                " You may be disconnected shortly.");
-        }
-        pos->fd = fd;
-
-        return 1;
-}
 
 static int gaim_parse_login(aim_session_t *sess, aim_frame_t *fr, ...) {
@@ -785 +651 @@
         struct im_connection *ic = sess->aux_data;
         struct chat_connection *chatcon;
-        struct groupchat *c = NULL;
         static int id = 1;
 
@@ -798 +663 @@
         chatcon = find_oscar_chat_by_conn(ic, fr->conn);
         chatcon->id = id;
-        
-        c = bee_chat_by_title(ic->bee, ic, chatcon->show);
-        if (c && !c->data)
-                chatcon->cnv = c;
-        else
-                chatcon->cnv = imcb_chat_new(ic, chatcon->show);
+        chatcon->cnv = imcb_chat_new(ic, chatcon->show);
         chatcon->cnv->data = chatcon;
 
@@ -1194 +1054 @@
         aim_ssi_auth_reply(od->sess, od->conn, uin, 1, "");
         // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
-        imcb_ask_add(data->ic, uin, NULL);
+        if(imcb_find_buddy(data->ic, uin) == NULL)
+                imcb_ask_add(data->ic, uin, NULL);
         
         g_free(uin);
@@ -1955 +1816 @@
         struct oscar_data *odata = (struct oscar_data *)g->proto_data;
         if (odata->icq) {
-                /** FIXME(wilmer): Hmm, lost the ability to get away msgs here, do we care to get that back?
                 struct buddy *budlight = imcb_find_buddy(g, who);
                 if (budlight)
@@ -1961 +1821 @@
                                 if (budlight->caps & AIM_CAPS_ICQSERVERRELAY)
                                         aim_send_im_ch2_geticqmessage(odata->sess, who, (budlight->uc & 0xff80) >> 7);
-                */
         } else
                 aim_getinfo(odata->sess, odata->conn, who, AIM_GETINFO_AWAYMESSAGE);
@@ -2088 +1947 @@
 static int gaim_ssi_parselist(aim_session_t *sess, aim_frame_t *fr, ...) {
         struct im_connection *ic = sess->aux_data;
-        struct aim_ssi_item *curitem, *curgroup;
+        struct aim_ssi_item *curitem;
         int tmp;
         char *nrm;
@@ -2099 +1958 @@
                 switch (curitem->type) {
                         case 0x0000: /* Buddy */
-                                if ((curitem->name) && (!imcb_buddy_by_handle(ic, nrm))) {
+                                if ((curitem->name) && (!imcb_find_buddy(ic, nrm))) {
                                         char *realname = NULL;
 
                                         if (curitem->data && aim_gettlv(curitem->data, 0x0131, 1))
                                                     realname = aim_gettlv_str(curitem->data, 0x0131, 1);
-                                        
-                                        imcb_add_buddy(ic, nrm, curgroup->gid == curitem->gid ? curgroup->name : NULL);
+                                                
+                                        imcb_add_buddy(ic, nrm, NULL);
                                         
                                         if (realname) {
@@ -2113 +1972 @@
                                         }
                                 }
-                                break;
-
-                        case 0x0001: /* Group */
-                                curgroup = curitem;
                                 break;
 
@@ -2659 +2514 @@
         static int chat_id = 0;
         char * chatname;
-        struct groupchat *c;
         
         chatname = g_strdup_printf("%s%s_%d", isdigit(*ic->acc->user) ? "icq_" : "",
                                    ic->acc->user, chat_id++);
-        
-        c = imcb_chat_new(ic, chatname);
+  
         ret = oscar_chat_join(ic, chatname, NULL, NULL);
+
         aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);