X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/5925849b5bb46b0960c1e8248cd3a2166a42c8bf..24fbfcf349642bd1d140ce171c0fdd997ebedac2:/aim_misc.c diff --git a/aim_misc.c b/aim_misc.c index 1227f46..a98047b 100644 --- a/aim_misc.c +++ b/aim_misc.c @@ -11,6 +11,7 @@ * */ +#define FAIM_INTERNAL #include /* @@ -267,7 +268,6 @@ faim_internal int aim_parse_bosrights(struct aim_session_t *sess, rxcallback_t userfunc = NULL; int ret=1; struct aim_tlvlist_t *tlvlist; - struct aim_tlv_t *tlv; unsigned short maxpermits = 0, maxdenies = 0; /* @@ -279,21 +279,18 @@ faim_internal int aim_parse_bosrights(struct aim_session_t *sess, /* * TLV type 0x0001: Maximum number of buddies on permit list. */ - if ((tlv = aim_gettlv(tlvlist, 0x0001, 1))) { - maxpermits = aimutil_get16(tlv->value); - } + if (aim_gettlv(tlvlist, 0x0001, 1)) + maxpermits = aim_gettlv16(tlvlist, 0x0001, 1); /* * TLV type 0x0002: Maximum number of buddies on deny list. * */ - if ((tlv = aim_gettlv(tlvlist, 0x0002, 1))) { - maxdenies = aimutil_get16(tlv->value); - } + if (aim_gettlv(tlvlist, 0x0002, 1)) + maxdenies = aim_gettlv16(tlvlist, 0x0002, 1); - userfunc = aim_callhandler(command->conn, 0x0009, 0x0003); - if (userfunc) - ret = userfunc(sess, command, maxpermits, maxdenies); + if ((userfunc = aim_callhandler(command->conn, 0x0009, 0x0003))) + ret = userfunc(sess, command, maxpermits, maxdenies); aim_freetlvchain(&tlvlist); @@ -305,79 +302,57 @@ faim_internal int aim_parse_bosrights(struct aim_session_t *sess, * * Send Client Ready. * - * TODO: Dynamisize. - * */ faim_export unsigned long aim_bos_clientready(struct aim_session_t *sess, struct aim_conn_t *conn) { - u_char command_2[] = { - /* placeholders for dynamic data */ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, - /* real data */ - 0x00, 0x01, - 0x00, 0x03, - 0x00, 0x04, - 0x06, 0x86, /* the good ones */ -#if 0 - 0x07, 0xda, /* DUPLE OF DEATH! */ -#endif - - 0x00, 0x02, - 0x00, 0x01, - 0x00, 0x04, - 0x00, 0x01, - - 0x00, 0x03, - 0x00, 0x01, - 0x00, 0x04, - 0x00, 0x01, - - 0x00, 0x04, - 0x00, 0x01, - 0x00, 0x04, - 0x00, 0x01, - - 0x00, 0x06, - 0x00, 0x01, - 0x00, 0x04, - 0x00, 0x01, - 0x00, 0x08, - 0x00, 0x01, - 0x00, 0x04, - 0x00, 0x01, - - 0x00, 0x09, - 0x00, 0x01, - 0x00, 0x04, - 0x00, 0x01, - 0x00, 0x0a, - 0x00, 0x01, - 0x00, 0x04, - 0x00, 0x01, - - 0x00, 0x0b, - 0x00, 0x01, - 0x00, 0x04, - 0x00, 0x01 +#define AIM_TOOL_JAVA 0x0001 +#define AIM_TOOL_MAC 0x0002 +#define AIM_TOOL_WIN16 0x0003 +#define AIM_TOOL_WIN32 0x0004 +#define AIM_TOOL_MAC68K 0x0005 +#define AIM_TOOL_MACPPC 0x0006 + struct aim_tool_version { + unsigned short group; + unsigned short version; + unsigned short tool; + unsigned short toolversion; + } tools[] = { + {0x0001, 0x0003, AIM_TOOL_WIN32, 0x0686}, + {0x0002, 0x0001, AIM_TOOL_WIN32, 0x0001}, + {0x0003, 0x0001, AIM_TOOL_WIN32, 0x0001}, + {0x0004, 0x0001, AIM_TOOL_WIN32, 0x0001}, + {0x0006, 0x0001, AIM_TOOL_WIN32, 0x0001}, + {0x0008, 0x0001, AIM_TOOL_WIN32, 0x0001}, + {0x0009, 0x0001, AIM_TOOL_WIN32, 0x0001}, + {0x000a, 0x0001, AIM_TOOL_WIN32, 0x0001}, + {0x000b, 0x0001, AIM_TOOL_WIN32, 0x0001} }; - int command_2_len = 0x52; + int i,j; struct command_tx_struct *newpacket; - - if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, command_2_len))) + int toolcount = sizeof(tools)/sizeof(struct aim_tool_version); + + if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 1152))) return -1; newpacket->lock = 1; - memcpy(newpacket->data, command_2, command_2_len); - - /* This write over the dynamic parts of the byte block */ - aim_putsnac(newpacket->data, 0x0001, 0x0002, 0x0000, sess->snac_nextid); + i = aim_putsnac(newpacket->data, 0x0001, 0x0002, 0x0000, sess->snac_nextid); + aim_cachesnac(sess, 0x0001, 0x0002, 0x0000, NULL, 0); + + for (j = 0; j < toolcount; j++) { + i += aimutil_put16(newpacket->data+i, tools[j].group); + i += aimutil_put16(newpacket->data+i, tools[j].version); + i += aimutil_put16(newpacket->data+i, tools[j].tool); + i += aimutil_put16(newpacket->data+i, tools[j].toolversion); + } + + newpacket->commandlen = i; + newpacket->lock = 0; aim_tx_enqueue(sess, newpacket); - return (sess->snac_nextid++); + return sess->snac_nextid; } /* @@ -461,10 +436,14 @@ faim_export unsigned long aim_setversions(struct aim_session_t *sess, newpacket->lock = 1; i = aim_putsnac(newpacket->data, 0x0001, 0x0017, 0x0000, sess->snac_nextid); + aim_cachesnac(sess, 0x0001, 0x0017, 0x0000, NULL, 0); i += aimutil_put16(newpacket->data+i, 0x0001); i += aimutil_put16(newpacket->data+i, 0x0003); + i += aimutil_put16(newpacket->data+i, 0x0013); + i += aimutil_put16(newpacket->data+i, 0x0001); + i += aimutil_put16(newpacket->data+i, 0x0002); i += aimutil_put16(newpacket->data+i, 0x0001); @@ -487,29 +466,16 @@ faim_export unsigned long aim_setversions(struct aim_session_t *sess, i += aimutil_put16(newpacket->data+i, 0x0001); i += aimutil_put16(newpacket->data+i, 0x000b); - i += aimutil_put16(newpacket->data+i, 0x0002); - - i += aimutil_put16(newpacket->data+i, 0x000c); i += aimutil_put16(newpacket->data+i, 0x0001); - i += aimutil_put16(newpacket->data+i, 0x0013); - i += aimutil_put16(newpacket->data+i, 0x0001); - - i += aimutil_put16(newpacket->data+i, 0x0015); + i += aimutil_put16(newpacket->data+i, 0x000c); i += aimutil_put16(newpacket->data+i, 0x0001); -#if 0 - for (j = 0; j < 0x10; j++) { - i += aimutil_put16(newpacket->data+i, j); /* family */ - i += aimutil_put16(newpacket->data+i, 0x0003); /* version */ - } -#endif - newpacket->commandlen = i; newpacket->lock = 0; aim_tx_enqueue(sess, newpacket); - return (sess->snac_nextid++); + return sess->snac_nextid; } @@ -539,6 +505,29 @@ faim_export unsigned long aim_bos_nop(struct aim_session_t *sess, return aim_genericreq_n(sess, conn, 0x0001, 0x0016); } +/* + * aim_flap_nop() + * + * No-op. WinAIM 4.x sends these _every minute_ to keep + * the connection alive. + */ +faim_export unsigned long aim_flap_nop(struct aim_session_t *sess, + struct aim_conn_t *conn) +{ + struct command_tx_struct *newpacket; + + if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0005, conn, 0))) + return sess->snac_nextid; + + newpacket->lock = 1; + newpacket->commandlen = 0; + newpacket->lock = 0; + + aim_tx_enqueue(sess, newpacket); + + return (sess->snac_nextid); +} + /* * aim_bos_reqrights() * @@ -636,9 +625,11 @@ 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_tx_enqueue(sess, newpacket); - return (sess->snac_nextid++); + return sess->snac_nextid; } /* @@ -663,13 +654,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); /* copy in data */ newlong = htonl(*longdata); memcpy(&(newpacket->data[10]), &newlong, sizeof(u_long)); aim_tx_enqueue(sess, newpacket); - return (sess->snac_nextid++); + return sess->snac_nextid; } faim_internal unsigned long aim_genericreq_s(struct aim_session_t *sess, @@ -690,13 +682,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); /* copy in data */ newshort = htons(*shortdata); memcpy(&(newpacket->data[10]), &newshort, sizeof(u_short)); aim_tx_enqueue(sess, newpacket); - return (sess->snac_nextid++); + return sess->snac_nextid; } /* @@ -738,6 +731,8 @@ 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 += aimutil_put16(newpacket->data+i, 0x0000); i += aimutil_put16(newpacket->data+i, 0x0000); i += aimutil_put16(newpacket->data+i, 0x0003); @@ -749,5 +744,146 @@ faim_export unsigned long aim_addicbmparam(struct aim_session_t *sess, aim_tx_enqueue(sess, newpacket); - return (sess->snac_nextid); + return sess->snac_nextid; +} + +/* + * Set directory profile data (not the same as aim_bos_setprofile!) + */ +faim_export unsigned long aim_setdirectoryinfo(struct aim_session_t *sess, struct aim_conn_t *conn, char *first, char *middle, char *last, char *maiden, char *nickname, char *street, char *city, char *state, char *zip, int country, unsigned short privacy) +{ + struct command_tx_struct *newpacket; + int packlen = 0, i = 0; + + packlen += 2+2+2; + + if(first) /* TLV 0001 */ + packlen += (strlen(first) + 4); + if(middle) + packlen += (strlen(middle) + 4); + if(last) + packlen += (strlen(last) + 4); + if(maiden) + packlen += (strlen(maiden) + 4); + if(nickname) + packlen += (strlen(nickname) + 4); + if(street) + packlen += (strlen(street) + 4); + if(state) + packlen += (strlen(state) + 4); + if(city) + packlen += (strlen(city) + 4); + if(zip) + packlen += (strlen(zip) + 4); + + if(!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, packlen+10))) + return -1; + + newpacket->lock = 1; + + i = aim_putsnac(newpacket->data, 0x0002, 0x0009, 0x0000, 0); + + /* 000a/0002: privacy: 1 to allow search/disp, 0 to disallow */ + i += aim_puttlv_16(newpacket->data+i, 0x000a, privacy); + + + if (first) + i += aim_puttlv_str(newpacket->data+i, 0x0001, strlen(first), first); + if (middle) + i += aim_puttlv_str(newpacket->data+i, 0x0003, strlen(middle), middle); + if (last) + i += aim_puttlv_str(newpacket->data+i, 0x0002, strlen(last), last); + if (maiden) + i += aim_puttlv_str(newpacket->data+i, 0x0004, strlen(maiden), maiden); + if (nickname) + i += aim_puttlv_str(newpacket->data+i, 0x000c, strlen(nickname), nickname); + if (street) + i += aim_puttlv_str(newpacket->data+i, 0x0021, strlen(street), street); + if (city) + i += aim_puttlv_str(newpacket->data+i, 0x0008, strlen(city), city); + if (state) + i += aim_puttlv_str(newpacket->data+i, 0x0007, strlen(state), state); + if (zip) + i += aim_puttlv_str(newpacket->data+i, 0x000d, strlen(zip), zip); + + newpacket->commandlen = i; + newpacket->lock = 0; + + aim_tx_enqueue(sess, newpacket); + + return(sess->snac_nextid); +} + +faim_export unsigned long aim_setuserinterests(struct aim_session_t *sess, struct aim_conn_t *conn, char *interest1, char *interest2, char *interest3, char *interest4, char *interest5, unsigned short privacy) +{ + struct command_tx_struct *newpacket; + int packlen = 0, i = 0; + + packlen += 2+2+2; + + if(interest1) + packlen += (strlen(interest1) + 4); + if(interest2) + packlen += (strlen(interest2) + 4); + if(interest3) + packlen += (strlen(interest3) + 4); + if(interest4) + packlen += (strlen(interest4) + 4); + if(interest5) + packlen += (strlen(interest5) + 4) ; + + + if(!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, packlen+10))) + return -1; + + newpacket->lock = 1; + + i = aim_putsnac(newpacket->data, 0x0002, 0x000f, 0x0000, 0); + + /* 000a/0002: 0000 ?? ?privacy? */ + i += aim_puttlv_16(newpacket->data+i, 0x000a, privacy); + + if(interest1) + i += aim_puttlv_str(newpacket->data+i, 0x000b, strlen(interest1), interest1); + if(interest2) + i += aim_puttlv_str(newpacket->data+i, 0x000b, strlen(interest2), interest2); + if(interest3) + i += aim_puttlv_str(newpacket->data+i, 0x000b, strlen(interest3), interest3); + if(interest4) + i += aim_puttlv_str(newpacket->data+i, 0x000b, strlen(interest4), interest4); + if(interest5) + i += aim_puttlv_str(newpacket->data+i, 0x000b, strlen(interest1), interest5); + + newpacket->commandlen = i; + newpacket->lock = 0; + + aim_tx_enqueue(sess, newpacket); + + return(sess->snac_nextid); +} + +faim_export unsigned long aim_icq_setstatus(struct aim_session_t *sess, + struct aim_conn_t *conn, + unsigned long status) +{ + struct command_tx_struct *newpacket; + int i; + unsigned long data; + + data = 0x00030000 | status; /* yay for error checking ;^) */ + + if(!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10 + 4))) + return -1; + + newpacket->lock = 1; + + i = aim_putsnac(newpacket->data, 0x0001, 0x001e, 0x0000, 0x0000001e); + i += aim_puttlv_32(newpacket->data+i, 0x0006, data); + + newpacket->commandlen = i; + newpacket->lock = 0; + + aim_tx_enqueue(sess, newpacket); + + return(sess->snac_nextid); }