X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/313a06b7b4be217e90a17413862dc04552f693c3..37ee990eab0e60fadbc1555d3f4a7e85d2026297:/aim_chat.c diff --git a/aim_chat.c b/aim_chat.c index b1f260a..cf57449 100644 --- a/aim_chat.c +++ b/aim_chat.c @@ -5,6 +5,7 @@ * */ +#define FAIM_INTERNAL #include faim_export char *aim_chat_getname(struct aim_conn_t *conn) @@ -25,6 +26,10 @@ faim_export struct aim_conn_t *aim_chat_getconn(struct aim_session_t *sess, char for (cur = sess->connlist; cur; cur = cur->next) { if (cur->type != AIM_CONN_TYPE_CHAT) continue; + if (!cur->priv) { + printf("faim: chat: chat connection with no name! (fd = %d)\n", cur->fd); + continue; + } if (strcmp((char *)cur->priv, name) == 0) break; } @@ -38,8 +43,10 @@ faim_export int aim_chat_attachname(struct aim_conn_t *conn, char *roomname) if (!conn || !roomname) return -1; - conn->priv = malloc(strlen(roomname)+1); - strcpy(conn->priv, roomname); + if (conn->priv) + free(conn->priv); + + conn->priv = strdup(roomname); return 0; } @@ -51,6 +58,7 @@ faim_export unsigned long aim_chat_send_im(struct aim_session_t *sess, int curbyte,i; struct command_tx_struct *newpacket; + struct aim_msgcookie_t *cookie; if (!sess || !conn || !msg) return 0; @@ -70,7 +78,10 @@ faim_export unsigned long aim_chat_send_im(struct aim_session_t *sess, for (i=0;i<8;i++) curbyte += aimutil_put8(newpacket->data+curbyte, (u_char) rand()); - aim_cachecookie(sess, aim_mkcookie(newpacket->data+curbyte-8, AIM_COOKIETYPE_CHAT, NULL)); + cookie = aim_mkcookie(newpacket->data+curbyte-8, AIM_COOKIETYPE_CHAT, NULL); + cookie->data = strdup(conn->priv); /* chat hack dependent */ + + aim_cachecookie(sess, cookie); /* * metaTLV start. -- i assume this is a metaTLV. it could be the @@ -149,10 +160,8 @@ faim_export unsigned long aim_chat_join(struct aim_session_t *sess, i+= aimutil_put16(newpacket->data+i, 2+1+strlen(roomname)+2); i+= aimutil_put16(newpacket->data+i, exchange); i+= aimutil_put8(newpacket->data+i, strlen(roomname)); - memcpy(newpacket->data+i, roomname, strlen(roomname)); - i+= strlen(roomname); - //i+= aimutil_putstr(newpacket->data+i, roomname, strlen(roomname)); - i+= aimutil_put16(newpacket->data+i, 0x0000); + i+= aimutil_putstr(newpacket->data+i, roomname, strlen(roomname)); + i+= aimutil_put16(newpacket->data+i, 0x0000); /* instance? */ /* * Chat hack. @@ -163,29 +172,15 @@ faim_export unsigned long aim_chat_join(struct aim_session_t *sess, * redirect! * */ - sess->pendingjoin = (char *)malloc(strlen(roomname)+1); - strcpy(sess->pendingjoin, roomname); + sess->pendingjoin = strdup(roomname); + sess->pendingjoinexchange = exchange; newpacket->lock = 0; aim_tx_enqueue(sess, newpacket); -#if 0 - { - struct aim_snac_t snac; - - snac.id = sess->snac_nextid; - snac.family = 0x0001; - snac.type = 0x0004; - snac.flags = 0x0000; - - snac.data = malloc(strlen(roomname)+1); - strcpy(snac.data, roomname); + aim_cachesnac(sess, 0x0001, 0x0004, 0x0000, roomname, strlen(roomname)+1); - aim_newsnac(sess, &snac); - } - -#endif - return (sess->snac_nextid++); + return sess->snac_nextid; } faim_internal int aim_chat_readroominfo(u_char *buf, struct aim_chat_roominfo *outinfo) @@ -236,7 +231,6 @@ faim_internal int aim_chat_parse_infoupdate(struct aim_session_t *sess, u_short tlvcount = 0; struct aim_tlvlist_t *tlvlist; char *roomdesc = NULL; - struct aim_tlv_t *tmptlv; unsigned short unknown_c9 = 0; unsigned long creationtime = 0; unsigned short maxmsglen = 0; @@ -273,12 +267,8 @@ faim_internal int aim_chat_parse_infoupdate(struct aim_session_t *sess, /* * Type 0x006f: Number of occupants. */ - if (aim_gettlv(tlvlist, 0x006f, 1)) { - struct aim_tlv_t *tmptlv; - tmptlv = aim_gettlv(tlvlist, 0x006f, 1); - - usercount = aimutil_get16(tmptlv->value); - } + if (aim_gettlv(tlvlist, 0x006f, 1)) + usercount = aim_gettlv16(tlvlist, 0x006f, 1); /* * Type 0x0073: Occupant list. @@ -300,26 +290,26 @@ faim_internal int aim_chat_parse_infoupdate(struct aim_session_t *sess, /* * Type 0x00c9: Unknown. (2 bytes) */ - if ((tmptlv = aim_gettlv(tlvlist, 0x00c9, 1))) - unknown_c9 = aimutil_get16(tmptlv->value); + if (aim_gettlv(tlvlist, 0x00c9, 1)) + unknown_c9 = aim_gettlv16(tlvlist, 0x00c9, 1); /* * Type 0x00ca: Creation time (4 bytes) */ - if ((tmptlv = aim_gettlv(tlvlist, 0x00ca, 1))) - creationtime = aimutil_get32(tmptlv->value); + if (aim_gettlv(tlvlist, 0x00ca, 1)) + creationtime = aim_gettlv32(tlvlist, 0x00ca, 1); /* * Type 0x00d1: Maximum Message Length */ - if ((tmptlv = aim_gettlv(tlvlist, 0x00d1, 1))) - maxmsglen = aimutil_get16(tmptlv->value); + if (aim_gettlv(tlvlist, 0x00d1, 1)) + maxmsglen = aim_gettlv16(tlvlist, 0x00d1, 1); /* * Type 0x00d2: Unknown. (2 bytes) */ - if ((tmptlv = aim_gettlv(tlvlist, 0x00d2, 1))) - unknown_d2 = aimutil_get16(tmptlv->value);; + if (aim_gettlv(tlvlist, 0x00d2, 1)) + unknown_d2 = aim_gettlv16(tlvlist, 0x00d2, 1); /* * Type 0x00d3: Room Description @@ -330,12 +320,11 @@ faim_internal int aim_chat_parse_infoupdate(struct aim_session_t *sess, /* * Type 0x00d5: Unknown. (1 byte) */ - if ((tmptlv = aim_gettlv(tlvlist, 0x00d5, 1))) - unknown_d5 = aimutil_get8(tmptlv->value);; + if (aim_gettlv(tlvlist, 0x00d5, 1)) + unknown_d5 = aim_gettlv8(tlvlist, 0x00d5, 1); - userfunc = aim_callhandler(command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_ROOMINFOUPDATE); - if (userfunc) { + if ((userfunc = aim_callhandler(command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_ROOMINFOUPDATE))) { ret = userfunc(sess, command, &roominfo, @@ -371,8 +360,7 @@ faim_internal int aim_chat_parse_joined(struct aim_session_t *sess, i += aim_extractuserinfo(command->data+i, &userinfo[curcount-1]); } - userfunc = aim_callhandler(command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_USERJOIN); - if (userfunc) { + if ((userfunc = aim_callhandler(command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_USERJOIN))) { ret = userfunc(sess, command, curcount, @@ -398,8 +386,7 @@ faim_internal int aim_chat_parse_leave(struct aim_session_t *sess, i += aim_extractuserinfo(command->data+i, &userinfo[curcount-1]); } - userfunc = aim_callhandler(command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_USERLEAVE); - if (userfunc) { + if ((userfunc = aim_callhandler(command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_USERLEAVE))) { ret = userfunc(sess, command, curcount, @@ -422,10 +409,11 @@ faim_internal int aim_chat_parse_incoming(struct aim_session_t *sess, struct aim_userinfo_s userinfo; rxcallback_t userfunc=NULL; int ret = 1, i = 0, z = 0; - u_char cookie[8]; + unsigned char cookie[8]; int channel; struct aim_tlvlist_t *outerlist; char *msg = NULL; + struct aim_msgcookie_t *ck; memset(&userinfo, 0x00, sizeof(struct aim_userinfo_s)); @@ -437,7 +425,11 @@ faim_internal int aim_chat_parse_incoming(struct aim_session_t *sess, for (z=0; z<8; z++,i++) cookie[z] = command->data[i]; - aim_cachecookie(sess, aim_mkcookie(cookie, AIM_COOKIETYPE_ICBM, NULL)); + if ((ck = aim_uncachecookie(sess, cookie, AIM_COOKIETYPE_CHAT))) { + if (ck->data) + free(ck->data); + free(ck); + } /* * Channel ID @@ -547,7 +539,7 @@ faim_export int aim_chat_leaveroom(struct aim_session_t *sess, char *name) struct aim_conn_t *conn; if ((conn = aim_chat_getconn(sess, name))) - aim_conn_kill(sess, &conn); + aim_conn_close(conn); if (!conn) return -1; @@ -567,9 +559,14 @@ faim_export unsigned long aim_chat_invite(struct aim_session_t *sess, { struct command_tx_struct *newpacket; int i,curbyte=0; + struct aim_msgcookie_t *cookie; + struct aim_invite_priv *priv; if (!sess || !conn || !sn || !msg || !roomname) - return 0; + return -1; + + if (conn->type != AIM_CONN_TYPE_BOS) + return -1; if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 1152+strlen(sn)+strlen(roomname)+strlen(msg)))) return -1; @@ -583,7 +580,18 @@ faim_export unsigned long aim_chat_invite(struct aim_session_t *sess, */ for (i=0;i<8;i++) curbyte += aimutil_put8(newpacket->data+curbyte, (u_char)rand()); - aim_cachecookie(sess, aim_mkcookie(newpacket->data+curbyte-8, AIM_COOKIETYPE_CHAT, NULL)); + + /* XXX this should get uncached by the unwritten 'invite accept' handler */ + if(!(priv = calloc(sizeof(struct aim_invite_priv), 1))) + return -1; + priv->sn = strdup(sn); + priv->roomname = strdup(roomname); + priv->exchange = exchange; + priv->instance = instance; + + if(!(cookie = aim_mkcookie(newpacket->data+curbyte-8, AIM_COOKIETYPE_INVITE, priv))) + return -1; + aim_cachecookie(sess, cookie); /* * Channel (2)