- Thu May 10 17:37:23 PDT 2001

[libfaim.git] / src / login.c

diff --git a/src/login.c b/src/login.c
index 7b36b97712df6d1f4fa549a40ed5eb35140da07a..987c66a7b787cb449517a0f747614ad8391b53a9 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -430,7 +430,7 @@ faim_export unsigned long aim_sendredirect(struct aim_session_t *sess,
 
 static int hostonline(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   int ret = 0;
   unsigned short *families;
   int famcount, i;
@@ -456,7 +456,7 @@ static int redirect(struct aim_session_t *sess, aim_module_t *mod, struct comman
   int serviceid;
   unsigned char *cookie;
   char *ip;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   struct aim_tlvlist_t *tlvlist;
   char *chathack = NULL;
   int chathackex = 0;
@@ -551,7 +551,7 @@ static int redirect(struct aim_session_t *sess, aim_module_t *mod, struct comman
 /* XXX parse this */
 static int rateresp(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
 
   if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
     return userfunc(sess, rx);
@@ -561,7 +561,7 @@ static int rateresp(struct aim_session_t *sess, aim_module_t *mod, struct comman
 
 static int ratechange(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   int i = 0, code;
   unsigned long currentavg, maxavg;
   unsigned long rateclass, windowsize, clear, alert, limit, disconnect;
@@ -596,7 +596,7 @@ static int ratechange(struct aim_session_t *sess, aim_module_t *mod, struct comm
 /* XXX parse this */
 static int selfinfo(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
 
   if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
     return userfunc(sess, rx);
@@ -606,7 +606,7 @@ static int selfinfo(struct aim_session_t *sess, aim_module_t *mod, struct comman
 
 static int evilnotify(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc = NULL;
+  aim_rxcallback_t userfunc = NULL;
   int i = 0;
   unsigned short newevil;
   struct aim_userinfo_s userinfo;
@@ -627,7 +627,7 @@ static int evilnotify(struct aim_session_t *sess, aim_module_t *mod, struct comm
 
 static int motd(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   char *msg = NULL;
   int ret = 0;
   struct aim_tlvlist_t *tlvlist;
@@ -663,7 +663,7 @@ static int motd(struct aim_session_t *sess, aim_module_t *mod, struct command_rx
 
 static int hostversions(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   int vercount;
 
   vercount = datalen/4;
@@ -713,7 +713,7 @@ static int hostversions(struct aim_session_t *sess, aim_module_t *mod, struct co
  */
 static int memrequest(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   unsigned long offset, len;
   int i = 0;
   struct aim_tlvlist_t *list;
@@ -763,12 +763,12 @@ static void dumpbox(struct aim_session_t *sess, unsigned char *buf, int len)
   return;
 }
 
-faim_export int aim_sendmemblock(struct aim_session_t *sess, struct aim_conn_t *conn, unsigned long offset, unsigned long len, const unsigned char *buf)
+faim_export int aim_sendmemblock(struct aim_session_t *sess, struct aim_conn_t *conn, unsigned long offset, unsigned long len, const unsigned char *buf, unsigned char flag)
 {
   struct command_tx_struct *tx;
   int i = 0;
 
-  if (!sess || !conn || ((offset == 0) && !buf))
+  if (!sess || !conn)
     return 0;
 
   if (!(tx = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, 10+2+16)))
@@ -779,7 +779,13 @@ faim_export int aim_sendmemblock(struct aim_session_t *sess, struct aim_conn_t *
   i = aim_putsnac(tx->data, 0x0001, 0x0020, 0x0000, sess->snac_nextid++);
   i += aimutil_put16(tx->data+i, 0x0010); /* md5 is always 16 bytes */
 
-  if (buf && (len > 0)) { /* use input buffer */
+  if ((flag == AIM_SENDMEMBLOCK_FLAG_ISHASH) &&
+      buf && (len == 0x10)) { /* we're getting a hash */
+
+    memcpy(tx->data+i, buf, 0x10);
+    i += 0x10;
+
+  } else if (buf && (len > 0)) { /* use input buffer */
     md5_state_t state;
 
     md5_init(&state);  
@@ -807,15 +813,17 @@ faim_export int aim_sendmemblock(struct aim_session_t *sess, struct aim_conn_t *
       faimdprintf(sess, 0, "sendmemblock: WARNING: sending bad hash... you will be disconnected soon...\n");
 
     /* 
-     * This data is correct for AIM 3.5.1670, offset 0x1004, length 4 
+     * This data is correct for AIM 3.5.1670, offset 0x03ffffff, 
+     * length 0x03ffffff (invalid).
      *
      * Using this block is as close to "legal" as you can get without
      * using an AIM binary.
+     *
      */
-    i += aimutil_put32(tx->data+i, 0x92bd6757);
-    i += aimutil_put32(tx->data+i, 0x3722cbd3);
-    i += aimutil_put32(tx->data+i, 0x2b048ab9);
-    i += aimutil_put32(tx->data+i, 0xd0b1e4ab);
+    i += aimutil_put32(tx->data+i, 0x1df8cbae);
+    i += aimutil_put32(tx->data+i, 0x5523b839);
+    i += aimutil_put32(tx->data+i, 0xa0e10db3);
+    i += aimutil_put32(tx->data+i, 0xa46d3b39);
 
   }