Changeset 535

Show
Ignore:
Timestamp:
04/28/06 15:24:18 (3 years ago)
Author:
common
Message:

nepenthes
- remove upload & geolocation from class Nepenthes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • nepenthes/trunk/nepenthes-core/include/Makefile.am

    r500 r535  
    1313EXTRA_DIST += DownloadManager.hpp DownloadHandler.hpp Download.hpp DownloadBuffer.hpp DownloadUrl.hpp DownloadCallback.hpp 
    1414EXTRA_DIST += EventManager.hpp EventHandler.hpp Event.hpp SubmitEvent.hpp SocketEvent.hpp 
    15 EXTRA_DIST += GeoLocationManager.hpp GeoLocationHandler.hpp GeoLocationCallback.hpp GeoLocationQuery.hpp  GeoLocationResult.hpp GeoLocationResult.hpp 
    1615EXTRA_DIST += LogManager.hpp LogHandler.hpp LogHandlerEntry.hpp FileLogger.hpp RingFileLogger.hpp ConsoleLogger.hpp  
    1716EXTRA_DIST += LuaFunctions.hpp LuaInterface.hpp 
    …… 
    2221EXTRA_DIST += Packet.hpp 
    2322EXTRA_DIST += SubmitManager.hpp SubmitHandler.hpp  
    24 EXTRA_DIST += UploadManager.hpp UploadHandler.hpp UploadQuery.hpp UploadCallback.hpp  UploadResult.hpp  
    2523EXTRA_DIST += Utilities.hpp 

  • nepenthes/trunk/nepenthes-core/include/Nepenthes.hpp

    r498 r535  
    109109        class DNSManager; 
    110110        class Message; 
    111         class GeoLocationManager; 
    112         class UploadManager; 
    113111 
    114112 
    …… 
    139137                virtual DNSManager                      *getDNSMgr(); 
    140138 
    141 #ifdef HAVE_GEOLOCATION 
    142                 virtual GeoLocationManager      *getGeoMgr(); 
    143 #endif  
    144  
    145                 virtual UploadManager           *getUploadMgr(); 
    146  
    147139                virtual bool                            doLoop(); 
    148140                virtual int32_t                                 run(int32_t argc, char **argv); 
    …… 
    156148                DNSManager          *m_DNSManager; 
    157149                EventManager        *m_EventManager; 
    158 #ifdef HAVE_GEOLOCATION 
    159                 GeoLocationManager  *m_GeoLocationManager; 
    160 #endif 
    161150                LuaInterface        *m_Lua; 
    162151                LogManager          *m_LogManager; 
    …… 
    165154                SubmitManager       *m_SubmitManager; 
    166155                SocketManager       *m_SocketManager; 
    167                 UploadManager       *m_UploadManager; 
    168156                Utilities           *m_Utilities; 
    169157                 

  • nepenthes/trunk/nepenthes-core/src/Makefile.am

    r500 r535  
    1616nepenthes_SOURCES += DownloadManager.cpp DownloadHandler.cpp DownloadBuffer.cpp Download.cpp DownloadUrl.cpp 
    1717nepenthes_SOURCES += EventManager.cpp EventHandler.cpp  
    18 nepenthes_SOURCES += GeoLocationManager.cpp GeoLocationHandler.cpp GeoLocationQuery.cpp GeoLocationResult.cpp 
    1918nepenthes_SOURCES += LogManager.cpp LogHandler.cpp ConsoleLogger.cpp FileLogger.cpp RingFileLogger.cpp 
    2019nepenthes_SOURCES += LuaFunctions.cpp LuaInterface.cpp 
    …… 
    2726nepenthes_SOURCES += ShellcodeManager.cpp ShellcodeHandler.cpp  
    2827nepenthes_SOURCES += SubmitManager.cpp SubmitHandler.cpp  
    29 nepenthes_SOURCES += UploadManager.cpp UploadQuery.cpp UploadResult.cpp 
    3028nepenthes_SOURCES += Utilities.cpp 
    3129 

  • nepenthes/trunk/nepenthes-core/src/Nepenthes.cpp

    r505 r535  
    6565#include "DialogueFactoryManager.hpp" 
    6666#include "DNSManager.hpp" 
    67 #include "GeoLocationManager.hpp" 
    68 #include "UploadManager.hpp" 
    6967 
    7068#include "Message.hpp" 
    …… 
    9795        m_DownloadManager   = NULL; 
    9896        m_EventManager  = NULL; 
    99 #ifdef HAVE_GEOLOCATION 
    100         m_GeoLocationManager = NULL; 
    101 #endif 
    10297        m_LogManager    = NULL; 
    10398        m_ModuleManager = NULL; 
    …… 
    142137        if (m_DialogueFactoryManager != NULL) 
    143138                delete m_DialogueFactoryManager; 
    144  
    145 #ifdef HAVE_GEOLOCATION 
    146         if (m_GeoLocationManager != NULL) 
    147                 delete m_GeoLocationManager; 
    148 #endif 
    149139 
    150140        if (m_DNSManager != NULL) 
    …… 
    412402                        m_EventManager      = new EventManager(this); 
    413403 
    414 #ifdef HAVE_GEOLOCATION 
    415                         m_GeoLocationManager = new GeoLocationManager(this); 
    416 #endif  
    417  
    418                         m_UploadManager         = new UploadManager(this); 
    419404                        //      m_Lua                           = new Lua 
    420405                        m_ModuleManager     = new ModuleManager(this); 
    …… 
    543528                } 
    544529 
    545 #ifdef HAVE_GEOLOCATION 
    546                 if (run == true ) 
    547                 { 
    548                         run = m_GeoLocationManager->Init(); 
    549                 } 
    550 #endif 
    551  
    552530                if (run == true ) 
    553531                { 
    554532                        run = m_DownloadManager->Init(); 
    555533                        m_DownloadManager->doList(); 
    556                 } 
    557  
    558                 if (run == true ) 
    559                 { 
    560                         run = m_UploadManager->Init(); 
    561                         m_UploadManager->doList(); 
    562534                } 
    563535 
    …… 
    11161088 
    11171089 
    1118 #ifdef HAVE_GEOLOCATION 
    1119 /** 
    1120  * get the GeoLocationManager 
    1121  *  
    1122  * @return returns the GeoLocationManager 
    1123  */ 
    1124 GeoLocationManager *Nepenthes::getGeoMgr() 
    1125 { 
    1126         return m_GeoLocationManager; 
    1127 } 
    1128  
    1129 #endif 
    1130  
    1131 /** 
    1132  * get the UploadManager 
    1133  *  
    1134  * @return returns the UploadManager 
    1135  */ 
    1136 UploadManager *Nepenthes::getUploadMgr() 
    1137 { 
    1138         return m_UploadManager; 
    1139 } 
    11401090 
    11411091/**