X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/e677fc4371dedb607e13d60a380a7e0d0becfd8b..f6686b7e06eba1e3b059d507a3ea37f2a43bddc1:/src/misc.c diff --git a/src/misc.c b/src/misc.c index bbc0538..c11cf12 100644 --- a/src/misc.c +++ b/src/misc.c @@ -558,11 +558,10 @@ faim_internal unsigned long aim_genericreq_n(struct aim_session_t *sess, newpacket->lock = 1; - aim_putsnac(newpacket->data, family, subtype, 0x0000, sess->snac_nextid); - - aim_cachesnac(sess, family, subtype, 0x0000, NULL, 0); + aim_putsnac(newpacket->data, family, subtype, 0x0000, 0x00000000); aim_tx_enqueue(sess, newpacket); + return sess->snac_nextid; } @@ -587,14 +586,14 @@ faim_internal unsigned long aim_genericreq_l(struct aim_session_t *sess, newpacket->lock = 1; - aim_putsnac(newpacket->data, family, subtype, 0x0000, sess->snac_nextid); - aim_cachesnac(sess, family, subtype, 0x0000, NULL, 0); + aim_putsnac(newpacket->data, family, subtype, 0x0000, 0x00000000); /* copy in data */ newlong = htonl(*longdata); memcpy(&(newpacket->data[10]), &newlong, sizeof(u_long)); aim_tx_enqueue(sess, newpacket); + return sess->snac_nextid; } @@ -615,14 +614,14 @@ faim_internal unsigned long aim_genericreq_s(struct aim_session_t *sess, newpacket->lock = 1; - aim_putsnac(newpacket->data, family, subtype, 0x0000, sess->snac_nextid); - aim_cachesnac(sess, family, subtype, 0x0000, NULL, 0); + aim_putsnac(newpacket->data, family, subtype, 0x0000, 0x00000000); /* copy in data */ newshort = htons(*shortdata); memcpy(&(newpacket->data[10]), &newshort, sizeof(u_short)); aim_tx_enqueue(sess, newpacket); + return sess->snac_nextid; } @@ -664,8 +663,7 @@ faim_export unsigned long aim_addicbmparam(struct aim_session_t *sess, newpacket->lock = 1; - i = aim_putsnac(newpacket->data, 0x0004, 0x0002, 0x0000, sess->snac_nextid); - aim_cachesnac(sess, 0x0004, 0x0002, 0x0000, NULL, 0); + i = aim_putsnac(newpacket->data, 0x0004, 0x0002, 0x0000, 0x00000000); i += aimutil_put16(newpacket->data+i, 0x0000); i += aimutil_put16(newpacket->data+i, 0x0000);