- Sat Sep 8 19:05:05 PDT 2001

  - Redo ICQ login
  - Fix search by email (oops).

diff --git a/CHANGES b/CHANGES
index 495037b7beddc9f931e313bda11866fbb1b4c285..053fd6af41217169443d611955991eb02f3bfb07 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 
 No release numbers
 ------------------
+ - Sat Sep  8 19:05:05 PDT 2001
+  - Redo ICQ login
+  - Fix search by email (oops).
+
  - Sat Sep  8 17:07:09 PDT 2001
   - Fix directim so you can do it more than once without crashing.
    - This removes the connect/disconnect callbacks.  They were pointless, as

diff --git a/src/login.c b/src/login.c
index 784ac1b8840122d9844443af08be6bcb91c6d704..f7776f5f32a416b408a68328b264f1abd1d90a0c 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -26,6 +26,55 @@ faim_export int aim_sendflapver(aim_session_t *sess, aim_conn_t *conn)
        return 0;
 }
 
+/*
+ * This is a bit confusing.
+ *
+ * Normal SNAC login goes like this:
+ *   - connect
+ *   - server sends flap version
+ *   - client sends flap version
+ *   - client sends screen name (17/6)
+ *   - server sends hash key (17/7)
+ *   - client sends auth request (17/2 -- aim_send_login)
+ *   - server yells
+ *
+ * XOR login (for ICQ) goes like this:
+ *   - connect
+ *   - server sends flap version
+ *   - client sends auth request which contains flap version (aim_send_login)
+ *   - server yells
+ *
+ * For the client API, we make them implement the most complicated version,
+ * and for the simpler version, we fake it and make it look like the more
+ * complicated process.
+ *
+ * This is done by giving the client a faked key, just so we can convince
+ * them to call aim_send_login right away, which will detect the session
+ * flag that says this is XOR login and ignore the key, sending an ICQ
+ * login request instead of the normal SNAC one.
+ *
+ * As soon as AOL makes ICQ log in the same way as AIM, this is /gone/.
+ *
+ * XXX This may cause problems if the client relies on callbacks only
+ * being called from the context of aim_rxdispatch()...
+ *
+ */
+static int goddamnicq(aim_session_t *sess, aim_conn_t *conn, const char *sn)
+{
+       aim_frame_t fr;
+       aim_rxcallback_t userfunc;
+       
+       sess->flags &= ~AIM_SESS_FLAGS_SNACLOGIN;
+       sess->flags |= AIM_SESS_FLAGS_XORLOGIN;
+
+       fr.conn = conn;
+       
+       if ((userfunc = aim_callhandler(sess, conn, 0x0017, 0x0007)))
+               userfunc(sess, &fr, "");
+
+       return 0;
+}
+
 /*
  * In AIM 3.5 protocol, the first stage of login is to request login from the 
  * Authorizer, passing it the screen name for verification.  If the name is 
@@ -44,6 +93,9 @@ faim_export int aim_request_login(aim_session_t *sess, aim_conn_t *conn, const c
        if (!sess || !conn || !sn)
                return -EINVAL;
 
+       if ((sn[0] >= '0') || (sn[0] <= '9'))
+               return goddamnicq(sess, conn, sn);
+
        sess->flags |= AIM_SESS_FLAGS_SNACLOGIN;
 
        aim_sendflapver(sess, conn);
@@ -63,6 +115,51 @@ faim_export int aim_request_login(aim_session_t *sess, aim_conn_t *conn, const c
        return 0;
 }
 
+/*
+ * Part two of the ICQ hack.  Note the ignoring of the key and clientinfo.
+ */
+static int goddamnicq2(aim_session_t *sess, aim_conn_t *conn, const char *sn, const char *password)
+{
+       static const char clientstr[] = {"ICQ Inc. - Product of ICQ (TM) 2000b.4.65.1.3281.85"};
+       static const char lang[] = {"en"};
+       static const char country[] = {"us"};
+       aim_frame_t *fr;
+       aim_tlvlist_t *tl = NULL;
+       char *password_encoded;
+
+       if (!(password_encoded = (char *) malloc(strlen(password))))
+               return -ENOMEM;
+
+       if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x01, 1152))) {
+               free(password_encoded);
+               return -ENOMEM;
+       }
+
+       aim_encode_password(password, password_encoded);
+
+       aimbs_put32(&fr->data, 0x00000001);
+       aim_addtlvtochain_raw(&tl, 0x0001, strlen(sn), sn);
+       aim_addtlvtochain_raw(&tl, 0x0002, strlen(password), password_encoded);
+       aim_addtlvtochain_raw(&tl, 0x0003, strlen(clientstr), clientstr);
+       aim_addtlvtochain16(&tl, 0x0016, 0x010a);
+       aim_addtlvtochain16(&tl, 0x0017, 0x0004);
+       aim_addtlvtochain16(&tl, 0x0018, 0x0041);
+       aim_addtlvtochain16(&tl, 0x0019, 0x0001);
+       aim_addtlvtochain16(&tl, 0x001a, 0x0cd1);
+       aim_addtlvtochain32(&tl, 0x0014, 0x00000055);
+       aim_addtlvtochain_raw(&tl, 0x000f, strlen(lang), lang);
+       aim_addtlvtochain_raw(&tl, 0x000e, strlen(country), country);
+
+       aim_writetlvchain(&fr->data, &tl);
+
+       free(password_encoded);
+       aim_freetlvchain(&tl);
+
+       aim_tx_enqueue(sess, fr);
+
+       return 0;
+}
+
 /*
  * send_login(int socket, char *sn, char *password)
  *  
@@ -126,10 +223,15 @@ faim_export int aim_send_login(aim_session_t *sess, aim_conn_t *conn, const char
 {
        aim_frame_t *fr;
        aim_tlvlist_t *tl = NULL;
+       fu8_t digest[16];
+       aim_snacid_t snacid;
 
        if (!clientinfo || !sn || !password)
                return -EINVAL;
 
+       if (sess->flags & AIM_SESS_FLAGS_XORLOGIN)
+               return goddamnicq2(sess, conn, sn, password);
+
        if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 1152)))
                return -ENOMEM;
 
@@ -145,40 +247,23 @@ faim_export int aim_send_login(aim_session_t *sess, aim_conn_t *conn, const char
                clientinfo->unknown = 0x00000055;
        }
 
-       if (sess->flags & AIM_SESS_FLAGS_SNACLOGIN)
-               aim_putsnac(&fr->data, 0x0017, 0x0002, 0x0000, 0x00010000);
-       else
-               aimbs_put32(&fr->data, 0x00000001);
+       snacid = aim_cachesnac(sess, 0x0017, 0x0002, 0x0000, NULL, 0);
+       aim_putsnac(&fr->data, 0x0017, 0x0002, 0x0000, snacid);
 
        aim_addtlvtochain_raw(&tl, 0x0001, strlen(sn), sn);
 
-       if (sess->flags & AIM_SESS_FLAGS_SNACLOGIN) {
-               fu8_t digest[16];
-
-               aim_encode_password_md5(password, key, digest);
-               aim_addtlvtochain_raw(&tl, 0x0025, 16, digest);
-       } else { 
-               char *password_encoded;
-
-               password_encoded = (char *) malloc(strlen(password));
-               aim_encode_password(password, password_encoded);
-               aim_addtlvtochain_raw(&tl, 0x0002, strlen(password), password_encoded);
-               free(password_encoded);
-       }
+       aim_encode_password_md5(password, key, digest);
+       aim_addtlvtochain_raw(&tl, 0x0025, 16, digest);
 
        aim_addtlvtochain_raw(&tl, 0x0003, strlen(clientinfo->clientstring), clientinfo->clientstring);
-
        aim_addtlvtochain16(&tl, 0x0016, (fu16_t)clientinfo->major2);
        aim_addtlvtochain16(&tl, 0x0017, (fu16_t)clientinfo->major);
        aim_addtlvtochain16(&tl, 0x0018, (fu16_t)clientinfo->minor);
        aim_addtlvtochain16(&tl, 0x0019, (fu16_t)clientinfo->minor2);
        aim_addtlvtochain16(&tl, 0x001a, (fu16_t)clientinfo->build);
-
        aim_addtlvtochain_raw(&tl, 0x000e, strlen(clientinfo->country), clientinfo->country);
        aim_addtlvtochain_raw(&tl, 0x000f, strlen(clientinfo->lang), clientinfo->lang);
-
-       if (sess->flags & AIM_SESS_FLAGS_SNACLOGIN)
-               aim_addtlvtochain16(&tl, 0x0009, 0x0015);
+       aim_addtlvtochain16(&tl, 0x0009, 0x0015);
 
        aim_writetlvchain(&fr->data, &tl);
 

diff --git a/src/search.c b/src/search.c
index 32793096cebc177d579f57c7fb6ea39589b43387..615300fa17c30c0ddacb58055cb5baffa4702345 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -20,10 +20,10 @@ faim_export int aim_usersearch_address(aim_session_t *sess, aim_conn_t *conn, co
        if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+strlen(address))))
                return -ENOMEM;
 
-       snacid = aim_cachesnac(sess, 0x000a, 0x0002, 0x0000, address, strlen(address)+1);
-
+       snacid = aim_cachesnac(sess, 0x000a, 0x0002, 0x0000, strdup(address), strlen(address)+1);
        aim_putsnac(&fr->data, 0x000a, 0x0002, 0x0000, snacid);
-       aimbs_putraw(&fr->data, address, strlen(address)); /* XXX this doesn't seem right at all... */
+       
+       aimbs_putraw(&fr->data, address, strlen(address)); 
 
        aim_tx_enqueue(sess, fr);
 
@@ -56,22 +56,17 @@ static int error(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_mo
 
 static int reply(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
 {
-       int j, m, ret = 0;
+       int j = 0, m, ret = 0;
        aim_tlvlist_t *tlvlist;
        char *cur = NULL, *buf = NULL;
        aim_rxcallback_t userfunc;
        aim_snac_t *snac2;
+       char *searchaddr = NULL;
 
-       if (!(snac2 = aim_remsnac(sess, snac->id))) {
-               faimdprintf(sess, 2, "search reply: couldn't get a snac for 0x%08lx\n", snac->id);
-               return 0;
-       }
+       if ((snac2 = aim_remsnac(sess, snac->id)))
+               searchaddr = (char *)snac2->data;
 
        tlvlist = aim_readtlvchain(bs);
-               return 0;
-
-       j = 0;
-
        m = aim_counttlvchain(&tlvlist);
 
        /* XXX uhm. */
@@ -87,7 +82,7 @@ static int reply(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_mo
        aim_freetlvchain(&tlvlist);
 
        if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-               ret = userfunc(sess, rx, snac2->data /* address */, j, buf);
+               ret = userfunc(sess, rx, searchaddr, j, buf);
 
        /* XXX freesnac()? */
        if (snac2)

diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c
index d333fcc2bc4d398116d2fbca24689152234c9f96..b18a7127da6bcdcd2b349e87809e84f655f7bbd6 100644 (file)
--- a/utils/faimtest/faimtest.c
+++ b/utils/faimtest/faimtest.c
@@ -1059,9 +1059,9 @@ static int faimtest_handlecmd(aim_session_t *sess, aim_conn_t *conn, struct aim_
 
                directim_start(sess, conn, userinfo->sn);
 
-       } else if(!(strncmp(tmpstr, "lookup", 6))) {
+       } else if(strstr(tmpstr, "lookup")) {
 
-               aim_usersearch_address(sess, conn, tmpstr+7);
+               aim_usersearch_address(sess, conn, "mid@auk.cx");
 
        } else if (!strncmp(tmpstr, "reqsendmsg", 10)) {
 

diff --git a/utils/faimtest/login.c b/utils/faimtest/login.c
index bacf2977a8842c1cbbe17d30f75798ff979878f5..f7933a463836cff174d15d012a01a7b6e2c434a9 100644 (file)
--- a/utils/faimtest/login.c
+++ b/utils/faimtest/login.c
@@ -107,7 +107,7 @@ static int faimtest_parse_authresp(aim_session_t *sess, aim_frame_t *fr, ...)
        if (errorcode || !bosip || !cookie) {
                dvprintf("Login Error Code 0x%04x\n", errorcode);
                dvprintf("Error URL: %s\n", errurl);
-               //aim_conn_kill(sess, &fr->conn);
+               aim_conn_kill(sess, &fr->conn);
                return 1;
        }