Changeset 1486

Timestamp:

07/17/05 18:11:08 (3 years ago)

Author:

wubbla

Message:

m_connections is now a boost::multi_index_container; PartData::getRange() is now used to download specific ranges; MD5-hashes are now added to MetaData? automatically (if found)

Files:

• testing/http/download.cpp (modified) (7 diffs)
• testing/http/download.h (modified) (5 diffs)
• testing/http/http.h (modified) (1 diff)
• testing/http/parser.cpp (modified) (3 diffs)
• testing/http/parser.h (modified) (1 diff)

testing/http/download.cpp

@@ -70 +70 @@
-    do {
-        it = m_connections.begin();
- (++it)->first 
+++it
-    } while(it != m_connections.end());
-
-    m_connections.clear();
-}
@@ -79 +78 @@
-void Download::onPDEvent(PartData *pd, int evt) { 
-    if(pd == m_pd && evt == PD_COMPLETE) {
+        logTrace(TRACE, "Download completed... now deleting");
-        HttpClient::instance().deleteDownload(this); 
-    }
@@ -96 +96 @@
-            
-        case EVT_SF_FOUND: 
-        {
-            logTrace(TRACE, "Got EVT_SF_FOUND (sharedfile was found) --> starting download");
-
-
-
-
-
-
-
-
-
-
+
+
+
-        case EVT_ERROR:
-            logError("An error occured...");
@@ -114 +106 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    HttpSocket *s = getSocket(p);
+    boost::format fmt("Parser(%p): %s");
+    fmt % p;
-    switch(evt) {
-        case EVT_SIZE:
-
-
-
+
-            if(m_size > 0) {
-logError("Filesize is already set!")
+fmt % "Filesize is already set!"
-            } else {
-                m_size = getParser(s)->getSize();
-
-
-
-
+
-                deleteConnection(s);
-                
-                if(m_size > 0) {
-                    postEvent(EVT_SET_SIZE);
-                } 
-            }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        case EVT_DESTROY:
-
-
-
+
-            deleteConnection(s);
-            break;
-        
-        case EVT_FAILURE:
-
-
-
-
-
+
+
-            break;
-                    
-        default:
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-void Download::createDownload() {
@@ -231 +280 @@
-}
-
-
+Parser *p, 
-    CHECK_THROW(m_pd != NULL);
-    
-
+
+
+
-    
-    try {
-
+
+
+
+
+
-    } catch(std::exception &e) {
-        logError(boost::format("Unable to write data: %s") % e.what());
@@ -256 +311 @@
-    Parser *p = new Parser;
-    p->getEventTable().addHandler(p, this, &Download::onParserEvent);
-    //p->writeData.connect(boost::bind(&Download::writeData, this, _b1, _b2));
-    p->sendData.connect(boost::bind(&Download::sendData, this, _b1, _b2));
+    Detail::LockedRangePtr ptr;
-        
-
-
+
-    return p;
-}
-
-void Download::deleteConnection(HttpSocket *s) {
-
-
-
-
-
-
+
+
+
+
+
-        HttpSocket *tmp = s;
-(*it).second
+it->parser
-        delete s;
-        delete p;
@@ -279 +332 @@
-        m_connections.erase(tmp);
-    }
+    
-    logTrace(TRACE, "deleteConnection finished...");
-}
-
+void Download::deleteConnection(connIter it) {
+    logTrace(TRACE, "deleteConnection(connIter)");
+    
+    if(it != m_connections.end()) {
+        HttpSocket *s = it->socket;
+        Parser *p = it->parser;
+        delete s;
+        delete p;
+        p = 0;
+        s = 0;  
+        m_connections.erase(it);
+    } else {
+        throw std::runtime_error("no such Connection");
+    }
+}
+
-void Download::sendData(Parser *p, const std::string &data) {
-
-
+
+
+
+
+
+
-}
-
-HttpSocket* Download::getSocket(Parser *p) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-}
-
-Parser* Download::getParser(HttpSocket *s) {
-
-
-
+
+
+
+
+
+
+
+
-}
-

testing/http/download.h

@@ -26 +26 @@
-#include <hn/object.h>
-#include <hn/ssocket.h>
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/key_extractors.hpp>
+#include <boost/multi_index/ordered_index.hpp>
+#include <boost/multi_index/member.hpp>
-
-namespace Http {
-
+using namespace boost;
+using namespace boost::multi_index;
+
-typedef SSocket<HttpClient, Socket::Client, Socket::TCP> HttpSocket;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-enum DownloadEvent {
@@ -45 +87 @@
-    ~Download();
-    
-
+Parser *p, 
-    void sendData(Parser *p, const std::string &data);
-
@@ -54 +96 @@
-    void postEvent(DownloadEvent evt);  
-    void onDownloadEvent(DownloadEvent evt);
+    
+    void getWholeFile();
+    void getRandomChunk(uint64_t chunksize = 0);
-    
-    //! Comparison operator for std containers
@@ -68 +113 @@
-    Parser* createConnection(const IPV4Address &addr);
-    void deleteConnection(HttpSocket *s);
+    void deleteConnection(connIter it);
-    void findSharedFile();
-    HttpSocket* getSocket(Parser *p);
-    Parser* getParser(HttpSocket *s);
-
+
+
-    std::map<std::string, std::string> m_url;
-connMap
+MIConn
-    
-    uint64_t    m_size;
@@ -80 +127 @@
-    SharedFile* m_sf;
-    MetaData*   m_md;    
+    Detail::LockedRangePtr m_locked;
-};
-

testing/http/http.h

@@ -37 +37 @@
-    EVT_DATA,
-    EVT_FAILURE,
-
+
+
+
-};
-

testing/http/parser.cpp

@@ -110 +110 @@
-}
-
+std::string Parser::getMD5() {
+    return getHeader("content-md5");
+}
+
-void Parser::tryRequest(const std::string &file) {
-    //absolute path AND hostname:
@@ -219 +223 @@
-            getEventTable().postEvent(this, EVT_SIZE);
-        }
+        if(getHeader("accept-ranges") != "bytes") {
+            getEventTable().postEvent(this, EVT_NORANGES);
+        }       
-    }
-}
@@ -248 +255 @@
-    
-    if(success) {
-
+this, 
-        m_offset += data.size();
+    }
+    if(m_offset == m_range->end() + 1) {
+        getEventTable().postEvent(this, EVT_COMPLETE);
-    }
-}

testing/http/parser.h

@@ -42 +42 @@
-    void setHostName(const std::string &hostname);
-    
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    boost::signal<void (Parser*, const std::string&)> sendData;
-