X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/dd60ff8bdd253cd6c24a9c8bbf6bedeecaade99c..646c6b5273a2272632e50e7393f090f7c8bf06eb:/src/search.c

diff --git a/src/search.c b/src/search.c
index 7b795f7..649a9fc 100644
--- a/src/search.c
+++ b/src/search.c
@@ -18,7 +18,7 @@ faim_export unsigned long aim_usersearch_address(struct aim_session_t *sess,
   if (!address)
     return -1;
 
-  if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10+strlen(address))))
+  if (!(newpacket = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, 10+strlen(address))))
     return -1;
 
   newpacket->lock = 1;
@@ -48,11 +48,11 @@ faim_internal unsigned long aim_parse_searcherror(struct aim_session_t *sess, st
   i += 4;
   
   if(!(snac = aim_remsnac(sess, snacid))) {
-    faimdprintf(2, "faim: couldn't get a snac for %d, probably should crash.\n", snacid);
+    faimdprintf(sess, 2, "faim: couldn't get a snac for %d, probably should crash.\n", snacid);
     return 0;
   }
 
-  if((userfunc = aim_callhandler(command->conn, 0x000a, 0x0001)))
+  if((userfunc = aim_callhandler(sess, command->conn, 0x000a, 0x0001)))
     ret = userfunc(sess, command, snac->data /* address */);
   else
     ret = 0;
@@ -82,7 +82,7 @@ faim_internal unsigned long aim_parse_searchreply(struct aim_session_t *sess, st
   i += 4;
 
   if(!(snac = aim_remsnac(sess, snacid))) {
-    faimdprintf(2, "faim: couldn't get a snac for %d, probably should crash.\n", snacid);
+    faimdprintf(sess, 2, "faim: couldn't get a snac for %d, probably should crash.\n", snacid);
     return 0;
   }
 
@@ -94,7 +94,7 @@ faim_internal unsigned long aim_parse_searchreply(struct aim_session_t *sess, st
 
   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");
+      faimdprintf(sess, 2, "faim: couldn't realloc buf. oh well.\n");
 
     strncpy(&buf[j * (MAXSNLEN+1)], cur, MAXSNLEN);
     free(cur);
@@ -104,7 +104,7 @@ faim_internal unsigned long aim_parse_searchreply(struct aim_session_t *sess, st
 
   aim_freetlvchain(&tlvlist);
 
-  if((userfunc = aim_callhandler(command->conn, 0x000a, 0x0003)))
+  if((userfunc = aim_callhandler(sess, command->conn, 0x000a, 0x0003)))
     ret = userfunc(sess, command, snac->data /* address */, j, buf);
   else
     ret = 0;