- Fri Jun 2 23:27:28 UTC 2000

[libfaim.git] / aim_buddylist.c

diff --git a/aim_buddylist.c b/aim_buddylist.c
index b9ac86a4bccdddd73dcc3f05d68c7c085cf8f182..04572b3356945c6ef8e9b858a03f7dad7e0741f2 100644 (file)
--- a/aim_buddylist.c
+++ b/aim_buddylist.c
@@ -1,5 +1,5 @@
 
-#include <aim.h>
+#include <faim/aim.h>
 
 /*
  * aim_add_buddy()
@@ -7,36 +7,31 @@
  * Adds a single buddy to your buddy list after login.
  *
  */
-u_long aim_add_buddy(struct aim_conn_t *conn, char *sn )
+u_long aim_add_buddy(struct aim_session_t *sess,
+                    struct aim_conn_t *conn, 
+                    char *sn )
 {
-   struct command_tx_struct newpacket;
+   struct command_tx_struct *newpacket;
+   int i;
 
-   if( !sn )
-      return -1;
+   if(!sn)
+     return -1;
 
-   if (conn)
-     newpacket.conn = conn;
-   else
-     newpacket.conn = aim_getconn_type(AIM_CONN_TYPE_BOS);
+   if (!(newpacket = aim_tx_new(0x0002, conn, 10+1+strlen(sn))))
+     return -1;
 
-   newpacket.lock = 1;
-   newpacket.type = 0x0002;
-   newpacket.commandlen = 11 + strlen( sn );
-   newpacket.data = (char *)malloc( newpacket.commandlen );
+   newpacket->lock = 1;
 
-   aim_putsnac(newpacket.data, 0x0003, 0x0004, 0x0000, aim_snac_nextid);
+   i = aim_putsnac(newpacket->data, 0x0003, 0x0004, 0x0000, sess->snac_nextid);
+   i += aimutil_put8(newpacket->data+i, strlen(sn));
+   i += aimutil_putstr(newpacket->data+i, sn, strlen(sn));
 
-   /* length of screenname */ 
-   newpacket.data[10] = strlen( sn );
-
-   memcpy( &(newpacket.data[11]), sn, strlen( sn ) );
-
-   aim_tx_enqueue( &newpacket );
+   aim_tx_enqueue(sess, newpacket );
 
    {
       struct aim_snac_t snac;
     
-      snac.id = aim_snac_nextid;
+      snac.id = sess->snac_nextid;
       snac.family = 0x0003;
       snac.type = 0x0004;
       snac.flags = 0x0000;
@@ -44,42 +39,38 @@ u_long aim_add_buddy(struct aim_conn_t *conn, char *sn )
       snac.data = malloc( strlen( sn ) + 1 );
       memcpy( snac.data, sn, strlen( sn ) + 1 );
 
-      aim_newsnac( &snac );
+      aim_newsnac(sess, &snac);
    }
 
-   return( aim_snac_nextid++ );
+   return( sess->snac_nextid++ );
 }
 
-u_long aim_remove_buddy(struct aim_conn_t *conn, char *sn )
+u_long aim_remove_buddy(struct aim_session_t *sess,
+                       struct aim_conn_t *conn, 
+                       char *sn )
 {
-   struct command_tx_struct newpacket;
-
-   if( !sn )
-      return -1;
+   struct command_tx_struct *newpacket;
+   int i;
 
-   if (conn)
-     newpacket.conn = conn;
-   else
-     newpacket.conn = aim_getconn_type(AIM_CONN_TYPE_BOS);
+   if(!sn)
+     return -1;
 
-   newpacket.lock = 1;
-   newpacket.type = 0x0002;
-   newpacket.commandlen = 11 + strlen(sn);
-   newpacket.data = (char *)malloc( newpacket.commandlen );
+   if (!(newpacket = aim_tx_new(0x0002, conn, 10+1+strlen(sn))))
+     return -1;
 
-   aim_putsnac(newpacket.data, 0x0003, 0x0005, 0x0000, aim_snac_nextid);
+   newpacket->lock = 1;
 
-   /* length of screenname */ 
-   newpacket.data[10] = strlen( sn );
+   i = aim_putsnac(newpacket->data, 0x0003, 0x0005, 0x0000, sess->snac_nextid);
 
-   memcpy( &(newpacket.data[11]), sn, strlen( sn ) );
+   i += aimutil_put8(newpacket->data+i, strlen(sn));
+   i += aimutil_putstr(newpacket->data+i, sn, strlen(sn));
 
-   aim_tx_enqueue( &newpacket );
+   aim_tx_enqueue(sess, newpacket);
 
    {
       struct aim_snac_t snac;
     
-      snac.id = aim_snac_nextid;
+      snac.id = sess->snac_nextid;
       snac.family = 0x0003;
       snac.type = 0x0005;
       snac.flags = 0x0000;
@@ -87,9 +78,9 @@ u_long aim_remove_buddy(struct aim_conn_t *conn, char *sn )
       snac.data = malloc( strlen( sn ) + 1 );
       memcpy( snac.data, sn, strlen( sn ) + 1 );
 
-      aim_newsnac( &snac );
+      aim_newsnac(sess, &snac );
    }
 
-   return( aim_snac_nextid++ );
+   return( sess->snac_nextid++ );
 }