From: mid <mid>
Date: Mon, 4 Jun 2001 20:05:10 +0000 (+0000)
Subject:  - Mon Jun  4 12:57:46 PDT 2001
X-Git-Tag: rel_0_99_2~34
X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/commitdiff_plain/79e0a0014d133acab79efd05844d0d4eb534c5d1

 - Mon Jun  4 12:57:46 PDT 2001
  - Fix chatnav.  Whoops.
---

diff --git a/CHANGES b/CHANGES
index 974ca9a..bce2798 100644
--- 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 a08a0dd..975a702 100644
--- 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 8eaa648..1c0196c 100644
--- 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 c11cf12..8b83e1e 100644
--- 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++;
+}
+
 /*
  *
  *