Changeset 645

Timestamp:

03/19/07 14:26:36 (17 months ago)

Author:

hyriand

Message:

Added initial (very hacky) version of a download socket. Museekd will now by
default try to download 'data' (which is my kernel) from my shares on slsk to
'download.out'.

Location:

branches/newnet/museekd/museekd

Files:

• downloadmanager.cpp (modified) (2 diffs)
• downloadmanager.h (modified) (1 diff)
• downloadsocket.h (added)
• main.cpp (modified) (1 diff)

branches/newnet/museekd/museekd/downloadmanager.cpp

@@ -22 +22 @@
 #include "peersocket.h"
 #include "servermanager.h"
+#include "downloadsocket.h"
 #include <NewNet/nnreactor.h>
 
@@ -252 +253 @@
   {
     // Transfer can start immediately, no queue at remote end.
-    NNLOG("museek.debug", "Got transfer reply: user=%s,path=%s,ticket=%u,allowed=yes,filesize=%llu", user.c_str(), download->path.c_str(), download->ticket, message->filesize);
-    NNLOG("museek.debug", "Ehm.. We're supposed to do something here: connect to %s and claim our prize...", user.c_str());
+    NNLOG("museek.debug", "Got transfer reply: user=%s,path=%s,ticket=%u,allowed=yes,filesize=%llu. Initiating download.", user.c_str(), download->path.c_str(), download->ticket, message->filesize);
+    download->size = message->filesize;
+    m_Museekd->reactor()->add(new DownloadSocket(m_Museekd, download));
   }
   else

branches/newnet/museekd/museekd/downloadmanager.h

@@ -50 +50 @@
       uint ticket; // The download ticket with which this download is identified
       std::string user, path, localPath;
+      off_t size;
       TrState state; // Transfer state (see mutypes.h)
       std::string error; // Error message if state = TR_Error

branches/newnet/museekd/museekd/main.cpp

@@ -115 +115 @@
   museekd->reactor()->addTimeout(5000, new AutoConnectCallback);
 
+  /* Add a sample download. */
+  museekd->downloads()->add("hyriand", "\\home\\hyriand\\MyBook\\music\\data");
+
   /* Start the reactor. This drives the daemon. */
   museekd->reactor()->run();