* 0501 0004 0101 0102 0101 WinAIM 4.1.2010, libfaim (right here)
* 0501 0001 0101 01 AOL v6.0, CompuServe 2000 v6.0, any
* TOC client
+ *
+ * Note that in this function, only the feature bytes are tested, since
+ * the rest will always be the same.
+ *
*/
-faim_export unsigned short aim_fingerprintclient(unsigned char *msghdr, int len)
+faim_export fu16_t aim_fingerprintclient(fu8_t *msghdr, int len)
{
static const struct {
- unsigned short clientid;
+ fu16_t clientid;
int len;
- unsigned char data[10];
+ fu8_t data[10];
} fingerprints[] = {
/* AOL Mobile Communicator, WinAIM 1.0.414 */
{ AIM_CLIENTTYPE_MC,
- 9, {0x05, 0x01, 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01}},
+ 3, {0x01, 0x01, 0x01}},
/* WinAIM 2.0.847, 2.1.1187, 3.0.1464, 4.3.2229, 4.4.2286 */
{ AIM_CLIENTTYPE_WINAIM,
- 9, {0x05, 0x01, 0x00, 0x03, 0x01, 0x01, 0x02, 0x01, 0x01}},
+ 3, {0x01, 0x01, 0x02}},
/* WinAIM 4.1.2010, libfaim */
{ AIM_CLIENTTYPE_WINAIM41,
- 10, {0x05, 0x01, 0x00, 0x04, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01}},
+ 4, {0x01, 0x01, 0x01, 0x02}},
/* AOL v6.0, CompuServe 2000 v6.0, any TOC client */
{ AIM_CLIENTTYPE_AOL_TOC,
- 7, {0x05, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01}},
+ 1, {0x01}},
{ 0, 0}
};
}
/* This should be endian-safe now... but who knows... */
-faim_export unsigned short aim_iconsum(const unsigned char *buf, int buflen)
+faim_export fu32_t aim_iconsum(const fu8_t *buf, int buflen)
{
- unsigned long sum;
+ fu32_t sum;
int i;
for (i = 0, sum = 0; i < buflen; i += 2)
sum = ((sum & 0xffff0000) >> 16) + (sum & 0x0000ffff);
- return sum & 0xffff;
+ return sum;
}
/*
* representation of the UNICODE index (in this case, UNICODE
* "Horizontal Ellipsis", or 133 in in ASCII8).
*
+ * Implementation note: Since this is one of the most-used functions
+ * in all of libfaim, it is written with performance in mind. As such,
+ * it is not as clear as it could be in respect to how this message is
+ * supposed to be layed out. Most obviously, tlvlists should be used
+ * instead of writing out the bytes manually.
+ *
+ * XXX more precise verification that we never send SNACs larger than 8192
+ * XXX check SNAC size for multipart
+ *
*/
-faim_export int aim_send_im_ext(struct aim_session_t *sess, struct aim_conn_t *conn, struct aim_sendimext_args *args)
+faim_export int aim_send_im_ext(aim_session_t *sess, aim_conn_t *conn, struct aim_sendimext_args *args)
{
- int curbyte,i;
- struct command_tx_struct *newpacket;
+ static const fu8_t deffeatures[] = {
+ 0x01, 0x01, 0x01, 0x02
+ };
+ int i, msgtlvlen;
+ aim_frame_t *fr;
+ aim_snacid_t snacid;
if (!sess || !conn || !args)
- return -EINVAL;
-
- if (!args->msg || (args->msglen <= 0))
return -EINVAL;
- if (args->msglen >= MAXMSGLEN)
- return -E2BIG;
+ if (args->flags & AIM_IMFLAGS_MULTIPART) {
+ if (args->mpmsg->numparts <= 0)
+ return -EINVAL;
+ } else {
+ if (!args->msg || (args->msglen <= 0))
+ return -EINVAL;
- if (!(newpacket = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, args->msglen+512)))
- return -ENOMEM;
+ if (args->msglen >= MAXMSGLEN)
+ return -E2BIG;
+ }
+
+ /* Painfully calculate the size of the message TLV */
+ msgtlvlen = 1 + 1; /* 0501 */
+
+ if (args->flags & AIM_IMFLAGS_CUSTOMFEATURES)
+ msgtlvlen += 2 + args->featureslen;
+ else
+ msgtlvlen += 2 + sizeof(deffeatures);
+
+ if (args->flags & AIM_IMFLAGS_MULTIPART) {
+ aim_mpmsg_section_t *sec;
+
+ for (sec = args->mpmsg->parts; sec; sec = sec->next) {
+ msgtlvlen += 2 /* 0101 */ + 2 /* block len */;
+ msgtlvlen += 4 /* charset */ + sec->datalen;
+ }
- newpacket->lock = 1; /* lock struct */
+ } else {
+ msgtlvlen += 2 /* 0101 */ + 2 /* block len */;
+ msgtlvlen += 4 /* charset */ + args->msglen;
+ }
+
+
+ if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, msgtlvlen+128)))
+ return -ENOMEM;
- curbyte = 0;
- curbyte += aim_putsnac(newpacket->data+curbyte,
- 0x0004, 0x0006, 0x0000, sess->snac_nextid);
+ /* XXX should be optional */
+ snacid = aim_cachesnac(sess, 0x0004, 0x0006, 0x0000, args->destsn, strlen(args->destsn)+1);
+ aim_putsnac(&fr->data, 0x0004, 0x0006, 0x0000, snacid);
/*
* Generate a random message cookie
* SNAC ID.
*
*/
- for (i = 0; i < 8; i++) {
- curbyte += aimutil_put8(newpacket->data+curbyte,
- (unsigned char) rand());
- }
+ for (i = 0; i < 8; i++)
+ aimbs_put8(&fr->data, (fu8_t) rand());
/*
* Channel ID
*/
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0001);
+ aimbs_put16(&fr->data, 0x0001);
/*
* Destination SN (prepended with byte length)
*/
- curbyte += aimutil_put8(newpacket->data+curbyte, strlen(args->destsn));
- curbyte += aimutil_putstr(newpacket->data+curbyte,
- args->destsn, strlen(args->destsn));
+ aimbs_put8(&fr->data, strlen(args->destsn));
+ aimbs_putraw(&fr->data, args->destsn, strlen(args->destsn));
/*
* metaTLV start.
*/
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002);
- curbyte += aimutil_put16(newpacket->data+curbyte, args->msglen + 0x10);
+ aimbs_put16(&fr->data, 0x0002);
+ aimbs_put16(&fr->data, msgtlvlen);
/*
- * Flag data / ICBM Parameters?
- *
- * I don't know what these are...
+ * Features
*
*/
- curbyte += aimutil_put8(newpacket->data+curbyte, 0x05);
- curbyte += aimutil_put8(newpacket->data+curbyte, 0x01);
+ aimbs_put8(&fr->data, 0x05);
+ aimbs_put8(&fr->data, 0x01);
+
+ if (args->flags & AIM_IMFLAGS_CUSTOMFEATURES) {
+ aimbs_put16(&fr->data, args->featureslen);
+ aimbs_putraw(&fr->data, args->features, args->featureslen);
+ } else {
+ aimbs_put16(&fr->data, sizeof(deffeatures));
+ aimbs_putraw(&fr->data, deffeatures, sizeof(deffeatures));
+ }
- /* number of bytes to follow */
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0004);
- curbyte += aimutil_put8(newpacket->data+curbyte, 0x01);
- curbyte += aimutil_put8(newpacket->data+curbyte, 0x01);
- curbyte += aimutil_put8(newpacket->data+curbyte, 0x01);
- curbyte += aimutil_put8(newpacket->data+curbyte, 0x02);
+ if (args->flags & AIM_IMFLAGS_MULTIPART) {
+ aim_mpmsg_section_t *sec;
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0101);
+ for (sec = args->mpmsg->parts; sec; sec = sec->next) {
+ aimbs_put16(&fr->data, 0x0101);
+ aimbs_put16(&fr->data, sec->datalen + 4);
+ aimbs_put16(&fr->data, sec->charset);
+ aimbs_put16(&fr->data, sec->charsubset);
+ aimbs_putraw(&fr->data, sec->data, sec->datalen);
+ }
- /*
- * Message block length.
- */
- curbyte += aimutil_put16(newpacket->data+curbyte, args->msglen + 0x04);
+ } else {
- /*
- * Character set.
- */
- if (args->flags & AIM_IMFLAGS_UNICODE)
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002);
- else if (args->flags & AIM_IMFLAGS_ISO_8859_1)
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0003);
- else
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
+ aimbs_put16(&fr->data, 0x0101);
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
+ /*
+ * Message block length.
+ */
+ aimbs_put16(&fr->data, args->msglen + 0x04);
- /*
- * Message. Not terminated.
- */
- curbyte += aimutil_putstr(newpacket->data+curbyte,
- args->msg, args->msglen);
+ /*
+ * Character set.
+ */
+ if (args->flags & AIM_IMFLAGS_CUSTOMCHARSET) {
+
+ aimbs_put16(&fr->data, args->charset);
+ aimbs_put16(&fr->data, args->charsubset);
+
+ } else {
+ if (args->flags & AIM_IMFLAGS_UNICODE)
+ aimbs_put16(&fr->data, 0x0002);
+ else if (args->flags & AIM_IMFLAGS_ISO_8859_1)
+ aimbs_put16(&fr->data, 0x0003);
+ else
+ aimbs_put16(&fr->data, 0x0000);
+
+ aimbs_put16(&fr->data, 0x0000);
+ }
+
+ /*
+ * Message. Not terminated.
+ */
+ aimbs_putraw(&fr->data, args->msg, args->msglen);
+ }
/*
* Set the Request Acknowledge flag.
*/
if (args->flags & AIM_IMFLAGS_ACK) {
- curbyte += aimutil_put16(newpacket->data+curbyte,0x0003);
- curbyte += aimutil_put16(newpacket->data+curbyte,0x0000);
+ aimbs_put16(&fr->data, 0x0003);
+ aimbs_put16(&fr->data, 0x0000);
}
-
+
/*
* Set the Autoresponse flag.
*/
if (args->flags & AIM_IMFLAGS_AWAY) {
- curbyte += aimutil_put16(newpacket->data+curbyte,0x0004);
- curbyte += aimutil_put16(newpacket->data+curbyte,0x0000);
+ aimbs_put16(&fr->data, 0x0004);
+ aimbs_put16(&fr->data, 0x0000);
}
/*
* Set the Buddy Icon Requested flag.
*/
if (args->flags & AIM_IMFLAGS_BUDDYREQ) {
- curbyte += aimutil_put16(newpacket->data+curbyte,0x0009);
- curbyte += aimutil_put16(newpacket->data+curbyte,0x0000);
+ aimbs_put16(&fr->data, 0x0009);
+ aimbs_put16(&fr->data, 0x0000);
}
/*
- * Set the I HAVE A REALLY PURTY ICON flag (with timestamp).
+ * Set the I HAVE A REALLY PURTY ICON flag.
*/
if (args->flags & AIM_IMFLAGS_HASICON) {
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0008);
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x000c);
- curbyte += aimutil_put32(newpacket->data+curbyte, args->iconlen);
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0001);
- curbyte += aimutil_put16(newpacket->data+curbyte, args->iconsum);
- curbyte += aimutil_put32(newpacket->data+curbyte, args->iconstamp);
+ aimbs_put16(&fr->data, 0x0008);
+ aimbs_put16(&fr->data, 0x000c);
+ aimbs_put32(&fr->data, args->iconlen);
+ aimbs_put32(&fr->data, args->iconsum);
+ aimbs_put32(&fr->data, args->iconstamp);
}
- newpacket->commandlen = curbyte;
- newpacket->lock = 0;
-
- aim_tx_enqueue(sess, newpacket);
+ aim_tx_enqueue(sess, fr);
#if 1 /* XXX do this with autoconf or something... */
- aim_cachesnac(sess, 0x0004, 0x0006, 0x0000, args->destsn, strlen(args->destsn)+1);
aim_cleansnacs(sess, 60); /* clean out all SNACs over 60sec old */
#endif
* that requires an explicit message length. Use aim_send_im_ext().
*
*/
-faim_export int aim_send_im(struct aim_session_t *sess, struct aim_conn_t *conn, const char *destsn, unsigned short flags, const char *msg)
+faim_export int aim_send_im(aim_session_t *sess, aim_conn_t *conn, const char *destsn, fu16_t flags, const char *msg)
{
struct aim_sendimext_args args;
args.msg = msg;
args.msglen = strlen(msg);
+ /* Make these don't get set by accident -- they need aim_send_im_ext */
+ args.flags &= ~(AIM_IMFLAGS_CUSTOMFEATURES | AIM_IMFLAGS_HASICON | AIM_IMFLAGS_MULTIPART);
+
return aim_send_im_ext(sess, conn, &args);
}
-faim_export int aim_send_icon(struct aim_session_t *sess, struct aim_conn_t *conn, const char *sn, const unsigned char *icon, int iconlen, time_t stamp, unsigned short iconsum)
+/*
+ * This is also performance sensitive. (If you can believe it...)
+ *
+ */
+faim_export int aim_send_icon(aim_session_t *sess, aim_conn_t *conn, const char *sn, const fu8_t *icon, int iconlen, time_t stamp, fu32_t iconsum)
{
- struct command_tx_struct *np;
- int i, curbyte = 0;
- unsigned char ck[8];
+ int i;
+ fu8_t ck[8];
+ aim_frame_t *fr;
+ aim_snacid_t snacid;
- if (!sess || !conn || !sn || !icon ||
- (iconlen <= 0) || (iconlen >= MAXICONLEN))
- return -EINVAL;
+ if (!sess || !conn || !sn || !icon || (iconlen <= 0) || (iconlen >= MAXICONLEN))
+ return -EINVAL;
if (conn->type != AIM_CONN_TYPE_BOS)
return -EINVAL;
- for (i = 0, curbyte = 0; i < 8; i++)
- curbyte += aimutil_put8(ck+curbyte, (u_char)rand());
+ for (i = 0; i < 8; i++)
+ aimutil_put8(ck+i, (fu8_t) rand());
- if (!(np = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, 10+8+2+1+strlen(sn)+2+2+2+8+16+2+2+2+2+2+2+2+4+4+4+iconlen+strlen(AIM_ICONIDENT)+2+2)))
+ if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+8+2+1+strlen(sn)+2+2+2+8+16+2+2+2+2+2+2+2+4+4+4+iconlen+strlen(AIM_ICONIDENT)+2+2)))
return -ENOMEM;
- np->lock = 1;
-
- curbyte = aim_putsnac(np->data, 0x0004, 0x0006, 0x0000, sess->snac_nextid);
+ snacid = aim_cachesnac(sess, 0x0004, 0x0006, 0x0000, NULL, 0);
+ aim_putsnac(&fr->data, 0x0004, 0x0006, 0x0000, snacid);
/*
* Cookie
*/
- memcpy(np->data+curbyte, ck, 8);
- curbyte += 8;
+ aimbs_putraw(&fr->data, ck, 8);
/*
* Channel (2)
*/
- curbyte += aimutil_put16(np->data+curbyte, 0x0002);
+ aimbs_put16(&fr->data, 0x0002);
/*
* Dest sn
*/
- curbyte += aimutil_put8(np->data+curbyte, strlen(sn));
- curbyte += aimutil_putstr(np->data+curbyte, sn, strlen(sn));
+ aimbs_put8(&fr->data, strlen(sn));
+ aimbs_putraw(&fr->data, sn, strlen(sn));
/*
* TLV t(0005)
+ *
+ * Encompasses everything below.
*/
- curbyte += aimutil_put16(np->data+curbyte, 0x0005);
- curbyte += aimutil_put16(np->data+curbyte, 2+8+16+6+4+4+iconlen+4+4+4+strlen(AIM_ICONIDENT));
+ aimbs_put16(&fr->data, 0x0005);
+ aimbs_put16(&fr->data, 2+8+16+6+4+4+iconlen+4+4+4+strlen(AIM_ICONIDENT));
- curbyte += aimutil_put16(np->data+curbyte, 0x0000);
-
- memcpy(np->data+curbyte, ck, 8);
- curbyte += 8;
-
- curbyte += aim_putcap(np->data+curbyte, 16, AIM_CAPS_BUDDYICON);
+ aimbs_put16(&fr->data, 0x0000);
+ aimbs_putraw(&fr->data, ck, 8);
+ aim_putcap(&fr->data, AIM_CAPS_BUDDYICON);
/* TLV t(000a) */
- curbyte += aimutil_put16(np->data+curbyte, 0x000a);
- curbyte += aimutil_put16(np->data+curbyte, 0x0002);
- curbyte += aimutil_put16(np->data+curbyte, 0x0001);
+ aimbs_put16(&fr->data, 0x000a);
+ aimbs_put16(&fr->data, 0x0002);
+ aimbs_put16(&fr->data, 0x0001);
/* TLV t(000f) */
- curbyte += aimutil_put16(np->data+curbyte, 0x000f);
- curbyte += aimutil_put16(np->data+curbyte, 0x0000);
+ aimbs_put16(&fr->data, 0x000f);
+ aimbs_put16(&fr->data, 0x0000);
/* TLV t(2711) */
- curbyte += aimutil_put16(np->data+curbyte, 0x2711);
- curbyte += aimutil_put16(np->data+curbyte, 4+4+4+iconlen+strlen(AIM_ICONIDENT));
- curbyte += aimutil_put16(np->data+curbyte, 0x0000);
- curbyte += aimutil_put16(np->data+curbyte, iconsum);
- curbyte += aimutil_put32(np->data+curbyte, iconlen);
- curbyte += aimutil_put32(np->data+curbyte, stamp);
- memcpy(np->data+curbyte, icon, iconlen);
- curbyte += iconlen;
- memcpy(np->data+curbyte, AIM_ICONIDENT, strlen(AIM_ICONIDENT));
- curbyte += strlen(AIM_ICONIDENT);
+ aimbs_put16(&fr->data, 0x2711);
+ aimbs_put16(&fr->data, 4+4+4+iconlen+strlen(AIM_ICONIDENT));
+ aimbs_put32(&fr->data, iconsum);
+ aimbs_put32(&fr->data, iconlen);
+ aimbs_put32(&fr->data, stamp);
+ aimbs_putraw(&fr->data, icon, iconlen);
+ aimbs_putraw(&fr->data, AIM_ICONIDENT, strlen(AIM_ICONIDENT));
/* TLV t(0003) */
- curbyte += aimutil_put16(np->data+curbyte, 0x0003);
- curbyte += aimutil_put16(np->data+curbyte, 0x0000);
+ aimbs_put16(&fr->data, 0x0003);
+ aimbs_put16(&fr->data, 0x0000);
- np->commandlen = curbyte;
- np->lock = 0;
- aim_tx_enqueue(sess, np);
+ aim_tx_enqueue(sess, fr);
return 0;
}
-static int outgoingim(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
+static int outgoingim(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
{
- unsigned int i, ret = 0;
+ int i, ret = 0;
aim_rxcallback_t userfunc;
- unsigned char cookie[8];
- int channel;
- struct aim_tlvlist_t *tlvlist;
- char sn[MAXSNLEN];
- unsigned short icbmflags = 0;
- unsigned char flag1 = 0, flag2 = 0;
- unsigned char *msgblock = NULL, *msg = NULL;
+ fu8_t cookie[8];
+ fu16_t channel;
+ aim_tlvlist_t *tlvlist;
+ char *sn;
+ int snlen;
+ fu16_t icbmflags = 0;
+ fu8_t flag1 = 0, flag2 = 0;
+ fu8_t *msg = NULL;
+ aim_tlv_t *msgblock;
/* ICBM Cookie. */
for (i = 0; i < 8; i++)
- cookie[i] = aimutil_get8(data+i);
+ cookie[i] = aimbs_get8(bs);
/* Channel ID */
- channel = aimutil_get16(data+i);
- i += 2;
+ channel = aimbs_get16(bs);
if (channel != 0x01) {
faimdprintf(sess, 0, "icbm: ICBM recieved on unsupported channel. Ignoring. (chan = %04x)\n", channel);
- return 1;
+ return 0;
}
- strncpy(sn, (char *) data+i+1, (int) *(data+i));
- i += 1 + (int) *(data+i);
+ snlen = aimbs_get8(bs);
+ sn = aimbs_getstr(bs, snlen);
- tlvlist = aim_readtlvchain(data+i, datalen-i);
+ tlvlist = aim_readtlvchain(bs);
if (aim_gettlv(tlvlist, 0x0003, 1))
icbmflags |= AIM_IMFLAGS_ACK;
if (aim_gettlv(tlvlist, 0x0004, 1))
icbmflags |= AIM_IMFLAGS_AWAY;
- if ((msgblock = (unsigned char *)aim_gettlv_str(tlvlist, 0x0002, 1))) {
- int j = 0;
+ if ((msgblock = aim_gettlv(tlvlist, 0x0002, 1))) {
+ aim_bstream_t mbs;
+ int featurelen, msglen;
- /* no, this really is correct. I'm not high or anything either. */
- j += 2;
- j += 2 + aimutil_get16(msgblock+j);
- j += 2;
+ aim_bstream_init(&mbs, msgblock->value, msgblock->length);
- j += 2; /* final block length */
+ aimbs_get8(&mbs);
+ aimbs_get8(&mbs);
+ for (featurelen = aimbs_get16(&mbs); featurelen; featurelen--)
+ aimbs_get8(&mbs);
+ aimbs_get8(&mbs);
+ aimbs_get8(&mbs);
- flag1 = aimutil_get16(msgblock);
- j += 2;
- flag2 = aimutil_get16(msgblock);
- j += 2;
+ msglen = aimbs_get16(&mbs) - 4; /* final block length */
- msg = msgblock+j;
+ flag1 = aimbs_get16(&mbs);
+ flag2 = aimbs_get16(&mbs);
+
+ msg = aimbs_getstr(&mbs, msglen);
}
if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
ret = userfunc(sess, rx, channel, sn, msg, icbmflags, flag1, flag2);
- free(msgblock);
+ free(sn);
aim_freetlvchain(&tlvlist);
return ret;
}
/*
- * A multipart IM:
+ * Ahh, the joys of nearly ridiculous over-engineering.
+ *
+ * Not only do AIM ICBM's support multiple channels. Not only do they
+ * support multiple character sets. But they support multiple character
+ * sets / encodings within the same ICBM.
+ *
+ * These multipart messages allow for complex space savings techniques, which
+ * seem utterly unnecessary by today's standards. In fact, there is only
+ * one client still in popular use that still uses this method: AOL for the
+ * Macintosh, Version 5.0. Obscure, yes, I know.
+ *
+ * In modern (non-"legacy") clients, if the user tries to send a character
+ * that is not ISO-8859-1 or ASCII, the client will send the entire message
+ * as UNICODE, meaning that every character in the message will occupy the
+ * full 16 bit UNICODE field, even if the high order byte would be zero.
+ * Multipart messages prevent this wasted space by allowing the client to
+ * only send the characters in UNICODE that need to be sent that way, and
+ * the rest of the message can be sent in whatever the native character
+ * set is (probably ASCII).
+ *
+ * An important note is that sections will be displayed in the order that
+ * they appear in the ICBM. There is no facility for merging or rearranging
+ * sections at run time. So if you have, say, ASCII then UNICODE then ASCII,
+ * you must supply two ASCII sections with a UNICODE in the middle, and incur
+ * the associated overhead.
+ *
+ * Normally I would have laughed and given a firm 'no' to supporting this
+ * seldom-used feature, but something is attracting me to it. In the future,
+ * it may be possible to abuse this to send mixed-media messages to other
+ * open source clients (like encryption or something) -- see faimtest for
+ * examples of how to do this.
+ *
+ * I would definitly recommend avoiding this feature unless you really
+ * know what you are doing, and/or you have something neat to do with it.
+ *
+ */
+faim_export int aim_mpmsg_init(aim_session_t *sess, aim_mpmsg_t *mpm)
+{
+
+ memset(mpm, 0, sizeof(aim_mpmsg_t));
+
+ return 0;
+}
+
+static int mpmsg_addsection(aim_session_t *sess, aim_mpmsg_t *mpm, fu16_t charset, fu16_t charsubset, fu8_t *data, fu16_t datalen)
+{
+ aim_mpmsg_section_t *sec;
+
+ if (!(sec = malloc(sizeof(aim_mpmsg_section_t))))
+ return -1;
+
+ sec->charset = charset;
+ sec->charsubset = charsubset;
+ sec->data = data;
+ sec->datalen = datalen;
+ sec->next = NULL;
+
+ if (!mpm->parts)
+ mpm->parts = sec;
+ else {
+ aim_mpmsg_section_t *cur;
+
+ for (cur = mpm->parts; cur->next; cur = cur->next)
+ ;
+ cur->next = sec;
+ }
+
+ mpm->numparts++;
+
+ return 0;
+}
+
+faim_export int aim_mpmsg_addraw(aim_session_t *sess, aim_mpmsg_t *mpm, fu16_t charset, fu16_t charsubset, const fu8_t *data, fu16_t datalen)
+{
+ fu8_t *dup;
+
+ if (!(dup = malloc(datalen)))
+ return -1;
+ memcpy(dup, data, datalen);
+
+ if (mpmsg_addsection(sess, mpm, charset, charsubset, dup, datalen) == -1) {
+ free(dup);
+ return -1;
+ }
+
+ return 0;
+}
+
+/* XXX should provide a way of saying ISO-8859-1 specifically */
+faim_export int aim_mpmsg_addascii(aim_session_t *sess, aim_mpmsg_t *mpm, const char *ascii)
+{
+ fu8_t *dup;
+
+ if (!(dup = strdup(ascii)))
+ return -1;
+
+ if (mpmsg_addsection(sess, mpm, 0x0000, 0x0000, dup, strlen(ascii)) == -1) {
+ free(dup);
+ return -1;
+ }
+
+ return 0;
+}
+
+faim_export int aim_mpmsg_addunicode(aim_session_t *sess, aim_mpmsg_t *mpm, const fu16_t *unicode, fu16_t unicodelen)
+{
+ fu8_t *buf;
+ aim_bstream_t bs;
+ int i;
+
+ if (!(buf = malloc(unicodelen * 2)))
+ return -1;
+
+ aim_bstream_init(&bs, buf, unicodelen * 2);
+
+ /* We assume unicode is in /host/ byte order -- convert to network */
+ for (i = 0; i < unicodelen; i++)
+ aimbs_put16(&bs, unicode[i]);
+
+ if (mpmsg_addsection(sess, mpm, 0x0002, 0x0000, buf, aim_bstream_curpos(&bs)) == -1) {
+ free(buf);
+ return -1;
+ }
+
+ return 0;
+}
+
+faim_export void aim_mpmsg_free(aim_session_t *sess, aim_mpmsg_t *mpm)
+{
+ aim_mpmsg_section_t *cur;
+
+ for (cur = mpm->parts; cur; ) {
+ aim_mpmsg_section_t *tmp;
+
+ tmp = cur->next;
+ free(cur->data);
+ free(cur);
+ cur = tmp;
+ }
+
+ mpm->numparts = 0;
+ mpm->parts = NULL;
+
+ return;
+}
+
+/*
+ * Start by building the multipart structures, then pick the first
+ * human-readable section and stuff it into args->msg so no one gets
+ * suspicious.
+ *
+ */
+static int incomingim_ch1_parsemsgs(aim_session_t *sess, fu8_t *data, int len, struct aim_incomingim_ch1_args *args)
+{
+ static const fu16_t charsetpri[] = {
+ 0x0000, /* ASCII first */
+ 0x0003, /* then ISO-8859-1 */
+ 0x0002, /* UNICODE as last resort */
+ };
+ static const int charsetpricount = 3;
+ int i;
+ aim_bstream_t mbs;
+ aim_mpmsg_section_t *sec;
+
+ aim_bstream_init(&mbs, data, len);
+
+ while (aim_bstream_empty(&mbs)) {
+ fu16_t msglen, flag1, flag2;
+ fu8_t *msgbuf;
+
+ aimbs_get8(&mbs); /* 01 */
+ aimbs_get8(&mbs); /* 01 */
+
+ /* Message string length, including character set info. */
+ msglen = aimbs_get16(&mbs);
+
+ /* Character set info */
+ flag1 = aimbs_get16(&mbs);
+ flag2 = aimbs_get16(&mbs);
+
+ /* Message. */
+ msglen -= 4;
+
+ /*
+ * For now, we don't care what the encoding is. Just copy
+ * it into a multipart struct and deal with it later. However,
+ * always pad the ending with a NULL. This makes it easier
+ * to treat ASCII sections as strings. It won't matter for
+ * UNICODE or binary data, as you should never read past
+ * the specified data length, which will not include the pad.
+ *
+ * XXX There's an API bug here. For sending, the UNICODE is
+ * given in host byte order (aim_mpmsg_addunicode), but here
+ * the received messages are given in network byte order.
+ *
+ */
+ msgbuf = aimbs_getstr(&mbs, msglen);
+ mpmsg_addsection(sess, &args->mpmsg, flag1, flag2, msgbuf, msglen);
+
+ } /* while */
+
+ args->icbmflags |= AIM_IMFLAGS_MULTIPART; /* always set */
+
+ /*
+ * Clients that support multiparts should never use args->msg, as it
+ * will point to an arbitrary section.
+ *
+ * Here, we attempt to provide clients that do not support multipart
+ * messages with something to look at -- hopefully a human-readable
+ * string. But, failing that, a UNICODE message, or nothing at all.
+ *
+ * Which means that even if args->msg is NULL, it does not mean the
+ * message was blank.
+ *
+ */
+ for (i = 0; i < charsetpricount; i++) {
+ for (sec = args->mpmsg.parts; sec; sec = sec->next) {
+
+ if (sec->charset != charsetpri[i])
+ continue;
+
+ /* Great. We found one. Fill it in. */
+ args->charset = sec->charset;
+ args->charsubset = sec->charsubset;
+ args->icbmflags |= AIM_IMFLAGS_CUSTOMCHARSET;
+
+ /* Set up the simple flags */
+ if (args->charset == 0x0000)
+ ; /* ASCII */
+ else if (args->charset == 0x0002)
+ args->icbmflags |= AIM_IMFLAGS_UNICODE;
+ else if (args->charset == 0x0003)
+ args->icbmflags |= AIM_IMFLAGS_ISO_8859_1;
+ else if (args->charset == 0xffff)
+ ; /* no encoding (yeep!) */
+
+ if (args->charsubset == 0x0000)
+ ; /* standard subencoding? */
+ else if (args->charsubset == 0x000b)
+ args->icbmflags |= AIM_IMFLAGS_SUBENC_MACINTOSH;
+ else if (args->charsubset == 0xffff)
+ ; /* no subencoding */
+#if 0
+ /* XXX this isn't really necesary... */
+ if ( ((args.flag1 != 0x0000) &&
+ (args.flag1 != 0x0002) &&
+ (args.flag1 != 0x0003) &&
+ (args.flag1 != 0xffff)) ||
+ ((args.flag2 != 0x0000) &&
+ (args.flag2 != 0x000b) &&
+ (args.flag2 != 0xffff))) {
+ faimdprintf(sess, 0, "icbm: **warning: encoding flags are being used! {%04x, %04x}\n", args.flag1, args.flag2);
+ }
+#endif
+
+ args->msg = sec->data;
+ args->msglen = sec->datalen;
+
+ return 0;
+ }
+ }
+
+ /* No human-readable sections found. Oh well. */
+ args->charset = args->charsubset = 0xffff;
+ args->msg = NULL;
+ args->msglen = 0;
+
+ return 0;
+}
+
+/*
+ *
+ * This should use tlvlists, but doesn't for performance reasons.
+ *
+ * XXX support multipart IMs:
*
* 0004 0007 0000 8f08 d295
* 0031 6520 3b7b f9fd
* 0101 000b 0000 0000 3c2f 4854 4d4c 3e another ASCII part
*
*/
-static int incomingim_ch1(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned short channel, struct aim_userinfo_s *userinfo, unsigned char *data, int datalen, unsigned char *cookie)
+static int incomingim_ch1(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, fu16_t channel, aim_userinfo_t *userinfo, aim_bstream_t *bs, fu8_t *cookie)
{
- unsigned short type, length;
+ fu16_t type, length;
aim_rxcallback_t userfunc;
- int i, ret = 0;
+ int ret = 0;
struct aim_incomingim_ch1_args args;
+ int endpos;
memset(&args, 0, sizeof(args));
+ aim_mpmsg_init(sess, &args.mpmsg);
+
/*
* This used to be done using tlvchains. For performance reasons,
* I've changed it to process the TLVs in-place. This avoids lots
* of per-IM memory allocations.
*/
- for (i = 0; i < datalen; ) {
+ while (aim_bstream_empty(bs)) {
+
+ type = aimbs_get16(bs);
+ length = aimbs_get16(bs);
- type = aimutil_get16(data+i);
- i += 2;
-
- length = aimutil_get16(data+i);
- i += 2;
+ endpos = aim_bstream_curpos(bs) + length;
if (type == 0x0002) { /* Message Block */
- unsigned short wastebits;
- unsigned char *msgblock;
- int j = 0, y = 0, z = 0;
- msgblock = data+i;
-
/*
- * Extracting the message from the unknown cruft.
- *
- * This is a bit messy, and I'm not really qualified,
- * even as the author, to comment on it. At least
- * its not as bad as a while loop shooting into
- * infinity.
- *
- * "Do you believe in magic?"
+ * This TLV consists of the following:
+ * - 0501 -- Unknown
+ * - Features: Don't know how to interpret these
+ * - 0101 -- Unknown
+ * - Message
*
*/
- wastebits = aimutil_get8(msgblock+j++);
- wastebits = aimutil_get8(msgblock+j++);
-
- y = aimutil_get16(msgblock+j);
- j += 2;
- for (z = 0; z < y; z++)
- wastebits = aimutil_get8(msgblock+j++);
- wastebits = aimutil_get8(msgblock+j++);
- wastebits = aimutil_get8(msgblock+j++);
-
- args.finlen = j;
- if (args.finlen > sizeof(args.fingerprint))
- args.finlen = sizeof(args.fingerprint);
- memcpy(args.fingerprint, msgblock, args.finlen);
-
- /* Message string length, including flag words. */
- args.msglen = aimutil_get16(msgblock+j);
- j += 2;
-
- /* Flag words. */
- args.flag1 = aimutil_get16(msgblock+j);
- if (args.flag1 == 0x0000)
- ; /* ASCII */
- else if (args.flag1 == 0x0002)
- args.icbmflags |= AIM_IMFLAGS_UNICODE;
- else if (args.flag1 == 0x0003)
- args.icbmflags |= AIM_IMFLAGS_ISO_8859_1;
- else if (args.flag1 == 0xffff)
- ; /* no encoding (yeep!) */
- j += 2;
+ aimbs_get8(bs); /* 05 */
+ aimbs_get8(bs); /* 01 */
- args.flag2 = aimutil_get16(msgblock+j);
- if (args.flag2 == 0x0000)
- ; /* standard subencoding? */
- else if (args.flag2 == 0x000b)
- args.icbmflags |= AIM_IMFLAGS_SUBENC_MACINTOSH;
- else if (args.flag2 == 0xffff)
- ; /* no subencoding */
- j += 2;
-
- if ( ((args.flag1 != 0x0000) &&
- (args.flag1 != 0x0002) &&
- (args.flag1 != 0x0003) &&
- (args.flag1 != 0xffff)) ||
- ((args.flag2 != 0x0000) &&
- (args.flag2 != 0x000b) &&
- (args.flag2 != 0xffff))) {
- faimdprintf(sess, 0, "icbm: **warning: encoding flags are being used! {%04x, %04x}\n", args.flag1, args.flag2);
- }
+ args.featureslen = aimbs_get16(bs);
+ /* XXX XXX this is all evil! */
+ args.features = bs->data + bs->offset;
+ aim_bstream_advance(bs, args.featureslen);
+ args.icbmflags |= AIM_IMFLAGS_CUSTOMFEATURES;
- /* Message string. */
- args.msglen -= 4;
- if (args.icbmflags & AIM_IMFLAGS_UNICODE) {
- args.msg = malloc(args.msglen+2);
- memcpy(args.msg, msgblock+j, args.msglen);
- args.msg[args.msglen] = '\0'; /* wide NULL */
- args.msg[args.msglen+1] = '\0';
- } else {
- args.msg = malloc(args.msglen+1);
- memcpy(args.msg, msgblock+j, args.msglen);
- args.msg[args.msglen] = '\0';
- }
+ /*
+ * The rest of the TLV contains one or more message
+ * blocks...
+ */
+ incomingim_ch1_parsemsgs(sess, bs->data + bs->offset /* XXX evil!!! */, length - 2 - 2 - args.featureslen, &args);
} else if (type == 0x0003) { /* Server Ack Requested */
args.icbmflags |= AIM_IMFLAGS_AWAY;
- } else if ((type == 0x0008) && (length == 0x000c)) { /* I-HAVE-A-REALLY-PURTY-ICON Flag */
+ } else if (type == 0x0008) { /* I-HAVE-A-REALLY-PURTY-ICON Flag */
- args.iconchecksum = aimutil_get32(data+i);
- args.iconlength = aimutil_get32(data+i+4);
- args.iconstamp = aimutil_get32(data+i+8);
+ args.iconsum = aimbs_get32(bs);
+ args.iconlen = aimbs_get32(bs);
+ args.iconstamp = aimbs_get32(bs);
args.icbmflags |= AIM_IMFLAGS_HASICON;
} else if (type == 0x0009) {
} else if (type == 0x0017) {
args.extdatalen = length;
- args.extdata = data+i;
+ args.extdata = aimbs_getraw(bs, args.extdatalen);
} else {
faimdprintf(sess, 0, "incomingim_ch1: unknown TLV 0x%04x (len %d)\n", type, length);
}
- i += length;
+ /*
+ * This is here to protect ourselves from ourselves. That
+ * is, if something above doesn't completly parse its value
+ * section, or, worse, overparses it, this will set the
+ * stream where it needs to be in order to land on the next
+ * TLV when the loop continues.
+ *
+ */
+ aim_bstream_setpos(bs, endpos);
}
if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
ret = userfunc(sess, rx, channel, userinfo, &args);
- free(args.msg);
+ aim_mpmsg_free(sess, &args.mpmsg);
+ free(args.extdata);
+
+ return ret;
+}
+
+static int incomingim_ch2_buddylist(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args, aim_tlvlist_t *list2)
+{
+ aim_rxcallback_t userfunc;
+ int ret = 0;
+ aim_tlv_t *tse;
+ aim_bstream_t tbs;
+
+ if (args->status != 0x0000)
+ return 1; /* ignore it -- not sure what it means */
+
+ tse = aim_gettlv(list2, 0x2711, 1);
+ aim_bstream_init(&tbs, tse->value, tse->length);
+
+ /*
+ * This goes like this...
+ *
+ * group name length
+ * group name
+ * num of buddies in group
+ * buddy name length
+ * buddy name
+ * buddy name length
+ * buddy name
+ * ...
+ * group name length
+ * group name
+ * num of buddies in group
+ * buddy name length
+ * buddy name
+ * ...
+ * ...
+ */
+ while (aim_bstream_empty(&tbs)) {
+ fu16_t gnlen, numb;
+ int i;
+ char *gn;
+
+ gnlen = aimbs_get16(&tbs);
+ gn = aimbs_getstr(&tbs, gnlen);
+ numb = aimbs_get16(&tbs);
+
+ for (i = 0; i < numb; i++) {
+ fu16_t bnlen;
+ char *bn;
+
+ bnlen = aimbs_get16(&tbs);
+ bn = aimbs_getstr(&tbs, bnlen);
+
+ faimdprintf(sess, 0, "got a buddy list from %s: group %s, buddy %s\n", userinfo->sn, gn, bn);
+
+ free(bn);
+ }
+
+ free(gn);
+ }
+
+ if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+ ret = userfunc(sess, rx, 0x0002, userinfo, args);
return ret;
}
-static int incomingim_ch2(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned short channel, struct aim_userinfo_s *userinfo, struct aim_tlvlist_t *tlvlist, unsigned char *cookie)
+static int incomingim_ch2_buddyicon(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args, aim_tlvlist_t *list2)
{
aim_rxcallback_t userfunc;
- struct aim_tlv_t *block1;
- struct aim_tlvlist_t *list2;
+ int ret = 0;
+ aim_tlv_t *miscinfo;
+ aim_bstream_t tbs;
+
+ if (!(miscinfo = aim_gettlv(list2, 0x2711, 1)))
+ return 0;
+ aim_bstream_init(&tbs, miscinfo->value, miscinfo->length);
+
+ args->info.icon.checksum = aimbs_get32(&tbs);
+ args->info.icon.length = aimbs_get32(&tbs);
+ args->info.icon.timestamp = aimbs_get32(&tbs);
+ args->info.icon.icon = aimbs_getraw(&tbs, args->info.icon.length);
+
+ if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+ ret = userfunc(sess, rx, 0x0002, userinfo, args);
+
+ free(args->info.icon.icon);
+
+ return ret;
+}
+
+static int incomingim_ch2_voice(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args, aim_tlvlist_t *list2)
+{
+ aim_msgcookie_t *cachedcook;
+ int ret = 0;
+ aim_rxcallback_t userfunc;
+
+ faimdprintf(sess, 1, "rend: voice!\n");
+
+ if (!(cachedcook = (aim_msgcookie_t*)calloc(1, sizeof(aim_msgcookie_t))))
+ return 0;
+
+ memcpy(cachedcook->cookie, args->cookie, 8);
+ cachedcook->type = AIM_COOKIETYPE_OFTVOICE;
+ cachedcook->data = NULL;
+
+ if (aim_cachecookie(sess, cachedcook) == -1)
+ faimdprintf(sess, 0, "ERROR caching message cookie\n");
+
+ /* XXX: implement all this */
+
+ if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+ ret = userfunc(sess, rx, 0x0002, userinfo, args);
+
+ return ret;
+}
+
+static int incomingim_ch2_chat(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args, aim_tlvlist_t *list2)
+{
+ aim_tlv_t *miscinfo;
+ aim_bstream_t tbs;
+ aim_rxcallback_t userfunc;
+ int ret = 0;
+
+ miscinfo = aim_gettlv(list2, 0x2711, 1);
+ aim_bstream_init(&tbs, miscinfo->value, miscinfo->length);
+
+ aim_chat_readroominfo(&tbs, &args->info.chat.roominfo);
+
+ if (aim_gettlv(list2, 0x000c, 1))
+ args->info.chat.msg = aim_gettlv_str(list2, 0x000c, 1);
+
+ if (aim_gettlv(list2, 0x000d, 1))
+ args->info.chat.encoding = aim_gettlv_str(list2, 0x000d, 1);
+
+ if (aim_gettlv(list2, 0x000e, 1))
+ args->info.chat.lang = aim_gettlv_str(list2, 0x000e, 1);
+
+ if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+ ret = userfunc(sess, rx, 0x0002, userinfo, args);
+
+ /* XXX free_roominfo */
+ free(args->info.chat.roominfo.name);
+ free(args->info.chat.msg);
+ free(args->info.chat.encoding);
+ free(args->info.chat.lang);
+
+ return ret;
+}
+
+static int incomingim_ch2_getfile(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args, aim_tlvlist_t *list2)
+{
+ char ip[30];
+ aim_msgcookie_t *cachedcook;
+ aim_tlv_t *miscinfo;
+ aim_tlv_t *iptlv, *porttlv;
+ int ret = 0;
+ aim_rxcallback_t userfunc;
+
+ memset(ip, 0, 30);
+
+ if (!(cachedcook = calloc(1, sizeof(aim_msgcookie_t)))) {
+ aim_freetlvchain(&list2);
+ return 0;
+ }
+
+ if (!(miscinfo = aim_gettlv(list2, 0x2711, 1)) ||
+ !(iptlv = aim_gettlv(list2, 0x0003, 1)) ||
+ !(porttlv = aim_gettlv(list2, 0x0005, 1))) {
+
+ faimdprintf(sess, 0, "rend: badly damaged file get request from %s...\n", userinfo->sn);
+ aim_cookie_free(sess, cachedcook);
+ aim_freetlvchain(&list2);
+
+ return 0;
+ }
+
+ snprintf(ip, 30, "%d.%d.%d.%d:%d",
+ aimutil_get8(iptlv->value+0),
+ aimutil_get8(iptlv->value+1),
+ aimutil_get8(iptlv->value+2),
+ aimutil_get8(iptlv->value+3),
+ aimutil_get16(porttlv->value));
+
+ faimdprintf(sess, 0, "rend: file get request from %s (%s)\n", userinfo->sn, ip);
+
+ args->info.getfile.ip = ip;
+ memcpy(args->info.getfile.cookie, args->cookie, 8);
+
+ if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+ ret = userfunc(sess, rx, 0x0002, userinfo, args);
+
+ return ret;
+}
+
+static int incomingim_ch2_sendfile(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args, aim_tlvlist_t *list2)
+{
+#if 0
+ char ip[30];
+ aim_msgcookie_t *cachedcook;
+ aim_tlv_t *miscinfo;
+ aim_tlv_t *iptlv, *porttlv;
+ int ret =0;
+ aim_rxcallback_t userfunc;
+ char *desc = NULL;
+
+ memset(ip, 0, 30);
+
+ if (!(cachedcook = calloc(1, sizeof(aim_msgcookie_t))))
+ return 0;
+
+ if (!(miscinfo = aim_gettlv(list2, 0x2711, 1)) ||
+ !(iptlv = aim_gettlv(list2, 0x0003, 1)) ||
+ !(porttlv = aim_gettlv(list2, 0x0005, 1))) {
+
+ faimdprintf(sess, 0, "rend: badly damaged file get request from %s...\n", userinfo->sn);
+ aim_cookie_free(sess, cachedcook);
+
+ return 0;
+ }
+
+ snprintf(ip, 30, "%d.%d.%d.%d:%d",
+ aimutil_get8(iptlv->value+0),
+ aimutil_get8(iptlv->value+1),
+ aimutil_get8(iptlv->value+2),
+ aimutil_get8(iptlv->value+3),
+ aimutil_get16(porttlv->value));
+
+ if (aim_gettlv(list2, 0x000c, 1))
+ desc = aim_gettlv_str(list2, 0x000c, 1);
+
+ faimdprintf(sess, 0, "rend: file transfer request from %s: %s (%s)\n",
+ userinfo->sn, desc, ip);
+
+ memcpy(cachedcook->cookie, args->cookie, 8);
+
+ ft = malloc(sizeof(struct aim_filetransfer_priv)); /* XXX */
+ strncpy(ft->sn, userinfo.sn, sizeof(ft->sn));
+ strncpy(ft->ip, ip, sizeof(ft->ip));
+ strncpy(ft->fh.name, miscinfo->value+8, sizeof(ft->fh.name));
+ cachedcook->type = AIM_COOKIETYPE_OFTSEND;
+ cachedcook->data = ft;
+
+ if (aim_cachecookie(sess, cachedcook) == -1)
+ faimdprintf(sess, 0, "ERROR caching message cookie\n");
+
+ aim_accepttransfer(sess, rx->conn, ft->sn, cookie, AIM_CAPS_SENDFILE);
+
+ if (desc)
+ free(desc);
+
+ if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+ ret = userfunc(sess, rx, 0x0002, userinfo, &args);
+#endif
+ return 0;
+}
+
+static int incomingim_ch2_imimage(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args, aim_tlvlist_t *list2)
+{
+ aim_rxcallback_t userfunc;
+ int ret = 0;
+
+ /* Primary IP address */
+ if (aim_gettlv(list2, 0x0003, 1)) {
+ aim_tlv_t *tlv;
+
+ tlv = aim_gettlv(list2, 0x0003, 1);
+
+ snprintf(args->info.imimage.ip, sizeof(args->info.imimage.ip),
+ "%d.%d.%d.%d:4443",
+ tlv->value[0],
+ tlv->value[1],
+ tlv->value[2],
+ tlv->value[3]);
+ }
+
+ /*
+ * Alternate IP address
+ *
+ * Sort of. The peer doesn't send this -- the OSCAR
+ * server does. So it will be the IP address that the
+ * peer is directly connected to the internet with, which
+ * may not be the same as the IP above. If these two
+ * values differ, it's rather unlikely that this
+ * rendezvous is going to happen...
+ *
+ */
+ if (aim_gettlv(list2, 0x0004, 1))
+ ;
+
+ /* Port number (not correct -- ignore) */
+ if (aim_gettlv(list2, 0x0005, 1))
+ ;
+
+ /* Unknown -- two bytes = 0x0001 */
+ if (aim_gettlv(list2, 0x000a, 1))
+ ;
+
+ /* Unknown -- no value */
+ if (aim_gettlv(list2, 0x000f, 1))
+ ;
+
+ faimdprintf(sess, 1, "rend: directIM request from %s (%s)\n", userinfo->sn, args->info.imimage.ip);
+
+ /*
+ * XXX: there are a couple of different request packets for
+ * different things
+ */
+
+ if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+ ret = userfunc(sess, rx, 0x0002, userinfo, args);
+
+ return ret;
+}
+
+/* XXX Ugh. I think its obvious. */
+static int incomingim_ch2(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, fu16_t channel, aim_userinfo_t *userinfo, aim_tlvlist_t *tlvlist, fu8_t *cookie)
+{
+ aim_tlv_t *block1;
+ aim_tlvlist_t *list2;
int ret = 0;
struct aim_incomingim_ch2_args args;
+ aim_bstream_t bbs;
+ fu8_t *cookie2;
memset(&args, 0, sizeof(args));
return 0;
}
+ aim_bstream_init(&bbs, block1->value, block1->length);
+
/*
* First two bytes represent the status of the connection.
*
* 0 is a request, 2 is an accept
*/
- args.status = aimutil_get16(block1->value+0);
+ args.status = aimbs_get16(&bbs);
/*
* Next comes the cookie. Should match the ICBM cookie.
*/
- if (memcmp(block1->value+2, cookie, 8) != 0)
+ cookie2 = aimbs_getraw(&bbs, 8);
+ if (memcmp(cookie, cookie2, 8) != 0)
faimdprintf(sess, 0, "rend: warning cookies don't match!\n");
+ memcpy(args.cookie, cookie2, 8);
+ free(cookie2);
/*
* The next 16bytes are a capability block so we can
* Read off one capability string and we should have it ID'd.
*
*/
- if ((args.reqclass = aim_getcap(sess, block1->value+2+8, 0x10)) == 0x0000) {
+ if ((args.reqclass = aim_getcap(sess, &bbs, 0x10)) == 0x0000) {
faimdprintf(sess, 0, "rend: no ID block\n");
return 0;
}
*
* Ack packets for instance have nothing more to them.
*/
- list2 = aim_readtlvchain(block1->value+2+8+16, block1->length-2-8-16);
+ list2 = aim_readtlvchain(&bbs);
+#if 0 /* this should be in the per-type blocks */
if (!list2 || ((args.reqclass != AIM_CAPS_IMIMAGE) && !(aim_gettlv(list2, 0x2711, 1)))) {
- struct aim_msgcookie_t *cook;
+ aim_msgcookie_t *cook;
int type;
type = aim_msgcookie_gettype(args.reqclass); /* XXX: fix this shitty code */
if ((cook = aim_checkcookie(sess, cookie, type)) == NULL) {
faimdprintf(sess, 0, "non-data rendezvous thats not in cache (type %d)\n", type);
- aim_freetlvchain(&list2);
- return 1;
+ aim_freetlvchain(&list2);
+ return 1;
}
if (cook->type == AIM_COOKIETYPE_OFTGET) {
if (args.status != 0x0002) {
- if (aim_gettlv(list2, 0x000b, 1))
- errorcode = aim_gettlv16(list2, 0x000b, 1);
+ if (aim_gettlv(list2, 0x000b, 1))
+ errorcode = aim_gettlv16(list2, 0x000b, 1);
- /* XXX this should make it up to the client, you know.. */
- if (errorcode)
- faimdprintf(sess, 0, "transfer from %s (%s) for %s cancelled (error code %d)\n", ft->sn, ft->ip, ft->fh.name, errorcode);
+ /* XXX this should make it up to the client, you know.. */
+ if (errorcode)
+ faimdprintf(sess, 0, "transfer from %s (%s) for %s cancelled (error code %d)\n", ft->sn, ft->ip, ft->fh.name, errorcode);
} /* args.status != 0x0002 */
-
+
} else {
faimdprintf(sess, 0, "no data attached to file transfer\n");
} /* !cook->data */
return 1;
}
+#endif
/*
* The rest of the handling depends on what type it is.
*/
- if (args.reqclass & AIM_CAPS_BUDDYICON) {
- struct aim_tlv_t *miscinfo;
- int curpos = 0;
-
- miscinfo = aim_gettlv(list2, 0x2711, 1);
-
- args.info.icon.checksum = aimutil_get32(miscinfo->value+curpos);
- curpos += 4;
- args.info.icon.length = aimutil_get32(miscinfo->value+curpos);
- curpos += 4;
- args.info.icon.timestamp = aimutil_get32(miscinfo->value+curpos);
- curpos += 4;
- args.info.icon.icon = malloc(args.info.icon.length);
- memcpy(args.info.icon.icon, miscinfo->value+curpos, args.info.icon.length);
-
- if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
- ret = userfunc(sess, rx, channel, userinfo, &args);
-
- free(args.info.icon.icon);
-
- } else if (args.reqclass & AIM_CAPS_VOICE) {
- struct aim_msgcookie_t *cachedcook;
-
- faimdprintf(sess, 1, "rend: voice!\n");
-
- if(!(cachedcook = (struct aim_msgcookie_t*)calloc(1, sizeof(struct aim_msgcookie_t)))) {
- aim_freetlvchain(&list2);
- return 0;
- }
-
- memcpy(cachedcook->cookie, cookie, 8);
- cachedcook->type = AIM_COOKIETYPE_OFTVOICE;
- cachedcook->data = NULL;
-
- if (aim_cachecookie(sess, cachedcook) == -1)
- faimdprintf(sess, 0, "ERROR caching message cookie\n");
-
- /* XXX: implement all this */
-
- if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
- ret = userfunc(sess, rx, channel, userinfo, &args);
-
- } else if (args.reqclass & AIM_CAPS_IMIMAGE) {
- char ip[30];
- struct aim_directim_priv *priv;
-
- memset(ip, 0, sizeof(ip));
-
- if (aim_gettlv(list2, 0x0003, 1) && aim_gettlv(list2, 0x0005, 1)) {
- struct aim_tlv_t *iptlv, *porttlv;
-
- iptlv = aim_gettlv(list2, 0x0003, 1);
- porttlv = aim_gettlv(list2, 0x0005, 1);
-
- snprintf(ip, 30, "%d.%d.%d.%d:%d",
- aimutil_get8(iptlv->value+0),
- aimutil_get8(iptlv->value+1),
- aimutil_get8(iptlv->value+2),
- aimutil_get8(iptlv->value+3),
- 4443 /*aimutil_get16(porttlv->value)*/);
- }
-
- faimdprintf(sess, 1, "rend: directIM request from %s (%s)\n",
- userinfo->sn, ip);
-
- /*
- * XXX: there are a couple of different request packets for
- * different things
- */
-
- args.info.directim = priv = (struct aim_directim_priv *)calloc(1, sizeof(struct aim_directim_priv)); /* XXX error */
- memcpy(priv->ip, ip, sizeof(priv->ip));
- memcpy(priv->sn, userinfo->sn, sizeof(priv->sn));
- memcpy(priv->cookie, cookie, sizeof(priv->cookie));
-
- if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
- ret = userfunc(sess, rx, channel, userinfo, &args);
-
- } else if (args.reqclass & AIM_CAPS_CHAT) {
- struct aim_tlv_t *miscinfo;
-
- miscinfo = aim_gettlv(list2, 0x2711, 1);
- aim_chat_readroominfo(miscinfo->value, &args.info.chat.roominfo);
-
- if (aim_gettlv(list2, 0x000c, 1))
- args.info.chat.msg = aim_gettlv_str(list2, 0x000c, 1);
-
- if (aim_gettlv(list2, 0x000d, 1))
- args.info.chat.encoding = aim_gettlv_str(list2, 0x000d, 1);
-
- if (aim_gettlv(list2, 0x000e, 1))
- args.info.chat.lang = aim_gettlv_str(list2, 0x000e, 1);
-
- if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
- ret = userfunc(sess, rx, channel, userinfo, &args);
-
- free(args.info.chat.roominfo.name);
- free(args.info.chat.msg);
- free(args.info.chat.encoding);
- free(args.info.chat.lang);
-
- } else if (args.reqclass & AIM_CAPS_GETFILE) {
- char ip[30];
- struct aim_msgcookie_t *cachedcook;
- struct aim_tlv_t *miscinfo;
- struct aim_tlv_t *iptlv, *porttlv;
-
- memset(ip, 0, 30);
-
- if (!(cachedcook = calloc(1, sizeof(struct aim_msgcookie_t)))) {
- aim_freetlvchain(&list2);
- return 0;
- }
-
- if (!(miscinfo = aim_gettlv(list2, 0x2711, 1)) ||
- !(iptlv = aim_gettlv(list2, 0x0003, 1)) ||
- !(porttlv = aim_gettlv(list2, 0x0005, 1))) {
-
- faimdprintf(sess, 0, "rend: badly damaged file get request from %s...\n", userinfo->sn);
- aim_cookie_free(sess, cachedcook);
- aim_freetlvchain(&list2);
-
- return 0;
- }
-
- snprintf(ip, 30, "%d.%d.%d.%d:%d",
- aimutil_get8(iptlv->value+0),
- aimutil_get8(iptlv->value+1),
- aimutil_get8(iptlv->value+2),
- aimutil_get8(iptlv->value+3),
- aimutil_get16(porttlv->value));
-
- faimdprintf(sess, 0, "rend: file get request from %s (%s)\n", userinfo->sn, ip);
-
- args.info.getfile.ip = ip;
- args.info.getfile.cookie = cookie;
-
- if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
- ret = userfunc(sess, rx, channel, userinfo, &args);
-
- } else if (args.reqclass & AIM_CAPS_SENDFILE) {
-#if 0
- char ip[30];
- struct aim_msgcookie_t *cachedcook;
- struct aim_tlv_t *miscinfo;
- struct aim_tlv_t *iptlv, *porttlv;
-
- memset(ip, 0, 30);
-
- if (!(cachedcook = calloc(1, sizeof(struct aim_msgcookie_t)))) {
- aim_freetlvchain(&list2);
- return 0;
- }
-
- if (!(miscinfo = aim_gettlv(list2, 0x2711, 1)) ||
- !(iptlv = aim_gettlv(list2, 0x0003, 1)) ||
- !(porttlv = aim_gettlv(list2, 0x0005, 1))) {
-
- faimdprintf(sess, 0, "rend: badly damaged file get request from %s...\n", userinfo->sn);
- aim_cookie_free(sess, cachedcook);
- aim_freetlvchain(&list2);
-
- return 0;
- }
-
- snprintf(ip, 30, "%d.%d.%d.%d:%d",
- aimutil_get8(iptlv->value+0),
- aimutil_get8(iptlv->value+1),
- aimutil_get8(iptlv->value+2),
- aimutil_get8(iptlv->value+3),
- aimutil_get16(porttlv->value));
-
- if (aim_gettlv(list2, 0x000c, 1))
- desc = aim_gettlv_str(list2, 0x000c, 1);
-
- faimdprintf(sess, 0, "rend: file transfer request from %s: %s (%s)\n",
- userinfo->sn, desc, ip);
-
- memcpy(cachedcook->cookie, cookie, 8);
-
- ft = malloc(sizeof(struct aim_filetransfer_priv)); /* XXX */
- strncpy(ft->sn, userinfo.sn, sizeof(ft->sn));
- strncpy(ft->ip, ip, sizeof(ft->ip));
- strncpy(ft->fh.name, miscinfo->value+8, sizeof(ft->fh.name));
- cachedcook->type = AIM_COOKIETYPE_OFTSEND;
- cachedcook->data = ft;
-
- if (aim_cachecookie(sess, cachedcook) == -1)
- faimdprintf(sess, 0, "ERROR caching message cookie\n");
-
- aim_accepttransfer(sess, rx->conn, ft->sn, cookie, AIM_CAPS_SENDFILE);
-
- if (desc)
- free(desc);
-
- if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
- ret = userfunc(sess, rx, channel, userinfo, &args);
-
-#endif
- } else
+ if (args.reqclass & AIM_CAPS_BUDDYICON)
+ ret = incomingim_ch2_buddyicon(sess, mod, rx, snac, userinfo, &args, list2);
+ else if (args.reqclass & AIM_CAPS_SENDBUDDYLIST)
+ ret = incomingim_ch2_buddylist(sess, mod, rx, snac, userinfo, &args, list2);
+ else if (args.reqclass & AIM_CAPS_VOICE)
+ ret = incomingim_ch2_voice(sess, mod, rx, snac, userinfo, &args, list2);
+ else if (args.reqclass & AIM_CAPS_IMIMAGE)
+ ret = incomingim_ch2_imimage(sess, mod, rx, snac, userinfo, &args, list2);
+ else if (args.reqclass & AIM_CAPS_CHAT)
+ ret = incomingim_ch2_chat(sess, mod, rx, snac, userinfo, &args, list2);
+ else if (args.reqclass & AIM_CAPS_GETFILE)
+ ret = incomingim_ch2_getfile(sess, mod, rx, snac, userinfo, &args, list2);
+ else if (args.reqclass & AIM_CAPS_SENDFILE)
+ ret = incomingim_ch2_sendfile(sess, mod, rx, snac, userinfo, &args, list2);
+ else
faimdprintf(sess, 0, "rend: unknown rendezvous 0x%04x\n", args.reqclass);
aim_freetlvchain(&list2);
* I have access to. Its not fast, its not clean. But it works.
*
*/
-static int incomingim(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
+static int incomingim(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
{
int i, ret = 0;
- unsigned char cookie[8];
- int channel;
- struct aim_userinfo_s userinfo;
+ fu8_t cookie[8];
+ fu16_t channel;
+ aim_userinfo_t userinfo;
- memset(&userinfo, 0x00, sizeof(struct aim_userinfo_s));
+ memset(&userinfo, 0x00, sizeof(aim_userinfo_t));
/*
* Read ICBM Cookie. And throw away.
*/
for (i = 0; i < 8; i++)
- cookie[i] = aimutil_get8(data+i);
+ cookie[i] = aimbs_get8(bs);
/*
* Channel ID.
* connection negotiations come from.
*
*/
- channel = aimutil_get16(data+i);
- i += 2;
-
- /*
- * Technically Channel 3 in chat could be done here too.
- */
- if ((channel != 0x01) && (channel != 0x02)) {
- faimdprintf(sess, 0, "icbm: ICBM received on an unsupported channel. Ignoring.\n (chan = %04x)", channel);
- return 1;
- }
+ channel = aimbs_get16(bs);
/*
* Extract the standard user info block.
* never be two TLVs of the same type in one block.
*
*/
- i += aim_extractuserinfo(sess, data+i, &userinfo);
+ aim_extractuserinfo(sess, bs, &userinfo);
/*
* From here on, its depends on what channel we're on.
*/
if (channel == 1) {
- ret = incomingim_ch1(sess, mod, rx, snac, channel, &userinfo, data+i, datalen-i, cookie);
+ ret = incomingim_ch1(sess, mod, rx, snac, channel, &userinfo, bs, cookie);
} else if (channel == 0x0002) {
- struct aim_tlvlist_t *tlvlist;
+ aim_tlvlist_t *tlvlist;
/*
* Read block of TLVs (not including the userinfo data). All
* further data is derived from what is parsed here.
*/
- tlvlist = aim_readtlvchain(data+i, datalen-i);
+ tlvlist = aim_readtlvchain(bs);
ret = incomingim_ch2(sess, mod, rx, snac, channel, &userinfo, tlvlist, cookie);
* Free up the TLV chain.
*/
aim_freetlvchain(&tlvlist);
+ } else {
+ faimdprintf(sess, 0, "icbm: ICBM received on an unsupported channel. Ignoring.\n (chan = %04x)", channel);
+ return 0;
}
return ret;
* AIM_TRANSFER_DENY_NOTACCEPTING -- "client is not accepting transfers"
*
*/
-faim_export int aim_denytransfer(struct aim_session_t *sess,
- struct aim_conn_t *conn,
- const char *sender,
- const char *cookie,
- unsigned short code)
+faim_export int aim_denytransfer(aim_session_t *sess, aim_conn_t *conn, const char *sender, const char *cookie, fu16_t code)
{
- struct command_tx_struct *newpacket;
- int curbyte, i;
-
- if (!(newpacket = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, 10+8+2+1+strlen(sender)+6)))
+ aim_frame_t *fr;
+ aim_snacid_t snacid;
+ aim_tlvlist_t *tl = NULL;
+
+ if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+8+2+1+strlen(sender)+6)))
return -ENOMEM;
- newpacket->lock = 1;
+ snacid = aim_cachesnac(sess, 0x0004, 0x000b, 0x0000, NULL, 0);
+ aim_putsnac(&fr->data, 0x0004, 0x000b, 0x0000, snacid);
+
+ aimbs_putraw(&fr->data, cookie, 8);
- curbyte = aim_putsnac(newpacket->data, 0x0004, 0x000b, 0x0000, sess->snac_nextid++);
- for (i = 0; i < 8; i++)
- curbyte += aimutil_put8(newpacket->data+curbyte, cookie[i]);
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002);
- curbyte += aimutil_put8(newpacket->data+curbyte, strlen(sender));
- curbyte += aimutil_putstr(newpacket->data+curbyte, sender, strlen(sender));
- curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0003, code);
+ aimbs_put16(&fr->data, 0x0002); /* channel */
+ aimbs_put8(&fr->data, strlen(sender));
+ aimbs_putraw(&fr->data, sender, strlen(sender));
- newpacket->lock = 0;
- aim_tx_enqueue(sess, newpacket);
+ aim_addtlvtochain16(&tl, 0x0003, code);
+ aim_writetlvchain(&fr->data, &tl);
+ aim_freetlvchain(&tl);
+
+ aim_tx_enqueue(sess, fr);
return 0;
}
* Request ICBM parameter information.
*
*/
-faim_export unsigned long aim_reqicbmparams(struct aim_session_t *sess, struct aim_conn_t *conn)
+faim_export int aim_reqicbmparams(aim_session_t *sess, aim_conn_t *conn)
{
return aim_genericreq_n(sess, conn, 0x0004, 0x0004);
}
/*
*
+ * I definitly recommend sending this. If you don't, you'll be stuck
+ * with the rather unreasonable defaults. You don't want those. Send this.
+ *
*/
-faim_export unsigned long aim_seticbmparam(struct aim_session_t *sess, struct aim_conn_t *conn, struct aim_icbmparameters *params)
+faim_export int aim_seticbmparam(aim_session_t *sess, aim_conn_t *conn, struct aim_icbmparameters *params)
{
- struct command_tx_struct *newpacket;
- int curbyte;
+ aim_frame_t *fr;
+ aim_snacid_t snacid;
if (!sess || !conn || !params)
return -EINVAL;
- if (!(newpacket = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, 10+16)))
+ if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+16)))
return -ENOMEM;
- newpacket->lock = 1;
+ snacid = aim_cachesnac(sess, 0x0004, 0x0002, 0x0000, NULL, 0);
+ aim_putsnac(&fr->data, 0x0004, 0x0002, 0x0000, snacid);
- curbyte = aim_putsnac(newpacket->data, 0x0004, 0x0002, 0x0000, sess->snac_nextid++);
-
- /* This is read-only (in Parameter Reply). Must be set to zero here. */
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
+ /* This is read-only (see Parameter Reply). Must be set to zero here. */
+ aimbs_put16(&fr->data, 0x0000);
/* These are all read-write */
- curbyte += aimutil_put32(newpacket->data+curbyte, params->flags);
- curbyte += aimutil_put16(newpacket->data+curbyte, params->maxmsglen);
- curbyte += aimutil_put16(newpacket->data+curbyte, params->maxsenderwarn);
- curbyte += aimutil_put16(newpacket->data+curbyte, params->maxrecverwarn);
- curbyte += aimutil_put32(newpacket->data+curbyte, params->minmsginterval);
+ aimbs_put32(&fr->data, params->flags);
+ aimbs_put16(&fr->data, params->maxmsglen);
+ aimbs_put16(&fr->data, params->maxsenderwarn);
+ aimbs_put16(&fr->data, params->maxrecverwarn);
+ aimbs_put32(&fr->data, params->minmsginterval);
- newpacket->lock = 0;
- aim_tx_enqueue(sess, newpacket);
+ aim_tx_enqueue(sess, fr);
return 0;
}
-static int paraminfo(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
+static int paraminfo(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
{
struct aim_icbmparameters params;
aim_rxcallback_t userfunc;
- int i = 0;
-
- params.maxchan = aimutil_get16(data+i);
- i += 2;
-
- params.flags = aimutil_get32(data+i);
- i += 4;
-
- params.maxmsglen = aimutil_get16(data+i);
- i += 2;
-
- params.maxsenderwarn = aimutil_get16(data+i);
- i += 2;
-
- params.maxrecverwarn = aimutil_get16(data+i);
- i += 2;
-
- params.minmsginterval = aimutil_get32(data+i);
- i += 4;
+ params.maxchan = aimbs_get16(bs);
+ params.flags = aimbs_get32(bs);
+ params.maxmsglen = aimbs_get16(bs);
+ params.maxsenderwarn = aimbs_get16(bs);
+ params.maxrecverwarn = aimbs_get16(bs);
+ params.minmsginterval = aimbs_get32(bs);
+
if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
return userfunc(sess, rx, ¶ms);
return 0;
}
-static int missedcall(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
+static int missedcall(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
{
- int i, ret = 0;
+ int ret = 0;
aim_rxcallback_t userfunc;
- unsigned short channel, nummissed, reason;
- struct aim_userinfo_s userinfo;
-
- for (i = 0; i < datalen; ) {
-
- /* Channel ID. */
- channel = aimutil_get16(data+i);
- i += 2;
+ fu16_t channel, nummissed, reason;
+ aim_userinfo_t userinfo;
- /* Extract the standard user info block. */
- i += aim_extractuserinfo(sess, data+i, &userinfo);
+ while (aim_bstream_empty(bs)) {
- nummissed = aimutil_get16(data+i);
- i += 2;
-
- reason = aimutil_get16(data+i);
- i += 2;
+ channel = aimbs_get16(bs);
+ aim_extractuserinfo(sess, bs, &userinfo);
+ nummissed = aimbs_get16(bs);
+ reason = aimbs_get16(bs);
if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
ret = userfunc(sess, rx, channel, &userinfo, nummissed, reason);
return ret;
}
-static int msgack(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
+static int clienterr(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
{
+ int ret = 0;
aim_rxcallback_t userfunc;
- char sn[MAXSNLEN];
- unsigned char ck[8];
- unsigned short type;
- int i = 0;
- unsigned char snlen;
+ fu16_t channel, reason;
+ char *sn;
+ fu8_t *ck, snlen;
- memcpy(ck, data, 8);
- i += 8;
+ ck = aimbs_getraw(bs, 8);
+ channel = aimbs_get16(bs);
+ snlen = aimbs_get8(bs);
+ sn = aimbs_getstr(bs, snlen);
+ reason = aimbs_get16(bs);
- type = aimutil_get16(data+i);
- i += 2;
+ if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+ ret = userfunc(sess, rx, channel, sn, reason);
- snlen = aimutil_get8(data+i);
- i++;
+ free(ck);
+ free(sn);
- memset(sn, 0, sizeof(sn));
- strncpy(sn, (char *)data+i, snlen);
+ return ret;
+}
+
+static int msgack(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
+{
+ aim_rxcallback_t userfunc;
+ fu16_t type;
+ fu8_t snlen, *ck;
+ char *sn;
+ int ret = 0;
+
+ ck = aimbs_getraw(bs, 8);
+ type = aimbs_get16(bs);
+ snlen = aimbs_get8(bs);
+ sn = aimbs_getstr(bs, snlen);
if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
- return userfunc(sess, rx, type, sn);
+ ret = userfunc(sess, rx, type, sn);
- return 0;
+ free(sn);
+ free(ck);
+
+ return ret;
}
-static int snachandler(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
+static int snachandler(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
{
if (snac->subtype == 0x0005)
- return paraminfo(sess, mod, rx, snac, data, datalen);
+ return paraminfo(sess, mod, rx, snac, bs);
else if (snac->subtype == 0x0006)
- return outgoingim(sess, mod, rx, snac, data, datalen);
+ return outgoingim(sess, mod, rx, snac, bs);
else if (snac->subtype == 0x0007)
- return incomingim(sess, mod, rx, snac, data, datalen);
+ return incomingim(sess, mod, rx, snac, bs);
else if (snac->subtype == 0x000a)
- return missedcall(sess, mod, rx, snac, data, datalen);
+ return missedcall(sess, mod, rx, snac, bs);
+ else if (snac->subtype == 0x000b)
+ return clienterr(sess, mod, rx, snac, bs);
else if (snac->subtype == 0x000c)
- return msgack(sess, mod, rx, snac, data, datalen);
+ return msgack(sess, mod, rx, snac, bs);
return 0;
}
-faim_internal int msg_modfirst(struct aim_session_t *sess, aim_module_t *mod)
+faim_internal int msg_modfirst(aim_session_t *sess, aim_module_t *mod)
{
mod->family = 0x0004;
andersk / libfaim.git / blobdiff