#include <faim/aim.h>
-u_long aim_usersearch_address(struct aim_session_t *sess,
- 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(sess, AIM_CONN_TYPE_BOS);
-
- newpacket.type = 0x0002;
-
- newpacket.commandlen = 10 + strlen(address);
- newpacket.data = (char *) malloc(newpacket.commandlen);
-
- aim_putsnac(newpacket.data, 0x000a, 0x0002, 0x0000, sess->snac_nextid);
+ if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10+strlen(address))))
+ return -1;
- memcpy(&(newpacket.data[10]), address, strlen(address));
+ newpacket->lock = 1;
- aim_tx_enqueue(sess, &newpacket);
+ aim_putsnac(newpacket->data, 0x000a, 0x0002, 0x0000, sess->snac_nextid);
- {
- struct aim_snac_t snac;
-
- snac.id = sess->snac_nextid;
- snac.family = 0x000a;
- snac.type = 0x0002;
- snac.flags = 0x0000;
+ aimutil_putstr(newpacket->data+10, address, strlen(address));
- snac.data = malloc(strlen(address)+1);
- memcpy(snac.data, address, strlen(address)+1);
+ aim_tx_enqueue(sess, newpacket);
- aim_newsnac(sess, &snac);
- }
+ aim_cachesnac(sess, 0x000a, 0x0002, 0x0000, address, strlen(address)+1);
- return (sess->snac_nextid++);
+ return sess->snac_nextid;
}