- Wed Apr 25 11:51:39 PDT 2001

[libfaim.git] / src / login.c

diff --git a/src/login.c b/src/login.c
index 1fd031ab1c9ad2213c9d6f9fee1753f1a81b4de3..98b81208947cb08a6aaffa99b5e076f9079ff894 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -715,24 +715,60 @@ static int memrequest(struct aim_session_t *sess, aim_module_t *mod, struct comm
 {
   rxcallback_t userfunc;
   unsigned long offset, len;
+  int i = 0;
+  struct aim_tlvlist_t *list;
+  char *modname = NULL;
 
   offset = aimutil_get32(data);
+  i += 4;
+
   len = aimutil_get32(data+4);
+  i += 4;
 
-  faimdprintf(sess, 1, "data at 0x%08lx (%d bytes) requested\n", offset, len);
+  list = aim_readtlvchain(data+i, datalen-i);
+
+  if (aim_gettlv(list, 0x0001, 1))
+    modname = aim_gettlv_str(list, 0x0001, 1);
+
+  faimdprintf(sess, 1, "data at 0x%08lx (%d bytes) of requested\n", offset, len, modname?modname:"aim.exe");
 
   if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-    return userfunc(sess, rx, offset, len);
+    return userfunc(sess, rx, offset, len, modname);
+
+  free(modname);
+  aim_freetlvchain(&list);
 
   return 0;
 }
 
-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)
+static void dumpbox(struct aim_session_t *sess, unsigned char *buf, int len)
+{
+  int i = 0;
+
+  if (!sess || !buf || !len)
+    return;
+
+  faimdprintf(sess, 1, "\nDump of %d bytes at %p:", len, buf);
+
+  for (i = 0; i < len; i++)
+    {
+      if ((i % 8) == 0)
+       faimdprintf(sess, 1, "\n\t");
+
+      faimdprintf(sess, 1, "0x%2x ", buf[i]);
+    }
+  
+  faimdprintf(sess, 1, "\n\n");
+
+  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, 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)))
@@ -743,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);  
@@ -751,6 +793,20 @@ faim_export int aim_sendmemblock(struct aim_session_t *sess, struct aim_conn_t *
     md5_finish(&state, (md5_byte_t *)(tx->data+i));
     i += 0x10;
 
+  } else if (len == 0) { /* no length, just hash NULL (buf is optional) */
+    md5_state_t state;
+    unsigned char nil = '\0';
+
+    /*
+     * These MD5 routines are stupid in that you have to have
+     * at least one append.  So thats why this doesn't look 
+     * real logical.
+     */
+    md5_init(&state);
+    md5_append(&state, (const md5_byte_t *)&nil, 0);
+    md5_finish(&state, (md5_byte_t *)(tx->data+i));
+    i += 0x10;
+
   } else {
 
     if ((offset != 0x00001004) || (len != 0x00000004))