Mercurial > pidgin3 / file diff

--- a/libfaim/aim_login.c	Thu Jun 29 19:38:18 2000 +0000
+++ b/libfaim/aim_login.c	Thu Jun 29 20:40:28 2000 +0000
@@ -22,7 +22,7 @@
   
   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;
@@ -51,7 +51,7 @@
   
   struct command_tx_struct *newpacket;
 
-  if (!(newpacket = aim_tx_new(0x0002, conn, 10+2+2+strlen(sn))))
+  if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10+2+2+strlen(sn))))
     return -1;
 
   newpacket->lock = 1;
@@ -87,7 +87,7 @@
   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;
 
   /*
@@ -150,7 +150,7 @@
   }
 
   newpacket->lock = 1;
-  newpacket->type = 0x01;
+  newpacket->hdr.oscar.type = 0x01;
 
   curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
   curbyte += aimutil_put16(newpacket->data+curbyte, 0x0001);
@@ -161,10 +161,7 @@
   curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002);
   curbyte += aimutil_put16(newpacket->data+curbyte, strlen(password));
   password_encoded = (char *) malloc(strlen(password));
-  if (icqmode)
-    aimicq_encode_password(password, password_encoded);
-  else
-    aim_encode_password(password, password_encoded);
+  aim_encode_password(password, password_encoded);
   curbyte += aimutil_putstr(newpacket->data+curbyte, password_encoded, strlen(password));
   free(password_encoded);
   
@@ -181,18 +178,17 @@
 
   curbyte += aim_puttlv_32(newpacket->data+curbyte, 0x0014, 0x00000055);
 
+  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));
   }
 
-  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));
-  }
-
 #endif
 
   newpacket->lock = 0;
@@ -218,12 +214,12 @@
 int aim_encode_password(const char *password, u_char *encoded)
 {
   u_char encoding_table[] = {
-#if 0
+#if 0 /* old v1 table */
     0xf3, 0xb3, 0x6c, 0x99,
     0x95, 0x3f, 0xac, 0xb6,
     0xc5, 0xfa, 0x6b, 0x63,
     0x69, 0x6c, 0xc3, 0x9f
-#else
+#else /* v2.1 table, also works for ICQ */
     0xf3, 0x26, 0x81, 0xc4,
     0x39, 0x86, 0xdb, 0x92,
     0x71, 0xa3, 0xb9, 0xe6,
@@ -240,31 +236,6 @@
 }
 
 /*
- * They changed the hash slightly for ICQ. 
- *   This new hash may work for AIM too (though
- *   the max password length for ICQ is only 
- *   eight characters, where its 16 with AIM).
- *
- */
-int aimicq_encode_password(const char *password, u_char *encoded)
-{
-  u_char encoding_table[] = {
-    0xf3, 0x26, 0x81, 0xc4,
-    0x39, 0x86, 0xdb, 0x92
-  };
-
-  int i;
-
-  if (strlen(password) > 8)
-    return -1;
-
-  for (i = 0; i < strlen(password); i++)
-      encoded[i] = (password[i] ^ encoding_table[i]);
-
-  return 0;
-}
-
-/*
  * This is sent back as a general response to the login command.
  * It can be either an error or a success, depending on the
  * precense of certain TLVs.  
@@ -313,7 +284,8 @@
    * 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)) {
+  else if (aim_gettlv(tlvlist, 0x0005, 1) && aim_gettlv(tlvlist, 0x0006, 1) 
+	   /*aim_gettlv(tlvlist, 0x0006, 1)->length*/) {
     struct aim_tlv_t *tmptlv;
 
     /*
@@ -376,7 +348,7 @@
   struct command_tx_struct *tx;
   struct aim_tlvlist_t *tlvlist = NULL;
 
-  if (!(tx = aim_tx_new(0x0004, conn, 1152)))
+  if (!(tx = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0004, conn, 1152)))
     return -1;
   
   tx->lock = 1;
@@ -424,7 +396,7 @@
   struct command_tx_struct *tx;
   int i = 0;
 
-  if (!(tx = aim_tx_new(0x0002, conn, 10+0x22)))
+  if (!(tx = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10+0x22)))
     return -1;
 
   tx->lock = 1;
@@ -463,7 +435,7 @@
   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;