- Mon Jun 4 12:57:46 PDT 2001

  - Fix chatnav.  Whoops.

diff --git a/CHANGES b/CHANGES
index 974ca9a2ba439a4a8397518db1d82bff1f417c08..bce2798f015650a32b410f27b98c13c242b83f41 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
 No release numbers
 ------------------
+ - Mon Jun  4 12:57:46 PDT 2001
+  - Fix chatnav.  Whoops.
+
  - 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

diff --git a/include/aim_internal.h b/include/aim_internal.h
index a08a0dd794c93c2c75dba9bcd7dd9327190aa601..975a702240242f17059bf890b165feed541a206b 100644 (file)
--- a/include/aim_internal.h
+++ b/include/aim_internal.h
@@ -45,6 +45,7 @@ faim_internal int locate_modfirst(struct aim_session_t *sess, aim_module_t *mod)
 faim_internal int general_modfirst(struct aim_session_t *sess, aim_module_t *mod);
 
 faim_internal unsigned long aim_genericreq_n(struct aim_session_t *, struct aim_conn_t *conn, u_short family, u_short subtype);
+faim_internal unsigned long aim_genericreq_n_snacid(struct aim_session_t *, struct aim_conn_t *conn, u_short family, u_short subtype);
 faim_internal unsigned long aim_genericreq_l(struct aim_session_t *, struct aim_conn_t *conn, u_short family, u_short subtype, u_long *);
 faim_internal unsigned long aim_genericreq_s(struct aim_session_t *, struct aim_conn_t *conn, u_short family, u_short subtype, u_short *);
 

diff --git a/src/chatnav.c b/src/chatnav.c
index 8eaa6483e1fb4d00433675fce9ee9fc840cd0f34..1c0196ce831b79e0d2d88fb8110862d6fd1cdaf2 100644 (file)
--- a/src/chatnav.c
+++ b/src/chatnav.c
@@ -16,9 +16,8 @@
 faim_export unsigned long aim_chatnav_reqrights(struct aim_session_t *sess,
                                                struct aim_conn_t *conn)
 {
-  aim_genericreq_n(sess, conn, 0x000d, 0x0002);
 
-  return sess->snac_nextid;
+  return aim_genericreq_n_snacid(sess, conn, 0x000d, 0x0002);
 }
 
 faim_export unsigned long aim_chatnav_clientready(struct aim_session_t *sess,

diff --git a/src/misc.c b/src/misc.c
index c11cf1244922abec12e08a73d92139428d349ed7..8b83e1e66552e578b32c706b3f86575c70da51e9 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -565,6 +565,26 @@ faim_internal unsigned long aim_genericreq_n(struct aim_session_t *sess,
   return sess->snac_nextid;
 }
 
+faim_internal unsigned long aim_genericreq_n_snacid(struct aim_session_t *sess,
+                                                   struct aim_conn_t *conn, 
+                                                   unsigned short family, 
+                                                   unsigned short subtype)
+{
+  struct command_tx_struct *newpacket;
+
+  if (!(newpacket = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, 10)))
+    return 0;
+
+  newpacket->lock = 1;
+
+  aim_putsnac(newpacket->data, family, subtype, 0x0000, sess->snac_nextid);
+  aim_cachesnac(sess, family, subtype, 0x0000, NULL, 0);
+
+  aim_tx_enqueue(sess, newpacket);
+
+  return sess->snac_nextid++;
+}
+
 /*
  *
  *