diff -r 5db69f4c3d06 -r b048e15729d6 loadgen/engine/inc/loadgen_netconn.h --- a/loadgen/engine/inc/loadgen_netconn.h Mon Aug 23 15:50:54 2010 +0300 +++ b/loadgen/engine/inc/loadgen_netconn.h Fri Sep 03 17:11:21 2010 +0300 @@ -22,8 +22,7 @@ // INCLUDES #include #include -//#include -//#include +#include "loadgen_httpreceiver.h" #include "loadgen_loadbase.h" #include "loadgen_loadattributes.h" @@ -52,7 +51,7 @@ virtual void Close(); virtual TPtrC Description(); inline TNetConnAttributes& Attributes() { return iAttributes; } - inline void SetAttributes(TNetConnAttributes aAttributes) { iAttributes = aAttributes; } + inline void SetAttributes(const TNetConnAttributes& aAttributes) { iAttributes = aAttributes; } public: // New static methods static TInt ThreadFunction(TAny* aThreadArg); @@ -66,7 +65,7 @@ }; -class CNetConnManager : public CActive, public MHttpDownloadMgrObserver +class CNetConnManager : public CActive, public MHTTPRecvObserver { public: static CNetConnManager* NewL(TNetConnAttributes& aAttributes); @@ -84,15 +83,15 @@ static TInt PeriodicTimerCallBack(TAny* aAny); void StartDownloadL(); -private: // MHttpDownloadMgrObserver - void HandleDMgrEventL(RHttpDownload& aDownload, THttpDownloadEvent aEvent); +private: // MHTTPRecvObserver + void HTTPFileReceived( TInt aStatus ); public: inline CPeriodic* PeriodicTimer() { return iPeriodicTimer; } private: TNetConnAttributes& iAttributes; CPeriodic* iPeriodicTimer; - RHttpDownloadMgr iDownloadMgr; + CHTTPReceiver* iHTTPReceiver; }; #endif