#include <faim/aim.h>
+#include "md5.h"
+
+static int aim_encode_password_md5(const char *password, const char *key, md5_byte_t *digest);
+static int aim_encode_password(const char *password, unsigned char *encoded);
/*
* FIXME: Reimplement the TIS stuff.
#include "tis_telnet_proxy.h"
#endif
-int aim_sendconnack(struct aim_session_t *sess,
- struct aim_conn_t *conn)
+faim_export int aim_sendconnack(struct aim_session_t *sess,
+ struct aim_conn_t *conn)
{
int curbyte=0;
struct command_tx_struct *newpacket;
- if (!(newpacket = aim_tx_new(0x0001, conn, 4)))
+ if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0001, conn, 4)))
return -1;
newpacket->lock = 1;
return aim_tx_enqueue(sess, newpacket);
}
-#ifdef SNACLOGIN
/*
* In AIM 3.5 protocol, the first stage of login is to request
* login from the Authorizer, passing it the screen name
* a 0017/0007 comes back, which is the signal to send
* it the main login command (0017/0002).
*/
-int aim_request_login(struct aim_session_t *sess,
- struct aim_conn_t *conn,
- char *sn)
+faim_export int aim_request_login(struct aim_session_t *sess,
+ struct aim_conn_t *conn,
+ char *sn)
{
- int curbyte=0;
-
+ int curbyte;
struct command_tx_struct *newpacket;
- if (!(newpacket = aim_tx_new(0x0002, conn, 10+2+2+strlen(sn))))
+ if (!sess || !conn || !sn)
+ return -1;
+
+ /*
+ * For ICQ, we enable the ancient horrible login and stuff
+ * a key packet into the queue to make it look like we got
+ * a reply back. This is so the client doesn't know we're
+ * really not doing MD5 login.
+ *
+ * This may sound stupid, but I'm not in the best of moods and
+ * I don't plan to keep support for this crap around much longer.
+ * Its all AOL's fault anyway, really. I hate AOL. Really. They
+ * always seem to be able to piss me off by doing the dumbest little
+ * things. Like disabling MD5 logins for ICQ UINs, or adding purposefully
+ * wrong TLV lengths, or adding superfluous information to host strings,
+ * or... I'll stop.
+ *
+ */
+ if ((sn[0] >= '0') && (sn[0] <= '9')) {
+ struct command_rx_struct *newrx;
+ int i;
+
+ if (!(newrx = (struct command_rx_struct *)malloc(sizeof(struct command_rx_struct))))
+ return -1;
+ memset(newrx, 0x00, sizeof(struct command_rx_struct));
+ newrx->lock = 1;
+ newrx->hdrtype = AIM_FRAMETYPE_OSCAR;
+ newrx->hdr.oscar.type = 0x02;
+ newrx->hdr.oscar.seqnum = 0;
+ newrx->commandlen = 10+2+1;
+ newrx->nofree = 0;
+ if (!(newrx->data = malloc(newrx->commandlen))) {
+ free(newrx);
+ return -1;
+ }
+
+ i = aim_putsnac(newrx->data, 0x0017, 0x0007, 0x0000, 0x0000);
+ i += aimutil_put16(newrx->data+i, 0x01);
+ i += aimutil_putstr(newrx->data+i, "0", 1);
+
+ newrx->conn = conn;
+
+ newrx->next = sess->queue_incoming;
+ sess->queue_incoming = newrx;
+
+ newrx->lock = 0;
+
+ sess->flags &= ~AIM_SESS_FLAGS_SNACLOGIN;
+
+ return 0;
+ }
+
+ sess->flags |= AIM_SESS_FLAGS_SNACLOGIN;
+
+ aim_sendconnack(sess, conn);
+
+ if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10+2+2+strlen(sn))))
return -1;
newpacket->lock = 1;
- curbyte += aim_putsnac(newpacket->data+curbyte, 0x0017, 0x0006, 0x0000, 0x00010000);
+ curbyte = aim_putsnac(newpacket->data, 0x0017, 0x0006, 0x0000, 0x00010000);
curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x0001, strlen(sn), sn);
+ newpacket->commandlen = curbyte;
newpacket->lock = 0;
+
return aim_tx_enqueue(sess, newpacket);
}
-#endif /* SNACLOGIN */
/*
* send_login(int socket, char *sn, char *password)
* stupid method of doing it.
*
*/
-int aim_send_login (struct aim_session_t *sess,
- struct aim_conn_t *conn,
- char *sn, char *password, struct client_info_s *clientinfo)
+faim_export int aim_send_login (struct aim_session_t *sess,
+ struct aim_conn_t *conn,
+ char *sn, char *password,
+ struct client_info_s *clientinfo,
+ char *key)
{
- u_char *password_encoded = NULL; /* to store encoded password */
int curbyte=0;
-
struct command_tx_struct *newpacket;
if (!clientinfo || !sn || !password)
return -1;
- if (!(newpacket = aim_tx_new(0x0002, conn, 1152)))
+ if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 1152)))
return -1;
-#ifdef SNACLOGIN
- newpacket->commandlen = 10;
- newpacket->commandlen += 2 + 2 + strlen(sn);
- newpacket->commandlen += 2 + 2 + strlen(password);
- newpacket->commandlen += 2 + 2 + strlen(clientinfo->clientstring);
- newpacket->commandlen += 56;
-
newpacket->lock = 1;
- curbyte = aim_putsnac(newpacket->data+curbyte, 0x0017, 0x0002, 0x0000, 0x00010000);
- curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0001, strlen(sn), sn);
- password_encoded = (u_char *) malloc(strlen(password));
- aim_encode_password(password, password_encoded);
- curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0002, strlen(password), password_encoded);
- curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0003,
- strlen(clientinfo->clientstring),
- clientinfo->clientstring);
- /* XXX: should use clientinfo provided version info */
- curbyte+= aim_puttlv_16(newpacket->data+curbyte, 0x0016, 0x0004);
- curbyte+= aim_puttlv_16(newpacket->data+curbyte, 0x0017, 0x0003);
- curbyte+= aim_puttlv_16(newpacket->data+curbyte, 0x0018, 0x0005);
- curbyte+= aim_puttlv_16(newpacket->data+curbyte, 0x0019, 0x0000);
- curbyte+= aim_puttlv_16(newpacket->data+curbyte, 0x001a, 0x0686);
- curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0001, 0x0002, clientinfo->country);
- curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0001, 0x0002, clientinfo->lang);
- curbyte+= aim_puttlv_32(newpacket->data+curbyte, 0x0014, 0x0000002a);
- curbyte+= aim_puttlv_16(newpacket->data+curbyte, 0x0009, 0x0015);
-#else
+ newpacket->hdr.oscar.type = (sess->flags & AIM_SESS_FLAGS_SNACLOGIN)?0x02:0x01;
- newpacket->commandlen = 4 + 4+strlen(sn) + 4+strlen(password) + 6;
-
- if (clientinfo) {
- if (strlen(clientinfo->clientstring))
- newpacket->commandlen += 4+strlen(clientinfo->clientstring);
- newpacket->commandlen += 6+6+6+6;
- if (strlen(clientinfo->country))
- newpacket->commandlen += 4+strlen(clientinfo->country);
- if (strlen(clientinfo->lang))
- newpacket->commandlen += 4+strlen(clientinfo->lang);
+ if (sess->flags & AIM_SESS_FLAGS_SNACLOGIN)
+ curbyte = aim_putsnac(newpacket->data, 0x0017, 0x0002, 0x0000, 0x00010000);
+ else {
+ curbyte = aimutil_put16(newpacket->data, 0x0000);
+ curbyte += aimutil_put16(newpacket->data+curbyte, 0x0001);
}
- newpacket->commandlen += 6;
- newpacket->lock = 1;
- newpacket->type = 0x01;
-
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0001);
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0001);
- curbyte += aimutil_put16(newpacket->data+curbyte, strlen(sn));
- curbyte += aimutil_putstr(newpacket->data+curbyte, sn, strlen(sn));
-
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002);
- curbyte += aimutil_put16(newpacket->data+curbyte, strlen(password));
- password_encoded = (char *) malloc(strlen(password));
- aim_encode_password(password, password_encoded);
- curbyte += aimutil_putstr(newpacket->data+curbyte, password_encoded, strlen(password));
- free(password_encoded);
+ curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x0001, strlen(sn), sn);
- curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0016, 0x0004);
+ if (sess->flags & AIM_SESS_FLAGS_SNACLOGIN) {
+ md5_byte_t digest[16];
+
+ aim_encode_password_md5(password, key, digest);
+ curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0025, 16, (char *)digest);
+ } else {
+ char *password_encoded;
+
+ password_encoded = (char *) malloc(strlen(password));
+ aim_encode_password(password, password_encoded);
+ curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x0002, strlen(password), password_encoded);
+ free(password_encoded);
+ }
+
+ /* XXX is clientstring required by oscar? */
+ if (strlen(clientinfo->clientstring))
+ curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x0003, strlen(clientinfo->clientstring), clientinfo->clientstring);
+
+ if (sess->flags & AIM_SESS_FLAGS_SNACLOGIN) {
+ curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0016, (unsigned short)clientinfo->major2);
+ curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0017, (unsigned short)clientinfo->major);
+ curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0018, (unsigned short)clientinfo->minor);
+ curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0019, (unsigned short)clientinfo->minor2);
+ curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x001a, (unsigned short)clientinfo->build);
- if (clientinfo) {
- if (strlen(clientinfo->clientstring)) {
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0003);
- curbyte += aimutil_put16(newpacket->data+curbyte, strlen(clientinfo->clientstring));
- curbyte += aimutil_putstr(newpacket->data+curbyte, clientinfo->clientstring, strlen(clientinfo->clientstring));
- }
- curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0017, clientinfo->major /*0x0001*/);
- curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0018, clientinfo->minor /*0x0001*/);
- curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0019, 0x0000);
- curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x001a, clientinfo->build /*0x0013*/);
- if (strlen(clientinfo->country)) {
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x000e);
- curbyte += aimutil_put16(newpacket->data+curbyte, strlen(clientinfo->country));
- curbyte += aimutil_putstr(newpacket->data+curbyte, clientinfo->country, strlen(clientinfo->country));
- }
- if (strlen(clientinfo->lang)) {
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x000f);
- curbyte += aimutil_put16(newpacket->data+curbyte, strlen(clientinfo->lang));
- curbyte += aimutil_putstr(newpacket->data+curbyte, clientinfo->lang, strlen(clientinfo->lang));
- }
+ curbyte += aim_puttlv_32(newpacket->data+curbyte, 0x0014, clientinfo->unknown);
+ curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0009, 0x0015);
+ } else {
+ curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0016, 0x010a);
+ curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0017, 0x0004);
+ curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0018, 0x003c);
+ curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0019, 0x0001);
+ curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x001a, 0x0cce);
+ curbyte += aim_puttlv_32(newpacket->data+curbyte, 0x0014, 0x00000055);
}
- curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0009, 0x0015);
-#endif
+ if (strlen(clientinfo->country))
+ curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x000e, strlen(clientinfo->country), clientinfo->country);
+ else
+ curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x000e, 2, "us");
+
+ if (strlen(clientinfo->lang))
+ curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x000f, strlen(clientinfo->lang), clientinfo->lang);
+ else
+ curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x000f, 2, "en");
+
+ newpacket->commandlen = curbyte;
newpacket->lock = 0;
return aim_tx_enqueue(sess, newpacket);
}
-/*
- * int encode_password(
- * const char *password,
- * char *encoded
- * );
+static int aim_encode_password_md5(const char *password, const char *key, md5_byte_t *digest)
+{
+ md5_state_t state;
+
+ md5_init(&state);
+ md5_append(&state, (const md5_byte_t *)key, strlen(key));
+ md5_append(&state, (const md5_byte_t *)password, strlen(password));
+ md5_append(&state, (const md5_byte_t *)AIM_MD5_STRING, strlen(AIM_MD5_STRING));
+ md5_finish(&state, (md5_byte_t *)digest);
+
+ return 0;
+}
+
+/**
+ * aim_encode_password - Encode a password using old XOR method
+ * @password: incoming password
+ * @encoded: buffer to put encoded password
*
* This takes a const pointer to a (null terminated) string
* containing the unencoded password. It also gets passed
* an already allocated buffer to store the encoded password.
* This buffer should be the exact length of the password without
- * the null. The encoded password buffer IS NOT NULL TERMINATED.
+ * the null. The encoded password buffer /is not %NULL terminated/.
*
* The encoding_table seems to be a fixed set of values. We'll
* hope it doesn't change over time!
*
+ * This is only used for the XOR method, not the better MD5 method.
+ *
*/
-int aim_encode_password(const char *password, u_char *encoded)
+static int aim_encode_password(const char *password, unsigned char *encoded)
{
u_char encoding_table[] = {
+#if 0 /* old v1 table */
0xf3, 0xb3, 0x6c, 0x99,
0x95, 0x3f, 0xac, 0xb6,
0xc5, 0xfa, 0x6b, 0x63,
0x69, 0x6c, 0xc3, 0x9f
+#else /* v2.1 table, also works for ICQ */
+ 0xf3, 0x26, 0x81, 0xc4,
+ 0x39, 0x86, 0xdb, 0x92,
+ 0x71, 0xa3, 0xb9, 0xe6,
+ 0x53, 0x7a, 0x95, 0x7c
+#endif
};
int i;
* its nonzero, there was an error.
*
*/
-int aim_authparse(struct aim_session_t *sess,
- struct command_rx_struct *command)
+faim_internal int aim_authparse(struct aim_session_t *sess,
+ struct command_rx_struct *command)
{
struct aim_tlvlist_t *tlvlist;
int ret = 1;
/*
* Read block of TLVs. All further data is derived
* from what is parsed here.
+ *
+ * For SNAC login, there's a 17/3 SNAC header in front.
+ *
*/
-#ifdef SNACLOGIN
- tlvlist = aim_readtlvchain(command->data+10, command->commandlen-10);
-#else
- tlvlist = aim_readtlvchain(command->data, command->commandlen);
-#endif
+ if (sess->flags & AIM_SESS_FLAGS_SNACLOGIN)
+ tlvlist = aim_readtlvchain(command->data+10, command->commandlen-10);
+ else
+ tlvlist = aim_readtlvchain(command->data, command->commandlen);
+
/*
* No matter what, we should have a screen name.
*/
sn = aim_gettlv_str(tlvlist, 0x0001, 1);
- memcpy(sess->logininfo.screen_name, sn, strlen(sn));
- sn[(strlen(sn))] = '\0';
-
+ strncpy(sess->logininfo.screen_name, sn, strlen(sn));
+ free(sn);
+
/*
* Check for an error code. If so, we should also
* have an error url.
*/
- if (aim_gettlv(tlvlist, 0x0008, 1))
- {
- struct aim_tlv_t *errtlv;
- errtlv = aim_gettlv(tlvlist, 0x0008, 1);
- sess->logininfo.errorcode = aimutil_get16(errtlv->value);
- sess->logininfo.errorurl = aim_gettlv_str(tlvlist, 0x0004, 1);
- }
+ if (aim_gettlv(tlvlist, 0x0008, 1)) {
+ struct aim_tlv_t *errtlv;
+ errtlv = aim_gettlv(tlvlist, 0x0008, 1);
+ sess->logininfo.errorcode = aimutil_get16(errtlv->value);
+ sess->logininfo.errorurl = aim_gettlv_str(tlvlist, 0x0004, 1);
+ }
/*
* If we have both an IP number (0x0005) and a cookie (0x0006),
* then the login was successful.
*/
- else if (aim_gettlv(tlvlist, 0x0005, 1) && aim_gettlv(tlvlist, 0x0006, 1))
- {
- struct aim_tlv_t *tmptlv;
-
- /*
- * IP address of BOS server.
- */
- sess->logininfo.BOSIP = aim_gettlv_str(tlvlist, 0x0005, 1);
-
- /*
- * Authorization Cookie
- */
- tmptlv = aim_gettlv(tlvlist, 0x0006, 1);
- memcpy(sess->logininfo.cookie, tmptlv->value, AIM_COOKIELEN);
-
- /*
- * The email address attached to this account
- */
+ else if (aim_gettlv(tlvlist, 0x0005, 1) && aim_gettlv(tlvlist, 0x0006, 1)
+ /*aim_gettlv(tlvlist, 0x0006, 1)->length*/) {
+ struct aim_tlv_t *tmptlv;
+
+ /*
+ * IP address of BOS server.
+ */
+ sess->logininfo.BOSIP = aim_gettlv_str(tlvlist, 0x0005, 1);
+
+ /*
+ * Authorization Cookie
+ */
+ tmptlv = aim_gettlv(tlvlist, 0x0006, 1);
+ memcpy(sess->logininfo.cookie, tmptlv->value, AIM_COOKIELEN);
+
+ /*
+ * The email address attached to this account
+ * Not available for ICQ logins.
+ */
+ if (aim_gettlv(tlvlist, 0x0011, 1))
sess->logininfo.email = aim_gettlv_str(tlvlist, 0x0011, 1);
-
- /*
- * The registration status. (Not real sure what it means.)
- */
- tmptlv = aim_gettlv(tlvlist, 0x0013, 1);
+
+ /*
+ * The registration status. (Not real sure what it means.)
+ * Not available for ICQ logins.
+ */
+ if ((tmptlv = aim_gettlv(tlvlist, 0x0013, 1)))
sess->logininfo.regstatus = aimutil_get16(tmptlv->value);
- }
+ }
-#ifdef SNACLOGIN
userfunc = aim_callhandler(command->conn, 0x0017, 0x0003);
-#else
- userfunc = aim_callhandler(command->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_AUTHSUCCESS);
-#endif
+
if (userfunc)
ret = userfunc(sess, command);
aim_freetlvchain(&tlvlist);
- /* These have been clobbered by the freetlvchain */
- sess->logininfo.BOSIP = NULL;
- sess->logininfo.email = NULL;
- sess->logininfo.errorurl = NULL;
+ if (sess->logininfo.BOSIP) {
+ free(sess->logininfo.BOSIP);
+ sess->logininfo.BOSIP = NULL;
+ }
+ if (sess->logininfo.email) {
+ free(sess->logininfo.email);
+ sess->logininfo.email = NULL;
+ }
+ if (sess->logininfo.errorurl) {
+ free(sess->logininfo.errorurl);
+ sess->logininfo.errorurl = NULL;
+ }
+
+ return ret;
+}
+
+/*
+ * Middle handler for 0017/0007 SNACs. Contains the auth key prefixed
+ * by only its length in a two byte word.
+ *
+ * Calls the client, which should then use the value to call aim_send_login.
+ *
+ */
+faim_internal int aim_authkeyparse(struct aim_session_t *sess, struct command_rx_struct *command)
+{
+ unsigned char *key;
+ int keylen;
+ int ret = 1;
+ rxcallback_t userfunc;
+
+ keylen = aimutil_get16(command->data+10);
+ if (!(key = malloc(keylen+1)))
+ return ret;
+ memcpy(key, command->data+12, keylen);
+ key[keylen] = '\0';
+
+ if ((userfunc = aim_callhandler(command->conn, 0x0017, 0x0007)))
+ ret = userfunc(sess, command, (char *)key);
+
+ free(key);
return ret;
}
* You probably don't want this unless you're writing an AIM server.
*
*/
-unsigned long aim_sendauthresp(struct aim_session_t *sess,
- struct aim_conn_t *conn,
- char *sn, char *bosip,
- char *cookie, char *email,
- int regstatus)
+faim_export unsigned long aim_sendauthresp(struct aim_session_t *sess,
+ struct aim_conn_t *conn,
+ char *sn, char *bosip,
+ char *cookie, char *email,
+ int regstatus)
{
struct command_tx_struct *tx;
struct aim_tlvlist_t *tlvlist = NULL;
- if (!(tx = aim_tx_new(0x0001 /*right??*/, conn, 1152)))
+ if (!(tx = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0004, conn, 1152)))
return -1;
tx->lock = 1;
aim_addtlvtochain_str(&tlvlist, 0x0005, bosip, strlen(bosip));
aim_addtlvtochain_str(&tlvlist, 0x0006, cookie, AIM_COOKIELEN);
aim_addtlvtochain_str(&tlvlist, 0x0011, email, strlen(email));
- aim_addtlvtochain16(&tlvlist, 0x0013, regstatus);
+ aim_addtlvtochain16(&tlvlist, 0x0013, (unsigned short)regstatus);
}
tx->commandlen = aim_writetlvchain(tx->data, tx->commandlen, &tlvlist);
/*
* Generate a random cookie. (Non-client use only)
*/
-int aim_gencookie(unsigned char *buf)
+faim_export int aim_gencookie(unsigned char *buf)
{
int i;
/*
* Send Server Ready. (Non-client)
*/
-int aim_sendserverready(struct aim_session_t *sess, struct aim_conn_t *conn)
+faim_export int aim_sendserverready(struct aim_session_t *sess, struct aim_conn_t *conn)
{
struct command_tx_struct *tx;
int i = 0;
- if (!(tx = aim_tx_new(0x0002, conn, 10+0x20)))
+ if (!(tx = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10+0x22)))
return -1;
tx->lock = 1;
- i += aimutil_put16(tx->data+i, 0x0001);
- i += aimutil_put16(tx->data+i, 0x0003);
- i += aimutil_put16(tx->data+i, 0x0000);
- i += aimutil_put16(tx->data+i, 0x0000);
- i += aimutil_put16(tx->data+i, 0x0000);
+ i += aim_putsnac(tx->data, 0x0001, 0x0003, 0x0000, sess->snac_nextid++);
i += aimutil_put16(tx->data+i, 0x0001);
i += aimutil_put16(tx->data+i, 0x0002);
i += aimutil_put16(tx->data+i, 0x000a);
i += aimutil_put16(tx->data+i, 0x000b);
i += aimutil_put16(tx->data+i, 0x000c);
+ i += aimutil_put16(tx->data+i, 0x0013);
+ i += aimutil_put16(tx->data+i, 0x0015);
+ tx->commandlen = i;
tx->lock = 0;
-
return aim_tx_enqueue(sess, tx);
}
/*
* Send service redirect. (Non-Client)
*/
-unsigned long aim_sendredirect(struct aim_session_t *sess,
- struct aim_conn_t *conn,
- unsigned short servid,
- char *ip,
- char *cookie)
+faim_export unsigned long aim_sendredirect(struct aim_session_t *sess,
+ struct aim_conn_t *conn,
+ unsigned short servid,
+ char *ip,
+ char *cookie)
{
struct command_tx_struct *tx;
struct aim_tlvlist_t *tlvlist = NULL;
int i = 0;
- if (!(tx = aim_tx_new(0x0002, conn, 1152)))
+ if (!(tx = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 1152)))
return -1;
tx->lock = 1;
- i += aimutil_put16(tx->data+i, 0x0001);
- i += aimutil_put16(tx->data+i, 0x0005);
- i += aimutil_put16(tx->data+i, 0x0000);
- i += aimutil_put16(tx->data+i, 0x0000);
- i += aimutil_put16(tx->data+i, 0x0000);
+ i += aim_putsnac(tx->data+i, 0x0001, 0x0005, 0x0000, 0x00000000);
aim_addtlvtochain16(&tlvlist, 0x000d, servid);
aim_addtlvtochain_str(&tlvlist, 0x0005, ip, strlen(ip));
andersk / libfaim.git / blobdiff