- Mon Jun 4 12:45:18 PDT 2001

  - Don't use snacid's for generic requests (gets around recent blocks)
  - If they start doing snacid-based blocks again, an audit will have
      to be done to see what WinAIM requests uses snacids for and what
      it leaves it blank for.  That will be tedious and I'm not going to
      do it.

diff --git a/CHANGES b/CHANGES
index 38b88d2adb0ce09992ce77659789b809fd8ab2ae..974ca9a2ba439a4a8397518db1d82bff1f417c08 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,13 @@
 
 No release numbers
 ------------------
+ - Mon Jun  4 12:45:18 PDT 2001
+  - Don't use snacid's for generic requests (gets around recent blocks)
+  - If they start doing snacid-based blocks again, an audit will have
+      to be done to see what WinAIM requests uses snacids for and what 
+      it leaves it blank for.  That will be tedious and I'm not going to 
+      do it. 
+
  - Thu May 31 23:00:50 PDT 2001
   - Store two hardcoded hashes in login.c.  Sigh.
   - Add prototype for aim_callhandler_noparam in aim_internal.h

diff --git a/src/misc.c b/src/misc.c
index bbc0538afb6eca0f192fb4a032edf72d5d90d756..c11cf1244922abec12e08a73d92139428d349ed7 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -558,11 +558,10 @@ faim_internal unsigned long aim_genericreq_n(struct aim_session_t *sess,
 
   newpacket->lock = 1;
 
-  aim_putsnac(newpacket->data, family, subtype, 0x0000, sess->snac_nextid);
-
-  aim_cachesnac(sess, family, subtype, 0x0000, NULL, 0);
+  aim_putsnac(newpacket->data, family, subtype, 0x0000, 0x00000000);
 
   aim_tx_enqueue(sess, newpacket);
+
   return sess->snac_nextid;
 }
 
@@ -587,14 +586,14 @@ faim_internal unsigned long aim_genericreq_l(struct aim_session_t *sess,
 
   newpacket->lock = 1;
 
-  aim_putsnac(newpacket->data, family, subtype, 0x0000, sess->snac_nextid);
-  aim_cachesnac(sess, family, subtype, 0x0000, NULL, 0);
+  aim_putsnac(newpacket->data, family, subtype, 0x0000, 0x00000000);
 
   /* copy in data */
   newlong = htonl(*longdata);
   memcpy(&(newpacket->data[10]), &newlong, sizeof(u_long));
 
   aim_tx_enqueue(sess, newpacket);
+
   return sess->snac_nextid;
 }
 
@@ -615,14 +614,14 @@ faim_internal unsigned long aim_genericreq_s(struct aim_session_t *sess,
 
   newpacket->lock = 1;
 
-  aim_putsnac(newpacket->data, family, subtype, 0x0000, sess->snac_nextid);
-  aim_cachesnac(sess, family, subtype, 0x0000, NULL, 0);
+  aim_putsnac(newpacket->data, family, subtype, 0x0000, 0x00000000);
 
   /* copy in data */
   newshort = htons(*shortdata);
   memcpy(&(newpacket->data[10]), &newshort, sizeof(u_short));
 
   aim_tx_enqueue(sess, newpacket);
+
   return sess->snac_nextid;
 }
 
@@ -664,8 +663,7 @@ faim_export unsigned long aim_addicbmparam(struct aim_session_t *sess,
   
   newpacket->lock = 1;
 
-  i = aim_putsnac(newpacket->data, 0x0004, 0x0002, 0x0000, sess->snac_nextid);
-  aim_cachesnac(sess, 0x0004, 0x0002, 0x0000, NULL, 0);
+  i = aim_putsnac(newpacket->data, 0x0004, 0x0002, 0x0000, 0x00000000);
 
   i += aimutil_put16(newpacket->data+i, 0x0000); 
   i += aimutil_put16(newpacket->data+i, 0x0000);