*
*/
+#define FAIM_INTERNAL
#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;
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 (!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)
* encode_password(). See that function for their
* stupid method of doing it.
*
+ * Latest WinAIM:
+ * clientstring = "AOL Instant Messenger (SM), version 4.3.2188/WIN32"
+ * major2 = 0x0109
+ * major = 0x0400
+ * minor = 0x0003
+ * minor2 = 0x0000
+ * build = 0x088c
+ * unknown = 0x00000086
+ * lang = "en"
+ * country = "us"
+ * unknown4a = 0x01
*/
-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;
- int icqmode = 0;
-
struct command_tx_struct *newpacket;
if (!clientinfo || !sn || !password)
if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 1152)))
return -1;
- /*
- * For ICQ logins, the client version must be at
- * least as high as ICQ2000a.
- */
- if ((sn[0] >= '0') && (sn[0] <= '9')) {
- icqmode = 1; /* needs a different password encoding */
- if (clientinfo && (clientinfo->major < 4)) {
- printf("faim: icq: version must be at least 4.30.3141 for ICQ OSCAR login\n");
- }
- if (strlen(password) > 8) {
- printf("faim: icq: password too long (8 char max)\n");
- }
- }
-
-#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->lock = 1;
- newpacket->hdr.oscar.type = 0x01;
-
- /*
- * These four bytes are actually the FLAP version information.
- * They're sent here for convenience. I suppose they could
- * be seperated out into a seperate FLAP, but this is where
- * everyone else sends them.
- */
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
- curbyte += aimutil_put16(newpacket->data+curbyte, 0x0001);
+ 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);
+ }
curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x0001, strlen(sn), sn);
-
- 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);
+ 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);
- curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0016, clientinfo->major2);
- curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0017, clientinfo->major);
- curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0018, clientinfo->minor);
- curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0019, clientinfo->minor2);
- curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x001a, clientinfo->build);
-
- curbyte += aim_puttlv_32(newpacket->data+curbyte, 0x0014, clientinfo->unknown);
+ 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);
+
+ curbyte += aim_puttlv_32(newpacket->data+curbyte, 0x0014, clientinfo->unknown);
+ curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0009, 0x0015);
+ curbyte += aim_puttlv_8(newpacket->data+curbyte, 0x004a, 0x00);
+ } else {
+ /* Use very specific version numbers, to further indicate the hack. */
+ 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);
+ }
if (strlen(clientinfo->country))
curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x000e, strlen(clientinfo->country), clientinfo->country);
curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x000f, 2, "en");
newpacket->commandlen = curbyte;
-#endif
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 */
* It can be either an error or a success, depending on the
* precense of certain TLVs.
*
- * The client should check the value of logininfo->errorcode. If
+ * The client should check the value passed as errorcode. If
* 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;
- char *sn;
rxcallback_t userfunc = NULL;
-
- memset(&sess->logininfo, 0x00, sizeof(sess->logininfo));
+ char *sn = NULL, *bosip = NULL, *errurl = NULL, *email = NULL;
+ unsigned char *cookie = NULL;
+ int errorcode = 0, regstatus = 0;
+ int latestbuild = 0, latestbetabuild = 0;
+ char *latestrelease = NULL, *latestbeta = NULL;
+ char *latestreleaseurl = NULL, *latestbetaurl = NULL;
+ char *latestreleaseinfo = NULL, *latestbetainfo = NULL;
/*
* 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);
- strncpy(sess->logininfo.screen_name, sn, strlen(sn));
- free(sn);
+ memset(sess->sn, 0, sizeof(sess->sn));
+ if (aim_gettlv(tlvlist, 0x0001, 1)) {
+ sn = aim_gettlv_str(tlvlist, 0x0001, 1);
+ strncpy(sess->sn, sn, sizeof(sess->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 we have both an IP number (0x0005) and a cookie (0x0006),
- * then the login was successful.
+ if (aim_gettlv(tlvlist, 0x0008, 1))
+ errorcode = aim_gettlv16(tlvlist, 0x0008, 1);
+ if (aim_gettlv(tlvlist, 0x0004, 1))
+ errurl = aim_gettlv_str(tlvlist, 0x0004, 1);
+
+ /*
+ * BOS server address.
*/
- else if (aim_gettlv(tlvlist, 0x0005, 1) && aim_gettlv(tlvlist, 0x0006, 1)
- /*aim_gettlv(tlvlist, 0x0006, 1)->length*/) {
+ if (aim_gettlv(tlvlist, 0x0005, 1))
+ bosip = aim_gettlv_str(tlvlist, 0x0005, 1);
+
+ /*
+ * Authorization cookie.
+ */
+ if (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
- * 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.)
- * Not available for ICQ logins.
- */
- if ((tmptlv = aim_gettlv(tlvlist, 0x0013, 1)))
- sess->logininfo.regstatus = aimutil_get16(tmptlv->value);
-
+
+ if ((cookie = malloc(tmptlv->length)))
+ memcpy(cookie, tmptlv->value, tmptlv->length);
}
-#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);
+ /*
+ * The email address attached to this account
+ * Not available for ICQ logins.
+ */
+ if (aim_gettlv(tlvlist, 0x0011, 1))
+ email = aim_gettlv_str(tlvlist, 0x0011, 1);
+
+ /*
+ * The registration status. (Not real sure what it means.)
+ * Not available for ICQ logins.
+ *
+ * 1 = No disclosure
+ * 2 = Limited disclosure
+ * 3 = Full disclosure
+ *
+ * This has to do with whether your email address is available
+ * to other users or not. AFAIK, this feature is no longer used.
+ *
+ */
+ if (aim_gettlv(tlvlist, 0x0013, 1))
+ regstatus = aim_gettlv16(tlvlist, 0x0013, 1);
+
+ if (aim_gettlv(tlvlist, 0x0040, 1))
+ latestbetabuild = aim_gettlv32(tlvlist, 0x0040, 1);
+ if (aim_gettlv(tlvlist, 0x0041, 1))
+ latestbetaurl = aim_gettlv_str(tlvlist, 0x0041, 1);
+ if (aim_gettlv(tlvlist, 0x0042, 1))
+ latestbetainfo = aim_gettlv_str(tlvlist, 0x0042, 1);
+ if (aim_gettlv(tlvlist, 0x0043, 1))
+ latestbeta = aim_gettlv_str(tlvlist, 0x0043, 1);
+ if (aim_gettlv(tlvlist, 0x0048, 1))
+ ; /* no idea what this is */
+
+ if (aim_gettlv(tlvlist, 0x0044, 1))
+ latestbuild = aim_gettlv32(tlvlist, 0x0044, 1);
+ if (aim_gettlv(tlvlist, 0x0045, 1))
+ latestreleaseurl = aim_gettlv_str(tlvlist, 0x0045, 1);
+ if (aim_gettlv(tlvlist, 0x0046, 1))
+ latestreleaseinfo = aim_gettlv_str(tlvlist, 0x0046, 1);
+ if (aim_gettlv(tlvlist, 0x0047, 1))
+ latestrelease = aim_gettlv_str(tlvlist, 0x0047, 1);
+ if (aim_gettlv(tlvlist, 0x0049, 1))
+ ; /* no idea what this is */
+
+
+ if ((userfunc = aim_callhandler(command->conn, 0x0017, 0x0003)))
+ ret = userfunc(sess, command, sn, errorcode, errurl, regstatus, email, bosip, cookie, latestrelease, latestbuild, latestreleaseurl, latestreleaseinfo, latestbeta, latestbetabuild, latestbetaurl, latestbetainfo);
+
+
+ if (sn)
+ free(sn);
+ if (bosip)
+ free(bosip);
+ if (errurl)
+ free(errurl);
+ if (email)
+ free(email);
+ if (cookie)
+ free(cookie);
+ if (latestrelease)
+ free(latestrelease);
+ if (latestreleaseurl)
+ free(latestreleaseurl);
+ if (latestbeta)
+ free(latestbeta);
+ if (latestbetaurl)
+ free(latestbetaurl);
+ if (latestreleaseinfo)
+ free(latestreleaseinfo);
+ if (latestbetainfo)
+ free(latestbetainfo);
aim_freetlvchain(&tlvlist);
- 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, int errorcode,
+ char *errorurl, char *bosip,
+ char *cookie, char *email,
+ int regstatus)
{
struct command_tx_struct *tx;
struct aim_tlvlist_t *tlvlist = NULL;
if (sn)
aim_addtlvtochain_str(&tlvlist, 0x0001, sn, strlen(sn));
else
- aim_addtlvtochain_str(&tlvlist, 0x0001, sess->logininfo.screen_name, strlen(sess->logininfo.screen_name));
+ aim_addtlvtochain_str(&tlvlist, 0x0001, sess->sn, strlen(sess->sn));
- if (sess->logininfo.errorcode) {
- aim_addtlvtochain16(&tlvlist, 0x0008, sess->logininfo.errorcode);
- aim_addtlvtochain_str(&tlvlist, 0x0004, sess->logininfo.errorurl, strlen(sess->logininfo.errorurl));
+ if (errorcode) {
+ aim_addtlvtochain16(&tlvlist, 0x0008, errorcode);
+ aim_addtlvtochain_str(&tlvlist, 0x0004, errorurl, strlen(errorurl));
} else {
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);
tx->lock = 0;
+
return aim_tx_enqueue(sess, tx);
}
/*
* 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;
/*
* 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;