X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/9de3ca7e3fdcf62e088fe2a0c7fcdc219e1a5094..53c935f8f1f4b5b669ab22169e80a70be68f2ed9:/aim_search.c

diff --git a/aim_search.c b/aim_search.c
index 62e9016..1963592 100644
--- a/aim_search.c
+++ b/aim_search.c
@@ -6,37 +6,32 @@
  *
  */
 
-#include <aim.h>
+#include <faim/aim.h>
 
-u_long aim_usersearch_address(struct aim_conn_t *conn, char *address)
+faim_export unsigned long aim_usersearch_address(struct aim_session_t *sess,
+						 struct aim_conn_t *conn, 
+						 char *address)
 {
-  struct command_tx_struct newpacket;
+  struct command_tx_struct *newpacket;
   
   if (!address)
     return -1;
 
-  newpacket.lock = 1;
-
-  if (conn)
-    newpacket.conn = conn;
-  else
-    newpacket.conn = aim_getconn_type(AIM_CONN_TYPE_BOS);
+  if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10+strlen(address))))
+    return -1;
 
-  newpacket.type = 0x0002;
-  
-  newpacket.commandlen = 10 + strlen(address);
-  newpacket.data = (char *) malloc(newpacket.commandlen);
+  newpacket->lock = 1;
 
-  aim_putsnac(newpacket.data, 0x000a, 0x0002, 0x0000, aim_snac_nextid);
+  aim_putsnac(newpacket->data, 0x000a, 0x0002, 0x0000, sess->snac_nextid);
 
-  memcpy(&(newpacket.data[10]), address, strlen(address));
+  aimutil_putstr(newpacket->data+10, address, strlen(address));
 
-  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 = 0x000a;
     snac.type = 0x0002;
     snac.flags = 0x0000;
@@ -44,9 +39,9 @@ u_long aim_usersearch_address(struct aim_conn_t *conn, char *address)
     snac.data = malloc(strlen(address)+1);
     memcpy(snac.data, address, strlen(address)+1);
 
-    aim_newsnac(&snac);
+    aim_newsnac(sess, &snac);
   }
 
-  return (aim_snac_nextid++);
+  return (sess->snac_nextid++);
 }