diff options
Diffstat (limited to 'server')
| -rwxr-xr-x | server/server/main.cpp | 2 | ||||
| -rwxr-xr-x | server/server/server.project | 26 | ||||
| -rw-r--r-- | server/server/speedtest.cpp | 12 |
3 files changed, 23 insertions, 17 deletions
diff --git a/server/server/main.cpp b/server/server/main.cpp index d8a1e5d..c662e6b 100755 --- a/server/server/main.cpp +++ b/server/server/main.cpp @@ -522,7 +522,7 @@ void session::proto_parser(std::vector<byte>& data) for(int i = 0; i < len; ++i) data.push_back(speed[i]); } - data.push_back('0'); //add speed here + //data.push_back('0'); //add speed here data.push_back(';'); } data.push_back(0x14); diff --git a/server/server/server.project b/server/server/server.project index a390dc3..6b8c5f7 100755 --- a/server/server/server.project +++ b/server/server/server.project @@ -2,7 +2,7 @@ <CodeLite_Project Name="server" InternalType="Console"> <Plugins> <Plugin Name="qmake"> - <![CDATA[00010001N0005Debug000000000000]]> + <![CDATA[00020001N0005Debug0000000000000001N0007Release000000000000]]> </Plugin> </Plugins> <Description/> @@ -49,7 +49,6 @@ <Library Value="boost_thread"/> <Library Value="boost_filesystem"/> <Library Value="z"/> - <Library Value="PocoFoundation"/> <Library Value="curl"/> </Linker> <ResourceCompiler Options="" Required="no"/> @@ -83,19 +82,26 @@ <SearchPaths/> </Completion> </Configuration> - <Configuration Name="Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> - <Compiler Options="" C_Options="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags=""> + <Configuration Name="Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> + <Compiler Options="-Os" C_Options="-Os" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags=""> <IncludePath Value="."/> </Compiler> - <Linker Options="-O2" Required="yes"/> + <Linker Options="-Wl,-O1" Required="yes"> + <Library Value="boost_system"/> + <Library Value="pthread"/> + <Library Value="ssl"/> + <Library Value="crypto"/> + <Library Value="boost_random"/> + <Library Value="boost_date_time"/> + <Library Value="boost_thread"/> + <Library Value="boost_filesystem"/> + <Library Value="z"/> + <Library Value="curl"/> + </Linker> <ResourceCompiler Options="" Required="no"/> <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/> <Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>"> - <![CDATA[ - - - - ]]> + <![CDATA[]]> </Environment> <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath=""> <PostConnectCommands/> diff --git a/server/server/speedtest.cpp b/server/server/speedtest.cpp index e47ebef..9b37b84 100644 --- a/server/server/speedtest.cpp +++ b/server/server/speedtest.cpp @@ -51,7 +51,7 @@ size_t speedtest::test(config::proxy_entry *p) curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &speedtest::curl_data_callback); curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*)&chunk); curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcurl-speedtest/0.1"); - curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, "10"); + curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10); time_t start = time(0); @@ -65,13 +65,13 @@ size_t speedtest::test(config::proxy_entry *p) if(error) { // const char *szError = curl_easy_strerror(error); - p->speed = -1; + p->speed = 0; return 0; } size_t speed = 0; if(chunk.size) { - if(time) + if(t) speed = (double)chunk.size/t; else speed = chunk.size; @@ -113,7 +113,7 @@ size_t speedtest::test(config::static_proxy_entry *p) curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &speedtest::curl_data_callback); curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*)&chunk); curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcurl-speedtest/0.1"); - curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, "10"); + curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10); time_t start = time(0); @@ -127,13 +127,13 @@ size_t speedtest::test(config::static_proxy_entry *p) if(error) { // const char *szError = curl_easy_strerror(error); - p->speed = -1; + p->speed = 0; return 0; } size_t speed = 0; if(chunk.size) { - if(time) + if(t) speed = (double)chunk.size/t; else speed = chunk.size; |