Changes in protocols/oscar/service.c [d18db32f:6042a54]

File:

• protocols/oscar/service.c (modified) (7 diffs)

protocols/oscar/service.c

@@ -352 +352 @@
         snacid = aim_cachesnac(sess, 0x0001, 0x0008, 0x0000, NULL, 0);
         aim_putsnac(&fr->data, 0x0001, 0x0008, 0x0000, snacid);
-
-        for (rc = ins->rates; rc; rc = rc->next)
-                aimbs_put16(&fr->data, rc->classid);
-
-        aim_tx_enqueue(sess, fr);
-
-        return 0;
-}
-
-/* Delete Rate Parameter (group 1, type 9) */
-int aim_rates_delparam(aim_session_t *sess, aim_conn_t *conn)
-{
-        aim_conn_inside_t *ins = (aim_conn_inside_t *)conn->inside;
-        aim_frame_t *fr;        
-        aim_snacid_t snacid;
-        struct rateclass *rc;
-
-        if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 512)))
-                return -ENOMEM; 
-
-        snacid = aim_cachesnac(sess, 0x0001, 0x0009, 0x0000, NULL, 0);
-        aim_putsnac(&fr->data, 0x0001, 0x0009, 0x0000, snacid);
 
         for (rc = ins->rates; rc; rc = rc->next)
@@ -431 +409 @@
 }
 
-/*
- * Service Pause Acknowledgement (group 1, type 0x0c)
- *
- * It is rather important that aim_sendpauseack() gets called for the exact
- * same connection that the Server Pause callback was called for, since
- * libfaim extracts the data for the SNAC from the connection structure.
- *
- * Of course, if you don't do that, more bad things happen than just what
- * libfaim can cause.
- *
- */
-int aim_sendpauseack(aim_session_t *sess, aim_conn_t *conn)
-{
-        aim_frame_t *fr;
-        aim_snacid_t snacid;
-        aim_conn_inside_t *ins = (aim_conn_inside_t *)conn->inside;
-        struct snacgroup *sg;
-
-        if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 1024)))
-                return -ENOMEM;
-
-        snacid = aim_cachesnac(sess, 0x0001, 0x000c, 0x0000, NULL, 0);
-        aim_putsnac(&fr->data, 0x0001, 0x000c, 0x0000, snacid);
-
-        /*
-         * This list should have all the groups that the original 
-         * Host Online / Server Ready said this host supports.  And 
-         * we want them all back after the migration.
-         */
-        for (sg = ins->groups; sg; sg = sg->next)
-                aimbs_put16(&fr->data, sg->group);
-
-        aim_tx_enqueue(sess, fr);
-
-        return 0;
-}
-
 /* Service Resume (group 1, type 0x0d) */
 static int serverresume(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
@@ -517 +458 @@
 
         return 0;
-}
-
-/*
- * Idle Notification (group 1, type 0x11)
- *
- * Should set your current idle time in seconds.  Note that this should
- * never be called consecutively with a non-zero idle time.  That makes
- * OSCAR do funny things.  Instead, just set it once you go idle, and then
- * call it again with zero when you're back.
- *
- */
-int aim_bos_setidle(aim_session_t *sess, aim_conn_t *conn, guint32 idletime)
-{
-        return aim_genericreq_l(sess, conn, 0x0001, 0x0011, &idletime);
 }
 
@@ -637 +564 @@
 }
 
-/*
- * No-op (group 1, type 0x16)
- *
- * WinAIM sends these every 4min or so to keep the connection alive.  Its not 
- * real necessary.
- *
- */
-int aim_nop(aim_session_t *sess, aim_conn_t *conn)
-{
-        return aim_genericreq_n(sess, conn, 0x0001, 0x0016);
-}
 
 /* 
@@ -702 +618 @@
 
         /* This is frivolous. (Thank you SmarterChild.) */
-        aim_bstream_empty(bs);
+        aim_bstream_empty(bs); /* == vercount * 4 */
         versions = aimbs_getraw(bs, aim_bstream_empty(bs));
         g_free(versions);
@@ -735 +651 @@
                 data |= AIM_ICQ_STATE_WEBAWARE;
 
-        aim_addtlvtochain32(&tl, 0x0006, data);
+        aim_addtlvtochain32(&tl, 0x0006, data); /* tlvlen */
 
         if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 8)))
@@ -807 +723 @@
         g_free(modname);
         aim_freetlvchain(&list);
-
-        return 0;
-}
-
-/* Client verification reply (group 1, subtype 0x20) */
-int aim_sendmemblock(aim_session_t *sess, aim_conn_t *conn, guint32 offset, guint32 len, const guint8 *buf, guint8 flag)
-{
-        aim_frame_t *fr;
-        aim_snacid_t snacid;
-
-        if (!sess || !conn)
-                return -EINVAL;
-
-        if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+2+16)))
-                return -ENOMEM;
-
-        snacid = aim_cachesnac(sess, 0x0001, 0x0020, 0x0000, NULL, 0);
-
-        aim_putsnac(&fr->data, 0x0001, 0x0020, 0x0000, snacid);
-        aimbs_put16(&fr->data, 0x0010); /* md5 is always 16 bytes */
-
-        if ((flag == AIM_SENDMEMBLOCK_FLAG_ISHASH) && buf && (len == 0x10)) { /* we're getting a hash */
-
-                aimbs_putraw(&fr->data, buf, 0x10); 
-
-        } else if (buf && (len > 0)) { /* use input buffer */
-                md5_state_t state;
-                md5_byte_t digest[0x10];
-
-                md5_init(&state);       
-                md5_append(&state, (const md5_byte_t *)buf, len);
-                md5_finish(&state, digest);
-
-                aimbs_putraw(&fr->data, (guint8 *)digest, 0x10);
-
-        } else if (len == 0) { /* no length, just hash NULL (buf is optional) */
-                md5_state_t state;
-                guint8 nil = '\0';
-                md5_byte_t digest[0x10];
-
-                /*
-                 * These MD5 routines are stupid in that you have to have
-                 * at least one append.  So thats why this doesn't look 
-                 * real logical.
-                 */
-                md5_init(&state);
-                md5_append(&state, (const md5_byte_t *)&nil, 0);
-                md5_finish(&state, digest);
-
-                aimbs_putraw(&fr->data, (guint8 *)digest, 0x10);
-
-        } else {
-
-                /* 
-                 * This data is correct for AIM 3.5.1670.
-                 *
-                 * Using these blocks is as close to "legal" as you can get
-                 * without using an AIM binary.
-                 *
-                 */
-                if ((offset == 0x03ffffff) && (len == 0x03ffffff)) {
-
-#if 1 /* with "AnrbnrAqhfzcd" */
-                        aimbs_put32(&fr->data, 0x44a95d26);
-                        aimbs_put32(&fr->data, 0xd2490423);
-                        aimbs_put32(&fr->data, 0x93b8821f);
-                        aimbs_put32(&fr->data, 0x51c54b01);
-#else /* no filename */
-                        aimbs_put32(&fr->data, 0x1df8cbae);
-                        aimbs_put32(&fr->data, 0x5523b839);
-                        aimbs_put32(&fr->data, 0xa0e10db3);
-                        aimbs_put32(&fr->data, 0xa46d3b39);
-#endif
-
-/* len can't be 0 here anyway...
-                } else if ((offset == 0x00001000) && (len == 0x00000000)) {
-
-                        aimbs_put32(&fr->data, 0xd41d8cd9);
-                        aimbs_put32(&fr->data, 0x8f00b204);
-                        aimbs_put32(&fr->data, 0xe9800998);
-                        aimbs_put32(&fr->data, 0xecf8427e);
-*/
-                } else
-                        imcb_error(sess->aux_data, "Warning: unknown hash request");
-
-        }
-
-        aim_tx_enqueue(sess, fr);
 
         return 0;