rxcallback_t newhandler,
u_short flags)
{
- struct aim_rxcblist_t *newcb,*cur;
+ struct aim_rxcblist_t *newcb;
if (!conn)
return -1;
faimdprintf(1, "aim_conn_addhandler: adding for %04x/%04x\n", family, type);
- newcb = (struct aim_rxcblist_t *)calloc(1, sizeof(struct aim_rxcblist_t));
+ if (!(newcb = (struct aim_rxcblist_t *)calloc(1, sizeof(struct aim_rxcblist_t))))
+ return -1;
newcb->family = family;
newcb->type = type;
newcb->flags = flags;
newcb->handler = newhandler;
newcb->next = NULL;
- cur = conn->handlerlist;
- if (!cur)
+ if (!conn->handlerlist)
conn->handlerlist = newcb;
- else
- {
- while (cur->next)
- cur = cur->next;
- cur->next = newcb;
- }
+ else {
+ struct aim_rxcblist_t *cur;
+
+ cur = conn->handlerlist;
+
+ while (cur->next)
+ cur = cur->next;
+ cur->next = newcb;
+ }
return 0;
}
faim_export int aim_clearhandlers(struct aim_conn_t *conn)
{
- struct aim_rxcblist_t *cur,*tmp;
+ struct aim_rxcblist_t *cur;
+
if (!conn)
return -1;
- cur = conn->handlerlist;
- while(cur)
- {
- tmp = cur->next;
- free(cur);
- cur = tmp;
- }
+ for (cur = conn->handlerlist; cur; ) {
+ struct aim_rxcblist_t *tmp;
+
+ tmp = cur->next;
+ free(cur);
+ cur = tmp;
+ }
+ conn->handlerlist = NULL;
+
return 0;
}
if (type==0xffff)
return NULL;
+
return aim_callhandler(conn, family, 0xffff);
}
workingPtr->handled = 1;
break;
case AIM_CONN_TYPE_AUTH: {
- u_long head;
+ unsigned long head;
head = aimutil_get32(workingPtr->data);
- if (head == 0x00000001) {
+ if ((head == 0x00000001) && (workingPtr->commandlen == 4)) {
faimdprintf(1, "got connection ack on auth line\n");
- workingPtr->handled = 1;
- } else if (workingPtr->hdr.oscar.type == 0x0004) {
+ workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, workingPtr);
+ } else if (workingPtr->hdr.oscar.type == 0x04) {
+ /* Used only by the older login protocol */
workingPtr->handled = aim_authparse(sess, workingPtr);
} else {
- u_short family,subtype;
+ unsigned short family,subtype;
family = aimutil_get16(workingPtr->data);
subtype = aimutil_get16(workingPtr->data+2);
switch (family) {
case 0x0000: /* not really a family, but it works */
if (subtype == 0x0001)
- workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0000, 0x0001, workingPtr);
+ workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, workingPtr);
else
workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_UNKNOWN, workingPtr);
break;
u_short subtype;
family = aimutil_get16(workingPtr->data);
subtype= aimutil_get16(workingPtr->data+2);
-
- if ((family == 0x0002) && (subtype == 0x0006)) {
- workingPtr->handled = 1;
- aim_conn_setstatus(workingPtr->conn, AIM_CONN_STATUS_READY);
+
+ if ((family == 0x0000) && (subtype == 0x00001)) {
+ workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, workingPtr);
} else if ((family == 0x000d) && (subtype == 0x0009)) {
workingPtr->handled = aim_chatnav_parse_info(sess, workingPtr);
} else {
family = aimutil_get16(workingPtr->data);
subtype= aimutil_get16(workingPtr->data+2);
- if ((family == 0x0000) && (subtype == 0x00001))
- workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0000, 0x0001, workingPtr);
- else if (family == 0x0001) {
+ if ((family == 0x0000) && (subtype == 0x00001)) {
+ workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, workingPtr);
+ } else if (family == 0x0001) {
if (subtype == 0x0001)
workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0001, 0x0001, workingPtr);
else if (subtype == 0x0003)
faim_internal int aim_handleredirect_middle(struct aim_session_t *sess,
struct command_rx_struct *command, ...)
{
- struct aim_tlv_t *tmptlv = NULL;
- int serviceid = 0x00;
- unsigned char cookie[AIM_COOKIELEN];
+ int serviceid = 0;
+ unsigned char *cookie = NULL;
char *ip = NULL;
rxcallback_t userfunc = NULL;
struct aim_tlvlist_t *tlvlist;
int ret = 1;
- if (!(tlvlist = aim_readtlvchain(command->data+10, command->commandlen-10)))
- {
- printf("libfaim: major bug: unable to read tlvchain from redirect\n");
- return ret;
- }
-
- if (!(tmptlv = aim_gettlv(tlvlist, 0x000d, 1)))
- {
- printf("libfaim: major bug: no service ID in tlvchain from redirect\n");
- aim_freetlvchain(&tlvlist);
- return ret;
- }
- serviceid = aimutil_get16(tmptlv->value);
-
- if (!(ip = aim_gettlv_str(tlvlist, 0x0005, 1)))
- {
- printf("libfaim: major bug: no IP in tlvchain from redirect (service 0x%02x)\n", serviceid);
- free(ip);
- aim_freetlvchain(&tlvlist);
- return ret;
- }
-
- if (!(tmptlv = aim_gettlv(tlvlist, 0x0006, 1)))
- {
- printf("libfaim: major bug: no cookie in tlvchain from redirect (service 0x%02x)\n", serviceid);
- free(ip);
- aim_freetlvchain(&tlvlist);
- return ret;
- }
- memcpy(cookie, tmptlv->value, AIM_COOKIELEN);
-
- if (serviceid == AIM_CONN_TYPE_CHAT)
- {
- /*
- * Chat hack.
- *
- */
- userfunc = aim_callhandler(command->conn, 0x0001, 0x0005);
- if (userfunc)
- ret = userfunc(sess, command, serviceid, ip, cookie, sess->pendingjoin);
+ tlvlist = aim_readtlvchain(command->data+10, command->commandlen-10);
+
+ if (aim_gettlv(tlvlist, 0x000d, 1))
+ serviceid = aim_gettlv16(tlvlist, 0x000d, 1);
+ if (aim_gettlv(tlvlist, 0x0005, 1))
+ ip = aim_gettlv_str(tlvlist, 0x0005, 1);
+ if (aim_gettlv(tlvlist, 0x0006, 1))
+ cookie = aim_gettlv_str(tlvlist, 0x0006, 1);
+
+ if ((serviceid == AIM_CONN_TYPE_CHAT) && sess->pendingjoin) {
+
+ /*
+ * Chat hack.
+ *
+ */
+ if ((userfunc = aim_callhandler(command->conn, 0x0001, 0x0005)))
+ ret = userfunc(sess, command, serviceid, ip, cookie, sess->pendingjoin, (int)sess->pendingjoinexchange);
free(sess->pendingjoin);
sess->pendingjoin = NULL;
- }
- else
- {
- userfunc = aim_callhandler(command->conn, 0x0001, 0x0005);
- if (userfunc)
- ret = userfunc(sess, command, serviceid, ip, cookie);
- }
+ sess->pendingjoinexchange = 0;
+ } else if (!serviceid || !ip || !cookie) { /* yeep! */
+ ret = 1;
+ } else {
+ if ((userfunc = aim_callhandler(command->conn, 0x0001, 0x0005)))
+ ret = userfunc(sess, command, serviceid, ip, cookie);
+ }
+
+ if (ip)
+ free(ip);
+ if (cookie)
+ free(cookie);
- free(ip);
aim_freetlvchain(&tlvlist);
return ret;
{
u_int i = 0;
+ if (!sess || !command)
+ return 1;
+
faimdprintf(1, "\nRecieved unknown packet:");
for (i = 0; i < command->commandlen; i++)
struct aim_tlvlist_t *tlvlist;
char *msg = NULL;
unsigned short code = 0;
- struct aim_tlv_t *tmptlv;
rxcallback_t userfunc = NULL;
int ret = 1;
tlvlist = aim_readtlvchain(command->data, command->commandlen);
- if ((tmptlv = aim_gettlv(tlvlist, 0x0009, 1)))
- code = aimutil_get16(tmptlv->value);
+ if (aim_gettlv(tlvlist, 0x0009, 1))
+ code = aim_gettlv16(tlvlist, 0x0009, 1);
- if ((tmptlv = aim_gettlv(tlvlist, 0x000b, 1)))
+ if (aim_gettlv(tlvlist, 0x000b, 1))
msg = aim_gettlv_str(tlvlist, 0x000b, 1);
- userfunc = aim_callhandler(command->conn,
- AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR);
- if (userfunc)
+ if ((userfunc = aim_callhandler(command->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR)))
ret = userfunc(sess, command, code, msg);
aim_freetlvchain(&tlvlist);
- free(msg);
+
+ if (msg)
+ free(msg);
return ret;
}
andersk / libfaim.git / blobdiff