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;
}
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;
}
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.
* 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)
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;
if (detaillevel != 0x02) {
if (detaillevel == 0x01)
- printf("faim: chat_roomupdateinfo: detail level 2 not supported\n");
+ printf("faim: chat_roomupdateinfo: detail level 1 not supported\n");
else
printf("faim: chat_roomupdateinfo: unknown detail level %d\n", detaillevel);
return 1;
/*
* 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.
/*
* 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
/*
* 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,
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,
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,
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));
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
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;
int i,curbyte=0;
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;
*/
for (i=0;i<8;i++)
curbyte += aimutil_put8(newpacket->data+curbyte, (u_char)rand());
+
+ /* XXX this should get uncached by the unwritten 'invite accept' handler */
aim_cachecookie(sess, aim_mkcookie(newpacket->data+curbyte-8, AIM_COOKIETYPE_CHAT, NULL));
/*
andersk / libfaim.git / blobdiff