version 0.1.6

[fms.git] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index 291f06b..6430d85 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -6,6 +6,7 @@
 #include "../include/db/sqlite3db.h"\r
 #include "../include/freenet/freenetmasterthread.h"\r
 #include "../include/nntp/nntplistener.h"\r
+#include "../include/http/httpthread.h"\r
 \r
 #ifdef _WIN32\r
        #include <winsock2.h>\r
@@ -334,7 +335,19 @@ void SetupDefaultOptions()
        // StartNNTP\r
        st.Bind(0,"StartNNTP");\r
        st.Bind(1,"true");\r
-       st.Bind(2,"Start NNTP service.");\r
+       st.Bind(2,"Start NNTP server.");\r
+       st.Step();\r
+       st.Reset();\r
+\r
+       st.Bind(0,"StartHTTP");\r
+       st.Bind(1,"true");\r
+       st.Bind(2,"Start HTTP server.");\r
+       st.Step();\r
+       st.Reset();\r
+\r
+       st.Bind(0,"HTTPListenPort");\r
+       st.Bind(1,"8080");\r
+       st.Bind(2,"Port HTTP server will listen on.");\r
        st.Step();\r
        st.Reset();\r
 \r
@@ -516,6 +529,7 @@ void StartThreads(std::vector<PThread::Thread *> &threads)
 {\r
        std::string startfreenet;\r
        std::string startnntp;\r
+       std::string starthttp;\r
 \r
        if(Option::Instance()->Get("StartFreenetUpdater",startfreenet)==false)\r
        {\r
@@ -529,6 +543,12 @@ void StartThreads(std::vector<PThread::Thread *> &threads)
                Option::Instance()->Set("StartNNTP","true");\r
        }\r
 \r
+       if(Option::Instance()->Get("StartHTTP",starthttp)==false)\r
+       {\r
+               starthttp="true";\r
+               Option::Instance()->Set("StartHTTP","true");\r
+       }\r
+\r
        if(startfreenet=="true")\r
        {\r
                PThread::Thread *t=new PThread::Thread(new FreenetMasterThread());\r
@@ -541,4 +561,10 @@ void StartThreads(std::vector<PThread::Thread *> &threads)
                threads.push_back(t);\r
        }\r
 \r
+       if(starthttp=="true")\r
+       {\r
+               PThread::Thread *t=new PThread::Thread(new HTTPThread());\r
+               threads.push_back(t);\r
+       }\r
+\r
 }\r