X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/c5ca2538e0cb3b3ffbffee35f7bc9ec40f27d84c..64c78745f1e1ef7ecd8166b3af5b80d0d142cfb9:/aim_search.c

diff --git a/aim_search.c b/aim_search.c
index 1963592..d1cba01 100644
--- a/aim_search.c
+++ b/aim_search.c
@@ -6,6 +6,7 @@
  *
  */
 
+#define FAIM_INTERNAL
 #include <faim/aim.h>
 
 faim_export unsigned long aim_usersearch_address(struct aim_session_t *sess,
@@ -28,20 +29,94 @@ faim_export unsigned long aim_usersearch_address(struct aim_session_t *sess,
 
   aim_tx_enqueue(sess, newpacket);
 
-  {
-    struct aim_snac_t snac;
-    
-    snac.id = sess->snac_nextid;
-    snac.family = 0x000a;
-    snac.type = 0x0002;
-    snac.flags = 0x0000;
+  aim_cachesnac(sess, 0x000a, 0x0002, 0x0000, address, strlen(address)+1);
 
-    snac.data = malloc(strlen(address)+1);
-    memcpy(snac.data, address, strlen(address)+1);
+  return sess->snac_nextid;
+}
+
+
+faim_internal unsigned long aim_parse_searcherror(struct aim_session_t *sess, struct command_rx_struct *command) 
+{
+  u_int i, ret;
+  int snacid;
+  rxcallback_t userfunc;
+  struct aim_snac_t *snac;
+
+  i = 6;
+
+  snacid = aimutil_get32(command->data+i);
+  i += 4;
+  
+  if(!(snac = aim_remsnac(sess, snacid))) {
+    faimdprintf(2, "faim: couldn't get a snac for %d, probably should crash.\n", snacid);
+    return 0;
+  }
+
+  if((userfunc = aim_callhandler(command->conn, 0x000a, 0x0001)))
+    ret = userfunc(sess, command, snac->data /* address */);
+  else
+    ret = 0;
 
-    aim_newsnac(sess, &snac);
+  if(snac) {
+    if(snac->data)
+      free(snac->data);
+    free(snac);
   }
 
-  return (sess->snac_nextid++);
+  return ret;
 }
+	
+  
+faim_internal unsigned long aim_parse_searchreply(struct aim_session_t *sess, struct command_rx_struct *command)
+{
+  u_int i, j, m, ret;
+  int snacid;
+  struct aim_tlvlist_t *tlvlist;
+  char *cur = NULL, *buf = NULL;
+  rxcallback_t userfunc;
+  struct aim_snac_t *snac;
+
+  i = 6;
+
+  snacid = aimutil_get32(command->data+i);
+  i += 4;
+
+  if(!(snac = aim_remsnac(sess, snacid))) {
+    faimdprintf(2, "faim: couldn't get a snac for %d, probably should crash.\n", snacid);
+    return 0;
+  }
+
+  tlvlist = aim_readtlvchain(command->data+i, command->commandlen-i);
+
+  j = 0;
+
+  m = aim_counttlvchain(&tlvlist);
+
+  while((cur = aim_gettlv_str(tlvlist, 0x0001, j+1)) && j < m) {
+    if(!(buf = realloc(buf, (j+1) * (MAXSNLEN+1))))
+      faimdprintf(2, "faim: couldn't realloc buf. oh well.\n");
+
+    strncpy(&buf[j * (MAXSNLEN+1)], cur, MAXSNLEN);
+    free(cur);
+
+    j++; 
+  }
+
+  aim_freetlvchain(&tlvlist);
 
+  if((userfunc = aim_callhandler(command->conn, 0x000a, 0x0003)))
+    ret = userfunc(sess, command, snac->data /* address */, j, buf);
+  else
+    ret = 0;
+
+  if(snac) {
+    if(snac->data)
+      free(snac->data);
+    free(snac);
+  }
+
+  if(buf)
+    free(buf);
+
+  return ret;
+}