- Thu Feb 8 20:12:39 UTC 2001

[libfaim.git] / aim_auth.c

diff --git a/aim_auth.c b/aim_auth.c
index 491e2e08628302c76d503b7f3b9054b3b1b26ddc..47f41292dedd47f79c0f81f31fa5add7c581e802 100644 (file)
--- a/aim_auth.c
+++ b/aim_auth.c
@@ -5,17 +5,18 @@
 
  */
 
+#define FAIM_INTERNAL
 #include <faim/aim.h> 
 
 /* this just pushes the passed cookie onto the passed connection -- NO SNAC! */
-int aim_auth_sendcookie(struct aim_session_t *sess, 
-                       struct aim_conn_t *conn, 
-                       u_char *chipsahoy)
+faim_export int aim_auth_sendcookie(struct aim_session_t *sess, 
+                                   struct aim_conn_t *conn, 
+                                   unsigned char *chipsahoy)
 {
   struct command_tx_struct *newpacket;
   int curbyte=0;
   
-  if (!(newpacket = aim_tx_new(0x0001, conn, 4+2+2+AIM_COOKIELEN)))
+  if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0001, conn, 4+2+2+AIM_COOKIELEN)))
     return -1;
 
   newpacket->lock = 1;
@@ -29,13 +30,13 @@ int aim_auth_sendcookie(struct aim_session_t *sess,
   return aim_tx_enqueue(sess, newpacket);
 }
 
-u_long aim_auth_clientready(struct aim_session_t *sess,
-                           struct aim_conn_t *conn)
+faim_export unsigned long aim_auth_clientready(struct aim_session_t *sess,
+                                              struct aim_conn_t *conn)
 {
   struct command_tx_struct *newpacket;
   int curbyte = 0;
 
-  if (!(newpacket = aim_tx_new(0x0002, conn, 26)))
+  if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 26)))
     return -1;
 
   newpacket->lock = 1;
@@ -52,30 +53,19 @@ u_long aim_auth_clientready(struct aim_session_t *sess,
 
   aim_tx_enqueue(sess, newpacket);
 
-  {
-    struct aim_snac_t snac;
-    
-    snac.id = sess->snac_nextid;
-    snac.family = 0x0001;
-    snac.type = 0x0004;
-    snac.flags = 0x0000;
+  aim_cachesnac(sess, 0x0001, 0x0004, 0x0000, NULL, 0);
 
-    snac.data = NULL;
-
-    aim_newsnac(sess, &snac);
-  }
-
-  return (sess->snac_nextid++);
+  return sess->snac_nextid;
 }
 
-u_long aim_auth_changepasswd(struct aim_session_t *sess,
-                            struct aim_conn_t *conn, 
-                            char *new, char *current)
+faim_export unsigned long aim_auth_changepasswd(struct aim_session_t *sess,
+                                               struct aim_conn_t *conn, 
+                                               char *new, char *current)
 {
   struct command_tx_struct *newpacket;
   int i;
 
-  if (!(newpacket = aim_tx_new(0x0002, conn, 10+4+strlen(current)+4+strlen(new))))
+  if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10+4+strlen(current)+4+strlen(new))))
     return -1;
 
   newpacket->lock = 1;
@@ -90,18 +80,7 @@ u_long aim_auth_changepasswd(struct aim_session_t *sess,
 
   aim_tx_enqueue(sess, newpacket);
 
-  {
-    struct aim_snac_t snac;
-    
-    snac.id = sess->snac_nextid;
-    snac.family = 0x0001;
-    snac.type = 0x0004;
-    snac.flags = 0x0000;
-
-    snac.data = NULL;
-
-    aim_newsnac(sess, &snac);
-  }
+  aim_cachesnac(sess, 0x0001, 0x0004, 0x0000, NULL, 0);
 
-  return (sess->snac_nextid++);
+  return sess->snac_nextid;
 }