From 1052c8bd510b92827a61aba725083c9feb24e042 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Tue, 4 Sep 2012 12:29:27 +0300 Subject: GPL'ed --- server/proxy_ui_server.workspace | 79 +++++++++++++++++++++--- server/server/config.cpp | 17 ++++++ server/server/config.h | 16 +++++ server/server/firewall_list.cfg | 116 +++++++++++++++++++++++++++++++++++- server/server/headers.h | 16 +++++ server/server/log.cpp | 16 +++++ server/server/log.h | 16 +++++ server/server/main.cpp | 15 +++++ server/server/main.h | 16 +++++ server/server/server.cfg | 2 +- server/server/server.project | 5 +- server/server/speedtest.cpp | 16 +++++ server/server/speedtest.h | 16 +++++ server/server/static_proxy_list.cfg | 10 ++-- server/server/utilities.cpp | 17 ++++++ server/server/utilities.h | 17 ++++++ 16 files changed, 372 insertions(+), 18 deletions(-) (limited to 'server') diff --git a/server/proxy_ui_server.workspace b/server/proxy_ui_server.workspace index eb17446..99111a2 100644 --- a/server/proxy_ui_server.workspace +++ b/server/proxy_ui_server.workspace @@ -1,14 +1,6 @@ - - - - - - - - + + + + + + + + diff --git a/server/server/config.cpp b/server/server/config.cpp index 0114c6f..13e48c4 100755 --- a/server/server/config.cpp +++ b/server/server/config.cpp @@ -1,3 +1,20 @@ +// Copyright © 2010-2012 sss +//. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +//. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + #include "headers.h" extern logtofile *logger; diff --git a/server/server/config.h b/server/server/config.h index 1170710..e66cf6a 100755 --- a/server/server/config.h +++ b/server/server/config.h @@ -1,3 +1,19 @@ +// Copyright © 2010-2012 sss +//. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +//. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #ifndef CONFIG_H #define CONFIG_H diff --git a/server/server/firewall_list.cfg b/server/server/firewall_list.cfg index 3b3e669..b5640d0 100644 --- a/server/server/firewall_list.cfg +++ b/server/server/firewall_list.cfg @@ -1,3 +1,115 @@ -block *.adobeereg.com; -block ereg.adobe.com; +block *.adobeereg.com;adobeereg.com; +block activate.adobe.com; block practivate.adobe.com; +block ereg.adobe.com; +block activate.wip3.adobe.com; +block wip3.adobe.com;3dns-3.adobe.com; +block 3dns-2.adobe.com; +block adobe-dns.adobe.com; +block adobe-dns-2.adobe.com; +block adobe-dns-3.adobe.com; +block ereg.wip3.adobe.com; +block activate-sea.adobe.com; +block wwis-dubc1-vip60.adobe.com; +block activate-sjc0.adobe.com; +block livejournal.sup.com; +block stat.livejournal.sup.com; +block 74.125.163.86; +block 8.ce.b4.a1.top.mail.ru; +block www.hitcounter.ru; +block 85ideas.com; +block fxfeeds.mozilla.com; +block newsrss.bbc.co.uk; +block www.bbc.co.uk; +block wsrss.bbc.co.uk; +block luna.mail.ru; +block photo75.mail.ru; +block sitecheck2.opera.com; +block mu-in-f118.1e100.net; +block 77.220.183.34; +block tsarfin.com; +block rmuuekotik; +block ugsdxkmvpl; +block ckenrwezzt; +block counter.rambler.ru; +block counter.glc.ru;d5.cd.bf.a0.top.mail.ru; +block hit10.hotlog.ru; +block null; +block de.c6.bb.a0.top.mail.ru; +block s-static.ak; +block g.live.com; +block shared.live.com; +block begun.ru; +block thumbs02.begun.ru; +block sb-ssl.google.com; +block clients2.google.com; +block chatenabled.mail.google.com; +block suggestqueries.google.com; +block video-stats.video.google.com; +block p2.gygesawcxs5u6.xkbhduq3n7egsy7y.ds.ipv6-exp.l.google.com; +block ipv4.ipv6-exp.l.google.com; +block ssl.gstatic.*; +block fxfeeds.mozilla.*; +block *googlesyndi*; +block top.mail.ru; +block *charlesproxy*; +block *.google-analytics*; +block *hitcounter.ru; +block *85ideas.com; +block *id.google.*; +block newsrss.bbc.*; +block *.bbc.*; +block clients1.google.*; +block luna.mail.*; +block photo75.mail.*; +block sitecheck2.opera.com; +block *1e100*;counter.yadro.*; +block clients4.google.*; +block sb-ssl.google.com; +block clients2.google.com; +block tsarfin.com; +block counter.rambler.ru; +block counter.glc.ru; +block chatenabled.mail.google.com; +block suggestqueries.google.com;d5.cd.bf.a0.top.mail.ru; +block video-stats.video.google.com; +block exp.l.google.com; +block exp.l.google.com; +block hit10.hotlog.ru; +block de.c6.bb.a0.top.mail.ru; +block mc.yandex.ru; +block csi.gstatic.*; +block l.sharethis.com; +block scnt.rambler.*; +block d9.c0.b2.a0.top.mail.ru; +block *yadro.*; +block www.tns-counter.*; +block safebrowsing.clients.google.*; +block *.advmaker.ru; +block ngbn.net; +block protizer.ru; +block click.readme.ru; +block *.google-analytics.*; +block clicks.runews.radeant.com; +block clicksen.runews.radeant.com; +block radeant.com; +block counter.spylog.com; +block tizer.advmaker.ru; +block myass.ru; +block ru.redtram.com; +block readme.ru; +block picjoke.com; +block odnaknopka.ru; +block mafiaonline.ru; +block www.pixshock.net; +block js.ru.redtram.com; +block cnt.rambler.ru; +block toget.ru; +block pop-bazar.com; +block ssl.gstatic.com; +block safebrowsing-cache.google.com; +block *xn--2-ftblm2etb*; +block sls.microsoft.com; +block genuine.microsoft.com; +block validation.sls.microsoft.com; +block *.yadro.*;ocsp.startssl.com; diff --git a/server/server/headers.h b/server/server/headers.h index a4d0114..bc5ba3a 100755 --- a/server/server/headers.h +++ b/server/server/headers.h @@ -1,3 +1,19 @@ +// Copyright © 2010-2012 sss +//. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +//. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #ifndef HEADERS_H #define HEADERS_H diff --git a/server/server/log.cpp b/server/server/log.cpp index fd489f4..7075b4f 100644 --- a/server/server/log.cpp +++ b/server/server/log.cpp @@ -1,3 +1,19 @@ +// Copyright © 2010-2012 sss +//. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +//. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include "headers.h" logtofile& logtofile::operator<<(const char *buf) diff --git a/server/server/log.h b/server/server/log.h index 41ef9f4..efe1552 100644 --- a/server/server/log.h +++ b/server/server/log.h @@ -1,3 +1,19 @@ +// Copyright © 2010-2012 sss +//. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +//. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #ifndef LOG_H #define LOG_H diff --git a/server/server/main.cpp b/server/server/main.cpp index 48532fd..5231856 100755 --- a/server/server/main.cpp +++ b/server/server/main.cpp @@ -1,3 +1,18 @@ +// Copyright © 2010-2012 sss +//. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +//. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "main.h" #include "headers.h" diff --git a/server/server/main.h b/server/server/main.h index 0ebd349..662d5c1 100644 --- a/server/server/main.h +++ b/server/server/main.h @@ -1,3 +1,19 @@ +// Copyright © 2010-2012 sss +//. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +//. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #ifndef MAIN_H #define MAIN_H diff --git a/server/server/server.cfg b/server/server/server.cfg index 6f1c75f..9eefe1c 100644 --- a/server/server/server.cfg +++ b/server/server/server.cfg @@ -1,2 +1,2 @@ Debug=1; -IgnoreSslErrors=1; +ProxyCheckInterval=10; \ No newline at end of file diff --git a/server/server/server.project b/server/server/server.project index f01d83e..cbf07ff 100755 --- a/server/server/server.project +++ b/server/server/server.project @@ -33,7 +33,6 @@ - @@ -50,8 +49,7 @@ - + @@ -99,6 +97,7 @@ diff --git a/server/server/speedtest.cpp b/server/server/speedtest.cpp index 6908e34..c34852f 100644 --- a/server/server/speedtest.cpp +++ b/server/server/speedtest.cpp @@ -1,3 +1,19 @@ +// Copyright © 2010-2012 sss +//. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +//. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include "headers.h" extern logtofile *logger; diff --git a/server/server/speedtest.h b/server/server/speedtest.h index 1e976e2..c791832 100644 --- a/server/server/speedtest.h +++ b/server/server/speedtest.h @@ -1,3 +1,19 @@ +// Copyright © 2010-2012 sss +//. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +//. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #ifndef SPEEDTEST_H #define SPEEDTEST_H #include "headers.h" diff --git a/server/server/static_proxy_list.cfg b/server/server/static_proxy_list.cfg index a08ddc6..2e42ccc 100644 --- a/server/server/static_proxy_list.cfg +++ b/server/server/static_proxy_list.cfg @@ -1,4 +1,6 @@ -https://192.168.1.1:3128 "Russian server #1" 1; -socks5://192.168.100.1:8080 "Russian server #2" 1; -http://192.168.101.1:10003 "UA server #1" 2; -https://login:passwd@192.168.222.1:3128 "UA server #2" 2; +socks5://192.168.222.1:10006 "USA 10006" 1; +socks5://192.168.222.1:10009 "DE 10009" 1; +socks5://192.168.222.1:10001 "USA 10001" 2; +socks5://192.168.222.1:10002 "USA 10002" 2; +socks5://192.168.222.1:10003 "Poland? 10003" 1; +socks5://192.168.222.1:10005 "Poland? 10005" 1; diff --git a/server/server/utilities.cpp b/server/server/utilities.cpp index 9d35ae2..d96399f 100755 --- a/server/server/utilities.cpp +++ b/server/server/utilities.cpp @@ -1,3 +1,20 @@ +// Copyright © 2010-2012 sss +//. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +//. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + #include "headers.h" diff --git a/server/server/utilities.h b/server/server/utilities.h index ded609f..8f15ffb 100644 --- a/server/server/utilities.h +++ b/server/server/utilities.h @@ -1,3 +1,20 @@ +// Copyright © 2010-2012 sss +//. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +//. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + #ifndef UTILITIES_H #define UTILITIES_H -- cgit v1.2.3